it* My version of sent Err codevoid.de 70 i Err codevoid.de 70 hgit clone git://git.codevoid.de/sent-sdk.git URL:git://git.codevoid.de/sent-sdk.git codevoid.de 70 1Log /git/sent-sdk/log.gph codevoid.de 70 1Files /git/sent-sdk/files.gph codevoid.de 70 1Refs /git/sent-sdk/refs.gph codevoid.de 70 1README /git/sent-sdk/file/README.md.gph codevoid.de 70 1LICENSE /git/sent-sdk/file/LICENSE.gph codevoid.de 70 i--- Err codevoid.de 70 1commit 4166516862020bd67a63e9341c49b1a17fe1bd9a /git/sent-sdk/commit/4166516862020bd67a63e9341c49b1a17fe1bd9a.gph codevoid.de 70 1parent 75081d228ea93bd30d584e52e875baf663309819 /git/sent-sdk/commit/75081d228ea93bd30d584e52e875baf663309819.gph codevoid.de 70 hAuthor: Markus Teich URL:mailto:markus.teich@stusta.mhn.de codevoid.de 70 iDate: Sat, 25 Apr 2015 20:18:43 +0200 Err codevoid.de 70 i Err codevoid.de 70 iremove old stuff and fix warnings Err codevoid.de 70 i Err codevoid.de 70 iDiffstat: Err codevoid.de 70 i M sent.c | 127 +------------------------------ Err codevoid.de 70 i Err codevoid.de 70 i1 file changed, 3 insertions(+), 124 deletions(-) Err codevoid.de 70 i--- Err codevoid.de 70 1diff --git a/sent.c b/sent.c /git/sent-sdk/file/sent.c.gph codevoid.de 70 it@@ -91,9 +91,7 @@ static int pngprepare(struct image *img); Err codevoid.de 70 i static void pngscale(struct image *img); Err codevoid.de 70 i static void pngdraw(struct image *img); Err codevoid.de 70 i Err codevoid.de 70 i-static Bool xfontisscalable(char *name); Err codevoid.de 70 i-static XFontStruct *xloadqueryscalablefont(char *name, int size); Err codevoid.de 70 i-static void getfontsize(char *str, int *width, int *height); Err codevoid.de 70 i+static void getfontsize(char *str, unsigned int *width, unsigned int *height); Err codevoid.de 70 i static void cleanup(struct DC *cur); Err codevoid.de 70 i static void eprintf(const char *, ...); Err codevoid.de 70 i static void die(const char *, ...); Err codevoid.de 70 it@@ -319,69 +317,7 @@ void pngdraw(struct image *img) Err codevoid.de 70 i img->state |= DRAWN; Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i-Bool xfontisscalable(char *name) Err codevoid.de 70 i-{ Err codevoid.de 70 i- int i, field; Err codevoid.de 70 i- Err codevoid.de 70 i- if (!name || name[0] != '-') Err codevoid.de 70 i- return False; Err codevoid.de 70 i- Err codevoid.de 70 i- for (i = field = 0; name[i] != '\0'; i++) { Err codevoid.de 70 i- if (name[i] == '-') { Err codevoid.de 70 i- field++; Err codevoid.de 70 i- if ((field == 7) || (field == 8) || (field == 12)) Err codevoid.de 70 i- if ((name[i+1] != '0') || (name[i+2] != '-')) Err codevoid.de 70 i- return False; Err codevoid.de 70 i- } Err codevoid.de 70 i- } Err codevoid.de 70 i- return field == 14; Err codevoid.de 70 i-} Err codevoid.de 70 i- Err codevoid.de 70 i-XFontStruct *xloadqueryscalablefont(char *name, int size) Err codevoid.de 70 i-{ Err codevoid.de 70 i- int i, j, field; Err codevoid.de 70 i- char newname[500]; Err codevoid.de 70 i- int resx, resy; Err codevoid.de 70 i- Err codevoid.de 70 i- if (!name || name[0] != '-') Err codevoid.de 70 i- return NULL; Err codevoid.de 70 i- /* calculate our screen resolution in dots per inch. 25.4mm = 1 inch */ Err codevoid.de 70 i- resx = DisplayWidth(xw.dpy, xw.scr)/(DisplayWidthMM(xw.dpy, xw.scr)/25.4); Err codevoid.de 70 i- resy = DisplayHeight(xw.dpy, xw.scr)/(DisplayHeightMM(xw.dpy, xw.scr)/25.4); Err codevoid.de 70 i- /* copy the font name, changing the scalable fields as we do so */ Err codevoid.de 70 i- for (i = j = field = 0; name[i] != '\0' && field <= 14; i++) { Err codevoid.de 70 i- newname[j++] = name[i]; Err codevoid.de 70 i- if (name[i] == '-') { Err codevoid.de 70 i- field++; Err codevoid.de 70 i- switch (field) { Err codevoid.de 70 i- case 7: /* pixel size */ Err codevoid.de 70 i- case 12: /* average width */ Err codevoid.de 70 i- /* change from "-0-" to "-*-" */ Err codevoid.de 70 i- newname[j] = '*'; Err codevoid.de 70 i- j++; Err codevoid.de 70 i- if (name[i+1] != '\0') i++; Err codevoid.de 70 i- break; Err codevoid.de 70 i- case 8: /* point size */ Err codevoid.de 70 i- /* change from "-0-" to "--" */ Err codevoid.de 70 i- sprintf(&newname[j], "%d", size); Err codevoid.de 70 i- while (newname[j] != '\0') j++; Err codevoid.de 70 i- if (name[i+1] != '\0') i++; Err codevoid.de 70 i- break; Err codevoid.de 70 i- case 9: /* x-resolution */ Err codevoid.de 70 i- case 10: /* y-resolution */ Err codevoid.de 70 i- /* change from an unspecified resolution to resx or resy */ Err codevoid.de 70 i- sprintf(&newname[j], "%d", (field == 9) ? resx : resy); Err codevoid.de 70 i- while (newname[j] != '\0') j++; Err codevoid.de 70 i- while ((name[i+1] != '-') && (name[i+1] != '\0')) i++; Err codevoid.de 70 i- break; Err codevoid.de 70 i- } Err codevoid.de 70 i- } Err codevoid.de 70 i- } Err codevoid.de 70 i- newname[j] = '\0'; Err codevoid.de 70 i- return (field != 14) ? NULL : XLoadQueryFont(xw.dpy, newname); Err codevoid.de 70 i-} Err codevoid.de 70 i- Err codevoid.de 70 i-void getfontsize(char *str, int *width, int *height) Err codevoid.de 70 i+void getfontsize(char *str, unsigned int *width, unsigned int *height) Err codevoid.de 70 i { Err codevoid.de 70 i size_t i; Err codevoid.de 70 i size_t len = strlen(str); Err codevoid.de 70 it@@ -543,8 +479,7 @@ void usage() Err codevoid.de 70 i Err codevoid.de 70 i void xdraw() Err codevoid.de 70 i { Err codevoid.de 70 i- int height; Err codevoid.de 70 i- int width; Err codevoid.de 70 i+ unsigned int height, width; Err codevoid.de 70 i struct image *im = slides[idx].img; Err codevoid.de 70 i Err codevoid.de 70 i getfontsize(slides[idx].text, &width, &height); Err codevoid.de 70 it@@ -621,11 +556,7 @@ void xinit() Err codevoid.de 70 i Err codevoid.de 70 i void xloadfonts(char *fontstr) Err codevoid.de 70 i { Err codevoid.de 70 i- int count = 0; Err codevoid.de 70 i int i, j; Err codevoid.de 70 i- XFontStruct *fnt; Err codevoid.de 70 i- XGCValues gcvalues; Err codevoid.de 70 i- struct DC *cur = &dc; Err codevoid.de 70 i char *fstrs[LEN(fontfallbacks)]; Err codevoid.de 70 i Err codevoid.de 70 i for (j = 0; j < LEN(fontfallbacks); j++) { Err codevoid.de 70 it@@ -641,58 +572,6 @@ void xloadfonts(char *fontstr) Err codevoid.de 70 i fonts[i] = drw_fontset_create(d, (const char**)fstrs, LEN(fstrs)); Err codevoid.de 70 i } Err codevoid.de 70 i drw_setfontset(d, fonts[19]); Err codevoid.de 70 i- Err codevoid.de 70 i-/* if (!(fstrs = malloc(NUMFONTS * MAXFONTSTRLEN))) Err codevoid.de 70 i- die("could not malloc fontstrings"); Err codevoid.de 70 i- if (!(fonts = malloc(NUMFONTS * sizeof(char*)))) { Err codevoid.de 70 i- free(fstrs); Err codevoid.de 70 i- die("could not malloc fontarray"); Err codevoid.de 70 i- } Err codevoid.de 70 i- Err codevoid.de 70 i- const char *fonts[] = { Err codevoid.de 70 i- "Sans:size=80:size=10.5", Err codevoid.de 70 i- "VL Gothic:size=10.5", Err codevoid.de 70 i- "WenQuanYi Micro Hei:size=10.5", Err codevoid.de 70 i- }; */ Err codevoid.de 70 i-// drw_load_fonts(d, fonts, LEN(fonts)); Err codevoid.de 70 i- Err codevoid.de 70 i-/* for (i = 0; i < NUMFONTS; i++) { Err codevoid.de 70 i- snprintf(&fstrs[i*MAXFONTSTRLEN], MAXFONTSTRLEN, "%s:size=%d", fontstr, FONTSZ(i)); Err codevoid.de 70 i- puts(&fstrs[i*MAXFONTSTRLEN]); Err codevoid.de 70 i- fonts[i] = &fstrs[i*MAXFONTSTRLEN]; Err codevoid.de 70 i- } Err codevoid.de 70 i- Err codevoid.de 70 i- drw_load_fonts(d, fonts, NUMFONTS); Err codevoid.de 70 i- Err codevoid.de 70 i- free(fstrs); Err codevoid.de 70 i- free(fonts); Err codevoid.de 70 i-*/ Err codevoid.de 70 i-// while (count-- && !xfontisscalable(fstr[count])) Err codevoid.de 70 i-// ; /* nothing, just get first scalable font result */ Err codevoid.de 70 i-// Err codevoid.de 70 i-// if (count < 0) Err codevoid.de 70 i-// eprintf("sent: could not find a scalable font matching %s", fontstr); Err codevoid.de 70 i-// Err codevoid.de 70 i-// memset(&gcvalues, 0, sizeof(gcvalues)); Err codevoid.de 70 i-// Err codevoid.de 70 i-// do { Err codevoid.de 70 i-// if (!(fnt = xloadqueryscalablefont(fstr[count], FONTSZ(i)))) { Err codevoid.de 70 i-// i++; Err codevoid.de 70 i-// continue; Err codevoid.de 70 i-// } Err codevoid.de 70 i-// Err codevoid.de 70 i-// cur->gc = XCreateGC(xw.dpy, XRootWindow(xw.dpy, xw.scr), 0, &gcvalues); Err codevoid.de 70 i-// cur->font = fnt; Err codevoid.de 70 i-// XSetFont(xw.dpy, cur->gc, fnt->fid); Err codevoid.de 70 i-// XSetForeground(xw.dpy, cur->gc, BlackPixel(xw.dpy, xw.scr)); Err codevoid.de 70 i-// cur->next = (++i < NUMFONTS) ? malloc(sizeof(struct DC)) : NULL; Err codevoid.de 70 i-// cur = cur->next; Err codevoid.de 70 i-// } while (cur && i < NUMFONTS); Err codevoid.de 70 i-// Err codevoid.de 70 i-// if (cur == &dc) Err codevoid.de 70 i-// eprintf("sent: could not load fonts."); Err codevoid.de 70 i-// Err codevoid.de 70 i-// XFreeFontNames(fstr); Err codevoid.de 70 i } Err codevoid.de 70 i Err codevoid.de 70 i void bpress(XEvent *e) Err codevoid.de 70 .