From 36ddd0c4086652bfb65d3b3034640e349d5c991b Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 9 May 2007 20:56:37 +0000 Subject: dont use XKeysymToKeycode because valgrind says it is doing bad things, and we have all the data we need anyways --- openbox/openbox.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) (limited to 'openbox/openbox.c') diff --git a/openbox/openbox.c b/openbox/openbox.c index dc1d3571..d3c80549 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -205,32 +205,27 @@ gint main(gint argc, gchar **argv) cursors[OB_CURSOR_NORTHWEST] = load_cursor("top_left_corner", XC_top_left_corner); - /* create available keycodes */ - keys[OB_KEY_RETURN] = - XKeysymToKeycode(ob_display, XK_Return); - keys[OB_KEY_ESCAPE] = - XKeysymToKeycode(ob_display, XK_Escape); - keys[OB_KEY_LEFT] = - XKeysymToKeycode(ob_display, XK_Left); - keys[OB_KEY_RIGHT] = - XKeysymToKeycode(ob_display, XK_Right); - keys[OB_KEY_UP] = - XKeysymToKeycode(ob_display, XK_Up); - keys[OB_KEY_DOWN] = - XKeysymToKeycode(ob_display, XK_Down); prop_startup(); /* get atoms values for the display */ extensions_query_all(); /* find which extensions are present */ if (screen_annex(program_name)) { /* it will be ours! */ do { + modkeys_startup(reconfigure); + + /* get the keycodes for keys we use */ + keys[OB_KEY_RETURN] = modkeys_sym_to_code(XK_Return); + keys[OB_KEY_ESCAPE] = modkeys_sym_to_code(XK_Escape); + keys[OB_KEY_LEFT] = modkeys_sym_to_code(XK_Left); + keys[OB_KEY_RIGHT] = modkeys_sym_to_code(XK_Right); + keys[OB_KEY_UP] = modkeys_sym_to_code(XK_Up); + keys[OB_KEY_DOWN] = modkeys_sym_to_code(XK_Down); + { ObParseInst *i; xmlDocPtr doc; xmlNodePtr node; - modkeys_startup(reconfigure); - /* startup the parsing so everything can register sections of the rc */ i = parse_startup(); -- cgit v1.2.3