diff options
| author | Joakim Verona | 2011-07-15 00:33:31 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-07-15 00:33:31 +0200 |
| commit | ff2be00005c3aeda6e11d7ed264ce86f02b60958 (patch) | |
| tree | 179733d9a5d6c23d497c5b7326528e3f991ce2f4 | |
| parent | 2f6c9a34360248292d09dc7c6a8c3c0f513665e2 (diff) | |
| download | emacs-ff2be00005c3aeda6e11d7ed264ce86f02b60958.tar.gz emacs-ff2be00005c3aeda6e11d7ed264ce86f02b60958.zip | |
webkit osr works again
| -rw-r--r-- | src/xwidget.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/xwidget.c b/src/xwidget.c index 82fa5ad6933..d77037723ff 100644 --- a/src/xwidget.c +++ b/src/xwidget.c | |||
| @@ -171,7 +171,8 @@ DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0, | |||
| 171 | /* DIY mvc. widget is rendered offscreen, | 171 | /* DIY mvc. widget is rendered offscreen, |
| 172 | later bitmap copied to the views. | 172 | later bitmap copied to the views. |
| 173 | */ | 173 | */ |
| 174 | if (EQ(xw->type, Qwebkit_osr) && !xw->widgetwindow_osr){ | 174 | if (EQ(xw->type, Qwebkit_osr)){ |
| 175 | printf("init webkit osr\n"); | ||
| 175 | BLOCK_INPUT; | 176 | BLOCK_INPUT; |
| 176 | xw->widgetwindow_osr = GTK_CONTAINER (gtk_offscreen_window_new ()); | 177 | xw->widgetwindow_osr = GTK_CONTAINER (gtk_offscreen_window_new ()); |
| 177 | gtk_window_resize( GTK_WINDOW(xw->widgetwindow_osr), xw->width, xw->height); | 178 | gtk_window_resize( GTK_WINDOW(xw->widgetwindow_osr), xw->width, xw->height); |
| @@ -365,8 +366,8 @@ xwidget_osr_draw_callback (GtkWidget *widget, cairo_t *cr, gpointer data) | |||
| 365 | struct xwidget* xw = (struct xwidget*) g_object_get_data (G_OBJECT (widget), XG_XWIDGET); | 366 | struct xwidget* xw = (struct xwidget*) g_object_get_data (G_OBJECT (widget), XG_XWIDGET); |
| 366 | struct xwidget_view* xv = (struct xwidget_view*) g_object_get_data (G_OBJECT (widget), XG_XWIDGET_VIEW); | 367 | struct xwidget_view* xv = (struct xwidget_view*) g_object_get_data (G_OBJECT (widget), XG_XWIDGET_VIEW); |
| 367 | 368 | ||
| 368 | printf("xwidget_osr_draw_callback gtk3 xw.id:%d xw.type:%d window:%d vis:%d\n", | 369 | // printf("xwidget_osr_draw_callback gtk3 xw.id:%d xw.type:%d window:%d vis:%d\n", |
| 369 | xw,xw->type, gtk_widget_get_window (widget), gtk_widget_get_visible (xw->widget_osr)); | 370 | // xw,xw->type, gtk_widget_get_window (widget), gtk_widget_get_visible (xw->widget_osr)); |
| 370 | 371 | ||
| 371 | cairo_rectangle(cr, 0,0, xv->clip_right, xv->clip_bottom);//xw->width, xw->height); | 372 | cairo_rectangle(cr, 0,0, xv->clip_right, xv->clip_bottom);//xw->width, xw->height); |
| 372 | cairo_clip(cr); | 373 | cairo_clip(cr); |