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@metux.net> Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1340>
This commit is contained in:
		
							parent
							
								
									6c7c4fdc7e
								
							
						
					
					
						commit
						955cc5417b
					
				| 
						 | 
					@ -52,6 +52,7 @@ SOFTWARE.
 | 
				
			||||||
#include <X11/Xproto.h>
 | 
					#include <X11/Xproto.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "dix/dix_priv.h"
 | 
					#include "dix/dix_priv.h"
 | 
				
			||||||
 | 
					#include "dix/property_priv.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "windowstr.h"
 | 
					#include "windowstr.h"
 | 
				
			||||||
#include "propertyst.h"
 | 
					#include "propertyst.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@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 */
 | 
				
			||||||
| 
						 | 
					@ -38,6 +38,7 @@
 | 
				
			||||||
#include <X11/Xfuncproto.h>
 | 
					#include <X11/Xfuncproto.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "dix/input_priv.h"
 | 
					#include "dix/input_priv.h"
 | 
				
			||||||
 | 
					#include "dix/property_priv.h"
 | 
				
			||||||
#include "os/osdep.h"
 | 
					#include "os/osdep.h"
 | 
				
			||||||
#include "os/xserver_poll.h"
 | 
					#include "os/xserver_poll.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -34,6 +34,9 @@
 | 
				
			||||||
#include <unistd.h>
 | 
					#include <unistd.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <X11/X.h>
 | 
					#include <X11/X.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "dix/property_priv.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <dix.h>
 | 
					#include <dix.h>
 | 
				
			||||||
#include <propertyst.h>
 | 
					#include <propertyst.h>
 | 
				
			||||||
#include <validate.h>
 | 
					#include <validate.h>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -51,14 +51,6 @@ SOFTWARE.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
typedef struct _Property *PropertyPtr;
 | 
					typedef struct _Property *PropertyPtr;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
typedef struct _PropertyStateRec {
 | 
					 | 
				
			||||||
    WindowPtr win;
 | 
					 | 
				
			||||||
    PropertyPtr prop;
 | 
					 | 
				
			||||||
    int state;
 | 
					 | 
				
			||||||
} PropertyStateRec;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
extern CallbackListPtr PropertyStateCallback;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
extern _X_EXPORT int dixLookupProperty(PropertyPtr * /*result */ ,
 | 
					extern _X_EXPORT int dixLookupProperty(PropertyPtr * /*result */ ,
 | 
				
			||||||
                                       WindowPtr /*pWin */ ,
 | 
					                                       WindowPtr /*pWin */ ,
 | 
				
			||||||
                                       Atom /*proprty */ ,
 | 
					                                       Atom /*proprty */ ,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue