CHANGE: moved the event port location from system/view/event-port to system/ports/event

Author: Oldes

src/boot/sysobj.reb

@@ -189,11 +189,12 @@ schemes: object []
 
 ports: object [
 	wait-list: []	; List of ports to add to 'wait
+	system:         ; Port for system events
+	event:          ; Port for GUI
 	input:          ; Port for user input.
 	output:         ; Port for user output
 	echo:           ; Port for echoing output
 	mail:           ; Port for sending and receiving emails
-	system:         ; Port for system events
 	callback: none	; Port for callback events
 ;	serial: none	; serial device name block
 ]
@@ -433,7 +434,6 @@ standard: object [
 view: object [
 	screen-gob: none
 	handler: none
-	event-port: none
 	metrics: construct [
 		screen-size:
 		border-size:

src/core/t-event.c

@@ -218,7 +218,7 @@
 	case SYM_PORT:
 		// Most events are for the GUI:
 		if (IS_EVENT_MODEL(value, EVM_GUI)) {
-			*val = *Get_System(SYS_VIEW, VIEW_EVENT_PORT);
+			*val = *Get_System(SYS_PORTS, PORTS_EVENT);
 		}
 		// Event holds a port:
 		else if (IS_EVENT_MODEL(value, EVM_PORT) || IS_EVENT_MODEL(value, EVM_MIDI)) {
@@ -443,7 +443,7 @@
 		case EF_PORT:
 			// Most events are for the GUI:
 			if (GET_FLAG(VAL_EVENT_FLAGS(value), EVF_NO_REQ))
-				*D_RET = *Get_System(SYS_VIEW, VIEW_EVENT_PORT);
+				*D_RET = *Get_System(SYS_PORTS, PORTS_EVENT);
 			else {
 				req = VAL_EVENT_REQ(value);
 				if (!req || !req->port) goto is_none;

src/include/reb-event.h

@@ -74,7 +74,7 @@ enum {
 	EVM_DEVICE,		// I/O request holds the port pointer
 	EVM_PORT,		// event holds port pointer
 	EVM_OBJECT,		// event holds object frame pointer
-	EVM_GUI,		// GUI event uses system/view/event/port
+	EVM_GUI,		// GUI event uses system/ports/event
 	EVM_CALLBACK,	// Callback event uses system/ports/callback port
 	EVM_MIDI,		// event holds midi port pointer
 	EVM_CONSOLE,    // native console events

src/mezz/sys-ports.reb

@@ -546,6 +546,7 @@ init-schemes: func [
 
 
 	system/ports/system:   open [scheme: 'system]
+	system/ports/event:    open [scheme: 'event]
 	system/ports/input:
 	system/ports/output:   open [scheme: 'console]
 	system/ports/callback: open [scheme: 'callback]

src/mezz/view-funcs.reb

@@ -89,7 +89,7 @@ view: func [
 		]
 		; Set up default handler...
 		if all [
-			empty? system/view/event-port/extra/handlers  ; ...if there is no other handler
+			empty? system/ports/event/extra/handlers  ; ...if there is no other handler
 			not opts/handler                              ; ...and user did not provide one
 		][
 			handle-events [
@@ -189,7 +189,7 @@ handle-events: func [
 	/local sys-hand
 ][
 	handler: make base-handler handler
-	sys-hand: system/view/event-port/extra/handlers
+	sys-hand: system/ports/event/extra/handlers
 	; First check if there is not any handler with such a name...
 	forall sys-hand [
 		if handler/name = sys-hand/1/name [
@@ -214,15 +214,15 @@ unhandle-events: func [
 	"Removes a handler from the view event system."
 	handler [object!]
 ][
-	remove find system/view/event-port/extra/handlers handler
+	remove find system/ports/event/extra/handlers handler
 	exit
 ]
 
 handled-events?: func [
 	"Returns event handler object matching a given name."
 	name
 ][
-	foreach hand system/view/event-port/extra/handlers [
+	foreach hand system/ports/event/extra/handlers [
 		if hand/name = name [return hand]
 	]
 	none
@@ -231,7 +231,7 @@ handled-events?: func [
 do-events: func [
 	"Waits for window events. Returns when all windows are closed."
 ][
-	wait system/view/event-port
+	wait system/ports/event
 ]
 
 init-view-system: func [
@@ -246,28 +246,28 @@ init-view-system: func [
 		set in system/view/metrics w gui-metric w
 	]
 
-	; Already initialized?
-	if system/view/event-port [exit]
+	ep: system/ports/event
 
-	; Open the event port:
-	ep: open [scheme: 'event]
-	system/view/event-port: ep
+	unless ep/extra [
+		; Create block of event handlers:
+		ep/extra: object [handlers: copy []]
 
-	; Create block of event handlers:
-	ep/extra: object [handlers: copy []]
-
-	; Global event handler for view system:
-	ep/awake: func [event /local h] [
-		h: event/port/extra/handlers
-		while [ ; (no binding needed)
-			all [event not tail? h]
-		][
-			; Handlers should return event in order to continue.
-			event: h/1/handler event
-			h: next h
+		; Global event handler for view system:
+		ep/awake: func [event /local h] [
+			h: event/port/extra/handlers
+			while [ ; (no binding needed)
+				all [event not tail? h]
+			][
+				; Handlers should return event in order to continue.
+				event: h/1/handler event
+				h: next h
+			]
+			tail? system/view/screen-gob
 		]
-		tail? system/view/screen-gob
 	]
+
+	init-top-window:
+	init-view-system: 'done
 ]
 
 init-view-system

src/tests/units/event-test.r3

@@ -63,13 +63,13 @@ Rebol [
 		e/type = 'custom
 		e/code = 1
 	]
-	if system/view/event-port [
+	if system/ports/event [
 		; using port in the custom event
 		--assert all [
-			event? e: try [make event! [type: 'custom code: 2 port: system/view/event-port]]
+			event? e: try [make event! [type: 'custom code: 2 port: system/ports/event]]
 			e/type = 'custom
 			e/code = 2
-			e/port = system/view/event-port
+			e/port = system/ports/event
 		]
 	]