Menu
▾
▴
SF.net SVN: frontierkernel: [1271] Frontier/trunk/Common/source
|
From: <and...@us...> - 2006-04-16 17:44:11
|
Revision: 1271 Author: andreradke Date: 2006-04-16 10:43:49 -0700 (Sun, 16 Apr 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1271&view=rev Log Message: ----------- For the Mac Intel build, perform byte-swapping on integers read from our custom 'cnfg' resources. Modified Paths: -------------- Frontier/trunk/Common/headers/config.r Frontier/trunk/Common/headers/frontierconfig.h Frontier/trunk/Common/source/frontierconfig.c Modified: Frontier/trunk/Common/headers/config.r =================================================================== --- Frontier/trunk/Common/headers/config.r 2006-04-16 17:31:13 UTC (rev 1270) +++ Frontier/trunk/Common/headers/config.r 2006-04-16 17:43:49 UTC (rev 1271) @@ -27,37 +27,37 @@ type'cnfg' { - boolean nohorizscroll, horizscroll; /*window has horiz scrollbar?*/ + integer nohorizscroll = 0, horizscroll = 1; /*window has horiz scrollbar?*/ - boolean novertscroll, vertscroll; + integer novertscroll = 0, vertscroll = 1; - boolean dontfloat, windowfloats; /*is it a floating palette window?*/ + integer dontfloat = 0, windowfloats = 1; /*is it a floating palette window?*/ - boolean nomessagearea, messagearea; /*allocate space for a message area?*/ + integer nomessagearea = 0, messagearea = 1; /*allocate space for a message area?*/ - boolean dontinsetcontentrect, insetcontentrect; /*if true we inset by 3 pixels*/ + integer dontinsetcontentrect = 0, insetcontentrect = 1; /*if true we inset by 3 pixels*/ - boolean nonewonlaunch, newonlaunch; + integer nonewonlaunch = 0, newonlaunch = 1; - boolean dontopenresfile, openresfile; + integer dontopenresfile = 0, openresfile = 1; - boolean normalwindow, dialogwindow; /*do a GetNewDialog on creating one of these windows?*/ + integer normalwindow = 0, dialogwindow = 1; /*do a GetNewDialog on creating one of these windows?*/ - boolean notgrowable, isgrowable; /*provide a grow box for window*/ + integer notgrowable = 0, isgrowable = 1; /*provide a grow box for window*/ - boolean dontcreateonnew, createonnew; + integer dontcreateonnew = 0, createonnew = 1; - boolean nowindoidscrollbars, windoidscrollbars; + integer nowindoidscrollbars = 0, windoidscrollbars = 1; - boolean notstoredindatabase, storedindatabase; + integer notstoredindatabase = 0, storedindatabase = 1; - boolean handlesownsave, parentwindowhandlessave; + integer handlesownsave = 0, parentwindowhandlessave = 1; - boolean donteraseonresize, eraseonresize; + integer donteraseonresize = 0, eraseonresize = 1; - boolean consumefrontclicks, dontconsumefrontclicks; + integer consumefrontclicks = 0, dontconsumefrontclicks = 1; - boolean monochromewindow, colorwindow; + integer monochromewindow = 0, colorwindow = 1; integer onehalf = 2, onethird = 3, onequarter = 4; Modified: Frontier/trunk/Common/headers/frontierconfig.h =================================================================== --- Frontier/trunk/Common/headers/frontierconfig.h 2006-04-16 17:31:13 UTC (rev 1270) +++ Frontier/trunk/Common/headers/frontierconfig.h 2006-04-16 17:43:49 UTC (rev 1271) @@ -71,41 +71,7 @@ typedef struct tyconfigrecord { -#ifdef MACVERSION - boolean flhorizscroll: 1; /*window has horiz scrollbar?*/ - - boolean flvertscroll: 1; - - boolean flwindowfloats: 1; /*is it a floating palette window?*/ // NOT USED - - boolean flmessagearea: 1; /*allocate space for a message area?*/ - - boolean flinsetcontentrect: 1; /*if true we inset by 3 pixels*/ - - boolean flnewonlaunch: 1; - - boolean flopenresfile: 1; - - boolean fldialog: 1; /*do a GetNewDialog on creating one of these windows?*/ - - boolean flgrowable: 1; /*provide a grow box for window*/ - - boolean flcreateonnew: 1; - - boolean flwindoidscrollbars: 1; - - boolean flstoredindatabase: 1; - - boolean flparentwindowhandlessave: 1; - - boolean fleraseonresize: 1; - - boolean fldontconsumefrontclicks: 1; - - boolean flcolorwindow: 1; -#endif - -#ifdef WIN95VERSION + short flhorizscroll; /*window has horiz scrollbar?*/ short flvertscroll; @@ -137,9 +103,7 @@ short fldontconsumefrontclicks; short flcolorwindow; -#endif - short messageareafraction; OSType filecreator, filetype; Modified: Frontier/trunk/Common/source/frontierconfig.c =================================================================== --- Frontier/trunk/Common/source/frontierconfig.c 2006-04-16 17:31:13 UTC (rev 1270) +++ Frontier/trunk/Common/source/frontierconfig.c 2006-04-16 17:43:49 UTC (rev 1271) @@ -37,6 +37,7 @@ #include "shell.rsrc.h" #include "frontierconfig.h" #include "shell.h" +#include "byteorder.h" /* 2006-04-16 aradke: swap byte order in loadconfigresource */ #ifdef MACVERSION @@ -90,6 +91,8 @@ /* 2.1b5 dmb: release the config resource when done with it + + 2006-04-16 aradke: swap byte-order on Intel Macs */ register Handle h; @@ -100,14 +103,66 @@ if (h != nil) { moveleft (*h, cr, sizeof (tyconfigrecord)); + + releaseresourcehandle (h); + reztomemshort ((*cr).flhorizscroll); + + reztomemshort ((*cr).flvertscroll); + + reztomemshort ((*cr).flwindowfloats); + + reztomemshort ((*cr).flmessagearea); + + reztomemshort ((*cr).flinsetcontentrect); + + reztomemshort ((*cr).flnewonlaunch); + + reztomemshort ((*cr).flopenresfile); + + reztomemshort ((*cr).fldialog); + + reztomemshort ((*cr).flgrowable); + + reztomemshort ((*cr).flcreateonnew); + + reztomemshort ((*cr).flwindoidscrollbars); + + reztomemshort ((*cr).flstoredindatabase); + + reztomemshort ((*cr).flparentwindowhandlessave); + + reztomemshort ((*cr).fleraseonresize); + + reztomemshort ((*cr).fldontconsumefrontclicks); + + reztomemshort ((*cr).flcolorwindow); + + reztomemshort ((*cr).messageareafraction); + + reztomemlong ((*cr).filecreator); /* OSType */ + + reztomemlong ((*cr).filetype); /* OSType */ + + reztomemrect ((*cr).rmin); + + reztomemshort ((*cr).templateresnum); + + reztomemshort ((*cr).defaultfont); + + reztomemshort ((*cr).defaultsize); + + reztomemshort ((*cr).defaultstyle); + + reztomemshort ((*cr).idbuttonstringlist); + + reztomemrect ((*cr).defaultwindowrect); + getstringlist (fontnamelistnumber, (*cr).defaultfont, bs); fontgetnumber (bs, &(*cr).defaultfont); centerrectondesktop (&(*cr).defaultwindowrect); - - releaseresourcehandle (h); } else initconfigrecord (cr); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
