hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-04 20:55:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add tablet example

Browse source
This commit is contained in:
Drew DeVault 2017-06-15 16:15:12 -04:00
parent 2443a070e7
commit def3d7c64f
4 changed files with 175 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
backend/libinput/tablet_tool.c
View file

@ -76,9 +76,6 @@ void handle_tablet_tool_proximity(struct libinput_event *event,
wlr_log(L_DEBUG, "Got a tablet tool event for a device with no tablet tools?");
return;
}
// Proximity events contain axis information. We update this information
// before we send the proximity event
handle_tablet_tool_axis(event, device);
struct libinput_event_tablet_tool *tevent =
libinput_event_get_tablet_tool_event(event);
struct wlr_tablet_tool_proximity *wlr_event =
@ -91,6 +88,7 @@ void handle_tablet_tool_proximity(struct libinput_event *event,
break;
case LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_IN:
wlr_event->state = WLR_TABLET_TOOL_PROXIMITY_IN;
handle_tablet_tool_axis(event, device);
break;
}
wl_signal_emit(&dev->tablet_tool->events.proximity, wlr_event);
@ -104,8 +102,6 @@ void handle_tablet_tool_tip(struct libinput_event *event,
wlr_log(L_DEBUG, "Got a tablet tool event for a device with no tablet tools?");
return;
}
// Tip events contain axis information. We update this information
// before we send the proximity event
handle_tablet_tool_axis(event, device);
struct libinput_event_tablet_tool *tevent =
libinput_event_get_tablet_tool_event(event);

68
example/shared.c
View file

