koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added option to select primary display on tray_output

Browse Source
This commit is contained in:
Jose Pereira
2012-04-01 15:07:15 +01:00
committed by Michael Stapelberg
parent 206b96202c
commit 9a58c1fcaa
5 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
i3bar/include/outputs.h
View File

@ -40,6 +40,7 @@ i3_output* get_output_by_name(char* name);
struct i3_output {
char* name; /* Name of the output */
bool active; /* If the output is active */
bool primary; /* If it is the primary output */
int ws; /* The number of the currently visible ws */
rect rect; /* The rect (relative to the root-win) */

16
i3bar/src/outputs.c
View File

@ -45,15 +45,19 @@ static int outputs_null_cb(void *params_) {
static int outputs_boolean_cb(void *params_, int val) {
struct outputs_json_params *params = (struct outputs_json_params*) params_;
if (strcmp(params->cur_key, "active")) {
return 0;
if (!strcmp(params->cur_key, "active")) {
params->outputs_walk->active = val;
FREE(params->cur_key);
return 1;
}
params->outputs_walk->active = val;
if (!strcmp(params->cur_key, "primary")) {
params->outputs_walk->primary = val;
FREE(params->cur_key);
return 1;
}
FREE(params->cur_key);
return 1;
return 0;
}
/*

9
i3bar/src/xcb.c
View File

@ -450,9 +450,12 @@ static void handle_client_message(xcb_client_message_event_t* event) {
SLIST_FOREACH(walk, outputs, slist) {
if (!walk->active)
continue;
if (config.tray_output &&
strcasecmp(walk->name, config.tray_output) != 0)
continue;
if (config.tray_output) {
if ((strcasecmp(walk->name, config.tray_output) != 0) &&
(!walk->primary || strcasecmp("primary", config.tray_output) != 0))
continue;
}
DLOG("using output %s\n", walk->name);
output = walk;
}