mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-05-18 21:37:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cycle.c: put common code in get_view_criteria()

Browse source
This commit is contained in:
Johan Malm 2026-05-06 21:17:02 +01:00 • committed by Consolatis
parent ff2f243eb1
commit 949e9ffe42
1 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/cycle/cycle.c
View file

@ -9,6 +9,7 @@
#include "common/mem.h" #include "common/mem.h"
#include "common/scene-helpers.h" #include "common/scene-helpers.h"
#include "config/rcxml.h" #include "config/rcxml.h"
#include "config/types.h"
#include "labwc.h" #include "labwc.h"
#include "node.h" #include "node.h"
#include "output.h" #include "output.h"
@ -322,6 +323,18 @@ handle_osd_tree_destroy(struct wl_listener *listener, void *data)
free(osd_output); free(osd_output);
} }
static enum lab_view_criteria
get_view_criteria(struct cycle_filter *filter)
{
enum lab_view_criteria criteria =
LAB_VIEW_CRITERIA_NO_SKIP_WINDOW_SWITCHER
| LAB_VIEW_CRITERIA_NO_DIALOG;
if (filter->workspace == CYCLE_WORKSPACE_CURRENT) {
criteria |= LAB_VIEW_CRITERIA_CURRENT_WORKSPACE;
}
return criteria;
}
static struct wl_list *prev(struct wl_list *elm) { return elm->prev; } static struct wl_list *prev(struct wl_list *elm) { return elm->prev; }
static struct wl_list *next(struct wl_list *elm) { return elm->next; } static struct wl_list *next(struct wl_list *elm) { return elm->next; }
@ -331,13 +344,10 @@ cycle_immediate(enum lab_cycle_dir direction, struct cycle_filter filter)
if (wl_list_empty(&server.views)) { if (wl_list_empty(&server.views)) {
return; return;
} }
enum lab_view_criteria criteria =
LAB_VIEW_CRITERIA_NO_SKIP_WINDOW_SWITCHER enum lab_view_criteria criteria = get_view_criteria(&filter);
| LAB_VIEW_CRITERIA_NO_DIALOG;
if (filter.workspace == CYCLE_WORKSPACE_CURRENT) {
criteria |= LAB_VIEW_CRITERIA_CURRENT_WORKSPACE;
}
uint64_t cycle_outputs = get_outputs_by_filter(filter.output); uint64_t cycle_outputs = get_outputs_by_filter(filter.output);
const char *cycle_app_id = NULL; const char *cycle_app_id = NULL;
if (filter.app_id == CYCLE_APP_ID_CURRENT && server.active_view) { if (filter.app_id == CYCLE_APP_ID_CURRENT && server.active_view) {
cycle_app_id = server.active_view->app_id; cycle_app_id = server.active_view->app_id;
@ -381,15 +391,8 @@ cycle_immediate(enum lab_cycle_dir direction, struct cycle_filter filter)
static bool static bool
init_cycle(struct cycle_filter filter) init_cycle(struct cycle_filter filter)
{ {
enum lab_view_criteria criteria = enum lab_view_criteria criteria = get_view_criteria(&filter);
LAB_VIEW_CRITERIA_NO_SKIP_WINDOW_SWITCHER uint64_t cycle_outputs = get_outputs_by_filter(filter.output);
| LAB_VIEW_CRITERIA_NO_DIALOG;
if (filter.workspace == CYCLE_WORKSPACE_CURRENT) {
criteria |= LAB_VIEW_CRITERIA_CURRENT_WORKSPACE;
}
uint64_t cycle_outputs =
get_outputs_by_filter(filter.output);
const char *cycle_app_id = NULL; const char *cycle_app_id = NULL;
if (filter.app_id == CYCLE_APP_ID_CURRENT && server.active_view) { if (filter.app_id == CYCLE_APP_ID_CURRENT && server.active_view) {