Merge branch 'xwidget' of https://github.com/daimrod/xwidget-emacs into xwidget

8 files changed, 265 insertions, 326 deletions

diff --git a/README.xwidget b/README.xwidget
index f631ea04ad8..a4c49b10250 100644
--- a/README.xwidget
+++ b/README.xwidget
@@ -123,7 +123,7 @@ we provide proper sizes and so on back to the redisplay engine.
 The problem is that Emacs cant actually draw the widgets, as it can with
 images. Emacs must notify GTK about where the widgets should be, and how they
 should be clipped and so on, and this information must be given to GTK
-synchonous with Emacs display changes. Ok, so why is that difficult then?
+synchronous with Emacs display changes. Ok, so why is that difficult then?
 
 - How do we know when a widget is NOT to be drawn? The only way I found so far
   is having a flag for each xwdiget, that is reset before a redisplay. When an
@@ -200,9 +200,9 @@ xembed host widget that allows for embedding other applications inside
 an Emacs window, the story gets more complex.
 
 The problem is that xembed is designed to plug an application window
-inside a a secket and thats it. You can't move a plug between
+inside a socket and thats it. You can't move a plug between
 sockets. I tried numerous hacks to get around this but there is
-nothing that works realy well.
+nothing that works really well.
 
 Therefore the Emacs part of the code will only expose well-defined
 interfaces. cooperating applications will be able to use the interface
@@ -217,14 +217,14 @@ multi view xembed function. That way Emacs is sane and the insanity
 contained.
 
 This app will work by providing a socket that an app plugs into. The
-socket window is copied efficientlp by means of composition to a
-number of other windows, that then are plugged into the different
+socket window is copied efficiently by means of composition to a
+number of other windows, that are then plugged into the different
 Emacs sockets. 
 ** old notes from x_draw_xwidget_glyph_string
 
     BUG it seems this method for some reason is called with bad s->x and s->y sometimes.
     When this happens the xwidget doesnt move on screen as it should.
-    This mightbe because of x_scroll_run. Emacs decides to scroll the screen by blitting sometimes.
+    This might be because of x_scroll_run. Emacs decides to scroll the screen by blitting sometimes.
     then emacs doesnt try to actualy call the paint routines, which means this here code will never
     run so the xwidget wont know it has been moved.
 
@@ -235,7 +235,7 @@ Emacs sockets.
     always available in an off-screen buffer. My current attempt at composition doesnt work properly however.
 
     //allocation debugging. the correct values cant be expected to show upp immediately, but eventually they should get to be ok
-    // this is because we dont know when the container gets around to doing layout
+    // this is because we dont know when the container gets around to do layout
     //GtkAllocation galloc;
     //gtk_widget_get_allocation(GTK_WIDGET (xv->widgetwindow), &galloc);
     //printf("allocation %d %d , %d %d\n", galloc.x,galloc.y,galloc.width,galloc.height);
@@ -244,7 +244,7 @@ Emacs sockets.
 *** old notes about the old live/phantom scheme
 
    //TODO:
-   // 1) always draw live xwidget in slected window
+   // 1) always draw live xwidget in selected window
    // (2) if there were no live instances of the xwidget in selected window, also draw it live)
    // 3) if there was a live xwidget previously, now phantom it.
 
@@ -549,7 +549,7 @@ hangs.
 
 http://kegel.com/gtk/button.c
 
-*** TODO examine some library to synthesise events
+*** TODO examine some library to synthesize events
 xdotool
 xte xautomation
 crikey
@@ -643,7 +643,7 @@ the other aproach would be to work more like images:
   xwidget.
 - retrieve the xwidget objet from the spec with an xwidget-at-point function. It
   can be uninitalized which client code must handle. Unlike
-  assynchronous process creation we dont get back a handle, because
+  asynchronous process creation we dont get back a handle, because
   there is none yet.
 - emitted event on initialization, when needed. Many widgets don't
   need this. for instance, a button sends an event when pressed. but
@@ -833,7 +833,7 @@ anyway clipping is rather complicated but seems to finally work okay.
     CLOSED: [2011-07-04 Mon 16:55]
 http://www.lanedo.com/~carlos/gtk3-doc/GtkWidget.html#gtk-widget-set-has-window
 mentions that it has_window can only be called inside a widget
-impementation.
+implementation.
 
 this wasnt really the issue. allocation was the problem
 *** DONE try scrolled window
@@ -924,7 +924,7 @@ see:
 I returned to using a simple gtkfixed for the widgetwindow. with
 allocation hack and set_has_window it works. Idea prefer not to have
 the allocatien hack and it wasnt needed it gtk3 only gtk2. needs
-furthi investigation,
+further investigation.
 
 ** various code cleanups
 There are many cleanups necessary before any hope of inclusion in
@@ -1015,9 +1015,9 @@ crash in gtk_window_get_size instead. great.
 
 http://gtkplus-p3.0.sourcearchive.com/documentation/2.91.5-0ubuntu1/testoffscreenwindow_8c-source.html
 
-after many atempts, the basic issue remains. for some reason the
+after many attempts, the basic issue remains. for some reason the
 offscreen widget isnt ok when I want to snapshot it, so i simply get
-emptiness. the surface is only ok someimes. 
+emptiness. the surface is only ok sometimes.
 
 here is a useful debugging snippets:
 #+begin_src C
@@ -1062,7 +1062,7 @@ seems to be severly bitrotted
 heres a newer aproach
 http://hg.mozilla.org/incubator/embedding/file/29ac0fe51754/gtk/tests/test.cpp
 
-while webkit clearly has the best traction as an embeddee, the
+while webkit clearly has the best traction as an embedded, the
 offscreen rendering issues makes it interesting to see what ff brings
 to the table. 
 
@@ -1102,7 +1102,7 @@ maybe
 https://launchpad.net/gnome-seed
 
 or this funny hack:
-<jave> im trying to understanh how to interact via javascript to an embedded
+<jave> im trying to understand how to interact via javascript to an embedded
        webkit gtk instance  [23:38]
 <jave> i use webkit_web_view_execute_script() which is nice but doesnt return
        a value, by design aparently  [23:39]
@@ -1141,7 +1141,7 @@ easy.
 ** webkit related
 *** TODO webkit support webkit signals
 
-**** DONE particularily document-load-finished
+**** DONE particularly document-load-finished
      CLOSED: [2011-08-01 Mon 22:34]
 http://webkitgtk.org/reference/webkitgtk-webkitwebview.html#WebKitWebView-document-load-finished
 because one might need tell set a title and sizes and things when it loads.
@@ -1377,7 +1377,7 @@ Maybe a new image type could be added that was a wraper on an
 xwidget. Then image mode could be reused for webkit mode. 
 
 I tried some adaptor code in xwidget.el so webkit mode now delegates
-to image mode buh its a kludge.
+to image mode but its a kludge.
 
 ** socket related
 *** TODO some flickering during redisplay of sockets
@@ -1387,13 +1387,13 @@ xwidget socket type. The webkit xwidget doesn't seem similarily
 afflicted.
 
 the size allocation workaround works by 1st running the ordinary
