[PATCH weston v2 08/21] desktop-shell: Pass a flag bitmask instead of bool to activate()
Jonas Ådahl
jadahl at gmail.com
Wed May 13 03:26:29 PDT 2015
Although it currently only has one available flag, but that'll change.
Signed-off-by: Jonas Ådahl <jadahl at gmail.com>
---
desktop-shell/exposay.c | 9 ++++++---
desktop-shell/shell.c | 35 +++++++++++++++++++++++------------
desktop-shell/shell.h | 2 +-
src/compositor.h | 5 +++++
4 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/desktop-shell/exposay.c b/desktop-shell/exposay.c
index 5073a96..5be92c7 100644
--- a/desktop-shell/exposay.c
+++ b/desktop-shell/exposay.c
@@ -160,7 +160,8 @@ exposay_highlight_surface(struct desktop_shell *shell,
shell->exposay.column_current = esurface->column;
shell->exposay.cur_output = esurface->eoutput;
- activate(shell, view, shell->exposay.seat, false);
+ activate(shell, view, shell->exposay.seat,
+ WESTON_ACTIVATE_FLAG_NONE);
shell->exposay.focus_current = view;
}
@@ -545,10 +546,12 @@ exposay_transition_inactive(struct desktop_shell *shell, int switch_focus)
* to the new. */
if (switch_focus && shell->exposay.focus_current)
activate(shell, shell->exposay.focus_current,
- shell->exposay.seat, true);
+ shell->exposay.seat,
+ WESTON_ACTIVATE_FLAG_CONFIGURE);
else if (shell->exposay.focus_prev)
activate(shell, shell->exposay.focus_prev,
- shell->exposay.seat, true);
+ shell->exposay.seat,
+ WESTON_ACTIVATE_FLAG_CONFIGURE);
wl_list_for_each(esurface, &shell->exposay.surface_list, link)
exposay_animate_out(esurface);
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index cb74347..cbd7d88 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -809,7 +809,8 @@ focus_state_surface_destroy(struct wl_listener *listener, void *data)
shell = state->seat->compositor->shell_interface.shell;
if (next) {
state->keyboard_focus = NULL;
- activate(shell, next, state->seat, true);
+ activate(shell, next, state->seat,
+ WESTON_ACTIVATE_FLAG_CONFIGURE);
} else {
if (shell->focus_animation_type == ANIMATION_DIM_LAYER) {
if (state->ws->focus_animation)
@@ -2052,10 +2053,12 @@ busy_cursor_grab_button(struct weston_pointer_grab *base,
struct weston_seat *seat = grab->grab.pointer->seat;
if (shsurf && button == BTN_LEFT && state) {
- activate(shsurf->shell, shsurf->view, seat, true);
+ activate(shsurf->shell, shsurf->view, seat,
+ WESTON_ACTIVATE_FLAG_CONFIGURE);
surface_move(shsurf, seat, 0);
} else if (shsurf && button == BTN_RIGHT && state) {
- activate(shsurf->shell, shsurf->view, seat, true);
+ activate(shsurf->shell, shsurf->view, seat,
+ WESTON_ACTIVATE_FLAG_CONFIGURE);
surface_rotate(shsurf, seat);
}
}
@@ -5095,7 +5098,7 @@ lower_fullscreen_layer(struct desktop_shell *shell)
void
activate(struct desktop_shell *shell, struct weston_view *view,
- struct weston_seat *seat, bool configure)
+ struct weston_seat *seat, enum weston_activate_flag flags)
{
struct weston_surface *es = view->surface;
struct weston_surface *main_surface;
@@ -5120,7 +5123,8 @@ activate(struct desktop_shell *shell, struct weston_view *view,
shsurf = get_shell_surface(main_surface);
assert(shsurf);
- if (shsurf->state.fullscreen && configure)
+ if (shsurf->state.fullscreen &&
+ flags & WESTON_ACTIVATE_FLAG_CONFIGURE)
shell_configure_fullscreen(shsurf);
else
restore_all_output_modes(shell->compositor);
@@ -5157,7 +5161,8 @@ is_black_surface(struct weston_view *view, struct weston_view **fs_view)
static void
activate_binding(struct weston_seat *seat,
struct desktop_shell *shell,
- struct weston_view *focus_view)
+ struct weston_view *focus_view,
+ enum weston_activate_flag flags)
{
struct weston_view *main_view;
struct weston_surface *main_surface;
@@ -5172,7 +5177,7 @@ activate_binding(struct weston_seat *seat,
if (get_shell_surface_type(main_surface) == SHELL_SURFACE_NONE)
return;
- activate(shell, focus_view, seat, true);
+ activate(shell, focus_view, seat, flags);
}
static void
@@ -5185,7 +5190,8 @@ click_to_activate_binding(struct weston_seat *seat,
if (seat->pointer->focus == NULL)
return;
- activate_binding(seat, data, seat->pointer->focus);
+ activate_binding(seat, data, seat->pointer->focus,
+ WESTON_ACTIVATE_FLAG_CONFIGURE);
}
static void
@@ -5196,7 +5202,8 @@ touch_to_activate_binding(struct weston_seat *seat, uint32_t time, void *data)
if (seat->touch->focus == NULL)
return;
- activate_binding(seat, data, seat->touch->focus);
+ activate_binding(seat, data, seat->touch->focus,
+ WESTON_ACTIVATE_FLAG_CONFIGURE);
}
static void
@@ -5610,7 +5617,8 @@ map(struct desktop_shell *shell, struct shell_surface *shsurf,
if (shell->locked)
break;
wl_list_for_each(seat, &compositor->seat_list, link)
- activate(shell, shsurf->view, seat, true);
+ activate(shell, shsurf->view, seat,
+ WESTON_ACTIVATE_FLAG_CONFIGURE);
break;
case SHELL_SURFACE_POPUP:
case SHELL_SURFACE_NONE:
@@ -6106,9 +6114,12 @@ switcher_destroy(struct switcher *switcher)
weston_surface_damage(view->surface);
}
- if (switcher->current)
+ if (switcher->current) {
activate(switcher->shell, switcher->current,
- keyboard->seat, true);
+ keyboard->seat,
+ WESTON_ACTIVATE_FLAG_CONFIGURE);
+ }
+
wl_list_remove(&switcher->listener.link);
weston_keyboard_end_grab(keyboard);
if (keyboard->input_method_resource)
diff --git a/desktop-shell/shell.h b/desktop-shell/shell.h
index 9409f8f..0be0d30 100644
--- a/desktop-shell/shell.h
+++ b/desktop-shell/shell.h
@@ -231,7 +231,7 @@ lower_fullscreen_layer(struct desktop_shell *shell);
void
activate(struct desktop_shell *shell, struct weston_view *view,
- struct weston_seat *seat, bool configure);
+ struct weston_seat *seat, uint32_t flags);
void
exposay_binding(struct weston_seat *seat,
diff --git a/src/compositor.h b/src/compositor.h
index dc4b830..dd554bb 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -1026,6 +1026,11 @@ enum weston_key_state_update {
STATE_UPDATE_NONE,
};
+enum weston_activate_flag {
+ WESTON_ACTIVATE_FLAG_NONE = 0,
+ WESTON_ACTIVATE_FLAG_CONFIGURE = 1 << 0,
+};
+
void
weston_version(int *major, int *minor, int *micro);
--
2.1.4
More information about the wayland-devel
mailing list