Odd problem with Entries file meant none got checked in last time...

h/MiscDefs

@@ -14,10 +14,13 @@
  */
 /***************************************************/
 /* File   : MiscDefs.h                             */
+/*                                                 */
 /* Purpose: Miscellaneous definitions for the      */
 /*          browser.                               */
+/*                                                 */
 /* Author : A.D.Hodgkinson                         */
-/* History: 13-Feb-97: Created                     */
+/*                                                 */
+/* History: 13-Feb-97: Created.                    */
 /***************************************************/
 
 /* Browser-defined bits in the flags field of an HStream structure */

h/Mouse

@@ -14,18 +14,25 @@
  */
 /***************************************************/
 /* File   : Mouse.h                                */
+/*                                                 */
 /* Purpose: Mouse pointer related functions for    */
-/*          the browser                            */
+/*          the browser.                           */
+/*                                                 */
 /* Author : A.D.Hodgkinson                         */
-/* History: 14-Mar-97: Created                     */
+/*                                                 */
+/* History: 14-Mar-97: Created.                    */
 /***************************************************/
 
 /* Shape definitions */
 
-#define Mouse_Shape_Off    0
-#define Mouse_Shape_Normal 1
-#define Mouse_Shape_Link   2
-#define Mouse_Shape_Map    3
+#define Mouse_Shape_Off      0
+#define Mouse_Shape_Normal   1
+#define Mouse_Shape_Link     2
+#define Mouse_Shape_Map      3
+#define Mouse_Shape_UD       4
+#define Mouse_Shape_LR       5
+#define Mouse_Shape_UDLR     6
+#define Mouse_Shape_NoResize 7
 
 /* Function prototypes */
 

h/Multiuser

@@ -12,26 +12,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*************************************************/
-/* File   : Multiuser.h                          */
-/* Purpose: Definitions required by multi-user   */
-/*          builds. Included by Global.h if      */
-/*          SINGLE_USER is not defined.          */
-/* Author : A.D.Hodgkinson                       */
-/* History: 23-Jul-97: Created                   */
-/*************************************************/
+/***************************************************/
+/* File   : Multiuser.h                            */
+/*                                                 */
+/* Purpose: Definitions required by multi-user     */
+/*          builds. Included by Global.h if        */
+/*          SINGLE_USER is not defined.            */
+/*                                                 */
+/* Author : A.D.Hodgkinson                         */
+/*                                                 */
+/* History: 23-Jul-97: Created.                    */
+/***************************************************/
+
+/* Structures */
 
 typedef struct userdef
 {
- char homepage    [256];
- char name        [32];
-
- char lastfind    [64];
- int  casematch;
-
- char historyfile [256];
- char hotlistfile [256];
+ char homepage    [Limits_Multi_HomePage];
+ char name        [Limits_Multi_Name];
+ char historyfile [Limits_Multi_History];
+ char hotlistfile [Limits_Multi_Hotlist];
 
 } userdef;
 
+/* Globals */
+
 extern userdef user;

h/NestWimp

@@ -12,13 +12,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*************************************************/
-/* File   : NestWimp.h                           */
-/* Purpose: Definitions to use the new features  */
-/*          of the nested Wimp.                  */
-/* Author : A.D.Hodgkinson                       */
-/* History: 21-Feb-97: Created                   */
-/*************************************************/
+/***************************************************/
+/* File   : NestWimp.h                             */
+/*                                                 */
+/* Purpose: Definitions to use the new features of */
+/*          the nested Wimp.                       */
+/*                                                 */
+/* Author : A.D.Hodgkinson                         */
+/*                                                 */
+/* History: 21-Feb-97: Created.                    */
+/***************************************************/
 
 /* Extensions to Wimp_OpenWindow */
 

h/Printing

@@ -14,9 +14,12 @@
  */
 /***************************************************/
 /* File   : Printing.h                             */
-/* Purpose: Printing functions for the browser     */
+/*                                                 */
+/* Purpose: Printing functions for the browser.    */
+/*                                                 */
 /* Author : A.D.Hodgkinson                         */
-/* History: 27-Jan-97: Created                     */
+/*                                                 */
+/* History: 27-Jan-97: Created.                    */
 /***************************************************/
 
 /* Message definitions */

h/Redraw

@@ -14,9 +14,12 @@
  */
 /***************************************************/
 /* File   : Redraw.h                               */
-/* Purpose: Redraw functions for the browser       */
+/*                                                 */
+/* Purpose: Redraw functions for the browser.      */
+/*                                                 */
 /* Author : A.D.Hodgkinson                         */
-/* History: 29-Nov-96: Created                     */
+/*                                                 */
+/* History: 29-Nov-96: Created.                    */
 /***************************************************/
 
 /* Definitions */

h/Reformat

@@ -14,9 +14,22 @@
  */
 /***************************************************/
 /* File   : Reformat.h                             */
-/* Purpose: Reformatting functions for the browser */
+/*                                                 */
+/* Purpose: Functions to handle page reformatting. */
+/*                                                 */
 /* Author : A.D.Hodgkinson                         */
