|
|
|
@ -72,6 +72,14 @@ static const int riodraw_borders = 0; /* 0 or 1, indicates whether the
|
|
|
|
|
static const int riodraw_matchpid = 1; /* 0 or 1, indicates whether to match the PID of the client that was spawned with riospawn */
|
|
|
|
|
#endif // SWALLOW_PATCH
|
|
|
|
|
#endif // RIODRAW_PATCH
|
|
|
|
|
/* Status is to be shown on: -1 (all monitors), 0 (a specific monitor by index), 'A' (active monitor) */
|
|
|
|
|
#if BAR_STATUSALLMONS_PATCH
|
|
|
|
|
static const int statusmon = -1;
|
|
|
|
|
#elif BAR_STATICSTATUS_PATCH
|
|
|
|
|
static const int statusmon = 0;
|
|
|
|
|
#else
|
|
|
|
|
static const int statusmon = 'A';
|
|
|
|
|
#endif // BAR_STATUSALLMONS_PATCH | BAR_STATICSTATUS_PATCH
|
|
|
|
|
#if BAR_STATUSPADDING_PATCH
|
|
|
|
|
static const int horizpadbar = 2; /* horizontal padding for statusbar */
|
|
|
|
|
static const int vertpadbar = 0; /* vertical padding for statusbar */
|
|
|
|
@ -462,77 +470,77 @@ static const Inset default_inset = {
|
|
|
|
|
* name - does nothing, intended for visual clue and for logging / debugging
|
|
|
|
|
*/
|
|
|
|
|
static const BarRule barrules[] = {
|
|
|
|
|
/* monitor bar alignment widthfunc drawfunc clickfunc name */
|
|
|
|
|
/* monitor bar alignment widthfunc drawfunc clickfunc name */
|
|
|
|
|
#if BAR_STATUSBUTTON_PATCH
|
|
|
|
|
{ -1, 0, BAR_ALIGN_LEFT, width_stbutton, draw_stbutton, click_stbutton, "statusbutton" },
|
|
|
|
|
{ -1, 0, BAR_ALIGN_LEFT, width_stbutton, draw_stbutton, click_stbutton, "statusbutton" },
|
|
|
|
|
#endif // BAR_STATUSBUTTON_PATCH
|
|
|
|
|
#if BAR_POWERLINE_TAGS_PATCH
|
|
|
|
|
{ 0, 0, BAR_ALIGN_LEFT, width_pwrl_tags, draw_pwrl_tags, click_pwrl_tags, "powerline_tags" },
|
|
|
|
|
{ 0, 0, BAR_ALIGN_LEFT, width_pwrl_tags, draw_pwrl_tags, click_pwrl_tags, "powerline_tags" },
|
|
|
|
|
#endif // BAR_POWERLINE_TAGS_PATCH
|
|
|
|
|
#if BAR_TAGS_PATCH
|
|
|
|
|
{ -1, 0, BAR_ALIGN_LEFT, width_tags, draw_tags, click_tags, "tags" },
|
|
|
|
|
{ -1, 0, BAR_ALIGN_LEFT, width_tags, draw_tags, click_tags, "tags" },
|
|
|
|
|
#endif // BAR_TAGS_PATCH
|
|
|
|
|
#if BAR_TAGGRID_PATCH
|
|
|
|
|
{ -1, 0, BAR_ALIGN_LEFT, width_taggrid, draw_taggrid, click_taggrid, "taggrid" },
|
|
|
|
|
{ -1, 0, BAR_ALIGN_LEFT, width_taggrid, draw_taggrid, click_taggrid, "taggrid" },
|
|
|
|
|
#endif // BAR_TAGGRID_PATCH
|
|
|
|
|
#if BAR_SYSTRAY_PATCH
|
|
|
|
|
{ 0, 0, BAR_ALIGN_RIGHT, width_systray, draw_systray, click_systray, "systray" },
|
|
|
|
|
{ 0, 0, BAR_ALIGN_RIGHT, width_systray, draw_systray, click_systray, "systray" },
|
|
|
|
|
#endif // BAR_SYSTRAY_PATCH
|
|
|
|
|
#if BAR_LTSYMBOL_PATCH
|
|
|
|
|
{ -1, 0, BAR_ALIGN_LEFT, width_ltsymbol, draw_ltsymbol, click_ltsymbol, "layout" },
|
|
|
|
|
{ -1, 0, BAR_ALIGN_LEFT, width_ltsymbol, draw_ltsymbol, click_ltsymbol, "layout" },
|
|
|
|
|
#endif // BAR_LTSYMBOL_PATCH
|
|
|
|
|
#if BAR_STATUSCOLORS_PATCH && BAR_STATUSCMD_PATCH
|
|
|
|
|
{ 'A', 0, BAR_ALIGN_RIGHT, width_statuscolors, draw_statuscolors, click_statuscmd, "statuscolors" },
|
|
|
|
|
{ statusmon, 0, BAR_ALIGN_RIGHT, width_statuscolors, draw_statuscolors, click_statuscmd, "statuscolors" },
|
|
|
|
|
#elif BAR_STATUSCOLORS_PATCH
|
|
|
|
|
{ 'A', 0, BAR_ALIGN_RIGHT, width_statuscolors, draw_statuscolors, click_statuscolors, "statuscolors" },
|
|
|
|
|
{ statusmon, 0, BAR_ALIGN_RIGHT, width_statuscolors, draw_statuscolors, click_statuscolors, "statuscolors" },
|
|
|
|
|
#elif BAR_STATUS2D_PATCH && BAR_STATUSCMD_PATCH
|
|
|
|
|
{ 'A', 0, BAR_ALIGN_RIGHT, width_status2d, draw_status2d, click_statuscmd, "status2d" },
|
|
|
|
|
{ statusmon, 0, BAR_ALIGN_RIGHT, width_status2d, draw_status2d, click_statuscmd, "status2d" },
|
|
|
|
|
#elif BAR_STATUS2D_PATCH
|
|
|
|
|
{ 'A', 0, BAR_ALIGN_RIGHT, width_status2d, draw_status2d, click_status2d, "status2d" },
|
|
|
|
|
{ statusmon, 0, BAR_ALIGN_RIGHT, width_status2d, draw_status2d, click_status2d, "status2d" },
|
|
|
|
|
#elif BAR_POWERLINE_STATUS_PATCH
|
|
|
|
|
{ 0, 0, BAR_ALIGN_RIGHT, width_pwrl_status, draw_pwrl_status, click_pwrl_status, "powerline_status" },
|
|
|
|
|
{ statusmon, 0, BAR_ALIGN_RIGHT, width_pwrl_status, draw_pwrl_status, click_pwrl_status, "powerline_status" },
|
|
|
|
|
#elif BAR_STATUS_PATCH && BAR_STATUSCMD_PATCH
|
|
|
|
|
{ 0, 0, BAR_ALIGN_RIGHT, width_status, draw_status, click_statuscmd, "status" },
|
|
|
|
|
{ statusmon, 0, BAR_ALIGN_RIGHT, width_status, draw_status, click_statuscmd, "status" },
|
|
|
|
|
#elif BAR_STATUS_PATCH
|
|
|
|
|
{ 'A', 0, BAR_ALIGN_RIGHT, width_status, draw_status, click_status, "status" },
|
|
|
|
|
{ statusmon, 0, BAR_ALIGN_RIGHT, width_status, draw_status, click_status, "status" },
|
|
|
|
|
#endif // BAR_STATUS2D_PATCH | BAR_STATUSCMD_PATCH
|
|
|
|
|
#if XKB_PATCH
|
|
|
|
|
{ 0, 0, BAR_ALIGN_RIGHT, width_xkb, draw_xkb, click_xkb, "xkb" },
|
|
|
|
|
{ 0, 0, BAR_ALIGN_RIGHT, width_xkb, draw_xkb, click_xkb, "xkb" },
|
|
|
|
|
#endif // XKB_PATCH
|
|
|
|
|
#if BAR_FLEXWINTITLE_PATCH
|
|
|
|
|
{ -1, 0, BAR_ALIGN_NONE, width_flexwintitle, draw_flexwintitle, click_flexwintitle, "flexwintitle" },
|
|
|
|
|
{ -1, 0, BAR_ALIGN_NONE, width_flexwintitle, draw_flexwintitle, click_flexwintitle, "flexwintitle" },
|
|
|
|
|
#elif BAR_TABGROUPS_PATCH
|
|
|
|
|
{ -1, 0, BAR_ALIGN_NONE, width_bartabgroups, draw_bartabgroups, click_bartabgroups, "bartabgroups" },
|
|
|
|
|
{ -1, 0, BAR_ALIGN_NONE, width_bartabgroups, draw_bartabgroups, click_bartabgroups, "bartabgroups" },
|
|
|
|
|
#elif BAR_AWESOMEBAR_PATCH
|
|
|
|
|
{ -1, 0, BAR_ALIGN_NONE, width_awesomebar, draw_awesomebar, click_awesomebar, "awesomebar" },
|
|
|
|
|
{ -1, 0, BAR_ALIGN_NONE, width_awesomebar, draw_awesomebar, click_awesomebar, "awesomebar" },
|
|
|
|
|
#elif BAR_FANCYBAR_PATCH
|
|
|
|
|
{ -1, 0, BAR_ALIGN_NONE, width_fancybar, draw_fancybar, click_fancybar, "fancybar" },
|
|
|
|
|
{ -1, 0, BAR_ALIGN_NONE, width_fancybar, draw_fancybar, click_fancybar, "fancybar" },
|
|
|
|
|
#elif BAR_WINTITLE_PATCH
|
|
|
|
|
{ -1, 0, BAR_ALIGN_NONE, width_wintitle, draw_wintitle, click_wintitle, "wintitle" },
|
|
|
|
|
{ -1, 0, BAR_ALIGN_NONE, width_wintitle, draw_wintitle, click_wintitle, "wintitle" },
|
|
|
|
|
#endif // BAR_TABGROUPS_PATCH | BAR_AWESOMEBAR_PATCH | BAR_FANCYBAR_PATCH | BAR_WINTITLE_PATCH
|
|
|
|
|
#if BAR_EXTRASTATUS_PATCH
|
|
|
|
|
#if BAR_STATUSCOLORS_PATCH && BAR_STATUSCMD_PATCH
|
|
|
|
|
{ 'A', 1, BAR_ALIGN_CENTER, width_statuscolors_es, draw_statuscolors_es, click_statuscmd_es, "statuscolors_es" },
|
|
|
|
|
{ statusmon, 1, BAR_ALIGN_CENTER, width_statuscolors_es, draw_statuscolors_es, click_statuscmd_es, "statuscolors_es" },
|
|
|
|
|
#elif BAR_STATUSCOLORS_PATCH
|
|
|
|
|
{ 'A', 1, BAR_ALIGN_CENTER, width_statuscolors_es, draw_statuscolors_es, click_statuscolors, "statuscolors_es" },
|
|
|
|
|
{ statusmon, 1, BAR_ALIGN_CENTER, width_statuscolors_es, draw_statuscolors_es, click_statuscolors, "statuscolors_es" },
|
|
|
|
|
#elif BAR_STATUS2D_PATCH && BAR_STATUSCMD_PATCH
|
|
|
|
|
{ 'A', 1, BAR_ALIGN_CENTER, width_status2d_es, draw_status2d_es, click_statuscmd_es, "status2d_es" },
|
|
|
|
|
{ statusmon, 1, BAR_ALIGN_CENTER, width_status2d_es, draw_status2d_es, click_statuscmd_es, "status2d_es" },
|
|
|
|
|
#elif BAR_STATUS2D_PATCH
|
|
|
|
|
{ 'A', 1, BAR_ALIGN_CENTER, width_status2d_es, draw_status2d_es, click_status2d, "status2d_es" },
|
|
|
|
|
{ statusmon, 1, BAR_ALIGN_CENTER, width_status2d_es, draw_status2d_es, click_status2d, "status2d_es" },
|
|
|
|
|
#elif BAR_POWERLINE_STATUS_PATCH
|
|
|
|
|
{ 0, 1, BAR_ALIGN_RIGHT, width_pwrl_status_es, draw_pwrl_status_es, click_pwrl_status, "powerline_status" },
|
|
|
|
|
{ statusmon, 1, BAR_ALIGN_RIGHT, width_pwrl_status_es, draw_pwrl_status_es, click_pwrl_status, "powerline_status" },
|
|
|
|
|
#elif BAR_STATUSCMD_PATCH && BAR_STATUS_PATCH
|
|
|
|
|
{ 'A', 1, BAR_ALIGN_CENTER, width_status_es, draw_status_es, click_statuscmd_es, "status_es" },
|
|
|
|
|
{ statusmon, 1, BAR_ALIGN_CENTER, width_status_es, draw_status_es, click_statuscmd_es, "status_es" },
|
|
|
|
|
#elif BAR_STATUS_PATCH
|
|
|
|
|
{ 'A', 1, BAR_ALIGN_CENTER, width_status_es, draw_status_es, click_status, "status_es" },
|
|
|
|
|
{ statusmon, 1, BAR_ALIGN_CENTER, width_status_es, draw_status_es, click_status, "status_es" },
|
|
|
|
|
#endif // BAR_STATUS2D_PATCH | BAR_STATUSCMD_PATCH
|
|
|
|
|
#endif // BAR_EXTRASTATUS_PATCH
|
|
|
|
|
#if BAR_FLEXWINTITLE_PATCH
|
|
|
|
|
#if BAR_WINTITLE_HIDDEN_PATCH
|
|
|
|
|
{ -1, 1, BAR_ALIGN_RIGHT_RIGHT, width_wintitle_hidden, draw_wintitle_hidden, click_wintitle_hidden, "wintitle_hidden" },
|
|
|
|
|
{ -1, 1, BAR_ALIGN_RIGHT_RIGHT, width_wintitle_hidden, draw_wintitle_hidden, click_wintitle_hidden, "wintitle_hidden" },
|
|
|
|
|
#endif
|
|
|
|
|
#if BAR_WINTITLE_FLOATING_PATCH
|
|
|
|
|
{ -1, 1, BAR_ALIGN_LEFT, width_wintitle_floating, draw_wintitle_floating, click_wintitle_floating, "wintitle_floating" },
|
|
|
|
|
{ -1, 1, BAR_ALIGN_LEFT, width_wintitle_floating, draw_wintitle_floating, click_wintitle_floating, "wintitle_floating" },
|
|
|
|
|
#endif // BAR_WINTITLE_FLOATING_PATCH
|
|
|
|
|
#endif // BAR_FLEXWINTITLE_PATCH
|
|
|
|
|
};
|
|
|
|
|