3 widely adopted XFree86 extensions, and thus the Solaris version is deprecated, |
3 widely adopted XFree86 extensions, and thus the Solaris version is deprecated, |
4 but Sun maintains backwards compatibility with old versions of Solaris, so |
4 but Sun maintains backwards compatibility with old versions of Solaris, so |
5 we still have this here for now. |
5 we still have this here for now. |
6 |
6 |
7 For more info, see: |
7 For more info, see: |
8 http://blogs.sun.com/roller/page/alanc?entry=xinerama_protocol_clashes_on_solaris |
8 http://blogs.sun.com/alanc/entry/xinerama_protocol_clashes_on_solaris |
9 |
9 |
10 diff -uwb build_32/xineramaproto-1.1.2/panoramiXext.h ../../../xc/include/extensions//panoramiXext.h |
10 diff -urp -x '*~' -x '*.orig' panoramiXext.h panoramiXext.h |
11 --- panoramiXext.h Fri Apr 23 11:43:06 2004 |
11 --- panoramiXext.h 2004-04-23 11:43:06.000000000 -0700 |
12 +++ panoramiXext.h Tue Apr 18 17:41:37 2006 |
12 +++ panoramiXext.h 2009-02-02 18:17:16.814431000 -0800 |
13 @@ -46,3 +46,76 @@ |
13 @@ -30,6 +30,9 @@ Equipment Corporation. |
|
14 |
|
15 /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ |
|
16 |
|
17 +#ifndef _panoramiXext_h |
|
18 +#define _panoramiXext_h |
|
19 + |
|
20 #define PANORAMIX_MAJOR_VERSION 1 /* current version number */ |
|
21 #define PANORAMIX_MINOR_VERSION 1 |
|
22 |
|
23 @@ -46,3 +49,68 @@ typedef struct { |
14 extern XPanoramiXInfo *XPanoramiXAllocInfo ( |
24 extern XPanoramiXInfo *XPanoramiXAllocInfo ( |
15 void |
25 void |
16 ); |
26 ); |
17 + |
27 + |
18 +#ifdef SUNSOFT |
28 +#if defined(SUNSOFT) && !defined(XORGSERVER) |
19 +/************************************************************************ |
29 +/************************************************************************ |
20 + * Xsun addition to Xinerama 1.0 protocol, now deprecated in favor of 1.1 |
30 + * Xsun addition to Xinerama 1.0 protocol, now deprecated in favor of 1.1 |
21 + * protocol. |
31 + * protocol. |
22 + * |
32 + * |
23 + * Copyright 2001 Sun Microsystems, Inc. All rights reserved. |
33 + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. |
24 + * |
34 + * |
25 + * Permission is hereby granted, free of charge, to any person obtaining a |
35 + * Permission is hereby granted, free of charge, to any person obtaining a |
26 + * copy of this software and associated documentation files (the |
36 + * copy of this software and associated documentation files (the |
27 + * "Software"), to deal in the Software without restriction, including |
37 + * "Software"), to deal in the Software without restriction, including |
28 + * without limitation the rights to use, copy, modify, merge, publish, |
38 + * without limitation the rights to use, copy, modify, merge, publish, |
65 +{ |
75 +{ |
66 + XinID wid; /* sub window id */ |
76 + XinID wid; /* sub window id */ |
67 + DELTA dx,dy; /* delta in screen co-ord from virtual zero */ |
77 + DELTA dx,dy; /* delta in screen co-ord from virtual zero */ |
68 + POINT x,y; /* location of window in screen co-ord */ |
78 + POINT x,y; /* location of window in screen co-ord */ |
69 + DELTA wdx,wdy;/* size of window in screen co-ord */ |
79 + DELTA wdx,wdy;/* size of window in screen co-ord */ |
70 +}SubWID, *pSubWID; |
80 +} SubWID, *pSubWID; |
71 + |
81 + |
72 +typedef struct xineramainfo |
82 +typedef struct xineramainfo |
73 +{ |
83 +{ |
74 + XinID wid; /* Window ID of requested virtual window */ |
84 + XinID wid; /* Window ID of requested virtual window */ |
75 + SubWID subs[MAXSCREEN]; /* there will be 16 slots */ |
85 + SubWID subs[MAXSCREEN]; /* there will be 16 slots */ |
76 +}XineramaInfo, *pXineramaInfo; |
86 +} XineramaInfo, *pXineramaInfo; |
77 +#endif |
87 +#endif /* _XINERAMAINFO_ */ |
78 + |
88 + |
79 +#ifndef NO_PROTO_HERE |
89 +#endif /* SUNSOFT & !XORGSERVER */ |
80 +Bool XDgaGetXineramaInfo( |
|
81 +#if NeedFunctionPrototypes |
|
82 +/* this brakes the server |
|
83 +Display *, int, XID, XineramaInfo * |
|
84 +*/ |
|
85 +#endif |
|
86 +); |
|
87 +#endif /* SUNSOFT */ |
|
88 + |
90 + |
89 +#endif |
91 +#endif /* _panoramiXext_h */ |
90 diff -uwb build_32/xineramaproto-1.1.2/panoramiXproto.h ../../../xc/include/extensions//panoramiXproto.h |
92 diff -urp -x '*~' -x '*.orig' panoramiXproto.h panoramiXproto.h |
91 --- panoramiXproto.h Fri Apr 23 11:43:06 2004 |
93 --- panoramiXproto.h 2004-04-23 11:43:06.000000000 -0700 |
92 +++ panoramiXproto.h Tue Apr 18 17:42:17 2006 |
94 +++ panoramiXproto.h 2009-02-02 18:17:16.824809000 -0800 |
93 @@ -189,4 +189,85 @@ |
95 @@ -189,4 +189,64 @@ typedef struct { |
94 } xXineramaScreenInfo; |
96 } xXineramaScreenInfo; |
95 #define sz_XineramaScreenInfo 8 |
97 #define sz_XineramaScreenInfo 8 |
96 |
98 |
97 +#ifdef SUNSOFT |
99 +#if defined(SUNSOFT) && !defined(XORGSERVER) |
98 +/************************************************************************ |
100 +/************************************************************************ |
99 + * Xsun addition to Xinerama 1.0 protocol, now deprecated in favor of 1.1 |
101 + * Xsun addition to Xinerama 1.0 protocol, now deprecated in favor of 1.1 |
100 + * protocol. |
102 + * protocol. |
101 + * |
103 + * |
102 + * Copyright 2000 Sun Microsystems, Inc. All rights reserved. |
104 + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. |
103 + * |
105 + * |
104 + * Permission is hereby granted, free of charge, to any person obtaining a |
106 + * Permission is hereby granted, free of charge, to any person obtaining a |
105 + * copy of this software and associated documentation files (the |
107 + * copy of this software and associated documentation files (the |
106 + * "Software"), to deal in the Software without restriction, including |
108 + * "Software"), to deal in the Software without restriction, including |
107 + * without limitation the rights to use, copy, modify, merge, publish, |
109 + * without limitation the rights to use, copy, modify, merge, publish, |
124 + * Except as contained in this notice, the name of a copyright holder |
126 + * Except as contained in this notice, the name of a copyright holder |
125 + * shall not be used in advertising or otherwise to promote the sale, use |
127 + * shall not be used in advertising or otherwise to promote the sale, use |
126 + * or other dealings in this Software without prior written authorization |
128 + * or other dealings in this Software without prior written authorization |
127 + * of the copyright holder. |
129 + * of the copyright holder. |
128 + */ |
130 + */ |
129 +#pragma ident "@(#)Xsun-extended-proto.patch 1.1 06/06/12 SMI" |
131 +#pragma ident "@(#)Xsun-extended-proto.patch 1.2 09/02/03 SMI" |
|
132 + |
|
133 +#include <X11/extensions/panoramiXext.h> |
130 + |
134 + |
131 +#define X_PanoramiXGetInfo 4 |
135 +#define X_PanoramiXGetInfo 4 |
132 +#define X_XineramaInfo 4 |
136 +#define X_XineramaInfo 4 |
133 + |
|
134 +#ifndef _XINERAMAINFO_ |
|
135 +#define _XINERAMAINFO_ |
|
136 +#define XinID int |
|
137 +#define MAXSCREEN 16 |
|
138 +#define DELTA int |
|
139 +#define POINT int |
|
140 + |
|
141 +typedef struct subwid |
|
142 +{ |
|
143 + XinID wid; /* sub window id */ |
|
144 + DELTA dx,dy; /* delta in screen co-ord from virtual zero */ |
|
145 + POINT x,y; /* location of window in screen co-ord */ |
|
146 + DELTA wdx,wdy;/* size of window in screen co-ord */ |
|
147 +}SubWID, *pSubWID; |
|
148 + |
|
149 +typedef struct xineramainfo |
|
150 +{ |
|
151 + XinID wid; /* Window ID of requested virtual window */ |
|
152 + SubWID subs[MAXSCREEN]; /* there will be 16 slots */ |
|
153 +}XineramaInfo, *pXineramaInfo; |
|
154 + |
|
155 +#endif |
|
156 + |
137 + |
157 +typedef struct _XXineramaInfoReply |
138 +typedef struct _XXineramaInfoReply |
158 +{ |
139 +{ |
159 + BYTE type; |
140 + BYTE type; |
160 + CARD8 unused; |
141 + CARD8 unused; |