diff options
Diffstat (limited to 'src/dillo.cc')
| -rw-r--r-- | src/dillo.cc | 319 |
1 files changed, 284 insertions, 35 deletions
diff --git a/src/dillo.cc b/src/dillo.cc index 7e29ac32..a42b0dab 100644 --- a/src/dillo.cc +++ b/src/dillo.cc @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <stdio.h> @@ -26,16 +25,19 @@ #include <fltk/Window.h> #include <fltk/TabGroup.h> +#include <fltk/Font.h> #include <fltk/run.h> #include "msg.h" -#include "dir.h" +#include "paths.hh" #include "uicmd.hh" #include "prefs.h" +#include "prefsparser.hh" +#include "keys.hh" #include "bw.h" #include "misc.h" -#include "nav.h" +#include "history.h" #include "dns.h" #include "web.hh" @@ -44,37 +46,174 @@ #include "capi.h" #include "dicache.h" #include "cookies.h" +#include "auth.h" +/* + * Command line options structure + */ +typedef enum { + DILLO_CLI_NONE = 0, + DILLO_CLI_XID = 1 << 0, + DILLO_CLI_FULLWINDOW = 1 << 1, + DILLO_CLI_HELP = 1 << 2, + DILLO_CLI_VERSION = 1 << 3, + DILLO_CLI_LOCAL = 1 << 4, + DILLO_CLI_GEOMETRY = 1 << 5, + DILLO_CLI_ERROR = 1 << 15, +} OptID; + +typedef struct { + const char *shortopt; + const char *longopt; + int opt_argc; /* positive: mandatory, negative: optional */ + OptID id; + const char *help; +} CLI_options; + +static const CLI_options Options[] = { + {"-f", "--fullwindow", 0, DILLO_CLI_FULLWINDOW, + " -f, --fullwindow Start in full window mode: hide address bar,\n" + " navigation buttons, menu, and status bar."}, + {"-g", "-geometry", 1, DILLO_CLI_GEOMETRY, + " -g, -geometry GEO Set initial window position where GEO is\n" + " WxH[{+-}X{+-}Y]"}, + {"-h", "--help", 0, DILLO_CLI_HELP, + " -h, --help Display this help text and exit."}, + {"-l", "--local", 0, DILLO_CLI_LOCAL, + " -l, --local Don't load images for these URL(s)."}, + {"-v", "--version", 0, DILLO_CLI_VERSION, + " -v, --version Display version info and exit."}, + {"-x", "--xid", 1, DILLO_CLI_XID, + " -x, --xid XID Open first Dillo window in an existing\n" + " window whose window ID is XID."}, + {NULL, NULL, 0, DILLO_CLI_NONE, NULL} +}; + +/* + * Print help text generated from the options structure + */ +static void printHelp(const char *cmdname, const CLI_options *options) +{ + printf("Usage: %s [OPTION]... [--] [URL|FILE]...\n" + "Options:\n", cmdname); + while (options && options->help) { + printf("%s\n", options->help); + options++; + } + printf(" URL URL to browse.\n" + " FILE Local FILE to view.\n" + "\n"); +} + +/* + * Return the maximum number of option arguments + */ +static int numOptions(const CLI_options *options) +{ + int i, max; + + for (i = 0, max = 0; options[i].shortopt; i++) + if (abs(options[i].opt_argc) > max) + max = abs(options[i].opt_argc); + return max; +} + +/* + * Get next command line option. + */ +static OptID getCmdOption(const CLI_options *options, int argc, char **argv, + char **opt_argv, int *idx) +{ + typedef enum { O_SEARCH, O_FOUND, O_NOTFOUND, O_DONE } State; + OptID opt_id = DILLO_CLI_NONE; + int i = 0; + State state = O_SEARCH; + + if (*idx >= argc) { + state = O_DONE; + } else { + state = O_NOTFOUND; + for (i = 0; options[i].shortopt; i++) { + if (strcmp(options[i].shortopt, argv[*idx]) == 0 || + strcmp(options[i].longopt, argv[*idx]) == 0) { + state = O_FOUND; + ++*idx; + break; + } + } + } + if (state == O_FOUND) { + int n_arg = options[i].opt_argc; + opt_id = options[i].id; + /* Find the required/optional arguments of the option */ + for (i = 0; *idx < argc && i < abs(n_arg) && argv[*idx][0] != '-'; i++) + opt_argv[i] = argv[(*idx)++]; + opt_argv[i] = NULL; + + /* Optional arguments have opt_argc < 0 */ + if (i < n_arg) { + fprintf(stderr, "Option %s requires %d argument%s\n", + argv[*idx-i-1], n_arg, (n_arg == 1) ? "" : "s"); + opt_id = DILLO_CLI_ERROR; + } + } + if (state == O_NOTFOUND) { + if (strcmp(argv[*idx], "--") == 0) + (*idx)++; + else if (argv[*idx][0] == '-') { + fprintf(stderr, "Command line option \"%s\" not recognized.\n", + argv[*idx]); + opt_id = DILLO_CLI_ERROR; + } + } + return opt_id; +} + +/* + * Tell the user if default/pref fonts can't be found. + */ +static void checkFont(const char *name, const char *type) +{ + if (::fltk::font(name) == NULL) + MSG_WARN("preferred %s font \"%s\" not found.\n", type, name); +} + +static void checkPreferredFonts() +{ + checkFont(prefs.font_sans_serif, "sans-serif"); + checkFont(prefs.font_serif, "serif"); + checkFont(prefs.font_monospace, "monospace"); + checkFont(prefs.font_cursive, "cursive"); + checkFont(prefs.font_fantasy, "fantasy"); +} /* * Given a command line argument, build a DilloUrl for it. */ -static DilloUrl *Dillo_make_start_url(char *str) +static DilloUrl *makeStartUrl(char *str, bool local) { char *url_str, *p; DilloUrl *start_url; - int is_file = FALSE; /* Relative path to a local file? */ - p = (*str == '/') ? dStrdup(str) : dStrconcat(a_Dir_get_owd(),"/",str,NULL); + p = (*str == '/') ? dStrdup(str) : + dStrconcat(Paths::getOldWorkingDir(), "/", str, NULL); if (access(p, F_OK) == 0) { /* absolute path may have non-URL characters */ url_str = a_Misc_escape_chars(p, "% "); - is_file = TRUE; + start_url = a_Url_new(url_str + 1, "file:/"); } else { /* Not a file, filter URL string */ url_str = a_Url_string_strip_delimiters(str); - } - dFree(p); - - if (is_file) { - start_url = a_Url_new(url_str + 1, "file:/"); - } else { start_url = a_Url_new(url_str, NULL); } + dFree(p); dFree(url_str); + if (local) + a_Url_set_flags(start_url, URL_FLAGS(start_url) | URL_SpamSafe); + return start_url; } @@ -83,15 +222,79 @@ static DilloUrl *Dillo_make_start_url(char *str) */ int main(int argc, char **argv) { + uint_t opt_id; + uint_t options_got = 0; + uint32_t xid = 0; + int idx = 1; + int xpos = PREFS_GEOMETRY_DEFAULT_XPOS, ypos = PREFS_GEOMETRY_DEFAULT_YPOS, + width = PREFS_GEOMETRY_DEFAULT_WIDTH, + height = PREFS_GEOMETRY_DEFAULT_HEIGHT; + char **opt_argv; + FILE *fp; + srand((uint_t)(time(0) ^ getpid())); // Some OSes exit dillo without this (not GNU/Linux). signal(SIGPIPE, SIG_IGN); - // Initialize internal modules - a_Dir_init(); + /* Handle command line options */ + opt_argv = dNew0(char*, numOptions(Options) + 1); + while ((opt_id = getCmdOption(Options, argc, argv, opt_argv, &idx))) { + options_got |= opt_id; + switch (opt_id) { + case DILLO_CLI_FULLWINDOW: + case DILLO_CLI_LOCAL: + break; + case DILLO_CLI_XID: + { + char *end; + xid = strtol(opt_argv[0], &end, 0); + if (*end) { + fprintf(stderr, "XID argument \"%s\" not valid.\n",opt_argv[0]); + return 2; + } + break; + } + case DILLO_CLI_GEOMETRY: + if (!a_Misc_parse_geometry(opt_argv[0],&xpos,&ypos,&width,&height)){ + fprintf(stderr, "geometry argument \"%s\" not valid. Must be of " + "the form WxH[{+-}X{+-}Y].\n", opt_argv[0]); + return 2; + } + break; + case DILLO_CLI_VERSION: + puts("Dillo version " VERSION); + return 0; + case DILLO_CLI_HELP: + printHelp(argv[0], Options); + return 0; + default: + printHelp(argv[0], Options); + return 2; + } + } + dFree(opt_argv); + + // set the default values for the preferences a_Prefs_init(); - a_Dir_check_dillorc_directory(); /* and create if not present */ + + // create ~/.dillo if not present + Paths::init(); + + // initialize default key bindings + Keys::init(); + + // parse dillorc + if ((fp = Paths::getPrefsFP(PATHS_RC_PREFS))) { + PrefsParser::parse(fp); + } + // parse keysrc + if ((fp = Paths::getPrefsFP(PATHS_RC_KEYS))) { + Keys::parse(fp); + } + dLib_show_messages(prefs.show_msg); + + // initialize internal modules a_Dpi_init(); a_Dns_init(); a_Web_init(); @@ -101,6 +304,17 @@ int main(int argc, char **argv) a_Dicache_init(); a_Bw_init(); a_Cookies_init(); + a_Auth_init(); + + /* command line options override preferences */ + if (options_got & DILLO_CLI_FULLWINDOW) + prefs.fullwindow_start = TRUE; + if (options_got & DILLO_CLI_GEOMETRY) { + prefs.width = width; + prefs.height = height; + prefs.xpos = xpos; + prefs.ypos = ypos; + } // Sets WM_CLASS hint on X11 fltk::Window::xclass("dillo"); @@ -108,9 +322,18 @@ int main(int argc, char **argv) // WORKAROUND: sometimes the default pager triggers redraw storms fltk::TabGroup::default_pager(fltk::PAGER_SHRINK); + checkPreferredFonts(); + /* use preferred font for UI */ + fltk::Font *dfont = fltk::font(prefs.font_sans_serif, 0); + if (dfont) { + fltk::Widget::default_style->textfont(dfont); + fltk::Widget::default_style->labelfont(dfont); + } + // Create a new UI/bw pair - BrowserWindow *bw = a_UIcmd_browser_window_new(0, 0, NULL); + BrowserWindow *bw = a_UIcmd_browser_window_new(0, 0, xid, NULL); + /* Proxy authentication */ if (prefs.http_proxyuser && !a_Http_proxy_auth()) { const char *passwd = a_UIcmd_get_passwd(prefs.http_proxyuser); if (passwd) { @@ -120,24 +343,50 @@ int main(int argc, char **argv) } } - if (argc == 2) { - DilloUrl *url = Dillo_make_start_url(argv[1]); - a_UIcmd_open_urlstr(bw, URL_STR(url)); - a_Url_free(url); - } else if (argc == 6) { - // WORKAROUND: sylpheed execs "dillo -l -f -x XID URL" - if (strcmp(argv[1], "-l") == 0 && strcmp(argv[2], "-f") == 0 && - strcmp(argv[3], "-x") == 0) { - a_UIcmd_set_images_enabled(bw, FALSE); - DilloUrl *url = Dillo_make_start_url(argv[5]); - a_Url_set_flags(url, URL_FLAGS(url) & URL_SpamSafe); - a_UIcmd_open_urlstr(bw, URL_STR(url)); - a_Url_free(url); - } + /* Open URLs/files */ + const bool local = options_got & DILLO_CLI_LOCAL; + + if (idx == argc) { + /* No URLs/files on cmdline. Send startup screen */ + a_UIcmd_open_url(bw, prefs.start_page); } else { - /* Send startup screen */ - a_Nav_push(bw, prefs.start_page); + for (int i = idx; i < argc; i++) { + DilloUrl *start_url = makeStartUrl(argv[i], local); + + if (i > idx) { + if (prefs.middle_click_opens_new_tab) { + /* user must prefer tabs */ + const int focus = 1; + a_UIcmd_open_url_nt(bw, start_url, focus); + } else { + a_UIcmd_open_url_nw(bw, start_url); + } + } else { + a_UIcmd_open_url(bw, start_url); + } + a_Url_free(start_url); + } } - return fltk::run(); + fltk::run(); + + /* + * Memory deallocating routines + * (This can be left to the OS, but we'll do it, with a view to test + * and fix our memory management) + */ + a_Cookies_freeall(); + a_Cache_freeall(); + a_Dicache_freeall(); + a_Http_freeall(); + a_Dns_freeall(); + a_History_freeall(); + a_Prefs_freeall(); + Keys::free(); + Paths::free(); + /* TODO: auth, css */ + + //a_Dpi_dillo_exit(); + MSG("Dillo: normal exit!\n"); + return 0; } |