diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2008-11-03 19:21:40 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2008-11-03 19:21:40 +0000 |
commit | d934e52dc6102615dbf095353cd0955d7526d7d1 (patch) | |
tree | b0a14d059a34010349db77f630acb5070d7a1ffb /amiga | |
parent | cae0d4a43bdc46586217a1e0375f5d59cadd1fba (diff) | |
download | netsurf-d934e52dc6102615dbf095353cd0955d7526d7d1.tar.gz netsurf-d934e52dc6102615dbf095353cd0955d7526d7d1.tar.bz2 |
Minor fixes, changing some defaults to safer values, screen_modeid should now work.
Added screen_depth to stop it complaining when trying to BestModeID() a 32-bit screen
on a system that doesn't have one.
svn path=/trunk/netsurf/; revision=5650
Diffstat (limited to 'amiga')
-rwxr-xr-x | amiga/dist/Rexx/GetVideo.nsrx | 3 | ||||
-rwxr-xr-x | amiga/gui.c | 8 | ||||
-rw-r--r-- | amiga/options.h | 13 | ||||
-rwxr-xr-x | amiga/schedule.c | 8 |
4 files changed, 17 insertions, 15 deletions
diff --git a/amiga/dist/Rexx/GetVideo.nsrx b/amiga/dist/Rexx/GetVideo.nsrx index 000286baf..e3708a199 100755 --- a/amiga/dist/Rexx/GetVideo.nsrx +++ b/amiga/dist/Rexx/GetVideo.nsrx @@ -19,8 +19,5 @@ /* This script launches getvideo.rexx (Aminet:comm/www/getvideo.lha) */ options results -address netsurf - geturl - address REXX 'rexx:getvideo.rexx' result 'save "ram:"' diff --git a/amiga/gui.c b/amiga/gui.c index fc66a0086..fa221ea73 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -421,15 +421,15 @@ void gui_init2(int argc, char** argv) if ((!option_homepage_url) || (option_homepage_url[0] == '\0')) option_homepage_url = (char *)strdup(NETSURF_HOMEPAGE); - if(option_modeid) + if((option_modeid) && (option_modeid[0] != '\0')) { - id = option_modeid; + id = strtoul(option_modeid,NULL,0); } else { id = p96BestModeIDTags(P96BIDTAG_NominalWidth,option_window_screen_width, P96BIDTAG_NominalHeight,option_window_screen_height, - P96BIDTAG_Depth,32); + P96BIDTAG_Depth,option_screen_depth); if(id == INVALID_ID) die(messages_get("NoMode")); } @@ -444,7 +444,7 @@ void gui_init2(int argc, char** argv) scrn = OpenScreenTags(NULL, SA_Width,option_window_screen_width, SA_Height,option_window_screen_height, - SA_Depth,32, + SA_Depth,option_screen_depth, SA_DisplayID,id, SA_Title,nsscreentitle, SA_LikeWorkbench,TRUE, diff --git a/amiga/options.h b/amiga/options.h index 0efef1896..4e38e6af0 100644 --- a/amiga/options.h +++ b/amiga/options.h @@ -24,7 +24,8 @@ extern bool option_verbose_log; extern char *option_url_file; extern char *option_hotlist_file; extern bool option_use_wb; -extern int option_modeid; +extern char *option_modeid; +extern int option_screen_depth; extern char *option_theme; extern bool option_no_iframes; extern bool option_utf8_clipboard; @@ -44,14 +45,15 @@ bool option_verbose_log = false; \ char *option_url_file = 0; \ char *option_hotlist_file = 0; \ bool option_use_wb = false; \ -int option_modeid = 0; \ +char *option_modeid = 0; \ +int option_screen_depth = 16; \ char *option_theme = 0; \ bool option_no_iframes = false; \ bool option_utf8_clipboard = false; \ bool option_context_menu = true; \ bool option_sticky_context_menu = true; \ -bool option_truecolour_mouse_pointers = true; \ -bool option_use_os_pointers = false; \ +bool option_truecolour_mouse_pointers = false; \ +bool option_use_os_pointers = true; \ bool option_force_tabs = false; \ bool option_new_tab_active = false; \ bool option_kiosk_mode = false; \ @@ -64,7 +66,8 @@ char *option_download_dir = 0; \ { "url_file", OPTION_STRING, &option_url_file }, \ { "hotlist_file", OPTION_STRING, &option_hotlist_file }, \ { "use_workbench", OPTION_BOOL, &option_use_wb}, \ -{ "screen_modeid", OPTION_INTEGER, &option_modeid}, \ +{ "screen_modeid", OPTION_STRING, &option_modeid}, \ +{ "screen_depth", OPTION_INTEGER, &option_screen_depth}, \ { "theme", OPTION_STRING, &option_theme}, \ { "no_iframes", OPTION_BOOL, &option_no_iframes}, \ { "clipboard_write_utf8", OPTION_BOOL, &option_utf8_clipboard}, \ diff --git a/amiga/schedule.c b/amiga/schedule.c index f088aa908..dd50a8cc5 100755 --- a/amiga/schedule.c +++ b/amiga/schedule.c @@ -95,8 +95,10 @@ void schedule_remove(void (*callback)(void *p), void *p) node = (struct nsObject *)GetHead((struct List *)schedule_list); - while(nnode=(struct nsObject *)GetSucc((struct Node *)node)) + do { + nnode=(struct nsObject *)GetSucc((struct Node *)node); + nscb = node->objstruct; if(!nscb) continue; @@ -105,8 +107,8 @@ void schedule_remove(void (*callback)(void *p), void *p) ami_remove_timer_event(nscb); DelObject(node); } - node=nnode; - } + + }while (node=nnode); } /** |