diff options
| author | Timothy Pearson <tpearson@raptorengineering.com> | 2019-03-04 03:52:48 -0600 |
|---|---|---|
| committer | Timothy Pearson <tpearson@raptorengineering.com> | 2019-03-04 08:05:23 -0600 |
| commit | 03c7ab9dba0dde870071e0e9ed6dcaa4631695e0 (patch) | |
| tree | 94440342e310df7bcd3e23808c2bbbf76c3dbd77 | |
| parent | 521409e47d2baaaa9166ea56a7121b3c182ff2e3 (diff) | |
| download | xrdp-proprietary-03c7ab9dba0dde870071e0e9ed6dcaa4631695e0.tar.gz xrdp-proprietary-03c7ab9dba0dde870071e0e9ed6dcaa4631695e0.zip | |
Work around GTK pixmaps (e.g. GIMP icons, etc) showing up as black squares
| -rw-r--r-- | xorg/X11R7.6/rdp/rdpmain.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/xorg/X11R7.6/rdp/rdpmain.c b/xorg/X11R7.6/rdp/rdpmain.c index 884b8a3a..ad081af2 100644 --- a/xorg/X11R7.6/rdp/rdpmain.c +++ b/xorg/X11R7.6/rdp/rdpmain.c @@ -108,6 +108,9 @@ static int g_greenBits = 6; static int g_blueBits = 5; static int g_initOutputCalled = 0; /* Common pixmap formats */ +#if 0 +// FIXME +// This is disabled to work around 32bpp pixmaps showing up all black when rendered static PixmapFormatRec g_formats[MAXFORMATS] = { { 1, 1, BITMAP_SCANLINE_PAD }, @@ -119,6 +122,18 @@ static PixmapFormatRec g_formats[MAXFORMATS] = { 32, 32, BITMAP_SCANLINE_PAD }, }; static int g_numFormats = 7; +#else +static PixmapFormatRec g_formats[MAXFORMATS] = +{ + { 1, 1, BITMAP_SCANLINE_PAD }, + { 4, 8, BITMAP_SCANLINE_PAD }, + { 8, 8, BITMAP_SCANLINE_PAD }, + { 15, 16, BITMAP_SCANLINE_PAD }, + { 16, 16, BITMAP_SCANLINE_PAD }, + { 24, 32, BITMAP_SCANLINE_PAD }, +}; +static int g_numFormats = 6; +#endif static miPointerSpriteFuncRec g_rdpSpritePointerFuncs = { /* these are in rdpinput.c */ |