--- sourceforge.net/trunk/rdesktop/xwin.c 2002/07/30 00:56:48 80 +++ sourceforge.net/trunk/rdesktop/xwin.c 2002/09/17 16:55:43 182 @@ -32,9 +32,11 @@ extern BOOL sendmotion; extern BOOL fullscreen; extern BOOL grab_keyboard; +extern char title[]; -Display *display = NULL; +Display *display; static int x_socket; +static Screen *screen; static Window wnd; static GC gc; static Visual *visual; @@ -59,13 +61,15 @@ /* 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; +static XIM IM = NULL; +static XIC IC = NULL; + +/* 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)); @@ -217,8 +221,7 @@ It seems to work alright anyway, though. */ if (IC != NULL) { - if (XGetICValues(IC, XNFilterEvents, &filtered_events, NULL) - != NULL) + if (XGetICValues(IC, XNFilterEvents, &filtered_events, NULL) != NULL) { error("Failed to obtain XNFilterEvents value from IC\n"); filtered_events = 0; @@ -241,21 +244,62 @@ } } +BOOL +get_key_state(int keysym) +{ + int keysymMask = 0, modifierpos, key; + Window wDummy1, wDummy2; + int iDummy3, iDummy4, iDummy5, iDummy6; + unsigned int current_state; + int offset; + + XModifierKeymap *map = XGetModifierMapping(display); + KeyCode keycode = XKeysymToKeycode(display, keysym); + + if (keycode == NoSymbol) + return False; + + for (modifierpos = 0; modifierpos < 8; modifierpos++) + { + offset = map->max_keypermod * modifierpos; + + for (key = 0; key < map->max_keypermod; key++) + { + if (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); +} BOOL -ui_create_window(char *title) +ui_init() { - 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"); @@ -274,8 +318,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; } @@ -295,35 +338,43 @@ else xcolmap = DefaultColormapOfScreen(screen); + if (DoesBackingStore(screen) == NotUseful) + ownbackstore = True; + test = 1; host_be = !(BOOL) (*(uint8 *) (&test)); xserver_be = (ImageByteOrder(display) == MSBFirst); - white = WhitePixelOfScreen(screen); - attribs.background_pixel = BlackPixelOfScreen(screen); - attribs.backing_store = DoesBackingStore(screen); - - if (attribs.backing_store == NotUseful) - ownbackstore = True; - if (fullscreen) { - attribs.override_redirect = True; width = WidthOfScreen(screen); height = HeightOfScreen(screen); } - else - { - attribs.override_redirect = False; - } - width = (width + 3) & ~3; /* make width a multiple of 32 bits */ + /* make sure width is a multiple of 4 */ + width = (width + 3) & ~3; + + xkeymap_init(); + return True; +} + +BOOL +ui_create_window() +{ + XSetWindowAttributes attribs; + XClassHint *classhints; + XSizeHints *sizehints; + XEvent xevent; + + attribs.background_pixel = BlackPixelOfScreen(screen); + attribs.backing_store = ownbackstore ? NotUseful : Always; + attribs.override_redirect = fullscreen; + wnd = XCreateWindow(display, RootWindowOfScreen(screen), 0, 0, width, height, + 0, CopyFromParent, InputOutput, CopyFromParent, + CWBackPixel | CWBackingStore | CWOverrideRedirect, &attribs); - wnd = XCreateWindow(display, RootWindowOfScreen(screen), - 0, 0, width, height, 0, CopyFromParent, - InputOutput, CopyFromParent, - CWBackingStore | CWBackPixel | CWOverrideRedirect, - &attribs); + if (ownbackstore) + backstore = XCreatePixmap(display, wnd, width, height, depth); XStoreName(display, wnd, title); @@ -345,30 +396,26 @@ XFree(sizehints); } - xkeymap_init2(); + input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | + VisibilityChangeMask | FocusChangeMask; - input_mask = - KeyPressMask | KeyReleaseMask | ButtonPressMask | - ButtonReleaseMask; if (grab_keyboard) input_mask |= EnterWindowMask | LeaveWindowMask; if (sendmotion) input_mask |= PointerMotionMask; - if (ownbackstore) input_mask |= ExposureMask; - if (enable_compose) input_mask |= init_inputmethod(); XSelectInput(display, wnd, input_mask); - gc = XCreateGC(display, wnd, 0, NULL); - - if (ownbackstore) - backstore = XCreatePixmap(display, wnd, width, height, depth); + xwin_map_window(); - XMapWindow(display, wnd); + /* 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); return True; } @@ -388,11 +435,30 @@ display = NULL; } + +void +xwin_toggle_fullscreen() +{ + 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 */ static void xwin_process_events() { XEvent xevent; - KeySym keysym; uint16 button, flags; uint32 ev_time; @@ -401,20 +467,13 @@ char str[256]; Status status; - /* 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)) { - DEBUG_KBD("Filtering event\n"); + DEBUG_KBD(("Filtering event\n")); continue; } @@ -429,73 +488,56 @@ { XmbLookupString(IC, (XKeyPressedEvent *) & - xevent, str, - sizeof(str), &keysym, - &status); - if (! - ((status == XLookupKeySym) - || (status == XLookupBoth))) + xevent, str, sizeof(str), &keysym, &status); + if (!((status == XLookupKeySym) || (status == XLookupBoth))) { - error("XmbLookupString failed with status 0x%x\n", status); + error("XmbLookupString failed with status 0x%x\n", + status); break; } } 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); + 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 (inhibit_key(keysym)) - { - DEBUG_KBD("Inhibiting key\n"); + if (handle_special_keys(keysym, ev_time, True)) break; - } tr = xkeymap_translate_key(keysym, - xevent.xkey. - keycode, - xevent.xkey.state); - - ensure_remote_modifiers(ev_time, tr); + xevent.xkey.keycode, xevent.xkey.state); if (tr.scancode == 0) break; - rdp_send_scancode(ev_time, RDP_KEYPRESS, - tr.scancode); + 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); + DEBUG_KBD(("\nKeyRelease for (keysym 0x%lx, %s)\n", keysym, + ksname)); - if (inhibit_key(keysym)) + if (handle_special_keys(keysym, ev_time, False)) break; tr = xkeymap_translate_key(keysym, - xevent.xkey. - keycode, - xevent.xkey.state); + xevent.xkey.keycode, xevent.xkey.state); if (tr.scancode == 0) break; - rdp_send_scancode(ev_time, RDP_KEYRELEASE, - tr.scancode); + rdp_send_scancode(ev_time, RDP_KEYRELEASE, tr.scancode); break; case ButtonPress: @@ -503,49 +545,34 @@ /* fall through */ case ButtonRelease: - button = xkeymap_translate_button(xevent. - xbutton. - button); + button = xkeymap_translate_button(xevent.xbutton.button); if (button == 0) break; rdp_send_input(ev_time, RDP_INPUT_MOUSE, - flags | button, - xevent.xbutton.x, - xevent.xbutton.y); + flags | button, xevent.xbutton.x, xevent.xbutton.y); break; case MotionNotify: rdp_send_input(ev_time, RDP_INPUT_MOUSE, - MOUSE_FLAG_MOVE, - xevent.xmotion.x, - xevent.xmotion.y); + 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); + GrabModeAsync, GrabModeAsync, CurrentTime); break; - case FocusOut: - /* reset keys */ - rdp_send_input(ev_time, RDP_INPUT_SCANCODE, - KBD_FLAG_DOWN | KBD_FLAG_UP, - SCANCODE_CHAR_LCTRL, 0); - rdp_send_input(ev_time, RDP_INPUT_SCANCODE, - KBD_FLAG_DOWN | KBD_FLAG_UP, - SCANCODE_CHAR_LALT, 0); - /* 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, @@ -553,6 +580,15 @@ 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); + break; + } } } @@ -567,13 +603,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)) { @@ -584,9 +619,6 @@ continue; } - if (FD_ISSET(x_socket, &rfds)) - xwin_process_events(); - if (FD_ISSET(rdp_socket, &rfds)) return; } @@ -619,8 +651,7 @@ } 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; @@ -811,7 +842,7 @@ if (XAllocColor(display, xcolmap, &xentry) != 0) colour = xentry.pixel; else - colour = white; + colour = WhitePixelOfScreen(screen); /* byte swap here to make translate_image faster */ map[i] = translate_colour(colour); @@ -904,8 +935,7 @@ SET_BACKGROUND(fgcolour); XSetFillStyle(display, gc, FillOpaqueStippled); XSetStipple(display, gc, fill); - XSetTSOrigin(display, gc, brush->xorigin, - brush->yorigin); + XSetTSOrigin(display, gc, brush->xorigin, brush->yorigin); FILL_RECTANGLE(x, y, cx, cy); @@ -929,8 +959,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); } @@ -942,8 +971,7 @@ SET_FUNCTION(opcode); 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); } @@ -960,22 +988,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: @@ -1016,8 +1040,7 @@ SET_BACKGROUND(bgcolour); XSetFillStyle(display, gc, - (mixmode == - MIX_TRANSPARENT) ? FillStippled : FillOpaqueStippled); + (mixmode == MIX_TRANSPARENT) ? FillStippled : FillOpaqueStippled); XSetStipple(display, gc, (Pixmap) glyph); XSetTSOrigin(display, gc, x, y); @@ -1087,8 +1110,7 @@ { case 0xff: if (i + 2 < length) - cache_put_text(text[i + 1], text, - text[i + 2]); + cache_put_text(text[i + 1], text, text[i + 2]); else { error("this shouldn't be happening\n"); @@ -1105,8 +1127,7 @@ if (entry != NULL) { if ((((uint8 *) (entry->data))[1] == - 0) - && (!(flags & TEXT2_IMPLICIT_X))) + 0) && (!(flags & TEXT2_IMPLICIT_X))) { if (flags & TEXT2_VERTICAL) y += text[i + 2]; @@ -1122,9 +1143,7 @@ text = &(text[i]); i = 0; for (j = 0; j < entry->size; j++) - DO_GLYPH(((uint8 *) (entry-> - data)), - j); + DO_GLYPH(((uint8 *) (entry->data)), j); } break; @@ -1146,21 +1165,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); + cache_put_desktop(offset, cx, cy, image->bytes_per_line, bpp / 8, (uint8 *) image->data); XDestroyImage(image); } @@ -1177,8 +1193,7 @@ return; image = XCreateImage(display, visual, depth, ZPixmap, 0, - (char *) data, cx, cy, BitmapPad(display), - cx * bpp / 8); + (char *) data, cx, cy, BitmapPad(display), cx * bpp / 8); if (ownbackstore) {