2 files changed, 55 insertions, 2 deletions

diff --git a/src/dispnew.c b/src/dispnew.c
index 879ff88ff14..22695df1dc0 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -4297,7 +4297,7 @@ scrolling_window (struct window *w, int header_line_p)
 
 #ifdef HAVE_XWIDGETS
  //currently this is needed to detect xwidget movement reliably. or probably not.
-  printf("scrolling_window\n");
+  //printf("scrolling_window\n");
     return 0;
 #endif
   
diff --git a/src/xwidget.c b/src/xwidget.c
index b2fa6c30561..271cbd07f2d 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -97,6 +97,7 @@
 #include <webkit/webkitwebplugindatabase.h>
 #include <webkit/webkitwebplugin.h>
 #include <webkit/webkitglobals.h>
+#include <webkit/webkitwebnavigationaction.h>
 #endif
 
 #include "xwidget.h"
@@ -157,6 +158,23 @@ gboolean  webkit_osr_mime_type_policy_typedecision_requested_callback(WebKitWebV
                                                                       gchar                   *mimetype,
                                                                       WebKitWebPolicyDecision *policy_decision,
                                                                       gpointer                 user_data);
+
+gboolean webkit_osr_new_window_policy_decision_requested_callback(WebKitWebView             *webView,
+                                                                  WebKitWebFrame            *frame,
+                                                                  WebKitNetworkRequest      *request,
+                                                                  WebKitWebNavigationAction *navigation_action,
+                                                                  WebKitWebPolicyDecision   *policy_decision,
+                                                                  gpointer                   user_data);
+
+
+gboolean webkit_osr_navigation_policy_decision_requested_callback(WebKitWebView             *webView,
+                                                        WebKitWebFrame            *frame,
+                                                        WebKitNetworkRequest      *request,
+                                                        WebKitWebNavigationAction *navigation_action,
+                                                        WebKitWebPolicyDecision   *policy_decision,
+                                                                  gpointer                   user_data);
+
+  
 DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0,
          doc: /* xw */
          )
@@ -228,12 +246,23 @@ DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0,
                       G_CALLBACK (webkit_osr_mime_type_policy_typedecision_requested_callback),
                       xw);    
 
-    
+    g_signal_connect (G_OBJECT ( xw->widget_osr),
+                      "new-window-policy-decision-requested",
+                      G_CALLBACK (webkit_osr_new_window_policy_decision_requested_callback),
+                      xw);    
+
+    g_signal_connect (G_OBJECT ( xw->widget_osr),
+                      "navigation-policy-decision-requested",
+                      G_CALLBACK (webkit_osr_navigation_policy_decision_requested_callback),
+                      xw);    
+
+
     webkit_web_view_load_uri(WEBKIT_WEB_VIEW(xw->widget_osr), "http://www.fsf.org");
     UNBLOCK_INPUT;
 
   }
 #endif
+
   if (EQ(xw->type, Qsocket_osr)){
     printf("init socket osr\n");
     BLOCK_INPUT;
@@ -492,6 +521,30 @@ gboolean  webkit_osr_mime_type_policy_typedecision_requested_callback(WebKitWebV
 }
 
 
+gboolean webkit_osr_new_window_policy_decision_requested_callback(WebKitWebView             *webView,
+                                                                  WebKitWebFrame            *frame,
+                                                                  WebKitNetworkRequest      *request,
+                                                                  WebKitWebNavigationAction *navigation_action,
+                                                                  WebKitWebPolicyDecision   *policy_decision,
+                                                                  gpointer                   user_data)
+{
+  printf("webkit_osr_new_window_policy_decision_requested_callback %s\n",
+         webkit_web_navigation_action_get_original_uri (navigation_action));
+  
+  return FALSE;
+}
+
+gboolean webkit_osr_navigation_policy_decision_requested_callback(WebKitWebView             *webView,
+                                                        WebKitWebFrame            *frame,
+                                                        WebKitNetworkRequest      *request,
+                                                        WebKitWebNavigationAction *navigation_action,
+                                                        WebKitWebPolicyDecision   *policy_decision,
+                                                        gpointer                   user_data)
+{
+  printf("webkit_osr_navigation_policy_decision_requested_callback\n");
+  return FALSE;
+}
+
 //for gtk3 webkit_osr
 gboolean
 xwidget_osr_draw_callback (GtkWidget *widget, cairo_t *cr, gpointer data)