X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=src%2Flib%2Fcmdline_rdline.c;h=ee78cb2ba685010630db9f72f3b928325a04ef09;hb=07b56132836475e2231868771a53a7d2b1ee2fd7;hp=16fda433dafc15ec0678cbe3390a462ff9ef3d1e;hpb=3e6cc1d7b682f75a75034602f003c3e9f8a8d3ad;p=libcmdline.git

diff --git a/src/lib/cmdline_rdline.c b/src/lib/cmdline_rdline.c
index 16fda43..ee78cb2 100644
--- a/src/lib/cmdline_rdline.c
+++ b/src/lib/cmdline_rdline.c
@@ -216,14 +216,20 @@ rdline_parse_char(struct rdline *rdl, char c)
 	if (rdl->pager_buf != NULL) {
 		if (cmd == VT100_STD_CHAR && c == 'q') {
 			rdline_asyncpager_reset(rdl);
-			// call cb()
+			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) {
 			rdline_asyncpager_reset(rdl);
-			// call cb()
+			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;
 		}
@@ -394,12 +400,14 @@ rdline_parse_char(struct rdline *rdl, char c)
 			cirbuf_align_left(&rdl->left);
 			rdl->left_buf[CIRBUF_GET_LEN(&rdl->left)] = '\0';
 			rdline_printf(rdl, "\r\n");
-			rdl->help(rdl, rdl->left_buf, rdline_write, rdl);
 #ifndef NO_PAGER
-			if (rdl->pager_buf != NULL) {
-				// XXX set cb
+			rdl->help(rdl, rdl->left_buf, rdline_asyncpager_write, rdl);
+			if (rdl->pager_buf != NULL)
 				return RDLINE_RES_SUCCESS;
-			}
+			else
+				rdline_asyncpager_reset(rdl);
+#else
+			rdl->help(rdl, rdl->left_buf, rdline_write, rdl);
 #endif
 			rdline_redisplay(rdl);
 			break;
@@ -407,7 +415,7 @@ rdline_parse_char(struct rdline *rdl, char c)
 
 		case CMDLINE_KEY_TAB: {
 			char tmp_buf[CMDLINE_MAX_TOKEN_SIZE];
-			int ret; //, curline = 0;
+			int ret;
 			unsigned int tmp_size;
 
 			if (rdl->complete == NULL)
@@ -425,12 +433,15 @@ rdline_parse_char(struct rdline *rdl, char c)
 				cirbuf_align_left(&rdl->left);
 				rdl->left_buf[CIRBUF_GET_LEN(&rdl->left)] = '\0';
 				rdline_printf(rdl, "\r\n");
-				rdl->help(rdl, rdl->left_buf, rdline_write, rdl);
 #ifndef NO_PAGER
-				if (rdl->pager_buf != NULL) {
-					// XXX set cb
+				rdl->help(rdl, rdl->left_buf, rdline_asyncpager_write,
+					  rdl);
+				if (rdl->pager_buf != NULL)
 					return RDLINE_RES_SUCCESS;
-				}
+				else
+					rdline_asyncpager_reset(rdl);
+#else
+				rdl->help(rdl, rdl->left_buf, rdline_write, rdl);
 #endif
 				rdline_redisplay(rdl);
 				break;
@@ -469,10 +480,11 @@ rdline_parse_char(struct rdline *rdl, char c)
 				rdline_asyncpager_reset(rdl);
 				return RDLINE_RES_EXITED;
 			}
-			if (rdl->pager_buf != NULL) {
-				// XXX set cb
+			if (rdl->pager_buf != NULL)
 				return RDLINE_RES_SUCCESS;
-			}
+			else
+				rdline_asyncpager_reset(rdl);
+
 			rdl->status = RDLINE_INIT;
 #else
 			if (rdl->status == RDLINE_EXITED)
@@ -521,7 +533,6 @@ rdline_parse_char(struct rdline *rdl, char c)
 			break;
 #endif /* !NO_RDLINE_HISTORY */
 
-
 		default:
 			break;
 		}
@@ -828,9 +839,11 @@ rdline_pager_next_page(struct rdline *rdl)
 }
 
 /* push data in pager */
-static int
-rdline_pager_push(struct rdline *rdl, char *s, int len)
+ssize_t
+rdline_asyncpager_write(struct rdline *rdl, void *buf, size_t len)
 {
+	char *s = buf;
+
 	/* display as many lines as we can */
 	if (rdl->pager_lines < RDLINE_MAX_LINES) {
 		int lines = RDLINE_MAX_LINES - rdl->pager_lines;
@@ -865,8 +878,7 @@ rdline_pager_push(struct rdline *rdl, char *s, int len)
 	return 0;
 }
 
-/* XXX we should have a specific return value when displaying will be
- * asynchronous, we may also have a callback */
+/* Print data asynchronously (using pager if needed) */
 int
 rdline_asyncpager_printf(struct rdline *rdl, const char *fmt, ...)
 {
@@ -888,8 +900,19 @@ rdline_asyncpager_printf(struct rdline *rdl, const char *fmt, ...)
 	if (n >= BUFSIZ)
 		n = BUFSIZ-1;
 	if (n > 0)
-		rdline_pager_push(rdl, buf, n);
+		rdline_asyncpager_write(rdl, buf, n);
 	free(buf);
 	return n;
 }
+
+int rdline_asyncpager_set_cb(struct rdline *rdl, rdline_asyncpager_cb_t *cb,
+			     void *arg)
+{
+	if (rdl->pager_buf == NULL)
+		return -1;
+
+	rdl->pager_cb = cb;
+	rdl->pager_arg = arg;
+	return 0;
+}
 #endif /* !NO_PAGER */