fbt/lemonbar
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

%{Sn<..>}: Don't rely on "-o" for output names

Browse Source 
Rather than up-front declare which outputs lemonbar can use, instead infer
this based on scanning the outputs from RandR.
This commit is contained in:
Thomas Adam 2017-04-02 14:48:35 +01:00
parent 170a7261fa
commit 3f20ba0541
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lemonbar.c
View File

@ -131,6 +131,8 @@ static char xft_width[MAX_WIDTHS];
static int num_outputs = 0; static int num_outputs = 0;
static char **output_names = NULL; static char **output_names = NULL;
static void parse_output_string(char *);
void void
update_gc (void) update_gc (void)
{ {
@ -1074,6 +1076,9 @@ get_randr_monitors (void)
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
xcb_randr_get_output_info_reply_t *oi_reply; xcb_randr_get_output_info_reply_t *oi_reply;
xcb_randr_get_crtc_info_reply_t *ci_reply; xcb_randr_get_crtc_info_reply_t *ci_reply;
int namelen;
uint8_t *str;
char *name;
oi_reply = xcb_randr_get_output_info_reply(c, xcb_randr_get_output_info(c, outputs[i], XCB_CURRENT_TIME), NULL); oi_reply = xcb_randr_get_output_info_reply(c, xcb_randr_get_output_info(c, outputs[i], XCB_CURRENT_TIME), NULL);
@ -1093,18 +1098,6 @@ get_randr_monitors (void)
return; return;
} }
if (num_outputs) {
for (j = 0; j < num_outputs; j++) {
int namelen;
uint8_t *str;
char *name;
fprintf(stderr, "output_names: %s\n", output_names[j]);
// if this output name has been allocated, skip it
if (!output_names[j])
continue;
namelen = xcb_randr_get_output_info_name_length(oi_reply); namelen = xcb_randr_get_output_info_name_length(oi_reply);
name = malloc(namelen+1); name = malloc(namelen+1);
@ -1117,6 +1110,17 @@ get_randr_monitors (void)
memcpy(name, str, namelen); memcpy(name, str, namelen);
name[namelen] = '\0'; name[namelen] = '\0';
if (!name || name[0] == '\0')
continue;
parse_output_string(name);
if (num_outputs) {
for (j = 0; j < num_outputs; j++) {
// if this output name has been allocated, skip it
if (!output_names[j])
continue;
if (!memcmp(output_names[j], name, namelen)) { if (!memcmp(output_names[j], name, namelen)) {
mons[j] = (monitor_t){ name, ci_reply->x, ci_reply->y, ci_reply->width, ci_reply->height, 0, 0, NULL, NULL }; mons[j] = (monitor_t){ name, ci_reply->x, ci_reply->y, ci_reply->width, ci_reply->height, 0, 0, NULL, NULL };
output_names[j] = NULL; output_names[j] = NULL;