--- sourceforge.net/trunk/rdesktop/xwin.c 2001/09/15 14:30:46 36 +++ sourceforge.net/trunk/rdesktop/xwin.c 2003/02/18 13:51:43 332 @@ -1,18 +1,18 @@ /* rdesktop: A Remote Desktop Protocol client. - User interface services - X-Windows - Copyright (C) Matthew Chapman 1999-2001 - + User interface services - X Window System + Copyright (C) Matthew Chapman 1999-2002 + 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. @@ -28,14 +28,28 @@ extern int height; extern BOOL sendmotion; extern BOOL fullscreen; +extern BOOL grab_keyboard; +extern BOOL hide_decorations; +extern char title[]; +extern int server_bpp; +extern int win_button_size; +BOOL enable_compose = False; +BOOL focused; +BOOL mouse_in_wnd; -static Display *display; +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 XModifierKeymap *mod_map; +static Cursor current_cursor; +static Atom protocol_atom, kill_atom; /* endianness */ static BOOL host_be; @@ -45,6 +59,27 @@ static BOOL ownbackstore; static Pixmap backstore; +/* MWM decorations */ +#define MWM_HINTS_DECORATIONS (1L << 1) +#define PROP_MOTIF_WM_HINTS_ELEMENTS 5 +typedef struct +{ + uint32 flags; + uint32 functions; + uint32 decorations; + sint32 inputMode; + uint32 status; +} +PropMotifWmHints; + +typedef struct +{ + uint32 red; + uint32 green; + uint32 blue; +} +PixelColour; + #define FILL_RECTANGLE(x,y,cx,cy)\ { \ XFillRectangle(display, wnd, gc, x, y, cx, cy); \ @@ -52,13 +87,17 @@ XFillRectangle(display, backstore, gc, x, y, cx, cy); \ } +#define FILL_RECTANGLE_BACKSTORE(x,y,cx,cy)\ +{ \ + XFillRectangle(display, ownbackstore ? backstore : wnd, gc, x, y, cx, cy); \ +} + /* colour maps */ -static BOOL owncolmap; +BOOL owncolmap = False; static Colormap xcolmap; -static uint32 white; static uint32 *colmap; -#define TRANSLATE(col) ( owncolmap ? col : translate_colour(colmap[col]) ) +#define TRANSLATE(col) ( server_bpp != 8 ? translate_colour(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)); @@ -85,22 +124,173 @@ #define RESET_FUNCTION(rop2) { if (rop2 != ROP2_COPY) XSetFunction(display, gc, GXcopy); } static void -translate8(uint8 *data, uint8 *out, uint8 *end) +mwm_hide_decorations(void) +{ + PropMotifWmHints motif_hints; + Atom hintsatom; + + /* setup the property */ + motif_hints.flags = MWM_HINTS_DECORATIONS; + motif_hints.decorations = 0; + + /* get the atom for the property */ + hintsatom = XInternAtom(display, "_MOTIF_WM_HINTS", False); + if (!hintsatom) + { + warning("Failed to get atom _MOTIF_WM_HINTS: probably your window manager does not support MWM hints\n"); + return; + } + + XChangeProperty(display, wnd, hintsatom, hintsatom, 32, PropModeReplace, + (unsigned char *) &motif_hints, PROP_MOTIF_WM_HINTS_ELEMENTS); +} + +static PixelColour +split_colour15(uint32 colour) +{ + PixelColour rv; + rv.red = (colour & 0x7c00) >> 10; + rv.red = (rv.red * 0xff) / 0x1f; + rv.green = (colour & 0x03e0) >> 5; + rv.green = (rv.green * 0xff) / 0x1f; + rv.blue = (colour & 0x1f); + rv.blue = (rv.blue * 0xff) / 0x1f; + return rv; +} + +static PixelColour +split_colour16(uint32 colour) +{ + PixelColour rv; + rv.red = (colour & 0xf800) >> 11; + rv.red = (rv.red * 0xff) / 0x1f; + rv.green = (colour & 0x07e0) >> 5; + rv.green = (rv.green * 0xff) / 0x3f; + rv.blue = (colour & 0x001f); + rv.blue = (rv.blue * 0xff) / 0x1f; + return rv; +} + +static PixelColour +split_colour24(uint32 colour) +{ + PixelColour rv; + rv.blue = (colour & 0xff0000) >> 16; + rv.green = (colour & 0xff00) >> 8; + rv.red = (colour & 0xff); + return rv; +} + +static uint32 +make_colour16(PixelColour pc) +{ + pc.red = (pc.red * 0x1f) / 0xff; + pc.green = (pc.green * 0x3f) / 0xff; + pc.blue = (pc.blue * 0x1f) / 0xff; + return (pc.red << 11) | (pc.green << 5) | pc.blue; +} + +static uint32 +make_colour24(PixelColour pc) +{ + return (pc.red << 16) | (pc.green << 8) | pc.blue; +} + +static uint32 +make_colour32(PixelColour pc) +{ + return (pc.red << 16) | (pc.green << 8) | pc.blue; +} + +#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 (server_bpp) + { + case 15: + switch (bpp) + { + case 16: + colour = make_colour16(split_colour15(colour)); + break; + case 24: + colour = make_colour24(split_colour15(colour)); + break; + case 32: + colour = make_colour32(split_colour15(colour)); + break; + } + break; + case 16: + switch (bpp) + { + case 16: + break; + case 24: + colour = make_colour24(split_colour16(colour)); + break; + case 32: + colour = make_colour32(split_colour16(colour)); + break; + } + break; + case 24: + switch (bpp) + { + case 16: + colour = make_colour16(split_colour24(colour)); + break; + case 24: + break; + case 32: + colour = make_colour32(split_colour24(colour)); + break; + } + break; + } + 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; +} + +static void +translate8to8(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) +translate8to16(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) +translate8to24(uint8 * data, uint8 * out, uint8 * end) { uint32 value; @@ -114,86 +304,217 @@ } static void -translate32(uint8 *data, uint32 *out, uint32 *end) +translate8to32(uint8 * data, uint32 * out, uint32 * end) { while (out < end) *(out++) = colmap[*(data++)]; } +/* todo the remaining translate function might need some big endian check ?? */ + +static void +translate15to16(uint16 * data, uint16 * out, uint16 * end) +{ + while (out < end) + *(out++) = (uint16) make_colour16(split_colour15(*(data++))); +} + +static void +translate15to24(uint16 * data, uint8 * out, uint8 * end) +{ + uint32 value; + + while (out < end) + { + value = make_colour24(split_colour15(*(data++))); + *(out++) = value; + *(out++) = value >> 8; + *(out++) = value >> 16; + } +} + +static void +translate15to32(uint16 * data, uint32 * out, uint32 * end) +{ + while (out < end) + *(out++) = make_colour32(split_colour15(*(data++))); +} + +static void +translate16to16(uint16 * data, uint16 * out, uint16 * end) +{ + while (out < end) + *(out++) = (uint16) (*(data++)); +} + + +static void +translate16to24(uint16 * data, uint8 * out, uint8 * end) +{ + uint32 value; + + while (out < end) + { + value = make_colour24(split_colour16(*(data++))); + *(out++) = value; + *(out++) = value >> 8; + *(out++) = value >> 16; + } +} + +static void +translate16to32(uint16 * data, uint32 * out, uint32 * end) +{ + while (out < end) + *(out++) = make_colour32(split_colour16(*(data++))); +} + +static void +translate24to16(uint8 * data, uint16 * out, uint16 * end) +{ + uint32 pixel = 0; + while (out < end) + { + pixel = *(data++) << 16; + pixel |= *(data++) << 8; + pixel |= *(data++); + *(out++) = (uint16) make_colour16(split_colour24(pixel)); + } +} + +static void +translate24to24(uint8 * data, uint8 * out, uint8 * end) +{ + while (out < end) + { + *(out++) = (*(data++)); + } +} + +static void +translate24to32(uint8 * data, uint32 * out, uint32 * end) +{ + uint32 pixel = 0; + while (out < end) + { + memcpy(&pixel, data, 3); + data += 3; + *(out++) = pixel; + } +} + 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; - switch (bpp) + switch (server_bpp) { - case 8: - translate8(data, out, end); + case 24: + switch (bpp) + { + case 32: + translate24to32(data, (uint32 *) out, (uint32 *) end); + break; + case 24: + translate24to24(data, out, end); + break; + case 16: + translate24to16(data, (uint16 *) out, (uint16 *) end); + break; + } break; - case 16: - translate16(data, (uint16 *)out, (uint16 *)end); + switch (bpp) + { + case 32: + translate16to32((uint16 *) data, (uint32 *) out, + (uint32 *) end); + break; + case 24: + translate16to24((uint16 *) data, out, end); + break; + case 16: + translate16to16((uint16 *) data, (uint16 *) out, + (uint16 *) end); + break; + } break; - - case 24: - translate24(data, out, end); + case 15: + switch (bpp) + { + case 32: + translate15to32((uint16 *) data, (uint32 *) out, + (uint32 *) end); + break; + case 24: + translate15to24((uint16 *) data, out, end); + break; + case 16: + translate15to16((uint16 *) data, (uint16 *) out, + (uint16 *) end); + break; + } break; - - case 32: - translate32(data, (uint32 *)out, (uint32 *)end); + case 8: + switch (bpp) + { + case 8: + translate8to8(data, out, end); + break; + case 16: + translate8to16(data, (uint16 *) out, (uint16 *) end); + break; + case 24: + translate8to24(data, out, end); + break; + case 32: + translate8to32(data, (uint32 *) out, (uint32 *) end); + break; + } break; } - 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); } - -static uint32 -translate_colour(uint32 colour) +BOOL +get_key_state(unsigned int state, uint32 keysym) { - switch (bpp) - { - case 16: - if (host_be != xserver_be) - BSWAP16(colour); - break; + int modifierpos, key, keysymMask = 0; + int offset; - case 24: - if (xserver_be) - BSWAP24(colour); - break; + KeyCode keycode = XKeysymToKeycode(display, keysym); - case 32: - if (host_be != xserver_be) - BSWAP32(colour); - break; + if (keycode == NoSymbol) + return False; + + for (modifierpos = 0; modifierpos < 8; modifierpos++) + { + offset = mod_map->max_keypermod * modifierpos; + + for (key = 0; key < mod_map->max_keypermod; key++) + { + if (mod_map->modifiermap[offset + key] == keycode) + keysymMask |= 1 << modifierpos; + } } - return colour; + return (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"); + error("Failed to open display: %s\n", XDisplayName(NULL)); return False; } @@ -209,8 +530,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; } @@ -225,43 +545,114 @@ return False; } - if (depth <= 8) - owncolmap = True; - else + if (owncolmap != True) + { xcolmap = DefaultColormapOfScreen(screen); + if (depth <= 8) + warning("Screen depth is 8 bits or lower: you may want to use -C for a private colourmap\n"); + } + + gc = XCreateGC(display, RootWindowOfScreen(screen), 0, NULL); + + if (DoesBackingStore(screen) != Always) + ownbackstore = True; test = 1; - host_be = !(BOOL)(*(uint8 *)(&test)); + host_be = !(BOOL) (*(uint8 *) (&test)); xserver_be = (ImageByteOrder(display) == MSBFirst); - white = WhitePixelOfScreen(screen); - attribs.background_pixel = BlackPixelOfScreen(screen); - attribs.backing_store = DoesBackingStore(screen); + if ((width == 0) || (height == 0)) + { + /* Fetch geometry from _NET_WORKAREA */ + uint32 x, y, cx, cy; - if (attribs.backing_store == NotUseful) - ownbackstore = True; + if (get_current_workarea(&x, &y, &cx, &cy) == 0) + { + width = cx; + height = cy; + } + else + { + warning("Failed to get workarea: probably your window manager does not support extended hints\n"); + width = 800; + height = 600; + } + } 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 */ + mod_map = XGetModifierMapping(display); + + if (enable_compose) + IM = XOpenIM(display, NULL, NULL, NULL); + + xkeymap_init(); + + /* todo take this out when high colour is done */ + printf("server bpp %d client bpp %d depth %d\n", server_bpp, bpp, depth); + + return True; +} + +void +ui_deinit(void) +{ + if (IM != NULL) + XCloseIM(IM); + + XFreeModifiermap(mod_map); + + 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; - wnd = XCreateWindow(display, RootWindowOfScreen(screen), - 0, 0, width, height, 0, CopyFromParent, - InputOutput, CopyFromParent, - CWBackingStore | CWBackPixel | CWOverrideRedirect, - &attribs); + wndwidth = fullscreen ? WidthOfScreen(screen) : width; + wndheight = fullscreen ? HeightOfScreen(screen) : height; + + 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); + if (hide_decorations) + mwm_hide_decorations(); + classhints = XAllocClassHint(); if (classhints != NULL) { @@ -280,203 +671,321 @@ XFree(sizehints); } - input_mask = KeyPressMask | KeyReleaseMask - | ButtonPressMask | ButtonReleaseMask - | EnterWindowMask | LeaveWindowMask; + input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | + VisibilityChangeMask | FocusChangeMask; if (sendmotion) input_mask |= PointerMotionMask; - if (ownbackstore) input_mask |= ExposureMask; + if (fullscreen || grab_keyboard) + input_mask |= EnterWindowMask; + if (grab_keyboard) + input_mask |= LeaveWindowMask; + + if (IM != NULL) + { + IC = XCreateIC(IM, XNInputStyle, (XIMPreeditNothing | XIMStatusNothing), + XNClientWindow, wnd, XNFocusWindow, wnd, NULL); + + if ((IC != NULL) + && (XGetICValues(IC, XNFilterEvents, &ic_input_mask, NULL) == NULL)) + input_mask |= ic_input_mask; + } XSelectInput(display, wnd, input_mask); - gc = XCreateGC(display, wnd, 0, NULL); + XMapWindow(display, wnd); - if (ownbackstore) - backstore = XCreatePixmap(display, wnd, width, height, depth); + /* wait for VisibilityNotify */ + do + { + XMaskEvent(display, VisibilityChangeMask, &xevent); + } + while (xevent.type != VisibilityNotify); + + focused = False; + mouse_in_wnd = False; + + /* handle the WM_DELETE_WINDOW protocol */ + protocol_atom = XInternAtom(display, "WM_PROTOCOLS", True); + kill_atom = XInternAtom(display, "WM_DELETE_WINDOW", True); + XSetWMProtocols(display, wnd, &kill_atom, 1); - XMapWindow(display, wnd); 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); - XCloseDisplay(display); - display = NULL; } -static uint8 -xwin_translate_key(unsigned long key) +void +xwin_toggle_fullscreen(void) { - DEBUG(("KEY(code=0x%lx)\n", key)); + Pixmap contents = 0; - if ((key > 8) && (key <= 0x60)) - return (key - 8); + 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); + } - 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; - uint8 scancode; - uint16 button; - uint32 ev_time; + ui_destroy_window(); + fullscreen = !fullscreen; + ui_create_window(); - if (display == NULL) - return; + XDefineCursor(display, wnd, current_cursor); - while (XCheckWindowEvent(display, wnd, ~0, &event)) + if (!ownbackstore) { - ev_time = time(NULL); + XCopyArea(display, contents, wnd, gc, 0, 0, width, height, 0, 0); + XFreePixmap(display, contents); + } +} - switch (event.type) +/* Process all events in Xlib queue + Returns 0 after user quit, 1 otherwise */ +static int +xwin_process_events(void) +{ + XEvent xevent; + KeySym keysym; + uint16 button, flags; + uint32 ev_time; + key_translation tr; + char str[256]; + Status status; + unsigned int state; + Window wdummy; + int dummy; + + while (XPending(display) > 0) + { + XNextEvent(display, &xevent); + + if ((IC != NULL) && (XFilterEvent(&xevent, None) == True)) { + DEBUG_KBD(("Filtering event\n")); + continue; + } + + flags = 0; + + switch (xevent.type) + { + case ClientMessage: + /* the window manager told us to quit */ + if ((xevent.xclient.message_type == protocol_atom) + && (xevent.xclient.data.l[0] == kill_atom)) + /* Quit */ + return 0; + break; + case KeyPress: - scancode = xwin_translate_key(event.xkey.keycode); - if (scancode == 0) + if (IC != NULL) + /* Multi_key compatible version */ + { + XmbLookupString(IC, + (XKeyPressedEvent *) & + xevent, str, sizeof(str), &keysym, &status); + if (!((status == XLookupKeySym) || (status == XLookupBoth))) + { + error("XmbLookupString failed with status 0x%x\n", + status); + break; + } + } + else + { + /* Plain old XLookupString */ + DEBUG_KBD(("\nNo input context, using XLookupString\n")); + XLookupString((XKeyEvent *) & xevent, + str, sizeof(str), &keysym, NULL); + } + + DEBUG_KBD(("KeyPress for (keysym 0x%lx, %s)\n", keysym, + get_ksname(keysym))); + + ev_time = time(NULL); + if (handle_special_keys(keysym, xevent.xkey.state, ev_time, True)) + break; + + tr = xkeymap_translate_key(keysym, + xevent.xkey.keycode, xevent.xkey.state); + + if (tr.scancode == 0) break; - rdp_send_input(ev_time, RDP_INPUT_SCANCODE, 0, - scancode, 0); + ensure_remote_modifiers(ev_time, tr); + + rdp_send_scancode(ev_time, RDP_KEYPRESS, tr.scancode); break; case KeyRelease: - scancode = xwin_translate_key(event.xkey.keycode); - if (scancode == 0) + XLookupString((XKeyEvent *) & xevent, str, + sizeof(str), &keysym, NULL); + + DEBUG_KBD(("\nKeyRelease for (keysym 0x%lx, %s)\n", keysym, + get_ksname(keysym))); + + ev_time = time(NULL); + if (handle_special_keys(keysym, xevent.xkey.state, ev_time, False)) break; - rdp_send_input(ev_time, RDP_INPUT_SCANCODE, - KBD_FLAG_DOWN | KBD_FLAG_UP, - scancode, 0); - break; + tr = xkeymap_translate_key(keysym, + xevent.xkey.keycode, xevent.xkey.state); - case ButtonPress: - button = xwin_translate_mouse(event.xbutton.button); - if (button == 0) + if (tr.scancode == 0) break; - rdp_send_input(ev_time, RDP_INPUT_MOUSE, - button | MOUSE_FLAG_DOWN, - event.xbutton.x, - event.xbutton.y); + rdp_send_scancode(ev_time, RDP_KEYRELEASE, tr.scancode); break; + case ButtonPress: + flags = MOUSE_FLAG_DOWN; + /* fall through */ + case ButtonRelease: - button = xwin_translate_mouse(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); + /* If win_button_size is nonzero, enable single app mode */ + if (xevent.xbutton.y < win_button_size) + { + /* Check from right to left: */ + + if (xevent.xbutton.x >= width - win_button_size) + { + /* The close button, continue */ + ; + } + else if (xevent.xbutton.x >= width - win_button_size * 2) + { + /* The maximize/restore button. Do not send to + server. It might be a good idea to change the + cursor or give some other visible indication + that rdesktop inhibited this click */ + break; + } + else if (xevent.xbutton.x >= width - win_button_size * 3) + { + /* The minimize button. Iconify window. */ + XIconifyWindow(display, wnd, + DefaultScreen(display)); + break; + } + else + { + /* Ignore clicks to the rest of the border. This includes + the system menu, but also inhibits double clicks on the + border itself. */ + break; + } + } + + rdp_send_input(time(NULL), RDP_INPUT_MOUSE, + 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); + if (fullscreen && !focused) + XSetInputFocus(display, wnd, RevertToPointerRoot, + CurrentTime); + rdp_send_input(time(NULL), RDP_INPUT_MOUSE, + MOUSE_FLAG_MOVE, xevent.xmotion.x, xevent.xmotion.y); + break; + + case FocusIn: + if (xevent.xfocus.mode == NotifyGrab) + break; + focused = True; + XQueryPointer(display, wnd, &wdummy, &wdummy, &dummy, &dummy, + &dummy, &dummy, &state); + reset_modifier_keys(state); + if (grab_keyboard && mouse_in_wnd) + XGrabKeyboard(display, wnd, True, + GrabModeAsync, GrabModeAsync, CurrentTime); + break; + + case FocusOut: + if (xevent.xfocus.mode == NotifyUngrab) + break; + focused = False; + if (xevent.xfocus.mode == NotifyWhileGrabbed) + XUngrabKeyboard(display, CurrentTime); break; case EnterNotify: - XGrabKeyboard(display, wnd, True, GrabModeAsync, - GrabModeAsync, CurrentTime); + /* we only register for this event when in fullscreen mode */ + /* or grab_keyboard */ + mouse_in_wnd = True; + if (fullscreen) + { + XSetInputFocus(display, wnd, RevertToPointerRoot, + CurrentTime); + break; + } + if (focused) + XGrabKeyboard(display, wnd, True, + GrabModeAsync, GrabModeAsync, CurrentTime); break; case LeaveNotify: + /* we only register for this event when grab_keyboard */ + mouse_in_wnd = False; XUngrabKeyboard(display, CurrentTime); break; 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; + + 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); + + if (xevent.xmapping.request == MappingModifier) + { + XFreeModifiermap(mod_map); + mod_map = XGetModifierMapping(display); + } + break; + } } + /* Keep going */ + return 1; } -void +/* Returns 0 after user quit, 1 otherwise */ +int 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) { + /* Process any events already waiting */ + if (!xwin_process_events()) + /* User quit */ + return 0; + FD_ZERO(&rfds); FD_SET(rdp_socket, &rfds); FD_SET(x_socket, &rfds); @@ -490,11 +999,8 @@ continue; } - if (FD_ISSET(x_socket, &rfds)) - xwin_process_events(); - if (FD_ISSET(rdp_socket, &rfds)) - return; + return 1; } } @@ -505,7 +1011,7 @@ } HBITMAP -ui_create_bitmap(int width, int height, uint8 *data) +ui_create_bitmap(int width, int height, uint8 * data) { XImage *image; Pixmap bitmap; @@ -513,8 +1019,8 @@ 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); + image = XCreateImage(display, visual, depth, ZPixmap, 0, + (char *) tdata, width, height, server_bpp == 8 ? 8 : bpp, 0); XPutImage(display, bitmap, gc, image, 0, 0, 0, 0, width, height); @@ -525,15 +1031,13 @@ } 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); + image = XCreateImage(display, visual, depth, ZPixmap, 0, + (char *) tdata, width, height, server_bpp == 8 ? 8 : bpp, 0); if (ownbackstore) { @@ -553,11 +1057,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; @@ -569,8 +1073,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); @@ -579,18 +1083,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) +ui_create_cursor(unsigned int x, unsigned int y, int width, int height, + uint8 * andmask, uint8 * xormask) { HGLYPH maskglyph, cursorglyph; XColor bg, fg; @@ -647,27 +1151,29 @@ 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); + current_cursor = (Cursor) cursor; + XDefineCursor(display, wnd, current_cursor); } void ui_destroy_cursor(HCURSOR cursor) { - XFreeCursor(display, (Cursor)cursor); + XFreeCursor(display, (Cursor) cursor); } #define MAKE_XCOLOR(xc,c) \ @@ -676,13 +1182,88 @@ (xc)->blue = ((c)->blue << 8) | (c)->blue; \ (xc)->flags = DoRed | DoGreen | DoBlue; + HCOLOURMAP -ui_create_colourmap(COLOURMAP *colours) +ui_create_colourmap(COLOURMAP * colours) { 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++) + { + entry = &colours->colours[i]; + MAKE_XCOLOR(&xentry, entry); + + if (XAllocColor(display, xcolmap, &xentry) == 0) + { + /* 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; + + /* 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; + + /* 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; + + } + - if (owncolmap) + /* byte swap here to make translate_image faster */ + map[i] = translate_colour(colour); + } + return map; + } + else { XColor *xcolours, *xentry; Colormap map; @@ -700,48 +1281,26 @@ XStoreColors(display, map, xcolours, ncolours); xfree(xcolours); - return (HCOLOURMAP)map; - } - else - { - uint32 *map = xmalloc(sizeof(*colmap) * ncolours); - XColor xentry; - uint32 colour; - - for (i = 0; i < ncolours; i++) - { - entry = &colours->colours[i]; - MAKE_XCOLOR(&xentry, entry); - - if (XAllocColor(display, xcolmap, &xentry) != 0) - colour = xentry.pixel; - else - colour = white; - - /* byte swap here to make translate_image faster */ - map[i] = translate_colour(colour); - } - - return map; + return (HCOLOURMAP) map; } } void ui_destroy_colourmap(HCOLOURMAP map) { - if (owncolmap) - XFreeColormap(display, (Colormap)map); - else + if (!owncolmap) xfree(map); + else + XFreeColormap(display, (Colormap) map); } void ui_set_colourmap(HCOLOURMAP map) { - if (owncolmap) - XSetWindowColormap(display, wnd, (Colormap)map); - else + if (!owncolmap) colmap = map; + else + XSetWindowColormap(display, wnd, (Colormap) map); } void @@ -757,7 +1316,7 @@ } void -ui_reset_clip() +ui_reset_clip(void) { XRectangle rect; @@ -769,7 +1328,7 @@ } void -ui_bell() +ui_bell(void) { XBell(display, 0); } @@ -786,9 +1345,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); @@ -800,7 +1360,9 @@ 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); @@ -811,7 +1373,8 @@ FILL_RECTANGLE(x, y, cx, cy); XSetFillStyle(display, gc, FillSolid); - ui_destroy_glyph((HGLYPH)fill); + XSetTSOrigin(display, gc, 0, 0); + ui_destroy_glyph((HGLYPH) fill); break; default: @@ -829,8 +1392,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); } @@ -840,10 +1402,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, - cx, cy, x, y); + XCopyArea(display, (Pixmap) src, backstore, gc, srcx, srcy, cx, cy, x, y); RESET_FUNCTION(opcode); } @@ -851,7 +1412,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. */ @@ -860,22 +1421,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: @@ -887,7 +1444,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); @@ -906,74 +1463,139 @@ FILL_RECTANGLE(x, y, cx, cy); } +/* warning, this function only draws on wnd or backstore, not both */ void ui_draw_glyph(int mixmode, /* dest */ int x, int y, int cx, int cy, - /* src */ HGLYPH glyph, int srcx, int srcy, int bgcolour, - int fgcolour) + /* src */ HGLYPH glyph, int srcx, int srcy, + int bgcolour, int fgcolour) { SET_FOREGROUND(fgcolour); SET_BACKGROUND(bgcolour); - XSetFillStyle(display, gc, (mixmode == MIX_TRANSPARENT) - ? FillStippled : FillOpaqueStippled); - XSetStipple(display, gc, (Pixmap)glyph); + XSetFillStyle(display, gc, + (mixmode == MIX_TRANSPARENT) ? FillStippled : FillOpaqueStippled); + XSetStipple(display, gc, (Pixmap) glyph); XSetTSOrigin(display, gc, x, y); - FILL_RECTANGLE(x, y, cx, cy); + FILL_RECTANGLE_BACKSTORE(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+1] | (ttext[idx+2] << 8);\ + else\ + x += ttext[idx+1] | (ttext[idx+2] << 8);\ + idx += 2;\ + }\ + else\ + {\ + if (flags & TEXT2_VERTICAL) \ + y += xyoffset;\ + else\ + x += xyoffset;\ + }\ + }\ + if (glyph != NULL)\ + {\ + ui_draw_glyph (mixmode, x + glyph->offset,\ + y + 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 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) { - FILL_RECTANGLE(boxx, boxy, boxcx, boxcy); + FILL_RECTANGLE_BACKSTORE(boxx, boxy, boxcx, boxcy); } else if (mixmode == MIX_OPAQUE) { - FILL_RECTANGLE(clipx, clipy, clipcx, clipcy); + FILL_RECTANGLE_BACKSTORE(clipx, clipy, clipcx, clipcy); } /* 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) - offset = ((offset & 0x7f) << 8) | text[++i]; - - if (flags & TEXT2_VERTICAL) - y += offset; - else - x += offset; - } + case 0xff: + if (i + 2 < length) + cache_put_text(text[i + 1], text, text[i + 2]); + else + { + error("this shouldn't be happening\n"); + exit(1); + } + /* this will move pointer from start to first character after FF command */ + length -= i + 3; + text = &(text[i + 3]); + i = 0; + 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); + 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]; + } + for (j = 0; j < entry->size; j++) + DO_GLYPH(((uint8 *) (entry->data)), j); + } + 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; + break; - if (flags & TEXT2_IMPLICIT_X) - x += glyph->width; + default: + DO_GLYPH(text, i); + i++; + break; } } + if (ownbackstore) + { + if (boxcx > 1) + XCopyArea(display, backstore, wnd, gc, boxx, + boxy, boxcx, boxcy, boxx, boxy); + else + XCopyArea(display, backstore, wnd, gc, clipx, + clipy, clipcx, clipcy, clipx, clipy); + } } void @@ -984,21 +1606,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); + offset *= bpp / 8; + cache_put_desktop(offset, cx, cy, image->bytes_per_line, bpp / 8, (uint8 *) image->data); XDestroyImage(image); } @@ -1009,14 +1628,13 @@ 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); + image = XCreateImage(display, visual, depth, ZPixmap, 0, + (char *) data, cx, cy, BitmapPad(display), cx * bpp / 8); if (ownbackstore) {