X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=e751f32b6baa267e693899914e9354a8f24f41d8;hb=cea19c78c1d3bccb356fce21cda4a2fc85afce1b;hp=122559068cadac4b04f4f85a0c59f969513f79db;hpb=71badb0790c8595a0ab6dedfbf8027c698369210;p=chaz%2Fopenbox

diff --git a/openbox/config.c b/openbox/config.c
index 12255906..e751f32b 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -5,18 +5,24 @@ gboolean config_focus_new;
 gboolean config_focus_follow;
 gboolean config_focus_last;
 gboolean config_focus_last_on_desktop;
+gboolean config_focus_popup;
 
-char *config_engine_name;
-char *config_engine_theme;
-char *config_engine_layout;
-char *config_engine_font;
-gboolean config_engine_shadow;
-int config_engine_shadow_offset;
-int config_engine_shadow_tint;
+char *config_theme;
 
-int config_desktops_num;
+int     config_desktops_num;
 GSList *config_desktops_names;
 
+gboolean config_opaque_move;
+gboolean config_opaque_resize;
+
+StackLayer   config_dock_layer;
+DockPosition config_dock_pos;
+int          config_dock_x;
+int          config_dock_y;
+gboolean     config_dock_horz;
+gboolean     config_dock_hide;
+guint        config_dock_hide_timeout;
+
 static void parse_focus(char *name, ParseToken *value)
 {
     if (!g_ascii_strcasecmp(name, "focusnew")) {
@@ -43,62 +49,25 @@ static void parse_focus(char *name, ParseToken *value)
         else {
             config_focus_last_on_desktop = value->data.bool;
         }
+    } else if (!g_ascii_strcasecmp(name, "cyclingdialog")) {
+        if (value->type != TOKEN_BOOL)
+            yyerror("invalid value");
+        else {
+            config_focus_popup = value->data.bool;
+        }
     } else
         yyerror("invalid option");
     parse_free_token(value);
 }
 
