diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/cons/cons.c | 6 | ||||
| -rw-r--r-- | modules/evdev/evdev.c | 4 | ||||
| -rw-r--r-- | modules/httpd/httpd.c | 2 | ||||
| -rw-r--r-- | modules/menu/menu.c | 9 | ||||
| -rw-r--r-- | modules/mwi/mwi.c | 6 | ||||
| -rw-r--r-- | modules/sdl/sdl.c | 6 | ||||
| -rw-r--r-- | modules/stdio/stdio.c | 4 | ||||
| -rw-r--r-- | modules/wincons/wincons.c | 4 |
8 files changed, 22 insertions, 19 deletions
diff --git a/modules/cons/cons.c b/modules/cons/cons.c index f652a75..fc80f81 100644 --- a/modules/cons/cons.c +++ b/modules/cons/cons.c @@ -67,7 +67,7 @@ static void udp_recv(const struct sa *src, struct mbuf *mb, void *arg) if (ch == '\r') ch = '\n'; - ui_input_key(ch, &pf); + ui_input_key(baresip_uis(), ch, &pf); } if (mbr->end > 0) { @@ -116,7 +116,7 @@ static void tcp_recv_handler(struct mbuf *mb, void *arg) if (ch == '\r') ch = '\n'; - ui_input_key(ch, &pf); + ui_input_key(baresip_uis(), ch, &pf); } } @@ -248,7 +248,7 @@ static int cons_init(void) if (err) return err; - ui_register(&ui_cons); + ui_register(baresip_uis(), &ui_cons); log_register_handler(&lg); diff --git a/modules/evdev/evdev.c b/modules/evdev/evdev.c index 3b8e6aa..7d27f1e 100644 --- a/modules/evdev/evdev.c +++ b/modules/evdev/evdev.c @@ -166,7 +166,7 @@ static void reportkey(struct ui_st *st, int ascii) static struct re_printf pf_stderr = {stderr_handler, NULL}; (void)st; - ui_input_key(ascii, &pf_stderr); + ui_input_key(baresip_uis(), ascii, &pf_stderr); } @@ -326,7 +326,7 @@ static int module_init(void) if (err) return err; - ui_register(&ui_evdev); + ui_register(baresip_uis(), &ui_evdev); return 0; } diff --git a/modules/httpd/httpd.c b/modules/httpd/httpd.c index 769e106..7642722 100644 --- a/modules/httpd/httpd.c +++ b/modules/httpd/httpd.c @@ -155,7 +155,7 @@ static int module_init(void) if (err) return err; - ui_register(&ui_http); + ui_register(baresip_uis(), &ui_http); info("httpd: listening on %J\n", &laddr); diff --git a/modules/menu/menu.c b/modules/menu/menu.c index 042db21..16bc2ee 100644 --- a/modules/menu/menu.c +++ b/modules/menu/menu.c @@ -90,7 +90,8 @@ static void check_registrations(void) n = list_count(uag_list()); /* We are ready */ - ui_output("\x1b[32mAll %u useragent%s registered successfully!" + ui_output(baresip_uis(), + "\x1b[32mAll %u useragent%s registered successfully!" " (%u ms)\x1b[;m\n", n, n==1 ? "" : "s", (uint32_t)(tmr_jiffies() - start_ticks)); @@ -822,7 +823,7 @@ static void tmrstat_handler(void *arg) tmr_start(&tmr_stat, 100, tmrstat_handler, 0); - if (ui_isediting()) + if (ui_isediting(baresip_uis())) return; if (STATMODE_OFF != statmode) { @@ -848,7 +849,7 @@ static void alert_start(void *arg) if (!menu.bell) return; - ui_output("\033[10;1000]\033[11;1000]\a"); + ui_output(baresip_uis(), "\033[10;1000]\033[11;1000]\a"); tmr_start(&tmr_alert, 1000, alert_start, NULL); } @@ -860,7 +861,7 @@ static void alert_stop(void) return; if (tmr_isrunning(&tmr_alert)) - ui_output("\r"); + ui_output(baresip_uis(), "\r"); tmr_cancel(&tmr_alert); } diff --git a/modules/mwi/mwi.c b/modules/mwi/mwi.c index 4ce4a19..4bae5f5 100644 --- a/modules/mwi/mwi.c +++ b/modules/mwi/mwi.c @@ -60,8 +60,10 @@ static void notify_handler(struct sip *sip, const struct sip_msg *msg, struct mwi *mwi = arg; if (mbuf_get_left(msg->mb)) { - ui_output("----- MWI for %s -----\n", ua_aor(mwi->ua)); - ui_output("%b\n", mbuf_buf(msg->mb), mbuf_get_left(msg->mb)); + struct ui_sub *uis = baresip_uis(); + ui_output(uis, "----- MWI for %s -----\n", ua_aor(mwi->ua)); + ui_output(uis, "%b\n", mbuf_buf(msg->mb), + mbuf_get_left(msg->mb)); } (void)sip_treply(NULL, sip, msg, 200, "OK"); diff --git a/modules/sdl/sdl.c b/modules/sdl/sdl.c index 122b451..02facd7 100644 --- a/modules/sdl/sdl.c +++ b/modules/sdl/sdl.c @@ -80,7 +80,7 @@ static void timeout(void *arg) tmr_start(&sdl.tmr, 1, event_handler, NULL); /* Emulate key-release */ - ui_input_key(KEYCODE_REL, NULL); + ui_input_key(baresip_uis(), KEYCODE_REL, NULL); } @@ -124,7 +124,7 @@ static void event_handler(void *arg) if (isprint(ch)) { tmr_start(&sdl.tmr, KEY_RELEASE_VAL, timeout, NULL); - ui_input_key(ch, NULL); + ui_input_key(baresip_uis(), ch, NULL); } break; } @@ -136,7 +136,7 @@ static void event_handler(void *arg) break; case SDL_QUIT: - ui_input_key('q', NULL); + ui_input_key(baresip_uis(), 'q', NULL); break; default: diff --git a/modules/stdio/stdio.c b/modules/stdio/stdio.c index 81dd9c5..179484e 100644 --- a/modules/stdio/stdio.c +++ b/modules/stdio/stdio.c @@ -63,7 +63,7 @@ static void report_key(struct ui_st *ui, char key) static struct re_printf pf_stderr = {print_handler, NULL}; (void)ui; - ui_input_key(key, &pf_stderr); + ui_input_key(baresip_uis(), key, &pf_stderr); } @@ -170,7 +170,7 @@ static int module_init(void) if (err) return err; - ui_register(&ui_stdio); + ui_register(baresip_uis(), &ui_stdio); return 0; } diff --git a/modules/wincons/wincons.c b/modules/wincons/wincons.c index 769705a..641ceb0 100644 --- a/modules/wincons/wincons.c +++ b/modules/wincons/wincons.c @@ -64,7 +64,7 @@ static void report_key(struct ui_st *ui, char key) static struct re_printf pf_stderr = {print_handler, NULL}; (void)ui; - ui_input_key(key, &pf_stderr); + ui_input_key(baresip_uis(), key, &pf_stderr); } @@ -195,7 +195,7 @@ static int module_init(void) if (err) return err; - ui_register(&ui_wincons); + ui_register(baresip_uis(), &ui_wincons); return 0; } |