aboutsummaryrefslogtreecommitdiff
path: root/example
diff options
context:
space:
mode:
Diffstat (limited to 'example')
-rw-r--r--example/pointer.c3
-rw-r--r--example/shared.c43
-rw-r--r--example/shared.h12
-rw-r--r--example/tablet.c41
4 files changed, 88 insertions, 11 deletions
diff --git a/example/pointer.c b/example/pointer.c
index d97d253e..ddb665a1 100644
--- a/example/pointer.c
+++ b/example/pointer.c
@@ -94,8 +94,9 @@ static void handle_pointer_axis(struct pointer_state *pstate,
static void handle_output_add(struct output_state *ostate) {
struct wlr_output *wlr_output = ostate->output;
+ int width = 16, height = 16;
if (!wlr_output_set_cursor(wlr_output, cat_tex.pixel_data,
- cat_tex.width * 4, cat_tex.width, cat_tex.height)) {
+ width * 4, width, height)) {
fprintf(stderr, "Failed to set cursor\n");
return;
}
diff --git a/example/shared.c b/example/shared.c
index 88f2b05f..be1bdee7 100644
--- a/example/shared.c
+++ b/example/shared.c
@@ -12,6 +12,16 @@
#include <wlr/types.h>
#include "shared.h"
+static void keyboard_led_update(struct keyboard_state *kbstate) {
+ uint32_t leds = 0;
+ for (uint32_t i = 0; i < WLR_LED_LAST; ++i) {
+ if (xkb_state_led_index_is_active(kbstate->xkb_state, kbstate->leds[i])) {
+ leds |= (1 << i);
+ }
+ }
+ wlr_keyboard_led_update(kbstate->device->keyboard, leds);
+}
+
static void keyboard_key_notify(struct wl_listener *listener, void *data) {
struct wlr_keyboard_key *event = data;
struct keyboard_state *kbstate = wl_container_of(listener, kbstate, key);
@@ -33,6 +43,7 @@ static void keyboard_key_notify(struct wl_listener *listener, void *data) {
}
xkb_state_update_key(kbstate->xkb_state, keycode,
event->state == WLR_KEY_PRESSED ? XKB_KEY_DOWN : XKB_KEY_UP);
+ keyboard_led_update(kbstate);
}
static void keyboard_add(struct wlr_input_device *device, struct compositor_state *state) {
@@ -68,6 +79,14 @@ static void keyboard_add(struct wlr_input_device *device, struct compositor_stat
fprintf(stderr, "Failed to create XKB state\n");
exit(1);
}
+ const char *led_names[3] = {
+ XKB_LED_NAME_NUM,
+ XKB_LED_NAME_CAPS,
+ XKB_LED_NAME_SCROLL
+ };
+ for (uint32_t i = 0; i < 3; ++i) {
+ kbstate->leds[i] = xkb_map_led_get_index(kbstate->keymap, led_names[i]);
+ }
}
static void pointer_motion_notify(struct wl_listener *listener, void *data) {
@@ -211,6 +230,25 @@ static void tablet_tool_add(struct wlr_input_device *device,
wl_list_insert(&state->tablet_tools, &tstate->link);
}
+static void tablet_pad_button_notify(struct wl_listener *listener, void *data) {
+ struct wlr_tablet_pad_button *event = data;
+ struct tablet_pad_state *pstate = wl_container_of(listener, pstate, button);
+ if (pstate->compositor->pad_button_cb) {
+ pstate->compositor->pad_button_cb(pstate, event->button, event->state);
+ }
+}
+
+static void tablet_pad_add(struct wlr_input_device *device,
+ struct compositor_state *state) {
+ struct tablet_pad_state *pstate = calloc(sizeof(struct tablet_pad_state), 1);
+ pstate->device = device;
+ pstate->compositor = state;
+ wl_list_init(&pstate->button.link);
+ pstate->button.notify = tablet_pad_button_notify;
+ wl_signal_add(&device->tablet_pad->events.button, &pstate->button);
+ wl_list_insert(&state->tablet_pads, &pstate->link);
+}
+
static void input_add_notify(struct wl_listener *listener, void *data) {
struct wlr_input_device *device = data;
struct compositor_state *state = wl_container_of(listener, state, input_add);
@@ -226,6 +264,10 @@ static void input_add_notify(struct wl_listener *listener, void *data) {
break;
case WLR_INPUT_DEVICE_TABLET_TOOL:
tablet_tool_add(device, state);
+ break;
+ case WLR_INPUT_DEVICE_TABLET_PAD:
+ tablet_pad_add(device, state);
+ break;
default:
break;
}
@@ -391,6 +433,7 @@ void compositor_init(struct compositor_state *state) {
wl_list_init(&state->pointers);
wl_list_init(&state->touch);
wl_list_init(&state->tablet_tools);
+ wl_list_init(&state->tablet_pads);
wl_list_init(&state->input_add.link);
state->input_add.notify = input_add_notify;
wl_list_init(&state->input_remove.link);
diff --git a/example/shared.h b/example/shared.h
index df456c91..6d533443 100644
--- a/example/shared.h
+++ b/example/shared.h
@@ -25,6 +25,7 @@ struct keyboard_state {
struct wl_list link;
struct xkb_keymap *keymap;
struct xkb_state *xkb_state;
+ xkb_led_index_t leds[WLR_LED_LAST];
void *data;
};
@@ -61,6 +62,14 @@ struct tablet_tool_state {
void *data;
};
+struct tablet_pad_state {
+ struct compositor_state *compositor;
+ struct wlr_input_device *device;
+ struct wl_listener button;
+ struct wl_list link;
+ void *data;
+};
+
struct compositor_state {
void (*output_add_cb)(struct output_state *s);
void (*keyboard_add_cb)(struct keyboard_state *s);
@@ -91,6 +100,8 @@ struct compositor_state {
enum wlr_tablet_tool_tip_state state);
void (*tool_button_cb)(struct tablet_tool_state *s,
uint32_t button, enum wlr_button_state state);
+ void (*pad_button_cb)(struct tablet_pad_state *s,
+ uint32_t button, enum wlr_button_state state);
struct wl_display *display;
struct wl_event_loop *event_loop;
@@ -101,6 +112,7 @@ struct compositor_state {
struct wl_list pointers;
struct wl_list touch;
struct wl_list tablet_tools;
+ struct wl_list tablet_pads;
struct wl_listener input_add;
struct wl_listener input_remove;
diff --git a/example/tablet.c b/example/tablet.c
index f2497d59..3c5b583e 100644
--- a/example/tablet.c
+++ b/example/tablet.c
@@ -21,13 +21,14 @@
struct sample_state {
struct wlr_renderer *renderer;
- bool proximity, tap;
+ bool proximity, tap, button;
double distance;
double pressure;
double x_mm, y_mm;
double width_mm, height_mm;
struct wl_list link;
float tool_color[4];
+ float pad_color[4];
};
static void handle_output_frame(struct output_state *output, struct timespec *ts) {
@@ -41,11 +42,10 @@ static void handle_output_frame(struct output_state *output, struct timespec *ts
wlr_renderer_begin(sample->renderer, wlr_output);
float matrix[16], view[16];
- float pad_color[4] = { 0.75, 0.75, 0.75, 1.0 };
float distance = 0.8f * (1 - sample->distance);
float tool_color[4] = { distance, distance, distance, 1 };
- for (size_t i = 0; i < 4; ++i) {
- tool_color[i] *= sample->tool_color[i];
+ for (size_t i = 0; sample->button && i < 4; ++i) {
+ tool_color[i] = sample->tool_color[i];
}
float scale = 4;
@@ -57,7 +57,7 @@ static void handle_output_frame(struct output_state *output, struct timespec *ts
wlr_matrix_scale(&view, pad_width, pad_height, 1);
wlr_matrix_mul(&matrix, &view, &view);
wlr_matrix_mul(&wlr_output->transform_matrix, &view, &matrix);
- wlr_render_colored_quad(sample->renderer, &pad_color, &matrix);
+ wlr_render_colored_quad(sample->renderer, &sample->pad_color, &matrix);
if (sample->proximity) {
wlr_matrix_translate(&matrix,
@@ -110,12 +110,31 @@ static void handle_tool_button(struct tablet_tool_state *tstate,
uint32_t button, enum wlr_button_state state) {
struct sample_state *sample = tstate->compositor->data;
if (state == WLR_BUTTON_RELEASED) {
- float default_color[4] = { 1, 1, 1, 1 };
- memcpy(sample->tool_color, default_color, 4);
+ sample->button = false;
} else {
+ sample->button = true;
for (size_t i = 0; i < 3; ++i) {
- if (button % 3 != i) {
- sample->tool_color[button % 3] = 0;
+ if (button % 3 == i) {
+ sample->tool_color[i] = 0;
+ } else {
+ sample->tool_color[i] = 1;
+ }
+ }
+ }
+}
+
+static void handle_pad_button(struct tablet_pad_state *pstate,
+ uint32_t button, enum wlr_button_state state) {
+ struct sample_state *sample = pstate->compositor->data;
+ float default_color[4] = { 0.75, 0.75, 0.75, 1.0 };
+ if (state == WLR_BUTTON_RELEASED) {
+ memcpy(sample->pad_color, default_color, sizeof(default_color));
+ } else {
+ for (size_t i = 0; i < 3; ++i) {
+ if (button % 3 == i) {
+ sample->pad_color[i] = 0;
+ } else {
+ sample->pad_color[i] = 1;
}
}
}
@@ -123,7 +142,8 @@ static void handle_tool_button(struct tablet_tool_state *tstate,
int main(int argc, char *argv[]) {
struct sample_state state = {
- .tool_color = { 1, 1, 1, 1 }
+ .tool_color = { 1, 1, 1, 1 },
+ .pad_color = { 0.75, 0.75, 0.75, 1.0 }
};
struct compositor_state compositor;
@@ -133,6 +153,7 @@ int main(int argc, char *argv[]) {
compositor.tool_axis_cb = handle_tool_axis;
compositor.tool_proximity_cb = handle_tool_proximity;
compositor.tool_button_cb = handle_tool_button;
+ compositor.pad_button_cb = handle_pad_button;
state.renderer = wlr_gles3_renderer_init();
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-07 16:43:44 +0000