aboutsummaryrefslogtreecommitdiffstats
path: root/font.c
diff options
context:
space:
mode:
authorokan2012-10-31 19:30:19 +0000
committerokan2012-10-31 19:30:19 +0000
commit09592e294300150a2c627a176bdbec0fedf4e1d9 (patch)
tree408b348edf99fa03e26c6aee3e1b08229d0c3da5 /font.c
parent5854a666c86986a568f60c94ce1fa0fe10104405 (diff)
downloadcwm-09592e294300150a2c627a176bdbec0fedf4e1d9.tar.gz
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
Diffstat (limited to '')
-rw-r--r--font.c7
1 files changed, 1 insertions, 6 deletions
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 <sys/param.h>
@@ -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");