From 50fc20c2d4883b399fcee8c7a2905605304d9e40 Mon Sep 17 00:00:00 2001
From: Phil Mellor <phil@monkeyson.info>
Date: Sun, 29 Dec 2002 22:27:35 +0000
Subject: [project @ 2002-12-29 22:27:35 by monkeyson] Font anti-alias colours
 corrected.

Begin displaying form elements - text, password, submit, reset

svn path=/import/netsurf/; revision=71
---
 desktop/browser.c | 15 ++++++++++++++-
 desktop/netsurf.c |  4 ++--
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'desktop')

diff --git a/desktop/browser.c b/desktop/browser.c
index 968282fdb..a52562a4e 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -1,5 +1,5 @@
 /**
- * $Id: browser.c,v 1.16 2002/12/25 22:59:21 bursa Exp $
+ * $Id: browser.c,v 1.17 2002/12/29 22:27:35 monkeyson Exp $
  */
 
 #include "netsurf/riscos/font.h"
@@ -684,10 +684,18 @@ void browser_window_text_selection(struct browser_window* bw,
       start = &(bw->current_content->data.html.text_selection.start);
       end = &(bw->current_content->data.html.text_selection.end);
 
+      if (click_boxes[i].box->font != 0)
+      {
       font_position_in_string(click_boxes[i].box->text,
           click_boxes[i].box->font, click_boxes[i].box->length,
           click_x - click_boxes[i].actual_x,
           &click_char_offset, &click_pixel_offset);
+      }
+      else
+      {
+        click_char_offset = 0;
+	click_pixel_offset = 0;
+      }
 
       new_pos.box = click_boxes[i].box;
       new_pos.actual_box_x = click_boxes[i].actual_x;
@@ -989,5 +997,10 @@ char *url_join(const char* new, const char* base)
   }
 
   LOG(("ret = %s", ret));
+  if (ret == NULL)
+  {
+    ret = xcalloc(strlen(new) + 10, sizeof(char));
+    strcpy(ret, new);
+  }
   return ret;
 }
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index e92dea016..144d9fa7d 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -1,5 +1,5 @@
 /**
- * $Id: netsurf.c,v 1.4 2002/11/03 09:39:53 bursa Exp $
+ * $Id: netsurf.c,v 1.5 2002/12/29 22:27:35 monkeyson Exp $
  */
 
 #include "netsurf/desktop/netsurf.h"
@@ -51,7 +51,7 @@ int main(int argc, char** argv)
 
 void Log(char* func, char* msg)
 {
-#ifdef NETSURF_DUMP
+#ifdef NETSURF_DUMP_MONKEYS
   FILE* logfile = NULL;
   logfile = fopen("logfile","a");
   if (logfile == NULL)
-- 
cgit v1.2.3