don't focus docks when you click on them

diff --git a/openbox/actions/focus.c b/openbox/actions/focus.c
index 254850ecc728e67e8c0651bd9a6ba944de1e1529..afa5f8ff14d9ac4bf4ea361ee75becc5cdb58148 100644 (file)
--- a/openbox/actions/focus.c
+++ b/openbox/actions/focus.c
@@ -45,9 +45,13 @@ 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);
         }