[svn-upgrade] Integrating new upstream version, ion3 (20070318)

[ion3.git] / ioncore / conf.c

diff --git a/ioncore/conf.c b/ioncore/conf.c
index 62c91f117679ace71fd879314ecc7816058a7f36..b8545e2bf283bd77460aba5d6817b357eb049128 100644 (file)
--- a/ioncore/conf.c
+++ b/ioncore/conf.c
@@ -76,6 +76,9 @@ static ExtlFn get_layout_fn;
  *  \var{float_placement_method} & (string) How to place floating frames.
  *                          One of ''udlr'' (up-down, then left-right), 
  *                          ''lrud'' (left-right, then up-down) or ''random''. \\
+ *  \var{mousefocus} & String: ''disable'' or ''sloppy''. \\
+ *  \var{unsqueeze} & (boolean) Auto-unsqueeze transients/menus/queries/etc. \\
+ *  \var{autoraise} & (boolean) Autoraise regions in groups on goto. \\
  * \end{tabularx}
  * 
  * When a keyboard resize function is called, and at most \var{kbresize_t_max} 
@@ -99,6 +102,8 @@ void ioncore_set(ExtlTab tab)
     extl_table_gets_b(tab, "switchto", &(ioncore_g.switchto_new));
     extl_table_gets_b(tab, "screen_notify", &(ioncore_g.screen_notify));
     extl_table_gets_b(tab, "framed_transients", &(ioncore_g.framed_transients));
+    extl_table_gets_b(tab, "unsqueeze", &(ioncore_g.unsqueeze_enabled));
+    extl_table_gets_b(tab, "autoraise", &(ioncore_g.autoraise));
     
     if(extl_table_gets_s(tab, "frame_default_index", &tmp)){
         ioncore_g.frame_default_index=stringintmap_value(frame_idxs, 
@@ -106,6 +111,13 @@ void ioncore_set(ExtlTab tab)
                                                          ioncore_g.frame_default_index);
         free(tmp);
     }
+
+    if(extl_table_gets_s(tab, "mousefocus", &tmp)){
+        if(strcmp(tmp, "disabled")==0)
+            ioncore_g.no_mousefocus=TRUE;
+        else if(strcmp(tmp, "sloppy")==0)
+            ioncore_g.no_mousefocus=FALSE;
+    }
     
     if(extl_table_gets_i(tab, "dblclick_delay", &dd))
         ioncore_g.dblclick_delay=maxof(0, dd);
@@ -146,12 +158,20 @@ ExtlTab ioncore_get()
     extl_table_sets_b(tab, "switchto", ioncore_g.switchto_new);
     extl_table_sets_i(tab, "dblclick_delay", ioncore_g.dblclick_delay);
     extl_table_sets_b(tab, "screen_notify", ioncore_g.screen_notify);
+    extl_table_sets_b(tab, "framed_transients", ioncore_g.framed_transients);
+    extl_table_sets_b(tab, "unsqueeze", ioncore_g.unsqueeze_enabled);
+    extl_table_sets_b(tab, "autoraise", ioncore_g.autoraise);
+    
 
     extl_table_sets_s(tab, "frame_default_index", 
                       stringintmap_key(frame_idxs, 
                                        ioncore_g.frame_default_index,
                                        NULL));
     
+    extl_table_sets_s(tab, "mousefocus", (ioncore_g.no_mousefocus
+                                          ? "disabled" 
+                                          : "sloppy"));
+
     ioncore_get_moveres_accel(tab);
     
     ioncore_groupws_get(tab);