XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,916 Commits 343 Branches 34 Tags
9d5cbe76efd8a9cdd1cfcab94829ca21cf394c8d
Commit Graph

9179 Commits

Author SHA1 Message Date
Andy Myers
39a67e9e03 xvfb: Add multiple CRTC support 
Multiple CRTCs can be added on a per-screen basis with the new -crtcs
option. Each CRTC has one associated output. Outputs beyond the first
are disabled by default and can be enabled by setting a mode. Outputs
can be disabled again by setting the associated CRTC's mode and output
to None.

Signed-off-by: Andy Myers <andy.myers@zetier.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1749>
(cherry picked from commit 7933cc24d0)
 2026-01-25 10:40:00 -08:00
Enrico Weigelt, metux IT consult
24da5e83c4 xfree86: xf86Opt.h: fix missing include 
<X11/Xdefs.h> is needed for `Bool` type.

Consumers shouldn't have to rely on Xdefs.h being accidentally included
by something else.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1782>
(cherry picked from commit 80a3df55ae)
 2026-01-25 10:40:00 -08:00
Aki Sakurai
f27942078f xquartz: fix inverted tablet pen Y tilt on macOS 
On macOS, the y tilt behavior is inverted; an increase in the tilt
value corresponds to tilting the device away from the user.

see https://chromium-review.googlesource.com/c/chromium/src/+/2348544
see 0f128fd7c5/src/plugins/platforms/cocoa/qnsview_tablet.mm (L63)

Fixes #792

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1779>
(cherry picked from commit 3562298068)
 2026-01-25 10:40:00 -08:00
Aki Sakurai
a49a8a3cf9 xquartz: fix compilation 
Fixes #1788

Fixes: 21df7a77d ("xquartz: fix length checking with bigreq")

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1777>
(cherry picked from commit da0de21b72)
 2026-01-25 10:40:00 -08:00
Spiky Caterpillar
d54c1e6c44 No longer leak FDs on VT switch. 
Modified-by: Povilas Kanapickas <povilas@radix.lt>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/997>
(cherry picked from commit 2631cad85d)
 2026-01-25 10:40:00 -08:00
Enrico Weigelt, metux IT consult
631064399a xfree86: vgahw: drop obsolete vgaHWSaveScreenWeak() 
No callers left, so no need to keep it around anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1724>
(cherry picked from commit 4235d2375a)
 2026-01-25 10:39:59 -08:00
Enrico Weigelt, metux IT consult
6acdd6fe93 xfree86: vgahw: drop obsolete vgaHWDisable() 
No callers left, so no need to keep it around anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1724>
(cherry picked from commit be9b89ef0f)
 2026-01-25 10:39:59 -08:00
Enrico Weigelt, metux IT consult
0b9b03310e xfree86: vgahw: drop obsolete vgaHWSetRegCounts 
No callers left, so no need to keep it around anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1724>
(cherry picked from commit bb0295b397)
 2026-01-25 10:39:59 -08:00
Enrico Weigelt, metux IT consult
f030036e67 xfree86: vgahw: make vgaHWSaveColormap() static 
No external callers anymore, so no need to keep it exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1724>
(cherry picked from commit 515d19806c)
 2026-01-25 10:39:59 -08:00
Enrico Weigelt, metux IT consult
4619318120 xfree86: vgahw: make vgaHWSaveMode() static 
No external callers left, so no need to keep it exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1724>
(cherry picked from commit 79522220a6)
 2026-01-25 10:39:59 -08:00
Enrico Weigelt, metux IT consult
4aa3815d2b xfree86: vgaha: make vgaHWRestoreColormap() static 
No external callers left, so no need to keep it exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1724>
(cherry picked from commit f004998b78)
 2026-01-25 10:39:59 -08:00
Enrico Weigelt, metux IT consult
0bdb813750 xfree86: vgahw: make vgaHWRestoreMode() static 
No external callers anymore, so no need to keep it exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1724>
(cherry picked from commit 30380cb207)
 2026-01-25 10:39:59 -08:00
Enrico Weigelt, metux IT consult
ac274eaf39 xfree86: vgahw: drop obsolete vgaHWBlankScreenWeak() 
Not used anymore, so no need to keep it around any longer.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1724>
(cherry picked from commit cd2457412f)
 2026-01-25 10:39:59 -08:00
