aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Verona2011-07-03 09:29:53 +0200
committerJoakim Verona2011-07-03 09:29:53 +0200
commitff0863a96f15f7f2e9f9ea3df68146f0ae413579 (patch)
tree7d8a5cf5903dd80bc791808c37d93727020abfaa
parent83d3c036b0f9bf5aea02b7b572d645f582ff7936 (diff)
downloademacs-ff0863a96f15f7f2e9f9ea3df68146f0ae413579.tar.gz
emacs-ff0863a96f15f7f2e9f9ea3df68146f0ae413579.zip
damage event now actually caught and used for webkit-osr.
-rw-r--r--README.xwidget11
-rw-r--r--src/xwidget.c18
2 files changed, 28 insertions, 1 deletions
diff --git a/README.xwidget b/README.xwidget
index c99cbe99381..59ddf9d2435 100644
--- a/README.xwidget
+++ b/README.xwidget
@@ -478,3 +478,14 @@ the needed data is private to the base class. to overcome this:
478 478
479** TODO use FRAME_GTK_WIDGET (f) 479** TODO use FRAME_GTK_WIDGET (f)
480rather than gwfixed 480rather than gwfixed
481
482** TODO translate clicks
483on onscreen webkit peer to offscreen
484
485maybe
486http://developer.gnome.org/gdk/stable/gdk-Windows.html#GdkWindow-from-embedder
487
488
489** TODO investigate gdk_window_redirect_to_drawable
490http://developer.gnome.org/gdk/stable/gdk-Windows.html#gdk-offscreen-window-set-embedder
491maybe control be used in place of my own copy hacks?
diff --git a/src/xwidget.c b/src/xwidget.c
index ac35f0d61af..6d82263ff80 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -428,6 +428,13 @@ xwidget_osr_draw_callback (GtkWidget *widget, cairo_t *cr, gpointer data)
428} 428}
429 429
430 430
431gboolean
432xwidget_osr_button_callback ( GtkWidget *widget,
433 GdkEvent *event,
434 gpointer user_data)
435{
436 printf ("button callback\n",);
437}
431 438
432int xwidget_view_index=0; 439int xwidget_view_index=0;
433 440
@@ -528,8 +535,17 @@ xwidget_init_view (
528 gtk_widget_set_app_paintable ( xv->widget, TRUE); //because expose event handling 535 gtk_widget_set_app_paintable ( xv->widget, TRUE); //because expose event handling
529#endif 536#endif
530#ifdef HAVE_GTK3 //and webkit_osr 537#ifdef HAVE_GTK3 //and webkit_osr
538 gtk_widget_add_events(xv->widget,
539 GDK_BUTTON_PRESS_MASK
540 | GDK_BUTTON_RELEASE_MASK
541 );
542
531 g_signal_connect (G_OBJECT ( xv->widget), "draw", 543 g_signal_connect (G_OBJECT ( xv->widget), "draw",
532 G_CALLBACK (xwidget_osr_draw_callback), NULL); 544 G_CALLBACK (xwidget_osr_draw_callback), NULL);
545
546 g_signal_connect (G_OBJECT ( xv->widget), "buton-press-event",
547 G_CALLBACK (xwidget_osr_button_callback), NULL);
548
533 549
534#else 550#else
535 g_signal_connect (G_OBJECT ( xv->widget), "expose_event", 551 g_signal_connect (G_OBJECT ( xv->widget), "expose_event",