1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
|
--- xserver.orig/configure.ac 2006-03-11 16:27:42.000000000 +0100
+++ xserver/configure.ac 2006-03-11 16:46:51.000000000 +0100
@@ -79,7 +79,7 @@
# tslib touchscreen driver
AC_CHECK_HEADERS([tslib.h])
-REQUIRED_MODULES="randr render fixesext damageext xextensions xfont xproto xtrans xau"
+REQUIRED_MODULES="randrproto renderproto fixesproto damageproto xextproto xfont xproto xtrans xau"
DEFAULT_FONT_PATH="/usr/lib/X11/fonts/misc,/usr/lib/X11/fonts/100dpi,/usr/lib/X11/fonts/75dpi"
DEFAULT_VENDOR_STRING="freedesktop.org"
--- xserver.orig/dix/dispatch.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/dix/dispatch.c 2006-03-11 16:30:59.000000000 +0100
@@ -79,7 +79,6 @@
#endif
#include "windowstr.h"
-#include "fontstruct.h"
#include "dixfontstr.h"
#include "gcstruct.h"
#include "selection.h"
--- xserver.orig/dix/glyphcurs.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/dix/glyphcurs.c 2006-03-11 16:31:57.000000000 +0100
@@ -51,7 +51,6 @@
#include <config.h>
#endif
#include "misc.h"
-#include "fontstruct.h"
#include "dixfontstr.h"
#include "scrnintstr.h"
#include "gcstruct.h"
--- xserver.orig/dix/main.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/dix/main.c 2006-03-11 16:32:05.000000000 +0100
@@ -89,7 +89,6 @@
#include "colormap.h"
#include "colormapst.h"
#include "cursorstr.h"
-#include "font.h"
#include "opaque.h"
#include "servermd.h"
#include "site.h"
--- xserver.orig/dix/swaprep.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/dix/swaprep.c 2006-03-11 16:32:24.000000000 +0100
@@ -57,7 +57,7 @@
#include <X11/Xproto.h>
#include "misc.h"
#include "dixstruct.h"
-#include "fontstruct.h"
+#include "dixfont.h"
#include "scrnintstr.h"
#include "swaprep.h"
#include "globals.h"
--- xserver.orig/dix/xpstubs.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/dix/xpstubs.c 2006-03-11 16:32:34.000000000 +0100
@@ -31,7 +31,7 @@
#include <config.h>
#endif
#include "misc.h"
-#include "font.h"
+#include "dixfont.h"
Bool
XpClientIsBitmapClient(ClientPtr client)
--- xserver.orig/fb/fbglyph.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/fb/fbglyph.c 2006-03-11 16:52:01.000000000 +0100
@@ -26,7 +26,6 @@
#include <config.h>
#endif
#include "fb.h"
-#include "fontstruct.h"
#include "dixfontstr.h"
Bool
--- xserver.orig/hw/kdrive/epson/epson13806draw.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/hw/kdrive/epson/epson13806draw.c 2006-03-11 16:34:56.000000000 +0100
@@ -38,7 +38,6 @@
#include "pixmapstr.h"
#include "regionstr.h"
#include "mistruct.h"
-#include "fontstruct.h"
#include "dixfontstr.h"
#include "fb.h"
#include "migc.h"
--- xserver.orig/hw/kdrive/i810/i810draw.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/hw/kdrive/i810/i810draw.c 2006-03-11 16:34:41.000000000 +0100
@@ -51,7 +51,6 @@
#include "pixmapstr.h"
#include "regionstr.h"
#include "mistruct.h"
-#include "fontstruct.h"
#include "dixfontstr.h"
#include "fb.h"
#include "migc.h"
--- xserver.orig/hw/kdrive/src/kaa.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/hw/kdrive/src/kaa.c 2006-03-11 16:35:39.000000000 +0100
@@ -29,7 +29,6 @@
#endif
#include "kdrive.h"
#include "kaa.h"
-#include "fontstruct.h"
#include "dixfontstr.h"
#define DEBUG_MIGRATE 0
--- xserver.orig/include/dixfont.h 2006-03-11 16:27:42.000000000 +0100
+++ xserver/include/dixfont.h 2006-03-11 16:43:25.000000000 +0100
@@ -27,10 +27,10 @@
#define DIXFONT_H 1
#include "dix.h"
-#include "font.h"
-#include "fontconf.h"
+#include <X11/fonts/font.h>
+#include <X11/fonts/fontconf.h>
#include "closure.h"
-#include "fontstruct.h"
+#include <X11/fonts/fontstruct.h>
#define NullDIXFontProp ((DIXFontPropPtr)0)
--- xserver.orig/include/dixfontstr.h 2006-03-11 16:27:42.000000000 +0100
+++ xserver/include/dixfontstr.h 2006-03-11 16:43:31.000000000 +0100
@@ -27,7 +27,6 @@
#include "servermd.h"
#include "dixfont.h"
-#include "fontstruct.h"
#include "closure.h"
#define NEED_REPLIES
#include "X11/Xproto.h" /* for xQueryFontReply */
--- xserver.orig/mi/mibstore.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/mi/mibstore.c 2006-03-11 16:36:26.000000000 +0100
@@ -57,7 +57,6 @@
#include "gcstruct.h"
#include "windowstr.h"
#include "pixmapstr.h"
-#include "fontstruct.h"
#include "dixfontstr.h"
#include "dixstruct.h" /* For requestingClient */
#include "mi.h"
--- xserver.orig/mi/miglblt.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/mi/miglblt.c 2006-03-11 16:53:52.000000000 +0100
@@ -55,7 +55,6 @@
#include <X11/Xmd.h>
#include <X11/Xproto.h>
#include "misc.h"
-#include "fontstruct.h"
#include "dixfontstr.h"
#include "gcstruct.h"
#include "windowstr.h"
--- xserver.orig/mi/mi.h 2006-03-11 16:27:42.000000000 +0100
+++ xserver/mi/mi.h 2006-03-11 16:36:16.000000000 +0100
@@ -54,7 +54,7 @@
#include "validate.h"
#include "window.h"
#include "gc.h"
-#include "font.h"
+#include "dixfont.h"
#include "input.h"
#include "cursor.h"
--- xserver.orig/mi/miinitext.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/mi/miinitext.c 2006-03-11 16:36:41.000000000 +0100
@@ -54,6 +54,8 @@
#include "extension.h"
#include "micmap.h"
#include "xext.h"
+#include "pixmap.h"
+#include "gc.h"
#ifdef NOPEXEXT /* sleaze for Solaris cpp building XsunMono */
#undef PEXEXT
--- xserver.orig/mi/mipolytext.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/mi/mipolytext.c 2006-03-11 16:36:48.000000000 +0100
@@ -63,7 +63,6 @@
#include <X11/Xproto.h>
#include "misc.h"
#include "gcstruct.h"
-#include "fontstruct.h"
#include "dixfontstr.h"
#include "mi.h"
--- xserver.orig/mi/misprite.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/mi/misprite.c 2006-03-11 16:37:00.000000000 +0100
@@ -42,7 +42,6 @@
# include "input.h"
# include "mi.h"
# include "cursorstr.h"
-# include "font.h"
# include "scrnintstr.h"
# include "colormapst.h"
# include "windowstr.h"
@@ -50,7 +49,6 @@
# include "mipointer.h"
# include "mispritest.h"
# include "dixfontstr.h"
-# include "fontstruct.h"
#ifdef RENDER
# include "mipict.h"
#endif
--- xserver.orig/miext/damage/damage.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/miext/damage/damage.c 2006-03-11 16:37:17.000000000 +0100
@@ -28,9 +28,7 @@
#include <X11/X.h>
#include "scrnintstr.h"
#include "windowstr.h"
-#include "font.h"
#include "dixfontstr.h"
-#include "fontstruct.h"
#include "mi.h"
#include "regionstr.h"
#include "globals.h"
--- xserver.orig/miext/shadow/shadow.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/miext/shadow/shadow.c 2006-03-11 16:38:13.000000000 +0100
@@ -29,9 +29,7 @@
#include <X11/X.h>
#include "scrnintstr.h"
#include "windowstr.h"
-#include "font.h"
#include "dixfontstr.h"
-#include "fontstruct.h"
#include "mi.h"
#include "regionstr.h"
#include "globals.h"
--- xserver.orig/miext/shadow/shalloc.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/miext/shadow/shalloc.c 2006-03-11 16:38:25.000000000 +0100
@@ -29,9 +29,7 @@
#include <X11/X.h>
#include "scrnintstr.h"
#include "windowstr.h"
-#include "font.h"
#include "dixfontstr.h"
-#include "fontstruct.h"
#include "mi.h"
#include "regionstr.h"
#include "globals.h"
--- xserver.orig/miext/shadow/shpacked.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/miext/shadow/shpacked.c 2006-03-11 16:38:33.000000000 +0100
@@ -28,9 +28,7 @@
#include <X11/X.h>
#include "scrnintstr.h"
#include "windowstr.h"
-#include "font.h"
#include "dixfontstr.h"
-#include "fontstruct.h"
#include "mi.h"
#include "regionstr.h"
#include "globals.h"
--- xserver.orig/miext/shadow/shplanar8.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/miext/shadow/shplanar8.c 2006-03-11 16:38:44.000000000 +0100
@@ -28,9 +28,7 @@
#include <X11/X.h>
#include "scrnintstr.h"
#include "windowstr.h"
-#include "font.h"
#include "dixfontstr.h"
-#include "fontstruct.h"
#include "mi.h"
#include "regionstr.h"
#include "globals.h"
--- xserver.orig/miext/shadow/shplanar.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/miext/shadow/shplanar.c 2006-03-11 16:38:39.000000000 +0100
@@ -28,9 +28,7 @@
#include <X11/X.h>
#include "scrnintstr.h"
#include "windowstr.h"
-#include "font.h"
#include "dixfontstr.h"
-#include "fontstruct.h"
#include "mi.h"
#include "regionstr.h"
#include "globals.h"
--- xserver.orig/miext/shadow/shrotate.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/miext/shadow/shrotate.c 2006-03-11 16:38:56.000000000 +0100
@@ -28,9 +28,7 @@
#include <X11/X.h>
#include "scrnintstr.h"
#include "windowstr.h"
-#include "font.h"
#include "dixfontstr.h"
-#include "fontstruct.h"
#include "mi.h"
#include "regionstr.h"
#include "globals.h"
--- xserver.orig/miext/shadow/shrotpack.h 2006-03-11 16:27:42.000000000 +0100
+++ xserver/miext/shadow/shrotpack.h 2006-03-11 16:39:02.000000000 +0100
@@ -30,9 +30,7 @@
#include <X11/X.h>
#include "scrnintstr.h"
#include "windowstr.h"
-#include "font.h"
#include "dixfontstr.h"
-#include "fontstruct.h"
#include "mi.h"
#include "regionstr.h"
#include "globals.h"
--- xserver.orig/miext/shadow/shrotpackYX.h 2006-03-11 16:27:42.000000000 +0100
+++ xserver/miext/shadow/shrotpackYX.h 2006-03-11 16:39:08.000000000 +0100
@@ -25,9 +25,7 @@
#include <X11/X.h>
#include "scrnintstr.h"
#include "windowstr.h"
-#include "font.h"
#include "dixfontstr.h"
-#include "fontstruct.h"
#include "mi.h"
#include "regionstr.h"
#include "globals.h"
--- xserver.orig/os/xstrans.c 2006-03-11 16:27:42.000000000 +0100
+++ xserver/os/xstrans.c 2006-03-11 16:39:31.000000000 +0100
@@ -27,4 +27,4 @@
#include "config.h"
-#include <transport.c>
+#include <X11/Xtrans/transport.c>
--- xserver.orig/os/xstrans.h 2006-03-11 16:27:42.000000000 +0100
+++ xserver/os/xstrans.h 2006-03-11 16:39:37.000000000 +0100
@@ -25,4 +25,4 @@
#define XSERV_t
#define TRANS_SERVER
-#include <Xtrans.h>
+#include <X11/Xtrans/Xtrans.h>
--- xserver.orig/Xext/shmint.h 2006-03-11 16:27:42.000000000 +0100
+++ xserver/Xext/shmint.h 2006-03-11 16:29:24.000000000 +0100
@@ -32,27 +32,6 @@
#include "pixmap.h"
#include "gc.h"
-typedef struct _ShmFuncs {
- PixmapPtr (* CreatePixmap)(ScreenPtr pScreen,
- int width,
- int height,
- int depth,
- char *addr);
- void (* PutImage)(DrawablePtr dst,
- GCPtr pGC,
- int depth,
- unsigned int format,
- int w,
- int h,
- int sx,
- int sy,
- int sw,
- int sh,
- int dx,
- int dy,
- char *data);
-} ShmFuncs, *ShmFuncsPtr;
-
void
ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
--- xserver.orig/Xext/syncint.h 2006-03-11 16:27:42.000000000 +0100
+++ xserver/Xext/syncint.h 2006-03-11 16:30:16.000000000 +0100
@@ -48,7 +48,7 @@
PERFORMANCE OF THIS SOFTWARE.
******************************************************************/
-/* $Id: syncint.h,v 3.1 2003-11-02 19:56:10 keithp Exp $ */
+/* $Id: syncint.h,v 3.2 2005-04-20 18:42:31 clee Exp $ */
#ifndef _SYNCINT_H_
#define _SYNCINT_H_
@@ -57,26 +57,10 @@
#define CARD64 XSyncValue /* XXX temporary! need real 64 bit values for Alpha */
-typedef struct _SyncCounter {
- ClientPtr client; /* Owning client. 0 for system counters */
- XSyncCounter id; /* resource ID */
- CARD64 value; /* counter value */
- struct _SyncTriggerList *pTriglist; /* list of triggers */
- Bool beingDestroyed; /* in process of going away */
- struct _SysCounterInfo *pSysCounterInfo; /* NULL if not a system counter */
-} SyncCounter;
-
/*
* The System Counter interface
*/
-typedef enum {
- XSyncCounterNeverChanges,
- XSyncCounterNeverIncreases,
- XSyncCounterNeverDecreases,
- XSyncCounterUnrestricted
-} SyncCounterType;
-
typedef void
(*SyncQueryValueProcPtr) (pointer pCounter,
CARD64 *freshvalue);
@@ -86,16 +70,6 @@
CARD64 *lessthan,
CARD64 *greaterthan);
-typedef struct _SysCounterInfo {
- char *name;
- CARD64 resolution;
- CARD64 bracket_greater;
- CARD64 bracket_less;
- SyncCounterType counterType; /* how can this counter change */
- SyncQueryValueProcPtr QueryValue;
- SyncBracketValuesProcPtr BracketValues;
-} SysCounterInfo;
-
struct _SyncTrigger;
typedef Bool
@@ -108,55 +82,6 @@
typedef void
(*SyncCounterDestroyedProcPtr) (struct _SyncTrigger *pTrigger);
-typedef struct _SyncTrigger {
- SyncCounter *pCounter;
- CARD64 wait_value; /* wait value */
- unsigned int value_type; /* Absolute or Relative */
- unsigned int test_type; /* transition or Comparision type */
- CARD64 test_value; /* trigger event threshold value */
- SyncCheckTriggerProcPtr CheckTrigger;
- SyncTriggerFiredProcPtr TriggerFired;
- SyncCounterDestroyedProcPtr CounterDestroyed;
-} SyncTrigger;
-
-typedef struct _SyncTriggerList {
- SyncTrigger *pTrigger;
- struct _SyncTriggerList *next;
-} SyncTriggerList;
-
-typedef struct _SyncAlarmClientList {
- ClientPtr client;
- XID delete_id;
- struct _SyncAlarmClientList *next;
-} SyncAlarmClientList;
-
-typedef struct _SyncAlarm {
- SyncTrigger trigger;
- ClientPtr client;
- XSyncAlarm alarm_id;
- CARD64 delta;
- int events;
- int state;
- SyncAlarmClientList *pEventClients;
-} SyncAlarm;
-
-typedef struct {
- ClientPtr client;
- CARD32 delete_id;
- int num_waitconditions;
-} SyncAwaitHeader;
-
-typedef struct {
- SyncTrigger trigger;
- CARD64 event_threshold;
- SyncAwaitHeader *pHeader;
-} SyncAwait;
-
-typedef union {
- SyncAwaitHeader header;
- SyncAwait await;
-} SyncAwaitUnion;
-
pointer
SyncCreateSystemCounter(char *name,
CARD64 inital_value,
|
