--- sourceforge.net/trunk/rdesktop/xwin.c 2002/07/27 23:09:32 70 +++ sourceforge.net/trunk/rdesktop/xwin.c 2002/09/24 12:25:21 194 @@ -22,22 +22,27 @@ #include #include #include -#define XK_MISCELLANY -#include #include "rdesktop.h" extern int width; extern int height; extern BOOL sendmotion; extern BOOL fullscreen; +extern BOOL grab_keyboard; +extern char title[]; +BOOL enable_compose = False; -Display *display = NULL; +Display *display; static int x_socket; +static Screen *screen; static Window wnd; static GC gc; static Visual *visual; static int depth; static int bpp; +static XIM IM; +static XIC IC; +static Cursor current_cursor; /* endianness */ static BOOL host_be; @@ -55,19 +60,11 @@ } /* colour maps */ -static BOOL owncolmap; static Colormap xcolmap; -static uint32 white; static uint32 *colmap; -static XIM IM = NULL; -static XIC IC = NULL; - -/* Compose support */ -BOOL enable_compose = False; -#define TRANSLATE(col) ( owncolmap ? col : translate_colour(colmap[col]) ) -#define SET_FOREGROUND(col) XSetForeground(display, gc, TRANSLATE(col)); -#define SET_BACKGROUND(col) XSetBackground(display, gc, TRANSLATE(col)); +#define SET_FOREGROUND(col) XSetForeground(display, gc, translate_colour(colmap[col])); +#define SET_BACKGROUND(col) XSetBackground(display, gc, translate_colour(colmap[col])); static int rop2_map[] = { GXclear, /* 0 */ @@ -185,75 +182,48 @@ return colour; } -static unsigned long -init_inputmethod(void) +BOOL +get_key_state(int keysym) { - unsigned long filtered_events = 0; + int keysymMask = 0, modifierpos, key; + Window wDummy1, wDummy2; + int iDummy3, iDummy4, iDummy5, iDummy6; + unsigned int current_state; + int offset; - IM = XOpenIM(display, NULL, NULL, NULL); - if (IM == NULL) - { - error("Failed to open input method\n"); - } + XModifierKeymap *map = XGetModifierMapping(display); + KeyCode keycode = XKeysymToKeycode(display, keysym); - if (IM != NULL) + if (keycode == NoSymbol) + return False; + + for (modifierpos = 0; modifierpos < 8; modifierpos++) { - /* Must be done after XCreateWindow */ - IC = XCreateIC(IM, XNInputStyle, - (XIMPreeditNothing | XIMStatusNothing), - XNClientWindow, wnd, XNFocusWindow, wnd, NULL); + offset = map->max_keypermod * modifierpos; - if (IC == NULL) + for (key = 0; key < map->max_keypermod; key++) { - error("Failed to create input context\n"); - XCloseIM(IM); - IM = NULL; + if (map->modifiermap[offset + key] == keycode) + keysymMask = 1 << modifierpos; } } - /* For correct Multi_key/Compose processing, I guess. - It seems to work alright anyway, though. */ - if (IC != NULL) - { - if (XGetICValues(IC, XNFilterEvents, &filtered_events, NULL) - != NULL) - { - error("Failed to obtain XNFilterEvents value from IC\n"); - filtered_events = 0; - } - } - return filtered_events; -} + XQueryPointer(display, DefaultRootWindow(display), &wDummy1, + &wDummy2, &iDummy3, &iDummy4, &iDummy5, &iDummy6, ¤t_state); -static void -close_inputmethod(void) -{ - if (IC != NULL) - { - XDestroyIC(IC); - if (IM != NULL) - { - XCloseIM(IM); - IM = NULL; - } - } -} + XFreeModifiermap(map); + return (current_state & keysymMask) ? True : False; +} BOOL -ui_create_window(char *title) +ui_init(void) { - XSetWindowAttributes attribs; - XClassHint *classhints; - XSizeHints *sizehints; - unsigned long input_mask; XPixmapFormatValues *pfm; - Screen *screen; uint16 test; int i; display = XOpenDisplay(NULL); - if (display == NULL) { error("Failed to open display\n"); @@ -272,8 +242,7 @@ desirable, e.g. 24 bits->32 bits. */ while (i--) { - if ((pfm[i].depth == depth) - && (pfm[i].bits_per_pixel > bpp)) + if ((pfm[i].depth == depth) && (pfm[i].bits_per_pixel > bpp)) { bpp = pfm[i].bits_per_pixel; } @@ -288,40 +257,75 @@ return False; } - if (depth <= 8) - owncolmap = True; - else - xcolmap = DefaultColormapOfScreen(screen); + xcolmap = DefaultColormapOfScreen(screen); + gc = XCreateGC(display, RootWindowOfScreen(screen), 0, NULL); + + if (DoesBackingStore(screen) != Always) + ownbackstore = True; test = 1; host_be = !(BOOL) (*(uint8 *) (&test)); xserver_be = (ImageByteOrder(display) == MSBFirst); - white = WhitePixelOfScreen(screen); - attribs.background_pixel = BlackPixelOfScreen(screen); - attribs.backing_store = DoesBackingStore(screen); - - if (attribs.backing_store == NotUseful) - ownbackstore = True; - if (fullscreen) { - attribs.override_redirect = True; width = WidthOfScreen(screen); height = HeightOfScreen(screen); } - else + + /* make sure width is a multiple of 4 */ + width = (width + 3) & ~3; + + if (ownbackstore) { - attribs.override_redirect = False; + backstore = XCreatePixmap(display, RootWindowOfScreen(screen), width, height, depth); + + /* clear to prevent rubbish being exposed at startup */ + XSetForeground(display, gc, BlackPixelOfScreen(screen)); + XFillRectangle(display, backstore, gc, 0, 0, width, height); } - width = (width + 3) & ~3; /* make width a multiple of 32 bits */ + if (enable_compose) + IM = XOpenIM(display, NULL, NULL, NULL); + + xkeymap_init(); + return True; +} + +void +ui_deinit(void) +{ + if (IM != NULL) + XCloseIM(IM); + + if (ownbackstore) + XFreePixmap(display, backstore); + + XFreeGC(display, gc); + XCloseDisplay(display); + display = NULL; +} + +BOOL +ui_create_window(void) +{ + XSetWindowAttributes attribs; + XClassHint *classhints; + XSizeHints *sizehints; + int wndwidth, wndheight; + long input_mask, ic_input_mask; + XEvent xevent; + + wndwidth = fullscreen ? WidthOfScreen(screen) : width; + wndheight = fullscreen ? HeightOfScreen(screen) : height; - wnd = XCreateWindow(display, RootWindowOfScreen(screen), - 0, 0, width, height, 0, CopyFromParent, - InputOutput, CopyFromParent, - CWBackingStore | CWBackPixel | CWOverrideRedirect, - &attribs); + attribs.background_pixel = BlackPixelOfScreen(screen); + attribs.backing_store = ownbackstore ? NotUseful : Always; + attribs.override_redirect = fullscreen; + + wnd = XCreateWindow(display, RootWindowOfScreen(screen), 0, 0, wndwidth, wndheight, + 0, CopyFromParent, InputOutput, CopyFromParent, + CWBackPixel | CWBackingStore | CWOverrideRedirect, &attribs); XStoreName(display, wnd, title); @@ -343,52 +347,76 @@ XFree(sizehints); } - xkeymap_init2(); + input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | + StructureNotifyMask | FocusChangeMask; - input_mask = - KeyPressMask | KeyReleaseMask | ButtonPressMask | - ButtonReleaseMask | EnterWindowMask | LeaveWindowMask; if (sendmotion) input_mask |= PointerMotionMask; - if (ownbackstore) input_mask |= ExposureMask; - if (enable_compose) - input_mask |= init_inputmethod(); + if (IM != NULL) + { + IC = XCreateIC(IM, XNInputStyle, (XIMPreeditNothing | XIMStatusNothing), + XNClientWindow, wnd, XNFocusWindow, wnd, NULL); - XSelectInput(display, wnd, input_mask); + if ((IC != NULL) && (XGetICValues(IC, XNFilterEvents, &ic_input_mask, NULL) == NULL)) + input_mask |= ic_input_mask; + } - gc = XCreateGC(display, wnd, 0, NULL); + XSelectInput(display, wnd, input_mask); + XMapWindow(display, wnd); - if (ownbackstore) - backstore = XCreatePixmap(display, wnd, width, height, depth); + /* wait for MapNotify */ + do { + XMaskEvent(display, StructureNotifyMask, &xevent); + } while (xevent.type != MapNotify); - XMapWindow(display, wnd); + if (fullscreen) + XSetInputFocus(display, wnd, RevertToPointerRoot, CurrentTime); return True; } void -ui_destroy_window() +ui_destroy_window(void) { - if (ownbackstore) - XFreePixmap(display, backstore); + if (IC != NULL) + XDestroyIC(IC); - XFreeGC(display, gc); + XDestroyWindow(display, wnd); +} - close_inputmethod(); +void +xwin_toggle_fullscreen(void) +{ + Pixmap contents = 0; - XDestroyWindow(display, wnd); - XCloseDisplay(display); - display = NULL; + if (!ownbackstore) + { + /* need to save contents of window */ + contents = XCreatePixmap(display, wnd, width, height, depth); + XCopyArea(display, wnd, contents, gc, 0, 0, width, height, 0, 0); + } + + ui_destroy_window(); + fullscreen = !fullscreen; + ui_create_window(); + + XDefineCursor(display, wnd, current_cursor); + + if (!ownbackstore) + { + XCopyArea(display, contents, wnd, gc, 0, 0, width, height, 0, 0); + XFreePixmap(display, contents); + } } +/* Process all events in Xlib queue */ static void -xwin_process_events() +xwin_process_events(void) { XEvent xevent; - KeySym keysym; uint16 button, flags; uint32 ev_time; @@ -397,20 +425,13 @@ char str[256]; Status status; - /* Refresh keyboard mapping if it has changed. This is important for - Xvnc, since it allocates keycodes dynamically */ - if (XCheckTypedEvent(display, MappingNotify, &xevent)) + while (XPending(display) > 0) { - if (xevent.xmapping.request == MappingKeyboard - || xevent.xmapping.request == MappingModifier) - XRefreshKeyboardMapping(&xevent.xmapping); - } + XNextEvent(display, &xevent); - while (XCheckMaskEvent(display, ~0, &xevent)) - { - if (enable_compose && (XFilterEvent(&xevent, None) == True)) + if ((IC != NULL) && (XFilterEvent(&xevent, None) == True)) { - DEBUG_KBD("Filtering event\n"); + DEBUG_KBD(("Filtering event\n")); continue; } @@ -425,73 +446,56 @@ { XmbLookupString(IC, (XKeyPressedEvent *) & - xevent, str, - sizeof(str), &keysym, - &status); - if (! - ((status == XLookupKeySym) - || (status == XLookupBoth))) + xevent, str, sizeof(str), &keysym, &status); + if (!((status == XLookupKeySym) || (status == XLookupBoth))) { - error("XmbLookupString failed with status 0x%x\n", status); + error("XmbLookupString failed with status 0x%x\n", + status); break; } } else { /* Plain old XLookupString */ - DEBUG_KBD - ("No input context, using XLookupString\n"); + DEBUG_KBD(("\nNo input context, using XLookupString\n")); XLookupString((XKeyEvent *) & xevent, - str, sizeof(str), - &keysym, NULL); + str, sizeof(str), &keysym, NULL); } ksname = get_ksname(keysym); - DEBUG_KBD - ("\nKeyPress for (keysym 0x%lx, %s)\n", - keysym, ksname); + DEBUG_KBD(("KeyPress for (keysym 0x%lx, %s)\n", keysym, ksname)); - if (inhibit_key(keysym)) - { - DEBUG_KBD("Inhibiting key\n"); + if (handle_special_keys(keysym, ev_time, True)) break; - } tr = xkeymap_translate_key(keysym, - xevent.xkey. - keycode, - xevent.xkey.state); - - ensure_remote_modifiers(ev_time, tr); + xevent.xkey.keycode, xevent.xkey.state); if (tr.scancode == 0) break; - rdp_send_scancode(ev_time, RDP_KEYPRESS, - tr.scancode); + ensure_remote_modifiers(ev_time, tr); + + rdp_send_scancode(ev_time, RDP_KEYPRESS, tr.scancode); break; case KeyRelease: XLookupString((XKeyEvent *) & xevent, str, sizeof(str), &keysym, NULL); ksname = get_ksname(keysym); - DEBUG_KBD - ("\nKeyRelease for (keysym 0x%lx, %s)\n", - keysym, ksname); + DEBUG_KBD(("\nKeyRelease for (keysym 0x%lx, %s)\n", keysym, + ksname)); - if (inhibit_key(keysym)) + if (handle_special_keys(keysym, ev_time, False)) break; tr = xkeymap_translate_key(keysym, - xevent.xkey. - keycode, - xevent.xkey.state); + xevent.xkey.keycode, xevent.xkey.state); if (tr.scancode == 0) break; - rdp_send_scancode(ev_time, RDP_KEYRELEASE, - tr.scancode); + rdp_send_scancode(ev_time, RDP_KEYRELEASE, tr.scancode); break; case ButtonPress: @@ -499,33 +503,29 @@ /* fall through */ case ButtonRelease: - button = xkeymap_translate_button(xevent. - xbutton. - button); + button = xkeymap_translate_button(xevent.xbutton.button); if (button == 0) break; rdp_send_input(ev_time, RDP_INPUT_MOUSE, - flags | button, - xevent.xbutton.x, - xevent.xbutton.y); + flags | button, xevent.xbutton.x, xevent.xbutton.y); break; case MotionNotify: rdp_send_input(ev_time, RDP_INPUT_MOUSE, - MOUSE_FLAG_MOVE, - xevent.xmotion.x, - xevent.xmotion.y); + MOUSE_FLAG_MOVE, xevent.xmotion.x, xevent.xmotion.y); break; - case EnterNotify: - XGrabKeyboard(display, wnd, True, - GrabModeAsync, GrabModeAsync, - CurrentTime); + case FocusIn: + reset_modifier_keys(); + if (grab_keyboard) + XGrabKeyboard(display, wnd, True, + GrabModeAsync, GrabModeAsync, CurrentTime); break; - case LeaveNotify: - XUngrabKeyboard(display, CurrentTime); + case FocusOut: + if (grab_keyboard) + XUngrabKeyboard(display, CurrentTime); break; case Expose: @@ -535,6 +535,15 @@ xevent.xexpose.height, xevent.xexpose.x, xevent.xexpose.y); break; + + case MappingNotify: + /* Refresh keyboard mapping if it has changed. This is important for + Xvnc, since it allocates keycodes dynamically */ + if (xevent.xmapping.request == MappingKeyboard + || xevent.xmapping.request == MappingModifier) + XRefreshKeyboardMapping(&xevent.xmapping); + break; + } } } @@ -549,13 +558,12 @@ while (True) { + /* Process any events already waiting */ + xwin_process_events(); + FD_ZERO(&rfds); FD_SET(rdp_socket, &rfds); - if (display != NULL) - { - FD_SET(x_socket, &rfds); - XFlush(display); - } + FD_SET(x_socket, &rfds); switch (select(n, &rfds, NULL, NULL, NULL)) { @@ -566,9 +574,6 @@ continue; } - if (FD_ISSET(x_socket, &rfds)) - xwin_process_events(); - if (FD_ISSET(rdp_socket, &rfds)) return; } @@ -587,29 +592,27 @@ Pixmap bitmap; uint8 *tdata; - tdata = (owncolmap ? data : translate_image(width, height, data)); + tdata = translate_image(width, height, data); bitmap = XCreatePixmap(display, wnd, width, height, depth); - image = XCreateImage(display, visual, depth, ZPixmap, 0, tdata, width, - height, 8, 0); + image = XCreateImage(display, visual, depth, ZPixmap, 0, + (char *) tdata, width, height, 8, 0); XPutImage(display, bitmap, gc, image, 0, 0, 0, 0, width, height); XFree(image); - if (!owncolmap) - xfree(tdata); + xfree(tdata); return (HBITMAP) bitmap; } void -ui_paint_bitmap(int x, int y, int cx, int cy, int width, int height, - uint8 * data) +ui_paint_bitmap(int x, int y, int cx, int cy, int width, int height, uint8 * data) { XImage *image; uint8 *tdata; - tdata = (owncolmap ? data : translate_image(width, height, data)); - image = XCreateImage(display, visual, depth, ZPixmap, 0, tdata, width, - height, 8, 0); + tdata = translate_image(width, height, data); + image = XCreateImage(display, visual, depth, ZPixmap, 0, + (char *) tdata, width, height, 8, 0); if (ownbackstore) { @@ -622,8 +625,7 @@ } XFree(image); - if (!owncolmap) - xfree(tdata); + xfree(tdata); } void @@ -645,8 +647,8 @@ bitmap = XCreatePixmap(display, wnd, width, height, 1); gc = XCreateGC(display, bitmap, 0, NULL); - image = XCreateImage(display, visual, 1, ZPixmap, 0, data, width, - height, 8, scanline); + image = XCreateImage(display, visual, 1, ZPixmap, 0, (char *) data, + width, height, 8, scanline); image->byte_order = MSBFirst; image->bitmap_bit_order = MSBFirst; XInitImage(image); @@ -738,7 +740,8 @@ void ui_set_cursor(HCURSOR cursor) { - XDefineCursor(display, wnd, (Cursor) cursor); + current_cursor = (Cursor) cursor; + XDefineCursor(display, wnd, current_cursor); } void @@ -758,67 +761,77 @@ { COLOURENTRY *entry; int i, ncolours = colours->ncolours; - - if (owncolmap) + uint32 *map = xmalloc(sizeof(*colmap) * ncolours); + XColor xentry; + XColor xc_cache[256]; + uint32 colour; + int colLookup = 256; + for (i = 0; i < ncolours; i++) { - XColor *xcolours, *xentry; - Colormap map; + entry = &colours->colours[i]; + MAKE_XCOLOR(&xentry, entry); - xcolours = xmalloc(sizeof(XColor) * ncolours); - for (i = 0; i < ncolours; i++) + if (XAllocColor(display, xcolmap, &xentry) == 0) { - entry = &colours->colours[i]; - xentry = &xcolours[i]; - xentry->pixel = i; - MAKE_XCOLOR(xentry, entry); - } - - map = XCreateColormap(display, wnd, visual, AllocAll); - XStoreColors(display, map, xcolours, ncolours); - - xfree(xcolours); - return (HCOLOURMAP) map; - } - else - { - uint32 *map = xmalloc(sizeof(*colmap) * ncolours); - XColor xentry; - uint32 colour; + /* Allocation failed, find closest match. */ + int j = 256; + int nMinDist = 3 * 256 * 256; + long nDist = nMinDist; + + /* only get the colors once */ + while( colLookup-- ){ + xc_cache[colLookup].pixel = colLookup; + xc_cache[colLookup].red = xc_cache[colLookup].green = xc_cache[colLookup].blue = 0; + xc_cache[colLookup].flags = 0; + XQueryColor(display, DefaultColormap(display, DefaultScreen(display)), &xc_cache[colLookup]); + } + colLookup = 0; - for (i = 0; i < ncolours; i++) - { - entry = &colours->colours[i]; - MAKE_XCOLOR(&xentry, entry); + /* approximate the pixel */ + while( j-- ){ + if( xc_cache[j].flags ){ + nDist = + ((long) (xc_cache[j].red >> 8) - (long) (xentry.red >> 8)) * + ((long) (xc_cache[j].red >> 8) - (long) (xentry.red >> 8)) + + ((long) (xc_cache[j].green >> 8) - (long) (xentry.green >> 8)) * + ((long) (xc_cache[j].green >> 8) - (long) (xentry.green >> 8)) + + ((long) (xc_cache[j].blue >> 8) - (long) (xentry.blue >> 8)) * + ((long) (xc_cache[j].blue >> 8) - (long) (xentry.blue >> 8)); + } + if( nDist < nMinDist ){ + nMinDist = nDist; + xentry.pixel = j; + } + } + } + colour = xentry.pixel; - if (XAllocColor(display, xcolmap, &xentry) != 0) - colour = xentry.pixel; - else - colour = white; + /* update our cache */ + if( xentry.pixel < 256 ){ + xc_cache[xentry.pixel].red = xentry.red; + xc_cache[xentry.pixel].green = xentry.green; + xc_cache[xentry.pixel].blue = xentry.blue; - /* byte swap here to make translate_image faster */ - map[i] = translate_colour(colour); } - return map; + + /* byte swap here to make translate_image faster */ + map[i] = translate_colour(colour); } + + return map; } void ui_destroy_colourmap(HCOLOURMAP map) { - if (owncolmap) - XFreeColormap(display, (Colormap) map); - else - xfree(map); + xfree(map); } void ui_set_colourmap(HCOLOURMAP map) { - if (owncolmap) - XSetWindowColormap(display, wnd, (Colormap) map); - else - colmap = map; + colmap = map; } void @@ -834,7 +847,7 @@ } void -ui_reset_clip() +ui_reset_clip(void) { XRectangle rect; @@ -846,7 +859,7 @@ } void -ui_bell() +ui_bell(void) { XBell(display, 0); } @@ -886,12 +899,12 @@ SET_BACKGROUND(fgcolour); XSetFillStyle(display, gc, FillOpaqueStippled); XSetStipple(display, gc, fill); - XSetTSOrigin(display, gc, brush->xorigin, - brush->yorigin); + XSetTSOrigin(display, gc, brush->xorigin, brush->yorigin); FILL_RECTANGLE(x, y, cx, cy); XSetFillStyle(display, gc, FillSolid); + XSetTSOrigin(display, gc, 0, 0); ui_destroy_glyph((HGLYPH) fill); break; @@ -910,8 +923,7 @@ SET_FUNCTION(opcode); XCopyArea(display, wnd, wnd, gc, srcx, srcy, cx, cy, x, y); if (ownbackstore) - XCopyArea(display, backstore, backstore, gc, srcx, srcy, cx, - cy, x, y); + XCopyArea(display, backstore, backstore, gc, srcx, srcy, cx, cy, x, y); RESET_FUNCTION(opcode); } @@ -923,8 +935,7 @@ SET_FUNCTION(opcode); XCopyArea(display, (Pixmap) src, wnd, gc, srcx, srcy, cx, cy, x, y); if (ownbackstore) - XCopyArea(display, (Pixmap) src, backstore, gc, srcx, srcy, - cx, cy, x, y); + XCopyArea(display, (Pixmap) src, backstore, gc, srcx, srcy, cx, cy, x, y); RESET_FUNCTION(opcode); } @@ -941,22 +952,18 @@ { case 0x69: /* PDSxxn */ ui_memblt(ROP2_XOR, x, y, cx, cy, src, srcx, srcy); - ui_patblt(ROP2_NXOR, x, y, cx, cy, brush, bgcolour, - fgcolour); + ui_patblt(ROP2_NXOR, x, y, cx, cy, brush, bgcolour, fgcolour); break; case 0xb8: /* PSDPxax */ - ui_patblt(ROP2_XOR, x, y, cx, cy, brush, bgcolour, - fgcolour); + ui_patblt(ROP2_XOR, x, y, cx, cy, brush, bgcolour, fgcolour); ui_memblt(ROP2_AND, x, y, cx, cy, src, srcx, srcy); - ui_patblt(ROP2_XOR, x, y, cx, cy, brush, bgcolour, - fgcolour); + ui_patblt(ROP2_XOR, x, y, cx, cy, brush, bgcolour, fgcolour); break; case 0xc0: /* PSa */ ui_memblt(ROP2_COPY, x, y, cx, cy, src, srcx, srcy); - ui_patblt(ROP2_AND, x, y, cx, cy, brush, bgcolour, - fgcolour); + ui_patblt(ROP2_AND, x, y, cx, cy, brush, bgcolour, fgcolour); break; default: @@ -997,8 +1004,7 @@ SET_BACKGROUND(bgcolour); XSetFillStyle(display, gc, - (mixmode == - MIX_TRANSPARENT) ? FillStippled : FillOpaqueStippled); + (mixmode == MIX_TRANSPARENT) ? FillStippled : FillOpaqueStippled); XSetStipple(display, gc, (Pixmap) glyph); XSetTSOrigin(display, gc, x, y); @@ -1016,9 +1022,10 @@ if ((xyoffset & 0x80))\ {\ if (flags & TEXT2_VERTICAL) \ - y += ttext[++idx] | (ttext[++idx] << 8);\ + y += ttext[idx+1] | (ttext[idx+2] << 8);\ else\ - x += ttext[++idx] | (ttext[++idx] << 8);\ + x += ttext[idx+1] | (ttext[idx+2] << 8);\ + idx += 2;\ }\ else\ {\ @@ -1067,8 +1074,7 @@ { case 0xff: if (i + 2 < length) - cache_put_text(text[i + 1], text, - text[i + 2]); + cache_put_text(text[i + 1], text, text[i + 2]); else { error("this shouldn't be happening\n"); @@ -1085,8 +1091,7 @@ if (entry != NULL) { if ((((uint8 *) (entry->data))[1] == - 0) - && (!(flags & TEXT2_IMPLICIT_X))) + 0) && (!(flags & TEXT2_IMPLICIT_X))) { if (flags & TEXT2_VERTICAL) y += text[i + 2]; @@ -1102,9 +1107,7 @@ text = &(text[i]); i = 0; for (j = 0; j < entry->size; j++) - DO_GLYPH(((uint8 *) (entry-> - data)), - j); + DO_GLYPH(((uint8 *) (entry->data)), j); } break; @@ -1126,21 +1129,18 @@ if (ownbackstore) { - image = XGetImage(display, backstore, x, y, cx, cy, AllPlanes, - ZPixmap); + image = XGetImage(display, backstore, x, y, cx, cy, AllPlanes, ZPixmap); } else { pix = XCreatePixmap(display, wnd, cx, cy, depth); XCopyArea(display, wnd, pix, gc, x, y, cx, cy, 0, 0); - image = XGetImage(display, pix, 0, 0, cx, cy, AllPlanes, - ZPixmap); + image = XGetImage(display, pix, 0, 0, cx, cy, AllPlanes, ZPixmap); XFreePixmap(display, pix); } offset *= bpp / 8; - cache_put_desktop(offset, cx, cy, image->bytes_per_line, bpp / 8, - (uint8 *) image->data); + cache_put_desktop(offset, cx, cy, image->bytes_per_line, bpp / 8, (uint8 *) image->data); XDestroyImage(image); } @@ -1156,8 +1156,8 @@ if (data == NULL) return; - image = XCreateImage(display, visual, depth, ZPixmap, 0, data, cx, cy, - BitmapPad(display), cx * bpp / 8); + image = XCreateImage(display, visual, depth, ZPixmap, 0, + (char *) data, cx, cy, BitmapPad(display), cx * bpp / 8); if (ownbackstore) {