Sivecano/dwl - Change F72VJF4KJZEYZEYGAGKCWPMEQGPKS7T5PEEJPJKZO6ZG246TTLAQC

don't pass compositor button events to client

Created by Devin J. Pohly on April 26, 2020

F72VJF4KJZEYZEYGAGKCWPMEQGPKS7T5PEEJPJKZO6ZG246TTLAQC

Dependencies

In channels

main

Change contents

Deletion in dwl.c at line 268 [4.4]

B:BD[3.3322] → [3.3322:3408]

	/* This event is forwarded by the cursor when a pointer emits a button
	 * event. */

Replacement in dwl.c at line 269 [4.4]

B:BD[3.3537] → [3.3537:3614]

B:BD[3.3614] → [5.1:119]

∅:D[5.119] → [6.985:1023]

B:BD[3.3614] → [6.985:1023]

∅:D[7.752] → [3.3660:3711]

∅:D[6.1023] → [3.3660:3711]

B:BD[3.3660] → [3.3660:3711]

∅:D[8.96] → [3.3900:3944]

∅:D[7.886] → [3.3900:3944]

B:BD[3.3900] → [3.3900:3944]

	/* Notify the client with pointer focus that a button press has occurred */
	/* XXX probably don't want to pass the event if it's handled by the
	 * compositor at the bottom of this function */
	wlr_seat_pointer_notify_button(seat,
			event->time_msec, event->button, event->state);
	if (event->state == WLR_BUTTON_RELEASED) {

[3.3537]

[3.3944]

	switch (event->state) {
	case WLR_BUTTON_PRESSED:;
		/* Change focus if the button was _pressed_ over a client */
		double sx, sy;
		struct wlr_surface *surface;
		Client *c = xytoclient(cursor->x, cursor->y, &surface, &sx, &sy);
		if (c) {
			keyboardfocus(c, surface);
			raiseclient(c);
		}
		struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat);
		uint32_t mods = wlr_keyboard_get_modifiers(keyboard);
		for (int i = 0; i < LENGTH(buttons); i++)
			if (event->button == buttons[i].button &&
					CLEANMASK(mods) == CLEANMASK(buttons[i].mod) &&
					buttons[i].func) {
				buttons[i].func(&buttons[i].arg);
				return;
			}
		break;
	case WLR_BUTTON_RELEASED:

Replacement in dwl.c at line 293 [4.4]
B:BD[5.186] → [5.186:218]
```
		if (cursor_mode != CurNormal)
```
[5.186]
[5.218]
```
		if (cursor_mode != CurNormal) {
```
Replacement in dwl.c at line 296 [4.4]
∅:D[5.296] → [6.1081:1108]
B:BD[3.4019] → [6.1081:1108]
B:BD[6.1108] → [9.1:11]
```
		cursor_mode = CurNormal;
		return;
```
[5.296]
[9.11]
```
			cursor_mode = CurNormal;
			return;
		}
		break;
```

Replacement in dwl.c at line 301 [4.4]

∅:D[9.14] → [3.4155:4156]

∅:D[10.152] → [3.4155:4156]

∅:D[8.191] → [3.4155:4156]

∅:D[11.1196] → [3.4155:4156]

B:BD[3.4155] → [3.4155:4156]

B:BD[3.4156] → [9.15:200]

B:BD[9.200] → [2.160:189]

∅:D[2.189] → [9.221:239]

B:BD[9.221] → [9.221:239]

∅:D[9.239] → [3.4498:4501]

B:BD[3.4498] → [3.4498:4501]

B:BD[3.4501] → [9.240:555]


	/* Change focus if the button was _pressed_ over a client */
	double sx, sy;
	struct wlr_surface *surface;
	Client *c = xytoclient(cursor->x, cursor->y, &surface, &sx, &sy);
	if (c) {
		keyboardfocus(c, surface);
		raiseclient(c);
	}
	struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat);
	uint32_t mods = wlr_keyboard_get_modifiers(keyboard);
	for (int i = 0; i < LENGTH(buttons); i++)
		if (event->button == buttons[i].button &&
				CLEANMASK(mods) == CLEANMASK(buttons[i].mod) &&
				buttons[i].func)
			buttons[i].func(&buttons[i].arg);

[9.14]

[3.4501]

	/* If the event wasn't handled by the compositor, notify the client with
	 * pointer focus that a button press has occurred */
	wlr_seat_pointer_notify_button(seat,
			event->time_msec, event->button, event->state);