author | Alan Coopersmith <Alan.Coopersmith@Sun.COM> |
Fri, 29 Sep 2006 13:30:42 -0700 | |
changeset 68 | 76d5bd5820f4 |
permissions | -rw-r--r-- |
68
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
1 |
/* |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
2 |
* Copyright 2006 Sun Microsystems, Inc. All rights reserved. |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
3 |
* |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
4 |
* Permission is hereby granted, free of charge, to any person obtaining a |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
5 |
* copy of this software and associated documentation files (the |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
6 |
* "Software"), to deal in the Software without restriction, including |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
7 |
* without limitation the rights to use, copy, modify, merge, publish, |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
8 |
* distribute, and/or sell copies of the Software, and to permit persons |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
9 |
* to whom the Software is furnished to do so, provided that the above |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
10 |
* copyright notice(s) and this permission notice appear in all copies of |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
11 |
* the Software and that both the above copyright notice(s) and this |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
12 |
* permission notice appear in supporting documentation. |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
13 |
* |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
14 |
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
15 |
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
16 |
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
17 |
* OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
18 |
* HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
19 |
* INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
20 |
* FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
21 |
* NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
22 |
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
23 |
* |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
24 |
* Except as contained in this notice, the name of a copyright holder |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
25 |
* shall not be used in advertising or otherwise to promote the sale, use |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
26 |
* or other dealings in this Software without prior written authorization |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
27 |
* of the copyright holder. |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
28 |
* |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
29 |
*/ |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
30 |
|
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
31 |
From 6c4d82990973b02a756ab3ba83ea345fed4bf87e Mon Sep 17 00:00:00 2001 |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
32 |
From: Stuart Kreitman <[email protected]> |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
33 |
Date: Wed, 27 Sep 2006 19:02:02 -0700 |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
34 |
Subject: [PATCH] Sun bug #5099413/Xorg bugzilla #1554: Gnopernicus full-screen mag not working |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
35 |
|
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
36 |
Sun bug #5099413: Gnopernicus full-screen magnification not working |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
37 |
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=5099413> |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
38 |
|
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
39 |
includes fix for Xorg bug #1554: rect defined in XFixesInvertRegion is not used |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
40 |
<https://bugs.freedesktop.org/show_bug.cgi?id=1554> |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
41 |
--- |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
42 |
src/Region.c | 5 +++++ |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
43 |
1 files changed, 5 insertions(+), 0 deletions(-) |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
44 |
|
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
45 |
diff --git a/src/Region.c b/src/Region.c |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
46 |
index c9f5920..0bbc1a2 100644 |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
47 |
--- src/Region.c |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
48 |
+++ src/Region.c |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
49 |
@@ -251,6 +251,10 @@ XFixesInvertRegion (Display *dpy, Xserve |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
50 |
GetReq (XFixesInvertRegion, req); |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
51 |
req->reqType = info->codes->major_opcode; |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
52 |
req->xfixesReqType = X_XFixesInvertRegion; |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
53 |
+ req->x = rect->x; |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
54 |
+ req->y = rect->y; |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
55 |
+ req->width = rect->width; |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
56 |
+ req->height = rect->height; |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
57 |
req->source = src; |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
58 |
req->destination = dst; |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
59 |
UnlockDisplay (dpy); |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
60 |
@@ -320,6 +324,7 @@ XFixesFetchRegionAndBounds (Display |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
61 |
req->reqType = info->codes->major_opcode; |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
62 |
req->xfixesReqType = X_XFixesFetchRegion; |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
63 |
req->region = region; |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
64 |
+ *nrectanglesRet = 0; |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
65 |
if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
66 |
{ |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
67 |
UnlockDisplay (dpy); |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
68 |
-- |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
69 |
1.4.1 |
76d5bd5820f4
6476476 Xorg modularization: libXfixes
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
70 |