turn off all elements, would miss them randomly if titlebar was disabled before

[chaz/openbox] / plugins / mouse / mouse.c

diff --git a/plugins/mouse/mouse.c b/plugins/mouse/mouse.c
index cd2320a1c82d778ef06630a3a4787347f8acbdee..7d60869f971e0ad24cf299330141db174b1429d4 100644 (file)
--- a/plugins/mouse/mouse.c
+++ b/plugins/mouse/mouse.c
@@ -9,6 +9,10 @@
 #include "mouse.h"
 #include <glib.h>
 
+void plugin_setup_config()
+{
+}
+
 static int drag_threshold = 3;
 
 /* GData of GSList*s of PointerBinding*s. */
@@ -368,10 +372,14 @@ static void binddef()
     a = action_new(action_resize);
     mbind("A-3", "frame", MouseAction_Motion, a);
 
-    a = action_new(action_focusraise);
+    a = action_new(action_focus);
     mbind("1", "titlebar", MouseAction_Press, a);
-    a = action_new(action_focusraise);
+    a = action_new(action_focus);
     mbind("1", "handle", MouseAction_Press, a);
+    a = action_new(action_raise);
+    mbind("1", "titlebar", MouseAction_Click, a);
+    a = action_new(action_raise);
+    mbind("1", "handle", MouseAction_Click, a);
     a = action_new(action_lower);
     mbind("2", "titlebar", MouseAction_Press, a);
     a = action_new(action_lower);
@@ -381,7 +389,7 @@ static void binddef()
     a = action_new(action_lower);
     mbind("A-3", "frame", MouseAction_Click, a);
 
-    a = action_new(action_focusraise);
+    a = action_new(action_focus);
     mbind("1", "client", MouseAction_Press, a);
 
     a = action_new(action_toggle_shade);
@@ -403,6 +411,8 @@ static void binddef()
     mbind("1", "icon", MouseAction_DClick, a);
     a = action_new(action_close);
     mbind("1", "close", MouseAction_Click, a);
+    a = action_new(action_kill);
+    mbind("2", "close", MouseAction_Click, a);
     a = action_new(action_toggle_omnipresent);
     mbind("1", "alldesktops", MouseAction_Click, a);