nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

unfix *lock modifiers, ignore scroll lock on events

Browse source
This commit is contained in:
markt 2006-07-21 08:36:12 +00:00
parent 9be679dad7
commit a72fc5e002
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
(Format: Year/Month/Day)
Changes for 1.0rc3:
*06/07/21:
* Stop using fixed values for num/caps/scroll lock, and ignore scroll lock
as a modifier (Mark)
FbTk/KeyUtil.cc/hh
*06/07/20:
* Fix _NET_WM_MOVERESIZE, bug #1525404 (Mark)
Ewmh.cc

2
src/FbTk/KeyUtil.cc
View file

@ -62,7 +62,7 @@ KeyUtil &KeyUtil::instance() {
KeyUtil::KeyUtil()
: m_modmap(0)
: m_modmap(0), m_capslock(0), m_numlock(0), m_scrolllock(0)
{
init();
}

8
src/FbTk/KeyUtil.hh
View file

@ -67,7 +67,7 @@ public:
*/
unsigned int cleanMods(unsigned int mods) {
//remove numlock, capslock and scrolllock
return mods & ~(capslock() | numlock() );
return mods & ~(capslock() | numlock() | scrolllock());
}
/**
@ -83,9 +83,9 @@ public:
@return corresponding modifier mask
*/
static unsigned int keycodeToModmask(unsigned int keycode);
int numlock() const { return Mod2Mask; } //m_numlock; }
int capslock() const { return LockMask; } //m_capslock; }
int scrolllock() const { return Mod5Mask; } //m_scrolllock; }
int numlock() const { return m_numlock; }
int capslock() const { return m_capslock; }
int scrolllock() const { return m_scrolllock; }
private:
void loadModmap();