From 2e91d4e17eea238281451532437e7447bfd4f0bf Mon Sep 17 00:00:00 2001 From: Ole Loots Date: Tue, 22 Jan 2013 01:21:24 +0100 Subject: Do not redraw textarea background. --- atari/gemtk/gemtk.h | 2 +- atari/gemtk/objc.c | 2 +- atari/misc.c | 2 +- atari/res/netsurf.rsc | Bin 34570 -> 34578 bytes atari/res/netsurf.rsh | 2 +- atari/res/netsurf.rsm | 6 +++--- atari/toolbar.c | 25 ++++++++++++++++++------- 7 files changed, 25 insertions(+), 14 deletions(-) diff --git a/atari/gemtk/gemtk.h b/atari/gemtk/gemtk.h index e31fc8ea1..679858af3 100644 --- a/atari/gemtk/gemtk.h +++ b/atari/gemtk/gemtk.h @@ -248,5 +248,5 @@ char *get_text(OBJECT * tree, short idx); GRECT * obj_screen_rect(OBJECT * tree, short obj); bool obj_is_inside(OBJECT * tree, short obj, GRECT *area); OBJECT *get_tree(int idx); -void obj_mouse_sprite(OBJECT *tree, int index); +void gemtk_obj_mouse_sprite(OBJECT *tree, int index); #endif // GEMTK_H_INCLUDED diff --git a/atari/gemtk/objc.c b/atari/gemtk/objc.c index 3221fdae6..05844388a 100644 --- a/atari/gemtk/objc.c +++ b/atari/gemtk/objc.c @@ -125,7 +125,7 @@ GRECT * obj_screen_rect(OBJECT * tree, short obj) } -void obj_mouse_sprite(OBJECT *tree, int index) +void gemtk_obj_mouse_sprite(OBJECT *tree, int index) { MFORM mform; int dum; diff --git a/atari/misc.c b/atari/misc.c index d339379db..d5837d7bd 100755 --- a/atari/misc.c +++ b/atari/misc.c @@ -323,7 +323,7 @@ void gem_set_cursor( MFORM_EX * cursor ) if( flags == cursor->flags && number == cursor->number ) return; if( cursor->flags & MFORM_EX_FLAG_USERFORM ) { - obj_mouse_sprite(cursor->tree, cursor->number); + gemtk_obj_mouse_sprite(cursor->tree, cursor->number); } else { graf_mouse(cursor->number, NULL ); } diff --git a/atari/res/netsurf.rsc b/atari/res/netsurf.rsc index 3ccd22d45..64a8e35a6 100755 Binary files a/atari/res/netsurf.rsc and b/atari/res/netsurf.rsc differ diff --git a/atari/res/netsurf.rsh b/atari/res/netsurf.rsh index 7fe6bc9b4..268aff523 100755 --- a/atari/res/netsurf.rsh +++ b/atari/res/netsurf.rsh @@ -56,7 +56,7 @@ #define TOOLBAR_BT_FORWARD 14 /* CICON in tree TOOLBAR */ #define TOOLBAR_BT_STOP 15 /* CICON in tree TOOLBAR */ #define TOOLBAR_BT_RELOAD 16 /* CICON in tree TOOLBAR */ -#define TOOLBAR_AREA_URL 17 /* BOX in tree TOOLBAR */ +#define TOOLBAR_AREA_URL 17 /* USERDEF in tree TOOLBAR */ #define TOOLBAR_THROBBER_AREA 18 /* BOX in tree TOOLBAR */ #define ICONIFY 2 /* form/dial */ diff --git a/atari/res/netsurf.rsm b/atari/res/netsurf.rsm index 08f98288c..189c6001f 100755 --- a/atari/res/netsurf.rsm +++ b/atari/res/netsurf.rsm @@ -3,7 +3,7 @@ ResourceMaster v3.65 #N 99@32@AZAaza___ _@AZAaza090___ _@@_@ #FoC-Header@rsm2out@C-Header@rsh@@@[C-Header@0@ #R 0@0@1@1@2@1@ -#M 20010100@0@7728@639@ +#M 20010100@0@7728@640@ #T 0@1@MAINMENU@@62@@ #O 4@32@T_FILE@@ #O 5@32@T_EDIT@@ @@ -59,7 +59,7 @@ ResourceMaster v3.65 #O 14@33@BT_FORWARD@@ #O 15@33@BT_STOP@@ #O 16@33@BT_RELOAD@@ -#O 17@20@AREA_URL@@ +#O 17@24@AREA_URL@@ #O 18@20@THROBBER_AREA@@ #T 2@2@ICONIFY@@3@@ #O 1@33@GLOBE@@ @@ -196,4 +196,4 @@ ResourceMaster v3.65 #T 15@2@POP_FONT_RENDERER@@3@@ #O 1@28@INTERNAL@@ #O 2@28@FREETYPE@@ -#c 22525@ +#c 22411@ diff --git a/atari/toolbar.c b/atari/toolbar.c index a6b7930b4..6afb66013 100644 --- a/atari/toolbar.c +++ b/atari/toolbar.c @@ -223,11 +223,22 @@ static struct s_tb_button *button_init(struct s_toolbar *tb, OBJECT * tree, int } +static short __CDECL toolbar_url_userdraw(PARMBLK *parmblock) +{ + return(0); +} + void toolbar_init( void ) { + static USERBLK userblk; + aes_toolbar = get_tree(TOOLBAR); throbber_form = get_tree(THROBBER); + userblk.ub_code = toolbar_url_userdraw; + userblk.ub_parm = (long) aes_toolbar[TOOLBAR_AREA_URL].ob_spec.userblk; + aes_toolbar[TOOLBAR_AREA_URL].ob_spec.userblk = &userblk; + area_full_height = aes_toolbar->ob_height; area_search_height = aes_toolbar[TOOLBAR_AREA_SEARCH].ob_height; area_navigation_height = aes_toolbar[TOOLBAR_AREA_NAVIGATION].ob_height; @@ -270,8 +281,8 @@ struct s_toolbar *toolbar_create(struct s_gui_win_root *owner) } t->btcnt = i; t->buttons = malloc(t->btcnt * sizeof(struct s_tb_button)); - memset( t->buttons, 0, t->btcnt * sizeof(struct s_tb_button)); - for (i=0; i < t->btcnt; i++ ) { + memset(t->buttons, 0, t->btcnt * sizeof(struct s_tb_button)); + for (i=0; i < t->btcnt; i++) { button_init(t, aes_toolbar, i, &t->buttons[i]); } @@ -438,11 +449,11 @@ void toolbar_update_buttons(struct s_toolbar *tb, struct browser_window *bw, } } - if (button == TOOLBAR_BT_HOME || button <= 0 ){ + if (button == TOOLBAR_BT_HOME || button <= 0 ) { } - if( button == TOOLBAR_BT_FORWARD || button <= 0 ){ + if (button == TOOLBAR_BT_FORWARD || button <= 0 ) { bt = find_button(tb, TOOLBAR_BT_FORWARD); enable = browser_window_forward_available(bw); if (enable) { @@ -452,7 +463,7 @@ void toolbar_update_buttons(struct s_toolbar *tb, struct browser_window *bw, } } - if( button == TOOLBAR_BT_RELOAD || button <= 0 ){ + if (button == TOOLBAR_BT_RELOAD || button <= 0 ) { bt = find_button(tb, TOOLBAR_BT_RELOAD); enable = browser_window_reload_available(bw); if (enable) { @@ -590,7 +601,7 @@ void toolbar_set_visible(struct s_toolbar *tb, short area, bool visible) void toolbar_set_reflow(struct s_toolbar *tb, bool do_reflow) { - tb->reflow = true; + tb->reflow = do_reflow; } void toolbar_set_attached(struct s_toolbar *tb, bool attached) @@ -743,7 +754,7 @@ void toolbar_mouse_input(struct s_toolbar *tb, short obj, short button) my = my - (work.g_y + TOOLBAR_URL_MARGIN_TOP); } while (mb & 1); - textarea_drag_end( tb->url.textarea, 0, mx, my ); + textarea_drag_end( tb->url.textarea, 0, mx, my); } else { /* when execution reaches here, mouse input is a click or dclick */ -- cgit v1.2.3