mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add view_impl .map and .unmap

Browse source 
Hook up iconify button to view->impl->unmap
This commit is contained in:
Johan Malm 2020-09-03 20:50:35 +01:00
parent 98c556be2a
commit bf3e4aa8d5
6 changed files with 79 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/labwc.h
View file

@ -107,6 +107,8 @@ enum deco_part {
struct view_impl {
void (*configure)(struct view *view, struct wlr_box geo);
void (*close)(struct view *view);
void (*map)(struct view *view);
void (*unmap)(struct view *view);
};
struct view {

3
src/cursor.c
View file

@ -201,6 +201,9 @@ void cursor_button(struct wl_listener *listener, void *data)
case LAB_DECO_BUTTON_CLOSE:
view->impl->close(view);
break;
case LAB_DECO_BUTTON_ICONIFY:
view->impl->unmap(view);
break;
case LAB_DECO_PART_TITLE:
interactive_begin(view, LAB_CURSOR_MOVE, 0);
break;

1
src/keyboard.c
View file

@ -66,7 +66,6 @@ static void keyboard_handle_key(struct wl_listener *listener, void *data)
} else if (event->state == WLR_KEY_PRESSED) {
/* cycle to next */
server->cycle_view = next_toplevel(server->cycle_view);
info("cycle_view=%p", (void *)server->cycle_view);
return;
}
}

13
src/view.c
View file

@ -140,15 +140,24 @@ static void move_xwayland_decendants_to_front(struct view *parent)
}
}
/**
* Note that if 'view' is not a toplevel view, the 'front' toplevel view
* will be focussed on; but if 'view' is a toplevel view, the 'next'
* will be focussed on.
*/
void view_focus(struct view *view)
{
/* Note: this function only deals with keyboard focus. */
if (!view || !view->surface)
if (!view)
return;
if (!view->mapped) {
view->impl->map(view);
return;
}
struct server *server = view->server;
struct wlr_seat *seat = server->seat;
struct wlr_surface *prev_surface;
prev_surface = seat->keyboard_state.focused_surface;
if (prev_surface == view->surface) {
/* Don't re-focus an already focused surface. */

46
src/xdg.c
View file

@ -13,7 +13,6 @@ static void xdg_deco_destroy(struct wl_listener *listener, void *data)
{
struct xdg_deco *xdg_deco =
wl_container_of(listener, xdg_deco, destroy);
wl_list_remove(&xdg_deco->destroy.link);
wl_list_remove(&xdg_deco->request_mode.link);
free(xdg_deco);
@ -76,25 +75,13 @@ static void handle_commit(struct wl_listener *listener, void *data)
void xdg_surface_map(struct wl_listener *listener, void *data)
{
struct view *view = wl_container_of(listener, view, map);
view->mapped = true;
view->surface = view->xdg_surface->surface;
if (!view->been_mapped) {
view->show_server_side_deco = has_ssd(view);
view_init_position(view);
}
view->been_mapped = true;
wl_signal_add(&view->xdg_surface->surface->events.commit,
&view->commit);
view->commit.notify = handle_commit;
view_focus(view);
view->impl->map(view);
}
void xdg_surface_unmap(struct wl_listener *listener, void *data)
{
struct view *view = wl_container_of(listener, view, unmap);
view->mapped = false;
wl_list_remove(&view->commit.link);
view_focus(next_toplevel(view));
view->impl->unmap(view);
}
void xdg_surface_destroy(struct wl_listener *listener, void *data)
@ -142,9 +129,33 @@ static void xdg_toplevel_view_close(struct view *view)
wlr_xdg_toplevel_send_close(view->xdg_surface);
}
static void xdg_toplevel_view_map(struct view *view)
{
view->mapped = true;
view->surface = view->xdg_surface->surface;
if (!view->been_mapped) {
view->show_server_side_deco = has_ssd(view);
view_init_position(view);
}
view->been_mapped = true;
wl_signal_add(&view->xdg_surface->surface->events.commit,
&view->commit);
view->commit.notify = handle_commit;
view_focus(view);
}
static void xdg_toplevel_view_unmap(struct view *view)
{
view->mapped = false;
wl_list_remove(&view->commit.link);
view_focus(next_toplevel(view));
}
static const struct view_impl xdg_toplevel_view_impl = {
.configure = xdg_toplevel_view_configure,
.close = xdg_toplevel_view_close,
.close = xdg_toplevel_view_close,
.map = xdg_toplevel_view_map,
.unmap = xdg_toplevel_view_unmap,
};
void xdg_surface_new(struct wl_listener *listener, void *data)
@ -152,9 +163,8 @@ void xdg_surface_new(struct wl_listener *listener, void *data)
struct server *server =
wl_container_of(listener, server, new_xdg_surface);
struct wlr_xdg_surface *xdg_surface = data;
if (xdg_surface->role != WLR_XDG_SURFACE_ROLE_TOPLEVEL) {
if (xdg_surface->role != WLR_XDG_SURFACE_ROLE_TOPLEVEL)
return;
}
struct view *view = calloc(1, sizeof(struct view));
view->server = server;

63
src/xwl.c
View file

@ -25,39 +25,13 @@ static void handle_commit(struct wl_listener *listener, void *data)
void xwl_surface_map(struct wl_listener *listener, void *data)
{
struct view *view = wl_container_of(listener, view, map);
view->mapped = true;
view->x = view->xwayland_surface->x;
view->y = view->xwayland_surface->y;
view->surface = view->xwayland_surface->surface;
if (!view->been_mapped) {
view->show_server_side_deco = has_ssd(view);
view_init_position(view);
wl_list_insert(&view->server->views, &view->link);
}
view->been_mapped = true;
/*
* Add commit listener here, because xwayland map/unmap can change
* the wlr_surface
*/
wl_signal_add(&view->xwayland_surface->surface->events.commit,
&view->commit);
view->commit.notify = handle_commit;
view_focus(view);
view->impl->map(view);
}
void xwl_surface_unmap(struct wl_listener *listener, void *data)
{
struct view *view = wl_container_of(listener, view, unmap);
view->mapped = false;
wl_list_remove(&view->commit.link);
/*
* Note that if 'view' is not a toplevel view, the 'front' toplevel view
* will be focussed on; but if 'view' is a toplevel view, the 'next'
* will be focussed on.
*/
view_focus(next_toplevel(view));
view->impl->unmap(view);
}
void xwl_surface_destroy(struct wl_listener *listener, void *data)
@ -92,9 +66,42 @@ static void xwl_view_close(struct view *view)
wlr_xwayland_surface_close(view->xwayland_surface);
}
static void xwl_view_map(struct view *view)
{
view->mapped = true;
view->x = view->xwayland_surface->x;
view->y = view->xwayland_surface->y;
view->surface = view->xwayland_surface->surface;
if (!view->been_mapped) {
view->show_server_side_deco = has_ssd(view);
view_init_position(view);
wl_list_insert(&view->server->views, &view->link);
}
view->been_mapped = true;
/*
* Add commit listener here, because xwayland map/unmap can change
* the wlr_surface
*/
wl_signal_add(&view->xwayland_surface->surface->events.commit,
&view->commit);
view->commit.notify = handle_commit;
view_focus(view);
}
static void xwl_view_unmap(struct view *view)
{
view->mapped = false;
wl_list_remove(&view->commit.link);
view_focus(next_toplevel(view));
}
static const struct view_impl xwl_view_impl = {
.configure = xwl_view_configure,
.close = xwl_view_close,
.map = xwl_view_map,
.unmap = xwl_view_unmap,
};
void xwl_surface_new(struct wl_listener *listener, void *data)