From c9c3e1d966af895377b3cf479f743d037a17624c Mon Sep 17 00:00:00 2001
From: John Tytgat <joty@netsurf-browser.org>
Date: Sat, 14 Aug 2004 12:16:45 +0000
Subject: [project @ 2004-08-14 12:16:44 by joty] Keypresses are wchar_t typed
 data.

svn path=/import/netsurf/; revision=1227
---
 desktop/browser.c | 29 ++++++++++++++---------------
 desktop/browser.h |  5 +++--
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'desktop')

diff --git a/desktop/browser.c b/desktop/browser.c
index 949d7511b..e2f30dfba 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -5,6 +5,7 @@
  * Copyright 2003 Phil Mellor <monkeyson@users.sourceforge.net>
  * Copyright 2004 James Bursa <bursa@users.sourceforge.net>
  * Copyright 2004 Andrew Timmins <atimmins@blueyonder.co.uk>
+ * Copyright 2004 John Tytgat <John.Tytgat@aaug.net>
  */
 
 /** \file
@@ -66,11 +67,11 @@ static void browser_window_input_click(struct browser_window* bw,
 		int box_x, int box_y,
 		int x, int y);
 static void browser_window_input_callback(struct browser_window *bw,
-		unsigned int key, void *p);
+		wchar_t key, void *p);
 static void browser_window_place_caret(struct browser_window *bw,
 		int x, int y, int height,
 		void (*callback)(struct browser_window *bw,
-		unsigned int key, void *p),
+		wchar_t key, void *p),
 		void *p);
 static void browser_window_remove_caret(struct browser_window *bw);
 static gui_pointer_shape get_pointer_shape(css_cursor cursor);
@@ -88,20 +89,18 @@ void browser_window_create(const char *url, struct browser_window *clone)
 {
 	struct browser_window *bw;
 
-	bw = malloc(sizeof *bw);
-	if (!bw) {
+	if ((bw = malloc(sizeof *bw)) == NULL) {
 		warn_user("NoMemory", 0);
 		return;
 	}
 
-	bw->current_content = 0;
-	bw->loading_content = 0;
+	bw->current_content = NULL;
+	bw->loading_content = NULL;
 	bw->history = history_create();
 	bw->throbbing = false;
-	bw->caret_callback = 0;
-	bw->frag_id = 0;
-	bw->window = gui_create_browser_window(bw, clone);
-	if (!bw->window) {
+	bw->caret_callback = NULL;
+	bw->frag_id = NULL;
+	if ((bw->window = gui_create_browser_window(bw, clone)) == NULL) {
 		free(bw);
 		return;
 	}
@@ -226,8 +225,8 @@ void browser_window_callback(content_msg msg, struct content *c,
 						bw, 0);
 			}
 			bw->current_content = c;
-			bw->loading_content = 0;
-			bw->caret_callback = 0;
+			bw->loading_content = NULL;
+			bw->caret_callback = NULL;
 			gui_window_new_content(bw->window);
 			gui_window_set_url(bw->window, c->url);
 			browser_window_update(bw, true);
@@ -1271,7 +1270,7 @@ void browser_window_input_click(struct browser_window* bw,
  */
 
 void browser_window_input_callback(struct browser_window *bw,
-		unsigned int key, void *p)
+		wchar_t key, void *p)
 {
 	struct box *input = (struct box *)p;
 	struct box *text_box = input->children->children;
@@ -1495,7 +1494,7 @@ void browser_window_input_callback(struct browser_window *bw,
 void browser_window_place_caret(struct browser_window *bw,
 		int x, int y, int height,
 		void (*callback)(struct browser_window *bw,
-		unsigned int key, void *p),
+		wchar_t key, void *p),
 		void *p)
 {
 	gui_window_place_caret(bw->window, x, y, height);
@@ -1520,7 +1519,7 @@ void browser_window_remove_caret(struct browser_window *bw)
  * Handle key presses in a browser window.
  */
 
-bool browser_window_key_press(struct browser_window *bw, unsigned int key)
+bool browser_window_key_press(struct browser_window *bw, wchar_t key)
 {
 	if (!bw->caret_callback)
 		return false;
diff --git a/desktop/browser.h b/desktop/browser.h
index 77f084349..06a7e61a2 100644
--- a/desktop/browser.h
+++ b/desktop/browser.h
@@ -14,6 +14,7 @@
 #define _NETSURF_DESKTOP_BROWSER_H_
 
 #include <stdbool.h>
+#include <stddef.h>
 #include <time.h>
 
 struct box;
@@ -36,7 +37,7 @@ struct browser_window
 
 	/** Handler for keyboard input, or 0. */
 	void (*caret_callback)(struct browser_window *bw,
-			unsigned int key, void *p);
+			wchar_t key, void *p);
 	/** User parameter for caret_callback. */
 	void *caret_p;
 
@@ -74,7 +75,7 @@ void browser_window_destroy(struct browser_window *bw);
 
 void browser_window_mouse_click(struct browser_window *bw,
 		browser_mouse_click click, int x, int y);
-bool browser_window_key_press(struct browser_window *bw, unsigned int key);
+bool browser_window_key_press(struct browser_window *bw, wchar_t key);
 void browser_window_form_select(struct browser_window *bw,
 		struct form_control *control, int item);
 
-- 
cgit v1.2.3