hiro/bspwm
1
0
Fork 0
mirror of https://github.com/vale981/bspwm synced 2025-03-05 09:51:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

click_to_focus should also apply to middle and right click

Browse source
This commit is contained in:
Matthijs Steen 2017-07-03 00:57:33 +02:00
parent cc3d3060fb
commit 61d5ca4756
2 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/events.c
View file

@ -340,26 +340,22 @@ void button_press(xcb_generic_event_t *evt)
{
xcb_button_press_event_t *e = (xcb_button_press_event_t *) evt;
bool replay = false;
switch (e->detail) {
case XCB_BUTTON_INDEX_1:
if (click_to_focus && cleaned_mask(e->state) == XCB_NONE) {
bool pff = pointer_follows_focus;
bool pfm = pointer_follows_monitor;
pointer_follows_focus = false;
pointer_follows_monitor = false;
replay = !grab_pointer(ACTION_FOCUS) || !swallow_first_click;
pointer_follows_focus = pff;
pointer_follows_monitor = pfm;
} else {
grab_pointer(pointer_actions[0]);
}
break;
case XCB_BUTTON_INDEX_2:
grab_pointer(pointer_actions[1]);
break;
case XCB_BUTTON_INDEX_3:
grab_pointer(pointer_actions[2]);
break;
uint8_t buttons[] = {XCB_BUTTON_INDEX_1, XCB_BUTTON_INDEX_2, XCB_BUTTON_INDEX_3};
for (unsigned int i = 0; i < LENGTH(buttons); i++) {
if (e->detail != buttons[i]) {
continue;
}
if (click_to_focus && cleaned_mask(e->state) == XCB_NONE) {
bool pff = pointer_follows_focus;
bool pfm = pointer_follows_monitor;
pointer_follows_focus = false;
pointer_follows_monitor = false;
replay = !grab_pointer(ACTION_FOCUS) || !swallow_first_click;
pointer_follows_focus = pff;
pointer_follows_monitor = pfm;
} else {
grab_pointer(pointer_actions[i]);
}
}
xcb_allow_events(dpy, replay ? XCB_ALLOW_REPLAY_POINTER : XCB_ALLOW_SYNC_POINTER, e->time);
xcb_flush(dpy);

6
src/pointer.c
View file

@ -50,11 +50,11 @@ void pointer_init(void)
void window_grab_buttons(xcb_window_t win)
{
if (click_to_focus) {
window_grab_button(win, XCB_BUTTON_INDEX_1, XCB_NONE);
}
uint8_t buttons[] = {XCB_BUTTON_INDEX_1, XCB_BUTTON_INDEX_2, XCB_BUTTON_INDEX_3};
for (unsigned int i = 0; i < LENGTH(buttons); i++) {
if (click_to_focus) {
window_grab_button(win, buttons[i], XCB_NONE);
}
if (pointer_actions[i] != ACTION_NONE) {
window_grab_button(win, buttons[i], pointer_modifier);
}