r6329 chris_y - /trunk/netsurf/amiga/gui.c
by netsurf＠semichrome.net
Author: chris_y
Date: Sun Feb 1 07:26:21 2009
New Revision: 6329
URL: http://source.netsurf-browser.org?rev=6329&view=rev
Log:
Convert UTF-8 titles to local charset for display in tabs
Disable keyboard shortcuts for tabs as an underscore in the title was causing
keypresses to be ignored or tabs to be switched unexpectedly
Modified:
trunk/netsurf/amiga/gui.c
Modified: trunk/netsurf/amiga/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=6329&r1=6...
==============================================================================
--- trunk/netsurf/amiga/gui.c (original)
+++ trunk/netsurf/amiga/gui.c Sun Feb 1 07:26:21 2009
@@ -1819,6 +1819,7 @@
LAYOUT_AddChild, gwin->shared->gadgets[GID_TABS] = ClickTabObject,
GA_ID,GID_TABS,
GA_RelVerify,TRUE,
+ GA_Underscore,13, // disable kb shortcuts
CLICKTAB_Labels,&gwin->shared->tab_list,
CLICKTAB_LabelTruncate,TRUE,
ClickTabEnd,
@@ -2004,7 +2005,7 @@
{
struct Node *node;
ULONG cur_tab = 0;
- STRPTR oldtitle;
+ STRPTR newtitle = NULL;
if(!g) return;
@@ -2015,7 +2016,9 @@
SetGadgetAttrs(g->shared->gadgets[GID_TABS],g->shared->win,NULL,
CLICKTAB_Labels,~0,
TAG_DONE);
- SetClickTabNodeAttrs(node,TNA_Text,title,TAG_DONE);
+ newtitle = ami_utf8_easy(title);
+ SetClickTabNodeAttrs(node,TNA_Text,ami_utf8_easy(newtitle),TAG_DONE);
+ if(newtitle) ami_utf8_free(newtitle);
RefreshSetGadgetAttrs(g->shared->gadgets[GID_TABS],g->shared->win,NULL,
CLICKTAB_Labels,&g->shared->tab_list,
TAG_DONE);
14 years, 7 months
- 1
- 0
r6328 chris_y - in /trunk/netsurf/amiga: context_menu.c gui.c menu.c
by netsurf＠semichrome.net
Author: chris_y
Date: Sun Feb 1 07:01:46 2009
New Revision: 6328
URL: http://source.netsurf-browser.org?rev=6328&view=rev
Log:
Change to use names instead of numbers for keypresses
Add missing keypresss
Modified:
trunk/netsurf/amiga/context_menu.c
trunk/netsurf/amiga/gui.c
trunk/netsurf/amiga/menu.c
Modified: trunk/netsurf/amiga/context_menu.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/context_menu.c?rev=...
==============================================================================
--- trunk/netsurf/amiga/context_menu.c (original)
+++ trunk/netsurf/amiga/context_menu.c Sun Feb 1 07:01:46 2009
@@ -31,6 +31,7 @@
#include <string.h>
#include "utils/utils.h"
#include <proto/asl.h>
+#include "desktop/textinput.h"
uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved);
@@ -277,12 +278,12 @@
break;
case CMID_SELCOPY:
- gui_copy_to_clipboard(gwin->bw->sel);
- browser_window_key_press(gwin->bw, 26);
+ browser_window_key_press(gwin->bw, KEY_COPY_SELECTION);
+ browser_window_key_press(gwin->bw, KEY_CLEAR_SELECTION);
break;
case CMID_SELALL:
- browser_window_key_press(gwin->bw, 1);
+ browser_window_key_press(gwin->bw, KEY_SELECT_ALL);
break;
}
}
Modified: trunk/netsurf/amiga/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=6328&r1=6...
==============================================================================
--- trunk/netsurf/amiga/gui.c (original)
+++ trunk/netsurf/amiga/gui.c Sun Feb 1 07:01:46 2009
@@ -929,19 +929,84 @@
switch(storage)
{
case RAWKEY_CRSRUP:
- browser_window_key_press(gwin->bw,KEY_UP);
+ if(ie->ie_Qualifier & IEQUALIFIER_RSHIFT)
+ {
+ browser_window_key_press(gwin->bw,KEY_PAGE_UP);
+ }
+ else if(ie->ie_Qualifier & IEQUALIFIER_RALT)
+ {
+ browser_window_key_press(gwin->bw,KEY_TEXT_START);
+ }
+ else browser_window_key_press(gwin->bw,KEY_UP);
break;
case RAWKEY_CRSRDOWN:
- browser_window_key_press(gwin->bw,KEY_DOWN);
+ if(ie->ie_Qualifier & IEQUALIFIER_RSHIFT)
+ {
+ browser_window_key_press(gwin->bw,KEY_PAGE_DOWN);
+ }
+ else if(ie->ie_Qualifier & IEQUALIFIER_RALT)
+ {
+ browser_window_key_press(gwin->bw,KEY_TEXT_END);
+ }
+ else browser_window_key_press(gwin->bw,KEY_DOWN);
break;
case RAWKEY_CRSRLEFT:
- browser_window_key_press(gwin->bw,KEY_LEFT);
+ if(ie->ie_Qualifier & IEQUALIFIER_RSHIFT)
+ {
+ browser_window_key_press(gwin->bw,KEY_LINE_START);
+ }
+ else if(ie->ie_Qualifier & IEQUALIFIER_RALT)
+ {
+ browser_window_key_press(gwin->bw,KEY_WORD_LEFT);
+ }
+ else browser_window_key_press(gwin->bw,KEY_LEFT);
break;
case RAWKEY_CRSRRIGHT:
- browser_window_key_press(gwin->bw,KEY_RIGHT);
+ if(ie->ie_Qualifier & IEQUALIFIER_RSHIFT)
+ {
+ browser_window_key_press(gwin->bw,KEY_LINE_END);
+ }
+ else if(ie->ie_Qualifier & IEQUALIFIER_RALT)
+ {
+ browser_window_key_press(gwin->bw,KEY_WORD_RIGHT);
+ }
+ else browser_window_key_press(gwin->bw,KEY_RIGHT);
break;
case RAWKEY_ESC:
- browser_window_key_press(gwin->bw,27);
+ browser_window_key_press(gwin->bw,KEY_ESCAPE);
+ break;
+ case RAWKEY_PAGEUP:
+ browser_window_key_press(gwin->bw,KEY_PAGE_UP);
+ break;
+ case RAWKEY_PAGEDOWN:
+ browser_window_key_press(gwin->bw,KEY_PAGE_DOWN);
+ break;
+ case RAWKEY_HOME:
+ browser_window_key_press(gwin->bw,KEY_TEXT_START);
+ break;
+ case RAWKEY_END:
+ browser_window_key_press(gwin->bw,KEY_TEXT_END);
+ break;
+ case RAWKEY_BACKSPACE:
+ if(ie->ie_Qualifier & IEQUALIFIER_RSHIFT)
+ {
+ browser_window_key_press(gwin->bw,KEY_DELETE_LINE_START);
+ }
+ else browser_window_key_press(gwin->bw,KEY_DELETE_LEFT);
+ break;
+ case RAWKEY_DEL:
+ if(ie->ie_Qualifier & IEQUALIFIER_RSHIFT)
+ {
+ browser_window_key_press(gwin->bw,KEY_DELETE_LINE_END);
+ }
+ else browser_window_key_press(gwin->bw,KEY_DELETE_RIGHT);
+ break;
+ case RAWKEY_TAB:
+ if(ie->ie_Qualifier & IEQUALIFIER_RSHIFT)
+ {
+ browser_window_key_press(gwin->bw,KEY_SHIFT_TAB);
+ }
+ else browser_window_key_press(gwin->bw,KEY_TAB);
break;
default:
if((chars = MapRawKey(ie,buffer,20,NULL)) > 0)
@@ -951,18 +1016,16 @@
/* We are duplicating the menu shortcuts here, as if RMBTRAP is active
* (ie. when context menus are enabled and the mouse is over the browser
* rendering area), Intuition also does not catch the menu shortcut
- * key presses. This should probably be expanded to contain all the
- * menu shortcuts, but copy and paste are the most used so we only
- * handle those for now. */
+ * key presses. Context menus need to be changed to use MENUVERIFY not RMBTRAP */
switch(buffer[0])
{
case 'c':
- gui_copy_to_clipboard(gwin->bw->sel);
- browser_window_key_press(gwin->bw, 26);
+ browser_window_key_press(gwin->bw, KEY_COPY_SELECTION);
+ browser_window_key_press(gwin->bw, KEY_ESCAPE);
break;
case 'v':
- gui_paste_from_clipboard(gwin->bw->window,0,0);
+ browser_window_key_press(gwin->bw, KEY_PASTE);
break;
}
}
Modified: trunk/netsurf/amiga/menu.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/menu.c?rev=6328&r1=...
==============================================================================
--- trunk/netsurf/amiga/menu.c (original)
+++ trunk/netsurf/amiga/menu.c Sun Feb 1 07:01:46 2009
@@ -39,7 +39,8 @@
#include "amiga/save_complete.h"
#include "utils/url.h"
#include <dos/anchorpath.h>
-
+#include "desktop/textinput.h"
+#include "amiga/search.h"
BOOL menualreadyinit;
const char * const netsurf_version;
@@ -547,20 +548,21 @@
switch(itemnum)
{
case 0: // copy
- gui_copy_to_clipboard(gwin->bw->sel);
- browser_window_key_press(gwin->bw, 26);
+ browser_window_key_press(gwin->bw, KEY_COPY_SELECTION);
+ browser_window_key_press(gwin->bw, KEY_ESCAPE);
break;
case 1: // paste
- gui_paste_from_clipboard(&tgw,0,0);
+ browser_window_key_press(gwin->bw, KEY_PASTE);
+ //gui_paste_from_clipboard(&tgw,0,0);
break;
case 2: // select all
- browser_window_key_press(gwin->bw, 1);
+ browser_window_key_press(gwin->bw, KEY_SELECT_ALL);
break;
case 3: // clear selection
- browser_window_key_press(gwin->bw, 26);
+ browser_window_key_press(gwin->bw, KEY_CLEAR_SELECTION);
break;
}
break;
14 years, 7 months
- 1
- 0
r6327 adrianl - in /trunk/netsurf: !NetSurf/Resources/de/ !NetSurf/Resources/en/ !NetSurf/Resources/fr/ !NetSurf/Resources/it/ !NetSurf/Resources/nl/ amiga/ desktop/ riscos/
by netsurf＠semichrome.net
Author: adrianl
Date: Sat Jan 31 20:19:01 2009
New Revision: 6327
URL: http://source.netsurf-browser.org?rev=6327&view=rev
Log:
Next batch of menu changes; clarify some key presses
Modified:
trunk/netsurf/!NetSurf/Resources/de/Messages
trunk/netsurf/!NetSurf/Resources/en/Messages
trunk/netsurf/!NetSurf/Resources/fr/Messages
trunk/netsurf/!NetSurf/Resources/it/Messages
trunk/netsurf/!NetSurf/Resources/nl/Messages
trunk/netsurf/amiga/menu.c
trunk/netsurf/desktop/textinput.c
trunk/netsurf/desktop/textinput.h
trunk/netsurf/riscos/menus.c
trunk/netsurf/riscos/menus.h
Modified: trunk/netsurf/!NetSurf/Resources/de/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/de/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/de/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/de/Messages Sat Jan 31 20:19:01 2009
@@ -76,6 +76,7 @@
#
ObjInfo:Info
ObjSave:Speichern
+ObjPrint:Drucken
ObjReload:erneut laden
# Main -> Object -> Object -> Export menu
@@ -250,7 +251,7 @@
# Edit menu
#
CopyNS:Copy
-Paste:Paste
+PasteNS:Paste
SelectAllNS:Select all
ClearNS:Clear selection
Modified: trunk/netsurf/!NetSurf/Resources/en/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/en/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/en/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/en/Messages Sat Jan 31 20:19:01 2009
@@ -76,6 +76,7 @@
#
ObjInfo:Info
ObjSave:Save
+ObjPrint:Print
ObjReload:Reload
# Main -> Object -> Object -> Export menu
@@ -250,7 +251,7 @@
# Edit menu
#
CopyNS:Copy
-Paste:Paste
+PasteNS:Paste
SelectAllNS:Select all
ClearNS:Clear selection
Modified: trunk/netsurf/!NetSurf/Resources/fr/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/fr/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/fr/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/fr/Messages Sat Jan 31 20:19:01 2009
@@ -76,6 +76,7 @@
#
ObjInfo:Info
ObjSave:Sauver
+ObjPrint:Imprimer
ObjReload:Recharger
# Main -> Object -> Object -> Export menu
@@ -250,7 +251,7 @@
# Edit menu
#
CopyNS:Copy
-Paste:Paste
+PasteNS:Paste
SelectAllNS:Select all
ClearNS:Clear selection
Modified: trunk/netsurf/!NetSurf/Resources/it/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/it/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/it/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/it/Messages Sat Jan 31 20:19:01 2009
@@ -77,6 +77,7 @@
#
ObjInfo:Info
ObjSave:Salva
+ObjPrint:Stampa
ObjReload:Ricarica
# Main -> Object -> Object -> Export menu
@@ -251,7 +252,7 @@
# Edit menu
#
CopyNS:Copia
-Paste:Incolla
+PasteNS:Incolla
SelectAllNS:Seleziona tutto
ClearNS:Cancella selezione
Modified: trunk/netsurf/!NetSurf/Resources/nl/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/nl/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/nl/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/nl/Messages Sat Jan 31 20:19:01 2009
@@ -76,6 +76,7 @@
#
ObjInfo:Informatie
ObjSave:Bewaar
+ObjPrint:Afdrukken
ObjReload:Herlaad
# Main -> Object -> Object -> Export menu
@@ -250,7 +251,7 @@
# Edit menu
#
CopyNS:Copy
-Paste:Paste
+PasteNS:Paste
SelectAllNS:Select all
ClearNS:Clear selection
Modified: trunk/netsurf/amiga/menu.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/menu.c?rev=6327&r1=...
==============================================================================
--- trunk/netsurf/amiga/menu.c (original)
+++ trunk/netsurf/amiga/menu.c Sat Jan 31 20:19:01 2009
@@ -83,7 +83,7 @@
menulab[15] = ami_utf8_easy((char *)messages_get("Quit"));
menulab[16] = ami_utf8_easy((char *)messages_get("Edit"));
menulab[17] = ami_utf8_easy((char *)messages_get("CopyNS"));
- menulab[18] = ami_utf8_easy((char *)messages_get("Paste"));
+ menulab[18] = ami_utf8_easy((char *)messages_get("PasteNS"));
menulab[19] = ami_utf8_easy((char *)messages_get("SelectAllNS"));
menulab[20] = ami_utf8_easy((char *)messages_get("ClearNS"));
menulab[21] = ami_utf8_easy((char *)messages_get("Browser"));
Modified: trunk/netsurf/desktop/textinput.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/textinput.c?rev=6...
==============================================================================
--- trunk/netsurf/desktop/textinput.c (original)
+++ trunk/netsurf/desktop/textinput.c Sat Jan 31 20:19:01 2009
@@ -467,8 +467,8 @@
reflow = true;
break;
- case 10:
- case 13: /* paragraph break */
+ case KEY_NL:
+ case KEY_CR: /* paragraph break */
if (selection_exists) {
/* If we have a selection, then delete it,
* so it's replaced by the break */
@@ -486,7 +486,7 @@
reflow = true;
break;
- case 21: /* Ctrl + U */
+ case KEY_CUT_LINE:
{
struct box *start_box = line_start(text_box);
struct box *end_box = line_end(text_box);
@@ -503,7 +503,7 @@
}
break;
- case 22: /* Ctrl + V */
+ case KEY_PASTE:
gui_paste_from_clipboard(bw->window,
box_x + inline_container->x +
text_box->x + pixel_offset,
@@ -512,7 +512,7 @@
/* screen updated and caret repositioned already */
return true;
- case 24: /* Ctrl + X */
+ case KEY_CUT_SELECTION:
{
size_t start_idx, end_idx;
struct box *start_box =
@@ -953,7 +953,7 @@
}
break;
- case 9: /* Tab */
+ case KEY_TAB:
{
struct form_control *next_input;
/* Find next text entry field that is actually
@@ -976,15 +976,15 @@
}
break;
- case 10:
- case 13: /* Return/Enter hit */
+ case KEY_NL:
+ case KEY_CR: /* Return/Enter hit */
selection_clear(bw->sel, true);
if (form)
browser_form_submit(bw, bw, form, 0);
return true;
- case 11: /* Shift + Tab */
+ case KEY_SHIFT_TAB:
{
struct form_control *prev_input;
/* Find previous text entry field that is actually
@@ -1007,7 +1007,7 @@
}
break;
- case 21: /* Ctrl + U */
+ case KEY_CUT_LINE:
/* Clear the selection, if one exists */
if (selection_exists)
selection_clear(bw->sel, false);
@@ -1019,7 +1019,7 @@
changed = true;
break;
- case 22: /* Ctrl + V */
+ case KEY_PASTE:
gui_paste_from_clipboard(bw->window,
box_x + input->children->x + text_box->x + pixel_offset,
box_y + input->children->y + text_box->y);
@@ -1027,7 +1027,7 @@
/* screen updated and caret repositioned already */
return true;
- case 24: /* Ctrl + X */
+ case KEY_CUT_SELECTION:
{
size_t start_idx, end_idx;
struct box *start_box =
@@ -1232,19 +1232,19 @@
{
/* keys that take effect wherever the caret is positioned */
switch (key) {
- case 1: /* Ctrl + A */
+ case KEY_SELECT_ALL:
selection_select_all(bw->sel);
return true;
- case 3: /* Ctrl + C */
+ case KEY_COPY_SELECTION:
gui_copy_to_clipboard(bw->sel);
return true;
- case 26: /* Ctrl + Z */
+ case KEY_CLEAR_SELECTION:
selection_clear(bw->sel, true);
return true;
- case 27: /** Escape */
+ case KEY_ESCAPE:
if (selection_defined(bw->sel)) {
selection_clear(bw->sel, true);
return true;
Modified: trunk/netsurf/desktop/textinput.h
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/textinput.h?rev=6...
==============================================================================
--- trunk/netsurf/desktop/textinput.h (original)
+++ trunk/netsurf/desktop/textinput.h Sat Jan 31 20:19:01 2009
@@ -34,8 +34,22 @@
enum input_key {
+ KEY_SELECT_ALL = 1,
+ KEY_COPY_SELECTION = 3,
+
KEY_DELETE_LEFT = 8,
KEY_TAB = 9,
+
+ KEY_NL = 10,
+ KEY_SHIFT_TAB = 11,
+ KEY_CR = 13,
+
+ KEY_CUT_LINE = 21,
+ KEY_PASTE = 22,
+ KEY_CUT_SELECTION = 24,
+ KEY_CLEAR_SELECTION = 26,
+
+ KEY_ESCAPE = 27,
/* cursor movement keys */
KEY_LEFT = 28,
Modified: trunk/netsurf/riscos/menus.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/menus.c?rev=6327&r...
==============================================================================
--- trunk/netsurf/riscos/menus.c (original)
+++ trunk/netsurf/riscos/menus.c Sat Jan 31 20:19:01 2009
@@ -36,6 +36,7 @@
#include "desktop/history_core.h"
#include "desktop/netsurf.h"
#include "desktop/selection.h"
+#include "desktop/textinput.h"
#include "render/box.h"
#include "riscos/dialog.h"
#include "render/form.h"
@@ -112,7 +113,7 @@
static int ro_gui_menu_get_checksum(void);
static bool ro_gui_menu_prepare_url_suggest(void);
static void ro_gui_menu_prepare_pageinfo(struct gui_window *g);
-static void ro_gui_menu_prepare_objectinfo(struct box *box);
+static void ro_gui_menu_prepare_objectinfo(struct content *object, const char *href);
static void ro_gui_menu_refresh_toolbar(struct toolbar *toolbar);
static bool ro_gui_menu_translate(struct menu_definition *menu);
@@ -128,10 +129,10 @@
wimp_menu *current_menu;
/** Whether a menu is currently open */
bool current_menu_open = false;
-/** Box for object under menu, or 0 if no object. */
-static struct box *current_menu_object_box = 0;
-/** Box for link under menu, or 0 if no link. */
-static struct box *current_menu_link_box = 0;
+/** Object under menu, or 0 if no object. */
+static struct content *current_menu_object = 0;
+/** URL of link under menu, or 0 if no link. */
+static const char *current_menu_url = 0;
/** Menu of options for form select controls. */
static wimp_menu *gui_form_select_menu = 0;
/** Form control which gui_form_select_menu is for. */
@@ -180,7 +181,7 @@
(struct ns_menu *)&iconbar_definition);
/* browser menu */
- NS_MENU(83) browser_definition = {
+ NS_MENU(86) browser_definition = {
"NetSurf", {
{ "Page", BROWSER_PAGE, 0 },
{ "Page.PageInfo",BROWSER_PAGE_INFO, dialog_pageinfo },
@@ -215,6 +216,7 @@
{ "Object.Object.SaveURL.URI", BROWSER_OBJECT_SAVE_URL_URI, dialog_saveas },
{ "Object.Object.SaveURL.URL", BROWSER_OBJECT_SAVE_URL_URL, dialog_saveas },
{ "Object.Object.SaveURL.LinkText", BROWSER_OBJECT_SAVE_URL_TEXT, dialog_saveas },
+ { "Object.Object.ObjPrint", BROWSER_OBJECT_PRINT, 0 },
{ "Object.Object.ObjReload", BROWSER_OBJECT_RELOAD, 0 },
{ "Object.Link", BROWSER_OBJECT_LINK, 0 },
{ "Object.Link.LinkSave", BROWSER_LINK_SAVE, 0 },
@@ -227,7 +229,9 @@
{ "_Selection.SelSave", BROWSER_SELECTION_SAVE, dialog_saveas },
{ "Selection.Copy", BROWSER_SELECTION_COPY, 0 },
{ "Selection.Cut", BROWSER_SELECTION_CUT, 0 },
- { "Selection.Paste", BROWSER_SELECTION_PASTE, 0 },
+ { "_Selection.Paste", BROWSER_SELECTION_PASTE, 0 },
+ { "Selection.Clear", BROWSER_SELECTION_CLEAR, 0 },
+ { "Selection.SelectAll", BROWSER_SELECTION_ALL, 0 },
{ "Navigate", NO_ACTION, 0 },
{ "Navigate.Home", BROWSER_NAVIGATE_HOME, 0 },
{ "Navigate.Back", BROWSER_NAVIGATE_BACK, 0 },
@@ -502,11 +506,25 @@
if (!ro_gui_window_to_window_pos(g, x, y, &pos))
return;
- current_menu_object_box = NULL;
- if (g->bw->current_content &&
- g->bw->current_content->type == CONTENT_HTML) {
- current_menu_object_box = box_object_at_point(g->bw->current_content, pos.x, pos.y);
- current_menu_link_box = box_href_at_point(g->bw->current_content, pos.x, pos.y);
+ current_menu_object = NULL;
+ current_menu_url = NULL;
+ if (g->bw->current_content) {
+ switch (g->bw->current_content->type) {
+ case CONTENT_HTML: {
+ struct box *box;
+ box = box_object_at_point(g->bw->current_content, pos.x, pos.y);
+ current_menu_object = box ? box->object : NULL;
+ box = box_href_at_point(g->bw->current_content, pos.x, pos.y);
+ current_menu_url = box ? box->href : NULL;
+ }
+ break;
+ case CONTENT_TEXTPLAIN:
+ /* no object, no url */
+ break;
+ default:
+ current_menu_object = g->bw->current_content;
+ break;
+ }
}
}
@@ -631,7 +649,8 @@
void ro_gui_menu_objects_moved(void)
{
gui_form_select_control = NULL;
- current_menu_object_box = NULL;
+ current_menu_object = NULL;
+ current_menu_url = NULL;
ro_gui_menu_prepare_action(0, BROWSER_OBJECT, false);
if ((current_menu) && (current_menu == gui_form_select_menu))
@@ -934,9 +953,10 @@
/**
* Prepare the object info window for use
*
- * \param box the box to set the display icons for
- */
-void ro_gui_menu_prepare_objectinfo(struct box *box)
+ * \param object the object for which information is to be displayed
+ * \param href corresponding href, if any
+ */
+void ro_gui_menu_prepare_objectinfo(struct content *object, const char *href)
{
char icon_buf[20] = "file_xxx";
const char *url = "-";
@@ -944,16 +964,16 @@
const char *mime = "-";
sprintf(icon_buf, "file_%.3x",
- ro_content_filetype(box->object));
+ ro_content_filetype(object));
if (!ro_gui_wimp_sprite_exists(icon_buf))
sprintf(icon_buf, "file_xxx");
- if (box->object->url)
- url = box->object->url;
- if (box->href)
- target = box->href;
- if (box->object->mime_type)
- mime = box->object->mime_type;
+ if (object->url)
+ url = object->url;
+ if (href)
+ target = href;
+ if (object->mime_type)
+ mime = object->mime_type;
ro_gui_set_icon_string(dialog_objinfo, ICON_OBJINFO_ICON, icon_buf, true);
ro_gui_set_icon_string(dialog_objinfo, ICON_OBJINFO_URL, url, true);
@@ -1545,16 +1565,16 @@
/* object actions */
case BROWSER_OBJECT_INFO:
- if (!current_menu_object_box)
+ if (!current_menu_object)
return false;
ro_gui_menu_prepare_action(owner, action, true);
ro_gui_dialog_open_persistent(g->window,
dialog_objinfo, windows_at_pointer);
return true;
case BROWSER_OBJECT_RELOAD:
- if (!current_menu_object_box)
+ if (!current_menu_object)
return false;
- current_menu_object_box->object->fresh = false;
+ current_menu_object->fresh = false;
browser_window_reload(bw, false);
return true;
@@ -1562,29 +1582,28 @@
case BROWSER_LINK_SAVE_URI:
case BROWSER_LINK_SAVE_URL:
case BROWSER_LINK_SAVE_TEXT:
- if (!current_menu_link_box)
+ if (!current_menu_url)
return false;
ro_gui_menu_prepare_action(owner, action, true);
ro_gui_dialog_open_persistent(owner, dialog_saveas,
windows_at_pointer);
break;
case BROWSER_LINK_DOWNLOAD:
- if (!current_menu_link_box)
+ if (!current_menu_url)
return false;
- browser_window_download(bw, current_menu_link_box->href, c->url);
+ browser_window_download(bw, current_menu_url, c->url);
break;
case BROWSER_LINK_NEW_WINDOW:
- if (!current_menu_link_box)
+ if (!current_menu_url)
return false;
- browser_window_create(current_menu_link_box->href, bw, c->url, true, false);
+ browser_window_create(current_menu_url, bw, c->url, true, false);
break;
/* save actions */
case BROWSER_OBJECT_SAVE:
case BROWSER_OBJECT_EXPORT_SPRITE:
case BROWSER_OBJECT_EXPORT_DRAW:
- c = current_menu_object_box ?
- current_menu_object_box->object : NULL;
+ c = current_menu_object;
/* Fall through */
case BROWSER_SAVE:
case BROWSER_SAVE_COMPLETE:
@@ -1611,14 +1630,20 @@
windows_at_pointer);
return true;
case BROWSER_SELECTION_COPY:
- browser_window_key_press(bw, 3);
+ browser_window_key_press(bw, KEY_COPY_SELECTION);
break;
case BROWSER_SELECTION_CUT:
- browser_window_key_press(bw, 24);
+ browser_window_key_press(bw, KEY_CUT_SELECTION);
return true;
case BROWSER_SELECTION_PASTE:
- browser_window_key_press(bw, 22);
- return true;
+ browser_window_key_press(bw, KEY_PASTE);
+ return true;
+ case BROWSER_SELECTION_ALL:
+ browser_window_key_press(bw, KEY_SELECT_ALL);
+ break;
+ case BROWSER_SELECTION_CLEAR:
+ browser_window_key_press(bw, KEY_CLEAR_SELECTION);
+ break;
/* navigation actions */
case BROWSER_NAVIGATE_HOME:
@@ -1866,6 +1891,10 @@
ro_gui_menu_get_window_details(owner, &g, &bw, &c, &t, &tree);
if (current_menu_open)
checksum = ro_gui_menu_get_checksum();
+ if (!c) {
+ current_menu_object = NULL;
+ current_menu_url = NULL;
+ }
switch (action) {
@@ -1919,9 +1948,8 @@
/* page actions */
case BROWSER_PAGE:
ro_gui_menu_set_entry_shaded(current_menu,
- action, !(c && (c->type == CONTENT_HTML ||
- c->type == CONTENT_TEXTPLAIN)
- && !current_menu_object_box));
+ action, !c || (c->type != CONTENT_HTML &&
+ c->type != CONTENT_TEXTPLAIN));
break;
case BROWSER_PAGE_INFO:
ro_gui_menu_set_entry_shaded(current_menu,
@@ -1953,39 +1981,35 @@
/* object actions */
case BROWSER_OBJECT:
ro_gui_menu_set_entry_shaded(current_menu, action,
- !(c && c->type == CONTENT_HTML &&
- (current_menu_object_box || current_menu_link_box)));
- break;
-
+ !current_menu_object && !current_menu_url);
+ break;
+
+ case BROWSER_OBJECT_LINK:
+ ro_gui_menu_set_entry_shaded(current_menu, action,
+ !current_menu_url);
+ break;
+
+ case BROWSER_OBJECT_INFO:
+ if (windows && current_menu_object)
+ ro_gui_menu_prepare_objectinfo(current_menu_object,
+ current_menu_url);
+ /* Fall through */
+ case BROWSER_OBJECT_RELOAD:
case BROWSER_OBJECT_OBJECT:
ro_gui_menu_set_entry_shaded(current_menu, action,
- !(c && c->type == CONTENT_HTML && current_menu_object_box));
- break;
- case BROWSER_OBJECT_LINK:
- ro_gui_menu_set_entry_shaded(current_menu, action,
- !(c && c->type == CONTENT_HTML && current_menu_link_box));
- break;
-
- case BROWSER_OBJECT_INFO:
- if ((windows) && (current_menu_object_box))
- ro_gui_menu_prepare_objectinfo(
- current_menu_object_box);
- /* Fall through */
- case BROWSER_OBJECT_RELOAD:
- ro_gui_menu_set_entry_shaded(current_menu, action,
- !(current_menu_object_box ||
- (c && c->type != CONTENT_HTML && c->type != CONTENT_TEXTPLAIN)));
+ !current_menu_object);
+ break;
+
+ case BROWSER_OBJECT_PRINT:
+ /* not yet implemented */
+ ro_gui_menu_set_entry_shaded(current_menu, action, true);
break;
/* save actions (browser, hotlist, history) */
case BROWSER_OBJECT_SAVE:
- if (c && c->type == CONTENT_HTML) {
- c = current_menu_object_box ?
- current_menu_object_box->object : NULL;
- }
- ro_gui_menu_set_entry_shaded(current_menu,
- action, !c);
- if ((c) && (windows))
+ ro_gui_menu_set_entry_shaded(current_menu,
+ action, !current_menu_object);
+ if (windows && current_menu_object)
ro_gui_save_prepare(GUI_SAVE_OBJECT_ORIG, c, NULL, NULL, NULL);
break;
case BROWSER_OBJECT_EXPORT:
@@ -1994,8 +2018,8 @@
bool exp_sprite = false;
bool exp_draw = false;
- if (c && c->type == CONTENT_HTML && current_menu_object_box)
- c = current_menu_object_box->object;
+ if (current_menu_object)
+ c = current_menu_object;
if (c) {
switch (c->type) {
@@ -2054,11 +2078,9 @@
case BROWSER_LINK_SAVE_URI:
case BROWSER_LINK_SAVE_URL:
case BROWSER_LINK_SAVE_TEXT:
- if (c && (c->type != CONTENT_HTML || !current_menu_link_box))
- c = NULL;
- ro_gui_menu_set_entry_shaded(current_menu,
- action, !c);
- if ((c) && (windows)) {
+ ro_gui_menu_set_entry_shaded(current_menu,
+ action, !current_menu_url);
+ if (windows && current_menu_url) {
gui_save_type save_type;
switch (action) {
case BROWSER_LINK_SAVE_URI:
@@ -2072,7 +2094,7 @@
break;
}
ro_gui_save_prepare(save_type, NULL, NULL,
- current_menu_link_box->href, NULL);
+ current_menu_url, NULL);
}
break;
@@ -2131,10 +2153,8 @@
ro_gui_save_prepare(GUI_SAVE_TEXT, c, NULL, NULL, NULL);
break;
case BROWSER_OBJECT_SAVE_URL_URI:
- if (c && c->type == CONTENT_HTML) {
- c = current_menu_object_box ?
- current_menu_object_box->object : NULL;
- }
+ if (c && c->type == CONTENT_HTML)
+ c = current_menu_object;
/* Fall through */
case BROWSER_SAVE_URL_URI:
ro_gui_menu_set_entry_shaded(current_menu,
@@ -2144,10 +2164,8 @@
c->url, c->title);
break;
case BROWSER_OBJECT_SAVE_URL_URL:
- if (c && c->type == CONTENT_HTML) {
- c = current_menu_object_box ?
- current_menu_object_box->object : NULL;
- }
+ if (c && c->type == CONTENT_HTML)
+ c = current_menu_object;
/* Fall through */
case BROWSER_SAVE_URL_URL:
ro_gui_menu_set_entry_shaded(current_menu,
@@ -2157,10 +2175,7 @@
c->url, c->title);
break;
case BROWSER_OBJECT_SAVE_URL_TEXT:
- if (c && c->type == CONTENT_HTML) {
- c = current_menu_object_box ?
- current_menu_object_box->object : NULL;
- }
+ c = current_menu_object;
/* Fall through */
case BROWSER_SAVE_URL_TEXT:
ro_gui_menu_set_entry_shaded(current_menu,
Modified: trunk/netsurf/riscos/menus.h
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/menus.h?rev=6327&r...
==============================================================================
--- trunk/netsurf/riscos/menus.h (original)
+++ trunk/netsurf/riscos/menus.h Sat Jan 31 20:19:01 2009
@@ -67,6 +67,7 @@
BROWSER_OBJECT_OBJECT,
BROWSER_OBJECT_LINK,
BROWSER_OBJECT_INFO,
+ BROWSER_OBJECT_PRINT,
BROWSER_OBJECT_RELOAD,
BROWSER_LINK_SAVE,
BROWSER_LINK_DOWNLOAD,
@@ -100,6 +101,8 @@
BROWSER_SELECTION_COPY,
BROWSER_SELECTION_CUT,
BROWSER_SELECTION_PASTE,
+ BROWSER_SELECTION_CLEAR,
+ BROWSER_SELECTION_ALL,
/* navigation actions */
BROWSER_NAVIGATE_HOME,
14 years, 7 months
- 1
- 0