diff options
Diffstat (limited to 'Xext')
39 files changed, 86 insertions, 87 deletions
diff --git a/Xext/EVI.c b/Xext/EVI.c index b59180685..8fe3481d4 100644 --- a/Xext/EVI.c +++ b/Xext/EVI.c @@ -1,4 +1,3 @@ -/* $Xorg: EVI.c,v 1.3 2000/08/17 19:47:55 cpqbld Exp $ */ /************************************************************ Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc. Permission to use, copy, modify, and distribute this @@ -21,7 +20,6 @@ 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. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/EVI.c,v 3.10tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/Xext/EVIstruct.h b/Xext/EVIstruct.h index 857e7565a..e6581909f 100644 --- a/Xext/EVIstruct.h +++ b/Xext/EVIstruct.h @@ -1,4 +1,3 @@ -/* $Xorg: EVIstruct.h,v 1.3 2000/08/17 19:47:55 cpqbld Exp $ */ /************************************************************ Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc. Permission to use, copy, modify, and distribute this @@ -21,7 +20,6 @@ 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. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/EVIstruct.h,v 3.5 2003/07/16 01:38:28 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/Xext/Makefile.am b/Xext/Makefile.am index b5a135568..4d77e2fbe 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -12,7 +12,7 @@ endif INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) if XORG sdk_HEADERS = xvdix.h xvmcext.h @@ -73,7 +73,7 @@ BUILTIN_SRCS += $(XACE_SRCS) endif # Security extension: multi-level security to protect clients from each other -XCSECURITY_SRCS = security.c +XCSECURITY_SRCS = security.c securitysrv.h if XCSECURITY BUILTIN_SRCS += $(XCSECURITY_SRCS) diff --git a/Xext/appgroup.c b/Xext/appgroup.c index 9bf416ec6..650dc0ab8 100644 --- a/Xext/appgroup.c +++ b/Xext/appgroup.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/appgroup.c,v 1.10tsi Exp $ */ /* Copyright 1996, 1998, 2001 The Open Group @@ -24,7 +23,6 @@ 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. */ -/* $Xorg: appgroup.c,v 1.6 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/Xext/bigreq.c b/Xext/bigreq.c index 1af8a930b..fcd848aec 100644 --- a/Xext/bigreq.c +++ b/Xext/bigreq.c @@ -1,4 +1,3 @@ -/* $Xorg: bigreq.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ /* Copyright 1992, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.8 2003/10/28 23:08:43 tsi Exp $ */ #define NEED_EVENTS #ifdef HAVE_DIX_CONFIG_H diff --git a/Xext/cup.c b/Xext/cup.c index 879130ece..10d13bae0 100644 --- a/Xext/cup.c +++ b/Xext/cup.c @@ -1,4 +1,3 @@ -/* $Xorg: cup.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ /* Copyright 1997, 1998 The Open Group @@ -24,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xext/cup.c,v 1.11tsi Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/Xext/dpms.c b/Xext/dpms.c index ea0a1ccdf..aced40639 100644 --- a/Xext/dpms.c +++ b/Xext/dpms.c @@ -1,4 +1,3 @@ -/* $Xorg: dpms.c,v 1.3 2000/08/17 19:47:56 cpqbld Exp $ */ /***************************************************************** Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts. @@ -33,7 +32,6 @@ Equipment Corporation. * @(#)RCSfile: dpms.c,v Revision: 1.1.4.5 (DEC) Date: 1996/03/04 15:27:00 */ -/* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.10tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/Xext/dpmsproc.h b/Xext/dpmsproc.h index ae1e6e25a..f5485ea79 100644 --- a/Xext/dpmsproc.h +++ b/Xext/dpmsproc.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/dpmsproc.h,v 1.3 2001/10/28 03:32:50 tsi Exp $ */ /* Prototypes for functions that the DDX must provide */ diff --git a/Xext/dpmsstubs.c b/Xext/dpmsstubs.c index 128c57bb0..9f99a2d22 100644 --- a/Xext/dpmsstubs.c +++ b/Xext/dpmsstubs.c @@ -1,4 +1,3 @@ -/* $Xorg: dpmsstubs.c,v 1.3 2000/08/17 19:47:56 cpqbld Exp $ */ /***************************************************************** Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts. @@ -26,7 +25,6 @@ dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/dpmsstubs.c,v 3.4 2001/01/17 22:13:15 dawes Exp $ */ typedef int Bool; diff --git a/Xext/fontcache.c b/Xext/fontcache.c index 9ab23a122..00a45c90e 100644 --- a/Xext/fontcache.c +++ b/Xext/fontcache.c @@ -27,7 +27,6 @@ * * Id: fontcache.c,v 1.12 1999/01/31 13:47:45 akiyama Exp $ */ -/* $XFree86: xc/programs/Xserver/Xext/fontcache.c,v 1.7 2003/10/28 23:08:43 tsi Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD */ diff --git a/Xext/mbuf.c b/Xext/mbuf.c index 9933fe0fd..e0361dda4 100644 --- a/Xext/mbuf.c +++ b/Xext/mbuf.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.15 2003/10/28 23:08:43 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $Xorg: mbuf.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_REPLIES #define NEED_EVENTS #ifdef HAVE_DIX_CONFIG_H diff --git a/Xext/mbufbf.c b/Xext/mbufbf.c index 8585c52d2..04fc487d8 100644 --- a/Xext/mbufbf.c +++ b/Xext/mbufbf.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/mbufbf.c,v 3.5tsi Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $Xorg: mbufbf.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/Xext/mbufpx.c b/Xext/mbufpx.c index c986217ee..16717d330 100644 --- a/Xext/mbufpx.c +++ b/Xext/mbufpx.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/mbufpx.c,v 3.3 2001/07/23 13:15:44 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $Xorg: mbufpx.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_REPLIES #define NEED_EVENTS #ifdef HAVE_DIX_CONFIG_H diff --git a/Xext/mitmisc.c b/Xext/mitmisc.c index f7b0ee55c..924b88063 100644 --- a/Xext/mitmisc.c +++ b/Xext/mitmisc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/mitmisc.c,v 3.6 2003/10/28 23:08:43 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -27,7 +26,6 @@ in this Software without prior written authorization from The Open Group. /* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING */ -/* $Xorg: mitmisc.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_EVENTS #ifdef HAVE_DIX_CONFIG_H @@ -44,8 +42,6 @@ in this Software without prior written authorization from The Open Group. #include <X11/extensions/mitmiscstr.h> #include "modinit.h" -extern Bool permitOldBugs; - #if 0 static unsigned char MITReqCode; #endif @@ -92,12 +88,8 @@ ProcMITSetBugMode(client) REQUEST(xMITSetBugModeReq); REQUEST_SIZE_MATCH(xMITSetBugModeReq); - if ((stuff->onOff != xTrue) && (stuff->onOff != xFalse)) - { - client->errorValue = stuff->onOff; - return BadValue; - } - permitOldBugs = stuff->onOff; + if (stuff->onOff != xFalse) + return BadRequest; return(client->noClientException); } @@ -112,7 +104,7 @@ ProcMITGetBugMode(client) rep.type = X_Reply; rep.length = 0; rep.sequenceNumber = client->sequence; - rep.onOff = permitOldBugs; + rep.onOff = FALSE; if (client->swapped) { swaps(&rep.sequenceNumber, n); swapl(&rep.length, n); diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c index 5d533a464..6b8b5f2f7 100644 --- a/Xext/panoramiX.c +++ b/Xext/panoramiX.c @@ -1,4 +1,3 @@ -/* $Xorg: panoramiX.c,v 1.5 2000/08/17 19:47:57 cpqbld Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. Permission is hereby granted, free of charge, to any person obtaining a copy @@ -23,7 +22,6 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.37tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h index 6cbb94dd3..7b3339204 100644 --- a/Xext/panoramiX.h +++ b/Xext/panoramiX.h @@ -1,5 +1,4 @@ /* $TOG: panoramiX.h /main/4 1998/03/17 06:51:02 kaleb $ */ -/* $XdotOrg: xc/programs/Xserver/Xext/panoramiX.h,v 1.3 2005/04/20 12:25:12 daniels Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. @@ -28,7 +27,6 @@ Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.5 2001/01/03 02:54:17 keithp Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c index e0548df7b..da445ffe1 100644 --- a/Xext/panoramiXSwap.c +++ b/Xext/panoramiXSwap.c @@ -1,4 +1,3 @@ -/* $Xorg: panoramiXSwap.c,v 1.4 2000/08/17 19:47:57 cpqbld Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. Permission is hereby granted, free of charge, to any person obtaining a copy @@ -23,7 +22,6 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.9 2003/07/16 01:38:29 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/Xext/panoramiXh.h b/Xext/panoramiXh.h index 9da5876fd..6cee650ac 100644 --- a/Xext/panoramiXh.h +++ b/Xext/panoramiXh.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/panoramiXh.h,v 1.2 2003/09/13 21:33:03 dawes Exp $ */ /* * Server dispatcher function replacements diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c index 79a5a3290..8bb4c593d 100644 --- a/Xext/panoramiXprocs.c +++ b/Xext/panoramiXprocs.c @@ -1,4 +1,3 @@ -/* $Xorg: panoramiXprocs.c,v 1.5 2000/08/17 19:47:57 cpqbld Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. Permission is hereby granted, free of charge, to any person obtaining a copy @@ -26,7 +25,6 @@ Equipment Corporation. /* Massively rewritten by Mark Vojkovich <markv@valinux.com> */ -/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.36tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/Xext/panoramiXsrv.h b/Xext/panoramiXsrv.h index dc3b3d805..bb032cfae 100644 --- a/Xext/panoramiXsrv.h +++ b/Xext/panoramiXsrv.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/panoramiXsrv.h,v 1.8 2001/08/01 00:44:44 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/Xext/sampleEVI.c b/Xext/sampleEVI.c index 67caa5613..d9c569609 100644 --- a/Xext/sampleEVI.c +++ b/Xext/sampleEVI.c @@ -1,4 +1,3 @@ -/* $Xorg: sampleEVI.c,v 1.3 2000/08/17 19:47:58 cpqbld Exp $ */ /************************************************************ Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc. Permission to use, copy, modify, and distribute this diff --git a/Xext/saver.c b/Xext/saver.c index d873ffde6..1d223ae53 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -1,6 +1,4 @@ -/* $XdotOrg: xserver/xorg/Xext/saver.c,v 1.12 2006/03/31 18:49:38 fredrik Exp $ */ /* - * $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $ * Copyright (c) 1992 X Consortium @@ -28,7 +26,6 @@ in this Software without prior written authorization from the X Consortium. * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.7 2003/10/28 23:08:43 tsi Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/Xext/security.c b/Xext/security.c index b96ac28c3..eca97b7dd 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/Xext/security.c,v 1.6 2006/03/28 01:20:59 ajax Exp $ */ -/* $Xorg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.16tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/Xext/shape.c b/Xext/shape.c index 9f46a798e..4d9d3fb5b 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/Xext/shape.c,v 1.9 2005/07/03 08:53:36 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.18 2003/10/28 23:08:43 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -26,7 +24,6 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $Xorg: shape.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_REPLIES #define NEED_EVENTS #ifdef HAVE_DIX_CONFIG_H diff --git a/Xext/shm.c b/Xext/shm.c index e56d45e8e..be79862cb 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.41 2003/12/17 23:28:56 alanh Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -27,7 +26,6 @@ in this Software without prior written authorization from The Open Group. /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */ -/* $Xorg: shm.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ #define SHM diff --git a/Xext/sleepuntil.c b/Xext/sleepuntil.c index 30be8c001..f8cedbe6e 100644 --- a/Xext/sleepuntil.c +++ b/Xext/sleepuntil.c @@ -1,5 +1,4 @@ /* - * $Xorg: sleepuntil.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ * Copyright 1992, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.c,v 3.6 2003/07/16 01:38:30 dawes Exp $ */ /* dixsleep.c - implement millisecond timeouts for X clients */ diff --git a/Xext/sleepuntil.h b/Xext/sleepuntil.h index 0b99148a4..a3618d99c 100644 --- a/Xext/sleepuntil.h +++ b/Xext/sleepuntil.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.h,v 1.2 2003/11/17 22:20:27 dawes Exp $ */ /* * Copyright (C) 2001 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/Xext/sync.c b/Xext/sync.c index e1383cea3..7def85b94 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -1,4 +1,3 @@ -/* $Xorg: sync.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /* Copyright 1991, 1993, 1998 The Open Group @@ -50,7 +49,6 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/Xext/sync.c,v 3.13 2003/09/02 18:19:01 tsi Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c index 45629e660..f26218e97 100644 --- a/Xext/xcmisc.c +++ b/Xext/xcmisc.c @@ -1,4 +1,3 @@ -/* $Xorg: xcmisc.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xext/xcmisc.c,v 3.7 2003/10/28 23:08:43 tsi Exp $ */ #define NEED_EVENTS #define NEED_REPLIES diff --git a/Xext/xevie.c b/Xext/xevie.c index ccc12371a..e979e7e4d 100644 --- a/Xext/xevie.c +++ b/Xext/xevie.c @@ -30,7 +30,6 @@ or other dealings in this Software without prior written authorization of the copyright holder. ************************************************************/ -/* $XdotOrg: xserver/xorg/Xext/xevie.c,v 1.11 2005/10/06 17:55:54 alanc Exp $ */ #define NEED_REPLIES #define NEED_EVENTS @@ -59,7 +58,9 @@ of the copyright holder. #define NoSuchEvent 0x80000000 +#ifdef XKB extern Bool noXkbExtension; +#endif extern int xeviegrabState; static int ProcDispatch (register ClientPtr client), SProcDispatch (register ClientPtr client); @@ -201,12 +202,14 @@ int ProcStart (register ClientPtr client) return BadAlloc; } else return BadAccess; +#ifdef XKB if (!noXkbExtension) { if (!XevieStart()) { DeleteCallback(&ClientStateCallback,XevieClientStateCallback,NULL); return BadAlloc; } } +#endif xevieModifiersOn = FALSE; @@ -255,19 +258,23 @@ int ProcSend (register ClientPtr client) case KeyPress: case KeyRelease: xevieKBEventSent = 1; - if(noXkbExtension) - CoreProcessKeyboardEvent (xE, xeviekb, 1); - else +#ifdef XKB + if(!noXkbExtension) doSendEvent(xE, inputInfo.keyboard); + else +#endif + CoreProcessKeyboardEvent (xE, xeviekb, 1); break; case ButtonPress: case ButtonRelease: case MotionNotify: xevieEventSent = 1; - if(noXkbExtension) - CoreProcessPointerEvent(xE, xeviemouse, 1); - else +#ifdef XKB + if(!noXkbExtension) doSendEvent(xE, inputInfo.pointer); + else +#endif + CoreProcessPointerEvent(xE, xeviemouse, 1); break; default: break; @@ -464,6 +471,7 @@ XevieKbdProcessInputProc(xEvent *xE, DeviceIntPtr dev, int count) xE->u.keyButtonPointer.state = keyc->state | inputInfo.pointer->button->state; /* fix bug: sequence lost in Xlib */ xE->u.u.sequenceNumber = clients[xevieClientIndex]->sequence; +#ifdef XKB /* fix for bug5092586 */ if(!noXkbExtension) { switch(xE->u.u.type) { @@ -471,6 +479,7 @@ XevieKbdProcessInputProc(xEvent *xE, DeviceIntPtr dev, int count) case KeyRelease: *kptr &= ~bit; break; } } +#endif keycq[keycqHead].time = xE->u.keyButtonPointer.time; memcpy(keycq[keycqHead].keyc, keyc, sizeof(KeyClassRec) - sizeof(KeyClassPtr)); memcpy(keycq[keycqHead].keyc->xkbInfo, keyc->xkbInfo, sizeof(XkbSrvInfoRec)); @@ -525,6 +534,7 @@ XevieEnd(int clientIndex) { if (!clientIndex || clientIndex == xevieClientIndex) { +#ifdef XKB if(!noXkbExtension) { XevieRemove(inputInfo.keyboard,NULL); @@ -540,6 +550,7 @@ XevieEnd(int clientIndex) inputInfo.pointer->public.realInputProc = CoreProcessPointerEvent; XkbSetExtension(inputInfo.pointer,ProcessPointerEvent); } +#endif xevieFlag = 0; xevieClientIndex = 0; diff --git a/Xext/xf86bigfont.c b/Xext/xf86bigfont.c index 36af17622..bd250569e 100644 --- a/Xext/xf86bigfont.c +++ b/Xext/xf86bigfont.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86bigfont.c,v 1.17 2003/10/28 23:08:43 tsi Exp $ */ /* * BIGFONT extension for sharing font metrics between clients (if possible) * and for transmitting font metrics to clients in a compressed form. diff --git a/Xext/xprint.c b/Xext/xprint.c index 9a4f2653e..29d3262f9 100644 --- a/Xext/xprint.c +++ b/Xext/xprint.c @@ -1,4 +1,3 @@ -/* $Xorg: xprint.c,v 1.5 2001/03/05 20:42:26 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -64,7 +63,6 @@ copyright holders. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.14tsi Exp $ */ #define _XP_PRINT_SERVER_ #ifdef HAVE_DIX_CONFIG_H diff --git a/Xext/xres.c b/Xext/xres.c index 9f3624ba5..1617337bf 100644 --- a/Xext/xres.c +++ b/Xext/xres.c @@ -1,8 +1,6 @@ /* Copyright (c) 2002 XFree86 Inc */ -/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.7tsi Exp $ */ -/* $XdotOrg: xserver/xorg/Xext/xres.c,v 1.8 2006/02/11 19:16:50 alanc Exp $ */ #define NEED_EVENTS #define NEED_REPLIES @@ -21,6 +19,8 @@ #include "swaprep.h" #include <X11/extensions/XResproto.h> #include "pixmapstr.h" +#include "windowstr.h" +#include "gcstruct.h" #include "modinit.h" static int @@ -156,6 +156,7 @@ ProcXResQueryClientResources (ClientPtr client) swapl (&rep.length, n); swapl (&rep.num_types, n); } + WriteToClient (client,sizeof(xXResQueryClientResourcesReply),(char*)&rep); if(num_types) { @@ -187,13 +188,54 @@ ProcXResQueryClientResources (ClientPtr client) return (client->noClientException); } +static unsigned long +ResGetApproxPixmapBytes (PixmapPtr pix) +{ + unsigned long nPixels; + int bytesPerPixel; + + bytesPerPixel = pix->drawable.bitsPerPixel>>3; + nPixels = pix->drawable.width * pix->drawable.height; + + /* Divide by refcnt as pixmap could be shared between clients, + * so total pixmap mem is shared between these. + */ + return ( nPixels * bytesPerPixel ) / pix->refcnt; +} + static void ResFindPixmaps (pointer value, XID id, pointer cdata) { unsigned long *bytes = (unsigned long *)cdata; PixmapPtr pix = (PixmapPtr)value; - *bytes += (pix->devKind * pix->drawable.height); + *bytes += ResGetApproxPixmapBytes(pix); +} + +static void +ResFindWindowPixmaps (pointer value, XID id, pointer cdata) +{ + unsigned long *bytes = (unsigned long *)cdata; + WindowPtr pWin = (WindowPtr)value; + + if (pWin->backgroundState == BackgroundPixmap) + *bytes += ResGetApproxPixmapBytes(pWin->background.pixmap); + + if (pWin->border.pixmap != NULL && !pWin->borderIsPixel) + *bytes += ResGetApproxPixmapBytes(pWin->border.pixmap); +} + +static void +ResFindGCPixmaps (pointer value, XID id, pointer cdata) +{ + unsigned long *bytes = (unsigned long *)cdata; + GCPtr pGC = (GCPtr)value; + + if (pGC->stipple != NULL) + *bytes += ResGetApproxPixmapBytes(pGC->stipple); + + if (pGC->tile.pixmap != NULL && !pGC->tileIsPixel) + *bytes += ResGetApproxPixmapBytes(pGC->tile.pixmap); } static int @@ -220,6 +262,24 @@ ProcXResQueryClientPixmapBytes (ClientPtr client) FindClientResourcesByType(clients[clientID], RT_PIXMAP, ResFindPixmaps, (pointer)(&bytes)); + /* + * Make sure win background pixmaps also held to account. + */ + FindClientResourcesByType(clients[clientID], RT_WINDOW, + ResFindWindowPixmaps, + (pointer)(&bytes)); + + /* + * GC Tile & Stipple pixmaps too. + */ + FindClientResourcesByType(clients[clientID], RT_GC, + ResFindGCPixmaps, + (pointer)(&bytes)); + +#ifdef COMPOSITE + /* FIXME: include composite pixmaps too */ +#endif + rep.type = X_Reply; rep.sequenceNumber = client->sequence; rep.length = 0; diff --git a/Xext/xtest.c b/Xext/xtest.c index 6737185aa..83f8b8cc6 100644 --- a/Xext/xtest.c +++ b/Xext/xtest.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/Xext/xtest.c,v 1.6 2005/07/03 08:53:36 daniels Exp $ */ -/* $Xorg: xtest.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /* Copyright 1992, 1998 The Open Group @@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.10 2003/10/28 23:08:44 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c index 7c490abca..0c7a38199 100644 --- a/Xext/xvdisp.c +++ b/Xext/xvdisp.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/Xext/xvdisp.c,v 1.6 2005/07/03 08:53:36 daniels Exp $ */ /*********************************************************** Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts. @@ -22,7 +21,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xvdisp.c,v 1.27 2003/07/16 01:38:31 dawes Exp $ */ /* ** File: diff --git a/Xext/xvdix.h b/Xext/xvdix.h index 99d918406..9e94e05d5 100644 --- a/Xext/xvdix.h +++ b/Xext/xvdix.h @@ -21,7 +21,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.7 2001/05/07 21:37:51 tsi Exp $ */ #ifndef XVDIX_H #define XVDIX_H diff --git a/Xext/xvmain.c b/Xext/xvmain.c index 422032da9..22339011c 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/Xext/xvmain.c,v 1.7 2006/02/10 22:00:20 anholt Exp $ */ /*********************************************************** Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts. @@ -22,7 +21,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.15tsi Exp $ */ /* ** File: diff --git a/Xext/xvmc.c b/Xext/xvmc.c index a814f003e..737fc5dfd 100644 --- a/Xext/xvmc.c +++ b/Xext/xvmc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/xvmc.c,v 1.8 2003/07/16 01:38:31 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS diff --git a/Xext/xvmcext.h b/Xext/xvmcext.h index c7eba30ad..9c019fee6 100644 --- a/Xext/xvmcext.h +++ b/Xext/xvmcext.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/xvmcext.h,v 1.1 2001/04/07 11:04:21 alanh Exp $ */ #ifndef _XVMC_H #define _XVMC_H |