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

Revert "Option to show full app_id in window switcher"

Browse source 
This reverts commit 7906b98a3c.
This commit is contained in:
kyak 2023-12-23 11:34:27 +03:00
parent 7906b98a3c
commit 702c7fc68b
5 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/labwc-config.5.scd
View file

@ -134,7 +134,7 @@ this is for compatibility with Openbox.
## WINDOW SWITCHER
*<windowSwitcher show="" preview="" outlines="" full_app_id="">*
*<windowSwitcher show="" preview="" outlines="">*
*show* [yes|no] Draw the OnScreenDisplay when switching between
windows. Default is yes.
@ -144,10 +144,6 @@ this is for compatibility with Openbox.
*outlines* [yes|no] Draw an outline around the selected window when
switching between windows. Default is yes.
*full_app_id* [yes|no] Display full application identifier instead of trimmed
variant. Trimming removes the first two nodes of 'org.' strings. Default is
no.
*<windowSwitcher><fields><field content="" width="%">*
Define window switcher fields.

2
docs/rc.xml.all
View file

@ -49,7 +49,7 @@
Just as for window-rules, 'identifier' relates to app_id for native Wayland
windows and WM_CLASS for XWayland clients.
-->
<windowSwitcher show="yes" preview="yes" outlines="yes" full_app_id="no">
<windowSwitcher show="yes" preview="yes" outlines="yes">
<fields>
<field content="type" width="25%" />
<field content="identifier" width="25%" />

1
include/config/rcxml.h
View file

@ -97,7 +97,6 @@ struct rcxml {
bool show;
bool preview;
bool outlines;
bool full_app_id;
struct wl_list fields; /* struct window_switcher_field.link */
} window_switcher;

5
src/config/rcxml.c
View file

@ -755,15 +755,13 @@ entry(xmlNode *node, char *nodename, char *content)
} else if (!strcasecmp(nodename, "topMaximize.snapping")) {
set_bool(content, &rc.snap_top_maximize);
/* <windowSwitcher show="" preview="" outlines="" full_app_id="" /> */
/* <windowSwitcher show="" preview="" outlines="" /> */
} else if (!strcasecmp(nodename, "show.windowSwitcher")) {
set_bool(content, &rc.window_switcher.show);
} else if (!strcasecmp(nodename, "preview.windowSwitcher")) {
set_bool(content, &rc.window_switcher.preview);
} else if (!strcasecmp(nodename, "outlines.windowSwitcher")) {
set_bool(content, &rc.window_switcher.outlines);
} else if (!strcasecmp(nodename, "full_app_id.windowSwitcher")) {
set_bool(content, &rc.window_switcher.full_app_id);
/* Remove this long term - just a friendly warning for now */
} else if (strstr(nodename, "windowswitcher.core")) {
@ -978,7 +976,6 @@ rcxml_init(void)
rc.window_switcher.show = true;
rc.window_switcher.preview = true;
rc.window_switcher.outlines = true;
rc.window_switcher.full_app_id = false;
rc.resize_indicator = LAB_RESIZE_INDICATOR_NEVER;

3
src/osd.c
View file

@ -44,9 +44,6 @@ get_formatted_app_id(struct view *view)
if (!s) {
return NULL;
}
if (rc.window_switcher.full_app_id) {
return s;
}
/* remove the first two nodes of 'org.' strings */
if (!strncmp(s, "org.", 4)) {
char *p = s + 4;