-/* xscreensaver, Copyright (c) 1991-2006 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1991-2008 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
{
CGRect wr = d->frame;
+ Assert ((w < 65535), "improbably large width");
+ Assert ((h < 65535), "improbably large height");
+ Assert ((src_x < 65535 && src_x > -65535), "improbably large src_x");
+ Assert ((src_y < 65535 && src_y > -65535), "improbably large src_y");
+ Assert ((dest_x < 65535 && dest_x > -65535), "improbably large dest_x");
+ Assert ((dest_y < 65535 && dest_y > -65535), "improbably large dest_y");
+
// Clip width and height to the bounds of the Drawable
//
if (dest_x + w > wr.size.width) {
int depth, ibpp, ibpl;
NSBitmapImageRep *bm = 0;
+ Assert ((width < 65535), "improbably large width");
+ Assert ((height < 65535), "improbably large height");
+ Assert ((x < 65535 && x > -65535), "improbably large x");
+ Assert ((y < 65535 && y > -65535), "improbably large y");
+
if (d->type == PIXMAP) {
depth = d->pixmap.depth;
ibpp = CGBitmapContextGetBitsPerPixel (d->cgc);
ibpl = [bm bytesPerRow];
data = [bm bitmapData];
Assert (data, "NSBitmapImageRep initWithFocusedViewRect failed");
-
- data += (y * ibpl) + (x * (ibpp/8));
}
+ // data points at (x,y) with ibpl rowstride. ignore x,y from now on.
+ data += (y * ibpl) + (x * (ibpp/8));
+
format = (depth == 1 ? XYPixmap : ZPixmap);
XImage *image = XCreateImage (dpy, 0, depth, format, 0, 0, width, height,
0, 0);
int xx, yy;
if (depth == 1) {
const unsigned char *iline = data;
- for (yy = y; yy < y+height; yy++) {
+ for (yy = 0; yy < height; yy++) {
const unsigned char *iline2 = iline;
- for (xx = x; xx < x+width; xx++) {
+ for (xx = 0; xx < width; xx++) {
iline2++; // ignore b or a
iline2++; // ignore g or r
Assert (ibpp == 24 || ibpp == 32, "weird obpp");
const unsigned char *iline = data;
unsigned char *oline = (unsigned char *) image->data;
- oline += (y * obpl);
- for (yy = y; yy < y+height; yy++) {
+ for (yy = 0; yy < height; yy++) {
const unsigned char *iline2 = iline;
unsigned char *oline2 = oline;
- for (xx = x; xx < x+width; xx++) {
+ for (xx = 0; xx < width; xx++) {
unsigned char a = (ibpp == 32 ? (*iline2++) : 0xFF);
unsigned char r = *iline2++;
(b << 0));
*((unsigned int *) oline2) = pixel;
oline2 += 4;
- }
+ }
oline += obpl;
iline += ibpl;
}
static void
query_font (Font fid)
{
+ if (!fid || !fid->nsfont) {
+ NSLog(@"no NSFont in fid");
+ abort();
+ }
+ if (![fid->nsfont fontName]) {
+ NSLog(@"broken NSFont in fid");
+ abort();
+ }
+
int first = 32;
int last = 255;
// copy the other pointers
fid2->ps_name = strdup (fid->ps_name);
- [fid2->nsfont retain];
+// [fid2->nsfont retain];
fid2->metrics.fid = fid2;
return fid2;
try_font (BOOL fixed, BOOL bold, BOOL ital, BOOL serif, float size,
char **name_ret)
{
- const char *prefix = (fixed ? "Monaco" : (serif ? "Times" : "Helvetica"));
- const char *suffix = (bold && ital
- ? (serif ? "-BoldItalic" : "-BoldOblique")
- : (bold ? "-Bold" :
- ital ? (serif ? "-Italic" : "-Oblique") : ""));
- char *name = (char *) malloc (strlen(prefix) + strlen(suffix) + 1);
- strcpy (name, prefix);
- strcat (name, suffix);
+ Assert (size > 0, "zero font size");
+ const char *name;
+
+ if (fixed) {
+ //
+ // "Monaco" only exists in plain.
+ // "LucidaSansTypewriterStd" gets an AGL bad value error.
+ //
+ if (bold && ital) name = "Courier-BoldOblique";
+ else if (bold) name = "Courier-Bold";
+ else if (ital) name = "Courier-Oblique";
+ else name = "Courier";
+
+ } else if (serif) {
+ //
+ // "Georgia" looks better than "Times".
+ //
+ if (bold && ital) name = "Georgia-BoldItalic";
+ else if (bold) name = "Georgia-Bold";
+ else if (ital) name = "Georgia-Italic";
+ else name = "Georgia";
+
+ } else {
+ //
+ // "Geneva" only exists in plain.
+ // "LucidaSansStd-BoldItalic" gets an AGL bad value error.
+ // "Verdana" renders smoother than "Helvetica" for some reason.
+ //
+ if (bold && ital) name = "Verdana-BoldItalic";
+ else if (bold) name = "Verdana-Bold";
+ else if (ital) name = "Verdana-Italic";
+ else name = "Verdana";
+ }
NSString *nsname = [NSString stringWithCString:name
encoding:NSUTF8StringEncoding];
NSFont *f = [NSFont fontWithName:nsname size:size];
- if (f) {
- *name_ret = name;
- } else {
- free (name);
- }
+ if (f)
+ *name_ret = strdup(name);
return f;
}
static NSFont *
random_font (BOOL bold, BOOL ital, float size, char **name_ret)
{
- NSFontTraitMask mask = ((bold ? NSUnboldFontMask : NSBoldFontMask) |
- (ital ? NSUnitalicFontMask : NSItalicFontMask));
+ NSFontTraitMask mask = ((bold ? NSBoldFontMask : NSUnboldFontMask) |
+ (ital ? NSItalicFontMask : NSUnitalicFontMask));
NSArray *fonts = [[NSFontManager sharedFontManager]
availableFontNamesWithTraits:mask];
if (!fonts) return 0;
{
free (fid->ps_name);
free (fid->metrics.per_char);
- [fid->nsfont release];
+
+ // #### DAMMIT! I can't tell what's going wrong here, but I keep getting
+ // crashes in [NSFont ascender] <- query_font, and it seems to go away
+ // if I never release the nsfont. So, fuck it, we'll just leak fonts.
+ // They're probably not very big...
+ //
+ // [fid->nsfont release];
+
free (fid);
return 0;
}
if (gc->gcv.font)
XUnloadFont (dpy, gc->gcv.font);
gc->gcv.font = copy_font (fid);
+ [gc->gcv.font->nsfont retain];
return 0;
}
-Font // really GContext
-XGContextFromGC (GC gc) // WTF is this actually supposed to do?
-{
- return gc->gcv.font;
-}
-
int
XTextExtents (XFontStruct *f, const char *s, int length,
int *dir_ret, int *ascent_ret, int *descent_ret,
set_font (CGContextRef cgc, GC gc)
{
Font font = gc->gcv.font;
- if (! font)
- font = gc->gcv.font = XLoadFont (0, 0);
+ if (! font) {
+ font = XLoadFont (0, 0);
+ gc->gcv.font = font;
+ [gc->gcv.font->nsfont retain];
+ }
CGContextSelectFont (cgc, font->ps_name, font->size, kCGEncodingMacRoman);
CGContextSetTextMatrix (cgc, CGAffineTransformIdentity);
}