commit 40fbc35499ea5d93df0655310e8e9df7774534c3 from: Omar Polo date: Wed Jul 14 20:52:28 2021 UTC don't allow to input special characters (e.g. ^U) commit - e80a23a161b19aab1cf034c9f318af4b4c9a89ce commit + 40fbc35499ea5d93df0655310e8e9df7774534c3 blob - 62558fb313faf3888287a234a1e10431bfa815b1 blob + 13ef1e8480f65cd928897a7238162eb2f281fe8b --- cmd.c +++ cmd.c @@ -487,7 +487,7 @@ cmd_tab_select(struct buffer *buffer) return; } - enter_minibuffer(minibuffer_self_insert, ts_select, exit_minibuffer, + enter_minibuffer(sensible_self_insert, ts_select, exit_minibuffer, NULL, compl_ts, NULL); strlcpy(ministate.prompt, "Select tab: ", sizeof(ministate.prompt)); } @@ -500,7 +500,7 @@ cmd_load_url(struct buffer *buffer) return; } - enter_minibuffer(lu_self_insert, lu_select, exit_minibuffer, + enter_minibuffer(sensible_self_insert, lu_select, exit_minibuffer, &lu_history, NULL, NULL); strlcpy(ministate.prompt, "Load URL: ", sizeof(ministate.prompt)); strlcpy(ministate.buf, "gemini://", sizeof(ministate.buf)); @@ -517,7 +517,7 @@ cmd_load_current_url(struct buffer *buffer) return; } - enter_minibuffer(lu_self_insert, lu_select, exit_minibuffer, + enter_minibuffer(sensible_self_insert, lu_select, exit_minibuffer, &lu_history, NULL, NULL); strlcpy(ministate.prompt, "Load URL: ", sizeof(ministate.prompt)); strlcpy(ministate.buf, tab->hist_cur->h, sizeof(ministate.buf)); @@ -538,7 +538,7 @@ cmd_bookmark_page(struct buffer *buffer) { struct tab *tab = current_tab(); - enter_minibuffer(lu_self_insert, bp_select, exit_minibuffer, NULL, + enter_minibuffer(sensible_self_insert, bp_select, exit_minibuffer, NULL, NULL, NULL); strlcpy(ministate.prompt, "Bookmark URL: ", sizeof(ministate.prompt)); strlcpy(ministate.buf, tab->hist_cur->h, sizeof(ministate.buf)); @@ -565,7 +565,7 @@ cmd_link_select(struct buffer *buffer) return; } - enter_minibuffer(minibuffer_self_insert, ls_select, exit_minibuffer, + enter_minibuffer(sensible_self_insert, ls_select, exit_minibuffer, NULL, compl_ls, TAILQ_FIRST(&buffer->page.head)); strlcpy(ministate.prompt, "Select link: ", sizeof(ministate.prompt)); } @@ -578,7 +578,7 @@ cmd_swiper(struct buffer *buffer) return; } - enter_minibuffer(minibuffer_self_insert, swiper_select, exit_minibuffer, + enter_minibuffer(sensible_self_insert, swiper_select, exit_minibuffer, NULL, compl_swiper, TAILQ_FIRST(&buffer->page.head)); strlcpy(ministate.prompt, "Select line: ", sizeof(ministate.prompt)); } blob - 62b1b51b659d0f3ea102273e032a4e1cfff66992 blob + 646346235203e6d091672273a2a1e41746ec7314 --- minibuffer.c +++ minibuffer.c @@ -133,6 +133,18 @@ minibuffer_self_insert(void) ministate.buffer.cpoff++; recompute_completions(1); +} + +void +sensible_self_insert(void) +{ + if (thiskey.meta || unicode_isspace(thiskey.key) || + !unicode_isgraph(thiskey.key)) { + global_key_unbound(); + return; + } + + minibuffer_self_insert(); } void @@ -187,18 +199,6 @@ ir_select(void) phos_uri_set_query(&uri, ministate.buf); phos_serialize_uri(&uri, buf, sizeof(buf)); load_url_in_tab(tab, buf); -} - -void -lu_self_insert(void) -{ - if (thiskey.meta || unicode_isspace(thiskey.key) || - !unicode_isgraph(thiskey.key)) { - global_key_unbound(); - return; - } - - minibuffer_self_insert(); } void blob - 9981be0e6bae2d5217fb272827c5d7487ab95a38 blob + 1f5cbed437ee9f3ad8d621f47dfa8b6263c0d9d9 --- minibuffer.h +++ minibuffer.h @@ -65,11 +65,11 @@ void recompute_completions(int); void minibuffer_taint_hist(void); void minibuffer_self_insert(void); +void sensible_self_insert(void); void eecmd_self_insert(void); void eecmd_select(void); void ir_self_insert(void); void ir_select(void); -void lu_self_insert(void); void lu_select(void); void bp_select(void); void ts_select(void);