removing focusLast again..

[chaz/openbox] / openbox / config.c

diff --git a/openbox/config.c b/openbox/config.c
index d05b9ab975cca2278bd1649ef95d9d9df7c99b5c..aebf433fbb00516fb505c2a7ca6f17a683891ebf 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -27,6 +27,7 @@
 gboolean config_focus_new;
 gboolean config_focus_follow;
 guint    config_focus_delay;
+guint    config_focus_raise;
 
 char *config_theme;
 
@@ -45,6 +46,8 @@ gint            config_dock_y;
 ObOrientation   config_dock_orient;
 gboolean        config_dock_hide;
 guint           config_dock_hide_delay;
+guint           config_dock_app_move_button;
+guint           config_dock_app_move_modifiers;
 
 guint config_keyboard_reset_keycode;
 guint config_keyboard_reset_state;
@@ -52,6 +55,9 @@ guint config_keyboard_reset_state;
 gint config_mouse_threshold;
 gint config_mouse_dclicktime;
 
+gboolean config_dialog_focus;
+gboolean config_dialog_desktop;
+
 GSList *config_menu_files;
 
 gint config_resist_win;
@@ -197,6 +203,8 @@ static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         config_focus_follow = parse_bool(doc, n);
     if ((n = parse_find_node("focusDelay", node)))
         config_focus_delay = parse_int(doc, n) * 1000;
+    if ((n = parse_find_node("raiseOnFocus", node)))
+        config_focus_raise = parse_bool(doc, n);
 }
 
 static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -319,6 +327,17 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
         config_dock_hide = parse_bool(doc, n);
     if ((n = parse_find_node("hideDelay", node)))
         config_dock_hide_delay = parse_int(doc, n) * 1000;
+    if ((n = parse_find_node("moveButton", node))) {
+        gchar *str = parse_string(doc, n);
+        guint b, s;
+        if (translate_button(str, &s, &b)) {
+            config_dock_app_move_button = b;
+            config_dock_app_move_modifiers = s;
+        } else {
+            g_warning("invalid button '%s'", str);
+        }
+        g_free(str);
+    }
 }
 
 static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
@@ -359,21 +378,7 @@ static void bind_default_keyboard()
     ObDefKeyBind binds[] = {
         { "A-Tab", "NextWindow" },
         { "S-A-Tab", "PreviousWindow" },
-        { "C-A-Right", "DesktopRight" },
-        { "C-A-Left", "DesktopLeft" },
-        { "C-A-Up", "DesktopUp" },
-        { "C-A-Down", "DesktopDown" },
-        { "S-A-Right", "SendToDesktopRight" },
-        { "S-A-Left", "SendToDesktopLeft" },
-        { "S-A-Up", "SendToDesktopUp" },
-        { "S-A-Down", "SendToDesktopDown" },
-        { "A-F10", "MaximizeFull" },
-        { "A-F5", "UnmaximizeFull" },
-        { "A-F12", "ToggleShade" },
         { "A-F4", "Close" },
-        { "A-F7", "Move" },
-        { "A-F8", "Resize" },
-        { "A-F9", "Iconify" },
         { NULL, NULL }
     };
 
@@ -396,14 +401,6 @@ static void bind_default_mouse()
 {
     ObDefMouseBind *it;
     ObDefMouseBind binds[] = {
-        { "Up", "Desktop", OB_MOUSE_ACTION_PRESS, "DesktopNext" },
-        { "Down", "Desktop", OB_MOUSE_ACTION_PRESS, "DesktopPrevious" },
-        { "A-Up", "Desktop", OB_MOUSE_ACTION_PRESS, "DesktopNext" },
-        { "A-Down", "Desktop", OB_MOUSE_ACTION_PRESS, "DesktopPrevious" },
-        { "A-Up", "Frame", OB_MOUSE_ACTION_PRESS, "DesktopNext" },
-        { "A-Down", "Frame", OB_MOUSE_ACTION_PRESS, "DesktopPrevious" },
-        { "A-Up", "MoveResize", OB_MOUSE_ACTION_PRESS, "DesktopNext" },
-        { "Down", "MoveResize", OB_MOUSE_ACTION_PRESS, "DesktopPrevious" },
         { "Left", "Client", OB_MOUSE_ACTION_PRESS, "Focus" },
         { "Middle", "Client", OB_MOUSE_ACTION_PRESS, "Focus" },
         { "Right", "Client", OB_MOUSE_ACTION_PRESS, "Focus" },
@@ -477,6 +474,7 @@ void config_startup(ObParseInst *i)
     config_focus_new = TRUE;
     config_focus_follow = FALSE;
     config_focus_delay = 0;
+    config_focus_raise = FALSE;
 
     parse_register(i, "focus", parse_focus, NULL);
 
@@ -503,6 +501,8 @@ void config_startup(ObParseInst *i)
     config_dock_orient = OB_ORIENTATION_VERT;
     config_dock_hide = FALSE;
     config_dock_hide_delay = 300;
+    config_dock_app_move_button = 2; /* middle */
+    config_dock_app_move_modifiers = 0;
 
     parse_register(i, "dock", parse_dock, NULL);