remove trailing whitespace

[chaz/openbox] / openbox / actions / focus.c

diff --git a/openbox/actions/focus.c b/openbox/actions/focus.c
index 9be6741cd38bf9810ab5472267f0633165e6030d..ea7a6a2c83bf59efa8bc011ea43282e927601872 100644 (file)
--- a/openbox/actions/focus.c
+++ b/openbox/actions/focus.c
@@ -45,16 +45,21 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     Options *o = options;
 
     if (data->client) {
+/*
+        ob_debug("button %d focusable %d context %d %d %d\n",
+                 data->button, client_mouse_focusable(data->client),
+                 data->context,
+                 OB_FRAME_CONTEXT_CLIENT, OB_FRAME_CONTEXT_FRAME);
+*/
         if (data->button == 0 || client_mouse_focusable(data->client) ||
-            data->context != OB_FRAME_CONTEXT_CLIENT ||
-            data->context != OB_FRAME_CONTEXT_FRAME)
+            (data->context != OB_FRAME_CONTEXT_CLIENT &&
+             data->context != OB_FRAME_CONTEXT_FRAME))
         {
             client_activate(data->client, o->here, FALSE, FALSE, TRUE);
         }
-    } else {
-        /* focus action on something other than a client, make keybindings
-           work for this openbox instance, but don't focus any specific client
-        */
+    } else if (data->context == OB_FRAME_CONTEXT_DESKTOP) {
+        /* focus action on the root window. make keybindings work for this
+           openbox instance, but don't focus any specific client */
         focus_nothing();
     }