diff options
| author | Simon Rettberg | 2019-02-18 11:55:41 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-02-18 11:55:41 +0100 |
| commit | ae69a754244c4e475c8d2591772ca8e005071d83 (patch) | |
| tree | 58b3fa7abc2dcfe3c23e1c0ce108950c720826ab /hacks/filmleader.c | |
| parent | Update gitignore (diff) | |
| download | xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.gz xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.tar.xz xscreensaver-ae69a754244c4e475c8d2591772ca8e005071d83.zip | |
Update to 5.42
Diffstat (limited to 'hacks/filmleader.c')
| -rw-r--r-- | hacks/filmleader.c | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/hacks/filmleader.c b/hacks/filmleader.c index ef021e1..25b64c4 100644 --- a/hacks/filmleader.c +++ b/hacks/filmleader.c @@ -53,6 +53,7 @@ filmleader_init (Display *dpy, Window window) { struct state *st = (struct state *) calloc (1, sizeof(*st)); XGCValues gcv; + char *s; st->dpy = dpy; st->window = window; @@ -105,15 +106,15 @@ filmleader_init (Display *dpy, Window window) st->xftdraw = XftDrawCreate (dpy, st->pix, st->xgwa.visual, st->xgwa.colormap); - st->font = load_xft_font_retry (dpy, screen_number (st->xgwa.screen), - get_string_resource (dpy, "numberFont", - "Font")); - st->font2 = load_xft_font_retry (dpy, screen_number (st->xgwa.screen), - get_string_resource (dpy, "numberFont2", - "Font")); - st->font3 = load_xft_font_retry (dpy, screen_number (st->xgwa.screen), - get_string_resource (dpy, "numberFont3", - "Font")); + s = get_string_resource (dpy, "numberFont", "Font"); + st->font = load_xft_font_retry (dpy, screen_number (st->xgwa.screen), s); + if (s) free (s); + s = get_string_resource (dpy, "numberFont2", "Font"); + st->font2 = load_xft_font_retry (dpy, screen_number (st->xgwa.screen), s); + if (s) free (s); + s = get_string_resource (dpy, "numberFont3", "Font"); + st->font3 = load_xft_font_retry (dpy, screen_number (st->xgwa.screen), s); + if (s) free (s); st->bg = get_pixel_resource (dpy, st->xgwa.colormap, "textBackground", "Background"); @@ -124,12 +125,15 @@ filmleader_init (Display *dpy, Window window) st->trace_color = get_pixel_resource (dpy, st->xgwa.colormap, "traceColor", "Foreground"); - XftColorAllocName (dpy, st->xgwa.visual, st->xgwa.colormap, - get_string_resource (dpy, "textColor", "Foreground"), + s = get_string_resource (dpy, "textColor", "Foreground"); + XftColorAllocName (dpy, st->xgwa.visual, st->xgwa.colormap, s, &st->xft_text_color_1); - XftColorAllocName (dpy, st->xgwa.visual, st->xgwa.colormap, - get_string_resource (dpy, "textBackground", "Background"), + if (s) free (s); + + s = get_string_resource (dpy, "textBackground", "Background"); + XftColorAllocName (dpy, st->xgwa.visual, st->xgwa.colormap, s, &st->xft_text_color_2); + if (s) free (s); return st; } @@ -512,6 +516,7 @@ filmleader_free (Display *dpy, Window window, void *closure) { struct state *st = (struct state *) closure; analogtv_release (st->tv); + free (st->inp); XftDrawDestroy (st->xftdraw); XftColorFree(dpy, st->xgwa.visual, st->xgwa.colormap, &st->xft_text_color_1); XftColorFree(dpy, st->xgwa.visual, st->xgwa.colormap, &st->xft_text_color_2); |