Contents of /trunk/nx/patches/nx-x11-1.5.0-windows-linux-resume.patch
Parent Directory | Revision Log
Revision 153 -
(show annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 1355 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 1355 byte(s)
-import
1 | --- nx-X11/programs/Xserver/hw/nxagent/Display.c.orig 2005-07-29 09:01:11.000000000 -0700 |
2 | +++ nx-X11/programs/Xserver/hw/nxagent/Display.c 2005-07-30 07:16:06.000000000 -0700 |
3 | @@ -1531,11 +1531,12 @@ |
4 | reconnectDisplayState = NOTHING; |
5 | } |
6 | |
7 | +#define WARNING |
8 | static Bool reloadVisuals(int flexibility) |
9 | { |
10 | int i, nitems; |
11 | XVisualInfo *newVisuals, *vi; |
12 | - unsigned long mask = VisualAllMask & ~VisualIDMask; |
13 | + unsigned long mask = VisualAllMask & ~VisualIDMask & ~VisualBitsPerRGBMask; |
14 | |
15 | newVisuals = malloc(sizeof(XVisualInfo) * nxagentNumVisuals); |
16 | |
17 | @@ -1577,6 +1578,10 @@ |
18 | } |
19 | } |
20 | |
21 | + #ifdef WARNING |
22 | + fprintf(stderr, "matched for %d visuals and found %d matching\n", nxagentNumVisuals,i); |
23 | + #endif |
24 | + |
25 | if (i == nxagentNumVisuals) |
26 | { |
27 | nxagentVisuals = newVisuals; |
28 | --- nx-X11/programs/Xserver/hw/nxagent/Visual.c.orig 2005-07-30 07:17:40.000000000 -0700 |
29 | +++ nx-X11/programs/Xserver/hw/nxagent/Visual.c 2005-07-30 07:17:44.000000000 -0700 |
30 | @@ -48,7 +48,6 @@ |
31 | for (i = 0; i < nxagentNumVisuals; i++) |
32 | { |
33 | if (pVisual->class == nxagentVisuals[i].class && |
34 | - pVisual->bitsPerRGBValue == nxagentVisuals[i].bits_per_rgb && |
35 | pVisual->ColormapEntries == nxagentVisuals[i].colormap_size && |
36 | pVisual->nplanes == nxagentVisuals[i].depth && |
37 | pVisual->redMask == nxagentVisuals[i].red_mask && |