alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Rename fowa enum and use switch in view_request_activate

Browse source
This commit is contained in:
Ryan Dwyer 2018-09-02 18:25:45 +10:00
parent f057a0195e
commit 6fb03817c9
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/sway/config.h
View file

@ -60,7 +60,7 @@ struct sway_mouse_binding {
/** /**
* Focus on window activation. * Focus on window activation.
*/ */
enum fowa { enum sway_fowa {
FOWA_SMART, FOWA_SMART,
FOWA_URGENT, FOWA_URGENT,
FOWA_FOCUS, FOWA_FOCUS,
@ -350,7 +350,7 @@ struct sway_config {
size_t font_height; size_t font_height;
bool pango_markup; bool pango_markup;
size_t urgent_timeout; size_t urgent_timeout;
enum fowa focus_on_window_activation; enum sway_fowa focus_on_window_activation;
// Flags // Flags
bool focus_follows_mouse; bool focus_follows_mouse;

28
sway/tree/view.c
View file

@ -281,26 +281,26 @@ void view_set_activated(struct sway_view *view, bool activated) {
} }
void view_request_activate(struct sway_view *view) { void view_request_activate(struct sway_view *view) {
if (config->focus_on_window_activation == FOWA_NONE) {
return;
}
if (config->focus_on_window_activation == FOWA_FOCUS) {
struct sway_seat *seat = input_manager_current_seat(input_manager);
seat_set_focus(seat, view->swayc);
return;
}
if (config->focus_on_window_activation == FOWA_URGENT) {
view_set_urgent(view, true);
return;
}
// FOWA_SMART
struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE); struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE);
if (workspace_is_visible(ws)) {
struct sway_seat *seat = input_manager_current_seat(input_manager); struct sway_seat *seat = input_manager_current_seat(input_manager);
switch (config->focus_on_window_activation) {
case FOWA_SMART:
if (workspace_is_visible(ws)) {
seat_set_focus(seat, view->swayc); seat_set_focus(seat, view->swayc);
} else { } else {
view_set_urgent(view, true); view_set_urgent(view, true);
} }
break;
case FOWA_URGENT:
view_set_urgent(view, true);
break;
case FOWA_FOCUS:
seat_set_focus(seat, view->swayc);
break;
case FOWA_NONE:
break;
}
} }
void view_set_tiled(struct sway_view *view, bool tiled) { void view_set_tiled(struct sway_view *view, bool tiled) {