frontierkernel-commits — Mailing list for Subversion commit messages.

[frontierkernel-commits] Frontier/Common/source scripts.c,1.3.4.1,1.3.4.2 shellwindow.c,1.3,1.3.4.1

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3189/Common/source

Modified Files:
      Tag: sidewinder-branch
	scripts.c shellwindow.c 
Log Message:
First cut at getting the language selection popup menu of script windows to work on Windows. This version seems to provide the basic functionality, but there are still display glitches. The logic behind the popup turned out to be easy, the problem is to get the popup displayed without disturbing the layout of script windows too much.

Index: scripts.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/scripts.c,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -C2 -d -r1.3.4.1 -r1.3.4.2
*** scripts.c	28 Nov 2004 00:40:48 -0000	1.3.4.1
--- scripts.c	30 Nov 2004 13:04:21 -0000	1.3.4.2
***************
*** 3578,3582 ****
  
  
! #ifdef flcomponent
  
  typedef boolean (*tyscriptvisitcallback) (OSType, bigstring, long);
--- 3578,3582 ----
  
  
! #if defined(flcomponent) || defined(FRONTIER_PYTHON)
  
  typedef boolean (*tyscriptvisitcallback) (OSType, bigstring, long);
***************
*** 3585,3599 ****
  static boolean scriptvisitservers (tyscriptvisitcallback visit, long refcon) {
  	
  	ComponentDescription desc, info;
  	Component comp = nil;
  	Handle hname;
  	bigstring bsname;
! 	
  #ifdef FRONTIER_PYTHON
!     // a naive attempt to inject Python into the list
!     copyctopstring("Python", bsname);
!     (*visit)(typePython, bsname, refcon);
  #endif
  	
  	if (!havecomponentmanager ())
  		return (false);
--- 3585,3616 ----
  static boolean scriptvisitservers (tyscriptvisitcallback visit, long refcon) {
  	
+ #ifdef flcomponent
  	ComponentDescription desc, info;
  	Component comp = nil;
  	Handle hname;
+ #else
+ 	long comp = nil;
+ #endif
  	bigstring bsname;
! 
! #ifndef flcomponent
! 
! 	langgetstringlist (usertalkcomponentstring, bsname);
! 
! 	if (!(*visit)(typeLAND, bsname, refcon))
! 		return (false);
! 
! #endif
! 
  #ifdef FRONTIER_PYTHON
! 
! 	// a naive attempt to inject Python into the list
!     if (!(*visit)(typePython, "\x06" "Python", refcon))
! 		return (false);
! 
  #endif
  	
+ #ifdef flcomponent
+ 
  	if (!havecomponentmanager ())
  		return (false);
***************
*** 3630,3633 ****
--- 3647,3652 ----
  	
  	disposehandle (hname);
+ 
+ #endif
  	
  	return (comp == nil); /*true if all components visited*/
***************
*** 3706,3710 ****
  	} /*scriptfillserverpopup*/
  
! #endif
  
  #define flstacktrace 0
--- 3725,3729 ----
  	} /*scriptfillserverpopup*/
  
! #endif /*flcomponent || FRONTIER_PYTHON*/
  
  #define flstacktrace 0
***************
*** 3856,3861 ****
  		#endif
  		
! 			#ifdef flcomponent
! 				serverarray = (long *) NewPtr (sizeof (long) * 100);
  				
  				if (popupmenuhit (rmsg, flgeneva9, &scriptfillserverpopup, &scriptserverpopupselect)) {
--- 3875,3880 ----
  		#endif
  		
! 			#if defined(flcomponent) || defined(FRONTIER_PYTHON)
! 				serverarray = (long *) malloc (sizeof (long) * 100);
  				
  				if (popupmenuhit (rmsg, flgeneva9, &scriptfillserverpopup, &scriptserverpopupselect)) {
***************
*** 3866,3870 ****
  					}
  				
! 				DisposePtr ((Ptr) serverarray);
  			#endif
  				}
--- 3885,3889 ----
  					}
  				
! 				free ((Ptr) serverarray);
  			#endif
  				}
***************
*** 4041,4045 ****
  	cbd.signature = signature;
  	
! #ifdef flcomponent
  	scriptvisitservers (&scriptfindsubtypevisit, (long) &cbd);
  #endif
--- 4060,4064 ----
  	cbd.signature = signature;
  	
! #if defined(flcomponent) || defined(FRONTIER_PYTHON)
  	scriptvisitservers (&scriptfindsubtypevisit, (long) &cbd);
  #endif
***************
*** 4071,4075 ****
  	*/
  	
! #ifdef flcomponent
  
  	tyfindservercallbackdata cbd;
--- 4090,4094 ----
  	*/
  	
! #if defined(flcomponent) || defined(FRONTIER_PYTHON)
  
  	tyfindservercallbackdata cbd;
***************
*** 4095,4101 ****
  	7.0b26 PBS: update the script language popup on Macs only -- since
  	it doesn't exist on Windows. This was the site of a display glitch on Windows.
  	*/
  
! 	#ifdef MACVERSION
  	
  		scriptupdateserverpopup ();
--- 4114,4122 ----
  	7.0b26 PBS: update the script language popup on Macs only -- since
  	it doesn't exist on Windows. This was the site of a display glitch on Windows.
+ 	
+ 	2004-11-30 aradke: script language popup for Python on Windows
  	*/
  
! 	#if defined(flcomponent) || defined(FRONTIER_PYTHON)
  	
  		scriptupdateserverpopup ();

Index: shellwindow.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellwindow.c,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -d -r1.3 -r1.3.4.1
*** shellwindow.c	1 Nov 2004 11:50:16 -0000	1.3
--- shellwindow.c	30 Nov 2004 13:04:21 -0000	1.3.4.1
***************
*** 775,781 ****
  		r.right -= scrollbarwidth;
  	
! 	if (config.flhorizscroll || config.flmessagearea) /*leave room for horiz scrollbar*/ /*7.0b26 PBS: leave room for msg, even if no scrollbar.*/
  		r.bottom -= scrollbarwidth;
