merge

13 files changed, 25 insertions, 20 deletions

diff --git a/dpi/cookies.c b/dpi/cookies.c
index a5142224..5e85eefb 100644
--- a/dpi/cookies.c
+++ b/dpi/cookies.c
@@ -13,8 +13,11 @@
  *
  */
 
-/* This is written to follow the HTTP State Working Group's
- * draft-ietf-httpstate-cookie-01.txt.
+/* This is written to follow the HTTP State Working Group's cookie draft
+ * standard, as of the version somewhere in the general neighbourhood of
+ * draft-ietf-httpstate-cookie-05.txt.
+ * TODO: They eventually succeeded in getting RFC 6265 out. What differences
+ * are there?
  *
  * Info on cookies in the wild:
  *  http://www.ietf.org/mail-archive/web/http-state/current/msg00078.html
diff --git a/dw/fltkcomplexbutton.cc b/dw/fltkcomplexbutton.cc
index 211a37e8..39257bde 100644
--- a/dw/fltkcomplexbutton.cc
+++ b/dw/fltkcomplexbutton.cc
@@ -126,7 +126,7 @@ int ComplexButton::handle(int event) {
     return 1;
   case FL_SHORTCUT:
     if (!(shortcut() ?
-          Fl::test_shortcut(shortcut()) : test_shortcut())) return 0;    
+          Fl::test_shortcut(shortcut()) : test_shortcut())) return 0;
     if (Fl::visible_focus() && handle(FL_FOCUS)) Fl::focus(this);
     goto triggered_by_keyboard;
   case FL_FOCUS : /* FALLTHROUGH */
diff --git a/dw/fltkcomplexbutton.hh b/dw/fltkcomplexbutton.hh
index 6266694a..e4ca2e2b 100644
--- a/dw/fltkcomplexbutton.hh
+++ b/dw/fltkcomplexbutton.hh
@@ -23,7 +23,7 @@
 #include <FL/Fl_Group.H>
 
 // values for type()
-#define FL_NORMAL_BUTTON	0   /**< value() will be set to 1 during the press of the button and 
+#define FL_NORMAL_BUTTON	0   /**< value() will be set to 1 during the press of the button and
                                          reverts back to 0 when the button is released */
 #define FL_TOGGLE_BUTTON	1   ///< value() toggles between 0 and 1 at every click of the button
 #define FL_RADIO_BUTTON		(FL_RESERVED_TYPE+2) /**< is set to 1 at button press, and all other
@@ -49,7 +49,7 @@ protected:
   static Fl_Widget_Tracker *key_release_tracker;
   static void key_release_timeout(void*);
   void simulate_key_action();
-  
+
   virtual void draw();
 
 public:
diff --git a/dw/fltkui.cc b/dw/fltkui.cc
index f79dea80..4c303e37 100644
--- a/dw/fltkui.cc
+++ b/dw/fltkui.cc
@@ -980,7 +980,7 @@ Fl_Menu_Item *FltkOptionMenuResource::newItem()
 
    return item;
 }
