cleanup behavior.c

diff --git a/src/behavior.c b/src/behavior.c
index 5c0fd640bfcf6d0cff27fa027e46f13f17ab1a68..08a0533c127fc5f950f7482d32a10abc05d4c9c6 100644 (file)
--- a/src/behavior.c
+++ b/src/behavior.c
@@ -22,120 +22,84 @@
 
 static gboolean mapping = FALSE;
 
+static void behavior_enable_stuff();
+
 void behavior_setup_tab()
 {
-    GtkWidget *winresist, *edgeresist;
-    GtkWidget *winresist_l, *edgeresist_l;
-    GtkSizeGroup *group1, *group2;
+    GtkWidget *w, *winresist, *edgeresist;
+    GtkSizeGroup *group;
+    gchar *s;
 
     winresist  = get_widget("resist_window");
     edgeresist = get_widget("resist_edge");
-    group1     = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-
-    gtk_size_group_add_widget(group1, winresist);
-    gtk_size_group_add_widget(group1, edgeresist);
-
-    winresist_l  = get_widget("resist_window_label");
-    edgeresist_l = get_widget("resist_edge_label");
-    group2       = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-
-    gtk_size_group_add_widget(group2, winresist_l);
-    gtk_size_group_add_widget(group2, edgeresist_l);
-}
-
-void behavior_setup_focus_mouse(GtkWidget *w)
-{
-    gboolean b;
+    group      = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+    gtk_size_group_add_widget(group, winresist);
+    gtk_size_group_add_widget(group, edgeresist);
 
-    mapping = TRUE;
+    winresist  = get_widget("resist_window_label");
+    edgeresist = get_widget("resist_edge_label");
+    group      = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+    gtk_size_group_add_widget(group, winresist);
+    gtk_size_group_add_widget(group, edgeresist);
 
-    b = tree_get_bool("focus/followMouse", FALSE);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), b);
-
-    {
-        GtkWidget *delay   = get_widget("focus_delay");
-        GtkWidget *delay_l = get_widget("focus_delay_label");
-        GtkWidget *delay_u = get_widget("focus_delay_label_units");
-        GtkWidget *raise   = get_widget("focus_raise");
-        GtkWidget *last    = get_widget("focus_last");
-
-        gtk_widget_set_sensitive(delay, b);
-        gtk_widget_set_sensitive(delay_l, b);
-        gtk_widget_set_sensitive(delay_u, b);
-        gtk_widget_set_sensitive(raise, b);
-        gtk_widget_set_sensitive(last, b);
-    }
-
-    mapping = FALSE;
-}
+    w = get_widget("focus_mouse");
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
+                                 tree_get_bool("focus/followMouse", FALSE));
 
-void behavior_setup_focus_delay(GtkWidget *w)
-{
-    mapping = TRUE;
+    w = get_widget("focus_delay");
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(w),
                               tree_get_int("focus/focusDelay", 0));
-    mapping = FALSE;
-}
 
-void behavior_setup_focus_raise(GtkWidget *w)
-{
-    mapping = TRUE;
+    w = get_widget("focus_raise");
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
                                  tree_get_bool("focus/raiseOnFocus", FALSE));
-    mapping = FALSE;
-}
 
-void behavior_setup_focus_last(GtkWidget *w)
-{
-    mapping = TRUE;
+    w = get_widget("focus_last");
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
                                  tree_get_bool("focus/focusLast", FALSE));
-    mapping = FALSE;
-}
 
-void behavior_setup_focus_new(GtkWidget *w)
-{
-    mapping = TRUE;
+    w = get_widget("focus_new");
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
                                  tree_get_bool("focus/focusNew", TRUE));
-    mapping = FALSE;
-}
 
-void behavior_setup_place_mouse(GtkWidget *w)
-{
-    gchar *s;
-
-    mapping = TRUE;
-    s = tree_get_string("placement/policy", "Smart");
+    w = get_widget("resize_contents");
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-                                 !g_ascii_strcasecmp(s, "UnderMouse"));
-    g_free(s);
-    mapping = FALSE;
-}
+                                 tree_get_bool("resize/drawContents", TRUE));
 
-void behavior_setup_resist_window(GtkWidget *w)
-{
-    mapping = TRUE;
+    w = get_widget("resist_window");
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(w),
                               tree_get_int("resistance/strength", 10));
-    mapping = FALSE;
-}
 
-void behavior_setup_resist_edge(GtkWidget *w)
-{
-    mapping = TRUE;
+    w = get_widget("resist_edge");
     gtk_spin_button_set_value(GTK_SPIN_BUTTON(w),
                               tree_get_int("resistance/screen_edge_strength",
                                            20));
-    mapping = FALSE;
+
+    w = get_widget("place_mouse");
+    s = tree_get_string("placement/policy", "Smart");
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
+                                 !g_ascii_strcasecmp(s, "UnderMouse"));
+    g_free(s);
 }
 
-void behavior_setup_resize_contents(GtkWidget *w)
+static void behavior_enable_stuff()
 {
-    mapping = TRUE;
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-                                 tree_get_bool("resize/drawContents", TRUE));
-    mapping = FALSE;
+    GtkWidget *w;
+    gboolean b;
+
+    w = get_widget("focus_mouse");
+    b = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w));
+
+    w = get_widget("focus_delay");
+    gtk_widget_set_sensitive(w, b);
+    w = get_widget("focus_delay_label");
+    gtk_widget_set_sensitive(w, b);
+    w = get_widget("focus_delay_label_units");
+    gtk_widget_set_sensitive(w, b);
+    w = get_widget("focus_raise");
+    gtk_widget_set_sensitive(w, b);
+    w = get_widget("focus_last");
+    gtk_widget_set_sensitive(w, b);
 }
 
 void on_focus_mouse_toggled(GtkToggleButton *w, gpointer data)

diff --git a/src/main.c b/src/main.c
index 4f96ed27ab7b0d38664948d4e70e86acfa30a826..a3243eb298268f7c662ed54aa35627286abd9b6b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -156,18 +156,7 @@ int main(int argc, char **argv)
 
     theme_setup_tab();
     appearance_setup_tab();
-
     behavior_setup_tab();
-    behavior_setup_focus_mouse(get_widget("focus_mouse"));
-    behavior_setup_focus_raise(get_widget("focus_raise"));
-    behavior_setup_focus_last(get_widget("focus_raise"));
-    behavior_setup_focus_delay(get_widget("focus_delay"));
-    behavior_setup_focus_new(get_widget("focus_new"));
-    behavior_setup_place_mouse(get_widget("place_mouse"));
-    behavior_setup_resist_window(get_widget("resist_window"));
-    behavior_setup_resist_edge(get_widget("resist_edge"));
-    behavior_setup_resize_contents(get_widget("resize_contents"));
-
     desktops_setup_tab();
 
     dock_setup_tab();