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

window-title: rewording, renaming, lint fixes

Browse source
This commit is contained in:
massi 2026-05-12 17:06:18 -07:00 • committed by Johan Malm
parent 0a9bd41df0
commit cd7be59d5f
4 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

14
docs/labwc.1.scd
View file

@ -70,13 +70,13 @@ the `--exit` and `--reconfigure` options use.
session clients support both X11 and Wayland, this command line option session clients support both X11 and Wayland, this command line option
avoids re-writes and fragmentation. avoids re-writes and fragmentation.
*-t, --window-title* <fmtstr> *-t, --title* <fmtstr>
Set the window title for labwc to use when nested in a compositor. Set the window title for labwc to use when it is running in a window
<fmtstr> is a format string to be used as the window title, replacing (i.e. nested in a compositor). <fmtstr> is a format string to be used as
`%o` with the name of the output region. This is useful when simulating the window title, replacing `%o` with the name of the output
multiple screens, such as with running labwc with the enviornment region. This is useful when simulating multiple screens, such as with
variable `WLR_WL_OUTPUTS=2`. In this case, `%o` will be unique per running labwc with the enviornment variable `WLR_WL_OUTPUTS=2`. In this
simulated screen. case, `%o` will be unique per simulated screen.
*-v, --version* *-v, --version*
Show the version number and quit Show the version number and quit

2
include/labwc.h
View file

@ -316,7 +316,7 @@ struct server {
pid_t primary_client_pid; pid_t primary_client_pid;
char *window_title_fmt; char *title_fmt;
}; };
/* defined in main.c */ /* defined in main.c */

32
src/main.c
View file

@ -38,7 +38,7 @@ static const struct option long_options[] = {
{"reconfigure", no_argument, NULL, 'r'}, {"reconfigure", no_argument, NULL, 'r'},
{"startup", required_argument, NULL, 's'}, {"startup", required_argument, NULL, 's'},
{"session", required_argument, NULL, 'S'}, {"session", required_argument, NULL, 'S'},
{"window-title", required_argument, NULL, 't'}, {"title", required_argument, NULL, 't'},
{"version", no_argument, NULL, 'v'}, {"version", no_argument, NULL, 'v'},
{"verbose", no_argument, NULL, 'V'}, {"verbose", no_argument, NULL, 'V'},
{0, 0, 0, 0} {0, 0, 0, 0}
@ -46,18 +46,18 @@ static const struct option long_options[] = {
static const char labwc_usage[] = static const char labwc_usage[] =
"Usage: labwc [options...]\n" "Usage: labwc [options...]\n"
" -c, --config <file> Specify config file (with path)\n" " -c, --config <file> Specify config file (with path)\n"
" -C, --config-dir <dir> Specify config directory\n" " -C, --config-dir <dir> Specify config directory\n"
" -d, --debug Enable full logging, including debug information\n" " -d, --debug Enable full logging, including debug information\n"
" -e, --exit Exit the compositor\n" " -e, --exit Exit the compositor\n"
" -h, --help Show help message and quit\n" " -h, --help Show help message and quit\n"
" -m, --merge-config Merge user config files/theme in all XDG Base Dirs\n" " -m, --merge-config Merge user config files/theme in all XDG Base Dirs\n"
" -r, --reconfigure Reload the compositor configuration\n" " -r, --reconfigure Reload the compositor configuration\n"
" -s, --startup <command> Run command on startup\n" " -s, --startup <command> Run command on startup\n"
" -S, --session <command> Run command on startup and terminate on exit\n" " -S, --session <command> Run command on startup and terminate on exit\n"
" -t, --window-title <fmtstr> Specify title to use when the compositor is nested\n" " -t, --title <fmtstr> Specify title to use when running in a window\n"
" -v, --version Show version number and quit\n" " -v, --version Show version number and quit\n"
" -V, --verbose Enable more verbose logging\n"; " -V, --verbose Enable more verbose logging\n";
static void static void
usage(void) usage(void)
@ -211,7 +211,7 @@ main(int argc, char *argv[])
primary_client = optarg; primary_client = optarg;
break; break;
case 't': case 't':
server.window_title_fmt = optarg; server.title_fmt = optarg;
break; break;
case 'v': case 'v':
print_version(); print_version();
@ -271,8 +271,8 @@ main(int argc, char *argv[])
increase_nofile_limit(); increase_nofile_limit();
if (string_null_or_empty(server.window_title_fmt)) { if (string_null_or_empty(server.title_fmt)) {
server.window_title_fmt = "labwc - %o"; server.title_fmt = "labwc - %o";
} }
server_init(); server_init();

4
src/output.c
View file

@ -607,8 +607,8 @@ handle_new_output(struct wl_listener *listener, void *data)
} }
if (wlr_output_is_wl(wlr_output)) { if (wlr_output_is_wl(wlr_output)) {
gchar** parts = g_strsplit(server.window_title_fmt, "%o", -1); gchar **parts = g_strsplit(server.title_fmt, "%o", -1);
gchar* formatted_title = g_strjoinv(wlr_output->name, parts); gchar *formatted_title = g_strjoinv(wlr_output->name, parts);
g_strfreev(parts); g_strfreev(parts);
wlr_wl_output_set_title(wlr_output, formatted_title); wlr_wl_output_set_title(wlr_output, formatted_title);
g_free(formatted_title); g_free(formatted_title);