! 	
  	if ((shellglobals.buttonlist != nil) && (!(**h).flhidebuttons)) { /*window type has attached button list*/
  		
--- 775,787 ----
  		r.right -= scrollbarwidth;
  	
! 	if (config.flhorizscroll) /*leave room for horiz scrollbar*/
  		r.bottom -= scrollbarwidth;
! 	else if (config.flmessagearea) /*7.0b26 PBS: leave room for msg, even if no scrollbar.*/
! 		#ifdef WIN95VERSION
! 			r.bottom -= 24; /*scrollbarwidth is always zero on Windows!*/
! 		#else
! 			r.bottom -= scrollbarwidth;
! 		#endif
! 
  	if ((shellglobals.buttonlist != nil) && (!(**h).flhidebuttons)) { /*window type has attached button list*/
  		
***************
*** 810,814 ****
  			//messagewidth = (r.right - r.left); /*7.0b26 PBS: if no horiz scrollbar, message gets entire space.*/
  		
! 		messagerect.top = r.bottom - scrollbarwidth + 1;
  		
  		messagerect.left = r.left - 1;
--- 816,824 ----
  			//messagewidth = (r.right - r.left); /*7.0b26 PBS: if no horiz scrollbar, message gets entire space.*/
  		
! 		#ifdef WIN95VERSION
! 			messagerect.top = r.bottom - 24 + 1; /*scrollbarwidth is always zero on Windows!*/
! 		#else
! 			messagerect.top = r.bottom - scrollbarwidth + 1;
! 		#endif
  		
  		messagerect.left = r.left - 1;

[frontierkernel-commits] Frontier/Common/source wpengine.c,1.4,1.4.4.1

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11649

Modified Files:
      Tag: sidewinder-branch
	wpengine.c 
Log Message:
Merged from trunk: Fixed unbalanced popbackcolor call in wpupdate [bug #1074719] to eliminate a flood of modal dialogs with debug messages.

Index: wpengine.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/wpengine.c,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -d -r1.4 -r1.4.4.1
*** wpengine.c	31 Oct 2004 20:41:10 -0000	1.4
--- wpengine.c	30 Nov 2004 10:58:05 -0000	1.4.4.1
***************
*** 1847,1850 ****
--- 1847,1855 ----
  		#endif
  		
+  		#ifdef gray3Dlook
+  			pushbackcolor (&whitecolor);
+ 
+  			eraserect (rcontent);
+  		#endif
  		
  		if (updatergn == nil)
***************
*** 1861,1865 ****
  		
  		#ifdef gray3Dlook
! 			popbackcolor ();
  		#endif
  		
--- 1866,1870 ----
  		
  		#ifdef gray3Dlook
!  			popbackcolor ();
  		#endif
  		

[frontierkernel-commits] Frontier/Common/source langpython.c,1.2.4.24,1.2.4.25

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9163

Modified Files:
      Tag: sidewinder-branch
	langpython.c 
Log Message:
Fixed a few Visual C++ compiler errors related to variables not being defined at the beginning of a block of code.

Index: langpython.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpython.c,v
retrieving revision 1.2.4.24
retrieving revision 1.2.4.25
diff -C2 -d -r1.2.4.24 -r1.2.4.25
*** langpython.c	29 Nov 2004 07:04:15 -0000	1.2.4.24
--- langpython.c	30 Nov 2004 10:48:05 -0000	1.2.4.25
***************
*** 1544,1550 ****
  newTableObject(hdlhashtable hdl) {
      PyObject *class;
!     
      class = PyObject_GetAttrString(frontierModule, "Table");
!     frontier_TableObject *obj = PyObject_New(frontier_TableObject, (PyTypeObject *)class);
      obj->table = hdl;
      
--- 1544,1551 ----
  newTableObject(hdlhashtable hdl) {
      PyObject *class;
!     frontier_TableObject *obj;
! 
      class = PyObject_GetAttrString(frontierModule, "Table");
!     obj = PyObject_New(frontier_TableObject, (PyTypeObject *)class);
      obj->table = hdl;
      
***************
*** 1555,1561 ****
  newOutlineObject() {
      PyObject *class;
!     
      class = PyObject_GetAttrString(frontierModule, "Outline");
!     frontier_OutlineObject *obj = PyObject_New(frontier_OutlineObject, (PyTypeObject *)class);
      
      return (PyObject *)obj;
--- 1556,1563 ----
  newOutlineObject() {
      PyObject *class;
!     frontier_OutlineObject *obj;
! 
      class = PyObject_GetAttrString(frontierModule, "Outline");
!     obj = PyObject_New(frontier_OutlineObject, (PyTypeObject *)class);
      
      return (PyObject *)obj;
***************
*** 1565,1571 ****
  newWPTextObject() {
      PyObject *class;
!     
      class = PyObject_GetAttrString(frontierModule, "WPText");
!     frontier_WPTextObject *obj = PyObject_New(frontier_WPTextObject, (PyTypeObject *)class);
      
      return (PyObject *)obj;
--- 1567,1574 ----
  newWPTextObject() {
      PyObject *class;
!     frontier_WPTextObject *obj;
! 
      class = PyObject_GetAttrString(frontierModule, "WPText");
!     obj = PyObject_New(frontier_WPTextObject, (PyTypeObject *)class);
      
      return (PyObject *)obj;
***************
*** 1575,1581 ****
  newScriptObject() {
      PyObject *class;
!     
      class = PyObject_GetAttrString(frontierModule, "Script");
!     frontier_ScriptObject *obj = PyObject_New(frontier_ScriptObject, (PyTypeObject *)class);
      
      return (PyObject *)obj;
--- 1578,1585 ----
  newScriptObject() {
      PyObject *class;
!     frontier_ScriptObject *obj;
! 
      class = PyObject_GetAttrString(frontierModule, "Script");
!     obj = PyObject_New(frontier_ScriptObject, (PyTypeObject *)class);
      
      return (PyObject *)obj;
***************
*** 1585,1591 ****
  newInternalValueObject(tyvaluetype vt) {
      PyObject *class;
!     
      class = PyObject_GetAttrString(frontierModule, "InternalValue");
!     frontier_InternalValue *obj = PyObject_New(frontier_InternalValue, (PyTypeObject *)class);
      obj->vartype = vt;
      
--- 1589,1596 ----
  newInternalValueObject(tyvaluetype vt) {
      PyObject *class;
!     frontier_InternalValue *obj;
! 
      class = PyObject_GetAttrString(frontierModule, "InternalValue");
!     obj = PyObject_New(frontier_InternalValue, (PyTypeObject *)class);
      obj->vartype = vt;
      
***************
*** 1596,1602 ****
  newExternalValueObject(tyexternalid ei) {
      PyObject *class;
!     
      class = PyObject_GetAttrString(frontierModule, "ExternalValue");
!     frontier_ExternalValue *obj = PyObject_New(frontier_ExternalValue, (PyTypeObject *)class);
      obj->extvartype = ei;
      
--- 1601,1608 ----
  newExternalValueObject(tyexternalid ei) {
      PyObject *class;
!     frontier_ExternalValue *obj;
! 
      class = PyObject_GetAttrString(frontierModule, "ExternalValue");
!     obj = PyObject_New(frontier_ExternalValue, (PyTypeObject *)class);
      obj->extvartype = ei;
      
***************
*** 1726,1730 ****
  convertreturns(Handle htext) {
      int len = gethandlesize(htext);
!     for (int i = 0; i < len; i++)
          if ((*htext)[i] == '\r')
              (*htext)[i] = '\n';
--- 1732,1737 ----
  convertreturns(Handle htext) {
      int len = gethandlesize(htext);
!     int i;
! 	for (i = 0; i < len; i++)
          if ((*htext)[i] == '\r')
              (*htext)[i] = '\n';

[frontierkernel-commits] Frontier/Common/source shell.c,1.7,1.8

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30493

Modified Files:
	shell.c 
Log Message:
Call dllinitverbs on all platforms, not just on the Mac.

Index: shell.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shell.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shell.c	29 Nov 2004 07:16:42 -0000	1.7
--- shell.c	29 Nov 2004 07:34:10 -0000	1.8
***************
*** 1321,1328 ****
  	quicktimeinitverbs ();
  	
- 	dllinitverbs (); /*2004-11-29 aradke: langdll.c*/
- 	
  #endif
  	
  	if (keyboardescape ()) /*check again before landinit; after this, must do shellquit*/
  		exittooperatingsystem ();
--- 1321,1328 ----
  	quicktimeinitverbs ();
  	
  #endif
  	
+ 	dllinitverbs (); /*2004-11-29 aradke: langdll.c*/
+ 	
  	if (keyboardescape ()) /*check again before landinit; after this, must do shellquit*/
  		exittooperatingsystem ();

[frontierkernel-commits] Frontier/Common/source langdll.c,1.3,1.4 langverbs.c,1.6,1.7 shell.c,1.6,1.7

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27448/Common/source

Modified Files:
	langdll.c langverbs.c shell.c 
Log Message:
Implemented the DLL interface in the Carbon/Mach-O build to be backwards compatible with existing Carbon/CFM shared libraries.

Index: shell.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shell.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shell.c	22 Nov 2004 04:43:56 -0000	1.6
--- shell.c	29 Nov 2004 07:16:42 -0000	1.7
***************
*** 77,80 ****
--- 77,81 ----
  #include "services.h"
  #include "WinSockNetEvents.h"
+ #include "langdll.h" /*2004-11-29 aradke: for dllinitverbs*/
  
  #ifdef flcomponent
***************
*** 1320,1323 ****
--- 1321,1326 ----
  	quicktimeinitverbs ();
  	
+ 	dllinitverbs (); /*2004-11-29 aradke: langdll.c*/
+ 	
  #endif
  	

Index: langverbs.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langverbs.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** langverbs.c	22 Nov 2004 03:52:56 -0000	1.6
--- langverbs.c	29 Nov 2004 07:16:41 -0000	1.7
***************
*** 3142,3151 ****
  			return (callscriptverb (hparam1, v));
  
- 	#if defined(WIN95VERSION) || (defined(MACVERSION) && !TARGET_RT_MAC_MACHO)
- 		/*
- 		2004-11-09 aradke: calling DLLs through the Code Fragment Manager (CFM)
- 		doesn't work yet on Carbon/Mach-O. throw an error instead of crashing.
- 		*/
- 		
  		case dllcallfunc:
  		case calldllfunc:		/* this is remaining for historical usage per Dave. rab: 5.0b4 1/6/98 */
--- 3142,3145 ----
***************
*** 3160,3165 ****
  		case dllisloadedfunc:
  			return (dllisloadedverb (hparam1, v));
! 	#endif
! 	
  		case packwindowfunc:
  			return (langpackwindowverb (hparam1, v));
--- 3154,3158 ----
  		case dllisloadedfunc:
  			return (dllisloadedverb (hparam1, v));
! 
  		case packwindowfunc:
  			return (langpackwindowverb (hparam1, v));

Index: langdll.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langdll.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** langdll.c	30 Oct 2004 23:15:04 -0000	1.3
--- langdll.c	29 Nov 2004 07:16:41 -0000	1.4
***************
*** 68,71 ****
--- 68,74 ----
  #include "langdll.h"
  
+ #if defined(MACVERSION) && TARGET_RT_MAC_MACHO
+ #include "CallMachOFramework.h"
+ #endif
  
  #define NEW_DLL_INTERFACE 1 /* 2002-11-03 AR: defined to enable new DLL interface */
***************
*** 136,185 ****
  	
  	static tydllinfohandle loadeddlls; /* linked list of currently loaded stay-resident DLLs */
- /*
- 	static const XDLLProcTable dllcallbacks = { /+ we create a copy of this struct on the stack for every call +/
- 		extfrontierAlloc,
- 		extfrontierReAlloc,
- 		extfrontierLock,
- 		extfrontierUnlock,
- 		extfrontierFree,
- 		extfrontierSize,
- 
- 		extOdbGetCurrentRoot,
- 		extOdbNewFile,
- 		extOdbOpenFile,
- 		extOdbSaveFile,
- 		extOdbCloseFile,
- 		extOdbDefined,
- 		extOdbDelete,
- 		extOdbGetType,
- 		extOdbCountItems,
- 		extOdbGetNthItem,
- 		extOdbGetValue,
- 		extOdbSetValue,
- 		extOdbNewTable,
- 		extOdbGetModDate,
- 		extOdbDisposeValue,
- 		extOdbGetError,
- 
- 		extDoScript,
- 		extDoScriptText,
- 
- 		extOdbNewListValue,
- 		extOdbGetListCount,
- 		extOdbDeleteListValue,
- 		extOdbSetListValue,
- 		extOdbGetListValue,
- 		extOdbAddListValue,
  
! 		extInvoke,
! 		extCoerce,
  
- 		extCallScript,
- 		extCallScriptText,
- 		
- 		extThreadYield,
- 		extThreadSleep
- 		};
- */
  #else
  
--- 139,145 ----
  	
  	static tydllinfohandle loadeddlls; /* linked list of currently loaded stay-resident DLLs */
  
! 	static XDLLProcTable *dllcallbacks; /* global pointer to array of callback functions */
  
  #else
  
***************
*** 1074,1077 ****
--- 1034,1041 ----
  		
  			hnext = (**h).hashlink;
+ 			
+ 			#if defined(MACVERSION) && TARGET_RT_MAC_MACHO
+ 				disposemachofuncptr ((void *) (**h).procaddress);	
+ 			#endif
  
  			disposehandle ((Handle) h);
***************
*** 1723,1726 ****
--- 1687,1694 ----
  				(**hprocinfo).moduleUPP = (UniversalProcPtr) &(**hprocinfo).moduledesc;
  				}
+ 		#elif TARGET_RT_MAC_MACHO
+ 			if (err == noErr) {
+ 				(**hprocinfo).procaddress = convertcfmtomachofuncptr ((**hprocinfo).procaddress);
+ 				}
  		#endif
  	#endif
***************
*** 1744,1752 ****
  	*/
  	
- 	XDLLProcTable calltable;
  	boolean fl = false;
  
- 	fillcalltable (&calltable);
- 
  	lockhandle ((Handle) hprocinfo); /* just to be sure our data doesn't move around */
  
--- 1712,1717 ----
***************
*** 1770,1779 ****
  	#if MACVERSION && !TARGET_API_MAC_CARBON
  		#if GENERATINGCFM
! 			fl = CallUniversalProc ((**hprocinfo).moduleUPP, uppdllcallProcInfo, params, &calltable);
  		#else
! 			fl = (*(tyDLLEXTROUTINE) ((**hprocinfo).moduleUPP)) (params, &calltable);
  		#endif
  	#else
! 		fl = (*(**hprocinfo).procaddress) (params, &calltable);
  	#endif
  	
--- 1735,1744 ----
  	#if MACVERSION && !TARGET_API_MAC_CARBON
  		#if GENERATINGCFM
! 			fl = CallUniversalProc ((**hprocinfo).moduleUPP, uppdllcallProcInfo, params, dllcallbacks);
  		#else
! 			fl = (*(tyDLLEXTROUTINE) ((**hprocinfo).moduleUPP)) (params, dllcallbacks);
  		#endif
  	#else
! 		fl = (*(**hprocinfo).procaddress) (params, dllcallbacks);
  	#endif
  	
***************
*** 1913,1916 ****
--- 1878,1885 ----
  	/* Dispose proc info here because we didn't ask for the hash table to be built */
  	
+ #if defined(MACVERSION) && TARGET_RT_MAC_MACHO
+ 	disposemachofuncptr ((void*) (**hprocinfo).procaddress);
+ #endif
+ 	
  	disposehandle ((Handle) hprocinfo);
  
***************
*** 2375,2394 ****
  	call the dll. 
  	*/
- 	XDLLProcTable calltable;
  	boolean fl = false;
  
- 	/*Need to initialize the callback table*/
- 	fillcalltable (&calltable);
- //#endif
- 
- 	
- 	// dllcall.frontiercallback = ???
- 
- 	//
- 
  	releasethreadglobals ();
  
  	#ifdef WIN95VERSION
! 		fl = (*(dllinfo->procAddress)) (dllcall, &calltable);
  	#endif
  
--- 2344,2353 ----
  	call the dll. 
  	*/
  	boolean fl = false;
  
  	releasethreadglobals ();
  
  	#ifdef WIN95VERSION
! 		fl = (*(dllinfo->procAddress)) (dllcall, dllcallbacks);
  	#endif
  
***************
*** 2397,2407 ****
  			//Code change by Timothy Paustian Friday, June 16, 2000 1:13:28 PM
  			//Changed to Opaque call for Carbon - we don't need UPPs in Carbon.
! 			//fl = (*(tyDLLEXTROUTINE) (dllinfo->moduleUPP)) (dllcall, &calltable); // call it
! 			fl = (*(dllinfo->procAddress)) (dllcall, &calltable); // call it
  		#else
  			#if GENERATINGCFM
! 				fl = CallUniversalProc (dllinfo->moduleUPP, uppdllcallProcInfo, dllcall, &calltable);
  			#else
! 				fl = (*(tyDLLEXTROUTINE) (dllinfo->moduleUPP)) (dllcall, &calltable); // call it
  			#endif
  		#endif
--- 2356,2366 ----
  			//Code change by Timothy Paustian Friday, June 16, 2000 1:13:28 PM
  			//Changed to Opaque call for Carbon - we don't need UPPs in Carbon.
! 			//fl = (*(tyDLLEXTROUTINE) (dllinfo->moduleUPP)) (dllcall, dllcallbacks); // call it
! 			fl = (*(dllinfo->procAddress)) (dllcall, dllcallbacks); // call it
  		#else
  			#if GENERATINGCFM
! 				fl = CallUniversalProc (dllinfo->moduleUPP, uppdllcallProcInfo, dllcall, dllcallbacks);
  			#else
! 				fl = (*(tyDLLEXTROUTINE) (dllinfo->moduleUPP)) (dllcall, dllcallbacks); // call it
  			#endif
  		#endif
***************
*** 2415,2485 ****
  	} /*langcalldll*/
  
- 
  #endif /* NEW_DLL_INTERFACE */
  
- 	
- void fillcalltable (XDLLProcTable * calltable) {
  
! 	/*
! 	2003-06-16 AR: We got some crash reports on Mac OS Classic
! 	implicating the new DLL interface where the stdlogs did not
! 	include a proper stack backtrace. Therefore, let's abandon
! 	the idea of using a global dllcallbacks table and switch
! 	back to building it on the fly for every call.
! 	*/
  
! /*
! #ifdef NEW_DLL_INTERFACE
  
! 	*calltable = dllcallbacks;
! 	
! #else
! */
! 	calltable->xMemAlloc = extfrontierAlloc;
! 	calltable->xMemResize = extfrontierReAlloc;
! 	calltable->xMemLock = extfrontierLock;
! 	calltable->xMemUnlock = extfrontierUnlock;
! 	calltable->xMemFree = extfrontierFree;
! 	calltable->xMemGetSize = extfrontierSize;
  
! 	calltable->xOdbGetCurrentRoot = extOdbGetCurrentRoot;
! 	calltable->xOdbNewFile = extOdbNewFile;
! 	calltable->xOdbOpenFile = extOdbOpenFile;
! 	calltable->xOdbSaveFile = extOdbSaveFile;
! 	calltable->xOdbCloseFile = extOdbCloseFile;
! 	calltable->xOdbDefined = extOdbDefined;
! 	calltable->xOdbDelete = extOdbDelete;
! 	calltable->xOdbGetType = extOdbGetType;
! 	calltable->xOdbCountItems = extOdbCountItems;
! 	calltable->xOdbGetNthItem = extOdbGetNthItem;
! 	calltable->xOdbGetValue = extOdbGetValue;
! 	calltable->xOdbSetValue = extOdbSetValue;
! 	calltable->xOdbNewTable = extOdbNewTable;
! 	calltable->xOdbGetModDate = extOdbGetModDate;
! 	calltable->xOdbDisposeValue = extOdbDisposeValue;
! 	calltable->xOdbGetError = extOdbGetError;
  
! 	calltable->xDoScript = extDoScript;
! 	calltable->xDoScriptText = extDoScriptText;
  
! 	calltable->xOdbNewListValue = extOdbNewListValue;
! 	calltable->xOdbGetListCount = extOdbGetListCount;
! 	calltable->xOdbDeleteListValue = extOdbDeleteListValue;
! 	calltable->xOdbSetListValue = extOdbSetListValue;
! 	calltable->xOdbGetListValue = extOdbGetListValue;
! 	calltable->xOdbAddListValue = extOdbAddListValue;
  
! 	calltable->xInvoke = extInvoke;
! 	calltable->xCoerce = extCoerce;
! 	
! 	calltable->xCallScript = extCallScript;
! 	calltable->xCallScriptText = extCallScriptText;
  	
! 	calltable->xThreadYield = extThreadYield;
! 	calltable->xThreadSleep = extThreadSleep;
! /*
  #endif
- */
- 	} /*fillcalltable*/
  
  
--- 2374,2531 ----
  	} /*langcalldll*/
  
  #endif /* NEW_DLL_INTERFACE */
  
  
! void fillcalltable (XDLLProcTable *pt) {
  
! 	#if defined(MACVERSION) && TARGET_RT_MAC_MACHO
  
! 		pt->xMemAlloc = convertmachotocfmfuncptr (&extfrontierAlloc);
! 		pt->xMemResize = convertmachotocfmfuncptr (&extfrontierReAlloc);
! 		pt->xMemLock = convertmachotocfmfuncptr (&extfrontierLock);
! 		pt->xMemUnlock = convertmachotocfmfuncptr (&extfrontierUnlock);
! 		pt->xMemFree = convertmachotocfmfuncptr (&extfrontierFree);
! 		pt->xMemGetSize = convertmachotocfmfuncptr (&extfrontierSize);
  
! 		pt->xOdbGetCurrentRoot = convertmachotocfmfuncptr (&extOdbGetCurrentRoot);
! 		pt->xOdbNewFile = convertmachotocfmfuncptr (&extOdbNewFile);
! 		pt->xOdbOpenFile = convertmachotocfmfuncptr (&extOdbOpenFile);
! 		pt->xOdbSaveFile = convertmachotocfmfuncptr (&extOdbSaveFile);
! 		pt->xOdbCloseFile = convertmachotocfmfuncptr (&extOdbCloseFile);
! 		pt->xOdbDefined = convertmachotocfmfuncptr (&extOdbDefined);
! 		pt->xOdbDelete = convertmachotocfmfuncptr (&extOdbDelete);
! 		pt->xOdbGetType = convertmachotocfmfuncptr (&extOdbGetType);
! 		pt->xOdbCountItems = convertmachotocfmfuncptr (&extOdbCountItems);
! 		pt->xOdbGetNthItem = convertmachotocfmfuncptr (&extOdbGetNthItem);
! 		pt->xOdbGetValue = convertmachotocfmfuncptr (&extOdbGetValue);
! 		pt->xOdbSetValue = convertmachotocfmfuncptr (&extOdbSetValue);
! 		pt->xOdbNewTable = convertmachotocfmfuncptr (&extOdbNewTable);
! 		pt->xOdbGetModDate = convertmachotocfmfuncptr (&extOdbGetModDate);
! 		pt->xOdbDisposeValue = convertmachotocfmfuncptr (&extOdbDisposeValue);
! 		pt->xOdbGetError = convertmachotocfmfuncptr (&extOdbGetError);
  
! 		pt->xDoScript = convertmachotocfmfuncptr (&extDoScript);
! 		pt->xDoScriptText = convertmachotocfmfuncptr (&extDoScriptText);
  
! 		pt->xOdbNewListValue = convertmachotocfmfuncptr (&extOdbNewListValue);
! 		pt->xOdbGetListCount = convertmachotocfmfuncptr (&extOdbGetListCount);
! 		pt->xOdbDeleteListValue = convertmachotocfmfuncptr (&extOdbDeleteListValue);
! 		pt->xOdbSetListValue = convertmachotocfmfuncptr (&extOdbSetListValue);
! 		pt->xOdbGetListValue = convertmachotocfmfuncptr (&extOdbGetListValue);
! 		pt->xOdbAddListValue = convertmachotocfmfuncptr (&extOdbAddListValue);
  
! 		pt->xInvoke = convertmachotocfmfuncptr (&extInvoke);
! 		pt->xCoerce = convertmachotocfmfuncptr (&extCoerce);
! 		
! 		pt->xCallScript = convertmachotocfmfuncptr (&extCallScript);
! 		pt->xCallScriptText = convertmachotocfmfuncptr (&extCallScriptText);
! 		
! 		pt->xThreadYield = convertmachotocfmfuncptr (&extThreadYield);
! 		pt->xThreadSleep = convertmachotocfmfuncptr (&extThreadSleep);
! 
! 	#else
! 
! 		pt->xMemAlloc = &extfrontierAlloc;
! 		pt->xMemResize = &extfrontierReAlloc;
! 		pt->xMemLock = &extfrontierLock;
! 		pt->xMemUnlock = &extfrontierUnlock;
! 		pt->xMemFree = &extfrontierFree;
! 		pt->xMemGetSize = &extfrontierSize;
! 
! 		pt->xOdbGetCurrentRoot = &extOdbGetCurrentRoot;
! 		pt->xOdbNewFile = &extOdbNewFile;
! 		pt->xOdbOpenFile = &extOdbOpenFile;
! 		pt->xOdbSaveFile = &extOdbSaveFile;
! 		pt->xOdbCloseFile = &extOdbCloseFile;
! 		pt->xOdbDefined = &extOdbDefined;
! 		pt->xOdbDelete = &extOdbDelete;
! 		pt->xOdbGetType = &extOdbGetType;
! 		pt->xOdbCountItems = &extOdbCountItems;
! 		pt->xOdbGetNthItem = &extOdbGetNthItem;
! 		pt->xOdbGetValue = &extOdbGetValue;
! 		pt->xOdbSetValue = &extOdbSetValue;
! 		pt->xOdbNewTable = &extOdbNewTable;
! 		pt->xOdbGetModDate = &extOdbGetModDate;
! 		pt->xOdbDisposeValue = &extOdbDisposeValue;
! 		pt->xOdbGetError = &extOdbGetError;
! 
! 		pt->xDoScript = &extDoScript;
! 		pt->xDoScriptText = &extDoScriptText;
! 
! 		pt->xOdbNewListValue = &extOdbNewListValue;
! 		pt->xOdbGetListCount = &extOdbGetListCount;
! 		pt->xOdbDeleteListValue = &extOdbDeleteListValue;
! 		pt->xOdbSetListValue = &extOdbSetListValue;
! 		pt->xOdbGetListValue = &extOdbGetListValue;
! 		pt->xOdbAddListValue = &extOdbAddListValue;
! 
! 		pt->xInvoke = &extInvoke;
! 		pt->xCoerce = &extCoerce;
! 		
! 		pt->xCallScript = &extCallScript;
! 		pt->xCallScriptText = &extCallScriptText;
! 		
! 		pt->xThreadYield = &extThreadYield;
! 		pt->xThreadSleep = &extThreadSleep;
! 
! 	#endif
! 
! 	} /*fillcalltable*/
! 
! 
! #if 0
! 
! void smashcalltable (XDLLProcTable *pt) {
! 
! 	#if defined(MACVERSION) && TARGET_RT_MAC_MACHO
! 
! 		disposecfmfuncptr (pt->xMemAlloc);
! 		disposecfmfuncptr (pt->xMemResize);
! 		disposecfmfuncptr (pt->xMemLock);
! 		disposecfmfuncptr (pt->xMemUnlock);
! 		disposecfmfuncptr (pt->xMemFree);
! 		disposecfmfuncptr (pt->xMemGetSize);
! 
! 		disposecfmfuncptr (pt->xOdbGetCurrentRoot);
! 		disposecfmfuncptr (pt->xOdbNewFile);
! 		disposecfmfuncptr (pt->xOdbOpenFile);
! 		disposecfmfuncptr (pt->xOdbSaveFile);
! 		disposecfmfuncptr (pt->xOdbCloseFile);
! 		disposecfmfuncptr (pt->xOdbDefined);
! 		disposecfmfuncptr (pt->xOdbDelete);
! 		disposecfmfuncptr (pt->xOdbGetType);
! 		disposecfmfuncptr (pt->xOdbCountItems);
! 		disposecfmfuncptr (pt->xOdbGetNthItem);
! 		disposecfmfuncptr (pt->xOdbGetValue);
! 		disposecfmfuncptr (pt->xOdbSetValue);
! 		disposecfmfuncptr (pt->xOdbNewTable);
! 		disposecfmfuncptr (pt->xOdbGetModDate);
! 		disposecfmfuncptr (pt->xOdbDisposeValue);
! 		disposecfmfuncptr (pt->xOdbGetError);
! 
! 		disposecfmfuncptr (pt->xDoScript);
! 		disposecfmfuncptr (pt->xDoScriptText);
! 
! 		disposecfmfuncptr (pt->xOdbNewListValue);
! 		disposecfmfuncptr (pt->xOdbGetListCount);
! 		disposecfmfuncptr (pt->xOdbDeleteListValue);
! 		disposecfmfuncptr (pt->xOdbSetListValue);
! 		disposecfmfuncptr (pt->xOdbGetListValue);
! 		disposecfmfuncptr (pt->xOdbAddListValue);
! 
! 		disposecfmfuncptr (pt->xInvoke);
! 		disposecfmfuncptr (pt->xCoerce);
! 		
! 		disposecfmfuncptr (pt->xCallScript);
! 		disposecfmfuncptr (pt->xCallScriptText);
! 		
! 		disposecfmfuncptr (pt->xThreadYield);
! 		disposecfmfuncptr (pt->xThreadSleep);
! 
! 	#endif
  	
! 	} /*smashcalltable*/
! 
  #endif
  
  
***************
*** 2738,2739 ****
--- 2784,2796 ----
  	} /*calldllverb*/
  
+ 
+ void dllinitverbs (void) {
+ 	
+ 	if (dllcallbacks == nil) {
+ 
+ 		dllcallbacks = (XDLLProcTable *) malloc (sizeof (XDLLProcTable));
+ 		
+ 		if (dllcallbacks != nil)
+ 			fillcalltable (dllcallbacks);
+ 		}
+ 	} /*initdllverbs*/

[frontierkernel-commits] Frontier/Common/headers langdll.h,1.1,1.2

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27448/Common/headers

Modified Files:
	langdll.h 
Log Message:
Implemented the DLL interface in the Carbon/Mach-O build to be backwards compatible with existing Carbon/CFM shared libraries.

Index: langdll.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/langdll.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** langdll.h	9 Oct 2004 20:57:10 -0000	1.1
--- langdll.h	29 Nov 2004 07:16:36 -0000	1.2
***************
*** 75,79 ****
  odbBool xCALLBACK extThreadSleep (long sleepticks); /* 2003-04-22 AR */
  
! extern void fillcalltable (XDLLProcTable * calltable);
  
  extern boolean dllisloadedverb (hdltreenode hparam1, tyvaluerecord *vreturned);
--- 75,81 ----
  odbBool xCALLBACK extThreadSleep (long sleepticks); /* 2003-04-22 AR */
  
! extern void dllinitverbs (void); /*2004-11-29 aradke*/
! 
! extern void fillcalltable (XDLLProcTable *);
  
  extern boolean dllisloadedverb (hdltreenode hparam1, tyvaluerecord *vreturned);

[frontierkernel-commits] Frontier/Common/source langpython.c,1.2.4.23,1.2.4.24

[David B. <dav...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24783

Modified Files:
      Tag: sidewinder-branch
	langpython.c 
Log Message:
minor cleanup, turned profiling code back on

Index: langpython.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpython.c,v
retrieving revision 1.2.4.23
retrieving revision 1.2.4.24
diff -C2 -d -r1.2.4.23 -r1.2.4.24
*** langpython.c	29 Nov 2004 05:45:32 -0000	1.2.4.23
--- langpython.c	29 Nov 2004 07:04:15 -0000	1.2.4.24
***************
*** 550,554 ****
  static PyObject *frontierModule = NULL;
  
- //static PyThreadState *saveState;
  static boolean locked = true;
  static int lockCount = 0;
--- 550,553 ----
***************
*** 562,566 ****
      
      locked = true;
-     //PyEval_RestoreThread(saveState);
      PyEval_AcquireLock();
  }
--- 561,564 ----
***************
*** 574,578 ****
      if (lockCount == 0) {
          locked = false;
-         //saveState = PyEval_SaveThread();
          PyEval_ReleaseLock();
      }
--- 572,575 ----
***************
*** 1653,1658 ****
  static int
  checkstatus(PyObject *o, PyFrameObject *frame, int what, PyObject *arg) {
!     //printf("tick\n");
!     langbackgroundtask(false);
      return 0;
  }
--- 1650,1654 ----
  static int
  checkstatus(PyObject *o, PyFrameObject *frame, int what, PyObject *arg) {
!     //langbackgroundtask(false);
      return 0;
  }
***************
*** 1674,1678 ****
          currentCookie = time(NULL);
  
!         //PyEval_SetProfile(checkstatus, NULL);
              
          releasepythonlock();
--- 1670,1674 ----
          currentCookie = time(NULL);
  
!         PyEval_SetProfile(checkstatus, NULL);
              
          releasepythonlock();

[frontierkernel-commits] Frontier/Common/source langpython.c,1.2.4.22,1.2.4.23

[David B. <dav...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8994

Modified Files:
      Tag: sidewinder-branch
	langpython.c 
Log Message:
fixed table code regression -- if you're going to mess with the global interpreter lock in Python, make sure you do it correctly

Index: langpython.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpython.c,v
retrieving revision 1.2.4.22
retrieving revision 1.2.4.23
diff -C2 -d -r1.2.4.22 -r1.2.4.23
*** langpython.c	28 Nov 2004 21:34:30 -0000	1.2.4.22
--- langpython.c	29 Nov 2004 05:45:32 -0000	1.2.4.23
***************
*** 227,230 ****
--- 227,233 ----
      PyThreadState * (*ptr_PyEval_SaveThread) (void);
      void        (*ptr_PyEval_SetProfile) (Py_tracefunc, PyObject *);
+     void        (*ptr_PyEval_InitThreads) (void);
+     void        (*ptr_PyEval_AcquireLock) (void);
+     void        (*ptr_PyEval_ReleaseLock) (void);
  
  } py;
***************
*** 331,334 ****
--- 334,340 ----
  #define PyEval_RestoreThread        (*py.ptr_PyEval_RestoreThread)
  #define PyEval_SetProfile           (*py.ptr_PyEval_SetProfile)
+ #define PyEval_InitThreads          (*py.ptr_PyEval_InitThreads)
+ #define PyEval_AcquireLock          (*py.ptr_PyEval_AcquireLock)
+ #define PyEval_ReleaseLock          (*py.ptr_PyEval_ReleaseLock)
  
  static boolean importsymbol (typythonlib hm, char *symbol, void **ptraddress) {
***************
*** 471,474 ****
--- 477,483 ----
      fl = fl && IMPORTSYMBOL (hm, PyEval_RestoreThread);
      fl = fl && IMPORTSYMBOL (hm, PyEval_SetProfile);
+     fl = fl && IMPORTSYMBOL (hm, PyEval_InitThreads);
+     fl = fl && IMPORTSYMBOL (hm, PyEval_AcquireLock);
+     fl = fl && IMPORTSYMBOL (hm, PyEval_ReleaseLock);
      
  	if (fl) {
***************
*** 541,554 ****
  static PyObject *frontierModule = NULL;
  
! PyThreadState *_save;
  
  static void
  getpythonlock() {
!     PyEval_RestoreThread(_save);
  }
  
  static void
  releasepythonlock() {
!     _save = PyEval_SaveThread();
  }
  
--- 550,580 ----
  static PyObject *frontierModule = NULL;
  
! //static PyThreadState *saveState;
! static boolean locked = true;
! static int lockCount = 0;
  
  static void
  getpythonlock() {
!     lockCount++;
! 
!     if (locked)
!         return;
!     
!     locked = true;
!     //PyEval_RestoreThread(saveState);
!     PyEval_AcquireLock();
  }
  
  static void
  releasepythonlock() {
!     if (lockCount == 0)
!         return;
!             
!     lockCount--;
!     if (lockCount == 0) {
!         locked = false;
!         //saveState = PyEval_SaveThread();
!         PyEval_ReleaseLock();
!     }
  }
  
***************
*** 1628,1631 ****
--- 1654,1658 ----
  checkstatus(PyObject *o, PyFrameObject *frame, int what, PyObject *arg) {
      //printf("tick\n");
+     langbackgroundtask(false);
      return 0;
  }
***************
*** 1637,1640 ****
--- 1664,1668 ----
      if (!Py_IsInitialized()) {
          Py_Initialize();
+         PyEval_InitThreads();
          initGlobals();
          
***************
*** 1646,1650 ****
          currentCookie = time(NULL);
  
!         PyEval_SetProfile(checkstatus, NULL);
              
          releasepythonlock();
--- 1674,1678 ----
          currentCookie = time(NULL);
  
!         //PyEval_SetProfile(checkstatus, NULL);
              
          releasepythonlock();

[frontierkernel-commits] Frontier/Common/headers CallMachOFrameWork.h,1.3,1.4

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11682/Common/headers

Modified Files:
	CallMachOFrameWork.h 
Log Message:
Added functions for converting between Mach-O and CFM function pointers and vice versa, to be used to make the Mach-O build compatible with Frontier DLLs that are CFM shared libraries.

Index: CallMachOFrameWork.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/CallMachOFrameWork.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CallMachOFrameWork.h	31 Oct 2004 20:41:23 -0000	1.3
--- CallMachOFrameWork.h	28 Nov 2004 22:19:42 -0000	1.4
***************
*** 28,32 ****
--- 28,41 ----
  
  extern boolean unixshellcall (Handle hcommand, Handle hreturn);
+ 
  extern OSStatus LoadFrameworkBundle(CFStringRef framework, CFBundleRef *bundlePtr);
  
+ extern void *convertcfmtomachofuncptr (void *);
+ 
+ extern void disposemachofuncptr (void *);
+ 
+ extern void *convertmachotocfmfuncptr (void *);
+ 
+ extern void disposecfmfuncptr (void *);
+ 
  #endif

[frontierkernel-commits] Frontier/Common/source CallMachOFrameWork.c,1.4,1.5

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11682/Common/source

Modified Files:
	CallMachOFrameWork.c 
Log Message:
Added functions for converting between Mach-O and CFM function pointers and vice versa, to be used to make the Mach-O build compatible with Frontier DLLs that are CFM shared libraries.

Index: CallMachOFrameWork.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/CallMachOFrameWork.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CallMachOFrameWork.c	31 Oct 2004 20:41:10 -0000	1.4
--- CallMachOFrameWork.c	28 Nov 2004 22:19:41 -0000	1.5
***************
*** 178,180 ****
  	
  	return err;
! }
\ No newline at end of file
--- 178,249 ----
  	
  	return err;
! } /*LoadFrameworkBundle*/
! 
! 
! static UInt32 gluetemplate[6] = {0x3D800000, 0x618C0000, 0x800C0000, 0x804C0004, 0x7C0903A6, 0x4E800420};
! 
! void *convertcfmtomachofuncptr (void *cfmfp) {
! 	
! 	/*
! 	2004-11-28 aradke: adapted from Apple's CFM_MachO_CFM sample:
! 	
! 	http://developer.apple.com/samplecode/CFM_MachO_CFM/CFM_MachO_CFM.html
! 	
! 	allocate a block of cfm glue code with instructions for calling the CFM function.
! 	the caller is responsible for disposal via disposemachofuncptr 
! 	*/
! 
!     UInt32 *mfp = (UInt32*) NewPtr (sizeof(gluetemplate));
! 
!     mfp[0] = gluetemplate[0] | ((UInt32) cfmfp >> 16);
!     mfp[1] = gluetemplate[1] | ((UInt32) cfmfp & 0xFFFF);
!     mfp[2] = gluetemplate[2];
!     mfp[3] = gluetemplate[3];
!     mfp[4] = gluetemplate[4];
!     mfp[5] = gluetemplate[5];
! 
!     MakeDataExecutable (mfp, sizeof(gluetemplate));
! 
!     return ((void *) mfp);
! 	} /*convertcfmtomachofuncptr*/
! 
! 
! void disposemachofuncptr (void *mfp) {
! 	
! 	if (mfp != nil)
! 		DisposePtr (mfp);
! 	} /*disposemachofuncptr*/
! 
! 
! typedef struct tvectorstruct {
! 	ProcPtr	procaddr;
! 	UInt32	toc;
! 	} tvectorstruct, *tvectorptr;
! 
! 
! void *convertmachotocfmfuncptr (void *mfp) {
! 	
! 	/*
! 	2004-11-28 aradke: allocate a fake TVector and set its procptr entry
! 	to the mach procptr handed to us by the caller. the toc entry can
! 	safely be set to nil since it's ignored in this context.
! 	*/
! 	
!     tvectorptr cfmfp = (tvectorptr) NewPtr (sizeof(tvectorstruct));
! 	
! 	if (MemError()  == noErr && cfmfp != nil) {
! 		
! 		cfmfp->procaddr = (ProcPtr) mfp;
! 		cfmfp->toc = 0; /*ignored*/
! 		}
! 
!     return ((void *) cfmfp);
! 	} /*convertmachotocfmfuncptr*/
! 
! 
! void disposecfmfuncptr (void *cfmfp) {
! 	
! 	if (cfmfp != nil)
! 		DisposePtr (cfmfp);
! 	} /*disposecfmfuncptr*/
! 

[frontierkernel-commits] Frontier/Common/source shellsysverbs.c,1.3,1.4

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7249

Modified Files:
	shellsysverbs.c 
Log Message:
Added Frontier.showApplication. On Windows, if the application was minimized to the system tray icon, this function will "unhide" the application's MDI window.

Index: shellsysverbs.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellsysverbs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shellsysverbs.c	27 Oct 2004 18:57:55 -0000	1.3
--- shellsysverbs.c	28 Nov 2004 22:03:24 -0000	1.4
***************
*** 162,165 ****
--- 162,167 ----
  	isvalidserialnumberfunc,
  
+ 	showapplicationfunc,
+ 
  	ctfrontierverbs
  	} tyfrontiertoken;
***************
*** 983,986 ****
--- 985,1003 ----
  			return (true);
  			}
+ 		
+ 		case showapplicationfunc: {	/*2004-11-28 aradke: re-emerge from system tray*/
+ 
+ 			#ifdef WIN95VERSION
+ 				
+ 				releasethreadglobals ();
+ 
+ 				ShowWindow (shellframewindow, SW_SHOW);
+ 
+ 				grabthreadglobals ();
+ 			
+ 			#endif
+ 
+ 			return (setbooleanvalue (true, v));
+ 			}
  
  		default:

[frontierkernel-commits] Frontier/Common/resources/Win32 kernvelverbs.rc,1.1,1.2

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/resources/Win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6219

Modified Files:
	kernvelverbs.rc 
Log Message:
Added Frontier.showApplication.

Index: kernvelverbs.rc
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Win32/kernvelverbs.rc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** kernvelverbs.rc	9 Oct 2004 08:50:17 -0000	1.1
--- kernvelverbs.rc	28 Nov 2004 21:59:07 -0000	1.2
***************
*** 827,831 ****
  		"frontier\0",		//Function Processor Name
  		true,			//Window required
! 			13,			//Count of verbs
  			"getprogrampath\0",
  			"getfilepath\0",
--- 827,831 ----
  		"frontier\0",		//Function Processor Name
  		true,			//Window required
! 			14,			//Count of verbs
  			"getprogrampath\0",
  			"getfilepath\0",
***************
*** 840,844 ****
  			"gethashloopcount\0",
  			"hideapplication\0",
! 			"isvalidserialnumber\0"
  	END
  
--- 840,845 ----
  			"gethashloopcount\0",
  			"hideapplication\0",
! 			"isvalidserialnumber\0",
! 			"showapplication\0"
  	END
  

[frontierkernel-commits] Frontier/Common/resources/Mac kernvelverbs.r,1.4,1.5

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/resources/Mac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5736

Modified Files:
	kernvelverbs.r 
Log Message:
Add Frontier.showApplication.

Index: kernvelverbs.r
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/kernvelverbs.r,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** kernvelverbs.r	22 Nov 2004 04:45:44 -0000	1.4
--- kernvelverbs.r	28 Nov 2004 21:57:36 -0000	1.5
***************
*** 884,888 ****
  		"gethashloopcount",
  		"hideapplication",
! 		"isvalidserialnumber"
  		}
  	}
--- 884,889 ----
  		"gethashloopcount",
  		"hideapplication",
! 		"isvalidserialnumber",
! 		"showapplication"
  		}
  	}

[frontierkernel-commits] Frontier/Common/source langpython.c,1.2.4.21,1.2.4.22

[David B. <dav...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv669

Modified Files:
      Tag: sidewinder-branch
	langpython.c 
Log Message:
hooking the profile code

Index: langpython.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpython.c,v
retrieving revision 1.2.4.21
retrieving revision 1.2.4.22
diff -C2 -d -r1.2.4.21 -r1.2.4.22
*** langpython.c	28 Nov 2004 20:45:18 -0000	1.2.4.21
--- langpython.c	28 Nov 2004 21:34:30 -0000	1.2.4.22
***************
*** 62,65 ****
--- 62,67 ----
  #undef _DEBUG	/*otherwise debug build of Frontier requires debug build of python dll*/
  #include <Python.h>
+ #include <compile.h>
+ #include <frameobject.h>
  
  #elif defined(MACVERSION)
***************
*** 70,73 ****
--- 72,77 ----
  
  #include <Python/Python.h>
+ #include <Python/compile.h>
+ #include <Python/frameobject.h>
  
  #elif TARGET_RT_MAC_CFM
***************
*** 222,225 ****
--- 226,230 ----
      void        (*ptr_PyEval_RestoreThread) (PyThreadState *);
      PyThreadState * (*ptr_PyEval_SaveThread) (void);
+     void        (*ptr_PyEval_SetProfile) (Py_tracefunc, PyObject *);
  
  } py;
***************
*** 325,328 ****
--- 330,334 ----
  #define PyEval_SaveThread           (*py.ptr_PyEval_SaveThread)
  #define PyEval_RestoreThread        (*py.ptr_PyEval_RestoreThread)
+ #define PyEval_SetProfile           (*py.ptr_PyEval_SetProfile)
  
  static boolean importsymbol (typythonlib hm, char *symbol, void **ptraddress) {
***************
*** 464,467 ****
--- 470,474 ----
      fl = fl && IMPORTSYMBOL (hm, PyEval_SaveThread);
      fl = fl && IMPORTSYMBOL (hm, PyEval_RestoreThread);
+     fl = fl && IMPORTSYMBOL (hm, PyEval_SetProfile);
      
  	if (fl) {
***************
*** 1618,1621 ****
--- 1625,1634 ----
  }
  
+ static int
+ checkstatus(PyObject *o, PyFrameObject *frame, int what, PyObject *arg) {
+     //printf("tick\n");
+     return 0;
+ }
+ 
  static boolean startInterpreter() {
      if (!ispythonloaded())
***************
*** 1633,1636 ****
--- 1646,1651 ----
          currentCookie = time(NULL);
  
+         PyEval_SetProfile(checkstatus, NULL);
+             
          releasepythonlock();
      }

[frontierkernel-commits] Frontier/Common/source wpengine.c,1.5,1.6

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26261

Modified Files:
	wpengine.c 
Log Message:
Rolled back accidental deletion in rev 1.4 that resulted in an unbalanced popbackcolor call in wpupdate [bug #1074719].

Index: wpengine.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/wpengine.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wpengine.c	28 Nov 2004 17:53:17 -0000	1.5
--- wpengine.c	28 Nov 2004 21:01:44 -0000	1.6
***************
*** 1848,1852 ****
  				
  		#ifdef gray3Dlook
! 		//	pushbackcolor (&whitecolor); /*2004-11-28 aradke: balance popbackcolor below*/ 
  		#endif
  
--- 1848,1854 ----
  				
  		#ifdef gray3Dlook
! 			pushbackcolor (&whitecolor);
! 		
! 			eraserect (rcontent);
  		#endif
  
***************
*** 1864,1868 ****
  		
  		#ifdef gray3Dlook
! 		//	popbackcolor (); 
  		#endif
  		
--- 1866,1870 ----
  		
  		#ifdef gray3Dlook
! 			popbackcolor (); 
  		#endif
  		

[frontierkernel-commits] Frontier/Common/source langpython.c,1.2.4.20,1.2.4.21

[David B. <dav...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22827

Modified Files:
      Tag: sidewinder-branch
	langpython.c 
Log Message:
python threading support

Index: langpython.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpython.c,v
retrieving revision 1.2.4.20
retrieving revision 1.2.4.21
diff -C2 -d -r1.2.4.20 -r1.2.4.21
*** langpython.c	28 Nov 2004 18:30:43 -0000	1.2.4.20
--- langpython.c	28 Nov 2004 20:45:18 -0000	1.2.4.21
***************
*** 218,221 ****
--- 218,226 ----
      PyObject *  (*ptr_PyObject_CallObject) (PyObject *, PyObject *);
  
+     int         (*ptr_PySys_SetArgv) (int, char **);
+     
+     void        (*ptr_PyEval_RestoreThread) (PyThreadState *);
+     PyThreadState * (*ptr_PyEval_SaveThread) (void);
+ 
  } py;
  
***************
*** 316,319 ****
--- 321,329 ----
  #define PyObject_CallObject         (*py.ptr_PyObject_CallObject)
  
+ #define PySys_SetArgv               (*py.ptr_PySys_SetArgv)
+ 
+ #define PyEval_SaveThread           (*py.ptr_PyEval_SaveThread)
+ #define PyEval_RestoreThread        (*py.ptr_PyEval_RestoreThread)
+ 
  static boolean importsymbol (typythonlib hm, char *symbol, void **ptraddress) {
  
***************
*** 450,453 ****
--- 460,468 ----
      fl = fl && IMPORTSYMBOL (hm, PyObject_CallObject);
  
+     fl = fl && IMPORTSYMBOL (hm, PySys_SetArgv);
+ 
+     fl = fl && IMPORTSYMBOL (hm, PyEval_SaveThread);
+     fl = fl && IMPORTSYMBOL (hm, PyEval_RestoreThread);
+     
  	if (fl) {
  	
***************
*** 519,522 ****
--- 534,549 ----
  static PyObject *frontierModule = NULL;
  
+ PyThreadState *_save;
+ 
+ static void
+ getpythonlock() {
+     PyEval_RestoreThread(_save);
+ }
+ 
+ static void
+ releasepythonlock() {
+     _save = PyEval_SaveThread();
+ }
+ 
  static boolean convertPython(PyObject *, hdlhashtable, bigstring);
  
***************
*** 937,947 ****
  fetch(PyObject *self, PyObject *args) {
      char *as;
      
      if (!PyArg_ParseTuple(args, "s:fetch", &as)) {
          PyErr_SetString(PyExc_ValueError, "Requires a string representing an address in the Frontier database");
          return NULL;
      }
      
!     return fetchAux(as);
  }
  
--- 964,982 ----
  fetch(PyObject *self, PyObject *args) {
      char *as;
+     PyObject *result;
+     
+     getpythonlock();
      
      if (!PyArg_ParseTuple(args, "s:fetch", &as)) {
          PyErr_SetString(PyExc_ValueError, "Requires a string representing an address in the Frontier database");
+         releasepythonlock();
          return NULL;
      }
      
!     result = fetchAux(as);
!     
!     releasepythonlock();
! 
!     return result;
  }
  
***************
*** 953,958 ****
--- 988,996 ----
      PyObject *result;
      
+     getpythonlock();
+     
      if (!PyArg_ParseTuple(args, "s:evaluate", &s)) {
          PyErr_SetString(PyExc_ValueError, "Couldn't execute because evaluate requires a string argument.");
+         releasepythonlock();
          return NULL;
      }
***************
*** 960,963 ****
--- 998,1002 ----
      if (!newfilledhandle(s, strlen(s), &htext)) {
          PyErr_SetString(PyExc_SystemError, "Couldn't execute because I couldn't allocate space for the string.");
+         releasepythonlock();
          return NULL;
      }
***************
*** 965,968 ****
--- 1004,1008 ----
      if (!langrun(htext, &v)) {
          PyErr_SetString(PyExc_SyntaxError, "Couldn't execute because of a syntax error in the UserTalk code.");
+         releasepythonlock();
          return NULL;
      }
***************
*** 970,976 ****
--- 1010,1018 ----
      if (!convertfrontiervalue(&v, &result)) {
          PyErr_SetString(PyExc_SystemError, "Couldn't execute because of an error converting the UserTalk return value.");
+         releasepythonlock();
          return NULL;
      }
      
+     releasepythonlock();
      return result;
  }
***************
*** 1069,1076 ****
--- 1111,1121 ----
      copyctopstring(name, loc);
      
+     getpythonlock();
+     
      if (!hashtablelookup(self->table, loc, &val, &node)) {
          char msg[300];
          sprintf(msg, "No table entry named %s.", name);
          PyErr_SetString(PyExc_KeyError, msg);
+         releasepythonlock();
          return NULL;
      }
***************
*** 1080,1086 ****
--- 1125,1133 ----
          sprintf(msg, "Cannot convert table entry named %s.", name);
          PyErr_SetString(PyExc_SystemError, msg);
+         releasepythonlock();
          return NULL;
      }
   
+     releasepythonlock();
      return result;
  }
***************
*** 1088,1097 ****
  static PyObject *
  Table_getattr(frontier_TableObject *self, char *name) {
!     PyObject *method = Py_FindMethod(tableMethods, (PyObject *)self, name);
!     if (method != NULL)
          return method;
          
      PyErr_Clear();
  
      return Table_get(self, name);
  }
--- 1135,1152 ----
  static PyObject *
  Table_getattr(frontier_TableObject *self, char *name) {
!     PyObject *method;
!     
!     getpythonlock();
!     
!     method = Py_FindMethod(tableMethods, (PyObject *)self, name);
!     if (method != NULL) {
!         releasepythonlock();
          return method;
+     }
          
      PyErr_Clear();
  
+     releasepythonlock();
+ 
      return Table_get(self, name);
  }
***************
*** 1103,1109 ****
      copyctopstring(name, loc);
      
!     if (!convertPython(val, self->table, loc))
          return -1;
!         
      return 0;
  }
--- 1158,1169 ----
      copyctopstring(name, loc);
      
!     getpythonlock();
!     
!     if (!convertPython(val, self->table, loc)) {
!         releasepythonlock();
          return -1;
!     }
!     
!     releasepythonlock();        
      return 0;
  }
***************
*** 1124,1129 ****
--- 1184,1192 ----
      PyObject *result;
  
+     getpythonlock();
+     
      if (!hashgetnthnode(self->table, index, &node)) {
          PyErr_SetString(PyExc_IndexError, "Index out of bounds");
+         releasepythonlock();
          return NULL;
      }
***************
*** 1131,1137 ****
--- 1194,1202 ----
      if (!convertfrontiervalue(&((**node).val), &result)) {
          PyErr_SetString(PyExc_ValueError, "Cannot convert value");
+         releasepythonlock();
          return NULL;
      }
      
+     releasepythonlock();
      return result;
  }
***************
*** 1140,1151 ****
  Table_setIndex(frontier_TableObject *self, int index, PyObject *val) {
      hdlhashnode node;
      if (!hashgetnthnode(self->table, index, &node)) {
          PyErr_SetString(PyExc_IndexError, "Index out of bounds");
          return 0;
      }
      
!     if (!convertPython(val, self->table, (**node).hashkey))
          return -1;
          
      return 0;
  }
--- 1205,1223 ----
  Table_setIndex(frontier_TableObject *self, int index, PyObject *val) {
      hdlhashnode node;
+     
+     getpythonlock();
+     
      if (!hashgetnthnode(self->table, index, &node)) {
          PyErr_SetString(PyExc_IndexError, "Index out of bounds");
+         releasepythonlock();
          return 0;
      }
      
!     if (!convertPython(val, self->table, (**node).hashkey)) {
!         releasepythonlock();        
          return -1;
+     }
          
+     releasepythonlock();
      return 0;
  }
***************
*** 1154,1160 ****
  Table_getItem(frontier_TableObject *self, PyObject *key) {
      char *keyName;
!     if (PyInt_Check(key))
          return Table_getIndex(self, PyInt_AsLong(key));
      keyName = PyString_AsString(PyObject_Str(key));
      return Table_get(self, keyName);    
  }
--- 1226,1239 ----
  Table_getItem(frontier_TableObject *self, PyObject *key) {
      char *keyName;
!     
!     getpythonlock();
!     
!     if (PyInt_Check(key)) {
!         releasepythonlock();
          return Table_getIndex(self, PyInt_AsLong(key));
+     }
      keyName = PyString_AsString(PyObject_Str(key));
+ 
+     releasepythonlock();
      return Table_get(self, keyName);    
  }
***************
*** 1163,1169 ****
  Table_setItem(frontier_TableObject *self, PyObject *key, PyObject *val) {
      char *keyName;
!     if (PyInt_Check(key))
          return Table_setIndex(self, PyInt_AsLong(key), val);
      keyName = PyString_AsString(PyObject_Str(key));
      return Table_setattr(self, keyName, val);
  }
--- 1242,1255 ----
  Table_setItem(frontier_TableObject *self, PyObject *key, PyObject *val) {
      char *keyName;
!     
!     getpythonlock();
!     
!     if (PyInt_Check(key)) {
!         releasepythonlock();
          return Table_setIndex(self, PyInt_AsLong(key), val);
+     }
      keyName = PyString_AsString(PyObject_Str(key));
+     
+     releasepythonlock();
      return Table_setattr(self, keyName, val);
  }
***************
*** 1196,1200 ****
--- 1282,1288 ----
      copyptocstring((**node).hashkey, name);
      
+     getpythonlock();
      PyList_Append(keyList, PyString_FromString(name));
+     releasepythonlock();
      
      return true;
***************
*** 1203,1213 ****
  static PyObject *
  Table_keys(frontier_TableObject *self) {
!     PyObject *keyList = PyList_New(0);
! 
      if (!hashtablevisit(self->table, Table_keysCallback, (ptrvoid)keyList)) {
          PyErr_SetString(PyExc_SystemError, "Cannot create key list");
          return NULL;
      }
  
      return keyList;
  }
--- 1291,1307 ----
  static PyObject *
  Table_keys(frontier_TableObject *self) {
!     PyObject *keyList;
!     
!     getpythonlock();
!     
!     keyList = PyList_New(0);
!     
      if (!hashtablevisit(self->table, Table_keysCallback, (ptrvoid)keyList)) {
          PyErr_SetString(PyExc_SystemError, "Cannot create key list");
+         releasepythonlock();
          return NULL;
      }
  
+     releasepythonlock();
      return keyList;
  }
***************
*** 1218,1224 ****
--- 1312,1322 ----
      bigstring loc;
      hdlhashtable newTable;
+     PyObject *nt;
+     
+     getpythonlock();
      
      if (!PyArg_ParseTuple(args, "s:newTable", &name)) {
          PyErr_SetString(PyExc_TypeError, "Table.newTable requires a string argument");
+         releasepythonlock();
          return NULL;
      }
***************
*** 1231,1235 ****
      }
      
!     return newTableObject(newTable);
  }
  
--- 1329,1337 ----
      }
      
!     nt = newTableObject(newTable);
!     
!     releasepythonlock();
!     
!     return nt;
  }
  
***************
*** 1411,1417 ****
  static PyObject *
  newTableObject(hdlhashtable hdl) {
!     PyObject *class = PyObject_GetAttrString(frontierModule, "Table");
      frontier_TableObject *obj = PyObject_New(frontier_TableObject, (PyTypeObject *)class);
      obj->table = hdl;
      return (PyObject *)obj;
  }
--- 1513,1522 ----
  static PyObject *
  newTableObject(hdlhashtable hdl) {
!     PyObject *class;
!     
!     class = PyObject_GetAttrString(frontierModule, "Table");
      frontier_TableObject *obj = PyObject_New(frontier_TableObject, (PyTypeObject *)class);
      obj->table = hdl;
+     
      return (PyObject *)obj;
  }
***************
*** 1419,1424 ****
  static PyObject *
  newOutlineObject() {
!     PyObject *class = PyObject_GetAttrString(frontierModule, "Outline");
      frontier_OutlineObject *obj = PyObject_New(frontier_OutlineObject, (PyTypeObject *)class);
      return (PyObject *)obj;
  }
--- 1524,1532 ----
  static PyObject *
  newOutlineObject() {
!     PyObject *class;
!     
!     class = PyObject_GetAttrString(frontierModule, "Outline");
      frontier_OutlineObject *obj = PyObject_New(frontier_OutlineObject, (PyTypeObject *)class);
+     
      return (PyObject *)obj;
  }
***************
*** 1426,1431 ****
  static PyObject *
  newWPTextObject() {
!     PyObject *class = PyObject_GetAttrString(frontierModule, "WPText");
      frontier_WPTextObject *obj = PyObject_New(frontier_WPTextObject, (PyTypeObject *)class);
      return (PyObject *)obj;
  }
--- 1534,1542 ----
  static PyObject *
  newWPTextObject() {
!     PyObject *class;
!     
!     class = PyObject_GetAttrString(frontierModule, "WPText");
      frontier_WPTextObject *obj = PyObject_New(frontier_WPTextObject, (PyTypeObject *)class);
+     
      return (PyObject *)obj;
  }
***************
*** 1433,1438 ****
  static PyObject *
  newScriptObject() {
!     PyObject *class = PyObject_GetAttrString(frontierModule, "Script");
      frontier_ScriptObject *obj = PyObject_New(frontier_ScriptObject, (PyTypeObject *)class);
      return (PyObject *)obj;
  }
--- 1544,1552 ----
  static PyObject *
  newScriptObject() {
!     PyObject *class;
!     
!     class = PyObject_GetAttrString(frontierModule, "Script");
      frontier_ScriptObject *obj = PyObject_New(frontier_ScriptObject, (PyTypeObject *)class);
+     
      return (PyObject *)obj;
  }
***************
*** 1440,1446 ****
  static PyObject *
  newInternalValueObject(tyvaluetype vt) {
!     PyObject *class = PyObject_GetAttrString(frontierModule, "InternalValue");
      frontier_InternalValue *obj = PyObject_New(frontier_InternalValue, (PyTypeObject *)class);
      obj->vartype = vt;
      return (PyObject *)obj;
  }
--- 1554,1563 ----
  static PyObject *
  newInternalValueObject(tyvaluetype vt) {
!     PyObject *class;
!     
!     class = PyObject_GetAttrString(frontierModule, "InternalValue");
      frontier_InternalValue *obj = PyObject_New(frontier_InternalValue, (PyTypeObject *)class);
      obj->vartype = vt;
+     
      return (PyObject *)obj;
  }
***************
*** 1448,1454 ****
  static PyObject *
  newExternalValueObject(tyexternalid ei) {
!     PyObject *class = PyObject_GetAttrString(frontierModule, "ExternalValue");
      frontier_ExternalValue *obj = PyObject_New(frontier_ExternalValue, (PyTypeObject *)class);
      obj->extvartype = ei;
      return (PyObject *)obj;
  }
--- 1565,1574 ----
  static PyObject *
  newExternalValueObject(tyexternalid ei) {
!     PyObject *class;
!     
!     class = PyObject_GetAttrString(frontierModule, "ExternalValue");
      frontier_ExternalValue *obj = PyObject_New(frontier_ExternalValue, (PyTypeObject *)class);
      obj->extvartype = ei;
+     
      return (PyObject *)obj;
  }
***************
*** 1512,1515 ****
--- 1632,1637 ----
              
          currentCookie = time(NULL);
+ 
+         releasepythonlock();
      }
      return true;
***************
*** 1520,1523 ****
--- 1642,1646 ----
          return false;
      
+     getpythonlock();
      if (Py_IsInitialized()) {
          disposeGlobals();
***************
*** 1600,1604 ****
  pythonconvertparameters(hdltreenode hparams) {
  	register hdltreenode nomad = hparams;
!     PyObject *argList = PyList_New(0);
  	
  	while (nomad != nil) {
--- 1723,1732 ----
  pythonconvertparameters(hdltreenode hparams) {
  	register hdltreenode nomad = hparams;
!     PyObject *argList;
!     PyObject *tuple;
!     
!     getpythonlock();
!     
!     argList = PyList_New(0);
  	
  	while (nomad != nil) {
***************
*** 1616,1623 ****
          PyList_Append(argList, arg);
      }
  	
!     return PyList_AsTuple(argList);
  }
  
  boolean callpythonscript(tyvaluerecord code, hdltreenode hparam1, bigstring bsname, tyvaluerecord *vreturned, boolean runbutton) {
      PyObject *globals;
--- 1744,1757 ----
          PyList_Append(argList, arg);
      }
+     
+     tuple = PyList_AsTuple(argList);
+     
+     releasepythonlock();
  	
!     return tuple;
  }
  
+ char *defArgv[] = {""};
+ 
  boolean callpythonscript(tyvaluerecord code, hdltreenode hparam1, bigstring bsname, tyvaluerecord *vreturned, boolean runbutton) {
      PyObject *globals;
***************
*** 1627,1630 ****
--- 1761,1766 ----
      startInterpreter();
      
+     getpythonlock();
+     
      globals = PyDict_New();
      
***************
*** 1639,1644 ****
      //
      htext = code.data.stringvalue;
!     if (!enlargehandle(htext, gethandlesize(htext) + 1, "\0"))
          return false;
      
      // lock the text
--- 1775,1782 ----
      //
      htext = code.data.stringvalue;
!     if (!enlargehandle(htext, gethandlesize(htext) + 1, "\0")) {
!         releasepythonlock();
          return false;
+     }
      
      // lock the text
***************
*** 1647,1650 ****
--- 1785,1789 ----
      // run it
      convertreturns(htext);
+     PySys_SetArgv(1, defArgv);
      result = PyRun_String(*htext, Py_file_input, globals, globals);
      if (result) Py_DECREF(result);
***************
*** 1657,1660 ****
--- 1796,1800 ----
          PyErr_Print();
          PyErr_Clear();
+         releasepythonlock();
          return false;
      }
***************
*** 1668,1673 ****
          // find the function that was called
          func = PyDict_GetItemString(globals, funcName);
!         if (!func)
              return false;
                  
          // convert the calling parameters
--- 1808,1815 ----
          // find the function that was called
          func = PyDict_GetItemString(globals, funcName);
!         if (!func) {
!             releasepythonlock();
              return false;
+         }
                  
          // convert the calling parameters
***************
*** 1675,1678 ****
--- 1817,1821 ----
                  
          // call it
+         PySys_SetArgv(1, defArgv);
          result = PyObject_CallObject(func, argList);
          
***************
*** 1683,1686 ****
--- 1826,1830 ----
              PyErr_Print();
              PyErr_Clear();
+             releasepythonlock();
              return false;
          }
***************
*** 1689,1692 ****
--- 1833,1837 ----
          if (!pythontofrontier(result, vreturned)) {
              if (result) Py_DECREF(result);
+             releasepythonlock();
              return false;
          }
***************
*** 1694,1697 ****
--- 1839,1843 ----
      }
      
+     releasepythonlock();
      return true;
  }