-allocation then modifying the results. its done this way to minimise
+allocation then modifying the results. its done this way to minimize
 the copy paste index from the base class. it might be that the
 original allocation has a brief time window to show itself.
 
 tried to modify the allocation hack so it doesn't call allocate
 twice. this doesn't seem to help flicker at all aparently so the
-hypothesis falls. Maybe then a socket simply doesn't lke being clipped
+hypothesis falls. Maybe then a socket simply doesn't like being clipped
 by gtkfixed. 
 
 *** TODO xwidget view reaping too agressive
@@ -1436,7 +1436,7 @@ suspects:
 - XCopyArea
   - x_shift_glyphs_for_insert
   - x_scroll_run. this is run by the try_window* functions, and
-    inhibiting them dösnt help. but also callid in scrolling_window.
+    inhibiting them doesnt help. but also callid in scrolling_window.
   
 
 - try_window_reusing_current_matrix
@@ -1454,7 +1454,7 @@ workaround:
 (run-with-timer 1 1 'redraw-display)
 
 seems to work:
-inhibiting scrolling_window(). and this seem to be enaugh to restore
+inhibiting scrolling_window(). and this seem to be enough to restore the
 old behaviour, GLYPH_DEBUG doesn't seem needed.
 
 
diff --git a/configure.ac b/configure.ac
index 67015b19e36..4a676ba6b6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2208,8 +2208,6 @@ fi
 
 HAVE_XWIDGETS=no
 HAVE_WEBKIT=no
-HAVE_GOOCANVAS=no
-HAVE_CLUTTER=no
 HAVE_GIR=no
 
 if test "${with_xwidgets}" != "no"; then
@@ -2219,7 +2217,7 @@ if test "${with_xwidgets}" != "no"; then
 #xwidgets
 #TODO
 # - enable only if gtk/gtk3 enabled
-# - webkit, goocanvas, clutter
+# - webkit
 # - only webkit_osr is good so remove plain webkit laterish
 
 #webkit version for gtk3. 
@@ -2233,26 +2231,6 @@ if test "${with_xwidgets}" != "no"; then
     fi
   fi
 
-  if test "${with_xwdemo}"  = "yes"; then
-#clutter and goocanvas are just proof of concept so disable for now  
-  CLUTTER_REQUIRED=1.0.0   
-  CLUTTER_MODULES="clutter-gtk-1.0 >= $CLUTTER_REQUIRED"
-
-  PKG_CHECK_MODULES(CLUTTER, $CLUTTER_MODULES, HAVE_CLUTTER=yes, HAVE_CLUTTER=no)
-  if test $HAVE_CLUTTER = yes;  then
-     AC_DEFINE(HAVE_CLUTTER, 1, [Define to 1 if you have clutter support.])
-  fi
-
-
-  GOOCANVAS_REQUIRED=1.4.0
-  GOOCANVAS_MODULES="goocanvasgtk-3.0 >= $GOOCANVAS_REQUIRED"
-
-  PKG_CHECK_MODULES(GOOCANVAS, $GOOCANVAS_MODULES, HAVE_GOOCANVAS=yes, HAVE_GOOCANVAS=no)
-  if test $HAVE_GOOCANVAS = yes; then
-     AC_DEFINE(HAVE_GOOCANVAS, 1, [Define to 1 if you have goocanvas support.])
-  fi
-  fi
-
   GIR_REQUIRED=1.32.1
   GIR_MODULES="gobject-introspection-1.0 >= $GIR_REQUIRED"
   PKG_CHECK_MODULES(GIR, $GIR_MODULES, HAVE_GIR=yes, HAVE_GIR=no)
@@ -4836,8 +4814,6 @@ echo "  Does Emacs use toolkit scroll bars?                     ${USE_TOOLKIT_SC
 echo "  Does Emacs support Xwidgets?                            ${HAVE_XWIDGETS}"
 echo "       Does xwidgets support webkit(requires gtk3)?       ${HAVE_WEBKIT}"
 echo "       Does xwidgets support gobject introspection?       ${HAVE_GIR}"
-echo "       Does xwidgets support clutter(demo code)?          ${HAVE_CLUTTER}"
-echo "       Does xwidgets support goocanvas(demo code)?        ${HAVE_GOOCANVAS}"
 echo
 
 if test -n "${EMACSDATA}"; then
diff --git a/lisp/xwidget-test.el b/lisp/xwidget-test.el
index 07b841bdc94..88d2739a209 100644
--- a/lisp/xwidget-test.el
+++ b/lisp/xwidget-test.el
@@ -194,3 +194,5 @@
 ;  (xwidget-resize-hack 1 200 200)
 
 ;(xwidget-demo-basic)
+
+(provide 'xwidget-test)
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 8af8d47c00d..7e556dfa6ba 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -3,7 +3,7 @@
 
 
 ;;; Commentary:
-;; 
+;;
 
 ;;TODO this breaks compilation when we dont have xwidgets
 ;;(require 'xwidget-internal)
@@ -11,19 +11,22 @@
 ;;TODO model after make-text-button instead!
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (defun xwidget-insert (pos type title width height)
-  "Insert an xwidget at POS, given ID, TYPE, TITLE WIDTH and HEIGHT.
+  "Insert an xwidget at POS, given ID, TYPE, TITLE WIDTH and
+HEIGHT in the current buffer.
+
 Return ID
 
-see xwidget.c for types suitable for TYPE."
+see `make-xwidget' for types suitable for TYPE."
   (goto-char pos)
-  (let ((id (make-xwidget (point) (point)  type  title  width  height nil)))
-    (put-text-property (point)
-                       (+ 1 (point)) 'display (list 'xwidget ':xwidget id))
-    
+  (let ((id (make-xwidget (point) (point)
+                          type title width height nil)))
+    (put-text-property (point) (+ 1 (point))
+                       'display (list 'xwidget ':xwidget id))
     id))
 
-
 (defun xwidget-at (pos)
   "Return xwidget at POS."
   ;;TODO this function is a bit tedious because the C layer isnt well protected yet and
@@ -31,10 +34,7 @@ see xwidget.c for types suitable for TYPE."
   (let* ((disp (get-text-property pos 'display))
          (xw (car (cdr (cdr  disp)))))
     ;;(if ( xwidgetp  xw) xw nil)
-    (if (equal 'xwidget (car disp)) xw)
-    ))
-
-
+    (if (equal 'xwidget (car disp)) xw)))
 
 
 ;; (defun xwidget-socket-handler ()
@@ -63,7 +63,7 @@ see xwidget.c for types suitable for TYPE."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; webkit support
 (require 'browse-url)
-(require 'image-mode);;for some image-mode alike functinoality
+(require 'image-mode);;for some image-mode alike functionality
 (require 'cl-macs);;for flet
 
 ;;;###autoload
@@ -72,14 +72,14 @@ see xwidget.c for types suitable for TYPE."
 NEW-SESSION specifies whether to create a new xwidget-webkit session.  URL
 defaults to the string looking like a url around the cursor position."
   (interactive (progn
-                 (require 'browse-url)
-                 (browse-url-interactive-arg "xwidget-webkit URL: "
+                 (require 'browse-url)
+                 (browse-url-interactive-arg "xwidget-webkit URL: "
                                              ;;( xwidget-webkit-current-url)
                                              )))
   (when (stringp url)
     (setq url (url-tidy url))
     (if new-session
-        (xwidget-webkit-new-session url)
+        (xwidget-webkit-new-session url)
       (xwidget-webkit-goto-url url))))
 
 
@@ -97,7 +97,7 @@ defaults to the string looking like a url around the cursor position."
        (funcall ,fn ))))
 
 (defmacro xwidget-image-mode-navigation-adaptor-p (fn)
-    "Image code adaptor.  `image-mode' FN is called with interactive arg."
+  "Image code adaptor.  `image-mode' FN is called with interactive arg."
   `(lambda (n) (interactive "p")
      (cl-flet ((image-display-size (spec) (xwidget-image-display-size spec)))
        (funcall ,fn n))))
@@ -116,26 +116,26 @@ defaults to the string looking like a url around the cursor position."
     (define-key map "w" 'xwidget-webkit-current-url)
 
     ;;similar to image mode bindings
-    (define-key map (kbd "SPC")       (xwidget-image-mode-navigation-adaptor   'image-scroll-up))
-    (define-key map (kbd "DEL")       (xwidget-image-mode-navigation-adaptor   'image-scroll-down))
-
-    (define-key map [remap scroll-up]          (xwidget-image-mode-navigation-adaptor 'image-scroll-up))
-    (define-key map [remap scroll-up-command]  (xwidget-image-mode-navigation-adaptor 'image-scroll-up))
-    
-    (define-key map [remap scroll-down]       (xwidget-image-mode-navigation-adaptor  'image-scroll-down))
-    (define-key map [remap scroll-down-command]       (xwidget-image-mode-navigation-adaptor  'image-scroll-down))
-    
-    (define-key map [remap forward-char]       (xwidget-image-mode-navigation-adaptor-p  'image-forward-hscroll))
-    (define-key map [remap backward-char]       (xwidget-image-mode-navigation-adaptor-p  'image-backward-hscroll))
-    (define-key map [remap right-char]       (xwidget-image-mode-navigation-adaptor-p  'image-forward-hscroll))
-    (define-key map [remap left-char]       (xwidget-image-mode-navigation-adaptor-p  'image-backward-hscroll))
-    (define-key map [remap previous-line]       (xwidget-image-mode-navigation-adaptor-p  'image-previous-line))
-    (define-key map [remap next-line]       (xwidget-image-mode-navigation-adaptor-p  'image-next-line))
-
-    (define-key map [remap move-beginning-of-line]       (xwidget-image-mode-navigation-adaptor-p  'image-bol))
-    (define-key map [remap move-end-of-line]       (xwidget-image-mode-navigation-adaptor-p  'image-eol))
-    (define-key map [remap beginning-of-buffer]       (xwidget-image-mode-navigation-adaptor  'image-bob))
-    (define-key map [remap end-of-buffer]       (xwidget-image-mode-navigation-adaptor  'image-eob))
+    (define-key map (kbd "SPC")                    (xwidget-image-mode-navigation-adaptor   'image-scroll-up))
+    (define-key map (kbd "DEL")                    (xwidget-image-mode-navigation-adaptor   'image-scroll-down))
+
+    (define-key map [remap scroll-up]              (xwidget-image-mode-navigation-adaptor   'image-scroll-up))
+    (define-key map [remap scroll-up-command]      (xwidget-image-mode-navigation-adaptor   'image-scroll-up))
+
+    (define-key map [remap scroll-down]            (xwidget-image-mode-navigation-adaptor   'image-scroll-down))
+    (define-key map [remap scroll-down-command]    (xwidget-image-mode-navigation-adaptor   'image-scroll-down))
+
+    (define-key map [remap forward-char]           (xwidget-image-mode-navigation-adaptor-p 'image-forward-hscroll))
+    (define-key map [remap backward-char]          (xwidget-image-mode-navigation-adaptor-p 'image-backward-hscroll))
+    (define-key map [remap right-char]             (xwidget-image-mode-navigation-adaptor-p 'image-forward-hscroll))
+    (define-key map [remap left-char]              (xwidget-image-mode-navigation-adaptor-p 'image-backward-hscroll))
+    (define-key map [remap previous-line]          (xwidget-image-mode-navigation-adaptor-p 'image-previous-line))
+    (define-key map [remap next-line]              (xwidget-image-mode-navigation-adaptor-p 'image-next-line))
+
+    (define-key map [remap move-beginning-of-line] (xwidget-image-mode-navigation-adaptor-p 'image-bol))
+    (define-key map [remap move-end-of-line]       (xwidget-image-mode-navigation-adaptor-p 'image-eol))
+    (define-key map [remap beginning-of-buffer]    (xwidget-image-mode-navigation-adaptor   'image-bob))
+    (define-key map [remap end-of-buffer]          (xwidget-image-mode-navigation-adaptor   'image-eob))
     map)
   "Keymap for `xwidget-webkit-mode'.")
 
@@ -162,42 +162,36 @@ defaults to the string looking like a url around the cursor position."
        )
                                         ;(funcall  xwidget-callback xwidget xwidget-event-type)
     (message "xw callback %s" xwidget)
-    (funcall  'xwidget-webkit-callback xwidget xwidget-event-type)
-    ))
+    (funcall  'xwidget-webkit-callback xwidget xwidget-event-type)))
 
 (defun xwidget-webkit-callback (xwidget xwidget-event-type)
   (save-excursion
-    (cond ( (buffer-live-p (xwidget-buffer xwidget))
-            (set-buffer (xwidget-buffer xwidget))
-            (let* ( (strarg  (nth 3 last-input-event)))
-              (cond ((eq xwidget-event-type 'document-load-finished)
-                     (xwidget-log "webkit finished loading: '%s'" (xwidget-webkit-get-title xwidget))
-                     (xwidget-adjust-size-to-content xwidget)
-                     (rename-buffer (format "*xwidget webkit: %s *" (xwidget-webkit-get-title xwidget)))
-                     (pop-to-buffer (current-buffer))
-                     )
-                    
-                    ((eq xwidget-event-type 'navigation-policy-decision-requested)
-                     (if (string-match ".*#\\(.*\\)" strarg)
-                         (xwidget-webkit-show-id-or-named-element xwidget (match-string 1 strarg))))
-                    (t (xwidget-log "unhandled event:%s" xwidget-event-type)))))
+    (cond ((buffer-live-p (xwidget-buffer xwidget))
+           (set-buffer (xwidget-buffer xwidget))
+           (let* ((strarg  (nth 3 last-input-event)))
+             (cond ((eq xwidget-event-type 'document-load-finished)
+                    (xwidget-log "webkit finished loading: '%s'" (xwidget-webkit-get-title xwidget))
+                    (xwidget-adjust-size-to-content xwidget)
+                    (rename-buffer (format "*xwidget webkit: %s *" (xwidget-webkit-get-title xwidget)))
+                    (pop-to-buffer (current-buffer)))
+                   ((eq xwidget-event-type 'navigation-policy-decision-requested)
+                    (if (string-match ".*#\\(.*\\)" strarg)
+                        (xwidget-webkit-show-id-or-named-element xwidget (match-string 1 strarg))))
+                   (t (xwidget-log "unhandled event:%s" xwidget-event-type)))))
           (t (xwidget-log "error: callback called for xwidget with dead buffer")))))
 
 (define-derived-mode xwidget-webkit-mode
   special-mode "xwidget-webkit" "xwidget webkit view mode"
   (setq buffer-read-only t)
   ;; Keep track of [vh]scroll when switching buffers
-  (image-mode-setup-winprops)
-
-  )
+  (image-mode-setup-winprops))
 
 (defvar xwidget-webkit-last-session-buffer nil)
 
 (defun  xwidget-webkit-last-session ()
   "Last active webkit, or nil."
   (if (buffer-live-p xwidget-webkit-last-session-buffer)
-      (save-excursion
-        (set-buffer xwidget-webkit-last-session-buffer)
+      (with-current-buffer xwidget-webkit-last-session-buffer
         (xwidget-at 1))
     nil))
 
@@ -238,13 +232,13 @@ function findactiveelement(doc){
 
 "
 
-"javascript that finds the active element."
-;;yes its ugly. because:
-;; - there is aparently no way to find the active frame other than recursion
-;; - the js "for each" construct missbehaved on the "frames" collection
-;; - a window with no frameset still has frames.length == 1, but frames[0].document.activeElement != document.activeElement
-;;TODO the activeelement type needs to be examined, for iframe, etc. sucks.
-)
+  "javascript that finds the active element."
+  ;;yes its ugly. because:
+  ;; - there is aparently no way to find the active frame other than recursion
+  ;; - the js "for each" construct missbehaved on the "frames" collection
+  ;; - a window with no frameset still has frames.length == 1, but frames[0].document.activeElement != document.activeElement
+  ;;TODO the activeelement type needs to be examined, for iframe, etc. sucks.
+  )
 
 (defun xwidget-webkit-insert-string (xw str)
   "Insert string in the active field in the webkit.
@@ -258,27 +252,29 @@ Argument STR string."
            (progn
              (xwidget-webkit-execute-script xww xwidget-webkit-activeelement-js)
              (xwidget-webkit-execute-script-rv xww "findactiveelement(document).value;" )))
-          (field-type              (xwidget-webkit-execute-script-rv xww "findactiveelement(document).type;" )))
+          (field-type (xwidget-webkit-execute-script-rv xww "findactiveelement(document).type;" )))
      (list xww
-           (cond ( (equal "text" field-type) (read-string "text:" field-value))
-                 ( (equal "password" field-type) (read-passwd "password:" nil field-value))
-                 ( (equal "textarea" field-type) (xwidget-webkit-begin-edit-textarea xww field-value))
-                 ))))
+           (cond ((equal "text" field-type)
+                  (read-string "text:" field-value))
+                 ((equal "password" field-type)
+                  (read-passwd "password:" nil field-value))
+                 ((equal "textarea" field-type)
+                  (xwidget-webkit-begin-edit-textarea xww field-value))))))
   (xwidget-webkit-execute-script xw (format "findactiveelement(document).value='%s'" str)))
 
 
 (defun xwidget-webkit-begin-edit-textarea (xw text)
-  (switch-to-buffer 
+  (switch-to-buffer
    (generate-new-buffer "textarea"))
-  
+
   (set (make-local-variable 'xwbl) xw)
-  (insert text)
-  )
+  (insert text))
 
 (defun xwidget-webkit-end-edit-textarea ()
   (interactive)
   (goto-char (point-min))
-  (replace-string "\n" "\\n")
+  (while (search-forward "\n" nil t)
+    (replace-match "\\n" nil t))
   (xwidget-webkit-execute-script xwbl (format "findactiveelement(document).value='%s'"
                                               (buffer-substring (point-min) (point-max))))
   ;;TODO convert linefeed to \n
@@ -295,42 +291,49 @@ Argument STR string."
   ;; - the selected window is scrolled but this is not always correct
   ;; - this needs to be interfaced into browse-url somehow. the tricky part is that we need to do this in two steps:
   ;;   A: load the base url, wait for load signal to arrive B: navigate to the anchor when the base url is finished rendering
-  
+
   ;;this part figures out the Y coordinate of the element
-  (let ((y 
-         (string-to-number (xwidget-webkit-execute-script-rv xw (format "document.getElementsByName('%s')[0].getBoundingClientRect().top" element-name) 0))))
-    ;;now we need to tell emacs to scroll the element into view. 
+  (let ((y (string-to-number
+            (xwidget-webkit-execute-script-rv xw
+                                              (format "document.getElementsByName('%s')[0].getBoundingClientRect().top" element-name)
+                                              0))))
+    ;;now we need to tell emacs to scroll the element into view.
     (xwidget-log "scroll: %d" y)
-    (set-window-vscroll (selected-window) y t))
-  )
+    (set-window-vscroll (selected-window) y t)))
 
 (defun xwidget-webkit-show-id-element (xw element-id)
   "make id-element show. for instance an anchor."
-  (interactive (list (xwidget-webkit-current-session) (read-string "element id:")))
-  (let ((y 
-         (string-to-number (xwidget-webkit-execute-script-rv xw (format "document.getElementById('%s').getBoundingClientRect().top" element-id) 0))))
-    ;;now we need to tell emacs to scroll the element into view. 
+  (interactive (list (xwidget-webkit-current-session)
+                     (read-string "element id:")))
+  (let ((y (string-to-number
+            (xwidget-webkit-execute-script-rv xw
+                                              (format "document.getElementById('%s').getBoundingClientRect().top" element-id)
+                                              0))))
+    ;;now we need to tell emacs to scroll the element into view.
     (xwidget-log "scroll: %d" y)
-    (set-window-vscroll (selected-window) y t))
-  )
+    (set-window-vscroll (selected-window) y t)))
 
 (defun xwidget-webkit-show-id-or-named-element (xw element-id)
   "make id-element show. for instance an anchor."
-  (interactive (list (xwidget-webkit-current-session) (read-string "element id:")))
-  (let* ((y1 
-         (string-to-number (xwidget-webkit-execute-script-rv xw (format "document.getElementsByName('%s')[0].getBoundingClientRect().top" element-id) "0")))
-        (y2 
-         (string-to-number (xwidget-webkit-execute-script-rv xw (format "document.getElementById('%s').getBoundingClientRect().top" element-id) "0")))
-        (y3 (max y1 y2)))
-    ;;now we need to tell emacs to scroll the element into view. 
+  (interactive (list (xwidget-webkit-current-session)
+                     (read-string "element id:")))
+  (let* ((y1 (string-to-number
+              (xwidget-webkit-execute-script-rv xw
+                                                (format "document.getElementsByName('%s')[0].getBoundingClientRect().top" element-id)
+                                                "0")))
+         (y2 (string-to-number
+              (xwidget-webkit-execute-script-rv xw
+                                                (format "document.getElementById('%s').getBoundingClientRect().top" element-id)
+                                                "0")))
+         (y3 (max y1 y2)))
+    ;;now we need to tell emacs to scroll the element into view.
     (xwidget-log "scroll: %d" y3)
-    (set-window-vscroll (selected-window) y3 t))
-  )
+    (set-window-vscroll (selected-window) y3 t)))
 
 (defun xwidget-webkit-adjust-size-to-content ()
   "Adjust webkit to content size."
   (interactive)
-  ( xwidget-adjust-size-to-content ( xwidget-webkit-current-session)))
+  (xwidget-adjust-size-to-content (xwidget-webkit-current-session)))
 
 (defun xwidget-webkit-adjust-size (w h)
   "Manualy set webkit size.
@@ -338,16 +341,16 @@ Argument W width.
 Argument H height."
   ;;TODO shouldnt be tied to the webkit xwidget
   (interactive "nWidth:\nnHeight:\n")
-  ( xwidget-resize ( xwidget-webkit-current-session) w h))
+  (xwidget-resize ( xwidget-webkit-current-session) w h))
 
 (defun xwidget-webkit-fit-width ()
   (interactive)
-  (xwidget-webkit-adjust-size
-   (- (caddr (window-inside-pixel-edges)) (car (window-inside-pixel-edges)))
-   1000))
+  (xwidget-webkit-adjust-size (- (caddr (window-inside-pixel-edges))
+                                 (car (window-inside-pixel-edges)))
+                              1000))
 
 (defun xwidget-webkit-new-session (url)
-"Create a new webkit session buffer with URL."
+  "Create a new webkit session buffer with URL."
   (let*
       ((bufname (generate-new-buffer-name "*xwidget-webkit*"))
        xw)
@@ -356,31 +359,32 @@ Argument H height."
     (setq xw (xwidget-insert 1 'webkit-osr  bufname 1000 1000))
     (xwidget-put xw 'callback 'xwidget-webkit-callback)
     (xwidget-webkit-mode)
-    (xwidget-webkit-goto-uri ( xwidget-webkit-last-session) url )))
+    (xwidget-webkit-goto-uri (xwidget-webkit-last-session) url )))
 
 
 (defun xwidget-webkit-goto-url (url)
   "Goto URL."
-  (if ( xwidget-webkit-current-session)
+  (if (xwidget-webkit-current-session)
       (progn
-        (xwidget-webkit-goto-uri ( xwidget-webkit-current-session) url))
-    ( xwidget-webkit-new-session url)))
+        (xwidget-webkit-goto-uri (xwidget-webkit-current-session) url))
+    (xwidget-webkit-new-session url)))
 
 (defun xwidget-webkit-back ()
   "Back in history."
   (interactive)
-  (xwidget-webkit-execute-script ( xwidget-webkit-current-session)  "history.go(-1);"))
+  (xwidget-webkit-execute-script (xwidget-webkit-current-session)  "history.go(-1);"))
 
 (defun xwidget-webkit-reload ()
   "Reload current url."
   (interactive)
-  (xwidget-webkit-execute-script ( xwidget-webkit-current-session)  "history.go(0);"))
+  (xwidget-webkit-execute-script (xwidget-webkit-current-session)  "history.go(0);"))
 
 (defun xwidget-webkit-current-url ()
   "Get the webkit url. place it on kill ring."
   (interactive)
-  (let* ((rv (xwidget-webkit-execute-script-rv (xwidget-webkit-current-session) "document.URL"))
-         (url (kill-new   (if rv rv ""))))
+  (let* ((rv (xwidget-webkit-execute-script-rv (xwidget-webkit-current-session)
+                                               "document.URL"))
+         (url (kill-new (or rv ""))))
     (message "url: %s" url )
     url))
 
@@ -391,13 +395,15 @@ Argument H height."
   ;;or we find some other way to access the DOM
 
   ;;reset webkit title. fugly.
-  (let* (          (emptytag "titlecantbewhitespaceohthehorror")
-                   title)
-    (xwidget-webkit-execute-script xw (format "document.title=\"%s\";" (if default default emptytag)))
+  (let* ((emptytag "titlecantbewhitespaceohthehorror")
+         title)
+    (xwidget-webkit-execute-script xw (format "document.title=\"%s\";" (or default emptytag)))
     (xwidget-webkit-execute-script xw (format "document.title=%s;" script))
     (setq title (xwidget-webkit-get-title xw))
-    (if (equal emptytag title) (setq title ""))
-    (unless title (setq title default))
+    (if (equal emptytag title)
+        (setq title ""))
+    (unless title
+      (setq title default))
     title))
 
 
@@ -427,7 +433,7 @@ This is the last value stored with `(xwidget-put XWIDGET PROPNAME VALUE)'."
   "Change XWIDGET' PROPNAME property to VALUE.
 It can be retrieved with `(xwidget-get XWIDGET PROPNAME)'."
   (set-xwidget-plist xwidget
-                     (plist-put (xwidget-plist xwidget) propname value)))
+                     (plist-put (xwidget-plist xwidget) propname value)))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -463,6 +469,4 @@ yet, so deinstall Flash instead for now."
 
 (provide 'xwidget)
 
-(provide 'xwidget)
-
 ;;; xwidget.el ends here
diff --git a/src/Makefile.in b/src/Makefile.in
index 8d8133c9e6c..3b5c736517f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -237,9 +237,6 @@ CFLAGS_SOUND= @CFLAGS_SOUND@
 RSVG_LIBS= @RSVG_LIBS@
 RSVG_CFLAGS= @RSVG_CFLAGS@
 
-CLUTTER_LIBS= @CLUTTER_LIBS@
-CLUTTER_CFLAGS= @CLUTTER_CFLAGS@
-
 WEBKIT_LIBS= @WEBKIT_LIBS@
 WEBKIT_CFLAGS= @WEBKIT_CFLAGS@
 
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c
index 6df0b2422b1..f675bd76d97 100644
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@ -184,7 +184,7 @@ static void emacs_fixed_gtk_widget_size_allocate (GtkWidget *widget,
 
 }
 
-#endif
+#endif  /* HAVE_XWIDGETS */
 
 static void
 emacs_fixed_class_init (EmacsFixedClass *klass)
diff --git a/src/xwidget.c b/src/xwidget.c
index d169069c99d..eada274949c 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -68,7 +68,7 @@
 
 #include "gtkutil.h"
 #include "font.h"
-#endif
+#endif  /* HAVE_X_WINDOWS */
 
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
@@ -79,18 +79,6 @@
 #include "emacsgtkfixed.h"
 #endif
 
-
-
-#ifdef HAVE_GOOCANVAS
-#include <goocanvas.h>
-#endif
-
-#ifdef HAVE_CLUTTER
-#include <librsvg/rsvg.h>
-#include <clutter/clutter.h>
-#include <clutter-gtk/clutter-gtk.h>
-#endif
-
 #include <wchar.h>
 
 #ifdef HAVE_WEBKIT_OSR
@@ -132,14 +120,14 @@ allocate_xwidget_view (void)
 #define XSETXWIDGET_VIEW(a, b) (XSETPSEUDOVECTOR (a, b, PVEC_XWIDGET_VIEW))
 
 Lisp_Object Qxwidget;
-Lisp_Object Qcxwidget;
-Lisp_Object Qtitle;
+Lisp_Object QCxwidget;
+Lisp_Object QCtitle;
 Lisp_Object Qxwidget_set_keyboard_grab;
 Lisp_Object Qxwidget_embed_steal_window;
 Lisp_Object Qxwidget_info;
 Lisp_Object Qxwidget_resize;
 Lisp_Object Qxwidget_send_keyboard_event;
-Lisp_Object Qcxwgir_class;
+Lisp_Object QCxwgir_class;
 Lisp_Object Qbutton, Qtoggle, Qslider, Qsocket, Qsocket_osr, Qcairo, Qxwgir,
   Qwebkit_osr, QCplist;
 
@@ -188,14 +176,27 @@ xwgir_event_callback (GtkWidget *widget,
 GtkWidget* xwgir_create(char* class, char* namespace);
 static void
 send_xembed_ready_event (struct xwidget* xw, int xembedid);  
-DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0,
-         doc: /* xw */
+DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 8, 0,
+         doc: /* Make an xwidget from BEG to END of TYPE. 
+
+If BUFFER is nil it uses the current buffer. If BUFFER is a string and
+no such buffer exists, it is created.
+
+TYPE is a symbol which can take one of the following values:
+- Button
+- ToggleButton
+- slider
+- socket
+- socket-osr
+- cairo
+*/
          )
   (Lisp_Object beg, Lisp_Object end,
-     Lisp_Object type,
-     Lisp_Object title,
-     Lisp_Object width, Lisp_Object height,
-     Lisp_Object data)
+   Lisp_Object type,
+   Lisp_Object title,
+   Lisp_Object width, Lisp_Object height,
+   Lisp_Object data,
+   Lisp_Object buffer)
 {
   //should work a bit like "make-button"(make-button BEG END &rest PROPERTIES)
   // arg "type" and fwd should be keyword args eventually
@@ -203,16 +204,18 @@ DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0,
   //(xwidget-info (car xwidget-alist))
   struct xwidget* xw = allocate_xwidget();
   Lisp_Object val;
-  struct gcpro gcpro1;
-  GCPRO1(xw);
   XSETSYMBOL(xw->type, type);
   XSETSTRING(xw->title, title);
-  //TODO buffer should be an optional argument not just assumed to be the current buffer
-  XSETBUFFER(xw->buffer,  Fcurrent_buffer()); // conservatively gcpro xw since we call lisp
+  if (NILP (buffer))
+      buffer = Fcurrent_buffer(); // no need to gcpro because Fcurrent_buffer doesn't call Feval/eval_sub.
+  else
+      buffer = Fget_buffer_create (buffer);
+  XSETBUFFER(xw->buffer, buffer);
+  
   xw->height = XFASTINT(height);
   xw->width = XFASTINT(width);
-  XSETPSEUDOVECTOR (val, xw, PVEC_XWIDGET); //?? dunno why i need this
-  Vxwidget_alist = Fcons ( val, Vxwidget_alist);
+  XSETPSEUDOVECTOR (val, xw, PVEC_XWIDGET); // set the vectorlike_header of VAL with the correct value
+  Vxwidget_alist = Fcons (val, Vxwidget_alist);
   xw->widgetwindow_osr = NULL;
   xw->widget_osr = NULL;
   xw->plist = Qnil;
@@ -224,78 +227,77 @@ DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0,
    */
   if (EQ(xw->type, Qwebkit_osr)||
       EQ(xw->type, Qsocket_osr)||
-      (Fget(xw->type, Qcxwgir_class) != Qnil)){
-    printf("init osr widget\n");
-    block_input();
-    xw->widgetwindow_osr = GTK_CONTAINER (gtk_offscreen_window_new ());
-    gtk_window_resize(    GTK_WINDOW(xw->widgetwindow_osr), xw->width, xw->height);
-
-    if (EQ(xw->type, Qwebkit_osr))
-      xw->widget_osr = webkit_web_view_new();
-    if(EQ(xw->type, Qsocket_osr))
-      xw->widget_osr = gtk_socket_new();    
-    if(Fget(xw->type, Qcxwgir_class) != Qnil)
-      xw->widget_osr = xwgir_create(    SDATA(Fcar(Fcdr(Fget(xw->type, Qcxwgir_class)))),
-                                        SDATA(Fcar(Fget(xw->type, Qcxwgir_class))));
-
-    gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width, xw->height);
-    gtk_container_add (xw->widgetwindow_osr, xw->widget_osr);
-
-    gtk_widget_show_all (GTK_WIDGET (xw->widgetwindow_osr));
-
-    /* store some xwidget data in the gtk widgets for convenient retrieval in the event handlers. */
-    g_object_set_data (G_OBJECT (xw->widget_osr), XG_XWIDGET, (gpointer) (xw));
-    g_object_set_data (G_OBJECT (xw->widgetwindow_osr), XG_XWIDGET, (gpointer) (xw));
-    /* signals */
-    g_signal_connect (G_OBJECT ( xw->widgetwindow_osr), "damage-event",    G_CALLBACK (xwidget_osr_damage_event_callback), NULL);
-
-
-    if (EQ(xw->type, Qwebkit_osr)){
-      g_signal_connect (G_OBJECT ( xw->widget_osr),
-                        "document-load-finished",
-                        G_CALLBACK (webkit_osr_document_load_finished_callback),
-                        xw);    
+      (Fget(xw->type, QCxwgir_class) != Qnil)) {
+      printf("init osr widget\n");
+      block_input();
+      xw->widgetwindow_osr = GTK_CONTAINER (gtk_offscreen_window_new ());
+      gtk_window_resize(GTK_WINDOW(xw->widgetwindow_osr), xw->width, xw->height);
+
+      if (EQ(xw->type, Qwebkit_osr))
+          xw->widget_osr = webkit_web_view_new();
+      if(EQ(xw->type, Qsocket_osr))
+          xw->widget_osr = gtk_socket_new();    
+      if(Fget(xw->type, QCxwgir_class) != Qnil)
+          xw->widget_osr = xwgir_create(SDATA(Fcar(Fcdr(Fget(xw->type, QCxwgir_class)))),
+                                        SDATA(Fcar(Fget(xw->type, QCxwgir_class))));
+
+      gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width, xw->height);
+      gtk_container_add (xw->widgetwindow_osr, xw->widget_osr);
+
+      gtk_widget_show_all (GTK_WIDGET (xw->widgetwindow_osr));
+
+      /* store some xwidget data in the gtk widgets for convenient retrieval in the event handlers. */
+      g_object_set_data (G_OBJECT (xw->widget_osr), XG_XWIDGET, (gpointer) (xw));
+      g_object_set_data (G_OBJECT (xw->widgetwindow_osr), XG_XWIDGET, (gpointer) (xw));
+
+      /* signals */
+      g_signal_connect (G_OBJECT (xw->widgetwindow_osr), "damage-event",
+                        G_CALLBACK (xwidget_osr_damage_event_callback), NULL);
+
+      if (EQ(xw->type, Qwebkit_osr)) {
+          g_signal_connect (G_OBJECT (xw->widget_osr),
+                            "document-load-finished",
+                            G_CALLBACK (webkit_osr_document_load_finished_callback),
+                            xw);    
       
-      g_signal_connect (G_OBJECT ( xw->widget_osr),
-                        "download-requested",
-                        G_CALLBACK (webkit_osr_download_callback),
-                        xw);    
-
-      g_signal_connect (G_OBJECT ( xw->widget_osr),
-                        "mime-type-policy-decision-requested",
-                        G_CALLBACK (webkit_osr_mime_type_policy_typedecision_requested_callback),
-                        xw);    
-
-      g_signal_connect (G_OBJECT ( xw->widget_osr),
-                        "new-window-policy-decision-requested",
-                        G_CALLBACK (webkit_osr_new_window_policy_decision_requested_callback),
-                        xw);    
-
-      g_signal_connect (G_OBJECT ( xw->widget_osr),
-                        "navigation-policy-decision-requested",
-                        G_CALLBACK (webkit_osr_navigation_policy_decision_requested_callback),
-                        xw);
-      //webkit_web_view_load_uri(WEBKIT_WEB_VIEW(xw->widget_osr), "http://www.fsf.org");
+          g_signal_connect (G_OBJECT (xw->widget_osr),
+                            "download-requested",
+                            G_CALLBACK (webkit_osr_download_callback),
+                            xw);    
+
+          g_signal_connect (G_OBJECT (xw->widget_osr),
+                            "mime-type-policy-decision-requested",
+                            G_CALLBACK (webkit_osr_mime_type_policy_typedecision_requested_callback),
+                            xw);    
+
+          g_signal_connect (G_OBJECT (xw->widget_osr),
+                            "new-window-policy-decision-requested",
+                            G_CALLBACK (webkit_osr_new_window_policy_decision_requested_callback),
+                            xw);    
+
+          g_signal_connect (G_OBJECT (xw->widget_osr),
+                            "navigation-policy-decision-requested",
+                            G_CALLBACK (webkit_osr_navigation_policy_decision_requested_callback),
+                            xw);
+          //webkit_web_view_load_uri(WEBKIT_WEB_VIEW(xw->widget_osr), "http://www.fsf.org");
 
-    }
+      }
 
-    if (EQ(xw->type, Qsocket_osr)) {
-    printf ("xwid:%d socket id:%x %d\n",
-            xw,
-            gtk_socket_get_id (GTK_SOCKET (xw->widget_osr)),
-            gtk_socket_get_id (GTK_SOCKET (xw->widget_osr)));
-    send_xembed_ready_event (xw,
-                             gtk_socket_get_id (GTK_SOCKET (xw->widget_osr)));
-    //gtk_widget_realize(xw->widget);
-  }
+      if (EQ(xw->type, Qsocket_osr)) {
+          printf ("xwid:%d socket id:%x %d\n",
+                  xw,
+                  gtk_socket_get_id (GTK_SOCKET (xw->widget_osr)),
+                  gtk_socket_get_id (GTK_SOCKET (xw->widget_osr)));
+          send_xembed_ready_event (xw, gtk_socket_get_id (GTK_SOCKET (xw->widget_osr)));
+          //gtk_widget_realize(xw->widget);
+      }
 
 
-    unblock_input();
+      unblock_input();
 
   }