@ -167,6 +167,50 @@ static void touch_add(struct wlr_input_device *device, struct compositor_state *
wl_list_insert(&state->touch, &tstate->link);
}
static void tablet_tool_axis_notify(struct wl_listener *listener, void *data) {
struct wlr_tablet_tool_axis *event = data;
struct tablet_tool_state *tstate = wl_container_of(listener, tstate, axis);
if (tstate->compositor->tool_axis_cb) {
tstate->compositor->tool_axis_cb(tstate, event);
}
}
static void tablet_tool_proximity_notify(struct wl_listener *listener, void *data) {
struct wlr_tablet_tool_proximity *event = data;
struct tablet_tool_state *tstate = wl_container_of(listener, tstate, proximity);
if (tstate->compositor->tool_proximity_cb) {
tstate->compositor->tool_proximity_cb(tstate, event->state);
}
}
static void tablet_tool_button_notify(struct wl_listener *listener, void *data) {
struct wlr_tablet_tool_button *event = data;
struct tablet_tool_state *tstate = wl_container_of(listener, tstate, button);
if (tstate->compositor->tool_button_cb) {
tstate->compositor->tool_button_cb(tstate, event->button, event->state);
}
}
static void tablet_tool_add(struct wlr_input_device *device,
struct compositor_state *state) {
struct tablet_tool_state *tstate = calloc(sizeof(struct tablet_tool_state), 1);
tstate->device = device;
tstate->compositor = state;
wl_list_init(&tstate->axis.link);
wl_list_init(&tstate->proximity.link);
wl_list_init(&tstate->tip.link);
wl_list_init(&tstate->button.link);
tstate->axis.notify = tablet_tool_axis_notify;
tstate->proximity.notify = tablet_tool_proximity_notify;
//tstate->tip.notify = tablet_tool_tip_notify;
tstate->button.notify = tablet_tool_button_notify;
wl_signal_add(&device->tablet_tool->events.axis, &tstate->axis);
wl_signal_add(&device->tablet_tool->events.proximity, &tstate->proximity);
//wl_signal_add(&device->tablet_tool->events.tip, &tstate->tip);
wl_signal_add(&device->tablet_tool->events.button, &tstate->button);
wl_list_insert(&state->tablet_tools, &tstate->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);
@ -180,6 +224,8 @@ static void input_add_notify(struct wl_listener *listener, void *data) {
case WLR_INPUT_DEVICE_TOUCH:
touch_add(device, state);
break;
case WLR_INPUT_DEVICE_TABLET_TOOL:
tablet_tool_add(device, state);
default:
break;
}
@ -236,6 +282,24 @@ static void touch_remove(struct wlr_input_device *device, struct compositor_stat
wl_list_remove(&tstate->cancel.link);
}
static void tablet_tool_remove(struct wlr_input_device *device, struct compositor_state *state) {
struct tablet_tool_state *tstate = NULL, *_tstate;
wl_list_for_each(_tstate, &state->tablet_tools, link) {
if (_tstate->device == device) {
tstate = _tstate;
break;
}
}
if (!tstate) {
return;
}
wl_list_remove(&tstate->link);
wl_list_remove(&tstate->axis.link);
wl_list_remove(&tstate->proximity.link);
//wl_list_remove(&tstate->tip.link);
wl_list_remove(&tstate->button.link);
}
static void input_remove_notify(struct wl_listener *listener, void *data) {
struct wlr_input_device *device = data;
struct compositor_state *state = wl_container_of(listener, state, input_add);
@ -249,6 +313,9 @@ static void input_remove_notify(struct wl_listener *listener, void *data) {
case WLR_INPUT_DEVICE_TOUCH:
touch_remove(device, state);
break;
case WLR_INPUT_DEVICE_TABLET_TOOL:
tablet_tool_remove(device, state);
break;
default:
break;
}
@ -323,6 +390,7 @@ void compositor_init(struct compositor_state *state) {
wl_list_init(&state->keyboards);
wl_list_init(&state->pointers);
wl_list_init(&state->touch);
wl_list_init(&state->tablet_tools);
wl_list_init(&state->input_add.link);
state->input_add.notify = input_add_notify;
wl_list_init(&state->input_remove.link);

20
example/shared.h
View file

@ -50,6 +50,17 @@ struct touch_state {
void *data;
};
struct tablet_tool_state {
struct compositor_state *compositor;
struct wlr_input_device *device;
struct wl_listener axis;
struct wl_listener proximity;
struct wl_listener tip;
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);
@ -72,6 +83,14 @@ struct compositor_state {
double x, double y, double width, double height);
void (*touch_up_cb)(struct touch_state *s, int32_t slot);
void (*touch_cancel_cb)(struct touch_state *s, int32_t slot);
void (*tool_axis_cb)(struct tablet_tool_state *s,
struct wlr_tablet_tool_axis *event);
void (*tool_proximity_cb)(struct tablet_tool_state *s,
enum wlr_tablet_tool_proximity_state proximity);
void (*tool_tip_cb)(struct tablet_tool_state *s,
enum wlr_tablet_tool_tip_state state);
void (*tool_button_cb)(struct tablet_tool_state *s,
uint32_t button, enum wlr_button_state state);
struct wl_display *display;
struct wl_event_loop *event_loop;
@ -81,6 +100,7 @@ struct compositor_state {
struct wl_list keyboards;
struct wl_list pointers;
struct wl_list touch;
struct wl_list tablet_tools;
struct wl_listener input_add;
struct wl_listener input_remove;

92
example/tablet.c
View file

@ -21,6 +21,13 @@
struct sample_state {
struct wlr_renderer *renderer;
bool proximity, tap;
double distance;
double pressure;
double x_mm, y_mm;
double width_mm, height_mm;
struct wl_list link;
float tool_color[4];
};
static void handle_output_frame(struct output_state *output, struct timespec *ts) {
@ -28,13 +35,41 @@ static void handle_output_frame(struct output_state *output, struct timespec *ts
struct sample_state *sample = state->data;
struct wlr_output *wlr_output = output->output;
int32_t width, height;
wlr_output_effective_resolution(wlr_output, &width, &height);
wlr_renderer_begin(sample->renderer, wlr_output);
float matrix[16];
float color[4] = { 0, 1.0, 0, 1.0 };
wlr_matrix_scale(&matrix, 128, 128, 1);
wlr_matrix_mul(&wlr_output->transform_matrix, &matrix, &matrix);
wlr_render_colored_ellipse(sample->renderer, &color, &matrix);
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];
}
float scale = 4;
float pad_width = sample->width_mm * scale;
float pad_height = sample->height_mm * scale;
float left = width / 2.0f - pad_width / 2.0f;
float top = height / 2.0f - pad_height / 2.0f;
wlr_matrix_translate(&matrix, left, top, 0);
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);
if (sample->proximity) {
wlr_matrix_translate(&matrix,
sample->x_mm * scale - 8 * (sample->pressure + 1) + left,
sample->y_mm * scale - 8 * (sample->pressure + 1) + top, 0);
wlr_matrix_scale(&view,
16 * (sample->pressure + 1),
16 * (sample->pressure + 1), 1);
wlr_matrix_mul(&matrix, &view, &view);
wlr_matrix_mul(&wlr_output->transform_matrix, &view, &matrix);
wlr_render_colored_ellipse(sample->renderer, &tool_color, &matrix);
}
wlr_renderer_end(sample->renderer);
}
@ -46,13 +81,58 @@ static void handle_keyboard_key(struct keyboard_state *kbstate,
}
}
static void handle_tool_axis(struct tablet_tool_state *tstate,
struct wlr_tablet_tool_axis *event) {
struct sample_state *sample = tstate->compositor->data;
sample->width_mm = event->width_mm;
sample->height_mm = event->height_mm;
if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_X)) {
sample->x_mm = event->x_mm;
}
if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_Y)) {
sample->y_mm = event->y_mm;
}
if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_DISTANCE)) {
sample->distance = event->distance;
}
if ((event->updated_axes & WLR_TABLET_TOOL_AXIS_PRESSURE)) {
sample->pressure = event->pressure;
}
}
static void handle_tool_proximity(struct tablet_tool_state *tstate,
enum wlr_tablet_tool_proximity_state state) {
struct sample_state *sample = tstate->compositor->data;
sample->proximity = state == WLR_TABLET_TOOL_PROXIMITY_IN;
}
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);
} else {
for (size_t i = 0; i < 3; ++i) {
if (button % 3 != i) {
sample->tool_color[button % 3] = 0;
}
}
}
}
int main(int argc, char *argv[]) {
struct sample_state state = { 0 };
struct sample_state state = {
.tool_color = { 1, 1, 1, 1 }
};
struct compositor_state compositor;
compositor_init(&compositor);
compositor.output_frame_cb = handle_output_frame;
compositor.keyboard_key_cb = handle_keyboard_key;
compositor.tool_axis_cb = handle_tool_axis;
compositor.tool_proximity_cb = handle_tool_proximity;
compositor.tool_button_cb = handle_tool_button;
state.renderer = wlr_gles3_renderer_init();