itycodes
/
convince
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3132 from emersion/dispatch-cursor-btn-segfault

Browse Source 
Fix segfault in dispatch_cursor_button
master
Ryan Dwyer 6 years ago committed by GitHub
parent b67baf5108 4ce18d2744
commit cb63321de6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File

11
sway/input/cursor.c
Unescape View File

@ -863,8 +863,8 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
} }
// Handle tiling resize via border // Handle tiling resize via border
if (resize_edge && button == BTN_LEFT && state == WLR_BUTTON_PRESSED && if (cont && resize_edge && button == BTN_LEFT &&
!is_floating) { state == WLR_BUTTON_PRESSED && !is_floating) {
seat_set_focus_container(seat, cont); seat_set_focus_container(seat, cont);
seat_begin_resize_tiling(seat, cont, button, edge); seat_begin_resize_tiling(seat, cont, button, edge);
return; return;
@ -873,7 +873,8 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
// Handle tiling resize via mod // Handle tiling resize via mod
bool mod_pressed = keyboard && bool mod_pressed = keyboard &&
(wlr_keyboard_get_modifiers(keyboard) & config->floating_mod); (wlr_keyboard_get_modifiers(keyboard) & config->floating_mod);
if (!is_floating_or_child && mod_pressed && state == WLR_BUTTON_PRESSED) { if (cont && !is_floating_or_child && mod_pressed &&
state == WLR_BUTTON_PRESSED) {
uint32_t btn_resize = config->floating_mod_inverse ? uint32_t btn_resize = config->floating_mod_inverse ?
BTN_LEFT : BTN_RIGHT; BTN_LEFT : BTN_RIGHT;
if (button == btn_resize) { if (button == btn_resize) {
@ -901,7 +902,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
} }
// Handle beginning floating move // Handle beginning floating move
if (is_floating_or_child && !is_fullscreen_or_child && if (cont && is_floating_or_child && !is_fullscreen_or_child &&
state == WLR_BUTTON_PRESSED) { state == WLR_BUTTON_PRESSED) {
uint32_t btn_move = config->floating_mod_inverse ? BTN_RIGHT : BTN_LEFT; uint32_t btn_move = config->floating_mod_inverse ? BTN_RIGHT : BTN_LEFT;
if (button == btn_move && state == WLR_BUTTON_PRESSED && if (button == btn_move && state == WLR_BUTTON_PRESSED &&
@ -916,7 +917,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
} }
// Handle beginning floating resize // Handle beginning floating resize
if (is_floating_or_child && !is_fullscreen_or_child && if (cont && is_floating_or_child && !is_fullscreen_or_child &&
state == WLR_BUTTON_PRESSED) { state == WLR_BUTTON_PRESSED) {
// Via border // Via border
if (button == BTN_LEFT && resize_edge != WLR_EDGE_NONE) { if (button == BTN_LEFT && resize_edge != WLR_EDGE_NONE) {

Write Preview
Loading…
Cancel
Save