diff options
| author | Rolf Vidar Mazunki Hoksaas <[email protected]> | 2024-02-15 03:29:04 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-02-14 21:29:04 -0500 |
| commit | 271af3d4748c7c0c4f45c3c250c33fb7b3399ed5 (patch) | |
| tree | e24705656be81418cd2de3b6baa31e091d084bb0 /sway/main.c | |
| parent | cf3ef50a3fb8bf6d8b63d84d15cfdf0ae72daedb (diff) | |
enhancement: update version printing format (#254)
* enhancement: update version printing format
as mentioned in #253, version numbers can be confusing if you don't know
or realize you're running SwayFX instead of standard sway.
to fix this issue, I've updated the way we display versions, replacing
"sway version X" to "swayfx version X", suffixed by the sway upstream
version which swayfx is based upon.
while not immediately displaying we come from swayfx in
swaymsg/swaynag/swaybar, we do display we're based off a specific
upstream sway version.
note: this requires updating `meson.build` (currently `meson.build:181`)
each time we rebase into a new sway version.
Closes: Issue #253
Signed-off-by: Mazunki Hoksaas <[email protected]>
* reduce linelength
---------
Signed-off-by: Mazunki Hoksaas <[email protected]>
Diffstat (limited to 'sway/main.c')
| -rw-r--r-- | sway/main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sway/main.c b/sway/main.c index 85bc2f1c..681a24e9 100644 --- a/sway/main.c +++ b/sway/main.c @@ -288,7 +288,7 @@ int main(int argc, char **argv) { allow_unsupported_gpu = true; break; case 'v': // version - printf("sway version " SWAY_VERSION "\n"); + printf("swayfx version " SWAY_VERSION " (based on sway " SWAY_ORIGINAL_VERSION ")\n"); exit(EXIT_SUCCESS); break; case 'V': // verbose @@ -335,7 +335,7 @@ int main(int argc, char **argv) { wlr_log_init(WLR_ERROR, handle_wlr_log); } - sway_log(SWAY_INFO, "Sway version " SWAY_VERSION); + sway_log(SWAY_INFO, "swayfx version " SWAY_VERSION " (based on sway version " SWAY_ORIGINAL_VERSION ")"); sway_log(SWAY_INFO, "wlroots version " WLR_VERSION_STR); log_kernel(); log_distro(); @@ -373,7 +373,8 @@ int main(int argc, char **argv) { // prevent ipc from crashing sway signal(SIGPIPE, SIG_IGN); - sway_log(SWAY_INFO, "Starting sway version " SWAY_VERSION); + sway_log(SWAY_INFO, "Starting swayfx version " SWAY_VERSION + " (based on sway version " SWAY_ORIGINAL_VERSION ")"); root = root_create(); |