Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Split configuration variables to a config.h file. (suckless style) #373

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Split configuration variables to a config.h file. (suckless style) #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
010bde7
Split configuration variables to a `config.h` file. (suckless style)
MouadCharradi Nov 19, 2023
c19b000
Move more default values to `config.h`.
MouadCharradi Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions client/bemenu-run.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@
#include <unistd.h>
#include <dirent.h>
#include <assert.h>
#include "common/common.h"

static struct client client = {
.filter_mode = BM_FILTER_MODE_DMENU,
.title = "bemenu-run",
.monitor = -1,
};
#include "../lib/config.h"

struct paths {
char *path;
Expand Down Expand Up @@ -177,14 +171,14 @@ main(int argc, char **argv)
if (!bm_init())
return EXIT_FAILURE;

parse_args(&client, &argc, &argv);
parse_args(&default_bmenu_run_client, &argc, &argv);

struct bm_menu *menu;
if (!(menu = menu_with_options(&client)))
if (!(menu = menu_with_options(&default_bmenu_run_client)))
return EXIT_FAILURE;

read_items_to_menu_from_path(menu);
const enum bm_run_result status = run_menu(&client, menu, item_cb);
const enum bm_run_result status = run_menu(&default_bmenu_run_client, menu, item_cb);
bm_menu_free(menu);
return (status == BM_RUN_RESULT_SELECTED ? EXIT_SUCCESS : EXIT_FAILURE);
}
Expand Down
14 changes: 6 additions & 8 deletions client/bemenu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@
#include <assert.h>
#include "common/common.h"

static struct client client = {
.filter_mode = BM_FILTER_MODE_DMENU,
.title = "bemenu",
.monitor = -1,
};

static void
read_items_to_menu_from_stdin(struct bm_menu *menu)
Expand Down Expand Up @@ -46,20 +41,23 @@ item_cb(const struct client *client, struct bm_item *item)
printf("%s\n", (text ? text : ""));
}

#include "../lib/config.h"

int
main(int argc, char **argv)
{

if (!bm_init())
return EXIT_FAILURE;

parse_args(&client, &argc, &argv);
parse_args(&default_bmenu_client, &argc, &argv);

struct bm_menu *menu;
if (!(menu = menu_with_options(&client)))
if (!(menu = menu_with_options(&default_bmenu_client)))
return EXIT_FAILURE;

read_items_to_menu_from_stdin(menu);
const enum bm_run_result status = run_menu(&client, menu, item_cb);
const enum bm_run_result status = run_menu(&default_bmenu_client, menu, item_cb);
bm_menu_free(menu);
switch (status) {
case BM_RUN_RESULT_SELECTED:
Expand Down
49 changes: 49 additions & 0 deletions lib/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#include "../client/common/common.h"

/**
* Default font.
*/
static const char *default_font = "monospace 10";

/**
* Default hexadecimal colors.
*/
static const char *default_colors[BM_COLOR_LAST] = {
"#121212FF", // BM_COLOR_TITLE_BG
"#D81860FF", // BM_COLOR_TITLE_FG
"#121212FF", // BM_COLOR_FILTER_BG
"#CACACAFF", // BM_COLOR_FILTER_FG
"#121212FF", // BM_COLOR_CURSOR_BG
"#CACACAFF", // BM_COLOR_CURSOR_FG
"#121212FF", // BM_COLOR_ITEM_BG
"#CACACAFF", // BM_COLOR_ITEM_FG
"#121212FF", // BM_COLOR_HIGHLIGHTED_BG
"#D81860FF", // BM_COLOR_HIGHLIGHTED_FG
"#D81860FF", // BM_COLOR_FEEDBACK_BG
"#121212FF", // BM_COLOR_FEEDBACK_FG
"#121212FF", // BM_COLOR_SELECTED_BG
"#D81860FF", // BM_COLOR_SELECTED_FG
"#121212FF", // BM_COLOR_ALTERNATE_BG
"#CACACAFF", // BM_COLOR_ALTERNATE_FG
"#121212FF", // BM_COLOR_SCROLLBAR_BG
"#D81860FF", // BM_COLOR_SCROLLBAR_FG
"#D81860FF", // BM_COLOR_BORDER
};

/**
* Default title/prompt for the bmenu client (Can be changed with `-p` option).
*/
static struct client default_bmenu_client = {
.filter_mode = BM_FILTER_MODE_DMENU,
.title = "bemenu",
.monitor = -1,
};

/**
* Default title/prompt for the bmenu-run client (Can be changed with `-p` option).
*/
static struct client default_bmenu_run_client = {
.filter_mode = BM_FILTER_MODE_DMENU,
.title = "bemenu-run",
.monitor = -1,
};
30 changes: 1 addition & 29 deletions lib/menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,7 @@

#include "vim.h"

/**
* Default font.
*/
static const char *default_font = "monospace 10";

/**
* Default hexadecimal colors.
*/
static const char *default_colors[BM_COLOR_LAST] = {
"#121212FF", // BM_COLOR_TITLE_BG
"#D81860FF", // BM_COLOR_TITLE_FG
"#121212FF", // BM_COLOR_FILTER_BG
"#CACACAFF", // BM_COLOR_FILTER_FG
"#121212FF", // BM_COLOR_CURSOR_BG
"#CACACAFF", // BM_COLOR_CURSOR_FG
"#121212FF", // BM_COLOR_ITEM_BG
"#CACACAFF", // BM_COLOR_ITEM_FG
"#121212FF", // BM_COLOR_HIGHLIGHTED_BG
"#D81860FF", // BM_COLOR_HIGHLIGHTED_FG
"#D81860FF", // BM_COLOR_FEEDBACK_BG
"#121212FF", // BM_COLOR_FEEDBACK_FG
"#121212FF", // BM_COLOR_SELECTED_BG
"#D81860FF", // BM_COLOR_SELECTED_FG
"#121212FF", // BM_COLOR_ALTERNATE_BG
"#CACACAFF", // BM_COLOR_ALTERNATE_FG
"#121212FF", // BM_COLOR_SCROLLBAR_BG
"#D81860FF", // BM_COLOR_SCROLLBAR_FG
"#D81860FF", // BM_COLOR_BORDER
};
#include "config.h"

/**
* Filter function map.
Expand Down