Magellan Linux

Contents of /trunk/xorg-server/patches/xorg-server-1.2.0-server-damage-version.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 153 - (show annotations) (download)
Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
File size: 1322 byte(s)
-import

1 --- a/damageext/damageext.c
2 +++ b/damageext/damageext.c
3 @@ -35,6 +35,13 @@ int DamageClientPrivateIndex;
4 RESTYPE DamageExtType;
5 RESTYPE DamageExtWinType;
6
7 +/* Version of the damage extension supported by the server, as opposed to the
8 + * DAMAGE_* defines from damageproto for what version the proto header
9 + * supports.
10 + */
11 +#define SERVER_DAMAGE_MAJOR 1
12 +#define SERVER_DAMAGE_MINOR 0
13 +
14 #define prScreen screenInfo.screens[0]
15
16 static void
17 @@ -143,16 +150,16 @@ ProcDamageQueryVersion(ClientPtr client)
18 rep.type = X_Reply;
19 rep.length = 0;
20 rep.sequenceNumber = client->sequence;
21 - if (stuff->majorVersion < DAMAGE_MAJOR) {
22 + if (stuff->majorVersion < SERVER_DAMAGE_MAJOR) {
23 rep.majorVersion = stuff->majorVersion;
24 rep.minorVersion = stuff->minorVersion;
25 } else {
26 - rep.majorVersion = DAMAGE_MAJOR;
27 - if (stuff->majorVersion == DAMAGE_MAJOR &&
28 - stuff->minorVersion < DAMAGE_MINOR)
29 + rep.majorVersion = SERVER_DAMAGE_MAJOR;
30 + if (stuff->majorVersion == SERVER_DAMAGE_MAJOR &&
31 + stuff->minorVersion < SERVER_DAMAGE_MINOR)
32 rep.minorVersion = stuff->minorVersion;
33 else
34 - rep.minorVersion = DAMAGE_MINOR;
35 + rep.minorVersion = SERVER_DAMAGE_MINOR;
36 }
37 pDamageClient->major_version = rep.majorVersion;
38 pDamageClient->minor_version = rep.minorVersion;