Merge pull request #79 from Oldes/io

Char based console input

Author: Oldes

src/boot/sysobj.reb

@@ -507,6 +507,9 @@ view: object [
 		focus
 		unfocus
 		scroll
+
+		control    ;; used to pass control key events to a console port
+		control-up ;; only on Windows?
 	]
 	event-keys: [
 		; Event types. Order dependent for C and REBOL.
@@ -533,6 +536,14 @@ view: object [
 		f10
 		f11
 		f12
+		paste-start  ;; Bracketed paste turned on - https://cirw.in/blog/bracketed-paste
+		paste-end    ;; Bracketed paste turned off
+		escape       ;; Escape key
+		shift
+		control
+		alt
+		pause
+		capital	
 	]
 ]
 

src/core/a-lib.c

@@ -1186,6 +1186,20 @@ RL_API void RL_Free_Handle_Context(REBHOB *hob)
 }
 
 
+RL_API REBCNT RL_Decode_UTF8_Char(const REBYTE *str, REBCNT *len)
+/*
+**	Converts a single UTF8 code-point (to 32 bit).
+**
+**	Returns:
+**		32 bit character code
+**	Arguments:
+**		src  - UTF8 encoded data
+**		len  - number of source bytes consumed.
+*/
+{
+	return  Decode_UTF8_Char(&str, len);
+}
+
 
 
 #include "reb-lib-lib.h"

src/core/t-event.c

@@ -265,20 +265,19 @@
 		goto is_none;
 
 	case SYM_KEY:
-		if (VAL_EVENT_TYPE(value) != EVT_KEY && VAL_EVENT_TYPE(value) != EVT_KEY_UP)
-			goto is_none;
-		n = VAL_EVENT_DATA(value); // key-words in top 16, chars in lower 16
-		if (n & 0xffff0000) {
+		n = VAL_EVENT_DATA(value);
+		if (VAL_EVENT_TYPE(value) == EVT_KEY || VAL_EVENT_TYPE(value) == EVT_KEY_UP) {
+			SET_CHAR(val, n);
+			break;
+		}
+		else if (VAL_EVENT_TYPE(value) == EVT_CONTROL || VAL_EVENT_TYPE(value) == EVT_CONTROL_UP) {
 			arg = Get_System(SYS_VIEW, VIEW_EVENT_KEYS);
-			n = (n >> 16) - 1;
-			if (IS_BLOCK(arg) && n < (REBINT)VAL_TAIL(arg)) {
-				*val = *VAL_BLK_SKIP(arg, n);
+			if (IS_BLOCK(arg) && n <= (REBINT)VAL_TAIL(arg)) {
+				*val = *VAL_BLK_SKIP(arg, n-1);
 				break;
 			}
-			goto is_none;
 		}
-		SET_CHAR(val, n);
-		break;
+		goto is_none;
 
 	case SYM_FLAGS:
 		if (VAL_EVENT_FLAGS(value) & (1<<EVF_DOUBLE | 1<<EVF_CONTROL | 1<<EVF_SHIFT)) {

src/mezz/prot-http.reb

@@ -717,7 +717,7 @@ anonymize: func[
 		any [
 			thru LF [
 				  "Authorization:" some SP some uri
-				| ["X-Token:" | "X-Auth-Token:"]
+				| ["X-Token:" | "X-Auth-Token:" | "X-goog-api-key:"]
 			] some SP 0 4 uri change to LF "****"
 			| skip
 		]

src/os/posix/dev-event.c

@@ -42,6 +42,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <errno.h>
+#include <poll.h>
 
 #include "reb-host.h"
 #include "host-lib.h"
@@ -54,7 +55,7 @@ extern REBINT exit_loop;
 REBINT exit_loop = 0;
 #endif
 
-
+extern struct pollfd poller; // currently in dev-stdio.c
 
 void Done_Device(int handle, int error);
 
@@ -110,17 +111,14 @@ void Done_Device(int handle, int error);
 **
 ***********************************************************************/
 {
-	struct timeval tv;
-	int result;
+	poll(&poller, 1, req->length);
 
-	tv.tv_sec = 0;
-	tv.tv_usec = req->length * (exit_loop == 0 ? 1000 : 200); // don't wait so much when gui is used
-	//printf("usec %d\n", tv.tv_usec);
+//	struct timeval tv;
 
-#ifdef REB_VIEW
-	int max_priority;
-	GPollFD poll_fds[10];
-	gint timeout = tv.tv_usec;
+//#ifdef REB_VIEW
+	//int max_priority;
+	//GPollFD poll_fds[10];
+	//gint timeout = tv.tv_usec;
 
 	//if (g_main_context_acquire(GTKCtx)) {
 	//	if (g_main_context_prepare(GTKCtx, &max_priority)) {
@@ -130,22 +128,22 @@ void Done_Device(int handle, int error);
 	//	g_main_context_release(GTKCtx);
 	//	if (result >= 0) return DR_DONE;
 	//}
-#endif	
-
-	result = select(0, 0, 0, 0, &tv);
-	if (result < 0) {
-		//
-		// !!! In R3-Alpha this had a TBD that said "set error code" and had a
-		// printf that said "ERROR!!!!".  However this can happen when a
-		// Ctrl-C interrupts a timer on a WAIT.  As a patch this is tolerant
-		// of EINTR, but still returns the error code.  :-/
-		//
-		if (errno == EINTR)
-			return DR_ERROR;
-
-		printf("select() returned -1 in dev-event.c (I/O error!)\n");
-		return DR_ERROR;
-	}
+//#endif	
+
+//	int result = select(STDIN_FILENO+1, &readfds, 0, 0, &tv);
+//	if (result < 0) {
+//		//
+//		// !!! In R3-Alpha this had a TBD that said "set error code" and had a
+//		// printf that said "ERROR!!!!".  However this can happen when a
+//		// Ctrl-C interrupts a timer on a WAIT.  As a patch this is tolerant
+//		// of EINTR, but still returns the error code.  :-/
+//		//
+//		if (errno == EINTR)
+//			return DR_ERROR;
+//
+//		printf("select() returned -1 in dev-event.c (I/O error!)\n");
+//		return DR_ERROR;
+//	}
 
 	return DR_DONE;
 }