svnno****@sourc*****
svnno****@sourc*****
Wed Mar 19 11:44:16 JST 2008
Revision: 3487
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3487
Author: ikezoe
Date: 2008-03-19 11:44:15 +0900 (Wed, 19 Mar 2008)
Log Message:
-----------
2008-03-19 Hiroyuki Ikezoe <poinc****@ikezo*****>
* module/embed/webkit-gtk/kz-webkit-gtk.[c|h]: Show scroll bar.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.c
kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.h
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2008-03-14 13:53:31 UTC (rev 3486)
+++ kazehakase/trunk/ChangeLog 2008-03-19 02:44:15 UTC (rev 3487)
@@ -1,3 +1,7 @@
+2008-03-19 Hiroyuki Ikezoe <poinc****@ikezo*****>
+
+ * module/embed/webkit-gtk/kz-webkit-gtk.[c|h]: Show scroll bar.
+
2008-03-14 Hiroyuki Ikezoe <poinc****@ikezo*****>
* src/kz-xml.c: Use g_slice.
Modified: kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.c
===================================================================
--- kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.c 2008-03-14 13:53:31 UTC (rev 3486)
+++ kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.c 2008-03-19 02:44:15 UTC (rev 3487)
@@ -23,11 +23,14 @@
#include "kz-webkit-gtk.h"
+#include <webkit/webkit.h>
+
#include "kz-embed.h"
typedef struct _KzWebKitGtkPrivate KzWebKitGtkPrivate;
struct _KzWebKitGtkPrivate
{
+ WebKitWebView *web_view;
gint progress;
gchar *location;
gchar *title;
@@ -38,7 +41,7 @@
#define KZ_WEBKIT_GTK_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), KZ_TYPE_WEBKIT_GTK, KzWebKitGtkPrivate))
static GType kz_type_webkit_gtk = 0;
-static WebKitWebViewClass *kz_webkit_gtk_parent_class;
+static GtkScrolledWindowClass *kz_webkit_gtk_parent_class;
GtkWidget *kz_webkit_gtk_new (void);
static void kz_webkit_gtk_class_init (KzWebKitGtkClass *klass);
@@ -139,7 +142,7 @@
};
kz_type_webkit_gtk = g_type_module_register_type(module,
- WEBKIT_TYPE_WEB_VIEW,
+ GTK_TYPE_SCROLLED_WINDOW,
"KzWebKitGtk",
&kz_webkit_gtk_info,
(GTypeFlags)0);
@@ -162,7 +165,7 @@
GObjectClass *object_class;
GtkWidgetClass *widget_class;
- kz_webkit_gtk_parent_class = WEBKIT_WEB_VIEW_CLASS(g_type_class_peek_parent(klass));
+ kz_webkit_gtk_parent_class = GTK_SCROLLED_WINDOW_CLASS(g_type_class_peek_parent(klass));
object_class = G_OBJECT_CLASS(klass);
widget_class = GTK_WIDGET_CLASS(klass);
@@ -284,18 +287,21 @@
priv->lock = FALSE;
priv->is_loading = FALSE;
- g_signal_connect(webkit, "title-changed",
- G_CALLBACK(cb_title_changed), NULL);
- g_signal_connect(webkit, "load-progress-changed",
- G_CALLBACK(cb_progress_changed), NULL);
- g_signal_connect(webkit, "load-committed",
- G_CALLBACK(cb_load_committed), NULL);
- g_signal_connect(webkit, "load-started",
- G_CALLBACK(cb_load_started), NULL);
- g_signal_connect(webkit, "load-finished",
- G_CALLBACK(cb_load_finished), NULL);
- g_signal_connect(webkit, "hovering-over-link",
- G_CALLBACK(cb_hover_link), NULL);
+ priv->web_view = WEBKIT_WEB_VIEW(webkit_web_view_new());
+ gtk_container_add(GTK_CONTAINER(webkit), GTK_WIDGET(priv->web_view));
+
+ g_signal_connect(priv->web_view, "title-changed",
+ G_CALLBACK(cb_title_changed), webkit);
+ g_signal_connect(priv->web_view, "load-progress-changed",
+ G_CALLBACK(cb_progress_changed), webkit);
+ g_signal_connect(priv->web_view, "load-committed",
+ G_CALLBACK(cb_load_committed), webkit);
+ g_signal_connect(priv->web_view, "load-started",
+ G_CALLBACK(cb_load_started), webkit);
+ g_signal_connect(priv->web_view, "load-finished",
+ G_CALLBACK(cb_load_finished), webkit);
+ g_signal_connect(priv->web_view, "hovering-over-link",
+ G_CALLBACK(cb_hover_link), webkit);
set_default_preferences(webkit);
}
@@ -320,7 +326,12 @@
GtkWidget *
kz_webkit_gtk_new (void)
{
- return GTK_WIDGET(g_object_new(KZ_TYPE_WEBKIT_GTK, NULL));
+ return GTK_WIDGET(g_object_new(KZ_TYPE_WEBKIT_GTK,
+ "hadjustment", NULL,
+ "vadjustment", NULL,
+ "hscrollbar-policy", GTK_POLICY_AUTOMATIC,
+ "vscrollbar-policy", GTK_POLICY_AUTOMATIC,
+ NULL));
}
#if 0
static KzEmbedEventMouse *
@@ -376,7 +387,7 @@
{
g_return_if_fail(KZ_IS_WEBKIT_GTK(kzembed));
- webkit_web_view_open(WEBKIT_WEB_VIEW(kzembed), url);
+ webkit_web_view_open(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view, url);
}
static void
@@ -384,7 +395,7 @@
{
g_return_if_fail(KZ_IS_WEBKIT_GTK(kzembed));
- webkit_web_view_reload(WEBKIT_WEB_VIEW(kzembed));
+ webkit_web_view_reload(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view);
}
static void
@@ -392,7 +403,7 @@
{
g_return_if_fail(KZ_IS_WEBKIT_GTK(kzembed));
- webkit_web_view_stop_loading(WEBKIT_WEB_VIEW(kzembed));
+ webkit_web_view_stop_loading(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view);
}
static void
@@ -400,7 +411,7 @@
{
g_return_if_fail(KZ_IS_WEBKIT_GTK(kzembed));
- webkit_web_view_go_back(WEBKIT_WEB_VIEW(kzembed));
+ webkit_web_view_go_back(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view);
}
static void
@@ -408,7 +419,7 @@
{
g_return_if_fail(KZ_IS_WEBKIT_GTK(kzembed));
- webkit_web_view_go_forward(WEBKIT_WEB_VIEW(kzembed));
+ webkit_web_view_go_forward(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view);
}
static gboolean
@@ -416,7 +427,7 @@
{
g_return_val_if_fail(KZ_IS_WEBKIT_GTK(kzembed), FALSE);
- return webkit_web_view_can_go_back(WEBKIT_WEB_VIEW(kzembed));
+ return webkit_web_view_can_go_back(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view);
}
static gboolean
@@ -424,7 +435,7 @@
{
g_return_val_if_fail(KZ_IS_WEBKIT_GTK(kzembed), FALSE);
- return webkit_web_view_can_go_forward(WEBKIT_WEB_VIEW(kzembed));
+ return webkit_web_view_can_go_forward(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view);
}
static gboolean
@@ -432,7 +443,7 @@
{
g_return_val_if_fail(KZ_IS_WEBKIT_GTK(kzembed), FALSE);
- return webkit_web_view_can_cut_clipboard(WEBKIT_WEB_VIEW(kzembed));
+ return webkit_web_view_can_cut_clipboard(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view);
}
static gboolean
@@ -440,7 +451,7 @@
{
g_return_val_if_fail(KZ_IS_WEBKIT_GTK(kzembed), FALSE);
- return webkit_web_view_can_copy_clipboard(WEBKIT_WEB_VIEW(kzembed));
+ return webkit_web_view_can_copy_clipboard(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view);
}
static gboolean
@@ -448,7 +459,7 @@
{
g_return_val_if_fail(KZ_IS_WEBKIT_GTK(kzembed), FALSE);
- return webkit_web_view_can_paste_clipboard(WEBKIT_WEB_VIEW(kzembed));
+ return webkit_web_view_can_paste_clipboard(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view);
}
static void
@@ -456,7 +467,7 @@
{
g_return_if_fail(KZ_IS_WEBKIT_GTK(kzembed));
- webkit_web_view_cut_clipboard(WEBKIT_WEB_VIEW(kzembed));
+ webkit_web_view_cut_clipboard(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view);
}
static void
@@ -464,7 +475,7 @@
{
g_return_if_fail(KZ_IS_WEBKIT_GTK(kzembed));
- webkit_web_view_copy_clipboard(WEBKIT_WEB_VIEW(kzembed));
+ webkit_web_view_copy_clipboard(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view);
}
static void
@@ -472,7 +483,7 @@
{
g_return_if_fail(KZ_IS_WEBKIT_GTK(kzembed));
- webkit_web_view_paste_clipboard(WEBKIT_WEB_VIEW(kzembed));
+ webkit_web_view_paste_clipboard(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view);
}
static void
@@ -480,7 +491,7 @@
{
g_return_if_fail(KZ_IS_WEBKIT_GTK(kzembed));
- webkit_web_view_select_all(WEBKIT_WEB_VIEW(kzembed));
+ webkit_web_view_select_all(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view);
}
static const gchar *
@@ -532,7 +543,7 @@
static gboolean
selection_is_collapsed (KzEmbed *kzembed)
{
- return webkit_web_view_has_selection(WEBKIT_WEB_VIEW(kzembed));
+ return webkit_web_view_has_selection(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view);
}
static gboolean
@@ -560,7 +571,7 @@
WebKitWebSettings *settings;
gboolean allow;
- settings = webkit_web_view_get_settings(WEBKIT_WEB_VIEW(kzembed));
+ settings = webkit_web_view_get_settings(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view);
if (!settings)
return FALSE;
@@ -574,7 +585,7 @@
{
WebKitWebSettings *settings;
- settings = webkit_web_view_get_settings(WEBKIT_WEB_VIEW(kzembed));
+ settings = webkit_web_view_get_settings(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view);
if (!settings)
return;
@@ -587,7 +598,7 @@
WebKitWebSettings *settings;
gboolean allow;
- settings = webkit_web_view_get_settings(WEBKIT_WEB_VIEW(kzembed));
+ settings = webkit_web_view_get_settings(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view);
if (!settings)
return FALSE;
@@ -601,7 +612,7 @@
{
WebKitWebSettings *settings;
- settings = webkit_web_view_get_settings(WEBKIT_WEB_VIEW(kzembed));
+ settings = webkit_web_view_get_settings(KZ_WEBKIT_GTK_GET_PRIVATE(kzembed)->web_view);
if (!settings)
return;
@@ -633,12 +644,12 @@
const gchar* title,
gpointer data)
{
- KzWebKitGtkPrivate *priv = KZ_WEBKIT_GTK_GET_PRIVATE(web_view);
+ KzWebKitGtkPrivate *priv = KZ_WEBKIT_GTK_GET_PRIVATE(data);
if (priv->title)
g_free(priv->title);
priv->title = g_strdup(title);
- g_signal_emit_by_name(web_view, "kz-title");
+ g_signal_emit_by_name(data, "kz-title");
}
static void
@@ -646,10 +657,10 @@
gint progress,
gpointer data)
{
- KzWebKitGtkPrivate *priv = KZ_WEBKIT_GTK_GET_PRIVATE(web_view);
+ KzWebKitGtkPrivate *priv = KZ_WEBKIT_GTK_GET_PRIVATE(data);
priv->progress = progress;
- g_signal_emit_by_name(web_view, "kz-progress");
+ g_signal_emit_by_name(data, "kz-progress");
}
static void
@@ -657,21 +668,21 @@
WebKitWebFrame* frame,
gpointer data)
{
- KzWebKitGtkPrivate *priv = KZ_WEBKIT_GTK_GET_PRIVATE(web_view);
+ KzWebKitGtkPrivate *priv = KZ_WEBKIT_GTK_GET_PRIVATE(data);
const gchar* location = webkit_web_frame_get_uri(frame);
if (priv->location)
g_free(priv->location);
priv->location = g_strdup(location);
- g_signal_emit_by_name(web_view, "kz-location");
+ g_signal_emit_by_name(data, "kz-location");
}
static void
cb_load_started (WebKitWebView* web_view,
- WebKitWebFrame* frame,
- gpointer data)
+ WebKitWebFrame* frame,
+ gpointer data)
{
- KZ_WEBKIT_GTK_GET_PRIVATE(web_view)->is_loading = TRUE;
- g_signal_emit_by_name(web_view, "kz-net-start");
+ KZ_WEBKIT_GTK_GET_PRIVATE(data)->is_loading = TRUE;
+ g_signal_emit_by_name(data, "kz-net-start");
}
static void
@@ -679,8 +690,8 @@
WebKitWebFrame* frame,
gpointer data)
{
- KZ_WEBKIT_GTK_GET_PRIVATE(web_view)->is_loading = FALSE;
- g_signal_emit_by_name(web_view, "kz-net-stop");
+ KZ_WEBKIT_GTK_GET_PRIVATE(data)->is_loading = FALSE;
+ g_signal_emit_by_name(data, "kz-net-stop");
}
static void
@@ -689,13 +700,13 @@
const gchar *location,
gpointer data)
{
- KzWebKitGtkPrivate *priv = KZ_WEBKIT_GTK_GET_PRIVATE(web_view);
+ KzWebKitGtkPrivate *priv = KZ_WEBKIT_GTK_GET_PRIVATE(data);
if (priv->link_message)
g_free(priv->link_message);
priv->link_message = g_strdup(location);
- g_signal_emit_by_name(web_view, "kz-link-message");
+ g_signal_emit_by_name(data, "kz-link-message");
}
static void
@@ -826,7 +837,7 @@
gchar value[1024];
WebKitWebSettings *settings;
- settings = webkit_web_view_get_settings(WEBKIT_WEB_VIEW(webkit));
+ settings = webkit_web_view_get_settings(KZ_WEBKIT_GTK_GET_PRIVATE(webkit)->web_view);
if (!settings)
return;
Modified: kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.h
===================================================================
--- kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.h 2008-03-14 13:53:31 UTC (rev 3486)
+++ kazehakase/trunk/module/embed/webkit-gtk/kz-webkit-gtk.h 2008-03-19 02:44:15 UTC (rev 3487)
@@ -22,7 +22,7 @@
#ifndef __KZ_WEBKIT_GTK_H__
#define __KZ_WEBKIT_GTK_H__
-#include <webkit/webkit.h>
+#include <gtk/gtkscrolledwindow.h>
G_BEGIN_DECLS
@@ -38,12 +38,12 @@
struct _KzWebKitGtk
{
- WebKitWebView parent;
+ GtkScrolledWindow parent;
};
struct _KzWebKitGtkClass
{
- WebKitWebViewClass parent_class;
+ GtkScrolledWindowClass parent_class;
};