r13985 mono - /trunk/netsurf/atari/ctxmenu.c
by netsurf＠semichrome.net
Author: mono
Date: Fri Jun 22 19:17:57 2012
New Revision: 13985
URL: http://source.netsurf-browser.org?rev=13985&view=rev
Log:
Show alert when no editor option is configured.
Modified:
trunk/netsurf/atari/ctxmenu.c
Modified: trunk/netsurf/atari/ctxmenu.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/ctxmenu.c?rev=13985...
==============================================================================
--- trunk/netsurf/atari/ctxmenu.c (original)
+++ trunk/netsurf/atari/ctxmenu.c Fri Jun 22 19:17:57 2012
@@ -150,6 +150,7 @@
FILE * fp_tmpfile;
char * tempfile;
int err = 0;
+ char * editor;
char cmdline[128];
pop = get_tree( POP_CTX );
@@ -224,7 +225,7 @@
if( ctx->ccdata.link_url != NULL ) {
browser_window_download(
gw->browser->bw,
- nsurl_access(ctx->ccdata.link_url),
+ nsurl_access((const char*)ctx->ccdata.link_url),
nsurl_access(hlcache_handle_get_url(gw->browser->bw->current_content))
);
}
@@ -256,8 +257,9 @@
}
break;
- case POP_CTX_VIEW_SOURCE:
- if( nsoption_charp(atari_editor) != NULL ) {
+ case POP_CTX_VIEW_SOURCE:
+ editor = nsoption_charp(atari_editor);
+ if( editor != NULL && strlen(editor)>0 ) {
data = content_get_source_data( gw->browser->bw->current_content, &size );
if( size > 0 && data != NULL ){
tempfile = tmpnam( NULL );
@@ -271,8 +273,8 @@
sprintf((char*)&cmdline, "%s \"%s\"", nsoption_charp(atari_editor), tempfile );
system( (char*)&cmdline );
*/
- err = ShelWrite( nsoption_charp(atari_editor), tempfile , nsoption_charp(atari_editor), 1, 0);
- LOG(("Launched: %s %s (%d)\n", nsoption_charp(atari_editor), tempfile, err ));
+ err = ShelWrite( editor, tempfile , editor, 1, 0);
+ LOG(("Launched: %s %s (%d)\n", editor, tempfile, err ));
} else {
printf("Could not open temp file: %s!\n", tempfile );
}
@@ -281,7 +283,7 @@
LOG(("Invalid content!"));
}
} else {
- printf("Please set option_atari_editor!");
+ form_alert(0, "[1][Set option \"option_atari_editor\".][OK]");
}
break;
10 years, 7 months
r13984 mono - /trunk/netsurf/atari/settings.c
by netsurf＠semichrome.net
Author: mono
Date: Fri Jun 22 19:16:12 2012
New Revision: 13984
URL: http://source.netsurf-browser.org?rev=13984&view=rev
Log:
Handle new toolbar options (background color, iconset)
Modified:
trunk/netsurf/atari/settings.c
Modified: trunk/netsurf/atari/settings.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/settings.c?rev=1398...
==============================================================================
--- trunk/netsurf/atari/settings.c (original)
+++ trunk/netsurf/atari/settings.c Fri Jun 22 19:16:12 2012
@@ -1,5 +1,6 @@
#include <sys/types.h>
-#include <sys/stat.h>
+#include <sys/stat.h>
+#include <dirent.h>
#include <fcntl.h>
#include <time.h>
#include <limits.h>
@@ -13,6 +14,7 @@
#include "atari/settings.h"
#include "atari/global_evnt.h"
#include "atari/misc.h"
+#include "atari/findfile.h"
extern char options[PATH_MAX];
@@ -28,6 +30,7 @@
static unsigned int tmp_option_max_fetchers;
static unsigned int tmp_option_max_fetchers_per_host;
static unsigned int tmp_option_max_cached_fetch_handles;
+static unsigned int tmp_option_atari_toolbar_bg;
/* Tab forms and their buttons: */
static int frms[] = {
@@ -69,6 +72,7 @@
#define INPUT_MIN_REFLOW_PERIOD_MAX_LEN 4
#define LABEL_FONT_RENDERER_MAX_LEN 8
#define LABEL_PATH_MAX_LEN 43
+#define LABEL_ICONSET_MAX_LEN 8
static void toggle_objects( void );
static void display_settings( void );
@@ -136,6 +140,10 @@
form_event, NULL);
ObjcAttachFormFunc( dlgwin, CHOICES_BT_SEL_LOCALE,
form_event, NULL);
+ ObjcAttachFormFunc( dlgwin, CHOICES_BT_TOOLBAR_BGCOLOR,
+ form_event, NULL);
+ ObjcAttachFormFunc( dlgwin, CHOICES_BT_TOOLBAR_ICONSET,
+ form_event, NULL);
ObjcAttachFormFunc( dlgwin, CHOICES_BT_CLEAR_HISTORY,
clear_history, NULL);
@@ -204,6 +212,76 @@
void *unused2)
{
+}
+
+/**
+* Displays a popup to select available icon sets,
+ the returned string is no longer than 8 characters.
+* \param x x pos of popup
+* \param y y pos of popup
+* \return the selected string or NULL on failure.
+*/
+static char * toolbar_iconset_popup( int x, int y )
+{
+ #define MAX_SETS 24
+ DIR *dp;
+ struct dirent *ep;
+ struct stat statbuf;
+ char * current = NULL;
+ char *avail[MAX_SETS];
+ int selected = 0, navail = 0, i, choice=-1;
+ static char toolbar_folder[PATH_MAX];
+ char fullpath[PATH_MAX];
+
+ strncpy( fullpath, nsoption_charp(tree_icons_path), 255 );
+ path_add_part( fullpath, 255, "toolbar/" );
+
+ /* Get current set (for pre-selection): */
+ memset( avail, 0, MAX_SETS );
+ current = nsoption_charp(atari_image_toolbar_folder);
+
+ /* locate the toolbar folder: */
+ atari_find_resource( toolbar_folder, fullpath, fullpath );
+
+ /* search for iconset folders: */
+ dp = opendir (toolbar_folder);
+ if (dp != NULL){
+ while (ep = readdir (dp)) {
+ if (strlen(ep->d_name) < 3)
+ continue;
+ snprintf(fullpath, PATH_MAX-1, "%s/%s", toolbar_folder, ep->d_name );
+ if (stat(fullpath, &statbuf) == 0) {
+ if (S_ISDIR(statbuf.st_mode)) {
+ if (strcmp(ep->d_name, current) == 0)
+ selected = navail;
+ /* store the folder name: */
+ avail[navail] = malloc( strlen(ep->d_name)+1 );
+ sprintf( avail[navail], "%s", ep->d_name );
+ navail++;
+ if( navail >= MAX_SETS )
+ break;
+ }
+ }
+ }
+ (void) closedir (dp);
+ }
+
+
+ if (navail > 0){
+ choice = MenuPopUp( avail, x, y, navail,
+ -1, selected, P_LIST | P_CHCK );
+ if (choice > 0)
+ snprintf( toolbar_folder, 9, "%s", avail[choice-1] );
+ }
+
+ for (i=0;i<navail; i++ ) {
+ free( avail[i] );
+ }
+ if (choice > 0)
+ return( toolbar_folder );
+ else
+ return( NULL );
+ #undef MAX_SETS
}
static void __CDECL
@@ -297,6 +375,31 @@
ObjcChange( OC_FORM, win, index, NORMAL, TRUE);
break;
+ case CHOICES_BT_TOOLBAR_BGCOLOR:
+ objc_offset( FORM(win), CHOICES_BT_TOOLBAR_BGCOLOR, &x, &y );
+ choice = MenuPopUp( get_tree(POP_COLOR), x, y, -1,
+ -1, -1, P_WNDW + P_CHCK );
+ if( choice >= 0 && choice <= 15 ){
+ snprintf( spare, 255, "%02d", choice-1 );
+ tmp_option_atari_toolbar_bg = choice-1;
+ ObjcStrCpy( dlgtree, CHOICES_BT_TOOLBAR_BGCOLOR,
+ spare );
+
+ }
+ is_button = true;
+ ObjcChange( OC_FORM, win, index, NORMAL, TRUE);
+ break;
+
+ case CHOICES_BT_TOOLBAR_ICONSET:
+ objc_offset( FORM(win), CHOICES_BT_TOOLBAR_ICONSET, &x, &y );
+ tmp = toolbar_iconset_popup(x,y);
+ if( tmp != NULL ){
+ ObjcStrCpy( dlgtree, CHOICES_BT_TOOLBAR_ICONSET, tmp );
+ }
+ is_button = true;
+ ObjcChange( OC_FORM, win, index, NORMAL, TRUE);
+ break;
+
case CHOICES_INC_MEM_CACHE:
case CHOICES_DEC_MEM_CACHE:
if( index == CHOICES_DEC_MEM_CACHE )
@@ -461,7 +564,10 @@
}
}
-
+/**
+ * Toogle all objects which are directly influenced by other GUI elements
+ * ( like checkbox )
+ */
static void toggle_objects( void )
{
/* enable / disable (refresh) objects depending on radio button values: */
@@ -589,6 +695,13 @@
tmp_option_font_size = nsoption_int(font_size);
snprintf( spare, 255, "%3d", nsoption_int(font_size) );
set_text( CHOICES_EDIT_DEF_FONT_SIZE, spare , 3 );
+
+ set_text(CHOICES_BT_TOOLBAR_ICONSET,
+ nsoption_charp(atari_image_toolbar_folder), LABEL_ICONSET_MAX_LEN);
+
+ tmp_option_atari_toolbar_bg = nsoption_int(atari_toolbar_bg);
+ snprintf( spare, 255, "%2d", tmp_option_atari_toolbar_bg);
+ set_text( CHOICES_BT_TOOLBAR_BGCOLOR, spare , 2 );
/* Only first tab is refreshed: */
ObjcDraw( OC_FORM, dlgwin, CHOICES_TAB_BROWSER, 4 );
@@ -628,6 +741,10 @@
/* "Style" tab: */
nsoption_set_int(font_min_size, tmp_option_font_min_size);
nsoption_set_int(font_size, tmp_option_font_size);
+ nsoption_set_int(atari_toolbar_bg, tmp_option_atari_toolbar_bg);
+ nsoption_set_charp(atari_image_toolbar_folder,
+ ObjcString( dlgtree, CHOICES_BT_TOOLBAR_ICONSET, NULL)
+ );
/* "Rendering" tab: */
nsoption_set_charp(atari_font_driver,
10 years, 7 months
r13983 mono - in /trunk/netsurf/atari/res: netsurf.rsc netsurf.rsh netsurf.rsm
by netsurf＠semichrome.net
Author: mono
Date: Fri Jun 22 19:14:17 2012
New Revision: 13983
URL: http://source.netsurf-browser.org?rev=13983&view=rev
Log:
Added new toolbar options.
Modified:
trunk/netsurf/atari/res/netsurf.rsc
trunk/netsurf/atari/res/netsurf.rsh
trunk/netsurf/atari/res/netsurf.rsm
Modified: trunk/netsurf/atari/res/netsurf.rsc
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/res/netsurf.rsc?rev...
==============================================================================
Binary files - no diff available.
Modified: trunk/netsurf/atari/res/netsurf.rsh
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/res/netsurf.rsh?rev...
==============================================================================
--- trunk/netsurf/atari/res/netsurf.rsh (original)
+++ trunk/netsurf/atari/res/netsurf.rsh Fri Jun 22 19:14:17 2012
@@ -140,58 +140,78 @@
#define CHOICES_EDIT_MIN_FONT_SIZE 16 /* FTEXT in tree CHOICES */
#define CHOICES_DEC_MIN_FONT_SIZE 17 /* BOXCHAR in tree CHOICES */
#define CHOICES_INC_MIN_FONT_SIZE 18 /* BOXCHAR in tree CHOICES */
-#define CHOICES_TAB_RENDER 19 /* BUTTON in tree CHOICES */
+#define CHOICES_BT_TOOLBAR_BGCOLOR 21 /* BOXTEXT in tree CHOICES */
+#define CHOICES_BT_TOOLBAR_ICONSET 109 /* BUTTON in tree CHOICES */
+#define CHOICES_TAB_RENDER 24 /* BUTTON in tree CHOICES */
/* Make sure that initial value is large enough! */
-#define CHOICES_BT_SEL_FONT_RENDERER 20 /* BUTTON in tree CHOICES */
-#define CHOICES_CB_TRANSPARENCY 22 /* BUTTON in tree CHOICES */
-#define CHOICES_CB_ENABLE_ANIMATION 24 /* BUTTON in tree CHOICES */
-#define CHOICES_EDIT_MIN_GIF_DELAY 27 /* FTEXT in tree CHOICES */
-#define CHOICES_DEC_GIF_DELAY 28 /* BOXCHAR in tree CHOICES */
-#define CHOICES_INC_GIF_DELAY 29 /* BOXCHAR in tree CHOICES */
-#define CHOICES_CB_INCREMENTAL_REFLOW 31 /* BUTTON in tree CHOICES */
-#define CHOICES_EDIT_MIN_REFLOW_PERIOD 33 /* FTEXT in tree CHOICES */
-#define CHOICES_DEC_INCREMENTAL_REFLOW 34 /* BOXCHAR in tree CHOICES */
-#define CHOICES_INC_INCREMENTAL_REFLOW 35 /* BOXCHAR in tree CHOICES */
-#define CHOICES_CB_ANTI_ALIASING 102 /* BUTTON in tree CHOICES */
-#define CHOICES_TAB_PATH 37 /* BUTTON in tree CHOICES */
-#define CHOICES_EDIT_CA_CERTS_PATH 42 /* FTEXT in tree CHOICES */
-#define CHOICES_EDIT_DOWNLOAD_PATH 43 /* FTEXT in tree CHOICES */
-#define CHOICES_EDIT_HOTLIST_FILE 44 /* FTEXT in tree CHOICES */
-#define CHOICES_EDIT_CA_BUNDLE 45 /* FTEXT in tree CHOICES */
-#define CHOICES_EDIT_EDITOR 46 /* FTEXT in tree CHOICES */
-#define CHOICES_TAB_CACHE 48 /* BUTTON in tree CHOICES */
-#define CHOICES_INC_MEM_CACHE 52 /* BOXCHAR in tree CHOICES */
-#define CHOICES_DEC_MEM_CACHE 53 /* BOXCHAR in tree CHOICES */
-#define CHOICES_STR_MAX_MEM_CACHE 54 /* STRING in tree CHOICES */
-#define CHOICES_TAB_BROWSER 55 /* BUTTON in tree CHOICES */
-#define CHOICES_CB_HIDE_ADVERTISEMENT 57 /* BUTTON in tree CHOICES */
-#define CHOICES_CB_DISABLE_POPUP_WINDOWS 58 /* BUTTON in tree CHOICES */
-#define CHOICES_CB_SEND_DO_NOT_TRACK 103 /* BUTTON in tree CHOICES */
-#define CHOICES_BT_SEL_LOCALE 60 /* BUTTON in tree CHOICES */
-#define CHOICES_BT_GUI_LANG 63 /* BUTTON in tree CHOICES */
-#define CHOICES_EDIT_HISTORY_AGE 66 /* FTEXT in tree CHOICES */
-#define CHOICES_DEC_HISTORY_AGE 67 /* BOXCHAR in tree CHOICES */
-#define CHOICES_INC_HISTORY_AGE 68 /* BOXCHAR in tree CHOICES */
-#define CHOICES_CB_SEND_HTTP_REFERRER 72 /* BUTTON in tree CHOICES */
-#define CHOICES_EDIT_HOMEPAGE 73 /* FTEXT in tree CHOICES */
-#define CHOICES_BT_CLEAR_HISTORY 74 /* BUTTON in tree CHOICES */
-#define CHOICES_TAB_NETWORK 75 /* BUTTON in tree CHOICES */
-#define CHOICES_CB_USE_PROXY 77 /* BUTTON in tree CHOICES */
-#define CHOICES_EDIT_PROXY_HOST 78 /* FTEXT in tree CHOICES */
-#define CHOICES_CB_PROXY_AUTH 79 /* BUTTON in tree CHOICES */
-#define CHOICES_EDIT_PROXY_USERNAME 80 /* FTEXT in tree CHOICES */
-#define CHOICES_EDIT_PROXY_PASSWORD 81 /* FTEXT in tree CHOICES */
-#define CHOICES_EDIT_PROXY_PORT 83 /* FTEXT in tree CHOICES */
-#define CHOICES_INC_MAX_FETCHERS_PER_HOST 88 /* BOXCHAR in tree CHOICES */
-#define CHOICES_INC_CACHED_CONNECTIONS 89 /* BOXCHAR in tree CHOICES */
-#define CHOICES_DEC_MAX_FETCHERS_PER_HOST 90 /* BOXCHAR in tree CHOICES */
-#define CHOICES_DEC_CACHED_CONNECTIONS 91 /* BOXCHAR in tree CHOICES */
-#define CHOICES_EDIT_MAX_FETCHERS_PER_HOST 92 /* FTEXT in tree CHOICES */
-#define CHOICES_EDIT_MAX_CACHED_CONNECTIONS 93 /* FTEXT in tree CHOICES */
-#define CHOICES_EDIT_MAX_FETCHERS 95 /* FTEXT in tree CHOICES */
-#define CHOICES_DEC_MAX_FETCHERS 96 /* BOXCHAR in tree CHOICES */
-#define CHOICES_INC_MAX_FETCHERS 97 /* BOXCHAR in tree CHOICES */
-#define CHOICES_CB_FG_IMAGES 100 /* BUTTON in tree CHOICES */
-#define CHOICES_CB_BG_IMAGES 101 /* BUTTON in tree CHOICES */
-#define CHOICES_ABORT 98 /* BUTTON in tree CHOICES */
-#define CHOICES_OK 99 /* BUTTON in tree CHOICES */
+#define CHOICES_BT_SEL_FONT_RENDERER 25 /* BUTTON in tree CHOICES */
+#define CHOICES_CB_TRANSPARENCY 27 /* BUTTON in tree CHOICES */
+#define CHOICES_CB_ENABLE_ANIMATION 29 /* BUTTON in tree CHOICES */
+#define CHOICES_EDIT_MIN_GIF_DELAY 32 /* FTEXT in tree CHOICES */
+#define CHOICES_DEC_GIF_DELAY 33 /* BOXCHAR in tree CHOICES */
+#define CHOICES_INC_GIF_DELAY 34 /* BOXCHAR in tree CHOICES */
+#define CHOICES_CB_INCREMENTAL_REFLOW 36 /* BUTTON in tree CHOICES */
+#define CHOICES_EDIT_MIN_REFLOW_PERIOD 38 /* FTEXT in tree CHOICES */
+#define CHOICES_DEC_INCREMENTAL_REFLOW 39 /* BOXCHAR in tree CHOICES */
+#define CHOICES_INC_INCREMENTAL_REFLOW 40 /* BOXCHAR in tree CHOICES */
+#define CHOICES_CB_ANTI_ALIASING 42 /* BUTTON in tree CHOICES */
+#define CHOICES_TAB_PATH 43 /* BUTTON in tree CHOICES */
+#define CHOICES_EDIT_CA_CERTS_PATH 48 /* FTEXT in tree CHOICES */
+#define CHOICES_EDIT_DOWNLOAD_PATH 49 /* FTEXT in tree CHOICES */
+#define CHOICES_EDIT_HOTLIST_FILE 50 /* FTEXT in tree CHOICES */
+#define CHOICES_EDIT_CA_BUNDLE 51 /* FTEXT in tree CHOICES */
+#define CHOICES_EDIT_EDITOR 52 /* FTEXT in tree CHOICES */
+#define CHOICES_TAB_CACHE 54 /* BUTTON in tree CHOICES */
+#define CHOICES_INC_MEM_CACHE 58 /* BOXCHAR in tree CHOICES */
+#define CHOICES_DEC_MEM_CACHE 59 /* BOXCHAR in tree CHOICES */
+#define CHOICES_STR_MAX_MEM_CACHE 60 /* STRING in tree CHOICES */
+#define CHOICES_TAB_BROWSER 61 /* BUTTON in tree CHOICES */
+#define CHOICES_CB_HIDE_ADVERTISEMENT 63 /* BUTTON in tree CHOICES */
+#define CHOICES_CB_DISABLE_POPUP_WINDOWS 64 /* BUTTON in tree CHOICES */
+#define CHOICES_CB_SEND_DO_NOT_TRACK 65 /* BUTTON in tree CHOICES */
+#define CHOICES_BT_SEL_LOCALE 67 /* BUTTON in tree CHOICES */
+#define CHOICES_BT_GUI_LANG 70 /* BUTTON in tree CHOICES */
+#define CHOICES_EDIT_HISTORY_AGE 73 /* FTEXT in tree CHOICES */
+#define CHOICES_DEC_HISTORY_AGE 74 /* BOXCHAR in tree CHOICES */
+#define CHOICES_INC_HISTORY_AGE 75 /* BOXCHAR in tree CHOICES */
+#define CHOICES_CB_SEND_HTTP_REFERRER 79 /* BUTTON in tree CHOICES */
+#define CHOICES_EDIT_HOMEPAGE 80 /* FTEXT in tree CHOICES */
+#define CHOICES_BT_CLEAR_HISTORY 81 /* BUTTON in tree CHOICES */
+#define CHOICES_TAB_NETWORK 82 /* BUTTON in tree CHOICES */
+#define CHOICES_CB_USE_PROXY 84 /* BUTTON in tree CHOICES */
+#define CHOICES_EDIT_PROXY_HOST 85 /* FTEXT in tree CHOICES */
+#define CHOICES_CB_PROXY_AUTH 86 /* BUTTON in tree CHOICES */
+#define CHOICES_EDIT_PROXY_USERNAME 87 /* FTEXT in tree CHOICES */
+#define CHOICES_EDIT_PROXY_PASSWORD 88 /* FTEXT in tree CHOICES */
+#define CHOICES_EDIT_PROXY_PORT 90 /* FTEXT in tree CHOICES */
+#define CHOICES_INC_MAX_FETCHERS_PER_HOST 95 /* BOXCHAR in tree CHOICES */
+#define CHOICES_INC_CACHED_CONNECTIONS 96 /* BOXCHAR in tree CHOICES */
+#define CHOICES_DEC_MAX_FETCHERS_PER_HOST 97 /* BOXCHAR in tree CHOICES */
+#define CHOICES_DEC_CACHED_CONNECTIONS 98 /* BOXCHAR in tree CHOICES */
+#define CHOICES_EDIT_MAX_FETCHERS_PER_HOST 99 /* FTEXT in tree CHOICES */
+#define CHOICES_EDIT_MAX_CACHED_CONNECTIONS 100 /* FTEXT in tree CHOICES */
+#define CHOICES_EDIT_MAX_FETCHERS 102 /* FTEXT in tree CHOICES */
+#define CHOICES_DEC_MAX_FETCHERS 103 /* BOXCHAR in tree CHOICES */
+#define CHOICES_INC_MAX_FETCHERS 104 /* BOXCHAR in tree CHOICES */
+#define CHOICES_CB_FG_IMAGES 105 /* BUTTON in tree CHOICES */
+#define CHOICES_CB_BG_IMAGES 106 /* BUTTON in tree CHOICES */
+#define CHOICES_ABORT 107 /* BUTTON in tree CHOICES */
+#define CHOICES_OK 108 /* BUTTON in tree CHOICES */
+
+#define POP_COLOR 14 /* form/dial */
+#define POP_COLOR_WHITE 1 /* BOXCHAR in tree POP_COLOR */
+#define POP_COLOR_BLACK 2 /* BOXCHAR in tree POP_COLOR */
+#define POP_COLOR_RED 3 /* BOXCHAR in tree POP_COLOR */
+#define POP_COLOR_GREEN 4 /* BOXCHAR in tree POP_COLOR */
+#define POP_COLOR_BLUE 5 /* BOXCHAR in tree POP_COLOR */
+#define POP_COLOR_CYAN 6 /* BOXCHAR in tree POP_COLOR */
+#define POP_COLOR_YELLOW 7 /* BOXCHAR in tree POP_COLOR */
+#define POP_COLOR_MAGENTA 8 /* BOXCHAR in tree POP_COLOR */
+#define POP_COLOR_LWHITE 9 /* BOXCHAR in tree POP_COLOR */
+#define POP_COLOR_DWHITE 10 /* BOXCHAR in tree POP_COLOR */
+#define POP_COLOR_DRED 11 /* BOXCHAR in tree POP_COLOR */
+#define POP_COLOR_DGREEN 12 /* BOXCHAR in tree POP_COLOR */
+#define POP_COLOR_DBLUE 13 /* BOXCHAR in tree POP_COLOR */
+#define POP_COLOR_DCYAN 14 /* BOXCHAR in tree POP_COLOR */
+#define POP_COLOR_DYELLOW 15 /* BOXCHAR in tree POP_COLOR */
+#define POP_COLOR_DMAGENTA 16 /* BOXCHAR in tree POP_COLOR */
Modified: trunk/netsurf/atari/res/netsurf.rsm
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/res/netsurf.rsm?rev...
==============================================================================
--- trunk/netsurf/atari/res/netsurf.rsm (original)
+++ trunk/netsurf/atari/res/netsurf.rsm Fri Jun 22 19:14:17 2012
@@ -1,9 +1,9 @@
ResourceMaster v3.65
-#C 14@0@0@0@
+#C 15@0@0@0@
#N 99@32@AZAaza___ _@AZAaza090___ _@@_@
#FoC-Header@rsm2out@C-Header@rsh@@@[C-Header@0@
#R 0@0@1@1@1@1@
-#M 20010100@0@7728@601@
+#M 20010100@0@7728@602@
#T 0@1@MAINMENU@@62@@
#O 4@32@T_FILE@@
#O 5@32@T_EDIT@@
@@ -117,7 +117,7 @@
#O 9@21@SAVE_AS@@
#O 10@21@VIEW_SOURCE@@
#O 11@21@SAVE_LINK_AS@@
-#T 13@2@CHOICES@@104@@
+#T 13@2@CHOICES@@110@@
#O 1@26@REG_BROWSER@@
#O 2@26@REG_RENDER@@
#O 3@26@REG_STYLE@@
@@ -131,58 +131,77 @@
#O 16@29@EDIT_MIN_FONT_SIZE@@
#O 17@27@DEC_MIN_FONT_SIZE@@
#O 18@27@INC_MIN_FONT_SIZE@@
-#O 19@26@TAB_RENDER@@
-#O 20@26@BT_SEL_FONT_RENDERER@Make sure that initial value is large enough!@
-#O 22@26@CB_TRANSPARENCY@@
-#O 24@26@CB_ENABLE_ANIMATION@@
-#O 27@29@EDIT_MIN_GIF_DELAY@@
-#O 28@27@DEC_GIF_DELAY@@
-#O 29@27@INC_GIF_DELAY@@
-#O 31@26@CB_INCREMENTAL_REFLOW@@
-#O 33@29@EDIT_MIN_REFLOW_PERIOD@@
-#O 34@27@DEC_INCREMENTAL_REFLOW@@
-#O 35@27@INC_INCREMENTAL_REFLOW@@
-#O 102@26@CB_ANTI_ALIASING@@
-#O 37@26@TAB_PATH@@
-#O 42@29@EDIT_CA_CERTS_PATH@@
-#O 43@29@EDIT_DOWNLOAD_PATH@@
-#O 44@29@EDIT_HOTLIST_FILE@@
-#O 45@29@EDIT_CA_BUNDLE@@
-#O 46@29@EDIT_EDITOR@@
-#O 48@26@TAB_CACHE@@
-#O 52@27@INC_MEM_CACHE@@
-#O 53@27@DEC_MEM_CACHE@@
-#O 54@28@STR_MAX_MEM_CACHE@@
-#O 55@26@TAB_BROWSER@@
-#O 57@26@CB_HIDE_ADVERTISEMENT@@
-#O 58@26@CB_DISABLE_POPUP_WINDOWS@@
-#O 103@26@CB_SEND_DO_NOT_TRACK@@
-#O 60@26@BT_SEL_LOCALE@@
-#O 63@26@BT_GUI_LANG@@
-#O 66@29@EDIT_HISTORY_AGE@@
-#O 67@27@DEC_HISTORY_AGE@@
-#O 68@27@INC_HISTORY_AGE@@
-#O 72@26@CB_SEND_HTTP_REFERRER@@
-#O 73@29@EDIT_HOMEPAGE@@
-#O 74@26@BT_CLEAR_HISTORY@@
-#O 75@26@TAB_NETWORK@@
-#O 77@26@CB_USE_PROXY@@
-#O 78@29@EDIT_PROXY_HOST@@
-#O 79@26@CB_PROXY_AUTH@@
-#O 80@29@EDIT_PROXY_USERNAME@@
-#O 81@29@EDIT_PROXY_PASSWORD@@
-#O 83@29@EDIT_PROXY_PORT@@
-#O 88@27@INC_MAX_FETCHERS_PER_HOST@@
-#O 89@27@INC_CACHED_CONNECTIONS@@
-#O 90@27@DEC_MAX_FETCHERS_PER_HOST@@
-#O 91@27@DEC_CACHED_CONNECTIONS@@
-#O 92@29@EDIT_MAX_FETCHERS_PER_HOST@@
-#O 93@29@EDIT_MAX_CACHED_CONNECTIONS@@
-#O 95@29@EDIT_MAX_FETCHERS@@
-#O 96@27@DEC_MAX_FETCHERS@@
-#O 97@27@INC_MAX_FETCHERS@@
-#O 100@26@CB_FG_IMAGES@@
-#O 101@26@CB_BG_IMAGES@@
-#O 98@26@ABORT@@
-#O 99@26@OK@@
-#c 27495@
+#O 21@22@BT_TOOLBAR_BGCOLOR@@
+#O 109@26@BT_TOOLBAR_ICONSET@@
+#O 24@26@TAB_RENDER@@
+#O 25@26@BT_SEL_FONT_RENDERER@Make sure that initial value is large enough!@
+#O 27@26@CB_TRANSPARENCY@@
+#O 29@26@CB_ENABLE_ANIMATION@@
+#O 32@29@EDIT_MIN_GIF_DELAY@@
+#O 33@27@DEC_GIF_DELAY@@
+#O 34@27@INC_GIF_DELAY@@
+#O 36@26@CB_INCREMENTAL_REFLOW@@
+#O 38@29@EDIT_MIN_REFLOW_PERIOD@@
+#O 39@27@DEC_INCREMENTAL_REFLOW@@
+#O 40@27@INC_INCREMENTAL_REFLOW@@
+#O 42@26@CB_ANTI_ALIASING@@
+#O 43@26@TAB_PATH@@
+#O 48@29@EDIT_CA_CERTS_PATH@@
+#O 49@29@EDIT_DOWNLOAD_PATH@@
+#O 50@29@EDIT_HOTLIST_FILE@@
+#O 51@29@EDIT_CA_BUNDLE@@
+#O 52@29@EDIT_EDITOR@@
+#O 54@26@TAB_CACHE@@
+#O 58@27@INC_MEM_CACHE@@
+#O 59@27@DEC_MEM_CACHE@@
+#O 60@28@STR_MAX_MEM_CACHE@@
+#O 61@26@TAB_BROWSER@@
+#O 63@26@CB_HIDE_ADVERTISEMENT@@
+#O 64@26@CB_DISABLE_POPUP_WINDOWS@@
+#O 65@26@CB_SEND_DO_NOT_TRACK@@
+#O 67@26@BT_SEL_LOCALE@@
+#O 70@26@BT_GUI_LANG@@
+#O 73@29@EDIT_HISTORY_AGE@@
+#O 74@27@DEC_HISTORY_AGE@@
+#O 75@27@INC_HISTORY_AGE@@
+#O 79@26@CB_SEND_HTTP_REFERRER@@
+#O 80@29@EDIT_HOMEPAGE@@
+#O 81@26@BT_CLEAR_HISTORY@@
+#O 82@26@TAB_NETWORK@@
+#O 84@26@CB_USE_PROXY@@
+#O 85@29@EDIT_PROXY_HOST@@
+#O 86@26@CB_PROXY_AUTH@@
+#O 87@29@EDIT_PROXY_USERNAME@@
+#O 88@29@EDIT_PROXY_PASSWORD@@
+#O 90@29@EDIT_PROXY_PORT@@
+#O 95@27@INC_MAX_FETCHERS_PER_HOST@@
+#O 96@27@INC_CACHED_CONNECTIONS@@
+#O 97@27@DEC_MAX_FETCHERS_PER_HOST@@
+#O 98@27@DEC_CACHED_CONNECTIONS@@
+#O 99@29@EDIT_MAX_FETCHERS_PER_HOST@@
+#O 100@29@EDIT_MAX_CACHED_CONNECTIONS@@
+#O 102@29@EDIT_MAX_FETCHERS@@
+#O 103@27@DEC_MAX_FETCHERS@@
+#O 104@27@INC_MAX_FETCHERS@@
+#O 105@26@CB_FG_IMAGES@@
+#O 106@26@CB_BG_IMAGES@@
+#O 107@26@ABORT@@
+#O 108@26@OK@@
+#T 14@2@POP_COLOR@@17@@
+#O 1@27@WHITE@@
+#O 2@27@BLACK@@
+#O 3@27@RED@@
+#O 4@27@GREEN@@
+#O 5@27@BLUE@@
+#O 6@27@CYAN@@
+#O 7@27@YELLOW@@
+#O 8@27@MAGENTA@@
+#O 9@27@LWHITE@@
+#O 10@27@DWHITE@@
+#O 11@27@DRED@@
+#O 12@27@DGREEN@@
+#O 13@27@DBLUE@@
+#O 14@27@DCYAN@@
+#O 15@27@DYELLOW@@
+#O 16@27@DMAGENTA@@
+#c 4056@
10 years, 7 months
r13982 mono - in /trunk/netsurf/atari: options.h toolbar.c
by netsurf＠semichrome.net
Author: mono
Date: Thu Jun 21 17:57:31 2012
New Revision: 13982
URL: http://source.netsurf-browser.org?rev=13982&view=rev
Log:
Added toolbar image folder option.
Modified:
trunk/netsurf/atari/options.h
trunk/netsurf/atari/toolbar.c
Modified: trunk/netsurf/atari/options.h
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/options.h?rev=13982...
==============================================================================
--- trunk/netsurf/atari/options.h (original)
+++ trunk/netsurf/atari/options.h Thu Jun 21 17:57:31 2012
@@ -32,6 +32,7 @@
int atari_transparency; \
int atari_image_toolbar; \
int atari_toolbar_bg; \
+ char *atari_image_toolbar_folder; \
char *atari_face_sans_serif; /* default sans face */ \
char *atari_face_sans_serif_bold; /* bold sans face */ \
char *atari_face_sans_serif_italic; /* bold sans face */ \
@@ -48,28 +49,29 @@
char *hotlist_file; \
char *tree_icons_path
-#define NSOPTION_EXTRA_DEFAULTS \
- .atari_screen_driver = (char*)"vdi", \
- .atari_font_driver = (char*)"vdi", \
- .atari_font_monochrom = 0, \
- .atari_dither = 1, \
- .atari_transparency = 1, \
- .atari_image_toolbar = 0, \
- .atari_toolbar_bg = 8, \
- .atari_face_sans_serif = NULL, \
- .atari_face_sans_serif_bold = NULL, \
- .atari_face_sans_serif_italic = NULL, \
- .atari_face_sans_serif_italic_bold = NULL, \
- .atari_face_monospace = NULL, \
- .atari_face_monospace_bold = NULL, \
- .atari_face_serif = NULL, \
- .atari_face_serif_bold = NULL, \
- .atari_face_cursive = NULL, \
- .atari_face_fantasy = NULL, \
- .atari_editor = (char*)"", \
- .downloads_path = (char*)"", \
- .url_file = (char*)"url.db", \
- .hotlist_file = (char*)"hotlist", \
+#define NSOPTION_EXTRA_DEFAULTS \
+ .atari_screen_driver = (char*)"vdi", \
+ .atari_font_driver = (char*)"vdi", \
+ .atari_font_monochrom = 0, \
+ .atari_dither = 1, \
+ .atari_transparency = 1, \
+ .atari_image_toolbar_folder = (char*)"default", \
+ .atari_image_toolbar = 0, \
+ .atari_toolbar_bg = 8, \
+ .atari_face_sans_serif = NULL, \
+ .atari_face_sans_serif_bold = NULL, \
+ .atari_face_sans_serif_italic = NULL, \
+ .atari_face_sans_serif_italic_bold = NULL, \
+ .atari_face_monospace = NULL, \
+ .atari_face_monospace_bold = NULL, \
+ .atari_face_serif = NULL, \
+ .atari_face_serif_bold = NULL, \
+ .atari_face_cursive = NULL, \
+ .atari_face_fantasy = NULL, \
+ .atari_editor = (char*)"", \
+ .downloads_path = (char*)"", \
+ .url_file = (char*)"url.db", \
+ .hotlist_file = (char*)"hotlist", \
.tree_icons_path = (char*)"./res/icons"
#define NSOPTION_EXTRA_TABLE \
@@ -81,6 +83,7 @@
{ "atari_transparency", OPTION_INTEGER, &nsoptions.atari_transparency },\
{ "atari_dither", OPTION_INTEGER, &nsoptions.atari_dither },\
{ "atari_editor", OPTION_STRING, &nsoptions.atari_editor },\
+ { "atari_image_toolbar_folder", OPTION_STRING, &nsoptions.atari_image_toolbar_folder },\
{ "font_face_sans_serif", OPTION_STRING, &nsoptions.atari_face_sans_serif },\
{ "font_face_sans_serif_bold", OPTION_STRING, &nsoptions.atari_face_sans_serif_bold },\
{ "font_face_sans_serif_italic", OPTION_STRING, &nsoptions.atari_face_sans_serif_italic },\
Modified: trunk/netsurf/atari/toolbar.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/toolbar.c?rev=13982...
==============================================================================
--- trunk/netsurf/atari/toolbar.c (original)
+++ trunk/netsurf/atari/toolbar.c Thu Jun 21 17:57:31 2012
@@ -61,7 +61,7 @@
static OBJECT * toolbar_buttons = NULL;
static OBJECT * throbber_form = NULL;
static bool img_toolbar = false;
-static char * img_toolbar_folder = (char *)"default";
+static char * toolbar_image_folder = (char *)"default";
static short toolbar_bg_color = LWHITE;
static hlcache_handle * toolbar_image;
static hlcache_handle * throbber_image;
@@ -153,20 +153,26 @@
short vdicolor[3];
uint32_t rgbcolor;
+ toolbar_image_folder = nsoption_charp(atari_image_toolbar_folder);
toolbar_bg_color = MIN(15,nsoption_int(atari_toolbar_bg));
img_toolbar = (nsoption_int( atari_image_toolbar ) > 0 ) ? true : false;
if( img_toolbar ){
- char imgfile[PATH_MAX];
+ char imgfile[PATH_MAX];
+ const char * imgfiletmpl = "toolbar/%s/%s";
while( tb_buttons[i].rsc_id != 0){
tb_buttons[i].index = i;
i++;
}
- toolbar_image = load_icon( "toolbar/default/main.png",
+ snprintf( imgfile, PATH_MAX-1, imgfiletmpl, toolbar_image_folder,
+ "main.png" );
+ toolbar_image = load_icon( imgfile,
toolbar_icon_callback, NULL );
- throbber_image = load_icon( "toolbar/default/throbber.png",
- toolbar_icon_callback, NULL );
+ snprintf( imgfile, PATH_MAX-1, imgfiletmpl, toolbar_image_folder,
+ "throbber.png" );
+ throbber_image = load_icon( imgfile,
+ toolbar_icon_callback, NULL );
} else {
RsrcGaddr( h_gem_rsrc, R_TREE, TOOLBAR, &toolbar_buttons );
@@ -181,7 +187,7 @@
for( i=0; i<n; i++ ){
toolbar_styles[i].bgcolor = toolbar_bg_color;
if( img_toolbar ){
- vq_color( vdih, toolbar_styles[i].bgcolor, 0, vdicolor );
+ vq_color( vdih, toolbar_bg_color, 0, vdicolor );
vdi1000_to_rgb( vdicolor, (unsigned char*)&rgbcolor );
toolbar_styles[i].icon_bgcolor = rgbcolor;
}
10 years, 7 months
r13981 mono - in /trunk/netsurf/atari: toolbar.c toolbar.h
by netsurf＠semichrome.net
Author: mono
Date: Thu Jun 21 17:01:41 2012
New Revision: 13981
URL: http://source.netsurf-browser.org?rev=13981&view=rev
Log:
apply background color option and removed unused struct member of struct s_tb_button.
Modified:
trunk/netsurf/atari/toolbar.c
trunk/netsurf/atari/toolbar.h
Modified: trunk/netsurf/atari/toolbar.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/toolbar.c?rev=13981...
==============================================================================
--- trunk/netsurf/atari/toolbar.c (original)
+++ trunk/netsurf/atari/toolbar.c Thu Jun 21 17:01:41 2012
@@ -85,7 +85,6 @@
{
TOOLBAR_BT_BACK,
tb_back_click,
- "toolbar/%s/bck_%s.png",
0,
{0,0},
0, 0, 0
@@ -93,13 +92,11 @@
{
TOOLBAR_BT_HOME,
tb_home_click,
- "toolbar/%s/hme_%s.png",
0, {0,0}, 0, 0, 0
},
{
TOOLBAR_BT_FORWARD,
tb_forward_click,
- "toolbar/%s/fwd_%s.png",
0,
{0,0},
0, 0, 0
@@ -107,7 +104,6 @@
{
TOOLBAR_BT_STOP,
tb_stop_click,
- "toolbar/%s/stp_%s.png",
0,
{0,0},
0, 0, 0
@@ -115,12 +111,11 @@
{
TOOLBAR_BT_RELOAD,
tb_reload_click,
- "toolbar/%s/rld_%s.png",
0,
{0,0},
0, 0, 0
},
- { 0, 0, 0, 0, {0,0}, 0, 0, -1 }
+ { 0, 0, 0, {0,0}, 0, 0, -1 }
};
struct s_toolbar_style {
@@ -158,6 +153,7 @@
short vdicolor[3];
uint32_t rgbcolor;
+ toolbar_bg_color = MIN(15,nsoption_int(atari_toolbar_bg));
img_toolbar = (nsoption_int( atari_image_toolbar ) > 0 ) ? true : false;
if( img_toolbar ){
@@ -576,9 +572,15 @@
/* TODO: recognize click + shift key */
int mstate = BROWSER_MOUSE_PRESS_1;
if( (kstat & (K_LSHIFT|K_RSHIFT)) != 0 )
- mstate = BROWSER_MOUSE_MOD_1;
- textarea_mouse_action( tb->url.textarea,
- BROWSER_MOUSE_PRESS_1, mx, my );
+ mstate = BROWSER_MOUSE_MOD_1;
+ if( evnt.nb_click == 2 ){
+ textarea_mouse_action( tb->url.textarea,
+ BROWSER_MOUSE_DOUBLE_CLICK | BROWSER_MOUSE_CLICK_1,
+ mx, my );
+ } else {
+ textarea_mouse_action( tb->url.textarea,
+ BROWSER_MOUSE_PRESS_1, mx, my );
+ }
}
}
// TODO: do not send an complete redraw!
Modified: trunk/netsurf/atari/toolbar.h
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/toolbar.h?rev=13981...
==============================================================================
--- trunk/netsurf/atari/toolbar.h (original)
+++ trunk/netsurf/atari/toolbar.h Thu Jun 21 17:01:41 2012
@@ -44,8 +44,7 @@
struct s_tb_button
{
short rsc_id;
- void (*cb_click)(struct gui_window * gw);
- const char * iconfile;
+ void (*cb_click)(struct gui_window * gw);
COMPONENT * comp;
hlcache_handle * icon[TOOLBAR_BUTTON_NUM_STATES];
struct gui_window * gw;
10 years, 7 months
r13980 mono - /trunk/netsurf/atari/options.h
by netsurf＠semichrome.net
Author: mono
Date: Thu Jun 21 17:00:42 2012
New Revision: 13980
URL: http://source.netsurf-browser.org?rev=13980&view=rev
Log:
added new options "atari_toolbar_bg".
Modified:
trunk/netsurf/atari/options.h
Modified: trunk/netsurf/atari/options.h
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/options.h?rev=13980...
==============================================================================
--- trunk/netsurf/atari/options.h (original)
+++ trunk/netsurf/atari/options.h Thu Jun 21 17:00:42 2012
@@ -31,6 +31,7 @@
int atari_dither; \
int atari_transparency; \
int atari_image_toolbar; \
+ int atari_toolbar_bg; \
char *atari_face_sans_serif; /* default sans face */ \
char *atari_face_sans_serif_bold; /* bold sans face */ \
char *atari_face_sans_serif_italic; /* bold sans face */ \
@@ -54,6 +55,7 @@
.atari_dither = 1, \
.atari_transparency = 1, \
.atari_image_toolbar = 0, \
+ .atari_toolbar_bg = 8, \
.atari_face_sans_serif = NULL, \
.atari_face_sans_serif_bold = NULL, \
.atari_face_sans_serif_italic = NULL, \
@@ -75,6 +77,7 @@
{ "atari_font_driver", OPTION_STRING, &nsoptions.atari_font_driver },\
{ "atari_font_monochrom", OPTION_INTEGER, &nsoptions.atari_font_monochrom },\
{ "atari_image_toolbar", OPTION_INTEGER, &nsoptions.atari_image_toolbar },\
+ { "atari_toolbar_bg", OPTION_INTEGER, &nsoptions.atari_toolbar_bg },\
{ "atari_transparency", OPTION_INTEGER, &nsoptions.atari_transparency },\
{ "atari_dither", OPTION_INTEGER, &nsoptions.atari_dither },\
{ "atari_editor", OPTION_STRING, &nsoptions.atari_editor },\
10 years, 7 months
r13979 mono - /trunk/netsurf/atari/settings.c
by netsurf＠semichrome.net
Author: mono
Date: Thu Jun 21 16:51:43 2012
New Revision: 13979
URL: http://source.netsurf-browser.org?rev=13979&view=rev
Log:
Handle do not trackoption and fix a call to snprintf().
Modified:
trunk/netsurf/atari/settings.c
Modified: trunk/netsurf/atari/settings.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/settings.c?rev=1397...
==============================================================================
--- trunk/netsurf/atari/settings.c (original)
+++ trunk/netsurf/atari/settings.c Thu Jun 21 16:51:43 2012
@@ -464,7 +464,7 @@
static void toggle_objects( void )
{
- // enable / disable objects depending on radio button values.
+ /* enable / disable (refresh) objects depending on radio button values: */
FORMEVENT(CHOICES_CB_USE_PROXY);
FORMEVENT(CHOICES_CB_PROXY_AUTH);
FORMEVENT(CHOICES_BT_SEL_FONT_RENDERER);
@@ -495,6 +495,11 @@
OBJ_CHECK( CHOICES_CB_SEND_HTTP_REFERRER );
} else {
OBJ_UNCHECK( CHOICES_CB_SEND_HTTP_REFERRER );
+ }
+ if( nsoption_bool(do_not_track) ){
+ OBJ_CHECK( CHOICES_CB_SEND_DO_NOT_TRACK );
+ } else {
+ OBJ_UNCHECK( CHOICES_CB_SEND_DO_NOT_TRACK );
}
set_text( CHOICES_BT_SEL_LOCALE,
@@ -578,7 +583,7 @@
/* "Style" tab: */
tmp_option_font_min_size = nsoption_int(font_min_size);
- snprintf( spare, "%3d", nsoption_int(font_min_size) );
+ snprintf( spare, 255, "%3d", nsoption_int(font_min_size) );
set_text( CHOICES_EDIT_MIN_FONT_SIZE, spare , 3 );
tmp_option_font_size = nsoption_int(font_size);
@@ -668,6 +673,8 @@
atoi(ObjcString( dlgtree, CHOICES_EDIT_HISTORY_AGE, NULL)));
nsoption_set_bool(send_referer,
OBJ_SELECTED(CHOICES_CB_SEND_HTTP_REFERRER));
+ nsoption_set_bool(do_not_track,
+ OBJ_SELECTED(CHOICES_CB_SEND_HTTP_REFERRER));
nsoption_set_charp(homepage_url,
ObjcString( dlgtree, CHOICES_EDIT_HOMEPAGE, NULL));
}
10 years, 7 months
r13978 vince - /trunk/netsurf/content/content_type.h
by netsurf＠semichrome.net
Author: vince
Date: Wed Jun 20 04:05:24 2012
New Revision: 13978
URL: http://source.netsurf-browser.org?rev=13978&view=rev
Log:
fix theme comment
fix CONTENT_ANY mask missing the script entry
Modified:
trunk/netsurf/content/content_type.h
Modified: trunk/netsurf/content/content_type.h
URL: http://source.netsurf-browser.org/trunk/netsurf/content/content_type.h?re...
==============================================================================
--- trunk/netsurf/content/content_type.h (original)
+++ trunk/netsurf/content/content_type.h Wed Jun 20 04:05:24 2012
@@ -42,7 +42,7 @@
/** Navigator API Plugins */
CONTENT_PLUGIN = 0x10,
- /** Themes (only GTK) */
+ /** Themes (only GTK and RISC OS) */
CONTENT_THEME = 0x20,
/** Javascript */
@@ -51,7 +51,7 @@
CONTENT_SCRIPT = 0x40,
/** Any content matches */
- CONTENT_ANY = 0x3f
+ CONTENT_ANY = 0x7f
} content_type;
10 years, 7 months
r13977 mono - in /trunk/netsurf/atari: gui.c history.c history.h hotlist.h
by netsurf＠semichrome.net
Author: mono
Date: Tue Jun 19 18:46:57 2012
New Revision: 13977
URL: http://source.netsurf-browser.org?rev=13977&view=rev
Log:
fix history redraw by calling the window specific redraw function from gui_poll(), also switch hotlist redraw to to hotlist specific redraw function.
Modified:
trunk/netsurf/atari/gui.c
trunk/netsurf/atari/history.c
trunk/netsurf/atari/history.h
trunk/netsurf/atari/hotlist.h
Modified: trunk/netsurf/atari/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/gui.c?rev=13977&r1=...
==============================================================================
--- trunk/netsurf/atari/gui.c (original)
+++ trunk/netsurf/atari/gui.c Tue Jun 19 18:46:57 2012
@@ -65,7 +65,8 @@
#include "atari/statusbar.h"
#include "atari/toolbar.h"
#include "atari/verify_ssl.h"
-#include "atari/hotlist.h"
+#include "atari/hotlist.h"
+#include "atari/history.h"
#include "atari/login.h"
#include "atari/global_evnt.h"
#include "atari/encoding.h"
@@ -149,7 +150,8 @@
if( evnt.timer != 0 && !active ){
/* this suits for stuff with lower priority */
/* TBD: really be spare on redraws??? */
- atari_treeview_redraw( hl.tv );
+ hotlist_redraw();
+ global_history_redraw();
}
}
Modified: trunk/netsurf/atari/history.c
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/history.c?rev=13977...
==============================================================================
--- trunk/netsurf/atari/history.c (original)
+++ trunk/netsurf/atari/history.c Tue Jun 19 18:46:57 2012
@@ -39,15 +39,7 @@
extern char * tree_directory_icon_name;
-struct s_atari_global_history {
- WINDOW * window;
- NSTREEVIEW tv; /*< The history treeview handle. */
- bool open;
- bool init;
-};
-
-static struct s_atari_global_history gl_history;
-
+struct s_atari_global_history gl_history;
void global_history_add_recent( const char *url )
Modified: trunk/netsurf/atari/history.h
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/history.h?rev=13977...
==============================================================================
--- trunk/netsurf/atari/history.h (original)
+++ trunk/netsurf/atari/history.h Tue Jun 19 18:46:57 2012
@@ -24,9 +24,25 @@
#include "desktop/tree.h"
#include "atari/treeview.h"
+struct s_atari_global_history {
+ WINDOW * window;
+ NSTREEVIEW tv; /*< The history treeview handle. */
+ bool open;
+ bool init;
+};
+
+extern struct s_atari_global_history gl_history;
+
bool global_history_init( void );
void global_history_destroy( void );
void global_history_open( void );
void global_history_close( void );
+inline void global_history_redraw( void );
+inline void global_history_redraw( void )
+{
+ atari_treeview_redraw( gl_history.tv );
+}
+
+
#endif
Modified: trunk/netsurf/atari/hotlist.h
URL: http://source.netsurf-browser.org/trunk/netsurf/atari/hotlist.h?rev=13977...
==============================================================================
--- trunk/netsurf/atari/hotlist.h (original)
+++ trunk/netsurf/atari/hotlist.h Tue Jun 19 18:46:57 2012
@@ -39,11 +39,11 @@
void hotlist_close( void );
void hotlist_destroy( void );
void atari_hotlist_add_page( const char * url, const char * title );
-
+
inline void hotlist_redraw( void );
inline void hotlist_redraw( void )
{
atari_treeview_redraw( hl.tv );
}
-#endif
+#endif
10 years, 7 months
r13976 vince - in /trunk/netsurf/javascript: content.c content.h jsapi.c
by netsurf＠semichrome.net
Author: vince
Date: Tue Jun 19 18:21:15 2012
New Revision: 13976
URL: http://source.netsurf-browser.org?rev=13976&view=rev
Log:
ensure javascript content handler is initialised
Added:
trunk/netsurf/javascript/content.h
Modified:
trunk/netsurf/javascript/content.c
trunk/netsurf/javascript/jsapi.c
Modified: trunk/netsurf/javascript/content.c
URL: http://source.netsurf-browser.org/trunk/netsurf/javascript/content.c?rev=...
==============================================================================
--- trunk/netsurf/javascript/content.c (original)
+++ trunk/netsurf/javascript/content.c Tue Jun 19 18:21:15 2012
@@ -24,16 +24,15 @@
#include <string.h>
#include <stdbool.h>
#include <stdlib.h>
-#include <libnsbmp.h>
#include "utils/config.h"
#include "content/content_protected.h"
#include "content/hlcache.h"
-#include "desktop/plotters.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/talloc.h"
#include "utils/utils.h"
+#include "javascript/content.h"
typedef struct javascript_content {
struct content base;
Added: trunk/netsurf/javascript/content.h
URL: http://source.netsurf-browser.org/trunk/netsurf/javascript/content.h?rev=...
==============================================================================
--- trunk/netsurf/javascript/content.h (added)
+++ trunk/netsurf/javascript/content.h Tue Jun 19 18:21:15 2012
@@ -1,0 +1,1 @@
+nserror javascript_init(void);
Modified: trunk/netsurf/javascript/jsapi.c
URL: http://source.netsurf-browser.org/trunk/netsurf/javascript/jsapi.c?rev=13...
==============================================================================
--- trunk/netsurf/javascript/jsapi.c (original)
+++ trunk/netsurf/javascript/jsapi.c Tue Jun 19 18:21:15 2012
@@ -19,6 +19,7 @@
#include "mozjs/jsapi.h"
#include "content/content.h"
+#include "javascript/content.h"
#include "javascript/jsapi.h"
#include "javascript/js.h"
@@ -36,6 +37,9 @@
rt = JS_NewRuntime(8L * 1024L * 1024L);
LOG(("New runtime handle %p", rt));
+
+ /* register script content handler */
+ javascript_init();
}
void js_finalise(void)
10 years, 7 months