--- sourceforge.net/trunk/rdesktop/xwin.c 2003/10/28 03:40:26 519 +++ sourceforge.net/trunk/rdesktop/xwin.c 2004/03/03 10:46:35 620 @@ -20,8 +20,11 @@ #include #include +#include +#include #include #include +#include #include "rdesktop.h" #include "xproto.h" @@ -41,7 +44,7 @@ static Screen *g_screen; Window g_wnd; BOOL g_enable_compose = False; -static GC g_gc; +static GC g_gc = NULL; static Visual *g_visual; static int g_depth; static int g_bpp; @@ -49,7 +52,7 @@ static XIC g_IC; static XModifierKeymap *g_mod_map; static Cursor g_current_cursor; -static HCURSOR g_null_cursor; +static HCURSOR g_null_cursor = NULL; static Atom g_protocol_atom, g_kill_atom; static BOOL g_focused; static BOOL g_mouse_in_wnd; @@ -57,10 +60,12 @@ /* 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; -static Pixmap g_backstore; +BOOL g_ownbackstore = True; /* We can't rely on external BackingStore */ +static Pixmap g_backstore = 0; /* Moving in single app mode */ static BOOL g_moving_wnd; @@ -112,7 +117,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)); @@ -164,12 +169,9 @@ split_colour15(uint32 colour) { PixelColour rv; - rv.red = (colour & 0x7c00) >> 10; - rv.red = (rv.red * 0xff) / 0x1f; - rv.green = (colour & 0x03e0) >> 5; - rv.green = (rv.green * 0xff) / 0x1f; - rv.blue = (colour & 0x1f); - rv.blue = (rv.blue * 0xff) / 0x1f; + rv.red = (colour & 0x7c00) >> 7; + rv.green = (colour & 0x03e0) >> 2; + rv.blue = (colour & 0x001f) << 3; return rv; } @@ -177,12 +179,9 @@ split_colour16(uint32 colour) { PixelColour rv; - rv.red = (colour & 0xf800) >> 11; - rv.red = (rv.red * 0xff) / 0x1f; - rv.green = (colour & 0x07e0) >> 5; - rv.green = (rv.green * 0xff) / 0x3f; - rv.blue = (colour & 0x001f); - rv.blue = (rv.blue * 0xff) / 0x1f; + rv.red = (colour & 0xf800) >> 8; + rv.green = (colour & 0x07e0) >> 3; + rv.blue = (colour & 0x001f) << 3; return rv; } @@ -191,98 +190,41 @@ { PixelColour rv; rv.blue = (colour & 0xff0000) >> 16; - rv.green = (colour & 0xff00) >> 8; - rv.red = (colour & 0xff); + rv.green = (colour & 0x00ff00) >> 8; + rv.red = (colour & 0x0000ff); return rv; } 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 +235,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,20 +265,47 @@ 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++)]; -/* todo the remaining translate function might need some big endian check ?? */ + 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; + } + } +} static void translate15to16(uint16 * data, uint8 * out, uint8 * end) @@ -335,9 +319,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 +349,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 +383,7 @@ BSWAP16(pixel); } - value = make_colour32(split_colour15(pixel)); + value = make_colour(split_colour15(pixel)); if (g_xserver_be) { @@ -417,34 +403,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 +444,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 +476,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 +509,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 +527,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 +617,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 +642,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 +681,24 @@ 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, nvisuals; + XVisualInfo *vmatches = NULL; + XVisualInfo template; + Bool TrueColorVisual = False; g_display = XOpenDisplay(NULL); if (g_display == NULL) @@ -678,11 +707,54 @@ 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); + /* Search for best TrueColor depth */ + template.class = TrueColor; + vmatches = XGetVisualInfo(g_display, VisualClassMask, &template, &nvisuals); + + nvisuals--; + while (nvisuals >= 0) + { + if ((vmatches + nvisuals)->depth > g_depth) + { + g_depth = (vmatches + nvisuals)->depth; + } + nvisuals--; + TrueColorVisual = True; + } + + if ((g_server_bpp == 8) && ((!TrueColorVisual) || (g_depth <= 8))) + { + /* we use a colourmap, so the default visual should do */ + g_visual = DefaultVisualOfScreen(g_screen); + g_depth = DefaultDepthOfScreen(g_screen); + + /* Do not allocate colours on a TrueColor visual */ + if (g_visual->class == TrueColor) + { + g_owncolmap = False; + } + } + 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,21 +777,20 @@ return False; } - /* private colour map code only works for 8 bpp */ - if (g_owncolmap && (g_bpp > 8)) - g_owncolmap = False; - if (!g_owncolmap) { - g_xcolmap = DefaultColormapOfScreen(g_screen); + g_xcolmap = + XCreateColormap(g_display, RootWindowOfScreen(g_screen), g_visual, + AllocNone); if (g_depth <= 8) warning("Screen depth is 8 bits or lower: you may want to use -C for a private colourmap\n"); } - g_gc = XCreateGC(g_display, RootWindowOfScreen(g_screen), 0, NULL); - - if (DoesBackingStore(g_screen) != Always) + if ((!g_ownbackstore) && (DoesBackingStore(g_screen) != Always)) + { + warning("External BackingStore not available, using internal\n"); g_ownbackstore = True; + } test = 1; g_host_be = !(BOOL) (*(uint8 *) (&test)); @@ -728,7 +799,12 @@ /* * Determine desktop size */ - if (g_width < 0) + if (g_fullscreen) + { + g_width = WidthOfScreen(g_screen); + g_height = HeightOfScreen(g_screen); + } + else if (g_width < 0) { /* Percent of screen */ g_height = HeightOfScreen(g_screen) * (-g_width) / 100; @@ -751,26 +827,10 @@ g_height = 600; } } - else if (g_fullscreen) - { - g_width = WidthOfScreen(g_screen); - g_height = HeightOfScreen(g_screen); - } /* make sure width is a multiple of 4 */ g_width = (g_width + 3) & ~3; - if (g_ownbackstore) - { - g_backstore = - XCreatePixmap(g_display, RootWindowOfScreen(g_screen), g_width, g_height, - g_depth); - - /* clear to prevent rubbish being exposed at startup */ - XSetForeground(g_display, g_gc, BlackPixelOfScreen(g_screen)); - XFillRectangle(g_display, g_backstore, g_gc, 0, 0, g_width, g_height); - } - g_mod_map = XGetModifierMapping(g_display); xkeymap_init(); @@ -791,6 +851,9 @@ if (g_IM != NULL) XCloseIM(g_IM); + if (g_null_cursor != NULL) + ui_destroy_cursor(g_null_cursor); + XFreeModifiermap(g_mod_map); if (g_ownbackstore) @@ -801,12 +864,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; @@ -818,12 +880,27 @@ wndheight = g_fullscreen ? HeightOfScreen(g_screen) : g_height; attribs.background_pixel = BlackPixelOfScreen(g_screen); + attribs.border_pixel = WhitePixelOfScreen(g_screen); attribs.backing_store = g_ownbackstore ? NotUseful : Always; attribs.override_redirect = g_fullscreen; + attribs.colormap = g_xcolmap; g_wnd = XCreateWindow(g_display, RootWindowOfScreen(g_screen), 0, 0, wndwidth, wndheight, - 0, CopyFromParent, InputOutput, CopyFromParent, - CWBackPixel | CWBackingStore | CWOverrideRedirect, &attribs); + 0, g_depth, InputOutput, g_visual, + CWBackPixel | CWBackingStore | CWOverrideRedirect | + CWColormap | CWBorderPixel, &attribs); + + if (g_gc == NULL) + g_gc = XCreateGC(g_display, g_wnd, 0, NULL); + + if ((g_ownbackstore) && (g_backstore == 0)) + { + g_backstore = XCreatePixmap(g_display, g_wnd, g_width, g_height, g_depth); + + /* clear to prevent rubbish being exposed at startup */ + XSetForeground(g_display, g_gc, BlackPixelOfScreen(g_screen)); + XFillRectangle(g_display, g_backstore, g_gc, 0, 0, g_width, g_height); + } XStoreName(g_display, g_wnd, g_title); @@ -889,7 +966,8 @@ 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); + if (g_null_cursor == NULL) + g_null_cursor = ui_create_cursor(0, 0, 1, 1, null_pointer_mask, null_pointer_data); return True; } @@ -897,8 +975,6 @@ void ui_destroy_window(void) { - ui_destroy_cursor(g_null_cursor); - if (g_IC != NULL) XDestroyIC(g_IC); @@ -942,9 +1018,6 @@ key_translation tr; char str[256]; Status status; - unsigned int state; - Window wdummy; - int dummy; while (XPending(g_display) > 0) { @@ -1117,9 +1190,7 @@ if (xevent.xfocus.mode == NotifyGrab) break; g_focused = True; - XQueryPointer(g_display, g_wnd, &wdummy, &wdummy, &dummy, &dummy, - &dummy, &dummy, &state); - reset_modifier_keys(state); + reset_modifier_keys(); if (g_grab_keyboard && g_mouse_in_wnd) XGrabKeyboard(g_display, g_wnd, True, GrabModeAsync, GrabModeAsync, CurrentTime); @@ -1199,11 +1270,14 @@ int ui_select(int rdp_socket) { - int n = (rdp_socket > g_x_socket) ? rdp_socket + 1 : g_x_socket + 1; + int n; fd_set rfds, wfds; + struct timeval tv; + BOOL s_timeout = False; while (True) { + n = (rdp_socket > g_x_socket) ? rdp_socket : g_x_socket; /* Process any events already waiting */ if (!xwin_process_events()) /* User quit */ @@ -1219,19 +1293,35 @@ if (g_dsp_busy) { FD_SET(g_dsp_fd, &wfds); - n = (g_dsp_fd + 1 > n) ? g_dsp_fd + 1 : n; + n = (g_dsp_fd > n) ? g_dsp_fd : n; } #endif + /* default timeout */ + tv.tv_sec = 60; + tv.tv_usec = 0; + + /* add redirection handles */ + rdpdr_add_fds(&n, &rfds, &wfds, &tv, &s_timeout); - switch (select(n, &rfds, &wfds, NULL, NULL)) + n++; + + switch (select(n, &rfds, &wfds, NULL, &tv)) { case -1: error("select: %s\n", strerror(errno)); case 0: + /* TODO: if tv.tv_sec just times out + * we will segfault. + * FIXME: + */ + //s_timeout = True; + //rdpdr_check_fds(&rfds, &wfds, (BOOL) True); continue; } + rdpdr_check_fds(&rfds, &wfds, (BOOL) False); + if (FD_ISSET(rdp_socket, &rfds)) return 1; @@ -1254,11 +1344,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); @@ -1273,9 +1376,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) { @@ -1501,9 +1618,7 @@ } - - /* byte swap here to make translate_image faster */ - map[i] = translate_colour(colour); + map[i] = colour; } return map; } @@ -1662,9 +1777,15 @@ /* src */ int srcx, int srcy) { SET_FUNCTION(opcode); - XCopyArea(g_display, g_wnd, g_wnd, g_gc, srcx, srcy, cx, cy, x, y); if (g_ownbackstore) + { + XCopyArea(g_display, g_backstore, g_wnd, g_gc, srcx, srcy, cx, cy, x, y); XCopyArea(g_display, g_backstore, g_backstore, g_gc, srcx, srcy, cx, cy, x, y); + } + else + { + XCopyArea(g_display, g_wnd, g_wnd, g_gc, srcx, srcy, cx, cy, x, y); + } RESET_FUNCTION(opcode); } @@ -1759,33 +1880,34 @@ {\ glyph = cache_get_font (font, ttext[idx]);\ if (!(flags & TEXT2_IMPLICIT_X))\ + {\ + xyoffset = ttext[++idx];\ + if ((xyoffset & 0x80))\ {\ - xyoffset = ttext[++idx];\ - if ((xyoffset & 0x80))\ - {\ - if (flags & TEXT2_VERTICAL) \ - y += ttext[idx+1] | (ttext[idx+2] << 8);\ - else\ - x += ttext[idx+1] | (ttext[idx+2] << 8);\ - idx += 2;\ - }\ + if (flags & TEXT2_VERTICAL)\ + y += ttext[idx+1] | (ttext[idx+2] << 8);\ else\ - {\ - if (flags & TEXT2_VERTICAL) \ - y += xyoffset;\ - else\ - x += xyoffset;\ - }\ + x += ttext[idx+1] | (ttext[idx+2] << 8);\ + idx += 2;\ }\ - if (glyph != NULL)\ + else\ {\ - ui_draw_glyph (mixmode, x + glyph->offset,\ - y + glyph->baseline,\ - glyph->width, glyph->height,\ - glyph->pixmap, 0, 0, bgcolour, fgcolour);\ - if (flags & TEXT2_IMPLICIT_X)\ - x += glyph->width;\ + if (flags & TEXT2_VERTICAL)\ + y += xyoffset;\ + else\ + x += xyoffset;\ }\ + }\ + if (glyph != NULL)\ + {\ + x1 = x + glyph->offset;\ + y1 = y + glyph->baseline;\ + XSetStipple(g_display, g_gc, (Pixmap) glyph->pixmap);\ + XSetTSOrigin(g_display, g_gc, x1, y1);\ + FILL_RECTANGLE_BACKSTORE(x1, y1, glyph->width, glyph->height);\ + if (flags & TEXT2_IMPLICIT_X)\ + x += glyph->width;\ + }\ } void @@ -1795,11 +1917,17 @@ int fgcolour, uint8 * text, uint8 length) { FONTGLYPH *glyph; - int i, j, xyoffset; + int i, j, xyoffset, x1, y1; DATABLOB *entry; SET_FOREGROUND(bgcolour); + /* Sometimes, the boxcx value is something really large, like + 32691. This makes XCopyArea fail with Xvnc. The code below + is a quick fix. */ + if (boxx + boxcx > g_width) + boxcx = g_width - boxx; + if (boxcx > 1) { FILL_RECTANGLE_BACKSTORE(boxx, boxy, boxcx, boxcy); @@ -1809,6 +1937,10 @@ FILL_RECTANGLE_BACKSTORE(clipx, clipy, clipcx, clipcy); } + SET_FOREGROUND(fgcolour); + SET_BACKGROUND(bgcolour); + XSetFillStyle(g_display, g_gc, FillStippled); + /* Paint text, character by character */ for (i = 0; i < length;) { @@ -1859,6 +1991,9 @@ break; } } + + XSetFillStyle(g_display, g_gc, FillSolid); + if (g_ownbackstore) { if (boxcx > 1)