diff options
author | Simon Rettberg | 2019-07-30 16:07:15 +0200 |
---|---|---|
committer | Simon Rettberg | 2019-07-30 16:07:15 +0200 |
commit | 813ac136e48f60d4c2b13e808107870dafcc4d52 (patch) | |
tree | 396a6c98276f6e9a04216933daebdf3af7b81d46 /hacks/filmleader.c | |
parent | Flush X events before locking if we have an external ungrab command (diff) | |
parent | Update to 5.43 (diff) | |
download | xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.tar.gz xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.tar.xz xscreensaver-813ac136e48f60d4c2b13e808107870dafcc4d52.zip |
Merge branch 'master' into openslx (5.43)
Diffstat (limited to 'hacks/filmleader.c')
-rw-r--r-- | hacks/filmleader.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/hacks/filmleader.c b/hacks/filmleader.c index 25b64c4..2aabb9d 100644 --- a/hacks/filmleader.c +++ b/hacks/filmleader.c @@ -1,4 +1,4 @@ -/* filmleader, Copyright (c) 2018 Jamie Zawinski <jwz@jwz.org> +/* filmleader, Copyright (c) 2018-2019 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 @@ -223,10 +223,10 @@ filmleader_draw (Display *dpy, Window window, void *closure) XftTextExtentsUtf8 (dpy, xftfont, (FcChar8 *) blurbs[i].s[0], strlen(blurbs[i].s[0]), &extents); - lbearing = -extents.x; + /* lbearing = -extents.x; */ rbearing = extents.width - extents.x; ascent = extents.y; - descent = extents.height - extents.y; + /* descent = extents.height - extents.y; */ x = (st->w - rbearing) / 2; y = st->h * 0.1 + ascent; @@ -245,10 +245,10 @@ filmleader_draw (Display *dpy, Window window, void *closure) XftTextExtentsUtf8 (dpy, xftfont, (FcChar8 *) blurbs[i].s[0], strlen(blurbs[i].s[j]), &extents); - lbearing = -extents.x; - rbearing = extents.width - extents.x; - ascent = extents.y; - descent = extents.height - extents.y; + /* lbearing = -extents.x; */ + /* rbearing = extents.width - extents.x; */ + /* ascent = extents.y; */ + /* descent = extents.height - extents.y; */ } } @@ -360,7 +360,7 @@ filmleader_draw (Display *dpy, Window window, void *closure) lbearing = -extents.x; rbearing = extents.width - extents.x; ascent = extents.y; - descent = extents.height - extents.y; + /* descent = extents.height - extents.y; */ x = st->w * 0.1; y = st->h * 0.1 + ascent; @@ -377,8 +377,8 @@ filmleader_draw (Display *dpy, Window window, void *closure) XftTextExtentsUtf8 (dpy, xftfont, (FcChar8 *) s, strlen(s), &extents); lbearing = -extents.x; rbearing = extents.width - extents.x; - ascent = extents.y; - descent = extents.height - extents.y; + /* ascent = extents.y; */ + /* descent = extents.height - extents.y; */ x = st->w * 0.1; y = st->h * 0.95; |