Enrico Weigelt, metux IT consult
eb21cdaf4e xfree86: vgahw: drop obsolete vgaHWProtectWeak() 
Not used anymore, so no need to keep it around any longer.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1724>
(cherry picked from commit a415e6ed37)
 2026-01-25 10:39:59 -08:00
Enrico Weigelt, metux IT consult
92e1e0eec5 xfree86: drop obsolete macro INITARGS 
This macro isn't used anymore for 12 years now, see commit:

    5079db78ae

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1722>
(cherry picked from commit b0452ecff4)
 2026-01-25 10:39:59 -08:00
Enrico Weigelt, metux IT consult
c5f11163d8 xfree86: common: dont install xf86MatchDrivers.h 
xf86MatchDrivers.h doesn't export any symbols, thus doesn't need to
be installed.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1738>
(cherry picked from commit cd52a8f8a4)
 2026-01-25 10:39:59 -08:00
Enrico Weigelt, metux IT consult
51d0126cf0 xfree86: unexport xf86PlatformMatchDriver() 
Not used by any drivers, so no need to keep it exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1738>
(cherry picked from commit 0b123a0413)
 2026-01-25 10:39:59 -08:00
Enrico Weigelt, metux IT consult
4b1f99e9db xfree86: drop now obsolete swap procs 
Several SProc's have become no-ops, just calling the actual Proc's,
so we can get rid of them entirely.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1639>
(cherry picked from commit 16ca87703c)
 2026-01-25 10:39:59 -08:00
Enrico Weigelt, metux IT consult
131c8839d6 xwin: drop swapping request length fields 
The request struct's length fields aren't used anymore - we have the
client->req_len field instead, which also is bigreq-compatible.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1639>
(cherry picked from commit 643f91266e)
 2026-01-25 10:39:59 -08:00
Enrico Weigelt, metux IT consult
d122c3f7a0 xwayland: drop swapping request length fields 
The request struct's length fields aren't used anymore - we have the
client->req_len field instead, which also is bigreq-compatible.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1639>
(cherry picked from commit 4cb141307c)
 2026-01-25 10:39:59 -08:00
Enrico Weigelt, metux IT consult
126c901200 xquartz: drop swapping request length fields 
The request struct's length fields aren't used anymore - we have the
client->req_len field instead, which also is bigreq-compatible.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1639>
(cherry picked from commit 65224a2f9a)
 2026-01-25 10:39:59 -08:00
Enrico Weigelt, metux IT consult
5213d2bd24 xfree86: drop swapping request length fields 
The request struct's length fields aren't used anymore - we have the
client->req_len field instead, which also is bigreq-compatible.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1639>
(cherry picked from commit 7e5c342be1)
 2026-01-25 10:39:59 -08:00
Enrico Weigelt, metux IT consult
f5a24358bf xquartz: fix length checking with bigreq 
The authorative source of the request frame size is client->req_len,
especially with big requests larger than 2^18 bytes.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1639>
(cherry picked from commit ef396a28b7)
 2026-01-25 10:39:58 -08:00
Enrico Weigelt, metux IT consult
5951f1f415 xfree86: parser: rename IOBASE for fixing name conflict 
Resolve conflicts with OS headers definining IOBASE by renaming the
IOBASE enum value to XF86_TOKEN_IOBASE.

This way, don't need the special #undef hack anymore.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1405>
(cherry picked from commit 584bbe9988)
 2026-01-25 10:39:58 -08:00
Enrico Weigelt, metux IT consult
f171a631ff xfree86: parser: drop obsolete token enum values 
These have been forgotten on some major cleanup back almost two decades ago.
(Daniel dropped a lot of dead code, which already had been removed earlier
but merged back accidentially).

Didn't look further back on where exactly they had become obsolete - being
unused for decades should be enough justification for dropping.

Fixes: 81913a1291
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1405>
(cherry picked from commit a1fa019012)
 2026-01-25 10:39:58 -08:00
Olivier Fourdan
f719341987 xwayland/glamor: Disable GLAMOR after GBM cleanup 
The cleanup function for GBM is called on the various error paths.

