Attachment #24668 for bug #61220

View | Details | Raw Unified | Return to bug 61220
Collapse All | Expand All

Lines 106-111 typedef XID KeySym64; Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Agent.h (+3 lines)
106	#undef Colormap	106	#undef Colormap
107	#undef GContext	107	#undef GContext
108	#undef KeySym	108	#undef KeySym
		109	typedef XID64 XIDLib;
		110	#else
		111	typedef XID XIDLib;
109	#endif /_XSERVER64_tmp/	112	#endif /_XSERVER64_tmp/
110		113
111	/*	114	/*

Lines 34-39 is" without express or implied warranty. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Args.c (-1 / +2 lines)
34	#include <errno.h>	34	#include <errno.h>
35		35
36	#include "X.h"	36	#include "X.h"
		37	#include "Agent.h"
		38
37	#include "Xproto.h"	39	#include "Xproto.h"
38	#include "screenint.h"	40	#include "screenint.h"
39	#include "input.h"	41	#include "input.h"
Lines 46-52 is" without express or implied warranty. Link Here
46	* NX specific includes and definitions.	48	* NX specific includes and definitions.
47	*/	49	*/
48		50
49	#include "Agent.h"
50	#include "Display.h"	51	#include "Display.h"
51	#include "Args.h"	52	#include "Args.h"
52	#include "Control.h"	53	#include "Control.h"




/*                                                                        */
/**************************************************************************/

#include "X.h"
#include "Agent.h"
#include "Xlib.h"

#include "misc.h"
#include "scrnintstr.h"
#include "Xatom.h"

#include "NXpack.h"


extern int nxagentPackMethod;
extern Bool windowManagerRunning;

XIDLib nxagentAtoms[NXAGENT_NUMBER_OF_ATOMS];

