mirror of
https://codeberg.org/dnkl/yambar.git
synced 2025-04-19 19:25:41 +02:00
Rename project: f00bar -> yambar
This commit is contained in:
parent
9b9344877f
commit
9dbbc480e4
23 changed files with 87 additions and 87 deletions
12
.build.yml
12
.build.yml
|
@ -23,7 +23,7 @@ packages:
|
||||||
- gcovr
|
- gcovr
|
||||||
|
|
||||||
sources:
|
sources:
|
||||||
- https://git.sr.ht/~dnkl/f00bar
|
- https://git.sr.ht/~dnkl/yambar
|
||||||
|
|
||||||
triggers:
|
triggers:
|
||||||
- action: email
|
- action: email
|
||||||
|
@ -37,11 +37,11 @@ tasks:
|
||||||
python2 -m pip install --user --upgrade setuptools
|
python2 -m pip install --user --upgrade setuptools
|
||||||
- setup: |
|
- setup: |
|
||||||
mkdir -p bld/debug bld/release bld/x11-only bld/wayland-only bld/plugs-are-shared
|
mkdir -p bld/debug bld/release bld/x11-only bld/wayland-only bld/plugs-are-shared
|
||||||
meson --buildtype=debug -Db_coverage=true f00bar bld/debug
|
meson --buildtype=debug -Db_coverage=true yambar bld/debug
|
||||||
meson --buildtype=minsize f00bar bld/release
|
meson --buildtype=minsize yambar bld/release
|
||||||
meson --buildtype=debug -Dbackend-x11=enabled -Dbackend-wayland=disabled f00bar bld/x11-only
|
meson --buildtype=debug -Dbackend-x11=enabled -Dbackend-wayland=disabled yambar bld/x11-only
|
||||||
meson --buildtype=debug -Dbackend-x11=disabled -Dbackend-wayland=enabled f00bar bld/wayland-only
|
meson --buildtype=debug -Dbackend-x11=disabled -Dbackend-wayland=enabled yambar bld/wayland-only
|
||||||
meson --buildtype=debug -Dcore-plugins-as-shared-libraries=true f00bar bld/plugs-are-shared
|
meson --buildtype=debug -Dcore-plugins-as-shared-libraries=true yambar bld/plugs-are-shared
|
||||||
- build: |
|
- build: |
|
||||||
ninja -C bld/debug -k0
|
ninja -C bld/debug -k0
|
||||||
ninja -C bld/release -k0
|
ninja -C bld/release -k0
|
||||||
|
|
4
PKGBUILD
4
PKGBUILD
|
@ -1,9 +1,9 @@
|
||||||
pkgname=f00bar
|
pkgname=yambar
|
||||||
pkgver=1.1.1
|
pkgver=1.1.1
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Simplistic and highly configurable status panel for X and Wayland"
|
pkgdesc="Simplistic and highly configurable status panel for X and Wayland"
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
url=https://gitlab.com/dnkl/f00bar
|
url=https://gitlab.com/dnkl/yambar
|
||||||
license=(mit)
|
license=(mit)
|
||||||
makedepends=('meson' 'ninja' 'scdoc')
|
makedepends=('meson' 'ninja' 'scdoc')
|
||||||
depends=(
|
depends=(
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
pkgname=f00bar-wayland
|
pkgname=yambar-wayland
|
||||||
pkgver=1.1.1
|
pkgver=1.1.1
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Simplistic and highly configurable status panel for Wayland"
|
pkgdesc="Simplistic and highly configurable status panel for Wayland"
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
url=https://gitlab.com/dnkl/f00bar
|
url=https://gitlab.com/dnkl/yambar
|
||||||
license=(mit)
|
license=(mit)
|
||||||
conflicts=('f00bar')
|
conflicts=('yambar')
|
||||||
provides=('f00bar')
|
provides=('yambar')
|
||||||
makedepends=('meson' 'ninja' 'scdoc')
|
makedepends=('meson' 'ninja' 'scdoc')
|
||||||
depends=(
|
depends=(
|
||||||
'wayland' 'wlroots'
|
'wayland' 'wlroots'
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# F00bar
|
# Yambar
|
||||||
|
|
||||||
## Index
|
## Index
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
**f00bar** is a light-weight and configurable status panel (_bar_, for
|
**yambar** is a light-weight and configurable status panel (_bar_, for
|
||||||
short) for X and Wayland.
|
short) for X and Wayland.
|
||||||
|
|
||||||
It has a number of _modules_ that provide information in the form of
|
It has a number of _modules_ that provide information in the form of
|
||||||
|
@ -38,7 +38,7 @@ using _particles_ and _decorations_. **How** is configured by you.
|
||||||
|
|
||||||
## Configuration
|
## Configuration
|
||||||
|
|
||||||
F00bar is configured using YAML, in `~/.config/f00bar/config.yml`. It
|
Yambar is configured using YAML, in `~/.config/yambar/config.yml`. It
|
||||||
must define a top-level dictionary named **bar**:
|
must define a top-level dictionary named **bar**:
|
||||||
|
|
||||||
bar:
|
bar:
|
||||||
|
@ -55,7 +55,7 @@ must define a top-level dictionary named **bar**:
|
||||||
- string: {text: "{time}"}
|
- string: {text: "{time}"}
|
||||||
|
|
||||||
|
|
||||||
For details, see the man pages (**f00bar**(5) is a good start).
|
For details, see the man pages (**yambar**(5) is a good start).
|
||||||
|
|
||||||
|
|
||||||
## Modules
|
## Modules
|
||||||
|
|
|
@ -379,7 +379,7 @@ bar_new(const struct bar_config *config)
|
||||||
backend_data = bar_backend_xcb_new();
|
backend_data = bar_backend_xcb_new();
|
||||||
backend_iface = &xcb_backend_iface;
|
backend_iface = &xcb_backend_iface;
|
||||||
#else
|
#else
|
||||||
LOG_ERR("f00bar was compiled without the XCB backend");
|
LOG_ERR("yambar was compiled without the XCB backend");
|
||||||
return NULL;
|
return NULL;
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
|
@ -389,7 +389,7 @@ bar_new(const struct bar_config *config)
|
||||||
backend_data = bar_backend_wayland_new();
|
backend_data = bar_backend_wayland_new();
|
||||||
backend_iface = &wayland_backend_iface;
|
backend_iface = &wayland_backend_iface;
|
||||||
#else
|
#else
|
||||||
LOG_ERR("f00bar was compiled without the Wayland backend");
|
LOG_ERR("yambar was compiled without the Wayland backend");
|
||||||
return NULL;
|
return NULL;
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -45,4 +45,4 @@ bar = declare_dependency(
|
||||||
sources: ['bar.c', 'bar.h', 'private.h', 'backend.h'],
|
sources: ['bar.c', 'bar.h', 'private.h', 'backend.h'],
|
||||||
dependencies: bar_backends + [threads])
|
dependencies: bar_backends + [threads])
|
||||||
|
|
||||||
install_headers('bar.h', subdir: 'f00bar/bar')
|
install_headers('bar.h', subdir: 'yambar/bar')
|
||||||
|
|
|
@ -467,7 +467,7 @@ get_buffer(struct wayland_backend *backend)
|
||||||
pixman_image_t *pix = NULL;
|
pixman_image_t *pix = NULL;
|
||||||
|
|
||||||
/* Backing memory for SHM */
|
/* Backing memory for SHM */
|
||||||
pool_fd = memfd_create("f00bar-wayland-shm-buffer-pool", MFD_CLOEXEC);
|
pool_fd = memfd_create("yambar-wayland-shm-buffer-pool", MFD_CLOEXEC);
|
||||||
if (pool_fd == -1) {
|
if (pool_fd == -1) {
|
||||||
LOG_ERRNO("failed to create SHM backing memory file");
|
LOG_ERRNO("failed to create SHM backing memory file");
|
||||||
goto err;
|
goto err;
|
||||||
|
@ -643,7 +643,7 @@ setup(struct bar *_bar)
|
||||||
|
|
||||||
backend->layer_surface = zwlr_layer_shell_v1_get_layer_surface(
|
backend->layer_surface = zwlr_layer_shell_v1_get_layer_surface(
|
||||||
backend->layer_shell, backend->surface, backend->monitor->output,
|
backend->layer_shell, backend->surface, backend->monitor->output,
|
||||||
ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM, "f00bar");
|
ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM, "yambar");
|
||||||
if (backend->layer_surface == NULL) {
|
if (backend->layer_surface == NULL) {
|
||||||
LOG_ERR("failed to create layer shell surface");
|
LOG_ERR("failed to create layer shell surface");
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -167,7 +167,7 @@ setup(struct bar *_bar)
|
||||||
backend->colormap}
|
backend->colormap}
|
||||||
);
|
);
|
||||||
|
|
||||||
const char *title = "f00bar";
|
const char *title = "yambar";
|
||||||
xcb_change_property(
|
xcb_change_property(
|
||||||
backend->conn,
|
backend->conn,
|
||||||
XCB_PROP_MODE_REPLACE, backend->win,
|
XCB_PROP_MODE_REPLACE, backend->win,
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
zsh_install_dir = join_paths(get_option('datadir'), 'zsh/site-functions')
|
zsh_install_dir = join_paths(get_option('datadir'), 'zsh/site-functions')
|
||||||
install_data('zsh/_f00bar', install_dir: zsh_install_dir)
|
install_data('zsh/_yambar', install_dir: zsh_install_dir)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#compdef f00bar
|
#compdef yambar
|
||||||
|
|
||||||
_arguments \
|
_arguments \
|
||||||
-s \
|
-s \
|
|
@ -7,7 +7,7 @@ foreach deco : ['background', 'stack', 'underline']
|
||||||
dependencies: deco_sdk,
|
dependencies: deco_sdk,
|
||||||
name_prefix: 'decoration_',
|
name_prefix: 'decoration_',
|
||||||
install: true,
|
install: true,
|
||||||
install_dir: join_paths(get_option('libdir'), 'f00bar'))
|
install_dir: join_paths(get_option('libdir'), 'yambar'))
|
||||||
else
|
else
|
||||||
decorations += [declare_dependency(
|
decorations += [declare_dependency(
|
||||||
sources: '@0@.c'.format(deco),
|
sources: '@0@.c'.format(deco),
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
scdoc = dependency('scdoc', native: true)
|
scdoc = dependency('scdoc', native: true)
|
||||||
scdoc_prog = find_program(scdoc.get_pkgconfig_variable('scdoc'), native: true)
|
scdoc_prog = find_program(scdoc.get_pkgconfig_variable('scdoc'), native: true)
|
||||||
|
|
||||||
foreach man_src : ['f00bar.1.scd', 'f00bar.5.scd', 'f00bar-decorations.5.scd',
|
foreach man_src : ['yambar.1.scd', 'yambar.5.scd', 'yambar-decorations.5.scd',
|
||||||
'f00bar-modules.5.scd', 'f00bar-particles.5.scd',
|
'yambar-modules.5.scd', 'yambar-particles.5.scd',
|
||||||
'f00bar-tags.5.scd']
|
'yambar-tags.5.scd']
|
||||||
parts = man_src.split('.')
|
parts = man_src.split('.')
|
||||||
name = parts[-3]
|
name = parts[-3]
|
||||||
section = parts[-2]
|
section = parts[-2]
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
f00bar-decorations(5)
|
yambar-decorations(5)
|
||||||
|
|
||||||
# NAME
|
# NAME
|
||||||
f00bar-decorations - configuration file
|
yambar-decorations - configuration file
|
||||||
|
|
||||||
# DESCRIPTION
|
# DESCRIPTION
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ This decoration sets the particles background color.
|
||||||
| color
|
| color
|
||||||
: color
|
: color
|
||||||
: yes
|
: yes
|
||||||
: The background color. See *f00bar*(5) for format.
|
: The background color. See *yambar*(5) for format.
|
||||||
|
|
||||||
## EXAMPLES
|
## EXAMPLES
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@ bottom of the particle.
|
||||||
| color
|
| color
|
||||||
: color
|
: color
|
||||||
: yes
|
: yes
|
||||||
: The color of the line. See *f00bar*(5) for format.
|
: The color of the line. See *yambar*(5) for format.
|
||||||
|
|
||||||
## EXAMPLES
|
## EXAMPLES
|
||||||
|
|
||||||
|
@ -92,4 +92,4 @@ content:
|
||||||
|
|
||||||
# SEE ALSO
|
# SEE ALSO
|
||||||
|
|
||||||
*f00bar-particles*(5)
|
*yambar-particles*(5)
|
|
@ -1,7 +1,7 @@
|
||||||
f00bar-modules(5)
|
yambar-modules(5)
|
||||||
|
|
||||||
# NAME
|
# NAME
|
||||||
f00bar-modules - configuration file
|
yambar-modules - configuration file
|
||||||
|
|
||||||
# DESCRIPTION
|
# DESCRIPTION
|
||||||
|
|
||||||
|
@ -10,12 +10,12 @@ bar.
|
||||||
|
|
||||||
All modules expose their data through *tags*. Each tag has a *name*,
|
All modules expose their data through *tags*. Each tag has a *name*,
|
||||||
*type* and *value*. The name and type is fixed, while the value
|
*type* and *value*. The name and type is fixed, while the value
|
||||||
typically changes over time. See *f00bar-tags(5)*.
|
typically changes over time. See *yambar-tags(5)*.
|
||||||
|
|
||||||
The tags are rendered by _particles_. Each particle has its own way of
|
The tags are rendered by _particles_. Each particle has its own way of
|
||||||
representing tag values. The simplest one is the _string_ particle,
|
representing tag values. The simplest one is the _string_ particle,
|
||||||
which renders a text representation of the tag value. See
|
which renders a text representation of the tag value. See
|
||||||
*f00bar-particles*(5).
|
*yambar-particles*(5).
|
||||||
|
|
||||||
Note that all the examples showed below have been kept simple. Here
|
Note that all the examples showed below have been kept simple. Here
|
||||||
are a couple of tips that will improve the looks:
|
are a couple of tips that will improve the looks:
|
||||||
|
@ -27,10 +27,10 @@ the middle of its string. To do this, you need to wrap multiple
|
||||||
_string_ particles in a _list_ particle.
|
_string_ particles in a _list_ particle.
|
||||||
|
|
||||||
This is especially important if you want to use an icon font since
|
This is especially important if you want to use an icon font since
|
||||||
f00bar does not do font fallback handling.
|
yambar does not do font fallback handling.
|
||||||
|
|
||||||
Also remember there is a short version for lists (see
|
Also remember there is a short version for lists (see
|
||||||
*f00bar-particles*(5))
|
*yambar-particles*(5))
|
||||||
|
|
||||||
For example, to render _backlight_ as " 20%", you could use:
|
For example, to render _backlight_ as " 20%", you could use:
|
||||||
|
|
||||||
|
@ -115,7 +115,7 @@ following attributes are supported by all modules:
|
||||||
| content
|
| content
|
||||||
: particle
|
: particle
|
||||||
: A particle describing how the module's information is to be rendered.
|
: A particle describing how the module's information is to be rendered.
|
||||||
See *f00bar-particles*(5)
|
See *yambar-particles*(5)
|
||||||
| anchors
|
| anchors
|
||||||
: associative array
|
: associative array
|
||||||
: Free-to-use associative array, where you can put yaml anchor definitions
|
: Free-to-use associative array, where you can put yaml anchor definitions
|
||||||
|
@ -768,4 +768,4 @@ bar:
|
||||||
|
|
||||||
# SEE ALSO
|
# SEE ALSO
|
||||||
|
|
||||||
*f00bar-particles*(5), *f00bar-tags*(5), *f00bar-decorations*(5)
|
*yambar-particles*(5), *yambar-tags*(5), *yambar-decorations*(5)
|
|
@ -1,7 +1,7 @@
|
||||||
f00bar-particles(5)
|
yambar-particles(5)
|
||||||
|
|
||||||
# NAME
|
# NAME
|
||||||
f00bar-particles - configuration file
|
yambar-particles - configuration file
|
||||||
|
|
||||||
# DESCRIPTION
|
# DESCRIPTION
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ following attributes are supported by all particles:
|
||||||
| deco
|
| deco
|
||||||
: decoration
|
: decoration
|
||||||
: no
|
: no
|
||||||
: Decoration to apply to the particle. See *f00bar-decorations*(5)
|
: Decoration to apply to the particle. See *yambar-decorations*(5)
|
||||||
|
|
||||||
# STRING
|
# STRING
|
||||||
|
|
||||||
|
@ -61,7 +61,7 @@ of free text mixed with tag specifiers.
|
||||||
: yes
|
: yes
|
||||||
: Format string. Tags are spcified with _{tag_name}_. Some tag types
|
: Format string. Tags are spcified with _{tag_name}_. Some tag types
|
||||||
have suffixes that can be appended (e.g. _{tag_name:suffix}_). See
|
have suffixes that can be appended (e.g. _{tag_name:suffix}_). See
|
||||||
*f00bar-modules*(5)).
|
*yambar-modules*(5)).
|
||||||
| max
|
| max
|
||||||
: int
|
: int
|
||||||
: no
|
: no
|
||||||
|
@ -306,4 +306,4 @@ content:
|
||||||
|
|
||||||
# SEE ALSO
|
# SEE ALSO
|
||||||
|
|
||||||
*f00bar-tags*(5), *f00bar-decorations*(5)
|
*yambar-tags*(5), *yambar-decorations*(5)
|
|
@ -1,7 +1,7 @@
|
||||||
f00bar-tags(5)
|
yambar-tags(5)
|
||||||
|
|
||||||
# NAME
|
# NAME
|
||||||
f00bar-tags - configuration file
|
yambar-tags - configuration file
|
||||||
|
|
||||||
# DESCRIPTION
|
# DESCRIPTION
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ The available tag *types* are:
|
||||||
: Value is an integer that changes in a predictable manner (in
|
: Value is an integer that changes in a predictable manner (in
|
||||||
"realtime"). This allows the particle to update itself
|
"realtime"). This allows the particle to update itself
|
||||||
periodically. Only supported by the
|
periodically. Only supported by the
|
||||||
*f00bar-particle-progress-bar*(5). Other particles can still render
|
*yambar-particle-progress-bar*(5). Other particles can still render
|
||||||
the tag's value. And, the _string_ particle recognizes the _:unit_
|
the tag's value. And, the _string_ particle recognizes the _:unit_
|
||||||
suffix, which will be translated to a "s" for a tag with "seconds"
|
suffix, which will be translated to a "s" for a tag with "seconds"
|
||||||
resolution, or "ms" for one with "milliseconds" resolution.
|
resolution, or "ms" for one with "milliseconds" resolution.
|
|
@ -1,15 +1,15 @@
|
||||||
f00bar(1)
|
yambar(1)
|
||||||
|
|
||||||
# NAME
|
# NAME
|
||||||
f00bar - modular status panel for X11 and Wayland
|
yambar - modular status panel for X11 and Wayland
|
||||||
|
|
||||||
# SYNOPSIS
|
# SYNOPSIS
|
||||||
*f00bar* [_OPTIONS_]...
|
*yambar* [_OPTIONS_]...
|
||||||
|
|
||||||
# OPTIONS
|
# OPTIONS
|
||||||
|
|
||||||
*-b, --backend={xcb,wayland,auto}*
|
*-b, --backend={xcb,wayland,auto}*
|
||||||
Backend to use. The default is *auto*. In this mode, f00bar will
|
Backend to use. The default is *auto*. In this mode, yambar will
|
||||||
look for the environment variable _WAYLAND\_DISPLAY_, and if
|
look for the environment variable _WAYLAND\_DISPLAY_, and if
|
||||||
available, use the *Wayland* backend. If not, the *XCB* backend is
|
available, use the *Wayland* backend. If not, the *XCB* backend is
|
||||||
used.
|
used.
|
||||||
|
@ -26,7 +26,7 @@ f00bar - modular status panel for X11 and Wayland
|
||||||
Show the version number and quit
|
Show the version number and quit
|
||||||
|
|
||||||
# DESCRIPTION
|
# DESCRIPTION
|
||||||
*f00bar* is a light-weight and configurable status panel (_bar_, for
|
*yambar* is a light-weight and configurable status panel (_bar_, for
|
||||||
short) for *X* and *Wayland*.
|
short) for *X* and *Wayland*.
|
||||||
|
|
||||||
It has a number of _modules_ that provide information in the form of
|
It has a number of _modules_ that provide information in the form of
|
||||||
|
@ -48,4 +48,4 @@ There are a number of modules and particles builtin. More can be added
|
||||||
as plugins. You can even write your own!
|
as plugins. You can even write your own!
|
||||||
|
|
||||||
# CONFIGURATION
|
# CONFIGURATION
|
||||||
See *f00bar*(5)
|
See *yambar*(5)
|
|
@ -1,15 +1,15 @@
|
||||||
f00bar(5)
|
yambar(5)
|
||||||
|
|
||||||
# NAME
|
# NAME
|
||||||
f00bar - configuration file
|
yambar - configuration file
|
||||||
|
|
||||||
# DESCRIPTION
|
# DESCRIPTION
|
||||||
|
|
||||||
A f00bar configuration file is a yaml formatted document containing an
|
A yambar configuration file is a yaml formatted document containing an
|
||||||
associative array named _bar_. You may define other top-level entities
|
associative array named _bar_. You may define other top-level entities
|
||||||
and reference them using anchors.
|
and reference them using anchors.
|
||||||
|
|
||||||
Besides the normal yaml types, there are a couple of f00bar specific
|
Besides the normal yaml types, there are a couple of yambar specific
|
||||||
types that are frequently used:
|
types that are frequently used:
|
||||||
|
|
||||||
- *font*: this is a string in _fontconfig_ format. Example of valid values:
|
- *font*: this is a string in _fontconfig_ format. Example of valid values:
|
||||||
|
@ -112,15 +112,15 @@ types that are frequently used:
|
||||||
| left
|
| left
|
||||||
: list
|
: list
|
||||||
: no
|
: no
|
||||||
: Left-aligned modules (see *f00bar-modules*(5))
|
: Left-aligned modules (see *yambar-modules*(5))
|
||||||
| center
|
| center
|
||||||
: list
|
: list
|
||||||
: no
|
: no
|
||||||
: Center-aligned modules (see *f00bar-modules*(5))
|
: Center-aligned modules (see *yambar-modules*(5))
|
||||||
| right
|
| right
|
||||||
: list
|
: list
|
||||||
: no
|
: no
|
||||||
: Right-aligned modules (see *f00bar-modules*(5))
|
: Right-aligned modules (see *yambar-modules*(5))
|
||||||
|
|
||||||
# EXAMPLES
|
# EXAMPLES
|
||||||
|
|
||||||
|
@ -142,10 +142,10 @@ bar:
|
||||||
# FILES
|
# FILES
|
||||||
The configuration file is searched for (in this order):
|
The configuration file is searched for (in this order):
|
||||||
|
|
||||||
- _$XDG_CONFIG_HOME/f00bar/config.yml_
|
- _$XDG_CONFIG_HOME/yambar/config.yml_
|
||||||
- _$HOME/.config/f00bar/config.yml_
|
- _$HOME/.config/yambar/config.yml_
|
||||||
|
|
||||||
# SEE ALSO
|
# SEE ALSO
|
||||||
|
|
||||||
*f00bar-modules*(5), *f00bar-particles*(5), *f00bar-tags*(5),
|
*yambar-modules*(5), *yambar-particles*(5), *yambar-tags*(5),
|
||||||
*f00bar-decorations*(5)
|
*yambar-decorations*(5)
|
12
main.c
12
main.c
|
@ -43,9 +43,9 @@ get_config_path_user_config(void)
|
||||||
const char *home_dir = passwd->pw_dir;
|
const char *home_dir = passwd->pw_dir;
|
||||||
LOG_DBG("user's home directory: %s", home_dir);
|
LOG_DBG("user's home directory: %s", home_dir);
|
||||||
|
|
||||||
int len = snprintf(NULL, 0, "%s/.config/f00bar/config.yml", home_dir);
|
int len = snprintf(NULL, 0, "%s/.config/yambar/config.yml", home_dir);
|
||||||
char *path = malloc(len + 1);
|
char *path = malloc(len + 1);
|
||||||
snprintf(path, len + 1, "%s/.config/f00bar/config.yml", home_dir);
|
snprintf(path, len + 1, "%s/.config/yambar/config.yml", home_dir);
|
||||||
return path;
|
return path;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,9 +56,9 @@ get_config_path_xdg(void)
|
||||||
if (xdg_config_home == NULL)
|
if (xdg_config_home == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
int len = snprintf(NULL, 0, "%s/f00bar/config.yml", xdg_config_home);
|
int len = snprintf(NULL, 0, "%s/yambar/config.yml", xdg_config_home);
|
||||||
char *path = malloc(len + 1);
|
char *path = malloc(len + 1);
|
||||||
snprintf(path, len + 1, "%s/f00bar/config.yml", xdg_config_home);
|
snprintf(path, len + 1, "%s/yambar/config.yml", xdg_config_home);
|
||||||
return path;
|
return path;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -185,7 +185,7 @@ main(int argc, char *const *argv)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'v':
|
case 'v':
|
||||||
printf("f00bar version %s\n", F00BAR_VERSION);
|
printf("yambar version %s\n", YAMBAR_VERSION);
|
||||||
return EXIT_SUCCESS;
|
return EXIT_SUCCESS;
|
||||||
|
|
||||||
case 'h':
|
case 'h':
|
||||||
|
@ -223,7 +223,7 @@ main(int argc, char *const *argv)
|
||||||
if (config_path == NULL) {
|
if (config_path == NULL) {
|
||||||
config_path = get_config_path();
|
config_path = get_config_path();
|
||||||
if (config_path == NULL) {
|
if (config_path == NULL) {
|
||||||
LOG_ERR("could not find a configuration (see man 5 f00bar)");
|
LOG_ERR("could not find a configuration (see man 5 yambar)");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
14
meson.build
14
meson.build
|
@ -1,4 +1,4 @@
|
||||||
project('f00bar', 'c',
|
project('yambar', 'c',
|
||||||
version: '1.1.1',
|
version: '1.1.1',
|
||||||
license: 'MIT',
|
license: 'MIT',
|
||||||
meson_version: '>=0.48.0',
|
meson_version: '>=0.48.0',
|
||||||
|
@ -60,7 +60,7 @@ backend_wayland = wayland_client.found() and wayland_cursor.found() and wlroots.
|
||||||
|
|
||||||
add_project_arguments(
|
add_project_arguments(
|
||||||
['-D_GNU_SOURCE',
|
['-D_GNU_SOURCE',
|
||||||
'-DF00BAR_VERSION=@0@'.format(version)] +
|
'-DYAMBAR_VERSION=@0@'.format(version)] +
|
||||||
(is_debug_build ? ['-D_DEBUG'] : []) +
|
(is_debug_build ? ['-D_DEBUG'] : []) +
|
||||||
(backend_x11 ? ['-DENABLE_X11'] : []) +
|
(backend_x11 ? ['-DENABLE_X11'] : []) +
|
||||||
(backend_wayland ? ['-DENABLE_WAYLAND'] : []) +
|
(backend_wayland ? ['-DENABLE_WAYLAND'] : []) +
|
||||||
|
@ -77,7 +77,7 @@ if backend_x11
|
||||||
pic: plugs_as_libs)
|
pic: plugs_as_libs)
|
||||||
|
|
||||||
xcb_stuff = declare_dependency(link_with: xcb_stuff_lib)
|
xcb_stuff = declare_dependency(link_with: xcb_stuff_lib)
|
||||||
install_headers('xcb.h', subdir: 'f00bar')
|
install_headers('xcb.h', subdir: 'yambar')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
subdir('completions')
|
subdir('completions')
|
||||||
|
@ -87,8 +87,8 @@ subdir('decorations')
|
||||||
subdir('particles')
|
subdir('particles')
|
||||||
subdir('modules')
|
subdir('modules')
|
||||||
|
|
||||||
f00bar = executable(
|
yambar = executable(
|
||||||
'f00bar',
|
'yambar',
|
||||||
'color.h',
|
'color.h',
|
||||||
'config-verify.c', 'config-verify.h',
|
'config-verify.c', 'config-verify.h',
|
||||||
'config.c', 'config.h',
|
'config.c', 'config.h',
|
||||||
|
@ -107,7 +107,7 @@ f00bar = executable(
|
||||||
build_rpath: '$ORIGIN/modules:$ORIGIN/decorations:$ORIGIN/particles',
|
build_rpath: '$ORIGIN/modules:$ORIGIN/decorations:$ORIGIN/particles',
|
||||||
export_dynamic: true,
|
export_dynamic: true,
|
||||||
install: true,
|
install: true,
|
||||||
install_rpath: '$ORIGIN/../' + get_option('libdir') + '/f00bar')
|
install_rpath: '$ORIGIN/../' + get_option('libdir') + '/yambar')
|
||||||
|
|
||||||
subdir('test')
|
subdir('test')
|
||||||
|
|
||||||
|
@ -124,7 +124,7 @@ install_headers(
|
||||||
'tag.h',
|
'tag.h',
|
||||||
'tllist.h',
|
'tllist.h',
|
||||||
'yml.h',
|
'yml.h',
|
||||||
subdir: 'f00bar')
|
subdir: 'yambar')
|
||||||
|
|
||||||
message('')
|
message('')
|
||||||
message('Build type: @0@'.format(get_option('buildtype')))
|
message('Build type: @0@'.format(get_option('buildtype')))
|
||||||
|
|
|
@ -38,7 +38,7 @@ foreach mod, data : deps
|
||||||
dependencies: [module_sdk] + dep,
|
dependencies: [module_sdk] + dep,
|
||||||
name_prefix: 'module_',
|
name_prefix: 'module_',
|
||||||
install: true,
|
install: true,
|
||||||
install_dir: join_paths(get_option('libdir'), 'f00bar'))
|
install_dir: join_paths(get_option('libdir'), 'yambar'))
|
||||||
else
|
else
|
||||||
modules += [declare_dependency(
|
modules += [declare_dependency(
|
||||||
sources: ['@0@.c'.format(mod)] + sources,
|
sources: ['@0@.c'.format(mod)] + sources,
|
||||||
|
|
|
@ -7,7 +7,7 @@ foreach particle : ['empty', 'list', 'map', 'progress-bar', 'ramp', 'string']
|
||||||
dependencies: particle_sdk,
|
dependencies: particle_sdk,
|
||||||
name_prefix: 'particle_',
|
name_prefix: 'particle_',
|
||||||
install: true,
|
install: true,
|
||||||
install_dir: join_paths(get_option('libdir'), 'f00bar'))
|
install_dir: join_paths(get_option('libdir'), 'yambar'))
|
||||||
else
|
else
|
||||||
particles += [declare_dependency(
|
particles += [declare_dependency(
|
||||||
sources: '@0@.c'.format(particle),
|
sources: '@0@.c'.format(particle),
|
||||||
|
@ -21,7 +21,7 @@ dynlist_lib = build_target(
|
||||||
target_type: plugs_as_libs ? 'shared_library' : 'static_library',
|
target_type: plugs_as_libs ? 'shared_library' : 'static_library',
|
||||||
override_options : ['b_lundef=false'],
|
override_options : ['b_lundef=false'],
|
||||||
install: plugs_as_libs,
|
install: plugs_as_libs,
|
||||||
install_dir: get_option('libdir') + '/f00bar',
|
install_dir: get_option('libdir') + '/yambar',
|
||||||
)
|
)
|
||||||
|
|
||||||
dynlist = declare_dependency(link_with: dynlist_lib)
|
dynlist = declare_dependency(link_with: dynlist_lib)
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
test('is-executable', f00bar, args: ['--version'])
|
test('is-executable', yambar, args: ['--version'])
|
||||||
|
|
||||||
pwd = meson.current_source_dir()
|
pwd = meson.current_source_dir()
|
||||||
|
|
||||||
# Configuration validation tests
|
# Configuration validation tests
|
||||||
test('no-config', f00bar, args: ['-C', '-c', 'xyz'], should_fail: true)
|
test('no-config', yambar, args: ['-C', '-c', 'xyz'], should_fail: true)
|
||||||
test('config-isnt-file', f00bar, args: ['-C', '-c', '.'], should_fail: true)
|
test('config-isnt-file', yambar, args: ['-C', '-c', '.'], should_fail: true)
|
||||||
test('config-no-bar', f00bar, args: ['-C', '-c', join_paths(pwd, 'no-bar.yml')],
|
test('config-no-bar', yambar, args: ['-C', '-c', join_paths(pwd, 'no-bar.yml')],
|
||||||
should_fail: true)
|
should_fail: true)
|
||||||
test('full-conf-good', f00bar, args: ['-C', '-c', join_paths(pwd, 'full-conf-good.yml')])
|
test('full-conf-good', yambar, args: ['-C', '-c', join_paths(pwd, 'full-conf-good.yml')])
|
||||||
|
|
Loading…
Add table
Reference in a new issue