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

xserver: map transient windows into shell surface

Browse Source 
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
This commit is contained in:
Tiago Vignatti
2012-05-21 16:47:49 +03:00
committed by Kristian Høgsberg
parent dec76580c4
commit 1ad4c42a52
1 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xserver-launcher.c
+30 -10
View File
@@ -186,6 +186,7 @@ struct weston_wm_window {
uint32_t protocols; uint32_t protocols;
xcb_atom_t type; xcb_atom_t type;
int width, height; int width, height;
int x, y;
int decorate; int decorate;
}; };
@@ -740,6 +741,8 @@ weston_wm_handle_configure_notify(struct weston_wm *wm, xcb_generic_event_t *eve
if (configure_notify->window != window->id) if (configure_notify->window != window->id)
return; return;
window->x = configure_notify->x;
window->y = configure_notify->y;
window->width = configure_notify->width; window->width = configure_notify->width;
window->height = configure_notify->height; window->height = configure_notify->height;
@@ -1908,6 +1911,32 @@ get_wm_window(struct weston_surface *surface)
return NULL; return NULL;
} }
static void
xserver_map_shell_surface(struct weston_wm *wm,
struct weston_wm_window *window)
{
struct weston_shell_interface *shell_interface =
&wm->server->compositor->shell_interface;
struct weston_wm_window *parent;
if (!shell_interface->create_shell_surface)
return;
shell_interface->create_shell_surface(shell_interface->shell,
window->surface, &window->shsurf);
if (!window->transient_for) {
shell_interface->set_toplevel(window->shsurf);
return;
}
parent = hash_table_lookup(wm->window_hash, window->transient_for->id);
shell_interface->set_transient(window->shsurf, parent->shsurf,
window->x - parent->x,
window->y - parent->y,
WL_SHELL_SURFACE_TRANSIENT_INACTIVE);
}
static void static void
xserver_set_window_id(struct wl_client *client, struct wl_resource *resource, xserver_set_window_id(struct wl_client *client, struct wl_resource *resource,
struct wl_resource *surface_resource, uint32_t id) struct wl_resource *surface_resource, uint32_t id)
@@ -1916,8 +1945,6 @@ xserver_set_window_id(struct wl_client *client, struct wl_resource *resource,
struct weston_wm *wm = wxs->wm; struct weston_wm *wm = wxs->wm;
struct wl_surface *surface = surface_resource->data; struct wl_surface *surface = surface_resource->data;
struct weston_wm_window *window; struct weston_wm_window *window;
struct weston_shell_interface *shell_interface =
&wm->server->compositor->shell_interface;
if (client != wxs->client) if (client != wxs->client)
return; return;
@@ -1938,14 +1965,7 @@ xserver_set_window_id(struct wl_client *client, struct wl_resource *resource,
&window->surface_destroy_listener); &window->surface_destroy_listener);
weston_wm_window_schedule_repaint(window); weston_wm_window_schedule_repaint(window);
xserver_map_shell_surface(wm, window);
if (shell_interface->create_shell_surface) {
shell_interface->create_shell_surface(shell_interface->shell,
window->surface,
&window->shsurf);
shell_interface->set_toplevel(window->shsurf);
}
} }
static const struct xserver_interface xserver_implementation = { static const struct xserver_interface xserver_implementation = {