-/* History: 03-Dec-96: Created                     */
+/*                                                 */
+/* History: 03-Dec-96: Created.                    */
+/*          16-Apr-97: First merge with T.Cheal's  */
+/*                     table code...               */
+/*          22-May-97: Amazingly, *still* trying   */
+/*                     to get this to work.        */
+/*          18-Jun-97: Hpmh; works, but very slow. */
+/*                     Will need to rewrite at     */
+/*                     some stage; for the moment, */
+/*                     moved a few bits over to    */
+/*                     Tables.c as they fitted in  */
+/*                     better over there.          */
 /***************************************************/
 
 #include "HTMLLib.h" /* From the HTML library; the definitions below rely on this */

h/Save

@@ -14,25 +14,36 @@
  */
 /***************************************************/
 /* File   : Save.h                                 */
-/* Purpose: Save functions for the browser         */
+/*                                                 */
+/* Purpose: Save functions for the browser.        */
+/*                                                 */
 /* Author : A.D.Hodgkinson                         */
-/* History: 04-Dec-96: Created                     */
+/*                                                 */
+/* History: 04-Dec-96: Created.                    */
 /***************************************************/
 
 /* Filetype definitions */
 
-#define FileType_HTML 0xFAF
 #define FileType_TEXT 0xFFF
+#define FileType_DATA 0xFFD
 #define FileType_POUT 0xFF4
+#define FileType_TIFF 0xFF0
+#define FileType_HTML 0xFAF
 #define FileType_URI  0xF91
+#define FileType_JPEG 0xC85
+#define FileType_PNG  0xB60
+#define FileType_URL  0xB28
+#define FileType_GIF  0x695
 
 /* Function prototypes */
 
-ObjectId save_return_dialogue_id (void);
+ObjectId          save_return_dialogue_id (void);
 
-int      save_fill_in            (int eventcode, ToolboxEvent * event, IdBlock * idb, void * handle);
-int      save_fill_for_html      (IdBlock * idb);
+int               save_fill_in            (int eventcode, ToolboxEvent * event, IdBlock * idb, void * handle);
+int               save_fill_for_html      (IdBlock * idb);
+_kernel_oserror * save_fill_for_object    (browser_data * b, char * url);
 
-int      save_save_to_file       (int eventcode, ToolboxEvent * event, IdBlock * idb, void * handle);
-int      save_fill_buffer        (int eventcode, ToolboxEvent * event, IdBlock * idb, void * handle);
-int      save_save_completed     (int eventcode, ToolboxEvent * event, IdBlock * idb, void * handle);
+int               save_save_to_file       (int eventcode, ToolboxEvent * event, IdBlock * idb, void * handle);
+int               save_fill_buffer        (int eventcode, ToolboxEvent * event, IdBlock * idb, void * handle);
+int               save_save_completed     (int eventcode, ToolboxEvent * event, IdBlock * idb, void * handle);
+int               save_dialogue_completed (int eventcode, ToolboxEvent * event, IdBlock * idb, void * handle);

h/Tables

@@ -13,9 +13,12 @@
  * limitations under the License.
  */
 /***************************************************/
-/* File   : tablelib.c                             */
-/* Purpose: Table handling functions               */
+/* File   : Tables.h                               */
+/*                                                 */
+/* Purpose: Table handling functions.              */
+/*                                                 */
 /* Author : T.Cheal, adapted by A.D.Hodgkinson     */
+/*                                                 */
 /* History: 18-Mar-97: Datestamp on code received  */
 /*                     from T.Cheal.               */
 /*          17-Apr-97: Split up; HTMLLib specific  */

h/TokenUtils

@@ -12,13 +12,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*************************************************/
-/* File   : TokenUtils.h                         */
-/* Purpose: Utility functions for finding        */
-/*          out information about tokens.        */
-/* Author : A.D.Hodgkinson                       */
-/* History: 09-Apr-97: Created                   */
-/*************************************************/
+/***************************************************/
+/* File   : TokenUtils.h                           */
+/*                                                 */
+/* Purpose: Utility functions for finding out      */
+/*          information about tokens.              */
+/*                                                 */
+/* Author : A.D.Hodgkinson                         */
+/*                                                 */
+/* History: 09-Apr-97: Created.                    */
+/***************************************************/
 
 /* Structures */
 

h/ToolAction

@@ -14,10 +14,13 @@
  */
 /***************************************************/
 /* File   : ToolAction.h                           */
+/*                                                 */
 /* Purpose: Definitions that don't use OSLib...    */
+/*                                                 */
 /* Author : Copied from header by S.Middleton, by  */
-/*          A.D.Hodgkinson.                        */
-/* History: 26-Feb-97: Created                     */
+/*          A.D.Hodgkinson                         */
+/*                                                 */
+/* History: 26-Feb-97: Created.                    */
 /***************************************************/
 
 /**********************************

h/Toolbars

@@ -14,10 +14,13 @@
  */
 /***************************************************/
 /* File   : Toolbars.h                             */
+/*                                                 */
 /* Purpose: Toolbar-related functions for the      */
