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

libweston: Drop shell_interface

Browse Source 
Its usage is now limited to some dock-related helper, and the plugin
registry is a better fit for that kind of helper.

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Giulio Camuffo <giuliocamuffo@gmail.com>
This commit is contained in:
Quentin Glidic
2016-08-15 10:56:52 +02:00
parent 96c6a798a5
commit fff39817bc
2 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop-shell/shell.c
+8 -11
View File
@@ -51,6 +51,7 @@
#endif #endif
struct focus_state { struct focus_state {
struct desktop_shell *shell;
struct weston_seat *seat; struct weston_seat *seat;
struct workspace *ws; struct workspace *ws;
struct weston_surface *keyboard_focus; struct weston_surface *keyboard_focus;
@@ -332,11 +333,10 @@ get_output_panel_size(struct desktop_shell *shell,
} }
static void static void
get_output_work_area(void *data, get_output_work_area(struct desktop_shell *shell,
struct weston_output *output, struct weston_output *output,
pixman_rectangle32_t *area) pixman_rectangle32_t *area)
{ {
struct desktop_shell *shell = data;
int32_t panel_width = 0, panel_height = 0; int32_t panel_width = 0, panel_height = 0;
area->x = output->x; area->x = output->x;
@@ -633,7 +633,6 @@ focus_state_surface_destroy(struct wl_listener *listener, void *data)
struct focus_state *state = container_of(listener, struct focus_state *state = container_of(listener,
struct focus_state, struct focus_state,
surface_destroy_listener); surface_destroy_listener);
struct desktop_shell *shell;
struct weston_surface *main_surface; struct weston_surface *main_surface;
struct weston_view *next; struct weston_view *next;
struct weston_view *view; struct weston_view *view;
@@ -658,13 +657,12 @@ focus_state_surface_destroy(struct wl_listener *listener, void *data)
if (main_surface != state->keyboard_focus) if (main_surface != state->keyboard_focus)
next = get_default_view(main_surface); next = get_default_view(main_surface);
shell = state->seat->compositor->shell_interface.shell;
if (next) { if (next) {
state->keyboard_focus = NULL; state->keyboard_focus = NULL;
activate(shell, next, state->seat, activate(state->shell, next, state->seat,
WESTON_ACTIVATE_FLAG_CONFIGURE); WESTON_ACTIVATE_FLAG_CONFIGURE);
} else { } else {
if (shell->focus_animation_type == ANIMATION_DIM_LAYER) { if (state->shell->focus_animation_type == ANIMATION_DIM_LAYER) {
if (state->ws->focus_animation) if (state->ws->focus_animation)
weston_view_animation_destroy(state->ws->focus_animation); weston_view_animation_destroy(state->ws->focus_animation);
@@ -680,7 +678,8 @@ focus_state_surface_destroy(struct wl_listener *listener, void *data)
} }
static struct focus_state * static struct focus_state *
focus_state_create(struct weston_seat *seat, struct workspace *ws) focus_state_create(struct desktop_shell *shell, struct weston_seat *seat,
struct workspace *ws)
{ {
struct focus_state *state; struct focus_state *state;
@@ -688,6 +687,7 @@ focus_state_create(struct weston_seat *seat, struct workspace *ws)
if (state == NULL) if (state == NULL)
return NULL; return NULL;
state->shell = shell;
state->keyboard_focus = NULL; state->keyboard_focus = NULL;
state->ws = ws; state->ws = ws;
state->seat = seat; state->seat = seat;
@@ -713,7 +713,7 @@ ensure_focus_state(struct desktop_shell *shell, struct weston_seat *seat)
break; break;
if (&state->link == &ws->focus_list) if (&state->link == &ws->focus_list)
state = focus_state_create(seat, ws); state = focus_state_create(shell, seat, ws);
return state; return state;
} }
@@ -4867,9 +4867,6 @@ module_init(struct weston_compositor *ec,
shell->transform_listener.notify = transform_handler; shell->transform_listener.notify = transform_handler;
wl_signal_add(&ec->transform_signal, &shell->transform_listener); wl_signal_add(&ec->transform_signal, &shell->transform_listener);
ec->shell_interface.shell = shell;
ec->shell_interface.get_output_work_area = get_output_work_area;
weston_layer_init(&shell->fullscreen_layer, &ec->cursor_layer.link); weston_layer_init(&shell->fullscreen_layer, &ec->cursor_layer.link);
weston_layer_init(&shell->panel_layer, &shell->fullscreen_layer.link); weston_layer_init(&shell->panel_layer, &shell->fullscreen_layer.link);
weston_layer_init(&shell->background_layer, &shell->panel_layer.link); weston_layer_init(&shell->background_layer, &shell->panel_layer.link);
libweston/compositor.h
-7
View File
@@ -100,12 +100,6 @@ struct weston_mode {
struct wl_list link; struct wl_list link;
}; };
struct weston_shell_interface {
void *shell; /* either desktop or tablet */
void (*get_output_work_area)(void *shell, struct weston_output *output, pixman_rectangle32_t *area);
};
struct weston_animation { struct weston_animation {
void (*frame)(struct weston_animation *animation, void (*frame)(struct weston_animation *animation,
struct weston_output *output, uint32_t msecs); struct weston_output *output, uint32_t msecs);
@@ -758,7 +752,6 @@ struct weston_compositor {
struct wl_display *wl_display; struct wl_display *wl_display;
struct weston_desktop_xwayland *xwayland; struct weston_desktop_xwayland *xwayland;
const struct weston_desktop_xwayland_interface *xwayland_interface; const struct weston_desktop_xwayland_interface *xwayland_interface;
struct weston_shell_interface shell_interface;
/* surface signals */ /* surface signals */
struct wl_signal create_surface_signal; struct wl_signal create_surface_signal;