Menu
▾
▴
SF.net SVN: frontierkernel: [1637] Frontier/branches/ Frontier_Long_File_Paths/Common
|
From: <cre...@us...> - 2007-02-27 23:30:13
|
Revision: 1637
http://svn.sourceforge.net/frontierkernel/?rev=1637&view=rev
Author: creecode
Date: 2007-02-27 15:30:09 -0800 (Tue, 27 Feb 2007)
Log Message:
-----------
formatting tweaks
Modified Paths:
--------------
Frontier/branches/Frontier_Long_File_Paths/Common/SystemHeaders/standard.h
Frontier/branches/Frontier_Long_File_Paths/Common/headers/stringdefs.h
Frontier/branches/Frontier_Long_File_Paths/Common/source/resources.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/search.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/shell.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/shellactivate.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/shellcallbacks.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/shellhooks.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/shellscroll.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/shellundo.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/tablecompare.c
Frontier/branches/Frontier_Long_File_Paths/Common/source/tableformats.c
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/SystemHeaders/standard.h
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/SystemHeaders/standard.h 2007-02-27 20:29:44 UTC (rev 1636)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/SystemHeaders/standard.h 2007-02-27 23:30:09 UTC (rev 1637)
@@ -33,13 +33,17 @@
#define standardinclude /*so other modules can tell that we've been included*/
#ifdef WIN95VERSION
+
#include "macconv.h"
-#endif
+
+ #endif // WIN95VERSION
+
+#ifdef MACVERSION
-#ifdef MACVERSION /* 2005-01-09 SMD - for getmilliseconds */
- #include "FastTimes.h"
-#endif
-
+ #include "FastTimes.h" // 2005-01-09 SMD - for getmilliseconds
+
+ #endif // MACVERSION
+
#include "stringdefs.h" /* embedded string definitions */
#ifndef appletdefsinclude
@@ -73,7 +77,6 @@
#endif
-
/*constants*/
#ifndef ctdirections
@@ -205,13 +208,29 @@
#ifdef WIN95VERSION
-typedef unsigned char Str255[258];
+
+ typedef unsigned char Str255 [ 258 ];
+
#endif
#define lenbigstring 255
+#ifdef MACVERSION // 2006-11-19 creedon
+
+ #define MAXPATHLEN 1024 // i wanted to include <sys/param.h> but that didn't fly! how can I include it here?
+ #define lengthpathstring MAXPATHLEN
+
+ #endif // MACVERSION
+
+#ifdef WIN95VERSION // 2006-11-19 creedon
+
+ #define MAX_PATH 260
+ #define lengthpathstring MAX_PATH // see < http://msdn2.microsoft.com/en-us/library/930f87yf(VS.80).aspx >
+
+ #endif // WIN95VERSION
+
#define sizegrowicon 15 /*it's square, this is the length of each side*/
-
+
#define dragscreenmargin 4 /*for dragging windows, leave this many pixels on all sides*/
#define doctitlebarheight 18 /*number of pixels in the title bar of each standard window*/
@@ -221,7 +240,7 @@
#define private static /*use "private" when a value or routine should not be seen outside the file it appears in*/
-/*types*/
+// types
#define bigstring Str255
@@ -250,7 +269,7 @@
#if defined(__RPCNDR_H_VERSION__)
typedef unsigned char *ptrbyte; /* 2004-12-29 trt: byte defined by Win32 rpcndr.h */
#else
-typedef unsigned char byte, *ptrbyte;
+typedef unsigned char byte, *ptrbyte;
#endif
@@ -307,7 +326,7 @@
#define stringbaseaddress(bs) (bs+1)
#define setstringlength(bs,len) (bs[0]=(char)(len))
-#define stringlength(bs) ((unsigned char)(bs)[0])
+#define stringlength(bs) ((unsigned char)(bs)[0])
#define setstringwithchar(ch,bs) {bs[0]=1;bs[1]=(ch);}
#define getstringcharacter(bs,pos) bs[(pos)+1]
#define setstringcharacter(bs,pos,ch) {bs[(pos)+1] = (ch);}
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/headers/stringdefs.h
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/headers/stringdefs.h 2007-02-27 20:29:44 UTC (rev 1636)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/headers/stringdefs.h 2007-02-27 23:30:09 UTC (rev 1637)
@@ -73,23 +73,23 @@
#define STR_script BIGSTRING ("\x06" "script")
#define STR_menubar "\x07" "menubar"
#define STR_picture BIGSTRING ("\x07" "picture")
-
+
#define STR_with BIGSTRING ("\x04" "with")
#define STR_this BIGSTRING ("\x04" "this")
#define STR_temp "\x04" "temp"
#define STR_environment "\x0b" "environment"
#define STR_charsets "\x08" "charsets"
-
+
#define STR_Stack_overflow BIGSTRING ("\x0f" "Stack overflow!")
-
+
#define STR_too_many_pophashtables BIGSTRING ("\x16" "too many pophashtables")
#define STR_trying_to_dispose_global_symbol_table BIGSTRING ("\x26" "trying to dispose global symbol table!")
#define STR_pushpackstack_no_room_on_stack BIGSTRING ("\x1f" "pushpackstack: no room on stack")
#define STR_poppackstack_nothing_on_stack BIGSTRING ("\x1e" "poppackstack: nothing on stack")
#define STR_Error_unpacking BIGSTRING ("\x11" "Error unpacking: ")
-
+
#define STR_The_version_number_of_this_database_file_is_not_recognized_by_this_version_of_Frontier BIGSTRING ("\x57" "The version number of this database file is not recognized by this version of Frontier.")
-
+
#define STR_move BIGSTRING ("\x04" "move")
#define STR_copy BIGSTRING ("\x04" "copy")
#define STR_rename BIGSTRING ("\x06" "rename")
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/resources.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/resources.c 2007-02-27 20:29:44 UTC (rev 1636)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/resources.c 2007-02-27 23:30:09 UTC (rev 1637)
@@ -43,38 +43,44 @@
boolean getstringlist (short listnum, short id, bigstring bs) {
-#ifdef MACVERSION
- /*
- the Mac routine GetIndString doesn't set ResError false when we fall off
- the end of the indicated list, so we return false if the returned string
- is of zero length.
- */
+
+ #ifdef MACVERSION
- #if 0 //#ifdef fldebug /* 2006-04-16 aradke: disabled for Mac Intel build */
+ /*
+ the Mac routine GetIndString doesn't set ResError false when we fall off
+ the end of the indicated list, so we return false if the returned string
+ is of zero length.
+ */
+
+ #if 0 //#ifdef fldebug /* 2006-04-16 aradke: disabled for Mac Intel build */
+
+ if (GetResource ('STR#', listnum) == nil)
+ DebugStr ("\pmissing STR# resource");
+
+ #endif
+
+ GetIndString (bs, listnum, id);
+
+ return (stringlength (bs) > 0);
+
+ #endif
+
+ #ifdef WIN95VERSION
- if (GetResource ('STR#', listnum) == nil)
- DebugStr ("\pmissing STR# resource");
-
+ HANDLE reshandle, hdata;
+
+ setstringlength(bs,0);
+ reshandle = FindResource (hInst, MAKEINTRESOURCE(id), MAKEINTRESOURCE(listnum));
+ if (reshandle != NULL)
+ {
+ hdata = LoadResource (hInst, reshandle);
+ strcpy (stringbaseaddress(bs), LockResource(hdata));
+ setstringlength (bs, strlen (stringbaseaddress(bs)));
+ }
+ return (stringlength (bs) > 0);
+
#endif
-
- GetIndString (bs, listnum, id);
-
- return (stringlength (bs) > 0);
-#endif
-#ifdef WIN95VERSION
- HANDLE reshandle, hdata;
-
- setstringlength(bs,0);
- reshandle = FindResource (hInst, MAKEINTRESOURCE(id), MAKEINTRESOURCE(listnum));
- if (reshandle != NULL)
- {
- hdata = LoadResource (hInst, reshandle);
- strcpy (stringbaseaddress(bs), LockResource(hdata));
- setstringlength (bs, strlen (stringbaseaddress(bs)));
- }
- return (stringlength (bs) > 0);
-#endif
} /*getstringlist*/
@@ -859,6 +865,7 @@
#endif
#ifdef MACVERSION
+
boolean getnthresourcehandle (const ptrfilespec fs, ResType type, short n, short *id, bigstring bsname, Handle *hresource, short forktype) {
/*
@@ -905,11 +912,14 @@
popresourcefile ();
return (fl);
+
} /*getnthresourcehandle*/
+
#endif
#ifdef MACVERSION
+
static boolean getemptyresourcehandle (ResType type, short id, bigstring bsname, Handle *hresource) {
/*
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/search.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/search.c 2007-02-27 20:29:44 UTC (rev 1636)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/search.c 2007-02-27 23:30:09 UTC (rev 1637)
@@ -75,6 +75,7 @@
#endif
return (true);
+
} /*isword*/
@@ -109,10 +110,13 @@
*lenmatch = stringlength (searchparams.bsfind);
return (true);
+
}
ixstart = ixmatch + 1; /*continue after beginning of false match*/
+
}
+
} /*textsearch*/
@@ -127,6 +131,7 @@
unlockhandle (h);
return (fl);
+
} /*handlesearch*/
@@ -142,6 +147,7 @@
*length = len;
return (true);
+
} /*stringsearch*/
/*
@@ -161,6 +167,7 @@
searchparams.flzoomfound = flzoomfound;
searchparams.flreplaceall = flreplaceall;
+
} /*startnewsearch*/
@@ -195,6 +202,7 @@
searchparams.searchrefcon = refcon;
return (true);
+
} /*startingtosearch*/
@@ -214,6 +222,7 @@
return (true);
return (searchparams.searchrefcon != refcon);
+
} /*searchshouldcontinue*/
@@ -232,6 +241,7 @@
return (false);
return (searchparams.flwraparound);
+
} /*searchshouldwrap*/
@@ -247,6 +257,7 @@
searchparams.ctreplaced = 0;
searchparams.searchrefcon = 0;
+
} /*endcurrentsearch*/
@@ -293,8 +304,6 @@
#endif
return (true);
+
} /*initsearch*/
-
-
-
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/shell.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/shell.c 2007-02-27 20:29:44 UTC (rev 1636)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/shell.c 2007-02-27 23:30:09 UTC (rev 1637)
@@ -499,6 +499,7 @@
void shellidle (void) {
(*shellglobals.idleroutine) ();
+
} /*shellidle*/
@@ -541,6 +542,7 @@
fl = processyield ();
return (fl);
+
} /*shellyield*/
@@ -551,6 +553,7 @@
*/
flshellimmediatebackground = true;
+
} /*shellforcebackgroundtask*/
@@ -1160,7 +1163,7 @@
boolean shellinit (void) {
-
+
/*
2.1b5 dmb: added small first steps towards starting up with a clean heap.
rearrange the load order slightly and added "ctreservebytes" parameter to
@@ -1169,8 +1172,9 @@
if (!initmacintosh ())
return (showerrorandexit (notenoughmemorystring));
-
- #ifdef MACVERSION
+
+ #ifdef MACVERSION
+
//Code change by Timothy Paustian Friday, June 9, 2000 2:36:02 PM
//Changed because using SysEnvisons and SysEnvRec is like Really old style
//This was changed to Gestalt calls with two new globals see mac.c initmacintosh
@@ -1181,11 +1185,12 @@
initfsdefault (); /* 2005-07-18 creedon, karstenw - init fsdefault here, don't leave it up to an
FSMakeFSSpec call at some unknown time, see
< http://sourceforge.net/tracker/index.php?func=detail&aid=1239991&group_id=120666&atid=687798 > */
-
#endif
if (keyboardescape ()) /*check for command-period for accidental launch*/
return (false);
+
+ //
langipcinit (); /*must do first to allow permanant event hook to be installed*/
@@ -1197,7 +1202,9 @@
initfile (); /*do this before about to filegetprogramversion will work*/
#ifdef MACVERSION
+
aboutsegment ();
+
#endif
initquickdraw ();
@@ -1215,38 +1222,43 @@
initscrollbars (); /*7.0b18 PBS*/
#ifdef MACVERSION
+
initmouse ();
+
#endif
#ifdef fltrialsize
- if (!shellinitclock ()) {
- bigstring bs;
+ if (!shellinitclock ()) {
- getstringlist (trialsizelistnumber, expirationstring, bs);
-
- parsedialogstring (bs, "\x06" "1/1/99", nil, nil, nil, bs);
+ bigstring bs;
+
+ getstringlist (trialsizelistnumber, expirationstring, bs);
+
+ parsedialogstring (bs, "\x06" "1/1/99", nil, nil, nil, bs);
- shellerrormessage (bs);
+ shellerrormessage (bs);
- return (false);
- }
-
- //alertdialog ("\x30" "This version of Frontier expires on July 1, 1998");
-
+ return (false);
+
+ }
+
+ //alertdialog ("\x30" "This version of Frontier expires on July 1, 1998");
+
#endif
#ifdef MACVERSION
- //#ifndef PIKE
- openabout (true, macmemoryconfig.reserveforcode); /*show about window, do zoom -- closed by shellmaineventloop*/
- //#endif
- FastInitialize(); /*2005-01-14 aradke: init timer, may take up to a second to callibrate*/
-
+ //#ifndef PIKE
+ openabout (true, macmemoryconfig.reserveforcode); /*show about window, do zoom -- closed by shellmaineventloop*/
+ //#endif
+
+ FastInitialize(); /*2005-01-14 aradke: init timer, may take up to a second to callibrate*/
+
#endif
#ifdef WIN95VERSION
- // openabout (true, 0);
+ // openabout (true, 0);
#endif
initmenusystem ();
@@ -1264,6 +1276,7 @@
sysbeep ();
return (false);
+
}
//RAB: 1/19/98 moved printing init to the bottom of the chain
@@ -1283,77 +1296,80 @@
#if TARGET_API_MAC_CARBON == 1
- initservices ();
-
-#endif
-
-#if isFrontier || flruntime || winhybrid
-
- initlang (); /*init callbacks and other basic inits*/
-
- langcallbacks.processeventcallback = &shellprocessevent; /*4.1b13 dmb - new*/
+ initservices ();
+
+ #endif
- if (!inittablestructure ()) /*create initial hashtable structure*/
- return (false);
+ #if isFrontier || flruntime || winhybrid
- initscripts (); /*set up global debugger data*/
-
- langinitverbs ();
-
- dbinitverbs (); // 4.1b4 dmb
-
- shellinitverbs ();
-
- fileinitverbs ();
-
- stringinitverbs ();
-
- windowinitverbs ();
-
- xmlinitverbs ();
-
- htmlinitverbs ();
+ initlang (); /*init callbacks and other basic inits*/
- sqliteinitverbs (); /* 2006-03-15 gewirtz: langsqlite.c */
+ langcallbacks.processeventcallback = &shellprocessevent; /*4.1b13 dmb - new*/
+
+ if (!inittablestructure ()) /*create initial hashtable structure*/
+ return (false);
+
+ initscripts (); /*set up global debugger data*/
+
+ langinitverbs ();
+
+ dbinitverbs (); // 4.1b4 dmb
+
+ shellinitverbs ();
+
+ fileinitverbs ();
+
+ stringinitverbs ();
+
+ windowinitverbs ();
+
+ xmlinitverbs ();
+
+ htmlinitverbs ();
-#ifdef flregexpverbs
- regexpinitverbs (); /* 2003-04-23 AR: langregexp.c */
-#endif
-
-#ifdef MACVERSION /*7.0b4 PBS: initialize QuickTime verbs*/
-
- quicktimeinitverbs ();
-
-#endif
-
- mathinitverbs (); /*2004-12-30 smd: langmath.c*/
-
- dllinitverbs (); /*2004-11-29 aradke: langdll.c*/
-
- cryptinitverbs (); /* 2006-03-07 creedon: langcrypt.c */
-
- if (keyboardescape ()) /*check again before landinit; after this, must do shellquit*/
- exittooperatingsystem ();
-
- flipcstarted = langipcstart ();
-
- initprocess ();
+ sqliteinitverbs (); /* 2006-03-15 gewirtz: langsqlite.c */
+
+ #ifdef flregexpverbs
+
+ regexpinitverbs (); /* 2003-04-23 AR: langregexp.c */
+
+ #endif
+
+ #ifdef MACVERSION /*7.0b4 PBS: initialize QuickTime verbs*/
+
+ quicktimeinitverbs ();
+
+ #endif
+
+ mathinitverbs (); /*2004-12-30 smd: langmath.c*/
+
+ dllinitverbs (); /*2004-11-29 aradke: langdll.c*/
+
+ cryptinitverbs (); /* 2006-03-07 creedon: langcrypt.c */
+
+ if (keyboardescape ()) /*check again before landinit; after this, must do shellquit*/
+ exittooperatingsystem ();
+
+ flipcstarted = langipcstart ();
+
+ initprocess ();
- //RAB: 1/19/98 - moved print init here so that Windows will have enough setup before using the dialog.
- shellinitprint (); /*get set up for printing*/
+ //RAB: 1/19/98 - moved print init here so that Windows will have enough setup before using the dialog.
+ shellinitprint (); /*get set up for printing*/
-#else
-
- flipcstarted = langipcstart ();
-
-#endif
-
+ #else
+
+ flipcstarted = langipcstart ();
+
+ #endif
+
//Code change by Timothy Paustian Wednesday, July 26, 2000 9:23:50 PM
//added init code for scroll proc
#if TARGET_API_MAC_CARBON == 1
shellinitscroll();
+
//Ok we now need to set up a timer for handling idle and network processes
{
//EventLoopRef mainLoop;
@@ -1373,42 +1389,28 @@
NULL,
&theTimer);*/
- /*Install dock menu handler.*/
-
- EventHandlerUPP dockmenuUPP;
- OSStatus ec = noErr;
- EventTypeSpec eventTypes [1];
+ /*Install dock menu handler.*/
+
+ EventHandlerUPP dockmenuUPP;
+ OSStatus ec = noErr;
+ EventTypeSpec eventTypes [1];
- eventTypes[0].eventClass = kEventClassApplication;
- eventTypes[0].eventKind = kEventAppGetDockTileMenu;
+ eventTypes[0].eventClass = kEventClassApplication;
+ eventTypes[0].eventKind = kEventAppGetDockTileMenu;
- dockmenuUPP = NewEventHandlerUPP (dockmenuhandler);
+ dockmenuUPP = NewEventHandlerUPP (dockmenuhandler);
- ec = InstallApplicationEventHandler (dockmenuUPP, 1, eventTypes, NULL, NULL);
+ ec = InstallApplicationEventHandler (dockmenuUPP, 1, eventTypes, NULL, NULL);
- /*If it fails, oh well, there's nothing to be done. So ec isn't checked.*/
- }
-
+ /*If it fails, oh well, there's nothing to be done. So ec isn't checked.*/
+
+ }
+
#endif
- fileinit();
+ fileinit ( );
+
return (true);
} /*shellinit*/
-#if 0 //TARGET_API_MAC_CARBON == 1
-static pascal void idleTimer (EventLoopTimerRef theTimer, void * userData)
-{
- //I hate warnings, shut up the compiler
- #pragma unused(theTimer)
- #pragma unused(userData)
-
- boolean flbackground;
-
- fwsNetEventCheckAndAcceptSocket ();
-
- shellhandlenullevent (&flbackground);
-
-}
-#endif
-
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/shellactivate.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/shellactivate.c 2007-02-27 20:29:44 UTC (rev 1636)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/shellactivate.c 2007-02-27 23:30:09 UTC (rev 1637)
@@ -151,13 +151,12 @@
if (config.fleraseonresize)
shellupdatenow (w);
#endif
+
}
shellpopglobals ();
return (true);
+
} /*shellactivatewindow*/
-
-
-
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/shellcallbacks.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/shellcallbacks.c 2007-02-27 20:29:44 UTC (rev 1636)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/shellcallbacks.c 2007-02-27 23:30:09 UTC (rev 1637)
@@ -97,6 +97,7 @@
} /*for*/
return (false); /*loop terminated, not found*/
+
} /*shellfindcallbacks*/
@@ -466,8 +467,7 @@
void shellloadbuttonlists (void) {
- register short i;
- register short resnum;
+ register short i, resnum;
for (i = 0; i < topglobalsarray; i++) {
@@ -492,6 +492,7 @@
*pconfig = globalsarray [ix].config;
return (true);
+
} /*shellgetconfig*/
@@ -505,6 +506,7 @@
globalsarray [ix].config = pconfig;
return (true);
+
} /*shellsetconfig*/
@@ -533,11 +535,14 @@
shellundostack = nil; /*7/21/91 dmb*/
-#ifdef WIN95VERSION
- setport (NULL); // must clear port from prev globals
-#endif
+ #ifdef WIN95VERSION
+
+ setport (NULL); // must clear port from prev globals
+
+ #endif
return (false);
+
}
if (!getwindowinfo (w, &hinfo)) /*chase the refcon field of the mac window*/
@@ -581,6 +586,7 @@
}
return (true);
+
} /*shellsetglobals*/
/*
@@ -674,6 +680,7 @@
shellsetglobals (nil);
return (false);
+
}
if (shellwindow != nil) { /*there are some globals currently set - set data to nil*/
@@ -685,6 +692,7 @@
*shellglobals.infoholder = nil;
(*shellglobals.setglobalsroutine) ();
+
}
shellsetglobals (globalsstack.stack [--globalsstack.top]);
@@ -698,6 +706,7 @@
}
return (true);
+
} /*shellpopglobals*/
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/shellhooks.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/shellhooks.c 2007-02-27 20:29:44 UTC (rev 1636)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/shellhooks.c 2007-02-27 23:30:09 UTC (rev 1637)
@@ -208,6 +208,7 @@
eventhooks [cteventhooks++] = routine;
return (true);
+
} /*shellpusheventhook*/
@@ -261,13 +262,16 @@
if (cterrorhooks >= maxerrorhooks) {
- shellinternalerror (idtoomanyerrorhooks, STR_increase_maxerrorhooks);
+ shellinternalerror (idtoomanyerrorhooks, STR_increase_maxerrorhooks);
+
return (false);
+
}
errorhooks [cterrorhooks++] = routine;
return (true);
+
} /*shellpusherrorhook*/
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/shellscroll.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/shellscroll.c 2007-02-27 20:29:44 UTC (rev 1636)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/shellscroll.c 2007-02-27 23:30:09 UTC (rev 1637)
@@ -109,6 +109,7 @@
dir = right;
return (dir);
+
} /*scrolldirection*/
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/shellundo.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/shellundo.c 2007-02-27 20:29:44 UTC (rev 1636)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/shellundo.c 2007-02-27 23:30:09 UTC (rev 1637)
@@ -226,6 +226,7 @@
(**hstack).ixaction = ixaction;
return (true);
+
} /*pushaction*/
@@ -246,16 +247,16 @@
if (step.flactionstep)
globaldata = (long) step.hundodata;
-
else {
-
shellsetundoglobals (globaldata, false); /*set up environment*/
(*step.undoroutine) (step.hundodata, false); /*ignore errors*/
+
}
}
(**hstack).ixaction = noaction;
+
} /*killactions*/
@@ -300,6 +301,7 @@
shelladjustundo (); /*7.0fc1: adjust the Undo menu item.*/
return (res);
+
} /*pushundoaction*/
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/tablecompare.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/tablecompare.c 2007-02-27 20:29:44 UTC (rev 1636)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/tablecompare.c 2007-02-27 23:30:09 UTC (rev 1637)
@@ -37,36 +37,23 @@
static short tablecomparenames (hdlhashnode hnode1, hdlhashnode hnode2) {
-
+
/*
2004-11-09 aradke: optimized by calling compareidentifiers which does
an in-place case-insensitive compare instead of copying both key strings,
converting both copies completely to lowercase, and running a case-sensitive
compare on the resulting lowercase strings.
*/
-
+
return (compareidentifiers ((**hnode1).hashkey, (**hnode2).hashkey));
- /*
- bigstring bs1, bs2;
-
- gethashkey (hnode1, bs1);
-
- gethashkey (hnode2, bs2);
-
- alllower (bs1); /%comparison is unicase%/
-
- alllower (bs2);
-
- return (comparestrings (bs1, bs2));
- */
} /*tablecomparenames*/
#if !flruntime
static short tablecomparekinds (hdlhashnode hnode1, hdlhashnode hnode2) {
-
+
tyvaluerecord val1, val2;
register tyvaluetype t1, t2;
@@ -101,6 +88,7 @@
return (tablecomparenames (hnode1, hnode2));
return (sgn (t1 - t2));
+
} /*tablecomparekinds*/
Modified: Frontier/branches/Frontier_Long_File_Paths/Common/source/tableformats.c
===================================================================
--- Frontier/branches/Frontier_Long_File_Paths/Common/source/tableformats.c 2007-02-27 20:29:44 UTC (rev 1636)
+++ Frontier/branches/Frontier_Long_File_Paths/Common/source/tableformats.c 2007-02-27 23:30:09 UTC (rev 1637)
@@ -306,6 +306,7 @@
remaining -= w;
maxwidth -= x;
+
}
tablesetcolwidth (lastcol, remaining, false);
@@ -313,6 +314,7 @@
opseteditbufferrect ();
return (true);
+
} /*tablerecalccolwidths*/
@@ -505,22 +507,22 @@
static boolean initializetableoutline (hdloutlinerecord ho, hdlhashtable ht) {
-
+
/*
5.0.2b21 dmb: use shellgetdatabase, not databasedata global
5.1.3 dmb: roll beachball; don't ignore clayfolderloop return value
*/
-
- hdlheadrecord hsummit = (**ho).hsummit;
- hdlheadrecord hnewsummit, hlastsummit;
- hdlheadrecord nomad, hnext;
+
+ boolean fl = false;
+ hdlheadrecord hlastsummit, hnewsummit, hnext, hsummit = (**ho).hsummit, nomad;
+ hdlwindowinfo hinfo;
+ long lnumcursor;
tybrowserspec fsroot;
tyexpandinfo expandinfo;
- hdlwindowinfo hinfo;
- long lnumcursor;
- boolean fl = false;
+ clearbytes ( &fsroot, sizeof ( fsroot ) );
+
oppushoutline (ho);
opgetnodeline ((**ho).hbarcursor, &lnumcursor);
@@ -529,7 +531,7 @@
while (opchasedown (&hlastsummit))
;
-
+
opdisabledisplay ();
opsetdisplaydefaults (ho);
@@ -549,22 +551,21 @@
fsroot.parID = ht;
- setemptystring (fsroot.name);
-
initbeachball (right);
- if (!clayfolderloop (&fsroot, false, browserexpandvisit, (long) &expandinfo))
+ if ( ! clayfolderloop ( &fsroot, false, browserexpandvisit, ( long ) &expandinfo ) )
goto exit;
-
+
hnewsummit = (**hlastsummit).headlinkdown;
if (hnewsummit == hlastsummit) { // table was empty
-
+
browserlineinserted (hnewsummit);
(**ho).fltextmode = true;
opeditsetselection (0, infinity);
+
}
else { // table was not empty
@@ -575,7 +576,7 @@
hnewsummit = (**hlastsummit).headlinkdown;
while (true) {
-
+
hnext = (**nomad).headlinkdown;
duplicateexpansionvisit (nomad, hnewsummit);
@@ -586,10 +587,11 @@
if (hnext == hnewsummit)
break;
+
+ nomad = hnext;
- nomad = hnext;
}
-
+
(**ho).hbarcursor = oprepeatedbump (flatdown, lnumcursor, hnewsummit, true);
(**ho).hline1 = oprepeatedbump (flatdown, (**ho).vertscrollinfo.cur, hnewsummit, true);
@@ -599,10 +601,13 @@
opdirtymeasurements (); //6.0a14 dmb
opsetctexpanded (ho);
+
}
+
+ #ifdef fldebug
- #ifdef fldebug
opvalidate (outlinedata);
+
#endif
fl = true;
@@ -615,6 +620,7 @@
// (**(**ho).hsummit).flnodeisfolder = true;
return (fl);
+
} /*initializetableoutline*/
@@ -729,11 +735,12 @@
//hdlhashtable ht = (**hf).htable;
hdloutlinerecord ho = (**hf).houtline;
-
+
if (ho == nil)
return;
+
+ // grab display setting from outline
- // grab display setting from outline
(**hf).fontnum = (**ho).fontnum;
(**hf).fontsize = (**ho).fontsize;
@@ -743,7 +750,7 @@
(**hf).vertcurrent = (**ho).vertscrollinfo.cur;
opgetnodeline ((**ho).hbarcursor, &(**hf).vertcurrent);
-
+
// if we have an auto-generated node, delete the table entry
/*
@@ -771,6 +778,7 @@
(**hf).houtline = nil;
opdisposeoutline (ho, false);
+
} /*tabledisposeoutline*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
