aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJoakim Verona2011-06-28 21:42:45 +0200
committerJoakim Verona2011-06-28 21:42:45 +0200
commitb380a76ffbf54594dfd6fc3d932983ac0439d07f (patch)
treed0918b1ef09699f5fd2ccb4bcb13e9c0d802a029 /src
parent65b7d4f0f95b7611946962ed8a06ecf52719fdb5 (diff)
downloademacs-b380a76ffbf54594dfd6fc3d932983ac0439d07f.tar.gz
emacs-b380a76ffbf54594dfd6fc3d932983ac0439d07f.zip
proof of concept webkit xwidget
Diffstat (limited to 'src')
-rw-r--r--src/xwidget.c12
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;
105Lisp_Object Qxwidget_resize_internal; 105Lisp_Object Qxwidget_resize_internal;
106Lisp_Object Qxwidget_send_keyboard_event; 106Lisp_Object Qxwidget_send_keyboard_event;
107 107
108Lisp_Object Qbutton, Qtoggle, Qslider, Qsocket, Qcairo, QCplist; 108Lisp_Object Qbutton, Qtoggle, Qslider, Qsocket, Qcairo, Qwebkit, QCplist;
109 109
110 110
111extern Lisp_Object QCtype; 111extern 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);