summaryrefslogtreecommitdiff
path: root/openbox/openbox.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-05-04 01:10:03 +0000
committerDana Jansens <danakj@orodu.net>2007-05-04 01:10:03 +0000
commit7e946f68d9f8ec7c880664b437edbbaa5d49ac10 (patch)
treedf9979455e26627815642071bd4bc43bcc721db8 /openbox/openbox.c
parent5784f11132cb2ee64af23695867aca9f4ebe0b9b (diff)
make the modifier key code a lot better...
1) it can handle more user cases. 2) it can handle binding more modifier keys with their keysym names like Hyper and Super. W is a shortcut for Super, cuz the windows key is generally bound to it. 3) if you change your keymap bindings and reconfigure openbox it will learn your changes. and i dunno.. its just nice and stuff now.. you can actually read it I think..
Diffstat (limited to 'openbox/openbox.c')
-rw-r--r--openbox/openbox.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/openbox/openbox.c b/openbox/openbox.c
index 9de780dd..052929a5 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -21,6 +21,7 @@
#include "openbox.h"
#include "session.h"
#include "dock.h"
+#include "modkeys.h"
#include "event.h"
#include "menu.h"
#include "client.h"
@@ -215,6 +216,8 @@ gint main(gint argc, gchar **argv)
xmlDocPtr doc;
xmlNodePtr node;
+ modkeys_startup(reconfigure);
+
/* startup the parsing so everything can register sections
of the rc */
i = parse_startup();
@@ -320,6 +323,7 @@ gint main(gint argc, gchar **argv)
window_shutdown(reconfigure);
event_shutdown(reconfigure);
config_shutdown();
+ modkeys_shutdown(reconfigure);
} while (reconfigure);
}