- s/camp/field/ s/CAMP/FIELD/

7 files changed, 27 insertions, 23 deletions

diff --git a/src/cache.c b/src/cache.c
index d3b99c23..eeeb5162 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -144,7 +144,7 @@ static int Cache_client_make_key(void)
 
 /*
  * Add a client to ClientQueue.
- *  - Every client-camp is just a reference (except 'Web').
+ *  - Every client-field is just a reference (except 'Web').
  *  - Return a unique number for identifying the client.
  */
 static int Cache_client_enqueue(const DilloUrl *Url, DilloWeb *Web,
diff --git a/src/history.c b/src/history.c
index 4a02a79f..f9d35ba7 100644
--- a/src/history.c
+++ b/src/history.c
@@ -63,7 +63,7 @@ int a_History_set_title(int idx, const char *title)
 }
 
 /*
- * Return the DilloUrl camp (by index)
+ * Return the DilloUrl field (by index)
  */
 DilloUrl *a_History_get_url(int idx)
 {
@@ -73,7 +73,7 @@ DilloUrl *a_History_get_url(int idx)
 }
 
 /*
- * Return the title camp (by index)
+ * Return the title field (by index)
  * ('force' returns URL_STR when there's no title)
  */
 const char *a_History_get_title(int idx, int force)
@@ -89,7 +89,7 @@ const char *a_History_get_title(int idx, int force)
 }
 
 /*
- * Return the title camp (by url)
+ * Return the title field (by url)
  * ('force' returns URL_STR when there's no title)
  */
 const char *a_History_get_title_by_url(const DilloUrl *url, int force)
diff --git a/src/html.cc b/src/html.cc
index c7857e92..c7e7b5f5 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -498,7 +498,6 @@ void *a_Html_text(const char *Type, void *P, CA_Callback_t *Call, void **Data)
 
 void a_Html_free(void *data)
 {
-   MSG("a_Html_free! %p\n", data);
    delete ((DilloHtml*)data);
 }
 
@@ -863,7 +862,7 @@ DilloHtml::~DilloHtml()
    DilloHtmlForm *form;
    DilloHtmlInput *input_j;
 
-   MSG("::~DilloHtml()\n");
+   MSG("::~DilloHtml(this=%p)\n", this);
 
    a_Bw_remove_doc(bw, this);
 
@@ -4003,7 +4002,7 @@ static void Html_tag_open_input(DilloHtml *html, const char *tag, int tagsize)
    int input_idx;
   
    if (!(html->InFlags & IN_FORM)) {
-      MSG_HTML("input camp outside <form>\n");
+      MSG_HTML("<input> element outside <form>\n");
       return;
    }
   
@@ -4653,7 +4652,7 @@ static void Html_tag_close_par(DilloHtml *html, int TagIdx)
  * Function index for the open and close functions for each tag
  * (Alphabetically sorted for a binary search)
  *
