From de16c2dd4d8bb2ab1b8cd2cacfd485908b306802 Mon Sep 17 00:00:00 2001 From: stefan11111 Date: Wed, 9 Sep 2026 01:14:45 +0300 Subject: [PATCH] kdrive: Move glamor and linux info from the Xfbdev man page to the Xkdrive man page Signed-off-by: stefan11111 --- hw/kdrive/Xkdrive.man | 46 ++++++++++++++++++++++++++++++++++++++ hw/kdrive/fbdev/Xfbdev.man | 33 --------------------------- 2 files changed, 46 insertions(+), 33 deletions(-) diff --git a/hw/kdrive/Xkdrive.man b/hw/kdrive/Xkdrive.man index e74d5bfad3..d9a85916b4 100644 --- a/hw/kdrive/Xkdrive.man +++ b/hw/kdrive/Xkdrive.man @@ -44,6 +44,41 @@ enable emulation of a middle mouse button by chording. .TP 8 .B -3button disable emulation of a middle mouse button by chording. + +.PP +Additionally, kdrive X servers using the common glamor code (currently Xfbdev), +also support the following options: + +.TP 8 +.B -dri "" +enables DRI3 support for the X server. +.TP 8 +.B -glamor +force enables glamor render acceleration (even on top of sw renderers like softpipe/llvmpipe). +.TP 8 +.B -gbm +allows glamor to use libgbm (it is only used for matching EGLDeviceEXT's to dri fd's). +.TP 8 +.B -direct-dri3 +Forces glamor to use the direct implementation of DRI3. +.TP 8 +.B -noglamor +force disables glamor render acceleration. +Also disables DRI3 and X-Video support. GLX is still enabled. +.TP 8 +.B -glvendor "" +tells the X server what gl vendor library to use. +Particularly useful on multi-card systems. +.TP 8 +.B -force-gl +tells the X server to only use desktop OpenGL contexts. +.TP 8 +.B -force-es +tells the X server to only use embedded GLES contexts. +.TP 8 +.B -noxv +disables X-Video support. + .SH KEYBOARD The .B Xkdrive @@ -66,6 +101,17 @@ Immediately kills the server -- no questions asked. It can be disabled by adding the .B -nozap command-line argument. + +.PP +Additionally, kdrive X servers using the linux backend (currently Xfbdev), +also support the following special key combinations: + +.TP 8 +.B Ctrl+Alt+F1...F12 +For systems with virtual terminal support, these keystroke +combinations are used to switch to virtual terminals 1 through 12, +respectively. + .SH SEE ALSO .BR X (@miscmansuffix@), .BR Xserver (@appmansuffix@), diff --git a/hw/kdrive/fbdev/Xfbdev.man b/hw/kdrive/fbdev/Xfbdev.man index 46ec9ed7ac..3e72374ccd 100644 --- a/hw/kdrive/fbdev/Xfbdev.man +++ b/hw/kdrive/fbdev/Xfbdev.man @@ -24,35 +24,9 @@ also accepts the following additional options: .B -fb "" sets the framebuffer device path the X server will use. .TP 8 -.B -dri "" -enables DRI3 support for the X server. -.TP 8 .B -noshadow disables the ShadowFB layer on supported hw, may slightly increase performance. May also lead to flickering. -.TP 8 -.B -glamor -force enables glamor render acceleration (even on top of sw renderers like softpipe/llvmpipe). -.TP 8 -.B -gbm -allows glamor to use libgbm (it is only used for matching EGLDeviceEXT's to dri fd's). -.TP 8 -.B -noglamor -force disables glamor render acceleration. -Also disables DRI3 and X-Video support. GLX is still enabled. -.TP 8 -.B -glvendor "" -tells the X server what gl vendor library to use. -Particularly useful on multi-card systems. -.TP 8 -.B -force-gl -tells the X server to only use desktop OpenGL contexts. -.TP 8 -.B -force-es -tells the X server to only use embedded GLES contexts. -.TP 8 -.B -noxv -disables X-Video support. .SH CONFIGURATION . @@ -103,13 +77,6 @@ Two X11 screens, the first one below the second one: .B Xfbdev supports the common special key combinations of the Xkdrive family of servers. Please see Xkdrive(@appmansuffix@). -.B Xfbdev -also accepts the following additional special key combinations: -.TP 8 -.B Ctrl+Alt+F1...F12 -For systems with virtual terminal support, these keystroke -combinations are used to switch to virtual terminals 1 through 12, -respectively. .SH SEE ALSO X(@miscmansuffix@), Xserver(@appmansuffix@), Xkdrive(@appmansuffix@), xdm(@appmansuffix@), xinit(@appmansuffix@).