--- sourceforge.net/trunk/rdesktop/xwin.c 2002/08/26 17:14:04 102 +++ sourceforge.net/trunk/rdesktop/xwin.c 2002/09/26 14:04:30 203 @@ -22,10 +22,7 @@ #include #include #include -#define XK_MISCELLANY -#include #include "rdesktop.h" -#include "scancodes.h" extern int width; extern int height; @@ -33,16 +30,20 @@ extern BOOL fullscreen; extern BOOL grab_keyboard; extern char title[]; +BOOL enable_compose = False; -Display *display = NULL; +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 int dpy_width; -static int dpy_height; +static XIM IM; +static XIC IC; +static XModifierKeymap *mod_map; +static Cursor current_cursor; /* endianness */ static BOOL host_be; @@ -60,23 +61,11 @@ } /* colour maps */ -static BOOL owncolmap; static Colormap xcolmap; -static uint32 white; static uint32 *colmap; -static XIM IM = NULL; -static XIC IC = NULL; - -/* Compose support */ -BOOL enable_compose = False; -/* toggle fullscreen globals */ -static XSetWindowAttributes attribs; -static unsigned long input_mask; - -#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)); +#define SET_FOREGROUND(col) XSetForeground(display, gc, translate_colour(colmap[col])); +#define SET_BACKGROUND(col) XSetBackground(display, gc, translate_colour(colmap[col])); static int rop2_map[] = { GXclear, /* 0 */ @@ -194,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; - } - } -} - -static BOOL -get_key_state(int keysym) +BOOL +get_key_state(uint32 keysym, unsigned int state) { - 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) @@ -264,113 +196,31 @@ 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; + return (state & keysymMask) ? True : False; } - BOOL -ui_init() +ui_init(void) { - Screen *screen; + XPixmapFormatValues *pfm; + uint16 test; + int i; + display = XOpenDisplay(NULL); if (display == NULL) { error("Failed to open display\n"); return False; } - if (fullscreen) - { - screen = DefaultScreenOfDisplay(display); - width = WidthOfScreen(screen); - height = HeightOfScreen(screen); - } - return True; -} - -void -ui_create_window_obj(int xpos, int ypos, int width, int height, int valuemask) -{ - XClassHint *classhints; - XSizeHints *sizehints; - XEvent xevent; - Screen *screen; - - screen = DefaultScreenOfDisplay(display); - - wnd = XCreateWindow(display, RootWindowOfScreen(screen), xpos, - ypos, width, height, 0, CopyFromParent, - InputOutput, CopyFromParent, valuemask, &attribs); - - - XStoreName(display, wnd, title); - - classhints = XAllocClassHint(); - if (classhints != NULL) - { - classhints->res_name = classhints->res_class = "rdesktop"; - XSetClassHint(display, wnd, classhints); - XFree(classhints); - } - - sizehints = XAllocSizeHints(); - if (sizehints) - { - sizehints->flags = PMinSize | PMaxSize; - sizehints->min_width = sizehints->max_width = width; - sizehints->min_height = sizehints->max_height = height; - XSetWMNormalHints(display, wnd, sizehints); - XFree(sizehints); - } - - if (enable_compose) - input_mask |= init_inputmethod(); - - XSelectInput(display, wnd, input_mask); - - gc = XCreateGC(display, wnd, 0, NULL); - - XMapWindow(display, wnd); - - /* Wait for VisibilityNotify Event */ - for (;;) - { - XNextEvent(display, &xevent); - if (xevent.type == VisibilityNotify) - break; - } - - if (ownbackstore) - backstore = XCreatePixmap(display, wnd, width, height, depth); - - /* clear the window so that cached data is not viewed upon start... */ - XSetBackground(display, gc, 0); - XSetForeground(display, gc, 0); - FILL_RECTANGLE(0, 0, width, height); - /* make sure the window is focused */ - XSetInputFocus(display, wnd, RevertToPointerRoot, CurrentTime); -} - -BOOL -ui_create_window() -{ - XPixmapFormatValues *pfm; - Screen *screen; - uint16 test; - int i; x_socket = ConnectionNumber(display); screen = DefaultScreenOfDisplay(display); @@ -399,158 +249,194 @@ return False; } - if (depth <= 8) - owncolmap = True; - else - xcolmap = DefaultColormapOfScreen(screen); + xcolmap = DefaultColormapOfScreen(screen); + gc = XCreateGC(display, RootWindowOfScreen(screen), 0, NULL); + + if (DoesBackingStore(screen) != Always) + ownbackstore = True; test = 1; host_be = !(BOOL) (*(uint8 *) (&test)); xserver_be = (ImageByteOrder(display) == MSBFirst); - white = WhitePixelOfScreen(screen); + if (fullscreen) + { + width = WidthOfScreen(screen); + height = HeightOfScreen(screen); + } + + /* 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(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 = DoesBackingStore(screen); + attribs.backing_store = ownbackstore ? NotUseful : Always; + attribs.override_redirect = fullscreen; - if (attribs.backing_store == NotUseful) - ownbackstore = True; + wnd = XCreateWindow(display, RootWindowOfScreen(screen), 0, 0, wndwidth, wndheight, + 0, CopyFromParent, InputOutput, CopyFromParent, + CWBackPixel | CWBackingStore | CWOverrideRedirect, &attribs); - dpy_width = WidthOfScreen(screen); - dpy_height = HeightOfScreen(screen); + XStoreName(display, wnd, title); - if (fullscreen) + classhints = XAllocClassHint(); + if (classhints != NULL) { - attribs.override_redirect = True; - width = dpy_width; - height = dpy_height; + classhints->res_name = classhints->res_class = "rdesktop"; + XSetClassHint(display, wnd, classhints); + XFree(classhints); } - else + + sizehints = XAllocSizeHints(); + if (sizehints) { - attribs.override_redirect = False; + sizehints->flags = PMinSize | PMaxSize; + sizehints->min_width = sizehints->max_width = width; + sizehints->min_height = sizehints->max_height = height; + XSetWMNormalHints(display, wnd, sizehints); + XFree(sizehints); } - width = (width + 3) & ~3; /* make width a multiple of 32 bits */ - - input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | - VisibilityChangeMask | FocusChangeMask; + StructureNotifyMask | FocusChangeMask; - if (grab_keyboard) - input_mask |= EnterWindowMask | LeaveWindowMask; if (sendmotion) input_mask |= PointerMotionMask; - if (ownbackstore) input_mask |= ExposureMask; - if (fullscreen) - ui_create_window_obj(0, 0, width, height, - CWBackingStore | CWBackPixel | CWOverrideRedirect); - else - ui_create_window_obj(0, 0, width, height, CWBackingStore | CWBackPixel); + 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); - xkeymap_init2(); + /* wait for MapNotify */ + do + { + XMaskEvent(display, StructureNotifyMask, &xevent); + } + while (xevent.type != MapNotify); + + 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 -reset_keys() +xwin_toggle_fullscreen(void) { - /* reset keys */ - uint32 ev_time; - ev_time = time(NULL); - rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LCTRL); - rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LALT); - rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_LSHIFT); - rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RCTRL); - rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RALT); - rdp_send_scancode(ev_time, RDP_KEYRELEASE, SCANCODE_CHAR_RSHIFT); -} + Pixmap contents = 0; -void -toggle_fullscreen() -{ - /* save window contents */ - Pixmap pixmap; - pixmap = XCreatePixmap(display, wnd, width, height, depth); - if (ownbackstore) - XCopyArea(display, backstore, pixmap, gc, 0, 0, width, height, 0, 0); - else - XCopyArea(display, wnd, pixmap, gc, 0, 0, width, height, 0, 0); - fullscreen = fullscreen ? False : True; - close_inputmethod(); - if (ownbackstore) - XFreePixmap(display, backstore); - XFreeGC(display, gc); - XDestroyWindow(display, wnd); - if (fullscreen) + if (!ownbackstore) { - attribs.override_redirect = True; - ui_create_window_obj(0, 0, dpy_width, dpy_height, - CWBackingStore | CWBackPixel | CWOverrideRedirect); + /* need to save contents of window */ + contents = XCreatePixmap(display, wnd, width, height, depth); + XCopyArea(display, wnd, contents, gc, 0, 0, width, height, 0, 0); } - else + + ui_destroy_window(); + fullscreen = !fullscreen; + ui_create_window(); + + XDefineCursor(display, wnd, current_cursor); + + if (!ownbackstore) { - attribs.override_redirect = False; - ui_create_window_obj(0, 0, width, height, CWBackingStore | CWBackPixel); + XCopyArea(display, contents, wnd, gc, 0, 0, width, height, 0, 0); + XFreePixmap(display, contents); } - ui_set_cursor(cache_get_cursor(0)); - ui_move_pointer(width / 2, height / 2); - reset_keys(); - /* restore window contents */ - if (ownbackstore) - XCopyArea(display, pixmap, backstore, gc, 0, 0, width, height, 0, 0); - XCopyArea(display, pixmap, wnd, gc, 0, 0, width, height, 0, 0); - XFreePixmap(display, pixmap); } +/* 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; - /* Refresh keyboard mapping if it has changed. This is important for - Xvnc, since it allocates keycodes dynamically */ - if (XCheckTypedEvent(display, MappingNotify, &xevent)) + while (XPending(display) > 0) { - if (xevent.xmapping.request == MappingKeyboard - || xevent.xmapping.request == MappingModifier) - XRefreshKeyboardMapping(&xevent.xmapping); - } + XNextEvent(display, &xevent); - while (XCheckMaskEvent(display, ~0, &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) @@ -572,48 +458,37 @@ else { /* Plain old XLookupString */ - DEBUG_KBD(("No input context, using XLookupString\n")); + DEBUG_KBD(("\nNo input context, using XLookupString\n")); XLookupString((XKeyEvent *) & xevent, str, sizeof(str), &keysym, NULL); } - if (keysym == XK_Break) /* toggle full screen */ - { - if (get_key_state(XK_Alt_L) || get_key_state(XK_Alt_R)) - { - toggle_fullscreen(); - break; - } - } - - ksname = get_ksname(keysym); - DEBUG_KBD(("\nKeyPress for (keysym 0x%lx, %s)\n", keysym, ksname)); + DEBUG_KBD(("KeyPress for (keysym 0x%lx, %s)\n", keysym, get_ksname(keysym))); - if (inhibit_key(keysym)) - { - DEBUG_KBD(("Inhibiting key\n")); + 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); - ensure_remote_modifiers(ev_time, tr); - if (tr.scancode == 0) break; + ensure_remote_modifiers(ev_time, tr); + 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 (inhibit_key(keysym)) + ev_time = time(NULL); + if (handle_special_keys(keysym, xevent.xkey.state, ev_time, False)) break; tr = xkeymap_translate_key(keysym, @@ -634,28 +509,25 @@ 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 FocusIn: - /* fall through */ - case EnterNotify: + 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 FocusOut: - reset_keys(); - /* fall through */ - case LeaveNotify: - if (grab_keyboard) + if (xevent.xfocus.mode == NotifyWhileGrabbed) XUngrabKeyboard(display, CurrentTime); break; @@ -666,6 +538,21 @@ 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; + } } } @@ -680,13 +567,12 @@ while (True) { + /* Process any events already waiting */ + xwin_process_events(); + FD_ZERO(&rfds); FD_SET(rdp_socket, &rfds); - if (display != NULL) - { - FD_SET(x_socket, &rfds); - XFlush(display); - } + FD_SET(x_socket, &rfds); switch (select(n, &rfds, NULL, NULL, NULL)) { @@ -697,9 +583,6 @@ continue; } - if (FD_ISSET(x_socket, &rfds)) - xwin_process_events(); - if (FD_ISSET(rdp_socket, &rfds)) return; } @@ -718,7 +601,7 @@ Pixmap bitmap; uint8 *tdata; - tdata = (owncolmap ? data : translate_image(width, height, data)); + tdata = translate_image(width, height, data); bitmap = XCreatePixmap(display, wnd, width, height, depth); image = XCreateImage(display, visual, depth, ZPixmap, 0, (char *) tdata, width, height, 8, 0); @@ -726,8 +609,7 @@ XPutImage(display, bitmap, gc, image, 0, 0, 0, 0, width, height); XFree(image); - if (!owncolmap) - xfree(tdata); + xfree(tdata); return (HBITMAP) bitmap; } @@ -737,7 +619,7 @@ XImage *image; uint8 *tdata; - tdata = (owncolmap ? data : translate_image(width, height, data)); + tdata = translate_image(width, height, data); image = XCreateImage(display, visual, depth, ZPixmap, 0, (char *) tdata, width, height, 8, 0); @@ -752,8 +634,7 @@ } XFree(image); - if (!owncolmap) - xfree(tdata); + xfree(tdata); } void @@ -868,7 +749,8 @@ void ui_set_cursor(HCURSOR cursor) { - XDefineCursor(display, wnd, (Cursor) cursor); + current_cursor = (Cursor) cursor; + XDefineCursor(display, wnd, current_cursor); } void @@ -888,67 +770,90 @@ { COLOURENTRY *entry; int i, ncolours = colours->ncolours; + 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; - if (owncolmap) - { - XColor *xcolours, *xentry; - Colormap map; + /* 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; - xcolours = xmalloc(sizeof(XColor) * ncolours); - for (i = 0; i < ncolours; i++) - { - entry = &colours->colours[i]; - xentry = &xcolours[i]; - xentry->pixel = i; - MAKE_XCOLOR(xentry, entry); + /* 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; - map = XCreateColormap(display, wnd, visual, AllocAll); - 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++) + /* update our cache */ + if (xentry.pixel < 256) { - entry = &colours->colours[i]; - MAKE_XCOLOR(&xentry, entry); + xc_cache[xentry.pixel].red = xentry.red; + xc_cache[xentry.pixel].green = xentry.green; + xc_cache[xentry.pixel].blue = xentry.blue; - 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; + + /* byte swap here to make translate_image faster */ + map[i] = translate_colour(colour); } + + return map; } void ui_destroy_colourmap(HCOLOURMAP map) { - if (owncolmap) - XFreeColormap(display, (Colormap) map); - else - xfree(map); + xfree(map); } void ui_set_colourmap(HCOLOURMAP map) { - if (owncolmap) - XSetWindowColormap(display, wnd, (Colormap) map); - else - colmap = map; + colmap = map; } void @@ -964,7 +869,7 @@ } void -ui_reset_clip() +ui_reset_clip(void) { XRectangle rect; @@ -976,7 +881,7 @@ } void -ui_bell() +ui_bell(void) { XBell(display, 0); }