diff options
Diffstat (limited to 'alpine/osdep/termin.gen.c')
| -rw-r--r-- | alpine/osdep/termin.gen.c | 62 |
1 files changed, 3 insertions, 59 deletions
diff --git a/alpine/osdep/termin.gen.c b/alpine/osdep/termin.gen.c index 74d2a37f..fb106be1 100644 --- a/alpine/osdep/termin.gen.c +++ b/alpine/osdep/termin.gen.c @@ -33,8 +33,6 @@ static char rcsid[] = "$Id: termin.gen.c 1025 2008-04-08 22:59:38Z hubert@u.wash #include "../../pith/newmail.h" #include "../../pith/conf.h" #include "../../pith/busy.h" -#include "../../pith/list.h" -#include "../../pith/rules.h" #include "../../pico/estruct.h" #include "../../pico/pico.h" @@ -69,30 +67,12 @@ static int g_mc_row, g_mc_col; int pcpine_oe_cursor(int, long); #endif -void -fake_config_screen(tt) - struct ttyo **tt; -{ - struct ttyo *ttyo; - - ttyo = (struct ttyo *)fs_get(sizeof (struct ttyo)); - - ttyo->header_rows = 2; - ttyo->footer_rows = 3; - ttyo->screen_rows = 24; - ttyo->screen_cols = 80; - - *tt = ttyo; - -} - /* * Generic tty input routines */ -void process_init_cmds(struct pine *, char **); -void queue_init_errors(struct pine *); + /*---------------------------------------------------------------------- Read a character from keyboard with timeout Input: none @@ -134,41 +114,6 @@ read_command(char **utf8str) *utf8str = NULL; ucs = read_char(tm); - if(!ps_global->initial_cmds){ - RULE_RESULT *rule; - char **list = NULL, *error = NULL; - int commas = 0, k; /* From args.c */ - - ps_global->pressed_key = cpystr(pretty_command(ucs)); - rule = (RULE_RESULT *)get_result_rule(V_KEY_RULES, FOR_KEY, NULL); - if(ps_global->pressed_key) - fs_give((void **)&ps_global->pressed_key); - if (rule){ - for(k = 0; rule->result[k]; k++) - if(rule->result[k] == ',') commas++; - list = parse_list(rule->result, commas+1, 0, &error); - if(error) - sprintf(tmp_20k_buf, "Error in parsing command list: %s, %s", - rule->result, error); - if (rule->result) - fs_give((void **)&rule->result); - fs_give((void **)&rule); - if(error){ - q_status_message(SM_ORDER | SM_DING, 0, 2, tmp_20k_buf); - return (NO_OP_COMMAND); - } - process_init_cmds(ps_global, list); - if(ps_global->init_errs){ - queue_init_errors(ps_global); - return (NO_OP_COMMAND); - } - ucs = read_char(tm); - ps_global->in_init_seq = 1; /* no output please */ - for(k = 0; k < commas; k++) - if(list[k]) fs_give((void **)&list[k]); - if (list) fs_give((void **)list); - } - } if(ucs != NO_OP_COMMAND && ucs != NO_OP_IDLE && ucs != KEY_RESIZE) zero_new_mail_count(); @@ -362,7 +307,7 @@ optionally_enter(char *utf8string, int y_base, int x_base, int utf8string_size, (escape_list && escape_list[0].ch != -1 && escape_list[0].label) ? escape_list[0].label: "")); - if(!ps_global->ttyo || ps_global->send_immediately) + if(!ps_global->ttyo) return(pre_screen_config_opt_enter(utf8string, utf8string_size, utf8prompt, escape_list, help, flags)); @@ -1209,11 +1154,10 @@ process_config_input(UCS *ch) } } } - ps_global->initial_cmds_offset++; + if(!*ps_global->initial_cmds && ps_global->free_initial_cmds){ fs_give((void **) &ps_global->free_initial_cmds); ps_global->initial_cmds = NULL; - firsttime = (char) 1; } return(ret); |