[frontierkernel-commits] Frontier/Common/headers langpython.h,1.1.4.4,1.1.4.5

[David B. <dav...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25884/headers

Modified Files:
      Tag: sidewinder-branch
	langpython.h 
Log Message:
more cleanup -- elimination of callpython in favor of callpythonscript

Index: langpython.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/langpython.h,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -C2 -d -r1.1.4.4 -r1.1.4.5
*** langpython.h	28 Nov 2004 06:51:46 -0000	1.1.4.4
--- langpython.h	28 Nov 2004 18:30:42 -0000	1.1.4.5
***************
*** 31,35 ****
  boolean ispythonnode(hdltreenode, tyvaluerecord *);
  boolean callpythonscript(tyvaluerecord, hdltreenode, bigstring, tyvaluerecord *, boolean);
- boolean callpython(hdltreenode htree, tyvaluerecord *vreturned);
  
  
--- 31,34 ----

[frontierkernel-commits] Frontier/Common/source langevaluate.c,1.3.4.1,1.3.4.2 langpython.c,1.2.4.19,1.2.4.20 langvalue.c,1.5.4.2,1.5.4.3

[David B. <dav...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25884/source

Modified Files:
      Tag: sidewinder-branch
	langevaluate.c langpython.c langvalue.c 
Log Message:
more cleanup -- elimination of callpython in favor of callpythonscript

Index: langvalue.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langvalue.c,v
retrieving revision 1.5.4.2
retrieving revision 1.5.4.3
diff -C2 -d -r1.5.4.2 -r1.5.4.3
*** langvalue.c	28 Nov 2004 06:51:47 -0000	1.5.4.2
--- langvalue.c	28 Nov 2004 18:30:43 -0000	1.5.4.3
***************
*** 8098,8102 ****
  					return (false);
  				
- 				// 5.0a18 dmb: this probably isn't adequate for osa execution
  				langsetthisvalue (currenthashtable, htable, bsname);
  				
--- 8098,8101 ----

Index: langevaluate.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langevaluate.c,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -C2 -d -r1.3.4.1 -r1.3.4.2
*** langevaluate.c	28 Nov 2004 00:40:47 -0000	1.3.4.1
--- langevaluate.c	28 Nov 2004 18:30:43 -0000	1.3.4.2
***************
*** 1502,1506 ****
  		{false, true},	/*multiplyvalueop*/
  		
! 		{false, true}	/*dividevalueop*/
  		};
  
--- 1502,1508 ----
  		{false, true},	/*multiplyvalueop*/
  		
! 		{false, true},	/*dividevalueop*/
!         
!         {true, nope}    /*pythonscriptop*/
  		};
  
