svnno****@sourc*****
svnno****@sourc*****
Fri Mar 7 10:39:45 JST 2008
Revision: 3451
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3451
Author: ikezoe
Date: 2008-03-07 10:39:44 +0900 (Fri, 07 Mar 2008)
Log Message:
-----------
2008-03-07 Hiroyuki Ikezoe <poinc****@ikezo*****>
* module/embed/webkit-gtk/kz-webkit-gtk.c: Fix typo. Suppress
G_CRITICAL warnings.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.c
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2008-03-06 19:31:04 UTC (rev 3450)
+++ kazehakase/trunk/ChangeLog 2008-03-07 01:39:44 UTC (rev 3451)
@@ -1,4 +1,10 @@
+2008-03-07 Hiroyuki Ikezoe <poinc****@ikezo*****>
+
+ * module/embed/webkit-gtk/kz-webkit-gtk.c: Fix typo. Suppress
+ G_CRITICAL warnings.
+
2008-03-07 Shunichi Fuji <palgl****@gmail*****>
+
* module/search/kz-hyper-estraier-search.c:
- keep working to cleanup some elements on kz-hyper-estraier-search.
it now reject none utf-8 contents. (Hyperestraier treat utf-8's text only.)
Modified: kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.c
===================================================================
--- kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.c 2008-03-06 19:31:04 UTC (rev 3450)
+++ kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.c 2008-03-07 01:39:44 UTC (rev 3451)
@@ -46,6 +46,12 @@
static void kz_webkit_gtk_init (KzWebKitGtk *webkit_gtk);
static void kz_webkit_gtk_dispose (GObject *object);
+#if 0
+static gboolean button_press_event (GtkWidget *widget,
+ GdkEventButton *event);
+static gboolean button_release_event (GtkWidget *widget,
+ GdkEventButton *event);
+#endif
static void load_url (KzEmbed *kzembed,
const gchar *url);
static void stop_load (KzEmbed *kzembed);
@@ -55,6 +61,13 @@
static void go_forward (KzEmbed *kzembed);
static gboolean can_go_back (KzEmbed *kzembed);
static gboolean can_go_forward (KzEmbed *kzembed);
+static gboolean can_go_nav_link (KzEmbed *kzembed,
+ KzEmbedNavLink link);
+static KzNavi *get_nth_nav_link (KzEmbed *kzembed,
+ KzEmbedNavLink link,
+ guint n);
+static GList *get_nav_links (KzEmbed *kzembed,
+ KzEmbedNavLink link);
static gboolean can_cut_selection (KzEmbed *kzembed);
static gboolean can_copy_selection (KzEmbed *kzembed);
static gboolean can_paste (KzEmbed *kzembed);
@@ -154,7 +167,10 @@
widget_class = GTK_WIDGET_CLASS(klass);
object_class->dispose = kz_webkit_gtk_dispose;
-
+#if 0
+ widget_class->button_press_event = button_press_event;
+ widget_class->button_release_event = button_release_event;
+#endif
g_type_class_add_private(object_class, sizeof(KzWebKitGtkPrivate));
}
@@ -192,14 +208,14 @@
iface->go_forward = go_forward;
iface->can_go_back = can_go_back;
iface->can_go_forward = can_go_forward;
- iface->can_go_nav_link = NULL;
+ iface->can_go_nav_link = can_go_nav_link;
iface->go_nav_link = NULL;
iface->append_nav_link = NULL;
iface->set_nav_link = NULL;
iface->set_nth_nav_link = NULL;
iface->get_nav_link = NULL;
- iface->get_nth_nav_link = NULL;
- iface->get_nav_links = NULL;
+ iface->get_nth_nav_link = get_nth_nav_link;
+ iface->get_nav_links = get_nav_links;
iface->go_history_index = NULL;
iface->do_command = NULL;
iface->can_do_command = NULL;
@@ -307,7 +323,55 @@
return GTK_WIDGET(g_object_new(KZ_TYPE_WEBKIT_GTK,
NULL));
}
+#if 0
+static KzEmbedEventMouse *
+create_kz_embed_event_mouse (GdkEventButton *event)
+{
+ KzEmbedEventMouse *kzevent;
+ kzevent = (KzEmbedEventMouse *) kz_embed_event_new(KZ_EMBED_EVENT_MOUSE);
+ if (event->state & GDK_SHIFT_MASK)
+ kzevent->modifier |= KZ_SHIFT_KEY;
+ if (event->state & GDK_CONTROL_MASK)
+ kzevent->modifier |= KZ_CTRL_KEY;
+ if (event->state & GDK_MOD1_MASK)
+ kzevent->modifier |= KZ_ALT_KEY;
+ if (event->state & GDK_META_MASK)
+ kzevent->modifier |= KZ_META_KEY;
+ kzevent->x = event->x;
+ kzevent->y = event->y;
+ kzevent->button = event->button;
+ kzevent->cinfo.context = KZ_CONTEXT_NONE;
+
+ return kzevent;
+}
+
+static gboolean
+button_press_event (GtkWidget *widget, GdkEventButton *event)
+{
+ KzEmbedEventMouse *kzevent;
+ gint ret = FALSE;
+
+ kzevent = create_kz_embed_event_mouse(event);
+ g_signal_emit_by_name(widget, "kz-dom-mouse-down", kzevent, &ret);
+ kz_embed_event_free((KzEmbedEvent *) kzevent);
+
+ return ret;
+}
+
+static gboolean
+button_release_event (GtkWidget *widget, GdkEventButton *event)
+{
+ KzEmbedEventMouse *kzevent;
+ gint ret = FALSE;
+
+ kzevent = create_kz_embed_event_mouse(event);
+ g_signal_emit_by_name(widget, "kz-dom-mouse-up", kzevent, &ret);
+ kz_embed_event_free((KzEmbedEvent *) kzevent);
+
+ return ret;
+}
+#endif
static void
load_url (KzEmbed *kzembed, const gchar *url)
{
@@ -545,6 +609,25 @@
g_object_set(settings, "auto-load-images", allow, NULL);
}
+static gboolean
+can_go_nav_link (KzEmbed *kzembed, KzEmbedNavLink link)
+{
+ return FALSE;
+}
+
+static KzNavi *
+get_nth_nav_link (KzEmbed *kzembed, KzEmbedNavLink link,
+ guint n)
+{
+ return NULL;
+}
+
+static GList *
+get_nav_links (KzEmbed *kzembed, KzEmbedNavLink link)
+{
+ return NULL;
+}
+
static void
cb_title_changed (WebKitWebView* web_view,
WebKitWebFrame* web_frame,
@@ -718,7 +801,7 @@
&value, strlen(value)+1,
KZ_PROFILE_VALUE_TYPE_STRING);
g_object_set(settings,
- "monospace-serif-font-family", value,
+ "monospace-font-family", value,
NULL);
}
}