alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

cmd_client_*: support optional args for i3 compat

Browse source 
For i3 compatibility, allow the indicator and child_border colors values
to be optional. The indicator will fallback to sane defaults and
child_border will fallback to the background color for the class.
This commit is contained in:
Brian Ashworth 2019-12-28 21:15:54 -05:00 committed by Simon Ser
parent ed9b4e6aeb
commit de43f7c1db
2 changed files with 31 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
sway/commands/client.c
View file

@ -10,30 +10,34 @@ static void rebuild_textures_iterator(struct sway_container *con, void *data) {
container_update_title_textures(con); container_update_title_textures(con);
} }
static struct cmd_results *handle_command(int argc, char **argv, static struct cmd_results *handle_command(int argc, char **argv, char *cmd_name,
struct border_colors *class, char *cmd_name) { struct border_colors *class, const char *default_indicator) {
struct cmd_results *error = NULL; struct cmd_results *error = NULL;
if ((error = checkarg(argc, cmd_name, EXPECTED_EQUAL_TO, 5))) { if ((error = checkarg(argc, cmd_name, EXPECTED_AT_LEAST, 3)) ||
(error = checkarg(argc, cmd_name, EXPECTED_AT_MOST, 5))) {
return error; return error;
} }
struct border_colors colors = {0}; struct border_colors colors = {0};
const char *ind_hex = argc > 3 ? argv[3] : default_indicator;
const char *child_hex = argc > 4 ? argv[4] : argv[1]; // def to background
struct { struct {
const char *name; const char *name;
const char *hex;
float *rgba[4]; float *rgba[4];
} properties[] = { } properties[] = {
{ "border", colors.border }, { "border", argv[0], colors.border },
{ "background", colors.background }, { "background", argv[1], colors.background },
{ "text", colors.text }, { "text", argv[2], colors.text },
{ "indicator", colors.indicator }, { "indicator", ind_hex, colors.indicator },
{ "child_border", colors.child_border } { "child_border", child_hex, colors.child_border }
}; };
for (size_t i = 0; i < sizeof(properties) / sizeof(properties[0]); i++) { for (size_t i = 0; i < sizeof(properties) / sizeof(properties[0]); i++) {
uint32_t color; uint32_t color;
if (!parse_color(argv[i], &color)) { if (!parse_color(properties[i].hex, &color)) {
return cmd_results_new(CMD_INVALID, return cmd_results_new(CMD_INVALID, "Invalid %s color %s",
"Invalid %s color %s", properties[i].name, argv[i]); properties[i].name, properties[i].hex);
} }
color_to_rgba(*properties[i].rgba, color); color_to_rgba(*properties[i].rgba, color);
} }
@ -53,19 +57,23 @@ static struct cmd_results *handle_command(int argc, char **argv,
} }
struct cmd_results *cmd_client_focused(int argc, char **argv) { struct cmd_results *cmd_client_focused(int argc, char **argv) {
return handle_command(argc, argv, &config->border_colors.focused, "client.focused"); return handle_command(argc, argv, "client.focused",
&config->border_colors.focused, "#2e9ef4ff");
} }
struct cmd_results *cmd_client_focused_inactive(int argc, char **argv) { struct cmd_results *cmd_client_focused_inactive(int argc, char **argv) {
return handle_command(argc, argv, &config->border_colors.focused_inactive, "client.focused_inactive"); return handle_command(argc, argv, "client.focused_inactive",
&config->border_colors.focused_inactive, "#484e50ff");
} }
struct cmd_results *cmd_client_unfocused(int argc, char **argv) { struct cmd_results *cmd_client_unfocused(int argc, char **argv) {
return handle_command(argc, argv, &config->border_colors.unfocused, "client.unfocused"); return handle_command(argc, argv, "client.unfocused",
&config->border_colors.unfocused, "#292d2eff");
} }
struct cmd_results *cmd_client_urgent(int argc, char **argv) { struct cmd_results *cmd_client_urgent(int argc, char **argv) {
return handle_command(argc, argv, &config->border_colors.urgent, "client.urgent"); return handle_command(argc, argv, "client.urgent",
&config->border_colors.urgent, "#900000ff");
} }
struct cmd_results *cmd_client_noop(int argc, char **argv) { struct cmd_results *cmd_client_noop(int argc, char **argv) {

15
sway/sway.5.scd
View file

@ -442,16 +442,17 @@ runtime.
bindswitch lid:toggle exec echo "Lid moved" bindswitch lid:toggle exec echo "Lid moved"
``` ```
*client.<class>* <border> <background> <text> <indicator> <child_border> *client.background* <color>
Configures the color of window borders and title bars. All 5 colors are This command is ignored and is only present for i3 compatibility.
required, with the exception of *client.background*, which requires exactly
one. Colors may be specified in hex, either as _#RRGGBB_ or _#RRGGBBAA_. *client.<class>* <border> <background> <text> [<indicator> [<child_border>]]
Configures the color of window borders and title bars. The first three
colors are required. When omitted _indicator_ will use a sane default and
_child_border_ will use the color set for _background_. Colors may be
specified in hex, either as _#RRGGBB_ or _#RRGGBBAA_.
The available classes are: The available classes are:
*client.background*
Ignored (present for i3 compatibility).
*client.focused* *client.focused*
The window that has focus. The window that has focus.