--- sourceforge.net/trunk/rdesktop/xwin.c 2001/09/15 03:16:05 31 +++ sourceforge.net/trunk/rdesktop/xwin.c 2002/04/07 09:42:54 42 @@ -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 @@ -21,20 +21,29 @@ #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; +static int x_socket; static Window wnd; static GC gc; static Visual *visual; static int depth; static int bpp; +/* endianness */ +static BOOL host_be; +static BOOL xserver_be; + +/* software backing store */ static BOOL ownbackstore; static Pixmap backstore; @@ -45,12 +54,13 @@ 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)); @@ -90,7 +100,7 @@ *(out++) = (uint16)colmap[*(data++)]; } -/* XXX endianness */ +/* little endian - conversion happens when colourmap is built */ static void translate24(uint8 *data, uint8 *out, uint8 *end) { @@ -113,7 +123,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); @@ -141,9 +151,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) @@ -154,9 +189,9 @@ unsigned long input_mask; XPixmapFormatValues *pfm; Screen *screen; + uint16 test; int i; - display = XOpenDisplay(NULL); if (display == NULL) { @@ -164,6 +199,7 @@ return False; } + x_socket = ConnectionNumber(display); screen = DefaultScreenOfDisplay(display); visual = DefaultVisualOfScreen(screen); depth = DefaultDepthOfScreen(screen); @@ -196,6 +232,10 @@ 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); @@ -242,6 +282,8 @@ XFree(sizehints); } + xkeymap_init(display); + input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask; @@ -274,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; -} - -void -ui_process_events() +static void +xwin_process_events() { XEvent event; + KeySym keysym; uint8 scancode; uint16 button; uint32 ev_time; @@ -354,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; @@ -370,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; @@ -380,7 +356,7 @@ break; case ButtonPress: - button = xwin_translate_mouse(event.xbutton.button); + button = xkeymap_translate_button(event.xbutton.button); if (button == 0) break; @@ -391,7 +367,7 @@ break; case ButtonRelease: - button = xwin_translate_mouse(event.xbutton.button); + button = xkeymap_translate_button(event.xbutton.button); if (button == 0) break; @@ -428,6 +404,39 @@ } 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); @@ -440,7 +449,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); @@ -460,7 +469,7 @@ 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); @@ -635,6 +644,7 @@ { uint32 *map = xmalloc(sizeof(*colmap) * ncolours); XColor xentry; + uint32 colour; for (i = 0; i < ncolours; i++) { @@ -642,9 +652,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; @@ -923,7 +936,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); }