xserver: Branch 'master' - 3 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Sep 2 18:15:38 UTC 2024
Xext/xselinux_ext.c | 1
dix/property.c | 1
dix/property_priv.h | 73 ++++++++++++++++++++++++++++++++++++++++++
dix/window.c | 1
hw/xquartz/applewm.c | 2 +
hw/xwayland/xwayland-screen.c | 1
hw/xwayland/xwayland-window.c | 1
hw/xwayland/xwayland-window.h | 3 +
include/property.h | 16 ---------
9 files changed, 83 insertions(+), 16 deletions(-)
New commits:
commit b0272692a1b20db2def5b228f6886bc1ed8835cc
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon May 13 17:45:29 2024 +0200
dix: unexport DeleteAllWindowProperties()
Not used by any drivers, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1340>
diff --git a/dix/property_priv.h b/dix/property_priv.h
index 2c3eb8021..38ad2da4b 100644
--- a/dix/property_priv.h
+++ b/dix/property_priv.h
@@ -68,4 +68,6 @@ extern CallbackListPtr PropertyStateCallback;
int dixLookupProperty(PropertyPtr *result, WindowPtr pWin, Atom proprty,
ClientPtr pClient, Mask access_mode);
+void DeleteAllWindowProperties(WindowPtr pWin);
+
#endif /* _XSERVER_PROPERTY_PRIV_H */
diff --git a/dix/window.c b/dix/window.c
index 21e09631b..9211c6964 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -105,6 +105,7 @@ Equipment Corporation.
#include "dix/dix_priv.h"
#include "dix/exevents_priv.h"
#include "dix/input_priv.h"
+#include "dix/property_priv.h"
#include "os/auth.h"
#include "os/screensaver.h"
diff --git a/include/property.h b/include/property.h
index 178c88dc9..6c879e6d9 100644
--- a/include/property.h
+++ b/include/property.h
@@ -65,6 +65,4 @@ extern _X_EXPORT int DeleteProperty(ClientPtr /*client */ ,
WindowPtr /*pWin */ ,
Atom /*propName */ );
-extern _X_EXPORT void DeleteAllWindowProperties(WindowPtr /*pWin */ );
-
#endif /* PROPERTY_H */
commit fb697dd644bada860be581e793a4fd9fc73f7e42
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon May 13 17:43:01 2024 +0200
dix: unexport dixLookupProperty()
It's not used by any drivers, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1340>
diff --git a/Xext/xselinux_ext.c b/Xext/xselinux_ext.c
index 5bfb9a84b..534d50b71 100644
--- a/Xext/xselinux_ext.c
+++ b/Xext/xselinux_ext.c
@@ -22,6 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#endif
#include "dix/dix_priv.h"
+#include "dix/property_priv.h"
#include "selection.h"
#include "inputstr.h"
diff --git a/dix/property_priv.h b/dix/property_priv.h
index bd8d8c992..2c3eb8021 100644
--- a/dix/property_priv.h
+++ b/dix/property_priv.h
@@ -51,6 +51,9 @@ SOFTWARE.
#ifndef _XSERVER_PROPERTY_PRIV_H
#define _XSERVER_PROPERTY_PRIV_H
+#include <X11/X.h>
+
+#include "dix.h"
#include "window.h"
#include "property.h"
@@ -62,4 +65,7 @@ typedef struct _PropertyStateRec {
extern CallbackListPtr PropertyStateCallback;
+int dixLookupProperty(PropertyPtr *result, WindowPtr pWin, Atom proprty,
+ ClientPtr pClient, Mask access_mode);
+
#endif /* _XSERVER_PROPERTY_PRIV_H */
diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index e0c7c505d..4edab98e0 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -36,6 +36,8 @@
#include <errno.h>
+#include "dix/property_priv.h"
+
#include "quartz.h"
#include "misc.h"
diff --git a/hw/xwayland/xwayland-window.c b/hw/xwayland/xwayland-window.c
index 4e56ed41e..e5d45a919 100644
--- a/hw/xwayland/xwayland-window.c
+++ b/hw/xwayland/xwayland-window.c
@@ -35,6 +35,7 @@
#include <X11/Xatom.h>
#include "dix/dix_priv.h"
+#include "dix/property_priv.h"
#include "compositeext.h"
#include "compint.h"
diff --git a/include/property.h b/include/property.h
index e6710820e..178c88dc9 100644
--- a/include/property.h
+++ b/include/property.h
@@ -51,12 +51,6 @@ SOFTWARE.
typedef struct _Property *PropertyPtr;
-extern _X_EXPORT int dixLookupProperty(PropertyPtr * /*result */ ,
- WindowPtr /*pWin */ ,
- Atom /*proprty */ ,
- ClientPtr /*pClient */ ,
- Mask /*access_mode */ );
-
extern _X_EXPORT int dixChangeWindowProperty(ClientPtr pClient,
WindowPtr pWin,
Atom property,
commit 955cc5417b700ef1bb1606a99217eb24b75c84ce
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Wed Feb 28 11:48:46 2024 +0100
include: split out non-exported stuff from property.h
Reduce cluttering public interface with non-exported stuff, moving those
things into a separate internal header.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1340>
diff --git a/dix/property.c b/dix/property.c
index 22f4d1603..435450973 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -52,6 +52,7 @@ SOFTWARE.
#include <X11/Xproto.h>
#include "dix/dix_priv.h"
+#include "dix/property_priv.h"
#include "windowstr.h"
#include "propertyst.h"
diff --git a/dix/property_priv.h b/dix/property_priv.h
new file mode 100644
index 000000000..bd8d8c992
--- /dev/null
+++ b/dix/property_priv.h
@@ -0,0 +1,65 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 1987, 1998 The Open Group
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info at metux.net>
+ */
+/***********************************************************
+
+Copyright 1987, 1998 The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice 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 NONINFRINGEMENT. IN NO EVENT SHALL THE
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+ All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************/
+#ifndef _XSERVER_PROPERTY_PRIV_H
+#define _XSERVER_PROPERTY_PRIV_H
+
+#include "window.h"
+#include "property.h"
+
+typedef struct _PropertyStateRec {
+ WindowPtr win;
+ PropertyPtr prop;
+ int state;
+} PropertyStateRec;
+
+extern CallbackListPtr PropertyStateCallback;
+
+#endif /* _XSERVER_PROPERTY_PRIV_H */
diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c
index 14b7a515a..f79d9ebc0 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -38,6 +38,7 @@
#include <X11/Xfuncproto.h>
#include "dix/input_priv.h"
+#include "dix/property_priv.h"
#include "os/osdep.h"
#include "os/xserver_poll.h"
diff --git a/hw/xwayland/xwayland-window.h b/hw/xwayland/xwayland-window.h
index 30d49c699..ba5c3a078 100644
--- a/hw/xwayland/xwayland-window.h
+++ b/hw/xwayland/xwayland-window.h
@@ -34,6 +34,9 @@
#include <unistd.h>
#include <X11/X.h>
+
+#include "dix/property_priv.h"
+
#include <dix.h>
#include <propertyst.h>
#include <validate.h>
diff --git a/include/property.h b/include/property.h
index 6ee8a8398..e6710820e 100644
--- a/include/property.h
+++ b/include/property.h
@@ -51,14 +51,6 @@ SOFTWARE.
typedef struct _Property *PropertyPtr;
-typedef struct _PropertyStateRec {
- WindowPtr win;
- PropertyPtr prop;
- int state;
-} PropertyStateRec;
-
-extern CallbackListPtr PropertyStateCallback;
-
extern _X_EXPORT int dixLookupProperty(PropertyPtr * /*result */ ,
WindowPtr /*pWin */ ,
Atom /*proprty */ ,
More information about the xorg-commit
mailing list