--- sourceforge.net/trunk/rdesktop/xwin.c 2002/09/18 12:13:08 185 +++ sourceforge.net/trunk/rdesktop/xwin.c 2002/10/02 13:51:16 209 @@ -1,7 +1,7 @@ /* rdesktop: A Remote Desktop Protocol client. User interface services - X Window System - Copyright (C) Matthew Chapman 1999-2001 + 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 @@ -22,10 +22,7 @@ #include #include #include -#define XK_MISCELLANY -#include #include "rdesktop.h" -#include "scancodes.h" extern int width; extern int height; @@ -33,6 +30,7 @@ extern BOOL fullscreen; extern BOOL grab_keyboard; extern char title[]; +BOOL enable_compose = False; Display *display; static int x_socket; @@ -42,6 +40,10 @@ static Visual *visual; static int depth; static int bpp; +static XIM IM; +static XIC IC; +static XModifierKeymap *mod_map; +static Cursor current_cursor; /* endianness */ static BOOL host_be; @@ -62,14 +64,6 @@ static Colormap xcolmap; static uint32 *colmap; -/* Compose support */ -BOOL enable_compose = False; -static XIM IM = NULL; -static XIC IC = NULL; - -/* toggle fullscreen globals */ -static unsigned long input_mask; - #define SET_FOREGROUND(col) XSetForeground(display, gc, translate_colour(colmap[col])); #define SET_BACKGROUND(col) XSetBackground(display, gc, translate_colour(colmap[col])); @@ -189,69 +183,12 @@ return colour; } -static unsigned long -init_inputmethod(void) -{ - unsigned long filtered_events = 0; - - IM = XOpenIM(display, NULL, NULL, NULL); - if (IM == NULL) - { - error("Failed to open input method\n"); - } - - if (IM != NULL) - { - /* Must be done after XCreateWindow */ - IC = XCreateIC(IM, XNInputStyle, - (XIMPreeditNothing | XIMStatusNothing), - XNClientWindow, wnd, XNFocusWindow, wnd, NULL); - - if (IC == NULL) - { - error("Failed to create input context\n"); - XCloseIM(IM); - IM = NULL; - } - } - - /* For correct Multi_key/Compose processing, I guess. - It seems to work alright anyway, though. */ - if (IC != NULL) - { - if (XGetICValues(IC, XNFilterEvents, &filtered_events, NULL) != NULL) - { - error("Failed to obtain XNFilterEvents value from IC\n"); - filtered_events = 0; - } - } - return filtered_events; -} - -static void -close_inputmethod(void) -{ - if (IC != NULL) - { - XDestroyIC(IC); - if (IM != NULL) - { - XCloseIM(IM); - IM = NULL; - } - } -} - BOOL -get_key_state(int keysym) +get_key_state(unsigned int state, uint32 keysym) { - int keysymMask = 0, modifierpos, key; - Window wDummy1, wDummy2; - int iDummy3, iDummy4, iDummy5, iDummy6; - unsigned int current_state; + int modifierpos, key, keysymMask = 0; int offset; - XModifierKeymap *map = XGetModifierMapping(display); KeyCode keycode = XKeysymToKeycode(display, keysym); if (keycode == NoSymbol) @@ -259,39 +196,20 @@ for (modifierpos = 0; modifierpos < 8; modifierpos++) { - offset = map->max_keypermod * modifierpos; + offset = mod_map->max_keypermod * modifierpos; - for (key = 0; key < map->max_keypermod; key++) + for (key = 0; key < mod_map->max_keypermod; key++) { - if (map->modifiermap[offset + key] == keycode) - keysymMask = 1 << modifierpos; + if (mod_map->modifiermap[offset + key] == keycode) + keysymMask |= 1 << modifierpos; } } - XQueryPointer(display, DefaultRootWindow(display), &wDummy1, - &wDummy2, &iDummy3, &iDummy4, &iDummy5, &iDummy6, ¤t_state); - - XFreeModifiermap(map); - - return (current_state & keysymMask) ? True : False; -} - -static void -xwin_map_window() -{ - XEvent xevent; - - XMapWindow(display, wnd); - - /* wait for VisibilityChange */ - XMaskEvent(display, VisibilityChangeMask, &xevent); - - if (fullscreen) - XSetInputFocus(display, wnd, RevertToPointerRoot, CurrentTime); + return (state & keysymMask) ? True : False; } BOOL -ui_init() +ui_init(void) { XPixmapFormatValues *pfm; uint16 test; @@ -332,8 +250,9 @@ } xcolmap = DefaultColormapOfScreen(screen); + gc = XCreateGC(display, RootWindowOfScreen(screen), 0, NULL); - if (DoesBackingStore(screen) == NotUseful) + if (DoesBackingStore(screen) != Always) ownbackstore = True; test = 1; @@ -349,28 +268,62 @@ /* make sure width is a multiple of 4 */ width = (width + 3) & ~3; + if (ownbackstore) + { + 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); + } + + mod_map = XGetModifierMapping(display); + + if (enable_compose) + IM = XOpenIM(display, NULL, NULL, NULL); + xkeymap_init(); 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() +ui_create_window(void) { XSetWindowAttributes attribs; XClassHint *classhints; XSizeHints *sizehints; + int wndwidth, wndheight; + long input_mask, ic_input_mask; XEvent xevent; + 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, width, height, + + wnd = XCreateWindow(display, RootWindowOfScreen(screen), 0, 0, wndwidth, wndheight, 0, CopyFromParent, InputOutput, CopyFromParent, CWBackPixel | CWBackingStore | CWOverrideRedirect, &attribs); - if (ownbackstore) - backstore = XCreatePixmap(display, wnd, width, height, depth); - XStoreName(display, wnd, title); classhints = XAllocClassHint(); @@ -394,85 +347,96 @@ input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | VisibilityChangeMask | FocusChangeMask; - if (grab_keyboard) - input_mask |= EnterWindowMask | LeaveWindowMask; if (sendmotion) input_mask |= PointerMotionMask; if (ownbackstore) input_mask |= ExposureMask; - if (enable_compose) - input_mask |= init_inputmethod(); + + 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); + XMapWindow(display, wnd); - xwin_map_window(); + /* wait for VisibilityNotify */ + do + { + XMaskEvent(display, VisibilityChangeMask, &xevent); + } + while (xevent.type != VisibilityNotify); - /* clear the window so that cached data is not seen */ - gc = XCreateGC(display, wnd, 0, NULL); - XSetForeground(display, gc, 0); - FILL_RECTANGLE(0, 0, width, height); + if (fullscreen) + XSetInputFocus(display, wnd, RevertToPointerRoot, CurrentTime); return True; } void -ui_destroy_window() +ui_destroy_window(void) { - if (ownbackstore) - XFreePixmap(display, backstore); - - XFreeGC(display, gc); - - close_inputmethod(); + if (IC != NULL) + XDestroyIC(IC); XDestroyWindow(display, wnd); - XCloseDisplay(display); - display = NULL; } - void -xwin_toggle_fullscreen() +xwin_toggle_fullscreen(void) { - XEvent xevent; - XSetWindowAttributes attribs; - int newwidth, newheight; + Pixmap contents = 0; + 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); + } + + ui_destroy_window(); fullscreen = !fullscreen; - newwidth = fullscreen ? WidthOfScreen(screen) : width; - newheight = fullscreen ? HeightOfScreen(screen) : height; + ui_create_window(); - XUnmapWindow(display, wnd); - attribs.override_redirect = fullscreen; - XMoveResizeWindow(display, wnd, 0, 0, newwidth, newheight); - XChangeWindowAttributes(display, wnd, CWOverrideRedirect, &attribs); - xwin_map_window(); + XDefineCursor(display, wnd, current_cursor); + + if (!ownbackstore) + { + XCopyArea(display, contents, wnd, gc, 0, 0, width, height, 0, 0); + XFreePixmap(display, contents); + } } /* Process all events in Xlib queue */ static void -xwin_process_events() +xwin_process_events(void) { XEvent xevent; KeySym keysym; uint16 button, flags; uint32 ev_time; key_translation tr; - char *ksname = NULL; char str[256]; Status status; + unsigned int state; + Window wdummy; + int dummy; while (XPending(display) > 0) { XNextEvent(display, &xevent); - if (enable_compose && (XFilterEvent(&xevent, None) == True)) + if ((IC != NULL) && (XFilterEvent(&xevent, None) == True)) { DEBUG_KBD(("Filtering event\n")); continue; } - ev_time = time(NULL); flags = 0; switch (xevent.type) @@ -499,10 +463,10 @@ str, sizeof(str), &keysym, NULL); } - ksname = get_ksname(keysym); - DEBUG_KBD(("KeyPress for (keysym 0x%lx, %s)\n", keysym, ksname)); + DEBUG_KBD(("KeyPress for (keysym 0x%lx, %s)\n", keysym, get_ksname(keysym))); - if (handle_special_keys(keysym, ev_time, True)) + ev_time = time(NULL); + if (handle_special_keys(keysym, xevent.xkey.state, ev_time, True)) break; tr = xkeymap_translate_key(keysym, @@ -515,15 +479,16 @@ rdp_send_scancode(ev_time, RDP_KEYPRESS, tr.scancode); break; + case KeyRelease: XLookupString((XKeyEvent *) & xevent, str, sizeof(str), &keysym, NULL); - ksname = get_ksname(keysym); DEBUG_KBD(("\nKeyRelease for (keysym 0x%lx, %s)\n", keysym, - ksname)); + get_ksname(keysym))); - if (handle_special_keys(keysym, ev_time, False)) + ev_time = time(NULL); + if (handle_special_keys(keysym, xevent.xkey.state, ev_time, False)) break; tr = xkeymap_translate_key(keysym, @@ -544,30 +509,28 @@ if (button == 0) break; - rdp_send_input(ev_time, RDP_INPUT_MOUSE, + 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, + rdp_send_input(time(NULL), RDP_INPUT_MOUSE, MOUSE_FLAG_MOVE, xevent.xmotion.x, xevent.xmotion.y); break; - case EnterNotify: + case FocusIn: + XQueryPointer(display, wnd, &wdummy, &wdummy, &dummy, &dummy, &dummy, &dummy, &state); + reset_modifier_keys(state); if (grab_keyboard) XGrabKeyboard(display, wnd, True, GrabModeAsync, GrabModeAsync, CurrentTime); break; - case LeaveNotify: - if (grab_keyboard) + case FocusOut: + if (xevent.xfocus.mode == NotifyWhileGrabbed) XUngrabKeyboard(display, CurrentTime); break; - case FocusIn: - reset_modifier_keys(); - break; - case Expose: XCopyArea(display, backstore, wnd, gc, xevent.xexpose.x, xevent.xexpose.y, @@ -582,6 +545,12 @@ 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; } @@ -780,7 +749,8 @@ void ui_set_cursor(HCURSOR cursor) { - XDefineCursor(display, wnd, (Cursor) cursor); + current_cursor = (Cursor) cursor; + XDefineCursor(display, wnd, current_cursor); } void @@ -818,26 +788,38 @@ long nDist = nMinDist; /* only get the colors once */ - while( colLookup-- ){ + while (colLookup--) + { xc_cache[colLookup].pixel = colLookup; - xc_cache[colLookup].red = xc_cache[colLookup].green = xc_cache[colLookup].blue = 0; + 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]); + 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)); + 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 ){ + if (nDist < nMinDist) + { nMinDist = nDist; xentry.pixel = j; } @@ -846,7 +828,8 @@ colour = xentry.pixel; /* update our cache */ - if( xentry.pixel < 256 ){ + 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; @@ -886,7 +869,7 @@ } void -ui_reset_clip() +ui_reset_clip(void) { XRectangle rect; @@ -898,7 +881,7 @@ } void -ui_bell() +ui_bell(void) { XBell(display, 0); }