RepoMirrors/bemenu
1
0
Fork 1
mirror of https://github.com/Cloudef/bemenu synced 2025-02-19 00:06:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove bg color option as you never see the real bg anyways.

Browse Source
This commit is contained in:
Jari Vetoniemi 2015-01-20 18:42:29 +02:00
parent 7d019e767b
commit eb46ba7bdc
4 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
client/common/common.c
View File

@ -85,7 +85,6 @@ usage(FILE *out, const char *name)
" -f, --grab grabs the keyboard before reading stdin. (x)\n"
" -m, --monitor index of monitor where menu will appear. (x)\n"
" --fn defines the font to be used ('name [size]'). (wx)\n"
" --bg defines the background color. (wx)\n"
" --tb defines the title background color. (wx)\n"
" --tf defines the title foreground color. (wx)\n"
" --fb defines the filter background color. (wx)\n"
@ -117,13 +116,12 @@ parse_args(struct client *client, int *argc, char **argv[])
{ "prompt", required_argument, 0, 'p' },
{ "index", required_argument, 0, 'I' },
{ "prefix", required_argument, 0, 'P' },
{ "scrollbar", required_argument, 0, 0x113 },
{ "scrollbar", required_argument, 0, 0x100 },
{ "bottom", no_argument, 0, 'b' },
{ "grab", no_argument, 0, 'f' },
{ "monitor", required_argument, 0, 'm' },
{ "fn", required_argument, 0, 0x100 },
{ "bg", required_argument, 0, 0x101 },
{ "fn", required_argument, 0, 0x101 },
{ "tb", required_argument, 0, 0x102 },
{ "tf", required_argument, 0, 0x103 },
{ "fb", required_argument, 0, 0x104 },
@ -134,10 +132,10 @@ parse_args(struct client *client, int *argc, char **argv[])
{ "hf", required_argument, 0, 0x109 },
{ "sb", required_argument, 0, 0x110 },
{ "sf", required_argument, 0, 0x111 },
{ "scb", required_argument, 0, 0x114 },
{ "scf", required_argument, 0, 0x115 },
{ "scb", required_argument, 0, 0x112 },
{ "scf", required_argument, 0, 0x113 },
{ "disco", no_argument, 0, 0x112 },
{ "disco", no_argument, 0, 0x114 },
{ 0, 0, 0, 0 }
};
@ -176,7 +174,7 @@ parse_args(struct client *client, int *argc, char **argv[])
case 'I':
client->selected = strtol(optarg, NULL, 10);
break;
case 0x113:
case 0x100:
client->scrollbar = (!strcmp(optarg, "always") ? BM_SCROLLBAR_ALWAYS : (!strcmp(optarg, "autohide") ? BM_SCROLLBAR_AUTOHIDE : BM_SCROLLBAR_NONE));
break;
@ -190,11 +188,8 @@ parse_args(struct client *client, int *argc, char **argv[])
client->monitor = strtol(optarg, NULL, 10);
break;
case 0x100:
client->font = optarg;
break;
case 0x101:
client->colors[BM_COLOR_BG] = optarg;
client->font = optarg;
break;
case 0x102:
client->colors[BM_COLOR_TITLE_BG] = optarg;
@ -226,14 +221,14 @@ parse_args(struct client *client, int *argc, char **argv[])
case 0x111:
client->colors[BM_COLOR_SELECTED_FG] = optarg;
break;
case 0x114:
case 0x112:
client->colors[BM_COLOR_SCROLLBAR_BG] = optarg;
break;
case 0x115:
case 0x113:
client->colors[BM_COLOR_SCROLLBAR_FG] = optarg;
break;
case 0x112:
case 0x114:
disco();
break;

1
lib/bemenu.h
View File

@ -202,7 +202,6 @@ enum bm_key {
* @link ::bm_color BM_COLOR_LAST @endlink is provided for enumerating colors.
*/
enum bm_color {
BM_COLOR_BG,
BM_COLOR_TITLE_BG,
BM_COLOR_TITLE_FG,
BM_COLOR_FILTER_BG,

1
lib/menu.c
View File

@ -15,7 +15,6 @@ static const char *default_font = "Terminus 9";
* Default hexadecimal colors.
*/
static const char *default_colors[BM_COLOR_LAST] = {
"#121212", // BM_COLOR_BG
"#121212", // BM_COLOR_TITLE_BG
"#D81860", // BM_COLOR_TITLE_FG
"#121212", // BM_COLOR_FILTER_BG

4
lib/renderers/cairo.h
View File

@ -169,9 +169,7 @@ bm_cairo_paint(struct cairo *cairo, uint32_t width, uint32_t height, uint32_t ma
memset(out_result, 0, sizeof(struct cairo_paint_result));
out_result->displayed = 1;
struct cairo_color c;
bm_cairo_color_from_menu_color(menu, BM_COLOR_BG, &c);
cairo_set_source_rgb(cairo->cr, c.r, c.g, c.b);
cairo_set_source_rgb(cairo->cr, 0, 0, 0);
cairo_rectangle(cairo->cr, 0, 0, width, height);
cairo_fill(cairo->cr);