aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-06-28 22:25:35 (GMT)
committermarkt <markt>2007-06-28 22:25:35 (GMT)
commitbbdc61c87bdb64af92c958065c3d4f204ac2bee3 (patch)
treeaf18708ab4e6c96e8f6ec972566aec9c925a40ef
parent9522db45a8184ec763f2ed7b926dd222df1d6947 (diff)
downloadfluxbox-bbdc61c87bdb64af92c958065c3d4f204ac2bee3.zip
fluxbox-bbdc61c87bdb64af92c958065c3d4f204ac2bee3.tar.bz2
strip off extra bits set by Xorg in event state
-rw-r--r--ChangeLog2
-rw-r--r--src/FbTk/KeyUtil.hh5
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b0cfa16..9e031ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.0: 2Changes for 1.0.0:
3*07/06/28: 3*07/06/28:
4 * Strip off additional bits in event state set by Xorg, bug #1736252 (Mark)
5 FbTk/KeyUtil.hh
4 * Added some missing Open Office entries and window managers, plus some other 6 * Added some missing Open Office entries and window managers, plus some other
5 minor changes in fluxbox-generate_menu 7 minor changes in fluxbox-generate_menu
6 fluxbox-generate_menu.in 8 fluxbox-generate_menu.in
diff --git a/src/FbTk/KeyUtil.hh b/src/FbTk/KeyUtil.hh
index e80918a..9311561 100644
--- a/src/FbTk/KeyUtil.hh
+++ b/src/FbTk/KeyUtil.hh
@@ -69,8 +69,9 @@ public:
69 @return the cleaned state number 69 @return the cleaned state number
70 */ 70 */
71 unsigned int cleanMods(unsigned int mods) { 71 unsigned int cleanMods(unsigned int mods) {
72 //remove numlock, capslock and scrolllock 72 // remove numlock, capslock, and scrolllock
73 return mods & ~(capslock() | numlock() | scrolllock()); 73 // and anything beyond Button5Mask
74 return mods & ~(capslock() | numlock() | scrolllock()) & ((1<<13) - 1);
74 } 75 }
75 76
76 /** 77 /**