From 4dc5c77d8236e0d2ce7aa4a82da3d8103ef9426b Mon Sep 17 00:00:00 2001 From: Jari Vetoniemi Date: Sat, 17 Jan 2015 19:05:39 +0200 Subject: [PATCH] Fix argument constants and references to --backend option --- client/bemenu-run.c | 1 - client/bemenu.c | 1 - client/common/common.c | 30 +++++++++++++----------------- client/common/common.h | 1 - 4 files changed, 13 insertions(+), 20 deletions(-) diff --git a/client/bemenu-run.c b/client/bemenu-run.c index 0efc32a..ab633c5 100644 --- a/client/bemenu-run.c +++ b/client/bemenu-run.c @@ -14,7 +14,6 @@ static struct client client = { .colors = {0}, .title = "bemenu", .prefix = NULL, - .renderer = NULL, .font = NULL, .selected = 0, .bottom = 0, diff --git a/client/bemenu.c b/client/bemenu.c index e441f3d..f2a4c4f 100644 --- a/client/bemenu.c +++ b/client/bemenu.c @@ -11,7 +11,6 @@ static struct client client = { .colors = {0}, .title = "bemenu", .prefix = NULL, - .renderer = NULL, .font = NULL, .selected = 0, .bottom = 0, diff --git a/client/common/common.c b/client/common/common.c index 52f71bc..ef25280 100644 --- a/client/common/common.c +++ b/client/common/common.c @@ -171,10 +171,6 @@ parse_args(struct client *client, int *argc, char **argv[]) client->selected = strtol(optarg, NULL, 10); break; - case 0x100: - client->renderer = optarg; - break; - case 'b': client->bottom = 1; break; @@ -185,44 +181,44 @@ parse_args(struct client *client, int *argc, char **argv[]) client->monitor = strtol(optarg, NULL, 10); break; - case 0x102: + case 0x100: client->font = optarg; break; - case 0x103: + case 0x101: client->colors[BM_COLOR_BG] = optarg; break; - case 0x104: + case 0x102: client->colors[BM_COLOR_TITLE_BG] = optarg; break; - case 0x105: + case 0x103: client->colors[BM_COLOR_TITLE_FG] = optarg; break; - case 0x106: + case 0x104: client->colors[BM_COLOR_FILTER_BG] = optarg; break; - case 0x107: + case 0x105: client->colors[BM_COLOR_FILTER_FG] = optarg; break; - case 0x108: + case 0x106: client->colors[BM_COLOR_ITEM_BG] = optarg; break; - case 0x109: + case 0x107: client->colors[BM_COLOR_ITEM_FG] = optarg; break; - case 0x110: + case 0x108: client->colors[BM_COLOR_HIGHLIGHTED_BG] = optarg; break; - case 0x111: + case 0x109: client->colors[BM_COLOR_HIGHLIGHTED_FG] = optarg; break; - case 0x112: + case 0x110: client->colors[BM_COLOR_SELECTED_BG] = optarg; break; - case 0x113: + case 0x111: client->colors[BM_COLOR_SELECTED_FG] = optarg; break; - case 0x114: + case 0x112: disco(); break; diff --git a/client/common/common.h b/client/common/common.h index 284b962..fa2025c 100644 --- a/client/common/common.h +++ b/client/common/common.h @@ -10,7 +10,6 @@ struct client { const char *colors[BM_COLOR_LAST]; const char *title; const char *prefix; - const char *renderer; const char *font; int32_t selected; int32_t bottom;