***************
*** 1886,1890 ****
          #ifdef FRONTIER_PYTHON
          case pythonscriptop:
!             return callpython (htree, valtree);
              
          #endif
--- 1888,1893 ----
          #ifdef FRONTIER_PYTHON
          case pythonscriptop:
!             if (ispythonnode (h, &val1))
!                 return callpythonscript (val1, nil, zerostring, valtree, true);
              
          #endif

Index: langpython.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpython.c,v
retrieving revision 1.2.4.19
retrieving revision 1.2.4.20
diff -C2 -d -r1.2.4.19 -r1.2.4.20
*** langpython.c	28 Nov 2004 08:38:42 -0000	1.2.4.19
--- langpython.c	28 Nov 2004 18:30:43 -0000	1.2.4.20
***************
*** 1697,1707 ****
  }
  
- boolean callpython(hdltreenode htree, tyvaluerecord *vreturned) {
-     boolean result;
-     bigstring bs;
-     copyctopstring("", bs);
-     result = callpythonscript((**htree).nodeval, NULL, bs, vreturned, true);
-     return result;
- }
- 
  #endif
--- 1697,1699 ----

[frontierkernel-commits] Frontier/Common/headers versions.h,1.3,1.4

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5956/Common/headers

Modified Files:
	versions.h 
Log Message:
Bumped version number to 10.0a4 for Frontier and Radio.

Index: versions.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/versions.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** versions.h	11 Nov 2004 09:31:39 -0000	1.3
--- versions.h	28 Nov 2004 14:19:07 -0000	1.4
***************
*** 33,48 ****
  
  
! #define	radio_major_version				8
! #define	radio_major_version_bcd			0x08 	/* major version in BCD notation */
  
! #define	radio_sub_version				1
  #define	radio_minor_version				0
! #define	radio_subminor_version_bcd		0x10  	/* sub and minor version in BCD notation */
  
! #define radio_stage_code				0x60	/* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
  #define	radio_revision_level			4		/* for non-final releases only */
  #define	radio_build_number				4		/* increment by one for every release, final or not */
  
! #define radio_version_string			"8.1b4"
  
  
--- 33,48 ----
  
  
! #define	radio_major_version				10
! #define	radio_major_version_bcd			0x10 	/* major version in BCD notation */
  
! #define	radio_sub_version				0
  #define	radio_minor_version				0
! #define	radio_subminor_version_bcd		0x00  	/* sub and minor version in BCD notation */
  
! #define radio_stage_code				0x40	/* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
  #define	radio_revision_level			4		/* for non-final releases only */
  #define	radio_build_number				4		/* increment by one for every release, final or not */
  
! #define radio_version_string			"10.0a4"
  
  
***************
*** 55,62 ****
  
  #define frontier_stage_code				0x40	/* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
! #define	frontier_revision_level			3		/* for non-final releases only */
! #define	frontier_build_number			3		/* increment by one for every release, final or not */
  
! #define frontier_version_string			"10.0a3"
  
  
--- 55,62 ----
  
  #define frontier_stage_code				0x40	/* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
! #define	frontier_revision_level			4		/* for non-final releases only */
! #define	frontier_build_number			4		/* increment by one for every release, final or not */
  
! #define frontier_version_string			"10.0a4"
  
  

[frontierkernel-commits] Frontier/build_CWPro8 Frontier.mcp,1.7,1.8

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/build_CWPro8
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5609

Modified Files:
	Frontier.mcp 
Log Message:
Added prefix file for Win32 resource compilation for Radio so that the resource compiler will pick up the PIKE preprocessor definition.

Index: Frontier.mcp
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/build_CWPro8/Frontier.mcp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
Binary files /tmp/cvsjjL6Bb and /tmp/cvsowgbt3 differ

[frontierkernel-commits] Frontier/build_CWPro8/prefix_headers radio.win32.rcprefix.h,NONE,1.1

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/build_CWPro8/prefix_headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5609/prefix_headers

Added Files:
	radio.win32.rcprefix.h 
Log Message:
Added prefix file for Win32 resource compilation for Radio so that the resource compiler will pick up the PIKE preprocessor definition.

--- NEW FILE: radio.win32.rcprefix.h ---

/******************************************************************************

    UserLand Frontier(tm) -- High performance Web content management,
    object database, system-level and Internet scripting environment,
    including source code editing and debugging.

    Copyright (C) 1992-2004 UserLand Software, Inc.

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

******************************************************************************/

/*
	2004-11-28 aradke: Generalized CodeWarrior resource prefix file for Win32
*/

#define	PIKE			1

#define	WIN95VERSION	1
#define WIN32
#define _WIN32
#define _WINDOWS
#define _X86_
#define _WIN32_WINNT 	0x0400		/* Windows NT 4.0 or later */
#define _WIN32_WINDOWS	0x0410		/* Windows 98 or later */

#undef	MACVERSION
#undef	TARGET_API_MAC_CARBON
#undef	TARGET_RT_MAC_CFM
#undef	TARGET_RT_MAC_MACHO

[frontierkernel-commits] Frontier/build_CWPro8 Frontier.mcp,1.6,1.7

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/build_CWPro8
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31757

Modified Files:
	Frontier.mcp 
Log Message:
Added CodeWarrior targets and prefix headers for building Radio.

Index: Frontier.mcp
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/build_CWPro8/Frontier.mcp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
Binary files /tmp/cvsIRectl and /tmp/cvsatIlTA differ

[frontierkernel-commits] Frontier/build_CWPro8/prefix_headers radio.osx.h,NONE,1.1 radio.osx.r,NONE,1.1 radio.osxcfm.debug.pch,NONE,1.1 radio.osxcfm.release.pch,NONE,1.1 radio.ppc.debug.pch,NONE,1.1 radio.ppc.h,NONE,1.1 radio.ppc.r,NONE,1.1 radio.ppc.release.pch,NONE,1.1 radio.win32.debug.pch,NONE,1.1 radio.win32.h,NONE,1.1 radio.win32.release.pch,NONE,1.1

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/build_CWPro8/prefix_headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31757/prefix_headers

Added Files:
	radio.osx.h radio.osx.r radio.osxcfm.debug.pch 
	radio.osxcfm.release.pch radio.ppc.debug.pch radio.ppc.h 
	radio.ppc.r radio.ppc.release.pch radio.win32.debug.pch 
	radio.win32.h radio.win32.release.pch 
Log Message:
Added CodeWarrior targets and prefix headers for building Radio.

--- NEW FILE: radio.win32.h ---

/******************************************************************************

    UserLand Frontier(tm) -- High performance Web content management,
    object database, system-level and Internet scripting environment,
    including source code editing and debugging.

    Copyright (C) 1992-2004 UserLand Software, Inc.

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

******************************************************************************/

/*
	2004-11-28 aradke: Generalized CodeWarrior prefix file for Win32
*/

#define	PIKE			1

#define	WIN95VERSION	1
#define WIN32
#define _WIN32
#define _WINDOWS
#define _X86_
#define _WIN32_WINNT 	0x0400		/* Windows NT 4.0 or later */
#define _WIN32_WINDOWS	0x0410		/* Windows 98 or later */

#undef	MACVERSION
#undef	TARGET_API_MAC_CARBON
#undef	TARGET_RT_MAC_CFM
#undef	TARGET_RT_MAC_MACHO

#include "frontier.h"

--- NEW FILE: radio.osx.r ---

/******************************************************************************

    UserLand Frontier(tm) -- High performance Web content management,
    object database, system-level and Internet scripting environment,
    including source code editing and debugging.

    Copyright (C) 1992-2004 UserLand Software, Inc.

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

******************************************************************************/

/*
	2004-11-28 aradke: Generalized CodeWarrior prefix file for Carbon/OSX
*/

#define PIKE					1

#undef	WIN95VERSION

#define	MACVERSION				1

#define TARGET_API_MAC_OS8		0	/* see ConditionalMacros.h */
#define TARGET_API_MAC_CARBON	1
#define TARGET_API_MAC_OSX		0

#undef FRONTIER_FRAMEWORK_INCLUDES

--- NEW FILE: radio.ppc.r ---

/******************************************************************************

    UserLand Frontier(tm) -- High performance Web content management,
    object database, system-level and Internet scripting environment,
    including source code editing and debugging.

    Copyright (C) 1992-2004 UserLand Software, Inc.

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

******************************************************************************/

/*
	2004-11-28 aradke: Generalized CodeWarrior prefix file for Classic Mac OS
*/

#define PIKE					1

#undef	WIN95VERSION

#define	MACVERSION				1

#define TARGET_API_MAC_OS8		1	/* see ConditionalMacros.h */
#define TARGET_API_MAC_CARBON	0
#define TARGET_API_MAC_OSX		0

#undef FRONTIER_FRAMEWORK_INCLUDES

--- NEW FILE: radio.win32.release.pch ---

/******************************************************************************

    UserLand Frontier(tm) -- High performance Web content management,
    object database, system-level and Internet scripting environment,
    including source code editing and debugging.

    Copyright (C) 1992-2004 UserLand Software, Inc.

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

******************************************************************************/

/*
	2004-11-28 aradke: Precompile prefix header for "Radio Win32"
*/

#pragma precompile_target "radio.win32.release.mch"

#undef _DEBUG
#define NDEBUG

#include "radio.win32.h"

--- NEW FILE: radio.osxcfm.debug.pch ---

/******************************************************************************

    UserLand Frontier(tm) -- High performance Web content management,
    object database, system-level and Internet scripting environment,
    including source code editing and debugging.

    Copyright (C) 1992-2004 UserLand Software, Inc.

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

******************************************************************************/

/*
	2004-11-28 aradke: Precompile prefix header for "Radio OSXCFM Debug"
*/

#pragma precompile_target "radio.osxcfm.debug.mch"

#define DEBUG 1
#define DEBUG_INTERNAL 1

#include "radio.osx.h"

--- NEW FILE: radio.osxcfm.release.pch ---

/******************************************************************************

    UserLand Frontier(tm) -- High performance Web content management,
    object database, system-level and Internet scripting environment,
    including source code editing and debugging.

    Copyright (C) 1992-2004 UserLand Software, Inc.

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

******************************************************************************/

