[Squeak-Commits] squeak/platforms/RiscOS/vm sqRPCMain.c,1.1,1.2 sqRPCWindows.c,1.6,1.7

[Tim R. <row...@us...>]

Update of /cvsroot/squeak/squeak/platforms/RiscOS/vm
In directory sc8-pr-cvs1:/tmp/cvs-serv18929

Modified Files:
	sqRPCMain.c sqRPCWindows.c 
Log Message:
Bring RiscOS sources up to date for 3.6 release. Fix window label bug on Iyonix

Index: sqRPCMain.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/RiscOS/vm/sqRPCMain.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sqRPCMain.c	15 Aug 2003 21:29:53 -0000	1.1
--- sqRPCMain.c	7 Oct 2003 05:06:14 -0000	1.2
***************
*** 64,68 ****
  int			versionMe = 0;
  int			objectHeadroom = 4*1024*1024;
! char * windowLabel = NULL;
  
  vmArg args[] = {
--- 64,68 ----
  int			versionMe = 0;
  int			objectHeadroom = 4*1024*1024;
! char * windowLabel = &imageName[0];
  
  vmArg args[] = {
***************
*** 448,452 ****
  /*** System Attributes ***/
  char * osVersionString(void) {
! 	sprintf(versionString, "RiscOS %-3.2f", actualOSLevel/100.0);
  	return versionString;
  }
--- 448,452 ----
  /*** System Attributes ***/
  char * osVersionString(void) {
! 	sprintf(versionString, "%-3.2f", actualOSLevel/100.0);
  	return versionString;
  }

Index: sqRPCWindows.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/RiscOS/vm/sqRPCWindows.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sqRPCWindows.c	15 Aug 2003 21:29:53 -0000	1.6
--- sqRPCWindows.c	7 Oct 2003 05:06:14 -0000	1.7
***************
*** 21,24 ****
--- 21,25 ----
  #include "sq.h"
  #include <kernel.h>
+ #include <ctype.h>
  
  #define longAt(i) (*((int *) (i)))
***************
*** 681,684 ****
--- 682,686 ----
  os_coord origin, size;
  extern char * windowLabel;
+ extern char imageName[];
  
  	PRINTF(("\\t initial open window\n"));
***************
*** 731,744 ****
  	wblock.ymin = (short)100;
  	/* title data; if the -windowlabel vm option was set, use its arg
! 	 * instead of the image pathname */
! 	if( strlen(windowLabel)) {
! 		wblock.title_data.indirected_text.text =  windowLabel;
! 		wblock.title_data.indirected_text.validation = (char*)-1;
! 		wblock.title_data.indirected_text.size = strlen(windowLabel);
! 	} else {
! 		wblock.title_data.indirected_text.text =  &imageName[0];
! 		wblock.title_data.indirected_text.validation = (char*)-1;
! 		wblock.title_data.indirected_text.size = strlen(imageName);
! 	}
  	/* icon count Assuming .icons=0 is ok for no icons ? */
  	wblock.icon_count = 0;
--- 733,741 ----
  	wblock.ymin = (short)100;
  	/* title data; if the -windowlabel vm option was set, use its arg
! 	 * instead of the image pathname. The windowLabel ptr will point
! 	 * to the imageName string unless -windowlabel was used */
! 	wblock.title_data.indirected_text.text =  windowLabel;
! 	wblock.title_data.indirected_text.validation = (char*)-1;
! 	wblock.title_data.indirected_text.size = strlen(windowLabel);
  	/* icon count Assuming .icons=0 is ok for no icons ? */
  	wblock.icon_count = 0;
***************
*** 983,986 ****
--- 980,984 ----
  	//ioProcessEvents();
  	DisplayPixmapNow();
+ 	return true;
  }