mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

osd: refactor to eliminate usage of g_strcmp0()

Browse source 
...to allow inclusion of ./scripts/find-banned in CI

No functional change intended.
This commit is contained in:
Johan Malm 2023-12-27 22:36:20 +00:00 • committed by Consolatis
parent e77dddbc59
commit 4b6239ee0c
1 changed files with 11 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/osd.c
View file

@ -20,23 +20,6 @@
#include "window-rules.h" #include "window-rules.h"
#include "workspaces.h" #include "workspaces.h"
/* is title different from app_id/class? */
static int
is_title_different(struct view *view)
{
switch (view->type) {
case LAB_XDG_SHELL_VIEW:
return g_strcmp0(view_get_string_prop(view, "title"),
view_get_string_prop(view, "app_id"));
#if HAVE_XWAYLAND
case LAB_XWAYLAND_VIEW:
return g_strcmp0(view_get_string_prop(view, "title"),
view_get_string_prop(view, "class"));
#endif
}
return 1;
}
static const char * static const char *
get_formatted_app_id(struct view *view) get_formatted_app_id(struct view *view)
{ {
@ -256,13 +239,18 @@ get_app_id(struct view *view)
} }
static const char * static const char *
get_title(struct view *view) get_title_if_different(struct view *view)
{ {
if (is_title_different(view)) { /*
return view_get_string_prop(view, "title"); * XWayland clients return WM_CLASS for 'app_id' so we don't need a
} else { * special case for that here.
return ""; */
const char *identifier = view_get_string_prop(view, "app_id");
const char *title = view_get_string_prop(view, "title");
if (!identifier) {
return title;
} }
return (!title || !strcmp(identifier, title)) ? NULL : title;
} }
static void static void
@ -371,7 +359,7 @@ render_osd(struct server *server, cairo_t *cairo, int w, int h,
break; break;
} }
case LAB_FIELD_TITLE: case LAB_FIELD_TITLE:
buf_add(&buf, get_title(*view)); buf_add(&buf, get_title_if_different(*view));
break; break;
default: default:
break; break;