some attempts at real-world usefulness

2 files changed, 40 insertions, 5 deletions

diff --git a/src/xdisp.c b/src/xdisp.c
index c02de7225e1..67cbfaa76f6 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12209,7 +12209,7 @@ redisplay_internal (void)
      frames.  Zero means, only selected_window is considered.  */
   int consider_all_windows_p;
 
-  printf(">>>>redisplay\n");
+  //printf(">>>>redisplay\n");
   //  xwidget_start_redisplay();
   
   TRACE ((stderr, "redisplay_internal %d\n", redisplaying_p));
@@ -12932,7 +12932,7 @@ redisplay_internal (void)
   RESUME_POLLING;
   //xwidget_end_redisplay();
     
-  printf("<<<<redisplay\n");
+  //printf("<<<<redisplay\n");
 }
 
 
@@ -15383,6 +15383,7 @@ 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));
 
@@ -15393,6 +15394,7 @@ 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)
     {
@@ -15489,10 +15491,11 @@ try_window_reusing_current_matrix (struct window *w)
   struct glyph_row *start_row;
   int start_vpos, min_y, max_y;
 
+#if HAVE_XWIDGETS_hhh
   return 0;
   //xwidgets doesnt like blit scrolling and stuff, try this for now
   //should be optimized, perhaps by just inhibiting optimizations of windows containing xwidgets.
-  
+#endif  
   
 #if GLYPH_DEBUG
   if (inhibit_try_window_reusing)
@@ -17476,7 +17479,11 @@ static void
 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;
+  }
   if (FRAME_WINDOW_P (it->f))
     {
       int i, min_y, max_y;
diff --git a/src/xwidget.c b/src/xwidget.c
index 2ea88a22279..44e1d327729 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -783,6 +783,33 @@ DEFUN("xwidget-view-info", Fxwidget_view_info , Sxwidget_view_info, 2,2,0, doc:
   return info;
 }
 
+
+DEFUN("xwidget-delete-zombies", Fxwidget_delete_zombies , Sxwidget_delete_zombies, 0,0,0, doc: /* */)
+  (void)
+{
+  /*
+    - remove all views with window gone
+
+    TODO
+    - remove all xwidgets with buffer gone
+    - remove all views with xw gone
+
+   */
+  struct xwidget_view* xv = NULL;
+  Lisp_Object w;
+  for (int i = 0; i < MAX_XWIDGETS; i++){
+      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;
+      }
+  }
+}
+
+
+
 void
 syms_of_xwidget (void)
 {
@@ -799,7 +826,7 @@ syms_of_xwidget (void)
   defsubr (&Sxwidget_webkit_execute_script);
   defsubr (&Sxwidget_webkit_get_title);
   defsubr (&Sxwidget_size_request  );
-  
+  defsubr (&Sxwidget_delete_zombies);
   DEFSYM (Qxwidget ,"xwidget");
 
   DEFSYM (Qcxwidget ,":xwidget");
@@ -904,6 +931,7 @@ void      xwidget_view_delete_all_in_window(  struct window *w )
 }
 
 
+
 struct xwidget_view* xwidget_view_lookup(struct xwidget* xw,     struct window *w){
   struct xwidget_view* xv = NULL;
   for (int i = 0; i < MAX_XWIDGETS; i++)