diff options
| author | Ole Loots <ole@monochrom.net> | 2012-04-10 23:12:49 +0000 |
|---|---|---|
| committer | Ole Loots <ole@monochrom.net> | 2012-04-10 23:12:49 +0000 |
| commit | 56ec72f04406ceca971eed009bf20a2e3a075a5b (patch) | |
| tree | a1fe451596346ac6e130b9ec94b7365815906026 /atari | |
| parent | 786be41d01b1a2940aae1012dd9db128acee594d (diff) | |
| download | netsurf-56ec72f04406ceca971eed009bf20a2e3a075a5b.tar.gz netsurf-56ec72f04406ceca971eed009bf20a2e3a075a5b.tar.bz2 | |
Init toolbar.
svn path=/trunk/netsurf/; revision=13849
Diffstat (limited to 'atari')
| -rwxr-xr-x | atari/browser_win.c | 6 | ||||
| -rwxr-xr-x | atari/global_evnt.c | 38 | ||||
| -rwxr-xr-x | atari/gui.c | 5 | ||||
| -rwxr-xr-x | atari/gui.h | 6 |
4 files changed, 27 insertions, 28 deletions
diff --git a/atari/browser_win.c b/atari/browser_win.c index f6179e351..68cce8008 100755 --- a/atari/browser_win.c +++ b/atari/browser_win.c @@ -235,10 +235,10 @@ void window_open( struct gui_window * gw, GRECT pos ) if( gw->root->statusbar != NULL ){
gw->root->statusbar->attached = true;
}
- tb_adjust_size( gw );
+ tb_adjust_size( gw ); /*TBD: get already present content and set size? */
input_window = gw;
- window_set_focus( gw, BROWSER, gw->browser );
+ window_set_focus( gw, BROWSER, gw->browser ); }
@@ -246,7 +246,7 @@ void window_open( struct gui_window * gw, GRECT pos ) /* update back forward buttons (see tb_update_buttons (bug) ) */
void window_update_back_forward( struct gui_window * gw)
{
- tb_update_buttons( gw );
+ tb_update_buttons( gw, -1 );
}
void window_set_stauts( struct gui_window * gw , char * text )
diff --git a/atari/global_evnt.c b/atari/global_evnt.c index b98816098..535fe066c 100755 --- a/atari/global_evnt.c +++ b/atari/global_evnt.c @@ -496,26 +496,24 @@ void __CDECL global_evnt_keybd( WINDOW * win, short buff[8], void * data) }
sascii = keybd2ascii( evnt.keybd, K_LSHIFT);
while( menu_evnt_tbl[i].rid != -1 && done == false) {
- if(menu_evnt_tbl[i].nsid[0] != 0 ) {
- if( kstate == menu_evnt_tbl[i].accel.mod && menu_evnt_tbl[i].accel.ascii != 0) {
- if( menu_evnt_tbl[i].accel.ascii == sascii) {
- menu_evnt_tbl[i].menu_func( NULL, menu_evnt_tbl[i].rid, MAINMENU, buff);
- done = true;
- break;
- }
- } else {
- /* the accel code hides in the keycode: */
- if( menu_evnt_tbl[i].accel.keycode != 0) {
- if( menu_evnt_tbl[i].accel.keycode == (nkc & 0xFF) &&
- kstate == menu_evnt_tbl[i].accel.mod &&
- menu_evnt_tbl[i].menu_func != NULL) {
- menu_evnt_tbl[i].menu_func( NULL,
- menu_evnt_tbl[i].rid,
- MAINMENU, buff
- );
- done = true;
- break;
- }
+ if( kstate == menu_evnt_tbl[i].accel.mod && menu_evnt_tbl[i].accel.ascii != 0) {
+ if( menu_evnt_tbl[i].accel.ascii == sascii) {
+ menu_evnt_tbl[i].menu_func( NULL, menu_evnt_tbl[i].rid, MAINMENU, buff);
+ done = true;
+ break;
+ }
+ } else {
+ /* the accel code hides in the keycode: */
+ if( menu_evnt_tbl[i].accel.keycode != 0) {
+ if( menu_evnt_tbl[i].accel.keycode == (nkc & 0xFF) &&
+ kstate == menu_evnt_tbl[i].accel.mod &&
+ menu_evnt_tbl[i].menu_func != NULL) {
+ menu_evnt_tbl[i].menu_func( NULL,
+ menu_evnt_tbl[i].rid,
+ MAINMENU, buff
+ );
+ done = true;
+ break;
}
}
}
diff --git a/atari/gui.c b/atari/gui.c index 476cbf06b..f5b8b4b24 100755 --- a/atari/gui.c +++ b/atari/gui.c @@ -178,7 +178,7 @@ gui_create_browser_window(struct browser_window *bw, window_open( gw , pos );
/* Recalculate windows browser area now */
browser_update_rects( gw );
- tb_update_buttons( gw );
+ tb_update_buttons( gw, -1 );
input_window = gw;
/* TODO:... this line: placeholder to create a local history widget ... */
}
@@ -989,7 +989,8 @@ static void gui_init2(int argc, char** argv) menu_register( _AESapid, (char*)" NetSurf ");
}
tree_set_icon_dir( nsoption_charp(tree_icons_path) );
- hotlist_init();
+ hotlist_init(); + toolbar_init();
}
/* #define WITH_DBG_LOGFILE 1 */
diff --git a/atari/gui.h b/atari/gui.h index ee84d9215..68f45ec9d 100755 --- a/atari/gui.h +++ b/atari/gui.h @@ -76,9 +76,9 @@ struct s_focus_info #define CDT_OWNER 0x03UL #define CDT_ICON 0x04UL #define CDT_ICON_TYPE 0x05UL -#define CDT_ICON_TYPE_NONE 0x00UL -#define CDT_ICON_TYPE_OBJECT 0x01UL
-#define CDT_ICON_TYPE_BITMAP 0x02UL +# define CDT_ICON_TYPE_NONE 0x00UL +# define CDT_ICON_TYPE_OBJECT 0x01UL
+# define CDT_ICON_TYPE_BITMAP 0x02UL struct gui_window; |