rdl->validate = validate;
rdl->complete = complete;
rdl->help = help;
- rdl->status = RDLINE_INIT;
+ rdl->status = RDLINE_STOPPED;
#ifndef NO_RDLINE_HISTORY
cirbuf_init(&rdl->history, rdl->history_buf, 0, RDLINE_HISTORY_BUF_SIZE);
#endif /* !NO_RDLINE_HISTORY */
void
rdline_stop(struct rdline *rdl)
{
- rdl->status = RDLINE_INIT;
+ rdl->status = RDLINE_STOPPED;
}
void
#ifndef NO_PAGER
/* display asynchrounous printf if any */
if (rdl->pager_buf != NULL) {
- if (cmd == VT100_STD_CHAR && c == 'q') {
- rdline_asyncpager_reset(rdl);
- if (rdl->pager_cb != NULL) {
- rdl->pager_cb(rdl, rdl->pager_arg);
- rdl->pager_cb = NULL;
- }
- if (rdl->pager_buf == NULL)
- return RDLINE_RES_VALIDATED;
- }
- if (rdline_pager_next_page(rdl) == 0) {
+ /* user ask to exit pager, or last page is displayed*/
+ if ((cmd == VT100_STD_CHAR && c == 'q') ||
+ rdline_pager_next_page(rdl) == 0) {
+ int ret;
+
+ ret = rdl->pager_ret;
rdline_asyncpager_reset(rdl);
if (rdl->pager_cb != NULL) {
rdl->pager_cb(rdl, rdl->pager_arg);
rdl->pager_cb = NULL;
}
- if (rdl->pager_buf == NULL)
- return RDLINE_RES_VALIDATED;
+ /* maybe the pager was reloaded in the
+ * callback */
+ if (rdl->pager_buf != NULL)
+ return RDLINE_RES_SUCCESS;
+
+ /* else, redisplay prompt and return the saved status */
+ rdline_redisplay(rdl);
+ return ret;
}
- /* async printf was called in cb() */
+
+ /* Some pages remain, lines were displayed in
+ * rdline_pager_next_page() */
return RDLINE_RES_SUCCESS;
}
#endif
}
case CMDLINE_KEY_RETURN:
- case CMDLINE_KEY_RETURN2:
+ case CMDLINE_KEY_RETURN2: {
+ char tmp;
+ while (!CIRBUF_IS_EMPTY(&rdl->right) &&
+ (tmp = cirbuf_get_head(&rdl->right))) {
+ cirbuf_del_head(&rdl->right);
+ cirbuf_add_tail(&rdl->left, tmp);
+ }
cirbuf_align_left(&rdl->left);
- rdl->left_buf[CIRBUF_GET_LEN(&rdl->left)] = '\n';
- rdl->left_buf[CIRBUF_GET_LEN(&rdl->left) + 1] = '\0';
+ rdl->left_buf[CIRBUF_GET_LEN(&rdl->left)] = '\0';
rdline_printf(rdl, "\r\n");
#ifndef NO_RDLINE_HISTORY
if (rdl->history_cur_line != -1)
#endif
if (rdl->validate)
- rdl->validate(rdl, rdl->left_buf, CIRBUF_GET_LEN(&rdl->left)+2);
+ rdl->validate(rdl, rdl->left_buf,
+ CIRBUF_GET_LEN(&rdl->left)+2);
#ifndef NO_PAGER
/* user may have stopped rdline */
if (rdl->status == RDLINE_EXITED) {
rdline_asyncpager_reset(rdl);
return RDLINE_RES_EXITED;
}
- if (rdl->pager_buf != NULL)
+ /* there is something in pager buffer, save
+ * return value that will be return once
+ * paging is finished */
+ if (rdl->pager_buf != NULL) {
+ rdl->pager_ret = RDLINE_RES_VALIDATED;
return RDLINE_RES_SUCCESS;
- else
- rdline_asyncpager_reset(rdl);
+ }
- rdl->status = RDLINE_INIT;
+ rdline_asyncpager_reset(rdl);
#else
if (rdl->status == RDLINE_EXITED)
return RDLINE_RES_EXITED;
#endif
return RDLINE_RES_VALIDATED;
-
+ }
#ifndef NO_RDLINE_HISTORY
case CMDLINE_KEY_UP_ARR:
case CMDLINE_KEY_CTRL_P:
rdl->pager_lines = 0;
rdl->pager_len = 0;
rdl->pager_off = 0;
+ rdl->pager_cb = NULL;
+ rdl->pager_arg = NULL;
+ rdl->pager_ret = RDLINE_RES_SUCCESS;
}
/* Return the offset of the i-th occurence of char c in string s. If