aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGrégoire Jadi2013-07-25 15:33:12 +0200
committerGrégoire Jadi2013-07-25 15:33:12 +0200
commit7ec36b160940e7ce72ab714fcd568b0298c60528 (patch)
tree6c4119eca3e28bb0ea4f6f1d7d75f529289f7a9f /src
parentc569331a8e58416393f7b0997fb43fc962808639 (diff)
downloademacs-7ec36b160940e7ce72ab714fcd568b0298c60528.tar.gz
emacs-7ec36b160940e7ce72ab714fcd568b0298c60528.zip
* src/xwidget.c: Remove old code.
Diffstat (limited to 'src')
-rw-r--r--src/xwidget.c72
1 files changed, 1 insertions, 71 deletions
diff --git a/src/xwidget.c b/src/xwidget.c
index 6e98bb4f54b..ebd22595f5b 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -133,7 +133,6 @@ extern Lisp_Object QCwidth, QCheight;
133struct xwidget_view* xwidget_view_lookup(struct xwidget* xw, struct window *w); 133struct xwidget_view* xwidget_view_lookup(struct xwidget* xw, struct window *w);
134Lisp_Object xwidget_spec_value ( Lisp_Object spec, Lisp_Object key, int *found); 134Lisp_Object xwidget_spec_value ( Lisp_Object spec, Lisp_Object key, int *found);
135gboolean offscreen_damage_event (GtkWidget *widget, GdkEvent *event, gpointer data); 135gboolean offscreen_damage_event (GtkWidget *widget, GdkEvent *event, gpointer data);
136gboolean webkit_osr_key_event_callback (GtkWidget *widget, GdkEventKey *event, gpointer data) ;
137void webkit_osr_document_load_finished_callback (WebKitWebView *webkitwebview, 136void webkit_osr_document_load_finished_callback (WebKitWebView *webkitwebview,
138 WebKitWebFrame *arg1, 137 WebKitWebFrame *arg1,
139 gpointer user_data); 138 gpointer user_data);
@@ -163,11 +162,6 @@ gboolean webkit_osr_navigation_policy_decision_requested_callback(WebKitWebView
163 WebKitWebPolicyDecision *policy_decision, 162 WebKitWebPolicyDecision *policy_decision,
164 gpointer user_data); 163 gpointer user_data);
165 164
166gboolean
167xwgir_event_callback (GtkWidget *widget,
168 GdkEvent *event,
169 gpointer user_data);
170
171GtkWidget* xwgir_create(char* class, char* namespace); 165GtkWidget* xwgir_create(char* class, char* namespace);
172static void 166static void
173send_xembed_ready_event (struct xwidget* xw, int xembedid); 167send_xembed_ready_event (struct xwidget* xw, int xembedid);
@@ -224,7 +218,6 @@ TYPE is a symbol which can take one of the following values:
224 if (EQ(xw->type, Qwebkit_osr)|| 218 if (EQ(xw->type, Qwebkit_osr)||
225 EQ(xw->type, Qsocket_osr)|| 219 EQ(xw->type, Qsocket_osr)||
226 (!NILP (Fget(xw->type, QCxwgir_class)))) { 220 (!NILP (Fget(xw->type, QCxwgir_class)))) {
227 printf("init osr widget\n");
228 block_input(); 221 block_input();
229 xw->widgetwindow_osr = gtk_offscreen_window_new (); 222 xw->widgetwindow_osr = gtk_offscreen_window_new ();
230 gtk_window_resize(GTK_WINDOW(xw->widgetwindow_osr), xw->width, xw->height); 223 gtk_window_resize(GTK_WINDOW(xw->widgetwindow_osr), xw->width, xw->height);
@@ -275,10 +268,6 @@ TYPE is a symbol which can take one of the following values:
275 } 268 }
276 269
277 if (EQ(xw->type, Qsocket_osr)) { 270 if (EQ(xw->type, Qsocket_osr)) {
278 printf ("xwid:%d socket id:%x %d\n",
279 xw,
280 gtk_socket_get_id (GTK_SOCKET (xw->widget_osr)),
281 gtk_socket_get_id (GTK_SOCKET (xw->widget_osr)));
282 send_xembed_ready_event (xw, gtk_socket_get_id (GTK_SOCKET (xw->widget_osr))); 271 send_xembed_ready_event (xw, gtk_socket_get_id (GTK_SOCKET (xw->widget_osr)));
283 //gtk_widget_realize(xw->widget); 272 //gtk_widget_realize(xw->widget);
284 } 273 }
@@ -456,18 +445,6 @@ offscreen_damage_event (GtkWidget *widget, GdkEvent *event, gpointer data)
456 return FALSE; 445 return FALSE;
457} 446}
458 447
459
460
461gboolean
462webkit_osr_key_event_callback (GtkWidget *widget, GdkEventKey *event, gpointer data)
463{
464 printf("terminating a webkit osr keypress\n");
465 //TRUE terminate the event here. no paren handlers will be called. but webkit then doesng get the event and it still crashes
466 //FALSE paren handlers will be called. webkit then gets the event and it still crashes
467 return TRUE;
468}
469
470
471void 448void
472store_xwidget_event_string(struct xwidget* xw, char* eventname, const char* eventstr) 449store_xwidget_event_string(struct xwidget* xw, char* eventname, const char* eventstr)
473{ 450{
@@ -581,14 +558,10 @@ xwidget_osr_draw_callback (GtkWidget *widget, cairo_t *cr, gpointer data)
581 struct xwidget* xw = (struct xwidget*) g_object_get_data (G_OBJECT (widget), XG_XWIDGET); 558 struct xwidget* xw = (struct xwidget*) g_object_get_data (G_OBJECT (widget), XG_XWIDGET);
582 struct xwidget_view* xv = (struct xwidget_view*) g_object_get_data (G_OBJECT (widget), XG_XWIDGET_VIEW); 559 struct xwidget_view* xv = (struct xwidget_view*) g_object_get_data (G_OBJECT (widget), XG_XWIDGET_VIEW);
583 560
584 printf("xwidget_osr_draw_callback gtk3 xw.id:%d xw.type:%d window:%d vis:%d\n",
585 xw,xw->type, gtk_widget_get_window (widget), gtk_widget_get_visible (xw->widget_osr));
586
587 cairo_rectangle(cr, 0,0, xv->clip_right, xv->clip_bottom);//xw->width, xw->height); 561 cairo_rectangle(cr, 0,0, xv->clip_right, xv->clip_bottom);//xw->width, xw->height);
588 cairo_clip(cr); 562 cairo_clip(cr);
589 563
590 gtk_widget_draw (xw->widget_osr, cr); 564 gtk_widget_draw (xw->widget_osr, cr);
591
592 565
593 return FALSE; 566 return FALSE;
594} 567}
@@ -635,20 +608,6 @@ xwidget_osr_event_forward (GtkWidget *widget,
635 //return FALSE; //dont propagate this event furter 608 //return FALSE; //dont propagate this event furter
636} 609}
637 610
638gboolean
639xwgir_event_callback (GtkWidget *widget,
640 GdkEvent *event,
641 gpointer user_data)
642{
643 //debugging
644 //perhaps delete copied events here
645 struct xwidget* xw = (struct xwidget*) g_object_get_data (G_OBJECT (widget), XG_XWIDGET);
646 printf("xwgir_event_callback\n");
647 return FALSE;
648}
649
650
651
652GIRepository *girepository ; 611GIRepository *girepository ;
653DEFUN( "xwgir-require-namespace",Fxwgir_require_namespace, Sxwgir_require_namespace, 2,2,0, 612DEFUN( "xwgir-require-namespace",Fxwgir_require_namespace, Sxwgir_require_namespace, 2,2,0,
654 doc: /*require a namespace. must be done for all namespaces we want to use, before using other xwgir functions.*/) 613 doc: /*require a namespace. must be done for all namespaces we want to use, before using other xwgir functions.*/)
@@ -873,23 +832,6 @@ to_child (GtkWidget *bin,
873} 832}
874 833
875 834
876void
877offscreen_window_from_parent (GdkWindow *window,
878 double parent_x,
879 double parent_y,
880 double *offscreen_x,
881 double *offscreen_y,
882 GtkWidget *bin)
883{
884 /* printf("offscreen_window_from_parent %d %f,%f %f,%f\n", */
885 /* window, */
886 /* parent_x, */
887 /* parent_y, */
888 /* offscreen_x, */
889 /* offscreen_y ); */
890 to_child (bin, parent_x, parent_y, offscreen_x, offscreen_y);
891}
892
893GdkWindow * 835GdkWindow *
894offscreen_pick_embedded_child (GdkWindow *window, 836offscreen_pick_embedded_child (GdkWindow *window,
895 double x, 837 double x,
@@ -1233,18 +1175,6 @@ DEFUN("xwidget-disable-plugin-for-mime", Fxwidget_disable_plugin_for_mime , Sxwi
1233} 1175}
1234 1176
1235 1177
1236//attempting a workaround for a webkit offscreen bug
1237//TODO verify its still needed
1238void
1239gtk_window_get_position (GtkWindow *window,
1240 gint *root_x,
1241 gint *root_y)
1242{
1243 printf("my getsize\n");
1244 *root_x = 0;
1245 *root_y = 0;
1246}
1247
1248void 1178void
1249xwidget_webkit_dom_dump(WebKitDOMNode* parent) 1179xwidget_webkit_dom_dump(WebKitDOMNode* parent)
1250{ 1180{