This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via fec8347d275d2357306b2ce3f1a9f5e8f5df7afb (commit)
from 51b342fee54569204ce5f039e9ef34615e703014 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/fec8347d275d2357306b2ce3f1a9f5e8f5df7afb
commit fec8347d275d2357306b2ce3f1a9f5e8f5df7afb
Author: David Maciejak <[email protected]>
Date: Thu Aug 28 11:07:05 2014 +0700
wmaker: make disable mouse actions a live set
This patch is allowing to enable or disable the 'disable mouse actions'
from the WPrefs app without requiring to restart the session.
diff --git a/src/defaults.c b/src/defaults.c
index 2b938a31..df7e9191 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -324,8 +324,6 @@ WDefaultEntry staticOptionList[] = {
&wPreferences.icon_size, getInt, NULL, NULL, NULL},
{"ModifierKey", "Mod1", NULL,
&wPreferences.modifier_mask, getModMask, NULL, NULL, NULL},
- {"DisableWSMouseActions", "NO", NULL,
- &wPreferences.disable_root_mouse, getBool, NULL, NULL, NULL},
{"FocusMode", "manual", seFocusModes, /* have
a problem when switching from */
&wPreferences.focus_mode, getEnum, NULL, NULL, NULL}, /*
manual to sloppy without restart */
{"NewStyle", "new", seTitlebarModes,
@@ -353,6 +351,8 @@ WDefaultEntry optionList[] = {
&wPreferences.icon_yard, getEnum, setIconPosition, NULL, NULL},
{"IconificationStyle", "Zoom", seIconificationStyles,
&wPreferences.iconification_style, getEnum, NULL, NULL, NULL},
+ {"DisableWSMouseActions", "NO", NULL,
+ &wPreferences.disable_root_mouse, getBool, NULL, NULL, NULL},
{"MouseLeftButtonAction", "SelectWindows", seMouseButtonActions,
&wPreferences.mouse_button1, getEnum, NULL, NULL, NULL},
{"MouseMiddleButtonAction", "OpenWindowListMenu", seMouseButtonActions,
diff --git a/src/event.c b/src/event.c
index 9e41dc90..0ec1b770 100644
--- a/src/event.c
+++ b/src/event.c
@@ -745,7 +745,7 @@ static void handleButtonPress(XEvent * event)
wBalloonHide(scr);
#endif
- if (event->xbutton.window == scr->root_win) {
+ if (!wPreferences.disable_root_mouse && event->xbutton.window ==
scr->root_win) {
if (event->xbutton.button == Button1 &&
wPreferences.mouse_button1 != WA_NONE) {
executeButtonAction(scr, event,
wPreferences.mouse_button1);
} else if (event->xbutton.button == Button2 &&
wPreferences.mouse_button2 != WA_NONE) {
diff --git a/src/screen.c b/src/screen.c
index 250f9962..da578c25 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -524,11 +524,6 @@ WScreen *wScreenInit(int screen_number)
oldHandler = XSetErrorHandler(alreadyRunningError);
event_mask = EVENT_MASK;
-
- if (wPreferences.disable_root_mouse) {
- event_mask &= ~(ButtonPressMask | ButtonReleaseMask);
- }
-
XSelectInput(dpy, scr->root_win, event_mask);
#ifdef KEEP_XKB_LOCK_STATUS
-----------------------------------------------------------------------
Summary of changes:
src/defaults.c | 4 ++--
src/event.c | 2 +-
src/screen.c | 5 -----
3 files changed, 3 insertions(+), 8 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
