mirror of
https://github.com/labwc/labwc.git
synced 2026-02-05 04:06:33 -05:00
cycle: support <action name="NextWindow" workspace="current|all">
This commit deprecates <windowSwitcher allWorkspaces="yes|no"> and adds per-action argument <action name="NextWindow" workspace="current|all">.
This commit is contained in:
parent
caa9b90e80
commit
a5c6ff499c
10 changed files with 78 additions and 35 deletions
|
|
@ -182,7 +182,7 @@ struct rcxml {
|
|||
bool outlines;
|
||||
bool unshade;
|
||||
enum window_switcher_order order;
|
||||
enum lab_view_criteria criteria;
|
||||
enum cycle_workspace_filter workspace_filter; /* deprecated */
|
||||
struct {
|
||||
bool show;
|
||||
enum cycle_osd_style style;
|
||||
|
|
|
|||
|
|
@ -117,6 +117,11 @@ enum cycle_osd_style {
|
|||
CYCLE_OSD_STYLE_THUMBNAIL,
|
||||
};
|
||||
|
||||
enum cycle_workspace_filter {
|
||||
CYCLE_WORKSPACE_ALL,
|
||||
CYCLE_WORKSPACE_CURRENT,
|
||||
};
|
||||
|
||||
enum cycle_output_filter {
|
||||
CYCLE_OUTPUT_ALL,
|
||||
CYCLE_OUTPUT_CURSOR,
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
#include <stdbool.h>
|
||||
#include <wayland-server-core.h>
|
||||
#include "config/types.h"
|
||||
|
||||
struct output;
|
||||
|
||||
|
|
@ -42,13 +43,18 @@ struct cycle_osd_field {
|
|||
struct wl_list link; /* struct rcxml.window_switcher.osd.fields */
|
||||
};
|
||||
|
||||
struct cycle_filter {
|
||||
enum cycle_workspace_filter workspace;
|
||||
};
|
||||
|
||||
struct buf;
|
||||
struct view;
|
||||
struct server;
|
||||
struct wlr_scene_node;
|
||||
|
||||
/* Begin window switcher */
|
||||
void cycle_begin(struct server *server, enum lab_cycle_dir direction);
|
||||
void cycle_begin(struct server *server, enum lab_cycle_dir direction,
|
||||
struct cycle_filter filter);
|
||||
|
||||
/* Cycle the selected view in the window switcher */
|
||||
void cycle_step(struct server *server, enum lab_cycle_dir direction);
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
#include <wlr/util/box.h>
|
||||
#include <wlr/util/log.h>
|
||||
#include "common/set.h"
|
||||
#include "cycle.h"
|
||||
#include "input/cursor.h"
|
||||
#include "overlay.h"
|
||||
|
||||
|
|
@ -310,6 +311,7 @@ struct server {
|
|||
struct wlr_scene_node *preview_node;
|
||||
struct wlr_scene_node *preview_dummy;
|
||||
struct lab_scene_rect *preview_outline;
|
||||
struct cycle_filter filter;
|
||||
} cycle;
|
||||
|
||||
struct theme *theme;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue