-
Jon Turney authored
Add depend_files: to indicate dependencies for hw/xwin/ resource compilation (only has effect with meson >= 0.47.0).
0f9aaa2c -
Jon Turney authored
c.f. configure.ac:1663 v2: Also drop -lfb from XORG_DRIVER_LIBS, since it's linked statically into the Xorg server since c1703cdf.
37b1c3d0 -
Jon Turney authored8218c238
-
Jon Turney authored
Install libxcvt build dep on appveyor. Explicitly install python3.8 lxml to ensure it matches python version installed (to workaround issues with Cygwin installer). Drop explicit configuration of hal and udev, as meson.build now knows to turn those off for Cygwin.
d7d6e6a4 -
b8c12aac
-
add_global_arguments affects subprojects too. add_project_arguments only affects the current project. Signed-off-by:
Simon Ser <contact@emersion.fr>
43452690 -
Depends on: xorg/lib/libxcvt!6 Signed-off-by:
Simon Ser <contact@emersion.fr>
2df3a62c -
Povilas Kanapickas authored
Reviewed-by:
Michel Dänzer <mdaenzer@redhat.com>
9e82a674 -
Dave Airlie authoreda7b0a7fa
-
Povilas Kanapickas authored
Quite a lot of applications currently expect the screen DPI exposed by the X server to be 96 even when the real display DPI is different. Additionally, currently Xwayland completely ignores any hardware information and sets the DPI to 96. Accordingly the new behavior, even if it fixes a bug, should not be enabled automatically to all users. A better solution would be to make the default DPI stay as is and enable the correct behavior with a command line option (maybe -dpi auto, or similar). For now let's just revert the bug fix. This reverts commit 05b3c681. Signed-off-by:
Povilas Kanapickas <povilas@radix.lt>
35af1299 -
Jocelyn Falempe authored
logind send the resume event for input devices and drm device, in any order. if we call vt_enter before logind resume the drm device, it leads to a driver error, because logind has not done the DRM_IOCTL_SET_MASTER on it. Keep the old workaround to make sure we call systemd_logind_vtenter at least once if there are no platform device Signed-off-by:
Jocelyn Falempe <jfalempe@redhat.com> Reviewed-by:
Hans de Goede <hdegoede@redhat.com>
f5bd0396 -
Jocelyn Falempe authored
When switching to VT, the ioctl DRM_DROP_MASTER must be done before the ioctl VT_RELDISP. Otherwise the kernel can't change the modesetting reliably, and this leads to the console not showing up in some cases, like after unplugging a docking station with a DP or HDMI monitor. Before doing the VT_RELDISP, send a dbus message to logind, to pause the drm device, so logind will do the ioctl DRM_DROP_MASTER. With this patch, it changes the order logind will send the resume event, and drm will be sent last instead of first. so there is a also fix to call systemd_logind_vtenter() at the right time. Signed-off-by:
Jocelyn Falempe <jfalempe@redhat.com> Reviewed-by:
Hans de Goede <hdegoede@redhat.com>
da9d012a -
Olivier Fourdan authored
If no EGLstream capable device is found at startup, Xwayland's EGLstream backend will log an error message "glamor: No eglstream capable devices found". However, considering that the vast majority of drivers do not implement EGLstream, the lack of EGLstream capable device is more of the norm than the exception. Change the error message to a log verbose message. Signed-off-by:
Olivier Fourdan <ofourdan@redhat.com> Reviewed-by:
Simon Ser <contact@emersion.fr> Reviewed-by:
Jonas Ådahl <jadahl@gmail.com>
96c82bef -
Olivier Fourdan authored
On a normal startup sequence, the Xwayland glamor backend would log an error whenever a required Wayland protocol is missing. Those are not really errors though, more informational messages along the glamor backend selection process. Demote those errors to verbose messages to reduce the verbosity of Xwayland at startup by default. Signed-off-by:
Olivier Fourdan <ofourdan@redhat.com> Reviewed-by:
Jonas Ådahl <jadahl@gmail.com>
30d0d4a1 -
Add (verbose) statements to trace the actual backend used with glamor. That can be useful for debugging. Signed-off-by:
Olivier Fourdan <ofourdan@redhat.com> Reviewed-by:
Michel Dänzer <mdaenzer@redhat.com>
c5d1fed9 -
Currently, when given the choice, Xwayland will pick the GBM backend over the EGLstream backend if both are available, unless the command line option “-eglstream” is specified. The NVIDIA proprietary driver had no support for GBM until driver series 495, but starting with the driver series 495, both can be used. But there are other requirements with the rest of the stack, typically Mesa, egl-wayland, libglvnd as documented in the NVIDIA driver. So if the NVIDIA driver series 495 gets installed, Xwayland will pick the GBM backend even if EGLstream is available and may fail to render properly. To avoid that issue, prefer EGLstream if EGLstream and all the Wayland interfaces are available, and fallback to GBM automatically unless “-eglstream” was specified. With this, the compositor, given the choice, can decide which actual backend Xwayland would use by advertising (or not) the Wayland "wl_eglstream_controller" interface. This change has no impact on compositors which do not have support for EGLstream in the first place. Signed-off-by:
Olivier Fourdan <ofourdan@redhat.com> Acked-by:
Michel Dänzer <mdaenzer@redhat.com>
6dd9709b -
Peter Hutterer authored
The previous if/else condition resulted in us always setting the key type count to the current number of key types. Split this up correctly. Regression introduced in de940e06 Fixes #1249 Signed-off-by:
Peter Hutterer <peter.hutterer@who-t.net>
be16bd85 -
Jonathan Gray authored
Attempting to run fvwm on a x61/965gm with xserver 1.21.1 with the modesetting driver on OpenBSD/amd64 would cause the xserver to reliably crash. I tracked this down to the free() calls introduced in 2906ee5e (d1ca47e1 in branch). clang also warns about this: glamor_program.c:296:13: warning: variable 'vs_prog_string' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] glamor_program.c:290:9: warning: variable 'vs_prog_string' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] glamor_program.c:288:9: warning: variable 'vs_prog_string' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] glamor_program.c:277:13: warning: variable 'vs_prog_string' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] glamor_program.c:296:13: warning: variable 'fs_prog_string' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] glamor_program.c:290:9: warning: variable 'fs_prog_string' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] glamor_program.c:288:9: warning: variable 'fs_prog_string' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] glamor_program.c:277:13: warning: variable 'fs_prog_string' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized] Signed-off-by:
Jonathan Gray <jsg@jsg.id.au> Reviewed-by:
Olivier Fourdan <ofourdan@redhat.com> Fixes: 2906ee5e ("glamor: Fix leak in glamor_build_program()")
5ac63197 -
Povilas Kanapickas authored
This worked with autotools, but not meson build system. Signed-off-by:
Povilas Kanapickas <povilas@radix.lt>
04c93b98
- .appveyor.yml 4 additions, 3 deletions.appveyor.yml
- glamor/glamor_program.c 2 additions, 2 deletionsglamor/glamor_program.c
- hw/xfree86/common/xf86Events.c 11 additions, 0 deletionshw/xfree86/common/xf86Events.c
- hw/xfree86/common/xf86Helper.c 12 additions, 18 deletionshw/xfree86/common/xf86Helper.c
- hw/xfree86/common/xf86Init.c 17 additions, 1 deletionhw/xfree86/common/xf86Init.c
- hw/xfree86/common/xf86Priv.h 2 additions, 0 deletionshw/xfree86/common/xf86Priv.h
- hw/xfree86/drivers/modesetting/dri2.c 2 additions, 1 deletionhw/xfree86/drivers/modesetting/dri2.c
- hw/xfree86/modes/xf86Crtc.c 2 additions, 4 deletionshw/xfree86/modes/xf86Crtc.c
- hw/xfree86/modes/xf86RandR12.c 0 additions, 6 deletionshw/xfree86/modes/xf86RandR12.c
- hw/xfree86/os-support/linux/systemd-logind.c 22 additions, 5 deletionshw/xfree86/os-support/linux/systemd-logind.c
- hw/xwayland/xwayland-glamor-eglstream.c 5 additions, 3 deletionshw/xwayland/xwayland-glamor-eglstream.c
- hw/xwayland/xwayland-glamor-gbm.c 1 addition, 1 deletionhw/xwayland/xwayland-glamor-gbm.c
- hw/xwayland/xwayland-glamor.c 8 additions, 8 deletionshw/xwayland/xwayland-glamor.c
- hw/xwin/meson.build 5 additions, 1 deletionhw/xwin/meson.build
- hw/xwin/winclipboard/meson.build 1 addition, 0 deletionshw/xwin/winclipboard/meson.build
- include/meson.build 2 additions, 0 deletionsinclude/meson.build
- include/systemd-logind.h 2 additions, 0 deletionsinclude/systemd-logind.h
- meson.build 14 additions, 7 deletionsmeson.build
- xkb/xkb.c 6 additions, 7 deletionsxkb/xkb.c