DeforaOS/Surfer
DeforaOS/Surfer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented a couple more callbacks

Browse Source
This commit is contained in:
Pierre Pronchery 2013-05-21 05:50:29 +02:00
parent 7101bd26fb
commit 5f1cbd5acf
1 changed files with 86 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/ghtml-webkit.c
View File

@ -43,6 +43,9 @@ typedef struct _GHtml
#endif #endif
char * status; char * status;
gboolean ssl; gboolean ssl;
/* for popup menus */
char * popup_uri;
} GHtml; } GHtml;
@ -61,6 +64,9 @@ static gboolean _on_console_message(WebKitWebView * view, const gchar * message,
static gboolean _on_context_menu(WebKitWebView * view, GtkWidget * menu, static gboolean _on_context_menu(WebKitWebView * view, GtkWidget * menu,
WebKitHitTestResult * result, gboolean keyboard, gpointer data); WebKitHitTestResult * result, gboolean keyboard, gpointer data);
#endif #endif
#if WEBKIT_CHECK_VERSION(1, 10, 0)
static void _on_copy_link_location(gpointer data);
#endif
static WebKitWebView * _on_create_web_view(WebKitWebView * view, static WebKitWebView * _on_create_web_view(WebKitWebView * view,
WebKitWebFrame * frame, gpointer data); WebKitWebFrame * frame, gpointer data);
#ifdef WEBKIT_TYPE_DOWNLOAD #ifdef WEBKIT_TYPE_DOWNLOAD
@ -84,6 +90,11 @@ static void _on_load_progress_changed(WebKitWebView * view, gint progress,
gpointer data); gpointer data);
static void _on_load_started(WebKitWebView * view, WebKitWebFrame * frame, static void _on_load_started(WebKitWebView * view, WebKitWebFrame * frame,
gpointer data); gpointer data);
#if WEBKIT_CHECK_VERSION(1, 10, 0)
static void _on_open_new_tab(gpointer data);
static void _on_open_new_window(gpointer data);
static void _on_save_link_as(gpointer data);
#endif
static gboolean _on_script_alert(WebKitWebView * view, WebKitWebFrame * frame, static gboolean _on_script_alert(WebKitWebView * view, WebKitWebFrame * frame,
const gchar * message, gpointer data); const gchar * message, gpointer data);
static gboolean _on_script_confirm(WebKitWebView * view, WebKitWebFrame * frame, static gboolean _on_script_confirm(WebKitWebView * view, WebKitWebFrame * frame,
@ -113,6 +124,7 @@ GtkWidget * ghtml_new(Surfer * surfer)
ghtml->surfer = surfer; ghtml->surfer = surfer;
ghtml->status = NULL; ghtml->status = NULL;
ghtml->ssl = FALSE; ghtml->ssl = FALSE;
ghtml->popup_uri = NULL;
/* widgets */ /* widgets */
widget = gtk_scrolled_window_new(NULL, NULL); widget = gtk_scrolled_window_new(NULL, NULL);
ghtml->widget = widget; ghtml->widget = widget;
@ -220,6 +232,7 @@ void ghtml_delete(GtkWidget * widget)
GHtml * ghtml; GHtml * ghtml;
ghtml = g_object_get_data(G_OBJECT(widget), "ghtml"); ghtml = g_object_get_data(G_OBJECT(widget), "ghtml");
free(ghtml->popup_uri);
free(ghtml->status); free(ghtml->status);
object_delete(ghtml); object_delete(ghtml);
} }
@ -839,8 +852,11 @@ static gboolean _on_console_message(WebKitWebView * view, const gchar * message,
static void _context_menu_document(GHtml * ghtml, GtkWidget * menu); static void _context_menu_document(GHtml * ghtml, GtkWidget * menu);
static void _context_menu_editable(GHtml * ghtml); static void _context_menu_editable(GHtml * ghtml);
static void _context_menu_image(GHtml * ghtml, GtkWidget * menu); static void _context_menu_image(GHtml * ghtml, GtkWidget * menu);
static void _context_menu_link(GHtml * ghtml, GtkWidget * menu); static void _context_menu_link(GHtml * ghtml, WebKitHitTestResult * result,
GtkWidget * menu);
static void _context_menu_media(GHtml * ghtml); static void _context_menu_media(GHtml * ghtml);
static void _context_menu_position(GtkMenu * menu, gint * x, gint * y,
gboolean * push, gpointer data);
static void _context_menu_selection(GHtml * ghtml, GtkWidget * menu); static void _context_menu_selection(GHtml * ghtml, GtkWidget * menu);
static void _context_menu_separator(GtkWidget * menu, gboolean * separator); static void _context_menu_separator(GtkWidget * menu, gboolean * separator);
@ -855,7 +871,7 @@ static gboolean _on_context_menu(WebKitWebView * view, GtkWidget * menu,
/* FIXME implement every callback */ /* FIXME implement every callback */
ghtml = g_object_get_data(G_OBJECT(widget), "ghtml"); ghtml = g_object_get_data(G_OBJECT(widget), "ghtml");
menu = gtk_menu_new(); menu = gtk_menu_new();
g_object_get(result, "context", &context, NULL); g_object_get(G_OBJECT(result), "context", &context, NULL);
if(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE) if(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE)
{ {
_context_menu_separator(menu, &separator); _context_menu_separator(menu, &separator);
@ -864,7 +880,7 @@ static gboolean _on_context_menu(WebKitWebView * view, GtkWidget * menu,
if(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK) if(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK)
{ {
_context_menu_separator(menu, &separator); _context_menu_separator(menu, &separator);
_context_menu_link(ghtml, menu); _context_menu_link(ghtml, result, menu);
} }
if(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT if(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT
&& !(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION) && !(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION)
@ -889,6 +905,11 @@ static gboolean _on_context_menu(WebKitWebView * view, GtkWidget * menu,
_context_menu_media(ghtml); _context_menu_media(ghtml);
} }
gtk_widget_show_all(menu); gtk_widget_show_all(menu);
if(keyboard)
/* XXX seems to be buggy */
gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
_context_menu_position, result, -1,
gtk_get_current_event_time());
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 3, gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 3,
gtk_get_current_event_time()); gtk_get_current_event_time());
return TRUE; return TRUE;
@ -982,21 +1003,29 @@ static void _context_menu_image(GHtml * ghtml, GtkWidget * menu)
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
} }
static void _context_menu_link(GHtml * ghtml, GtkWidget * menu) static void _context_menu_link(GHtml * ghtml, WebKitHitTestResult * result,
GtkWidget * menu)
{ {
GtkWidget * menuitem; GtkWidget * menuitem;
GtkWidget * image; GtkWidget * image;
free(ghtml->popup_uri);
ghtml->popup_uri;
g_object_get(G_OBJECT(result), "link-uri", &ghtml->popup_uri, NULL);
/* open in new tab */ /* open in new tab */
menuitem = gtk_image_menu_item_new_with_mnemonic(_("Open in new _tab")); menuitem = gtk_image_menu_item_new_with_mnemonic(_("Open in new _tab"));
image = gtk_image_new_from_icon_name("tab-new", GTK_ICON_SIZE_MENU); image = gtk_image_new_from_icon_name("tab-new", GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image);
g_signal_connect_swapped(menuitem, "activate", G_CALLBACK(
_on_open_new_tab), ghtml);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
/* open in new window */ /* open in new window */
menuitem = gtk_image_menu_item_new_with_mnemonic( menuitem = gtk_image_menu_item_new_with_mnemonic(
_("Open in new _window")); _("Open in new _window"));
image = gtk_image_new_from_icon_name("window-new", GTK_ICON_SIZE_MENU); image = gtk_image_new_from_icon_name("window-new", GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image);
g_signal_connect_swapped(menuitem, "activate", G_CALLBACK(
_on_open_new_window), ghtml);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
/* separator */ /* separator */
menuitem = gtk_separator_menu_item_new(); menuitem = gtk_separator_menu_item_new();
@ -1005,12 +1034,16 @@ static void _context_menu_link(GHtml * ghtml, GtkWidget * menu)
menuitem = gtk_image_menu_item_new_with_mnemonic(_("_Save link as...")); menuitem = gtk_image_menu_item_new_with_mnemonic(_("_Save link as..."));
image = gtk_image_new_from_stock(GTK_STOCK_SAVE_AS, GTK_ICON_SIZE_MENU); image = gtk_image_new_from_stock(GTK_STOCK_SAVE_AS, GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image);
g_signal_connect_swapped(menuitem, "activate",
G_CALLBACK(_on_save_link_as), ghtml);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
/* copy link location */ /* copy link location */
menuitem = gtk_image_menu_item_new_with_mnemonic( menuitem = gtk_image_menu_item_new_with_mnemonic(
_("_Copy link location")); _("_Copy link location"));
image = gtk_image_new_from_stock(GTK_STOCK_COPY, GTK_ICON_SIZE_MENU); image = gtk_image_new_from_stock(GTK_STOCK_COPY, GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image);
g_signal_connect_swapped(menuitem, "activate",
G_CALLBACK(_on_copy_link_location), ghtml);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
} }
@ -1019,6 +1052,15 @@ static void _context_menu_media(GHtml * ghtml)
/* FIXME implement */ /* FIXME implement */
} }
static void _context_menu_position(GtkMenu * menu, gint * x, gint * y,
gboolean * push, gpointer data)
{
WebKitHitTestResult * result = data;
g_object_get(G_OBJECT(result), "x", x, "y", y, NULL);
*push = TRUE;
}
static void _context_menu_selection(GHtml * ghtml, GtkWidget * menu) static void _context_menu_selection(GHtml * ghtml, GtkWidget * menu)
{ {
GtkWidget * menuitem; GtkWidget * menuitem;
@ -1052,6 +1094,15 @@ static void _context_menu_separator(GtkWidget * menu, gboolean * separator)
#endif #endif
#if WEBKIT_CHECK_VERSION(1, 10, 0)
/* on_copy_link_location */
static void _on_copy_link_location(gpointer data)
{
/* FIXME implement */
}
#endif
/* on_create_web_view */ /* on_create_web_view */
static WebKitWebView * _on_create_web_view(WebKitWebView * view, static WebKitWebView * _on_create_web_view(WebKitWebView * view,
WebKitWebFrame * frame, gpointer data) WebKitWebFrame * frame, gpointer data)
@ -1200,6 +1251,37 @@ static void _on_load_started(WebKitWebView * view, WebKitWebFrame * frame,
} }
#if WEBKIT_CHECK_VERSION(1, 10, 0)
/* on_open_new_tab */
static void _on_open_new_tab(gpointer data)
{
GHtml * ghtml = data;
surfer_open_tab(ghtml->surfer, ghtml->popup_uri);
free(ghtml->popup_uri);
ghtml->popup_uri = NULL;
}
/* on_open_new_window */
static void _on_open_new_window(gpointer data)
{
GHtml * ghtml = data;
surfer_new(ghtml->popup_uri);
free(ghtml->popup_uri);
ghtml->popup_uri = NULL;
}
/* on_save_link_as */
static void _on_save_link_as(gpointer data)
{
/* FIXME implement */
}
#endif
/* on_script_alert */ /* on_script_alert */
static gboolean _on_script_alert(WebKitWebView * view, WebKitWebFrame * frame, static gboolean _on_script_alert(WebKitWebView * view, WebKitWebFrame * frame,
const gchar * message, gpointer data) const gchar * message, gpointer data)