mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-11 13:29:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

[project @ 2004-03-27 18:46:08 by bursa]

Browse Source 
Save complete gui and F3 etc.

svn path=/import/netsurf/; revision=677
This commit is contained in:
James Bursa 2004-03-27 18:46:08 +00:00
parent b5cd93fb6b
commit 74b1c3986b
3 changed files with 112 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
riscos/gui.h
View File

@ -31,7 +31,8 @@ extern bool gui_redraw_debug;
extern gui_window *current_gui;
typedef enum { GUI_BROWSER_WINDOW, GUI_DOWNLOAD_WINDOW } gui_window_type;
typedef enum { GUI_SAVE_SOURCE, GUI_SAVE_DRAW, GUI_SAVE_TEXT } gui_save_type;
typedef enum { GUI_SAVE_SOURCE, GUI_SAVE_DRAW, GUI_SAVE_TEXT,
GUI_SAVE_COMPLETE } gui_save_type;
extern gui_save_type gui_current_save_type;
typedef enum { GUI_DRAG_SELECTION, GUI_DRAG_DOWNLOAD_SAVE,
GUI_DRAG_SAVE } gui_drag_type;
@ -93,6 +94,7 @@ void ro_gui_create_menu(wimp_menu* menu, int x, int y, gui_window* g);
void ro_gui_popup_menu(wimp_menu *menu, wimp_w w, wimp_i i);
void ro_gui_menu_selection(wimp_selection* selection);
void ro_gui_menu_warning(wimp_message_menu_warning *warning);
void ro_gui_menu_prepare_save(struct content *c);
/* in dialog.c */
void ro_gui_dialog_init(void);

94
riscos/menus.c
View File

