summaryrefslogtreecommitdiff
path: root/openbox/keyboard.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-09-03 18:11:39 +0000
committerDana Jansens <danakj@orodu.net>2003-09-03 18:11:39 +0000
commit806a8c411f10c7a2292bfac15d77c8609f56ee71 (patch)
treed56c0f2a4b05b00fef085ea69930603f10ee8f75 /openbox/keyboard.c
parent40902496a01b21b950f3672bf2ae9e100ba9b95c (diff)
add a reconfigure action, also reconfigure on SIGUSR2.
support reconfiguring throughout the entire codebase.
Diffstat (limited to 'openbox/keyboard.c')
-rw-r--r--openbox/keyboard.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index f73fe298..f8109456 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -264,15 +264,25 @@ void keyboard_event(ObClient *client, const XEvent *e)
}
}
-void keyboard_startup()
+void keyboard_startup(gboolean reconfig)
{
grab_keys(TRUE);
}
-void keyboard_shutdown()
+void keyboard_shutdown(gboolean reconfig)
{
+ GSList *it;
+
tree_destroy(keyboard_firstnode);
keyboard_firstnode = NULL;
+
+ for (it = interactive_states; it; it = g_slist_next(it))
+ g_free(it->data);
+ g_slist_free(interactive_states);
+ interactive_states = NULL;
+
+ ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);
grab_keys(FALSE);
+ curpos = NULL;
}