add padding in the menu title too

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index c30d0e613ffaff3d03c348f975aaa34856a785ac..a15e1b165b6e5a8b9190c0fba50fca768ea3483a 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -9,7 +9,6 @@
 #include "screen.h"
 #include "group.h"
 #include "prop.h"
-#include "dispatch.h"
 #include "focus.h"
 #include "stacking.h"
 #include "popup.h"
@@ -81,7 +80,7 @@ void focus_set_client(ObClient *client)
 
     /* in the middle of cycling..? kill it. */
     if (focus_cycle_target)
-        focus_cycle(TRUE, TRUE, TRUE, TRUE);
+        focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE);
 
     old = focus_client;
     focus_client = client;
@@ -96,11 +95,6 @@ void focus_set_client(ObClient *client)
         PROP_SET32(RootWindow(ob_display, ob_screen),
                    net_active_window, window, active);
     }
-
-    if (focus_client != NULL)
-        dispatch_client(Event_Client_Focus, focus_client, 0, 0);
-    if (old != NULL)
-        dispatch_client(Event_Client_Unfocus, old, 0, 0);
 }
 
 static gboolean focus_under_pointer()
@@ -190,6 +184,7 @@ void focus_fallback(ObFocusFallbackType type)
             }
         }
 
+#if 0
         /* try for group relations */
         if (old->group) {
             GSList *sit;
@@ -204,6 +199,7 @@ void focus_fallback(ObFocusFallbackType type)
                                 return;
                             }
         }
+#endif
     }
 
     for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
@@ -261,8 +257,8 @@ static void popup_cycle(ObClient *c, gboolean show)
     }
 }
 
-ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done,
-                      gboolean cancel)
+ObClient *focus_cycle(gboolean forward, gboolean linear,
+                      gboolean dialog, gboolean done, gboolean cancel)
 {
     static ObClient *first = NULL;
     static ObClient *t = NULL;
@@ -317,7 +313,7 @@ ObClient *focus_cycle(gboolean forward, gboolean linear, gboolean done,
                 focus_cycle_target = ft;
                 frame_adjust_focus(focus_cycle_target->frame, TRUE);
             }
-            popup_cycle(ft, config_focus_popup);
+            popup_cycle(ft, dialog);
             return ft;
         }
     } while (it != start);