mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfreerdp: fix fullscreen window toggle

Browse Source
This commit is contained in:
Marc-André Moreau 2011-09-13 22:20:04 -04:00
parent 882f6d49a6
commit 278422aed5
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/X11/xf_gdi.c
View File

@ -334,8 +334,6 @@ void xf_gdi_patblt(rdpUpdate* update, PATBLT_ORDER* patblt)
} }
else if (brush->style == GDI_BS_PATTERN) else if (brush->style == GDI_BS_PATTERN)
{ {
printf("pattern bpp:%d\n", brush->bpp);
if (brush->bpp > 1) if (brush->bpp > 1)
{ {
pattern = xf_bitmap_new(xfi, 8, 8, brush->bpp, brush->data); pattern = xf_bitmap_new(xfi, 8, 8, brush->bpp, brush->data);

11
client/X11/xf_window.c
View File

@ -72,10 +72,7 @@ void xf_SetWindowFullscreen(xfInfo* xfi, xfWindow* window, boolean fullscreen)
XMoveResizeWindow(xfi->display, window->handle, 0, 0, window->width, window->height); XMoveResizeWindow(xfi->display, window->handle, 0, 0, window->width, window->height);
XMapRaised(xfi->display, window->handle); XMapRaised(xfi->display, window->handle);
//XGrabPointer(xfi->display, window->handle, True, 0, GrabModeAsync, GrabModeAsync, window->handle, 0L, CurrentTime);
//XGrabKeyboard(xfi->display, window->handle, False, GrabModeAsync, GrabModeAsync, CurrentTime);
//XSetInputFocus(xfi->display, window->handle, RevertToParent, CurrentTime);
window->fullscreen = True; window->fullscreen = True;
} }
} }
@ -218,10 +215,8 @@ xfWindow* xf_CreateDesktopWindow(xfInfo* xfi, char* name, int width, int height)
if (class_hints != NULL) if (class_hints != NULL)
{ {
if (name != NULL) class_hints->res_name = "xfreerdp";
class_hints->res_name = name; class_hints->res_class = "xfreerdp";
class_hints->res_class = "freerdp";
XSetClassHint(xfi->display, window->handle, class_hints); XSetClassHint(xfi->display, window->handle, class_hints);
XFree(class_hints); XFree(class_hints);
} }
@ -237,6 +232,8 @@ xfWindow* xf_CreateDesktopWindow(xfInfo* xfi, char* name, int width, int height)
XMapWindow(xfi->display, window->handle); XMapWindow(xfi->display, window->handle);
} }
XStoreName(xfi->display, window->handle, name);
return window; return window;
} }

5
client/X11/xfreerdp.c
View File

@ -204,7 +204,9 @@ void xf_toggle_fullscreen(xfInfo* xfi)
contents = XCreatePixmap(xfi->display, xfi->window->handle, xfi->width, xfi->height, xfi->depth); contents = XCreatePixmap(xfi->display, xfi->window->handle, xfi->width, xfi->height, xfi->depth);
XCopyArea(xfi->display, xfi->primary, contents, xfi->gc, 0, 0, xfi->width, xfi->height, 0, 0); XCopyArea(xfi->display, xfi->primary, contents, xfi->gc, 0, 0, xfi->width, xfi->height, 0, 0);
XDestroyWindow(xfi->display, xfi->window->handle);
xfi->fullscreen = (xfi->fullscreen) ? False : True; xfi->fullscreen = (xfi->fullscreen) ? False : True;
xf_post_connect(xfi->instance);
XCopyArea(xfi->display, contents, xfi->primary, xfi->gc, 0, 0, xfi->width, xfi->height, 0, 0); XCopyArea(xfi->display, contents, xfi->primary, xfi->gc, 0, 0, xfi->width, xfi->height, 0, 0);
XFreePixmap(xfi->display, contents); XFreePixmap(xfi->display, contents);
@ -358,6 +360,7 @@ boolean xf_pre_connect(freerdp* instance)
xfi->decoration = settings->decorations; xfi->decoration = settings->decorations;
xfi->remote_app = settings->remote_app; xfi->remote_app = settings->remote_app;
xfi->fullscreen = settings->fullscreen; xfi->fullscreen = settings->fullscreen;
xfi->fullscreen_toggle = xfi->fullscreen;
xf_detect_monitors(xfi, settings); xf_detect_monitors(xfi, settings);
@ -405,7 +408,7 @@ boolean xf_post_connect(freerdp* instance)
if (xfi->remote_app != True) if (xfi->remote_app != True)
{ {
xfi->window = xf_CreateDesktopWindow(xfi, "xfreerdp", xfi->width, xfi->height); xfi->window = xf_CreateDesktopWindow(xfi, "FreeRDP", xfi->width, xfi->height);
xf_SetWindowDecorations(xfi, xfi->window, xfi->decoration); xf_SetWindowDecorations(xfi, xfi->window, xfi->decoration);

1
client/X11/xfreerdp.h
View File

@ -112,6 +112,7 @@ struct xf_info
}; };
void xf_toggle_fullscreen(xfInfo* xfi); void xf_toggle_fullscreen(xfInfo* xfi);
boolean xf_post_connect(freerdp* instance);
#ifdef WITH_DEBUG_X11 #ifdef WITH_DEBUG_X11
#define DEBUG_X11(fmt, ...) DEBUG_CLASS(X11, fmt, ## __VA_ARGS__) #define DEBUG_X11(fmt, ...) DEBUG_CLASS(X11, fmt, ## __VA_ARGS__)