--- sourceforge.net/trunk/rdesktop/xwin.c 2001/09/14 03:38:39 29 +++ sourceforge.net/trunk/rdesktop/xwin.c 2002/04/26 08:22:39 52 @@ -1,18 +1,18 @@ /* rdesktop: A Remote Desktop Protocol client. - User interface services - X-Windows - Copyright (C) Matthew Chapman 1999-2000 - + User interface services - X Window System + Copyright (C) Matthew Chapman 1999-2001 + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -20,28 +20,60 @@ #include #include +#include #include +#include #include "rdesktop.h" +extern char keymapname[16]; +extern int keylayout; extern int width; extern int height; extern BOOL sendmotion; extern BOOL fullscreen; -static Display *display; +Display *display; +XkbDescPtr xkb; +static int x_socket; static Window wnd; static GC gc; static Visual *visual; static int depth; static int bpp; -static BOOL backpixmap; +/* endianness */ +static BOOL host_be; +static BOOL xserver_be; + +/* software backing store */ +static BOOL ownbackstore; +static Pixmap backstore; + +/* needed to keep track of the modifiers */ +static unsigned int key_modifier_state = 0; +static unsigned int key_down_state = 0; + +#define DShift1Mask (1<<0) +#define DShift2Mask (1<<1) +#define DControl1Mask (1<<2) +#define DControl2Mask (1<<3) +#define DMod1Mask (1<<4) +#define DMod2Mask (1<<5) + +#define FILL_RECTANGLE(x,y,cx,cy)\ +{ \ + XFillRectangle(display, wnd, gc, x, y, cx, cy); \ + if (ownbackstore) \ + XFillRectangle(display, backstore, gc, x, y, cx, cy); \ +} + +/* colour maps */ static BOOL owncolmap; static Colormap xcolmap; static uint32 white; static uint32 *colmap; -#define TRANSLATE(col) ( owncolmap ? col : colmap[col] ) +#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)); @@ -67,6 +99,9 @@ #define SET_FUNCTION(rop2) { if (rop2 != ROP2_COPY) XSetFunction(display, gc, rop2_map[rop2]); } #define RESET_FUNCTION(rop2) { if (rop2 != ROP2_COPY) XSetFunction(display, gc, GXcopy); } +void xwin_release_modifiers(XKeyEvent* ev, uint32 ev_time, uint32 scancode); +void xwin_press_modifiers(XKeyEvent* ev, uint32 ev_time, uint32 scancode); + static void translate8(uint8 *data, uint8 *out, uint8 *end) { @@ -81,7 +116,7 @@ *(out++) = (uint16)colmap[*(data++)]; } -/* XXX endianness */ +/* little endian - conversion happens when colourmap is built */ static void translate24(uint8 *data, uint8 *out, uint8 *end) { @@ -104,7 +139,7 @@ } static uint8 * -translate(int width, int height, uint8 *data) +translate_image(int width, int height, uint8 *data) { int size = width * height * bpp/8; uint8 *out = xmalloc(size); @@ -132,9 +167,34 @@ return out; } -#define L_ENDIAN -int screen_msbfirst = 0; +#define BSWAP16(x) { x = (((x & 0xff) << 8) | (x >> 8)); } +#define BSWAP24(x) { x = (((x & 0xff) << 16) | (x >> 16) | ((x >> 8) & 0xff00)); } +#define BSWAP32(x) { x = (((x & 0xff00ff) << 8) | ((x >> 8) & 0xff00ff)); \ + x = (x << 16) | (x >> 16); } + +static uint32 +translate_colour(uint32 colour) +{ + switch (bpp) + { + case 16: + if (host_be != xserver_be) + BSWAP16(colour); + break; + + case 24: + if (xserver_be) + BSWAP24(colour); + break; + case 32: + if (host_be != xserver_be) + BSWAP32(colour); + break; + } + + return colour; +} BOOL ui_create_window(char *title) @@ -145,20 +205,57 @@ unsigned long input_mask; XPixmapFormatValues *pfm; Screen *screen; + uint16 test; int i; + + int xkb_minor, xkb_major; + int xkb_event, xkb_error, xkb_reason; + /* compare compiletime libs with runtime libs. */ + xkb_major = XkbMajorVersion; + xkb_minor = XkbMinorVersion; + if( XkbLibraryVersion( &xkb_major, &xkb_minor ) == False ) + { + error("please re-compile rdesktop\ncompile time version of xkb is not compatible with\nyour runtime version of the library\n"); + return False; + } + + + /* XKB is the 'new' keyboard handler in x.. ( the xkb code in Xfree86 originates from SGI, years 1993 and 1995 from what I could tell. ) + * it makes it possible for people with disabilities to use rdesktop, stickykeys, bouncekeys etc. VERY MUCH useful. + * XFree86 has had support for it since it's earliest incarnation. I believe it is a reasonable dependency. + */ + display = XkbOpenDisplay( NULL, &xkb_event, &xkb_error, &xkb_major, &xkb_minor, &xkb_reason ); + switch(xkb_reason) + { + case XkbOD_BadLibraryVersion: + error("XkbOD_BadLibraryVersion: XKB extensions in server and the library rdesktop is linked against aren't compatible with each other.\n"); + break; + case XkbOD_ConnectionRefused: + error("XkbOD_ConnectionRefused\n"); + break; + case XkbOD_BadServerVersion: + error("XkbOD_BadServerVersion\n"); + break; + case XkbOD_NonXkbServer: + error("XkbOD_NonXkbServer: XKB extension not present in server\nupdate your X server.\n"); + break; + case XkbOD_Success: + DEBUG("XkbOD_Success: Connection established with display\n"); + break; + } - display = XOpenDisplay(NULL); if (display == NULL) { - ERROR("Failed to open display\n"); + error("Failed to open display\n"); return False; } + x_socket = ConnectionNumber(display); screen = DefaultScreenOfDisplay(display); visual = DefaultVisualOfScreen(screen); depth = DefaultDepthOfScreen(screen); - + pfm = XListPixmapFormats(display, &i); if (pfm != NULL) { @@ -177,7 +274,7 @@ if (bpp < 8) { - ERROR("Less than 8 bpp not currently supported.\n"); + error("Less than 8 bpp not currently supported.\n"); XCloseDisplay(display); return False; } @@ -187,12 +284,16 @@ else xcolmap = DefaultColormapOfScreen(screen); + 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) - backpixmap = True; + ownbackstore = True; if (fullscreen) { @@ -205,7 +306,7 @@ attribs.override_redirect = False; } - width &= ~3; /* make width a multiple of 32 bits */ + width = (width + 3) & ~3; /* make width a multiple of 32 bits */ wnd = XCreateWindow(display, RootWindowOfScreen(screen), 0, 0, width, height, 0, CopyFromParent, @@ -233,161 +334,131 @@ XFree(sizehints); } - input_mask = KeyPressMask | KeyReleaseMask - | ButtonPressMask | ButtonReleaseMask - | EnterWindowMask | LeaveWindowMask; + xkeymap_init(); + input_mask = KeyPressMask | KeyReleaseMask | + ButtonPressMask | ButtonReleaseMask | + EnterWindowMask | LeaveWindowMask | KeymapStateMask; if (sendmotion) input_mask |= PointerMotionMask; + if (ownbackstore) + input_mask |= ExposureMask; + XSelectInput(display, wnd, input_mask); gc = XCreateGC(display, wnd, 0, NULL); + if (ownbackstore) + backstore = XCreatePixmap(display, wnd, width, height, depth); + XMapWindow(display, wnd); + + /* TODO: error texts... make them friendly. */ + xkb = XkbGetKeyboard(display, XkbAllComponentsMask, XkbUseCoreKbd); + if ((int)xkb == BadAlloc || xkb == NULL) + { + error( "XkbGetKeyboard failed.\n"); + exit(0); + } + + /* TODO: error texts... make them friendly. */ + if( XkbSelectEvents(display, xkb->device_spec, XkbAllEventsMask, XkbAllEventsMask) == False ) + { + error( "XkbSelectEvents failed.\n"); + exit(0); + } + return True; } void ui_destroy_window() { + if( xkb != NULL ) + XkbFreeKeyboard(xkb, XkbAllControlsMask, True); + + if (ownbackstore) + XFreePixmap(display, backstore); + XFreeGC(display, gc); XDestroyWindow(display, wnd); XCloseDisplay(display); display = NULL; } -static uint8 -xwin_translate_key(unsigned long key) -{ - DEBUG("KEY(code=0x%lx)\n", key); - - if ((key > 8) && (key <= 0x60)) - return (key - 8); - - switch (key) - { - case 0x61: /* home */ - return 0x47 | 0x80; - case 0x62: /* up arrow */ - return 0x48 | 0x80; - case 0x63: /* page up */ - return 0x49 | 0x80; - case 0x64: /* left arrow */ - return 0x4b | 0x80; - case 0x66: /* right arrow */ - return 0x4d | 0x80; - case 0x67: /* end */ - return 0x4f | 0x80; - case 0x68: /* down arrow */ - return 0x50 | 0x80; - case 0x69: /* page down */ - return 0x51 | 0x80; - case 0x6a: /* insert */ - return 0x52 | 0x80; - case 0x6b: /* delete */ - return 0x53 | 0x80; - case 0x6c: /* keypad enter */ - return 0x1c | 0x80; - case 0x6d: /* right ctrl */ - return 0x1d | 0x80; - case 0x6f: /* ctrl - print screen */ - return 0x37 | 0x80; - case 0x70: /* keypad '/' */ - return 0x35 | 0x80; - case 0x71: /* right alt */ - return 0x38 | 0x80; - case 0x72: /* ctrl break */ - return 0x46 | 0x80; - case 0x73: /* left window key */ - return 0xff; /* real scancode is 5b */ - case 0x74: /* right window key */ - return 0xff; /* real scancode is 5c */ - case 0x75: /* menu key */ - return 0x5d | 0x80; - } - - return 0; -} - -static uint16 -xwin_translate_mouse(unsigned long button) -{ - switch (button) - { - case Button1: /* left */ - return MOUSE_FLAG_BUTTON1; - case Button2: /* middle */ - return MOUSE_FLAG_BUTTON3; - case Button3: /* right */ - return MOUSE_FLAG_BUTTON2; - } - - return 0; -} - -void -ui_process_events() +static void +xwin_process_events() { - XEvent event; + XkbEvent xkbevent; + + KeySym keysym; uint8 scancode; - uint16 button; + uint16 button, flags; uint32 ev_time; + uint32 tmpmods; if (display == NULL) return; - while (XCheckWindowEvent(display, wnd, ~0, &event)) + while (XCheckMaskEvent(display, ~0, &xkbevent.core)) { ev_time = time(NULL); + flags = 0; - switch (event.type) + switch (xkbevent.type) { - case KeyPress: - scancode = xwin_translate_key(event.xkey.keycode); - if (scancode == 0) - break; - - rdp_send_input(ev_time, RDP_INPUT_SCANCODE, 0, - scancode, 0); + case KeymapNotify: + /* TODO: + * read modifier status at focus in, and update the local masks, and the other end as well.. + * if not, we may get out of sync. + * xkbevent.core.xkeymap.key_vector + * char key_vector[32]; + */ break; case KeyRelease: - scancode = xwin_translate_key(event.xkey.keycode); - if (scancode == 0) - break; + flags = KBD_FLAG_DOWN | KBD_FLAG_UP; + /* fall through */ - rdp_send_input(ev_time, RDP_INPUT_SCANCODE, - KBD_FLAG_DOWN | KBD_FLAG_UP, - scancode, 0); - break; + case KeyPress: + if( XkbTranslateKeyCode(xkb, xkbevent.core.xkey.keycode, xkbevent.core.xkey.state, &tmpmods, &keysym) == False ) + break; + scancode = xkeymap_translate_key(keysym, xkbevent.core.xkey.keycode, &flags); - case ButtonPress: - button = xwin_translate_mouse(event.xbutton.button); - if (button == 0) + if (scancode == 0 ) break; - rdp_send_input(ev_time, RDP_INPUT_MOUSE, - button | MOUSE_FLAG_DOWN, - event.xbutton.x, - event.xbutton.y); + /* keep track of the modifiers -- needed for stickykeys... */ + if( xkbevent.type == KeyPress ) + xwin_press_modifiers( &xkbevent.core.xkey, ev_time, scancode ); + + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, flags, scancode, 0); + + if( xkbevent.type == KeyRelease ) + xwin_release_modifiers( &xkbevent.core.xkey, ev_time, scancode ); + break; + case ButtonPress: + flags = MOUSE_FLAG_DOWN; + /* fall through */ + case ButtonRelease: - button = xwin_translate_mouse(event.xbutton.button); + button = xkeymap_translate_button(xkbevent.core.xbutton.button); if (button == 0) break; rdp_send_input(ev_time, RDP_INPUT_MOUSE, - button, - event.xbutton.x, - event.xbutton.y); + flags | button, + xkbevent.core.xbutton.x, + xkbevent.core.xbutton.y); break; case MotionNotify: rdp_send_input(ev_time, RDP_INPUT_MOUSE, MOUSE_FLAG_MOVE, - event.xmotion.x, - event.xmotion.y); + xkbevent.core.xmotion.x, + xkbevent.core.xmotion.y); break; case EnterNotify: @@ -398,11 +469,159 @@ case LeaveNotify: XUngrabKeyboard(display, CurrentTime); break; + + case Expose: + XCopyArea(display, backstore, wnd, gc, + xkbevent.core.xexpose.x, xkbevent.core.xexpose.y, + xkbevent.core.xexpose.width, xkbevent.core.xexpose.height, + xkbevent.core.xexpose.x, xkbevent.core.xexpose.y); + break; } } } void +xwin_release_modifiers(XKeyEvent* ev, uint32 ev_time, uint32 scancode) +{ + switch (scancode) { + case 0x2a: + key_down_state &= ~DShift1Mask; + break; + case 0x36: + key_down_state &= ~DShift2Mask; + break; + case 0x1d: + key_down_state &= ~DControl1Mask; + break; + case 0x9d: + key_down_state &= ~DControl2Mask; + break; + case 0x38: + key_down_state &= ~DMod1Mask; + break; + case 0xb8: + key_down_state &= ~DMod2Mask; + break; + } + + if( !(ShiftMask & ev->state) && (key_down_state & DShift1Mask)) + { + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_UP, 0x2a, 0); + key_down_state &= ~DShift1Mask; + + } + + if( !(ControlMask & ev->state) && (key_down_state & DControl1Mask)) + { + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_UP, 0x1d, 0); + key_down_state &= ~DControl1Mask; + + } + + if( !(Mod1Mask & ev->state) && (key_down_state & DMod1Mask)) + { + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_UP, 0x38, 0); + key_down_state &= ~DMod1Mask; + + } + + if( !(Mod2Mask & ev->state) && (key_down_state & DMod2Mask)) + { + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_UP, 0xb8, 0); + key_down_state &= ~DMod2Mask; + } +} + + +void +xwin_press_modifiers(XKeyEvent* ev, uint32 ev_time, uint32 scancode) +{ + key_modifier_state = ev->state; + + switch (scancode) { + case 0x2a: + key_down_state |= DShift1Mask; + break; + case 0x36: + key_down_state |= DShift2Mask; + break; + case 0x1d: + key_down_state |= DControl1Mask; + break; + case 0x9d: + key_down_state |= DControl2Mask; + break; + case 0x38: + key_down_state |= DMod1Mask; + break; + case 0xb8: + key_down_state |= DMod2Mask; + break; + } + + if( (ShiftMask & ev->state) && !((key_down_state & DShift1Mask) || (key_down_state & DShift2Mask))) + { + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_DOWN, 0x2a, 0); + key_down_state |= DShift1Mask; + + } + + if( (ControlMask & ev->state) && !((key_down_state & DControl1Mask) || (key_down_state & DControl2Mask))) + { + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_DOWN, 0x1d, 0); + key_down_state |= DControl1Mask; + + } + + if( (Mod1Mask & ev->state) && !(key_down_state & DMod1Mask)) + { + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_DOWN, 0x38, 0); + key_down_state |= DMod1Mask; + + } + + if( (Mod2Mask & ev->state) && !(key_down_state & DMod2Mask)) + { + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_DOWN, 0xb8, 0); + key_down_state |= DMod2Mask; + + } +} + +void +ui_select(int rdp_socket) +{ + int n = (rdp_socket > x_socket) ? rdp_socket+1 : x_socket+1; + fd_set rfds; + + XFlush(display); + + FD_ZERO(&rfds); + + while (True) + { + FD_ZERO(&rfds); + FD_SET(rdp_socket, &rfds); + FD_SET(x_socket, &rfds); + + switch (select(n, &rfds, NULL, NULL, NULL)) + { + case -1: + error("select: %s\n", strerror(errno)); + + case 0: + continue; + } + + if (FD_ISSET(x_socket, &rfds)) + xwin_process_events(); + + if (FD_ISSET(rdp_socket, &rfds)) + return; + } +} + +void ui_move_pointer(int x, int y) { XWarpPointer(display, wnd, wnd, 0, 0, 0, 0, x, y); @@ -415,7 +634,7 @@ Pixmap bitmap; uint8 *tdata; - tdata = (owncolmap ? data : translate(width, height, data)); + tdata = (owncolmap ? data : translate_image(width, height, data)); bitmap = XCreatePixmap(display, wnd, width, height, depth); image = XCreateImage(display, visual, depth, ZPixmap, 0, tdata, width, height, 8, 0); @@ -435,11 +654,19 @@ XImage *image; uint8 *tdata; - tdata = (owncolmap ? data : translate(width, height, data)); + tdata = (owncolmap ? data : translate_image(width, height, data)); image = XCreateImage(display, visual, depth, ZPixmap, 0, tdata, width, height, 8, 0); - XPutImage(display, wnd, gc, image, 0, 0, x, y, cx, cy); + if (ownbackstore) + { + XPutImage(display, backstore, gc, image, 0, 0, x, y, cx, cy); + XCopyArea(display, backstore, wnd, gc, x, y, cx, cy, x, y); + } + else + { + XPutImage(display, wnd, gc, image, 0, 0, x, y, cx, cy); + } XFree(image); if (!owncolmap) @@ -602,6 +829,7 @@ { uint32 *map = xmalloc(sizeof(*colmap) * ncolours); XColor xentry; + uint32 colour; for (i = 0; i < ncolours; i++) { @@ -609,9 +837,12 @@ MAKE_XCOLOR(&xentry, entry); if (XAllocColor(display, xcolmap, &xentry) != 0) - map[i] = xentry.pixel; + colour = xentry.pixel; else - map[i] = white; + colour = white; + + /* byte swap here to make translate_image faster */ + map[i] = translate_colour(colour); } return map; @@ -671,7 +902,7 @@ /* dest */ int x, int y, int cx, int cy) { SET_FUNCTION(opcode); - XFillRectangle(display, wnd, gc, x, y, cx, cy); + FILL_RECTANGLE(x, y, cx, cy); RESET_FUNCTION(opcode); } @@ -688,7 +919,7 @@ { case 0: /* Solid */ SET_FOREGROUND(fgcolour); - XFillRectangle(display, wnd, gc, x, y, cx, cy); + FILL_RECTANGLE(x, y, cx, cy); break; case 3: /* Pattern */ @@ -700,14 +931,14 @@ XSetStipple(display, gc, fill); XSetTSOrigin(display, gc, brush->xorigin, brush->yorigin); - XFillRectangle(display, wnd, gc, x, y, cx, cy); + FILL_RECTANGLE(x, y, cx, cy); XSetFillStyle(display, gc, FillSolid); ui_destroy_glyph((HGLYPH)fill); break; default: - NOTIMP("brush %d\n", brush->style); + unimpl("brush %d\n", brush->style); } RESET_FUNCTION(opcode); @@ -720,6 +951,9 @@ { 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); RESET_FUNCTION(opcode); } @@ -730,6 +964,9 @@ { 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); RESET_FUNCTION(opcode); } @@ -765,7 +1002,7 @@ break; default: - NOTIMP("triblt 0x%x\n", opcode); + unimpl("triblt 0x%x\n", opcode); ui_memblt(ROP2_COPY, x, y, cx, cy, src, srcx, srcy); } } @@ -778,6 +1015,8 @@ SET_FUNCTION(opcode); SET_FOREGROUND(pen->colour); XDrawLine(display, wnd, gc, startx, starty, endx, endy); + if (ownbackstore) + XDrawLine(display, backstore, gc, startx, starty, endx, endy); RESET_FUNCTION(opcode); } @@ -787,7 +1026,7 @@ /* brush */ int colour) { SET_FOREGROUND(colour); - XFillRectangle(display, wnd, gc, x, y, cx, cy); + FILL_RECTANGLE(x, y, cx, cy); } void @@ -804,56 +1043,111 @@ XSetStipple(display, gc, (Pixmap)glyph); XSetTSOrigin(display, gc, x, y); - XFillRectangle(display, wnd, gc, x, y, cx, cy); + FILL_RECTANGLE(x, y, cx, cy); XSetFillStyle(display, gc, FillSolid); } +#define DO_GLYPH(ttext,idx) \ +{\ + glyph = cache_get_font (font, ttext[idx]);\ + if (!(flags & TEXT2_IMPLICIT_X))\ + {\ + xyoffset = ttext[++idx];\ + if ((xyoffset & 0x80))\ + {\ + if (flags & TEXT2_VERTICAL) \ + y += ttext[++idx] | (ttext[++idx] << 8);\ + else\ + x += ttext[++idx] | (ttext[++idx] << 8);\ + }\ + else\ + {\ + if (flags & TEXT2_VERTICAL) \ + y += xyoffset;\ + else\ + x += xyoffset;\ + }\ + }\ + if (glyph != NULL)\ + {\ + ui_draw_glyph (mixmode, x + (short) glyph->offset,\ + y + (short) glyph->baseline,\ + glyph->width, glyph->height,\ + glyph->pixmap, 0, 0, bgcolour, fgcolour);\ + if (flags & TEXT2_IMPLICIT_X)\ + x += glyph->width;\ + }\ +} + void ui_draw_text(uint8 font, uint8 flags, int mixmode, int x, int y, - int clipx, int clipy, int clipcx, int clipcy, - int boxx, int boxy, int boxcx, int boxcy, - int bgcolour, int fgcolour, uint8 *text, uint8 length) + int clipx, int clipy, int clipcx, int clipcy, int boxx, + int boxy, int boxcx, int boxcy, int bgcolour, + int fgcolour, uint8 * text, uint8 length) { FONTGLYPH *glyph; - int i, offset; + int i, j, xyoffset; + DATABLOB *entry; SET_FOREGROUND(bgcolour); if (boxcx > 1) - XFillRectangle(display, wnd, gc, boxx, boxy, boxcx, boxcy); + { + FILL_RECTANGLE(boxx, boxy, boxcx, boxcy); + } else if (mixmode == MIX_OPAQUE) - XFillRectangle(display, wnd, gc, clipx, clipy, clipcx, clipcy); + { + FILL_RECTANGLE(clipx, clipy, clipcx, clipcy); + } /* Paint text, character by character */ - for (i = 0; i < length; i++) - { - glyph = cache_get_font(font, text[i]); + for (i = 0; i < length;) { + switch (text[i]) { + case 0xff: + if (i + 2 < length) + cache_put_text(text[i + 1], text, text[i + 2]); + else { + error("this shouldn't be happening\n"); + break; + } + /* this will move pointer from start to first character after FF command */ + length -= i + 3; + text = &(text[i + 3]); + i = 0; + break; - if (!(flags & TEXT2_IMPLICIT_X)) - { - offset = text[++i]; - if (offset & 0x80) - offset = ((offset & 0x7f) << 8) | text[++i]; + case 0xfe: + entry = cache_get_text(text[i + 1]); + if (entry != NULL) { + if ((((uint8 *) (entry->data))[1] == 0) + && (!(flags & TEXT2_IMPLICIT_X))) { + if (flags & TEXT2_VERTICAL) + y += text[i + 2]; + else + x += text[i + 2]; + } + if (i + 2 < length) + i += 3; + else + i += 2; + length -= i; + /* this will move pointer from start to first character after FE command */ + text = &(text[i]); + i = 0; + for (j = 0; j < entry->size; j++) + DO_GLYPH(((uint8 *) (entry->data)), j); + } + break; - if (flags & TEXT2_VERTICAL) - y += offset; - else - x += offset; + default: + DO_GLYPH(text, i); + i++; + break; } + } - if (glyph != NULL) - { - ui_draw_glyph(mixmode, x + (short) glyph->offset, - y + (short) glyph->baseline, - glyph->width, glyph->height, - glyph->pixmap, 0, 0, - bgcolour, fgcolour); - if (flags & TEXT2_IMPLICIT_X) - x += glyph->width; - } - } } void @@ -862,17 +1156,25 @@ Pixmap pix; XImage *image; - 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); + if (ownbackstore) + { + 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); + XFreePixmap(display, pix); + } offset *= bpp/8; cache_put_desktop(offset, cx, cy, image->bytes_per_line, - bpp/8, image->data); + bpp/8, (uint8 *)image->data); XDestroyImage(image); - XFreePixmap(display, pix); } void @@ -890,7 +1192,15 @@ 0, data, cx, cy, BitmapPad(display), cx * bpp/8); - XPutImage(display, wnd, gc, image, 0, 0, x, y, cx, cy); + if (ownbackstore) + { + XPutImage(display, backstore, gc, image, 0, 0, x, y, cx, cy); + XCopyArea(display, backstore, wnd, gc, x, y, cx, cy, x, y); + } + else + { + XPutImage(display, wnd, gc, image, 0, 0, x, y, cx, cy); + } + XFree(image); } -