* manage.h (ungrab_prefix_key): new prototype

(grab_prefix_key): likewise

* manage.c (ungrab_prefix_key): new function

* main.c (main): calls initialize_default_keybindings after
init_window_list.

* data.h (struct rp_action): key is of type KeySym. state is
unsigned int.

* conf.h (KEY_PREFIX): set to XK_t

* actions.h (cmd_escape): new prototype

* actions.c (cmd_escape): new function

* data.h (struct key): move from actions.h
(struct rp_key): rename from struct key. dependant code updated.
(prefix_key): new global variable. code dependant on KEY_PREFIX
and MODIFIER_PREFIX updated to use this.

* actions.c: "maximize" user command calls cmd_maximize
(initialize_default_keybindings): initializes prefix_key.
Added "escape" command.

* manage.c (force_maximize): moved from actions.c
(maximize): likewise
(maximize_normal): likewise
(maximize_transient): likewise

* actions.c (cmd_maximize): New function

* main.c (handler): Prepends error message with "ERROR: ".
Displays error in message bar. Returns 0.

* events.c (destroy_window): sets rp_current_window to NULL when
there are no more mapped windows.
(destroy_window): calls set_current_window and find_window_other
directly instead of cmd_other.

1 files changed, 11 insertions, 2 deletions

diff --git a/src/data.h b/src/data.h
index e79ab41..95822a7 100644
--- a/src/data.h
+++ b/src/data.h
@@ -78,12 +78,21 @@ struct screen_info
 
 struct rp_action
 {
-  int key;
-  int state;
+  KeySym key;
+  unsigned int state;
   void *data;			/* misc data to be passed to the function */
 /*   void (*func)(void *); */
 };
 
+struct rp_key
+{
+  KeySym sym;
+  unsigned int state;
+};
+
+/* The prefix key also known as the command character under screen. */
+extern struct rp_key prefix_key;
+
 /* These _sentinel pointers point to a special rp_window whose next
    pointer points to the head of the list and whose prev pointer
    points to the tail. This is done to simplify removing an element