Once xwl_glamor_gbm_cleanup() has been called, GBM support is no longer
usable (and the corresponding data structures are freed), so there is
no way we can keep using GLAMOR after that point.

Make sure to explicitly disable GLAMOR support in that case, so we do
not crash later on trying to use GBM.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1768>
(cherry picked from commit e8784b7d89)
 2026-01-25 10:39:58 -08:00
Michel Dänzer
dc95d5cbc2 xwayland/glamor: Clean-up GBM's screen private on failure 
If we bail out initializing GBM glamor backend, the screen private for
the GBM backend may remain, pointing at freed memory.

To avoid that issue, make sure to clear up the screen's private for the
GBM backend.

Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1785
Signed-off-by: Michel Dänzer <michel@daenzer.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1768>
(cherry picked from commit b27b5cd5f3)
 2026-01-25 10:39:58 -08:00
Julian Orth
d038d2c080 xwayland: Don't run key behaviors and actions 
Consider the following keymap:

```xkb
xkb_keymap {
    xkb_keycodes {
        <compose> = 135;
    };
    xkb_symbols {
        key <compose> {
            [ SetGroup(group = +1) ]
        };
    };
};
```

When the user presses the compose key, the following happens:

1. The compositor forwards the key to Xwayland.
2. Xwayland executes the SetGroup action and sets the base_group to 1
   and the effective group to 1.
3. The compositor updates its own state and sends the effective group,
   1, to Xwayland.
4. Xwayland sets the locked group to 1 and the effective group to
   1 + 1 = 2.

This is wrong since pressing compose should set the effective group to 1
but to X applications the effective group appears to be 2.

This commit makes it so that Xwayland completely ignores the key
behaviors and actions of the keymap and only updates the modifier and
group components in response to the wayland modifiers events.

Signed-off-by: Julian Orth <ju.orth@gmail.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1758>
(cherry picked from commit 45c1d22ff6)
 2026-01-25 10:39:58 -08:00
Julian Orth
c74a340dc6 xwayland: copy repeat settings from the compositor map 
Previously the repeat settings sent by the compositor were completely
ignored.

Signed-off-by: Julian Orth <ju.orth@gmail.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1759>
(cherry picked from commit 8d9184db5f)
 2026-01-25 10:39:58 -08:00
Olivier Fourdan
8830263b0a xwayland: Do not keep the cursor's pixmap around 
Currently, Xwayland creates a pixmap backed by shared memory buffer as
soon as an X11 cursor is realized, which is destroyed when the cursor is
eventually unrealized.

If an X11 client is leaking cursors, Xwayland will be creating new
pixmaps continuously, which will eventually cause an error once the
limit is reached, and get Xwayland killed.

However, we do not need the shared memory buffer to stay around, we
already have the buffer retention mechanism which will take care of
keeping the buffer around until the Wayland compositor is done with it,
so we could just create and destroy the pixmap as needed when setting
the cursor.

That would not fix the leak in the X11 application, yet that would
mitigate the risk of Xwayland being killed by reaching the shared memory
limits, until the client itself reaches the limit of X11 resources.

v2: Don't increase the pixmap refcnt to destroy it just after (Michel)

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Suggested-by: Michel Dänzer <michel@daenzer.net>
See-also: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1773
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1754>
(cherry picked from commit 8707d2835c)
 2026-01-25 10:39:58 -08:00
Matt Turner
53144575ed hw/xfree86: Fix -Wincompatible-pointer-types sbus compile failure 
```
../hw/xfree86/common/xf86sbusBus.c: In function ‘xf86SbusConfigureNewDev’:
../hw/xfree86/common/xf86sbusBus.c:751:21: error: passing argument 1 of ‘XNFasprintf’ from incompatible pointer type [-Wincompatible-pointer-types]
  751 |         XNFasprintf(&GDev->busID, "SBUS:%s", promPath);
      |                     ^~~~~~~~~~~~
      |                     |
      |                     const char **
```

