summaryrefslogtreecommitdiff
path: root/app/cwm/calmwm.c
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2008-05-21 14:11:20 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2008-05-21 14:11:20 +0000
commit913928db385e6d08f0141674758a36e9f4978c33 (patch)
tree40e08422b237763329fa35ca4be3cc341b0dbe1a /app/cwm/calmwm.c
parent0552425b23ee3a2ddd3452e9e2f5ffc97bfadd0d (diff)
Make menu_filter handle mouse movement too. This enables the keyboard
search dialogues to be manipulated with the mouse, too. It also allows me to shrink the codebase further by killing grab_menu(). One known issue with highlighting the first entry in a search dialogue, that'll be fixed soonish. ok okan@, tested by Edd Barrett and todd@.
Diffstat (limited to 'app/cwm/calmwm.c')
-rw-r--r--app/cwm/calmwm.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/app/cwm/calmwm.c b/app/cwm/calmwm.c
index 79b62ea21..3a0f18ca5 100644
--- a/app/cwm/calmwm.c
+++ b/app/cwm/calmwm.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.
*
- * $Id: calmwm.c,v 1.19 2008/05/20 14:50:51 oga Exp $
+ * $Id: calmwm.c,v 1.20 2008/05/21 14:11:19 oga Exp $
*/
#include "headers.h"
@@ -202,10 +202,6 @@ x_setupscreen(struct screen_ctx *sc, u_int which)
GCForeground|GCBackground|GCFunction|
GCLineWidth|GCSubwindowMode, &gv);
- sc->hlgc = XCreateGC(X_Dpy, sc->rootwin,
- GCForeground|GCBackground|GCFunction|
- GCLineWidth|GCSubwindowMode, &gv);
-
font_init(sc);
DefaultFont = font_getx(sc, Conf.DefaultFontName);
sc->fontheight = font_ascent(DefaultFont) +
@@ -218,7 +214,7 @@ x_setupscreen(struct screen_ctx *sc, u_int which)
TAILQ_INIT(&sc->mruq);
/* Initialize menu window. */
- grab_menuinit(sc);
+ menu_init(sc);
/* Deal with existing clients. */
XQueryTree(X_Dpy, sc->rootwin, &w0, &w1, &wins, &nwins);