Skip to content

Commit

Permalink
Fixed issue #51 - succade now works with Lemonbar v1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@domsson
domsson committed Dec 8, 2020
1 parent d51b507 commit 1973cf4
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 17 deletions.
78 changes: 63 additions & 15 deletions src/succade.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,15 +333,55 @@ static double time_to_wait(state_s *state, double now)
return (lemon_due == DBL_MAX) ? -1 : lemon_due;
}

/*
* Given a block, returns a malloc'd string that contains both the block's
* output, as well as its unit string (if any). The length (excluding the
* null terminator) of the resulting string will be returned in `len` and
* the additional characters, that have been added due to escaping of the
* result and unit string, will be returned in `diff`, if given.
*/
char* resultstr(const thing_s *block, int *len, size_t *diff)
{
// The 'diff' will tell us how many extra characters the string gained
// because of escaping '%' signs; we need this amount for the min_width
// value, because while those additional characters have to be taken
// into account for snprintf(), they aren't part of the visible output

const cfg_s *bcfg = &block->cfg;

size_t rdiff = 0;
char *result = cfg_get_int(bcfg, BLOCK_OPT_RAW) ?
strdup(block->output) : escape(block->output, '%', &rdiff);

size_t udiff = 0;
char *unit = escape(strsel(cfg_get_str(bcfg, BLOCK_OPT_UNIT), "", ""), '%', &udiff);

if (diff)
{
*diff = rdiff + udiff;
}

size_t output_len = strlen(result) + strlen(unit) + 1;
char *output = malloc(sizeof(char) * output_len);

*len = snprintf(output, output_len, "%s%s", result, unit);

free(result);
free(unit);

return output;
}

