svnno****@sourc*****
svnno****@sourc*****
Sun Aug 30 12:27:11 JST 2009
Revision: 3801
http://sourceforge.jp/projects/kazehakase/svn/view?view=rev&revision=3801
Author: ikezoe
Date: 2009-08-30 12:27:11 +0900 (Sun, 30 Aug 2009)
Log Message:
-----------
DOM event returns gboolean value.
Modified Paths:
--------------
kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
kazehakase/trunk/src/kz-embed.c
kazehakase/trunk/src/kz-embed.h
kazehakase/trunk/src/kz-window.c
Modified: kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2009-08-30 03:21:59 UTC (rev 3800)
+++ kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2009-08-30 03:27:11 UTC (rev 3801)
@@ -187,14 +187,14 @@
gpointer request,
guint state);
#endif
-static gint kz_gecko_embed_dom_key_down (GtkMozEmbed *embed, gpointer event);
-static gint kz_gecko_embed_dom_key_up (GtkMozEmbed *embed, gpointer event);
-static gint kz_gecko_embed_dom_key_press (GtkMozEmbed *embed, gpointer event);
-static gint kz_gecko_embed_dom_mouse_down (GtkMozEmbed *embed, gpointer event);
-static gint kz_gecko_embed_dom_mouse_up (GtkMozEmbed *embed, gpointer event);
-static gint kz_gecko_embed_dom_mouse_click (GtkMozEmbed *embed, gpointer event);
-static gint kz_gecko_embed_dom_mouse_dbl_click (GtkMozEmbed *embed, gpointer event);
-static gint kz_gecko_embed_dom_mouse_over (GtkMozEmbed *embed, gpointer event);
+static gboolean kz_gecko_embed_dom_key_down (GtkMozEmbed *embed, gpointer event);
+static gboolean kz_gecko_embed_dom_key_up (GtkMozEmbed *embed, gpointer event);
+static gboolean kz_gecko_embed_dom_key_press (GtkMozEmbed *embed, gpointer event);
+static gboolean kz_gecko_embed_dom_mouse_down (GtkMozEmbed *embed, gpointer event);
+static gboolean kz_gecko_embed_dom_mouse_up (GtkMozEmbed *embed, gpointer event);
+static gboolean kz_gecko_embed_dom_mouse_click (GtkMozEmbed *embed, gpointer event);
+static gboolean kz_gecko_embed_dom_mouse_dbl_click (GtkMozEmbed *embed, gpointer event);
+static gboolean kz_gecko_embed_dom_mouse_over (GtkMozEmbed *embed, gpointer event);
static void kz_gecko_embed_navigation_link_free(KzGeckoEmbed *kzembed);
@@ -1222,11 +1222,11 @@
return ret;
}
-static gint
+static gboolean
kz_gecko_embed_dom_mouse_down (GtkMozEmbed *embed, gpointer event)
{
KzEmbedEventMouse *kzevent;
- gint ret = FALSE;
+ gboolean ret = FALSE;
kz_gecko_embed_get_mouse_event_info(KZ_GECKO_EMBED(embed), event, &kzevent);
@@ -1237,11 +1237,11 @@
return ret;
}
-static gint
+static gboolean
kz_gecko_embed_dom_mouse_up (GtkMozEmbed *embed, gpointer event)
{
KzEmbedEventMouse *kzevent;
- gint ret = FALSE;
+ gboolean ret = FALSE;
kz_gecko_embed_get_mouse_event_info(KZ_GECKO_EMBED(embed), event, &kzevent);
g_signal_emit_by_name(embed, "kz-dom-mouse-up",
@@ -1251,11 +1251,11 @@
return ret;
}
-static gint
+static gboolean
kz_gecko_embed_dom_mouse_click (GtkMozEmbed *embed, gpointer event)
{
KzEmbedEventMouse *kzevent;
- gint ret = FALSE;
+ gboolean ret = FALSE;
kz_gecko_embed_get_mouse_event_info(KZ_GECKO_EMBED(embed), event, &kzevent);
g_signal_emit_by_name(embed, "kz-dom-mouse-click",
@@ -1265,11 +1265,11 @@
return ret;
}
-static gint
+static gboolean
kz_gecko_embed_dom_mouse_dbl_click (GtkMozEmbed *embed, gpointer event)
{
KzEmbedEventMouse *kzevent;
- gint ret = FALSE;
+ gboolean ret = FALSE;
kz_gecko_embed_get_mouse_event_info(KZ_GECKO_EMBED(embed), event, &kzevent);
g_signal_emit_by_name(embed, "kz-dom-mouse-dbl-click",
@@ -1280,10 +1280,10 @@
}
static
-gint kz_gecko_embed_dom_mouse_over (GtkMozEmbed *embed, gpointer event)
+gboolean kz_gecko_embed_dom_mouse_over (GtkMozEmbed *embed, gpointer event)
{
KzEmbedEventMouse *kzevent;
- gint ret = FALSE;
+ gboolean ret = FALSE;
kz_gecko_embed_get_mouse_event_info(KZ_GECKO_EMBED(embed), event, &kzevent);
g_signal_emit_by_name(embed, "kz-dom-mouse-over",
Modified: kazehakase/trunk/src/kz-embed.c
===================================================================
--- kazehakase/trunk/src/kz-embed.c 2009-08-30 03:21:59 UTC (rev 3800)
+++ kazehakase/trunk/src/kz-embed.c 2009-08-30 03:27:11 UTC (rev 3801)
@@ -304,8 +304,8 @@
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(KzEmbedIFace, dom_key_down),
NULL, NULL,
- _kz_marshal_INT__POINTER,
- G_TYPE_INT, 1, G_TYPE_POINTER);
+ _kz_marshal_BOOLEAN__POINTER,
+ G_TYPE_BOOLEAN, 1, G_TYPE_POINTER);
kz_embed_signals[DOM_KEY_PRESS_SIGNAL]
= g_signal_new ("kz-dom-key-press",
@@ -313,8 +313,8 @@
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(KzEmbedIFace, dom_key_press),
NULL, NULL,
- _kz_marshal_INT__POINTER,
- G_TYPE_INT, 1, G_TYPE_POINTER);
+ _kz_marshal_BOOLEAN__POINTER,
+ G_TYPE_BOOLEAN, 1, G_TYPE_POINTER);
kz_embed_signals[DOM_KEY_UP_SIGNAL]
= g_signal_new ("kz-dom-key-up",
@@ -322,8 +322,8 @@
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(KzEmbedIFace, dom_key_up),
NULL, NULL,
- _kz_marshal_INT__POINTER,
- G_TYPE_INT, 1, G_TYPE_POINTER);
+ _kz_marshal_BOOLEAN__POINTER,
+ G_TYPE_BOOLEAN, 1, G_TYPE_POINTER);
kz_embed_signals[DOM_MOUSE_DOWN_SIGNAL]
= g_signal_new ("kz-dom-mouse-down",
@@ -331,8 +331,8 @@
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(KzEmbedIFace, dom_mouse_down),
NULL, NULL,
- _kz_marshal_INT__POINTER,
- G_TYPE_INT, 1, G_TYPE_POINTER);
+ _kz_marshal_BOOLEAN__POINTER,
+ G_TYPE_BOOLEAN, 1, G_TYPE_POINTER);
kz_embed_signals[DOM_MOUSE_UP_SIGNAL]
= g_signal_new ("kz-dom-mouse-up",
@@ -340,8 +340,8 @@
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(KzEmbedIFace, dom_mouse_up),
NULL, NULL,
- _kz_marshal_INT__POINTER,
- G_TYPE_INT, 1, G_TYPE_POINTER);
+ _kz_marshal_BOOLEAN__POINTER,
+ G_TYPE_BOOLEAN, 1, G_TYPE_POINTER);
kz_embed_signals[DOM_MOUSE_CLICK_SIGNAL]
= g_signal_new ("kz-dom-mouse-click",
@@ -349,8 +349,8 @@
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(KzEmbedIFace, dom_mouse_click),
NULL, NULL,
- _kz_marshal_INT__POINTER,
- G_TYPE_INT, 1, G_TYPE_POINTER);
+ _kz_marshal_BOOLEAN__POINTER,
+ G_TYPE_BOOLEAN, 1, G_TYPE_POINTER);
kz_embed_signals[DOM_MOUSE_DBL_CLICK_SIGNAL]
= g_signal_new ("kz-dom-mouse-dbl-click",
@@ -358,8 +358,8 @@
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(KzEmbedIFace, dom_mouse_dbl_click),
NULL, NULL,
- _kz_marshal_INT__POINTER,
- G_TYPE_INT, 1, G_TYPE_POINTER);
+ _kz_marshal_BOOLEAN__POINTER,
+ G_TYPE_BOOLEAN, 1, G_TYPE_POINTER);
kz_embed_signals[DOM_MOUSE_OVER_SIGNAL]
= g_signal_new ("kz-dom-mouse-over",
@@ -367,8 +367,8 @@
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(KzEmbedIFace, dom_mouse_over),
NULL, NULL,
- _kz_marshal_INT__POINTER,
- G_TYPE_INT, 1, G_TYPE_POINTER);
+ _kz_marshal_BOOLEAN__POINTER,
+ G_TYPE_BOOLEAN, 1, G_TYPE_POINTER);
kz_embed_signals[DOM_MOUSE_OUT_SIGNAL]
= g_signal_new ("kz-dom-mouse-out",
@@ -376,8 +376,8 @@
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(KzEmbedIFace, dom_mouse_out),
NULL, NULL,
- _kz_marshal_INT__POINTER,
- G_TYPE_INT, 1, G_TYPE_POINTER);
+ _kz_marshal_BOOLEAN__POINTER,
+ G_TYPE_BOOLEAN, 1, G_TYPE_POINTER);
kz_embed_signals[SELECTION_SIGNAL]
= g_signal_new ("kz-selection",
Modified: kazehakase/trunk/src/kz-embed.h
===================================================================
--- kazehakase/trunk/src/kz-embed.h 2009-08-30 03:21:59 UTC (rev 3800)
+++ kazehakase/trunk/src/kz-embed.h 2009-08-30 03:27:11 UTC (rev 3801)
@@ -261,24 +261,24 @@
void (*size_to) (KzEmbed *embed,
gint width,
gint height);
- gint (*dom_key_down) (KzEmbed *embed,
- KzEmbedEvent *event);
- gint (*dom_key_press) (KzEmbed *embed,
+ gboolean (*dom_key_down) (KzEmbed *embed,
+ KzEmbedEvent *event);
+ gboolean (*dom_key_press) (KzEmbed *embed,
+ KzEmbedEvent event);
+ gboolean (*dom_key_up) (KzEmbed *embed,
+ KzEmbedEvent event);
+ gboolean (*dom_mouse_down) (KzEmbed *embed,
+ KzEmbedEvent event);
+ gboolean (*dom_mouse_up) (KzEmbed *embed,
+ KzEmbedEvent event);
+ gboolean (*dom_mouse_click) (KzEmbed *embed,
+ KzEmbedEvent event);
+ gboolean (*dom_mouse_dbl_click) (KzEmbed *embed,
+ KzEmbedEvent event);
+ gboolean (*dom_mouse_over) (KzEmbed *embed,
+ KzEmbedEvent event);
+ gboolean (*dom_mouse_out) (KzEmbed *embed,
KzEmbedEvent event);
- gint (*dom_key_up) (KzEmbed *embed,
- KzEmbedEvent event);
- gint (*dom_mouse_down) (KzEmbed *embed,
- KzEmbedEvent event);
- gint (*dom_mouse_up) (KzEmbed *embed,
- KzEmbedEvent event);
- gint (*dom_mouse_click) (KzEmbed *embed,
- KzEmbedEvent event);
- gint (*dom_mouse_dbl_click) (KzEmbed *embed,
- KzEmbedEvent event);
- gint (*dom_mouse_over) (KzEmbed *embed,
- KzEmbedEvent event);
- gint (*dom_mouse_out) (KzEmbed *embed,
- KzEmbedEvent event);
void (*selection) (KzEmbed *embed);
#if 1 /* not implemented yet */
void (*security_change) (KzEmbed *embed,
Modified: kazehakase/trunk/src/kz-window.c
===================================================================
--- kazehakase/trunk/src/kz-window.c 2009-08-30 03:21:59 UTC (rev 3800)
+++ kazehakase/trunk/src/kz-window.c 2009-08-30 03:27:11 UTC (rev 3801)
@@ -247,23 +247,23 @@
KzWindow *kz);
static void cb_embed_close_tab (GtkObject *obj,
KzWindow *kz);
-static gint cb_embed_dom_key_down (KzEmbed *embed,
+static gboolean cb_embed_dom_key_down (KzEmbed *embed,
KzEmbedEventKey *event,
KzWindow *kz);
-static gint cb_embed_dom_key_up (KzEmbed *embed,
+static gboolean cb_embed_dom_key_up (KzEmbed *embed,
KzEmbedEventKey *event,
KzWindow *kz);
-static gint cb_embed_dom_mouse_click (KzEmbed *embed,
+static gboolean cb_embed_dom_mouse_click (KzEmbed *embed,
KzEmbedEventMouse *event,
KzWindow *kz);
-static gint cb_embed_dom_mouse_down (KzEmbed *embed,
+static gboolean cb_embed_dom_mouse_down (KzEmbed *embed,
KzEmbedEventMouse *event,
KzWindow *kz);
-static gint cb_embed_dom_mouse_up (KzEmbed *embed,
+static gboolean cb_embed_dom_mouse_up (KzEmbed *embed,
KzEmbedEventMouse *event,
KzWindow *kz);
-static gint cb_embed_dom_mouse_over (KzEmbed *embed,
+static gboolean cb_embed_dom_mouse_over (KzEmbed *embed,
KzEmbedEventMouse *event,
KzWindow *kz);
@@ -2142,7 +2142,7 @@
}
-static gint
+static gboolean
cb_embed_dom_key_down (KzEmbed *embed, KzEmbedEventKey *event, KzWindow *kz)
{
@@ -2154,7 +2154,7 @@
}
-static gint
+static gboolean
cb_embed_dom_key_up (KzEmbed *embed, KzEmbedEventKey *event, KzWindow *kz)
{
g_return_val_if_fail(KZ_IS_WINDOW(kz), FALSE);
@@ -2165,7 +2165,7 @@
}
-static gint
+static gboolean
cb_embed_dom_mouse_click (KzEmbed *embed, KzEmbedEventMouse *event,
KzWindow *kz)
{
@@ -2236,7 +2236,7 @@
}
-static gint
+static gboolean
cb_embed_dom_mouse_down (KzEmbed *kzembed, KzEmbedEventMouse *event,
KzWindow *kz)
{
@@ -2353,7 +2353,7 @@
}
-static gint
+static gboolean
cb_embed_dom_mouse_up (KzEmbed *embed, KzEmbedEventMouse *event,
KzWindow *kz)
{
@@ -2364,7 +2364,7 @@
return FALSE;
}
-static gint
+static gboolean
cb_embed_dom_mouse_over (KzEmbed *embed, KzEmbedEventMouse *event,
KzWindow *kz)
{