--- sourceforge.net/trunk/rdesktop/xwin.c 2002/04/10 14:07:56 44 +++ sourceforge.net/trunk/rdesktop/xwin.c 2002/07/18 16:38:31 64 @@ -2,17 +2,17 @@ rdesktop: A Remote Desktop Protocol client. 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,6 +20,7 @@ #include #include +#include #include #include #include "rdesktop.h" @@ -31,7 +32,8 @@ extern BOOL sendmotion; extern BOOL fullscreen; -static Display *display; +Display *display; +XkbDescPtr xkb; static int x_socket; static Window wnd; static GC gc; @@ -47,6 +49,23 @@ static BOOL ownbackstore; static Pixmap backstore; +/* needed to keep track of the modifiers */ +static unsigned int numlock_modifier_mask = 0; +static unsigned int key_down_state = 0; + + +#define DShift1Mask (1<<0) +#define DLockMask (1<<1) +#define DControl1Mask (1<<2) +#define DMod1Mask (1<<3) +#define DMod2Mask (1<<4) +#define DMod3Mask (1<<5) +#define DMod4Mask (1<<6) +#define DMod5Mask (1<<7) +#define DShift2Mask (1<<8) +#define DControl2Mask (1<<9) +#define DNumLockMask (1<<10) + #define FILL_RECTANGLE(x,y,cx,cy)\ { \ XFillRectangle(display, wnd, gc, x, y, cx, cy); \ @@ -86,23 +105,28 @@ #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_get_numlock_mask(); +void xwin_mod_update(uint32 state, uint32 ev_time); +void xwin_mod_release(uint32 state, uint32 ev_time, uint32 scancode); +void xwin_mod_press(uint32 state, uint32 ev_time, uint32 scancode); + static void -translate8(uint8 *data, uint8 *out, uint8 *end) +translate8(uint8 * data, uint8 * out, uint8 * end) { while (out < end) - *(out++) = (uint8)colmap[*(data++)]; + *(out++) = (uint8) colmap[*(data++)]; } static void -translate16(uint8 *data, uint16 *out, uint16 *end) +translate16(uint8 * data, uint16 * out, uint16 * end) { while (out < end) - *(out++) = (uint16)colmap[*(data++)]; + *(out++) = (uint16) colmap[*(data++)]; } /* little endian - conversion happens when colourmap is built */ static void -translate24(uint8 *data, uint8 *out, uint8 *end) +translate24(uint8 * data, uint8 * out, uint8 * end) { uint32 value; @@ -116,16 +140,16 @@ } static void -translate32(uint8 *data, uint32 *out, uint32 *end) +translate32(uint8 * data, uint32 * out, uint32 * end) { while (out < end) *(out++) = colmap[*(data++)]; } static uint8 * -translate_image(int width, int height, uint8 *data) +translate_image(int width, int height, uint8 * data) { - int size = width * height * bpp/8; + int size = width * height * bpp / 8; uint8 *out = xmalloc(size); uint8 *end = out + size; @@ -136,7 +160,7 @@ break; case 16: - translate16(data, (uint16 *)out, (uint16 *)end); + translate16(data, (uint16 *) out, (uint16 *) end); break; case 24: @@ -144,7 +168,7 @@ break; case 32: - translate32(data, (uint32 *)out, (uint32 *)end); + translate32(data, (uint32 *) out, (uint32 *) end); break; } @@ -192,7 +216,41 @@ uint16 test; int i; - display = XOpenDisplay(NULL); + 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; + } + + + 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; + } + if (display == NULL) { error("Failed to open display\n"); @@ -233,7 +291,7 @@ xcolmap = DefaultColormapOfScreen(screen); test = 1; - host_be = !(BOOL)(*(uint8 *)(&test)); + host_be = !(BOOL) (*(uint8 *) (&test)); xserver_be = (ImageByteOrder(display) == MSBFirst); white = WhitePixelOfScreen(screen); @@ -254,7 +312,7 @@ attribs.override_redirect = False; } - width = (width + 3) & ~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, @@ -282,12 +340,11 @@ XFree(sizehints); } - xkeymap_init(display); - - input_mask = KeyPressMask | KeyReleaseMask - | ButtonPressMask | ButtonReleaseMask - | EnterWindowMask | LeaveWindowMask; + xkeymap_init(); + input_mask = KeyPressMask | KeyReleaseMask | + ButtonPressMask | ButtonReleaseMask | + EnterWindowMask | LeaveWindowMask; if (sendmotion) input_mask |= PointerMotionMask; @@ -301,12 +358,83 @@ 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); + } + + xwin_get_numlock_mask(); + return True; } void +xwin_get_numlock_mask() +{ + KeyCode numlockcode; + KeyCode *keycode; + XModifierKeymap *modmap; + int i, j; + + /* Find out if numlock is already defined as a modifier key, and if so where */ + numlockcode = XKeysymToKeycode(display, 0xFF7F); /* XF_Num_Lock = 0xFF7F */ + if (numlockcode) + { + modmap = XGetModifierMapping(display); + if (modmap) + { + keycode = modmap->modifiermap; + for (i = 0; i < 8; i++) + for (j = modmap->max_keypermod; j--;) + { + if (*keycode == numlockcode) + { + numlock_modifier_mask = + (1 << i); + i = 8; + break; + } + keycode++; + } + if (!numlock_modifier_mask) + { + modmap->modifiermap[7 * + modmap->max_keypermod] = + numlockcode; + if (XSetModifierMapping(display, modmap) == + MappingSuccess) + numlock_modifier_mask = (1 << 7); + else + printf("XSetModifierMapping failed!\n"); + } + XFreeModifiermap(modmap); + } + } + + if (!numlock_modifier_mask) + printf("WARNING: Failed to get a numlock modifier mapping.\n"); + +} + +void ui_destroy_window() { + if (xkb != NULL) + XkbFreeKeyboard(xkb, XkbAllControlsMask, True); + if (ownbackstore) XFreePixmap(display, backstore); @@ -319,74 +447,84 @@ static void xwin_process_events() { - XEvent event; + XEvent xevent; + KeySym keysym; uint8 scancode; - uint16 button; + uint16 button, flags; uint32 ev_time; + uint32 tmpmods; - if (display == NULL) - return; - - while (XCheckMaskEvent(display, ~0, &event)) + while (XCheckMaskEvent(display, ~0, &xevent)) { ev_time = time(NULL); + flags = 0; - switch (event.type) + switch (xevent.type) { + case KeyRelease: + flags = KBD_FLAG_DOWN | KBD_FLAG_UP; + /* fall through */ case KeyPress: - keysym = XKeycodeToKeysym(display, event.xkey.keycode, 0); - scancode = xkeymap_translate_key(keysym, event.xkey.keycode); - if (scancode == 0) + if (XkbTranslateKeyCode + (xkb, xevent.xkey.keycode, + xevent.xkey.state, &tmpmods, + &keysym) == False) break; + scancode = + xkeymap_translate_key(keysym, + xevent.xkey. + keycode, + &flags); - rdp_send_input(ev_time, RDP_INPUT_SCANCODE, 0, - scancode, 0); - break; - - case KeyRelease: - keysym = XKeycodeToKeysym(display, event.xkey.keycode, 0); - scancode = xkeymap_translate_key(keysym, event.xkey.keycode); if (scancode == 0) break; + /* keep track of the modifiers -- needed for stickykeys... */ + if (xevent.type == KeyPress) + xwin_mod_press(xevent.xkey.state, + ev_time, scancode); + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, - KBD_FLAG_DOWN | KBD_FLAG_UP, - scancode, 0); - break; + flags, scancode, 0); - case ButtonPress: - button = xkeymap_translate_button(event.xbutton.button); - if (button == 0) - break; + if (xevent.type == KeyRelease) + xwin_mod_release(xevent.xkey.state, + ev_time, scancode); - rdp_send_input(ev_time, RDP_INPUT_MOUSE, - button | MOUSE_FLAG_DOWN, - event.xbutton.x, - event.xbutton.y); break; + case ButtonPress: + flags = MOUSE_FLAG_DOWN; + /* fall through */ + case ButtonRelease: - button = xkeymap_translate_button(event.xbutton.button); + button = xkeymap_translate_button(xevent. + xbutton. + button); if (button == 0) break; rdp_send_input(ev_time, RDP_INPUT_MOUSE, - button, - event.xbutton.x, - event.xbutton.y); + flags | button, + xevent.xbutton.x, + xevent.xbutton.y); break; case MotionNotify: rdp_send_input(ev_time, RDP_INPUT_MOUSE, MOUSE_FLAG_MOVE, - event.xmotion.x, - event.xmotion.y); + xevent.xmotion.x, + xevent.xmotion.y); break; case EnterNotify: - XGrabKeyboard(display, wnd, True, GrabModeAsync, - GrabModeAsync, CurrentTime); + XGrabKeyboard(display, wnd, True, + GrabModeAsync, GrabModeAsync, + CurrentTime); + + xwin_mod_update(xevent.xcrossing.state, + ev_time); break; case LeaveNotify: @@ -395,29 +533,204 @@ case Expose: XCopyArea(display, backstore, wnd, gc, - event.xexpose.x, event.xexpose.y, - event.xexpose.width, event.xexpose.height, - event.xexpose.x, event.xexpose.y); + xevent.xexpose.x, xevent.xexpose.y, + xevent.xexpose.width, + xevent.xexpose.height, + xevent.xexpose.x, xevent.xexpose.y); break; } } } void +xwin_mod_update(uint32 state, uint32 ev_time) +{ + xwin_mod_press(state, ev_time, 0); + xwin_mod_release(state, ev_time, 0); +} + +void +xwin_mod_release(uint32 state, 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 (!(numlock_modifier_mask & state) + && (key_down_state & DNumLockMask)) + { + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, 0, 0x45, 0); + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, + KBD_FLAG_DOWN | KBD_FLAG_UP, 0x45, 0); + key_down_state &= ~DNumLockMask; + } + + if (!(LockMask & state) && (key_down_state & DLockMask)) + { + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, 0, 0x3a, 0); + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, + KBD_FLAG_DOWN | KBD_FLAG_UP, 0x3a, 0); + key_down_state &= ~DLockMask; + + } + + + if (!(ShiftMask & state) && (key_down_state & DShift1Mask)) + { + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_UP, 0x2a, + 0); + key_down_state &= ~DShift1Mask; + + } + + if (!(ControlMask & state) && (key_down_state & DControl1Mask)) + { + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_UP, 0x1d, + 0); + key_down_state &= ~DControl1Mask; + + } + + if (!(Mod1Mask & state) && (key_down_state & DMod1Mask)) + { + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_UP, 0x38, + 0); + key_down_state &= ~DMod1Mask; + + } + + if (!(Mod2Mask & state) && (key_down_state & DMod2Mask)) + { + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_UP, 0xb8, + 0); + key_down_state &= ~DMod2Mask; + } +} + + +void +xwin_mod_press(uint32 state, 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 0x3a: + key_down_state ^= DLockMask; + break; + case 0x45: + key_down_state ^= DNumLockMask; + break; + case 0x38: + key_down_state |= DMod1Mask; + break; + case 0xb8: + key_down_state |= DMod2Mask; + break; + } + + if ((numlock_modifier_mask && state) + && !(key_down_state & DNumLockMask)) + { + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, 0, 0x45, 0); + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, + KBD_FLAG_DOWN | KBD_FLAG_UP, 0x45, 0); + key_down_state |= DNumLockMask; + } + + if ((LockMask & state) && !(key_down_state & DLockMask)) + { + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, 0, 0x3a, 0); + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, + KBD_FLAG_DOWN | KBD_FLAG_UP, 0x3a, 0); + key_down_state |= DLockMask; + + } + + + if ((ShiftMask & 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 & 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 & state) && !(key_down_state & DMod1Mask)) + { + rdp_send_input(ev_time, RDP_INPUT_SCANCODE, KBD_FLAG_DOWN, + 0x38, 0); + key_down_state |= DMod1Mask; + + } + + if ((Mod2Mask & 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; + 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); + if (display != NULL) + { + FD_SET(x_socket, &rfds); + XFlush(display); + } switch (select(n, &rfds, NULL, NULL, NULL)) { @@ -443,7 +756,7 @@ } HBITMAP -ui_create_bitmap(int width, int height, uint8 *data) +ui_create_bitmap(int width, int height, uint8 * data) { XImage *image; Pixmap bitmap; @@ -464,7 +777,7 @@ void ui_paint_bitmap(int x, int y, int cx, int cy, - int width, int height, uint8 *data) + int width, int height, uint8 * data) { XImage *image; uint8 *tdata; @@ -491,11 +804,11 @@ void ui_destroy_bitmap(HBITMAP bmp) { - XFreePixmap(display, (Pixmap)bmp); + XFreePixmap(display, (Pixmap) bmp); } HGLYPH -ui_create_glyph(int width, int height, uint8 *data) +ui_create_glyph(int width, int height, uint8 * data) { XImage *image; Pixmap bitmap; @@ -517,18 +830,18 @@ XFree(image); XFreeGC(display, gc); - return (HGLYPH)bitmap; + return (HGLYPH) bitmap; } void ui_destroy_glyph(HGLYPH glyph) { - XFreePixmap(display, (Pixmap)glyph); + XFreePixmap(display, (Pixmap) glyph); } HCURSOR ui_create_cursor(unsigned int x, unsigned int y, int width, - int height, uint8 *andmask, uint8 *xormask) + int height, uint8 * andmask, uint8 * xormask) { HGLYPH maskglyph, cursorglyph; XColor bg, fg; @@ -585,27 +898,27 @@ cursorglyph = ui_create_glyph(width, height, cursor); maskglyph = ui_create_glyph(width, height, mask); - - xcursor = XCreatePixmapCursor(display, (Pixmap)cursorglyph, - (Pixmap)maskglyph, &fg, &bg, x, y); + + xcursor = XCreatePixmapCursor(display, (Pixmap) cursorglyph, + (Pixmap) maskglyph, &fg, &bg, x, y); ui_destroy_glyph(maskglyph); ui_destroy_glyph(cursorglyph); xfree(mask); xfree(cursor); - return (HCURSOR)xcursor; + return (HCURSOR) xcursor; } void ui_set_cursor(HCURSOR cursor) { - XDefineCursor(display, wnd, (Cursor)cursor); + XDefineCursor(display, wnd, (Cursor) cursor); } void ui_destroy_cursor(HCURSOR cursor) { - XFreeCursor(display, (Cursor)cursor); + XFreeCursor(display, (Cursor) cursor); } #define MAKE_XCOLOR(xc,c) \ @@ -615,7 +928,7 @@ (xc)->flags = DoRed | DoGreen | DoBlue; HCOLOURMAP -ui_create_colourmap(COLOURMAP *colours) +ui_create_colourmap(COLOURMAP * colours) { COLOURENTRY *entry; int i, ncolours = colours->ncolours; @@ -638,7 +951,7 @@ XStoreColors(display, map, xcolours, ncolours); xfree(xcolours); - return (HCOLOURMAP)map; + return (HCOLOURMAP) map; } else { @@ -668,7 +981,7 @@ ui_destroy_colourmap(HCOLOURMAP map) { if (owncolmap) - XFreeColormap(display, (Colormap)map); + XFreeColormap(display, (Colormap) map); else xfree(map); } @@ -677,7 +990,7 @@ ui_set_colourmap(HCOLOURMAP map) { if (owncolmap) - XSetWindowColormap(display, wnd, (Colormap)map); + XSetWindowColormap(display, wnd, (Colormap) map); else colmap = map; } @@ -724,9 +1037,10 @@ void ui_patblt(uint8 opcode, /* dest */ int x, int y, int cx, int cy, - /* brush */ BRUSH *brush, int bgcolour, int fgcolour) + /* brush */ BRUSH * brush, int bgcolour, int fgcolour) { Pixmap fill; + uint8 i, ipattern[8]; SET_FUNCTION(opcode); @@ -738,18 +1052,21 @@ break; case 3: /* Pattern */ - fill = (Pixmap)ui_create_glyph(8, 8, brush->pattern); + for (i = 0; i != 8; i++) + ipattern[7 - i] = brush->pattern[i]; + fill = (Pixmap) ui_create_glyph(8, 8, ipattern); SET_FOREGROUND(bgcolour); 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); - ui_destroy_glyph((HGLYPH)fill); + ui_destroy_glyph((HGLYPH) fill); break; default: @@ -778,9 +1095,9 @@ /* src */ HBITMAP src, int srcx, int srcy) { SET_FUNCTION(opcode); - XCopyArea(display, (Pixmap)src, wnd, gc, srcx, srcy, cx, cy, x, y); + XCopyArea(display, (Pixmap) src, wnd, gc, srcx, srcy, cx, cy, x, y); if (ownbackstore) - XCopyArea(display, (Pixmap)src, backstore, gc, srcx, srcy, + XCopyArea(display, (Pixmap) src, backstore, gc, srcx, srcy, cx, cy, x, y); RESET_FUNCTION(opcode); } @@ -789,7 +1106,7 @@ ui_triblt(uint8 opcode, /* dest */ int x, int y, int cx, int cy, /* src */ HBITMAP src, int srcx, int srcy, - /* brush */ BRUSH *brush, int bgcolour, int fgcolour) + /* brush */ BRUSH * brush, int bgcolour, int fgcolour) { /* This is potentially difficult to do in general. Until someone comes up with a more efficient way of doing it I am using cases. */ @@ -825,7 +1142,7 @@ void ui_line(uint8 opcode, /* dest */ int startx, int starty, int endx, int endy, - /* pen */ PEN *pen) + /* pen */ PEN * pen) { SET_FUNCTION(opcode); SET_FOREGROUND(pen->colour); @@ -855,7 +1172,7 @@ XSetFillStyle(display, gc, (mixmode == MIX_TRANSPARENT) ? FillStippled : FillOpaqueStippled); - XSetStipple(display, gc, (Pixmap)glyph); + XSetStipple(display, gc, (Pixmap) glyph); XSetTSOrigin(display, gc, x, y); FILL_RECTANGLE(x, y, cx, cy); @@ -863,15 +1180,47 @@ 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; - short offset; - int i; + int i, j, xyoffset; + DATABLOB *entry; SET_FOREGROUND(bgcolour); @@ -885,46 +1234,61 @@ } /* Paint text, character by character */ - for (i = 0; i < length; i++) + for (i = 0; i < length;) { - glyph = cache_get_font(font, text[i]); - - if (!(flags & TEXT2_IMPLICIT_X)) + switch (text[i]) { - offset = text[++i]; - if (offset & 0x80) - { - if (offset == 0x80) + case 0xff: + if (i + 2 < length) + cache_put_text(text[i + 1], text, + text[i + 2]); + else { - /* next two bytes, little-endian */ - offset = text[++i]; - offset |= text[++i] << 8; + error("this shouldn't be happening\n"); + break; } - else + /* this will move pointer from start to first character after FF command */ + length -= i + 3; + text = &(text[i + 3]); + i = 0; + break; + + case 0xfe: + entry = cache_get_text(text[i + 1]); + if (entry != NULL) { - offset = (offset & 0x7f) << 8; - offset |= text[++i]; + 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 @@ -947,9 +1311,9 @@ XFreePixmap(display, pix); } - offset *= bpp/8; + offset *= bpp / 8; cache_put_desktop(offset, cx, cy, image->bytes_per_line, - bpp/8, (uint8 *)image->data); + bpp / 8, (uint8 *) image->data); XDestroyImage(image); } @@ -960,14 +1324,14 @@ XImage *image; uint8 *data; - offset *= bpp/8; - data = cache_get_desktop(offset, cx, cy, bpp/8); + offset *= bpp / 8; + data = cache_get_desktop(offset, cx, cy, bpp / 8); if (data == NULL) return; image = XCreateImage(display, visual, depth, ZPixmap, 0, data, cx, cy, BitmapPad(display), - cx * bpp/8); + cx * bpp / 8); if (ownbackstore) {