xserver: Branch 'master' - 3 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Feb 6 20:27:35 UTC 2025
hw/xnest/Args.c | 17 +++++++++++++++--
hw/xnest/Color.c | 3 +--
hw/xnest/Cursor.c | 3 +--
hw/xnest/Display.c | 3 +--
hw/xnest/Events.c | 3 +--
hw/xnest/Font.c | 3 +--
hw/xnest/GC.c | 3 +--
hw/xnest/GCOps.c | 3 +--
hw/xnest/Handlers.c | 3 +--
hw/xnest/Init.c | 3 +--
hw/xnest/Keyboard.c | 3 +--
hw/xnest/Pixmap.c | 3 +--
hw/xnest/Pointer.c | 3 +--
hw/xnest/Screen.c | 3 +--
hw/xnest/Visual.c | 3 +--
hw/xnest/Window.c | 3 +--
hw/xnest/xnest-config.h | 36 ------------------------------------
17 files changed, 30 insertions(+), 68 deletions(-)
New commits:
commit 30fb73d9af7f3b6345daa24e02a6344d52c3903e
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Jul 30 13:09:49 2024 +0200
Xnest: drop obsolete xnest-config.h
This file became pretty no-op, just including dix-config.h.
So we can remove it now and include dix-config.h directly.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1632>
diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c
index a57da839b..aa87558f3 100644
--- a/hw/xnest/Args.c
+++ b/hw/xnest/Args.c
@@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-
-#include <xnest-config.h>
+#include <dix-config.h>
#include <X11/X.h>
#include <X11/Xdefs.h>
diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c
index dea33f57d..b8460b974 100644
--- a/hw/xnest/Color.c
+++ b/hw/xnest/Color.c
@@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-
-#include <xnest-config.h>
+#include <dix-config.h>
#include <X11/X.h>
#include <X11/Xdefs.h>
diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c
index ea7d94912..89f508709 100644
--- a/hw/xnest/Cursor.c
+++ b/hw/xnest/Cursor.c
@@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-
-#include <xnest-config.h>
+#include <dix-config.h>
#include <X11/X.h>
#include <X11/Xdefs.h>
diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c
index e9e98fcb4..a3e930135 100644
--- a/hw/xnest/Display.c
+++ b/hw/xnest/Display.c
@@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-
-#include <xnest-config.h>
+#include <dix-config.h>
#include <string.h>
#include <errno.h>
diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c
index 155296785..0cc0d225d 100644
--- a/hw/xnest/Events.c
+++ b/hw/xnest/Events.c
@@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-
-#include <xnest-config.h>
+#include <dix-config.h>
#include <X11/X.h>
#include <X11/Xdefs.h>
diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c
index 060f29a91..eff88f5d9 100644
--- a/hw/xnest/Font.c
+++ b/hw/xnest/Font.c
@@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-
-#include <xnest-config.h>
+#include <dix-config.h>
#include <stddef.h>
#include <X11/X.h>
diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c
index f8d99d6a2..a50803ea5 100644
--- a/hw/xnest/GC.c
+++ b/hw/xnest/GC.c
@@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-
-#include <xnest-config.h>
+#include <dix-config.h>
#include <X11/X.h>
#include <X11/Xdefs.h>
diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c
index 772076bb3..42db50c10 100644
--- a/hw/xnest/GCOps.c
+++ b/hw/xnest/GCOps.c
@@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-
-#include <xnest-config.h>
+#include <dix-config.h>
#include <X11/X.h>
#include <X11/Xdefs.h>
diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c
index a06f3f90d..1484beec4 100644
--- a/hw/xnest/Handlers.c
+++ b/hw/xnest/Handlers.c
@@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-
-#include <xnest-config.h>
+#include <dix-config.h>
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index 95b271777..fb30d7686 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-
-#include <xnest-config.h>
+#include <dix-config.h>
#include <stddef.h>
#include <X11/X.h>
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index d60d7dd8b..cd6e69b0b 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-
-#include <xnest-config.h>
+#include <dix-config.h>
#ifdef WIN32
#include <X11/Xwindows.h>
diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c
index 55ea97e39..3910db3c7 100644
--- a/hw/xnest/Pixmap.c
+++ b/hw/xnest/Pixmap.c
@@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-
-#include <xnest-config.h>
+#include <dix-config.h>
#include <X11/X.h>
#include <X11/Xdefs.h>
diff --git a/hw/xnest/Pointer.c b/hw/xnest/Pointer.c
index e3b702ea9..0eced5741 100644
--- a/hw/xnest/Pointer.c
+++ b/hw/xnest/Pointer.c
@@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-
-#include <xnest-config.h>
+#include <dix-config.h>
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c
index 9455527ca..2a762a782 100644
--- a/hw/xnest/Screen.c
+++ b/hw/xnest/Screen.c
@@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-
-#include <xnest-config.h>
+#include <dix-config.h>
#include <X11/X.h>
#include <X11/Xdefs.h>
diff --git a/hw/xnest/Visual.c b/hw/xnest/Visual.c
index 858324b2c..37a6ac6cf 100644
--- a/hw/xnest/Visual.c
+++ b/hw/xnest/Visual.c
@@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-
-#include <xnest-config.h>
+#include <dix-config.h>
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c
index 3630c7d98..d7e388568 100644
--- a/hw/xnest/Window.c
+++ b/hw/xnest/Window.c
@@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as
is" without express or implied warranty.
*/
-
-#include <xnest-config.h>
+#include <dix-config.h>
#include <X11/X.h>
#include <X11/Xdefs.h>
diff --git a/hw/xnest/xnest-config.h b/hw/xnest/xnest-config.h
deleted file mode 100644
index c8b3483ed..000000000
--- a/hw/xnest/xnest-config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2005 Red Hat Inc., Raleigh, North Carolina.
- *
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation on the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef XNEST_CONFIG_H
-#define XNEST_CONFIG_H
-
-#include <dix-config.h>
-
-#endif /* XNEST_CONFIG_H */
commit 7130072dc5c72999a10d7b9488ad4d1a3eeb1818
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Jul 30 12:56:06 2024 +0200
Xnest: no need to include xkb-config.h
Xnest doesn't need anything from xkb-config.h, so no need to include it.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1632>
diff --git a/hw/xnest/xnest-config.h b/hw/xnest/xnest-config.h
index fb2e3beee..c8b3483ed 100644
--- a/hw/xnest/xnest-config.h
+++ b/hw/xnest/xnest-config.h
@@ -29,6 +29,5 @@
#define XNEST_CONFIG_H
#include <dix-config.h>
-#include <xkb-config.h>
#endif /* XNEST_CONFIG_H */
commit ec13a6a61f43672adea025a04321da462d81995f
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Jul 30 12:26:40 2024 +0200
Xnest: simplify disabling unsupported extension
Instead of strange #undef hacks in various places, just go the straight
route and set the corresponding no*Extension flags on server startup.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1632>
diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c
index cb0cded86..a57da839b 100644
--- a/hw/xnest/Args.c
+++ b/hw/xnest/Args.c
@@ -25,6 +25,7 @@ is" without express or implied warranty.
#include "misc.h"
#include "scrnintstr.h"
#include "servermd.h"
+#include "extinit.h"
#include "Xnest.h"
@@ -54,6 +55,19 @@ Window xnestParentWindow = 0;
int
ddxProcessArgument(int argc, char *argv[], int i)
{
+ /* disable some extensions we currently don't support yet */
+#ifdef MITSHM
+ noMITShmExtension = TRUE;
+#endif
+
+#ifdef COMPOSITE
+ noCompositeExtension = TRUE;
+#endif
+
+#ifdef DPMSExtension
+ noDPMSExtension = TRUE;
+#endif
+
if (!strcmp(argv[i], "-display")) {
if (++i < argc) {
xnestDisplayName = argv[i];
diff --git a/hw/xnest/xnest-config.h b/hw/xnest/xnest-config.h
index ef48c580f..fb2e3beee 100644
--- a/hw/xnest/xnest-config.h
+++ b/hw/xnest/xnest-config.h
@@ -31,6 +31,4 @@
#include <dix-config.h>
#include <xkb-config.h>
-#undef MITSHM
-
#endif /* XNEST_CONFIG_H */
More information about the xorg-commit
mailing list