RT R3 A104 Hostkit for Win32

rebolsource · Aug 27, 2010 · 2805f80 · 2805f80
1 parent 7f30242
commit 2805f80
Show file tree

Hide file tree

Showing 26 changed files with 262 additions and 271 deletions.
diff --git a/go.r b/go.r
diff --git a/info.txt b/info.txt
@@ -1,8 +1,8 @@
 REBOL 3 Host-Kit Source Distribution
 From REBOL Technologies in Ukiah, California
 
-    Version: 2.100.103.0.0  (alpha)
-    Updated: 19-Aug-2010/20:35:57-7:00 
+    Version: 2.100.104.0.0  (alpha)
+    Updated: 26-Aug-2010/20:41:49-7:00 
 
 The purpose of the R3 Host-Kit is to provide developers with a method of
 building custom versions of REBOL, including built-in extension modules.

diff --git a/lib/r3lib.dll b/lib/r3lib.dll
diff --git a/lib/r3lib.exp b/lib/r3lib.exp
diff --git a/lib/r3lib.lib b/lib/r3lib.lib
diff --git a/makefile b/makefile
@@ -1,5 +1,5 @@
-#--- REBOL 3.0 Host Makefile - Build A103
-#--- Note: this makefile was generated by make-build.r (20-Aug-2010/3:35:57)
+#--- REBOL 3.0 Host Makefile - Build A104
+#--- Note: this makefile was generated by make-build.r (27-Aug-2010/3:41:49)
 #--- This file intentionally kept simple - to work on all platforms.
 #--- You will need REBOL 2.6 or 2.7 in your work directory or environment path
 
@@ -25,7 +25,8 @@ INCS= \
 	$I/reb-evtypes.h\
 	$I/reb-net.h\
 	$I/reb-filereq.h\
-	$I/reb-gob.h
+	$I/reb-gob.h\
+	$I/reb-lib.h
 
 OBJS= \
 	$O/host-main.o\
@@ -130,13 +131,13 @@ $O/host-main.o:     $S/os/host-main.c $(INCS) $I/reb-host.h $I/host-lib.h $I/reb
 $O/host-args.o:     $S/os/host-args.c $(INCS) $I/reb-config.h $I/reb-c.h $I/reb-args.h
 	$C $(CFLAGS) -fpack-struct -o $O/host-args.o $S/os/host-args.c
 
-$O/host-device.o:   $S/os/host-device.c $(INCS) $I/reb-host.h $I/host-lib.h $I/rebol-lib.h
+$O/host-device.o:   $S/os/host-device.c $(INCS) $I/reb-host.h $I/host-lib.h
 	$C $(CFLAGS) -fpack-struct -o $O/host-device.o $S/os/host-device.c
 
 $O/host-stdio.o:    $S/os/host-stdio.c $(INCS) $I/reb-host.h $I/host-lib.h
 	$C $(CFLAGS) -fpack-struct -o $O/host-stdio.o $S/os/host-stdio.c
 
-$O/host-ext-test.o: $S/os/host-ext-test.c $(INCS) $I/reb-host.h $I/host-lib.h $I/rebol-lib.h
+$O/host-ext-test.o: $S/os/host-ext-test.c $(INCS) $I/reb-host.h $I/host-lib.h
 	$C $(CFLAGS) -fpack-struct -o $O/host-ext-test.o $S/os/host-ext-test.c
 
 $O/dev-net.o:       $S/os/dev-net.c $(INCS) $I/reb-host.h $I/host-lib.h $I/sys-net.h
@@ -163,13 +164,13 @@ $O/dev-event.o:     $S/os/win32/dev-event.c $(INCS) $I/reb-host.h $I/host-lib.h
 $O/dev-clipboard.o: $S/os/win32/dev-clipboard.c $(INCS) $I/reb-host.h $I/host-lib.h $I/sys-net.h
 	$C $(CFLAGS) -fpack-struct -o $O/dev-clipboard.o $S/os/win32/dev-clipboard.c
 
-$O/host-graphics.o: $S/os/win32/host-graphics.c $(INCS) $I/reb-host.h $I/host-lib.h $I/rebol-lib.h $I/agg-draw.h
+$O/host-graphics.o: $S/os/win32/host-graphics.c $(INCS) $I/reb-host.h $I/host-lib.h $I/agg-draw.h
 	$C $(CFLAGS) -fpack-struct -o $O/host-graphics.o $S/os/win32/host-graphics.c
 
-$O/host-event.o:    $S/os/win32/host-event.c $(INCS) $I/reb-host.h $I/host-lib.h $I/rebol-lib.h
+$O/host-event.o:    $S/os/win32/host-event.c $(INCS) $I/reb-host.h $I/host-lib.h
 	$C $(CFLAGS) -fpack-struct -o $O/host-event.o $S/os/win32/host-event.c
 
-$O/host-window.o:   $S/os/win32/host-window.c $(INCS) $I/reb-host.h $I/host-lib.h $I/rebol-lib.h $I/agg-compositor.h
+$O/host-window.o:   $S/os/win32/host-window.c $(INCS) $I/reb-host.h $I/host-lib.h $I/agg-compositor.h
 	$C $(CFLAGS) -fpack-struct -o $O/host-window.o $S/os/win32/host-window.c
 
 

