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

Fix arbitrary submenus and add 'Set Zoom...' to terminal

Browse Source
This commit is contained in:
K. Lange 2018-06-18 22:03:36 +09:00
parent 08e3f58146
commit cba3b2e804
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/terminal.c
View File

@ -1821,6 +1821,18 @@ void _menu_action_paste(struct MenuEntry * self) {
yutani_special_request(yctx, NULL, YUTANI_SPECIAL_REQUEST_CLIPBOARD);
}
void _menu_action_set_scale(struct MenuEntry * self) {
struct MenuEntry_Normal * _self = (struct MenuEntry_Normal *)self;
if (!_self->action) {
scale_fonts = 0;
font_scaling = 1.0;
} else {
scale_fonts = 1;
font_scaling = atof(_self->action);
}
reinit(1);
}
void maybe_flip_cursor(void) {
uint64_t ticks = get_ticks();
if (ticks > mouse_ticks + 600000LL) {
@ -1959,8 +1971,16 @@ int main(int argc, char ** argv) {
menu_insert(m, _menu_paste);
menu_set_insert(terminal_menu_bar.set, "edit", m);
m = menu_create();
menu_insert(m, menu_create_normal(NULL, "0.75", "75%", _menu_action_set_scale));
menu_insert(m, menu_create_normal(NULL, NULL, "100%", _menu_action_set_scale));
menu_insert(m, menu_create_normal(NULL, "1.5", "150%", _menu_action_set_scale));
menu_insert(m, menu_create_normal(NULL, "2.0", "200%", _menu_action_set_scale));
menu_set_insert(terminal_menu_bar.set, "zoom", m);
m = menu_create();
menu_insert(m, menu_create_normal(NULL, NULL, "Hide borders", _menu_action_hide_borders));
menu_insert(m, menu_create_submenu(NULL,"zoom","Set Zoom..."));
menu_set_insert(terminal_menu_bar.set, "view", m);
m = menu_create();

1
lib/menu.c
View File

@ -304,6 +304,7 @@ struct MenuSet * menu_set_create(void) {
void menu_set_insert(struct MenuSet * set, char * action, struct MenuList * menu) {
hashmap_set(set->_menus, action, menu);
menu->set = set;
}
struct MenuSet * menu_set_from_description(const char * path, void (*callback)(struct MenuEntry *)) {