-
These are only used inside xkb/*, so no need to export them. Signed-off-by:
Enrico Weigelt, metux IT consult <info@metux.net> Part-of: <!1475>
434044cb -
These are only used inside xkb/*, so no need to keep them exported. Signed-off-by:
Enrico Weigelt, metux IT consult <info@metux.net> Part-of: <!1475>
fec061fc -
The sun_apm.c support was written to a draft version of the interfaces that were integrated under a different name (SRN - Suspend/Resume Notification) in 2007 for OpenSolaris, and what eventually became Solaris 11.0. Adopt the official names and use the system-provided header file for these now. Signed-off-by:
Alan Coopersmith <alan.coopersmith@oracle.com> Part-of: <!1540>
7e119c51 -
Michael Dluhosch authored
The core keyboard before this change always used a layout of "us" even if you configured the build with another default layout. Signed-off-by:
Michael Dluhosch <michael.dluhosch@gmail.com> Part-of: <!1549>
e61bd1e5 -
David Gilbert authored
The last use of struct '_SrvXkmInfo' was removed in commit fbd77689 ("XKB: Ditch XkbFileInfo"). Remove it. The define MAX_TOC hasn't been used in this file since sometime in the mid 90's; it's unused in version '1997/05/20 11:42:06' but in '1.8 94/05/16 10:49:53' it's used in the definition of _SrvXkmInfo. Remove it. Build tested. Signed-off-by:
Dr. David Alan Gilbert <dave@treblig.org> Part-of: <!1558>
d94bff78 -
GLAMOR_HAS_GBM is ifdefed through the whole file, so checking for it again is redundant. Signed-off-by:
Yusuf Khan <yusisamerican@gmail.com> Part-of: <!1554>
c5d152c1 -
Signed-off-by:
Matthieu Herrb <matthieu@herrb.eu> Part-of: <!1559>
89c3f35d -
Before this change, the xwayland pkgconfig file will always contain an includedir directive, even though xwayland is not a linkable shared library: prefix=/nix/store/3spcjqp5zcyg8arz6dnsj59fal5yk3jy-xwayland-23.2.6 includedir=${prefix}/include exec_prefix=${prefix} xwayland=/nix/store/3spcjqp5zcyg8arz6dnsj59fal5yk3jy-xwayland-23.2.6/bin/Xwayland […] Cflags: -I${includedir} According to a bug reporter this trips up cmake [1], which expects that the include directory exists, which it does not since xwayland does not install any header files. Add the dataonly directive to pkgsconfig.generate() which will remove the default "." subdir and ensures that includedir is not set inside the pkgconfig file. Additionally enforce the install directory to $libdir/pkgconfig, since it otherwise will be installed to $datadir/pkgconfig, which precludes programs from finding the pkgconfig because share/pkgconfig is usually not included in the search path. The resulting pkgconfig does not contain an includedir: prefix=/nix/store/p7xhdzl65hfhzf36vxykzp2i9cyy7y6c-xwayland-23.2.6 exec_prefix=${prefix} xwayland=/nix/store/p7xhdzl65hfhzf36vxykzp2i9cyy7y6c-xwayland-23.2.6/bin/Xwayland have_glamor=true have_eglstream=true have_initfd=true have_listenfd=true have_verbose=true have_terminate_delay=true have_no_touch_pointer_emulation=true have_force_xrandr_emulation=true have_geometry=true have_fullscreen=true have_host_grab=true have_decorate=false have_enable_ei_portal=true have_byteswappedclients=true Name: Xwayland Description: X Server for Wayland Version: 23.2.6 [1]: https://github.com/NixOS/nixpkgs/pull/309075#issuecomment-2108381428 Signed-off-by:
Rouven Czerwinski <rouven@czerwinskis.de> Reviewed-by:
Olivier Fourdan <ofourdan@redhat.com> Part-of: <!1543>
9df084c8 -
Remove the previous change which ensured that the xwayland pkgconfig file was installed into $libdir. This is a breaking change for build systems searching for the xwayland pkg-config file. The sharedir location fits xwayland better since the pkg-config file does not contain linking information, it only contains the data on how to locate the xwayland binary and which features are enabled. Signed-off-by:
Rouven Czerwinski <rouven@czerwinskis.de> Reviewed-by:
Olivier Fourdan <ofourdan@redhat.com> Part-of: <!1543>
b9754729 -
Noticed this after trying to update to xorg-server-xwayland-24.1.0 in void linux https://github.com/void-linux/void-packages/pull/50457 Signed-off-by:
Fotios Valasiadis <fvalasiad@gmail.com> Part-of: <!1561>
af6180b2 -
Function `xwl_glamor_gbm_init_main_dev` does not check whether `xwl_screen->default_feedback.main_dev` a.k.a. `main_dev` is a valid pointer. This result in some special situation where main linux-dmabuf device is not accessible, such as KWin nested desktop, raising segment fault. This commit add a null pointer check to prevent crashing. Signed-off-by:
Chenx Dust <chenx_dust@outlook.com> Closes: #1683 Fixes: d7f1909e - xwayland/glamor/gbm: make wl_drm optional See-also: https://bugzilla.redhat.com/2284141 Part-of: <!1565>
76058333 -
While walking the window tree looking for the surface window to use, we should ignore windows using manual redirection. If a client manually redirects a window, it has control over how the contents of that window are presented. It's not safe to present them directly to the Wayland compositor. v2: break instead of continue, reword commit message (Michel) Signed-off-by:
Olivier Fourdan <ofourdan@redhat.com> Reviewed-by:
Michel Dänzer <mdaenzer@redhat.com> Fixes: 3a0fc268 - xwayland: Add xwl_window::surface_window Closes: #1677 Closes: #1679 Part-of: <!1564>
0509b13f -
If a child window of the same size is unmapped, we should stop walking the tree looking for the surface window to use. Whatever lies beneath is not visible anyway. This also fixes an issue with the Damage list becoming corrupted when destroying a window, because the first thing that DeleteWindow() does is to unmap the window and crush the window tree underneath it. Signed-off-by:
Olivier Fourdan <ofourdan@redhat.com> Reviewed-by:
Michel Dänzer <mdaenzer@redhat.com> Fixes: 3a0fc268 - xwayland: Add xwl_window::surface_window Closes: #1680 Part-of: <!1564>
32e16082
- hw/xfree86/common/xf86Config.c 1 addition, 1 deletionhw/xfree86/common/xf86Config.c
- hw/xfree86/drivers/modesetting/dri2.c 0 additions, 2 deletionshw/xfree86/drivers/modesetting/dri2.c
- hw/xfree86/os-support/solaris/sun_apm.c 20 additions, 47 deletionshw/xfree86/os-support/solaris/sun_apm.c
- hw/xwayland/meson.build 1 addition, 0 deletionshw/xwayland/meson.build
- hw/xwayland/xwayland-glamor-gbm.c 5 additions, 0 deletionshw/xwayland/xwayland-glamor-gbm.c
- hw/xwayland/xwayland-window.c 6 additions, 0 deletionshw/xwayland/xwayland-window.c
- include/xkbfile.h 0 additions, 85 deletionsinclude/xkbfile.h
- os/osdep.h 1 addition, 0 deletionsos/osdep.h
- present/meson.build 7 additions, 0 deletionspresent/meson.build
- xkb/xkbInit.c 0 additions, 7 deletionsxkb/xkbInit.c
- xkb/xkbout.c 3 additions, 1 deletionxkb/xkbout.c
- xkb/xkbtext.c 3 additions, 2 deletionsxkb/xkbtext.c
- xkb/xkbtext_priv.h 37 additions, 0 deletionsxkb/xkbtext_priv.h