cleanups

12 files changed, 105 insertions, 151 deletions

diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 3ef379c4ffe..967577a4e98 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -97,4 +97,13 @@ defaults to the string looking like a url around the cursor position."
 ;; (declare-function xwidget-resize-internal "xwidget.c" )
 ;; check-declare-function?
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defun xwidget-cleanup ()
+  ;;its still pretty easy to trigger bugs with xwidgets.
+  ;;this function tries to implement a workaround
+  (interactive)
+  (xwidget-delete-zombies) ;;kill xviews who should have been deleted but stull linger
+  (redraw-display);;redraw display otherwise ghost of zombies  will remain to haunt the screen
+  )
+
 (provide 'xwidget)
diff --git a/src/dispextern.h b/src/dispextern.h
index ec1bdab815c..b8ef4656220 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -23,6 +23,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define DISPEXTERN_H_INCLUDED
 
 #ifdef HAVE_X_WINDOWS
+
 #include <X11/Xlib.h>
 #ifdef USE_X_TOOLKIT
 #include <X11/Intrinsic.h>
@@ -118,7 +119,7 @@ enum window_part
 
 /* If GLYPH_DEBUG is non-zero, additional checks are activated.  Turn
    it off by defining the macro GLYPH_DEBUG to zero.  */
-#define GLYPH_DEBUG 1
+
 #ifndef GLYPH_DEBUG
 #define GLYPH_DEBUG 0
 #endif
@@ -436,7 +437,7 @@ struct glyph
     int img_id;
 
     struct xwidget* xwidget;
-    
+
     /* Sub-structure for type == STRETCH_GLYPH.  */
     struct
     {
@@ -2396,7 +2397,6 @@ struct it
   /* If what == IT_XWIDGET*/
   struct xwidget* xwidget;
 
-  
   /* Values from `slice' property.  */
   struct it_slice slice;
 
diff --git a/src/dispnew.c b/src/dispnew.c
index bfd4b3a7ecf..7b20979e45d 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -295,7 +295,6 @@ static void add_frame_display_history (struct frame *, int);
    has been constructed.  PAUSED_P non-zero means that the update
    has been interrupted for pending input.  */
 
-
 static void
 add_window_display_history (struct window *w, const char *msg, int paused_p)
 {
@@ -305,7 +304,7 @@ add_window_display_history (struct window *w, const char *msg, int paused_p)
     history_idx = 0;
   buf = redisplay_history[history_idx].trace;
   ++history_idx;
-  /* glyph debug seems broken
+
   sprintf (buf, "%d: window %p (`%s')%s\n",
            history_tick++,
            w,
@@ -314,9 +313,8 @@ add_window_display_history (struct window *w, const char *msg, int paused_p)
             ? SSDATA (BVAR (XBUFFER (w->buffer), name))
             : "???"),
            paused_p ? " ***paused***" : "");
-  */
-  strcat (buf, msg);
 
+  strcat (buf, msg);
 }
 
 
@@ -3383,7 +3381,6 @@ update_single_window (struct window *w, int force_p)
 {
   if (w->must_be_updated_p)
     {
-      printf("window %d must be updated\n");
       struct frame *f = XFRAME (WINDOW_FRAME (w));
 
       /* Record that this is not a frame-based redisplay.  */
@@ -3740,10 +3737,9 @@ update_window (struct window *w, int force_p)
   add_window_display_history (w, w->current_matrix->method, paused_p);
 #endif
 
-  
-  if ((XWINDOW(FRAME_SELECTED_WINDOW (SELECTED_FRAME()))) ==  (w))
-    xwidget_end_redisplay(w->current_matrix);
-  
+  //  if ((XWINDOW(FRAME_SELECTED_WINDOW (SELECTED_FRAME()))) ==  (w))
+  xwidget_end_redisplay(w, w->current_matrix);
+
   clear_glyph_matrix (desired_matrix);
 
   return paused_p;
diff --git a/src/emacs.c b/src/emacs.c
index 1de10c0b5dc..ecf372d40ad 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -49,7 +49,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "window.h"
 
 #include "xwidget.h"
-
 #include "systty.h"
 #include "blockinput.h"
 #include "syssignal.h"
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c
index e7d1690605c..5a0e57d0146 100644
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@ -42,8 +42,6 @@ static void emacs_fixed_get_preferred_height (GtkWidget *widget,
                                               gint      *natural);
 G_DEFINE_TYPE (EmacsFixed, emacs_fixed, GTK_TYPE_FIXED)
 
-
-
 void aloc_callback(GtkWidget* child, GtkWidget* fixed){
   GtkAllocation child_allocation;
   GtkRequisition child_requisition;
@@ -76,7 +74,7 @@ static void emacs_fixed_gtk_widget_size_allocate (GtkWidget *widget,
   parent_class = g_type_class_peek_parent (klass);
   parent_class->size_allocate (widget, allocation);
 
-  
+ 
   //then modify allocations
   gtk_container_foreach  (widget,
                           aloc_callback,
@@ -97,9 +95,7 @@ emacs_fixed_class_init (EmacsFixedClass *klass)
 
   widget_class->get_preferred_width = emacs_fixed_get_preferred_width;
   widget_class->get_preferred_height = emacs_fixed_get_preferred_height;
-
   widget_class->size_allocate =  emacs_fixed_gtk_widget_size_allocate;
-  
   g_type_class_add_private (klass, sizeof (EmacsFixedPrivate));
 }
 
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 1a16246f2b8..c4b5feb9f25 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1078,10 +1078,6 @@ delete_cb (GtkWidget *widget,
 /* Create and set up the GTK widgets for frame F.
    Return 0 if creation failed, non-zero otherwise.  */
 
-
-
-
-
 int
 xg_create_frame_widgets (FRAME_PTR f)
 {
diff --git a/src/keyboard.c b/src/keyboard.c
index 60c6283dab5..62de68cbf74 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -5906,8 +5906,6 @@ make_lispy_event (struct input_event *event)
         return apply_modifiers (event->modifiers, event->arg);
       return event->arg;
 
-
-      
     case USER_SIGNAL_EVENT:
       /* A user signal.  */
       {
@@ -11548,8 +11546,6 @@ syms_of_keyboard (void)
   Qxwidget_event = intern ("xwidget-event");
   staticpro (&Qxwidget_event);
 
-  
-
   DEFSYM (QCenable, ":enable");
   DEFSYM (QCvisible, ":visible");
   DEFSYM (QChelp, ":help");
@@ -11567,7 +11563,6 @@ syms_of_keyboard (void)
   DEFSYM (Qvertical_scroll_bar, "vertical-scroll-bar");
   DEFSYM (Qmenu_bar, "menu-bar");
 
-
 #if defined (HAVE_MOUSE) || defined (HAVE_GPM)
   DEFSYM (Qmouse_fixup_help_message, "mouse-fixup-help-message");
 #endif
diff --git a/src/window.c b/src/window.c
index d39efa8071d..14ebc89e04e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -51,7 +51,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 
 #include "xwidget.h"
-
 Lisp_Object Qwindowp, Qwindow_live_p;
 static Lisp_Object Qwindow_configuration_p, Qrecord_window_buffer;
 static Lisp_Object Qwindow_deletable_p, Qdelete_window, Qdisplay_buffer;
diff --git a/src/xdisp.c b/src/xdisp.c
index 8003eb3e9d5..cd87d00d8d0 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -315,7 +315,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "font.h"
 
 #include "xwidget.h"
-
 #ifndef FRAME_X_OUTPUT
 #define FRAME_X_OUTPUT(f) ((f)->output_data.x)
 #endif
@@ -4083,7 +4082,7 @@ handle_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
   if (CONSP (spec)
       /* Simple specerties.  */
       && !EQ (XCAR (spec), Qimage)
-      && !EQ (XCAR (spec), Qxwidget)      
+      && !EQ (XCAR (spec), Qxwidget)
       && !EQ (XCAR (spec), Qspace)
       && !EQ (XCAR (spec), Qwhen)
       && !EQ (XCAR (spec), Qslice)
@@ -4189,7 +4188,6 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
   Lisp_Object location, value;
   struct text_pos start_pos = *position;
   int valid_p;
-  //printf("handle_single_display_spec:\n");
 
   /* If SPEC is a list of the form `(when FORM . VALUE)', evaluate FORM.
      If the result is non-nil, use VALUE instead of SPEC.  */
@@ -4497,22 +4495,13 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
      LOCATION specifies where to display: `left-margin',
      `right-margin' or nil.  */
 
-  /*
-  printf("handle_single_display_spec xwidgetp:%d  imagep:%d spacep:%d display_replaced_before_p:%d stringp:%d\n",
-         XWIDGETP(value),
-         valid_image_p (value),
-         (CONSP (value) && EQ (XCAR (value), Qspace)),
-         display_replaced_before_p,
-         STRINGP (value));
-  */
   valid_p = (STRINGP (value)
 #ifdef HAVE_WINDOW_SYSTEM
              || ((it ? FRAME_WINDOW_P (it->f) : frame_window_p)
                  && valid_image_p (value))
 #endif /* not HAVE_WINDOW_SYSTEM */
              || (CONSP (value) && EQ (XCAR (value), Qspace))
-             || XWIDGETP(value)
-             );
+             || XWIDGETP(value));
 
   if (valid_p && !display_replaced_p)
     {
@@ -4586,7 +4575,7 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
           *position = start_pos;
 
           it->xwidget = lookup_xwidget(value);
-        }      
+        }
 #ifdef HAVE_WINDOW_SYSTEM
       else //if nothing else, its an image
         {
@@ -4612,7 +4601,6 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
   return 0;
 }
 
-
 /* Check if PROP is a display property value whose text should be
    treated as intangible.  OVERLAY is the overlay from which PROP
    came, or nil if it came from a text property.  CHARPOS and BYTEPOS
@@ -5306,7 +5294,6 @@ push_it (struct it *it, struct text_pos *position)
     case GET_FROM_XWIDGET:
       p->u.xwidget.object = it->object;
       break;
-      
     }
   p->position = position ? *position : it->position;
   p->current = it->current;
@@ -11846,7 +11833,7 @@ debug_method_add (struct window *w, char const *fmt, ...)
     }
 
   strncpy (method + len, buffer, remaining);
-  /* glyph debug broken
+
   if (trace_redisplay_p)
     fprintf (stderr, "%p (%s): %s\n",
              w,
@@ -11855,7 +11842,6 @@ debug_method_add (struct window *w, char const *fmt, ...)
               ? SSDATA (BVAR (XBUFFER (w->buffer), name))
               : "no buffer"),
              buffer);
-  */
 }
 
 #endif /* GLYPH_DEBUG */
@@ -12223,9 +12209,6 @@ redisplay_internal (void)
      frames.  Zero means, only selected_window is considered.  */
   int consider_all_windows_p;
 
-  //printf(">>>>redisplay\n");
-  //  xwidget_start_redisplay();
-  
   TRACE ((stderr, "redisplay_internal %d\n", redisplaying_p));
 
   /* No redisplay if running in batch mode or frame is not yet fully
@@ -12944,9 +12927,6 @@ redisplay_internal (void)
  end_of_redisplay:
   unbind_to (count, Qnil);
   RESUME_POLLING;
-  //xwidget_end_redisplay();
-    
-  //printf("<<<<redisplay\n");
 }
 
 
@@ -15397,7 +15377,6 @@ try_window (Lisp_Object window, struct text_pos pos, int flags)
   struct glyph_row *last_text_row = NULL;
   struct frame *f = XFRAME (w->frame);
 
-  
   /* Make POS the new window start.  */
   set_marker_both (w->start, Qnil, CHARPOS (pos), BYTEPOS (pos));
 
@@ -15408,7 +15387,6 @@ try_window (Lisp_Object window, struct text_pos pos, int flags)
   /* Initialize iterator and info to start at POS.  */
   start_display (&it, w, pos);
 
-
   /* Display all lines of W.  */
   while (it.current_y < it.last_visible_y)
     {
@@ -17117,7 +17095,7 @@ dump_glyph (struct glyph_row *row, struct glyph *glyph, int area)
                glyph->face_id,
                glyph->left_box_line_p,
                glyph->right_box_line_p);
-      
+
       //      printf("dump xwidget glyph\n");
     }
 }
@@ -17495,8 +17473,7 @@ compute_line_metrics (struct it *it)
   struct glyph_row *row = it->glyph_row;
   if(row->used[TEXT_AREA] > 1000){
   printf("compute_line_metrics %d %d %d\n", row->used[TEXT_AREA], it->f->text_cols, row->end.pos.charpos);
-    printf("row->used[TEXT_AREA] seems weirdly big! therefore dont compute_line_metrics\n");
-    return;
+    printf("row->used[TEXT_AREA] seems weirdly big! emacs will crash soon\n");
   }
   if (FRAME_WINDOW_P (it->f))
     {
@@ -21227,8 +21204,7 @@ calc_pixel_width_or_height (double *res, struct it *it, Lisp_Object prop,
               return OK_PIXELS (width_p ? img->width : img->height);
             }
 
-          if (FRAME_WINDOW_P (it->f)
-              && valid_xwidget_p (prop))
+          if (FRAME_WINDOW_P (it->f) && valid_xwidget_p (prop))
             {
               printf("calc_pixel_width_or_height: return dummy size FIXME\n");
               return OK_PIXELS (width_p ? 100 : 100);
@@ -21740,7 +21716,6 @@ fill_xwidget_glyph_string (struct glyph_string *s)
   //assert_valid_xwidget_id ( s->xwidget, "fill_xwidget_glyph_string");
 }
 
-
 /* Fill glyph string S from a sequence of stretch glyphs.
 
    START is the index of the first glyph to consider,
@@ -22919,8 +22894,8 @@ produce_xwidget_glyph (struct it *it)
           glyph->ascent = glyph_ascent;
           glyph->descent = it->descent;
           glyph->voffset = it->voffset;
-          glyph->type = XWIDGET_GLYPH;          
-          
+          glyph->type = XWIDGET_GLYPH;
+
           glyph->multibyte_p = it->multibyte_p;
           glyph->left_box_line_p = it->start_of_box_run_p;
           glyph->right_box_line_p = it->end_of_box_run_p;
diff --git a/src/xterm.c b/src/xterm.c
index 58b326fc227..a7bdffa8bf3 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2624,7 +2624,6 @@ x_draw_glyph_string (struct glyph_string *s)
 {
   int relief_drawn_p = 0;
 
-  //printf("x_draw_glyph_string: %d\n",s->first_glyph->type);
   /* If S draws into the background of its successors, draw the
      background of the successors first so that S can draw into it.
      This makes S->next use XDrawString instead of XDrawImageString.  */
@@ -2685,7 +2684,6 @@ x_draw_glyph_string (struct glyph_string *s)
     case XWIDGET_GLYPH:
       //erase xwidget background
       x_draw_glyph_string_background (s, 0);
-      //x_draw_xwidget_glyph_string draws phantom xwidgets only, live xwidgets are drawn in an expose handler
       x_draw_xwidget_glyph_string (s);
       break;
 
@@ -5834,7 +5832,6 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr,
   inev.ie.kind = NO_EVENT;
   inev.ie.arg = Qnil;
 
-  
   if (pending_event_wait.eventtype == event.type)
     pending_event_wait.eventtype = 0; /* Indicates we got it.  */
 
@@ -6321,15 +6318,11 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr,
           Lisp_Object c;
 
 #ifdef USE_GTK
-
           /* Don't pass keys to GTK.  A Tab will shift focus to the
              tool bar in GTK 2.4.  Keys will still go to menus and
              dialogs because in that case popup_activated is TRUE
-             (see above).
-          */
+             (see above).  */
           *finish = X_EVENT_DROP;
-          
-
 #endif
 
           event.xkey.state
@@ -7221,7 +7214,7 @@ x_draw_hollow_cursor (struct window *w, struct glyph_row *row)
   cursor_glyph = get_phys_cursor_glyph (w);
   if (cursor_glyph == NULL)
     return;
-  
+
   /* Compute frame-relative coordinates for phys cursor.  */
   get_phys_cursor_geometry (w, row, cursor_glyph, &x, &y, &h);
   wd = w->phys_cursor_width;
@@ -7266,7 +7259,6 @@ x_draw_bar_cursor (struct window *w, struct glyph_row *row, int width, enum text
     printf("tried avoiding xwidget cursor\n");
     return; //experimental avoidance of cursor on xwidget
   }
-  
   /* If on an image, draw like a normal cursor.  That's usually better
      visible than drawing a bar, esp. if the image is large so that
      the bar might not be in the window.  */
@@ -9899,9 +9891,9 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
                                   | G_LOG_FLAG_RECURSION, my_log_handler, NULL);
 #ifdef HAVE_CLUTTER
         gtk_clutter_init (&argc, &argv2);
-#else        
+#else
         gtk_init (&argc, &argv2);
-#endif        
+#endif
         g_log_remove_handler ("GLib", id);
 
         /* gtk_init does set_locale.  We must fix locale after calling it.  */
@@ -10507,7 +10499,7 @@ static struct redisplay_interface x_redisplay_interface =
     x_write_glyphs,
     x_insert_glyphs,
     x_clear_end_of_line,
-    x_scroll_run, //maybe xwidgets dont work too well with scrolling by blitting
+    x_scroll_run,
     x_after_update_window_line,
     x_update_window_begin,
     x_update_window_end,
diff --git a/src/xwidget.c b/src/xwidget.c
index 44e1d327729..6a0d3ee4340 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -102,7 +102,7 @@
 //would need to be hashtables or something
 
 #define MAX_XWIDGETS 100
-struct xwidget_view xwidget_views[MAX_XWIDGETS]; 
+struct xwidget_view xwidget_views[MAX_XWIDGETS];
 
 //TODO embryo of lisp allocators for xwidgets
 //TODO xwidget* should be Lisp_xwidget*
@@ -129,12 +129,12 @@ Lisp_Object Qxwidget_info;
 Lisp_Object Qxwidget_resize;
 Lisp_Object Qxwidget_send_keyboard_event;
 
-Lisp_Object Qbutton, Qtoggle, Qslider, Qsocket, Qcairo, 
+Lisp_Object Qbutton, Qtoggle, Qslider, Qsocket, Qcairo,
   Qwebkit_osr, QCplist;
 
 
-extern Lisp_Object  QCtype;   
-extern Lisp_Object QCwidth, QCheight;  
+extern Lisp_Object  QCtype;
+extern Lisp_Object QCwidth, QCheight;
 
 struct xwidget_view* xwidget_view_lookup(struct xwidget* xw,     struct window *w);
 Lisp_Object xwidget_spec_value ( Lisp_Object spec, Lisp_Object  key,  int *found);
@@ -145,7 +145,7 @@ DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0,
          )
   (Lisp_Object beg, Lisp_Object end,
      Lisp_Object type,
-     Lisp_Object title,     
+     Lisp_Object title,
      Lisp_Object width, Lisp_Object height,
      Lisp_Object data)
 {
@@ -158,7 +158,7 @@ DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0,
   struct gcpro gcpro1;
   GCPRO1(xw);
   XSETSYMBOL(xw->type, type);
-  XSETSTRING(xw->title, title);  
+  XSETSTRING(xw->title, title);
   XSETBUFFER(xw->buffer,  Fcurrent_buffer()); // conservatively gcpro xw since we call lisp
   xw->height = XFASTINT(height);
   xw->width = XFASTINT(width);
@@ -180,21 +180,21 @@ DEFUN ("make-xwidget", Fmake_xwidget, Smake_xwidget, 7, 7, 0,
     gtk_window_resize(    GTK_WINDOW(xw->widgetwindow_osr), xw->width, xw->height);
     xw->widget_osr = webkit_web_view_new();
 
-    gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width, xw->height);      
+    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));
     g_signal_connect (G_OBJECT (    xw->widgetwindow_osr), "damage-event",    G_CALLBACK (webkit_osr_damage_event_callback), NULL);
-      
+
     webkit_web_view_load_uri(WEBKIT_WEB_VIEW(xw->widget_osr), "http://www.fsf.org");
     UNBLOCK_INPUT;
 
   }
-#endif          
+#endif
 
 
   UNGCPRO;
@@ -246,7 +246,7 @@ send_xembed_ready_event (struct xwidget* xw, int xembedid)
   event.arg = Qnil;
   event.arg = Fcons (make_number (xembedid), event.arg);
   event.arg = Fcons (intern ("xembed-ready"), event.arg);
-  event.arg = Fcons (xw, event.arg); //TODO 
+  event.arg = Fcons (xw, event.arg); //TODO
 
 
   kbd_buffer_store_event (&event);
@@ -268,7 +268,7 @@ xwidget_show_view (struct xwidget_view *xv)
   //printf("xwidget %d shown\n",xw->id);
   xv->hidden = 0;
   gtk_widget_show(GTK_WIDGET(xv->widgetwindow));
-  gtk_fixed_move (GTK_FIXED (xv->emacswindow), GTK_WIDGET (xv->widgetwindow),  xv->x  + xv->clip_left, xv->y + xv->clip_top); //TODO refactor 
+  gtk_fixed_move (GTK_FIXED (xv->emacswindow), GTK_WIDGET (xv->widgetwindow),  xv->x  + xv->clip_left, xv->y + xv->clip_top); //TODO refactor
 }
 
 
@@ -318,7 +318,7 @@ void xwidget_slider_changed (GtkRange *range,
 
   printf("slider changed val:%f\n", v);
 
-  
+
   //block sibling views signal handlers
   for (int i = 0; i < MAX_XWIDGETS; i++)
     {
@@ -342,7 +342,7 @@ void xwidget_slider_changed (GtkRange *range,
 
 /* when the off-screen webkit master view changes this signal is called.
    it copies the bitmap from the off-screen webkit instance */
-gboolean webkit_osr_damage_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data) 
+gboolean webkit_osr_damage_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
   //TODO this is wrong! should just oueu a redraw of onscreen widget
   struct xwidget* xw = (struct xwidget*) g_object_get_data (G_OBJECT (widget), XG_XWIDGET);
@@ -358,7 +358,7 @@ gboolean webkit_osr_damage_event_callback (GtkWidget *widget, GdkEventExpose *ev
     }
 
   return FALSE;
-}                                                                               
+}
 
 
 //for gtk3 webkit_osr
@@ -366,8 +366,8 @@ gboolean
 xwidget_osr_draw_callback (GtkWidget *widget, cairo_t *cr, gpointer data)
 {
   struct xwidget* xw = (struct xwidget*) g_object_get_data (G_OBJECT (widget), XG_XWIDGET);
-  struct xwidget_view* xv = (struct xwidget_view*) g_object_get_data (G_OBJECT (widget), XG_XWIDGET_VIEW);    
-  
+  struct xwidget_view* xv = (struct xwidget_view*) g_object_get_data (G_OBJECT (widget), XG_XWIDGET_VIEW);
+
   //  printf("xwidget_osr_draw_callback gtk3 xw.id:%d xw.type:%d window:%d vis:%d\n",
   //         xw,xw->type, gtk_widget_get_window (widget),  gtk_widget_get_visible (xw->widget_osr));
 
@@ -376,7 +376,7 @@ xwidget_osr_draw_callback (GtkWidget *widget, cairo_t *cr, gpointer data)
 
   gtk_widget_draw (xw->widget_osr,  cr);
 
-  
+
   return FALSE;
 }
 
@@ -386,9 +386,9 @@ xwidget_osr_button_callback ( GtkWidget *widget,
                               GdkEvent  *event,
                               gpointer   user_data)
 {
-  struct xwidget* xw = (struct xwidget*) g_object_get_data (G_OBJECT (widget), XG_XWIDGET);    
+  struct xwidget* xw = (struct xwidget*) g_object_get_data (G_OBJECT (widget), XG_XWIDGET);
   GdkEvent* eventcopy =  gdk_event_copy(event);
-  
+
   ((GdkEventButton*)eventcopy)->window = gtk_widget_get_window(xw->widget_osr);
   gtk_main_do_event(eventcopy); //TODO this will leak events. they should be deallocated later
 }
@@ -397,7 +397,7 @@ int xwidget_view_index=0;
 
 /* initializes and does initial placement of an xwidget view on screen */
 struct xwidget_view*
-xwidget_init_view ( 
+xwidget_init_view (
                    struct xwidget *xww,
                    struct glyph_string *s,
                    int x, int y)
@@ -414,11 +414,11 @@ xwidget_init_view (
 
     xv = &xwidget_views[xwidget_view_index];
   }while(  xv->initialized == 1); //TODO yeah this can infloop if there are MAX_WIDGETS on-screen
-  
+
   xv->initialized = 1;
   xv->w = s->w;
   xv->model = xww;
-  
+
   //widget creation
   if(EQ(xww->type, Qbutton))
     {
@@ -434,7 +434,7 @@ xwidget_init_view (
     //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");
-    g_signal_connect_after(xv->widget, "plug-removed", G_CALLBACK(xwidget_plug_removed), "plug removed");              
+    g_signal_connect_after(xv->widget, "plug-removed", G_CALLBACK(xwidget_plug_removed), "plug removed");
   } else if (EQ(xww->type, Qslider)) {
     xv->widget =
       //gtk_hscale_new (GTK_ADJUSTMENT(gtk_adjustment_new (0.0, 0.0, 100.0, 1.0, 10.0, 10.0)));
@@ -443,7 +443,7 @@ xwidget_init_view (
     xv->handler_id = g_signal_connect_after(xv->widget, "value-changed", G_CALLBACK(xwidget_slider_changed), "slider changed");
   } else if (EQ(xww->type, Qcairo)) {
     //Cairo view
-    //uhm cairo is differentish in gtk 3. 
+    //uhm cairo is differentish in gtk 3.
     //gdk_cairo_create (gtk_widget_get_window (f->gwfixed));
 #ifdef HAVE_GOOCANVAS
     xv->widget = goo_canvas_new();
@@ -463,7 +463,7 @@ xwidget_init_view (
                                      "font", "Sans 24",
                                      NULL);
     goo_canvas_item_rotate (text_item, 45, 300, 300);
-  
+
 #endif
 #ifdef HAVE_CLUTTER
     xv->widget = gtk_clutter_embed_new ();;
@@ -483,13 +483,13 @@ xwidget_init_view (
     /* 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        
+    clutter_actor_show (stage);
+#endif
   } else if (EQ(xww->type, Qwebkit_osr)) {
 #ifdef HAVE_WEBKIT_OSR
     xv->widget = gtk_drawing_area_new();
@@ -498,19 +498,19 @@ xwidget_init_view (
                           GDK_BUTTON_PRESS_MASK
                           | GDK_BUTTON_RELEASE_MASK
                           | GDK_POINTER_MOTION_MASK);
-    g_signal_connect (G_OBJECT (    xv->widget), "draw",                    
+    g_signal_connect (G_OBJECT (    xv->widget), "draw",
                       G_CALLBACK (xwidget_osr_draw_callback), NULL);
-    g_signal_connect (G_OBJECT (    xv->widget), "button-press-event",                    
+    g_signal_connect (G_OBJECT (    xv->widget), "button-press-event",
                       G_CALLBACK (xwidget_osr_button_callback), NULL);
-    g_signal_connect (G_OBJECT (    xv->widget), "button-release-event",                    
+    g_signal_connect (G_OBJECT (    xv->widget), "button-release-event",
                       G_CALLBACK (xwidget_osr_button_callback), NULL);
-    g_signal_connect (G_OBJECT (    xv->widget), "motion-notify-event",                    
+    g_signal_connect (G_OBJECT (    xv->widget), "motion-notify-event",
                       G_CALLBACK (xwidget_osr_button_callback), NULL);
 #endif
 
 
   } else return NULL;
-  
+
   //widget realization
   //make container widget 1st, and put the actual widget inside the container
   //later, drawing should crop container window if necessary to handle case where xwidget
@@ -523,7 +523,7 @@ xwidget_init_view (
   //xv->widgetwindow = GTK_CONTAINER (gtk_event_box_new ()); //doesnt help clipping gtk3
   //xv->widgetwindow = GTK_CONTAINER (gtk_scrolled_window_new (NULL, NULL)); //clips in gtk3
   //xv->widgetwindow = GTK_CONTAINER (gtk_viewport_new (NULL, NULL));
-  
+
 
   /* GtkAllocation a; */
   /* a.x=0;  a.y=0;   a.width=xww->width;  a.height=xww->height; */
@@ -546,29 +546,29 @@ xwidget_init_view (
   g_object_set_data (G_OBJECT (xv->widget), XG_FRAME_DATA, (gpointer) (s->f)); //the emacs frame
   g_object_set_data (G_OBJECT (xv->widget), XG_XWIDGET, (gpointer) (xww)); //the xwidget
   g_object_set_data (G_OBJECT (xv->widget), XG_XWIDGET_VIEW, (gpointer) (xv)); //the xwidget
-  g_object_set_data (G_OBJECT (xv->widgetwindow), XG_XWIDGET, (gpointer) (xww)); //the xwidget  
+  g_object_set_data (G_OBJECT (xv->widgetwindow), XG_XWIDGET, (gpointer) (xww)); //the xwidget
   g_object_set_data (G_OBJECT (xv->widgetwindow), XG_XWIDGET_VIEW, (gpointer) (xv)); //the xwidget
 
-  
+
   gtk_widget_set_size_request (GTK_WIDGET (xv->widget), xww->width, xww->height);
   gtk_widget_set_size_request (GTK_WIDGET (xv->widgetwindow), xww->width, xww->height);
   gtk_fixed_put (GTK_FIXED (s->f->gwfixed), GTK_WIDGET (xv->widgetwindow), x, y);
   xv->x = x;  xv->y = y;
   gtk_widget_show_all (GTK_WIDGET (xv->widgetwindow));
 
-  
+
   //this seems to enable xcomposition. later we need to paint ourselves somehow,
   //since the widget is no longer responsible for painting itself
   //if(xw->type!=3)  //im having trouble with compositing and sockets. hmmm.
   //gdk_window_set_composited (xw->widget->window, TRUE);
-  //gdk_window_set_composited (GTK_LAYOUT (xw->widgetwindow)->bin_window, TRUE);  
+  //gdk_window_set_composited (GTK_LAYOUT (xw->widgetwindow)->bin_window, TRUE);
   // gtk_widget_set_double_buffered (xw->widget,FALSE);
-  // gtk_widget_set_double_buffered (xw->widgetwindow,FALSE);  
-  //gdk_window_set_composited (xw->widgetwindow, TRUE);  
+  // gtk_widget_set_double_buffered (xw->widgetwindow,FALSE);
+  //gdk_window_set_composited (xw->widgetwindow, TRUE);
   //g_signal_connect_after(xw->widget, "expose-event", G_CALLBACK(xwidget_composite_draw), "widget exposed");
-  //g_signal_connect_after(xw->widgetwindow, "expose-event", G_CALLBACK(xwidget_composite_draw_widgetwindow), "widgetwindow exposed");  
-  //  g_signal_connect_after(xw->widget, "damage-event", G_CALLBACK(xwidget_composite_draw), "damaged");  
-  
+  //g_signal_connect_after(xw->widgetwindow, "expose-event", G_CALLBACK(xwidget_composite_draw_widgetwindow), "widgetwindow exposed");
+  //  g_signal_connect_after(xw->widget, "damage-event", G_CALLBACK(xwidget_composite_draw), "damaged");
+
   //widgettype specific initialization only possible after realization
   if (EQ(xww->type, Qsocket)) {
     printf ("xwid:%d socket id:%x %d\n",
@@ -608,16 +608,16 @@ x_draw_xwidget_glyph_string (struct glyph_string *s)
        window placement etc.
     */
     printf ("xv init for xw %d\n", xww);
-    xv = xwidget_init_view (xww, s, x, y); 
+    xv = xwidget_init_view (xww, s, x, y);
   }
 
   //calculate clipping, which is used for all manner of onscreen xwidget views
   //each widget border can get clipped by other emacs objects so there are four clipping variables
   clip_right = min (xww->width, WINDOW_RIGHT_EDGE_X (s->w) - x - WINDOW_RIGHT_SCROLL_BAR_AREA_WIDTH(s->w) - WINDOW_RIGHT_FRINGE_WIDTH(s->w));
   clip_left = max (0, WINDOW_LEFT_EDGE_X (s->w) - x + WINDOW_LEFT_SCROLL_BAR_AREA_WIDTH(s->w) + WINDOW_LEFT_FRINGE_WIDTH(s->w));
-  
+
   clip_bottom = min (xww->height, WINDOW_BOTTOM_EDGE_Y (s->w) - WINDOW_MODE_LINE_HEIGHT (s->w) - y);
-  clip_top = max(0, WINDOW_TOP_EDGE_Y(s->w) -y ); 
+  clip_top = max(0, WINDOW_TOP_EDGE_Y(s->w) -y );
 
   //we are conserned with movement of the onscreen area. the area might sit still when the widget actually moves
   //this happens when an emacs window border moves across a widget winow
@@ -647,7 +647,7 @@ x_draw_xwidget_glyph_string (struct glyph_string *s)
     gtk_fixed_move(GTK_FIXED(xv->widgetwindow), xv->widget, -clip_left, -clip_top);
     printf("reclip %d %d -> %d %d  clip_top:%d clip_left:%d\n",xv->clip_right, xv->clip_bottom,  clip_right, clip_bottom, clip_top , clip_left);
 
-        
+
     xv->clip_right = clip_right; xv->clip_bottom = clip_bottom; xv->clip_top = clip_top;xv->clip_left = clip_left;
   }
   //if emacs wants to repaint the area where the widget lives, queue a redraw
@@ -692,7 +692,7 @@ DEFUN ("xwidget-webkit-get-title", Fxwidget_webkit_get_title,  Sxwidget_webkit_g
 
 
 
-#endif        
+#endif
 
 
 
@@ -710,7 +710,7 @@ DEFUN ("xwidget-resize", Fxwidget_resize, Sxwidget_resize, 3, 3, 0, doc:
   CHECK_NUMBER (new_height);
   w = XFASTINT (new_width);
   h = XFASTINT (new_height);
-  
+
 
   printf("resize xwidget %d (%d,%d)->(%d,%d)",xw, xw->width,xw->height,w,h);
   xw->width=w;
@@ -763,13 +763,13 @@ DEFUN("xwidget-info", Fxwidget_info , Sxwidget_info, 1,1,0, doc: /* get xwidget
   return info;
 }
 
- 
+
 DEFUN("xwidget-view-info", Fxwidget_view_info , Sxwidget_view_info, 2,2,0, doc: /* get xwidget view props */)
   (Lisp_Object xwidget, Lisp_Object window)
 {
   struct xwidget* xw = XXWIDGET(xwidget);
   struct xwidget_view* xv = xwidget_view_lookup(xw, XWINDOW(window));
-  
+
   Lisp_Object info;
 
   info = Fmake_vector (make_number (6), Qnil);
@@ -801,7 +801,7 @@ DEFUN("xwidget-delete-zombies", Fxwidget_delete_zombies , Sxwidget_delete_zombie
       xv =  &xwidget_views[i];
       XSETWINDOW(w,  xv->w);
       if(xv->initialized && (! (WINDOW_LIVE_P(w)))){
-        
+
         gtk_widget_destroy(GTK_WIDGET(xv->widgetwindow));
         xv->initialized = 0;
       }
@@ -832,19 +832,19 @@ syms_of_xwidget (void)
   DEFSYM (Qcxwidget ,":xwidget");
   DEFSYM (Qtitle ,":title");
 
-  DEFSYM (Qbutton, "button");  
-  DEFSYM (Qtoggle, "toggle");  
-  DEFSYM (Qslider, "slider");  
+  DEFSYM (Qbutton, "button");
+  DEFSYM (Qtoggle, "toggle");
+  DEFSYM (Qslider, "slider");
   DEFSYM (Qsocket, "socket");
   DEFSYM (Qcairo, "cairo");
-  DEFSYM (Qwebkit_osr ,"webkit-osr");    
-  DEFSYM (QCplist, ":plist");  
+  DEFSYM (Qwebkit_osr ,"webkit-osr");
+  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;
- 
+
   Fprovide (intern ("xwidget-internal"), Qnil);
 
   //  for (i = 0; i < MAX_XWIDGETS; i++)
@@ -937,7 +937,7 @@ struct xwidget_view* xwidget_view_lookup(struct xwidget* xw,     struct window *
   for (int i = 0; i < MAX_XWIDGETS; i++)
     if ((xwidget_views[i].model == xw) && (xwidget_views[i].w == w))
       xv =  &xwidget_views[i];
-  
+
   return xv;
 }
 
@@ -950,7 +950,7 @@ void                gtk_window_get_position             (GtkWindow *window,
   *root_y = 0;
 }
 
-  
+
 
 struct xwidget*
 lookup_xwidget (Lisp_Object  spec)
@@ -960,7 +960,7 @@ lookup_xwidget (Lisp_Object  spec)
      So, take special care of one-shot events
 
      TODO remove xwidget init from display spec. simply store an xwidget reference only and set
-     size etc when creating the xwidget, which should happen before insertion into buffer 
+     size etc when creating the xwidget, which should happen before insertion into buffer
   */
   int found = 0, found1 = 0, found2 = 0;
   Lisp_Object value;
@@ -1000,23 +1000,23 @@ xwidget_start_redisplay (void)
 
 /* the xwidget was touched during redisplay, so it isnt a candidate for hiding*/
 void
-xwidget_touch (struct xwidget_view *xw)
+xwidget_touch (struct xwidget_view *xv)
 {
-  xw->redisplayed = 1;
+  xv->redisplayed = 1;
 }
 
 int
-xwidget_touched (struct xwidget_view *xw)
+xwidget_touched (struct xwidget_view *xv)
 {
-  return  xw->redisplayed;
+  return  xv->redisplayed;
 }
 
 /* redisplay has ended, now we should hide untouched xwidgets
 */
 void
-xwidget_end_redisplay (struct glyph_matrix *matrix)
+xwidget_end_redisplay (struct window *w, struct glyph_matrix *matrix)
 {
-  
+
   int i;
   struct xwidget *xw;
   int area;
@@ -1045,12 +1045,11 @@ xwidget_end_redisplay (struct glyph_matrix *matrix)
                   if (glyph->type == XWIDGET_GLYPH)
                     {
                       /*
-                        the only call to xwidget_end_redisplay is in dispnew and looks like:
-                        if ((XWINDOW(FRAME_SELECTED_WINDOW (SELECTED_FRAME()))) ==  (w))
+                        the only call to xwidget_end_redisplay is in dispnew
                         xwidget_end_redisplay(w->current_matrix);
                       */
                       xwidget_touch (xwidget_view_lookup(glyph->u.xwidget,
-                                                         (XWINDOW(FRAME_SELECTED_WINDOW (SELECTED_FRAME())))));
+                                                         w));
                     }
                 }
             }
@@ -1062,7 +1061,7 @@ xwidget_end_redisplay (struct glyph_matrix *matrix)
       struct xwidget_view* xv = &xwidget_views[i];
 
       //"touched" is only meaningful for the "live" window, so disregard other views
-      if (xv->initialized && ( xv->w ==    (XWINDOW(FRAME_SELECTED_WINDOW (SELECTED_FRAME())))))
+      if (xv->initialized && ( xv->w ==    w))
         {
           if (xwidget_touched(xv))
             xwidget_show_view (xv);
@@ -1071,5 +1070,3 @@ xwidget_end_redisplay (struct glyph_matrix *matrix)
         }
     }
 }
-
-
diff --git a/src/xwidget.h b/src/xwidget.h
index 9244ff7017f..edd360969dc 100644
--- a/src/xwidget.h
+++ b/src/xwidget.h
@@ -92,7 +92,7 @@ struct xwidget* xwidget_from_id(int id);
 //extern int xwidget_owns_kbd;
 
 void xwidget_start_redisplay();
-void xwidget_end_redisplay(struct glyph_matrix* matrix);
+void xwidget_end_redisplay (struct window *w, struct glyph_matrix *matrix);
 
 void xwidget_touch (struct xwidget_view *xw);