mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xwayland: Forward global position to X

Browse Source 
xeyes works as expected now. subwindows are popped also as expected. This
patch should fix the following:

https://bugs.freedesktop.org/show_bug.cgi?id=59983

Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
This commit is contained in:
Tiago Vignatti
2013-06-12 15:43:21 -03:00
committed by Kristian Høgsberg
parent 55375b9858
commit fb2adba3da
5 changed files with 79 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xwayland/window-manager.c
+47 -26
View File
@@ -593,12 +593,49 @@ weston_wm_window_activate(struct wl_listener *listener, void *data)
if (wm->focus_window)
weston_wm_window_schedule_repaint(wm->focus_window);
wm->focus_window = window;
if (window)
wm->focus_latest = window;
if (wm->focus_window)
weston_wm_window_schedule_repaint(wm->focus_window);
}
static void
weston_wm_window_transform(struct wl_listener *listener, void *data)
{
struct weston_surface *surface = data;
struct weston_wm_window *window = get_wm_window(surface);
struct weston_wm *wm =
container_of(listener, struct weston_wm, transform_listener);
struct weston_output *output = surface->output;
uint32_t mask, values[2];
float sxf, syf;
int sx, sy;
static int old_sx = -1, old_sy = -1;
if (!window || !wm)
return;
if (!weston_surface_is_mapped(surface))
return;
weston_surface_to_global_float(surface, output->x, output->y,
&sxf, &syf);
sx = (int) sxf;
sy = (int) syf;
if (old_sx == sx && old_sy == sy)
return;
values[0] = sx;
values[1] = sy;
mask = XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y;
xcb_configure_window(wm->conn, window->frame_id, mask, values);
xcb_flush(wm->conn);
old_sx = sx;
old_sy = sy;
}
static int
our_resource(struct weston_wm *wm, uint32_t id)
{
@@ -1684,6 +1721,9 @@ weston_wm_create(struct weston_xserver *wxs)
wm->activate_listener.notify = weston_wm_window_activate;
wl_signal_add(&wxs->compositor->activate_signal,
&wm->activate_listener);
wm->transform_listener.notify = weston_wm_window_transform;
wl_signal_add(&wxs->compositor->transform_signal,
&wm->transform_listener);
wm->kill_listener.notify = weston_wm_kill_client;
wl_signal_add(&wxs->compositor->kill_signal,
&wm->kill_listener);
@@ -1807,9 +1847,7 @@ xserver_map_shell_surface(struct weston_wm *wm,
{
struct weston_shell_interface *shell_interface =
&wm->server->compositor->shell_interface;
struct weston_wm_window *parent;
struct theme *t = window->wm->theme;
int parent_id, x = 0, y = 0;
if (!shell_interface->create_shell_surface)
return;
@@ -1827,31 +1865,14 @@ xserver_map_shell_surface(struct weston_wm *wm,
0, NULL);
return;
} else if (!window->override_redirect) {
/* ICCCM 4.1.1 */
shell_interface->set_toplevel(window->shsurf);
return;
} else {
shell_interface->set_xwayland(window->shsurf,
window->x + t->margin,
window->y + t->margin,
WL_SHELL_SURFACE_TRANSIENT_INACTIVE);
}
/* not all non-toplevel has transient_for set. So we need this
* workaround to guess a parent that will determine the relative
* position of the transient surface */
if (!window->transient_for)
parent_id = wm->focus_latest->id;
else
parent_id = window->transient_for->id;
parent = hash_table_lookup(wm->window_hash, parent_id);
/* non-decorated and non-toplevel windows, e.g. sub-menus */
if (!parent->decorate && parent->override_redirect) {
x = parent->x + t->margin;
y = parent->y + t->margin;
}
shell_interface->set_transient(window->shsurf, parent->surface,
window->x + t->margin - x,
window->y + t->margin - y,
WL_SHELL_SURFACE_TRANSIENT_INACTIVE);
}
static void
src/xwayland/xwayland.h
+1 -1
View File
@@ -53,7 +53,6 @@ struct weston_wm {
struct weston_xserver *server;
xcb_window_t wm_window;
struct weston_wm_window *focus_window;
struct weston_wm_window *focus_latest;
struct theme *theme;
xcb_cursor_t *cursors;
int last_cursor;
@@ -61,6 +60,7 @@ struct weston_wm {
xcb_visualid_t visual_id;
xcb_colormap_t colormap;
struct wl_listener activate_listener;
struct wl_listener transform_listener;
struct wl_listener kill_listener;
xcb_window_t selection_window;