aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/ClDisplay.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-06-11 15:04:08 +0000
committermarha <marha@users.sourceforge.net>2010-06-11 15:04:08 +0000
commitf56cfbb54588917d9566277a669fa086a842b2f5 (patch)
treec96e64395853bcb39e04dd41bbfe7d27b673f0e1 /libX11/src/ClDisplay.c
parent4c61bf84b11e26e6f22648668c95ea760a379163 (diff)
downloadvcxsrv-f56cfbb54588917d9566277a669fa086a842b2f5.tar.gz
vcxsrv-f56cfbb54588917d9566277a669fa086a842b2f5.tar.bz2
vcxsrv-f56cfbb54588917d9566277a669fa086a842b2f5.zip
libX11 and libXext git update 11/6/2010
Diffstat (limited to 'libX11/src/ClDisplay.c')
-rw-r--r--libX11/src/ClDisplay.c156
1 files changed, 74 insertions, 82 deletions
diff --git a/libX11/src/ClDisplay.c b/libX11/src/ClDisplay.c
index cc0e3315b..148284ff9 100644
--- a/libX11/src/ClDisplay.c
+++ b/libX11/src/ClDisplay.c
@@ -1,82 +1,74 @@
-
-/*
-
-Copyright 1985, 1990, 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.
-
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#if USE_XCB
-#include "Xxcbint.h"
-#else /* !USE_XCB */
-#include <X11/Xtrans/Xtrans.h>
-#endif /* USE_XCB */
-#include "Xlib.h"
-#include "Xlibint.h"
-#include "Xintconn.h"
-
-/*
- * XCloseDisplay - XSync the connection to the X Server, close the connection,
- * and free all associated storage. Extension close procs should only free
- * memory and must be careful about the types of requests they generate.
- */
-
-int
-XCloseDisplay (
- register Display *dpy)
-{
- register _XExtension *ext;
- register int i;
-
- if (!(dpy->flags & XlibDisplayClosing))
- {
- dpy->flags |= XlibDisplayClosing;
- for (i = 0; i < dpy->nscreens; i++) {
- register Screen *sp = &dpy->screens[i];
- XFreeGC (dpy, sp->default_gc);
- }
- if (dpy->cursor_font != None) {
- XUnloadFont (dpy, dpy->cursor_font);
- }
- XSync(dpy, 1); /* throw away pending events, catch errors */
- /* call out to any extensions interested */
- for (ext = dpy->ext_procs; ext; ext = ext->next) {
- if (ext->close_display)
- (*ext->close_display)(dpy, &ext->codes);
- }
- /* if the closes generated more protocol, sync them up */
- if (dpy->request != dpy->last_request_read)
- XSync(dpy, 1);
- }
-#if USE_XCB
- xcb_disconnect(dpy->xcb->connection);
-#else /* !USE_XCB */
- _XDisconnectDisplay(dpy->trans_conn);
-#endif /* USE_XCB */
- _XFreeDisplayStructure (dpy);
- return 0;
-}
+
+/*
+
+Copyright 1985, 1990, 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.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xxcbint.h"
+#include "Xlib.h"
+#include "Xlibint.h"
+#include "Xintconn.h"
+
+/*
+ * XCloseDisplay - XSync the connection to the X Server, close the connection,
+ * and free all associated storage. Extension close procs should only free
+ * memory and must be careful about the types of requests they generate.
+ */
+
+int
+XCloseDisplay (
+ register Display *dpy)
+{
+ register _XExtension *ext;
+ register int i;
+
+ if (!(dpy->flags & XlibDisplayClosing))
+ {
+ dpy->flags |= XlibDisplayClosing;
+ for (i = 0; i < dpy->nscreens; i++) {
+ register Screen *sp = &dpy->screens[i];
+ XFreeGC (dpy, sp->default_gc);
+ }
+ if (dpy->cursor_font != None) {
+ XUnloadFont (dpy, dpy->cursor_font);
+ }
+ XSync(dpy, 1); /* throw away pending events, catch errors */
+ /* call out to any extensions interested */
+ for (ext = dpy->ext_procs; ext; ext = ext->next) {
+ if (ext->close_display)
+ (*ext->close_display)(dpy, &ext->codes);
+ }
+ /* if the closes generated more protocol, sync them up */
+ if (dpy->request != dpy->last_request_read)
+ XSync(dpy, 1);
+ }
+ xcb_disconnect(dpy->xcb->connection);
+ _XFreeDisplayStructure (dpy);
+ return 0;
+}