Apply the same fix as in commit e1e01d2e3 ("xfree86/common: Warning
fixes. Mostly const string handling.")

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1751>
(cherry picked from commit bdacb100bf)
 2026-01-25 10:39:58 -08:00
Matt Turner
0368e9351b hw/xfree86: Fix -Wmissing-prototypes warnings 
None of these functions are used elsewhere in the Xserver nor in any of
the xf86-video-sun* DDXs.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1751>
(cherry picked from commit 00a96cd82a)
 2026-01-25 10:39:58 -08:00
Olivier Fourdan
d481ad6ba9 xwayland: Add xdg-system-bell support 
For the Wayland compositors who do not implement XkbBellNotifyMask but
support the Wayland protocol xdg-system-bell, use that to ring the
bell.

v2: Be more selective on the device, make sure it's a keyboard and it
    has core events.

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1742>
(cherry picked from commit e4804d11e8)
 2026-01-25 10:39:58 -08:00
Michel Dänzer
6a06151731 xwayland: Always decrement expecting_event in xwl_output_create 
If we bail without decrementing it, xwl_screen_init will keep waiting
indefinitely for an event which never arrives.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1739>
(cherry picked from commit 8c4b137237)
 2026-01-25 10:39:58 -08:00
Michel Dänzer
8972dd93aa xwayland/glamor: Drop expecting_event bailing from xwl_drm_handle_device 
If we bail without decrementing xwl_screen->expecting_event,
xwl_screen_init will keep waiting indefinitely for an event which never
arrives.

Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1648
Fixes: 2f113d68f6 ("xwayland: Add glamor and DRI3 support")
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1739>
(cherry picked from commit 375c35a5e4)
 2026-01-25 10:39:58 -08:00
Michel Dänzer
2566b7ac31 xwayland/present: Check allow_commits in xwl_present_flip 
We're not supposed to call wl_surface_commit while
xwl_window->allow_commits is false. Bailing results in falling back to
a copy.

Noticed by inspection while looking into an issue which turned out to be
due to something else.

Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1764
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1732>
(cherry picked from commit 56ba0b2a5f)
 2026-01-25 10:39:58 -08:00
Alan Coopersmith
6c4c4bbfff modesetting: avoid memory leak when ms_present_check_unflip() returns FALSE 
Found by Oracle Parfait 13.3 static analyzer:
   Memory leak [memory-leak]:
      Memory leak of pointer event allocated with calloc(1, 16)
        at line 470 of hw/xfree86/drivers/modesetting/present.c in
	function 'ms_present_unflip'.
          event allocated at line 431 with calloc(1, 16)
          event leaks when ms_present_check_unflip(...) == 0 at line 438
              and i >= config->num_crtc at line 445

Fixes: 13c7d53df ("modesetting: Implement page flipping support for Present.")
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1730>
(cherry picked from commit bf63d9b34e)
 2026-01-25 10:39:58 -08:00
Alan Coopersmith
be52ca8116 xfree86: avoid memory leak on realloc failure 
Found by Oracle Parfait 13.3 static analyzer:
   Memory leak [memory-leak]:
      Memory leak of pointer optname allocated with asprintf(&optname,
      "\"%s\"", p->name)
        at line 326 of hw/xfree86/common/xf86Configure.c in function
	'configureDeviceSection'.
          optname allocated at line 309 with asprintf(&optname, "\"%s\"",
	  p->name)

Fixes: code inherited from XFree86
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1730>
(cherry picked from commit fa711c486a)
 2026-01-25 10:39:57 -08:00
Enrico Weigelt, metux IT consult
34f3752ab8 dix: unexport Ones() 
It's not used by any module/driver, so no need to keep it exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1695>
(cherry picked from commit 1642adec3b)
 2026-01-25 10:39:57 -08:00
Michel Dänzer
cf0da4e7c8 xwayland/glamor/gbm: Don't close fence_fd after xwl_glamor_wait_fence 
eglCreateSyncKHR takes ownership of the file descriptor. Noticed by
inspection.

While we're at it, move the fence_fd declaration to the scope where
it's used.

Last but not least, close the fd in xwl_glamor_wait_fence when bailing
before calling eglCreateSyncKHR, and document that it takes ownership.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1712>
(cherry picked from commit 91b5a003a5)
 2026-01-25 10:39:57 -08:00
YaoBing Xiao
4374000a50 xwayland: prevent potential null pointer dereference 
Signed-off-by: YaoBing Xiao <xiaoyaobing@uniontech.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1718>
(cherry picked from commit e12d9863fd)
 2026-01-25 10:39:57 -08:00
Tj
1887172161 xfree86: fbdevhw: fix pci detection on recent Linux 
Linux kernel v6.9 has changed the symlink to point to the parent device. This
breaks fbdev_open() detection logic. Change it to use the subsystem symlink
instead which will remain stable.

Kernel v6.8:

[    14.067] (II) fbdev_open() sysfs_path=/sys/class/graphics/fb0
[    14.067] (II) fbdev_open() buf=../../devices/platform/vesa-framebuffer.0/graphics/fb0

Kernel v6.9:

[    15.609] (II) fbdev_open() sysfs_path=/sys/class/graphics/fb0
[    15.609] (II) fbdev_open() buf=../../devices/pci0000:00/0000:00:01.0/vesa-framebuffer.0/graphics/fb0

Originally found in automated Debian ISO QA testing [0] and confirmed in Linux [1].

Tested on kernels v6.9.7 and v6.8.12

[0] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1075713
[1] https://lore.kernel.org/lkml/lLyvPFC_APGHNfyGNHRpQy5izBikkaTPOpHooZIT3fFAoJPquSI31ZMueA99XTdr8ysir3X7O7IMdc6za-0m79vr_claeparHhoRouVgHOI=@proton.me/

Fixes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1714
Signed-off-by: Tj <tj.iam.tj@proton.me>
Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1612>
(cherry picked from commit 728b54528d)
 2026-01-25 10:39:57 -08:00
Enrico Weigelt, metux IT consult
8d75072240 xfree86: dri: unexport DRIDestroyWindow() and make it static 
This function is only called inside dri.c, not used by any drivers
(and wouldn't make sense to do so), so no need to keep it exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1713>
(cherry picked from commit 73cf8d3560)
 2026-01-25 10:39:57 -08:00
Enrico Weigelt, metux IT consult
8ecbebff3d xwin: fix memleak on freeing pixmaps 
Xwin's DestroyPixmap proc just free()s the PixmapRec directly, w/o catering
for devPrivate's, so leaving a memleak. The correct DIX function for this
is FreePixmap().

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1710>
(cherry picked from commit 9323ba6fed)
 2026-01-25 10:39:57 -08:00
Enrico Weigelt, metux IT consult
e2ce0aec71 xquartz: drop unused code 
These code pieces have been commented out since their introduction back
almost two decades ago, so probably no need for them anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1603>
(cherry picked from commit 78d420870f)
 2026-01-25 10:39:57 -08:00
Enrico Weigelt, metux IT consult
6bc94b0fdc xfree86: modesetting: merge FreeRec() into FreeScreen() 
No need to have one function doing nothing more than calling another one
with the same prototype.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1611>
(cherry picked from commit e97adda52d)
 2026-01-25 10:39:57 -08:00
Enrico Weigelt, metux IT consult
c0cf638136 xfree86: os-support: move including machine/sysarch.h out of public header 
The only consumer seems to be one BSD specific file, the few drivers using
the *_iopl seem to include it on their own. Thus, no need to keep it in
public headers.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1420>
(cherry picked from commit bd40e9f836)
 2026-01-25 10:39:57 -08:00
Enrico Weigelt, metux IT consult
b2078acc33 xfree86: os-support: move CONSOLE_X_TV_ON/OFF to i386_video.c 
These are only used in i386_video.c, so move them there.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1420>
(cherry picked from commit 4d677fab46)
 2026-01-25 10:39:57 -08:00
Enrico Weigelt, metux IT consult
838d675fd8 xfree86: os-support: move CONSOLE_X_MODE_ON/OFF to bsd_init.c 
These are only used in bsd_init.c, so move them there.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1420>
(cherry picked from commit 758bee502d)
 2026-01-25 10:39:57 -08:00
Enrico Weigelt, metux IT consult
394a8cae62 xfree86: os-support: drop unused CONSOLE_GET_* defines 
These don't seem to be used anywhere, so we can drop them.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1420>
(cherry picked from commit d7e0d174a5)
 2026-01-25 10:39:57 -08:00