cleanups + small step towards better lisp interface. use syms rather than ints for xwidget types

2 files changed, 33 insertions, 8 deletions

diff --git a/lisp/xwidget-test.el b/lisp/xwidget-test.el
index 060ebcd6101..69f7cfff82b 100644
--- a/lisp/xwidget-test.el
+++ b/lisp/xwidget-test.el
@@ -36,24 +36,24 @@
      ,@body))
 
 (xwidget-demo "a-button" 
-              (xwidget-insert (point-min)  1 "button" 40  50  1)
+              (xwidget-insert (point-min) 'button  "button" 40  50  1)
               (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
 
 (xwidget-demo "a-big-button" 
-              (xwidget-insert (point-min)  1 "button" 400  500  1)
+              (xwidget-insert (point-min)  'button "button" 400  500  1)
               (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
 
 (xwidget-demo "a-socket" 
-              (xwidget-insert (point-min)  3 "socket" 500  500  5)
+              (xwidget-insert (point-min)  'socket "socket" 500  500  5)
               (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic))
 
 
 (xwidget-demo "basic"
-  (xwidget-insert (point-min)  1 "button" 40  50  1)
-  (xwidget-insert          15  2 "toggle" 60  30  2)
-  (xwidget-insert          30  3 "emacs"  400 200 3)
-  (xwidget-insert          20  4 "slider" 100 50  4)
-  (xwidget-insert          40  3 "uzbl-core"   400 400 5)
+  (xwidget-insert (point-min)  'button "button" 40  50  1)
+  (xwidget-insert          15  'toggle "toggle" 60  30  2)
+  (xwidget-insert          30  'socket "emacs"  400 200 3)
+  (xwidget-insert          20  'slider "slider" 100 50  4)
+  (xwidget-insert          40  'socket "uzbl-core"   400 400 5)
   (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic)
 )
 
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index ef200048f59..71dcc15df69 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -38,6 +38,31 @@ hand-wave issues like these until the hard parts are solved.
     (xwidget-resize-internal id width height)
   ))
 
+
+(defun xwidget-socket-handler ()
+  "creates plug for socket."
+  (interactive)
+  (message "socket handler xwidget %S" last-input-event)
+  (let*
+      ((xwidget-event-type (nth 2 last-input-event))
+       (xwidget-id (nth 1 last-input-event)))
+    (cond ( (eq xwidget-event-type 'xembed-ready)
+            (let*
+                ((xembed-id (nth 3 last-input-event)))
+              (message "xembed ready  event: %S xw-id:%s" xembed-id xwidget-id)
+              ;;TODO fetch process data from the xwidget. create it, store process info
+              ;;will start emacs/uzbl in a xembed socket when its ready
+              ;; (cond
+              ;;  ((eq 3 xwidget-id)
+              ;;   (start-process "xembed" "*xembed*" (format "%ssrc/emacs" default-directory) "-q" "--parent-id" (number-to-string xembed-id) ) )
+              ;;  ((eq 5 xwidget-id)
+              ;;   (start-process "xembed2" "*xembed2*" "uzbl-core"  "-s" (number-to-string xembed-id)  "http://www.fsf.org" )  )
+               
+              )
+            ))))
+
+
+
 ;; use declare here?
 ;; (declare-function xwidget-resize-internal "xwidget.c" )
 ;; check-declare-function?