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

Don't replay the initial click in button_press

Browse source 
When `click_to_focus` is set, clicking on a window should simply focus
that window and not trigger some random action that might be attached to
an interactive element under the pointer.
This commit is contained in:
Bastien Dejean 2016-11-14 10:38:46 +01:00
parent b14ec64565
commit e00b6c9e5c
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
events.c
View file

@ -324,12 +324,11 @@ void button_press(xcb_generic_event_t *evt)
switch (e->detail) {
case XCB_BUTTON_INDEX_1:
if (click_to_focus && cleaned_mask(e->state) == XCB_NONE) {
replay = true;
bool pff = pointer_follows_focus;
bool pfm = pointer_follows_monitor;
pointer_follows_focus = false;
pointer_follows_monitor = false;
grab_pointer(ACTION_FOCUS);
replay = !grab_pointer(ACTION_FOCUS);
pointer_follows_focus = pff;
pointer_follows_monitor = pfm;
} else {

19
pointer.c
View file

@ -177,7 +177,7 @@ resize_handle_t get_handle(node_t *n, xcb_point_t pos, pointer_action_t pac)
return rh;
}
void grab_pointer(pointer_action_t pac)
bool grab_pointer(pointer_action_t pac)
{
xcb_window_t win = XCB_NONE;
xcb_point_t pos;
@ -191,29 +191,36 @@ void grab_pointer(pointer_action_t pac)
monitor_t *m = monitor_from_point(pos);
if (m != NULL && m != mon && (win == XCB_NONE || win == m->root)) {
focus_node(m, m->desk, m->desk->focus);
return true;
} else {
return false;
}
} else {
return false;
}
return;
}
if (pac == ACTION_FOCUS) {
if (loc.node != mon->desk->focus) {
focus_node(loc.monitor, loc.desktop, loc.node);
return true;
} else if (focus_follows_pointer) {
stack(loc.desktop, loc.node, true);
return true;
} else {
return false;
}
return;
}
if (loc.node->client->state == STATE_FULLSCREEN) {
return;
return true;
}
xcb_grab_pointer_reply_t *reply = xcb_grab_pointer_reply(dpy, xcb_grab_pointer(dpy, 0, root, XCB_EVENT_MASK_BUTTON_RELEASE|XCB_EVENT_MASK_BUTTON_MOTION, XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, XCB_NONE, XCB_NONE, XCB_CURRENT_TIME), NULL);
if (reply == NULL || reply->status != XCB_GRAB_STATUS_SUCCESS) {
free(reply);
return;
return true;
}
free(reply);
@ -226,6 +233,8 @@ void grab_pointer(pointer_action_t pac)
}
track_pointer(loc, pac, pos);
return true;
}
void track_pointer(coordinates_t loc, pointer_action_t pac, xcb_point_t pos)

2
pointer.h
View file

@ -42,7 +42,7 @@ void grab_button(uint8_t button, uint16_t modifier);
void ungrab_buttons(void);
int16_t modfield_from_keysym(xcb_keysym_t keysym);
resize_handle_t get_handle(node_t *n, xcb_point_t pos, pointer_action_t pac);
void grab_pointer(pointer_action_t pac);
bool grab_pointer(pointer_action_t pac);
void track_pointer(coordinates_t loc, pointer_action_t pac, xcb_point_t pos);
#endif