X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=b6e7770f61a7d70a46a957dff1c4ae6a5064cc79;hb=b99f9e6abd88d02cba0c631cd688c00e1c9905cd;hp=d05b9ab975cca2278bd1649ef95d9d9df7c99b5c;hpb=22bf54526c96bd108d8b4fa8a7fedd23b6495226;p=chaz%2Fopenbox

diff --git a/openbox/config.c b/openbox/config.c
index d05b9ab9..b6e7770f 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -27,6 +27,9 @@
 gboolean config_focus_new;
 gboolean config_focus_follow;
 guint    config_focus_delay;
+guint    config_focus_raise;
+
+ObPlacePolicy config_place_policy;
 
 char *config_theme;
 
@@ -45,6 +48,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;
@@ -197,6 +202,20 @@ 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_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
+                            void *d)
+{
+    xmlNodePtr n;
+
+    node = node->children;
+    
+    if ((n = parse_find_node("policy", node)))
+        if (parse_contains("UnderMouse", doc, n))
+            config_place_policy = OB_PLACE_POLICY_MOUSE;
 }
 
 static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -303,11 +322,11 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
     }
     if ((n = parse_find_node("stacking", node))) {
         if (parse_contains("top", doc, n))
-            config_dock_layer = OB_STACKING_LAYER_TOP;
+            config_dock_layer = OB_STACKING_LAYER_DOCK_ABOVE;
         else if (parse_contains("normal", doc, n))
             config_dock_layer = OB_STACKING_LAYER_NORMAL;
         else if (parse_contains("bottom", doc, n))
-            config_dock_layer = OB_STACKING_LAYER_BELOW;
+            config_dock_layer = OB_STACKING_LAYER_DOCK_BELOW;
     }
     if ((n = parse_find_node("direction", node))) {
         if (parse_contains("horizontal", doc, n))
@@ -319,6 +338,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 +389,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 +412,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,9 +485,14 @@ 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);
 
+    config_place_policy = OB_PLACE_POLICY_SMART;
+
+    parse_register(i, "placement", parse_placement, NULL);
+
     config_theme = NULL;
 
     config_title_layout = g_strdup("NLIMC");
@@ -495,7 +508,7 @@ void config_startup(ObParseInst *i)
 
     parse_register(i, "resize", parse_resize, NULL);
 
-    config_dock_layer = OB_STACKING_LAYER_TOP;
+    config_dock_layer = OB_STACKING_LAYER_DOCK_ABOVE;
     config_dock_pos = OB_DIRECTION_NORTHEAST;
     config_dock_floating = FALSE;
     config_dock_x = 0;
@@ -503,6 +516,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);