Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-25 23:07:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] wayland: fail gracefully when interfaces are too old

Browse Source 
Before, we just attempt to bind, causing an obscure Wayland error.
This commit checks the interface versions and print better error
messages.
This commit is contained in:
Quantum 2021-02-24 19:44:49 -05:00 committed by Geoffrey McRae
parent 1111045546
commit 798a1aadb5
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/displayservers/Wayland/clipboard.c
View File

@ -329,7 +329,7 @@ bool waylandCBInit(void)
if (!wlWm.dataDeviceManager) if (!wlWm.dataDeviceManager)
{ {
DEBUG_ERROR("Missing wl_data_device_manager interface"); DEBUG_ERROR("Missing wl_data_device_manager interface (version 3+)");
return false; return false;
} }

8
client/displayservers/Wayland/output.c
View File

@ -77,12 +77,18 @@ void waylandOutputFree(void)
} }
} }
void waylandOutputBind(uint32_t name) void waylandOutputBind(uint32_t name, uint32_t version)
{ {
struct WaylandOutput * node = malloc(sizeof(struct WaylandOutput)); struct WaylandOutput * node = malloc(sizeof(struct WaylandOutput));
if (!node) if (!node)
return; return;
if (version < 3)
{
DEBUG_WARN("wl_output version too old: expected 3, got %d", version);
return;
}
node->name = name; node->name = name;
node->scale = 0; node->scale = 0;
node->output = wl_registry_bind(wlWm.registry, name, node->output = wl_registry_bind(wlWm.registry, name,

6
client/displayservers/Wayland/registry.c
View File

@ -31,12 +31,12 @@ static void registryGlobalHandler(void * data, struct wl_registry * registry,
uint32_t name, const char * interface, uint32_t version) uint32_t name, const char * interface, uint32_t version)
{ {
if (!strcmp(interface, wl_output_interface.name)) if (!strcmp(interface, wl_output_interface.name))
waylandOutputBind(name); waylandOutputBind(name, version);
else if (!strcmp(interface, wl_seat_interface.name) && !wlWm.seat) else if (!strcmp(interface, wl_seat_interface.name) && !wlWm.seat)
wlWm.seat = wl_registry_bind(wlWm.registry, name, &wl_seat_interface, 1); wlWm.seat = wl_registry_bind(wlWm.registry, name, &wl_seat_interface, 1);
else if (!strcmp(interface, wl_shm_interface.name)) else if (!strcmp(interface, wl_shm_interface.name))
wlWm.shm = wl_registry_bind(wlWm.registry, name, &wl_shm_interface, 1); wlWm.shm = wl_registry_bind(wlWm.registry, name, &wl_shm_interface, 1);
else if (!strcmp(interface, wl_compositor_interface.name)) else if (!strcmp(interface, wl_compositor_interface.name) && version >= 4)
wlWm.compositor = wl_registry_bind(wlWm.registry, name, &wl_compositor_interface, 4); wlWm.compositor = wl_registry_bind(wlWm.registry, name, &wl_compositor_interface, 4);
else if (!strcmp(interface, xdg_wm_base_interface.name)) else if (!strcmp(interface, xdg_wm_base_interface.name))
wlWm.xdgWmBase = wl_registry_bind(wlWm.registry, name, &xdg_wm_base_interface, 1); wlWm.xdgWmBase = wl_registry_bind(wlWm.registry, name, &xdg_wm_base_interface, 1);
@ -52,7 +52,7 @@ static void registryGlobalHandler(void * data, struct wl_registry * registry,
else if (!strcmp(interface, zwp_keyboard_shortcuts_inhibit_manager_v1_interface.name)) else if (!strcmp(interface, zwp_keyboard_shortcuts_inhibit_manager_v1_interface.name))
wlWm.keyboardInhibitManager = wl_registry_bind(wlWm.registry, name, wlWm.keyboardInhibitManager = wl_registry_bind(wlWm.registry, name,
&zwp_keyboard_shortcuts_inhibit_manager_v1_interface, 1); &zwp_keyboard_shortcuts_inhibit_manager_v1_interface, 1);
else if (!strcmp(interface, wl_data_device_manager_interface.name)) else if (!strcmp(interface, wl_data_device_manager_interface.name) && version >= 3)
wlWm.dataDeviceManager = wl_registry_bind(wlWm.registry, name, wlWm.dataDeviceManager = wl_registry_bind(wlWm.registry, name,
&wl_data_device_manager_interface, 3); &wl_data_device_manager_interface, 3);
else if (!strcmp(interface, zwp_idle_inhibit_manager_v1_interface.name)) else if (!strcmp(interface, zwp_idle_inhibit_manager_v1_interface.name))

2
client/displayservers/Wayland/wayland.h
View File

@ -221,7 +221,7 @@ void waylandWarpPointer(int x, int y, bool exiting);
// output module // output module
bool waylandOutputInit(void); bool waylandOutputInit(void);
void waylandOutputFree(void); void waylandOutputFree(void);
void waylandOutputBind(uint32_t name); void waylandOutputBind(uint32_t name, uint32_t version);
void waylandOutputTryUnbind(uint32_t name); void waylandOutputTryUnbind(uint32_t name);
int32_t waylandOutputGetScale(struct wl_output * output); int32_t waylandOutputGetScale(struct wl_output * output);

2
client/displayservers/Wayland/window.c
View File

@ -139,7 +139,7 @@ bool waylandWindowInit(const char * title, bool fullscreen, bool maximize, bool
if (!wlWm.compositor) if (!wlWm.compositor)
{ {
DEBUG_ERROR("Compositor missing wl_compositor, will not proceed"); DEBUG_ERROR("Compositor missing wl_compositor (version 4+), will not proceed");
return false; return false;
} }