Menu
▾
▴
squeak-commits — CVS Commits
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
(27) |
Apr
(11) |
May
(112) |
Jun
(8) |
Jul
(10) |
Aug
(68) |
Sep
(12) |
Oct
(3) |
Nov
(19) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(6) |
Feb
(15) |
Mar
(20) |
Apr
(22) |
May
(131) |
Jun
(27) |
Jul
(19) |
Aug
(207) |
Sep
(61) |
Oct
(27) |
Nov
(28) |
Dec
(21) |
| 2004 |
Jan
(7) |
Feb
(25) |
Mar
(14) |
Apr
(55) |
May
(15) |
Jun
(2) |
Jul
(14) |
Aug
(28) |
Sep
(29) |
Oct
|
Nov
|
Dec
|
|
From: John M M. <jo...@us...> - 2003-12-02 05:02:08
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm
In directory sc8-pr-cvs1:/tmp/cvs-serv14458/squeak/platforms/Mac OS/vm
Modified Files:
sqMacImageIO.c
Log Message:
3.7.0b2 Changes for file name encoding. Ensure we use current encoding when working with file names. Change logic in vmPath, imageName, shortImageName, documentName to support CFString which we convert to desired encoding at read time.
Index: sqMacImageIO.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacImageIO.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sqMacImageIO.c 6 Aug 2002 22:35:27 -0000 1.3
--- sqMacImageIO.c 2 Dec 2003 04:52:31 -0000 1.4
***************
*** 11,14 ****
--- 11,15 ----
* NOTES:
* Feb 22nd, 2002, JMM moved code into 10 other files, see sqMacMain.c for comments
+ 3.7.0bx Nov 24th, 2003 JMM gCurrentVMEncoding
*****************************************************************************/
***************
*** 18,31 ****
#include "sqMacWindow.h"
#include "sqMacFileLogic.h"
- /*** Variables -- image and path names ***/
- char imageName[IMAGE_NAME_SIZE + 1]; /* full path to image file */
-
- char shortImageName[SHORTIMAGE_NAME_SIZE + 1]; /* just the image file name */
- char documentName[DOCUMENT_NAME_SIZE + 1]; /* full path to document file */
-
- char vmPath[VMPATH_SIZE + 1]; /* full path to interpreter's directory */
/*** VM Home Directory Path ***/
--- 19,26 ----
#include "sqMacWindow.h"
#include "sqMacFileLogic.h"
+ #include "sqMacEncoding.h"
/*** VM Home Directory Path ***/
***************
*** 33,37 ****
int vmPathSize(void) {
! return strlen(vmPath);
}
--- 28,35 ----
int vmPathSize(void) {
! char path[VMPATH_SIZE + 1];
!
! getVMPathWithEncoding(path,gCurrentVMEncoding);
! return strlen(path);
}
***************
*** 39,49 ****
char *stVMPath = (char *) sqVMPathIndex;
int count, i;
! count = strlen(vmPath);
count = (length < count) ? length : count;
/* copy the file name into the Squeak string */
for (i = 0; i < count; i++) {
! stVMPath[i] = vmPath[i];
}
return count;
--- 37,49 ----
char *stVMPath = (char *) sqVMPathIndex;
int count, i;
+ char path[VMPATH_SIZE + 1];
! getVMPathWithEncoding(path,gCurrentVMEncoding);
! count = strlen(path);
count = (length < count) ? length : count;
/* copy the file name into the Squeak string */
for (i = 0; i < count; i++) {
! stVMPath[i] = path[i];
}
return count;
***************
*** 53,57 ****
int imageNameSize(void) {
! return strlen(imageName);
}
--- 53,60 ----
int imageNameSize(void) {
! char path[IMAGE_NAME_SIZE+1];
! getImageNameWithEncoding(path,gCurrentVMEncoding);
!
! return strlen(path);
}
***************
*** 59,69 ****
char *sqImageName = (char *) sqImageNameIndex;
int count, i;
! count = strlen(imageName);
count = (length < count) ? length : count;
/* copy the file name into the Squeak string */
for (i = 0; i < count; i++) {
! sqImageName[i] = imageName[i];
}
return count;
--- 62,74 ----
char *sqImageName = (char *) sqImageNameIndex;
int count, i;
+ char path[IMAGE_NAME_SIZE+1];
+ getImageNameWithEncoding(path,gCurrentVMEncoding);
! count = strlen(path);
count = (length < count) ? length : count;
/* copy the file name into the Squeak string */
for (i = 0; i < count; i++) {
! sqImageName[i] = path[i];
}
return count;
***************
*** 74,77 ****
--- 79,84 ----
int count, i, ch, j;
int lastColonIndex = -1;
+ char name[IMAGE_NAME_SIZE + 1]; /* full path to image file */
+ char shortImageName[SHORTIMAGE_NAME_SIZE+1];
count = (IMAGE_NAME_SIZE < length) ? IMAGE_NAME_SIZE : length;
***************
*** 79,95 ****
/* copy the file name into a null-terminated C string */
for (i = 0; i < count; i++) {
! ch = imageName[i] = sqImageName[i];
if (ch == ':') {
lastColonIndex = i;
}
}
! imageName[count] = 0;
/* copy short image name into a null-terminated C string */
for (i = lastColonIndex + 1, j = 0; i < count; i++, j++) {
! shortImageName[j] = imageName[i];
}
shortImageName[j] = 0;
SetWindowTitle(shortImageName);
return count;
--- 86,104 ----
/* copy the file name into a null-terminated C string */
for (i = 0; i < count; i++) {
! ch = name[i] = sqImageName[i];
if (ch == ':') {
lastColonIndex = i;
}
}
! name[count] = 0;
! SetImageNameViaString(name,gCurrentVMEncoding);
/* copy short image name into a null-terminated C string */
for (i = lastColonIndex + 1, j = 0; i < count; i++, j++) {
! shortImageName[j] = name[i];
}
shortImageName[j] = 0;
+ SetShortImageNameViaString(shortImageName,gCurrentVMEncoding);
SetWindowTitle(shortImageName);
return count;
***************
*** 388,392 ****
#endif
-
--- 397,400 ----
|
|
From: John M M. <jo...@us...> - 2003-12-02 05:02:08
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm
In directory sc8-pr-cvs1:/tmp/cvs-serv14477/squeak/platforms/Mac OS/vm
Modified Files:
sqMacImageIO.h
Log Message:
3.7.0b2 Changes for file name encoding. Ensure we use current encoding when working with file names. Change logic in vmPath, imageName, shortImageName, documentName to support CFString which we convert to desired encoding at read time.
Index: sqMacImageIO.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacImageIO.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sqMacImageIO.h 23 Feb 2002 10:47:31 -0000 1.1
--- sqMacImageIO.h 2 Dec 2003 04:52:35 -0000 1.2
***************
*** 11,20 ****
* NOTES:
* Feb 22nd, 2002, JMM moved code into 10 other files, see sqMacMain.c for comments
****************************************************************************/
#if TARGET_API_MAC_CARBON
#include <Carbon/Carbon.h>
- #else
#endif
- int IsImageName(char *name);
--- 11,19 ----
* NOTES:
* Feb 22nd, 2002, JMM moved code into 10 other files, see sqMacMain.c for comments
+ 3.7.0bx Nov 24th, 2003 JMM gCurrentVMEncoding
****************************************************************************/
#if TARGET_API_MAC_CARBON
#include <Carbon/Carbon.h>
#endif
|
|
From: John M M. <jo...@us...> - 2003-12-02 05:02:07
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm
In directory sc8-pr-cvs1:/tmp/cvs-serv14526/squeak/platforms/Mac OS/vm
Modified Files:
sqMacMain.c
Log Message:
3.7.0b2 Changes for file name encoding. Ensure we use current encoding when working with file names. Change logic in vmPath, imageName, shortImageName, documentName to support CFString which we convert to desired encoding at read time.
Index: sqMacMain.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacMain.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** sqMacMain.c 3 Oct 2003 19:06:27 -0000 1.18
--- sqMacMain.c 2 Dec 2003 04:52:46 -0000 1.19
***************
*** 64,67 ****
--- 64,68 ----
* 3.5.1b3 June 7th, 2003 JMM fix up full screen pthread issue.
* 3.6.x Sept 1st, 2003 JMM per note from Bert Freudenberg <be...@is...> changed 1003 parm to lowercase.
+ * 3.7.0bx Nov 24th, 2003 JMM gCurrentVMEncoding
*/
***************
*** 83,86 ****
--- 84,88 ----
#include "sqMacUIEvents.h"
#include "sqMacMemory.h"
+ #include "sqMacEncoding.h"
#ifdef __MPW__
***************
*** 99,105 ****
#include "aio.h"
#endif
! extern char shortImageName[];
! extern char documentName[];
! extern char vmPath[];
extern int getFullScreenFlag();
extern unsigned char *memory;
--- 101,105 ----
#include "aio.h"
#endif
!
extern int getFullScreenFlag();
extern unsigned char *memory;
***************
*** 112,116 ****
OSErr gSqueakFileLastError;
Boolean gSqueakWindowIsFloating,gSqueakWindowHasTitle=true,gSqueakFloatingWindowGetsFocus=false;
! UInt32 gMaxHeapSize=512*1024*1024;
#ifdef BROWSERPLUGIN
--- 112,116 ----
OSErr gSqueakFileLastError;
Boolean gSqueakWindowIsFloating,gSqueakWindowHasTitle=true,gSqueakFloatingWindowGetsFocus=false;
! UInt32 gMaxHeapSize=512*1024*1024,gSqueakWindowType,gSqueakWindowAttributes;
#ifdef BROWSERPLUGIN
***************
*** 129,132 ****
--- 129,133 ----
static pascal void* squeakThread(void *threadParm);
void SetUpCarbonEvent();
+ void fetchPrefrences();
/*** Main ***/
***************
*** 147,150 ****
--- 148,152 ----
OSErr err;
long threadGestaltInfo;
+ char shortImageName[256];
/* check the interpreter's size assumptions for basic data types */
***************
*** 171,174 ****
--- 173,177 ----
SetUpMenus();
SetUpClipboard();
+ fetchPrefrences();
SetUpWindow();
***************
*** 177,183 ****
#endif
/* install apple event handlers and wait for open event */
- imageName[0] = shortImageName[0] = documentName[0] = vmPath[0] = 0;
InstallAppleEventHandlers();
! while (shortImageName[0] == 0) {
GetNextEvent(everyEvent, &theEvent);
if (theEvent.what == kHighLevelEvent) {
--- 180,185 ----
#endif
/* install apple event handlers and wait for open event */
InstallAppleEventHandlers();
! while (ShortImageNameIsEmpty()) {
GetNextEvent(everyEvent, &theEvent);
if (theEvent.what == kHighLevelEvent) {
***************
*** 186,190 ****
}
! if (imageName[0] == 0) {
FSSpec workingDirectory;
#if TARGET_API_MAC_CARBON && !defined(__MWERKS__)
--- 188,194 ----
}
! getShortImageNameWithEncoding(shortImageName,gCurrentVMEncoding);
!
! if (ImageNameIsEmpty()) {
FSSpec workingDirectory;
#if TARGET_API_MAC_CARBON && !defined(__MWERKS__)
***************
*** 197,201 ****
if (imageURL != NULL) {
imagePath = CFURLCopyFileSystemPath (imageURL, kCFURLHFSPathStyle);
! CFStringGetCString (imagePath, imageName, IMAGE_NAME_SIZE, CFStringGetSystemEncoding());
} else {
#endif
--- 201,207 ----
if (imageURL != NULL) {
imagePath = CFURLCopyFileSystemPath (imageURL, kCFURLHFSPathStyle);
! SetImageNameViaCFString(imagePath);
! CFRelease(imageURL);
! CFRelease(imagePath);
} else {
#endif
***************
*** 204,209 ****
if (err != noErr)
error("Could not obtain default directory");
! CopyCStringToPascal("squeak.image",workingDirectory.name);
! PathToFile(imageName, IMAGE_NAME_SIZE, &workingDirectory);
#if TARGET_API_MAC_CARBON && !defined(__MWERKS__)
}
--- 210,215 ----
if (err != noErr)
error("Could not obtain default directory");
! CopyCStringToPascal("Squeak.image",workingDirectory.name);
! SetImageName(&workingDirectory);
#if TARGET_API_MAC_CARBON && !defined(__MWERKS__)
}
***************
*** 215,219 ****
/* read the image file and allocate memory for Squeak heap */
! f = sqImageFileOpen(imageName, "rb");
while (f == NULL) {
//Failure attempt to ask the user to find the image file
--- 221,225 ----
/* read the image file and allocate memory for Squeak heap */
! f = sqImageFileOpen(getImageName(), "rb");
while (f == NULL) {
//Failure attempt to ask the user to find the image file
***************
*** 221,226 ****
FSSpec vmfsSpec,imageFsSpec;
WDPBRec wdPB;
!
! err = makeFSSpec(vmPath,vmPathSize(),&vmfsSpec);
if (err)
ioExit();
--- 227,235 ----
FSSpec vmfsSpec,imageFsSpec;
WDPBRec wdPB;
! char path[VMPATH_SIZE + 1];
!
! getVMPathWithEncoding(path,gCurrentVMEncoding);
!
! err = makeFSSpec(path,strlen(path),&vmfsSpec);
if (err)
ioExit();
***************
*** 229,233 ****
ioExit();
CopyPascalStringToC(imageFsSpec.name,shortImageName);
! PathToFile(imageName, IMAGE_NAME_SIZE, &imageFsSpec);
/* make the image or document directory the working directory */
--- 238,243 ----
ioExit();
CopyPascalStringToC(imageFsSpec.name,shortImageName);
! SetShortImageNameViaString(shortImageName,gCurrentVMEncoding);
! SetImageName(&imageFsSpec);
/* make the image or document directory the working directory */
***************
*** 236,240 ****
wdPB.ioWDDirID = imageFsSpec.parID;
PBHSetVolSync(&wdPB);
! f = sqImageFileOpen(imageName, "rb");
}
--- 246,250 ----
wdPB.ioWDDirID = imageFsSpec.parID;
PBHSetVolSync(&wdPB);
! f = sqImageFileOpen(getImageName(), "rb");
}
***************
*** 451,460 ****
// id #0 should return the full name of VM; for now it just returns its path
! if (id == 0) return vmPath;
/* Note: 1.3x images will try to read the image as a document because they
expect attribute #1 to be the document name. A 1.3x image can be patched
using a VM of 2.6 or earlier. */
! if (id == 1) return imageName;
! if (id == 2) return documentName;
#ifdef BROWSERPLUGIN
--- 461,483 ----
// id #0 should return the full name of VM; for now it just returns its path
! if (id == 0) {
! static char path[VMPATH_SIZE + 1];
! getVMPathWithEncoding(path,gCurrentVMEncoding);
! return path;
! }
/* Note: 1.3x images will try to read the image as a document because they
expect attribute #1 to be the document name. A 1.3x image can be patched
using a VM of 2.6 or earlier. */
! if (id == 1) {
! static char path[IMAGE_NAME_SIZE + 1];
! getImageNameWithEncoding(path,gCurrentVMEncoding);
! return path;
! }
!
! if (id == 2) {
! static char path[DOCUMENT_NAME_SIZE + 1];
! getDocumentNameWithEncoding(path,gCurrentVMEncoding);
! return path;
! }
#ifdef BROWSERPLUGIN
***************
*** 500,504 ****
strcat(data,interpreterVersion);
strcat(data," ");
! CFStringGetCString (versionString, data+strlen(data), 255-strlen(data), CFStringGetSystemEncoding());
return data;
}
--- 523,527 ----
strcat(data,interpreterVersion);
strcat(data," ");
! CFStringGetCString (versionString, data+strlen(data), 255-strlen(data), gCurrentVMEncoding);
return data;
}
***************
*** 564,570 ****
}
- /* clear all path and file names */
- imageName[0] = shortImageName[0] = documentName[0] = vmPath[0] = 0;
-
SetUpTimers();
PowerMgrCheck();
--- 587,590 ----
***************
*** 598,601 ****
--- 618,685 ----
#endif
+
+ #if TARGET_API_MAC_CARBON
+ void fetchPrefrences() {
+ CFBundleRef myBundle;
+ CFDictionaryRef myDictionary;
+ CFNumberRef SqueakWindowType,SqueakMaxHeapSizeType;
+ CFBooleanRef SqueakWindowHasTitleType,SqueakFloatingWindowGetsFocusType;
+ CFDataRef SqueakWindowAttributeType;
+ CFStringRef SqueakVMEncodingType;
+ char encoding[256];
+
+ myBundle = CFBundleGetMainBundle();
+ myDictionary = CFBundleGetInfoDictionary(myBundle);
+ SqueakWindowType = CFDictionaryGetValue(myDictionary, CFSTR("SqueakWindowType"));
+ SqueakWindowAttributeType = CFDictionaryGetValue(myDictionary, CFSTR("SqueakWindowAttribute"));
+ SqueakWindowHasTitleType = CFDictionaryGetValue(myDictionary, CFSTR("SqueakWindowHasTitle"));
+ SqueakFloatingWindowGetsFocusType = CFDictionaryGetValue(myDictionary, CFSTR("SqueakFloatingWindowGetsFocus"));
+ SqueakMaxHeapSizeType = CFDictionaryGetValue(myDictionary, CFSTR("SqueakMaxHeapSize"));
+ SqueakVMEncodingType = CFDictionaryGetValue(myDictionary, CFSTR("SqueakEncodingType"));
+
+
+ if (SqueakVMEncodingType)
+ CFStringGetCString (SqueakVMEncodingType, encoding, 255, kCFStringEncodingMacRoman);
+ else
+ *encoding = 0x00;
+
+ setEncodingType(encoding);
+
+ if (SqueakWindowType)
+ CFNumberGetValue(SqueakWindowType,kCFNumberLongType,&gSqueakWindowType);
+ else
+ gSqueakWindowType = kDocumentWindowClass;
+
+ gSqueakWindowIsFloating = gSqueakWindowType == kUtilityWindowClass;
+
+ if (SqueakWindowAttributeType && CFDataGetLength(SqueakWindowAttributeType) == 4) {
+ const UInt8 *where;
+ where = CFDataGetBytePtr(SqueakWindowAttributeType);
+ memmove(&gSqueakWindowAttributes,where,4);
+ } else {
+ gSqueakWindowAttributes = kWindowStandardDocumentAttributes
+ +kWindowStandardHandlerAttribute
+ +kWindowNoConstrainAttribute
+ -kWindowCloseBoxAttribute;
+ }
+
+ if (SqueakWindowHasTitleType)
+ gSqueakWindowHasTitle = CFBooleanGetValue(SqueakWindowHasTitleType);
+ else
+ gSqueakWindowHasTitle = true;
+
+ if (SqueakFloatingWindowGetsFocusType)
+ gSqueakFloatingWindowGetsFocus = CFBooleanGetValue(SqueakFloatingWindowGetsFocusType);
+ else
+ gSqueakFloatingWindowGetsFocus = false;
+
+ if (SqueakMaxHeapSizeType)
+ CFNumberGetValue(SqueakMaxHeapSizeType,kCFNumberLongType,(long *) &gMaxHeapSize);
+
+ }
+ #else
+ void fetchPrefrences() {}
+ #endif
+
/*** Profiling Stubs ***/
|
|
From: John M M. <jo...@us...> - 2003-12-02 05:02:06
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm
In directory sc8-pr-cvs1:/tmp/cvs-serv14578/squeak/platforms/Mac OS/vm
Modified Files:
sqMacUIAppleEvents.c
Log Message:
3.7.0b2 Changes for file name encoding. Ensure we use current encoding when working with file names. Change logic in vmPath, imageName, shortImageName, documentName to support CFString which we convert to desired encoding at read time.
Index: sqMacUIAppleEvents.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacUIAppleEvents.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sqMacUIAppleEvents.c 23 Feb 2002 10:47:54 -0000 1.1
--- sqMacUIAppleEvents.c 2 Dec 2003 04:52:56 -0000 1.2
***************
*** 16,26 ****
#include "sqMacUIConstants.h"
#include "sqMacUIEvents.h"
! #include "sqMacImageIO.h"
#include "sqMacFileLogic.h"
#include "DropPlugin.h"
- extern char shortImageName[];
- extern char vmPath[];
-
extern squeakFileOffsetType calculateStartLocationForImage();
--- 16,23 ----
#include "sqMacUIConstants.h"
#include "sqMacUIEvents.h"
! #include "sqMacEncoding.h"
#include "sqMacFileLogic.h"
#include "DropPlugin.h"
extern squeakFileOffsetType calculateStartLocationForImage();
***************
*** 40,44 ****
long result;
- shortImageName[0] = 0;
err = Gestalt(gestaltAppleEventsAttr, &result);
if (err == noErr) {
--- 37,40 ----
***************
*** 51,55 ****
pascal OSErr HandleOpenAppEvent(const AEDescList *aevt, AEDescList *reply, long refCon) {
! /* User double-clicked application; look for "squeak.image" in same directory */
squeakFileOffsetType checkValueForEmbeddedImage;
OSErr err;
--- 47,51 ----
pascal OSErr HandleOpenAppEvent(const AEDescList *aevt, AEDescList *reply, long refCon) {
! /* User double-clicked application; look for "Squeak.image" in same directory */
squeakFileOffsetType checkValueForEmbeddedImage;
OSErr err;
***************
*** 57,73 ****
ProcessInfoRec processInformation;
Str255 name;
FSSpec workingDirectory;
// Get spec to the working directory
err = GetApplicationDirectory(&workingDirectory);
! if (err != noErr) return err;
// Convert that to a full path string.
! PathToDir(vmPath, VMPATH_SIZE,&workingDirectory);
checkValueForEmbeddedImage = calculateStartLocationForImage();
if (checkValueForEmbeddedImage == 0) {
/* use default image name in same directory as the VM */
! strcpy(shortImageName, "squeak.image");
return noErr;
}
--- 53,71 ----
ProcessInfoRec processInformation;
Str255 name;
+ char cname[256];
FSSpec workingDirectory;
// Get spec to the working directory
err = GetApplicationDirectory(&workingDirectory);
! if (err != noErr)
! return err;
// Convert that to a full path string.
! SetVMPath(&workingDirectory);
checkValueForEmbeddedImage = calculateStartLocationForImage();
if (checkValueForEmbeddedImage == 0) {
/* use default image name in same directory as the VM */
! SetShortImageNameViaString("Squeak.image",gCurrentVMEncoding);
return noErr;
}
***************
*** 80,89 ****
if (err != noErr) {
! strcpy(shortImageName, "squeak.image");
! return noErr;
! }
!
! CopyPascalStringToC(name,shortImageName);
! PathToFile(imageName, IMAGE_NAME_SIZE, &workingDirectory);
return noErr;
--- 78,88 ----
if (err != noErr) {
! SetShortImageNameViaString("Squeak.image",gCurrentVMEncoding);
! return noErr;
! }
!
! CopyPascalStringToC(name,cname);
! SetShortImageNameViaString(cname,gCurrentVMEncoding);
! SetImageName( &workingDirectory);
return noErr;
***************
*** 103,106 ****
--- 102,106 ----
WDPBRec pb;
FInfo finderInformation;
+ char shortImageName[256];
reply; refCon; /* reference args to avoid compiler warnings */
***************
*** 108,116 ****
/* record path to VM's home folder */
! if (vmPath[0] == 0) {
err = GetApplicationDirectory(&workingDirectory);
if (err != noErr)
return err;
! PathToDir(vmPath, VMPATH_SIZE, &workingDirectory);
}
--- 108,116 ----
/* record path to VM's home folder */
! if (VMPathIsEmpty()) {
err = GetApplicationDirectory(&workingDirectory);
if (err != noErr)
return err;
! SetVMPath(&workingDirectory);
}
***************
*** 125,129 ****
goto done;
! if (shortImageName[0] != 0) {
/* Do the rest of the documents */
processDocumentsButExcludeOne(&fileList,-1);
--- 125,129 ----
goto done;
! if (!ShortImageNameIsEmpty()) {
/* Do the rest of the documents */
processDocumentsButExcludeOne(&fileList,-1);
***************
*** 135,141 ****
if (imageFileIsNumber == 0) {
// Test is open change set
! strcpy(shortImageName, "squeak.image");
CopyCStringToPascal(shortImageName,workingDirectory.name);
! PathToFile(imageName, IMAGE_NAME_SIZE, &workingDirectory);
fileSpec = workingDirectory;
} else {
--- 135,142 ----
if (imageFileIsNumber == 0) {
// Test is open change set
! strcpy(shortImageName, "Squeak.image");
CopyCStringToPascal(shortImageName,workingDirectory.name);
! SetShortImageNameViaString(shortImageName,gCurrentVMEncoding);
! SetImageName(&workingDirectory);
fileSpec = workingDirectory;
} else {
***************
*** 150,154 ****
CopyPascalStringToC(fileSpec.name,shortImageName);
! PathToFile(imageName, IMAGE_NAME_SIZE,&fileSpec);
}
--- 151,156 ----
CopyPascalStringToC(fileSpec.name,shortImageName);
! SetShortImageNameViaString(shortImageName,gCurrentVMEncoding);
! SetImageName(&fileSpec);
}
***************
*** 255,258 ****
--- 257,261 ----
FSSpec fileSpec;
FInfo finderInformation;
+ char shortImageName[256];
/* count list elements */
***************
*** 271,275 ****
if (err)
goto done;
! CopyPascalStringToC(fileSpec.name,shortImageName);
if (IsImageName(shortImageName) || finderInformation.fdType == 'STim')
--- 274,280 ----
if (err)
goto done;
!
! CopyPascalStringToC(fileSpec.name,shortImageName);
! SetShortImageNameViaString(shortImageName,gCurrentVMEncoding);
if (IsImageName(shortImageName) || finderInformation.fdType == 'STim')
|
|
From: John M M. <jo...@us...> - 2003-12-02 05:02:01
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm
In directory sc8-pr-cvs1:/tmp/cvs-serv14663/squeak/platforms/Mac OS/vm
Modified Files:
sqMacWindow.c
Log Message:
3.7.0b2 Changes for file name encoding. Ensure we use current encoding when working with file names. Change logic in vmPath, imageName, shortImageName, documentName to support CFString which we convert to desired encoding at read time.
Index: sqMacWindow.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacWindow.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** sqMacWindow.c 20 Nov 2003 01:35:47 -0000 1.29
--- sqMacWindow.c 2 Dec 2003 04:53:12 -0000 1.30
***************
*** 16,19 ****
--- 16,20 ----
3.2.8b1 July 24th, 2002 JMM support for os-x plugin under IE 5.x
3.5.1b5 June 25th, 2003 JMM fix memory leak on color table free, pull preferences from Info.plist under os-x
+ 3.7.0bx Nov 24th, 2003 JMM move preferences to main, the proper place.
*****************************************************************************/
***************
*** 59,63 ****
extern struct VirtualMachine *interpreterProxy;
int ioSetFullScreenActual(int fullScreen);
- void fetchPrefrencesForWindow(int *windowType,int *windowAttributes);
void SetupSurface(void);
--- 60,63 ----
***************
*** 356,360 ****
out += pixPitch;
}
! } else if (depth == 16 && pixDepth == 8) { // Untested, perhaps will not get called
SetPort(windowPort);
while (affectedH--) {
--- 356,360 ----
out += pixPitch;
}
! } else if (depth == 16 && pixDepth == 8) { //Tested by Steve Moffitt <st...@ci...> not all machines do true 8bit windows, some the GPU does and window stays as 16bits
SetPort(windowPort);
while (affectedH--) {
***************
*** 521,527 ****
if ((Ptr)CreateNewWindow != (Ptr)kUnresolvedCFragSymbolAddress) {
! int windowType,windowAttributes;
! fetchPrefrencesForWindow(&windowType,&windowAttributes);
! CreateNewWindow(windowType,windowAttributes,&windowBounds,&stWindow);
} else
#endif
--- 521,527 ----
if ((Ptr)CreateNewWindow != (Ptr)kUnresolvedCFragSymbolAddress) {
! extern UInt32 gSqueakWindowType,gSqueakWindowAttributes;
!
! CreateNewWindow(gSqueakWindowType,gSqueakWindowAttributes,&windowBounds,&stWindow);
} else
#endif
***************
*** 1149,1203 ****
}
- #if TARGET_API_MAC_CARBON
- void fetchPrefrencesForWindow(int *windowType,int *windowAttributes) {
- CFBundleRef myBundle;
- CFDictionaryRef myDictionary;
- CFNumberRef SqueakWindowType,SqueakMaxHeapSizeType;
- CFBooleanRef SqueakWindowHasTitleType,SqueakFloatingWindowGetsFocusType;
- CFDataRef SqueakWindowAttributeType;
- extern Boolean gSqueakWindowIsFloating,gSqueakWindowHasTitle,gSqueakFloatingWindowGetsFocus;
- extern UInt32 gMaxHeapSize;
-
- myBundle = CFBundleGetMainBundle();
- myDictionary = CFBundleGetInfoDictionary(myBundle);
- SqueakWindowType = CFDictionaryGetValue(myDictionary, CFSTR("SqueakWindowType"));
- SqueakWindowAttributeType = CFDictionaryGetValue(myDictionary, CFSTR("SqueakWindowAttribute"));
- SqueakWindowHasTitleType = CFDictionaryGetValue(myDictionary, CFSTR("SqueakWindowHasTitle"));
- SqueakFloatingWindowGetsFocusType = CFDictionaryGetValue(myDictionary, CFSTR("SqueakFloatingWindowGetsFocus"));
- SqueakMaxHeapSizeType = CFDictionaryGetValue(myDictionary, CFSTR("SqueakMaxHeapSize"));
-
- if (SqueakWindowType)
- CFNumberGetValue(SqueakWindowType,kCFNumberLongType,windowType);
- else
- *windowType = kDocumentWindowClass;
-
- gSqueakWindowIsFloating = *windowType == kUtilityWindowClass;
-
- if (SqueakWindowAttributeType && CFDataGetLength(SqueakWindowAttributeType) == 4) {
- const UInt8 *where;
- where = CFDataGetBytePtr(SqueakWindowAttributeType);
- memmove(windowAttributes,where,4);
- } else {
- *windowAttributes = kWindowStandardDocumentAttributes
- +kWindowStandardHandlerAttribute
- +kWindowNoConstrainAttribute
- -kWindowCloseBoxAttribute;
- }
-
- if (SqueakWindowHasTitleType)
- gSqueakWindowHasTitle = CFBooleanGetValue(SqueakWindowHasTitleType);
- else
- gSqueakWindowHasTitle = true;
-
- if (SqueakFloatingWindowGetsFocusType)
- gSqueakFloatingWindowGetsFocus = CFBooleanGetValue(SqueakFloatingWindowGetsFocusType);
- else
- gSqueakFloatingWindowGetsFocus = false;
-
- if (SqueakMaxHeapSizeType)
- CFNumberGetValue(SqueakMaxHeapSizeType,kCFNumberLongType,(long *) &gMaxHeapSize);
-
- }
- #endif
#ifdef JMMFOO2
--- 1149,1152 ----
|
|
From: John M M. <jo...@us...> - 2003-12-02 04:53:05
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm In directory sc8-pr-cvs1:/tmp/cvs-serv14602/squeak/platforms/Mac OS/vm Modified Files: sqMacUIEvents.h Log Message: 3.7.0b2 Changes for file name encoding. Ensure we use current encoding when working with file names. Change logic in vmPath, imageName, shortImageName, documentName to support CFString which we convert to desired encoding at read time. Index: sqMacUIEvents.h =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacUIEvents.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sqMacUIEvents.h 15 Mar 2002 01:58:20 -0000 1.4 --- sqMacUIEvents.h 2 Dec 2003 04:53:02 -0000 1.5 *************** *** 13,16 **** --- 13,17 ---- * Feb 27th, 2002, JMM changed for carbon event logic. * Mar 8th, 2002, JMM external prims that make dialog windows must do this on main thread + * 3.7.0bx Nov 24th, 2003 JMM gCurrentVMEncoding, plus multiple keystrokes for input ****************************************************************************/ |
|
From: John M M. <jo...@us...> - 2003-12-02 04:52:53
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/plugins/SecurityPlugin
In directory sc8-pr-cvs1:/tmp/cvs-serv14558/squeak/platforms/Mac OS/plugins/SecurityPlugin
Modified Files:
sqMacSecurity.c
Log Message:
3.7.0b2 Changes for file name encoding. Ensure we use current encoding when working with file names. Change logic in vmPath, imageName, shortImageName, documentName to support CFString which we convert to desired encoding at read time.
Index: sqMacSecurity.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/plugins/SecurityPlugin/sqMacSecurity.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sqMacSecurity.c 13 May 2002 19:52:06 -0000 1.4
--- sqMacSecurity.c 2 Dec 2003 04:52:50 -0000 1.5
***************
*** 4,7 ****
--- 4,8 ----
//JMM 8/15/01 only allow call to ioInitSecurity Once, also return proper return code
//JMM 9/5/01 make it as a plugin
+ // 3.7.0bx Nov 24th, 2003 JMM gCurrentVMEncoding
#include "sq.h"
***************
*** 215,219 ****
// Look for folder, if not found abort */
FSMakeFSSpecCompat(vRefNum,dirID,"\p",&spec);
! PathToFile(untrustedUserDirectory,255,&spec);
strcat(untrustedUserDirectory,"Squeak:Internet");
err = makeFSSpec(untrustedUserDirectory, strlen(untrustedUserDirectory),&spec);
--- 216,220 ----
// Look for folder, if not found abort */
FSMakeFSSpecCompat(vRefNum,dirID,"\p",&spec);
! PathToFile(untrustedUserDirectory,255,&spec,gCurrentVMEncoding);
strcat(untrustedUserDirectory,"Squeak:Internet");
err = makeFSSpec(untrustedUserDirectory, strlen(untrustedUserDirectory),&spec);
|
|
From: John M M. <jo...@us...> - 2003-12-02 04:52:43
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/plugins/InternetConfigPlugin In directory sc8-pr-cvs1:/tmp/cvs-serv14497/squeak/platforms/Mac OS/plugins/InternetConfigPlugin Modified Files: sqMacInternetConfiguration.c Log Message: 3.7.0b2 Changes for file name encoding. Ensure we use current encoding when working with file names. Change logic in vmPath, imageName, shortImageName, documentName to support CFString which we convert to desired encoding at read time. Index: sqMacInternetConfiguration.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/plugins/InternetConfigPlugin/sqMacInternetConfiguration.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sqMacInternetConfiguration.c 18 Dec 2001 21:17:19 -0000 1.2 --- sqMacInternetConfiguration.c 2 Dec 2003 04:52:40 -0000 1.3 *************** *** 5,9 **** http://www.smalltalkconsulting.com ! Nov 24th 2001 JMM fixed broken tempSpec code, was causing memory exception under os-x*/ --- 5,12 ---- http://www.smalltalkconsulting.com ! Nov 24th 2001 JMM fixed broken tempSpec code, was causing memory exception under os-x ! 3.7.0bx Nov 24th, 2003 JMM gCurrentVMEncoding ! ! */ *************** *** 76,80 **** if (error == noErr || error == icTruncatedErr) { tempICFileSpec = (ICFileSpec *) &buffer; ! PathToFile(aString, 1024, &tempICFileSpec->fss); size = strlen(aString); } else --- 79,83 ---- if (error == noErr || error == icTruncatedErr) { tempICFileSpec = (ICFileSpec *) &buffer; ! PathToFile(aString, 1024, &tempICFileSpec->fss,gCurrentVMEncoding); size = strlen(aString); } else |
|
From: John M M. <jo...@us...> - 2003-12-02 04:52:25
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm
In directory sc8-pr-cvs1:/tmp/cvs-serv14419/squeak/platforms/Mac OS/vm
Modified Files:
sqMacFileLogic.c
Log Message:
3.7.0b2 Changes for file name encoding. Ensure we use current encoding when working with file names. Change logic in vmPath, imageName, shortImageName, documentName to support CFString which we convert to desired encoding at read time.
Index: sqMacFileLogic.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacFileLogic.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** sqMacFileLogic.c 20 Jun 2003 01:47:37 -0000 1.11
--- sqMacFileLogic.c 2 Dec 2003 04:52:22 -0000 1.12
***************
*** 17,20 ****
--- 17,21 ----
* 5/12/2002 JMM add logic to enable you to put plugins beside macclassic VM
* 3.2.8b1 July 24th, 2002 JMM support for os-x plugin under IE 5.x
+ 3.7.0bx Nov 24th, 2003 JMM gCurrentVMEncoding
*
***************
*** 65,69 ****
OSErr err;
! filePath = CFStringCreateWithBytes(kCFAllocatorDefault,(UInt8 *) pathString,pathStringLength,kCFStringEncodingMacRoman,false);
if (filePath == nil)
return -1000;
--- 66,70 ----
OSErr err;
! filePath = CFStringCreateWithBytes(kCFAllocatorDefault,(UInt8 *) pathString,pathStringLength,gCurrentVMEncoding,false);
if (filePath == nil)
return -1000;
***************
*** 84,95 ****
/* Fill in the given string with the full path from a root volume to the given directory. */
! int PathToDir(char *pathName, int pathNameMax, FSSpec *where) {
CopyCStringToPascal(":",where->name);
! return PathToFile(pathName,pathNameMax,where);
}
/* Fill in the given string with the full path from a root volume to the given file. */
! int PathToFile(char *pathName, int pathNameMax, FSSpec *where) {
CFURLRef sillyThing;
CFStringRef filePath;
--- 85,96 ----
/* Fill in the given string with the full path from a root volume to the given directory. */
! int PathToDir(char *pathName, int pathNameMax, FSSpec *where,UInt32 encoding) {
CopyCStringToPascal(":",where->name);
! return PathToFile(pathName,pathNameMax,where,encoding);
}
/* Fill in the given string with the full path from a root volume to the given file. */
! int PathToFile(char *pathName, int pathNameMax, FSSpec *where,UInt32 encoding) {
CFURLRef sillyThing;
CFStringRef filePath;
***************
*** 118,122 ****
CFRelease(sillyThing);
! CFStringGetCString (filePath,pathName,pathNameMax, kCFStringEncodingMacRoman);
CFRelease(filePath);
--- 119,123 ----
CFRelease(sillyThing);
! CFStringGetCString (filePath,pathName,pathNameMax, encoding);
CFRelease(filePath);
***************
*** 139,143 ****
filePath = CFStringCreateWithBytes(kCFAllocatorDefault,
! (UInt8 *)pathString,pathStringLength,kCFStringEncodingMacRoman,false);
if (filePath == nil)
return -1;
--- 140,144 ----
filePath = CFStringCreateWithBytes(kCFAllocatorDefault,
! (UInt8 *)pathString,pathStringLength,gCurrentVMEncoding,false);
if (filePath == nil)
return -1;
***************
*** 175,179 ****
#if defined(__MWERKS__) && !defined(__APPLE__) && !defined(__MACH__)
! filePath = CFStringCreateWithBytes(kCFAllocatorDefault,(UInt8 *)dst,strlen(dst),kCFStringEncodingMacRoman,false);
if (filePath == nil)
return 2;
--- 176,180 ----
#if defined(__MWERKS__) && !defined(__APPLE__) && !defined(__MACH__)
! filePath = CFStringCreateWithBytes(kCFAllocatorDefault,(UInt8 *)dst,strlen(dst),gCurrentVMEncoding,false);
if (filePath == nil)
return 2;
***************
*** 181,185 ****
CFRelease(filePath);
filePath = CFURLCopyFileSystemPath (sillyThing, kCFURLHFSPathStyle);
! CFStringGetCString (filePath,dst,1000, kCFStringEncodingMacRoman);
CFRelease(sillyThing);
CFRelease(filePath);
--- 182,186 ----
CFRelease(filePath);
filePath = CFURLCopyFileSystemPath (sillyThing, kCFURLHFSPathStyle);
! CFStringGetCString (filePath,dst,1000, gCurrentVMEncoding);
CFRelease(sillyThing);
CFRelease(filePath);
***************
*** 201,205 ****
sillyThing = CFURLCreateFromFSRef(kCFAllocatorDefault,&theFSRef);
filePath = CFURLCopyFileSystemPath (sillyThing, kCFURLHFSPathStyle);
! CFStringGetCString (filePath,dst,1000, kCFStringEncodingMacRoman);
CFRelease(sillyThing);
CFRelease(filePath);
--- 202,206 ----
sillyThing = CFURLCreateFromFSRef(kCFAllocatorDefault,&theFSRef);
filePath = CFURLCopyFileSystemPath (sillyThing, kCFURLHFSPathStyle);
! CFStringGetCString (filePath,dst,1000, gCurrentVMEncoding);
CFRelease(sillyThing);
CFRelease(filePath);
***************
*** 242,246 ****
if (err != noErr)
return;
! filePath = CFStringCreateWithBytes(kCFAllocatorDefault,(UInt8 *)src,num,kCFStringEncodingMacRoman,false);
if (filePath == nil)
return;
--- 243,247 ----
if (err != noErr)
return;
! filePath = CFStringCreateWithBytes(kCFAllocatorDefault,(UInt8 *)src,num,gCurrentVMEncoding,false);
if (filePath == nil)
return;
***************
*** 256,260 ****
filePath = CFURLCopyFileSystemPath (appendedSillyThing, kCFURLPOSIXPathStyle);
#endif
! CFStringGetCString (filePath,dst,1000, kCFStringEncodingMacRoman);
CFRelease(sillyThing);
CFRelease(appendedSillyThing);
--- 257,261 ----
filePath = CFURLCopyFileSystemPath (appendedSillyThing, kCFURLPOSIXPathStyle);
#endif
! CFStringGetCString (filePath,dst,1000, gCurrentVMEncoding);
CFRelease(sillyThing);
CFRelease(appendedSillyThing);
***************
*** 267,271 ****
sillyThing = CFURLCreateFromFSRef(kCFAllocatorDefault,&theFSRef);
filePath = CFURLCopyFileSystemPath (sillyThing, kCFURLHFSPathStyle);
! CFStringGetCString (filePath,dst,1000, kCFStringEncodingMacRoman);
CFRelease(sillyThing);
CFRelease(filePath);
--- 268,272 ----
sillyThing = CFURLCreateFromFSRef(kCFAllocatorDefault,&theFSRef);
filePath = CFURLCopyFileSystemPath (sillyThing, kCFURLHFSPathStyle);
! CFStringGetCString (filePath,dst,1000, gCurrentVMEncoding);
CFRelease(sillyThing);
CFRelease(filePath);
***************
*** 312,323 ****
if (err != noErr)
return err;
! aLevel = CFStringCreateWithCString(kCFAllocatorDefault,token,kCFStringEncodingMacRoman);
if (aLevel == nil)
return -1000;
tokenLength = CFStringGetLength(aLevel);
CFStringGetCharacters(aLevel,CFRangeMake(0,tokenLength),buffer);
! err = FSMakeFSRefUnicode(&parentFSRef,tokenLength,buffer,kCFStringEncodingMacRoman,&childFSRef);
if (err != noErr) {
! CFStringGetPascalString(aLevel,spec->name,64,kCFStringEncodingMacRoman);
CFRelease(aLevel);
return err;
--- 313,324 ----
if (err != noErr)
return err;
! aLevel = CFStringCreateWithCString(kCFAllocatorDefault,token,gCurrentVMEncoding);
if (aLevel == nil)
return -1000;
tokenLength = CFStringGetLength(aLevel);
CFStringGetCharacters(aLevel,CFRangeMake(0,tokenLength),buffer);
! err = FSMakeFSRefUnicode(&parentFSRef,tokenLength,buffer,gCurrentVMEncoding,&childFSRef);
if (err != noErr) {
! CFStringGetPascalString(aLevel,spec->name,64,gCurrentVMEncoding);
CFRelease(aLevel);
return err;
***************
*** 449,461 ****
! int PathToDir(char *pathName, int pathNameMax, FSSpec *where) {
/* Fill in the given string with the full path from a root volume to
to given directory.
*/
CopyCStringToPascal(":",where->name);
! return PathToFile(pathName,pathNameMax,where);
}
! int PathToFile(char *pathName, int pathNameMax, FSSpec *where) {
OSErr error;
short pathLength;
--- 450,462 ----
! int PathToDir(char *pathName, int pathNameMax, FSSpec *where,UInt32 encoding) {
/* Fill in the given string with the full path from a root volume to
to given directory.
*/
CopyCStringToPascal(":",where->name);
! return PathToFile(pathName,pathNameMax,where,encoding);
}
! int PathToFile(char *pathName, int pathNameMax, FSSpec *where,UInt32 encoding) {
OSErr error;
short pathLength;
***************
*** 741,745 ****
theString = CFStringCreateWithCharacters (kCFAllocatorDefault, unicodeName.unicode, (CFIndex) unicodeName.length);
! CFStringGetPascalString(theString,(unsigned char *) name,256, kCFStringEncodingMacRoman);
CFRelease(theString);
return;
--- 742,746 ----
theString = CFStringCreateWithCharacters (kCFAllocatorDefault, unicodeName.unicode, (CFIndex) unicodeName.length);
! CFStringGetPascalString(theString,(unsigned char *) name,256, gCurrentVMEncoding);
CFRelease(theString);
return;
***************
*** 1169,1173 ****
pb->hFileInfo.ioFlLgLen = catalogInfo.dataLogicalSize;
theString = CFStringCreateWithCharacters (nil, unicodeName.unicode, (CFIndex) unicodeName.length);
! CFStringGetCString (theString,name,256, kCFStringEncodingMacRoman);
CopyCStringToPascal(name,name);
CFRelease(theString);
--- 1170,1174 ----
pb->hFileInfo.ioFlLgLen = catalogInfo.dataLogicalSize;
theString = CFStringCreateWithCharacters (nil, unicodeName.unicode, (CFIndex) unicodeName.length);
! CFStringGetCString (theString,name,256, gCurrentVMEncoding);
CopyCStringToPascal(name,name);
CFRelease(theString);
|
|
From: John M M. <jo...@us...> - 2003-12-02 04:52:14
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm
In directory sc8-pr-cvs1:/tmp/cvs-serv14373/squeak/platforms/Mac OS/vm
Modified Files:
sqMacExternalPrims.c
Log Message:
3.7.0b2 Changes for file name encoding. Ensure we use current encoding when working with file names. Change logic in vmPath, imageName, shortImageName, documentName to support CFString which we convert to desired encoding at read time.
Index: sqMacExternalPrims.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacExternalPrims.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sqMacExternalPrims.c 3 Oct 2003 18:59:08 -0000 1.5
--- sqMacExternalPrims.c 2 Dec 2003 04:52:11 -0000 1.6
***************
*** 12,15 ****
--- 12,16 ----
* Feb 22nd, 2002, JMM moved code into 10 other files, see sqMacMain.c for comments
* Oct 2nd, 2003, JMM bug in browser file name creation in os-x, rework how path is resolved
+ 3.7.0bx Nov 24th, 2003 JMM gCurrentVMEncoding
*****************************************************************************/
***************
*** 17,22 ****
#include "sqMacExternalPrims.h"
#include "sqMacFileLogic.h"
- extern char vmPath[];
CFragConnectionID LoadLibViaPath(char *libName, char *pluginDirPath);
void createBrowserPluginPath(char *pluginDirPath);
--- 18,23 ----
#include "sqMacExternalPrims.h"
#include "sqMacFileLogic.h"
+ #include "sqMacEncoding.h"
CFragConnectionID LoadLibViaPath(char *libName, char *pluginDirPath);
void createBrowserPluginPath(char *pluginDirPath);
***************
*** 37,41 ****
/* first, look in the "<Squeak VM directory>Plugins" directory for the library */
! strcpy(pluginDirPath, vmPath);
#ifdef BROWSERPLUGIN
--- 38,42 ----
/* first, look in the "<Squeak VM directory>Plugins" directory for the library */
! getVMPathWithEncoding(pluginDirPath,gCurrentVMEncoding);
#ifdef BROWSERPLUGIN
***************
*** 50,54 ****
#ifndef BROWSERPLUGIN
/* second, look directly in Squeak VM directory for the library */
! libHandle = LoadLibViaPath(pluginName, vmPath);
if (libHandle != nil) return (int) libHandle;
--- 51,56 ----
#ifndef BROWSERPLUGIN
/* second, look directly in Squeak VM directory for the library */
! getVMPathWithEncoding(pluginDirPath,gCurrentVMEncoding);
! libHandle = LoadLibViaPath(pluginName, pluginDirPath);
if (libHandle != nil) return (int) libHandle;
***************
*** 178,182 ****
return nil;
! theString = CFStringCreateWithCString(kCFAllocatorDefault,lookupName,kCFStringEncodingMacRoman);
if (theString == nil)
return nil;
--- 180,184 ----
return nil;
! theString = CFStringCreateWithCString(kCFAllocatorDefault,lookupName,gCurrentVMEncoding);
if (theString == nil)
return nil;
***************
*** 220,224 ****
// So go back to a cheaper call
filePath = CFStringCreateWithCString(kCFAllocatorDefault,
! (UInt8 *) tempDirPath,kCFStringEncodingMacRoman);
if (filePath == nil)
return nil;
--- 222,226 ----
// So go back to a cheaper call
filePath = CFStringCreateWithCString(kCFAllocatorDefault,
! (UInt8 *) tempDirPath,gCurrentVMEncoding);
if (filePath == nil)
return nil;
***************
*** 234,238 ****
if (theBundle == nil) {
CFStringRef libNameCFString;
! libNameCFString = CFStringCreateWithCString(kCFAllocatorDefault,libName,kCFStringEncodingMacRoman);
err = LoadFrameworkBundle(libNameCFString, &theBundle);
CFRelease(libNameCFString);
--- 236,240 ----
if (theBundle == nil) {
CFStringRef libNameCFString;
! libNameCFString = CFStringCreateWithCString(kCFAllocatorDefault,libName,gCurrentVMEncoding);
err = LoadFrameworkBundle(libNameCFString, &theBundle);
CFRelease(libNameCFString);
|
|
From: Andreas R. <and...@us...> - 2003-11-21 17:19:52
|
Update of /cvsroot/squeak/squeak/platforms/win32/plugins/SocketPlugin
In directory sc8-pr-cvs1:/tmp/cvs-serv7510
Modified Files:
sqWin32NewNet.c
Log Message:
fixed semaphore signaling
Index: sqWin32NewNet.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/plugins/SocketPlugin/sqWin32NewNet.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sqWin32NewNet.c 2 Nov 2003 19:52:39 -0000 1.7
--- sqWin32NewNet.c 21 Nov 2003 17:19:49 -0000 1.8
***************
*** 523,527 ****
UNLOCKSOCKET(pss->mutex);
/* Socket state changed so signal */
! signalSemaphoreWithIndex(pss->semaphoreIndex);
} else {
if(n != SOCKET_ERROR) {
--- 523,527 ----
UNLOCKSOCKET(pss->mutex);
/* Socket state changed so signal */
! SIGNAL(pss->semaphoreIndex);
} else {
if(n != SOCKET_ERROR) {
***************
*** 603,607 ****
UNLOCKSOCKET(pss->mutex);
/* Socket state changed so signal */
! signalSemaphoreWithIndex(pss->semaphoreIndex);
} else {
if(n != SOCKET_ERROR) {
--- 603,607 ----
UNLOCKSOCKET(pss->mutex);
/* Socket state changed so signal */
! SIGNAL(pss->semaphoreIndex);
} else {
if(n != SOCKET_ERROR) {
***************
*** 1806,1810 ****
(strncmp(hostName, lastName, len) == 0)) {
/* same as last, no point in looking it up */
! signalSemaphoreWithIndex(resolverSemaphoreIndex);
return;
}
--- 1806,1810 ----
(strncmp(hostName, lastName, len) == 0)) {
/* same as last, no point in looking it up */
! SIGNAL(resolverSemaphoreIndex);
return;
}
***************
*** 1865,1869 ****
lastError = WSAGetLastError();
asyncLookupHandle = 0;
! synchronizedSignalSemaphoreWithIndex(resolverSemaphoreIndex);
ExitThread(0);
return 1;
--- 1865,1869 ----
lastError = WSAGetLastError();
asyncLookupHandle = 0;
! SIGNAL(resolverSemaphoreIndex);
ExitThread(0);
return 1;
***************
*** 1887,1891 ****
lastError = WSAGetLastError();
asyncLookupHandle = 0;
! synchronizedSignalSemaphoreWithIndex(resolverSemaphoreIndex);
ExitThread(0);
return 1;
--- 1887,1891 ----
lastError = WSAGetLastError();
asyncLookupHandle = 0;
! SIGNAL(resolverSemaphoreIndex);
ExitThread(0);
return 1;
|
|
From: Ned K. <ne...@us...> - 2003-11-21 02:46:39
|
Update of /cvsroot/squeak/squeak/platforms/Cross/plugins/SoundGenerationPlugin
In directory sc8-pr-cvs1:/tmp/cvs-serv27564/Cross/plugins/SoundGenerationPlugin
Removed Files:
Tag: ned-branch
sqOldSoundPrims.c
Log Message:
Removed sqOldSoundPrims.c
--- sqOldSoundPrims.c DELETED ---
|
|
From: Ned K. <ne...@us...> - 2003-11-21 02:40:21
|
Update of /cvsroot/squeak/squeak/platforms/unix/vm-display-fbdev
In directory sc8-pr-cvs1:/tmp/cvs-serv26458/unix/vm-display-fbdev
Modified Files:
Tag: ned-branch
sqUnixFBDev.c
Log Message:
Copied from Ian's 3.6g-2 sources, with recent patches by Ned Konz
Index: sqUnixFBDev.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/unix/vm-display-fbdev/sqUnixFBDev.c,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** sqUnixFBDev.c 22 Aug 2003 17:07:15 -0000 1.3
--- sqUnixFBDev.c 21 Nov 2003 02:40:18 -0000 1.3.2.1
***************
*** 68,72 ****
#include <assert.h>
! #define DEBUG 0
--- 68,74 ----
#include <assert.h>
! #if !defined(DEBUG)
! # define DEBUG 0
! #endif
|
|
From: Ned K. <ne...@us...> - 2003-11-21 02:40:21
|
Update of /cvsroot/squeak/squeak/platforms/unix/vm-sound-NAS
In directory sc8-pr-cvs1:/tmp/cvs-serv26458/unix/vm-sound-NAS
Added Files:
Tag: ned-branch
Makefile.inc
Log Message:
Copied from Ian's 3.6g-2 sources, with recent patches by Ned Konz
--- NEW FILE: Makefile.inc ---
PLIBS=-laudio
|
|
From: Ned K. <ne...@us...> - 2003-11-21 02:40:21
|
Update of /cvsroot/squeak/squeak/platforms/unix/vm
In directory sc8-pr-cvs1:/tmp/cvs-serv26458/unix/vm
Modified Files:
Tag: ned-branch
sqUnixExternalPrims.c sqUnixMain.c
Log Message:
Copied from Ian's 3.6g-2 sources, with recent patches by Ned Konz
Index: sqUnixExternalPrims.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/unix/vm/sqUnixExternalPrims.c,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** sqUnixExternalPrims.c 3 Sep 2003 18:08:23 -0000 1.11
--- sqUnixExternalPrims.c 21 Nov 2003 02:40:18 -0000 1.11.2.1
***************
*** 37,48 ****
/* Author: Ian...@IN...
*
! * Last edited: 2003-09-03 18:06:25 by piumarta on emilia.inria.fr
*/
- #define DEBUG 0
-
#include "sq.h" /* sqUnixConfig.h */
! #if DEBUG
# define dprintf(ARGS) fprintf ARGS
#else
--- 37,46 ----
/* Author: Ian...@IN...
*
! * Last edited: 2003-09-07 15:38:59 by piumarta on emilia.inria.fr
*/
#include "sq.h" /* sqUnixConfig.h */
! #if defined(DEBUG) && DEBUG>0
# define dprintf(ARGS) fprintf ARGS
#else
***************
*** 305,309 ****
int ioFindExternalFunctionIn(char *lookupName, int moduleHandle)
{
! void *fn= dlsym((void *)moduleHandle, lookupName);
dprintf((stderr, "ioFindExternalFunctionIn(%s, %d)\n",
--- 303,316 ----
int ioFindExternalFunctionIn(char *lookupName, int moduleHandle)
{
! char buf[256];
! void *fn;
!
! #ifdef HAVE_SNPRINTF
! snprintf(buf, sizeof(buf), "%s", lookupName);
! #else
! sprintf(buf, "%s", lookupName);
! #endif
!
! fn= dlsym((void *)moduleHandle, buf);
dprintf((stderr, "ioFindExternalFunctionIn(%s, %d)\n",
***************
*** 312,315 ****
--- 319,323 ----
if ((fn == 0) && (!sqIgnorePluginErrors)
&& strcmp(lookupName, "initialiseModule")
+ && strcmp(lookupName, "shutdownModule")
&& strcmp(lookupName, "setInterpreter")
&& strcmp(lookupName, "getModuleName"))
Index: sqUnixMain.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/unix/vm/sqUnixMain.c,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** sqUnixMain.c 3 Sep 2003 18:07:35 -0000 1.13
--- sqUnixMain.c 21 Nov 2003 02:40:18 -0000 1.13.2.1
***************
*** 68,74 ****
#endif
#undef DEBUG_MODULES
! #undef IMAGE_DUMP /* define to enable SIGHUP and SIGQUIT handling */
#define IMAGE_NAME_SIZE MAXPATHLEN
--- 68,79 ----
#endif
+ /*
#undef DEBUG_MODULES
+ */
! /* define to enable SIGHUP and SIGQUIT handling */
! /*
! #undef IMAGE_DUMP
! */
#define IMAGE_NAME_SIZE MAXPATHLEN
***************
*** 453,462 ****
{
int nwt= getNextWakeupTick();
- int now= (ioMSecs() & 0x1fffffff);
int ms= 0;
! if (nwt <= now)
! ms= (nwt ? 0 : (1000/60));
! else
! ms= nwt - now;
if (ms < (1000/60)) /* < 1 timeslice? */
{
--- 458,469 ----
{
int nwt= getNextWakeupTick();
int ms= 0;
!
! if (nwt)
! {
! int now= (ioMSecs() & 0x1fffffff);
! ms= ((nwt <= now) ? (1000/60) : nwt - now);
! }
!
if (ms < (1000/60)) /* < 1 timeslice? */
{
|
|
From: Ned K. <ne...@us...> - 2003-11-21 02:40:21
|
Update of /cvsroot/squeak/squeak/platforms/unix/vm-display-X11
In directory sc8-pr-cvs1:/tmp/cvs-serv26458/unix/vm-display-X11
Modified Files:
Tag: ned-branch
sqUnixX11.c
Log Message:
Copied from Ian's 3.6g-2 sources, with recent patches by Ned Konz
Index: sqUnixX11.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/unix/vm-display-X11/sqUnixX11.c,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** sqUnixX11.c 16 Sep 2003 07:55:04 -0000 1.12
--- sqUnixX11.c 21 Nov 2003 02:40:18 -0000 1.12.2.1
***************
*** 83,86 ****
--- 83,87 ----
#undef FULL_UPDATE_ON_EXPOSE
+ /*
#undef DEBUG_CONV
#undef DEBUG_EVENTS
***************
*** 88,91 ****
--- 89,93 ----
#undef DEBUG_BROWSER
#undef DEBUG_WINDOW
+ */
#if defined(HAVE_LIBXEXT)
***************
*** 608,615 ****
* Qt/KDE apps) don't accept pastes from Squeak. Of course, they'll use
* UTF8_STRING anyway... */
! Atom targets[]= {
! xaTargets, xaMultiple, xaTimestamp, /* required by ICCCM */
! xaUTF8String, XA_STRING, xaCompoundText
! };
xError= XChangeProperty(requestEv->display, requestEv->requestor,
--- 610,620 ----
* Qt/KDE apps) don't accept pastes from Squeak. Of course, they'll use
* UTF8_STRING anyway... */
! Atom targets[6];
! targets[0]= xaTargets;
! targets[1]= xaMultiple;
! targets[2]= xaTimestamp; /* required by ICCCM */
! targets[3]= xaUTF8String;
! targets[4]= XA_STRING;
! targets[5]= xaCompoundText;
xError= XChangeProperty(requestEv->display, requestEv->requestor,
***************
*** 622,627 ****
int len= strlen(stPrimarySelection);
char *buf= (char *)malloc(len * 3 + 1);
- char *list[]= { buf, NULL };
XTextProperty textProperty;
/* convert our locale text to CTEXT */
--- 627,635 ----
int len= strlen(stPrimarySelection);
char *buf= (char *)malloc(len * 3 + 1);
XTextProperty textProperty;
+ char *list[2];
+
+ list[0]= buf;
+ list[1]= NULL;
/* convert our locale text to CTEXT */
***************
*** 670,674 ****
&numberOfItems,
&bytesAfter,
! (unsigned char **)&multipleAtoms);
if ((xError != Success) || (bytesAfter != 0)
|| (format != 32) || (type == None))
--- 678,682 ----
&numberOfItems,
&bytesAfter,
! (void *)&multipleAtoms);
if ((xError != Success) || (bytesAfter != 0)
|| (format != 32) || (type == None))
***************
*** 678,682 ****
else
{
! int i;
for (i= 0; i < numberOfItems; i+= 2)
{
--- 686,690 ----
else
{
! unsigned long i;
for (i= 0; i < numberOfItems; i+= 2)
{
***************
*** 766,770 ****
XEvent ev;
fd_set fdMask;
- int xreturn;
Time timestamp= getXTimestamp();
--- 774,777 ----
***************
*** 857,866 ****
True, AnyPropertyType,
&type, &format, &nitems, &bytesAfter,
! (unsigned char **)&data);
# if defined(DEBUG_SELECTIONS)
fprintf(stderr, "getprop type ");
printAtomName(type);
! fprintf(stderr, " format %d nitems %d bytesAfter %d\ndata=",
format, nitems, bytesAfter);
dumpSelectionData(data, nitems, 1);
--- 864,873 ----
True, AnyPropertyType,
&type, &format, &nitems, &bytesAfter,
! (void *)&data);
# if defined(DEBUG_SELECTIONS)
fprintf(stderr, "getprop type ");
printAtomName(type);
! fprintf(stderr, " format %d nitems %ld bytesAfter %ld\ndata=",
format, nitems, bytesAfter);
dumpSelectionData(data, nitems, 1);
***************
*** 3979,3985 ****
static void listVisuals();
- static glRenderer *current= NULL;
- static glRenderer allRenderer[MAX_RENDERER];
-
static int visualAttributes[]= {
GLX_STENCIL_SIZE, 0, /* filled in later - must be first item! */
--- 3986,3989 ----
***************
*** 4009,4013 ****
{
XVisualInfo* visinfo= 0;
- int index= -1;
if (flags & B3D_STENCIL_BUFFER)
--- 4013,4016 ----
***************
*** 4160,4166 ****
if (slow != GLX_SLOW_CONFIG)
! DPRINTF(3, (fp,"===> OpenGL visual\r"))
else
! DPRINTF(3, (fp,"---> slow OpenGL visual\r"));
DPRINTF(3, (fp,"rgbaBits = %i+%i+%i+%i\r", red, green, blue, alpha));
--- 4163,4169 ----
if (slow != GLX_SLOW_CONFIG)
! { DPRINTF(3, (fp,"===> OpenGL visual\r")) }
else
! { DPRINTF(3, (fp,"---> slow OpenGL visual\r")) }
DPRINTF(3, (fp,"rgbaBits = %i+%i+%i+%i\r", red, green, blue, alpha));
***************
*** 4230,4235 ****
static void display_winOpen(void)
{
- int sws= getSavedWindowSize();
#if defined(DEBUG_WINDOW)
fprintf(stderr, "saved window size is %d %d\n", sws >> 16, sws & 0xffff);
#endif
--- 4233,4238 ----
static void display_winOpen(void)
{
#if defined(DEBUG_WINDOW)
+ int sws= getSavedWindowSize();
fprintf(stderr, "saved window size is %d %d\n", sws >> 16, sws & 0xffff);
#endif
***************
*** 4333,4337 ****
else if (!strcmp(arg, "-browserWindow"))
{
! sscanf(argv[1], "%li", &browserWindow);
if (browserWindow == 0)
{
--- 4336,4340 ----
else if (!strcmp(arg, "-browserWindow"))
{
! sscanf(argv[1], "%lu", (unsigned long *)&browserWindow);
if (browserWindow == 0)
{
|
|
From: Ned K. <ne...@us...> - 2003-11-21 02:40:21
|
Update of /cvsroot/squeak/squeak/platforms/unix/npsqueak
In directory sc8-pr-cvs1:/tmp/cvs-serv26458/unix/npsqueak
Modified Files:
Tag: ned-branch
npsqueak.c
Log Message:
Copied from Ian's 3.6g-2 sources, with recent patches by Ned Konz
Index: npsqueak.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/unix/npsqueak/npsqueak.c,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** npsqueak.c 7 Aug 2003 02:44:53 -0000 1.3
--- npsqueak.c 21 Nov 2003 02:40:18 -0000 1.3.2.1
***************
*** 5,9 ****
* Author: Bert Freudenberg <be...@is...>
*
! * Last edited: Wed 02 Oct 2002 14:43:26 by bert on balloon
*
* History:
--- 5,9 ----
* Author: Bert Freudenberg <be...@is...>
*
! * Last edited: 2003-08-22 23:50:01 by piumarta on emilia.inria.fr
*
* History:
|
|
From: Ned K. <ne...@us...> - 2003-11-21 02:40:21
|
Update of /cvsroot/squeak/squeak/platforms/unix/plugins/SoundPlugin/zzz
In directory sc8-pr-cvs1:/tmp/cvs-serv26458/unix/plugins/SoundPlugin/zzz
Modified Files:
Tag: ned-branch
ring.h
Log Message:
Copied from Ian's 3.6g-2 sources, with recent patches by Ned Konz
Index: ring.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/unix/plugins/SoundPlugin/zzz/ring.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** ring.h 7 Aug 2003 02:44:55 -0000 1.3
--- ring.h 21 Nov 2003 02:40:18 -0000 1.3.2.1
***************
*** 5,9 ****
// Last edited:
//
! // Copyright (C) 1996-2002 Ian Piumarta and other authors/contributors
// as listed elsewhere in this file.
// All rights reserved.
--- 5,9 ----
// Last edited:
//
! // Copyright (C) 1996-2003 Ian Piumarta and other authors/contributors
// as listed elsewhere in this file.
// All rights reserved.
|
|
From: Ned K. <ne...@us...> - 2003-11-21 02:40:21
|
Update of /cvsroot/squeak/squeak/platforms/unix/plugins/PseudoTTYPlugin
In directory sc8-pr-cvs1:/tmp/cvs-serv26458/unix/plugins/PseudoTTYPlugin
Modified Files:
Tag: ned-branch
openpty.h
Log Message:
Copied from Ian's 3.6g-2 sources, with recent patches by Ned Konz
Index: openpty.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/unix/plugins/PseudoTTYPlugin/openpty.h,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** openpty.h 1 Sep 2003 08:31:50 -0000 1.5
--- openpty.h 21 Nov 2003 02:40:18 -0000 1.5.2.1
***************
*** 36,40 ****
* Author: Ian...@in...
*
! * Last edited: 2002-07-11 21:07:37 by piumarta on emilia.inria.fr
*/
--- 36,40 ----
* Author: Ian...@in...
*
! * Last edited: 2003-09-03 17:42:22 by piumarta on emilia.inria.fr
*/
|
|
From: Ned K. <ne...@us...> - 2003-11-21 02:40:21
|
Update of /cvsroot/squeak/squeak/platforms/unix/plugins/SocketPlugin
In directory sc8-pr-cvs1:/tmp/cvs-serv26458/unix/plugins/SocketPlugin
Modified Files:
Tag: ned-branch
sqUnixSocket.c
Log Message:
Copied from Ian's 3.6g-2 sources, with recent patches by Ned Konz
Index: sqUnixSocket.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/unix/plugins/SocketPlugin/sqUnixSocket.c,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** sqUnixSocket.c 16 Sep 2003 07:56:51 -0000 1.12
--- sqUnixSocket.c 21 Nov 2003 02:40:18 -0000 1.12.2.1
***************
*** 37,41 ****
/* Author: Ian...@in...
*
! * Last edited: 2003-09-12 21:05:50 by piumarta on emilia.inria.fr
*
* Support for BSD-style "accept" primitives contributed by:
--- 37,41 ----
/* Author: Ian...@in...
*
! * Last edited: 2003-09-16 20:06:06 by piumarta on emilia.inria.fr
*
* Support for BSD-style "accept" primitives contributed by:
***************
*** 590,593 ****
--- 590,594 ----
return Invalid;
}
+ #if 0
/* check for connection closed by peer */
if (SOCKETSTATE(s) == Connected)
***************
*** 601,604 ****
--- 602,606 ----
}
}
+ #endif
FPRINTF((stderr, "socketStatus(%d) -> %d\n", SOCKET(s), SOCKETSTATE(s)));
return SOCKETSTATE(s);
|
|
From: Ned K. <ne...@us...> - 2003-11-21 02:40:20
|
Update of /cvsroot/squeak/squeak/platforms/unix/config
In directory sc8-pr-cvs1:/tmp/cvs-serv26458/unix/config
Modified Files:
Tag: ned-branch
configure.ac gnuify
Log Message:
Copied from Ian's 3.6g-2 sources, with recent patches by Ned Konz
Index: configure.ac
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/unix/config/configure.ac,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -d -r1.14 -r1.14.2.1
*** configure.ac 16 Sep 2003 07:59:23 -0000 1.14
--- configure.ac 21 Nov 2003 02:40:17 -0000 1.14.2.1
***************
*** 38,46 ****
# Author: Ian...@IN...
#
! # Last edited: 2003-09-16 08:10:35 by piumarta on emilia.inria.fr
AC_INIT([config.h.in])
! AC_VM_VERSION(3,6g,1, 3,6g,5420)
topdir=`cd ${srcdir}/../../..; pwd`
--- 38,46 ----
# Author: Ian...@IN...
#
! # Last edited: 2003-09-16 20:08:09 by piumarta on emilia.inria.fr
AC_INIT([config.h.in])
! AC_VM_VERSION(3,6g,2, 3,6g,5420)
topdir=`cd ${srcdir}/../../..; pwd`
Index: gnuify
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/unix/config/gnuify,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** gnuify 3 Sep 2003 18:05:00 -0000 1.6
--- gnuify 21 Nov 2003 02:40:17 -0000 1.6.2.1
***************
*** 6,10 ****
# Author: Ian...@IN...
#
! # Last edited: 2003-09-03 00:06:37 by piumarta on emilia.inria.fr
# Copyright (C) 1996-2003 Ian Piumarta and other authors/contributors
--- 6,10 ----
# Author: Ian...@IN...
#
! # Last edited: 2003-09-10 06:11:41 by piumarta on emilia.inria.fr
# Copyright (C) 1996-2003 Ian Piumarta and other authors/contributors
|
|
From: John M M. <jo...@us...> - 2003-11-20 01:37:12
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm/Developer In directory sc8-pr-cvs1:/tmp/cvs-serv536/squeak/platforms/Mac OS/vm/Developer Modified Files: SqueakVMForCarbon.pbproj.sit Log Message: 3.6.1b5 XCODE! Need I say more enjoy. Index: SqueakVMForCarbon.pbproj.sit =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/Developer/SqueakVMForCarbon.pbproj.sit,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 Binary files /tmp/cvsWrfR2o and /tmp/cvsawOUND differ |
|
From: John M M. <jo...@us...> - 2003-11-20 01:36:30
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm
In directory sc8-pr-cvs1:/tmp/cvs-serv451/squeak/platforms/Mac OS/vm
Modified Files:
sqMacWindow.c
Log Message:
3.6.1b6 clean casts and usage of carbon defines to see if we can compile under os-9. Also add code for 16/32 to 8bit, but it seems under os-x we never get 8 bit windows, only 16 which are rended as 8bit
Index: sqMacWindow.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacWindow.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** sqMacWindow.c 17 Nov 2003 23:39:26 -0000 1.28
--- sqMacWindow.c 20 Nov 2003 01:35:47 -0000 1.29
***************
*** 145,149 ****
#define bytesPerLine(width, depth) ((((width)*(depth) + 31) >> 5) << 2)
! #ifndef TARGET_API_MAC_CARBON
int ioShowDisplay(
int dispBitsIndex, int width, int height, int depth,
--- 145,149 ----
#define bytesPerLine(width, depth) ((((width)*(depth) + 31) >> 5) << 2)
! #if !TARGET_API_MAC_CARBON
int ioShowDisplay(
int dispBitsIndex, int width, int height, int depth,
***************
*** 229,234 ****
}
LockPortBits(windowPort);
!
{
PixMapHandle pix;
--- 229,235 ----
}
+ #if TARGET_API_MAC_CARBON
LockPortBits(windowPort);
! #endif
{
PixMapHandle pix;
***************
*** 264,269 ****
while (affectedH--) {
register long i,count= bytes/2;
! register short *to= out;
! register short *from= in;
while (count--)
*to++= *from++;
--- 265,270 ----
while (affectedH--) {
register long i,count= bytes/2;
! register short *to= (short *) out;
! register short *from= (short *) in;
while (count--)
*to++= *from++;
***************
*** 273,278 ****
else while (affectedH--) {
register long count= bytes/4;
! register long *to= out;
! register long *from= in;
while (count--)
*to++= *from++;
--- 274,279 ----
else while (affectedH--) {
register long count= bytes/4;
! register long *to= (long *) out;
! register long *from= (long *)in;
while (count--)
*to++= *from++;
***************
*** 282,287 ****
} else if ( depth == 16 && pixDepth == 32) {
while (affectedH--) {
! register long *to= out;
! register short *from= in;
register long count= bytes/2,target,r,g,b;
--- 283,288 ----
} else if ( depth == 16 && pixDepth == 32) {
while (affectedH--) {
! register long *to= (long *) out;
! register short *from= (short *) in;
register long count= bytes/2,target,r,g,b;
***************
*** 305,310 ****
} else if (depth == 32 && pixDepth == 16) {
while (affectedH--) {
! register short *to= out;
! register long *from= in;
register long count= bytes/4,target;
while (count--) {
--- 306,311 ----
} else if (depth == 32 && pixDepth == 16) {
while (affectedH--) {
! register short *to= (short *) out;
! register long *from= (long *) in;
register long count= bytes/4,target;
while (count--) {
***************
*** 319,324 ****
} else if (depth == 8 && pixDepth == 16) {
while (affectedH--) {
! short *to= out;
! unsigned char *from= in;
long count= bytes;
unsigned short r,g,b;
--- 320,325 ----
} else if (depth == 8 && pixDepth == 16) {
while (affectedH--) {
! short *to= (short *) out;
! unsigned char *from= ( unsigned char *) in;
long count= bytes;
unsigned short r,g,b;
***************
*** 338,343 ****
}else if (depth == 8 && pixDepth == 32) {
while (affectedH--) {
! long *to= out;
! unsigned char *from= in;
long count= bytes;
unsigned short r,g,b;
--- 339,344 ----
}else if (depth == 8 && pixDepth == 32) {
while (affectedH--) {
! long *to= (long *) out;
! unsigned char *from= (unsigned char *) in;
long count= bytes;
unsigned short r,g,b;
***************
*** 355,364 ****
--- 356,407 ----
out += pixPitch;
}
+ } else if (depth == 16 && pixDepth == 8) { // Untested, perhaps will not get called
+ SetPort(windowPort);
+ while (affectedH--) {
+ unsigned char *to= (unsigned char *) out;
+ unsigned short *from= (unsigned short *) in;
+ long count= bytes/2;
+ unsigned short target;
+ RGBColor colorPixel;
+
+ while (count--) {
+ target = *from++;
+ colorPixel.red = (target & 0x7C00) >> 10;
+ colorPixel.green = (target & 0x03E0) >> 5;
+ colorPixel.blue = (target & 0x001F);
+ *to++ = (unsigned char) Color2Index(&colorPixel);
+ }
+ in += pitch;
+ out += pixPitch;
+ }
+ } else if (depth == 32 && pixDepth == 8) {
+ SetPort(windowPort);
+ while (affectedH--) {
+ unsigned char *to= (unsigned char *) out;
+ unsigned short *from= (unsigned short *) in;
+ long count= bytes/4;
+ unsigned long target;
+ RGBColor colorPixel;
+
+ while (count--) {
+ target = *from++;
+ colorPixel.red = (target & 0x00FF0000) >> 16;
+ colorPixel.green = (target & 0x0000FF00) >> 8;
+ colorPixel.blue = (target & 0x000000FF);
+ *to++ = (unsigned char) Color2Index(&colorPixel);
+ }
+ in += pitch;
+ out += pixPitch;
+ }
}
+
+
+ #if TARGET_API_MAC_CARBON
SetRectRgn(maskRect, affectedL, affectedT, affectedR, affectedB);
QDFlushPortBuffer(windowPort, maskRect);
UnlockPortBits(windowPort);
+ #endif
}
***************
*** 1224,1227 ****
--- 1267,1271 ----
#endif
+ #if JMMFoo
#include "SurfacePlugin.h"
***************
*** 1324,1325 ****
--- 1368,1370 ----
}
+ #endif
\ No newline at end of file
|
|
From: John M M. <jo...@us...> - 2003-11-20 01:34:28
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm In directory sc8-pr-cvs1:/tmp/cvs-serv32590/squeak/platforms/Mac OS/vm Modified Files: sqMacNSPlugin.c Log Message: 3.6.1b6 seem to missing a variable define Index: sqMacNSPlugin.c =================================================================== RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacNSPlugin.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** sqMacNSPlugin.c 23 Oct 2003 17:02:26 -0000 1.13 --- sqMacNSPlugin.c 20 Nov 2003 01:33:43 -0000 1.14 *************** *** 171,174 **** --- 171,175 ---- #if defined ( __APPLE__ ) && defined ( __MACH__ ) pthread_mutex_t gEventDrawLock; + extern pthread_mutex_t gEventQueueLock; extern TMTask gTMTask; #endif |
|
From: John M M. <jo...@us...> - 2003-11-17 23:39:29
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/vm
In directory sc8-pr-cvs1:/tmp/cvs-serv7556/squeak/platforms/Mac OS/vm
Modified Files:
sqMacWindow.c
Log Message:
3.6.1b5 Add 8bit to 8/16/32 screen depth.
Index: sqMacWindow.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/vm/sqMacWindow.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** sqMacWindow.c 17 Nov 2003 17:16:02 -0000 1.27
--- sqMacWindow.c 17 Nov 2003 23:39:26 -0000 1.28
***************
*** 317,321 ****
--- 317,360 ----
out += pixPitch;
}
+ } else if (depth == 8 && pixDepth == 16) {
+ while (affectedH--) {
+ short *to= out;
+ unsigned char *from= in;
+ long count= bytes;
+ unsigned short r,g,b;
+ unsigned long target;
+ while (count--) {
+ target = *from++;
+ r = (short) (*stColorTable)->ctTable[target].rgb.red;
+ g = (short) (*stColorTable)->ctTable[target].rgb.green;
+ b = (short) (*stColorTable)->ctTable[target].rgb.blue;
+ *to++ = ((r>>11) << 10) |
+ ((g>>11) << 5) |
+ ((b>>11));
+ }
+ in += pitch;
+ out += pixPitch;
+ }
+ }else if (depth == 8 && pixDepth == 32) {
+ while (affectedH--) {
+ long *to= out;
+ unsigned char *from= in;
+ long count= bytes;
+ unsigned short r,g,b;
+ unsigned long target;
+ while (count--) {
+ target = *from++;
+ r = (short) (*stColorTable)->ctTable[target].rgb.red;
+ g = (short) (*stColorTable)->ctTable[target].rgb.green;
+ b = (short) (*stColorTable)->ctTable[target].rgb.blue;
+ *to++ = ((r>>8) << 16) |
+ ((g>>8) << 8) |
+ ((b>>8));
+ }
+ in += pitch;
+ out += pixPitch;
+ }
}
+
SetRectRgn(maskRect, affectedL, affectedT, affectedR, affectedB);
***************
*** 471,474 ****
--- 510,515 ----
case 2:
case 4:
+ return false; //OS-X 10.3.0/1 bug in copybits, force silly manual move
+ break;
case 8:
case 16:
|
