pogmommy/chayang
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix return value after input event

Browse source
This commit is contained in:
Simon Ser 2023-01-11 14:41:51 +01:00
parent 70c3b7c5c0
commit 03f80d8c6b
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/chayang.h
View file

@ -15,7 +15,7 @@ struct chayang {
struct wl_list outputs; struct wl_list outputs;
struct wl_list seats; struct wl_list seats;
bool running; bool running, cancelled;
int64_t delay_ms, start_time_ms; int64_t delay_ms, start_time_ms;
}; };

18
main.c
View file

@ -24,6 +24,11 @@ static int64_t now_ms(void) {
return (int64_t)ts.tv_sec * 1000 + ts.tv_nsec / 1000000; return (int64_t)ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
} }
static void cancel(struct chayang *state) {
state->running = false;
state->cancelled = true;
}
static void frame_callback_handle_done(void *data, struct wl_callback *callback, uint32_t time) { static void frame_callback_handle_done(void *data, struct wl_callback *callback, uint32_t time) {
struct chayang_output *output = data; struct chayang_output *output = data;
wl_callback_destroy(callback); wl_callback_destroy(callback);
@ -108,19 +113,19 @@ static void pointer_handle_leave(void *data, struct wl_pointer *wl_pointer, uint
static void pointer_handle_motion(void *data, struct wl_pointer *wl_pointer, uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) { static void pointer_handle_motion(void *data, struct wl_pointer *wl_pointer, uint32_t time, wl_fixed_t surface_x, wl_fixed_t surface_y) {
struct chayang_seat *seat = data; struct chayang_seat *seat = data;
seat->chayang->running = false; cancel(seat->chayang);
} }
static void pointer_handle_button(void *data, struct wl_pointer *wl_pointer, uint32_t serial, uint32_t time, uint32_t button, uint32_t state) { static void pointer_handle_button(void *data, struct wl_pointer *wl_pointer, uint32_t serial, uint32_t time, uint32_t button, uint32_t state) {
struct chayang_seat *seat = data; struct chayang_seat *seat = data;
if (state == WL_POINTER_BUTTON_STATE_PRESSED) { if (state == WL_POINTER_BUTTON_STATE_PRESSED) {
seat->chayang->running = false; cancel(seat->chayang);
} }
} }
static void pointer_handle_axis(void *data, struct wl_pointer *wl_pointer, uint32_t time, uint32_t axis, wl_fixed_t value) { static void pointer_handle_axis(void *data, struct wl_pointer *wl_pointer, uint32_t time, uint32_t axis, wl_fixed_t value) {
struct chayang_seat *output = data; struct chayang_seat *seat = data;
output->chayang->running = false; cancel(seat->chayang);
} }
static const struct wl_pointer_listener pointer_listener = { static const struct wl_pointer_listener pointer_listener = {
@ -146,7 +151,7 @@ static void keyboard_handle_leave(void *data, struct wl_keyboard *wl_keyboard, u
static void keyboard_handle_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial, uint32_t time, uint32_t key, uint32_t state) { static void keyboard_handle_key(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial, uint32_t time, uint32_t key, uint32_t state) {
struct chayang_seat *seat = data; struct chayang_seat *seat = data;
if (state == WL_KEYBOARD_KEY_STATE_PRESSED) { if (state == WL_KEYBOARD_KEY_STATE_PRESSED) {
seat->chayang->running = false; cancel(seat->chayang);
} }
} }
@ -334,6 +339,9 @@ int main(int argc, char *argv[]) {
break; break;
} }
} }
if (ret == 0 && state.cancelled) {
ret = 2;
}
struct chayang_output *output_tmp; struct chayang_output *output_tmp;
wl_list_for_each_safe(output, output_tmp, &state.outputs, link) { wl_list_for_each_safe(output, output_tmp, &state.outputs, link) {