summaryrefslogtreecommitdiff
path: root/xc
diff options
context:
space:
mode:
Diffstat (limited to 'xc')
-rw-r--r--xc/programs/Xserver/hw/xnest/Args.c7
-rw-r--r--xc/programs/Xserver/hw/xnest/Color.c55
-rw-r--r--xc/programs/Xserver/hw/xnest/Cursor.c12
-rw-r--r--xc/programs/Xserver/hw/xnest/Display.c10
-rw-r--r--xc/programs/Xserver/hw/xnest/Events.c7
-rw-r--r--xc/programs/Xserver/hw/xnest/Font.c7
-rw-r--r--xc/programs/Xserver/hw/xnest/GC.c7
-rw-r--r--xc/programs/Xserver/hw/xnest/GCOps.c11
-rw-r--r--xc/programs/Xserver/hw/xnest/Handlers.c7
-rw-r--r--xc/programs/Xserver/hw/xnest/Init.c7
-rw-r--r--xc/programs/Xserver/hw/xnest/Keyboard.c23
-rw-r--r--xc/programs/Xserver/hw/xnest/Pixmap.c7
-rw-r--r--xc/programs/Xserver/hw/xnest/Pointer.c7
-rw-r--r--xc/programs/Xserver/hw/xnest/Screen.c7
-rw-r--r--xc/programs/Xserver/hw/xnest/Visual.c7
-rw-r--r--xc/programs/Xserver/hw/xnest/Window.c8
16 files changed, 102 insertions, 87 deletions
diff --git a/xc/programs/Xserver/hw/xnest/Args.c b/xc/programs/Xserver/hw/xnest/Args.c
index a240b3cd4..25d8710a4 100644
--- a/xc/programs/Xserver/hw/xnest/Args.c
+++ b/xc/programs/Xserver/hw/xnest/Args.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xnestArgs.c,v 1.1 93/06/23 16:23:24 dmatic Exp $ */
+/* $XConsortium: Args.c,v 1.1 93/07/12 15:27:49 rws Exp ray $ */
/*
Copyright 1993 by Davor Matic
@@ -20,10 +20,7 @@ is" without express or implied warranty.
#include "scrnintstr.h"
#include "servermd.h"
-#define GC XlibGC
-#include "Xlib.h"
-#include "Xutil.h"
-#undef GC
+#include "Xnest.h"
#include "Display.h"
#include "Args.h"
diff --git a/xc/programs/Xserver/hw/xnest/Color.c b/xc/programs/Xserver/hw/xnest/Color.c
index caa49db49..d95886d34 100644
--- a/xc/programs/Xserver/hw/xnest/Color.c
+++ b/xc/programs/Xserver/hw/xnest/Color.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Color.c,v 1.3 94/02/06 17:49:05 rws Exp $ */
+/* $XConsortium: Color.c,v 1.4 94/03/31 17:48:44 dpw Exp ray $ */
/*
Copyright 1993 by Davor Matic
@@ -20,10 +20,8 @@ is" without express or implied warranty.
#include "colormapst.h"
#include "resource.h"
-#define GC XlibGC
-#include "Xlib.h"
-#include "Xutil.h"
-#undef GC
+#include "Xnest.h"
+
#include "Display.h"
#include "Screen.h"
@@ -210,9 +208,23 @@ void xnestSetInstalledColormapWindows(pScreen)
if (!xnestSameInstalledColormapWindows(icws.windows, icws.numWindows)) {
if (xnestOldInstalledColormapWindows)
xfree(xnestOldInstalledColormapWindows);
-
+
+#ifdef _XSERVER64
+ {
+ int i;
+ Window64 *windows = (Window64 *)xalloc(icws.numWindows *
+ sizeof(Window64));
+
+ for(i = 0; i < icws.numWindows; ++i)
+ windows[i] = icws.windows[i];
+ XSetWMColormapWindows(xnestDisplay, xnestDefaultWindows[pScreen->myNum],
+ windows, icws.numWindows);
+ xfree(windows);
+ }
+#else
XSetWMColormapWindows(xnestDisplay, xnestDefaultWindows[pScreen->myNum],
icws.windows, icws.numWindows);
+#endif
xnestOldInstalledColormapWindows = icws.windows;
xnestNumOldInstalledColormapWindows = icws.numWindows;
@@ -253,9 +265,20 @@ void xnestSetScreenSaverColormapWindow(pScreen)
{
if (xnestOldInstalledColormapWindows)
xfree(xnestOldInstalledColormapWindows);
-
+
+#ifdef _XSERVER64
+ {
+ Window64 window;
+
+ window = xnestScreenSaverWindows[pScreen->myNum];
+ XSetWMColormapWindows(xnestDisplay, xnestDefaultWindows[pScreen->myNum],
+ &window, 1);
+ xnestScreenSaverWindows[pScreen->myNum] = window;
+ }
+#else
XSetWMColormapWindows(xnestDisplay, xnestDefaultWindows[pScreen->myNum],
&xnestScreenSaverWindows[pScreen->myNum], 1);
+#endif /* _XSERVER64 */
xnestOldInstalledColormapWindows = NULL;
xnestNumOldInstalledColormapWindows = 0;
@@ -366,8 +389,26 @@ void xnestStoreColors(pCmap, nColors, pColors)
xColorItem *pColors;
{
if (pCmap->pVisual->class & DynamicClass)
+#ifdef _XSERVER64
+ {
+ int i;
+ XColor *pColors64 = (XColor *)xalloc(nColors * sizeof(XColor) );
+
+ for(i = 0; i < nColors; ++i)
+ {
+ pColors64[i].pixel = pColors[i].pixel;
+ pColors64[i].red = pColors[i].red;
+ pColors64[i].green = pColors[i].green;
+ pColors64[i].blue = pColors[i].blue;
+ pColors64[i].flags = pColors[i].flags;
+ }
+ XStoreColors(xnestDisplay, xnestColormap(pCmap), pColors64, nColors);
+ xfree(pColors64);
+ }
+#else
XStoreColors(xnestDisplay, xnestColormap(pCmap),
(XColor *)pColors, nColors);
+#endif
}
void xnestResolveColor(pRed, pGreen, pBlue, pVisual)
diff --git a/xc/programs/Xserver/hw/xnest/Cursor.c b/xc/programs/Xserver/hw/xnest/Cursor.c
index 459858ddf..3a209ea96 100644
--- a/xc/programs/Xserver/hw/xnest/Cursor.c
+++ b/xc/programs/Xserver/hw/xnest/Cursor.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Cursor.c,v 1.2 94/02/06 17:49:44 rws Exp $ */
+/* $XConsortium: Cursor.c,v 1.3 94/03/31 17:49:09 dpw Exp ray $ */
/*
Copyright 1993 by Davor Matic
@@ -22,10 +22,7 @@ is" without express or implied warranty.
#include "scrnintstr.h"
#include "servermd.h"
-#define GC XlibGC
-#include "Xlib.h"
-#include "Xutil.h"
-#undef GC
+#include "Xnest.h"
#include "Display.h"
#include "Screen.h"
@@ -37,7 +34,12 @@ void xnestConstrainCursor(pScreen, pBox)
ScreenPtr pScreen;
BoxPtr pBox;
{
+#ifdef _XSERVER64
+ Window64 wroot;
+#else
Window wroot;
+#endif
+
int wx, wy;
unsigned int wwidth, wheight;
unsigned int wborderwidth;
diff --git a/xc/programs/Xserver/hw/xnest/Display.c b/xc/programs/Xserver/hw/xnest/Display.c
index d10918c9e..8e37a5636 100644
--- a/xc/programs/Xserver/hw/xnest/Display.c
+++ b/xc/programs/Xserver/hw/xnest/Display.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Display.c,v 1.1 93/07/12 15:28:06 rws Exp $ */
+/* $XConsortium: Display.c,v 1.2 94/02/06 17:51:11 rws Exp ray $ */
/*
Copyright 1993 by Davor Matic
@@ -13,9 +13,6 @@ is" without express or implied warranty.
*/
-#ifdef _XSERVER64
-#undef _XSERVER64
-#endif
#include "X.h"
#include "Xproto.h"
@@ -25,10 +22,7 @@ is" without express or implied warranty.
#include "scrnintstr.h"
#include "servermd.h"
-#define GC XlibGC
-#include "Xlib.h"
-#include "Xutil.h"
-#undef GC
+#include "Xnest.h"
#include "Display.h"
#include "Init.h"
diff --git a/xc/programs/Xserver/hw/xnest/Events.c b/xc/programs/Xserver/hw/xnest/Events.c
index d3395c390..f756345f8 100644
--- a/xc/programs/Xserver/hw/xnest/Events.c
+++ b/xc/programs/Xserver/hw/xnest/Events.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Events.c,v 1.2 93/09/23 18:57:11 rws Exp $ */
+/* $XConsortium: Events.c,v 1.3 94/01/07 09:52:34 dpw Exp ray $ */
/*
Copyright 1993 by Davor Matic
@@ -22,10 +22,7 @@ is" without express or implied warranty.
#include "windowstr.h"
#include "servermd.h"
-#define GC XlibGC
-#include "Xlib.h"
-#include "Xutil.h"
-#undef GC
+#include "Xnest.h"
#include "Display.h"
#include "Screen.h"
diff --git a/xc/programs/Xserver/hw/xnest/Font.c b/xc/programs/Xserver/hw/xnest/Font.c
index 986e77bdf..4bd82f52a 100644
--- a/xc/programs/Xserver/hw/xnest/Font.c
+++ b/xc/programs/Xserver/hw/xnest/Font.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xnestFont.c,v 1.1 93/06/23 16:23:30 dmatic Exp $ */
+/* $XConsortium: Font.c,v 1.1 93/07/12 15:28:18 rws Exp ray $ */
/*
Copyright 1993 by Davor Matic
@@ -21,10 +21,7 @@ is" without express or implied warranty.
#include "fontstruct.h"
#include "scrnintstr.h"
-#define GC XlibGC
-#include "Xlib.h"
-#include "Xutil.h"
-#undef GC
+#include "Xnest.h"
#include "Display.h"
#include "Font.h"
diff --git a/xc/programs/Xserver/hw/xnest/GC.c b/xc/programs/Xserver/hw/xnest/GC.c
index 517924f3e..674b8930d 100644
--- a/xc/programs/Xserver/hw/xnest/GC.c
+++ b/xc/programs/Xserver/hw/xnest/GC.c
@@ -1,4 +1,4 @@
-/* $XConsortium: GC.c,v 1.5 94/02/06 17:52:15 rws Exp $ */
+/* $XConsortium: GC.c,v 1.6 94/03/31 17:50:26 dpw Exp ray $ */
/*
Copyright 1993 by Davor Matic
@@ -22,10 +22,7 @@ is" without express or implied warranty.
#include "mistruct.h"
#include "region.h"
-#define GC XlibGC
-#include "Xlib.h"
-#include "Xutil.h"
-#undef GC
+#include "Xnest.h"
#include "Display.h"
#include "GC.h"
diff --git a/xc/programs/Xserver/hw/xnest/GCOps.c b/xc/programs/Xserver/hw/xnest/GCOps.c
index 459284170..c1ec480d5 100644
--- a/xc/programs/Xserver/hw/xnest/GCOps.c
+++ b/xc/programs/Xserver/hw/xnest/GCOps.c
@@ -1,4 +1,4 @@
-/* $XConsortium: GCOps.c,v 1.6 94/01/07 09:52:44 dpw Exp $ */
+/* $XConsortium: GCOps.c,v 1.7 94/03/31 17:49:50 dpw Exp ray $ */
/*
Copyright 1993 by Davor Matic
@@ -23,10 +23,7 @@ is" without express or implied warranty.
#include "region.h"
#include "servermd.h"
-#define GC XlibGC
-#include "Xlib.h"
-#include "Xutil.h"
-#undef GC
+#include "Xnest.h"
#include "Display.h"
#include "Screen.h"
@@ -101,7 +98,9 @@ void xnestPutImage(pDrawable, pGC, depth, x, y, w, h, leftPad, format, pImage)
ximage = XCreateImage(xnestDisplay, xnestDefaultVisual(pDrawable->pScreen),
depth, format, leftPad, (char *)pImage,
- w, h, BitmapPad(xnestDisplay), 0);
+ w, h, BitmapPad(xnestDisplay),
+ (format == ZPixmap) ?
+ PixmapBytePad(w, depth) : BitmapBytePad(w));
if (ximage) {
XPutImage(xnestDisplay, xnestDrawable(pDrawable), xnestGC(pGC),
diff --git a/xc/programs/Xserver/hw/xnest/Handlers.c b/xc/programs/Xserver/hw/xnest/Handlers.c
index 6f9708b95..a09545171 100644
--- a/xc/programs/Xserver/hw/xnest/Handlers.c
+++ b/xc/programs/Xserver/hw/xnest/Handlers.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xnestHandlers.c,v 1.1 93/06/23 16:23:33 dmatic Exp $ */
+/* $XConsortium: Handlers.c,v 1.1 93/07/12 15:28:29 rws Exp ray $ */
/*
Copyright 1993 by Davor Matic
@@ -21,10 +21,7 @@ is" without express or implied warranty.
#include "windowstr.h"
#include "servermd.h"
-#define GC XlibGC
-#include "Xlib.h"
-#include "Xutil.h"
-#undef GC
+#include "Xnest.h"
#include "Display.h"
#include "Handlers.h"
diff --git a/xc/programs/Xserver/hw/xnest/Init.c b/xc/programs/Xserver/hw/xnest/Init.c
index 21162d1e3..22fce3583 100644
--- a/xc/programs/Xserver/hw/xnest/Init.c
+++ b/xc/programs/Xserver/hw/xnest/Init.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Init.c,v 1.1 93/07/12 15:28:32 rws Exp $ */
+/* $XConsortium: Init.c,v 1.2 93/12/13 17:40:05 dpw Exp ray $ */
/*
Copyright 1993 by Davor Matic
@@ -21,10 +21,7 @@ is" without express or implied warranty.
#include "windowstr.h"
#include "servermd.h"
-#define GC XlibGC
-#include "Xlib.h"
-#include "Xutil.h"
-#undef GC
+#include "Xnest.h"
#include "Display.h"
#include "Screen.h"
diff --git a/xc/programs/Xserver/hw/xnest/Keyboard.c b/xc/programs/Xserver/hw/xnest/Keyboard.c
index 0902edda4..f1f91464f 100644
--- a/xc/programs/Xserver/hw/xnest/Keyboard.c
+++ b/xc/programs/Xserver/hw/xnest/Keyboard.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Keyboard.c,v 1.1 93/07/12 15:28:36 rws Exp $ */
+/* $XConsortium: Keyboard.c,v 1.2 94/02/23 15:56:46 dpw Exp ray $ */
/*
Copyright 1993 by Davor Matic
@@ -22,10 +22,7 @@ is" without express or implied warranty.
#include "scrnintstr.h"
#include "servermd.h"
-#define GC XlibGC
-#include "Xlib.h"
-#include "Xutil.h"
-#undef GC
+#include "Xnest.h"
#include "Display.h"
#include "Screen.h"
@@ -95,10 +92,26 @@ int xnestKeyboardProc(pDev, onoff, argc, argv)
case DEVICE_INIT:
modifier_keymap = XGetModifierMapping(xnestDisplay);
XDisplayKeycodes(xnestDisplay, &min_keycode, &max_keycode);
+#ifdef _XSERVER64
+ {
+ KeySym64 *keymap64;
+ int i, len;
+ keymap64 = XGetKeyboardMapping(xnestDisplay,
+ min_keycode,
+ max_keycode - min_keycode + 1,
+ &mapWidth);
+ len = (max_keycode - min_keycode + 1) * mapWidth;
+ keymap = (KeySym *)xalloc(len * sizeof(KeySym));
+ for(i = 0; i < len; ++i)
+ keymap[i] = keymap64[i];
+ XFree(keymap64);
+ }
+#else
keymap = XGetKeyboardMapping(xnestDisplay,
min_keycode,
max_keycode - min_keycode + 1,
&mapWidth);
+#endif
for (i = 0; i < 256; i++)
modmap[i] = 0;
diff --git a/xc/programs/Xserver/hw/xnest/Pixmap.c b/xc/programs/Xserver/hw/xnest/Pixmap.c
index 32a64ef49..5b3b3c6d6 100644
--- a/xc/programs/Xserver/hw/xnest/Pixmap.c
+++ b/xc/programs/Xserver/hw/xnest/Pixmap.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Pixmap.c,v 1.1 93/07/12 15:28:39 rws Exp $ */
+/* $XConsortium: Pixmap.c,v 1.2 94/01/07 09:52:47 dpw Exp ray $ */
/*
Copyright 1993 by Davor Matic
@@ -22,10 +22,7 @@ is" without express or implied warranty.
#include "servermd.h"
#include "mi.h"
-#define GC XlibGC
-#include "Xlib.h"
-#include "Xutil.h"
-#undef GC
+#include "Xnest.h"
#include "Display.h"
#include "Screen.h"
diff --git a/xc/programs/Xserver/hw/xnest/Pointer.c b/xc/programs/Xserver/hw/xnest/Pointer.c
index cd420daf4..ab8b549c7 100644
--- a/xc/programs/Xserver/hw/xnest/Pointer.c
+++ b/xc/programs/Xserver/hw/xnest/Pointer.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xnestPointer.c,v 1.1 93/06/23 16:23:37 dmatic Exp $ */
+/* $XConsortium: Pointer.c,v 1.1 93/07/12 15:28:43 rws Exp ray $ */
/*
Copyright 1993 by Davor Matic
@@ -21,10 +21,7 @@ is" without express or implied warranty.
#include "servermd.h"
#include "mipointer.h"
-#define GC XlibGC
-#include "Xlib.h"
-#include "Xutil.h"
-#undef GC
+#include "Xnest.h"
#include "Display.h"
#include "Screen.h"
diff --git a/xc/programs/Xserver/hw/xnest/Screen.c b/xc/programs/Xserver/hw/xnest/Screen.c
index 0531c262f..826e68055 100644
--- a/xc/programs/Xserver/hw/xnest/Screen.c
+++ b/xc/programs/Xserver/hw/xnest/Screen.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Screen.c,v 1.3 93/09/29 17:40:17 dpw Exp $ */
+/* $XConsortium: Screen.c,v 1.4 94/02/06 17:52:40 rws Exp ray $ */
/*
Copyright 1993 by Davor Matic
@@ -21,10 +21,7 @@ is" without express or implied warranty.
#include "colormapst.h"
#include "resource.h"
-#define GC XlibGC
-#include "Xlib.h"
-#include "Xutil.h"
-#undef GC
+#include "Xnest.h"
#include "Display.h"
#include "Screen.h"
diff --git a/xc/programs/Xserver/hw/xnest/Visual.c b/xc/programs/Xserver/hw/xnest/Visual.c
index fe1ae07d3..33ca36741 100644
--- a/xc/programs/Xserver/hw/xnest/Visual.c
+++ b/xc/programs/Xserver/hw/xnest/Visual.c
@@ -1,4 +1,4 @@
-/* $XConsortium: xnestVisual.c,v 1.1 93/06/23 16:23:40 dmatic Exp $ */
+/* $XConsortium: Visual.c,v 1.1 93/07/12 15:28:52 rws Exp ray $ */
/*
Copyright 1993 by Davor Matic
@@ -18,10 +18,7 @@ is" without express or implied warranty.
#include "dix.h"
#include "mi.h"
#include "mibstore.h"
-#define GC XlibGC
-#include "Xlib.h"
-#include "Xutil.h"
-#undef GC
+#include "Xnest.h"
#include "Display.h"
#include "Visual.h"
diff --git a/xc/programs/Xserver/hw/xnest/Window.c b/xc/programs/Xserver/hw/xnest/Window.c
index 318f23f4d..f83e75b7c 100644
--- a/xc/programs/Xserver/hw/xnest/Window.c
+++ b/xc/programs/Xserver/hw/xnest/Window.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Window.c,v 1.4 94/02/06 17:53:04 rws Exp $ */
+/* $XConsortium: Window.c,v 1.5 94/02/16 11:53:17 rws Exp ray $ */
/*
Copyright 1993 by Davor Matic
@@ -22,11 +22,7 @@ is" without express or implied warranty.
#include "scrnintstr.h"
#include "region.h"
-#define GC XlibGC
-#include "Xlib.h"
-#include "Xutil.h"
-#include <X11/extensions/shape.h>
-#undef GC
+#include "Xnest.h"
#include "Display.h"
#include "Screen.h"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 16:58:38 +0000