svnno****@sourc*****
svnno****@sourc*****
Wed Apr 18 17:05:07 JST 2007
Revision: 3206
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3206
Author: ikezoe
Date: 2007-04-18 17:05:07 +0900 (Wed, 18 Apr 2007)
Log Message:
-----------
* module/embed/gtk-webcore/kz-gtk-webcore.cpp: DOM like mouse event
handling.
Need the patch in
http://sourceforge.net/mailarchive/forum.php?thread_name=1176868862.5716.38.camel%40localhost&forum_name=gtk-webcore-patches
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.cpp
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-04-17 06:51:12 UTC (rev 3205)
+++ kazehakase/trunk/ChangeLog 2007-04-18 08:05:07 UTC (rev 3206)
@@ -1,3 +1,10 @@
+2007-04-18 Hiroyuki Ikezoe <poinc****@ikezo*****>
+
+ * module/embed/gtk-webcore/kz-gtk-webcore.cpp: DOM like mouse event
+ handling.
+ Need the patch in
+ http://sourceforge.net/mailarchive/forum.php?thread_name=1176868862.5716.38.camel%40localhost&forum_name=gtk-webcore-patches
+
2007-04-17 Hiroyuki Ikezoe <poinc****@ikezo*****>
* module/embed/gtk-webcore/kz-gtk-webcore.cpp: Now font size unit is
Modified: kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.cpp
===================================================================
--- kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.cpp 2007-04-17 06:51:12 UTC (rev 3205)
+++ kazehakase/trunk/module/embed/gtk-webcore/kz-gtk-webcore.cpp 2007-04-18 08:05:07 UTC (rev 3206)
@@ -74,17 +74,12 @@
const gchar *url);
static void kz_gtk_webcore_close_window (Webi *webi);
static void kz_gtk_webcore_mouse_over (Webi *webi,
- const gchar *link_title,
- const gchar *link_label,
- const gchar *link_url,
- const gchar *link_target);
+ const WebiEventInfo *event_info);
#if HAVE_GTK_WEBCORE_MOUSE_DOWN
static gboolean kz_gtk_webcore_mouse_down (Webi *webi,
- const gchar *link_url,
- guint button);
+ const WebiEventInfo *event_info);
static gboolean kz_gtk_webcore_mouse_up (Webi *webi,
- const gchar *link_url,
- guint button);
+ const WebiEventInfo *event_info);
#endif
static gboolean kz_gtk_webcore_set_cookie (Webi *webi,
const gchar *url,
@@ -863,11 +858,7 @@
}
static void
-kz_gtk_webcore_mouse_over (Webi *webi,
- const gchar *link_title,
- const gchar *link_label,
- const gchar *link_url,
- const gchar *link_target)
+kz_gtk_webcore_mouse_over (Webi *webi, const WebiEventInfo *event_info)
{
KzEmbedEventMouse *kzevent;
gint ret = FALSE;
@@ -877,6 +868,7 @@
priv = KZ_GTK_WEBCORE_GET_PRIVATE(webi);
get_mouse_event_info(&kzevent);
+ const gchar *link_url = webi_event_info_get_link_url((WebiEventInfo*)event_info);
if (!link_url)
{
if (priv->link_message)
@@ -891,7 +883,7 @@
KzEmbedEvent *info = (KzEmbedEvent *) kzevent;
info->context |= KZ_CONTEXT_LINK;
info->link = g_strdup(link_url);
- info->linktext = g_strdup(link_label);
+ info->linktext = g_strdup(webi_event_info_get_link_label((WebiEventInfo*)event_info));
if (priv->link_message)
g_free(priv->link_message);
@@ -908,9 +900,7 @@
#if HAVE_GTK_WEBCORE_MOUSE_DOWN
gboolean
-kz_gtk_webcore_mouse_down (Webi *webi,
- const gchar *link_url,
- guint button)
+kz_gtk_webcore_mouse_down (Webi *webi, const WebiEventInfo *event_info)
{
KzEmbedEventMouse *kzevent;
gint ret = FALSE;
@@ -921,9 +911,10 @@
priv->button_press_time = GDK_CURRENT_TIME;
get_mouse_event_info(&kzevent);
- kzevent->button = button - 1;
+ kzevent->button = webi_event_info_get_button((WebiEventInfo*)event_info);
((KzEmbedEvent *)kzevent)->context |= KZ_CONTEXT_DOCUMENT;
+ const gchar *link_url = webi_event_info_get_link_url((WebiEventInfo*)event_info);
if (link_url)
{
((KzEmbedEvent *)kzevent)->context |= KZ_CONTEXT_LINK;
@@ -938,9 +929,7 @@
}
static gboolean
-kz_gtk_webcore_mouse_up (Webi *webi,
- const gchar *link_url,
- guint button)
+kz_gtk_webcore_mouse_up (Webi *webi, const WebiEventInfo *event_info)
{
KzEmbedEventMouse *kzevent;
gint ret = FALSE;
@@ -950,7 +939,7 @@
priv = KZ_GTK_WEBCORE_GET_PRIVATE(webi);
get_mouse_event_info(&kzevent);
- kzevent->button = button - 1;
+ kzevent->button = webi_event_info_get_button((WebiEventInfo*)event_info);
((KzEmbedEvent *)kzevent)->context |= KZ_CONTEXT_DOCUMENT;
@@ -959,6 +948,7 @@
if (!ret && GDK_CURRENT_TIME < priv->button_press_time + 1000)
{
+ const gchar *link_url = webi_event_info_get_link_url((WebiEventInfo*)event_info);
if (link_url)
{
((KzEmbedEvent *)kzevent)->context |= KZ_CONTEXT_LINK;