--- sourceforge.net/trunk/rdesktop/xwin.c 2001/09/15 12:34:34 33 +++ sourceforge.net/trunk/rdesktop/xwin.c 2002/04/19 12:06:08 49 @@ -1,6 +1,6 @@ /* rdesktop: A Remote Desktop Protocol client. - User interface services - X-Windows + User interface services - X Window System Copyright (C) Matthew Chapman 1999-2001 This program is free software; you can redistribute it and/or modify @@ -24,6 +24,8 @@ #include #include "rdesktop.h" +extern char keymapname[16]; +extern int keylayout; extern int width; extern int height; extern BOOL sendmotion; @@ -149,10 +151,10 @@ return out; } -#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); +#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) @@ -280,6 +282,8 @@ XFree(sizehints); } + xkeymap_init(display); + input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask; @@ -312,79 +316,11 @@ 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; -} - static void xwin_process_events() { XEvent event; + KeySym keysym; uint8 scancode; uint16 button; uint32 ev_time; @@ -392,14 +328,15 @@ if (display == NULL) return; - while (XCheckWindowEvent(display, wnd, ~0, &event)) + while (XCheckMaskEvent(display, ~0, &event)) { ev_time = time(NULL); switch (event.type) { case KeyPress: - scancode = xwin_translate_key(event.xkey.keycode); + keysym = XKeycodeToKeysym(display, event.xkey.keycode, 0); + scancode = xkeymap_translate_key(keysym, event.xkey.keycode); if (scancode == 0) break; @@ -408,7 +345,8 @@ break; case KeyRelease: - scancode = xwin_translate_key(event.xkey.keycode); + keysym = XKeycodeToKeysym(display, event.xkey.keycode, 0); + scancode = xkeymap_translate_key(keysym, event.xkey.keycode); if (scancode == 0) break; @@ -418,7 +356,7 @@ break; case ButtonPress: - button = xwin_translate_mouse(event.xbutton.button); + button = xkeymap_translate_button(event.xbutton.button); if (button == 0) break; @@ -429,7 +367,7 @@ break; case ButtonRelease: - button = xwin_translate_mouse(event.xbutton.button); + button = xkeymap_translate_button(event.xbutton.button); if (button == 0) break; @@ -714,9 +652,9 @@ MAKE_XCOLOR(&xentry, entry); if (XAllocColor(display, xcolmap, &xentry) != 0) - colour = translate_colour(xentry.pixel); + colour = xentry.pixel; else - colour = translate_colour(white); + colour = white; /* byte swap here to make translate_image faster */ map[i] = translate_colour(colour); @@ -925,14 +863,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; - int i, offset; + int i, j, xyoffset; + DATABLOB *entry; SET_FOREGROUND(bgcolour); @@ -946,34 +917,52 @@ } /* 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 @@ -998,7 +987,7 @@ offset *= bpp/8; cache_put_desktop(offset, cx, cy, image->bytes_per_line, - bpp/8, image->data); + bpp/8, (uint8 *)image->data); XDestroyImage(image); }