mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

osd: support full app_id in window switcher (#1309)

Browse source 
Support showing full application
identifier or the trimmed variant in window switcher OSD.

Regression notice: For anyone using ‘identifier’ in window-switcher field configuration, change it to ‘trimmed_identifier’.
This commit is contained in:
kyak 2023-12-27 13:55:49 +03:00 • committed by GitHub
parent ccd4ab943e
commit d2d469133f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -163,6 +163,9 @@ this is for compatibility with Openbox.
- *identifier* Show identifier (app_id for native Wayland
windows and WM_CLASS for XWayland clients)
- *trimmed_identifier* Show trimmed identifier. Trimming removes the first
two nodes of 'org.' strings.
- *title* Show window title if different to app_id
*width* defines the width of the field expressed as a percentage of

3
docs/rc.xml.all
View file

@ -56,7 +56,8 @@
<windowSwitcher show="yes" preview="yes" outlines="yes">
<fields>
<field content="type" width="25%" />
<field content="identifier" width="25%" />
<field content="trimmed_identifier" width="25%" />
<!-- <field content="identifier" width="25%" /> -->
<field content="title" width="50%" />
</fields>
</windowSwitcher>

1
include/config/rcxml.h
View file

@ -17,6 +17,7 @@ enum window_switcher_field_content {
LAB_FIELD_NONE = 0,
LAB_FIELD_TYPE,
LAB_FIELD_IDENTIFIER,
LAB_FIELD_TRIMMED_IDENTIFIER,
LAB_FIELD_TITLE,
};

4
src/config/rcxml.c
View file

@ -198,6 +198,8 @@ fill_window_switcher_field(char *nodename, char *content)
} else if (!strcmp(content, "app_id")) {
wlr_log(WLR_ERROR, "window-switcher field 'app_id' is deprecated");
current_field->content = LAB_FIELD_IDENTIFIER;
} else if (!strcmp(content, "trimmed_identifier")) {
current_field->content = LAB_FIELD_TRIMMED_IDENTIFIER;
} else if (!strcmp(content, "title")) {
current_field->content = LAB_FIELD_TITLE;
} else {
@ -1228,7 +1230,7 @@ static struct {
int width;
} fields[] = {
{ LAB_FIELD_TYPE, 25 },
{ LAB_FIELD_IDENTIFIER, 25 },
{ LAB_FIELD_TRIMMED_IDENTIFIER, 25 },
{ LAB_FIELD_TITLE, 50 },
{ LAB_FIELD_NONE, 0 },
};

15
src/osd.c
View file

@ -41,6 +41,15 @@ static const char *
get_formatted_app_id(struct view *view)
{
char *s = (char *)view_get_string_prop(view, "app_id");
if (!s) {
return NULL;
}
return s;
}
static const char *
get_trimmed_app_id(char *s)
{
if (!s) {
return NULL;
}
@ -355,6 +364,12 @@ render_osd(struct server *server, cairo_t *cairo, int w, int h,
case LAB_FIELD_IDENTIFIER:
buf_add(&buf, get_app_id(*view));
break;
case LAB_FIELD_TRIMMED_IDENTIFIER:
{
char *s = (char *)get_app_id(*view);
buf_add(&buf, get_trimmed_app_id(s));
break;
}
case LAB_FIELD_TITLE:
buf_add(&buf, get_title(*view));
break;