summaryrefslogtreecommitdiff
path: root/atari/global_evnt.c
diff options
context:
space:
mode:
authorOle Loots <ole@monochrom.net>2011-09-19 18:38:48 +0000
committerOle Loots <ole@monochrom.net>2011-09-19 18:38:48 +0000
commit0f2871e41889f254cb614883ae9bbc6ab6fbceae (patch)
tree7d1a65739fbd044ea7ad490404c81710515ac5de /atari/global_evnt.c
parent60f641bc44e7c40f3114630f60d0a30b57813e89 (diff)
downloadnetsurf-0f2871e41889f254cb614883ae9bbc6ab6fbceae.tar.gz
netsurf-0f2871e41889f254cb614883ae9bbc6ab6fbceae.tar.bz2
Added context menu,
Allow to set bitmap for iconified window. ( altough it's usesless right now because favicon support has been dropped) svn path=/trunk/netsurf/; revision=12821
Diffstat (limited to 'atari/global_evnt.c')
-rwxr-xr-xatari/global_evnt.c32
1 files changed, 17 insertions, 15 deletions
diff --git a/atari/global_evnt.c b/atari/global_evnt.c
index 4fc355472..7350e232c 100755
--- a/atari/global_evnt.c
+++ b/atari/global_evnt.c
@@ -223,7 +223,9 @@ static void __CDECL menu_home(WINDOW *win, int item, int title, void *data)
static void __CDECL menu_lhistory(WINDOW *win, int item, int title, void *data)
{
- LOG(("%s", __FUNCTION__));
+ LOG(("%s", __FUNCTION__));
+ if( input_window == NULL )
+ return;
}
static void __CDECL menu_ghistory(WINDOW *win, int item, int title, void *data)
@@ -320,7 +322,7 @@ void __CDECL global_evnt_keybd( WINDOW * win, short buff[8], void * data)
return;
kstate = evnt.mkstate;
kcode = evnt.keybd;
- nkc= gem_to_norm( (short)kstate, (short)kcode );
+ nkc= gem_to_norm( (short)kstate, (short)kcode );
nks = (nkc & 0xFF00);
if( kstate & (K_LSHIFT|K_RSHIFT))
kstate |= K_LSHIFT|K_RSHIFT;
@@ -354,11 +356,11 @@ void __CDECL global_evnt_keybd( WINDOW * win, short buff[8], void * data)
} 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 &&
+ 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,
+ menu_evnt_tbl[i].menu_func( NULL,
+ menu_evnt_tbl[i].rid,
MAINMENU, buff
);
done = true;
@@ -372,7 +374,7 @@ void __CDECL global_evnt_keybd( WINDOW * win, short buff[8], void * data)
}
/*
- mode = 0 -> return string ptr
+ mode = 0 -> return string ptr
(build from accel definition in s_accelerator accel)
mode = 1 -> return ptr to (untranslated) NS accel string, if any
*/
@@ -572,10 +574,10 @@ void bind_global_events( void )
spare[1]=' ';
if( u != NULL && t != NULL ) {
LOG(("Menu Item %s: found NS accelerator, ascii: %c, scancode: %x, mod: %x",
- m,
- menu_evnt_tbl[i].accel.ascii,
- menu_evnt_tbl[i].accel.keycode,
- menu_evnt_tbl[i].accel.mod
+ m,
+ menu_evnt_tbl[i].accel.ascii,
+ menu_evnt_tbl[i].accel.keycode,
+ menu_evnt_tbl[i].accel.mod
));
/* Accelerator is defined in menu string: */
memcpy((char*)&spare[2], m, u-m-1);
@@ -583,10 +585,10 @@ void bind_global_events( void )
}
else if( t != NULL && u == NULL) {
LOG(("Menu Item %s: found RSC accelerator, ascii: %c, scancode: %x, mod: %x",
- m,
- menu_evnt_tbl[i].accel.ascii,
- menu_evnt_tbl[i].accel.keycode,
- menu_evnt_tbl[i].accel.mod
+ m,
+ menu_evnt_tbl[i].accel.ascii,
+ menu_evnt_tbl[i].accel.keycode,
+ menu_evnt_tbl[i].accel.mod
));
/* Accelerator is defined in struct: */
memcpy( (char*)&spare[2], m, strlen(m) );