diff --git a/src/agg/agg_compo.cpp b/src/agg/agg_compo.cpp
@@ -6,7 +6,7 @@
 extern "C" void Blit_Rect(REBGOB *gob, REBPAR d, REBPAR dsize, REBYTE *src, REBPAR s, REBPAR ssize);
 //extern "C" void* Rich_Text;
 //extern "C" void* Effects;
-extern "C" void *Reb_Get_Series(REBSER *ser, REBINT what);
+extern "C" void *RL_Get_Series(REBSER *ser, REBINT what);
 
 namespace agg
 {

diff --git a/src/boot/version.r b/src/boot/version.r
@@ -1 +1 @@
-2.100.103.3.1
+2.100.104.3.1
diff --git a/src/include/ext-types.h b/src/include/ext-types.h
@@ -7,8 +7,8 @@
 ************************************************************************
 **
 **  Title: Extension Types (Isolators)
-**  Build: A103
-**  Date:  19-Aug-2010/20:35:22-7:00
+**  Build: A104
+**  Date:  26-Aug-2010/20:40:59-7:00
 **  File:  ext-types.h
 **
 **  AUTO-GENERATED FILE - Do not modify. (From: make-boot.r)

diff --git a/src/include/host-lib.h b/src/include/host-lib.h
@@ -7,16 +7,16 @@
 ************************************************************************
 **
 **  Title: Host Access Library
-**  Build: A103
-**  Date:  19-Aug-2010/20:35:21-7:00
+**  Build: A104
+**  Date:  26-Aug-2010/20:40:59-7:00
 **  File:  host-lib.h
 **
 **  AUTO-GENERATED FILE - Do not modify. (From: make-os-ext.r)
 **
 ***********************************************************************/
 
 
-#define HOST_LIB_VER 103
+#define HOST_LIB_VER 104
 #define HOST_LIB_SUM 5782
 #define HOST_LIB_SIZE 30
 

diff --git a/src/include/reb-config.h b/src/include/reb-config.h
@@ -132,12 +132,16 @@
 #define OS_CRLF FALSE
 #endif
 
+#ifdef REBOL_HOST
+#define REB_LIB
+#endif
+
 #ifdef REBOL_ONLY
-#define REBOL_API				// REBOL stand-alone test version
+#define RL_API
 #else
 #ifdef REBOL_EXPORTS
-#define REBOL_API API_EXPORT	// for REBOL library build
+#define RL_API API_EXPORT	// for REBOL library build
 #else
-#define REBOL_API API_IMPORT	// for host files when DLL used
+#define RL_API API_IMPORT	// for host files when DLL used
 #endif
 #endif // REBOL_ONLY
diff --git a/src/include/reb-event.h b/src/include/reb-event.h
@@ -40,10 +40,11 @@ enum {
 // Event port data model
 
 enum {
-	EVM_PORT,
-	EVM_OBJECT,
-	EVM_GUI,
-	EVM_CALLBACK,
+	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_CALLBACK,	// Callback event uses system/ports/callback port
 };
 
 // Special messages

diff --git a/src/include/reb-evtypes.h b/src/include/reb-evtypes.h
@@ -7,8 +7,8 @@
 ************************************************************************
 **
 **  Title: Event Types
-**  Build: A103
-**  Date:  19-Aug-2010/20:35:22-7:00
+**  Build: A104
+**  Date:  26-Aug-2010/20:41-7:00
 **  File:  reb-evtypes.h
 **
 **  AUTO-GENERATED FILE - Do not modify. (From: make-boot.r)

diff --git a/src/include/reb-ext.h b/src/include/reb-ext.h
@@ -126,6 +126,3 @@ enum {
 	RXC_QUEUED,		// pending in event queue
 	RXC_DONE,		// call completed, structs can be freed
 };
-
-// Include the library interface:
-#include "reb-ext-lib.h"
diff --git a/src/include/reb-gob.h b/src/include/reb-gob.h
@@ -150,9 +150,9 @@ struct rebol_gob {		// size: 64 bytes!
 #define GOB_TAIL(g)		SERIES_TAIL((g)->pane)
 #define GOB_HEAD(g)		((REBGOB **)(SERIES_DATA(GOB_PANE(g))))
 #else
-#define GOB_STRING(g)	((REBYTE *)Reb_Get_Series(GOB_CONTENT(g), 0))
-#define GOB_TAIL(g)		((REBCNT)Reb_Get_Series(GOB_PANE(g), 1))
-#define GOB_HEAD(g)		((REBGOB **)Reb_Get_Series(GOB_PANE(g), 0))
+#define GOB_STRING(g)	((REBYTE *)RL_Get_Series(GOB_CONTENT(g), 0))
+#define GOB_TAIL(g)		((REBCNT)RL_Get_Series(GOB_PANE(g), 1))
+#define GOB_HEAD(g)		((REBGOB **)RL_Get_Series(GOB_PANE(g), 0))
 #endif
 #define GOB_BITMAP(g)	GOB_STRING(g)
 #define GOB_SKIP(g,n)	(GOB_HEAD(g)+n)

diff --git a/src/include/reb-host.h b/src/include/reb-host.h
@@ -25,3 +25,4 @@
 #include "reb-filereq.h"
 
 #include "reb-gob.h"
+#include "reb-lib.h"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,3 +25,4 @@
		#include "reb-filereq.h"

		#include "reb-gob.h"
		#include "reb-lib.h"