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

tree-wide: auto-replace of (struct server *)

Browse source 
#!/bin/bash
    read -r -d '' EXPRS << EOF
    s/xwayland->server/xwayland->svr/g;

    s/\t*struct server \*server;\n//g;
    s/\t*struct server \*server =.*?;\n//gs;
    s/\t*.* = ([a-z_]*->)*server[;,]\n//g;
    s/\{\n\n/\{\n/g;
    s/\n\n+/\n\n/g;

    s/\(\s*struct server \*server\)/(void)/g;
    s/\(\s*struct server \*server,\s*/(/g;
    s/,\s*struct server \*server\)/)/g;
    s/,\s*struct server \*server,\s*/, /g;

    s/\(\s*([a-z_]*->)*server\)/()/g;
    s/\(\s*([a-z_]*->)*server,\s*/(/g;
    s/,\s*([a-z_]*->)*server\)/)/g;
    s/,\s*([a-z_]*->)*server,\s*/, /g;

    s/([a-z_]*->)*server->/g_server./g;

    s/xwayland->svr/xwayland->server/g;
    EOF

    find src include \( -name \*.c -o -name \*.h \) -exec \
        perl -0777 -i -pe "$EXPRS" \{\} \;
This commit is contained in:
John Lindgren 2026-02-23 11:56:39 -05:00 • committed by Johan Malm
parent 60ac8f07bb
commit cb49bddf63
81 changed files with 1522 additions and 1682 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/scaled-buffer/scaled-icon-buffer.c
View file

@ -59,8 +59,7 @@ img_to_buffer(struct lab_img *img, int width, int height, double scale)
static struct lab_data_buffer *
load_client_icon(struct scaled_icon_buffer *self, int icon_size, double scale)
{
struct lab_img *img = desktop_entry_load_icon(self->server,
self->view_icon_name, icon_size, scale);
struct lab_img *img = desktop_entry_load_icon(self->view_icon_name, icon_size, scale);
if (img) {
wlr_log(WLR_DEBUG, "loaded icon from client icon name");
return img_to_buffer(img, self->width, self->height, scale);
@ -83,8 +82,7 @@ load_client_icon(struct scaled_icon_buffer *self, int icon_size, double scale)
static struct lab_data_buffer *
load_server_icon(struct scaled_icon_buffer *self, int icon_size, double scale)
{
struct lab_img *img = desktop_entry_load_icon_from_app_id(self->server,
self->view_app_id, icon_size, scale);
struct lab_img *img = desktop_entry_load_icon_from_app_id(self->view_app_id, icon_size, scale);
if (img) {
wlr_log(WLR_DEBUG, "loaded icon by app_id");
return img_to_buffer(img, self->width, self->height, scale);
@ -106,7 +104,7 @@ _create_buffer(struct scaled_buffer *scaled_buffer, double scale)
if (self->icon_name) {
/* generic icon (e.g. menu icons) */
img = desktop_entry_load_icon(self->server, self->icon_name,
img = desktop_entry_load_icon(self->icon_name,
icon_size, scale);
if (img) {
wlr_log(WLR_DEBUG, "loaded icon by icon name");
@ -136,7 +134,7 @@ _create_buffer(struct scaled_buffer *scaled_buffer, double scale)
}
}
/* If both client and server icons are unavailable, use the fallback icon */
img = desktop_entry_load_icon(self->server, rc.fallback_app_icon_name,
img = desktop_entry_load_icon(rc.fallback_app_icon_name,
icon_size, scale);
if (img) {
wlr_log(WLR_DEBUG, "loaded fallback icon");
@ -215,8 +213,7 @@ static struct scaled_buffer_impl impl = {
};
struct scaled_icon_buffer *
scaled_icon_buffer_create(struct wlr_scene_tree *parent, struct server *server,
int width, int height)
scaled_icon_buffer_create(struct wlr_scene_tree *parent, int width, int height)
{
assert(parent);
assert(width >= 0 && height >= 0);
@ -226,7 +223,6 @@ scaled_icon_buffer_create(struct wlr_scene_tree *parent, struct server *server,
struct scaled_icon_buffer *self = znew(*self);
self->scaled_buffer = scaled_buffer;
self->scene_buffer = scaled_buffer->scene_buffer;
self->server = server;
self->width = width;
self->height = height;