struct weston_touch *touch)
{
struct desktop_shell *shell = shsurf->shell;
-
+
grab->grab.interface = interface;
grab->shsurf = shsurf;
grab->shsurf_destroy_listener.notify = destroy_shell_grab_shsurf;
seat->pointer->button_count > 0 &&
seat->pointer->grab_serial == serial) {
surface = weston_surface_get_main_surface(seat->pointer->focus->surface);
- if ((surface == shsurf->surface) &&
+ if ((surface == shsurf->surface) &&
(surface_move(shsurf, seat) < 0))
wl_resource_post_no_memory(resource);
} else if (seat->touch &&
seat->touch->focus &&
seat->touch->grab_serial == serial) {
surface = weston_surface_get_main_surface(seat->touch->focus->surface);
- if ((surface == shsurf->surface) &&
+ if ((surface == shsurf->surface) &&
(surface_touch_move(shsurf, seat) < 0))
wl_resource_post_no_memory(resource);
}
{
struct shell_surface *shsurf = get_shell_surface(surface);
+ assert(shsurf);
+
wl_shell_surface_send_configure(shsurf->resource,
edges, width, height);
}
{
struct shell_surface *shsurf = get_shell_surface(surface);
+ assert(shsurf);
+
xdg_surface_send_configure(shsurf->resource, edges, width, height);
}
wl_signal_add(&es->destroy_signal, &state->surface_destroy_listener);
shsurf = get_shell_surface(main_surface);
+ assert(shsurf);
+
if (shsurf->state.fullscreen)
shell_configure_fullscreen(shsurf);
else
/* Update the surface’s layer. This brings it to the top of the stacking
* order as appropriate. */
- shell_surface_update_layer(get_shell_surface(main_surface));
+ shell_surface_update_layer(shsurf);
}
/* no-op func for checking black surface */
shsurf = get_shell_surface(surface);
+ assert(shsurf);
+
if (shsurf->state.fullscreen)
shell_configure_fullscreen(shsurf);
else if (shsurf->state.maximized) {
shell_surface_configure(struct weston_surface *es, int32_t sx, int32_t sy)
{
struct shell_surface *shsurf = get_shell_surface(es);
- struct desktop_shell *shell = shsurf->shell;
-
+ struct desktop_shell *shell;
int type_changed = 0;
+ assert(shsurf);
+
+ shell = shsurf->shell;
+
if (!weston_surface_is_mapped(es) &&
!wl_list_empty(&shsurf->popup.grab_link)) {
remove_popup_grab(shsurf);
{
struct shell_surface *shsurf = get_shell_surface(es);
+ assert(shsurf);
+
shsurf->saved_position_valid = false;
shsurf->next_state.maximized = false;
shsurf->next_state.fullscreen = false;