- * Explanation for the 'Flags' camp:
+ * Explanation for the 'Flags' field:
  *
  *   {"address", B8(010110), ...}
  *                  |||||`- inline element
diff --git a/src/ui.cc b/src/ui.cc
index 391e325e..f5ea2c0a 100644
--- a/src/ui.cc
+++ b/src/ui.cc
@@ -881,7 +881,9 @@ void UI::color_change_cb_i()
 void UI::fullscreen_cb_i()
 {
 #if 0
-   // Works, but for unknown reasons it resizes hidden widgets on "Maximize"
+   // BUG:
+   // Works, but for unknown reasons it resizes hidden-widgets upon "Maximize"
+   // i.e. hide panel -> maximize window -> unhide panel == larger panel
    if (Panel->visible_r()) {
       Panel->hide();
       Status->hide();
diff --git a/src/uicmd.cc b/src/uicmd.cc
index d71354b1..eca9e76c 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -76,18 +76,21 @@ BrowserWindow *a_UIcmd_browser_window_new(int ww, int wh)
    FltkPlatform *platform = new FltkPlatform ();
    Layout *layout = new Layout (platform);
 
+   int p_h = new_ui->panel_h();
+   int s_h = new_ui->status_h();
    // BUG: This is a workaround for FLTK's non-working replace().
    new_ui->set_render_layout_begin();
-    int p_h = new_ui->panel_h();
-    int s_h = new_ui->status_h();
     FltkViewport *viewport = new FltkViewport (0, p_h, ww, wh-p_h-s_h);
     layout->attachView (viewport);
     //viewport->addGadget(new_ui->fullscreen_button());
-    viewport->setScrollStep((int) rint(12.0 * prefs.font_factor));
    new_ui->set_render_layout_end();
    // This was the original code.
    // Set the render_layout widget into the UI
-   // new_ui->set_render_layout(*viewport);
+   //FltkViewport *viewport = new FltkViewport (0, p_h, ww, wh-p_h-s_h);
+   //layout->attachView (viewport);
+   //new_ui->set_render_layout(*viewport);
+
+   viewport->setScrollStep((int) rint(12.0 * prefs.font_factor));
 
    // Now, create a new browser window structure
    BrowserWindow *new_bw = a_Bw_new(ww, wh, 0);
diff --git a/src/url.c b/src/url.c
index 1dab39c3..c21a458a 100644
--- a/src/url.c
+++ b/src/url.c
@@ -56,7 +56,7 @@
 
 /*
  * Return the url as a string.
- * (initializing 'url_string' camp if necessary)
+ * (initializing 'url_string' field if necessary)
  */
 char *a_Url_str(const DilloUrl *u)
 {
@@ -87,7 +87,7 @@ char *a_Url_str(const DilloUrl *u)
 
 /*
  * Return the hostname as a string.
- * (initializing 'hostname' and 'port' camps if necessary)
+ * (initializing 'hostname' and 'port' fields if necessary)
  * Note: a similar approach can be taken for user:password auth.
  */
 const char *a_Url_hostname(const DilloUrl *u)
@@ -440,13 +440,13 @@ int a_Url_cmp(const DilloUrl *A, const DilloUrl *B)
    dReturn_val_if_fail(A && B, 1);
 
    if (A == B ||
-       ((st = URL_STRCAMP_I_CMP(A->authority, B->authority)) == 0 &&
+       ((st = URL_STR_FIELD_I_CMP(A->authority, B->authority)) == 0 &&
         (st = strcmp(A->path ? A->path + (*A->path == '/') : "",
                      B->path ? B->path + (*B->path == '/') : "")) == 0 &&
-        //(st = URL_STRCAMP_CMP(A->path, B->path)) == 0 &&
-        (st = URL_STRCAMP_CMP(A->query, B->query)) == 0 &&
-        (st = URL_STRCAMP_CMP(A->data, B->data)) == 0 &&
-        (st = URL_STRCAMP_I_CMP(A->scheme, B->scheme) == 0)))
+        //(st = URL_STR_FIELD_CMP(A->path, B->path)) == 0 &&
+        (st = URL_STR_FIELD_CMP(A->query, B->query)) == 0 &&
+        (st = URL_STR_FIELD_CMP(A->data, B->data)) == 0 &&
+        (st = URL_STR_FIELD_I_CMP(A->scheme, B->scheme) == 0)))
       return 0;
    return st;
 }
diff --git a/src/url.h b/src/url.h
index 5f331881..1781c802 100644
--- a/src/url.h
+++ b/src/url.h
@@ -87,10 +87,10 @@
 #define URL_ILLEGAL_CHARS_SPC(u)    URL_ILLEGAL_CHARS_SPC_(u)
 
 
-/* URL-camp compare methods */
-#define URL_STRCAMP_CMP(s1,s2) \
+/* URL-field compare methods */
+#define URL_STR_FIELD_CMP(s1,s2) \
    (s1) && (s2) ? strcmp(s1,s2) : !(s1) && !(s2) ? 0 : (s1) ? 1 : -1
-#define URL_STRCAMP_I_CMP(s1,s2) \
+#define URL_STR_FIELD_I_CMP(s1,s2) \
    (s1) && (s2) ? dStrcasecmp(s1,s2) : !(s1) && !(s2) ? 0 : (s1) ? 1 : -1