-/*          browser                                */
+/*          browser.                               */
+/*                                                 */
 /* Author : A.D.Hodgkinson                         */
-/* History: 21-Nov-96: Created                     */
+/*                                                 */
+/* History: 21-Nov-96: Created.                    */
 /***************************************************/
 
 /* Magic number definitions */

h/Trace

@@ -14,14 +14,17 @@
  */
 /***************************************************/
 /* File   : Trace.c                                */
+/*                                                 */
 /* Purpose: Trace build only debugging functions   */
 /*          - not the sort of thing that hacks     */
 /*          up some text display or whatever; that */
 /*          is the domain of TML. These functions  */
 /*          are for principally file-based output  */
 /*          of things like token list dumps.       */
+/*                                                 */
 /* Author : A.D.Hodgkinson                         */
-/* History: 02-Jul-97: Created                     */
+/*                                                 */
+/* History: 02-Jul-97: Created.                    */
 /***************************************************/
 
 int trace_dump_tokens_by_line   (int eventcode, ToolboxEvent * event, IdBlock * idb, void * handle);

h/URLutils

@@ -14,16 +14,23 @@
  */
 /***************************************************/
 /* File   : URLutils.h                             */
+/*                                                 */
 /* Purpose: URL manipulation for the browser.      */
+/*                                                 */
 /* Author : Merlyn Kline for Customer browser     */
 /*          This source adapted by A.D.Hodgkinson  */
-/*          from various original functions, with  */
-/*          new additions.                         */
-/* History: 06-Feb-97: Created                     */
+/*          from various original functions        */
+/*                                                 */
+/* History: 06-Feb-97: Created.                    */
 /***************************************************/
 
 #include "URI.h" /* URI handler API, in URILib:h */
 
+/* General definitions */
+
+#define Internal_URL "!INTRNL!" /* Special string (i.e. hack...) to mark a URL as internal only. */
+#define Int_URL_Len  8          /* Saves having to strlen(Internal_URL) in various places.       */
+
 /* Structures */
 
 /* If using the URI handler, need to keep an array of all */

h/Utils

@@ -12,12 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*************************************************/
-/* File   : Utils.h                              */
-/* Purpose: Infrequently altered utilities       */
-/* Author : A.D.Hodgkinson                       */
-/* History: 18-Oct-96: Created                   */
-/*************************************************/
+/***************************************************/
+/* File   : Utils.h                                */
+/*                                                 */
+/* Purpose: Infrequently altered utilities.        */
+/*                                                 */
+/* Author : A.D.Hodgkinson                         */
+/*                                                 */
+/* History: 18-Oct-96: Created.                    */
+/***************************************************/
 
 /* Useful macros */
 
@@ -41,7 +44,7 @@
 #define Utils_Error_Custom_Fatal   ((1u<<30) + 1)  /* Offers only 'Quit'          */
 #define Utils_Error_Custom_Message ((1u<<30) + 2)  /* Offers only 'Continue'      */
 
-/* Miscellaneous function prototypes */
+/* Function prototypes */
 
 char            * lookup_token                     (char * s, int flag, char * arg);
 char            * lookup_choice                    (char * s, int flag, char * arg);
@@ -102,6 +105,7 @@ browser_data    * utils_ancestor                   (browser_data * b);
 int               encode_base64                    (const char * in, int len, char * out);
 int               utils_strcasecmp                 (const char * a, const char * b);
 int               utils_strncasecmp                (const char * a, const char * b, unsigned int n);
+int               utils_len_printf                 (const char * format, ...);
 
 _kernel_oserror * utils_stop_webserv               (void);
 _kernel_oserror * utils_set_http_agent             (void);

h/Windows

@@ -13,14 +13,16 @@
  * limitations under the License.
  */
 /***************************************************/
+/* File   : Utils.h                                */
 /* File   : Windows.h                              */
+/*                                                 */
 /* Purpose: Window related functions for the       */
 /*          browser (open, close, create, etc.).   */
+/*                                                 */
 /* Author : A.D.Hodgkinson                         */
-/* History: 20-Nov-96: Created                     */
-/*          15-Mar-97: Browser.c created from all  */
-/*                     browser_ prefixed functions */
-/*                     to reduce source file size  */
+/*                                                 */
+/* History: 20-Nov-96: Created.                    */
+/*          15-Mar-97: Split up to form Browser.h. */
 /***************************************************/
 
 /* Magic number definitions */
@@ -33,7 +35,7 @@
 /* Function prototypes */
 
 int               windows_new_browser            (int eventcode, ToolboxEvent * event, IdBlock * idb, void * handle);
-_kernel_oserror * windows_create_browser         (char * url, browser_data * parent, BBox * size, char * name);
+_kernel_oserror * windows_create_browser         (char * url, browser_data * parent, BBox * size, char * name, int savelink);
 
 int               windows_open_browser           (int eventcode, WimpPollBlock * b, IdBlock * idb, browser_data * handle);
 int               windows_remember_size          (int eventcode, WimpPollBlock * b, IdBlock * idb, void * handle);