gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-06-01 09:42:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix xdgshell protocol handling and resolve compile errors

Browse source
This commit is contained in:
pkgdemon 2024-08-27 19:50:48 -05:00
parent 4da87c840f
commit d08ee51ca4
1 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

74
Source/wayland/WaylandServer+Xdgshell.m
View file

@ -28,10 +28,14 @@
#include "wayland/WaylandServer.h" #include "wayland/WaylandServer.h"
#include <AppKit/NSEvent.h> #include <AppKit/NSEvent.h>
#include <AppKit/NSApplication.h> #include <AppKit/NSApplication.h>
#include <AppKit/NSWindow.h>
// Ensure the function GSWindowWithNumber is declared or included from the appropriate header
NSWindow *GSWindowWithNumber(int window_id);
static void static void
xdg_surface_on_configure(void *data, struct xdg_surface *xdg_surface, xdg_surface_on_configure(void *data, struct xdg_surface *xdg_surface,
uint32_t serial) uint32_t serial)
{ {
struct window *window = data; struct window *window = data;
@ -43,7 +47,6 @@ xdg_surface_on_configure(void *data, struct xdg_surface *xdg_surface,
free(window); free(window);
return; return;
} }
WaylandConfig *wlconfig = window->wlconfig;
NSEvent *ev = nil; NSEvent *ev = nil;
NSWindow *nswindow = GSWindowWithNumber(window->window_id); NSWindow *nswindow = GSWindowWithNumber(window->window_id);
@ -57,22 +60,22 @@ xdg_surface_on_configure(void *data, struct xdg_surface *xdg_surface,
if (window->buffer_needs_attach) if (window->buffer_needs_attach)
{ {
[window->instance flushwindowrect:NSMakeRect(window->pos_x, window->pos_y, [window->instance flushwindowrect:NSMakeRect(window->pos_x, window->pos_y,
window->width, window->height window->width, window->height)
):window->window_id]; :window->window_id];
} }
if (wlconfig->pointer.focus if (window->wlconfig->pointer.focus
&& wlconfig->pointer.focus->window_id == window->window_id) && window->wlconfig->pointer.focus->window_id == window->window_id)
{ {
ev = [NSEvent otherEventWithType:NSAppKitDefined ev = [NSEvent otherEventWithType:NSAppKitDefined
location:NSZeroPoint location:NSZeroPoint
modifierFlags:0 modifierFlags:0
timestamp:0 timestamp:0
windowNumber:(int) window->window_id windowNumber:(int) window->window_id
context:GSCurrentContext() context:GSCurrentContext()
subtype:GSAppKitWindowFocusIn subtype:GSAppKitWindowFocusIn
data1:0 data1:0
data2:0]; data2:0];
[nswindow sendEvent:ev]; [nswindow sendEvent:ev];
} }
@ -80,15 +83,14 @@ xdg_surface_on_configure(void *data, struct xdg_surface *xdg_surface,
static void static void
xdg_toplevel_configure(void *data, struct xdg_toplevel *xdg_toplevel, xdg_toplevel_configure(void *data, struct xdg_toplevel *xdg_toplevel,
int32_t width, int32_t height, struct wl_array *states) int32_t width, int32_t height, struct wl_array *states)
{ {
struct window *window = data; struct window *window = data;
WaylandConfig *wlconfig = window->wlconfig;
NSDebugLog(@"[%d] xdg_toplevel_configure %ldx%ld", window->window_id, width, NSDebugLog(@"[%d] xdg_toplevel_configure %dx%d", window->window_id, width,
height); height);
// the compositor can send 0.0x0.0 // The compositor can send 0x0
if (width == 0 || height == 0) if (width == 0 || height == 0)
{ {
return; return;
@ -99,45 +101,43 @@ xdg_toplevel_configure(void *data, struct xdg_toplevel *xdg_toplevel,
window->height = height; window->height = height;
xdg_surface_set_window_geometry(window->xdg_surface, 0, 0, window->width, xdg_surface_set_window_geometry(window->xdg_surface, 0, 0, window->width,
window->height); window->height);
NSEvent *ev = [NSEvent otherEventWithType:NSAppKitDefined NSEvent *ev = [NSEvent otherEventWithType:NSAppKitDefined
location:NSMakePoint(0.0, 0.0) location:NSMakePoint(0.0, 0.0)
modifierFlags:0 modifierFlags:0
timestamp:0 timestamp:0
windowNumber:window->window_id windowNumber:window->window_id
context:GSCurrentContext() context:GSCurrentContext()
subtype:GSAppKitWindowResized subtype:GSAppKitWindowResized
data1:window->width data1:window->width
data2:window->height]; data2:window->height];
[(GSWindowWithNumber(window->window_id)) sendEvent:ev]; [(GSWindowWithNumber(window->window_id)) sendEvent:ev];
} }
NSDebugLog(@"[%d] notify resize from backend=%ldx%ld", window->window_id, NSDebugLog(@"[%d] notify resize from backend=%dx%d", window->window_id,
width, height); width, height);
} }
static void static void
xdg_toplevel_close_handler(void *data, struct zxdg_toplevel_v6 *xdg_toplevel) xdg_toplevel_close_handler(void *data, struct xdg_toplevel *xdg_toplevel)
{ {
NSDebugLog(@"xdg_toplevel_close_handler"); NSDebugLog(@"xdg_toplevel_close_handler");
} }
static void static void
xdg_popup_configure(void *data, struct xdg_popup *xdg_popup, int32_t x, xdg_popup_configure(void *data, struct xdg_popup *xdg_popup, int32_t x,
int32_t y, int32_t width, int32_t height) int32_t y, int32_t width, int32_t height)
{ {
struct window *window = data; struct window *window = data;
WaylandConfig *wlconfig = window->wlconfig;
NSDebugLog(@"[%d] xdg_popup_configure [%d,%d %dx%d]", window->window_id, x, y, NSDebugLog(@"[%d] xdg_popup_configure [%d,%d %dx%d]", window->window_id, x, y,
width, height); width, height);
} }
static void static void
xdg_popup_done(void *data, struct xdg_popup *xdg_popup) xdg_popup_done(void *data, struct xdg_popup *xdg_popup)
{ {
struct window *window = data; struct window *window = data;
WaylandConfig *wlconfig = window->wlconfig;
window->terminated = YES; window->terminated = YES;
xdg_popup_destroy(xdg_popup); xdg_popup_destroy(xdg_popup);
wl_surface_destroy(window->surface); wl_surface_destroy(window->surface);
@ -145,7 +145,7 @@ xdg_popup_done(void *data, struct xdg_popup *xdg_popup)
static void static void
wm_base_handle_ping(void *data, struct xdg_wm_base *xdg_wm_base, wm_base_handle_ping(void *data, struct xdg_wm_base *xdg_wm_base,
uint32_t serial) uint32_t serial)
{ {
NSDebugLog(@"wm_base_handle_ping"); NSDebugLog(@"wm_base_handle_ping");
xdg_wm_base_pong(xdg_wm_base, serial); xdg_wm_base_pong(xdg_wm_base, serial);
@ -167,4 +167,4 @@ const struct xdg_popup_listener xdg_popup_listener = {
const struct xdg_toplevel_listener xdg_toplevel_listener = { const struct xdg_toplevel_listener xdg_toplevel_listener = {
.configure = xdg_toplevel_configure, .configure = xdg_toplevel_configure,
.close = xdg_toplevel_close_handler, .close = xdg_toplevel_close_handler,
}; };