Bugzilla – Attachment 24668 Details for
Bug 61220
Update NX to release 3.2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
IDP Log In
|
Forgot Password
[patch]
Patch that improves the situation somehow
bugzilla_suse_46220_nxagent.diff (text/plain), 26.58 KB, created by
Matthias Hopf
on 2004-10-06 20:10:14 UTC
(
hide
)
Description:
Patch that improves the situation somehow
Filename:
MIME Type:
Creator:
Matthias Hopf
Created:
2004-10-06 20:10:14 UTC
Size:
26.58 KB
patch
obsolete
>diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Agent.h ./programs/Xserver/hw/nxagent/Agent.h >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Agent.h 2004-06-04 17:08:24.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Agent.h 2004-10-06 12:20:19.000000000 +0200 >@@ -106,6 +106,9 @@ typedef XID KeySym64; > #undef Colormap > #undef GContext > #undef KeySym >+typedef XID64 XIDLib; >+#else >+typedef XID XIDLib; > #endif /*_XSERVER64_tmp*/ > > /* >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Args.c ./programs/Xserver/hw/nxagent/Args.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Args.c 2004-07-14 19:08:12.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Args.c 2004-10-06 11:34:49.000000000 +0200 >@@ -34,6 +34,8 @@ is" without express or implied warranty. > #include <errno.h> > > #include "X.h" >+#include "Agent.h" >+ > #include "Xproto.h" > #include "screenint.h" > #include "input.h" >@@ -46,7 +48,6 @@ is" without express or implied warranty. > * NX specific includes and definitions. > */ > >-#include "Agent.h" > #include "Display.h" > #include "Args.h" > #include "Control.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Atoms.c ./programs/Xserver/hw/nxagent/Atoms.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Atoms.c 2004-09-24 16:13:05.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Atoms.c 2004-10-06 12:37:52.353582078 +0200 >@@ -15,12 +15,12 @@ > /* */ > /**************************************************************************/ > >-#include "Xutil.h" >-#include "Xatom.h" >-#include "Xlib.h" >+#include "X.h" >+#include "Agent.h" > > #include "misc.h" > #include "scrnintstr.h" >+#include "Xatom.h" > > #include "NXpack.h" > >@@ -48,7 +48,7 @@ extern int nxagentAlphaEnabled; > extern int nxagentPackMethod; > extern Bool windowManagerRunning; > >-Atom nxagentAtoms[NXAGENT_NUMBER_OF_ATOMS]; >+XIDLib nxagentAtoms[NXAGENT_NUMBER_OF_ATOMS]; > > static char *nxagentAtomNames[NXAGENT_NUMBER_OF_ATOMS + 1] = > { >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Atoms.h ./programs/Xserver/hw/nxagent/Atoms.h >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Atoms.h 2004-07-12 16:53:13.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Atoms.h 2004-10-06 12:35:35.000000000 +0200 >@@ -24,7 +24,7 @@ > > #define NXAGENT_NUMBER_OF_ATOMS 11 > >-extern Atom nxagentAtoms[NXAGENT_NUMBER_OF_ATOMS]; >+extern XIDLib nxagentAtoms[NXAGENT_NUMBER_OF_ATOMS]; > > /* > * Create the required atoms internally >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Clipboard.c ./programs/Xserver/hw/nxagent/Clipboard.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Clipboard.c 2004-09-21 16:31:58.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Clipboard.c 2004-10-06 11:31:43.000000000 +0200 >@@ -18,8 +18,12 @@ > #define NEED_EVENTS > > #include "X.h" >+#include "Agent.h" >+ > #include "Xlib.h" > #include "Xproto.h" >+#include "Xutil.h" >+ > #include "Xatom.h" > #include "selection.h" > #include "windowstr.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Color.c ./programs/Xserver/hw/nxagent/Color.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Color.c 2004-06-04 17:08:23.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Color.c 2004-10-06 11:34:39.000000000 +0200 >@@ -30,6 +30,8 @@ is" without express or implied warranty. > */ > > #include "X.h" >+#include "Agent.h" >+ > #include "Xproto.h" > #include "scrnintstr.h" > #include "window.h" >@@ -37,9 +39,6 @@ is" without express or implied warranty. > #include "colormapst.h" > #include "resource.h" > >-#include "Agent.h" >- >- > #include "Display.h" > #include "Screen.h" > #include "Color.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Control.c ./programs/Xserver/hw/nxagent/Control.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Control.c 2004-06-04 17:08:23.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Control.c 2004-10-06 11:34:59.000000000 +0200 >@@ -24,6 +24,9 @@ > #include <errno.h> > > #include "X.h" >+ >+#include "Agent.h" >+ > #include "Xproto.h" > #include "dix.h" > #include "os.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Cursor.c ./programs/Xserver/hw/nxagent/Cursor.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Cursor.c 2004-08-06 16:59:47.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Cursor.c 2004-10-06 11:35:07.000000000 +0200 >@@ -30,6 +30,8 @@ is" without express or implied warranty. > */ > > #include "X.h" >+#include "Agent.h" >+ > #include "Xproto.h" > #include "screenint.h" > #include "input.h" >@@ -39,7 +41,6 @@ is" without express or implied warranty. > #include "scrnintstr.h" > #include "servermd.h" > >-#include "Agent.h" > #include "Display.h" > #include "Options.h" > #include "Screen.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Display.c ./programs/Xserver/hw/nxagent/Display.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Display.c 2004-09-21 12:46:52.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Display.c 2004-10-06 11:35:16.000000000 +0200 >@@ -30,13 +30,14 @@ is" without express or implied warranty. > */ > > #include <X11/X.h> >+#include "Agent.h" >+ > #include <X11/Xproto.h> > #include "screenint.h" > #include "input.h" > #include "misc.h" > #include "scrnintstr.h" > #include "servermd.h" >-#include "Agent.h" > > #include <signal.h> > #include <sys/types.h> >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Error.c ./programs/Xserver/hw/nxagent/Error.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Error.c 2004-06-04 17:08:25.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Error.c 2004-10-06 11:32:05.000000000 +0200 >@@ -18,6 +18,9 @@ > #include <stdio.h> > #include <string.h> > >+#include "X.h" >+#include "Agent.h" >+ > #include "Xlib.h" > #include "Xproto.h" /* to declare xEvent */ > >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Events.c ./programs/Xserver/hw/nxagent/Events.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Events.c 2004-09-24 16:10:59.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Events.c 2004-10-06 12:20:02.000000000 +0200 >@@ -30,6 +30,8 @@ is" without express or implied warranty. > */ > > #include "X.h" >+#include "Agent.h" >+ > #include "signal.h" > #include "unistd.h" > #define NEED_EVENTS >@@ -42,7 +44,6 @@ is" without express or implied warranty. > #include "servermd.h" > #include "mi.h" > >-#include "Agent.h" > #include "Args.h" > #include "Atoms.h" > #include "Color.h" >@@ -1412,7 +1413,7 @@ int nxagentHandlePropertyNotify(XEvent * > { > unsigned char *buffer; > Atom xa_string = XInternAtom(nxagentDisplay, "STRING", FALSE); >- Atom type = xa_string; >+ XIDLib type = xa_string; > int format; > int result; > unsigned long nitems, bytes_after; >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Font.c ./programs/Xserver/hw/nxagent/Font.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Font.c 2004-06-14 19:02:39.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Font.c 2004-10-06 11:35:30.000000000 +0200 >@@ -30,7 +30,8 @@ is" without express or implied warranty. > */ > > #include "X.h" >-#include "Xatom.h" >+#include "Agent.h" >+ > #include "Xproto.h" > #include "misc.h" > #include "miscstruct.h" >@@ -38,7 +39,7 @@ is" without express or implied warranty. > #include "fontstruct.h" > #include "scrnintstr.h" > >-#include "Agent.h" >+#include "Xatom.h" > > #include "Display.h" > #include "Font.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/GC.c ./programs/Xserver/hw/nxagent/GC.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/GC.c 2004-07-09 11:55:14.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/GC.c 2004-10-06 11:35:36.000000000 +0200 >@@ -30,6 +30,8 @@ is" without express or implied warranty. > */ > > #include "X.h" >+#include "Agent.h" >+ > #include "Xproto.h" > #include "gcstruct.h" > #include "windowstr.h" >@@ -39,8 +41,6 @@ is" without express or implied warranty. > #include "mistruct.h" > #include "region.h" > >-#include "Agent.h" >- > #include "Display.h" > #include "GC.h" > #include "GCOps.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/GCOps.c ./programs/Xserver/hw/nxagent/GCOps.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/GCOps.c 2004-09-24 15:55:21.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/GCOps.c 2004-10-06 11:35:43.000000000 +0200 >@@ -30,6 +30,8 @@ is" without express or implied warranty. > */ > > #include "X.h" >+#include "Agent.h" >+ > #include "Xproto.h" > #include "miscstruct.h" > #include "dixstruct.h" >@@ -41,7 +43,6 @@ is" without express or implied warranty. > #include "region.h" > #include "servermd.h" > >-#include "Agent.h" > #include "Args.h" > #include "Display.h" > #include "Options.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Handlers.c ./programs/Xserver/hw/nxagent/Handlers.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Handlers.c 2004-06-04 17:08:23.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Handlers.c 2004-10-06 11:35:51.000000000 +0200 >@@ -30,6 +30,8 @@ is" without express or implied warranty. > */ > > #include "X.h" >+#include "Agent.h" >+ > #include "Xproto.h" > #include "screenint.h" > #include "input.h" >@@ -38,7 +40,6 @@ is" without express or implied warranty. > #include "windowstr.h" > #include "servermd.h" > >-#include "Agent.h" > #include "Handlers.h" > #include "Display.h" > #include "Events.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Init.c ./programs/Xserver/hw/nxagent/Init.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Init.c 2004-09-22 17:27:48.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Init.c 2004-10-06 11:35:59.000000000 +0200 >@@ -30,6 +30,8 @@ is" without express or implied warranty. > */ > > #include "X.h" >+#include "Agent.h" >+ > #include "Xproto.h" > #include "screenint.h" > #include "input.h" >@@ -40,8 +42,6 @@ is" without express or implied warranty. > #include "mi.h" > #include "fontstruct.h" > >-#include "Agent.h" >- > #include "Display.h" > #include "Screen.h" > #include "Pointer.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Keyboard.c ./programs/Xserver/hw/nxagent/Keyboard.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Keyboard.c 2004-06-21 17:46:29.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Keyboard.c 2004-10-06 11:36:10.000000000 +0200 >@@ -31,6 +31,8 @@ is" without express or implied warranty. > > #define NEED_EVENTS > #include "X.h" >+#include "Agent.h" >+ > #include "Xproto.h" > #include "keysym.h" > #include "screenint.h" >@@ -39,7 +41,6 @@ is" without express or implied warranty. > #include "scrnintstr.h" > #include "servermd.h" > >-#include "Agent.h" > #include "Display.h" > #include "Screen.h" > #include "Keyboard.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/NXdispatch.c ./programs/Xserver/hw/nxagent/NXdispatch.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/NXdispatch.c 2004-09-24 16:06:42.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/NXdispatch.c 2004-10-06 11:36:21.000000000 +0200 >@@ -94,6 +94,9 @@ int ProcInitialConnection(); > #define True 1 > #endif > >+#include "X.h" >+#include "Agent.h" >+ > #include "windowstr.h" > #include "fontstruct.h" > #include "dixfontstr.h" >@@ -107,6 +110,7 @@ int ProcInitialConnection(); > #include "servermd.h" > #include "extnsionst.h" > #include "dixfont.h" >+ > #include "../../dix/dispatch.h" > #include "swaprep.h" > #include "swapreq.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/NXdixfonts.c ./programs/Xserver/hw/nxagent/NXdixfonts.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/NXdixfonts.c 2004-06-04 17:08:24.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/NXdixfonts.c 2004-10-06 11:36:25.000000000 +0200 >@@ -40,6 +40,8 @@ SOFTWARE. > > #define NEED_REPLIES > #include "X.h" >+#include "Agent.h" >+ > #include "Xmd.h" > #include "Xproto.h" > #include "scrnintstr.h" >@@ -60,7 +62,6 @@ SOFTWARE. > #endif > > #ifdef NXAGENT_FONTMATCH >-# include "Agent.h" > # include "Font.h" > #endif > >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/NXevents.c ./programs/Xserver/hw/nxagent/NXevents.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/NXevents.c 2004-06-04 17:08:24.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/NXevents.c 2004-10-06 11:36:36.000000000 +0200 >@@ -85,6 +85,8 @@ SOFTWARE. > *****************************************************************/ > > #include "X.h" >+#include "Agent.h" >+ > #include "misc.h" > #include "resource.h" > #define NEED_EVENTS >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/NXextension.c ./programs/Xserver/hw/nxagent/NXextension.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/NXextension.c 2004-06-04 17:08:25.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/NXextension.c 2004-10-06 11:36:42.000000000 +0200 >@@ -63,6 +63,8 @@ SOFTWARE. > ******************************************************************/ > > #include "X.h" >+#include "Agent.h" >+ > #define NEED_EVENTS > #define NEED_REPLIES > #include "Xproto.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/NXglyph.c ./programs/Xserver/hw/nxagent/NXglyph.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/NXglyph.c 2004-06-04 17:08:24.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/NXglyph.c 2004-10-06 11:42:26.000000000 +0200 >@@ -38,6 +38,9 @@ > * Author: Keith Packard, SuSE, Inc. > */ > >+#include "X.h" >+#include "Agent.h" >+ > #include "misc.h" > #include "scrnintstr.h" > #include "os.h" >@@ -433,7 +436,7 @@ FreeGlyphSet (pointer value, > > #ifdef NXAGENT_RECONNECT > >-extern void nxagentAddGlyphs(GlyphSetPtr, Glyph*, xGlyphInfo*, int, CARD8*, int); >+extern void nxagentAddGlyphs(GlyphSetPtr, CARD32*, xGlyphInfo*, int, CARD8*, int); > > Bool nxagentFillGlyphSet(GlyphSetPtr pGly) > { >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/NXglyphcurs.c ./programs/Xserver/hw/nxagent/NXglyphcurs.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/NXglyphcurs.c 2004-06-04 17:08:24.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/NXglyphcurs.c 2004-10-06 11:37:05.000000000 +0200 >@@ -62,6 +62,9 @@ SOFTWARE. > > ************************************************************************/ > >+#include "X.h" >+#include "Agent.h" >+ > #include "misc.h" > #include "fontstruct.h" > #include "dixfontstr.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/NXmiwindow.c ./programs/Xserver/hw/nxagent/NXmiwindow.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/NXmiwindow.c 2004-07-21 19:18:13.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/NXmiwindow.c 2004-10-06 11:37:15.000000000 +0200 >@@ -63,6 +63,8 @@ SOFTWARE. > ******************************************************************/ > > #include "X.h" >+#include "Agent.h" >+ > #include "miscstruct.h" > #include "region.h" > #include "mi.h" >@@ -73,7 +75,6 @@ SOFTWARE. > > #ifdef NXAGENT_EXPOSURES > >-#include "Agent.h" > #include "Display.h" > #include "Window.h" > #include "Events.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/NXpicture.c ./programs/Xserver/hw/nxagent/NXpicture.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/NXpicture.c 2004-06-04 17:08:24.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/NXpicture.c 2004-10-06 11:37:25.000000000 +0200 >@@ -38,6 +38,9 @@ > * Author: Keith Packard, SuSE, Inc. > */ > >+#include "X.h" >+#include "Agent.h" >+ > #include "misc.h" > #include "scrnintstr.h" > #include "os.h" >@@ -51,6 +54,7 @@ > #include "dixstruct.h" > #include "gcstruct.h" > #include "servermd.h" >+ > #include "NXpicturestr.h" > > #include "Pixmap.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/NXproperty.c ./programs/Xserver/hw/nxagent/NXproperty.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/NXproperty.c 2004-07-13 13:04:04.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/NXproperty.c 2004-10-06 11:37:33.000000000 +0200 >@@ -63,6 +63,8 @@ SOFTWARE. > ******************************************************************/ > > #include "X.h" >+#include "Agent.h" >+ > #define NEED_REPLIES > #define NEED_EVENTS > #include "Xproto.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/NXrender.c ./programs/Xserver/hw/nxagent/NXrender.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/NXrender.c 2004-09-02 19:41:58.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/NXrender.c 2004-10-06 13:00:44.053874153 +0200 >@@ -41,6 +41,8 @@ > #define NEED_REPLIES > #define NEED_EVENTS > #include "X.h" >+#include "Agent.h" >+ > #include "Xproto.h" > #include "misc.h" > #include "os.h" >@@ -93,7 +95,7 @@ extern void nxagentComposite(CARD8, Pict > extern void nxagentCompositeRects(CARD8, PicturePtr, xRenderColor *, int, xRectangle *); > extern void nxagentCreateGlyphSet(GlyphSetPtr glyphSet); > extern void nxagentReferenceGlyphSet(GlyphSetPtr glyphSet); >-extern void nxagentAddGlyphs(GlyphSetPtr glyphSet, Glyph *gids, xGlyphInfo *gi, >+extern void nxagentAddGlyphs(GlyphSetPtr glyphSet, CARD32 *gids, xGlyphInfo *gi, > int nglyphs, CARD8 *images, int sizeImages); > > extern void nxagentFreeGlyphs(GlyphSetPtr glyphSet, CARD32 *gids, int nglyph); >@@ -1433,7 +1435,7 @@ ProcRenderFreeGlyphs (ClientPtr client) > GlyphSetPtr glyphSet; > int nglyph; > CARD32 *gids; >- CARD32 glyph; >+ Glyph glyph; > > REQUEST_AT_LEAST_SIZE(xRenderFreeGlyphsReq); > glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client, >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/NXwindow.c ./programs/Xserver/hw/nxagent/NXwindow.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/NXwindow.c 2004-09-03 16:43:17.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/NXwindow.c 2004-10-06 11:37:48.000000000 +0200 >@@ -85,6 +85,9 @@ SOFTWARE. > * * > *****************************************************************/ > >+#include "X.h" >+#include "Agent.h" >+ > #include "misc.h" > #include "scrnintstr.h" > #include "os.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Pixmap.c ./programs/Xserver/hw/nxagent/Pixmap.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Pixmap.c 2004-06-04 17:08:24.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Pixmap.c 2004-10-06 11:37:56.000000000 +0200 >@@ -30,6 +30,8 @@ is" without express or implied warranty. > */ > > #include "X.h" >+#include "Agent.h" >+ > #include "Xproto.h" > #include "miscstruct.h" > #include "pixmapstr.h" >@@ -41,8 +43,6 @@ is" without express or implied warranty. > > #include "../../fb/fb.h" > >-#include "Agent.h" >- > #include "Display.h" > #include "Screen.h" > #include "Pixmap.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Pointer.c ./programs/Xserver/hw/nxagent/Pointer.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Pointer.c 2004-06-04 17:08:24.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Pointer.c 2004-10-06 11:38:02.000000000 +0200 >@@ -30,6 +30,8 @@ is" without express or implied warranty. > */ > > #include "X.h" >+#include "Agent.h" >+ > #include "Xproto.h" > #include "screenint.h" > #include "input.h" >@@ -38,7 +40,6 @@ is" without express or implied warranty. > #include "servermd.h" > #include "mipointer.h" > >-#include "Agent.h" > #include "Args.h" > #include "Display.h" > #include "Screen.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Reconnect.c ./programs/Xserver/hw/nxagent/Reconnect.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Reconnect.c 2004-08-06 16:32:31.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Reconnect.c 2004-10-06 11:38:08.000000000 +0200 >@@ -18,12 +18,13 @@ > #include <signal.h> > > #include "X.h" >+#include "Agent.h" >+ > #include "Xproto.h" > #include "Xpoll.h" > #include "mi.h" > #include "fb.h" > >-#include "Agent.h" > #include "Drawable.h" > #include "Control.h" > #include "Reconnect.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Render.c ./programs/Xserver/hw/nxagent/Render.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Render.c 2004-08-05 22:30:20.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Render.c 2004-10-06 12:27:31.000000000 +0200 >@@ -15,11 +15,13 @@ > /* */ > /**************************************************************************/ > >+#include "X.h" >+#include "Agent.h" >+ > #include "NXpicturestr.h" > #include "NXglyphstr.h" > #include "Render.h" > >-#include "X.h" > #include "Xproto.h" > > #include "render.h" >@@ -29,7 +31,6 @@ > #include "fb.h" > #include "mipict.h" > #include "fbpict.h" >-#include "Agent.h" > #include "Drawable.h" > > #include "../../../../lib/Xrender/Xrenderint.h" >@@ -65,7 +66,7 @@ Bool nxagentDisconnectPictures(void); > > void nxagentCreateGlyphSet(GlyphSetPtr pGly); > void nxagentQueryFormats(void); >-void nxagentAddGlyphs(GlyphSetPtr glyphsSet, Glyph *gids, xGlyphInfo *gi, int nglyphs, CARD8 *images, int sizeImages); >+void nxagentAddGlyphs(GlyphSetPtr glyphsSet, CARD32 *gids, xGlyphInfo *gi, int nglyphs, CARD8 *images, int sizeImages); > static XRenderPictFormat *nxagentMatchingFormats(PictFormatPtr pForm); > > #ifdef NX_RENDER_DEBUG >@@ -984,11 +985,20 @@ void nxagentCreateGlyphSet(GlyphSetPtr p > #endif > } > >-void nxagentAddGlyphs(GlyphSetPtr glyphSet, Glyph *gids, xGlyphInfo *gi, int nglyphs, CARD8 *images, int sizeImages) >+void nxagentAddGlyphs(GlyphSetPtr glyphSet, CARD32 *gids, xGlyphInfo *gi, int nglyphs, CARD8 *images, int sizeImages) > { > extern const CARD8 glyphDepths[]; > extern int ServerOrder(void); > extern void BitOrderInvert(unsigned char*, int); >+ Glyph *gconv; >+ >+ if (sizeof(CARD32) != sizeof(Glyph)) { >+ int i; >+ gconv = malloc (nglyphs * sizeof(Glyph)); >+ for (i = 0; i < nglyphs; i++) >+ gconv[i] = (Glyph) gids[i]; >+ } else >+ gconv = (Glyph *) gids; > > #ifdef NX_RENDER_DEBUG > fprintf(stderr, "nxagentAddGlyphs\n"); >@@ -1002,7 +1012,7 @@ void nxagentAddGlyphs(GlyphSetPtr glyphS > > XRenderAddGlyphs(nxagentDisplay, > glyphSet -> remoteID, >- gids, >+ gconv, > (XGlyphInfo*)(gi), > nglyphs, > (char*)images, >@@ -1011,6 +1021,8 @@ void nxagentAddGlyphs(GlyphSetPtr glyphS > #ifdef NX_RENDER_DEBUG > XSync(nxagentDisplay, False); > #endif >+ if (sizeof(CARD32) != sizeof(Glyph)) >+ free (gconv); > } > > void nxagentReferenceGlyphSet(GlyphSetPtr glyphSet) >@@ -1020,10 +1032,20 @@ void nxagentReferenceGlyphSet(GlyphSetPt > > void nxagentFreeGlyphs(GlyphSetPtr glyphSet, CARD32 *gids, int nglyph) > { >-/* Glyph nx_gids[nglyph]; >-*/ >- XRenderFreeGlyphs (nxagentDisplay, glyphSet -> remoteID, gids, nglyph); >+ Glyph *gconv; >+ >+ if (sizeof(CARD32) != sizeof(Glyph)) { >+ int i; >+ gconv = malloc (nglyph * sizeof(Glyph)); >+ for (i = 0; i < nglyph; i++) >+ gconv[i] = (Glyph) gids[i]; >+ } else >+ gconv = (Glyph *) gids; >+ >+ XRenderFreeGlyphs (nxagentDisplay, glyphSet -> remoteID, gconv, nglyph); > >+ if (sizeof(CARD32) != sizeof(Glyph)) >+ free (gconv); > } > > void nxagentFreeGlyphSet(GlyphSetPtr glyphSet) >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Rootless.c ./programs/Xserver/hw/nxagent/Rootless.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Rootless.c 2004-06-04 17:08:24.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Rootless.c 2004-10-06 11:38:22.000000000 +0200 >@@ -16,12 +16,12 @@ > /**************************************************************************/ > > #include "X.h" >+#include "Agent.h" > > #include "window.h" > #include "windowstr.h" > #include "colormapst.h" > >-#include "Agent.h" > #include "Display.h" > #include "Drawable.h" > >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Screen.c ./programs/Xserver/hw/nxagent/Screen.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Screen.c 2004-09-22 18:55:59.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Screen.c 2004-10-06 12:21:07.000000000 +0200 >@@ -29,6 +29,9 @@ is" without express or implied warranty. > > */ > >+#include "X.h" >+#include "Agent.h" >+ > #include "scrnintstr.h" > #include "dix.h" > #include "mi.h" >@@ -38,7 +41,6 @@ is" without express or implied warranty. > #include "resource.h" > #include "mipointer.h" > >-#include "Agent.h" > #include "Display.h" > #include "Screen.h" > #include "Atoms.h" >@@ -1082,7 +1084,7 @@ N/A > > if (windowManagerRunning) > { >- Atom deleteWMatom = nxagentAtoms[2]; /* WM_DELETE_WINDOW */ >+ XIDLib deleteWMatom = nxagentAtoms[2]; /* WM_DELETE_WINDOW */ > > #ifdef TEST > fprintf(stderr, "nxagentOpenScreen: Found WM, delete window atom [%ld].\n", >@@ -1333,7 +1335,7 @@ unsigned char fromHexNibble(char c) > void nxagentPropagateArtsdProperties(ScreenPtr pScreen, char *port) > { > Window rootWin; >- Atom atomReturnType; >+ XIDLib atomReturnType; > Atom prop_atom; > int iReturnFormat; > unsigned long ulReturnItems; >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Splash.c ./programs/Xserver/hw/nxagent/Splash.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Splash.c 2004-06-04 17:08:24.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Splash.c 2004-10-06 12:34:47.000000000 +0200 >@@ -15,7 +15,12 @@ > /* */ > /**************************************************************************/ > >+#include "X.h" >+#include "Agent.h" >+#define GC XlibGC >+ > #include "Xlib.h" >+#include "Xutil.h" > > #include "Intrinsic.h" > >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/TestExt.c ./programs/Xserver/hw/nxagent/TestExt.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/TestExt.c 2004-06-04 17:08:24.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/TestExt.c 2004-10-06 11:38:48.000000000 +0200 >@@ -30,6 +30,8 @@ is" without express or implied warranty. > */ > > #include <X11/X.h> >+#include "Agent.h" >+ > #include <X11/Xproto.h> > #include <X11/Xlib.h> > #undef Bool >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Visual.c ./programs/Xserver/hw/nxagent/Visual.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Visual.c 2004-06-04 17:08:24.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Visual.c 2004-10-06 11:38:57.000000000 +0200 >@@ -30,12 +30,13 @@ is" without express or implied warranty. > */ > > #include "X.h" >+#include "Agent.h" >+ > #include "Xproto.h" > #include "scrnintstr.h" > #include "dix.h" > #include "mi.h" > #include "mibstore.h" >-#include "Agent.h" > > #include "Display.h" > #include "Visual.h" >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/Window.c ./programs/Xserver/hw/nxagent/Window.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/Window.c 2004-08-06 19:40:04.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/Window.c 2004-10-06 12:21:22.000000000 +0200 >@@ -30,6 +30,8 @@ is" without express or implied warranty. > */ > > #include "X.h" >+#include "Agent.h" >+ > #include "Xproto.h" > #include "gcstruct.h" > #include "window.h" >@@ -41,8 +43,6 @@ is" without express or implied warranty. > > #include "mi.h" > >-#include "Agent.h" >- > #include "Display.h" > #include "Screen.h" > #include "GC.h" >@@ -772,7 +772,7 @@ void nxagentRestackWindow(pWin, pOldNext > } > else > { >- Window windowList[2]; >+ XIDLib windowList[2]; > > #ifdef TEST > fprintf(stderr, "nxagentRestackWindow: Putting window [%p][%ld] in the middle.\n", >diff -upr ../nx-X11.orig/programs/Xserver/hw/nxagent/os2Stub.c ./programs/Xserver/hw/nxagent/os2Stub.c >--- ../nx-X11.orig/programs/Xserver/hw/nxagent/os2Stub.c 2004-06-04 17:08:24.000000000 +0200 >+++ ./programs/Xserver/hw/nxagent/os2Stub.c 2004-10-06 11:39:24.000000000 +0200 >@@ -47,6 +47,9 @@ > /* somewhat optimized for improved performance, but assumes a few */ > /* things so it cannot be used as a general select. */ > >+#include "X.h" >+#include "Agent.h" >+ > #define I_NEED_OS2_H > #include "Xpoll.h" > #include <stdio.h>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
Actions:
View
|
Diff
Attachments on
bug 61220
: 24668