--- sourceforge.net/trunk/rdesktop/xwin.c 2002/09/24 12:25:21 194 +++ sourceforge.net/trunk/rdesktop/xwin.c 2002/11/25 18:23:44 278 @@ -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 @@ -29,8 +29,11 @@ extern BOOL sendmotion; extern BOOL fullscreen; extern BOOL grab_keyboard; +extern BOOL hide_decorations; extern char title[]; BOOL enable_compose = False; +BOOL focused; +BOOL mouse_in_wnd; Display *display; static int x_socket; @@ -42,7 +45,9 @@ 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; @@ -52,6 +57,20 @@ static BOOL ownbackstore; static Pixmap backstore; +/* MWM decorations */ +#define MWM_HINTS_DECORATIONS (1L << 1) +#define PROP_MOTIF_WM_HINTS_ELEMENTS 5 +typedef struct +{ + unsigned long flags; + unsigned long functions; + unsigned long decorations; + long inputMode; + unsigned long status; +} +PropMotifWmHints; + + #define FILL_RECTANGLE(x,y,cx,cy)\ { \ XFillRectangle(display, wnd, gc, x, y, cx, cy); \ @@ -88,6 +107,28 @@ #define SET_FUNCTION(rop2) { if (rop2 != ROP2_COPY) XSetFunction(display, gc, rop2_map[rop2]); } #define RESET_FUNCTION(rop2) { if (rop2 != ROP2_COPY) XSetFunction(display, gc, GXcopy); } +void +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) + { + error("Failed to get atom _MOTIF_WM_HINTS\n"); + return; + } + + XChangeProperty(display, wnd, hintsatom, hintsatom, 32, PropModeReplace, + (unsigned char *) &motif_hints, PROP_MOTIF_WM_HINTS_ELEMENTS); +} + static void translate8(uint8 * data, uint8 * out, uint8 * end) { @@ -183,15 +224,11 @@ } 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) @@ -199,21 +236,16 @@ 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 @@ -226,7 +258,7 @@ display = XOpenDisplay(NULL); if (display == NULL) { - error("Failed to open display\n"); + error("Failed to open display: %s\n", XDisplayName(NULL)); return False; } @@ -267,6 +299,21 @@ host_be = !(BOOL) (*(uint8 *) (&test)); xserver_be = (ImageByteOrder(display) == MSBFirst); + if ((width == 0) || (height == 0)) + { + /* Fetch geometry from _NET_WORKAREA */ + uint32 xpos, ypos; + + if (get_current_workarea(&xpos, &ypos, &width, &height) < 0) + { + error("Failed to get workarea.\n"); + error("Perhaps your window manager does not support EWMH?\n"); + error("Defaulting to geometry 800x600\n"); + width = 800; + height = 600; + } + } + if (fullscreen) { width = WidthOfScreen(screen); @@ -278,13 +325,16 @@ if (ownbackstore) { - backstore = XCreatePixmap(display, RootWindowOfScreen(screen), width, height, depth); + 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); @@ -298,6 +348,8 @@ if (IM != NULL) XCloseIM(IM); + XFreeModifiermap(mod_map); + if (ownbackstore) XFreePixmap(display, backstore); @@ -316,7 +368,7 @@ long input_mask, ic_input_mask; XEvent xevent; - wndwidth = fullscreen ? WidthOfScreen(screen) : width; + wndwidth = fullscreen ? WidthOfScreen(screen) : width; wndheight = fullscreen ? HeightOfScreen(screen) : height; attribs.background_pixel = BlackPixelOfScreen(screen); @@ -329,6 +381,9 @@ XStoreName(display, wnd, title); + if (hide_decorations) + mwm_hide_decorations(); + classhints = XAllocClassHint(); if (classhints != NULL) { @@ -348,32 +403,44 @@ } input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | - StructureNotifyMask | FocusChangeMask; + 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)) + if ((IC != NULL) + && (XGetICValues(IC, XNFilterEvents, &ic_input_mask, NULL) == NULL)) input_mask |= ic_input_mask; } XSelectInput(display, wnd, input_mask); XMapWindow(display, wnd); - /* wait for MapNotify */ - do { - XMaskEvent(display, StructureNotifyMask, &xevent); - } while (xevent.type != MapNotify); + /* wait for VisibilityNotify */ + do + { + XMaskEvent(display, VisibilityChangeMask, &xevent); + } + while (xevent.type != VisibilityNotify); - if (fullscreen) - XSetInputFocus(display, wnd, RevertToPointerRoot, CurrentTime); + 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); return True; } @@ -412,8 +479,9 @@ } } -/* Process all events in Xlib queue */ -static void +/* Process all events in Xlib queue + Returns 0 after user quit, 1 otherwise */ +static int xwin_process_events(void) { XEvent xevent; @@ -421,9 +489,11 @@ 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) { @@ -435,11 +505,18 @@ continue; } - ev_time = time(NULL); 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: if (IC != NULL) /* Multi_key compatible version */ @@ -462,10 +539,11 @@ 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, @@ -478,15 +556,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, @@ -507,27 +586,56 @@ 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: - reset_modifier_keys(); - if (grab_keyboard) + 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 (grab_keyboard) + if (xevent.xfocus.mode == NotifyUngrab) + break; + focused = False; + if (xevent.xfocus.mode == NotifyWhileGrabbed) XUngrabKeyboard(display, CurrentTime); break; + case EnterNotify: + /* 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, xevent.xexpose.x, xevent.xexpose.y, @@ -542,13 +650,22 @@ 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; @@ -559,7 +676,9 @@ while (True) { /* Process any events already waiting */ - xwin_process_events(); + if (!xwin_process_events()) + /* User quit */ + return 0; FD_ZERO(&rfds); FD_SET(rdp_socket, &rfds); @@ -575,7 +694,7 @@ } if (FD_ISSET(rdp_socket, &rfds)) - return; + return 1; } } @@ -779,26 +898,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; } @@ -807,7 +938,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; @@ -994,6 +1126,7 @@ 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, @@ -1008,7 +1141,10 @@ XSetStipple(display, gc, (Pixmap) glyph); XSetTSOrigin(display, gc, x, y); - FILL_RECTANGLE(x, y, cx, cy); + if (ownbackstore) + XFillRectangle(display, backstore, gc, x, y, cx, cy); + else + XFillRectangle(display, wnd, gc, x, y, cx, cy); XSetFillStyle(display, gc, FillSolid); } @@ -1078,7 +1214,7 @@ else { error("this shouldn't be happening\n"); - break; + exit(1); } /* this will move pointer from start to first character after FF command */ length -= i + 3; @@ -1117,8 +1253,15 @@ 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