Skip to content

Commit

Permalink
fix hidden taskbar doesn't slide up wit maximized window (#33)
Browse files Browse the repository at this point in the history 
Co-authored-by: Hideyuki Nagase <hideyukn@ntdev.microsoft.com>
  • Loading branch information
@hideyukn88
hideyukn88 and Hideyuki Nagase authored Jul 23, 2021
1 parent 3c01d12 commit 1c989c3
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 47 deletions.
2 changes: 2 additions & 0 deletions include/libweston/backend-rdp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@ struct weston_surface_rail_state {
bool is_minimized_requested;
bool is_maximized;
bool is_maximized_requested;
bool is_fullscreen;
bool is_fullscreen_requested;
bool forceRecreateSurface;
bool forceUpdateWindowState;
bool error;
Expand Down
81 changes: 34 additions & 47 deletions libweston/backend-rdp/rdprail.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@

#include "libweston-internal.h"

#define RAIL_WINDOW_FULLSCREEN_STYLE (WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_GROUP | WS_TABSTOP)
#define RAIL_WINDOW_NORMAL_STYLE (RAIL_WINDOW_FULLSCREEN_STYLE | WS_THICKFRAME | WS_CAPTION)

extern PWtsApiFunctionTable FreeRDP_InitWtsApi(void);

static void rdp_rail_destroy_window(struct wl_listener *listener, void *data);
Expand Down Expand Up @@ -1342,52 +1345,8 @@ rdp_rail_create_window(struct wl_listener *listener, void *data)
(WINDOW_ORDER_TYPE_WINDOW | WINDOW_ORDER_STATE_NEW);
window_order_info.windowId = window_id;

/*
#define WS_OVERLAPPED 0x00000000L
#define WS_POPUP 0x80000000L
#define WS_CHILD 0x40000000L
#define WS_MINIMIZE 0x20000000L
#define WS_VISIBLE 0x10000000L
#define WS_DISABLED 0x08000000L
#define WS_CLIPSIBLINGS 0x04000000L
#define WS_CLIPCHILDREN 0x02000000L
#define WS_MAXIMIZE 0x01000000L
#define WS_CAPTION 0x00C00000L
#define WS_BORDER 0x00800000L
#define WS_DLGFRAME 0x00400000L
#define WS_VSCROLL 0x00200000L
#define WS_HSCROLL 0x00100000L
#define WS_SYSMENU 0x00080000L
#define WS_THICKFRAME 0x00040000L
#define WS_GROUP 0x00020000L
#define WS_TABSTOP 0x00010000L
#define WS_MINIMIZEBOX 0x00020000L
#define WS_MAXIMIZEBOX 0x00010000L
#define WS_EX_DLGMODALFRAME 0x00000001L
#define WS_EX_NOPARENTNOTIFY 0x00000004L
#define WS_EX_TOPMOST 0x00000008L
#define WS_EX_ACCEPTFILES 0x00000010L
#define WS_EX_TRANSPARENT 0x00000020L
#define WS_EX_MDICHILD 0x00000040L
#define WS_EX_TOOLWINDOW 0x00000080L
#define WS_EX_WINDOWEDGE 0x00000100L
#define WS_EX_CLIENTEDGE 0x00000200L
#define WS_EX_CONTEXTHELP 0x00000400L
#define WS_EX_RIGHT 0x00001000L
#define WS_EX_LEFT 0x00000000L
#define WS_EX_RTLREADING 0x00002000L
#define WS_EX_LTRREADING 0x00000000L
#define WS_EX_LEFTSCROLLBAR 0x00004000L
#define WS_EX_RIGHTSCROLLBAR 0x00000000L
#define WS_EX_CONTROLPARENT 0x00010000L
#define WS_EX_STATICEDGE 0x00020000L
#define WS_EX_APPWINDOW 0x00040000L
#define WS_EX_LAYERED 0x00080000L
*/

window_order_info.fieldFlags |= WINDOW_ORDER_FIELD_STYLE;
window_state_order.style = (WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_THICKFRAME | WS_GROUP | WS_TABSTOP);
window_state_order.style = RAIL_WINDOW_NORMAL_STYLE;
window_state_order.extendedStyle = WS_EX_LAYERED;

window_order_info.fieldFlags |= WINDOW_ORDER_FIELD_OWNER;
Expand Down Expand Up @@ -1849,10 +1808,26 @@ rdp_rail_update_window(struct weston_surface *surface, struct update_window_iter
window_id, rail_state->is_minimized_requested);
}

