Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bim: sync with upstream

Browse Source
This commit is contained in:
K. Lange 2022-10-10 17:08:16 +09:00
parent 3a80a3c0c8
commit 4ab636defa
2 changed files with 429 additions and 333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

716
apps/bim.c
View File

File diff suppressed because it is too large Load Diff

20
apps/bim.h
View File

@ -378,7 +378,7 @@ extern struct syntax_definition * syntaxes;
struct action_def { struct action_def {
char * name; char * name;
void (*action)(); uintptr_t action;
int options; int options;
const char * description; const char * description;
}; };
@ -390,12 +390,12 @@ extern struct action_def * mappable_actions;
#define ARG_IS_PROMPT 0x04 /* Prompts for an argument. */ #define ARG_IS_PROMPT 0x04 /* Prompts for an argument. */
#define ACTION_IS_RW 0x08 /* Needs to be able to write. */ #define ACTION_IS_RW 0x08 /* Needs to be able to write. */
#define BIM_ACTION(name, options, description) \ #define BIM_ACTION(name, options, description, ...) \
void name (); /* Define the action with unknown arguments */ \ extern void name(__VA_ARGS__); /* Define the action with unknown arguments */ \
void __attribute__((constructor)) _install_ ## name (void) { \ void __attribute__((constructor)) _install_ ## name (void) { \
add_action((struct action_def){#name, name, options, description}); \ add_action((struct action_def){#name, (uintptr_t)name, options, description}); \
} \ } \
void name void name(__VA_ARGS__)
struct command_def { struct command_def {
char * name; char * name;
@ -431,7 +431,7 @@ extern void quit(const char * message);
extern void close_buffer(void); extern void close_buffer(void);
extern void set_syntax_by_name(const char * name); extern void set_syntax_by_name(const char * name);
extern void rehighlight_search(line_t * line); extern void rehighlight_search(line_t * line);
extern void try_to_center(); extern void try_to_center(void);
extern int read_one_character(char * message); extern int read_one_character(char * message);
extern void bim_unget(int c); extern void bim_unget(int c);
#define bim_getch() bim_getch_timeout(200) #define bim_getch() bim_getch_timeout(200)
@ -494,9 +494,14 @@ extern void pause_for_key(void);
struct action_map { struct action_map {
int key; int key;
void (*method)();
int options; int options;
union {
struct {
uintptr_t method;
int arg; int arg;
};
KrkValue callable;
};
}; };
#define opt_rep 0x1 /* This action will be repeated */ #define opt_rep 0x1 /* This action will be repeated */
@ -506,6 +511,7 @@ struct action_map {
#define opt_rw 0x10 /* Must not be read-only */ #define opt_rw 0x10 /* Must not be read-only */
#define opt_norm 0x20 /* Returns to normal mode */ #define opt_norm 0x20 /* Returns to normal mode */
#define opt_byte 0x40 /* Same as opt_char but forces a byte */ #define opt_byte 0x40 /* Same as opt_char but forces a byte */
#define opt_krk 0x80
struct mode_names { struct mode_names {
const char * description; const char * description;