/*
	2004-11-28 aradke: Precompile prefix header for "Radio OSXCFM"
*/

#pragma precompile_target "radio.osxcfm.release.mch"

#define DEBUG 1
#define PRODUCTION 1

#include "radio.osx.h"

--- NEW FILE: radio.ppc.debug.pch ---

/******************************************************************************

    UserLand Frontier(tm) -- High performance Web content management,
    object database, system-level and Internet scripting environment,
    including source code editing and debugging.

    Copyright (C) 1992-2004 UserLand Software, Inc.

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

******************************************************************************/

/*
	2004-11-28 aradke: Precompile prefix header for "Radio PPC Debug"
*/

#pragma precompile_target "radio.ppc.debug.mch"

#include "radio.ppc.h"

--- NEW FILE: radio.ppc.release.pch ---

/******************************************************************************

    UserLand Frontier(tm) -- High performance Web content management,
    object database, system-level and Internet scripting environment,
    including source code editing and debugging.

    Copyright (C) 1992-2004 UserLand Software, Inc.

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

******************************************************************************/

/*
	2004-11-28 aradke: Precompile prefix header for "Radio PPC"
*/

#pragma precompile_target "radio.ppc.release.mch"

#include "radio.ppc.h"

--- NEW FILE: radio.osx.h ---

/******************************************************************************

    UserLand Frontier(tm) -- High performance Web content management,
    object database, system-level and Internet scripting environment,
    including source code editing and debugging.

    Copyright (C) 1992-2004 UserLand Software, Inc.

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

******************************************************************************/

/*
	2004-11-28 aradke: Generalized CodeWarrior prefix file for Carbon/OSX
*/

#define PIKE					1

#undef	WIN95VERSION

#define	MACVERSION				1

#define TARGET_API_MAC_OS8		0	/* see ConditionalMacros.h */
#define TARGET_API_MAC_CARBON	1
#define TARGET_API_MAC_OSX		0

#include "frontier.h"

--- NEW FILE: radio.ppc.h ---

/******************************************************************************

    UserLand Frontier(tm) -- High performance Web content management,
    object database, system-level and Internet scripting environment,
    including source code editing and debugging.

    Copyright (C) 1992-2004 UserLand Software, Inc.

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

******************************************************************************/

/*
	2004-11-28 aradke: Generalized CodeWarrior prefix file for Classic Mac OS
*/

#define	PIKE					1

#undef	WIN95VERSION

#define	MACVERSION				1

#define TARGET_API_MAC_OS8		1	/* see ConditionalMacros.h */
#define TARGET_API_MAC_CARBON	0
#define TARGET_API_MAC_OSX		0

#include "frontier.h"

--- NEW FILE: radio.win32.debug.pch ---

/******************************************************************************

    UserLand Frontier(tm) -- High performance Web content management,
    object database, system-level and Internet scripting environment,
    including source code editing and debugging.

    Copyright (C) 1992-2004 UserLand Software, Inc.

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

******************************************************************************/

/*
	2004-11-28 aradke: Precompile prefix header for "Radio Win32 Debug"
*/

#pragma precompile_target "radio.win32.debug.mch"

#define _DEBUG
#undef NDEBUG

#include "radio.win32.h"

[frontierkernel-commits] Frontier/resources/Radio BNDL.r,NONE,1.1 icns.r,NONE,1.1

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/resources/Radio
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30917/resources/Radio

Added Files:
	BNDL.r icns.r 
Log Message:
Add bundle and icon resource for Mac version of Radio.

--- NEW FILE: icns.r ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: BNDL.r ---
data 'icl4' (0) {
	$"0000 0000 3333 3333 3333 3333 0000 0000"            /* ....33333333.... */
	$"0000 0003 3333 3333 3333 3333 3000 0000"            /* ....333333330... */
	$"0000 0033 3333 3333 3333 3333 3300 0000"            /* ...3333333333... */
	$"0000 0333 3333 333C 3333 3333 3330 0000"            /* ...3333<333330.. */
	$"0000 3333 3333 33CC C333 3333 3333 0000"            /* ..33333ÌÃ33333.. */
	$"0003 3333 333C 33CC C33C C333 3333 3000"            /* ..333<3ÌÃ<Ã3330. */
	$"0033 3333 33CC C3CC C3CC C333 3333 3300"            /* .3333ÌÃÌÃÌÃ3333. */
	$"0333 3333 33CC C3CC C3CC C333 3333 3330"            /* .3333ÌÃÌÃÌÃ33330 */
	$"3333 3333 C3CC C3CC C3CC C333 3333 3333"            /* 3333ÃÌÃÌÃÌÃ33333 */
	$"3333 333C C3CC C3CC C3CC C333 3333 3333"            /* 333<ÃÌÃÌÃÌÃ33333 */
	$"3333 333C C3CC C3CC C3CC C333 3333 3333"            /* 333<ÃÌÃÌÃÌÃ33333 */
	$"3333 333C C3CC C3CC C3CC C333 3333 3333"            /* 333<ÃÌÃÌÃÌÃ33333 */
	$"3333 333C C3CC C3CC C3CC C333 3333 3333"            /* 333<ÃÌÃÌÃÌÃ33333 */
	$"3333 333C C3CC C3CC C3CC C333 3333 3333"            /* 333<ÃÌÃÌÃÌÃ33333 */
	$"3333 333C C3CC CCCC CCCC C333 CCC3 3333"            /* 333<ÃÌÌÌÌÌÃ3ÌÃ33 */
	$"3333 333C CCCC CCCC CCCC C33C CCC3 3333"            /* 333<ÌÌÌÌÌÌÃ<ÌÃ33 */
	$"3333 333C CCCC CCCC CCCC C33C CCC3 3333"            /* 333<ÌÌÌÌÌÌÃ<ÌÃ33 */
	$"3333 333C CCCC CCCC CCCC C3CC CC33 3333"            /* 333<ÌÌÌÌÌÌÃÌÌ333 */
	$"3333 333C CCCC CCCC CCCC CCCC CC33 3333"            /* 333<ÌÌÌÌÌÌÌÌÌ333 */
	$"3333 333C CCCC CCCC CCCC CCCC C333 3333"            /* 333<ÌÌÌÌÌÌÌÌÃ333 */
	$"3333 333C CCCC CCCC CCCC CCCC C333 3333"            /* 333<ÌÌÌÌÌÌÌÌÃ333 */
	$"3333 333C CCCC CCCC CCCC CCCC 3333 3333"            /* 333<ÌÌÌÌÌÌÌÌ3333 */
	$"3333 333C CCCC CCCC CCCC CCCC 3333 3333"            /* 333<ÌÌÌÌÌÌÌÌ3333 */
	$"3333 333C CCCC CCCC CCCC CCC3 3333 3333"            /* 333<ÌÌÌÌÌÌÌÃ3333 */
	$"3333 333C CCCC CCCC CCCC CCC3 3333 3333"            /* 333<ÌÌÌÌÌÌÌÃ3333 */
	$"0333 333C CCCC C3CC CCCC CC33 3333 3330"            /* .33<ÌÌÃÌÌÌÌ33330 */
	$"0033 3333 CCCC CC3C CCCC C333 3333 3300"            /* .333ÌÌÌ<ÌÌÃ3333. */
	$"0003 3333 3333 3333 3333 3333 3333 3000"            /* ..3333333333330. */
	$"0000 3333 3333 3333 3333 3333 3333 0000"            /* ..333333333333.. */
	$"0000 0333 3333 3333 3333 3333 3330 0000"            /* ...33333333330.. */
	$"0000 0033 3333 3333 3333 3333 3300 0000"            /* ...3333333333... */
	$"0000 0003 3333 3333 3333 3333 3000 0000"            /* ....333333330... */
};

data 'icl4' (1) {
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"F000 0000 0FFF FFFF FFFF FFFF FFFF FFFF"            /* ð....ÿÿÿÿÿÿÿÿÿÿÿ */
	$"F000 0000 0FFF FFFF FFFF FFFF FFFF FFFF"            /* ð....ÿÿÿÿÿÿÿÿÿÿÿ */
	$"F000 0000 0FFF FFFF FFFF FFFF FFFF FFFF"            /* ð....ÿÿÿÿÿÿÿÿÿÿÿ */
	$"F000 0000 0FFF FFFF FFFF FFFF FFFF FFFF"            /* ð....ÿÿÿÿÿÿÿÿÿÿÿ */
	$"F000 0000 0FFF FFFF FF00 0000 FFFF FFFF"            /* ð....ÿÿÿÿ...ÿÿÿÿ */
	$"F000 F000 0FFF FFFF 0000 0000 00FF FFFF"            /* ð.ð..ÿÿÿ.....ÿÿÿ */
	$"F000 F000 0FFF FFF0 0000 0000 000F FFFF"            /* ð.ð..ÿÿð......ÿÿ */
	$"F000 F000 0FFF FF00 0000 0000 0000 FFFF"            /* ð.ð..ÿÿ.......ÿÿ */
	$"F000 0000 0FFF F000 0000 0000 0000 0FFF"            /* ð....ÿð........ÿ */
	$"F000 0000 0FFF F000 0000 0000 0000 0FFF"            /* ð....ÿð........ÿ */
	$"F000 0000 0FFF 0000 0000 0000 0000 00FF"            /* ð....ÿ.........ÿ */
	$"F000 0000 0FFF 0003 3303 3303 3300 00FF"            /* ð....ÿ..3.3.3..ÿ */
	$"F000 0000 0FFF 0000 0000 0000 0000 00FF"            /* ð....ÿ.........ÿ */
	$"F000 0000 0FFF 0000 0000 0000 0000 00FF"            /* ð....ÿ.........ÿ */
	$"F000 0000 0FFF 0003 3303 3303 0300 00FF"            /* ð....ÿ..3.3....ÿ */
	$"F000 0000 0FFF 0000 0000 0000 0000 00FF"            /* ð....ÿ.........ÿ */
	$"F000 0000 0FFF 0000 0000 0000 0000 00FF"            /* ð....ÿ.........ÿ */
	$"F000 0000 0FFF 0003 3303 0333 0000 00FF"            /* ð....ÿ..3..3...ÿ */
	$"F000 0000 0FFF 0000 0000 0000 0000 00FF"            /* ð....ÿ.........ÿ */
	$"F000 0FFF FFFF 0000 0000 0000 0000 00FF"            /* ð..ÿÿÿ.........ÿ */
	$"F000 000F FFFF 0003 3330 3330 3300 00FF"            /* ð...ÿÿ..30303..ÿ */
	$"F000 000F FFFF 0000 0000 0000 0000 0FFF"            /* ð...ÿÿ.........ÿ */
	$"F000 000F FFFF 0000 0000 0000 0000 0FFF"            /* ð...ÿÿ.........ÿ */
	$"F000 000F FFFF 0000 0000 0000 0000 FFFF"            /* ð...ÿÿ........ÿÿ */
	$"F000 000F FFF0 0000 0000 0000 000F FFFF"            /* ð...ÿð........ÿÿ */
	$"F000 FFFF F000 0000 0000 0000 0FFF FFFF"            /* ð.ÿÿð........ÿÿÿ */
	$"F000 000F FFFF FFFF FFFF FFFF FFFF FFFF"            /* ð...ÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"F000 000F FFFF FFFF FFFF FFFF FFFF FFFF"            /* ð...ÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"F000 000F FFFF FFFF FFFF FFFF FFFF FFFF"            /* ð...ÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"F000 000F FFFF FFFF FFFF FFFF FFFF FFFF"            /* ð...ÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
};

data 'icl4' (2) {
	$"0000 0000 0000 000F F000 0000 0000 0000"            /* ........ð....... */
	$"0000 0000 0000 00FF FF00 0000 0000 0000"            /* .......ÿÿ....... */
	$"0000 0000 0000 00FF FF00 0000 0000 0000"            /* .......ÿÿ....... */
	$"0000 0000 0000 0FF1 1FF0 0000 0000 0000"            /* .......ñ.ð...... */
	$"0000 0000 0000 0FF1 1FF0 0000 0000 0000"            /* .......ñ.ð...... */
	$"0000 0000 0000 FF11 11FF 0000 0000 0000"            /* ......ÿ..ÿ...... */
	$"0000 0000 0000 FF11 11FF 0000 0000 0000"            /* ......ÿ..ÿ...... */
	$"0000 0000 000F F111 111F F000 0000 0000"            /* ......ñ...ð..... */
	$"0000 0000 000F F11F F11F F000 0000 0000"            /* ......ñ.ñ.ð..... */
	$"0000 0000 00FF 11FF FF11 FF00 0000 0000"            /* .....ÿ.ÿÿ.ÿ..... */
	$"0000 0000 00FF 11FF FF11 FF00 0000 0000"            /* .....ÿ.ÿÿ.ÿ..... */
	$"0000 0000 0FF1 11FF FF11 1FF0 0000 0000"            /* .....ñ.ÿÿ..ð.... */
	$"0000 0000 0FF1 11FF FF11 1FF0 0000 0000"            /* .....ñ.ÿÿ..ð.... */
	$"0000 0000 FF11 11FF FF11 11FF 0000 0000"            /* ....ÿ..ÿÿ..ÿ.... */
	$"0000 0000 FF11 11FF FF11 11FF 0000 0000"            /* ....ÿ..ÿÿ..ÿ.... */
	$"0000 000F F111 11FF FF11 111F F000 0000"            /* ....ñ..ÿÿ...ð... */
	$"0000 000F F111 11FF FF11 111F F000 0000"            /* ....ñ..ÿÿ...ð... */
	$"0000 00FF 1111 11FF FF11 1111 FF00 0000"            /* ...ÿ...ÿÿ...ÿ... */
	$"0000 00FF 1111 11FF FF11 1111 FF00 0000"            /* ...ÿ...ÿÿ...ÿ... */
	$"0000 0FF1 1111 11FF FF11 1111 1FF0 0000"            /* ...ñ...ÿÿ....ð.. */
	$"0000 0FF1 1111 111F F111 1111 1FF0 0000"            /* ...ñ....ñ....ð.. */
	$"0000 FF11 1111 111F F111 1111 11FF 0000"            /* ..ÿ.....ñ....ÿ.. */
	$"0000 FF11 1111 1111 1111 1111 11FF 0000"            /* ..ÿ..........ÿ.. */
	$"000F F111 1111 1111 1111 1111 111F F000"            /* ..ñ...........ð. */
	$"000F F111 1111 111F F111 1111 111F F000"            /* ..ñ.....ñ.....ð. */
	$"00FF 1111 1111 11FF FF11 1111 1111 FF00"            /* .ÿ.....ÿÿ.....ÿ. */
	$"00FF 1111 1111 11FF FF11 1111 1111 FF00"            /* .ÿ.....ÿÿ.....ÿ. */
	$"0FF1 1111 1111 111F F111 1111 1111 1FF0"            /* .ñ......ñ......ð */
	$"0FF1 1111 1111 1111 1111 1111 1111 1FF0"            /* .ñ.............ð */
	$"FF11 1111 1111 1111 1111 1111 1111 11FF"            /* ÿ..............ÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"0FFF FFFF FFFF FFFF FFFF FFFF FFFF FFF0"            /* .ÿÿÿÿÿÿÿÿÿÿÿÿÿÿð */
};

data 'icl4' (128) {
	$"00DD DDDD DDDD DDDD DDDD DDDD DDDD DD00"            /* .ÝÝÝÝÝÝÝÝÝÝÝÝÝÝ. */
	$"0D00 0000 0000 0000 0000 0000 0000 0CA0"            /* ...............  */
	$"D00C CCCC C00C CCCC CCCC CCCC CCCC CCCA"            /* Ð.ÌÌÀ.ÌÌÌÌÌÌÌÌÌÊ */
	$"D0CC CCC0 0CCC CCCC CCCC CCCC CCCC CCCA"            /* ÐÌÌÀ.ÌÌÌÌÌÌÌÌÌÌÊ */
	$"D0CC CC0C CCCC CCDD DDCC CCCC CCCC CCCA"            /* ÐÌÌ.ÌÌÌÝÝÌÌÌÌÌÌÊ */
	$"D0CC C0CC CCCC CCCC CCCC DCCC CCCC CCCA"            /* ÐÌÀÌÌÌÌÌÌÌÜÌÌÌÌÊ */
	$"D0CC 00CC CCCC C000 000C CCCC CCCC CCCA"            /* ÐÌ.ÌÌÌÀ...ÌÌÌÌÌÊ */
	$"D0CC 0CCC CC00 0CCC CCC0 0CCC CCCC CCCA"            /* ÐÌ.ÌÌ..ÌÌÀ.ÌÌÌÌÊ */
	$"D0C0 CCCC C00C CCDD DDDC C00C CCCC CCCA"            /* ÐÀÌÌÀ.ÌÝÝÜÀ.ÌÌÌÊ */
	$"D0C0 CCCC 0CCC DCCC CCCD DCCC CCCC CCCA"            /* ÐÀÌÌ.ÌÜÌÌÍÜÌÌÌÌÊ */
	$"D00C CCCC CCCD CC00 000C CDCC CCCC CCCA"            /* Ð.ÌÌÌÍÌ...ÍÌÌÌÌÊ */
	$"D00C CCCC CCDC 0CCD DDC0 CCDC CCCC CCCA"            /* Ð.ÌÌÌÜ.ÍÝÀÌÜÌÌÌÊ */
	$"D0CC CCCC CDC0 CDDC DD5D 0CDC CCCC CCCA"            /* ÐÌÌÌÍÀÍÜÝ].ÜÌÌÌÊ */
	$"D0CC CCCC DCCC DCCC DD55 CCCD CCCC CCCA"            /* ÐÌÌÌÜÌÜÌÝUÌÍÌÌÌÊ */
	$"D0CC DCCC DCCC DCCD D556 ECCD CCCC CCCA"            /* ÐÌÜÌÜÌÜÍÕVìÍÌÌÌÊ */
	$"D0CC DCCC DCCD 5DD5 555E ECCD CCCC CCCA"            /* ÐÌÜÌÜÍ]ÕU^ìÍÌÌÌÊ */
	$"D0CC DCCC DCCD 5555 56EF ECCD CCCC CCCA"            /* ÐÌÜÌÜÍUUVïìÍÌÌÌÊ */
	$"D0CC CCCC DCCC 5556 6EFF ECCD CCCC CCCA"            /* ÐÌÌÌÜÌUVnÿìÍÌÌÌÊ */
	$"D0CC CCCC CCCC D6EE EFFE DCCC CCCC CCCA"            /* ÐÌÌÌÌÌÖîïþÜÌÌÌÌÊ */
	$"D0CC CCCC CCCC CEEF FFED CCDC CCCC CCCA"            /* ÐÌÌÌÌÌÎïÿíÌÜÌÌÌÊ */
	$"D0CC CCCC 0CDC CCDE EDDC CDC0 CCCC CCCA"            /* ÐÌÌÌ.ÜÌÞíÜÍÀÌÌÌÊ */
	$"D0CC CCCC C0CD CCCC CCCD DCCC CCCC CCCA"            /* ÐÌÌÌÀÍÌÌÌÍÜÌÌÌÌÊ */
	$"D0CC CCCC CC0C CDDD DDDD CC0C CCCC CCCA"            /* ÐÌÌÌÌ.ÍÝÝÝÌ.ÌÌÌÊ */
	$"D0CC C0CC CCC0 CCCC CCCC 00CC CCCC CCCA"            /* ÐÌÀÌÌÀÌÌÌÌ.ÌÌÌÌÊ */
	$"D0CC CC0C CCCC 0000 0000 0CCC C0CC CCCA"            /* ÐÌÌ.ÌÌ.....ÌÀÌÌÊ */
	$"D0CC CCC0 CCCC CC00 00CC CCCC 0CCC CCCA"            /* ÐÌÌÀÌÌÌ..ÌÌÌ.ÌÌÊ */
	$"D0CC CCCC 0CCC CCCC CCCC CCC0 CCCC CCCA"            /* ÐÌÌÌ.ÌÌÌÌÌÌÀÌÌÌÊ */
	$"D0CC CCCC C00C CCCC CCCC C00C CCCC C0CA"            /* ÐÌÌÌÀ.ÌÌÌÌÀ.ÌÌÀÊ */
	$"D0CC CCCC CC00 0000 0000 0CCC CCCC 0CCA"            /* ÐÌÌÌÌ......ÌÌÌ.Ê */
	$"DC0C CCCC CCCC C000 00CC CCCC CC00 CCDA"            /* Ü.ÌÌÌÌÀ..ÌÌÌÌ.ÌÚ */
	$"0ADC CCCC CCCC CCCC CCCC CCCC CCCC CDA0"            /* ÂÜÌÌÌÌÌÌÌÌÌÌÌÌÍ  */
	$"00AA AAAA AAAA AAAA AAAA AAAA AAAA AA00"            /* .ªªªªªªªªªªªªªª. */
};