-static void parse_engine(char *name, ParseToken *value)
+static void parse_theme(char *name, ParseToken *value)
 {
-    if (!g_ascii_strcasecmp(name, "engine")) {
+    if (!g_ascii_strcasecmp(name, "theme")) {
         if (value->type != TOKEN_STRING)
             yyerror("invalid value");
         else {
-            g_free(config_engine_name);
-            config_engine_name = g_strdup(value->data.string);
-        }
-    } else if (!g_ascii_strcasecmp(name, "theme")) {
-        if (value->type != TOKEN_STRING)
-            yyerror("invalid value");
-        else {
-            g_free(config_engine_theme);
-            config_engine_theme = g_strdup(value->data.string);
-        }
-    } else if (!g_ascii_strcasecmp(name, "titlebarlayout")) {
-        if (value->type != TOKEN_STRING)
-            yyerror("invalid value");
-        else {
-            g_free(config_engine_layout);
-            config_engine_layout = g_strdup(value->data.string);
-        }
-    } else if (!g_ascii_strcasecmp(name, "font.title")) {
-        if (value->type != TOKEN_STRING)
-            yyerror("invalid value");
-        else {
-            g_free(config_engine_font);
-            config_engine_font = g_strdup(value->data.string);
-        }
-    } else if (!g_ascii_strcasecmp(name, "font.title.shadow")) {
-        if (value->type != TOKEN_BOOL)
-            yyerror("invalid value");
-        else {
-            config_engine_shadow = value->data.bool;
-        }
-    } else if (!g_ascii_strcasecmp(name, "font.title.shadow.offset")) {
-        if (value->type != TOKEN_INTEGER)
-            yyerror("invalid value");
-        else {
-            config_engine_shadow_offset = value->data.integer;
-        }
-    } else if (!g_ascii_strcasecmp(name, "font.title.shadow.tint")) {
-        if (value->type != TOKEN_INTEGER)
-            yyerror("invalid value");
-        else {
-            config_engine_shadow_tint = value->data.integer;
-            if (config_engine_shadow_tint < -100)
-                config_engine_shadow_tint = -100;
-            else if (config_engine_shadow_tint > 100)
-                config_engine_shadow_tint = 100;
+            g_free(config_theme);
+            config_theme = g_strdup(value->data.string);
         }
     } else
         yyerror("invalid option");
@@ -138,38 +107,140 @@ static void parse_desktops(char *name, ParseToken *value)
     parse_free_token(value);
 }
 
+static void parse_moveresize(char *name, ParseToken *value)
+{
+    if (!g_ascii_strcasecmp(name, "opaque_move")) {
+        if (value->type != TOKEN_BOOL)
+            yyerror("invalid value");
+        else {
+            config_opaque_move = value->data.integer;
+        }
+    } else if (!g_ascii_strcasecmp(name, "opaque_resize")) {
+        if (value->type != TOKEN_BOOL)
+            yyerror("invalid value");
+        else {
+            config_opaque_resize = value->data.integer;
+        }
+    } else
+        yyerror("invalid option");
+    parse_free_token(value);
+}
+
+static void parse_dock(char *name, ParseToken *value)
+{
+    if (!g_ascii_strcasecmp(name, "stacking")) {
+        if (value->type != TOKEN_STRING)
+            yyerror("invalid value");
+        else {
+            if (!g_ascii_strcasecmp(value->data.string, "bottom"))
+                config_dock_layer = Layer_Below;
+            else if (!g_ascii_strcasecmp(value->data.string, "normal"))
+                config_dock_layer = Layer_Normal;
+            else if (!g_ascii_strcasecmp(value->data.string, "top"))
+                config_dock_layer = Layer_Top;
+            else
+                yyerror("invalid layer");
+        }
+    } else if (!g_ascii_strcasecmp(name, "position")) {
+        if (value->type != TOKEN_STRING)
+            yyerror("invalid value");
+        else {
+            if (!g_ascii_strcasecmp(value->data.string, "topleft"))
+                config_dock_pos = DockPos_TopLeft;
+            else if (!g_ascii_strcasecmp(value->data.string, "top"))
+                config_dock_pos = DockPos_Top;
+            else if (!g_ascii_strcasecmp(value->data.string, "topright"))
+                config_dock_pos = DockPos_TopRight;
+            else if (!g_ascii_strcasecmp(value->data.string, "right"))
+                config_dock_pos = DockPos_Right;
+            else if (!g_ascii_strcasecmp(value->data.string, "bottomright"))
+                config_dock_pos = DockPos_BottomRight;
+            else if (!g_ascii_strcasecmp(value->data.string, "bottom"))
+                config_dock_pos = DockPos_Bottom;
+            else if (!g_ascii_strcasecmp(value->data.string, "bottomleft"))
+                config_dock_pos = DockPos_BottomLeft;
+            else if (!g_ascii_strcasecmp(value->data.string, "left"))
+                config_dock_pos = DockPos_Left;
+            else if (!g_ascii_strcasecmp(value->data.string, "floating"))
+                config_dock_pos = DockPos_Floating;
+            else
+                yyerror("invalid position");
+        }
+    } else if (!g_ascii_strcasecmp(name, "floatingx")) {
+        if (value->type != TOKEN_INTEGER)
+            yyerror("invalid value");
+        else {
+            config_dock_x = value->data.integer;
+        }
+    } else if (!g_ascii_strcasecmp(name, "floatingy")) {
+        if (value->type != TOKEN_INTEGER)
+            yyerror("invalid value");
+        else {
+            config_dock_y = value->data.integer;
+        }
+    } else if (!g_ascii_strcasecmp(name, "horizontal")) {
+        if (value->type != TOKEN_BOOL)
+            yyerror("invalid value");
+        else {
+            config_dock_horz = value->data.bool;
+        }
+    } else if (!g_ascii_strcasecmp(name, "autohide")) {
+        if (value->type != TOKEN_BOOL)
+            yyerror("invalid value");
+        else {
+            config_dock_hide = value->data.bool;
+        }
+    } else if (!g_ascii_strcasecmp(name, "hidetimeout")) {
+        if (value->type != TOKEN_INTEGER)
+            yyerror("invalid value");
+        else {
+            config_dock_hide_timeout = value->data.integer;
+        }
+    } else
+        yyerror("invalid option");
+    parse_free_token(value);
+}
+
 void config_startup()
 {
     config_focus_new = TRUE;
     config_focus_follow = FALSE;
     config_focus_last = TRUE;
     config_focus_last_on_desktop = TRUE;
+    config_focus_popup = TRUE;
 
     parse_reg_section("focus", NULL, parse_focus);
 
-    config_engine_name = g_strdup(DEFAULT_ENGINE);
-    config_engine_theme = NULL;
-    config_engine_layout = g_strdup("NLIMC");
-    config_engine_font = g_strdup("Sans-7");
-    config_engine_shadow = FALSE;
-    config_engine_shadow_offset = 1;
-    config_engine_shadow_tint = 25;
+    config_theme = NULL;
 
-    parse_reg_section("engine", NULL, parse_engine);
+    parse_reg_section("theme", NULL, parse_theme);
 
     config_desktops_num = 4;
     config_desktops_names = NULL;
 
     parse_reg_section("desktops", NULL, parse_desktops);
+
+    config_opaque_move = TRUE;
+    config_opaque_resize = TRUE;
+
+    parse_reg_section("moveresize", NULL, parse_moveresize);
+
+    config_dock_layer = Layer_Top;
+    config_dock_pos = DockPos_TopRight;
+    config_dock_x = 0;
+    config_dock_y = 0;
+    config_dock_horz = FALSE;
+    config_dock_hide = FALSE;
+    config_dock_hide_timeout = 3000;
+
+    parse_reg_section("dock", NULL, parse_dock);
 }
 
 void config_shutdown()
 {
     GSList *it;
 
-    g_free(config_engine_name);
-    g_free(config_engine_layout);
-    g_free(config_engine_font);
+    g_free(config_theme);
 
     for (it = config_desktops_names; it; it = it->next)
         g_free(it->data);