fixed bug that lost focus of any window when the current window was unmapped.

moved key strokes into a structure in actions.c along with all key stroke functi
ons. added ability to ignore badwindow errors. fixed up unmap_notify function. w
hen waiting for a keystroke after the prefix has been hit, pressing a modifier d
oesn't count as a 'keystroke' and doesn't abort the current key combination bein
g keyed

1 files changed, 3 insertions, 13 deletions

diff --git a/src/conf.h b/src/conf.h
index 8efee2e..395945c 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -17,22 +17,12 @@
  * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307 USA */
 
+#include "data.h"
+#include "actions.h"
+
 #define KEY_PREFIX      't'
 #define MODIFIER_PREFIX ControlMask
 
-#define KEY_XTERM       'c'
-#define KEY_EMACS       'e'
-#define KEY_PREVWINDOW  'p'
-#define KEY_NEXTWINDOW  'n'	
-#define KEY_LASTWINDOW  't'	/* key to toggle between the current window and the last visitted one */
-#define KEY_TOGGLEBAR   'w'	/* key to toggle the display of the program bar */
-#define KEY_DELETE      'k'	/* delete a window SHIFT+key will Destroy the window */
-#define KEY_WINBYNAME   '\''	/* key to jump to a window by name */
-#define KEY_RENAME      'a'	/* key to rename a window. */
-
-#define TERM_PROG       "xterm"	/* command to boot an x term */
-#define EMACS_PROG      "emacs"	/* command to boot emacs */
-
 #define BAR_FG_COLOR    "Gray60"
 #define BAR_BG_COLOR    "Lightgreen"
 #define BAR_BOLD_COLOR  "Black" /* To indicate the current window */