From 513a678413180525d1092d1254e9a0984218073d Mon Sep 17 00:00:00 2001
From: sabetts <sabetts>
Date: Wed, 28 Feb 2001 06:39:33 +0000
Subject: * 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.
---
 src/main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index 97a61f8..276df1d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -63,6 +63,8 @@ char **myargv;
 
 XGCValues gv;
 
+struct rp_key prefix_key;
+
 /* Command line options */
 static struct option ratpoison_longopts[] = { {"help", no_argument, 0, 'h'},
 					      {"version", no_argument, 0, 'v'},
@@ -325,6 +327,7 @@ main (int argc, char *argv[])
 
   init_numbers ();
   init_window_list ();
+  initialize_default_keybindings ();
 
   font = XLoadQueryFont (dpy, FONT);
   if (font == NULL)
@@ -348,8 +351,6 @@ main (int argc, char *argv[])
       init_screen (&screens[i], i);
     }
 
-  initialize_default_keybindings ();
-
   read_startup_files ();
 
   /* Set an initial window as active. */
-- 
cgit v1.2.3