diff options
| -rw-r--r-- | app/cwm/Makefile | 4 | ||||
| -rw-r--r-- | app/cwm/calmwm.h | 4 | ||||
| -rw-r--r-- | app/cwm/cursor.c | 65 |
3 files changed, 3 insertions, 70 deletions
diff --git a/app/cwm/Makefile b/app/cwm/Makefile index 0e2a4d69c..fa1c08eaa 100644 --- a/app/cwm/Makefile +++ b/app/cwm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2008/01/03 01:58:16 oga Exp $ +# $OpenBSD: Makefile,v 1.4 2008/01/08 20:21:43 oga Exp $ .include <bsd.own.mk> @@ -8,7 +8,7 @@ PROG= cwm SRCS= calmwm.c screen.c xmalloc.c client.c grab.c search.c \ util.c xutil.c conf.c input.c xevents.c group.c \ - kbfunc.c cursor.c font.c + kbfunc.c font.c CPPFLAGS+= -I${X11BASE}/include -I${X11BASE}/include/freetype2 diff --git a/app/cwm/calmwm.h b/app/cwm/calmwm.h index 6288f45ba..14deed465 100644 --- a/app/cwm/calmwm.h +++ b/app/cwm/calmwm.h @@ -4,7 +4,7 @@ * Copyright (c) 2004 Marius Aamodt Eriksen <marius@monkey.org> * All rights reserved. * - * $Id: calmwm.h,v 1.15 2008/01/03 01:58:16 oga Exp $ + * $Id: calmwm.h,v 1.16 2008/01/08 20:21:43 oga Exp $ */ #ifndef _CALMWM_H_ @@ -482,8 +482,6 @@ void group_autogroup(struct client_ctx *); void notification_init(struct screen_ctx *); -Cursor cursor_bigarrow(); - void font_init(struct screen_ctx *sc); struct fontdesc *font_get(struct screen_ctx *sc, const char *name); int font_width(struct fontdesc *fdp, const char *text, int len); diff --git a/app/cwm/cursor.c b/app/cwm/cursor.c deleted file mode 100644 index 551e0463b..000000000 --- a/app/cwm/cursor.c +++ /dev/null @@ -1,65 +0,0 @@ -/* - * cursor.c - * - * Copyright (c) 2005 Marius Eriksen <marius@monkey.org> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include "headers.h" -#include "calmwm.h" - -/* Pretty much straight out of 9wm... */ - -struct cursor_data { - int width; - int hot[2]; - u_char mask[64]; - u_char fore[64]; -}; - -static struct cursor_data Bigarrow = { - 16, - {0, 0}, - { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0x3F, - 0xFF, 0x0F, 0xFF, 0x0F, 0xFF, 0x1F, 0xFF, 0x3F, - 0xFF, 0x7F, 0xFF, 0xFF, 0xFF, 0x7F, 0xFF, 0x3F, - 0xCF, 0x1F, 0x8F, 0x0F, 0x07, 0x07, 0x03, 0x02, - }, - { 0x00, 0x00, 0xFE, 0x7F, 0xFE, 0x3F, 0xFE, 0x0F, - 0xFE, 0x07, 0xFE, 0x07, 0xFE, 0x0F, 0xFE, 0x1F, - 0xFE, 0x3F, 0xFE, 0x7F, 0xFE, 0x3F, 0xCE, 0x1F, - 0x86, 0x0F, 0x06, 0x07, 0x02, 0x02, 0x00, 0x00, - }, -}; - -static Cursor -_mkcursor(struct cursor_data *c, struct screen_ctx *sc) -{ - Pixmap f, m; - - f = XCreatePixmapFromBitmapData(X_Dpy, sc->rootwin, (char *)c->fore, - c->width, c->width, 1, 0, 1); - m = XCreatePixmapFromBitmapData(X_Dpy, sc->rootwin, (char *)c->mask, - c->width, c->width, 1, 0, 1); - - return (XCreatePixmapCursor(X_Dpy, f, m, - &sc->blackcolor, &sc->whitecolor, c->hot[0], c->hot[1])); -} - -Cursor -cursor_bigarrow(struct screen_ctx *sc) -{ - return _mkcursor(&Bigarrow, sc); -} - |