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

use previous resource versions and destroy pads

Browse source
This commit is contained in:
Markus Ongyerth 2018-06-01 12:33:19 +02:00
parent 48e2cba9b6
commit 6b51f3b57a
3 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/wlr/types/wlr_tablet_v2.h
View file

@ -38,7 +38,7 @@ struct wlr_tablet_v2_tablet {
struct wlr_tablet_v2_tablet_tool { struct wlr_tablet_v2_tablet_tool {
struct wl_list link; // wlr_tablet_seat_v2::tablets struct wl_list link; // wlr_tablet_seat_v2::tablets
struct wlr_tablet_tool_tool *wlr_tool; struct wlr_tablet_tool_tool *wlr_tool;
struct wl_list clients; // wlr_tablet_tool_client_v2::tablet_link struct wl_list clients; // wlr_tablet_tool_client_v2::tool_link
struct wl_listener tool_destroy; struct wl_listener tool_destroy;
@ -62,7 +62,7 @@ struct wlr_tablet_v2_tablet_pad {
struct wl_list link; // wlr_tablet_seat_v2::pads struct wl_list link; // wlr_tablet_seat_v2::pads
struct wlr_tablet_pad *wlr_pad; struct wlr_tablet_pad *wlr_pad;
struct wlr_input_device *wlr_device; struct wlr_input_device *wlr_device;
struct wl_list clients; // wlr_tablet_pad_client_v2::tablet_link struct wl_list clients; // wlr_tablet_pad_client_v2::pad_link
size_t group_count; size_t group_count;
uint32_t *groups; uint32_t *groups;

17
types/tablet_v2/wlr_tablet_v2_pad.c
View file

@ -185,8 +185,11 @@ static struct zwp_tablet_pad_group_v2_interface tablet_pad_group_impl = {
static void add_tablet_pad_group(struct wlr_tablet_v2_tablet_pad *pad, static void add_tablet_pad_group(struct wlr_tablet_v2_tablet_pad *pad,
struct wlr_tablet_pad_client_v2 *client, struct wlr_tablet_pad_client_v2 *client,
struct wlr_tablet_pad_group *group, size_t index) { struct wlr_tablet_pad_group *group, size_t index) {
int version = wl_resource_get_version(client->resource);
client->groups[index] = client->groups[index] =
wl_resource_create(client->client, &zwp_tablet_pad_group_v2_interface, 1, 0); wl_resource_create(client->client, &zwp_tablet_pad_group_v2_interface,
version, 0);
if (!client->groups[index]) { if (!client->groups[index]) {
wl_client_post_no_memory(client->client); wl_client_post_no_memory(client->client);
return; return;
@ -194,6 +197,7 @@ static void add_tablet_pad_group(struct wlr_tablet_v2_tablet_pad *pad,
struct tablet_pad_auxiliary_user_data *user_data = struct tablet_pad_auxiliary_user_data *user_data =
calloc(1, sizeof(struct tablet_pad_auxiliary_user_data)); calloc(1, sizeof(struct tablet_pad_auxiliary_user_data));
if (!user_data) { if (!user_data) {
wl_client_post_no_memory(client->client);
return; return;
} }
user_data->pad = client; user_data->pad = client;
@ -338,6 +342,14 @@ static void handle_wlr_tablet_pad_destroy(struct wl_listener *listener, void *da
} }
} }
struct wlr_tablet_pad_client_v2 *client;
struct wlr_tablet_pad_client_v2 *tmp_client;
wl_list_for_each_safe(client, tmp_client, &pad->clients, pad_link) {
zwp_tablet_pad_v2_send_removed(client->resource);
destroy_tablet_pad_v2(client->resource);
}
wl_list_remove(&pad->clients); wl_list_remove(&pad->clients);
wl_list_remove(&pad->link); wl_list_remove(&pad->link);
wl_list_remove(&pad->pad_destroy.link); wl_list_remove(&pad->pad_destroy.link);
@ -437,9 +449,6 @@ uint32_t wlr_send_tablet_v2_tablet_pad_enter(
pad->current_client = pad_client; pad->current_client = pad_client;
/* Pre-increment keeps 0 clean. wraparound would be after 2^32
* proximity_in. Someone wants to do the math how long that would take?
*/
uint32_t serial = wl_display_next_serial(wl_client_get_display(client)); uint32_t serial = wl_display_next_serial(wl_client_get_display(client));
zwp_tablet_pad_v2_send_enter(pad_client->resource, serial, zwp_tablet_pad_v2_send_enter(pad_client->resource, serial,

8
types/tablet_v2/wlr_tablet_v2_tablet.c
View file

@ -2,7 +2,6 @@
#define _POSIX_C_SOURCE 200809L #define _POSIX_C_SOURCE 200809L
#endif #endif
#include "tablet-unstable-v2-protocol.h"
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <types/wlr_tablet_v2.h> #include <types/wlr_tablet_v2.h>
@ -11,6 +10,8 @@
#include <wlr/types/wlr_tablet_v2.h> #include <wlr/types/wlr_tablet_v2.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "tablet-unstable-v2-protocol.h"
void destroy_tablet_v2(struct wl_resource *resource) { void destroy_tablet_v2(struct wl_resource *resource) {
struct wlr_tablet_client_v2 *tablet = tablet_client_from_resource(resource); struct wlr_tablet_client_v2 *tablet = tablet_client_from_resource(resource);
@ -92,9 +93,12 @@ void add_tablet_client(struct wlr_tablet_seat_client_v2 *seat,
return; return;
} }
int version = wl_resource_get_version(seat->resource);
client->resource = client->resource =
wl_resource_create(seat->wl_client, &zwp_tablet_v2_interface, 1, 0); wl_resource_create(seat->wl_client, &zwp_tablet_v2_interface,
version, 0);
if (!client->resource) { if (!client->resource) {
wl_resource_post_no_memory(seat->resource);
free(client); free(client);
return; return;
} }