data 'icl4' (129) {
	$"0000 FFFF FFFF FFFF FFFF FF00 0000 0000"            /* ..ÿÿÿÿÿÿÿÿÿ..... */
	$"0000 F000 0000 0000 0000 0FF0 0000 0000"            /* ..ð........ð.... */
	$"0000 F000 0000 0000 0000 0FCF 0000 0000"            /* ..ð........Ï.... */
	$"0000 F000 0000 0000 0000 0FCC F000 0000"            /* ..ð........Ìð... */
	$"0000 F000 0000 0000 0000 0FCC CF00 0000"            /* ..ð........ÌÏ... */
	$"0000 F000 0000 0000 0000 0FCC CCF0 0000"            /* ..ð........ÌÌð.. */
	$"0000 F000 0000 0000 0000 0FFF FFFF 0000"            /* ..ð........ÿÿÿ.. */
	$"0000 F000 0000 0DDD DDD0 0000 000F 0000"            /* ..ð....ÝÝÐ...... */
	$"0000 F000 000D D000 000D D000 000F 0000"            /* ..ð...Ð...Ð..... */
	$"0000 F000 0DD0 0000 0000 0DD0 000F 0000"            /* ..ð..Ð.....Ð.... */
	$"0000 F000 D000 00DD DD00 000D 000F 0000"            /* ..ð.Ð..ÝÝ....... */
	$"0000 F000 D000 DD00 00DD 000D 000F 0000"            /* ..ð.Ð.Ý..Ý...... */
	$"0000 F00D 000D 0000 0000 D000 D00F 0000"            /* ..ð.......Ð.Ð... */
	$"0000 F00D 00D0 00DD DD00 0D00 D00F 0000"            /* ..ð..Ð.ÝÝ...Ð... */
	$"0000 F0D0 00D0 0D00 0DD0 0D00 0D0F 0000"            /* ..ðÐ.Ð...Ð...... */
	$"0000 F0D0 0D00 D000 DD5D 00D0 0D0F 0000"            /* ..ðÐ..Ð.Ý].Ð.... */
	$"0000 F0D0 0D00 D000 D566 00D0 0D0F 0000"            /* ..ðÐ..Ð.Õf.Ð.... */
	$"0000 F0D0 0D00 D0DD 5EEE 00D0 0D0F 0000"            /* ..ðÐ..ÐÝ^î.Ð.... */
	$"0000 F0D0 0D00 DDD5 EFF5 00D0 0D0F 0000"            /* ..ðÐ..ÝÕïõ.Ð.... */
	$"0000 F0D0 00D0 0D56 FFE0 0D00 0D0F 0000"            /* ..ðÐ.Ð.Vÿà...... */
	$"0000 F00D 00D0 0056 E500 0D00 D00F 0000"            /* ..ð..Ð.Vå...Ð... */
	$"0000 F00D 000D 0000 0000 D000 D00F 0000"            /* ..ð.......Ð.Ð... */
	$"0000 F000 D000 DD00 00DD 000D 000F 0000"            /* ..ð.Ð.Ý..Ý...... */
	$"0000 F000 D000 00DD DD00 000D 000F 0000"            /* ..ð.Ð..ÝÝ....... */
	$"0000 F000 0DD0 0000 0000 0DD0 000F 0000"            /* ..ð..Ð.....Ð.... */
	$"0000 F000 000D D000 000D D000 000F 0000"            /* ..ð...Ð...Ð..... */
	$"0000 F000 0000 0DDD DDD0 0000 000F 0000"            /* ..ð....ÝÝÐ...... */
	$"0000 F000 0000 0000 0000 0000 000F 0000"            /* ..ð............. */
	$"0000 F000 0000 0000 0000 0000 000F 0000"            /* ..ð............. */
	$"0000 F000 0000 0000 0000 0000 000F 0000"            /* ..ð............. */
	$"0000 F000 0000 0000 0000 0000 000F 0000"            /* ..ð............. */
	$"0000 FFFF FFFF FFFF FFFF FFFF FFFF 0000"            /* ..ÿÿÿÿÿÿÿÿÿÿÿÿ.. */
};

data 'icl8' (0) {
	$"0000 0000 0000 0000 D8D8 D8D8 D8D8 D8D8"            /* ........ØØØØØØØØ */
	$"D8D8 D8D8 D8D8 D8D8 0000 0000 0000 0000"            /* ØØØØØØØØ........ */
	$"0000 0000 0000 00D8 D8D8 D8D8 D8D8 D8D8"            /* .......ØØØØØØØØØ */
	$"D8D8 D8D8 D8D8 D8D8 D800 0000 0000 0000"            /* ØØØØØØØØØ....... */
	$"0000 0000 0000 D8D8 D8D8 D8D8 D8D8 D8D8"            /* ......ØØØØØØØØØØ */
	$"D8D8 D8D8 D8D8 D8D8 D8D8 0000 0000 0000"            /* ØØØØØØØØØØ...... */
	$"0000 0000 00D8 D8D8 D8D8 D8D8 D8D8 D808"            /* .....ØØØØØØØØØØ. */
	$"D8D8 D8D8 D8D8 D8D8 D8D8 D800 0000 0000"            /* ØØØØØØØØØØØ..... */
	$"0000 0000 D8D8 D8D8 D8D8 D8D8 D8D8 0808"            /* ....ØØØØØØØØØØ.. */
	$"08D8 D8D8 D8D8 D8D8 D8D8 D8D8 0000 0000"            /* .ØØØØØØØØØØØ.... */
	$"0000 00D8 D8D8 D8D8 D8D8 D808 D8D8 0808"            /* ...ØØØØØØØØ.ØØ.. */
	$"08D8 D808 08D8 D8D8 D8D8 D8D8 D800 0000"            /* .ØØ..ØØØØØØØØ... */
	$"0000 D8D8 D8D8 D8D8 D8D8 0808 08D8 0808"            /* ..ØØØØØØØØ...Ø.. */
	$"08D8 0808 08D8 D8D8 D8D8 D8D8 D8D8 0000"            /* .Ø...ØØØØØØØØØ.. */
	$"00D8 D8D8 D8D8 D8D8 D8D8 0808 08D8 0808"            /* .ØØØØØØØØØ...Ø.. */
	$"08D8 0808 08D8 D8D8 D8D8 D8D8 D8D8 D800"            /* .Ø...ØØØØØØØØØØ. */
	$"D8D8 D8D8 D8D8 D8D8 08D8 0808 08D8 0808"            /* ØØØØØØØØ.Ø...Ø.. */
	$"08D8 0808 08D8 D8D8 D8D8 D8D8 D8D8 D8D8"            /* .Ø...ØØØØØØØØØØØ */
	$"D8D8 D8D8 D8D8 D808 08D8 0808 08D8 0808"            /* ØØØØØØØ..Ø...Ø.. */
	$"08D8 0808 08D8 D8D8 D8D8 D8D8 D8D8 D8D8"            /* .Ø...ØØØØØØØØØØØ */
	$"D8D8 D8D8 D8D8 D808 08D8 0808 08D8 0808"            /* ØØØØØØØ..Ø...Ø.. */
	$"08D8 0808 08D8 D8D8 D8D8 D8D8 D8D8 D8D8"            /* .Ø...ØØØØØØØØØØØ */
	$"D8D8 D8D8 D8D8 D808 08D8 0808 08D8 0808"            /* ØØØØØØØ..Ø...Ø.. */
	$"08D8 0808 08D8 D8D8 D8D8 D8D8 D8D8 D8D8"            /* .Ø...ØØØØØØØØØØØ */
	$"D8D8 D8D8 D8D8 D808 08D8 0808 08D8 0808"            /* ØØØØØØØ..Ø...Ø.. */
	$"08D8 0808 08D8 D8D8 D8D8 D8D8 D8D8 D8D8"            /* .Ø...ØØØØØØØØØØØ */
	$"D8D8 D8D8 D8D8 D808 08D8 0808 08D8 0808"            /* ØØØØØØØ..Ø...Ø.. */
	$"08D8 0808 08D8 D8D8 D8D8 D8D8 D8D8 D8D8"            /* .Ø...ØØØØØØØØØØØ */
	$"D8D8 D8D8 D8D8 D808 08D8 0808 0808 0808"            /* ØØØØØØØ..Ø...... */
	$"0808 0808 08D8 D8D8 0808 08D8 D8D8 D8D8"            /* .....ØØØ...ØØØØØ */
	$"D8D8 D8D8 D8D8 D808 0808 0808 0808 0808"            /* ØØØØØØØ......... */
	$"0808 0808 08D8 D808 0808 08D8 D8D8 D8D8"            /* .....ØØ....ØØØØØ */
	$"D8D8 D8D8 D8D8 D808 0808 0808 0808 0808"            /* ØØØØØØØ......... */
	$"0808 0808 08D8 D808 0808 08D8 D8D8 D8D8"            /* .....ØØ....ØØØØØ */
	$"D8D8 D8D8 D8D8 D808 0808 0808 0808 0808"            /* ØØØØØØØ......... */
	$"0808 0808 08D8 0808 0808 D8D8 D8D8 D8D8"            /* .....Ø....ØØØØØØ */
	$"D8D8 D8D8 D8D8 D808 0808 0808 0808 0808"            /* ØØØØØØØ......... */
	$"0808 0808 0808 0808 0808 D8D8 D8D8 D8D8"            /* ..........ØØØØØØ */
	$"D8D8 D8D8 D8D8 D808 0808 0808 0808 0808"            /* ØØØØØØØ......... */
	$"0808 0808 0808 0808 08D8 D8D8 D8D8 D8D8"            /* .........ØØØØØØØ */
	$"D8D8 D8D8 D8D8 D808 0808 0808 0808 0808"            /* ØØØØØØØ......... */
	$"0808 0808 0808 0808 08D8 D8D8 D8D8 D8D8"            /* .........ØØØØØØØ */
	$"D8D8 D8D8 D8D8 D808 0808 0808 0808 0808"            /* ØØØØØØØ......... */
	$"0808 0808 0808 0808 D8D8 D8D8 D8D8 D8D8"            /* ........ØØØØØØØØ */
	$"D8D8 D8D8 D8D8 D808 0808 0808 0808 0808"            /* ØØØØØØØ......... */
	$"0808 0808 0808 0808 D8D8 D8D8 D8D8 D8D8"            /* ........ØØØØØØØØ */
	$"D8D8 D8D8 D8D8 D808 0808 0808 0808 0808"            /* ØØØØØØØ......... */
	$"0808 0808 0808 08D8 D8D8 D8D8 D8D8 D8D8"            /* .......ØØØØØØØØØ */
	$"D8D8 D8D8 D8D8 D808 0808 0808 0808 0808"            /* ØØØØØØØ......... */
	$"0808 0808 0808 08D8 D8D8 D8D8 D8D8 D8D8"            /* .......ØØØØØØØØØ */
	$"00D8 D8D8 D8D8 D808 0808 0808 08D8 0808"            /* .ØØØØØØ......Ø.. */
	$"0808 0808 0808 D8D8 D8D8 D8D8 D8D8 D800"            /* ......ØØØØØØØØØ. */
	$"0000 D8D8 D8D8 D8D8 0808 0808 0808 D808"            /* ..ØØØØØØ......Ø. */
	$"0808 0808 08D8 D8D8 D8D8 D8D8 D8D8 0000"            /* .....ØØØØØØØØØ.. */
	$"0000 00D8 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8"            /* ...ØØØØØØØØØØØØØ */
	$"D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 D800 0000"            /* ØØØØØØØØØØØØØ... */
	$"0000 0000 D8D8 D8D8 D8D8 D8D8 D8D8 D8D8"            /* ....ØØØØØØØØØØØØ */
	$"D8D8 D8D8 D8D8 D8D8 D8D8 D8D8 0000 0000"            /* ØØØØØØØØØØØØ.... */
	$"0000 0000 00D8 D8D8 D8D8 D8D8 D8D8 D8D8"            /* .....ØØØØØØØØØØØ */
	$"D8D8 D8D8 D8D8 D8D8 D8D8 D800 0000 0000"            /* ØØØØØØØØØØØ..... */
	$"0000 0000 0000 D8D8 D8D8 D8D8 D8D8 D8D8"            /* ......ØØØØØØØØØØ */
	$"D8D8 D8D8 D8D8 D8D8 D8D8 0000 0000 0000"            /* ØØØØØØØØØØ...... */
	$"0000 0000 0000 00D8 D8D8 D8D8 D8D8 D8D8"            /* .......ØØØØØØØØØ */
	$"D8D8 D8D8 D8D8 D8D8 D800 0000 0000 0000"            /* ØØØØØØØØØ....... */
};

data 'icl8' (1) {
	$"FFFF FFFF FFFF FFFF FFFD FDFD FDFD FDFD"            /* ÿÿÿÿÿÿÿÿÿýýýýýýý */
	$"FDFD FDFD FDFD FDFD FDFD FDFD FDFD FDFD"            /* ýýýýýýýýýýýýýýýý */
	$"FF08 0808 0808 0808 08FD FDFD FDFD FDFD"            /* ÿ........ýýýýýýý */
	$"FDFD FDFD FDFD FDFD FDFD FDFD FDFD FDFD"            /* ýýýýýýýýýýýýýýýý */
	$"FF08 0808 0808 0808 08FD FDFD FDFD FDFD"            /* ÿ........ýýýýýýý */
	$"FDFD FDFD FDFD FDFD FDFD FDFD FDFD FDFD"            /* ýýýýýýýýýýýýýýýý */
	$"FF08 0808 0808 0808 08FD FDFD FDFD FDFD"            /* ÿ........ýýýýýýý */
	$"FDFD FDFD FDFD FDFD FDFD FDFD FDFD FDFD"            /* ýýýýýýýýýýýýýýýý */
	$"FF08 0808 0808 0808 08FD FDFD FDFD FDFD"            /* ÿ........ýýýýýýý */
	$"FDFD FDFD FDFD FDFD FDFD FDFD FDFD FDFD"            /* ýýýýýýýýýýýýýýýý */
	$"FF08 0808 0808 0808 08FD FDFD FDFD FDFD"            /* ÿ........ýýýýýýý */
	$"FDFD 2B2B 2B2B 2B2B FDFD FDFD FDFD FDFD"            /* ýý++++++ýýýýýýýý */
	$"FF08 0808 FF08 0808 08FD FDFD FDFD FDFD"            /* ÿ...ÿ....ýýýýýýý */
	$"2B2B 2B2B 2B2B 2B2B 2B2B FDFD FDFD FDFD"            /* ++++++++++ýýýýýý */
	$"FF08 0808 FF08 0808 08FD FDFD FDFD FD2B"            /* ÿ...ÿ....ýýýýýý+ */
	$"2B2B 2B2B 2B2B 2B2B 2B2B 2BFD FDFD FDFD"            /* +++++++++++ýýýýý */
	$"FF08 0808 FF08 0808 08FD FDFD FDFD 2B2B"            /* ÿ...ÿ....ýýýýý++ */
	$"2B2B 2B2B 2B2B 2B2B 2B2B 2B2B FDFD FDFD"            /* ++++++++++++ýýýý */
	$"FF08 0808 0808 0808 08FD FDFD FD2B 2B2B"            /* ÿ........ýýýý+++ */
	$"2B2B 2B2B 2B2B 2B2B 2B2B 2B2B 2BFD FDFD"            /* +++++++++++++ýýý */
	$"FF08 0808 0808 0808 08FD FDFD FD2B 2B2B"            /* ÿ........ýýýý+++ */
	$"2B2B 2B2B 2B2B 2B2B 2B2B 2B2B 2BFD FDFD"            /* +++++++++++++ýýý */
	$"FF08 0808 0808 0808 08FD FDFD 2B2B 2B2B"            /* ÿ........ýýý++++ */
	$"2B2B 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B FDFD"            /* ++++++++++++++ýý */
	$"FF08 0808 0808 0808 08FD FDFD 2B2B 2BD8"            /* ÿ........ýýý+++Ø */
	$"D8D8 2BD8 D8D8 2BD8 D8D8 2B2B 2B2B FDFD"            /* ØØ+ØØØ+ØØØ++++ýý */
	$"FF08 0808 0808 0808 08FD FDFD 2B2B 2B2B"            /* ÿ........ýýý++++ */
	$"2B2B 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B FDFD"            /* ++++++++++++++ýý */
	$"FF08 0808 0808 0808 08FD FDFD 2B2B 2B2B"            /* ÿ........ýýý++++ */
	$"2B2B 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B FDFD"            /* ++++++++++++++ýý */
	$"FF08 0808 0808 0808 08FD FDFD 2B2B 2BD8"            /* ÿ........ýýý+++Ø */
	$"D8D8 2BD8 D8D8 2BD8 2BD8 2B2B 2B2B FDFD"            /* ØØ+ØØØ+Ø+Ø++++ýý */
	$"FF08 0808 0808 0808 08FD FDFD 2B2B 2B2B"            /* ÿ........ýýý++++ */
	$"2B2B 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B FDFD"            /* ++++++++++++++ýý */
	$"FF08 0808 0808 0808 08FD FDFD 2B2B 2B2B"            /* ÿ........ýýý++++ */
	$"2B2B 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B FDFD"            /* ++++++++++++++ýý */
	$"FF08 0808 0808 0808 08FD FDFD 2B2B 2BD8"            /* ÿ........ýýý+++Ø */
	$"D8D8 2BD8 2BD8 D8D8 2B2B 2B2B 2B2B FDFD"            /* ØØ+Ø+ØØØ++++++ýý */
	$"FF08 0808 0808 0808 08FD FDFD 2B2B 2B2B"            /* ÿ........ýýý++++ */
	$"2B2B 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B FDFD"            /* ++++++++++++++ýý */
	$"FF08 0808 08FD FDFD FDFD FDFD 2B2B 2B2B"            /* ÿ....ýýýýýýý++++ */
	$"2B2B 2B2B 2B2B 2B2B 2B2B 2B2B 2B2B FDFD"            /* ++++++++++++++ýý */
	$"FF08 0808 0808 08FD FDFD FDFD 2B2B 2BD8"            /* ÿ......ýýýýý+++Ø */
	$"D8D8 D82B D8D8 D82B D8D8 2B2B 2B2B FDFD"            /* ØØØ+ØØØ+ØØ++++ýý */
	$"FF08 0808 0808 08FD FDFD FDFD 2B2B 2B2B"            /* ÿ......ýýýýý++++ */
	$"2B2B 2B2B 2B2B 2B2B 2B2B 2B2B 2BFD FDFD"            /* +++++++++++++ýýý */
	$"FF08 0808 0808 08FD FDFD FDFD 2B2B 2B2B"            /* ÿ......ýýýýý++++ */
	$"2B2B 2B2B 2B2B 2B2B 2B2B 2B2B 2BFD FDFD"            /* +++++++++++++ýýý */
	$"FF08 0808 0808 08FD FDFD FDFD 2B2B 2B2B"            /* ÿ......ýýýýý++++ */
	$"2B2B 2B2B 2B2B 2B2B 2B2B 2B2B FDFD FDFD"            /* ++++++++++++ýýýý */
	$"FF08 0808 0808 08FD FDFD FD2B 2B2B 2B2B"            /* ÿ......ýýýý+++++ */
	$"2B2B 2B2B 2B2B 2B2B 2B2B 2BFD FDFD FDFD"            /* +++++++++++ýýýýý */
	$"FF08 0808 FDFD FDFD FD2B 2B2B 2B2B 2B2B"            /* ÿ...ýýýýý+++++++ */
	$"2B2B 2B2B 2B2B 2B2B 2BFD FDFD FDFD FDFD"            /* +++++++++ýýýýýýý */
	$"FF08 0808 0808 08FD FDFD FDFD FDFD FDFD"            /* ÿ......ýýýýýýýýý */
	$"FDFD FDFD FDFD FDFD FDFD FDFD FDFD FDFD"            /* ýýýýýýýýýýýýýýýý */
	$"FF08 0808 0808 08FD FDFD FDFD FDFD FDFD"            /* ÿ......ýýýýýýýýý */
	$"FDFD FDFD FDFD FDFD FDFD FDFD FDFD FDFD"            /* ýýýýýýýýýýýýýýýý */
	$"FF08 0808 0808 08FD FDFD FDFD FDFD FDFD"            /* ÿ......ýýýýýýýýý */
	$"FDFD FDFD FDFD FDFD FDFD FDFD FDFD FDFD"            /* ýýýýýýýýýýýýýýýý */
	$"FF08 0808 0808 08FD FDFD FDFD FDFD FDFD"            /* ÿ......ýýýýýýýýý */
	$"FDFD FDFD FDFD FDFD FDFD FDFD FDFD FDFD"            /* ýýýýýýýýýýýýýýýý */
	$"FFFF FFFF FFFF FFFD FDFD FDFD FDFD FDFD"            /* ÿÿÿÿÿÿÿýýýýýýýýý */
	$"FDFD FDFD FDFD FDFD FDFD FDFD FDFD FDFD"            /* ýýýýýýýýýýýýýýýý */
};

