Contents of /trunk/vnc/patches/vnc-24bit.patch
Parent Directory | Revision Log
Revision 637 -
(show annotations)
(download)
Tue Jun 3 20:32:55 2008 UTC (16 years, 3 months ago) by niro
File size: 1556 byte(s)
Tue Jun 3 20:32:55 2008 UTC (16 years, 3 months ago) by niro
File size: 1556 byte(s)
-added several new fixes from fedora
1 | --- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.24bit 2007-06-07 17:27:46.000000000 +0200 |
2 | +++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2007-06-07 17:29:01.000000000 +0200 |
3 | @@ -762,7 +762,7 @@ static Bool vfbScreenInit(int index, Scr |
4 | |
5 | miSetPixmapDepths(); |
6 | |
7 | - switch (pvfb->bitsPerPixel) |
8 | + switch (pvfb->depth) |
9 | { |
10 | case 8: |
11 | miSetVisualTypesAndMasks (8, 1 << PseudoColor, 8, PseudoColor, 0, 0, 0); |
12 | @@ -771,6 +771,9 @@ static Bool vfbScreenInit(int index, Scr |
13 | case 16: |
14 | miSetVisualTypesAndMasks (16, 1 << TrueColor, 8, TrueColor, 0xf800, 0x07e0, 0x001f); |
15 | break; |
16 | + case 24: |
17 | + miSetVisualTypesAndMasks (24, 1 << TrueColor, 8, TrueColor, 0xff0000, 0x00ff00, 0x0000ff); |
18 | + break; |
19 | case 32: |
20 | miSetVisualTypesAndMasks (32, 1 << TrueColor , 8, TrueColor, 0xff000000, 0x00ff0000, 0x0000ff00); |
21 | break; |
22 | @@ -778,15 +781,17 @@ static Bool vfbScreenInit(int index, Scr |
23 | return FALSE; |
24 | } |
25 | |
26 | - if (!fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height, |
27 | - dpi, dpi, pvfb->paddedWidth, pvfb->bitsPerPixel)) |
28 | - return FALSE; |
29 | + ret =fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height, |
30 | + dpi, dpi, pvfb->paddedWidth, pvfb->bitsPerPixel); |
31 | |
32 | #ifdef RENDER |
33 | if (ret && Render) |
34 | fbPictureInit(pScreen, 0, 0); |
35 | #endif /* RENDER */ |
36 | |
37 | + if (!ret) |
38 | + return FALSE; |
39 | + |
40 | pScreen->InstallColormap = vfbInstallColormap; |
41 | pScreen->UninstallColormap = vfbUninstallColormap; |
42 | pScreen->ListInstalledColormaps = vfbListInstalledColormaps; |