projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.39.tar.gz
[xscreensaver]
/
jwxyz
/
jwxyz-common.c
diff --git
a/jwxyz/jwxyz-common.c
b/jwxyz/jwxyz-common.c
index 849c4567881677114550b36b9cb619c8ee5482ce..81ffe373e5049a133352344388f085d3863b8fd2 100644
(file)
--- a/
jwxyz/jwxyz-common.c
+++ b/
jwxyz/jwxyz-common.c
@@
-27,6
+27,7
@@
#include <stdarg.h>
#include <stdio.h>
#include <stdarg.h>
#include <stdio.h>
+#include <string.h>
#include "jwxyzI.h"
#include "pow2.h"
#include "jwxyzI.h"
#include "pow2.h"
@@
-1035,6
+1036,9
@@
try_native_font (Display *dpy, const char *name, Font fid)
fid->xa_font = strdup (name); // Maybe this should be an XLFD?
break;
} else {
fid->xa_font = strdup (name); // Maybe this should be an XLFD?
break;
} else {
+ // To list fonts:
+ // po [UIFont familyNames]
+ // po [UIFont fontNamesForFamilyName:@"Arial"]
Log("No native font: \"%s\" %.0f", name2, size);
}
}
Log("No native font: \"%s\" %.0f", name2, size);
}
}
@@
-1566,9
+1570,13
@@
XDrawImageString (Display *dpy, Drawable d, GC gc, int x, int y,
jwxyz_fill_rect (dpy, d, gc,
x + MIN (0, cs.lbearing),
y - MAX (0, ascent),
jwxyz_fill_rect (dpy, d, gc,
x + MIN (0, cs.lbearing),
y - MAX (0, ascent),
+
+ /* The +1 here is almost certainly wrong, but BSOD
+ requires it; and only BSOD, fluidballs, juggle
+ and grabclient call XDrawImageString... */
MAX (MAX (0, cs.rbearing) -
MIN (0, cs.lbearing),
MAX (MAX (0, cs.rbearing) -
MIN (0, cs.lbearing),
- cs.width),
+ cs.width)
+ 1
,
MAX (0, ascent) + MAX (0, descent),
VTBL->gc_gcv(gc)->background);
return XDrawString (dpy, d, gc, x, y, str, len);
MAX (0, ascent) + MAX (0, descent),
VTBL->gc_gcv(gc)->background);
return XDrawString (dpy, d, gc, x, y, str, len);