changeset 282:87f5a4a8c91b

- Minor cleanups.
author jcid
date Wed, 18 Jun 2008 21:59:47 +0200
parents 30963ebac871
children f97319b762d2
files dillorc2 dpid/dpi_socket_dir.c src/dicache.c src/findbar.hh src/html.cc src/prefs.c src/prefs.h
diffstat 7 files changed, 2 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/dillorc2	Wed Jun 18 15:05:10 2008 +0200
+++ b/dillorc2	Wed Jun 18 21:59:47 2008 +0200
@@ -12,10 +12,6 @@
 #geometry=650x545+0+20
 geometry=780x580
 
-# Dicache is where the Decompressed Images are cached (not the original ones).
-# If you have a lot of memory and a slow CPU, use YES, otherwise use NO
-use_dicache=NO
-
 # Uncomment if you want to have text-only browsing from the start.
 # (there's a toggle button near the bug meter to change this on-the-fly)
 #load_images=NO
--- a/dpid/dpi_socket_dir.c	Wed Jun 18 15:05:10 2008 +0200
+++ b/dpid/dpi_socket_dir.c	Wed Jun 18 21:59:47 2008 +0200
@@ -79,7 +79,7 @@
 {
    char *template, *logname;
 
-   logname = getenv("LOGNAME") ? getenv("LOGNAME") : "joe";
+   logname = getenv("LOGNAME") ? getenv("LOGNAME") : "dillo";
    template = dStrconcat("/tmp/", logname, "-", "XXXXXX", NULL);
    if (a_Misc_mkdtemp(template) == NULL) {
       ERRMSG("mk_sockdir", "a_Misc_mkdtemp", 0);
--- a/src/dicache.c	Wed Jun 18 15:05:10 2008 +0200
+++ b/src/dicache.c	Wed Jun 18 21:59:47 2008 +0200
@@ -18,7 +18,6 @@
 #include "web.hh"
 #include "dicache.h"
 #include "cache.h"
-#include "prefs.h"
 
 typedef struct _DICacheNode DICacheNode;
 
--- a/src/findbar.hh	Wed Jun 18 15:05:10 2008 +0200
+++ b/src/findbar.hh	Wed Jun 18 21:59:47 2008 +0200
@@ -1,14 +1,12 @@
 #ifndef __FINDBAR_HH__
 #define __FINDBAR_HH__
 
-//#include <fltk/Window.h>
 #include <fltk/Widget.h>
 #include <fltk/HighlightButton.h>
 #include <fltk/Button.h>
 #include <fltk/Input.h>
 #include <fltk/Group.h>
 #include <fltk/CheckButton.h>
-#include <fltk/ReturnButton.h>
 
 // simple declaration to avoid circular include
 class UI;
--- a/src/html.cc	Wed Jun 18 15:05:10 2008 +0200
+++ b/src/html.cc	Wed Jun 18 21:59:47 2008 +0200
@@ -2104,6 +2104,7 @@
    }
    style_attrs.textDecoration |= TEXT_DECORATION_UNDERLINE;
    style_attrs.x_link = Html_set_new_link(html, &url);
+   style_attrs.cursor = CURSOR_POINTER;
    link_style = Style::create (HT2LT(html), &style_attrs);
 
    textblock->addParbreak (5, S_TOP(html)->style);
--- a/src/prefs.c	Wed Jun 18 15:05:10 2008 +0200
+++ b/src/prefs.c	Wed Jun 18 21:59:47 2008 +0200
@@ -102,7 +102,6 @@
    DRC_TOKEN_STANDARD_WIDGET_COLORS,
    DRC_TOKEN_START_PAGE,
    DRC_TOKEN_TEXT_COLOR,
-   DRC_TOKEN_USE_DICACHE,
    DRC_TOKEN_VISITED_COLOR,
    DRC_TOKEN_VW_FONT,
    DRC_TOKEN_W3C_PLUS_HEURISTICS
@@ -161,7 +160,6 @@
    { "standard_widget_colors", DRC_TOKEN_STANDARD_WIDGET_COLORS },
    { "start_page", DRC_TOKEN_START_PAGE },
    { "text_color", DRC_TOKEN_TEXT_COLOR },
-   { "use_dicache", DRC_TOKEN_USE_DICACHE },
    { "visited_color", DRC_TOKEN_VISITED_COLOR, },
    { "vw_fontname", DRC_TOKEN_VW_FONT },
    { "w3c_plus_heuristics", DRC_TOKEN_W3C_PLUS_HEURISTICS }
@@ -275,9 +273,6 @@
    case DRC_TOKEN_W3C_PLUS_HEURISTICS:
       prefs.w3c_plus_heuristics = (strcmp(value,"YES") == 0);
       break;
-   case DRC_TOKEN_USE_DICACHE:
-      prefs.use_dicache = (strcmp(value, "YES") == 0);
-      break;
    case DRC_TOKEN_SHOW_BACK:
       prefs.show_back = (strcmp(value, "YES") == 0);
       break;
@@ -425,7 +420,6 @@
    prefs.limit_text_width = FALSE;
    prefs.w3c_plus_heuristics = TRUE;
    prefs.font_factor = 1.0;
-   prefs.use_dicache = FALSE;
    prefs.show_back=TRUE;
    prefs.show_forw=TRUE;
    prefs.show_home=TRUE;
--- a/src/prefs.h	Wed Jun 18 15:05:10 2008 +0200
+++ b/src/prefs.h	Wed Jun 18 21:59:47 2008 +0200
@@ -37,7 +37,6 @@
    bool_t limit_text_width;
    bool_t w3c_plus_heuristics;
    double font_factor;
-   bool_t use_dicache;
    bool_t show_back;
    bool_t show_forw;
    bool_t show_home;