From 09592e294300150a2c627a176bdbec0fedf4e1d9 Mon Sep 17 00:00:00 2001 From: okan Date: Wed, 31 Oct 2012 19:30:19 +0000 Subject: replace 'reload' with 'restart', which merely re-exec's cwm using the existing argv; same idea with respect to argv saving as Alexander Polakov. reload support was half-complete and is getting in the way. agreed to by many --- font.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'font.c') diff --git a/font.c b/font.c index cebb2bd..4e8d4b7 100644 --- a/font.c +++ b/font.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: font.c,v 1.17 2011/09/08 12:35:33 okan Exp $ + * $OpenBSD: font.c,v 1.18 2012/10/31 19:30:19 okan Exp $ */ #include @@ -51,16 +51,11 @@ font_height(struct screen_ctx *sc) void font_init(struct screen_ctx *sc, const char *color) { - if (sc->xftdraw) - XftDrawDestroy(sc->xftdraw); sc->xftdraw = XftDrawCreate(X_Dpy, sc->rootwin, DefaultVisual(X_Dpy, sc->which), DefaultColormap(X_Dpy, sc->which)); if (sc->xftdraw == NULL) errx(1, "XftDrawCreate"); - if (sc->xftcolor.pixel) - XftColorFree(X_Dpy, DefaultVisual(X_Dpy, sc->which), - DefaultColormap(X_Dpy, sc->which), &sc->xftcolor); if (!XftColorAllocName(X_Dpy, DefaultVisual(X_Dpy, sc->which), DefaultColormap(X_Dpy, sc->which), color, &sc->xftcolor)) errx(1, "XftColorAllocName"); -- cgit v1.2.3-2-gb3c3