aboutsummaryrefslogtreecommitdiffstats
path: root/calmwm.c
diff options
context:
space:
mode:
authoroga2008-05-21 14:11:19 +0000
committeroga2008-05-21 14:11:19 +0000
commit70508fca2af57f5b3b025a45f7b5a6a66e31d4cb (patch)
tree2f68ba9395dbae3a11e6d2401bc09b62e09783ad /calmwm.c
parentc4a8f44931713f32f250264ca00520aae30fc0e3 (diff)
downloadcwm-70508fca2af57f5b3b025a45f7b5a6a66e31d4cb.tar.gz
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 '')
-rw-r--r--calmwm.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/calmwm.c b/calmwm.c
index 79b62ea..3a0f18c 100644
--- a/calmwm.c
+++ b/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);