data 'icl8' (2) {
	$"0000 0000 0000 0000 0000 0000 0000 00FF"            /* ...............ÿ */
	$"FF00 0000 0000 0000 0000 0000 0000 0000"            /* ÿ............... */
	$"0000 0000 0000 0000 0000 0000 0000 FFFF"            /* ..............ÿÿ */
	$"FFFF 0000 0000 0000 0000 0000 0000 0000"            /* ÿÿ.............. */
	$"0000 0000 0000 0000 0000 0000 0000 FFFF"            /* ..............ÿÿ */
	$"FFFF 0000 0000 0000 0000 0000 0000 0000"            /* ÿÿ.............. */
	$"0000 0000 0000 0000 0000 0000 00FF FF05"            /* .............ÿÿ. */
	$"05FF FF00 0000 0000 0000 0000 0000 0000"            /* .ÿÿ............. */
	$"0000 0000 0000 0000 0000 0000 00FF FF05"            /* .............ÿÿ. */
	$"05FF FF00 0000 0000 0000 0000 0000 0000"            /* .ÿÿ............. */
	$"0000 0000 0000 0000 0000 0000 FFFF 0505"            /* ............ÿÿ.. */
	$"0505 FFFF 0000 0000 0000 0000 0000 0000"            /* ..ÿÿ............ */
	$"0000 0000 0000 0000 0000 0000 FFFF 0505"            /* ............ÿÿ.. */
	$"0505 FFFF 0000 0000 0000 0000 0000 0000"            /* ..ÿÿ............ */
	$"0000 0000 0000 0000 0000 00FF FF05 0505"            /* ...........ÿÿ... */
	$"0505 05FF FF00 0000 0000 0000 0000 0000"            /* ...ÿÿ........... */
	$"0000 0000 0000 0000 0000 00FF FF05 05FF"            /* ...........ÿÿ..ÿ */
	$"FF05 05FF FF00 0000 0000 0000 0000 0000"            /* ÿ..ÿÿ........... */
	$"0000 0000 0000 0000 0000 FFFF 0505 FFFF"            /* ..........ÿÿ..ÿÿ */
	$"FFFF 0505 FFFF 0000 0000 0000 0000 0000"            /* ÿÿ..ÿÿ.......... */
	$"0000 0000 0000 0000 0000 FFFF 0505 FFFF"            /* ..........ÿÿ..ÿÿ */
	$"FFFF 0505 FFFF 0000 0000 0000 0000 0000"            /* ÿÿ..ÿÿ.......... */
	$"0000 0000 0000 0000 00FF FF05 0505 FFFF"            /* .........ÿÿ...ÿÿ */
	$"FFFF 0505 05FF FF00 0000 0000 0000 0000"            /* ÿÿ...ÿÿ......... */
	$"0000 0000 0000 0000 00FF FF05 0505 FFFF"            /* .........ÿÿ...ÿÿ */
	$"FFFF 0505 05FF FF00 0000 0000 0000 0000"            /* ÿÿ...ÿÿ......... */
	$"0000 0000 0000 0000 FFFF 0505 0505 FFFF"            /* ........ÿÿ....ÿÿ */
	$"FFFF 0505 0505 FFFF 0000 0000 0000 0000"            /* ÿÿ....ÿÿ........ */
	$"0000 0000 0000 0000 FFFF 0505 0505 FFFF"            /* ........ÿÿ....ÿÿ */
	$"FFFF 0505 0505 FFFF 0000 0000 0000 0000"            /* ÿÿ....ÿÿ........ */
	$"0000 0000 0000 00FF FF05 0505 0505 FFFF"            /* .......ÿÿ.....ÿÿ */
	$"FFFF 0505 0505 05FF FF00 0000 0000 0000"            /* ÿÿ.....ÿÿ....... */
	$"0000 0000 0000 00FF FF05 0505 0505 FFFF"            /* .......ÿÿ.....ÿÿ */
	$"FFFF 0505 0505 05FF FF00 0000 0000 0000"            /* ÿÿ.....ÿÿ....... */
	$"0000 0000 0000 FFFF 0505 0505 0505 FFFF"            /* ......ÿÿ......ÿÿ */
	$"FFFF 0505 0505 0505 FFFF 0000 0000 0000"            /* ÿÿ......ÿÿ...... */
	$"0000 0000 0000 FFFF 0505 0505 0505 FFFF"            /* ......ÿÿ......ÿÿ */
	$"FFFF 0505 0505 0505 FFFF 0000 0000 0000"            /* ÿÿ......ÿÿ...... */
	$"0000 0000 00FF FF05 0505 0505 0505 FFFF"            /* .....ÿÿ.......ÿÿ */
	$"FFFF 0505 0505 0505 05FF FF00 0000 0000"            /* ÿÿ.......ÿÿ..... */
	$"0000 0000 00FF FF05 0505 0505 0505 05FF"            /* .....ÿÿ........ÿ */
	$"FF05 0505 0505 0505 05FF FF00 0000 0000"            /* ÿ........ÿÿ..... */
	$"0000 0000 FFFF 0505 0505 0505 0505 05FF"            /* ....ÿÿ.........ÿ */
	$"FF05 0505 0505 0505 0505 FFFF 0000 0000"            /* ÿ.........ÿÿ.... */
	$"0000 0000 FFFF 0505 0505 0505 0505 0505"            /* ....ÿÿ.......... */
	$"0505 0505 0505 0505 0505 FFFF 0000 0000"            /* ..........ÿÿ.... */
	$"0000 00FF FF05 0505 0505 0505 0505 0505"            /* ...ÿÿ........... */
	$"0505 0505 0505 0505 0505 05FF FF00 0000"            /* ...........ÿÿ... */
	$"0000 00FF FF05 0505 0505 0505 0505 05FF"            /* ...ÿÿ..........ÿ */
	$"FF05 0505 0505 0505 0505 05FF FF00 0000"            /* ÿ..........ÿÿ... */
	$"0000 FFFF 0505 0505 0505 0505 0505 FFFF"            /* ..ÿÿ..........ÿÿ */
	$"FFFF 0505 0505 0505 0505 0505 FFFF 0000"            /* ÿÿ..........ÿÿ.. */
	$"0000 FFFF 0505 0505 0505 0505 0505 FFFF"            /* ..ÿÿ..........ÿÿ */
	$"FFFF 0505 0505 0505 0505 0505 FFFF 0000"            /* ÿÿ..........ÿÿ.. */
	$"00FF FF05 0505 0505 0505 0505 0505 05FF"            /* .ÿÿ............ÿ */
	$"FF05 0505 0505 0505 0505 0505 05FF FF00"            /* ÿ............ÿÿ. */
	$"00FF FF05 0505 0505 0505 0505 0505 0505"            /* .ÿÿ............. */
	$"0505 0505 0505 0505 0505 0505 05FF FF00"            /* .............ÿÿ. */
	$"FFFF 0505 0505 0505 0505 0505 0505 0505"            /* ÿÿ.............. */
	$"0505 0505 0505 0505 0505 0505 0505 FFFF"            /* ..............ÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"00FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* .ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ. */
};

data 'icl8' (128) {
	$"0000 5656 5656 5656 5656 5656 5656 5656"            /* ..VVVVVVVVVVVVVV */
	$"5656 5656 5656 5656 5656 5656 5656 0000"            /* VVVVVVVVVVVVVV.. */
	$"0056 0000 0000 0000 0000 0000 0000 0000"            /* .V.............. */
	$"0000 0000 0000 0000 0000 0000 00F6 FD00"            /* .............öý. */
	$"5600 00F6 F6F6 2B2B F6F5 F5F6 F6F6 F6F6"            /* V..ööö++öõõööööö */
	$"F6F6 F6F6 F6F6 F6F6 F62B 2BF6 F6F6 F7FD"            /* ööööööööö++ööö÷ý */
	$"5600 F6F6 F6F7 2BF5 F5F6 F6F6 F6F6 F6F6"            /* V.ööö÷+õõööööööö */
	$"F6F6 F6F6 F6F6 F6F6 F6F6 F62B F6F6 F7FD"            /* ööööööööööö+öö÷ý */
	$"5600 F6F6 F72B F5F6 F6F6 F62B F7F8 56F9"            /* V.öö÷+õöööö+÷øVù */
	$"F956 F8F7 F6F6 F6F6 F6F6 F6F6 2BF6 2BFD"            /* ùVø÷öööööööö+ö+ý */
	$"5600 F62B 2BF5 F6F6 F62B F8F8 F72B F6F6"            /* V.ö++õööö+øø÷+öö */
	$"F62B F7F8 56F8 F6F6 F6F6 F6F6 2B2B 2BFD"            /* ö+÷øVøöööööö+++ý */
	$"5600 2BF7 F5F5 F6F6 F7F8 F7F6 F6F5 F5F5"            /* V.+÷õõöö÷ø÷ööõõõ */
	$"F5F5 F5F6 F6F8 F82B F6F6 F6F6 F62B 2BFD"            /* õõõööøø+ööööö++ý */
	$"5600 F7F6 F5F6 F6F8 F8F6 F5F5 F5F6 F6F6"            /* V.÷öõööøøöõõõööö */
	$"F6F6 F6F5 F5F6 2BF8 F7F6 F6F6 F6F6 2BFD"            /* öööõõö+ø÷ööööö+ý */
	$"5600 2BF5 F6F6 F7F7 F6F5 F5F6 2BF8 F9FA"            /* V.+õöö÷÷öõõö+øùú */
	$"FAF9 56F7 F6F5 F52B F82B F6F6 F6F6 2BFD"            /* úùV÷öõõ+ø+öööö+ý */
	$"5600 F6F5 F62B F8F6 F5F6 F6F8 F9F8 F7F6"            /* V.öõö+øöõööøùø÷ö */
	$"F62B F856 562B F6F6 2BF8 F6F6 F6F6 2BFD"            /* ö+øVV+öö+øöööö+ý */
	$"5600 F5F6 F6F8 2BF6 F6F6 F856 2BF6 F5F5"            /* V.õööø+öööøV+öõõ */
	$"F5F5 F5F6 F8F9 2BF6 F6F8 F7F6 F6F6 2BFD"            /* õõõöøù+ööø÷ööö+ý */
	$"5600 F5F6 2BF8 F6F6 F6F8 56F6 F52B 557F"            /* V.õö+øöööøVöõ+U. */
	$"7F79 F7F5 F6F7 56F6 F62B F8F6 F6F6 2BFD"            /* .y÷õö÷Vöö+øööö+ý */
	$"5600 F6F6 F7F7 F6F6 F756 F7F5 F77F 7955"            /* V.öö÷÷öö÷V÷õ÷.yU */
	$"797F A4F9 F5F6 56F7 F6F6 F82B F6F6 2BFD"            /* y.¤ùõöV÷ööø+öö+ý */
	$"5600 F6F6 F82B F6F6 56F8 F6F6 7F55 F755"            /* V.ööø+ööVøöö.U÷U */
	$"797F A4AA 55F6 F756 F6F6 F7F7 F6F6 2BFD"            /* y.¤ªUö÷Vöö÷÷öö+ý */
	$"5600 F6F6 56F6 F6F6 F9F8 F655 7F55 5579"            /* V.ööVöööùøöU.UUy */
	$"7FA3 A4CE A5F6 2BF9 F6F6 F7F8 F6F6 2BFD"            /* .£¤Î¥ö+ùöö÷øöö+ý */
	$"5600 F6F6 F9F6 F6F6 FAF7 F67A A37F 7FA3"            /* V.ööùöööú÷öz£..£ */
	$"A3A4 AACF ABF7 F6FA F6F6 F7F8 F6F6 2BFD"            /* £¤ªÏ«÷öúöö÷øöö+ý */
	$"5600 F6F6 56F6 F6F6 F9F8 F6F9 A4A4 A4A4"            /* V.ööVöööùøöù¤¤¤¤ */
	$"A4CE CFF1 ABF8 F6F9 F6F6 F7F8 F6F6 2BFD"            /* ¤ÎÏñ«øöùöö÷øöö+ý */
	$"5600 F6F6 F82B F6F6 56F8 F6F8 AAAA AACE"            /* V.ööø+ööVøöøªªªÎ */
	$"CECF F1F2 FBF8 F756 F6F6 F7F7 F6F6 2BFD"            /* ÎÏñòûø÷Vöö÷÷öö+ý */
	$"5600 F6F6 F8F7 F6F6 F7F8 2BF6 81CE CFCF"            /* V.ööø÷öö÷ø+öÎÏÏ */
	$"CFF2 F2AB F9F7 F8F7 F6F6 F72B F6F6 2BFD"            /* Ïòò«ù÷ø÷öö÷+öö+ý */
	$"5600 F6F6 2BF8 F6F6 F6F8 F8F6 2BA5 CFF1"            /* V.öö+øöööøøö+¥Ïñ */
	$"F2F2 ABFA F8F8 F9F6 F62B F82B F6F6 2BFD"            /* òò«úøøùöö+ø+öö+ý */
	$"5600 F6F6 F6F8 2BF6 F52B 56F8 F62B F9FB"            /* V.öööø+öõ+Vøö+ùû */
	$"FB81 F9F8 F8F9 F7F5 F6F7 F7F6 F6F6 2BFD"            /* ûùøøù÷õö÷÷ööö+ý */
	$"5600 F6F6 F6F7 F7F6 F6F5 2B56 F8F7 F62B"            /* V.ööö÷÷ööõ+Vø÷ö+ */
	$"F7F8 F856 56F8 F6F6 2BF8 2BF6 F6F6 2BFD"            /* ÷øøVVøöö+ø+ööö+ý */
	$"5600 F6F6 F6F6 F82B F6F6 F52B F856 5656"            /* V.ööööø+ööõ+øVVV */
	$"5656 5656 F7F6 F5F6 F7F7 F6F6 F6F6 2BFD"            /* VVVV÷öõö÷÷öööö+ý */
	$"5600 2BF6 F6F5 2BF8 2BF6 F6F5 F62B F8F8"            /* V.+ööõ+ø+ööõö+øø */
	$"F8F8 F7F6 F5F5 F6F7 F7F6 F6F6 F6F6 2BFD"            /* øø÷öõõö÷÷ööööö+ý */
	$"5600 2B2B F6F6 F52B F8F7 F6F6 F5F5 F5F5"            /* V.++ööõ+ø÷ööõõõõ */
	$"F5F5 F5F5 F52B F7F8 F6F5 F6F6 F6F7 2BFD"            /* õõõõõ+÷øöõööö÷+ý */
	$"5600 F62B F6F6 F6F5 2BF8 F8F7 2BF6 F5F5"            /* V.ö+öööõ+øø÷+öõõ */
	$"F5F5 F62B F7F8 F7F6 F5F6 F6F6 2B2B 2BFD"            /* õõö+÷ø÷öõööö+++ý */
	$"5600 F6F6 2BF6 F6F6 F5F6 F7F8 F8F8 F7F7"            /* V.öö+öööõö÷øøø÷÷ */
	$"F7F8 F8F8 F82B F6F5 F6F6 F62B F7F6 2BFD"            /* ÷øøøø+öõööö+÷ö+ý */
	$"5600 F6F6 F62B 2BF6 F6F5 F5F6 2BF7 F8F8"            /* V.ööö++ööõõö+÷øø */
	$"F8F8 F72B F6F5 F5F6 F6F6 2BF7 F6F5 F7FD"            /* øø÷+öõõööö+÷öõ÷ý */
	$"5600 F6F6 F6F6 2B2B F6F6 F5F5 F5F5 F5F5"            /* V.öööö++ööõõõõõõ */
	$"F5F5 F5F5 F5F6 F6F6 F6F7 2BF6 F5F6 F8FD"            /* õõõõõöööö÷+öõöøý */
	$"56F7 00F6 F6F6 F6F6 2B2B F6F6 F6F5 F5F5"            /* V÷.ööööö++öööõõõ */
	$"F5F5 F6F6 F6F6 F62B F72B F5F5 F6F6 FAFD"            /* õõööööö+÷+õõööúý */
	$"00FD F9F8 F8F8 F8F8 F8F8 F8F8 F8F8 F8F8"            /* .ýùøøøøøøøøøøøøø */
	$"F8F8 F8F8 F8F8 F8F8 F8F8 F8F8 F881 FD00"            /* øøøøøøøøøøøøøý. */
	$"0000 FDFD FDFD FDFD FDFD FDFD FDFD FDFD"            /* ..ýýýýýýýýýýýýýý */
	$"FDFD FDFD FDFD FDFD FDFD FDFD FDFD 0000"            /* ýýýýýýýýýýýýýý.. */
};

data 'icl8' (129) {
	$"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF"            /* ....ÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF 0000 0000 0000 0000 0000"            /* ÿÿÿÿÿÿ.......... */
	$"0000 0000 FFF5 F5F5 F5F5 F5F5 F5F5 F5F5"            /* ....ÿõõõõõõõõõõõ */
	$"F5F5 F5F5 F5FF FF00 0000 0000 0000 0000"            /* õõõõõÿÿ......... */
	$"0000 0000 FFF5 F5F5 F5F5 F5F5 F5F5 F5F5"            /* ....ÿõõõõõõõõõõõ */
	$"F5F5 F5F5 F5FF 2BFF 0000 0000 0000 0000"            /* õõõõõÿ+ÿ........ */
	$"0000 0000 FFF5 F5F5 F5F5 F5F5 F5F5 F5F5"            /* ....ÿõõõõõõõõõõõ */
	$"F5F5 F5F5 F5FF 2B2B FF00 0000 0000 0000"            /* õõõõõÿ++ÿ....... */
	$"0000 0000 FFF5 F5F5 F5F5 F5F5 F5F5 F5F5"            /* ....ÿõõõõõõõõõõõ */
	$"F5F5 F5F5 F5FF 2B2B 2BFF 0000 0000 0000"            /* õõõõõÿ+++ÿ...... */
	$"0000 0000 FFF5 F5F5 F5F5 F5F5 F5F5 F5F5"            /* ....ÿõõõõõõõõõõõ */
	$"F5F5 F5F5 F5FF 2B2B 2B2B FF00 0000 0000"            /* õõõõõÿ++++ÿ..... */
	$"0000 0000 FFF5 F5F5 F5F5 F5F5 F5F5 F5F5"            /* ....ÿõõõõõõõõõõõ */
	$"F5F5 F5F5 F5FF FFFF FFFF FFFF 0000 0000"            /* õõõõõÿÿÿÿÿÿÿ.... */
	$"0000 0000 FFF5 F5F5 F5F5 F5F5 F7F8 F856"            /* ....ÿõõõõõõõ÷øøV */
	$"56F8 F8F7 F5F5 F5F5 F5F5 F5FF 0000 0000"            /* Vøø÷õõõõõõõÿ.... */
	$"0000 0000 FFF5 F5F5 F5F5 2BF8 F8F7 2BF6"            /* ....ÿõõõõõ+øø÷+ö */
	$"F62B F7F8 F82B F5F5 F5F5 F5FF 0000 0000"            /* ö+÷øø+õõõõõÿ.... */
	$"0000 0000 FFF5 F5F5 F5F7 F82B F6F6 F6F6"            /* ....ÿõõõõ÷ø+öööö */
	$"F6F6 F6F6 F756 F7F5 F5F5 F5FF 0000 0000"            /* öööö÷V÷õõõõÿ.... */
	$"0000 0000 FFF5 F5F5 F72B F6F6 F6F8 F9FA"            /* ....ÿõõõ÷+öööøùú */
	$"FAF9 F8F6 F62B F7F7 F5F5 F5FF 0000 0000"            /* úùøöö+÷÷õõõÿ.... */
	$"0000 0000 FFF5 F52B F82B F6F7 F9F9 F7F6"            /* ....ÿõõ+ø+ö÷ùù÷ö */
	$"F6F7 F9F9 F7F6 2B56 2BF6 F5FF 0000 0000"            /* ö÷ùù÷ö+V+öõÿ.... */
	$"0000 0000 FFF5 F6F8 2BF6 F7F9 F7F6 F6F6"            /* ....ÿõöø+ö÷ù÷ööö */
	$"F6F6 F6F7 F9F7 F6F7 F8F6 F5FF 0000 0000"            /* ööö÷ù÷ö÷øöõÿ.... */
	$"0000 0000 FFF6 F7F8 F6F6 F9F7 F6F6 4F55"            /* ....ÿö÷øööù÷ööOU */
	$"5555 F6F6 F7F9 F6F6 F82B F6FF 0000 0000"            /* UUöö÷ùööø+öÿ.... */
	$"0000 0000 FFF6 F8F7 F6F8 F9F6 F6F7 4F55"            /* ....ÿöø÷öøùöö÷OU */
	$"5579 564F F6F9 F8F6 F7F8 F6FF 0000 0000"            /* UyVOöùøö÷øöÿ.... */
	$"0000 0000 FFF6 F82B F6F9 F7F6 4F4F 4F55"            /* ....ÿöø+öù÷öOOOU */
	$"797A A49E 2BF8 F9F6 2BF8 F6FF 0000 0000"            /* yz¤ž+øùö+øöÿ.... */
	$"0000 0000 FFF6 56F6 F6FA F6F6 5555 5555"            /* ....ÿöVööúööUUUU */
	$"7AA4 CECE F72B FAF6 F656 F6FF 0000 0000"            /* z¤ÎÎ÷+úööVöÿ.... */
	$"0000 0000 FFF6 56F6 F6FA 2BF6 5555 797A"            /* ....ÿöVööú+öUUyz */
	$"A4CF CFCF F82B FAF6 2B56 F6FF 0000 0000"            /* ¤ÏÏÏø+úö+Vöÿ.... */
	$"0000 0000 FFF6 F82B F6F9 F7F6 5579 7AA4"            /* ....ÿöø+öù÷öUyz¤ */
	$"CFF2 F2A4 F8F8 F9F6 2BF8 F6FF 0000 0000"            /* Ïòò¤øøùö+øöÿ.... */
	$"0000 0000 FFF6 F8F7 F6F8 F9F6 F656 A4CE"            /* ....ÿöø÷öøùööV¤Î */
	$"F1F2 FC56 F7F9 F8F6 F7F8 F6FF 0000 0000"            /* ñòüV÷ùøö÷øöÿ.... */
	$"0000 0000 FFF6 F7F8 F6F6 F9F7 F64F A4CE"            /* ....ÿö÷øööù÷öO¤Î */
	$"CFA4 F9F8 F8F9 F6F6 F82B F6FF 0000 0000"            /* Ϥùøøùööø+öÿ.... */
	$"0000 0000 FFF5 F6F8 2BF6 F7F9 F7F6 2BF7"            /* ....ÿõöø+ö÷ù÷ö+÷ */
	$"F8F8 F7F8 F9F7 F6F7 F8F6 F5FF 0000 0000"            /* øø÷øù÷ö÷øöõÿ.... */
	$"0000 0000 FFF5 F62B 56F6 F6F7 F9F9 F82B"            /* ....ÿõö+Vöö÷ùùø+ */
	$"2BF8 F9F9 F7F6 2B56 2BF6 F5FF 0000 0000"            /* +øùù÷ö+V+öõÿ.... */
	$"0000 0000 FFF5 F5F5 F7F7 2BF6 F6F8 F9FA"            /* ....ÿõõõ÷÷+ööøùú */
	$"FAF9 F8F6 F62B F8F7 F6F5 F5FF 0000 0000"            /* úùøöö+ø÷öõõÿ.... */
	$"0000 0000 FFF5 F5F5 F5F7 F8F7 F6F6 F6F6"            /* ....ÿõõõõ÷ø÷öööö */
	$"F6F6 F6F6 F7F8 F7F5 F5F5 F5FF 0000 0000"            /* öööö÷ø÷õõõõÿ.... */
	$"0000 0000 FFF5 F5F5 F5F5 2BF8 F8F7 2BF6"            /* ....ÿõõõõõ+øø÷+ö */
	$"F62B F756 F82B F6F5 F5F5 F5FF 0000 0000"            /* ö+÷Vø+öõõõõÿ.... */
	$"0000 0000 FFF5 F5F5 F5F5 F5F5 2BF8 5656"            /* ....ÿõõõõõõõ+øVV */
	$"56F8 F82B F6F5 F5F5 F5F5 F5FF 0000 0000"            /* Vøø+öõõõõõõÿ.... */
	$"0000 0000 FFF5 F5F5 F5F5 F5F5 F5F5 F5F5"            /* ....ÿõõõõõõõõõõõ */
	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"            /* õõõõõõõõõõõÿ.... */
	$"0000 0000 FFF5 F5F5 F5F5 F5F5 F5F5 F5F5"            /* ....ÿõõõõõõõõõõõ */
	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"            /* õõõõõõõõõõõÿ.... */
	$"0000 0000 FFF5 F5F5 F5F5 F5F5 F5F5 F5F5"            /* ....ÿõõõõõõõõõõõ */
	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"            /* õõõõõõõõõõõÿ.... */
	$"0000 0000 FFF5 F5F5 F5F5 F5F5 F5F5 F5F5"            /* ....ÿõõõõõõõõõõõ */
	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"            /* õõõõõõõõõõõÿ.... */
	$"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF"            /* ....ÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"            /* ÿÿÿÿÿÿÿÿÿÿÿÿ.... */
};

