socket init demo xwidget-demo-a-socket now shows embedded browser again. phew./configure multiple socket views create multiple embeddable processes though which is wrong. the 1st process plug should just be moved between sockets.

2 files changed, 29 insertions, 26 deletions

diff --git a/lisp/xwidget-test.el b/lisp/xwidget-test.el
index 301fa1af984..b9c80d081a6 100644
--- a/lisp/xwidget-test.el
+++ b/lisp/xwidget-test.el
@@ -24,18 +24,27 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; demo functions
+;; demo/test functions
 (require 'xwidget)
 
-(defun xwidget-demo-minimal ()
-  (interactive)
-  (insert "xwidgetdemo<<< a button. another button\n")
-  (xwidget-insert (point-min)  2 "button" 40  50  1)
-  (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic)
-)
-(defun xwidget-demo-basic ()
-  (interactive)
-  (insert "xwidgetdemo<<< a button. another button\n")
+(defmacro xwidget-demo (name &rest body)
+  `(defun ,(intern (concat "xwidget-demo-" name)) ()
+     (interactive)
+     (switch-to-buffer ,(format "*xwidget-demo-%s*" name))
+     (text-mode);;otherwise no local keymap
+     (insert "Some random text for xwidgets to be inserted in for demo purposes.\n")
+     ,@body))
+
+(xwidget-demo "a-button" 
+              (xwidget-insert (point-min)  1 "button" 40  50  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)
+              (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)
@@ -45,13 +54,6 @@
 )
 
 
-(defun xwidget-demo-single ()
-  (interactive)
-  (insert "xwidgetdemo<<< a button. another button\n")
-  (xwidget-insert (point-min) 1 "1" 200 300 1)
-  (define-key (current-local-map) [xwidget-event] 'xwidget-handler-demo-basic)
-)
-
 ;it doesnt seem gtk_socket_steal works very well. its deprecated.
 ; xwininfo -int
 ; then (xwidget-embed-steal 3 <winid>)
@@ -82,7 +84,7 @@
     (cond ( (eq xwidget-event-type 'xembed-ready)
             (let*
                 ((xembed-id (nth 3 last-input-event)))
-              (message "xembed ready  %S" xembed-id)
+              (message "xembed ready  event: %S xw-id:%s" xembed-id xwidget-id)
               ;;will start emacs/uzbl in a xembed socket when its ready
               (cond
                ((eq 3 xwidget-id)
diff --git a/src/xwidget.c b/src/xwidget.c
index 389e6a655ff..5ebecd63937 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -223,8 +223,8 @@ xwidget_init_view (
       xv->widget = gtk_socket_new ();
       //gtk_widget_set_app_paintable (xw->widget, TRUE); //workaround for composited sockets
 
-      gdk_color_parse("blue",&color); //the blue color never seems to show up. something else draws a grey bg
-      gtk_widget_modify_bg(xv->widget, GTK_STATE_NORMAL, &color);
+      //gdk_color_parse("blue",&color); //the blue color never seems to show up. something else draws a grey bg
+      //gtk_widget_modify_bg(xv->widget, GTK_STATE_NORMAL, &color);
       g_signal_connect_after(xv->widget, "plug-added", G_CALLBACK(xwidget_plug_added), "plug added");        
       break;
     case 4:
@@ -277,7 +277,8 @@ xwidget_init_view (
   switch (xww->type)
     {
     case 3:
-      printf ("socket id:%x %d\n",
+      printf ("xwid:%d socket id:%x %d\n",
+              xww->id,
               gtk_socket_get_id (GTK_SOCKET (xv->widget)),
               gtk_socket_get_id (GTK_SOCKET (xv->widget)));
       send_xembed_ready_event (xww->id,
@@ -732,7 +733,7 @@ struct xwidget_view* xwidget_view_lookup(struct xwidget* xw,     struct window *
 int
 lookup_xwidget (Lisp_Object  spec)
 {
-
+  /*when a xwidget lisp spec is found initialize the C struct*/
   int found = 0, found1 = 0, found2 = 0;
   Lisp_Object value;
   int id;
@@ -742,6 +743,7 @@ lookup_xwidget (Lisp_Object  spec)
   id = INTEGERP (value) ? XFASTINT (value) : 0; //id 0 by default, but id must be unique so this is dumb
 
   xw = &xwidgets[id];
+  xw->id=id;
   value = xwidget_spec_value (spec, QCtype, &found);
   xw->type = INTEGERP (value) ? XFASTINT (value) : 1;   //default to button
   value = xwidget_spec_value (spec, Qtitle, &found2);
@@ -802,8 +804,6 @@ xwidget_touched (struct xwidget_view *xw)
 void
 xwidget_end_redisplay (struct glyph_matrix *matrix)
 {
-  //return; //until I convert this to MVC
-
   
   int i;
   struct xwidget *xw;
@@ -863,8 +863,9 @@ xwidget_end_redisplay (struct glyph_matrix *matrix)
   for (i = 0; i < MAX_XWIDGETS; i++)
     {
       struct xwidget_view* xv = &xwidget_views[i];
-        
-      if (xv->initialized && (         xv->w ==                   (XWINDOW(FRAME_SELECTED_WINDOW (SELECTED_FRAME())))))
+
+      //"touched" is only meaningful for the "live" window, so disregard other views
+      if (xv->initialized && ( xv->w ==    (XWINDOW(FRAME_SELECTED_WINDOW (SELECTED_FRAME())))))
         {
           if (xwidget_touched(xv))
             xwidget_show_view (xv);