diff options
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/libinput/pointer.c | 4 | ||||
| -rw-r--r-- | backend/x11/input_device.c | 14 | 
2 files changed, 9 insertions, 9 deletions
| diff --git a/backend/libinput/pointer.c b/backend/libinput/pointer.c index 01bfc190..57a2f4a3 100644 --- a/backend/libinput/pointer.c +++ b/backend/libinput/pointer.c @@ -69,13 +69,13 @@ void handle_pointer_button(struct libinput_event *event,  	uint32_t seat_count = libinput_event_pointer_get_seat_button_count(pevent);  	switch (libinput_event_pointer_get_button_state(pevent)) {  	case LIBINPUT_BUTTON_STATE_PRESSED: -		wlr_event.state = WLR_BUTTON_PRESSED; +		wlr_event.state = WL_POINTER_BUTTON_STATE_PRESSED;  		if (seat_count != 1) {  			return;  		}  		break;  	case LIBINPUT_BUTTON_STATE_RELEASED: -		wlr_event.state = WLR_BUTTON_RELEASED; +		wlr_event.state = WL_POINTER_BUTTON_STATE_RELEASED;  		if (seat_count != 0) {  			return;  		} diff --git a/backend/x11/input_device.c b/backend/x11/input_device.c index 8526ae9b..82d9c151 100644 --- a/backend/x11/input_device.c +++ b/backend/x11/input_device.c @@ -29,7 +29,7 @@ static void send_key_event(struct wlr_x11_backend *x11, uint32_t key,  }  static void send_button_event(struct wlr_x11_output *output, uint32_t key, -		enum wlr_button_state st, xcb_timestamp_t time) { +		enum wl_pointer_button_state st, xcb_timestamp_t time) {  	struct wlr_pointer_button_event ev = {  		.pointer = &output->pointer,  		.time_msec = time, @@ -155,15 +155,15 @@ void handle_x11_xinput_event(struct wlr_x11_backend *x11,  		switch (ev->detail) {  		case XCB_BUTTON_INDEX_1: -			send_button_event(output, BTN_LEFT, WLR_BUTTON_PRESSED, +			send_button_event(output, BTN_LEFT, WL_POINTER_BUTTON_STATE_PRESSED,  				ev->time);  			break;  		case XCB_BUTTON_INDEX_2: -			send_button_event(output, BTN_MIDDLE, WLR_BUTTON_PRESSED, +			send_button_event(output, BTN_MIDDLE, WL_POINTER_BUTTON_STATE_PRESSED,  				ev->time);  			break;  		case XCB_BUTTON_INDEX_3: -			send_button_event(output, BTN_RIGHT, WLR_BUTTON_PRESSED, +			send_button_event(output, BTN_RIGHT, WL_POINTER_BUTTON_STATE_PRESSED,  				ev->time);  			break;  		case XCB_BUTTON_INDEX_4: @@ -188,15 +188,15 @@ void handle_x11_xinput_event(struct wlr_x11_backend *x11,  		switch (ev->detail) {  		case XCB_BUTTON_INDEX_1: -			send_button_event(output, BTN_LEFT, WLR_BUTTON_RELEASED, +			send_button_event(output, BTN_LEFT, WL_POINTER_BUTTON_STATE_RELEASED,  				ev->time);  			break;  		case XCB_BUTTON_INDEX_2: -			send_button_event(output, BTN_MIDDLE, WLR_BUTTON_RELEASED, +			send_button_event(output, BTN_MIDDLE, WL_POINTER_BUTTON_STATE_RELEASED,  				ev->time);  			break;  		case XCB_BUTTON_INDEX_3: -			send_button_event(output, BTN_RIGHT, WLR_BUTTON_RELEASED, +			send_button_event(output, BTN_RIGHT, WL_POINTER_BUTTON_STATE_RELEASED,  				ev->time);  			break;  		} | 