-   
+
 void FltkOptionMenuResource::addItem (const char *str,
                                       bool enabled, bool selected)
 {
@@ -1022,7 +1022,7 @@ void FltkOptionMenuResource::popGroup ()
 
 bool FltkOptionMenuResource::isSelected (int index)
 {
-   return index == (int) ((Fl_Choice *)widget)->mvalue()->user_data();
+   return index == (long) ((Fl_Choice *)widget)->mvalue()->user_data();
 }
 
 int FltkOptionMenuResource::getNumberOfItems()
diff --git a/dw/fltkviewbase.cc b/dw/fltkviewbase.cc
index de974578..eaaae1c4 100644
--- a/dw/fltkviewbase.cc
+++ b/dw/fltkviewbase.cc
@@ -143,7 +143,7 @@ void FltkViewBase::draw (const core::Rectangle *rect,
    // fl_clip_box() can't handle values greater than SHRT_MAX!
    if (X > x () + w () || Y > y () + h ())
       return;
-   
+
    W = X + rect->width > x () + w () ? x () + w () - X : rect->width;
    H = Y + rect->height > y () + h () ? y () + h () - Y : rect->height;
 
@@ -288,7 +288,7 @@ int FltkViewBase::handle (int event)
    case FL_UNFOCUS:
       focused_child = fl_oldfocus;
       return 0;
-      
+
    default:
       return Fl_Group::handle (event);
    }
diff --git a/dw/fltkviewbase.hh b/dw/fltkviewbase.hh
index 4fb7df9d..b1b6c4ab 100644
--- a/dw/fltkviewbase.hh
+++ b/dw/fltkviewbase.hh
@@ -23,7 +23,7 @@ private:
 
       public:
          Fl_Offscreen offscreen;
-      
+
          BackBuffer ();
          ~BackBuffer ();
          void setSize(int w, int h);
diff --git a/dw/fltkviewport.cc b/dw/fltkviewport.cc
index 135550e8..9e75932f 100644
--- a/dw/fltkviewport.cc
+++ b/dw/fltkviewport.cc
@@ -147,7 +147,7 @@ void FltkViewport::hscrollbarCallback (Fl_Widget *hscrollbar,void *viewportPtr)
 
 // ----------------------------------------------------------------------
 
-void FltkViewport::resize(int X, int Y, int W, int H) 
+void FltkViewport::resize(int X, int Y, int W, int H)
 {
    bool dimension_changed = W != w() || H != h();
 
diff --git a/src/cssparser.cc b/src/cssparser.cc
index aa4cea56..1075ef63 100644
--- a/src/cssparser.cc
+++ b/src/cssparser.cc
@@ -1522,7 +1522,7 @@ const char * CssParser::propertyNameString(CssPropertyName name)
 {
    return Css_property_info[name].symbol;
 }
- 
+
 void CssParser::ignoreBlock()
 {
    int depth = 0;
diff --git a/src/form.cc b/src/form.cc
index 18441fb8..bf1f8e33 100644
--- a/src/form.cc
+++ b/src/form.cc
@@ -249,7 +249,9 @@ static void Html_add_input(DilloHtml *html, DilloHtmlInputType type,
       html->inputs_outside_form->increase();
       html->inputs_outside_form->set(ni, input);
 
-      input->setEnabled(false);
+      if (html->bw->NumPendingStyleSheets > 0) {
+         input->setEnabled(false);
+      }
    }
 }
 
diff --git a/src/html.cc b/src/html.cc
index ede391a3..c3235209 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -2880,7 +2880,7 @@ static void Html_tag_open_meta(DilloHtml *html, const char *tag, int tagsize)
 
          if (a_Url_cmp(html->base_url, new_url) == 0) {
             /* redirection loop, or empty url string: ignore */
-            BUG_MSG("META refresh: %s\n", 
+            BUG_MSG("META refresh: %s\n",
                     *mr_url ? "redirection loop" : "no target URL");
          } else if (delay == 0) {
             /* zero-delay redirection */
diff --git a/src/menu.cc b/src/menu.cc
index fa725931..d054a917 100644
--- a/src/menu.cc
+++ b/src/menu.cc
@@ -505,8 +505,8 @@ void a_Menu_bugmeter_popup(BrowserWindow *bw, const DilloUrl *url)
       {"Validate URL with WDG", 0, Menu_bugmeter_validate_wdg_cb, 0,
        FL_MENU_DIVIDER,0,0,0,0},
       {"About bug meter", 0, Menu_bugmeter_about_cb,0,0,0,0,0,0},
-      {0,0,0,0,0,0,0,0,0}     
-   };      
+      {0,0,0,0,0,0,0,0,0}
+   };
 
    popup_x = Fl::event_x();
    popup_y = Fl::event_y();
@@ -620,7 +620,7 @@ void a_Menu_tools_popup(BrowserWindow *bw, void *v_wid)
       {"Use remote CSS", 0, Menu_remote_css_cb, 0, FL_MENU_TOGGLE,0,0,0,0},
       {"Use embedded CSS", 0, Menu_embedded_css_cb, 0,
        FL_MENU_TOGGLE|FL_MENU_DIVIDER,0,0,0,0},
-      {"Load images", 0, Menu_imgload_toggle_cb, 0, 
+      {"Load images", 0, Menu_imgload_toggle_cb, 0,
        FL_MENU_TOGGLE|FL_MENU_DIVIDER,0,0,0,0},
       {"Panel size", 0, 0, (void*)"Submenu1", FL_SUBMENU,0,0,0,0},
          {"tiny",  0,Menu_panel_change_cb,(void*)0,FL_MENU_RADIO,0,0,0,0},
diff --git a/src/ui.cc b/src/ui.cc
index 5ca58e8e..a8a802fb 100644
--- a/src/ui.cc
+++ b/src/ui.cc
@@ -707,7 +707,7 @@ UI::UI(int x, int y, int ui_w, int ui_h, const char* label, const UI *cur_ui) :
    // Control panel
    TopGroup->begin();
     make_panel(ui_w);
- 
+
     // Render area
     int main_h = ui_h - (mh+(LocBar?lh:0)+nh+fh+sh);
     Main = new Fl_Group(0,0,0,main_h,"Welcome...");
@@ -721,7 +721,7 @@ UI::UI(int x, int y, int ui_w, int ui_h, const char* label, const UI *cur_ui) :
     TopGroup->add(Main);
     TopGroup->resizable(Main);
     MainIdx = TopGroup->find(Main);
- 
+
     // Find text bar
     FindBarSpace = 1;
     FindBar = new Findbar(ui_w, fh);
diff --git a/src/uicmd.cc b/src/uicmd.cc
index 02747e48..415f0d3b 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -305,7 +305,7 @@ void CustTabs::set_tab_label(UI *ui, const char *label)
 {
    char title[128];
    int idx = get_btn_idx(ui);
- 
+
    if (idx > 0) {
       // Make a label for this tab
       size_t tab_chars = 7, label_len = strlen(label);