Fix match function bugs
There were two problems with match denfinition. 1) There was a forward declaration in the form: static inline bool match(uint, uint); but later the function was defined as: inline bool match(uint mask, uint state) { This causes that there were two different functions in the code, one local and inline, and other inline but extern. All was working without problems due to we were using -Os, and the compiler was using the extern definition and it was no expanding the static declaration. If you removed the -Os flag, then you got linker errors due it was no able to find the static definition of the static declaration. 2) The mask checking was incorrect because we were doing the test: (state & mask) != state and this test only was saying that at least all the enabled bits of state were enabled also in mask, but no all the possible bits in mask. This was the origin of the bug reported by Xavier Cartron, where he said it was possible activated some shortcuts with some of the modifiers defined in the config.h file.dev
parent
90c6f055b6
commit
6e1c7c8afc
10
st.c
10
st.c
|
@ -3355,17 +3355,17 @@ focus(XEvent *ev) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
inline bool
|
static inline bool
|
||||||
match(uint mask, uint state) {
|
match(uint mask, uint state) {
|
||||||
state &= ~(ignoremod);
|
state &= ~ignoremod;
|
||||||
|
|
||||||
if(mask == XK_NO_MOD && state)
|
if(mask == XK_NO_MOD && state)
|
||||||
return false;
|
return false;
|
||||||
if(mask != XK_ANY_MOD && mask != XK_NO_MOD && !state)
|
if(mask != XK_ANY_MOD && mask != XK_NO_MOD && !state)
|
||||||
return false;
|
return false;
|
||||||
if((state & mask) != state)
|
if(mask == XK_ANY_MOD)
|
||||||
return false;
|
return true;
|
||||||
return true;
|
return state == mask;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Loading…
Reference in New Issue