--- sourceforge.net/trunk/rdesktop/xwin.c 2002/07/29 20:16:22 76 +++ sourceforge.net/trunk/rdesktop/xwin.c 2002/09/12 09:38:31 119 @@ -32,6 +32,7 @@ extern BOOL sendmotion; extern BOOL fullscreen; extern BOOL grab_keyboard; +extern char title[]; Display *display = NULL; static int x_socket; @@ -40,6 +41,8 @@ static Visual *visual; static int depth; static int bpp; +static int dpy_width; +static int dpy_height; /* endianness */ static BOOL host_be; @@ -67,6 +70,10 @@ /* 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)); @@ -217,8 +224,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,26 +247,130 @@ } } +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; +} + 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"); 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); @@ -274,8 +384,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; } @@ -306,50 +415,23 @@ if (attribs.backing_store == NotUseful) ownbackstore = True; + dpy_width = WidthOfScreen(screen); + dpy_height = HeightOfScreen(screen); + if (fullscreen) { attribs.override_redirect = True; - width = WidthOfScreen(screen); - height = HeightOfScreen(screen); + width = dpy_width; + height = dpy_height; } else { attribs.override_redirect = False; } - width = (width + 3) & ~3; /* make width a multiple of 32 bits */ - - wnd = XCreateWindow(display, RootWindowOfScreen(screen), - 0, 0, width, height, 0, CopyFromParent, - InputOutput, CopyFromParent, - CWBackingStore | CWBackPixel | CWOverrideRedirect, - &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); - } - - 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) @@ -358,17 +440,13 @@ 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); + if (fullscreen) + ui_create_window_obj(0, 0, width, height, + CWBackingStore | CWBackPixel | CWOverrideRedirect); + else + ui_create_window_obj(0, 0, width, height, CWBackingStore | CWBackPixel); - XMapWindow(display, wnd); + xkeymap_init2(); return True; } @@ -388,6 +466,58 @@ 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() +{ + /* 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) + { + attribs.override_redirect = True; + ui_create_window_obj(0, 0, dpy_width, dpy_height, + CWBackingStore | CWBackPixel | CWOverrideRedirect); + } + else + { + attribs.override_redirect = False; + ui_create_window_obj(0, 0, width, height, CWBackingStore | CWBackPixel); + } + 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() { @@ -401,20 +531,11 @@ 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)) - { - if (xevent.xmapping.request == MappingKeyboard - || xevent.xmapping.request == MappingModifier) - XRefreshKeyboardMapping(&xevent.xmapping); - } - 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 +550,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(("No 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(("\nKeyPress 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,23 +607,17 @@ /* 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: @@ -527,18 +625,11 @@ 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); + reset_keys(); /* fall through */ case LeaveNotify: if (grab_keyboard) @@ -552,6 +643,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; + } } } @@ -561,11 +661,15 @@ { int n = (rdp_socket > x_socket) ? rdp_socket + 1 : x_socket + 1; fd_set rfds; + XEvent xevent; FD_ZERO(&rfds); while (True) { + /* Process any events already in queue */ + xwin_process_events(); + FD_ZERO(&rfds); FD_SET(rdp_socket, &rfds); if (display != NULL) @@ -584,7 +688,11 @@ } if (FD_ISSET(x_socket, &rfds)) - xwin_process_events(); + { + /* Move new events from socket to queue */ + XPeekEvent(display, &xevent); + continue; + } if (FD_ISSET(rdp_socket, &rfds)) return; @@ -606,8 +714,8 @@ tdata = (owncolmap ? data : 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); + image = XCreateImage(display, visual, depth, ZPixmap, 0, + (char *) tdata, width, height, 8, 0); XPutImage(display, bitmap, gc, image, 0, 0, 0, 0, width, height); @@ -618,15 +726,14 @@ } 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; tdata = (owncolmap ? data : translate_image(width, height, data)); - image = XCreateImage(display, visual, depth, ZPixmap, 0, (char *)tdata, - width, height, 8, 0); + image = XCreateImage(display, visual, depth, ZPixmap, 0, + (char *) tdata, width, height, 8, 0); if (ownbackstore) { @@ -662,7 +769,7 @@ bitmap = XCreatePixmap(display, wnd, width, height, 1); gc = XCreateGC(display, bitmap, 0, NULL); - image = XCreateImage(display, visual, 1, ZPixmap, 0, (char *)data, + image = XCreateImage(display, visual, 1, ZPixmap, 0, (char *) data, width, height, 8, scanline); image->byte_order = MSBFirst; image->bitmap_bit_order = MSBFirst; @@ -903,12 +1010,12 @@ 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); XSetFillStyle(display, gc, FillSolid); + XSetTSOrigin(display, gc, 0, 0); ui_destroy_glyph((HGLYPH) fill); break; @@ -927,8 +1034,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); } @@ -940,8 +1046,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); } @@ -958,22 +1063,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: @@ -1014,8 +1115,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); @@ -1085,8 +1185,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"); @@ -1103,8 +1202,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]; @@ -1120,9 +1218,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; @@ -1144,21 +1240,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); } @@ -1174,8 +1267,8 @@ if (data == NULL) return; - image = XCreateImage(display, visual, depth, ZPixmap, 0, (char *)data, - cx, cy, BitmapPad(display), cx * bpp / 8); + image = XCreateImage(display, visual, depth, ZPixmap, 0, + (char *) data, cx, cy, BitmapPad(display), cx * bpp / 8); if (ownbackstore) {