mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Chase wlroots X11 hints update

Browse source
This commit is contained in:
Johan Malm 2022-04-20 18:48:49 +01:00
parent c7aaa8dd61
commit 286b2146c3
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -57,6 +57,7 @@ wayland_server = dependency('wayland-server', version: '>=1.19.0')
wayland_protos = dependency('wayland-protocols') wayland_protos = dependency('wayland-protocols')
xkbcommon = dependency('xkbcommon') xkbcommon = dependency('xkbcommon')
xcb = dependency('xcb', required: get_option('xwayland')) xcb = dependency('xcb', required: get_option('xwayland'))
xcb_icccm = dependency('xcb-icccm', required: get_option('xwayland'))
drm_full = dependency('libdrm') drm_full = dependency('libdrm')
drm = drm_full.partial_dependency(compile_args: true, includes: true) drm = drm_full.partial_dependency(compile_args: true, includes: true)
xml2 = dependency('libxml-2.0') xml2 = dependency('libxml-2.0')
@ -83,6 +84,7 @@ labwc_deps = [
wayland_server, wayland_server,
wlroots, wlroots,
xkbcommon, xkbcommon,
xcb_icccm,
xml2, xml2,
glib, glib,
cairo, cairo,

5
src/view.c
View file

@ -2,6 +2,7 @@
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <strings.h> #include <strings.h>
#include <xcb/xcb_icccm.h>
#include "labwc.h" #include "labwc.h"
#include "ssd.h" #include "ssd.h"
@ -72,8 +73,8 @@ view_adjust_size(struct view *view, int *w, int *h)
int min_height = MIN_VIEW_HEIGHT; int min_height = MIN_VIEW_HEIGHT;
#if HAVE_XWAYLAND #if HAVE_XWAYLAND
if (view->type == LAB_XWAYLAND_VIEW) { if (view->type == LAB_XWAYLAND_VIEW) {
struct wlr_xwayland_surface_size_hints *hints = xcb_size_hints_t *hints = view->xwayland_surface->size_hints;
view->xwayland_surface->size_hints;
/* /*
* Honor size increments from WM_SIZE_HINTS. Typically, X11 * Honor size increments from WM_SIZE_HINTS. Typically, X11
* terminal emulators will use WM_SIZE_HINTS to make sure that * terminal emulators will use WM_SIZE_HINTS to make sure that

2
subprojects/wlroots.wrap
View file

@ -1,3 +1,3 @@
[wrap-git] [wrap-git]
url = https://gitlab.freedesktop.org/wlroots/wlroots.git url = https://gitlab.freedesktop.org/wlroots/wlroots.git
revision = 2e14bed9 revision = 640f3b9f2156a007c5d1a36afdee570e123c95e4