--- sourceforge.net/trunk/rdesktop/xwin.c 2005/11/18 22:46:38 1029 +++ sourceforge.net/trunk/rdesktop/xwin.c 2007/01/17 07:39:31 1380 @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. User interface services - X Window System - Copyright (C) Matthew Chapman 1999-2005 + Copyright (C) Matthew Chapman 1999-2007 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 @@ -20,6 +20,7 @@ #include #include +#include #include #include #include @@ -33,12 +34,14 @@ extern int g_xpos; extern int g_ypos; extern int g_pos; -extern BOOL g_sendmotion; -extern BOOL g_fullscreen; -extern BOOL g_grab_keyboard; -extern BOOL g_hide_decorations; +extern RD_BOOL g_sendmotion; +extern RD_BOOL g_fullscreen; +extern RD_BOOL g_grab_keyboard; +extern RD_BOOL g_hide_decorations; extern char g_title[]; -extern int g_server_bpp; +/* Color depth of the RDP session. + As of RDP 5.1, it may be 8, 15, 16 or 24. */ +extern int g_server_depth; extern int g_win_button_size; Display *g_display; @@ -46,45 +49,103 @@ static int g_x_socket; static Screen *g_screen; Window g_wnd; + +/* SeamlessRDP support */ +typedef struct _seamless_group +{ + Window wnd; + unsigned long id; + unsigned int refcnt; +} seamless_group; +typedef struct _seamless_window +{ + Window wnd; + unsigned long id; + unsigned long behind; + seamless_group *group; + int xoffset, yoffset; + int width, height; + int state; /* normal/minimized/maximized. */ + unsigned int desktop; + struct timeval *position_timer; + + RD_BOOL outstanding_position; + unsigned int outpos_serial; + int outpos_xoffset, outpos_yoffset; + int outpos_width, outpos_height; + + struct _seamless_window *next; +} seamless_window; +static seamless_window *g_seamless_windows = NULL; +static unsigned long g_seamless_focused = 0; +static RD_BOOL g_seamless_started = False; /* Server end is up and running */ +static RD_BOOL g_seamless_active = False; /* We are currently in seamless mode */ +static RD_BOOL g_seamless_hidden = False; /* Desktop is hidden on server */ +extern RD_BOOL g_seamless_rdp; + extern uint32 g_embed_wnd; -BOOL g_enable_compose = False; -BOOL g_Unobscured; /* used for screenblt */ +RD_BOOL g_enable_compose = False; +RD_BOOL g_Unobscured; /* used for screenblt */ static GC g_gc = NULL; static GC g_create_bitmap_gc = NULL; static GC g_create_glyph_gc = NULL; +static XRectangle g_clip_rectangle; static Visual *g_visual; +/* Color depth of the X11 visual of our window (e.g. 24 for True Color R8G8B visual). + This may be 32 for R8G8B8 visuals, and then the rest of the bits are undefined + as far as we're concerned. */ static int g_depth; +/* Bits-per-Pixel of the pixmaps we'll be using to draw on our window. + This may be larger than g_depth, in which case some of the bits would + be kept solely for alignment (e.g. 32bpp pixmaps on a 24bpp visual). */ static int g_bpp; static XIM g_IM; static XIC g_IC; static XModifierKeymap *g_mod_map; static Cursor g_current_cursor; -static HCURSOR g_null_cursor = NULL; +static RD_HCURSOR g_null_cursor = NULL; static Atom g_protocol_atom, g_kill_atom; -static BOOL g_focused; -static BOOL g_mouse_in_wnd; -static BOOL g_arch_match = False; /* set to True if RGB XServer and little endian */ +extern Atom g_net_wm_state_atom; +extern Atom g_net_wm_desktop_atom; +static RD_BOOL g_focused; +static RD_BOOL g_mouse_in_wnd; +/* Indicates that: + 1) visual has 15, 16 or 24 depth and the same color channel masks + as its RDP equivalent (implies X server is LE), + 2) host is LE + This will trigger an optimization whose real value is questionable. +*/ +static RD_BOOL g_compatible_arch; +/* Indicates whether RDP's bitmaps and our XImages have the same + binary format. If so, we can avoid an expensive translation. + Note that this can be true when g_compatible_arch is false, + e.g.: + + RDP(LE) <-> host(BE) <-> X-Server(LE) + + ('host' is the machine running rdesktop; the host simply memcpy's + so its endianess doesn't matter) + */ +static RD_BOOL g_no_translate_image = False; /* endianness */ -static BOOL g_host_be; -static BOOL g_xserver_be; +static RD_BOOL g_host_be; +static RD_BOOL g_xserver_be; static int g_red_shift_r, g_blue_shift_r, g_green_shift_r; static int g_red_shift_l, g_blue_shift_l, g_green_shift_l; /* software backing store */ -extern BOOL g_ownbackstore; +extern RD_BOOL g_ownbackstore; static Pixmap g_backstore = 0; /* Moving in single app mode */ -static BOOL g_moving_wnd; +static RD_BOOL g_moving_wnd; static int g_move_x_offset = 0; static int g_move_y_offset = 0; -static BOOL g_using_full_workarea = False; +static RD_BOOL g_using_full_workarea = False; #ifdef WITH_RDPSND -extern int g_dsp_fd; -extern BOOL g_dsp_busy; -extern BOOL g_rdpsnd; +extern RD_BOOL g_rdpsnd; #endif /* MWM decorations */ @@ -92,11 +153,11 @@ #define PROP_MOTIF_WM_HINTS_ELEMENTS 5 typedef struct { - uint32 flags; - uint32 functions; - uint32 decorations; - sint32 inputMode; - uint32 status; + unsigned long flags; + unsigned long functions; + unsigned long decorations; + long inputMode; + unsigned long status; } PropMotifWmHints; @@ -108,10 +169,46 @@ } PixelColour; +#define ON_ALL_SEAMLESS_WINDOWS(func, args) \ + do { \ + seamless_window *sw; \ + XRectangle rect; \ + if (!g_seamless_windows) break; \ + for (sw = g_seamless_windows; sw; sw = sw->next) { \ + rect.x = g_clip_rectangle.x - sw->xoffset; \ + rect.y = g_clip_rectangle.y - sw->yoffset; \ + rect.width = g_clip_rectangle.width; \ + rect.height = g_clip_rectangle.height; \ + XSetClipRectangles(g_display, g_gc, 0, 0, &rect, 1, YXBanded); \ + func args; \ + } \ + XSetClipRectangles(g_display, g_gc, 0, 0, &g_clip_rectangle, 1, YXBanded); \ + } while (0) + +static void +seamless_XFillPolygon(Drawable d, XPoint * points, int npoints, int xoffset, int yoffset) +{ + points[0].x -= xoffset; + points[0].y -= yoffset; + XFillPolygon(g_display, d, g_gc, points, npoints, Complex, CoordModePrevious); + points[0].x += xoffset; + points[0].y += yoffset; +} + +static void +seamless_XDrawLines(Drawable d, XPoint * points, int npoints, int xoffset, int yoffset) +{ + points[0].x -= xoffset; + points[0].y -= yoffset; + XDrawLines(g_display, d, g_gc, points, npoints, CoordModePrevious); + points[0].x += xoffset; + points[0].y += yoffset; +} #define FILL_RECTANGLE(x,y,cx,cy)\ { \ XFillRectangle(g_display, g_wnd, g_gc, x, y, cx, cy); \ + ON_ALL_SEAMLESS_WINDOWS(XFillRectangle, (g_display, sw->wnd, g_gc, x-sw->xoffset, y-sw->yoffset, cx, cy)); \ if (g_ownbackstore) \ XFillRectangle(g_display, g_backstore, g_gc, x, y, cx, cy); \ } @@ -126,6 +223,7 @@ XFillPolygon(g_display, g_wnd, g_gc, p, np, Complex, CoordModePrevious); \ if (g_ownbackstore) \ XFillPolygon(g_display, g_backstore, g_gc, p, np, Complex, CoordModePrevious); \ + ON_ALL_SEAMLESS_WINDOWS(seamless_XFillPolygon, (sw->wnd, p, np, sw->xoffset, sw->yoffset)); \ } #define DRAW_ELLIPSE(x,y,cx,cy,m)\ @@ -134,11 +232,13 @@ { \ case 0: /* Outline */ \ XDrawArc(g_display, g_wnd, g_gc, x, y, cx, cy, 0, 360*64); \ + ON_ALL_SEAMLESS_WINDOWS(XDrawArc, (g_display, sw->wnd, g_gc, x-sw->xoffset, y-sw->yoffset, cx, cy, 0, 360*64)); \ if (g_ownbackstore) \ XDrawArc(g_display, g_backstore, g_gc, x, y, cx, cy, 0, 360*64); \ break; \ case 1: /* Filled */ \ XFillArc(g_display, g_wnd, g_gc, x, y, cx, cy, 0, 360*64); \ + ON_ALL_SEAMLESS_WINDOWS(XFillArc, (g_display, sw->wnd, g_gc, x-sw->xoffset, y-sw->yoffset, cx, cy, 0, 360*64)); \ if (g_ownbackstore) \ XFillArc(g_display, g_backstore, g_gc, x, y, cx, cy, 0, 360*64); \ break; \ @@ -146,11 +246,11 @@ } /* colour maps */ -extern BOOL g_owncolmap; +extern RD_BOOL g_owncolmap; static Colormap g_xcolmap; static uint32 *g_colmap = NULL; -#define TRANSLATE(col) ( g_server_bpp != 8 ? translate_colour(col) : g_owncolmap ? col : g_colmap[col] ) +#define TRANSLATE(col) ( g_server_depth != 8 ? translate_colour(col) : g_owncolmap ? col : g_colmap[col] ) #define SET_FOREGROUND(col) XSetForeground(g_display, g_gc, TRANSLATE(col)); #define SET_BACKGROUND(col) XSetBackground(g_display, g_gc, TRANSLATE(col)); @@ -176,8 +276,230 @@ #define SET_FUNCTION(rop2) { if (rop2 != ROP2_COPY) XSetFunction(g_display, g_gc, rop2_map[rop2]); } #define RESET_FUNCTION(rop2) { if (rop2 != ROP2_COPY) XSetFunction(g_display, g_gc, GXcopy); } +static seamless_window * +sw_get_window_by_id(unsigned long id) +{ + seamless_window *sw; + for (sw = g_seamless_windows; sw; sw = sw->next) + { + if (sw->id == id) + return sw; + } + return NULL; +} + + +static seamless_window * +sw_get_window_by_wnd(Window wnd) +{ + seamless_window *sw; + for (sw = g_seamless_windows; sw; sw = sw->next) + { + if (sw->wnd == wnd) + return sw; + } + return NULL; +} + + +static void +sw_remove_window(seamless_window * win) +{ + seamless_window *sw, **prevnext = &g_seamless_windows; + for (sw = g_seamless_windows; sw; sw = sw->next) + { + if (sw == win) + { + *prevnext = sw->next; + sw->group->refcnt--; + if (sw->group->refcnt == 0) + { + XDestroyWindow(g_display, sw->group->wnd); + xfree(sw->group); + } + xfree(sw->position_timer); + xfree(sw); + return; + } + prevnext = &sw->next; + } + return; +} + + +/* Move all windows except wnd to new desktop */ static void -mwm_hide_decorations(void) +sw_all_to_desktop(Window wnd, unsigned int desktop) +{ + seamless_window *sw; + for (sw = g_seamless_windows; sw; sw = sw->next) + { + if (sw->wnd == wnd) + continue; + if (sw->desktop != desktop) + { + ewmh_move_to_desktop(sw->wnd, desktop); + sw->desktop = desktop; + } + } +} + + +/* Send our position */ +static void +sw_update_position(seamless_window * sw) +{ + XWindowAttributes wa; + int x, y; + Window child_return; + unsigned int serial; + + XGetWindowAttributes(g_display, sw->wnd, &wa); + XTranslateCoordinates(g_display, sw->wnd, wa.root, + -wa.border_width, -wa.border_width, &x, &y, &child_return); + + serial = seamless_send_position(sw->id, x, y, wa.width, wa.height, 0); + + sw->outstanding_position = True; + sw->outpos_serial = serial; + + sw->outpos_xoffset = x; + sw->outpos_yoffset = y; + sw->outpos_width = wa.width; + sw->outpos_height = wa.height; +} + + +/* Check if it's time to send our position */ +static void +sw_check_timers() +{ + seamless_window *sw; + struct timeval now; + + gettimeofday(&now, NULL); + for (sw = g_seamless_windows; sw; sw = sw->next) + { + if (timerisset(sw->position_timer) && timercmp(sw->position_timer, &now, <)) + { + timerclear(sw->position_timer); + sw_update_position(sw); + } + } +} + + +static void +sw_restack_window(seamless_window * sw, unsigned long behind) +{ + seamless_window *sw_above; + + /* Remove window from stack */ + for (sw_above = g_seamless_windows; sw_above; sw_above = sw_above->next) + { + if (sw_above->behind == sw->id) + break; + } + + if (sw_above) + sw_above->behind = sw->behind; + + /* And then add it at the new position */ + for (sw_above = g_seamless_windows; sw_above; sw_above = sw_above->next) + { + if (sw_above->behind == behind) + break; + } + + if (sw_above) + sw_above->behind = sw->id; + + sw->behind = behind; +} + + +static void +sw_handle_restack(seamless_window * sw) +{ + Status status; + Window root, parent, *children; + unsigned int nchildren, i; + seamless_window *sw_below; + + status = XQueryTree(g_display, RootWindowOfScreen(g_screen), + &root, &parent, &children, &nchildren); + if (!status || !nchildren) + return; + + sw_below = NULL; + + i = 0; + while (children[i] != sw->wnd) + { + i++; + if (i >= nchildren) + goto end; + } + + for (i++; i < nchildren; i++) + { + sw_below = sw_get_window_by_wnd(children[i]); + if (sw_below) + break; + } + + if (!sw_below && !sw->behind) + goto end; + if (sw_below && (sw_below->id == sw->behind)) + goto end; + + if (sw_below) + { + seamless_send_zchange(sw->id, sw_below->id, 0); + sw_restack_window(sw, sw_below->id); + } + else + { + seamless_send_zchange(sw->id, 0, 0); + sw_restack_window(sw, 0); + } + + end: + XFree(children); +} + + +static seamless_group * +sw_find_group(unsigned long id, RD_BOOL dont_create) +{ + seamless_window *sw; + seamless_group *sg; + XSetWindowAttributes attribs; + + for (sw = g_seamless_windows; sw; sw = sw->next) + { + if (sw->group->id == id) + return sw->group; + } + + if (dont_create) + return NULL; + + sg = xmalloc(sizeof(seamless_group)); + + sg->wnd = + XCreateWindow(g_display, RootWindowOfScreen(g_screen), -1, -1, 1, 1, 0, + CopyFromParent, CopyFromParent, CopyFromParent, 0, &attribs); + + sg->id = id; + sg->refcnt = 0; + + return sg; +} + + +static void +mwm_hide_decorations(Window wnd) { PropMotifWmHints motif_hints; Atom hintsatom; @@ -194,8 +516,9 @@ return; } - XChangeProperty(g_display, g_wnd, hintsatom, hintsatom, 32, PropModeReplace, + XChangeProperty(g_display, wnd, hintsatom, hintsatom, 32, PropModeReplace, (unsigned char *) &motif_hints, PROP_MOTIF_WM_HINTS_ELEMENTS); + } #define SPLITCOLOUR15(colour, rv) \ @@ -229,6 +552,9 @@ #define BSWAP32(x) { x = (((x & 0xff00ff) << 8) | ((x >> 8) & 0xff00ff)); \ x = (x << 16) | (x >> 16); } +/* The following macros output the same octet sequences + on both BE and LE hosts: */ + #define BOUT16(o, x) { *(o++) = x >> 8; *(o++) = x; } #define BOUT24(o, x) { *(o++) = x >> 16; *(o++) = x >> 8; *(o++) = x; } #define BOUT32(o, x) { *(o++) = x >> 24; *(o++) = x >> 16; *(o++) = x >> 8; *(o++) = x; } @@ -240,7 +566,7 @@ translate_colour(uint32 colour) { PixelColour pc; - switch (g_server_bpp) + switch (g_server_depth) { case 15: SPLITCOLOUR15(colour, pc); @@ -251,6 +577,12 @@ case 24: SPLITCOLOUR24(colour, pc); break; + default: + /* Avoid warning */ + pc.red = 0; + pc.green = 0; + pc.blue = 0; + break; } return MAKECOLOUR(pc); } @@ -302,7 +634,7 @@ { uint16 value; - if (g_arch_match) + if (g_compatible_arch) { /* *INDENT-OFF* */ REPEAT2 @@ -336,7 +668,7 @@ { uint32 value; - if (g_xserver_be) + if (g_compatible_arch) { while (out < end) { @@ -359,7 +691,7 @@ { uint32 value; - if (g_arch_match) + if (g_compatible_arch) { /* *INDENT-OFF* */ REPEAT4 @@ -431,7 +763,7 @@ uint16 pixel; PixelColour pc; - if (g_arch_match) + if (g_compatible_arch) { /* *INDENT-OFF* */ REPEAT3 @@ -481,7 +813,7 @@ uint32 value; PixelColour pc; - if (g_arch_match) + if (g_compatible_arch) { /* *INDENT-OFF* */ REPEAT4 @@ -589,7 +921,7 @@ uint16 pixel; PixelColour pc; - if (g_arch_match) + if (g_compatible_arch) { /* *INDENT-OFF* */ REPEAT3 @@ -659,7 +991,7 @@ uint32 value; PixelColour pc; - if (g_arch_match) + if (g_compatible_arch) { /* *INDENT-OFF* */ REPEAT4 @@ -788,7 +1120,7 @@ uint32 value; PixelColour pc; - if (g_arch_match) + if (g_compatible_arch) { /* *INDENT-OFF* */ #ifdef NEED_ALIGN @@ -802,9 +1134,10 @@ #else REPEAT4 ( - *((uint32 *) out) = *((uint32 *) data); - out += 4; - data += 3; + /* Only read 3 bytes. Reading 4 bytes means reading beyond buffer. */ + *((uint32 *) out) = *((uint16 *) data) + (*((uint8 *) data + 2) << 16); + out += 4; + data += 3; ) #endif /* *INDENT-ON* */ @@ -842,16 +1175,19 @@ uint8 *out; uint8 *end; - /* if server and xserver bpp match, */ - /* and arch(endian) matches, no need to translate */ - /* just return data */ - if (g_arch_match) + /* + If RDP depth and X Visual depths match, + and arch(endian) matches, no need to translate: + just return data. + Note: select_visual should've already ensured g_no_translate + is only set for compatible depths, but the RDP depth might've + changed during connection negotiations. + */ + if (g_no_translate_image) { - if (g_depth == 15 && g_server_bpp == 15) - return data; - if (g_depth == 16 && g_server_bpp == 16) - return data; - if (g_depth == 24 && g_bpp == 24 && g_server_bpp == 24) + if ((g_depth == 15 && g_server_depth == 15) || + (g_depth == 16 && g_server_depth == 16) || + (g_depth == 24 && g_server_depth == 24)) return data; } @@ -859,7 +1195,7 @@ out = (uint8 *) xmalloc(size); end = out + size; - switch (g_server_bpp) + switch (g_server_depth) { case 24: switch (g_bpp) @@ -924,7 +1260,7 @@ return out; } -BOOL +RD_BOOL get_key_state(unsigned int state, uint32 keysym) { int modifierpos, key, keysymMask = 0; @@ -957,126 +1293,285 @@ *shift_r = 8 - ffs(mask & ~(mask >> 1)); } -BOOL -ui_init(void) +/* Given a mask of a colour channel (e.g. XVisualInfo.red_mask), + calculates the bits-per-pixel of this channel (a.k.a. colour weight). + */ +static unsigned +calculate_mask_weight(uint32 mask) +{ + unsigned weight = 0; + do + { + weight += (mask & 1); + } + while (mask >>= 1); + return weight; +} + +static RD_BOOL +select_visual(int screen_num) { - XVisualInfo vi; XPixmapFormatValues *pfm; - uint16 test; - int i, screen_num, nvisuals; + int pixmap_formats_count, visuals_count; XVisualInfo *vmatches = NULL; XVisualInfo template; - Bool TrueColorVisual = False; + int i; + unsigned red_weight, blue_weight, green_weight; - g_display = XOpenDisplay(NULL); - if (g_display == NULL) + red_weight = blue_weight = green_weight = 0; + + if (g_server_depth == -1) { - error("Failed to open display: %s\n", XDisplayName(NULL)); - return False; + g_server_depth = DisplayPlanes(g_display, DefaultScreen(g_display)); } - screen_num = DefaultScreen(g_display); - g_x_socket = ConnectionNumber(g_display); - g_screen = ScreenOfDisplay(g_display, screen_num); - g_depth = DefaultDepthOfScreen(g_screen); + pfm = XListPixmapFormats(g_display, &pixmap_formats_count); + if (pfm == NULL) + { + error("Unable to get list of pixmap formats from display.\n"); + XCloseDisplay(g_display); + return False; + } - /* Search for best TrueColor depth */ + /* Search for best TrueColor visual */ template.class = TrueColor; - vmatches = XGetVisualInfo(g_display, VisualClassMask, &template, &nvisuals); + template.screen = screen_num; + vmatches = + XGetVisualInfo(g_display, VisualClassMask | VisualScreenMask, &template, + &visuals_count); + g_visual = NULL; + g_no_translate_image = False; + g_compatible_arch = False; + if (vmatches != NULL) + { + for (i = 0; i < visuals_count; ++i) + { + XVisualInfo *visual_info = &vmatches[i]; + RD_BOOL can_translate_to_bpp = False; + int j; + + /* Try to find a no-translation visual that'll + allow us to use RDP bitmaps directly as ZPixmaps. */ + if (!g_xserver_be && (((visual_info->depth == 15) && + /* R5G5B5 */ + (visual_info->red_mask == 0x7c00) && + (visual_info->green_mask == 0x3e0) && + (visual_info->blue_mask == 0x1f)) || + ((visual_info->depth == 16) && + /* R5G6B5 */ + (visual_info->red_mask == 0xf800) && + (visual_info->green_mask == 0x7e0) && + (visual_info->blue_mask == 0x1f)) || + ((visual_info->depth == 24) && + /* R8G8B8 */ + (visual_info->red_mask == 0xff0000) && + (visual_info->green_mask == 0xff00) && + (visual_info->blue_mask == 0xff)))) + { + g_visual = visual_info->visual; + g_depth = visual_info->depth; + g_compatible_arch = !g_host_be; + g_no_translate_image = (visual_info->depth == g_server_depth); + if (g_no_translate_image) + /* We found the best visual */ + break; + } + else + { + g_compatible_arch = False; + } + + if (visual_info->depth > 24) + { + /* Avoid 32-bit visuals and likes like the plague. + They're either untested or proven to work bad + (e.g. nvidia's Composite 32-bit visual). + Most implementation offer a 24-bit visual anyway. */ + continue; + } - nvisuals--; - while (nvisuals >= 0) - { - if ((vmatches + nvisuals)->depth > g_depth) - { - g_depth = (vmatches + nvisuals)->depth; + /* Only care for visuals, for whose BPPs (not depths!) + we have a translateXtoY function. */ + for (j = 0; j < pixmap_formats_count; ++j) + { + if (pfm[j].depth == visual_info->depth) + { + if ((pfm[j].bits_per_pixel == 16) || + (pfm[j].bits_per_pixel == 24) || + (pfm[j].bits_per_pixel == 32)) + { + can_translate_to_bpp = True; + } + break; + } + } + + /* Prefer formats which have the most colour depth. + We're being truly aristocratic here, minding each + weight on its own. */ + if (can_translate_to_bpp) + { + unsigned vis_red_weight = + calculate_mask_weight(visual_info->red_mask); + unsigned vis_green_weight = + calculate_mask_weight(visual_info->green_mask); + unsigned vis_blue_weight = + calculate_mask_weight(visual_info->blue_mask); + if ((vis_red_weight >= red_weight) + && (vis_green_weight >= green_weight) + && (vis_blue_weight >= blue_weight)) + { + red_weight = vis_red_weight; + green_weight = vis_green_weight; + blue_weight = vis_blue_weight; + g_visual = visual_info->visual; + g_depth = visual_info->depth; + } + } } - nvisuals--; - TrueColorVisual = True; + XFree(vmatches); } - test = 1; - g_host_be = !(BOOL) (*(uint8 *) (&test)); - g_xserver_be = (ImageByteOrder(g_display) == MSBFirst); - - if ((g_server_bpp == 8) && ((!TrueColorVisual) || (g_depth <= 8))) + if (g_visual != NULL) { - /* we use a colourmap, so the default visual should do */ - g_visual = DefaultVisualOfScreen(g_screen); - g_depth = DefaultDepthOfScreen(g_screen); - - /* Do not allocate colours on a TrueColor visual */ - if (g_visual->class == TrueColor) - { - g_owncolmap = False; - } + g_owncolmap = False; + calculate_shifts(g_visual->red_mask, &g_red_shift_r, &g_red_shift_l); + calculate_shifts(g_visual->green_mask, &g_green_shift_r, &g_green_shift_l); + calculate_shifts(g_visual->blue_mask, &g_blue_shift_r, &g_blue_shift_l); } else { - /* need a truecolour visual */ - if (!XMatchVisualInfo(g_display, screen_num, g_depth, TrueColor, &vi)) - { - error("The display does not support true colour - high colour support unavailable.\n"); + template.class = PseudoColor; + template.depth = 8; + template.colormap_size = 256; + vmatches = + XGetVisualInfo(g_display, + VisualClassMask | VisualDepthMask | VisualColormapSizeMask, + &template, &visuals_count); + if (vmatches == NULL) + { + error("No usable TrueColor or PseudoColor visuals on this display.\n"); + XCloseDisplay(g_display); + XFree(pfm); return False; } - g_visual = vi.visual; - g_owncolmap = False; - calculate_shifts(vi.red_mask, &g_red_shift_r, &g_red_shift_l); - calculate_shifts(vi.blue_mask, &g_blue_shift_r, &g_blue_shift_l); - calculate_shifts(vi.green_mask, &g_green_shift_r, &g_green_shift_l); + /* we use a colourmap, so the default visual should do */ + g_owncolmap = True; + g_visual = vmatches[0].visual; + g_depth = vmatches[0].depth; + } - /* if RGB video and everything is little endian */ - if ((vi.red_mask > vi.green_mask && vi.green_mask > vi.blue_mask) && - !g_xserver_be && !g_host_be) + g_bpp = 0; + for (i = 0; i < pixmap_formats_count; ++i) + { + XPixmapFormatValues *pf = &pfm[i]; + if (pf->depth == g_depth) { - if (g_depth <= 16 || (g_red_shift_l == 16 && g_green_shift_l == 8 && - g_blue_shift_l == 0)) + g_bpp = pf->bits_per_pixel; + + if (g_no_translate_image) { - g_arch_match = True; + switch (g_server_depth) + { + case 15: + case 16: + if (g_bpp != 16) + g_no_translate_image = False; + break; + case 24: + /* Yes, this will force image translation + on most modern servers which use 32 bits + for R8G8B8. */ + if (g_bpp != 24) + g_no_translate_image = False; + break; + default: + g_no_translate_image = False; + break; + } } - } - if (g_arch_match) - { - DEBUG(("Architectures match, enabling little endian optimisations.\n")); + /* Pixmap formats list is a depth-to-bpp mapping -- + there's just a single entry for every depth, + so we can safely break here */ + break; } } + XFree(pfm); + pfm = NULL; + return True; +} + +static XErrorHandler g_old_error_handler; - pfm = XListPixmapFormats(g_display, &i); - if (pfm != NULL) +static int +error_handler(Display * dpy, XErrorEvent * eev) +{ + if ((eev->error_code == BadMatch) && (eev->request_code == X_ConfigureWindow)) { - /* Use maximum bpp for this depth - this is generally - desirable, e.g. 24 bits->32 bits. */ - while (i--) - { - if ((pfm[i].depth == g_depth) && (pfm[i].bits_per_pixel > g_bpp)) - { - g_bpp = pfm[i].bits_per_pixel; - } - } - XFree(pfm); + fprintf(stderr, "Got \"BadMatch\" when trying to restack windows.\n"); + fprintf(stderr, + "This is most likely caused by a broken window manager (commonly KWin).\n"); + return 0; } - if (g_bpp < 8) + return g_old_error_handler(dpy, eev); +} + +RD_BOOL +ui_init(void) +{ + int screen_num; + + g_display = XOpenDisplay(NULL); + if (g_display == NULL) { - error("Less than 8 bpp not currently supported.\n"); - XCloseDisplay(g_display); + error("Failed to open display: %s\n", XDisplayName(NULL)); return False; } + { + uint16 endianess_test = 1; + g_host_be = !(RD_BOOL) (*(uint8 *) (&endianess_test)); + } + + g_old_error_handler = XSetErrorHandler(error_handler); + g_xserver_be = (ImageByteOrder(g_display) == MSBFirst); + screen_num = DefaultScreen(g_display); + g_x_socket = ConnectionNumber(g_display); + g_screen = ScreenOfDisplay(g_display, screen_num); + g_depth = DefaultDepthOfScreen(g_screen); + + if (!select_visual(screen_num)) + return False; + + if (g_no_translate_image) + { + DEBUG(("Performance optimization possible: avoiding image translation (colour depth conversion).\n")); + } + + if (g_server_depth > g_bpp) + { + warning("Remote desktop colour depth %d higher than display colour depth %d.\n", + g_server_depth, g_bpp); + } + + DEBUG(("RDP depth: %d, display depth: %d, display bpp: %d, X server BE: %d, host BE: %d\n", + g_server_depth, g_depth, g_bpp, g_xserver_be, g_host_be)); + if (!g_owncolmap) { g_xcolmap = XCreateColormap(g_display, RootWindowOfScreen(g_screen), g_visual, AllocNone); if (g_depth <= 8) - warning("Screen depth is 8 bits or lower: you may want to use -C for a private colourmap\n"); + warning("Display colour depth is %d bit: you may want to use -C for a private colourmap.\n", g_depth); } if ((!g_ownbackstore) && (DoesBackingStore(g_screen) != Always)) { - warning("External BackingStore not available, using internal\n"); + warning("External BackingStore not available. Using internal.\n"); g_ownbackstore = True; } @@ -1087,6 +1582,7 @@ { g_width = WidthOfScreen(g_screen); g_height = HeightOfScreen(g_screen); + g_using_full_workarea = True; } else if (g_width < 0) { @@ -1100,18 +1596,17 @@ { /* Fetch geometry from _NET_WORKAREA */ uint32 x, y, cx, cy; - g_using_full_workarea = True; - if (get_current_workarea(&x, &y, &cx, &cy) == 0) { g_width = cx; g_height = cy; + g_using_full_workarea = True; } else { warning("Failed to get workarea: probably your window manager does not support extended hints\n"); - g_width = 800; - g_height = 600; + g_width = WidthOfScreen(g_screen); + g_height = HeightOfScreen(g_screen); } } @@ -1126,8 +1621,11 @@ g_IM = XOpenIM(g_display, NULL, NULL, NULL); xclip_init(); + ewmh_init(); + if (g_seamless_rdp) + seamless_init(); - DEBUG_RDP5(("server bpp %d client bpp %d depth %d\n", g_server_bpp, g_bpp, g_depth)); + DEBUG_RDP5(("server bpp %d client bpp %d depth %d\n", g_server_depth, g_bpp, g_depth)); return True; } @@ -1135,6 +1633,14 @@ void ui_deinit(void) { + while (g_seamless_windows) + { + XDestroyWindow(g_display, g_seamless_windows->wnd); + sw_remove_window(g_seamless_windows); + } + + xclip_deinit(); + if (g_IM != NULL) XCloseIM(g_IM); @@ -1151,7 +1657,35 @@ g_display = NULL; } -BOOL + +static void +get_window_attribs(XSetWindowAttributes * attribs) +{ + attribs->background_pixel = BlackPixelOfScreen(g_screen); + attribs->background_pixel = WhitePixelOfScreen(g_screen); + attribs->border_pixel = WhitePixelOfScreen(g_screen); + attribs->backing_store = g_ownbackstore ? NotUseful : Always; + attribs->override_redirect = g_fullscreen; + attribs->colormap = g_xcolmap; +} + +static void +get_input_mask(long *input_mask) +{ + *input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | + VisibilityChangeMask | FocusChangeMask | StructureNotifyMask; + + if (g_sendmotion) + *input_mask |= PointerMotionMask; + if (g_ownbackstore) + *input_mask |= ExposureMask; + if (g_fullscreen || g_grab_keyboard) + *input_mask |= EnterWindowMask; + if (g_grab_keyboard) + *input_mask |= LeaveWindowMask; +} + +RD_BOOL ui_create_window(void) { uint8 null_pointer_mask[1] = { 0x80 }; @@ -1173,11 +1707,7 @@ if (g_ypos < 0 || (g_ypos == 0 && (g_pos & 4))) g_ypos = HeightOfScreen(g_screen) + g_ypos - g_height; - attribs.background_pixel = BlackPixelOfScreen(g_screen); - attribs.border_pixel = WhitePixelOfScreen(g_screen); - attribs.backing_store = g_ownbackstore ? NotUseful : Always; - attribs.override_redirect = g_fullscreen; - attribs.colormap = g_xcolmap; + get_window_attribs(&attribs); g_wnd = XCreateWindow(g_display, RootWindowOfScreen(g_screen), g_xpos, g_ypos, wndwidth, wndheight, 0, g_depth, InputOutput, g_visual, @@ -1185,7 +1715,10 @@ CWBorderPixel, &attribs); if (g_gc == NULL) + { g_gc = XCreateGC(g_display, g_wnd, 0, NULL); + ui_reset_clip(); + } if (g_create_bitmap_gc == NULL) g_create_bitmap_gc = XCreateGC(g_display, g_wnd, 0, NULL); @@ -1200,9 +1733,10 @@ } XStoreName(g_display, g_wnd, g_title); + ewmh_set_wm_name(g_wnd, g_title); if (g_hide_decorations) - mwm_hide_decorations(); + mwm_hide_decorations(g_wnd); classhints = XAllocClassHint(); if (classhints != NULL) @@ -1229,17 +1763,7 @@ XReparentWindow(g_display, g_wnd, (Window) g_embed_wnd, 0, 0); } - input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | - VisibilityChangeMask | FocusChangeMask | StructureNotifyMask; - - if (g_sendmotion) - input_mask |= PointerMotionMask; - if (g_ownbackstore) - input_mask |= ExposureMask; - if (g_fullscreen || g_grab_keyboard) - input_mask |= EnterWindowMask; - if (g_grab_keyboard) - input_mask |= LeaveWindowMask; + get_input_mask(&input_mask); if (g_IM != NULL) { @@ -1324,6 +1848,10 @@ { Pixmap contents = 0; + if (g_seamless_active) + /* Turn off SeamlessRDP mode */ + ui_seamless_toggle(); + if (!g_ownbackstore) { /* need to save contents of window */ @@ -1345,7 +1873,7 @@ } static void -handle_button_event(XEvent xevent, BOOL down) +handle_button_event(XEvent xevent, RD_BOOL down) { uint16 button, flags = 0; g_last_gesturetime = xevent.xbutton.time; @@ -1412,10 +1940,20 @@ } } - rdp_send_input(time(NULL), RDP_INPUT_MOUSE, - flags | button, xevent.xbutton.x, xevent.xbutton.y); + if (xevent.xmotion.window == g_wnd) + { + rdp_send_input(time(NULL), RDP_INPUT_MOUSE, + flags | button, xevent.xbutton.x, xevent.xbutton.y); + } + else + { + /* SeamlessRDP */ + rdp_send_input(time(NULL), RDP_INPUT_MOUSE, + flags | button, xevent.xbutton.x_root, xevent.xbutton.y_root); + } } + /* Process events in Xlib queue Returns 0 after user quit, 1 otherwise */ static int @@ -1427,6 +1965,7 @@ char str[256]; Status status; int events = 0; + seamless_window *sw; while ((XPending(g_display) > 0) && events++ < 20) { @@ -1441,7 +1980,10 @@ switch (xevent.type) { case VisibilityNotify: - g_Unobscured = xevent.xvisibility.state == VisibilityUnobscured; + if (xevent.xvisibility.window == g_wnd) + g_Unobscured = + xevent.xvisibility.state == VisibilityUnobscured; + break; case ClientMessage: /* the window manager told us to quit */ @@ -1521,8 +2063,19 @@ if (g_fullscreen && !g_focused) XSetInputFocus(g_display, g_wnd, RevertToPointerRoot, CurrentTime); - rdp_send_input(time(NULL), RDP_INPUT_MOUSE, - MOUSE_FLAG_MOVE, xevent.xmotion.x, xevent.xmotion.y); + + if (xevent.xmotion.window == g_wnd) + { + rdp_send_input(time(NULL), RDP_INPUT_MOUSE, MOUSE_FLAG_MOVE, + xevent.xmotion.x, xevent.xmotion.y); + } + else + { + /* SeamlessRDP */ + rdp_send_input(time(NULL), RDP_INPUT_MOUSE, MOUSE_FLAG_MOVE, + xevent.xmotion.x_root, + xevent.xmotion.y_root); + } break; case FocusIn: @@ -1533,6 +2086,16 @@ if (g_grab_keyboard && g_mouse_in_wnd) XGrabKeyboard(g_display, g_wnd, True, GrabModeAsync, GrabModeAsync, CurrentTime); + + sw = sw_get_window_by_wnd(xevent.xfocus.window); + if (!sw) + break; + + if (sw->id != g_seamless_focused) + { + seamless_send_focus(sw->id, 0); + g_seamless_focused = sw->id; + } break; case FocusOut: @@ -1565,11 +2128,28 @@ break; case Expose: - XCopyArea(g_display, g_backstore, g_wnd, g_gc, - xevent.xexpose.x, xevent.xexpose.y, - xevent.xexpose.width, - xevent.xexpose.height, - xevent.xexpose.x, xevent.xexpose.y); + if (xevent.xexpose.window == g_wnd) + { + XCopyArea(g_display, g_backstore, xevent.xexpose.window, + g_gc, + xevent.xexpose.x, xevent.xexpose.y, + xevent.xexpose.width, xevent.xexpose.height, + xevent.xexpose.x, xevent.xexpose.y); + } + else + { + sw = sw_get_window_by_wnd(xevent.xexpose.window); + if (!sw) + break; + XCopyArea(g_display, g_backstore, + xevent.xexpose.window, g_gc, + xevent.xexpose.x + sw->xoffset, + xevent.xexpose.y + sw->yoffset, + xevent.xexpose.width, + xevent.xexpose.height, xevent.xexpose.x, + xevent.xexpose.y); + } + break; case MappingNotify: @@ -1598,12 +2178,61 @@ break; case PropertyNotify: xclip_handle_PropertyNotify(&xevent.xproperty); + if (xevent.xproperty.window == g_wnd) + break; + if (xevent.xproperty.window == DefaultRootWindow(g_display)) + break; + + /* seamless */ + sw = sw_get_window_by_wnd(xevent.xproperty.window); + if (!sw) + break; + + if ((xevent.xproperty.atom == g_net_wm_state_atom) + && (xevent.xproperty.state == PropertyNewValue)) + { + sw->state = ewmh_get_window_state(sw->wnd); + seamless_send_state(sw->id, sw->state, 0); + } + + if ((xevent.xproperty.atom == g_net_wm_desktop_atom) + && (xevent.xproperty.state == PropertyNewValue)) + { + sw->desktop = ewmh_get_window_desktop(sw->wnd); + sw_all_to_desktop(sw->wnd, sw->desktop); + } + break; case MapNotify: - rdp_send_client_window_status(1); + if (!g_seamless_active) + rdp_send_client_window_status(1); break; case UnmapNotify: - rdp_send_client_window_status(0); + if (!g_seamless_active) + rdp_send_client_window_status(0); + break; + case ConfigureNotify: + if (!g_seamless_active) + break; + + sw = sw_get_window_by_wnd(xevent.xconfigure.window); + if (!sw) + break; + + gettimeofday(sw->position_timer, NULL); + if (sw->position_timer->tv_usec + SEAMLESSRDP_POSITION_TIMER >= + 1000000) + { + sw->position_timer->tv_usec += + SEAMLESSRDP_POSITION_TIMER - 1000000; + sw->position_timer->tv_sec += 1; + } + else + { + sw->position_timer->tv_usec += SEAMLESSRDP_POSITION_TIMER; + } + + sw_handle_restack(sw); break; } } @@ -1618,7 +2247,7 @@ int n; fd_set rfds, wfds; struct timeval tv; - BOOL s_timeout = False; + RD_BOOL s_timeout = False; while (True) { @@ -1628,25 +2257,25 @@ /* User quit */ return 0; + if (g_seamless_active) + sw_check_timers(); + FD_ZERO(&rfds); FD_ZERO(&wfds); FD_SET(rdp_socket, &rfds); FD_SET(g_x_socket, &rfds); -#ifdef WITH_RDPSND - /* FIXME: there should be an API for registering fds */ - if (g_dsp_busy) - { - FD_SET(g_dsp_fd, &wfds); - n = (g_dsp_fd > n) ? g_dsp_fd : n; - } -#endif /* default timeout */ tv.tv_sec = 60; tv.tv_usec = 0; +#ifdef WITH_RDPSND + rdpsnd_add_fds(&n, &rfds, &wfds, &tv); +#endif + /* add redirection handles */ rdpdr_add_fds(&n, &rfds, &wfds, &tv, &s_timeout); + seamless_select_timeout(&tv); n++; @@ -1656,21 +2285,25 @@ error("select: %s\n", strerror(errno)); case 0: +#ifdef WITH_RDPSND + rdpsnd_check_fds(&rfds, &wfds); +#endif + /* Abort serial read calls */ if (s_timeout) - rdpdr_check_fds(&rfds, &wfds, (BOOL) True); + rdpdr_check_fds(&rfds, &wfds, (RD_BOOL) True); continue; } - rdpdr_check_fds(&rfds, &wfds, (BOOL) False); +#ifdef WITH_RDPSND + rdpsnd_check_fds(&rfds, &wfds); +#endif + + rdpdr_check_fds(&rfds, &wfds, (RD_BOOL) False); if (FD_ISSET(rdp_socket, &rfds)) return 1; -#ifdef WITH_RDPSND - if (g_dsp_busy && FD_ISSET(g_dsp_fd, &wfds)) - wave_out_play(); -#endif } } @@ -1680,7 +2313,7 @@ XWarpPointer(g_display, g_wnd, g_wnd, 0, 0, 0, 0, x, y); } -HBITMAP +RD_HBITMAP ui_create_bitmap(int width, int height, uint8 * data) { XImage *image; @@ -1688,7 +2321,7 @@ uint8 *tdata; int bitmap_pad; - if (g_server_bpp == 8) + if (g_server_depth == 8) { bitmap_pad = 8; } @@ -1710,7 +2343,7 @@ XFree(image); if (tdata != data) xfree(tdata); - return (HBITMAP) bitmap; + return (RD_HBITMAP) bitmap; } void @@ -1720,7 +2353,7 @@ uint8 *tdata; int bitmap_pad; - if (g_server_bpp == 8) + if (g_server_depth == 8) { bitmap_pad = 8; } @@ -1740,10 +2373,16 @@ { XPutImage(g_display, g_backstore, g_gc, image, 0, 0, x, y, cx, cy); XCopyArea(g_display, g_backstore, g_wnd, g_gc, x, y, cx, cy, x, y); + ON_ALL_SEAMLESS_WINDOWS(XCopyArea, + (g_display, g_backstore, sw->wnd, g_gc, x, y, cx, cy, + x - sw->xoffset, y - sw->yoffset)); } else { XPutImage(g_display, g_wnd, g_gc, image, 0, 0, x, y, cx, cy); + ON_ALL_SEAMLESS_WINDOWS(XCopyArea, + (g_display, g_wnd, sw->wnd, g_gc, x, y, cx, cy, + x - sw->xoffset, y - sw->yoffset)); } XFree(image); @@ -1752,12 +2391,12 @@ } void -ui_destroy_bitmap(HBITMAP bmp) +ui_destroy_bitmap(RD_HBITMAP bmp) { XFreePixmap(g_display, (Pixmap) bmp); } -HGLYPH +RD_HGLYPH ui_create_glyph(int width, int height, uint8 * data) { XImage *image; @@ -1779,20 +2418,20 @@ XPutImage(g_display, bitmap, g_create_glyph_gc, image, 0, 0, 0, 0, width, height); XFree(image); - return (HGLYPH) bitmap; + return (RD_HGLYPH) bitmap; } void -ui_destroy_glyph(HGLYPH glyph) +ui_destroy_glyph(RD_HGLYPH glyph) { XFreePixmap(g_display, (Pixmap) glyph); } -HCURSOR +RD_HCURSOR ui_create_cursor(unsigned int x, unsigned int y, int width, int height, uint8 * andmask, uint8 * xormask) { - HGLYPH maskglyph, cursorglyph; + RD_HGLYPH maskglyph, cursorglyph; XColor bg, fg; Cursor xcursor; uint8 *cursor, *pcursor; @@ -1856,18 +2495,19 @@ ui_destroy_glyph(cursorglyph); xfree(mask); xfree(cursor); - return (HCURSOR) xcursor; + return (RD_HCURSOR) xcursor; } void -ui_set_cursor(HCURSOR cursor) +ui_set_cursor(RD_HCURSOR cursor) { g_current_cursor = (Cursor) cursor; XDefineCursor(g_display, g_wnd, g_current_cursor); + ON_ALL_SEAMLESS_WINDOWS(XDefineCursor, (g_display, sw->wnd, g_current_cursor)); } void -ui_destroy_cursor(HCURSOR cursor) +ui_destroy_cursor(RD_HCURSOR cursor) { XFreeCursor(g_display, (Cursor) cursor); } @@ -1885,7 +2525,7 @@ (xc)->flags = DoRed | DoGreen | DoBlue; -HCOLOURMAP +RD_HCOLOURMAP ui_create_colourmap(COLOURMAP * colours) { COLOURENTRY *entry; @@ -1981,12 +2621,12 @@ XStoreColors(g_display, map, xcolours, ncolours); xfree(xcolours); - return (HCOLOURMAP) map; + return (RD_HCOLOURMAP) map; } } void -ui_destroy_colourmap(HCOLOURMAP map) +ui_destroy_colourmap(RD_HCOLOURMAP map) { if (!g_owncolmap) xfree(map); @@ -1995,7 +2635,7 @@ } void -ui_set_colourmap(HCOLOURMAP map) +ui_set_colourmap(RD_HCOLOURMAP map) { if (!g_owncolmap) { @@ -2005,31 +2645,30 @@ g_colmap = (uint32 *) map; } else + { XSetWindowColormap(g_display, g_wnd, (Colormap) map); + ON_ALL_SEAMLESS_WINDOWS(XSetWindowColormap, (g_display, sw->wnd, (Colormap) map)); + } } void ui_set_clip(int x, int y, int cx, int cy) { - XRectangle rect; - - rect.x = x; - rect.y = y; - rect.width = cx; - rect.height = cy; - XSetClipRectangles(g_display, g_gc, 0, 0, &rect, 1, YXBanded); + g_clip_rectangle.x = x; + g_clip_rectangle.y = y; + g_clip_rectangle.width = cx; + g_clip_rectangle.height = cy; + XSetClipRectangles(g_display, g_gc, 0, 0, &g_clip_rectangle, 1, YXBanded); } void ui_reset_clip(void) { - XRectangle rect; - - rect.x = 0; - rect.y = 0; - rect.width = g_width; - rect.height = g_height; - XSetClipRectangles(g_display, g_gc, 0, 0, &rect, 1, YXBanded); + g_clip_rectangle.x = 0; + g_clip_rectangle.y = 0; + g_clip_rectangle.width = g_width; + g_clip_rectangle.height = g_height; + XSetClipRectangles(g_display, g_gc, 0, 0, &g_clip_rectangle, 1, YXBanded); } void @@ -2084,7 +2723,7 @@ FILL_RECTANGLE_BACKSTORE(x, y, cx, cy); XSetFillStyle(g_display, g_gc, FillSolid); XSetTSOrigin(g_display, g_gc, 0, 0); - ui_destroy_glyph((HGLYPH) fill); + ui_destroy_glyph((RD_HGLYPH) fill); break; case 3: /* Pattern */ @@ -2099,7 +2738,7 @@ FILL_RECTANGLE_BACKSTORE(x, y, cx, cy); XSetFillStyle(g_display, g_gc, FillSolid); XSetTSOrigin(g_display, g_gc, 0, 0); - ui_destroy_glyph((HGLYPH) fill); + ui_destroy_glyph((RD_HGLYPH) fill); break; default: @@ -2110,6 +2749,9 @@ if (g_ownbackstore) XCopyArea(g_display, g_backstore, g_wnd, g_gc, x, y, cx, cy, x, y); + ON_ALL_SEAMLESS_WINDOWS(XCopyArea, + (g_display, g_ownbackstore ? g_backstore : g_wnd, sw->wnd, g_gc, + x, y, cx, cy, x - sw->xoffset, y - sw->yoffset)); } void @@ -2120,33 +2762,32 @@ SET_FUNCTION(opcode); if (g_ownbackstore) { - if (g_Unobscured) - { - XCopyArea(g_display, g_wnd, g_wnd, g_gc, srcx, srcy, cx, cy, x, y); - XCopyArea(g_display, g_backstore, g_backstore, g_gc, srcx, srcy, cx, cy, x, - y); - } - else - { - XCopyArea(g_display, g_backstore, g_wnd, g_gc, srcx, srcy, cx, cy, x, y); - XCopyArea(g_display, g_backstore, g_backstore, g_gc, srcx, srcy, cx, cy, x, - y); - } + XCopyArea(g_display, g_Unobscured ? g_wnd : g_backstore, + g_wnd, g_gc, srcx, srcy, cx, cy, x, y); + XCopyArea(g_display, g_backstore, g_backstore, g_gc, srcx, srcy, cx, cy, x, y); } else { XCopyArea(g_display, g_wnd, g_wnd, g_gc, srcx, srcy, cx, cy, x, y); } + + ON_ALL_SEAMLESS_WINDOWS(XCopyArea, + (g_display, g_ownbackstore ? g_backstore : g_wnd, + sw->wnd, g_gc, x, y, cx, cy, x - sw->xoffset, y - sw->yoffset)); + RESET_FUNCTION(opcode); } void ui_memblt(uint8 opcode, /* dest */ int x, int y, int cx, int cy, - /* src */ HBITMAP src, int srcx, int srcy) + /* src */ RD_HBITMAP src, int srcx, int srcy) { SET_FUNCTION(opcode); XCopyArea(g_display, (Pixmap) src, g_wnd, g_gc, srcx, srcy, cx, cy, x, y); + ON_ALL_SEAMLESS_WINDOWS(XCopyArea, + (g_display, (Pixmap) src, sw->wnd, g_gc, + srcx, srcy, cx, cy, x - sw->xoffset, y - sw->yoffset)); if (g_ownbackstore) XCopyArea(g_display, (Pixmap) src, g_backstore, g_gc, srcx, srcy, cx, cy, x, y); RESET_FUNCTION(opcode); @@ -2155,7 +2796,7 @@ void ui_triblt(uint8 opcode, /* dest */ int x, int y, int cx, int cy, - /* src */ HBITMAP src, int srcx, int srcy, + /* src */ RD_HBITMAP src, int srcx, int srcy, /* brush */ BRUSH * brush, int bgcolour, int fgcolour) { /* This is potentially difficult to do in general. Until someone @@ -2193,6 +2834,9 @@ SET_FUNCTION(opcode); SET_FOREGROUND(pen->colour); XDrawLine(g_display, g_wnd, g_gc, startx, starty, endx, endy); + ON_ALL_SEAMLESS_WINDOWS(XDrawLine, (g_display, sw->wnd, g_gc, + startx - sw->xoffset, starty - sw->yoffset, + endx - sw->xoffset, endy - sw->yoffset)); if (g_ownbackstore) XDrawLine(g_display, g_backstore, g_gc, startx, starty, endx, endy); RESET_FUNCTION(opcode); @@ -2210,7 +2854,7 @@ void ui_polygon(uint8 opcode, /* mode */ uint8 fillmode, - /* dest */ POINT * point, int npoints, + /* dest */ RD_POINT * point, int npoints, /* brush */ BRUSH * brush, int bgcolour, int fgcolour) { uint8 style, i, ipattern[8]; @@ -2253,7 +2897,7 @@ FILL_POLYGON((XPoint *) point, npoints); XSetFillStyle(g_display, g_gc, FillSolid); XSetTSOrigin(g_display, g_gc, 0, 0); - ui_destroy_glyph((HGLYPH) fill); + ui_destroy_glyph((RD_HGLYPH) fill); break; case 3: /* Pattern */ @@ -2268,7 +2912,7 @@ FILL_POLYGON((XPoint *) point, npoints); XSetFillStyle(g_display, g_gc, FillSolid); XSetTSOrigin(g_display, g_gc, 0, 0); - ui_destroy_glyph((HGLYPH) fill); + ui_destroy_glyph((RD_HGLYPH) fill); break; default: @@ -2280,7 +2924,7 @@ void ui_polyline(uint8 opcode, - /* dest */ POINT * points, int npoints, + /* dest */ RD_POINT * points, int npoints, /* pen */ PEN * pen) { /* TODO: set join style */ @@ -2290,6 +2934,10 @@ if (g_ownbackstore) XDrawLines(g_display, g_backstore, g_gc, (XPoint *) points, npoints, CoordModePrevious); + + ON_ALL_SEAMLESS_WINDOWS(seamless_XDrawLines, + (sw->wnd, (XPoint *) points, npoints, sw->xoffset, sw->yoffset)); + RESET_FUNCTION(opcode); } @@ -2327,7 +2975,7 @@ DRAW_ELLIPSE(x, y, cx, cy, fillmode); XSetFillStyle(g_display, g_gc, FillSolid); XSetTSOrigin(g_display, g_gc, 0, 0); - ui_destroy_glyph((HGLYPH) fill); + ui_destroy_glyph((RD_HGLYPH) fill); break; case 3: /* Pattern */ @@ -2342,7 +2990,7 @@ DRAW_ELLIPSE(x, y, cx, cy, fillmode); XSetFillStyle(g_display, g_gc, FillSolid); XSetTSOrigin(g_display, g_gc, 0, 0); - ui_destroy_glyph((HGLYPH) fill); + ui_destroy_glyph((RD_HGLYPH) fill); break; default: @@ -2356,7 +3004,7 @@ void ui_draw_glyph(int mixmode, /* dest */ int x, int y, int cx, int cy, - /* src */ HGLYPH glyph, int srcx, int srcy, + /* src */ RD_HGLYPH glyph, int srcx, int srcy, int bgcolour, int fgcolour) { SET_FOREGROUND(fgcolour); @@ -2445,9 +3093,13 @@ switch (text[i]) { case 0xff: + /* At least two bytes needs to follow */ if (i + 3 > length) { - /* short command, skip */ + warning("Skipping short 0xff command:"); + for (j = 0; j < length; j++) + fprintf(stderr, "%02x ", text[j]); + fprintf(stderr, "\n"); i = length = 0; break; } @@ -2460,17 +3112,21 @@ break; case 0xfe: - if (i + 3 > length) + /* At least one byte needs to follow */ + if (i + 2 > length) { - /* short command, skip */ + warning("Skipping short 0xfe command:"); + for (j = 0; j < length; j++) + fprintf(stderr, "%02x ", text[j]); + fprintf(stderr, "\n"); i = length = 0; break; } entry = cache_get_text(text[i + 1]); - if (entry != NULL) + if (entry->data != NULL) { - if ((((uint8 *) (entry->data))[1] == - 0) && (!(flags & TEXT2_IMPLICIT_X))) + if ((((uint8 *) (entry->data))[1] == 0) + && (!(flags & TEXT2_IMPLICIT_X)) && (i + 2 < length)) { if (flags & TEXT2_VERTICAL) y += text[i + 2]; @@ -2480,7 +3136,10 @@ for (j = 0; j < entry->size; j++) DO_GLYPH(((uint8 *) (entry->data)), j); } - i += 3; + if (i + 2 < length) + i += 3; + else + i += 2; length -= i; /* this will move pointer from start to first character after FE command */ text = &(text[i]); @@ -2499,11 +3158,25 @@ if (g_ownbackstore) { if (boxcx > 1) + { XCopyArea(g_display, g_backstore, g_wnd, g_gc, boxx, boxy, boxcx, boxcy, boxx, boxy); + ON_ALL_SEAMLESS_WINDOWS(XCopyArea, + (g_display, g_backstore, sw->wnd, g_gc, + boxx, boxy, + boxcx, boxcy, + boxx - sw->xoffset, boxy - sw->yoffset)); + } else + { XCopyArea(g_display, g_backstore, g_wnd, g_gc, clipx, clipy, clipcx, clipcy, clipx, clipy); + ON_ALL_SEAMLESS_WINDOWS(XCopyArea, + (g_display, g_backstore, sw->wnd, g_gc, + clipx, clipy, + clipcx, clipcy, clipx - sw->xoffset, + clipy - sw->yoffset)); + } } } @@ -2516,12 +3189,14 @@ if (g_ownbackstore) { image = XGetImage(g_display, g_backstore, x, y, cx, cy, AllPlanes, ZPixmap); + exit_if_null(image); } else { pix = XCreatePixmap(g_display, g_wnd, cx, cy, g_depth); XCopyArea(g_display, g_wnd, pix, g_gc, x, y, cx, cy, 0, 0); image = XGetImage(g_display, pix, 0, 0, cx, cy, AllPlanes, ZPixmap); + exit_if_null(image); XFreePixmap(g_display, pix); } @@ -2549,10 +3224,16 @@ { XPutImage(g_display, g_backstore, g_gc, image, 0, 0, x, y, cx, cy); XCopyArea(g_display, g_backstore, g_wnd, g_gc, x, y, cx, cy, x, y); + ON_ALL_SEAMLESS_WINDOWS(XCopyArea, + (g_display, g_backstore, sw->wnd, g_gc, + x, y, cx, cy, x - sw->xoffset, y - sw->yoffset)); } else { XPutImage(g_display, g_wnd, g_gc, image, 0, 0, x, y, cx, cy); + ON_ALL_SEAMLESS_WINDOWS(XCopyArea, + (g_display, g_wnd, sw->wnd, g_gc, x, y, cx, cy, + x - sw->xoffset, y - sw->yoffset)); } XFree(image); @@ -2568,3 +3249,447 @@ ui_end_update(void) { } + + +void +ui_seamless_begin(RD_BOOL hidden) +{ + if (!g_seamless_rdp) + return; + + if (g_seamless_started) + return; + + g_seamless_started = True; + g_seamless_hidden = hidden; + + if (!hidden) + ui_seamless_toggle(); +} + + +void +ui_seamless_hide_desktop() +{ + if (!g_seamless_rdp) + return; + + if (!g_seamless_started) + return; + + if (g_seamless_active) + ui_seamless_toggle(); + + g_seamless_hidden = True; +} + + +void +ui_seamless_unhide_desktop() +{ + if (!g_seamless_rdp) + return; + + if (!g_seamless_started) + return; + + g_seamless_hidden = False; + + ui_seamless_toggle(); +} + + +void +ui_seamless_toggle() +{ + if (!g_seamless_rdp) + return; + + if (!g_seamless_started) + return; + + if (g_seamless_hidden) + return; + + if (g_seamless_active) + { + /* Deactivate */ + while (g_seamless_windows) + { + XDestroyWindow(g_display, g_seamless_windows->wnd); + sw_remove_window(g_seamless_windows); + } + XMapWindow(g_display, g_wnd); + } + else + { + /* Activate */ + XUnmapWindow(g_display, g_wnd); + seamless_send_sync(); + } + + g_seamless_active = !g_seamless_active; +} + + +void +ui_seamless_create_window(unsigned long id, unsigned long group, unsigned long parent, + unsigned long flags) +{ + Window wnd; + XSetWindowAttributes attribs; + XClassHint *classhints; + XSizeHints *sizehints; + XWMHints *wmhints; + long input_mask; + seamless_window *sw, *sw_parent; + + if (!g_seamless_active) + return; + + /* Ignore CREATEs for existing windows */ + sw = sw_get_window_by_id(id); + if (sw) + return; + + get_window_attribs(&attribs); + wnd = XCreateWindow(g_display, RootWindowOfScreen(g_screen), -1, -1, 1, 1, 0, g_depth, + InputOutput, g_visual, + CWBackPixel | CWBackingStore | CWColormap | CWBorderPixel, &attribs); + + XStoreName(g_display, wnd, "SeamlessRDP"); + ewmh_set_wm_name(wnd, "SeamlessRDP"); + + mwm_hide_decorations(wnd); + + classhints = XAllocClassHint(); + if (classhints != NULL) + { + classhints->res_name = "rdesktop"; + classhints->res_class = "SeamlessRDP"; + XSetClassHint(g_display, wnd, classhints); + XFree(classhints); + } + + /* WM_NORMAL_HINTS */ + sizehints = XAllocSizeHints(); + if (sizehints != NULL) + { + sizehints->flags = USPosition; + XSetWMNormalHints(g_display, wnd, sizehints); + XFree(sizehints); + } + + /* Parent-less transient windows */ + if (parent == 0xFFFFFFFF) + { + XSetTransientForHint(g_display, wnd, RootWindowOfScreen(g_screen)); + /* Some buggy wm:s (kwin) do not handle the above, so fake it + using some other hints. */ + ewmh_set_window_popup(wnd); + } + /* Normal transient windows */ + else if (parent != 0x00000000) + { + sw_parent = sw_get_window_by_id(parent); + if (sw_parent) + XSetTransientForHint(g_display, wnd, sw_parent->wnd); + else + warning("ui_seamless_create_window: No parent window 0x%lx\n", parent); + } + + if (flags & SEAMLESSRDP_CREATE_MODAL) + { + /* We do this to support buggy wm:s (*cough* metacity *cough*) + somewhat at least */ + if (parent == 0x00000000) + XSetTransientForHint(g_display, wnd, RootWindowOfScreen(g_screen)); + ewmh_set_window_modal(wnd); + } + + /* FIXME: Support for Input Context:s */ + + get_input_mask(&input_mask); + input_mask |= PropertyChangeMask; + + XSelectInput(g_display, wnd, input_mask); + + /* handle the WM_DELETE_WINDOW protocol. FIXME: When killing a + seamless window, we could try to close the window on the + serverside, instead of terminating rdesktop */ + XSetWMProtocols(g_display, wnd, &g_kill_atom, 1); + + sw = xmalloc(sizeof(seamless_window)); + sw->wnd = wnd; + sw->id = id; + sw->behind = 0; + sw->group = sw_find_group(group, False); + sw->group->refcnt++; + sw->xoffset = 0; + sw->yoffset = 0; + sw->width = 0; + sw->height = 0; + sw->state = SEAMLESSRDP_NOTYETMAPPED; + sw->desktop = 0; + sw->position_timer = xmalloc(sizeof(struct timeval)); + timerclear(sw->position_timer); + + sw->outstanding_position = False; + sw->outpos_serial = 0; + sw->outpos_xoffset = sw->outpos_yoffset = 0; + sw->outpos_width = sw->outpos_height = 0; + + sw->next = g_seamless_windows; + g_seamless_windows = sw; + + /* WM_HINTS */ + wmhints = XAllocWMHints(); + if (wmhints) + { + wmhints->flags = WindowGroupHint; + wmhints->window_group = sw->group->wnd; + XSetWMHints(g_display, sw->wnd, wmhints); + XFree(wmhints); + } +} + + +void +ui_seamless_destroy_window(unsigned long id, unsigned long flags) +{ + seamless_window *sw; + + if (!g_seamless_active) + return; + + sw = sw_get_window_by_id(id); + if (!sw) + { + warning("ui_seamless_destroy_window: No information for window 0x%lx\n", id); + return; + } + + XDestroyWindow(g_display, sw->wnd); + sw_remove_window(sw); +} + + +void +ui_seamless_destroy_group(unsigned long id, unsigned long flags) +{ + seamless_window *sw, *sw_next; + + if (!g_seamless_active) + return; + + for (sw = g_seamless_windows; sw; sw = sw_next) + { + sw_next = sw->next; + + if (sw->group->id == id) + { + XDestroyWindow(g_display, sw->wnd); + sw_remove_window(sw); + } + } +} + + +void +ui_seamless_move_window(unsigned long id, int x, int y, int width, int height, unsigned long flags) +{ + seamless_window *sw; + + if (!g_seamless_active) + return; + + sw = sw_get_window_by_id(id); + if (!sw) + { + warning("ui_seamless_move_window: No information for window 0x%lx\n", id); + return; + } + + /* We ignore server updates until it has handled our request. */ + if (sw->outstanding_position) + return; + + if (!width || !height) + /* X11 windows must be at least 1x1 */ + return; + + sw->xoffset = x; + sw->yoffset = y; + sw->width = width; + sw->height = height; + + /* If we move the window in a maximized state, then KDE won't + accept restoration */ + switch (sw->state) + { + case SEAMLESSRDP_MINIMIZED: + case SEAMLESSRDP_MAXIMIZED: + return; + } + + /* FIXME: Perhaps use ewmh_net_moveresize_window instead */ + XMoveResizeWindow(g_display, sw->wnd, sw->xoffset, sw->yoffset, sw->width, sw->height); +} + + +void +ui_seamless_restack_window(unsigned long id, unsigned long behind, unsigned long flags) +{ + seamless_window *sw; + + if (!g_seamless_active) + return; + + sw = sw_get_window_by_id(id); + if (!sw) + { + warning("ui_seamless_restack_window: No information for window 0x%lx\n", id); + return; + } + + if (behind) + { + seamless_window *sw_behind; + Window wnds[2]; + + sw_behind = sw_get_window_by_id(behind); + if (!sw_behind) + { + warning("ui_seamless_restack_window: No information for window 0x%lx\n", + behind); + return; + } + + wnds[1] = sw_behind->wnd; + wnds[0] = sw->wnd; + + XRestackWindows(g_display, wnds, 2); + } + else + { + XRaiseWindow(g_display, sw->wnd); + } + + sw_restack_window(sw, behind); +} + + +void +ui_seamless_settitle(unsigned long id, const char *title, unsigned long flags) +{ + seamless_window *sw; + + if (!g_seamless_active) + return; + + sw = sw_get_window_by_id(id); + if (!sw) + { + warning("ui_seamless_settitle: No information for window 0x%lx\n", id); + return; + } + + /* FIXME: Might want to convert the name for non-EWMH WMs */ + XStoreName(g_display, sw->wnd, title); + ewmh_set_wm_name(sw->wnd, title); +} + + +void +ui_seamless_setstate(unsigned long id, unsigned int state, unsigned long flags) +{ + seamless_window *sw; + + if (!g_seamless_active) + return; + + sw = sw_get_window_by_id(id); + if (!sw) + { + warning("ui_seamless_setstate: No information for window 0x%lx\n", id); + return; + } + + switch (state) + { + case SEAMLESSRDP_NORMAL: + case SEAMLESSRDP_MAXIMIZED: + ewmh_change_state(sw->wnd, state); + XMapWindow(g_display, sw->wnd); + break; + case SEAMLESSRDP_MINIMIZED: + /* EWMH says: "if an Application asks to toggle _NET_WM_STATE_HIDDEN + the Window Manager should probably just ignore the request, since + _NET_WM_STATE_HIDDEN is a function of some other aspect of the window + such as minimization, rather than an independent state." Besides, + XIconifyWindow is easier. */ + if (sw->state == SEAMLESSRDP_NOTYETMAPPED) + { + XWMHints *hints; + hints = XGetWMHints(g_display, sw->wnd); + if (hints) + { + hints->flags |= StateHint; + hints->initial_state = IconicState; + XSetWMHints(g_display, sw->wnd, hints); + XFree(hints); + } + XMapWindow(g_display, sw->wnd); + } + else + XIconifyWindow(g_display, sw->wnd, DefaultScreen(g_display)); + break; + default: + warning("SeamlessRDP: Invalid state %d\n", state); + break; + } + + sw->state = state; +} + + +void +ui_seamless_syncbegin(unsigned long flags) +{ + if (!g_seamless_active) + return; + + /* Destroy all seamless windows */ + while (g_seamless_windows) + { + XDestroyWindow(g_display, g_seamless_windows->wnd); + sw_remove_window(g_seamless_windows); + } +} + + +void +ui_seamless_ack(unsigned int serial) +{ + seamless_window *sw; + for (sw = g_seamless_windows; sw; sw = sw->next) + { + if (sw->outstanding_position && (sw->outpos_serial == serial)) + { + sw->xoffset = sw->outpos_xoffset; + sw->yoffset = sw->outpos_yoffset; + sw->width = sw->outpos_width; + sw->height = sw->outpos_height; + sw->outstanding_position = False; + + /* Do a complete redraw of the window as part of the + completion of the move. This is to remove any + artifacts caused by our lack of synchronization. */ + XCopyArea(g_display, g_backstore, + sw->wnd, g_gc, + sw->xoffset, sw->yoffset, sw->width, sw->height, 0, 0); + + break; + } + } +}