mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[project @ 2003-12-26 22:12:39 by jmb] 

Move constant global data into a new file. This makes things a bit
tidier.
Add help: and home: shortcut URLs.

svn path=/import/netsurf/; revision=449
This commit is contained in:
John Mark Bell 2003-12-26 22:12:39 +00:00
parent d49a18d608
commit 93dfe6dfe8
7 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefile
View File

@ -13,7 +13,7 @@ OBJECTS_COMMON = cache.o content.o fetch.o fetchcache.o other.o \
OBJECTS = $(OBJECTS_COMMON) \
browser.o loginlist.o netsurf.o \
htmlinstance.o htmlredraw.o \
401login.o dialog.o download.o frames.o gui.o \
401login.o constdata.o dialog.o download.o frames.o gui.o \
menus.o mouseactions.o \
options.o textselection.o theme.o window.o \
draw.o gif.o jpeg.o plugin.o png.o sprite.o \

15
riscos/401login.c
View File

@ -106,11 +106,16 @@ void ro_gui_401login_open(char *host, char* realm, char *fetchurl)
bool ro_gui_401login_keypress(wimp_key *key) {
if (key->c == wimp_KEY_RETURN) {
get_unamepwd();
ro_gui_dialog_close(dialog_401li);
browser_window_open_location(bwin, url);
return true;
switch (key->c) {
case wimp_KEY_RETURN:
get_unamepwd();
ro_gui_dialog_close(dialog_401li);
browser_window_open_location(bwin, url);
return true;
case wimp_KEY_ESCAPE:
ro_gui_dialog_close(dialog_401li);
break;
default: break;
}
return false;

6
riscos/dialog.c
View File

@ -16,17 +16,13 @@
#include "oslib/osspriteop.h"
#include "oslib/wimp.h"
#include "netsurf/desktop/netsurf.h"
#include "netsurf/riscos/constdata.h"
#include "netsurf/riscos/gui.h"
#include "netsurf/riscos/options.h"
#include "netsurf/utils/log.h"
#include "netsurf/utils/messages.h"
#include "netsurf/utils/utils.h"
#define GESTURES_URL "file:///%3CNetSurf$Dir%3E/Resources/gestures"
#define THEMES_URL "http://netsurf.sourceforge.net/themes/"
wimp_w dialog_info, dialog_saveas, dialog_config, dialog_config_br,
dialog_config_prox, dialog_config_th, download_template,
dialog_401li;

3
riscos/gui.c
View File

@ -26,6 +26,7 @@
#include "netsurf/render/form.h"
#include "netsurf/render/html.h"
#include "netsurf/riscos/about.h"
#include "netsurf/riscos/constdata.h"
#include "netsurf/riscos/gui.h"
#include "netsurf/riscos/plugin.h"
#include "netsurf/riscos/theme.h"
@ -36,8 +37,6 @@
const char *__dynamic_da_name = "NetSurf"; /**< For UnixLib. */
const char *HOME_URL = "file:///%3CNetSurf$Dir%3E/Docs/en/intro";
const char *HELP_URL = "file:///%3CNetSurf$Dir%3E/Docs/en/index";
char *NETSURF_DIR;
wimp_menu *combo_menu;

1
riscos/gui.h
View File

@ -25,7 +25,6 @@ extern wimp_menu *current_menu, *iconbar_menu, *browser_menu,
*combo_menu, *theme_menu;
extern int current_menu_x, current_menu_y, iconbar_menu_height;
extern struct form_control *current_gadget;
extern const char *HOME_URL;
extern gui_window *window_list;
extern bool gui_reformat_pending;

1
riscos/menus.c
View File

@ -11,6 +11,7 @@
#include <string.h>
#include "oslib/wimp.h"
#include "netsurf/desktop/gui.h"
#include "netsurf/riscos/constdata.h"
#include "netsurf/riscos/gui.h"
#include "netsurf/riscos/theme.h"
#include "netsurf/utils/log.h"

9
riscos/window.c
View File

@ -16,6 +16,7 @@
#include "oslib/wimp.h"
#include "oslib/wimpspriteop.h"
#include "netsurf/riscos/about.h"
#include "netsurf/riscos/constdata.h"
#include "netsurf/riscos/gui.h"
#include "netsurf/riscos/theme.h"
#include "netsurf/utils/log.h"
@ -703,7 +704,13 @@ bool ro_gui_window_keypress(gui_window *g, int key, bool toolbar)
if (strcasecmp(g->url, "about:") == 0) {
about_create();
browser_window_open_location(g->data.browser.bw,
"file:///%3CWimp$ScrapDir%3E/WWW/NetSurf/About");
ABOUT_URL);
} else if (strcasecmp(g->url, "help:") == 0) {
browser_window_open_location(g->data.browser.bw,
HELP_URL);
} else if (strcasecmp(g->url, "home:") == 0) {
browser_window_open_location(g->data.browser.bw,
HOME_URL);
} else {
char *url = xcalloc(1, 10 + strlen(g->url));
char *url2;