diff --git a/desktop-shell/exposay.c b/desktop-shell/exposay.c deleted file mode 100644 index c7c064b5..00000000 --- a/desktop-shell/exposay.c +++ /dev/null @@ -1,737 +0,0 @@ -/* - * Copyright © 2010-2012 Intel Corporation - * Copyright © 2011-2012 Collabora, Ltd. - * Copyright © 2013 Raspberry Pi Foundation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#include "config.h" - -#include -#include - -#include "shell.h" -#include "shared/helpers.h" - -struct exposay_surface { - struct desktop_shell *shell; - struct exposay_output *eoutput; - struct weston_surface *surface; - struct weston_view *view; - struct wl_listener view_destroy_listener; - struct wl_list link; - - int x; - int y; - int width; - int height; - double scale; - - int row; - int column; - - /* The animations only apply a transformation for their own lifetime, - * and don't have an option to indefinitely maintain the - * transformation in a steady state - so, we apply our own once the - * animation has finished. */ - struct weston_transform transform; -}; - -static void exposay_set_state(struct desktop_shell *shell, - enum exposay_target_state state, - struct weston_seat *seat); -static void exposay_check_state(struct desktop_shell *shell); - -static void -exposay_surface_destroy(struct exposay_surface *esurface) -{ - wl_list_remove(&esurface->link); - wl_list_remove(&esurface->view_destroy_listener.link); - - if (esurface->shell->exposay.focus_current == esurface->view) - esurface->shell->exposay.focus_current = NULL; - if (esurface->shell->exposay.focus_prev == esurface->view) - esurface->shell->exposay.focus_prev = NULL; - - free(esurface); -} - -static void -exposay_in_flight_inc(struct desktop_shell *shell) -{ - shell->exposay.in_flight++; -} - -static void -exposay_in_flight_dec(struct desktop_shell *shell) -{ - if (--shell->exposay.in_flight > 0) - return; - - exposay_check_state(shell); -} - -static void -exposay_animate_in_done(struct weston_view_animation *animation, void *data) -{ - struct exposay_surface *esurface = data; - - wl_list_insert(&esurface->view->geometry.transformation_list, - &esurface->transform.link); - weston_matrix_init(&esurface->transform.matrix); - weston_matrix_scale(&esurface->transform.matrix, - esurface->scale, esurface->scale, 1.0f); - weston_matrix_translate(&esurface->transform.matrix, - esurface->x - esurface->view->geometry.x, - esurface->y - esurface->view->geometry.y, - 0); - - weston_view_geometry_dirty(esurface->view); - weston_compositor_schedule_repaint(esurface->view->surface->compositor); - - exposay_in_flight_dec(esurface->shell); -} - -static void -exposay_animate_in(struct exposay_surface *esurface) -{ - exposay_in_flight_inc(esurface->shell); - - weston_move_scale_run(esurface->view, - esurface->x - esurface->view->geometry.x, - esurface->y - esurface->view->geometry.y, - 1.0, esurface->scale, 0, - exposay_animate_in_done, esurface); -} - -static void -exposay_animate_out_done(struct weston_view_animation *animation, void *data) -{ - struct exposay_surface *esurface = data; - struct desktop_shell *shell = esurface->shell; - - exposay_surface_destroy(esurface); - - exposay_in_flight_dec(shell); -} - -static void -exposay_animate_out(struct exposay_surface *esurface) -{ - exposay_in_flight_inc(esurface->shell); - - /* Remove the static transformation set up by - * exposay_transform_in_done(). */ - wl_list_remove(&esurface->transform.link); - weston_view_geometry_dirty(esurface->view); - - weston_move_scale_run(esurface->view, - esurface->x - esurface->view->geometry.x, - esurface->y - esurface->view->geometry.y, - 1.0, esurface->scale, 1, - exposay_animate_out_done, esurface); -} - -static void -exposay_highlight_surface(struct desktop_shell *shell, - struct exposay_surface *esurface) -{ - struct weston_view *view = esurface->view; - - if (shell->exposay.focus_current == view) - return; - - shell->exposay.row_current = esurface->row; - shell->exposay.column_current = esurface->column; - shell->exposay.cur_output = esurface->eoutput; - - activate(shell, view, shell->exposay.seat, - WESTON_ACTIVATE_FLAG_NONE); - shell->exposay.focus_current = view; -} - -static int -exposay_is_animating(struct desktop_shell *shell) -{ - if (shell->exposay.state_cur == EXPOSAY_LAYOUT_INACTIVE || - shell->exposay.state_cur == EXPOSAY_LAYOUT_OVERVIEW) - return 0; - - return (shell->exposay.in_flight > 0); -} - -static void -exposay_pick(struct desktop_shell *shell, int x, int y) -{ - struct exposay_surface *esurface; - - if (exposay_is_animating(shell)) - return; - - wl_list_for_each(esurface, &shell->exposay.surface_list, link) { - if (x < esurface->x || x > esurface->x + esurface->width) - continue; - if (y < esurface->y || y > esurface->y + esurface->height) - continue; - - exposay_highlight_surface(shell, esurface); - return; - } -} - -static void -handle_view_destroy(struct wl_listener *listener, void *data) -{ - struct exposay_surface *esurface = container_of(listener, - struct exposay_surface, - view_destroy_listener); - - exposay_surface_destroy(esurface); -} - -/* Compute each surface size and then inner pad (10% of surface size). - * After that, it's necessary to recompute surface size (90% of its - * original size). Also, each surface can't be bigger than half the - * exposay area width and height. - */ -static void -exposay_surface_and_inner_pad_size(pixman_rectangle32_t exposay_area, struct exposay_output *eoutput) -{ - if (exposay_area.height < exposay_area.width) - eoutput->surface_size = exposay_area.height / eoutput->grid_size; - else - eoutput->surface_size = exposay_area.width / eoutput->grid_size; - - eoutput->padding_inner = eoutput->surface_size / 10; - eoutput->surface_size -= eoutput->padding_inner; - - if ((uint32_t)eoutput->surface_size > (exposay_area.width / 2)) - eoutput->surface_size = exposay_area.width / 2; - if ((uint32_t)eoutput->surface_size > (exposay_area.height / 2)) - eoutput->surface_size = exposay_area.height / 2; -} - -/* Compute the exposay top/left margin in order to centralize it */ -static void -exposay_margin_size(struct desktop_shell *shell, pixman_rectangle32_t exposay_area, - int row_size, int column_size, int *left_margin, int *top_margin) -{ - (*left_margin) = exposay_area.x + (exposay_area.width - row_size) / 2; - (*top_margin) = exposay_area.y + (exposay_area.height - column_size) / 2; -} - -/* Pretty lame layout for now; just tries to make a square. Should take - * aspect ratio into account really. Also needs to be notified of surface - * addition and removal and adjust layout/animate accordingly. - * - * Lay the grid out as square as possible, losing surfaces from the - * bottom row if required. Start with fixed padding of a 10% margin - * around the outside, and maximise the area made available to surfaces - * after this. Also, add an inner padding between surfaces that varies - * with the surface size (10% of its size). - * - * If we can't make a square grid, add one extra row at the bottom which - * will have a smaller number of columns. - */ -static enum exposay_layout_state -exposay_layout(struct desktop_shell *shell, struct shell_output *shell_output) -{ - struct workspace *workspace = shell->exposay.workspace; - struct weston_output *output = shell_output->output; - struct exposay_output *eoutput = &shell_output->eoutput; - struct weston_view *view; - struct exposay_surface *esurface, *highlight = NULL; - pixman_rectangle32_t exposay_area; - int pad, row_size, column_size, left_margin, top_margin; - int last_row_size, last_row_margin_increase; - int populated_rows; - int i; - - eoutput->num_surfaces = 0; - wl_list_for_each(view, &workspace->layer.view_list.link, layer_link.link) { - if (!get_shell_surface(view->surface)) - continue; - if (view->output != output) - continue; - eoutput->num_surfaces++; - } - - if (eoutput->num_surfaces == 0) { - eoutput->grid_size = 0; - eoutput->padding_inner = 0; - eoutput->surface_size = 0; - return EXPOSAY_LAYOUT_OVERVIEW; - } - - /* Get exposay area and position, taking into account - * the shell panel position and size */ - get_output_work_area(shell, output, &exposay_area); - - /* Compute grid size */ - eoutput->grid_size = floor(sqrtf(eoutput->num_surfaces)); - if (pow(eoutput->grid_size, 2) != eoutput->num_surfaces) - eoutput->grid_size++; - - /* Compute each surface size and the inner padding between them */ - exposay_surface_and_inner_pad_size(exposay_area, eoutput); - - /* Compute each row/column size */ - pad = eoutput->surface_size + eoutput->padding_inner; - row_size = (pad * eoutput->grid_size) - eoutput->padding_inner; - /* We may have empty rows that should be desconsidered to compute - * column size */ - populated_rows = ceil(eoutput->num_surfaces / (float) eoutput->grid_size); - column_size = (pad * populated_rows) - eoutput->padding_inner; - - /* The last row size can be different, since it may have less surfaces - * than the grid size. Also, its margin may be increased to centralize - * its surfaces, in the case where we don't have a perfect grid. */ - last_row_size = ((eoutput->num_surfaces % eoutput->grid_size) * pad) - eoutput->padding_inner; - if (eoutput->num_surfaces % eoutput->grid_size) - last_row_margin_increase = (row_size - last_row_size) / 2; - else - last_row_margin_increase = 0; - - /* Compute a top/left margin to centralize the exposay */ - exposay_margin_size(shell, exposay_area, row_size, column_size, &left_margin, &top_margin); - - i = 0; - wl_list_for_each(view, &workspace->layer.view_list.link, layer_link.link) { - - if (!get_shell_surface(view->surface)) - continue; - if (view->output != output) - continue; - - esurface = malloc(sizeof(*esurface)); - if (!esurface) { - exposay_set_state(shell, EXPOSAY_TARGET_CANCEL, - shell->exposay.seat); - break; - } - - wl_list_insert(&shell->exposay.surface_list, &esurface->link); - esurface->shell = shell; - esurface->eoutput = eoutput; - esurface->view = view; - - esurface->row = i / eoutput->grid_size; - esurface->column = i % eoutput->grid_size; - - esurface->x = left_margin + (pad * esurface->column); - esurface->y = top_margin + (pad * esurface->row); - - /* If this is the last row, increase left margin (it sums 0 if - * we have a perfect square) to centralize the surfaces */ - if (eoutput->num_surfaces / eoutput->grid_size == esurface->row) - esurface->x += last_row_margin_increase; - - if (view->surface->width > view->surface->height) - esurface->scale = eoutput->surface_size / (float) view->surface->width; - else - esurface->scale = eoutput->surface_size / (float) view->surface->height; - esurface->width = view->surface->width * esurface->scale; - esurface->height = view->surface->height * esurface->scale; - - /* Surfaces are usually rectangular, but their exposay surfaces - * are square. centralize them in their own square */ - if (esurface->width > esurface->height) - esurface->y += (esurface->width - esurface->height) / 2; - else - esurface->x += (esurface->height - esurface->width) / 2; - - if (shell->exposay.focus_current == esurface->view) - highlight = esurface; - - exposay_animate_in(esurface); - - /* We want our destroy handler to be after the animation - * destroy handler in the list, this way when the view is - * destroyed, the animation can safely call the animation - * completion callback before we free the esurface in our - * destroy handler. - */ - esurface->view_destroy_listener.notify = handle_view_destroy; - wl_signal_add(&view->destroy_signal, &esurface->view_destroy_listener); - - i++; - } - - if (highlight) { - shell->exposay.focus_current = NULL; - exposay_highlight_surface(shell, highlight); - } - - weston_compositor_schedule_repaint(shell->compositor); - - return EXPOSAY_LAYOUT_ANIMATE_TO_OVERVIEW; -} - -static void -exposay_focus(struct weston_pointer_grab *grab) -{ -} - -static void -exposay_motion(struct weston_pointer_grab *grab, - const struct timespec *time, - struct weston_pointer_motion_event *event) -{ - struct desktop_shell *shell = - container_of(grab, struct desktop_shell, exposay.grab_ptr); - - weston_pointer_move(grab->pointer, event); - - exposay_pick(shell, - wl_fixed_to_int(grab->pointer->x), - wl_fixed_to_int(grab->pointer->y)); -} - -static void -exposay_button(struct weston_pointer_grab *grab, const struct timespec *time, - uint32_t button, uint32_t state_w) -{ - struct desktop_shell *shell = - container_of(grab, struct desktop_shell, exposay.grab_ptr); - struct weston_seat *seat = grab->pointer->seat; - enum wl_pointer_button_state state = state_w; - - if (button != BTN_LEFT) - return; - - /* Store the surface we clicked on, and don't do anything if we end up - * releasing on a different surface. */ - if (state == WL_POINTER_BUTTON_STATE_PRESSED) { - shell->exposay.clicked = shell->exposay.focus_current; - return; - } - - if (shell->exposay.focus_current == shell->exposay.clicked) - exposay_set_state(shell, EXPOSAY_TARGET_SWITCH, seat); - else - shell->exposay.clicked = NULL; -} - -static void -exposay_axis(struct weston_pointer_grab *grab, - const struct timespec *time, - struct weston_pointer_axis_event *event) -{ -} - -static void -exposay_axis_source(struct weston_pointer_grab *grab, uint32_t source) -{ -} - -static void -exposay_frame(struct weston_pointer_grab *grab) -{ -} - -static void -exposay_pointer_grab_cancel(struct weston_pointer_grab *grab) -{ - struct desktop_shell *shell = - container_of(grab, struct desktop_shell, exposay.grab_ptr); - - exposay_set_state(shell, EXPOSAY_TARGET_CANCEL, shell->exposay.seat); -} - -static const struct weston_pointer_grab_interface exposay_ptr_grab = { - exposay_focus, - exposay_motion, - exposay_button, - exposay_axis, - exposay_axis_source, - exposay_frame, - exposay_pointer_grab_cancel, -}; - -static int -exposay_maybe_move(struct desktop_shell *shell, int row, int column) -{ - struct exposay_surface *esurface; - - wl_list_for_each(esurface, &shell->exposay.surface_list, link) { - if (esurface->eoutput != shell->exposay.cur_output || - esurface->row != row || esurface->column != column) - continue; - - exposay_highlight_surface(shell, esurface); - return 1; - } - - return 0; -} - -static void -exposay_key(struct weston_keyboard_grab *grab, const struct timespec *time, - uint32_t key, uint32_t state_w) -{ - struct weston_seat *seat = grab->keyboard->seat; - struct desktop_shell *shell = - container_of(grab, struct desktop_shell, exposay.grab_kbd); - enum wl_keyboard_key_state state = state_w; - - if (state != WL_KEYBOARD_KEY_STATE_RELEASED) - return; - - switch (key) { - case KEY_ESC: - exposay_set_state(shell, EXPOSAY_TARGET_CANCEL, seat); - break; - case KEY_ENTER: - exposay_set_state(shell, EXPOSAY_TARGET_SWITCH, seat); - break; - case KEY_UP: - exposay_maybe_move(shell, shell->exposay.row_current - 1, - shell->exposay.column_current); - break; - case KEY_DOWN: - /* Special case for trying to move to the bottom row when it - * has fewer items than all the others. */ - if (!exposay_maybe_move(shell, shell->exposay.row_current + 1, - shell->exposay.column_current) && - shell->exposay.row_current < (shell->exposay.cur_output->grid_size - 1)) { - exposay_maybe_move(shell, shell->exposay.row_current + 1, - (shell->exposay.cur_output->num_surfaces % - shell->exposay.cur_output->grid_size) - 1); - } - break; - case KEY_LEFT: - exposay_maybe_move(shell, shell->exposay.row_current, - shell->exposay.column_current - 1); - break; - case KEY_RIGHT: - exposay_maybe_move(shell, shell->exposay.row_current, - shell->exposay.column_current + 1); - break; - case KEY_TAB: - /* Try to move right, then down (and to the leftmost column), - * then if all else fails, to the top left. */ - if (!exposay_maybe_move(shell, shell->exposay.row_current, - shell->exposay.column_current + 1) && - !exposay_maybe_move(shell, shell->exposay.row_current + 1, 0)) - exposay_maybe_move(shell, 0, 0); - break; - default: - break; - } -} - -static void -exposay_modifier(struct weston_keyboard_grab *grab, uint32_t serial, - uint32_t mods_depressed, uint32_t mods_latched, - uint32_t mods_locked, uint32_t group) -{ - struct desktop_shell *shell = - container_of(grab, struct desktop_shell, exposay.grab_kbd); - struct weston_seat *seat = (struct weston_seat *) grab->keyboard->seat; - - /* We want to know when mod has been pressed and released. - * FIXME: There is a problem here: if mod is pressed, then a key - * is pressed and released, then mod is released, we will treat that - * as if only mod had been pressed and released. */ - if (seat->modifier_state) { - if (seat->modifier_state == shell->binding_modifier) { - shell->exposay.mod_pressed = true; - } else { - shell->exposay.mod_invalid = true; - } - } else { - if (shell->exposay.mod_pressed && !shell->exposay.mod_invalid) - exposay_set_state(shell, EXPOSAY_TARGET_CANCEL, seat); - - shell->exposay.mod_invalid = false; - shell->exposay.mod_pressed = false; - } - - return; -} - -static void -exposay_cancel(struct weston_keyboard_grab *grab) -{ - struct desktop_shell *shell = - container_of(grab, struct desktop_shell, exposay.grab_kbd); - - exposay_set_state(shell, EXPOSAY_TARGET_CANCEL, shell->exposay.seat); -} - -static const struct weston_keyboard_grab_interface exposay_kbd_grab = { - exposay_key, - exposay_modifier, - exposay_cancel, -}; - -/** - * Called when the transition from overview -> inactive has completed. - */ -static enum exposay_layout_state -exposay_set_inactive(struct desktop_shell *shell) -{ - struct weston_seat *seat = shell->exposay.seat; - struct weston_keyboard *keyboard = weston_seat_get_keyboard(seat); - struct weston_pointer *pointer = weston_seat_get_pointer(seat); - - if (pointer) - weston_pointer_end_grab(pointer); - - if (keyboard) { - weston_keyboard_end_grab(keyboard); - if (keyboard->input_method_resource) - keyboard->grab = &keyboard->input_method_grab; - } - - return EXPOSAY_LAYOUT_INACTIVE; -} - -/** - * Begins the transition from overview to inactive. */ -static enum exposay_layout_state -exposay_transition_inactive(struct desktop_shell *shell, int switch_focus) -{ - struct exposay_surface *esurface; - - /* Call activate() before we start the animations to avoid - * animating back the old state and then immediately transitioning - * to the new. */ - if (switch_focus && shell->exposay.focus_current) - activate(shell, shell->exposay.focus_current, - shell->exposay.seat, - WESTON_ACTIVATE_FLAG_CONFIGURE); - else if (shell->exposay.focus_prev) - activate(shell, shell->exposay.focus_prev, - shell->exposay.seat, - WESTON_ACTIVATE_FLAG_CONFIGURE); - - wl_list_for_each(esurface, &shell->exposay.surface_list, link) - exposay_animate_out(esurface); - weston_compositor_schedule_repaint(shell->compositor); - - return EXPOSAY_LAYOUT_ANIMATE_TO_INACTIVE; -} - -static enum exposay_layout_state -exposay_transition_active(struct desktop_shell *shell) -{ - struct weston_seat *seat = shell->exposay.seat; - struct weston_pointer *pointer = weston_seat_get_pointer(seat); - struct weston_keyboard *keyboard = weston_seat_get_keyboard(seat); - struct shell_output *shell_output; - bool animate = false; - - shell->exposay.workspace = get_current_workspace(shell); - shell->exposay.focus_prev = get_default_view(keyboard->focus); - shell->exposay.focus_current = get_default_view(keyboard->focus); - shell->exposay.clicked = NULL; - wl_list_init(&shell->exposay.surface_list); - - lower_fullscreen_layer(shell, NULL); - shell->exposay.grab_kbd.interface = &exposay_kbd_grab; - weston_keyboard_start_grab(keyboard, - &shell->exposay.grab_kbd); - weston_keyboard_set_focus(keyboard, NULL); - - shell->exposay.grab_ptr.interface = &exposay_ptr_grab; - if (pointer) { - weston_pointer_start_grab(pointer, - &shell->exposay.grab_ptr); - weston_pointer_clear_focus(pointer); - } - wl_list_for_each(shell_output, &shell->output_list, link) { - enum exposay_layout_state state; - - state = exposay_layout(shell, shell_output); - - if (state == EXPOSAY_LAYOUT_ANIMATE_TO_OVERVIEW) - animate = true; - } - - return animate ? EXPOSAY_LAYOUT_ANIMATE_TO_OVERVIEW - : EXPOSAY_LAYOUT_OVERVIEW; -} - -static void -exposay_check_state(struct desktop_shell *shell) -{ - enum exposay_layout_state state_new = shell->exposay.state_cur; - int do_switch = 0; - - /* Don't do anything whilst animations are running, just store up - * target state changes and only act on them when the animations have - * completed. */ - if (exposay_is_animating(shell)) - return; - - switch (shell->exposay.state_target) { - case EXPOSAY_TARGET_OVERVIEW: - switch (shell->exposay.state_cur) { - case EXPOSAY_LAYOUT_OVERVIEW: - goto out; - case EXPOSAY_LAYOUT_ANIMATE_TO_OVERVIEW: - state_new = EXPOSAY_LAYOUT_OVERVIEW; - break; - default: - state_new = exposay_transition_active(shell); - break; - } - break; - - case EXPOSAY_TARGET_SWITCH: - do_switch = 1; /* fallthrough */ - case EXPOSAY_TARGET_CANCEL: - switch (shell->exposay.state_cur) { - case EXPOSAY_LAYOUT_INACTIVE: - goto out; - case EXPOSAY_LAYOUT_ANIMATE_TO_INACTIVE: - state_new = exposay_set_inactive(shell); - break; - default: - state_new = exposay_transition_inactive(shell, do_switch); - break; - } - - break; - } - -out: - shell->exposay.state_cur = state_new; -} - -static void -exposay_set_state(struct desktop_shell *shell, enum exposay_target_state state, - struct weston_seat *seat) -{ - shell->exposay.state_target = state; - shell->exposay.seat = seat; - exposay_check_state(shell); -} - -void -exposay_binding(struct weston_keyboard *keyboard, enum weston_keyboard_modifier modifier, - void *data) -{ - struct desktop_shell *shell = data; - - exposay_set_state(shell, EXPOSAY_TARGET_OVERVIEW, keyboard->seat); -} diff --git a/desktop-shell/meson.build b/desktop-shell/meson.build index c6f374ee..8c9754e4 100644 --- a/desktop-shell/meson.build +++ b/desktop-shell/meson.build @@ -3,7 +3,6 @@ if get_option('shell-desktop') srcs_shell_desktop = [ 'shell.c', - 'exposay.c', 'input-panel.c', weston_desktop_shell_server_protocol_h, weston_desktop_shell_protocol_c, diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index e4f84ec6..0b686b92 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -490,11 +490,6 @@ shell_configuration(struct desktop_shell *shell) shell->binding_modifier = get_modifier(s); free(s); - weston_config_section_get_string(section, - "exposay-modifier", &s, "none"); - shell->exposay_modifier = get_modifier(s); - free(s); - weston_config_section_get_string(section, "animation", &s, "none"); shell->win_animation_type = get_animation_type(s); free(s); @@ -4917,11 +4912,6 @@ shell_add_bindings(struct weston_compositor *ec, struct desktop_shell *shell) weston_compositor_add_key_binding(ec, KEY_BRIGHTNESSUP, 0, backlight_binding, ec); - /* configurable bindings */ - if (shell->exposay_modifier) - weston_compositor_add_modifier_binding(ec, shell->exposay_modifier, - exposay_binding, shell); - mod = shell->binding_modifier; if (!mod) return; @@ -5048,9 +5038,6 @@ wet_shell_init(struct weston_compositor *ec, shell_configuration(shell); - shell->exposay.state_cur = EXPOSAY_LAYOUT_INACTIVE; - shell->exposay.state_target = EXPOSAY_TARGET_CANCEL; - for (i = 0; i < shell->workspaces.num; i++) { pws = wl_array_add(&shell->workspaces.array, sizeof *pws); if (pws == NULL) diff --git a/desktop-shell/shell.h b/desktop-shell/shell.h index 01af4aaf..f4cb40fd 100644 --- a/desktop-shell/shell.h +++ b/desktop-shell/shell.h @@ -45,51 +45,6 @@ enum fade_type { FADE_OUT }; -enum exposay_target_state { - EXPOSAY_TARGET_OVERVIEW, /* show all windows */ - EXPOSAY_TARGET_CANCEL, /* return to normal, same focus */ - EXPOSAY_TARGET_SWITCH, /* return to normal, switch focus */ -}; - -enum exposay_layout_state { - EXPOSAY_LAYOUT_INACTIVE = 0, /* normal desktop */ - EXPOSAY_LAYOUT_ANIMATE_TO_INACTIVE, /* in transition to normal */ - EXPOSAY_LAYOUT_OVERVIEW, /* show all windows */ - EXPOSAY_LAYOUT_ANIMATE_TO_OVERVIEW, /* in transition to all windows */ -}; - -struct exposay_output { - int num_surfaces; - int grid_size; - int surface_size; - int padding_inner; -}; - -struct exposay { - /* XXX: Make these exposay_surfaces. */ - struct weston_view *focus_prev; - struct weston_view *focus_current; - struct weston_view *clicked; - struct workspace *workspace; - struct weston_seat *seat; - - struct wl_list surface_list; - - struct weston_keyboard_grab grab_kbd; - struct weston_pointer_grab grab_ptr; - - enum exposay_target_state state_target; - enum exposay_layout_state state_cur; - int in_flight; /* number of animations still running */ - - int row_current; - int column_current; - struct exposay_output *cur_output; - - bool mod_pressed; - bool mod_invalid; -}; - struct focus_surface { struct weston_curtain *curtain; struct weston_transform workspace_transform; @@ -109,7 +64,6 @@ struct workspace { struct shell_output { struct desktop_shell *shell; struct weston_output *output; - struct exposay_output eoutput; struct wl_listener destroy_listener; struct wl_list link; @@ -195,11 +149,8 @@ struct desktop_shell { struct wl_list surfaces; } input_panel; - struct exposay exposay; - bool allow_zap; uint32_t binding_modifier; - uint32_t exposay_modifier; enum animation_type win_animation_type; enum animation_type win_close_animation_type; enum animation_type startup_animation_type; @@ -245,10 +196,6 @@ void activate(struct desktop_shell *shell, struct weston_view *view, struct weston_seat *seat, uint32_t flags); -void -exposay_binding(struct weston_keyboard *keyboard, - enum weston_keyboard_modifier modifier, - void *data); int input_panel_setup(struct desktop_shell *shell); void