@ -57,11 +57,12 @@ static wimp_MENU(2) export_menu = {
};
static wimp_menu *browser_export_menu = (wimp_menu *) &export_menu;
static wimp_MENU(4) page_menu = {
static wimp_MENU(5) page_menu = {
{ "Page" }, 7,2,7,0, 200, 44, 0,
{
{ 0, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "Info" } },
{ wimp_MENU_GIVE_WARNING, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "Save" } },
{ wimp_MENU_GIVE_WARNING, wimp_NO_SUB_MENU, DEFAULT_FLAGS, { "SaveComp" } },
{ 0, (wimp_menu *) &export_menu, DEFAULT_FLAGS, { "Export" } },
{ wimp_MENU_LAST, wimp_NO_SUB_MENU, DEFAULT_FLAGS | wimp_ICON_SHADED, { "Print" } }
}
@ -125,6 +126,7 @@ void ro_gui_menus_init(void)
iconbar_menu->entries[0].sub_menu = (wimp_menu *) dialog_info;
browser_page_menu->entries[1].sub_menu = (wimp_menu *) dialog_saveas;
browser_page_menu->entries[2].sub_menu = (wimp_menu *) dialog_saveas;
browser_export_menu->entries[0].sub_menu = (wimp_menu *) dialog_saveas;
browser_export_menu->entries[1].sub_menu = (wimp_menu *) dialog_saveas;
browser_view_menu->entries[0].sub_menu = (wimp_menu *) dialog_zoom;
@ -230,9 +232,11 @@ void ro_gui_menu_selection(wimp_selection *selection)
break;
case 1: /* Save */
break;
case 2: /* Export */
case 2: /* Save complete */
break;
case 3: /* Print */
case 3: /* Export */
break;
case 4: /* Print */
break;
}
break;
@ -288,45 +292,36 @@ void ro_gui_menu_selection(wimp_selection *selection)
void ro_gui_menu_warning(wimp_message_menu_warning *warning)
{
char icon[20] = "file_xxx";
struct content *c = current_gui->data.browser.bw->current_content;
os_error *error;
if (warning->selection.items[0] != 0)
return;
switch (warning->selection.items[2]) {
case 0: /* Export as -> Draw */
gui_current_save_type = GUI_SAVE_DRAW;
ro_gui_set_icon_string(dialog_saveas,
ICON_SAVE_ICON, "file_aff");
ro_gui_set_icon_string(dialog_saveas,
ICON_SAVE_PATH,
messages_get("SaveDraw"));
break;
case 1: /* Export as -> Text */
gui_current_save_type = GUI_SAVE_TEXT;
ro_gui_set_icon_string(dialog_saveas,
ICON_SAVE_ICON, "file_fff");
ro_gui_set_icon_string(dialog_saveas,
ICON_SAVE_PATH,
messages_get("SaveText"));
switch (warning->selection.items[1]) {
case 3: /* Export as -> */
switch (warning->selection.items[2]) {
case 0: /* Draw */
gui_current_save_type = GUI_SAVE_DRAW;
break;
case 1: /* Text */
gui_current_save_type = GUI_SAVE_TEXT;
break;
}
case 2: /* Save complete */
gui_current_save_type = GUI_SAVE_COMPLETE;
break;
case -1:
case 1:
default: /* Save */
gui_current_save_type = GUI_SAVE_SOURCE;
if (c)
sprintf(icon, "file_%x",
ro_content_filetype(c));
ro_gui_set_icon_string(dialog_saveas,
ICON_SAVE_ICON, icon);
ro_gui_set_icon_string(dialog_saveas,
ICON_SAVE_PATH,
messages_get("SaveSource"));
break;
}
ro_gui_menu_prepare_save(c);
error = xwimp_create_sub_menu((wimp_menu *) dialog_saveas,
warning->pos.x, warning->pos.y);
if (error) {
@ -334,3 +329,44 @@ void ro_gui_menu_warning(wimp_message_menu_warning *warning)
warn_user(error->errmess);
}
}
/**
* Prepares the save box to reflect gui_current_save_type and a content.
*
* \param c content to save
*/
void ro_gui_menu_prepare_save(struct content *c)
{
char icon_buf[20] = "file_xxx";
const char *icon = icon_buf;
const char *name;
switch (gui_current_save_type) {
case GUI_SAVE_SOURCE:
if (c)
sprintf(icon_buf, "file_%x",
ro_content_filetype(c));
name = messages_get("SaveSource");
break;
case GUI_SAVE_DRAW:
icon = "file_aff";
name = messages_get("SaveDraw");
break;
case GUI_SAVE_TEXT:
icon = "file_fff";
name = messages_get("SaveText");
break;
case GUI_SAVE_COMPLETE:
icon = "file_faf";
name = messages_get("SaveComplete");
break;
}
ro_gui_set_icon_string(dialog_saveas, ICON_SAVE_ICON, icon);
ro_gui_set_icon_string(dialog_saveas, ICON_SAVE_PATH, name);
}

59
riscos/window.c
View File

@ -729,12 +729,23 @@ void gui_window_place_caret(gui_window *g, int x, int y, int height)
/**
* Process Key_Pressed events in a browser window.
*/
bool ro_gui_window_keypress(gui_window *g, int key, bool toolbar)
{
struct content *content = g->data.browser.bw->current_content;
wimp_window_state state;
int y;
char *url;
os_error *error;
wimp_pointer pointer;
error = xwimp_get_pointer_info(&pointer);
if (error) {
LOG(("xwimp_get_pointer_info: 0x%x: %s\n",
error->errnum, error->errmess));
warn_user(error->errmess);
return false;
}
assert(g->type == GUI_BROWSER_WINDOW);
@ -786,21 +797,39 @@ bool ro_gui_window_keypress(gui_window *g, int key, bool toolbar)
#endif
);
return true;
#ifdef WITH_TEXT_EXPORT
case wimp_KEY_CONTROL + wimp_KEY_F3:
/* save_as_text(g->data.browser.bw->current_content);*/
return true;
#endif
#ifdef WITH_SAVE_COMPLETE
case wimp_KEY_SHIFT + wimp_KEY_F3:
save_complete(g->data.browser.bw->current_content);
return true;
#endif
#ifdef WITH_DRAW_EXPORT
case wimp_KEY_SHIFT + wimp_KEY_CONTROL + wimp_KEY_F3:
/* save_as_draw(g->data.browser.bw->current_content); */
return true;
#endif
case wimp_KEY_F3:
current_gui = g;
gui_current_save_type = GUI_SAVE_SOURCE;
ro_gui_menu_prepare_save(content);
/** \todo make save window persistent */
xwimp_create_menu((wimp_menu *) dialog_saveas,
pointer.pos.x, pointer.pos.y);
break;
case wimp_KEY_CONTROL + wimp_KEY_F3:
current_gui = g;
gui_current_save_type = GUI_SAVE_TEXT;
ro_gui_menu_prepare_save(content);
xwimp_create_menu((wimp_menu *) dialog_saveas,
pointer.pos.x, pointer.pos.y);
break;
case wimp_KEY_SHIFT + wimp_KEY_F3:
current_gui = g;
gui_current_save_type = GUI_SAVE_COMPLETE;
ro_gui_menu_prepare_save(content);
xwimp_create_menu((wimp_menu *) dialog_saveas,
pointer.pos.x, pointer.pos.y);
break;
case wimp_KEY_CONTROL + wimp_KEY_SHIFT + wimp_KEY_F3:
current_gui = g;
gui_current_save_type = GUI_SAVE_DRAW;
ro_gui_menu_prepare_save(content);
xwimp_create_menu((wimp_menu *) dialog_saveas,
pointer.pos.x, pointer.pos.y);
break;
case wimp_KEY_RETURN:
if (!toolbar)