diff options
Diffstat (limited to 'src/xwidget.c')
| -rw-r--r-- | src/xwidget.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/xwidget.c b/src/xwidget.c index 870054469c0..14110af7fce 100644 --- a/src/xwidget.c +++ b/src/xwidget.c | |||
| @@ -105,7 +105,7 @@ Lisp_Object Qxwidget_info; | |||
| 105 | Lisp_Object Qxwidget_resize_internal; | 105 | Lisp_Object Qxwidget_resize_internal; |
| 106 | Lisp_Object Qxwidget_send_keyboard_event; | 106 | Lisp_Object Qxwidget_send_keyboard_event; |
| 107 | 107 | ||
| 108 | Lisp_Object Qbutton, Qtoggle, Qslider, Qsocket, Qcairo, QCplist; | 108 | Lisp_Object Qbutton, Qtoggle, Qslider, Qsocket, Qcairo, Qwebkit, QCplist; |
| 109 | 109 | ||
| 110 | 110 | ||
| 111 | extern Lisp_Object QCtype; | 111 | extern Lisp_Object QCtype; |
| @@ -339,6 +339,13 @@ xwidget_init_view ( | |||
| 339 | clutter_actor_show (stage); | 339 | clutter_actor_show (stage); |
| 340 | #endif | 340 | #endif |
| 341 | 341 | ||
| 342 | } else if (EQ(xww->type, Qwebkit)) { | ||
| 343 | #ifdef HAVE_WEBKIT | ||
| 344 | xv->widget = webkit_web_view_new(); | ||
| 345 | webkit_web_view_load_uri(xv->widget, "http://www.fsf.org"); | ||
| 346 | #endif | ||
| 347 | |||
| 348 | |||
| 342 | } else return NULL; | 349 | } else return NULL; |
| 343 | 350 | ||
| 344 | //widget realization | 351 | //widget realization |
| @@ -722,7 +729,8 @@ syms_of_xwidget (void) | |||
| 722 | DEFSYM (Qslider, "slider"); | 729 | DEFSYM (Qslider, "slider"); |
| 723 | DEFSYM (Qsocket, "socket"); | 730 | DEFSYM (Qsocket, "socket"); |
| 724 | DEFSYM (Qcairo, "cairo"); | 731 | DEFSYM (Qcairo, "cairo"); |
| 725 | 732 | DEFSYM (Qwebkit ,"webkit"); | |
| 733 | |||
| 726 | DEFSYM (QCplist, ":plist"); | 734 | DEFSYM (QCplist, ":plist"); |
| 727 | 735 | ||
| 728 | Fprovide (intern ("xwidget-internal"), Qnil); | 736 | Fprovide (intern ("xwidget-internal"), Qnil); |