data 'ICN#' (0) {
	$"00FF FF00 01FF FF80 03FF FFC0 07FE FFE0"            /* .ÿÿ..ÿÿ€.ÿÿÀ.þÿà */
	$"0FFC 7FF0 1FEC 67F8 3FC4 47FC 7FC4 47FE"            /* .ü.ð.ìgø?ÄGü.ÄGþ */
	$"FF44 47FF FE44 47FF FE44 47FF FE44 47FF"            /* ÿDGÿþDGÿþDGÿþDGÿ */
	$"FE44 47FF FE44 47FF FE40 071F FE00 061F"            /* þDGÿþDGÿþ@..þ... */
	$"FE00 061F FE00 043F FE00 003F FE00 007F"            /* þ...þ..?þ..?þ... */
	$"FE00 007F FE00 00FF FE00 00FF FE00 01FF"            /* þ...þ..ÿþ..ÿþ..ÿ */
	$"FE00 01FF 7E04 03FE 3F02 07FC 1FFF FFF8"            /* þ..ÿ~..þ?..ü.ÿÿø */
	$"0FFF FFF0 07FF FFE0 03FF FFC0 01FF FF80"            /* .ÿÿð.ÿÿà.ÿÿÀ.ÿÿ€ */
	$"00FF FF00 01FF FF80 03FF FFC0 07FF FFE0"            /* .ÿÿ..ÿÿ€.ÿÿÀ.ÿÿà */
	$"0FFF FFF0 1FFF FFF8 3FFF FFFC 7FFF FFFE"            /* .ÿÿð.ÿÿø?ÿÿü.ÿÿþ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF 7FFF FFFE 3FFF FFFC 1FFF FFF8"            /* ÿÿÿÿ.ÿÿþ?ÿÿü.ÿÿø */
	$"0FFF FFF0 07FF FFE0 03FF FFC0 01FF FF80"            /* .ÿÿð.ÿÿà.ÿÿÀ.ÿÿ€ */
};

data 'ICN#' (1) {
	$"FFFF FFFF 807F FFFF 807F FFFF 807F FFFF"            /* ÿÿÿÿ€.ÿÿ€.ÿÿ€.ÿÿ */
	$"807F FFFF 807F C0FF 887F 003F 887E 001F"            /* €.ÿÿ€.Àÿˆ..?ˆ~.. */
	$"887C 000F 8078 0007 8078 0007 8070 0003"            /* ˆ|..€x..€x..€p.. */
	$"8071 DDC3 8070 0003 8070 0003 8071 DD43"            /* €qÝÀp..€p..€qÝC */
	$"8070 0003 8070 0003 8071 D703 8070 0003"            /* €p..€p..€q×.€p.. */
	$"87F0 0003 81F1 EEC3 81F0 0007 81F0 0007"            /* ‡ð..ñîÁð..ð.. */
	$"81F0 000F 81E0 001F 8F80 007F 81FF FFFF"            /* ð..à..€..ÿÿÿ */
	$"81FF FFFF 81FF FFFF 81FF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
};

data 'ICN#' (2) {
	$"0001 8000 0003 C000 0003 C000 0006 6000"            /* ..€...À...À...`. */
	$"0006 6000 000C 3000 000C 3000 0018 1800"            /* ..`...0...0..... */
	$"0019 9800 0033 CC00 0033 CC00 0063 C600"            /* ..˜..3Ì..3Ì..cÆ. */
	$"0063 C600 00C3 C300 00C3 C300 0183 C180"            /* .cÆ..ÃÃ..ÃÃ..ƒÁ€ */
	$"0183 C180 0303 C0C0 0303 C0C0 0603 C060"            /* .ƒÁ€..ÀÀ..ÀÀ..À` */
	$"0601 8060 0C01 8030 0C00 0030 1800 0018"            /* ..€`..€0...0.... */
	$"1801 8018 3003 C00C 3003 C00C 6001 8006"            /* ..€.0.À.0.À.`.€. */
	$"6000 0006 C000 0003 FFFF FFFF 7FFF FFFE"            /* `...À...ÿÿÿÿ.ÿÿþ */
	$"0001 8000 0003 C000 0003 C000 0007 E000"            /* ..€...À...À...à. */
	$"0007 E000 000F F000 000F F000 001F F800"            /* ..à...ð...ð...ø. */
	$"001F F800 003F FC00 003F FC00 007F FE00"            /* ..ø..?ü..?ü...þ. */
	$"007F FE00 00FF FF00 00FF FF00 01FF FF80"            /* ..þ..ÿÿ..ÿÿ..ÿÿ€ */
	$"01FF FF80 03FF FFC0 03FF FFC0 07FF FFE0"            /* .ÿÿ€.ÿÿÀ.ÿÿÀ.ÿÿà */
	$"07FF FFE0 0FFF FFF0 0FFF FFF0 1FFF FFF8"            /* .ÿÿà.ÿÿð.ÿÿð.ÿÿø */
	$"1FFF FFF8 3FFF FFFC 3FFF FFFC 7FFF FFFE"            /* .ÿÿø?ÿÿü?ÿÿü.ÿÿþ */
	$"7FFF FFFE FFFF FFFF FFFF FFFF 7FFF FFFE"            /* .ÿÿþÿÿÿÿÿÿÿÿ.ÿÿþ */
};

data 'ICN#' (128) {
	$"0000 0000 0000 0002 0000 0001 0000 0001"            /* ................ */
	$"0000 0001 0000 0001 0000 0001 0000 0001"            /* ................ */
	$"0001 8001 0000 0001 0000 0001 0001 8001"            /* ..€...........€. */
	$"0004 6001 0008 7001 0008 F801 008F F901"            /* ..`...p...ø..ù. */
	$"000F F801 000F F801 000F F001 0007 F001"            /* ..ø...ø...ð...ð. */
	$"0001 C001 0000 0001 0000 0001 0000 0001"            /* ..À............. */
	$"0000 0001 0000 0001 0000 0001 0000 0001"            /* ................ */
	$"0000 0001 0000 0003 4000 0006 3FFF FFFC"            /* ........@...?ÿÿü */
	$"3FFF FFFC 7FFF FFFE FFFF FFFF FFFF FFFF"            /* ?ÿÿü.ÿÿþÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF 7FFF FFFE 3FFF FFFC"            /* ÿÿÿÿÿÿÿÿ.ÿÿþ?ÿÿü */
};

data 'ICN#' (129) {
	$"0FFF FC00 0800 0600 0800 0500 0800 0480"            /* .ÿü............€ */
	$"0800 0440 0800 0420 0800 07F0 0807 E010"            /* ...@... ...ð..à. */
	$"0818 1810 0860 0610 0883 C110 088C 3110"            /* .....`...ƒÁ..Œ1. */
	$"0910 0890 0923 C490 0A24 2450 0A48 3250"            /* Æ..Æ#ĐÂ$$PÂH2P */
	$"0A48 7250 0A48 F250 0A49 F250 0A27 E450"            /* ÂHrPÂHòPÂIòPÂ'äP */
	$"0923 C490 0910 0890 088C 3110 0883 C110"            /* Æ#ĐÆ...Œ1..ƒÁ. */
	$"0860 0610 0818 1810 0807 E010 0800 0010"            /* .`........à..... */
	$"0800 0010 0800 0010 0800 0010 0FFF FFF0"            /* .............ÿÿð */
	$"0FFF FC00 0FFF FE00 0FFF FF00 0FFF FF80"            /* .ÿü..ÿþ..ÿÿ..ÿÿ€ */
	$"0FFF FFC0 0FFF FFE0 0FFF FFF0 0FFF FFF0"            /* .ÿÿÀ.ÿÿà.ÿÿð.ÿÿð */
	$"0FFF FFF0 0FFF FFF0 0FFF FFF0 0FFF FFF0"            /* .ÿÿð.ÿÿð.ÿÿð.ÿÿð */
	$"0FFF FFF0 0FFF FFF0 0FFF FFF0 0FFF FFF0"            /* .ÿÿð.ÿÿð.ÿÿð.ÿÿð */
	$"0FFF FFF0 0FFF FFF0 0FFF FFF0 0FFF FFF0"            /* .ÿÿð.ÿÿð.ÿÿð.ÿÿð */
	$"0FFF FFF0 0FFF FFF0 0FFF FFF0 0FFF FFF0"            /* .ÿÿð.ÿÿð.ÿÿð.ÿÿð */
	$"0FFF FFF0 0FFF FFF0 0FFF FFF0 0FFF FFF0"            /* .ÿÿð.ÿÿð.ÿÿð.ÿÿð */
	$"0FFF FFF0 0FFF FFF0 0FFF FFF0 0FFF FFF0"            /* .ÿÿð.ÿÿð.ÿÿð.ÿÿð */
};

data 'BNDL' (128) {
	$"5261 6475 0000 0001 4652 4546 0002 0000"            /* Radu....FREF.... */
	$"0080 0001 0081 0002 0082 4943 4E23 0002"            /* .€......‚ICN#.. */
	$"0000 0080 0001 0081 0002 0081"                      /* ...€...... */
};

data 'FREF' (128) {
	$"4150 504C 0000 00"                                  /* APPL... */
};

data 'FREF' (129) {
	$"4F50 4D4C 0001 00"                                  /* OPML... */
};

data 'FREF' (130) {
	$"2A2A 2A2A 0002 00"                                  /* ****... */
};

data 'ics8' (128) {
	$"5656 5656 5656 5656 5656 5656 5656 F6FD"            /* VVVVVVVVVVVVVVöý */
	$"56F6 F7F5 F6F6 F6F6 F6F6 F6F6 F6F6 F6FD"            /* Vö÷õöööööööööööý */
	$"56F6 F7F6 F6F8 F8F9 F9F8 F8F6 F6F6 F6FD"            /* Vö÷ööøøùùøøööööý */
	$"56F7 F6F8 F8F7 F6F6 F6F6 F8F8 F7F6 F6FD"            /* V÷öøø÷ööööøø÷ööý */
	$"56F6 F6F8 F6F8 F9FA FAF8 F6F6 F8F6 F6FD"            /* Vööøöøùúúøööøööý */
	$"56F6 F8F6 F8F8 F6F5 F5F7 F9F6 F8F8 F6FD"            /* Vöøöøøöõõ÷ùöøøöý */
	$"56F6 F8F6 F8F7 F7F7 7FF9 F6F7 F6F8 F6FD"            /* Vöøöø÷÷÷.ùö÷öøöý */
	$"56F6 F9F6 FAF6 A3A3 A4CF F7FA F6F8 F6FD"            /* Vöùöúö££¤Ï÷úöøöý */
	$"56F6 F8F6 F9F9 AACE CFF2 FBF9 F6F8 F6FD"            /* VöøöùùªÎÏòûùöøöý */
	$"56F6 F8F6 F8F8 CEF1 F2FA F9F9 F6F8 F6FD"            /* VöøöøøÎñòúùùöøöý */
	$"56F6 F8F7 F6F8 F8FB FBF9 F9F7 F8F7 F6FD"            /* Vöø÷öøøûûùù÷ø÷öý */
	$"56F6 F6F8 F6F6 F8F8 F8F7 F7F7 F7F6 F6FD"            /* Vööøööøøø÷÷÷÷ööý */
	$"56F6 F6F6 F8F8 F6F5 F5F6 F8F8 F6F6 F7FD"            /* Vöööøøöõõöøøöö÷ý */
	$"56F6 F6F6 F6F8 F8F8 F8F8 F8F6 F6F7 F7FD"            /* Vööööøøøøøøöö÷÷ý */
	$"F7F6 F6F6 F6F6 F6F5 F5F6 F6F6 F7F6 F6FD"            /* ÷ööööööõõööö÷ööý */
	$"FDFD FDFD FDFD FDFD FDFD FDFD FDFD FDFD"            /* ýýýýýýýýýýýýýýýý */
};

data 'ics8' (129) {
	$"0000 FFFF FFFF FFFF FFFF FFFF 0000 0000"            /* ..ÿÿÿÿÿÿÿÿÿÿ.... */
	$"0000 FFF5 F5F5 F5F5 F5F5 F5FF FF00 0000"            /* ..ÿõõõõõõõõÿÿ... */
	$"0000 FFF5 F5F5 F5F5 F5F5 F5FF 2BFF 0000"            /* ..ÿõõõõõõõõÿ+ÿ.. */
	$"0000 FFF5 F5F5 F5F5 F5F5 F5FF FFFF FF00"            /* ..ÿõõõõõõõõÿÿÿÿ. */
	$"0000 FFF5 F5F5 F5F5 F5F5 F5F5 F5F5 FF00"            /* ..ÿõõõõõõõõõõõÿ. */
	$"0000 FFF5 F5F5 F54F 5555 4FF5 F5F5 FF00"            /* ..ÿõõõõOUUOõõõÿ. */
	$"0000 FFF5 F5F5 F74F 5555 79F7 F5F5 FF00"            /* ..ÿõõõ÷OUUy÷õõÿ. */
	$"0000 FFF5 F54F 4F4F 5579 7A7A 55F5 FF00"            /* ..ÿõõOOOUyzzUõÿ. */
	$"0000 FFF5 F54F 5555 557A A4CE CEF5 FF00"            /* ..ÿõõOUUUz¤ÎÎõÿ. */
	$"0000 FFF5 F555 5579 7980 CFCF CFF5 FF00"            /* ..ÿõõUUyy€ÏÏÏõÿ. */
	$"0000 FFF5 F54F 7955 7ACF F2F2 A4F5 FF00"            /* ..ÿõõOyUzÏòò¤õÿ. */
	$"0000 FFF5 F5F5 56A4 A4F1 F2FB F5F5 FF00"            /* ..ÿõõõV¤¤ñòûõõÿ. */
	$"0000 FFF5 F5F5 F5A4 A4CF 80F5 F5F5 FF00"            /* ..ÿõõõõ¤¤Ï€õõõÿ. */
	$"0000 FFF5 F5F5 F5F5 F5F5 F5F5 F5F5 FF00"            /* ..ÿõõõõõõõõõõõÿ. */
	$"0000 FFF5 F5F5 F5F5 F5F5 F5F5 F5F5 FF00"            /* ..ÿõõõõõõõõõõõÿ. */
	$"0000 FFFF FFFF FFFF FFFF FFFF FFFF FF00"            /* ..ÿÿÿÿÿÿÿÿÿÿÿÿÿ. */
};

data 'ics4' (128) {
	$"DDDD DDDD DDDD DDCA DCC0 CCCC CCCC CCCA"            /* ÝÝÝÝÝÝÝÊÜÀÌÌÌÌÌÊ */
	$"DCCC CCCD DCCC CCCA DCCC CCCC CCCC CCCA"            /* ÜÌÌÍÜÌÌÊÜÌÌÌÌÌÌÊ */
	$"DCCC CCDD DCCC CCCA DCCC CCC0 0CDC CCCA"            /* ÜÌÌÝÜÌÌÊÜÌÌÀ.ÜÌÊ */
	$"DCCC CCCC DDCC CCCA DCDC DC55 5ECD CCCA"            /* ÜÌÌÌÝÌÌÊÜÜÜU^ÍÌÊ */
	$"DCCC DD56 EFED CCCA DCCC CC6F FDDD CCCA"            /* ÜÌÝVïíÌÊÜÌÌoýÝÌÊ */
	$"DCCC CCCE EDDC CCCA DCCC CCCC CCCC CCCA"            /* ÜÌÌÎíÜÌÊÜÌÌÌÌÌÌÊ */
	$"DCCC CCC0 0CCC CCCA DCCC CCCC CCCC CCCA"            /* ÜÌÌÀ.ÌÌÊÜÌÌÌÌÌÌÊ */
	$"CCCC CCC0 0CCC CCCA AAAA AAAA AAAA AAAA"            /* ÌÌÌÀ.ÌÌʪªªªªªªª */
};

data 'ics4' (129) {
	$"00FF FFFF FFFF 0000 00F0 0000 000F F000"            /* .ÿÿÿÿÿ...ð....ð. */
	$"00F0 0000 000F CF00 00F0 0000 000F FFF0"            /* .ð....Ï..ð....ÿð */
	$"00F0 0000 0000 00F0 00F0 000C CCC0 00F0"            /* .ð.....ð.ð..ÌÀ.ð */
	$"00F0 00CC CCDC 00F0 00F0 0CCC CDDD C0F0"            /* .ð.ÌÌÜ.ð.ð.ÌÍÝÀð */
	$"00F0 0CCC CD56 60F0 00F0 0CCD DDEE E0F0"            /* .ð.ÌÍV`ð.ð.ÍÝîàð */
	$"00F0 0CDC DEFF 50F0 00F0 00D5 5FFE 00F0"            /* .ð.ÜÞÿPð.ð.Õ_þ.ð */
	$"00F0 0005 5ED0 00F0 00F0 0000 0000 00F0"            /* .ð..^Ð.ð.ð.....ð */
	$"00F0 0000 0000 00F0 00FF FFFF FFFF FFF0"            /* .ð.....ð.ÿÿÿÿÿÿð */
};

data 'ics#' (128) {
	$"0001 0001 0001 0001 0181 0001 0081 0BD1"            /* .............Ñ */
	$"03E1 03C1 0181 0001 0001 0001 0001 FFFF"            /* .á.Á.........ÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
	$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"            /* ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ */
};

data 'ics#' (129) {
	$"3FF0 2018 2014 201E 2002 21E2 2212 241A"            /* ?ð . . . .!â".$. */
	$"243A 247A 24FA 23F2 21E2 2002 2002 3FFE"            /* $:$z$ú#ò!â . .?þ */
	$"3FF0 3FF8 3FFC 3FFE 3FFE 3FFE 3FFE 3FFE"            /* ?ð?ø?ü?þ?þ?þ?þ?þ */
	$"3FFE 3FFE 3FFE 3FFE 3FFE 3FFE 3FFE 3FFE"            /* ?þ?þ?þ?þ?þ?þ?þ?þ */
};

data 'Radu' (0, "Owner resource") {
	$"00"                                                 /* . */
};

data 'open' (0) {
	$"5261 6475 0000 0003 4F50 4D4C 5445 5854"            /* Radu....OPMLTEXT */
	$"2A2A 2A2A"                                          /* **** */
};

[frontierkernel-commits] Frontier/Common/resources/Mac kernvelverbs.r,1.2.4.2,1.2.4.3

[David B. <dav...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/resources/Mac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14927/resources/Mac

Modified Files:
      Tag: sidewinder-branch
	kernvelverbs.r 
Log Message:
misc cleanup

Index: kernvelverbs.r
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/kernvelverbs.r,v
retrieving revision 1.2.4.2
retrieving revision 1.2.4.3
diff -C2 -d -r1.2.4.2 -r1.2.4.3
*** kernvelverbs.r	23 Nov 2004 16:22:14 -0000	1.2.4.2
--- kernvelverbs.r	28 Nov 2004 06:51:47 -0000	1.2.4.3
***************
*** 1105,1110 ****
          "python", false, {
              "startinterpreter",
!             "stopinterpreter",
!             "runstring"
          }
      }
--- 1105,1110 ----
          "python", false, {
              "startinterpreter",
!             "stopinterpreter" /*,
!             "runstring"*/
          }
      }