Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix xterm geometry option doesn't work #20

Merged
merged 1 commit into from
Jun 1, 2021
Merged

fix xterm geometry option doesn't work #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions libweston/backend-rdp/rdprail.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,12 @@ rail_client_ClientSysparam_callback(void *arg)
&workareaRect.x, &workareaRect.y,
&workareaRect.width, &workareaRect.height);
if (base_output) {
rdp_debug(b, "Translated workarea:(%d,%d)-(%d,%d) at %s:(%d,%d)-(%d,%d)\n",
workareaRect.x, workareaRect.y,
workareaRect.x + workareaRect.width, workareaRect.y + workareaRect.height,
base_output->name,
base_output->x, base_output->y,
base_output->x + base_output->width, base_output->y + base_output->height);
b->rdprail_shell_api->set_desktop_workarea(base_output, b->rdprail_shell_context, &workareaRect);
wl_list_for_each(base_head_iter, &base_output->head_list, output_link) {
to_rdp_head(base_head_iter)->workarea = workareaRect;
Expand Down
17 changes: 14 additions & 3 deletions xwayland/window-manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,12 +978,23 @@ weston_wm_handle_configure_request(struct weston_wm *wm, xcb_generic_event_t *ev
}

weston_wm_configure_window(wm, window->id, mask, values);
if (configure_frame_position)
if (window->frame == NULL && !window->override_redirect) {
/* must not mapped yet */
assert(!window->shsurf);
/* if frame is not created yet, or not override window,
save window position, so it's captured at map,
weston_wm_handle_map_request() for map_request_x/y.
This over-writes the position given at create_notify. */
window->x = configure_x;
window->y = configure_y;
} else if (configure_frame_position) {
weston_wm_window_configure_frame_with_position(window,
configure_x - x,
configure_y - y);
else
} else {
weston_wm_window_configure_frame(window);
}

weston_wm_window_schedule_repaint(window);
}

Expand Down Expand Up @@ -1022,7 +1033,7 @@ weston_wm_handle_configure_notify(struct weston_wm *wm, xcb_generic_event_t *eve
Previously, toplevel window was not movable by configure_notify, but
with move_position API, it can be moved. Thus, xcb_create_window is
for frame is now called with SHRT_MIN (previously it was 0, now changed to
something explicit, SHRT_SHORT), and configure with that value for frame
something explicit, SHRT_MIN), and configure with that value for frame
is ignored here. */
if (is_our_resource &&
configure_notify->x == SHRT_MIN &&
Expand Down