--- sourceforge.net/trunk/rdesktop/xwin.c 2003/10/22 10:55:11 508 +++ sourceforge.net/trunk/rdesktop/xwin.c 2003/11/02 16:43:29 541 @@ -20,6 +20,7 @@ #include #include +#include #include #include #include "rdesktop.h" @@ -57,6 +58,8 @@ /* endianness */ static BOOL g_host_be; static BOOL g_xserver_be; +static int g_red_shift_r, g_blue_shift_r, g_green_shift_r; +static int g_red_shift_l, g_blue_shift_l, g_green_shift_l; /* software backing store */ static BOOL g_ownbackstore; @@ -112,7 +115,7 @@ static Colormap g_xcolmap; static uint32 *g_colmap = NULL; -#define TRANSLATE(col) ( g_server_bpp != 8 ? translate_colour(col) : g_owncolmap ? col : translate_colour(g_colmap[col]) ) +#define TRANSLATE(col) ( g_server_bpp != 8 ? translate_colour(col) : g_owncolmap ? col : g_colmap[col] ) #define SET_FOREGROUND(col) XSetForeground(g_display, g_gc, TRANSLATE(col)); #define SET_BACKGROUND(col) XSetBackground(g_display, g_gc, TRANSLATE(col)); @@ -197,92 +200,35 @@ } static uint32 -make_colour16(PixelColour pc) +make_colour(PixelColour pc) { - pc.red = (pc.red * 0x1f) / 0xff; - pc.green = (pc.green * 0x3f) / 0xff; - pc.blue = (pc.blue * 0x1f) / 0xff; - return (pc.red << 11) | (pc.green << 5) | pc.blue; -} - -static uint32 -make_colour24(PixelColour pc) -{ - if (g_xserver_be) - { - return pc.red | (pc.green << 8) | (pc.blue << 16); - } - else - { - return (pc.red << 16) | (pc.green << 8) | pc.blue; - } -} - -static uint32 -make_colour32(PixelColour pc) -{ - if (g_xserver_be) - { - return pc.red | (pc.green << 8) | (pc.blue << 16); - } - else - { - return (pc.red << 16) | (pc.green << 8) | pc.blue; - } + return (((pc.red >> g_red_shift_r) << g_red_shift_l) + | ((pc.green >> g_green_shift_r) << g_green_shift_l) + | ((pc.blue >> g_blue_shift_r) << g_blue_shift_l)); } #define BSWAP16(x) { x = (((x & 0xff) << 8) | (x >> 8)); } -#define BSWAP24(x) { x = (((x & 0xff) << 16) | (x >> 16) | ((x >> 8) & 0xff00)); } +#define BSWAP24(x) { x = (((x & 0xff) << 16) | (x >> 16) | (x & 0xff00)); } #define BSWAP32(x) { x = (((x & 0xff00ff) << 8) | ((x >> 8) & 0xff00ff)); \ x = (x << 16) | (x >> 16); } static uint32 translate_colour(uint32 colour) { + PixelColour pc; switch (g_server_bpp) { case 15: - switch (g_bpp) - { - case 16: - colour = make_colour16(split_colour15(colour)); - break; - case 24: - colour = make_colour24(split_colour15(colour)); - break; - case 32: - colour = make_colour32(split_colour15(colour)); - break; - } + pc = split_colour15(colour); break; case 16: - switch (g_bpp) - { - case 16: - break; - case 24: - colour = make_colour24(split_colour16(colour)); - break; - case 32: - colour = make_colour32(split_colour16(colour)); - break; - } + pc = split_colour16(colour); break; case 24: - switch (g_bpp) - { - case 16: - colour = make_colour16(split_colour24(colour)); - break; - case 24: - break; - case 32: - colour = make_colour32(split_colour24(colour)); - break; - } + pc = split_colour24(colour); break; } - return colour; + return make_colour(pc); } static void @@ -293,10 +239,25 @@ } static void -translate8to16(uint8 * data, uint16 * out, uint16 * end) +translate8to16(uint8 * data, uint8 * out, uint8 * end) { + uint16 value; + while (out < end) - *(out++) = (uint16) g_colmap[*(data++)]; + { + value = (uint16) g_colmap[*(data++)]; + + if (g_xserver_be) + { + *(out++) = value >> 8; + *(out++) = value; + } + else + { + *(out++) = value; + *(out++) = value >> 8; + } + } } /* little endian - conversion happens when colourmap is built */ @@ -308,17 +269,46 @@ while (out < end) { value = g_colmap[*(data++)]; - *(out++) = value; - *(out++) = value >> 8; - *(out++) = value >> 16; + + if (g_xserver_be) + { + *(out++) = value >> 16; + *(out++) = value >> 8; + *(out++) = value; + } + else + { + *(out++) = value; + *(out++) = value >> 8; + *(out++) = value >> 16; + } } } static void -translate8to32(uint8 * data, uint32 * out, uint32 * end) +translate8to32(uint8 * data, uint8 * out, uint8 * end) { + uint32 value; + while (out < end) - *(out++) = g_colmap[*(data++)]; + { + value = g_colmap[*(data++)]; + + if (g_xserver_be) + { + *(out++) = value >> 24; + *(out++) = value >> 16; + *(out++) = value >> 8; + *(out++) = value; + } + else + { + *(out++) = value; + *(out++) = value >> 8; + *(out++) = value >> 16; + *(out++) = value >> 24; + } + } } /* todo the remaining translate function might need some big endian check ?? */ @@ -335,9 +325,10 @@ if (g_host_be) { - BSWAP16(pixel)} + BSWAP16(pixel); + } - value = make_colour16(split_colour15(pixel)); + value = make_colour(split_colour15(pixel)); if (g_xserver_be) { @@ -364,9 +355,10 @@ if (g_host_be) { - BSWAP16(pixel)} + BSWAP16(pixel); + } - value = make_colour24(split_colour15(pixel)); + value = make_colour(split_colour15(pixel)); if (g_xserver_be) { *(out++) = value >> 16; @@ -397,7 +389,7 @@ BSWAP16(pixel); } - value = make_colour32(split_colour15(pixel)); + value = make_colour(split_colour15(pixel)); if (g_xserver_be) { @@ -417,34 +409,35 @@ } static void -translate16to16(uint16 * data, uint16 * out, uint16 * end) +translate16to16(uint16 * data, uint8 * out, uint8 * end) { + uint16 pixel; uint16 value; - if (g_xserver_be) + while (out < end) { - while (out < end) + pixel = *(data++); + + if (g_host_be) { - value = *data; - BSWAP16(value); - *out = value; - data++; - out++; + BSWAP16(pixel); } - } - else - { - while (out < end) + value = make_colour(split_colour16(pixel)); + + if (g_xserver_be) { - *out = *data; - out++; - data++; + *(out++) = value >> 8; + *(out++) = value; + } + else + { + *(out++) = value; + *(out++) = value >> 8; } } } - static void translate16to24(uint16 * data, uint8 * out, uint8 * end) { @@ -457,9 +450,10 @@ if (g_host_be) { - BSWAP16(pixel)} + BSWAP16(pixel); + } - value = make_colour24(split_colour16(pixel)); + value = make_colour(split_colour16(pixel)); if (g_xserver_be) { @@ -488,9 +482,10 @@ if (g_host_be) { - BSWAP16(pixel)} + BSWAP16(pixel); + } - value = make_colour32(split_colour16(pixel)); + value = make_colour(split_colour16(pixel)); if (g_xserver_be) { @@ -520,7 +515,7 @@ pixel |= *(data++) << 8; pixel |= *(data++); - value = (uint16) make_colour16(split_colour24(pixel)); + value = (uint16) make_colour(split_colour24(pixel)); if (g_xserver_be) { @@ -538,30 +533,59 @@ static void translate24to24(uint8 * data, uint8 * out, uint8 * end) { + uint32 pixel; + uint32 value; + while (out < end) { - *(out++) = (*(data++)); + pixel = *(data++) << 16; + pixel |= *(data++) << 8; + pixel |= *(data++); + + value = make_colour(split_colour24(pixel)); + + if (g_xserver_be) + { + *(out++) = value >> 16; + *(out++) = value >> 8; + *(out++) = value; + } + else + { + *(out++) = value; + *(out++) = value >> 8; + *(out++) = value >> 16; + } } } static void translate24to32(uint8 * data, uint8 * out, uint8 * end) { + uint32 pixel; + uint32 value; + while (out < end) { + pixel = *(data++) << 16; + pixel |= *(data++) << 8; + pixel |= *(data++); + + value = make_colour(split_colour24(pixel)); + if (g_xserver_be) { - *(out++) = 0x00; - *(out++) = *(data++); - *(out++) = *(data++); - *(out++) = *(data++); + *(out++) = value >> 24; + *(out++) = value >> 16; + *(out++) = value >> 8; + *(out++) = value; } else { - *(out++) = *(data++); - *(out++) = *(data++); - *(out++) = *(data++); - *(out++) = 0x00; + *(out++) = value; + *(out++) = value >> 8; + *(out++) = value >> 16; + *(out++) = value >> 24; } } } @@ -599,8 +623,7 @@ translate16to24((uint16 *) data, out, end); break; case 16: - translate16to16((uint16 *) data, (uint16 *) out, - (uint16 *) end); + translate16to16((uint16 *) data, out, end); break; } break; @@ -625,13 +648,13 @@ translate8to8(data, out, end); break; case 16: - translate8to16(data, (uint16 *) out, (uint16 *) end); + translate8to16(data, out, end); break; case 24: translate8to24(data, out, end); break; case 32: - translate8to32(data, (uint32 *) out, (uint32 *) end); + translate8to32(data, out, end); break; } break; @@ -664,12 +687,21 @@ return (state & keysymMask) ? True : False; } +static void +calculate_shifts(uint32 mask, int *shift_r, int *shift_l) +{ + *shift_l = ffs(mask) - 1; + mask >>= *shift_l; + *shift_r = 8 - ffs(mask & ~(mask >> 1)); +} + BOOL ui_init(void) { + XVisualInfo vi; XPixmapFormatValues *pfm; uint16 test; - int i; + int i, screen_num; g_display = XOpenDisplay(NULL); if (g_display == NULL) @@ -678,11 +710,32 @@ return False; } + screen_num = DefaultScreen(g_display); g_x_socket = ConnectionNumber(g_display); - g_screen = DefaultScreenOfDisplay(g_display); - g_visual = DefaultVisualOfScreen(g_screen); + g_screen = ScreenOfDisplay(g_display, screen_num); g_depth = DefaultDepthOfScreen(g_screen); + if (g_server_bpp == 8) + { + /* we use a colourmap, so any visual should do */ + g_visual = DefaultVisualOfScreen(g_screen); + } + else + { + /* need a truecolour visual */ + if (!XMatchVisualInfo(g_display, screen_num, g_depth, TrueColor, &vi)) + { + error("The display does not support true colour - high colour support unavailable.\n"); + return False; + } + + g_visual = vi.visual; + g_owncolmap = False; + calculate_shifts(vi.red_mask, &g_red_shift_r, &g_red_shift_l); + calculate_shifts(vi.blue_mask, &g_blue_shift_r, &g_blue_shift_l); + calculate_shifts(vi.green_mask, &g_green_shift_r, &g_green_shift_l); + } + pfm = XListPixmapFormats(g_display, &i); if (pfm != NULL) { @@ -705,7 +758,7 @@ return False; } - if (g_owncolmap != True) + if (!g_owncolmap) { g_xcolmap = DefaultColormapOfScreen(g_screen); if (g_depth <= 8) @@ -776,8 +829,7 @@ xclip_init(); - /* todo take this out when high colour is done */ - printf("server bpp %d client bpp %d depth %d\n", g_server_bpp, g_bpp, g_depth); + DEBUG_RDP5(("server bpp %d client bpp %d depth %d\n", g_server_bpp, g_bpp, g_depth)); return True; } @@ -798,12 +850,11 @@ g_display = NULL; } -#define NULL_POINTER_MASK "\x80" -#define NULL_POINTER_DATA "\x0\x0\x0" - BOOL ui_create_window(void) { + uint8 null_pointer_mask[1] = { 0x80 }; + uint8 null_pointer_data[4] = { 0x00, 0x00, 0x00, 0x00 }; XSetWindowAttributes attribs; XClassHint *classhints; XSizeHints *sizehints; @@ -886,7 +937,7 @@ XSetWMProtocols(g_display, g_wnd, &g_kill_atom, 1); /* create invisible 1x1 cursor to be used as null cursor */ - g_null_cursor = ui_create_cursor(0, 0, 1, 1, NULL_POINTER_MASK, NULL_POINTER_DATA); + g_null_cursor = ui_create_cursor(0, 0, 1, 1, null_pointer_mask, null_pointer_data); return True; } @@ -894,8 +945,6 @@ void ui_destroy_window(void) { - ui_destroy_cursor(g_null_cursor); - if (g_IC != NULL) XDestroyIC(g_IC); @@ -1251,11 +1300,24 @@ XImage *image; Pixmap bitmap; uint8 *tdata; + int bitmap_pad; + + if (g_server_bpp == 8) + { + bitmap_pad = 8; + } + else + { + bitmap_pad = g_bpp; + + if (g_bpp == 24) + bitmap_pad = 32; + } tdata = (g_owncolmap ? data : translate_image(width, height, data)); bitmap = XCreatePixmap(g_display, g_wnd, width, height, g_depth); image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0, - (char *) tdata, width, height, g_server_bpp == 8 ? 8 : g_bpp, 0); + (char *) tdata, width, height, bitmap_pad, 0); XPutImage(g_display, bitmap, g_gc, image, 0, 0, 0, 0, width, height); @@ -1270,9 +1332,23 @@ { XImage *image; uint8 *tdata; + int bitmap_pad; + + if (g_server_bpp == 8) + { + bitmap_pad = 8; + } + else + { + bitmap_pad = g_bpp; + + if (g_bpp == 24) + bitmap_pad = 32; + } + tdata = (g_owncolmap ? data : translate_image(width, height, data)); image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0, - (char *) tdata, width, height, g_server_bpp == 8 ? 8 : g_bpp, 0); + (char *) tdata, width, height, bitmap_pad, 0); if (g_ownbackstore) { @@ -1498,9 +1574,7 @@ } - - /* byte swap here to make translate_image faster */ - map[i] = translate_colour(colour); + map[i] = colour; } return map; }