static char *nxagentAtomNames[NXAGENT_NUMBER_OF_ATOMS + 1] =
{

Lines 24-30 Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Atoms.h (-1 / +1 lines)
24		24
25	#define NXAGENT_NUMBER_OF_ATOMS 11	25	#define NXAGENT_NUMBER_OF_ATOMS 11
26		26
27	extern Atom nxagentAtoms[NXAGENT_NUMBER_OF_ATOMS];	27	extern XIDLib nxagentAtoms[NXAGENT_NUMBER_OF_ATOMS];
28		28
29	/*	29	/*
30	* Create the required atoms internally	30	* Create the required atoms internally

Lines 18-25 Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Clipboard.c (+4 lines)
18	#define NEED_EVENTS	18	#define NEED_EVENTS
19		19
20	#include "X.h"	20	#include "X.h"
		21	#include "Agent.h"
		22
21	#include "Xlib.h"	23	#include "Xlib.h"
22	#include "Xproto.h"	24	#include "Xproto.h"
		25	#include "Xutil.h"
		26
23	#include "Xatom.h"	27	#include "Xatom.h"
24	#include "selection.h"	28	#include "selection.h"
25	#include "windowstr.h"	29	#include "windowstr.h"

Lines 30-35 is" without express or implied warranty. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Color.c (-3 / +2 lines)
30	*/	30	*/
31		31
32	#include "X.h"	32	#include "X.h"
		33	#include "Agent.h"
		34
33	#include "Xproto.h"	35	#include "Xproto.h"
34	#include "scrnintstr.h"	36	#include "scrnintstr.h"
35	#include "window.h"	37	#include "window.h"
Lines 37-45 is" without express or implied warranty. Link Here
37	#include "colormapst.h"	39	#include "colormapst.h"
38	#include "resource.h"	40	#include "resource.h"
39		41
40	#include "Agent.h"
41
42
43	#include "Display.h"	42	#include "Display.h"
44	#include "Screen.h"	43	#include "Screen.h"
45	#include "Color.h"	44	#include "Color.h"

Lines 24-29 Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Control.c (+3 lines)
24	#include <errno.h>	24	#include <errno.h>
25		25
26	#include "X.h"	26	#include "X.h"
		27
		28	#include "Agent.h"
		29
27	#include "Xproto.h"	30	#include "Xproto.h"
28	#include "dix.h"	31	#include "dix.h"
29	#include "os.h"	32	#include "os.h"

Lines 30-35 is" without express or implied warranty. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Cursor.c (-1 / +2 lines)
30	*/	30	*/
31		31
32	#include "X.h"	32	#include "X.h"
		33	#include "Agent.h"
		34
33	#include "Xproto.h"	35	#include "Xproto.h"
34	#include "screenint.h"	36	#include "screenint.h"
35	#include "input.h"	37	#include "input.h"
Lines 39-45 is" without express or implied warranty. Link Here
39	#include "scrnintstr.h"	41	#include "scrnintstr.h"
40	#include "servermd.h"	42	#include "servermd.h"
41		43
42	#include "Agent.h"
43	#include "Display.h"	44	#include "Display.h"
44	#include "Options.h"	45	#include "Options.h"
45	#include "Screen.h"	46	#include "Screen.h"

Lines 30-42 is" without express or implied warranty. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Display.c (-1 / +2 lines)
30	*/	30	*/
31		31
32	#include <X11/X.h>	32	#include <X11/X.h>
		33	#include "Agent.h"
		34
33	#include <X11/Xproto.h>	35	#include <X11/Xproto.h>
34	#include "screenint.h"	36	#include "screenint.h"
35	#include "input.h"	37	#include "input.h"
36	#include "misc.h"	38	#include "misc.h"
37	#include "scrnintstr.h"	39	#include "scrnintstr.h"
38	#include "servermd.h"	40	#include "servermd.h"
39	#include "Agent.h"
40		41
41	#include <signal.h>	42	#include <signal.h>
42	#include <sys/types.h>	43	#include <sys/types.h>

Lines 18-23 Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Error.c (+3 lines)
18	#include <stdio.h>	18	#include <stdio.h>
19	#include <string.h>	19	#include <string.h>
20		20
		21	#include "X.h"
		22	#include "Agent.h"
		23
21	#include "Xlib.h"	24	#include "Xlib.h"
22	#include "Xproto.h" /* to declare xEvent */	25	#include "Xproto.h" /* to declare xEvent */
23		26

Lines 30-35 is" without express or implied warranty. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Events.c (-2 / +3 lines)
30	*/	30	*/
31		31
32	#include "X.h"	32	#include "X.h"
		33	#include "Agent.h"
		34
33	#include "signal.h"	35	#include "signal.h"
34	#include "unistd.h"	36	#include "unistd.h"
35	#define NEED_EVENTS	37	#define NEED_EVENTS
Lines 42-48 is" without express or implied warranty. Link Here
42	#include "servermd.h"	44	#include "servermd.h"
43	#include "mi.h"	45	#include "mi.h"
44		46
45	#include "Agent.h"
46	#include "Args.h"	47	#include "Args.h"
47	#include "Atoms.h"	48	#include "Atoms.h"
48	#include "Color.h"	49	#include "Color.h"
Lines 1412-1418 int nxagentHandlePropertyNotify(XEvent * Link Here
1412	{	1413	{
1413	unsigned char *buffer;	1414	unsigned char *buffer;
1414	Atom xa_string = XInternAtom(nxagentDisplay, "STRING", FALSE);	1415	Atom xa_string = XInternAtom(nxagentDisplay, "STRING", FALSE);
1415	Atom type = xa_string;	1416	XIDLib type = xa_string;
1416	int format;	1417	int format;
1417	int result;	1418	int result;
1418	unsigned long nitems, bytes_after;	1419	unsigned long nitems, bytes_after;

Lines 30-36 is" without express or implied warranty. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Font.c (-2 / +3 lines)
30	*/	30	*/
31		31
32	#include "X.h"	32	#include "X.h"
33	#include "Xatom.h"	33	#include "Agent.h"
		34
34	#include "Xproto.h"	35	#include "Xproto.h"
35	#include "misc.h"	36	#include "misc.h"
36	#include "miscstruct.h"	37	#include "miscstruct.h"
Lines 38-44 is" without express or implied warranty. Link Here
38	#include "fontstruct.h"	39	#include "fontstruct.h"
39	#include "scrnintstr.h"	40	#include "scrnintstr.h"
40		41
41	#include "Agent.h"	42	#include "Xatom.h"
42		43
43	#include "Display.h"	44	#include "Display.h"
44	#include "Font.h"	45	#include "Font.h"

Lines 30-35 is" without express or implied warranty. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/GC.c (-2 / +2 lines)
30	*/	30	*/
31		31
32	#include "X.h"	32	#include "X.h"
		33	#include "Agent.h"
		34
33	#include "Xproto.h"	35	#include "Xproto.h"
34	#include "gcstruct.h"	36	#include "gcstruct.h"
35	#include "windowstr.h"	37	#include "windowstr.h"
Lines 39-46 is" without express or implied warranty. Link Here
39	#include "mistruct.h"	41	#include "mistruct.h"
40	#include "region.h"	42	#include "region.h"
41		43
42	#include "Agent.h"
43
44	#include "Display.h"	44	#include "Display.h"
45	#include "GC.h"	45	#include "GC.h"
46	#include "GCOps.h"	46	#include "GCOps.h"

Lines 30-35 is" without express or implied warranty. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/GCOps.c (-1 / +2 lines)
30	*/	30	*/
31		31
32	#include "X.h"	32	#include "X.h"
		33	#include "Agent.h"
		34
33	#include "Xproto.h"	35	#include "Xproto.h"
34	#include "miscstruct.h"	36	#include "miscstruct.h"
35	#include "dixstruct.h"	37	#include "dixstruct.h"
Lines 41-47 is" without express or implied warranty. Link Here
41	#include "region.h"	43	#include "region.h"
42	#include "servermd.h"	44	#include "servermd.h"
43		45
44	#include "Agent.h"
45	#include "Args.h"	46	#include "Args.h"
46	#include "Display.h"	47	#include "Display.h"
47	#include "Options.h"	48	#include "Options.h"

Lines 30-35 is" without express or implied warranty. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Handlers.c (-1 / +2 lines)
30	*/	30	*/
31		31
32	#include "X.h"	32	#include "X.h"
		33	#include "Agent.h"
		34
33	#include "Xproto.h"	35	#include "Xproto.h"
34	#include "screenint.h"	36	#include "screenint.h"
35	#include "input.h"	37	#include "input.h"
Lines 38-44 is" without express or implied warranty. Link Here
38	#include "windowstr.h"	40	#include "windowstr.h"
39	#include "servermd.h"	41	#include "servermd.h"
40		42
41	#include "Agent.h"
42	#include "Handlers.h"	43	#include "Handlers.h"
43	#include "Display.h"	44	#include "Display.h"
44	#include "Events.h"	45	#include "Events.h"

Lines 30-35 is" without express or implied warranty. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Init.c (-2 / +2 lines)
30	*/	30	*/
31		31
32	#include "X.h"	32	#include "X.h"
		33	#include "Agent.h"
		34
33	#include "Xproto.h"	35	#include "Xproto.h"
34	#include "screenint.h"	36	#include "screenint.h"
35	#include "input.h"	37	#include "input.h"
Lines 40-47 is" without express or implied warranty. Link Here
40	#include "mi.h"	42	#include "mi.h"
41	#include "fontstruct.h"	43	#include "fontstruct.h"
42		44
43	#include "Agent.h"
44
45	#include "Display.h"	45	#include "Display.h"
46	#include "Screen.h"	46	#include "Screen.h"
47	#include "Pointer.h"	47	#include "Pointer.h"

Lines 31-36 is" without express or implied warranty. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Keyboard.c (-1 / +2 lines)
31		31
32	#define NEED_EVENTS	32	#define NEED_EVENTS
33	#include "X.h"	33	#include "X.h"
		34	#include "Agent.h"
		35
34	#include "Xproto.h"	36	#include "Xproto.h"
35	#include "keysym.h"	37	#include "keysym.h"
36	#include "screenint.h"	38	#include "screenint.h"
Lines 39-45 is" without express or implied warranty. Link Here
39	#include "scrnintstr.h"	41	#include "scrnintstr.h"
40	#include "servermd.h"	42	#include "servermd.h"
41		43
42	#include "Agent.h"
43	#include "Display.h"	44	#include "Display.h"
44	#include "Screen.h"	45	#include "Screen.h"
45	#include "Keyboard.h"	46	#include "Keyboard.h"

Lines 94-99 int ProcInitialConnection(); Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/NXdispatch.c (+4 lines)
94	#define True 1	94	#define True 1
95	#endif	95	#endif
96		96
		97	#include "X.h"
		98	#include "Agent.h"
		99
97	#include "windowstr.h"	100	#include "windowstr.h"
98	#include "fontstruct.h"	101	#include "fontstruct.h"
99	#include "dixfontstr.h"	102	#include "dixfontstr.h"
Lines 107-112 int ProcInitialConnection(); Link Here
107	#include "servermd.h"	110	#include "servermd.h"
108	#include "extnsionst.h"	111	#include "extnsionst.h"
109	#include "dixfont.h"	112	#include "dixfont.h"
		113
110	#include "../../dix/dispatch.h"	114	#include "../../dix/dispatch.h"
111	#include "swaprep.h"	115	#include "swaprep.h"
112	#include "swapreq.h"	116	#include "swapreq.h"

Lines 40-45 SOFTWARE. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/NXdixfonts.c (-1 / +2 lines)
40		40
41	#define NEED_REPLIES	41	#define NEED_REPLIES
42	#include "X.h"	42	#include "X.h"
		43	#include "Agent.h"
		44
43	#include "Xmd.h"	45	#include "Xmd.h"
44	#include "Xproto.h"	46	#include "Xproto.h"
45	#include "scrnintstr.h"	47	#include "scrnintstr.h"
Lines 60-66 SOFTWARE. Link Here
60	#endif	62	#endif
61		63
62	#ifdef NXAGENT_FONTMATCH	64	#ifdef NXAGENT_FONTMATCH
63	# include "Agent.h"
64	# include "Font.h"	65	# include "Font.h"
65	#endif	66	#endif
66		67

Lines 85-90 SOFTWARE. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/NXevents.c (+2 lines)
85	*****************************************************************/	85	*****************************************************************/
86		86
87	#include "X.h"	87	#include "X.h"
		88	#include "Agent.h"
		89
88	#include "misc.h"	90	#include "misc.h"
89	#include "resource.h"	91	#include "resource.h"
90	#define NEED_EVENTS	92	#define NEED_EVENTS

Lines 63-68 SOFTWARE. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/NXextension.c (+2 lines)
63	******************************************************************/	63	******************************************************************/
64		64
65	#include "X.h"	65	#include "X.h"
		66	#include "Agent.h"
		67
66	#define NEED_EVENTS	68	#define NEED_EVENTS
67	#define NEED_REPLIES	69	#define NEED_REPLIES
68	#include "Xproto.h"	70	#include "Xproto.h"

Lines 38-43 Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/NXglyph.c (-1 / +4 lines)
38	* Author: Keith Packard, SuSE, Inc.	38	* Author: Keith Packard, SuSE, Inc.
39	*/	39	*/
40		40
		41	#include "X.h"
		42	#include "Agent.h"
		43
41	#include "misc.h"	44	#include "misc.h"
42	#include "scrnintstr.h"	45	#include "scrnintstr.h"
43	#include "os.h"	46	#include "os.h"
Lines 433-439 FreeGlyphSet (pointer value, Link Here
433		436
434	#ifdef NXAGENT_RECONNECT	437	#ifdef NXAGENT_RECONNECT
435		438
436	extern void nxagentAddGlyphs(GlyphSetPtr, Glyph, xGlyphInfo, int, CARD8*, int);	439	extern void nxagentAddGlyphs(GlyphSetPtr, CARD32, xGlyphInfo, int, CARD8*, int);
437		440
438	Bool nxagentFillGlyphSet(GlyphSetPtr pGly)	441	Bool nxagentFillGlyphSet(GlyphSetPtr pGly)
439	{	442	{

Lines 62-67 SOFTWARE. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/NXglyphcurs.c (+3 lines)
62		62
63	************************************************************************/	63	************************************************************************/
64		64
		65	#include "X.h"
		66	#include "Agent.h"
		67
65	#include "misc.h"	68	#include "misc.h"
66	#include "fontstruct.h"	69	#include "fontstruct.h"
67	#include "dixfontstr.h"	70	#include "dixfontstr.h"

Lines 63-68 SOFTWARE. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/NXmiwindow.c (-1 / +2 lines)
63	******************************************************************/	63	******************************************************************/
64		64
65	#include "X.h"	65	#include "X.h"
		66	#include "Agent.h"
		67
66	#include "miscstruct.h"	68	#include "miscstruct.h"
67	#include "region.h"	69	#include "region.h"
68	#include "mi.h"	70	#include "mi.h"
Lines 73-79 SOFTWARE. Link Here
73		75
74	#ifdef NXAGENT_EXPOSURES	76	#ifdef NXAGENT_EXPOSURES
75		77
76	#include "Agent.h"
77	#include "Display.h"	78	#include "Display.h"
78	#include "Window.h"	79	#include "Window.h"
79	#include "Events.h"	80	#include "Events.h"

Lines 38-43 Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/NXpicture.c (+4 lines)
38	* Author: Keith Packard, SuSE, Inc.	38	* Author: Keith Packard, SuSE, Inc.
39	*/	39	*/
40		40
		41	#include "X.h"
		42	#include "Agent.h"
		43
41	#include "misc.h"	44	#include "misc.h"
42	#include "scrnintstr.h"	45	#include "scrnintstr.h"
43	#include "os.h"	46	#include "os.h"
Lines 51-56 Link Here
51	#include "dixstruct.h"	54	#include "dixstruct.h"
52	#include "gcstruct.h"	55	#include "gcstruct.h"
53	#include "servermd.h"	56	#include "servermd.h"
		57
54	#include "NXpicturestr.h"	58	#include "NXpicturestr.h"
55		59
56	#include "Pixmap.h"	60	#include "Pixmap.h"

Lines 63-68 SOFTWARE. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/NXproperty.c (+2 lines)
63	******************************************************************/	63	******************************************************************/
64		64
65	#include "X.h"	65	#include "X.h"
		66	#include "Agent.h"
		67
66	#define NEED_REPLIES	68	#define NEED_REPLIES
67	#define NEED_EVENTS	69	#define NEED_EVENTS
68	#include "Xproto.h"	70	#include "Xproto.h"

Lines 41-46 Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/NXrender.c (-2 / +4 lines)
41	#define NEED_REPLIES	41	#define NEED_REPLIES
42	#define NEED_EVENTS	42	#define NEED_EVENTS
43	#include "X.h"	43	#include "X.h"
		44	#include "Agent.h"
		45
44	#include "Xproto.h"	46	#include "Xproto.h"
45	#include "misc.h"	47	#include "misc.h"
46	#include "os.h"	48	#include "os.h"
Lines 93-99 extern void nxagentComposite(CARD8, Pict Link Here
93	extern void nxagentCompositeRects(CARD8, PicturePtr, xRenderColor , int, xRectangle );	95	extern void nxagentCompositeRects(CARD8, PicturePtr, xRenderColor , int, xRectangle );
94	extern void nxagentCreateGlyphSet(GlyphSetPtr glyphSet);	96	extern void nxagentCreateGlyphSet(GlyphSetPtr glyphSet);
95	extern void nxagentReferenceGlyphSet(GlyphSetPtr glyphSet);	97	extern void nxagentReferenceGlyphSet(GlyphSetPtr glyphSet);
96	extern void nxagentAddGlyphs(GlyphSetPtr glyphSet, Glyph gids, xGlyphInfo gi,	98	extern void nxagentAddGlyphs(GlyphSetPtr glyphSet, CARD32 gids, xGlyphInfo gi,
97	int nglyphs, CARD8 *images, int sizeImages);	99	int nglyphs, CARD8 *images, int sizeImages);
98		100
99	extern void nxagentFreeGlyphs(GlyphSetPtr glyphSet, CARD32 *gids, int nglyph);	101	extern void nxagentFreeGlyphs(GlyphSetPtr glyphSet, CARD32 *gids, int nglyph);
Lines 1433-1439 ProcRenderFreeGlyphs (ClientPtr client) Link Here
1433	GlyphSetPtr glyphSet;	1435	GlyphSetPtr glyphSet;
1434	int nglyph;	1436	int nglyph;
1435	CARD32 *gids;	1437	CARD32 *gids;
1436	CARD32 glyph;	1438	Glyph glyph;
1437		1439
1438	REQUEST_AT_LEAST_SIZE(xRenderFreeGlyphsReq);	1440	REQUEST_AT_LEAST_SIZE(xRenderFreeGlyphsReq);
1439	glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client,	1441	glyphSet = (GlyphSetPtr) SecurityLookupIDByType (client,

Lines 85-90 SOFTWARE. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/NXwindow.c (+3 lines)
85	* *	85	* *
86	*****************************************************************/	86	*****************************************************************/
87		87
		88	#include "X.h"
		89	#include "Agent.h"
		90
88	#include "misc.h"	91	#include "misc.h"
89	#include "scrnintstr.h"	92	#include "scrnintstr.h"
90	#include "os.h"	93	#include "os.h"

Lines 30-35 is" without express or implied warranty. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Pixmap.c (-2 / +2 lines)
30	*/	30	*/
31		31
32	#include "X.h"	32	#include "X.h"
		33	#include "Agent.h"
		34
33	#include "Xproto.h"	35	#include "Xproto.h"
34	#include "miscstruct.h"	36	#include "miscstruct.h"
35	#include "pixmapstr.h"	37	#include "pixmapstr.h"
Lines 41-48 is" without express or implied warranty. Link Here
41		43
42	#include "../../fb/fb.h"	44	#include "../../fb/fb.h"
43		45
44	#include "Agent.h"
45
46	#include "Display.h"	46	#include "Display.h"
47	#include "Screen.h"	47	#include "Screen.h"
48	#include "Pixmap.h"	48	#include "Pixmap.h"

Lines 30-35 is" without express or implied warranty. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Pointer.c (-1 / +2 lines)
30	*/	30	*/
31		31
32	#include "X.h"	32	#include "X.h"
		33	#include "Agent.h"
		34
33	#include "Xproto.h"	35	#include "Xproto.h"
34	#include "screenint.h"	36	#include "screenint.h"
35	#include "input.h"	37	#include "input.h"
Lines 38-44 is" without express or implied warranty. Link Here
38	#include "servermd.h"	40	#include "servermd.h"
39	#include "mipointer.h"	41	#include "mipointer.h"
40		42
41	#include "Agent.h"
42	#include "Args.h"	43	#include "Args.h"
43	#include "Display.h"	44	#include "Display.h"
44	#include "Screen.h"	45	#include "Screen.h"

Lines 18-29 Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Reconnect.c (-1 / +2 lines)
18	#include <signal.h>	18	#include <signal.h>
19		19
20	#include "X.h"	20	#include "X.h"
		21	#include "Agent.h"
		22
21	#include "Xproto.h"	23	#include "Xproto.h"
22	#include "Xpoll.h"	24	#include "Xpoll.h"
23	#include "mi.h"	25	#include "mi.h"
24	#include "fb.h"	26	#include "fb.h"
25		27
26	#include "Agent.h"
27	#include "Drawable.h"	28	#include "Drawable.h"
28	#include "Control.h"	29	#include "Control.h"
29	#include "Reconnect.h"	30	#include "Reconnect.h"

Lines 15-25 Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Render.c (-8 / +30 lines)
15	/* */	15	/* */
16	/**************************************************************************/	16	/**************************************************************************/
17		17
		18	#include "X.h"
		19	#include "Agent.h"
		20
18	#include "NXpicturestr.h"	21	#include "NXpicturestr.h"
19	#include "NXglyphstr.h"	22	#include "NXglyphstr.h"
20	#include "Render.h"	23	#include "Render.h"
21		24
22	#include "X.h"
23	#include "Xproto.h"	25	#include "Xproto.h"
24		26
25	#include "render.h"	27	#include "render.h"
Lines 29-35 Link Here
29	#include "fb.h"	31	#include "fb.h"
30	#include "mipict.h"	32	#include "mipict.h"
31	#include "fbpict.h"	33	#include "fbpict.h"
32	#include "Agent.h"
33	#include "Drawable.h"	34	#include "Drawable.h"
34		35
35	#include "../../../../lib/Xrender/Xrenderint.h"	36	#include "../../../../lib/Xrender/Xrenderint.h"
Lines 65-71 Bool nxagentDisconnectPictures(void); Link Here
65		66
66	void nxagentCreateGlyphSet(GlyphSetPtr pGly);	67	void nxagentCreateGlyphSet(GlyphSetPtr pGly);
67	void nxagentQueryFormats(void);	68	void nxagentQueryFormats(void);
68	void nxagentAddGlyphs(GlyphSetPtr glyphsSet, Glyph gids, xGlyphInfo gi, int nglyphs, CARD8 *images, int sizeImages);	69	void nxagentAddGlyphs(GlyphSetPtr glyphsSet, CARD32 gids, xGlyphInfo gi, int nglyphs, CARD8 *images, int sizeImages);
69	static XRenderPictFormat *nxagentMatchingFormats(PictFormatPtr pForm);	70	static XRenderPictFormat *nxagentMatchingFormats(PictFormatPtr pForm);
70		71
71	#ifdef NX_RENDER_DEBUG	72	#ifdef NX_RENDER_DEBUG
Lines 984-994 void nxagentCreateGlyphSet(GlyphSetPtr p Link Here
984	#endif	985	#endif
985	}	986	}
986		987
987	void nxagentAddGlyphs(GlyphSetPtr glyphSet, Glyph gids, xGlyphInfo gi, int nglyphs, CARD8 *images, int sizeImages)	988	void nxagentAddGlyphs(GlyphSetPtr glyphSet, CARD32 gids, xGlyphInfo gi, int nglyphs, CARD8 *images, int sizeImages)
988	{	989	{
989	extern const CARD8 glyphDepths[];	990	extern const CARD8 glyphDepths[];
990	extern int ServerOrder(void);	991	extern int ServerOrder(void);
991	extern void BitOrderInvert(unsigned char*, int);	992	extern void BitOrderInvert(unsigned char*, int);
		993	Glyph *gconv;
		994
		995	if (sizeof(CARD32) != sizeof(Glyph)) {
		996	int i;
		997	gconv = malloc (nglyphs * sizeof(Glyph));
		998	for (i = 0; i < nglyphs; i++)
		999	gconv[i] = (Glyph) gids[i];
		1000	} else
		1001	gconv = (Glyph *) gids;
992		1002
993	#ifdef NX_RENDER_DEBUG	1003	#ifdef NX_RENDER_DEBUG
994	fprintf(stderr, "nxagentAddGlyphs\n");	1004	fprintf(stderr, "nxagentAddGlyphs\n");
Lines 1002-1008 void nxagentAddGlyphs(GlyphSetPtr glyphS Link Here
1002		1012
1003	XRenderAddGlyphs(nxagentDisplay,	1013	XRenderAddGlyphs(nxagentDisplay,
1004	glyphSet -> remoteID,	1014	glyphSet -> remoteID,
1005	gids,	1015	gconv,
1006	(XGlyphInfo*)(gi),	1016	(XGlyphInfo*)(gi),
1007	nglyphs,	1017	nglyphs,
1008	(char*)images,	1018	(char*)images,
Lines 1011-1016 void nxagentAddGlyphs(GlyphSetPtr glyphS Link Here
1011	#ifdef NX_RENDER_DEBUG	1021	#ifdef NX_RENDER_DEBUG
1012	XSync(nxagentDisplay, False);	1022	XSync(nxagentDisplay, False);
1013	#endif	1023	#endif
		1024	if (sizeof(CARD32) != sizeof(Glyph))
		1025	free (gconv);
1014	}	1026	}
1015		1027
1016	void nxagentReferenceGlyphSet(GlyphSetPtr glyphSet)	1028	void nxagentReferenceGlyphSet(GlyphSetPtr glyphSet)
Lines 1020-1029 void nxagentReferenceGlyphSet(GlyphSetPt Link Here
1020		1032
1021	void nxagentFreeGlyphs(GlyphSetPtr glyphSet, CARD32 *gids, int nglyph)	1033	void nxagentFreeGlyphs(GlyphSetPtr glyphSet, CARD32 *gids, int nglyph)
1022	{	1034	{
1023	/* Glyph nx_gids[nglyph];	1035	Glyph *gconv;
1024	*/	1036
1025	XRenderFreeGlyphs (nxagentDisplay, glyphSet -> remoteID, gids, nglyph);	1037	if (sizeof(CARD32) != sizeof(Glyph)) {
		1038	int i;
		1039	gconv = malloc (nglyph * sizeof(Glyph));
		1040	for (i = 0; i < nglyph; i++)
		1041	gconv[i] = (Glyph) gids[i];
		1042	} else
		1043	gconv = (Glyph *) gids;
		1044
		1045	XRenderFreeGlyphs (nxagentDisplay, glyphSet -> remoteID, gconv, nglyph);
1026		1046
		1047	if (sizeof(CARD32) != sizeof(Glyph))
		1048	free (gconv);
1027	}	1049	}
1028		1050
1029	void nxagentFreeGlyphSet(GlyphSetPtr glyphSet)	1051	void nxagentFreeGlyphSet(GlyphSetPtr glyphSet)

Lines 16-27 Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Rootless.c (-1 / +1 lines)
16	/**************************************************************************/	16	/**************************************************************************/
17		17
18	#include "X.h"	18	#include "X.h"
		19	#include "Agent.h"
19		20
20	#include "window.h"	21	#include "window.h"
21	#include "windowstr.h"	22	#include "windowstr.h"
22	#include "colormapst.h"	23	#include "colormapst.h"
23		24
24	#include "Agent.h"
25	#include "Display.h"	25	#include "Display.h"
26	#include "Drawable.h"	26	#include "Drawable.h"
27		27

Lines 29-34 is" without express or implied warranty. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Screen.c (-3 / +5 lines)
29		29
30	*/	30	*/
31		31
		32	#include "X.h"
		33	#include "Agent.h"
		34
32	#include "scrnintstr.h"	35	#include "scrnintstr.h"
33	#include "dix.h"	36	#include "dix.h"
34	#include "mi.h"	37	#include "mi.h"
Lines 38-44 is" without express or implied warranty. Link Here
38	#include "resource.h"	41	#include "resource.h"
39	#include "mipointer.h"	42	#include "mipointer.h"
40		43
41	#include "Agent.h"
42	#include "Display.h"	44	#include "Display.h"
43	#include "Screen.h"	45	#include "Screen.h"
44	#include "Atoms.h"	46	#include "Atoms.h"
Lines 1082-1088 N/A Link Here
1082		1084
1083	if (windowManagerRunning)	1085	if (windowManagerRunning)
1084	{	1086	{
1085	Atom deleteWMatom = nxagentAtoms[2]; /* WM_DELETE_WINDOW */	1087	XIDLib deleteWMatom = nxagentAtoms[2]; /* WM_DELETE_WINDOW */
1086		1088
1087	#ifdef TEST	1089	#ifdef TEST
1088	fprintf(stderr, "nxagentOpenScreen: Found WM, delete window atom [%ld].\n",	1090	fprintf(stderr, "nxagentOpenScreen: Found WM, delete window atom [%ld].\n",
Lines 1333-1339 unsigned char fromHexNibble(char c) Link Here
1333	void nxagentPropagateArtsdProperties(ScreenPtr pScreen, char *port)	1335	void nxagentPropagateArtsdProperties(ScreenPtr pScreen, char *port)
1334	{	1336	{
1335	Window rootWin;	1337	Window rootWin;
1336	Atom atomReturnType;	1338	XIDLib atomReturnType;
1337	Atom prop_atom;	1339	Atom prop_atom;
1338	int iReturnFormat;	1340	int iReturnFormat;
1339	unsigned long ulReturnItems;	1341	unsigned long ulReturnItems;

Lines 15-21 Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Splash.c (+5 lines)
15	/* */	15	/* */
16	/**************************************************************************/	16	/**************************************************************************/
17		17
		18	#include "X.h"
		19	#include "Agent.h"
		20	#define GC XlibGC
		21
18	#include "Xlib.h"	22	#include "Xlib.h"
		23	#include "Xutil.h"
19		24
20	#include "Intrinsic.h"	25	#include "Intrinsic.h"
21		26

Lines 30-35 is" without express or implied warranty. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/TestExt.c (+2 lines)
30	*/	30	*/
31		31
32	#include <X11/X.h>	32	#include <X11/X.h>
		33	#include "Agent.h"
		34
33	#include <X11/Xproto.h>	35	#include <X11/Xproto.h>
34	#include <X11/Xlib.h>	36	#include <X11/Xlib.h>
35	#undef Bool	37	#undef Bool

Lines 30-41 is" without express or implied warranty. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Visual.c (-1 / +2 lines)
30	*/	30	*/
31		31
32	#include "X.h"	32	#include "X.h"
		33	#include "Agent.h"
		34
33	#include "Xproto.h"	35	#include "Xproto.h"
34	#include "scrnintstr.h"	36	#include "scrnintstr.h"
35	#include "dix.h"	37	#include "dix.h"
36	#include "mi.h"	38	#include "mi.h"
37	#include "mibstore.h"	39	#include "mibstore.h"
38	#include "Agent.h"
39		40
40	#include "Display.h"	41	#include "Display.h"
41	#include "Visual.h"	42	#include "Visual.h"

Lines 30-35 is" without express or implied warranty. Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/Window.c (-3 / +3 lines)
30	*/	30	*/
31		31
32	#include "X.h"	32	#include "X.h"
		33	#include "Agent.h"
		34
33	#include "Xproto.h"	35	#include "Xproto.h"
34	#include "gcstruct.h"	36	#include "gcstruct.h"
35	#include "window.h"	37	#include "window.h"
Lines 41-48 is" without express or implied warranty. Link Here
41		43
42	#include "mi.h"	44	#include "mi.h"
43		45
44	#include "Agent.h"
45
46	#include "Display.h"	46	#include "Display.h"
47	#include "Screen.h"	47	#include "Screen.h"
48	#include "GC.h"	48	#include "GC.h"
Lines 772-778 void nxagentRestackWindow(pWin, pOldNext Link Here
772	}	772	}
773	else	773	else
774	{	774	{
775	Window windowList[2];	775	XIDLib windowList[2];
776		776
777	#ifdef TEST	777	#ifdef TEST
778	fprintf(stderr, "nxagentRestackWindow: Putting window [%p][%ld] in the middle.\n",	778	fprintf(stderr, "nxagentRestackWindow: Putting window [%p][%ld] in the middle.\n",

Lines 47-52 Link Here

(-)../nx-X11.orig/programs/Xserver/hw/nxagent/os2Stub.c (+3 lines)
47	/* somewhat optimized for improved performance, but assumes a few */	47	/* somewhat optimized for improved performance, but assumes a few */
48	/* things so it cannot be used as a general select. */	48	/* things so it cannot be used as a general select. */
49		49
		50	#include "X.h"
		51	#include "Agent.h"
		52
50	#define I_NEED_OS2_H	53	#define I_NEED_OS2_H
51	#include "Xpoll.h"	54	#include "Xpoll.h"
52	#include <stdio.h>	55	#include <stdio.h>

Return to bug 61220