Unified · Split
| @@ -40,8 +40,7 @@ struct Qmsg { · 39 unmodified lines | |||
| 40 | 40 | ||
| 41 | struct Qmenu_item_extra { | 41 | struct Qmenu_item_extra { |
| 42 | int user_id; | 42 | int user_id; |
| 43 | U8 owns_string : 1; | 43 | U8 owns_string : 1, is_spacer : 1; |
| 44 | U8 is_spacer : 1; | ||
| 45 | }; | 44 | }; |
| 46 | 45 | ||
| 47 | struct Qmenu { | 46 | struct Qmenu { |
| @@ -65,11 +64,7 @@ struct Qform { · 17 unmodified lines | |||
| 65 | 64 | ||
| 66 | Qnav_stack qnav_stack; | 65 | Qnav_stack qnav_stack; |
| 67 | 66 | ||
| 68 | void qnav_init() { | 67 | void qnav_init() { qnav_stack = (Qnav_stack){.blocks = {0}}; } |
| 69 | qnav_stack.count = 0; | ||
| 70 | qnav_stack.stack_changed = false; | ||
| 71 | memset(qnav_stack.blocks, 0, sizeof(qnav_stack.blocks)); | ||
| 72 | } | ||
| 73 | void qnav_deinit() { | 68 | void qnav_deinit() { |
| 74 | while (qnav_stack.count != 0) | 69 | while (qnav_stack.count != 0) |
| 75 | qnav_stack_pop(); | 70 | qnav_stack_pop(); |
| @@ -58,8 +58,7 @@ typedef enum { · 57 unmodified lines | |||
| 58 | 58 | ||
| 59 | typedef struct { | 59 | typedef struct { |
| 60 | Qblock_type_tag tag; | 60 | Qblock_type_tag tag; |
| 61 | WINDOW *outer_window; | 61 | WINDOW *outer_window, *content_window; |
| 62 | WINDOW *content_window; | ||
| 63 | char const *title; | 62 | char const *title; |
| 64 | int y, x; | 63 | int y, x; |
| 65 | } Qblock; | 64 | } Qblock; |