--- sourceforge.net/trunk/rdesktop/xwin.c 2002/09/14 11:48:44 121 +++ sourceforge.net/trunk/rdesktop/xwin.c 2002/09/18 12:13:08 185 @@ -42,8 +42,6 @@ static Visual *visual; static int depth; static int bpp; -static int dpy_width; -static int dpy_height; /* endianness */ static BOOL host_be; @@ -61,7 +59,6 @@ } /* colour maps */ -static BOOL owncolmap; static Colormap xcolmap; static uint32 *colmap; @@ -73,9 +70,8 @@ /* toggle fullscreen globals */ 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 */ @@ -280,6 +276,19 @@ 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); +} BOOL ui_init() @@ -322,10 +331,7 @@ return False; } - if (depth <= 8) - owncolmap = True; - else - xcolmap = DefaultColormapOfScreen(screen); + xcolmap = DefaultColormapOfScreen(screen); if (DoesBackingStore(screen) == NotUseful) ownbackstore = True; @@ -340,6 +346,9 @@ height = HeightOfScreen(screen); } + /* make sure width is a multiple of 4 */ + width = (width + 3) & ~3; + xkeymap_init(); return True; } @@ -359,6 +368,9 @@ 0, CopyFromParent, InputOutput, CopyFromParent, CWBackPixel | CWBackingStore | CWOverrideRedirect, &attribs); + if (ownbackstore) + backstore = XCreatePixmap(display, wnd, width, height, depth); + XStoreName(display, wnd, title); classhints = XAllocClassHint(); @@ -393,27 +405,12 @@ XSelectInput(display, wnd, input_mask); - gc = XCreateGC(display, wnd, 0, NULL); - - XMapWindow(display, wnd); + xwin_map_window(); - /* 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); + /* 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); - /* make sure the window is focused */ - XSetInputFocus(display, wnd, RevertToPointerRoot, CurrentTime); return True; } @@ -433,45 +430,23 @@ display = NULL; } -void -reset_keys() -{ - /* 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); -} void -toggle_fullscreen() +xwin_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); - ui_create_window(); - 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); + XEvent xevent; + XSetWindowAttributes attribs; + int newwidth, newheight; + + fullscreen = !fullscreen; + newwidth = fullscreen ? WidthOfScreen(screen) : width; + newheight = fullscreen ? HeightOfScreen(screen) : height; + + XUnmapWindow(display, wnd); + attribs.override_redirect = fullscreen; + XMoveResizeWindow(display, wnd, 0, 0, newwidth, newheight); + XChangeWindowAttributes(display, wnd, CWOverrideRedirect, &attribs); + xwin_map_window(); } /* Process all events in Xlib queue */ @@ -479,7 +454,6 @@ xwin_process_events() { XEvent xevent; - KeySym keysym; uint16 button, flags; uint32 ev_time; @@ -488,8 +462,10 @@ char str[256]; Status status; - while (XCheckMaskEvent(display, ~0, &xevent)) + while (XPending(display) > 0) { + XNextEvent(display, &xevent); + if (enable_compose && (XFilterEvent(&xevent, None) == True)) { DEBUG_KBD(("Filtering event\n")); @@ -518,13 +494,13 @@ 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); } 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, ksname)); if (handle_special_keys(keysym, ev_time, True)) break; @@ -577,22 +553,21 @@ MOUSE_FLAG_MOVE, xevent.xmotion.x, xevent.xmotion.y); break; - case FocusIn: - /* fall through */ case EnterNotify: if (grab_keyboard) XGrabKeyboard(display, wnd, True, GrabModeAsync, GrabModeAsync, CurrentTime); break; - case FocusOut: - reset_keys(); - /* fall through */ case LeaveNotify: if (grab_keyboard) XUngrabKeyboard(display, CurrentTime); break; + case FocusIn: + reset_modifier_keys(); + break; + case Expose: XCopyArea(display, backstore, wnd, gc, xevent.xexpose.x, xevent.xexpose.y, @@ -624,7 +599,6 @@ while (True) { /* Process any events already waiting */ - XFlush(display); xwin_process_events(); FD_ZERO(&rfds); @@ -658,7 +632,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); @@ -666,8 +640,7 @@ XPutImage(display, bitmap, gc, image, 0, 0, 0, 0, width, height); XFree(image); - if (!owncolmap) - xfree(tdata); + xfree(tdata); return (HBITMAP) bitmap; } @@ -677,7 +650,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); @@ -692,8 +665,7 @@ } XFree(image); - if (!owncolmap) - xfree(tdata); + xfree(tdata); } void @@ -828,67 +800,77 @@ { 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; + + /* 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; - if (owncolmap) - { - XColor *xcolours, *xentry; - Colormap map; - - 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); + /* 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; - 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 = WhitePixelOfScreen(screen); - - /* 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