- 31 Jan, 1998 1 commit
-
-
Andrew Hodgkinson authored
Check for WindowManager 3.97 and ensure Unicode$Path is set in all !Run[D] files, don't set the Alias$@PrintType_FF4 variable, and updated Customer build ROM obey file variants. Various other changes to the Run files for new module versions, updated paths to support new positions of choices, hotlist and histories (see later), etc. !Sprites[22] files hold small !app icons for some variants, and an ic_browse sprite. Some variants now have a Sprites and Sprites22 file instead of just Sprites, with the former containing various mode 12 or 15 specific sprites. Text files dragged to the URL writable are treated as ANT URL files. This relies on URLBarWrit (Toolbars.h) being a unique ID, which it should be, but beware of the Hotlist and Choices numberspaces... INPUT TYPE=BUTTON supported. Form items without a FORM tag are now shown (as MSIE 4, but not NN 4). '*', '-', '@', '_' and '.' are not escaped when submitting forms now. The Web interface to the IMDb now works. INPUT TYPE=HIDDEN items will not affect the line height anymore - so http://www.hotmail.com/ now has correctly aligned writable icons, for example. Similarly, TAG_FORM and TAG_FORM_END items could push up line height and don't anymore. HRs with a specified pixel width will now influence the size of a table cell (they didn't before). BRs now checked by tagno field when the browser needs to know something was an actual BR tag rather than just a line break signal, and by the style bit entry when only the indication of a line break is required. Table widths of 0 or 0% are ignored. Trace.c updated to report height and background fields in a table_stream. fm_putsl() writes a terminator into the string; the Forms.c routines were calling this for displaying INPUT TYPE=PASSWORD fields using the FE_PassCode literal string (a line of stars). This write into a read only data area would make the debugger fault the access. A local char array is now used instead, to get round this (note the use of var[]=literal rather than var[sizeof(literal)]; strcpy(var, literal) due to some weird compiler bug that copies the wrong thing into 'var' under some (undefined...) circumstances). Text areas don't scroll back to the top line when clicked in anymore; single line writables don't scroll back to the left either. When reentering a text area from 'above', the caret appears at the top line rather than 'somewhere further down'... ARROWS_MOVE_OUT compile time option at the top of Forms.c defines whether you must press Tab/Shift+Tab to move between writable fields in forms or if up/down will drop out of them, though if keyboard control is on this is enforced (or you get trapped inside the form!). urlutils_filetype_from_url now uses MimeMap module. If fetcher is told a page is text, it'll check for a filename extension and may choose to use this instead (e.g. it may find it's HTML instead). This is to try and get around duff servers... (e.g. http://www.batalarms.co.uk/). Save dialogues shouldn't flicker when options that don't change the filetype are selected (before, the draggable sprite was always reset for each selection). Noticed the erroneous setting of a static variable in SaveFile.c by a call to this by SaveObject.c, and so added a flag to savefile_set_filetype to deal with this - would have been possible to get the wrong filetype sent to applications or at best the wrong filetype sprite in the dialogue without that. The caret shouldn't jump out of a form back to the URL writable if the page reformats now. Table background colours now supported (as in the colour you see in the border space if the cellspacing is large enough; this is as in MSIE, not as in Navigator). Drawfile output routines updated accordingly. Corrected erroneous use of wimpt_dx() / wimpt_dy() in a couple of places in Images.c, which meant that (say) 1x1 images didn't work correctly in medium resolution display modes. Now have support for save as text (component ID and event 0x12) and save as Draw (component ID and event 0x13) buttons. Dubious conditions for greying and ungreying the print, save source and view source buttons and menu options sorted out as part of implementing the same for the two new buttons; added greying out of their associated menu items in passing. Turned kerning on in draw file objects (does mean a rather heinous increase in file size, but this is the only way to ensure the draw file matches the visible page). Comments before functions in SaveDraw.c are now complete and up to date. Image and visit histories now generate a crude hash number to speed up searching for items. It does give a speed increase, though it's a disappointingly small one. Issue of left/right margins and cellpaddings sorted out. Now have redraw_left/right_margin for finding out the basic gap you must leave. redraw_left/right_gap then gives any extra indentation for LI, BLOCKQUOTE or whatever. The last two can be subtracted from the display width to get an available page width for any section of text. Note that redraw_left_gap replaces redraw_margin. The redraw_start_x function uses the above to work out where a line's left hand edge should be, taking account of left/right/centre alignment. HRs have been fixed now (they were quite broken in v1.30, I think) based on this new model and the behaviour of MSIE/NN 4. Fixed width of cells with no contents - cell padding values wouldn't have worked properly as the reformatter returns 0 rather than the left hand margin size if given no stream. Removed FM_Absolute flags for Font_Paint (spotted by DBrown) - sets bit 2, which is reserved...? IMG width and height in % terms now works correctly; a % of available width (after margins and indents) or height on the main page or for a table cell, if the image lies in one. Because of the chicken-and-egg problem with the latter, the cell must specify a width and/or height for things to work properly. If this is not done, you'll usually end up with a 1:1 scaled image (as in Navigator 4, rather than ending up with no image or even no cell (!), as in MSIE 4). HEIGHT attribute on a TABLE tag is supported, but only in a crude fashion; the extra height (if there is any) is distributed over the rows in a linear fashion. This is probably all you have to do in practice, but I haven't checked. To maintain a notion of min/max height as well as width would of course require a great deal more work... If using client pull to reload a page with a fragment ('...#name') specified, then the reload wouldn't work on the same page; it'd just jump to the fragment position. This won't happen if b->reloading is set now (so works in conjunction with client pull on the same page forcing a non-cached fetch). Similarly, if POSTing to such a URL, a fetch will proceed (both these fixes done originally for http://jupiter.beseen.com/chat/rooms/g/1678/). browser_inherit split to browser_inherit and browser_inherit_post_data; the code for the latter didn't clear any post_data in the child before copying from the parent either, and could cause flex errors (now fixed). Res file for Ursula ('Desktop' Browse) build tweaked - bits in the font choices dialogue renamed, and button bar rearranged to hold the new Save As Draw button. Other builds have had Save As Draw and Save As Text buttons added, or not, depending upon availability of suitable sprites, required UI simplicity, etc. Now have: Browse$ChoicesFile Browse$ControlsFile Browse$ChoicesSave Browse$ControlsSave (the last two are new) for loading and saving of the Choices or Controls files. If unset, <App$Dir>.Choices or <App$Dir>.Controls will be set. E.g., you could set Browse$ChoicesFile to be: <App$Dir>.Choices,Choices:WWW.(app).Choices for loading and <Choices$Write>.WWW.(app).Choices for saving. (The browser never saves Controls at the moment, so the relevant variable above isn't effectively implemented, but could be in future). Similarly, to support asymetric loading/saving of the Hotlist, there are HotlistSave, HistorySave and ImageHistorySave entries in Choices to complement HotlistPath, HistoryPath and ImageHistoryPath (which are used for loading). save_save_choices will create directories as needed to obtain the given path (and has also been fixed in various areas that hadn't been tested out until now; e.g. zero termination of the AppName$ChoicesFile variable expansion...). !Run[D] files updated appropriately. Table widthing code rewritten. Slower, but a lot better on the whole. Still has some problems - still needs a final 'make sure nothing is below minimum width' scan, which it should be possible to do without. No time to fix this at present! The reformatter will now 'glue together' an LI token followed by any non-LI token; so a bullet point followed by an item should not be able to have a line break inserted after the bullet because of very tight width constraints (it could before - yuk...). 'about:' brings up a page about the browser and any Plug-Ins, as with Navigator (for example). URI files support titles, as per spec. version 8. Saving a current location to the Hotlist will thus give a sensible title now (unless you're in a frame, so there's no title to get...). Of course, v1.00 files without a title still work. Note that NOBR is *not* supported in this build and this combined with the new table widther may cause problems on some sites (e.g. Microsoft's home page!).
-
- 12 Dec, 1997 1 commit
-
-
Andrew Hodgkinson authored
There are a few known significant problems with this code but it's being checked in so the Choices can be worked on. Note that Res files etc. are not up to date across all builds. Progress is as follows... Bug report prompted me to do this - now ignore <p> tags straight after <li> tags, so '<ul><li><p>Some text' works as the author (or automatic generator, more commonly) intended. A <p> tag before a table will be acted upon now (it was ignored before). Something like <li><p><table...> will give a line break and paragraph space after the <li> despite the changes mentioned above, as in other browsers. Both browsers differ from Navigator, where the table appears alongside the <li> tag. Multiple BR tags work as in MSIE / Navigator (they don't collapse to zero height anymore). For the above, line height (and so, <br><br> or <p> spacing) is now calculated inside reformat_text_line_height, and is used with either a token to get the text height at a given size (e.g. for general line spacing or multiple BR tags) or NULL for normal size text (e.g. for P spacing, though this value is in practice later scaled by 7/8ths in reformat_check_height). Note this behaviour is exhibited by MSIE 4; v3 gave two BRs the same spacing as one P (i.e. not font size dependent). Save dialogues can have an option button or couple of radios to switch between various formats (e.g. URI or URL, sprite or original format). See 'Docs.Notes' for more. The back-end to this is now implemented (i.e. at the moment, save as URI or URL, save as original image format). Note that when saving background images, a leafname based on the original fetch URL is now offered rather than a generic 'Background'. Internal URL scheme changed to be all lower case, so relativisation through URL_Fetcher still makes sense... :-/ Holding down 'shift' when clicking on stop reverses the interpretation of the Controls file 'StopWebServe' entry. Fixed row / column count for exporting tables as text; fixed a few bits and pieces of internal URL scheme stuff which got broken when HTMLLib started using URL_Fetcher's relativisation.
-
- 20 Nov, 1997 1 commit
-
-
Andrew Hodgkinson authored
Adjust-click on forwards/backwards buttons did not work in the intermediate build, and now does. Adjust-click on form submission buttons where the submit method is POST will now work correctly, as the new view inherits the extradata block of the old. Failure of this is signalled through make_no_fetch_memory_error, code 16 (see updated Errors file in Docs). Note the name change of extradata in this context; more details below. The passing of forms POST data and extra headers for sending in an HTTP request via. the URL module was all done through pointers into flex blocks, and was therefore very unsafe. All relevant functions now use pointers to pointers to the data. To remove confusion on the umpteen uses of the word 'extradata', the field in browser_data has been renamed to 'post_data'. The 'extradata' parameters used within FetchPage.c were all disconnected from the extra header info / form POST data stuff that extradata is usually associated with, and have thus also been renamed, in this case to 'appnddata' (Append Data). As well as X-NoProxy, the browser sends the 'proper' HTTP headers Pragma:no-cache and Cache-Control:no-cache. A redirection from a POST request was not handled correctly; despite what HTTP specs say, you're supposed to use GET for the new URL. The browser was, but when it chopped off the redundant header data in the request didn't terminate it and left Content-Type in anyway...! Fixed. Ctrl+Tab implemented - URL completion. Comes from the hotlist URLs, hotlist titles, history hosts, paths, full URLs and lastly titles. See code comments for more (history_find_match, hotlist_find_match). TableSupport option added to Choices; it is read, can be set by the front-end, but doesn't actually do anything else yet. Reversed Choices' semantics on 'don't expire by...' for History. Added 'needs_redraw' flag to choices_get_contents so that, for example, if the table border types change, browsers get redrawn.
-
- 19 Nov, 1997 1 commit
-
-
Andrew Hodgkinson authored
This is an intermediate check-in to allow work on Choices for the new table options and History choices as detailed below. Res files are not up to date except where indicated and there are several known bugs that will be fixed before the 'final' v1.27 is created. Any work on resources should only be done for the testbed !Browse. Client side image maps implemented. There is code to draw highlighted borders in CSIM.c, but this is not wired in yet; other than that, the implementation is functionally complete. As part of this, centralised the fetching of a targetted URL taking into account user request of a new view and full screen mode, in fetchpage_fetch_targetted. The forms library now uses this too, so form buttons respond to both adjust-clicks and TARGET attributes. Fixed APPLET handling where '.class' isn't present in the CODE attribute. Paragraphs squashed at the top of cells/pages - browser would insert white space before. Now append a ' ' to the end of History menu items to prevent the Wimp thinking the end of entries represents a keyboard shortcut (e.g. 'Home'). Netscape's handling of 'meta http-equiv="refresh"' is to start counting when the fetch has completed and everything else has died down. The browser will now not start counting until the animation handler is deregistered (so formatting is complete) to show similar behaviour (note that this checks the main handler, not the 'idle but returning to first frame' drift handler). URLs from requests for fetches by Plug-Ins are now relativised. Page width change tolerance prior to reformat upped from 16 to 32 OS units. Hoping to provoke a loosely connected bug with this change! TableOuter, TableInner and SeeFetches choices added to all Choices files, with appropriate loading and saving code in Main.c and Save.c. AuthorFTP and AuthorFSh messages added for FTP authentication, and dialogue handling code (the component in FetchHTML.c) updated to recognise an FTP fetch and alter the dialogue presentation appropriately. All Messages file version numbers taken up to 1.27 (20 Nov 1997). Following a UseNet suggestion, Ctrl+Toggle Size will increase the window size to fill the screen vertically only; horizontal size/positioning is not changed. Shift+Tab in the URL writable will cycle through alternative fetcher protocols (from both the Controls file and checking the fetcher modules are actually present). Hotlist doesn't require '://' in URLs when loading HTML, just ':/' - so 'file:/' URLs now will be reloaded correctly. History system rewritten completely. GHistSize and VHistSize options removed, and replaced by MaxSize and ExpiryAge. Now have global history menus with most recently visited items at the top, and local history menus which reflect the path that forward/back buttons would take. Browsers are robust to background expiry of the History though this is not implemented - date expiry and size checks are carried out on history_record only. This does mean that with two windows open one could have the history expired underneath it whilst another fetched, though; the code handles this and update toolbars (greying items) as necessary. It is possible to have the history limits so tight that even one entry will not fit and again the code copes with this, though values read from Choices are limit checked to ensure rather more useful results! Implemented 'Save' button in save dialogues. Remembers pathnames and just replaces the leaf now (hard coded exceptions for <Wimp$Scrap>... and <Wimp$ScrapDir>...) - it did before, but only if you'd typed the path in. Not many people did, given that you couldn't press Return or click on a Save button to use that path... In a similar vein, files of type Data or DOS will be checked for a '/xxx' type extension and the MimeMap module will be used to find a more meaningful filetype. If this can be handled, the file is loaded. This only works for files dragged to the browser - the behaviour with inline data in web pages will depend on the File module, and similarly, if File doesn't spot what is going on and claims that the object is data, the browser will just open a save dialogue for it. !RunD files taken up to 3072K WimpSlot. Hotlist's saved HTML page title wasn't internationalised - is now. This opened up a significant can of worms; on file write error, the file would never be closed, and if a caller of the save or load functions passed in a filename held in the global Messages lookup buffer then subsequent lookups in the callees would corrupt that filename. All sorted out now. Local (not very useful) or global (useful) histories can be saved as HTML, which opens up the possibility of sending your history to the hotlist by saving to it. Local and global histories can also be emptied, though this is probably not a feature that current release Desktop browsers need. Inheritance of local history and certain UI features is now done more or less for all cases where one browser window spawns another, too. Vertical alignment on images is rather less ropey than it was (e.g. ALIGN=TOP stands half a chance of working) but is still far from perfect. This was part of fixing a nasty little bug in Redraw.c's setting of an image position via. image_set_token_image_position, which was making (amongst possibly many other things) client side image maps fail. Image update where images had large borders was affected by a similar problem too (more cans with more worms...). Fixed image background filler functions; two problems. When cross referenced images were replaced by base images in a browser because the original owner was closing down, the original owner browser would stay registered with ImageLib. Fixed; secondly, when images were deleted from the image array causing those above to be renumbered, images registered with ImageLib did not have their numbers updated (this was the one that lead to the visible drop out of background images with PNGs on the Acorn Internet home page when there were two views of the page and the first was closed). This is now also sorted out.
-
- 22 Sep, 1997 1 commit
-
-
Andrew Hodgkinson authored
Now working on source merged with Kevin Bracey's internationalisation support. UNIFONT is undefined in the Make File for now. All Res and Choices files updated appropriately. Having sorted out the old Choices and Messages to form Choices, Controls and Messages, this build has had the same cleaning up done internally. This includes greater consistency in naming schemes and the removal of the inconsitent choices items - e.g. Choices file entries saying 'delay images' and 'plain backgrounds' where internally all the flags say 'show images' and 'show backgrounds'. ChoiceDefs.h and CtrlDefs.h added to clarify the meaning of some fields, though usage of these is not 100% in the source (there are cases where parameters are passed through to functions as ints, and those functions still check these against hard coded values rather than the #define stuff). Fetcher status return bits (connected, sent request, etc.) now reflected in status bar. Progress during fetchs to files are reported by %, where the size of the object is known. Exceeding 100% drops back to a byte counter, in case the estimated size was wrong. The progress counter may be updated after specific delays, rather than 'as often as possible', to reduce flicker (as requested by D.Brown some time ago). I've done a small rewrite of the fetch prioritisation scheme in FetchPage.c; how well this performs in general use across different processor speeds remains to be tested, but certainly it has some advantages. For each small fetch window before the rewrite, a 4cs tight loop was entered - this gave a noticable and substantial drain to the Desktop performance if more than one was opened. Now, several can be up at once with little hit. The actual file fetch is on half the priority it was before, with all others taken back just a bit - e.g. from 20cs per poll to 15cs per poll for flat out reformatting. You don't seem to lose much time on the format in practice, and the Desktop feels quite a bit lighter at the same time. There's the potential for smoother frameset loading in this scheme, too. When Shift+Clicking on a link meant you still fetched inside the main browser window, several fetches could occur in a frameset - one per frame. However, now that you can only do this by clicking on a link that leads to non-displayable data - or by turning off the small fetch windows by setting UseSmall to 'no' in Choices - a bug where fetchpage_preprocessed would stop such fetches as new ones were started was revealed. The API to frames_abort_fetching has now been extended to include a 'stop file spooling too' flag, allowing a fix to be made by having fetchpage_preprocess's calls not set this (and it doesn't check the savelink flag is unset before proceeding, since frames_abort_fetching does that implicitly now). Had left the RAM transfer buffer at 16 bytes (from testing) accidentally... Oops. Upped it to 4K. In addition, when loading data by RAM transfer, the browser didn't notice if a RAMFetch bounced during the transfer. It would be treated as a 'first' RAMFetch bounce, basically, and try to go to file transfer - oops. Fixed.
-
- 14 Sep, 1997 1 commit
-
-
Andrew Hodgkinson authored
Got the deferred reformatter working properly. It doesn't do that 'OK, the page is fetched and reformatted, but just to annoy you, I'm going to wait 5 seconds and then suddenly reformat the whole thing again' trick anymore. The fetcher was calling the reformatter in a delayed form even when the reformatter was already running, so it would carry on past the reformat point or from below what had become and invalidated line, and some time later, get back to the delayed reformat. Now, reformatting is only delayed by the fetcher when the reformatter is not running. In practice this means body text reformats as it fetches, but large tables will show delayed reformatting - which was exactly the intended behaviour of the feature when it was originally thought of. fetch_token_data_address removed; it was only needed in two places, both of which already knew when to read tp->text and when to ignore it. Its functionality is duplicated in an 'if' involving reformat_istext, anyway. !Run[D] files taken back to requiri...
-
- 09 Sep, 1997 1 commit
-
-
Andrew Hodgkinson authored
Only the Browse resources are currently valid. Added Utils.Icons - has a few archives inside containing the resources (well, some of them) used to build various UI sprites for various builds. Archived because these are unlikely to change much, and putting them on CVS was a move to, well, archive the stuff... SaveDBox objects vanquished and requirements in !Run[D] files removed. The data save code fits much more neatly in amongst the data load protocol stuff now (with the slight exception of having to split the SaveObject source into SaveObject and SaveFile - the former handles multiple persistent dialogues for Shift+Click on links and the like, the latter handles 'one at a time' transient dialogues for save source and similar). Export Link is now supported, too, and writes a 'proper' version URI file. You'll find that double-clicking on old URI files will work as the URI handler picks them up, whilst new version ones don't; however, dragging onto the browser will only work with new version files. Note that support for saving and loading URL files (ANT suite stuff) is present too, so old URI files can be typed as URL files if you want to keep them working without modification - the URI handler itself will hopefully support the defined URI file format soon; double-clicking on old URI files will stop working at that point. Note there are *lots* of changes in every Res file to support all this. This may all seem a bit pointless to some, but the changes do in fact make it very easy to add new save dialogues all over the place. Certainly much easier than with the previous system, anyway. In fact, post script, image 'save as sprite' took about half an hour, which I hope proves the worth of the new system. Merged in newer hotlist code with support for drag cancelling with Escape (all relevant Res files appropriately updated) and cancelling scrolling when you've reached the window scroll limit. Had to move some of the Wimp message handling stuff to the central Protocols source, as clashes were occuring, and also the hotlist routines were using independent saving code - a lot of duplicated effort. This was fair enough as at the time the Hotlist code was written, the Save code couldn't be used in the way it is now. New Save Source and Print buttons on the toolbar of some builds. Phoenix Sprites file made more efficient - the Acorn base section has been split from the animated upper region. Browse build has a new grey fade sprite at the back, which is less grainy than the previous one and only uses 16 colours (with a 16 greyscale palette). Not really a bug, bug the routine to start an image fetch for INPUT TYPE=IMAGE forms items only did so if the src field (or equivalent, for this tag type) was non-NULL. In fact, you should always call image_new_image and let that handle the rest, otherwise other sections of the code will fail as they try to obtain an image number for a given HStream and get -1 back. This problem only generally manifested itself when loading an HTML file to the browser straight from an application, as many src fields become NULL when the relativisation routines find nothing to relativise to... Authentication got broken somewhere along the line - this has been fixed (in HTMLLib and the browser). Ctrl+Click on a cross referenced image updates *all* copies, not just the one with the image data attached. Next big step: Rip up TBEvents.h and rebuild that whole approach somewhat. To all those working on the code, my apologies but this means all Res files will receive a very large number of alterations and there will be extensive code changes too (mostly naming convention stuff), in more or less all source files. I am endeavouring to ensure that the new numberspace convention does not clash with the work being done by Kevin on internationalisation.
-
- 03 Sep, 1997 1 commit
-
-
Andrew Hodgkinson authored
File fetches now set DEADDEAD during the fetch, Data if it is aborted, or an appropriate filetype when finished. If the fetcher routines return a zero or data filetype, the browser looks at a set of hard coded filename extensions to try and determine if there's a better filetype to use (urlutils_filetype_from_url) - since this is a centralised routine it can use a Mime mapping system (or be removed entirely) as and when one becomes available. You can now drag URI / URL files to the Hotlist window to add them to the list. They are added roughly where dragged to. (NB, note that I renamed the function to return the window ID - just being picky; it matches other similar functions now). Oh, and hotlist_add_position actually works now ;-) The global history will save when titles are added, as well as when a URL is added. Before, a browser crash could mean a title got dropped out of the history file even if SaveHistory was set to 'always'. SaveObject sources have been added but nothing references them or links them in yet - they're not finished. Mostly checking this one in because of the hotlist changes.
-