diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-07-26 21:56:42 -0400 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-01-20 01:36:55 -0500 |
| commit | 1aac72bc4cfffdd816347d305624b15d0ae2112e (patch) | |
| tree | bb71ca867bac38c067680788be2de75156d17a27 /openbox/openbox.c | |
| parent | 2f0e73cf9d20154c5c84b6ea90e658cf44a6f0c4 (diff) | |
add keyboard.[ch] to libobt. these are for tracking modifier keys, and translating to/from keycodes/keysyms/modmasks (also include a new obt/internal.h for putting functions that are not public)
Diffstat (limited to 'openbox/openbox.c')
| -rw-r--r-- | openbox/openbox.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/openbox/openbox.c b/openbox/openbox.c index 0551a587..fb19cbdf 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -21,7 +21,6 @@ #include "openbox.h" #include "session.h" #include "dock.h" -#include "modkeys.h" #include "event.h" #include "menu.h" #include "client.h" @@ -204,7 +203,7 @@ gint main(gint argc, gchar **argv) if (screen_annex()) { /* it will be ours! */ do { - modkeys_startup(reconfigure); + if (reconfigure) obt_keyboard_reload(); /* get the keycodes for keys we use */ keys[OB_KEY_RETURN] = modkeys_sym_to_code(XK_Return); @@ -359,7 +358,6 @@ gint main(gint argc, gchar **argv) event_shutdown(reconfigure); config_shutdown(); actions_shutdown(reconfigure); - modkeys_shutdown(reconfigure); } while (reconfigure); } |