if (rail_state->is_maximized != rail_state->is_maximized_requested)
if (rail_state->is_maximized != rail_state->is_maximized_requested) {
rdp_debug_verbose(b, "WindowUpdate(0x%x - is_maximized:%d)\n",
window_id, rail_state->is_maximized_requested);
rail_state->is_maximized = rail_state->is_maximized_requested;
rail_state->is_maximized = rail_state->is_maximized_requested;
}

if (rail_state->is_fullscreen != rail_state->is_fullscreen_requested) {
rdp_debug_verbose(b, "WindowUpdate(0x%x - is_fullscreen:%d)\n",
window_id, rail_state->is_fullscreen_requested);
rail_state->is_fullscreen = rail_state->is_fullscreen_requested;

window_order_info.fieldFlags |= WINDOW_ORDER_FIELD_STYLE;
if (rail_state->is_fullscreen)
window_state_order.style = RAIL_WINDOW_FULLSCREEN_STYLE;
else
window_state_order.style = RAIL_WINDOW_NORMAL_STYLE;
window_state_order.extendedStyle = WS_EX_LAYERED;
/* force update window geometry */
rail_state->forceUpdateWindowState = true;
}

if (rail_state->forceUpdateWindowState ||
rail_state->get_label != surface->get_label) {
Expand Down Expand Up @@ -1948,6 +1923,16 @@ rdp_rail_update_window(struct weston_surface *surface, struct update_window_iter
window_state_order.visibilityRects = &window_vis;
window_state_order.clientAreaWidth = newClientPos.width;
window_state_order.clientAreaHeight = newClientPos.height;
if (!rail_state->is_fullscreen) {
/* when window is not in fullscreen, there should be 'some' area for title bar,
thus substracting 32 pixels out from window size for client area, this value
does not need to be accurate at all, all here need to tell RDP client is that
'real' application client area size is different from window size.
To pursue accuracy if desired, this value can be pulled from X for X app,
but this seems not possible for Wayland native application. */
if (window_state_order.clientAreaHeight > 8)
window_state_order.clientAreaHeight -= 8;
}

/* if previous window size is 0 and new window is not,
show and place in taskbar (if not set yet) */
Expand Down Expand Up @@ -3463,6 +3448,8 @@ rdp_rail_dump_window_iter(void *element, void *data)
rail_state->is_minimized, rail_state->is_minimized_requested);
fprintf(fp," isWindowMaximized:%d, isWindowMaximizedRequested:%d\n",
rail_state->is_maximized, rail_state->is_maximized_requested);
fprintf(fp," isWindowFullscreen:%d, isWindowFullscreenRequested:%d\n",
rail_state->is_fullscreen, rail_state->is_fullscreen_requested);
fprintf(fp," forceRecreateSurface:%d, error:%d\n",
rail_state->forceRecreateSurface, rail_state->error);
fprintf(fp," isUdatePending:%d, isFirstUpdateDone:%d\n",
Expand Down
15 changes: 15 additions & 0 deletions rdprail-shell/shell.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1571,6 +1571,15 @@ weston_view_set_initial_position(struct weston_view *view,
static void
unset_fullscreen(struct shell_surface *shsurf)
{
struct weston_surface *surface =
weston_desktop_surface_get_surface(shsurf->desktop_surface);
struct weston_surface_rail_state *rail_state =
(struct weston_surface_rail_state *)surface->backend_state;

if (!rail_state)
return;
rail_state->is_fullscreen_requested = false;

/* Unset the fullscreen output, driver configuration and transforms. */
wl_list_remove(&shsurf->fullscreen.transform.link);
wl_list_init(&shsurf->fullscreen.transform.link);
Expand Down Expand Up @@ -2336,8 +2345,14 @@ set_fullscreen(struct shell_surface *shsurf, bool fullscreen,
struct weston_desktop_surface *desktop_surface = shsurf->desktop_surface;
struct weston_surface *surface =
weston_desktop_surface_get_surface(shsurf->desktop_surface);
struct weston_surface_rail_state *rail_state =
(struct weston_surface_rail_state *)surface->backend_state;
int32_t width = 0, height = 0;

if (!rail_state)
return;
rail_state->is_fullscreen_requested = fullscreen;

if (fullscreen) {
/* handle clients launching in fullscreen */
if (output == NULL && !weston_surface_is_mapped(surface)) {
Expand Down

0 comments on commit 1c989c3

Please sign in to comment.