/*
* Given a block, writes a string to the given buf that is the formatted result
* of this block's script output, ready to be fed to Lemonbar, including prefix,
* label and suffix. Returns the number of characters written to buf.
*/
int blockstr(const thing_s *block, char *buf, size_t len)
int blockstr(const thing_s *lemon, const thing_s *block, char *buf, size_t len)
{
// for convenience
const cfg_s *bcfg = &block->cfg;
const cfg_s *lcfg = &lemon->cfg;

char action_start[(5 * strlen(block->sid)) + 64];
char action_end[24];
Expand Down Expand Up @@ -399,10 +439,15 @@ int blockstr(const thing_s *block, char *buf, size_t len)
const char *affix_bg = strsel(cfg_get_str(bcfg, BLOCK_OPT_AFFIX_BG), "-", "");
const char *lc = strsel(cfg_get_str(bcfg, BLOCK_OPT_LC), "-", "");

int font_count = 0;

char block_font_idx = cfg_get_str(lcfg, LEMON_OPT_BLOCK_FONT) ? (++font_count) + '0' : '-'; // 1st slot
char label_font_idx = cfg_get_str(lcfg, LEMON_OPT_LABEL_FONT) ? (++font_count) + '0' : '-'; // 2nd slot
char affix_font_idx = cfg_get_str(lcfg, LEMON_OPT_AFFIX_FONT) ? (++font_count) + '0' : '-'; // 3rd slot

const char *prefix = strsel(cfg_get_str(bcfg, BLOCK_OPT_PREFIX), "", "");
const char *suffix = strsel(cfg_get_str(bcfg, BLOCK_OPT_SUFFIX), "", "");
const char *label = strsel(cfg_get_str(bcfg, BLOCK_OPT_LABEL), "", "");
//const char *unit = strsel(cfg_get_str(bcfg, BLOCK_OPT_UNIT), "", "");

int padding_l = cfg_get_int(bcfg, BLOCK_OPT_PADDING_LEFT);
int padding_r = cfg_get_int(bcfg, BLOCK_OPT_PADDING_RIGHT);
Expand All @@ -411,10 +456,10 @@ int blockstr(const thing_s *block, char *buf, size_t len)
int ol = cfg_get_int(bcfg, BLOCK_OPT_OL);
int ul = cfg_get_int(bcfg, BLOCK_OPT_UL);

size_t diff = 0;
char *result = cfg_get_int(bcfg, BLOCK_OPT_RAW) ?
strdup(block->output) : escape(block->output, '%', &diff);
int min_width = cfg_get_int(bcfg, BLOCK_OPT_MIN_WIDTH) + diff;
int rlen = 0;
size_t rdiff = 0;
char *result = resultstr(block, &rlen, &rdiff);
int min_width = cfg_get_int(bcfg, BLOCK_OPT_MIN_WIDTH) + rdiff;

// TODO currently we are adding the format thingies for label,
// prefix and suffix, even if those are empty anyway, which
Expand All @@ -423,14 +468,17 @@ int blockstr(const thing_s *block, char *buf, size_t len)
// but of course, replacing a couple bytes with lots of malloc
// would not be great either, so... not sure about it yet.

// TODO bug! bug! bug! we just used font slots 1 to 3 here, but maybe
// we're only loading one or two (or zero) fonts! NO BUENO!

int res = snprintf(buf, len,
"%%{O%d}" // margin left
"%s" // action start
"%%{F%s B%s U%s %co %cu}" // format start
"%%{T3 F%s B%s}%s" // prefix
"%%{T2 F%s B%s}%s" // label
"%%{T1 F%s B%s}%*s%*s%*s" // block
"%%{T3 F%s B%s}%s" // suffix
"%%{T%c F%s B%s}%s" // prefix
"%%{T%c F%s B%s}%s" // label
"%%{T%c F%s B%s}%*s%*s%*s" // block
"%%{T%c F%s B%s}%s" // suffix
"%%{T- F- B- U- -o -u}" // format end
"%s" // action end
"%%{O%d}", // margin right
Expand All @@ -441,13 +489,13 @@ int blockstr(const thing_s *block, char *buf, size_t len)
// format start
block_fg, block_bg, lc, (ol ? '+' : '-'), (ul ? '+' : '-'),
// prefix
affix_fg, affix_bg, prefix,
affix_font_idx, affix_fg, affix_bg, prefix,
// label
label_fg, label_bg, label,
label_font_idx, label_fg, label_bg, label,
// block
block_fg, block_bg, padding_l, "", min_width, result, padding_r, "",
block_font_idx, block_fg, block_bg, padding_l, "", min_width, result, padding_r, "",
// suffix
affix_fg, affix_bg, suffix,
affix_font_idx, affix_fg, affix_bg, suffix,
// action end
action_end,
// margin right
Expand Down Expand Up @@ -513,7 +561,7 @@ static char *barstr(const state_s *state)
int same_align = block_align == last_align;

// Build the block string
int block_str_len = blockstr(block, block_str, BUFFER_BLOCK_STR);
int block_str_len = blockstr(&state->lemon, block, block_str, BUFFER_BLOCK_STR);

// Potentially change the alignment
if (!same_align)
Expand Down
4 changes: 2 additions & 2 deletions src/succade.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#define SUCCADE_URL "https://github.com/domsson/succade"
#define SUCCADE_VER_MAJOR 2
#define SUCCADE_VER_MINOR 1
#define SUCCADE_VER_PATCH 2
#define SUCCADE_VER_PATCH 3

#define BUFFER_NUMERIC 8
#define BUFFER_LEMON_ARG 1024
Expand Down Expand Up @@ -101,7 +101,7 @@ enum succade_block_opt
BLOCK_OPT_MARGIN_RIGHT, // int: margin right
BLOCK_OPT_PADDING_LEFT, // int: padding left
BLOCK_OPT_PADDING_RIGHT, // int: padding right
BLOCK_OPT_ALIGN, // TODO
BLOCK_OPT_ALIGN, // string: 'left', 'center' or 'right'
BLOCK_OPT_PREFIX, // string: prefix
BLOCK_OPT_SUFFIX, // string: suffix
BLOCK_OPT_LABEL, // string: label
Expand Down

0 comments on commit 1973cf4

Please sign in to comment.