e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Tweak click-raises (raise if lowered after getting focus). 

SVN revision: 17664
This commit is contained in:
Kim Woelders 2005-10-18 19:21:25 +00:00
parent ae4477d0d8
commit a8e94bdae1
3 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ewins.c
View File

@ -1259,6 +1259,8 @@ RaiseEwin(EWin * ewin)
if (lst)
Efree(lst);
FocusEwinSetGrabs(ewin);
if (call_depth == 1)
ModulesSignal(ESIGNAL_EWIN_CHANGE, ewin);
@ -1292,6 +1294,8 @@ LowerEwin(EWin * ewin)
if (lst)
Efree(lst);
FocusEwinSetGrabs(ewin);
if (call_depth == 1)
ModulesSignal(ESIGNAL_EWIN_CHANGE, ewin);

1
src/ewins.h
View File

@ -65,6 +65,7 @@ struct _ewin
char shaded;
unsigned placed:1;
unsigned click_grab_isset:1;
unsigned maximized_horz:1;
unsigned maximized_vert:1;
unsigned fullscreen:1;

44
src/focus.c
View File

@ -199,25 +199,39 @@ FocusGetPrevEwin(void)
void
FocusEwinSetGrabs(EWin * ewin)
{
if ((Conf.focus.mode != MODE_FOCUS_CLICK &&
ewin->state.active && Conf.focus.clickraises &&
ewin != EwinListStackGetTop()) ||
(Conf.focus.mode == MODE_FOCUS_CLICK && !ewin->state.active))
int set = 0;
if (Conf.focus.mode == MODE_FOCUS_CLICK)
{
GrabButtonSet(AnyButton, AnyModifier, _EwinGetContainerWin(ewin),
ButtonPressMask, ECSR_PGRAB, 1);
#if 0
Eprintf("FocusEwinSetGrabs: %#lx grab %s\n", _EwinGetClientXwin(ewin),
EwinGetName(ewin));
#endif
set = !ewin->state.active;
}
if (ewin->state.active && Conf.focus.clickraises &&
ewin != EwinListStackGetTop())
set = 1;
if (set)
{
if (!ewin->state.click_grab_isset)
{
GrabButtonSet(AnyButton, AnyModifier, _EwinGetContainerWin(ewin),
ButtonPressMask, ECSR_PGRAB, 1);
if (EventDebug(EDBUG_TYPE_GRABS))
Eprintf("FocusEwinSetGrabs: %#lx set %s\n",
_EwinGetClientXwin(ewin), EwinGetName(ewin));
ewin->state.click_grab_isset = 1;
}
}
else
{
GrabButtonRelease(AnyButton, AnyModifier, _EwinGetContainerWin(ewin));
#if 0
Eprintf("FocusEwinSetGrabs: %#lx ungrab %s\n", _EwinGetClientXwin(ewin),
EwinGetName(ewin));
#endif
if (ewin->state.click_grab_isset)
{
GrabButtonRelease(AnyButton, AnyModifier,
_EwinGetContainerWin(ewin));
if (EventDebug(EDBUG_TYPE_GRABS))
Eprintf("FocusEwinSetGrabs: %#lx unset %s\n",
_EwinGetClientXwin(ewin), EwinGetName(ewin));
ewin->state.click_grab_isset = 0;
}
}
}