-#endif
+#endif  /* HAVE_WEBKIT_OSR */
 
-  UNGCPRO;
   return val;
 }
 
@@ -762,7 +764,7 @@ xwgir_convert_lisp_to_gir_arg(GIArgument* giarg,
 void
 refactor_attempt(){
   //this methhod should be called from xwgir-xwidget-call-method and from xwgir xwidget construction  
-  char* class = SDATA(Fcar(Fcdr(Fget(xw->type, Qcxwgir_class))));
+  char* class = SDATA(Fcar(Fcdr(Fget(xw->type, QCxwgir_class))));
 
   GIObjectInfo* obj_info = g_irepository_find_by_name(girepository, namespace, class);
   GIFunctionInfo* f_info = g_object_info_find_method (obj_info, SDATA(method));
@@ -792,7 +794,7 @@ refactor_attempt(){
    }   
   return Qt;
 }
-#endif
+#endif  /* 0 */
 
 DEFUN ("xwgir-xwidget-call-method", Fxwgir_xwidget_call_method,  Sxwgir_xwidget_call_method,       3, 3, 0,
        doc:     /* call xwidget object method.*/)
@@ -808,7 +810,7 @@ DEFUN ("xwgir-xwidget-call-method", Fxwgir_xwidget_call_method,  Sxwgir_xwidget_
   if(Qnil == xwidget) {printf("ERROR xwidget nil\n");   return Qnil;};  
   xw = XXWIDGET(xwidget);                                               
   if(NULL == xw) printf("ERROR xw is 0\n");                               
-  char* namespace = SDATA(Fcar(Fget(xw->type, Qcxwgir_class)));
+  char* namespace = SDATA(Fcar(Fget(xw->type, QCxwgir_class)));
   //we need the concrete widget, which happens in 2 ways depending on OSR or not TODO
   GtkWidget* widget = NULL;
   if(NULL == xw->widget_osr) {
@@ -823,7 +825,7 @@ DEFUN ("xwgir-xwidget-call-method", Fxwgir_xwidget_call_method,  Sxwgir_xwidget_
   /* char* class = G_OBJECT_TYPE_NAME(widget); //gives "GtkButton"(I want "Button") */
   /* class += strlen(namespace);  //TODO check for corresponding api method. but this seems to work. */
 
-  char* class = SDATA(Fcar(Fcdr(Fget(xw->type, Qcxwgir_class))));
+  char* class = SDATA(Fcar(Fcdr(Fget(xw->type, QCxwgir_class))));
 
   GIObjectInfo* obj_info = g_irepository_find_by_name(girepository, namespace, class);
   GIFunctionInfo* f_info = g_object_info_find_method (obj_info, SDATA(method));
@@ -981,54 +983,9 @@ xwidget_init_view (struct xwidget *xww,
     //Cairo view
     //uhm cairo is differentish in gtk 3.
     //gdk_cairo_create (gtk_widget_get_window (FRAME_GTK_WIDGET (s->f)));
-#ifdef HAVE_GOOCANVAS
-    xv->widget = goo_canvas_new();
-    GooCanvasItem *root, *rect_item, *text_item;
-    goo_canvas_set_bounds (GOO_CANVAS (xv->widget), 0, 0, 1000, 1000);
-    root = goo_canvas_get_root_item (GOO_CANVAS (xv->widget));
-    rect_item = goo_canvas_rect_new (root, 100, 100, 400, 400,
-                                     "line-width", 10.0,
-                                     "radius-x", 20.0,
-                                     "radius-y", 10.0,
-                                     "stroke-color", "yellow",
-                                     "fill-color", "red",
-                                     NULL);
-
-    text_item = goo_canvas_text_new (root, "Hello World", 300, 300, -1,
-                                     GTK_ANCHOR_CENTER,
-                                     "font", "Sans 24",
-                                     NULL);
-    goo_canvas_item_rotate (text_item, 45, 300, 300);
-
-#endif
-#ifdef HAVE_CLUTTER
-    xv->widget = gtk_clutter_embed_new ();;
-    ClutterActor *stage = NULL;
-    stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED (        xv->widget));
-    ClutterColor stage_color = { 0xaa, 0xaa, 0xaa, 0xff }; /* Black */
-    clutter_stage_set_color (CLUTTER_STAGE (stage), &stage_color);
-
-    ClutterActor *  texture =  clutter_cairo_texture_new (1000, 1000);
-    clutter_container_add_actor(stage, texture);
-    clutter_actor_set_position(texture, 0,0);
-    clutter_actor_show(texture);
-
-    cairo_t *cr;
-    cr = clutter_cairo_texture_create (CLUTTER_CAIRO_TEXTURE (texture));
-
-    /* draw on the context */
-    RsvgHandle *h =  rsvg_handle_new_from_file  ("/tmp/tst.svg",
-                                                 NULL);
-
-    rsvg_handle_render_cairo(h, cr);
-    cairo_destroy (cr);
-
-    /* Show the stage: */
-    clutter_actor_show (stage);
-#endif
   } else if (EQ(xww->type, Qwebkit_osr)||
              EQ(xww->type, Qsocket_osr)||
-             (Fget(xww->type, Qcxwgir_class) != Qnil))//xwgir widgets are OSR
+             (Fget(xww->type, QCxwgir_class) != Qnil))//xwgir widgets are OSR
     {
 #ifdef HAVE_WEBKIT_OSR //TODO the ifdef isnt really relevant anymore, we always have osr
       printf("osr init:%s\n",SDATA(SYMBOL_NAME(xww->type)));
@@ -1067,7 +1024,7 @@ xwidget_init_view (struct xwidget *xww,
     /* g_signal_connect (G_OBJECT (    xv->widget), "key-release-event", */
     /*                   G_CALLBACK (xwidget_osr_event_forward), NULL); */
     
-#endif
+#endif  /* HAVE_WEBKIT_OSR */
 
 
   } 
@@ -1114,7 +1071,7 @@ xwidget_init_view (struct xwidget *xww,
   //xwgir debug
   if (//EQ(xww->type, Qwebkit_osr)|| //TODO should be able to choose compile time which method to use with webkit
       EQ(xww->type, Qsocket_osr)||
-      (Fget(xww->type, Qcxwgir_class) != Qnil))//xwgir widgets are OSR
+      (Fget(xww->type, QCxwgir_class) != Qnil))//xwgir widgets are OSR
     {
       //xwidget_set_embedder_view(xww,xv);
       printf("gdk_offscreen_window_set_embedder %d %d\n",
@@ -1350,7 +1307,7 @@ DEFUN ("xwidget-webkit-dom-dump", Fxwidget_webkit_dom_dump,  Sxwidget_webkit_dom
 
 
 
-#endif
+#endif  /* HAVE_WEBKIT_OSR */
 
 
 
@@ -1611,12 +1568,14 @@ syms_of_xwidget (void)
   defsubr (&Sxwidget_buffer);
   defsubr (&Sset_xwidget_plist);
   
-  DEFSYM (Qxwidget ,"xwidget");
+  DEFSYM (Qxwidget, "xwidget");
 
-  DEFSYM (Qcxwidget ,":xwidget");
-  DEFSYM (Qcxwgir_class ,":xwgir-class");
-  DEFSYM (Qtitle ,":title");
+  DEFSYM (QCxwidget, ":xwidget");
+  DEFSYM (QCxwgir_class, ":xwgir-class");
+  DEFSYM (QCtitle, ":title");
 
+  /* Do not forget to update the docstring of make-xwidget if you add
+     new types. */
   DEFSYM (Qbutton, "Button"); //changed to match the gtk class because xwgir(experimental and not really needed)
   DEFSYM (Qtoggle, "ToggleButton");
   DEFSYM (Qslider, "slider");
@@ -1626,10 +1585,11 @@ syms_of_xwidget (void)
 
   DEFSYM (QCplist, ":plist");
 
-   DEFVAR_LISP ("xwidget-alist", Vxwidget_alist, doc: /*xwidgets list*/);
-   Vxwidget_alist = Qnil;
-   DEFVAR_LISP ("xwidget-view-alist", Vxwidget_view_alist, doc: /*xwidget views list*/);
-   Vxwidget_alist = Qnil;
+  DEFVAR_LISP ("xwidget-alist", Vxwidget_alist, doc: /*xwidgets list*/);
+  Vxwidget_alist = Qnil;
+
+  DEFVAR_LISP ("xwidget-view-alist", Vxwidget_view_alist, doc: /*xwidget views list*/);
+  Vxwidget_view_alist = Qnil;
 
   Fprovide (intern ("xwidget-internal"), Qnil);
 
@@ -1744,12 +1704,12 @@ lookup_xwidget (Lisp_Object  spec)
   Lisp_Object value;
   struct xwidget *xw;
 
-  value = xwidget_spec_value (spec, Qcxwidget, &found1);
+  value = xwidget_spec_value (spec, QCxwidget, &found1);
   xw = XXWIDGET(value);
 
   /* value = xwidget_spec_value (spec, QCtype, &found); */
   /* xw->type = SYMBOLP (value) ? value : Qbutton;      //default to button */
-  /* value = xwidget_spec_value (spec, Qtitle, &found2); */
+  /* value = xwidget_spec_value (spec, QCtitle, &found2); */
   /* xw->title = STRINGP (value) ? (char *) SDATA (value) : "?";        //funky cast FIXME TODO */
 
   /* value = xwidget_spec_value (spec, QCheight, NULL); */
@@ -1852,4 +1812,4 @@ xwidget_end_redisplay (struct window *w, struct glyph_matrix *matrix)
 }
 
       
-#endif
+#endif  /* HAVE_XWIDGETS */
diff --git a/src/xwidget.h b/src/xwidget.h
index e5cfe6de902..92c6e6e3513 100644
--- a/src/xwidget.h
+++ b/src/xwidget.h
@@ -107,4 +107,4 @@ struct xwidget* lookup_xwidget (Lisp_Object  spec);
 #define XG_XWIDGET "emacs_xwidget"
 #define XG_XWIDGET_VIEW "emacs_xwidget_view"
 void      xwidget_view_delete_all_in_window(  struct window *w );
-#endif
+#endif  /* XWIDGET_H_INCLUDED */