8:18 a.m.
Author: chris_y
Date: Tue Nov 3 17:17:57 2009
New Revision: 9660
URL: http://source.netsurf-browser.org?rev=9660&view=rev
Log:
PageUp/Down, Home/End etc page scrolling now working.
Most menu shortcuts now available even when the pointer is hovering over the browser
window (menu disabled mode)
RAmiga-R (reload page) and RAmiga-U (activate URL bar) available from keyboard
shortcuts but not from the menu.
This fixes unsat bug #81
Modified:
trunk/netsurf/amiga/gui.c
trunk/netsurf/amiga/menu.c
Modified: trunk/netsurf/amiga/gui.c
URL:
http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=9660&...
==============================================================================
--- trunk/netsurf/amiga/gui.c (original)
+++ trunk/netsurf/amiga/gui.c Tue Nov 3 17:17:57 2009
@@ -1214,6 +1214,32 @@
* key presses. Context menus need to be changed to use MENUVERIFY not RMBTRAP */
switch(nskey)
{
+ case 'n':
+ if(option_kiosk_mode == false)
+ browser_window_create(gwin->bw->current_content->url,
+ gwin->bw, 0, true, false);
+ break;
+
+ case 't':
+ if(option_kiosk_mode == false)
+ browser_window_create(gwin->bw->current_content->url,
+ gwin->bw, 0, true, true);
+ break;
+
+ case 'k':
+ if(option_kiosk_mode == false)
+ browser_window_destroy(gwin->bw);
+ break;
+
+ case 'p':
+ ami_print_ui(gwin->bw->current_content);
+ break;
+
+ case 'q':
+ if(option_kiosk_mode == false)
+ ami_quit_netsurf();
+ break;
+
case 'a':
browser_window_key_press(gwin->bw, KEY_SELECT_ALL);
break;
@@ -1223,6 +1249,32 @@
browser_window_key_press(gwin->bw, KEY_CLEAR_SELECTION);
case 'v':
browser_window_key_press(gwin->bw, KEY_PASTE);
+ break;
+
+ case 'z':
+ browser_window_key_press(gwin->bw, KEY_CLEAR_SELECTION);
+ break;
+
+ case 'f':
+ ami_search_open(gwin->bw->window);
+ break;
+
+ case 'h':
+ if(option_kiosk_mode == false)
+ ami_open_tree(hotlist,AMI_TREE_HOTLIST);
+ break;
+
+/* The following aren't available from the menu at the moment */
+
+ case 'r': // reload
+ if(browser_window_reload_available(gwin->bw))
+ browser_window_reload(gwin->bw,false);
+ break;
+
+ case 'u': // open url
+ if(option_kiosk_mode == false)
+ ActivateGadget(gwin->gadgets[GID_URL],
+ gwin->win, NULL);
break;
}
}
@@ -1230,6 +1282,10 @@
{
if(!browser_window_key_press(gwin->bw, nskey))
{
+ GetAttr(SPACE_AreaBox,
+ gwin->gadgets[GID_BROWSER],
+ (ULONG *)&bbox);
+
gui_window_get_scroll(gwin->bw->window,
&gwin->bw->window->scrollx,
&gwin->bw->window->scrolly);
@@ -1258,6 +1314,40 @@
gui_window_set_scroll(gwin->bw->window,
gwin->bw->window->scrollx + 5,
gwin->bw->window->scrolly);
+ break;
+
+ case KEY_PAGE_UP:
+ gui_window_set_scroll(gwin->bw->window,
+ gwin->bw->window->scrollx,
+ gwin->bw->window->scrolly - bbox->Height);
+ break;
+
+ case KEY_PAGE_DOWN:
+ gui_window_set_scroll(gwin->bw->window,
+ gwin->bw->window->scrollx,
+ gwin->bw->window->scrolly + bbox->Height);
+ break;
+
+ case KEY_LINE_START: // page left
+ gui_window_set_scroll(gwin->bw->window,
+ gwin->bw->window->scrollx - bbox->Width,
+ gwin->bw->window->scrolly);
+ break;
+
+ case KEY_LINE_END: // page right
+ gui_window_set_scroll(gwin->bw->window,
+ gwin->bw->window->scrollx + bbox->Width,
+ gwin->bw->window->scrolly);
+ break;
+
+ case KEY_TEXT_START: // home
+ gui_window_set_scroll(gwin->bw->window, 0, 0);
+ break;
+
+ case KEY_TEXT_END: // end
+ gui_window_set_scroll(gwin->bw->window,
+ gwin->bw->current_content->width,
+ gwin->bw->current_content->height);
break;
}
}
Modified: trunk/netsurf/amiga/menu.c
URL:
http://source.netsurf-browser.org/trunk/netsurf/amiga/menu.c?rev=9660&...
==============================================================================
--- trunk/netsurf/amiga/menu.c (original)
+++ trunk/netsurf/amiga/menu.c Tue Nov 3 17:17:57 2009
@@ -615,7 +615,7 @@
if(gwin->bw->current_content->type <= CONTENT_CSS)
{
browser_window_key_press(gwin->bw, KEY_COPY_SELECTION);
- browser_window_key_press(gwin->bw, KEY_ESCAPE);
+ browser_window_key_press(gwin->bw, KEY_CLEAR_SELECTION);
}
else if(gwin->bw->current_content->bitmap)
{