itycodes
/
wlseeds
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to stable tablet-v2 protocol

Browse Source 
References: https://gitlab.freedesktop.org/wayland/wayland-protocols/-/merge_requests/284
master
Simon Ser 7 months ago committed by Kirill Primak
parent 099350a414
commit fe429b2463
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File

2
backend/wayland/backend.c
Unescape View File

@ -26,7 +26,7 @@
#include "xdg-activation-v1-client-protocol.h" #include "xdg-activation-v1-client-protocol.h"
#include "xdg-decoration-unstable-v1-client-protocol.h" #include "xdg-decoration-unstable-v1-client-protocol.h"
#include "xdg-shell-client-protocol.h" #include "xdg-shell-client-protocol.h"
#include "tablet-unstable-v2-client-protocol.h" #include "tablet-v2-client-protocol.h"
#include "relative-pointer-unstable-v1-client-protocol.h" #include "relative-pointer-unstable-v1-client-protocol.h"
#include "viewporter-client-protocol.h" #include "viewporter-client-protocol.h"

2
backend/wayland/meson.build
Unescape View File

@ -18,7 +18,7 @@ client_protos = [
'pointer-gestures-unstable-v1', 'pointer-gestures-unstable-v1',
'presentation-time', 'presentation-time',
'relative-pointer-unstable-v1', 'relative-pointer-unstable-v1',
'tablet-unstable-v2', 'tablet-v2',
'viewporter', 'viewporter',
'xdg-activation-v1', 'xdg-activation-v1',
'xdg-decoration-unstable-v1', 'xdg-decoration-unstable-v1',

2
backend/wayland/tablet_v2.c
Unescape View File

@ -10,7 +10,7 @@
#include "backend/wayland.h" #include "backend/wayland.h"
#include "util/time.h" #include "util/time.h"
#include "tablet-unstable-v2-client-protocol.h" #include "tablet-v2-client-protocol.h"
struct tablet_tool { struct tablet_tool {
/* static */ /* static */

2
include/types/wlr_tablet_v2.h
Unescape View File

@ -1,7 +1,7 @@
#ifndef TYPES_WLR_TABLET_V2_H #ifndef TYPES_WLR_TABLET_V2_H
#define TYPES_WLR_TABLET_V2_H #define TYPES_WLR_TABLET_V2_H
#include "tablet-unstable-v2-protocol.h" #include "tablet-v2-protocol.h"
#include <wayland-server-core.h> #include <wayland-server-core.h>
#include <wlr/types/wlr_tablet_v2.h> #include <wlr/types/wlr_tablet_v2.h>

2
include/wlr/types/wlr_tablet_tool.h
Unescape View File

@ -15,7 +15,7 @@
/* /*
* Copy+Paste from libinput, but this should neither use libinput, nor * Copy+Paste from libinput, but this should neither use libinput, nor
* tablet-unstable-v2 headers, so we can't include them * tablet-v2 headers, so we can't include them
*/ */
enum wlr_tablet_tool_type { enum wlr_tablet_tool_type {
/** A generic pen */ /** A generic pen */

2
include/wlr/types/wlr_tablet_v2.h
Unescape View File

@ -12,7 +12,7 @@
#include <wayland-server-core.h> #include <wayland-server-core.h>
#include <wlr/types/wlr_seat.h> #include <wlr/types/wlr_seat.h>
#include "tablet-unstable-v2-protocol.h" #include "tablet-v2-protocol.h"
/* This can probably be even lower,the tools don't have a lot of buttons */ /* This can probably be even lower,the tools don't have a lot of buttons */
#define WLR_TABLET_V2_TOOL_BUTTONS_CAP 16 #define WLR_TABLET_V2_TOOL_BUTTONS_CAP 16

2
protocol/meson.build
Unescape View File

@ -15,6 +15,7 @@ protocols = {
# Stable upstream protocols # Stable upstream protocols
'linux-dmabuf-v1': wl_protocol_dir / 'stable/linux-dmabuf/linux-dmabuf-v1.xml', 'linux-dmabuf-v1': wl_protocol_dir / 'stable/linux-dmabuf/linux-dmabuf-v1.xml',
'presentation-time': wl_protocol_dir / 'stable/presentation-time/presentation-time.xml', 'presentation-time': wl_protocol_dir / 'stable/presentation-time/presentation-time.xml',
'tablet-v2': wl_protocol_dir / 'stable/tablet/tablet-v2.xml',
'viewporter': wl_protocol_dir / 'stable/viewporter/viewporter.xml', 'viewporter': wl_protocol_dir / 'stable/viewporter/viewporter.xml',
'xdg-shell': wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml', 'xdg-shell': wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml',
@ -42,7 +43,6 @@ protocols = {
'pointer-gestures-unstable-v1': wl_protocol_dir / 'unstable/pointer-gestures/pointer-gestures-unstable-v1.xml', 'pointer-gestures-unstable-v1': wl_protocol_dir / 'unstable/pointer-gestures/pointer-gestures-unstable-v1.xml',
'primary-selection-unstable-v1': wl_protocol_dir / 'unstable/primary-selection/primary-selection-unstable-v1.xml', 'primary-selection-unstable-v1': wl_protocol_dir / 'unstable/primary-selection/primary-selection-unstable-v1.xml',
'relative-pointer-unstable-v1': wl_protocol_dir / 'unstable/relative-pointer/relative-pointer-unstable-v1.xml', 'relative-pointer-unstable-v1': wl_protocol_dir / 'unstable/relative-pointer/relative-pointer-unstable-v1.xml',
'tablet-unstable-v2': wl_protocol_dir / 'unstable/tablet/tablet-unstable-v2.xml',
'text-input-unstable-v3': wl_protocol_dir / 'unstable/text-input/text-input-unstable-v3.xml', 'text-input-unstable-v3': wl_protocol_dir / 'unstable/text-input/text-input-unstable-v3.xml',
'xdg-decoration-unstable-v1': wl_protocol_dir / 'unstable/xdg-decoration/xdg-decoration-unstable-v1.xml', 'xdg-decoration-unstable-v1': wl_protocol_dir / 'unstable/xdg-decoration/xdg-decoration-unstable-v1.xml',
'xdg-foreign-unstable-v1': wl_protocol_dir / 'unstable/xdg-foreign/xdg-foreign-unstable-v1.xml', 'xdg-foreign-unstable-v1': wl_protocol_dir / 'unstable/xdg-foreign/xdg-foreign-unstable-v1.xml',

2
types/tablet_v2/wlr_tablet_v2.c
Unescape View File

@ -8,7 +8,7 @@
#include <wlr/types/wlr_tablet_tool.h> #include <wlr/types/wlr_tablet_tool.h>
#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" #include "tablet-v2-protocol.h"
#define TABLET_MANAGER_VERSION 1 #define TABLET_MANAGER_VERSION 1

2
types/tablet_v2/wlr_tablet_v2_pad.c
Unescape View File

@ -7,7 +7,7 @@
#include <wlr/types/wlr_tablet_pad.h> #include <wlr/types/wlr_tablet_pad.h>
#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" #include "tablet-v2-protocol.h"
static const struct wlr_tablet_pad_v2_grab_interface default_pad_grab_interface; static const struct wlr_tablet_pad_v2_grab_interface default_pad_grab_interface;

2
types/tablet_v2/wlr_tablet_v2_tablet.c
Unescape View File

@ -7,7 +7,7 @@
#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" #include "tablet-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);

2
types/tablet_v2/wlr_tablet_v2_tool.c
Unescape View File

@ -8,7 +8,7 @@
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "util/set.h" #include "util/set.h"
#include "util/time.h" #include "util/time.h"
#include "tablet-unstable-v2-protocol.h" #include "tablet-v2-protocol.h"
static const struct wlr_tablet_tool_v2_grab_interface default_tool_grab_interface; static const struct wlr_tablet_tool_v2_grab_interface default_tool_grab_interface;

Write Preview
Loading…
Cancel
Save