tweak to improve deletion of xwviews when emacs windows are closed

4 files changed, 25 insertions, 0 deletions

diff --git a/README.xwidget b/README.xwidget
index b709fcd7d9e..8c4998cc960 100644
--- a/README.xwidget
+++ b/README.xwidget
@@ -588,6 +588,16 @@ maybe control be used in place of my own copy hacks?
 
 
 
+** TODO remove xwidget_views when emacs window is deleted
+removing xwidget views when an Emacs window closes is not reliable.
+
+- switching buffers in a window seems to hide the corresponding
+  xwidget-views properly, but they might as well be deleted.
+
+-  patching delete-window-internal could be used to delete the xwidget-views
+
+
+
 ** 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.
diff --git a/src/window.c b/src/window.c
index 93f763ec9af..3c867145620 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3953,6 +3953,7 @@ when WINDOW is the only window on its frame.  */)
     {
       /* Block input.  */
       BLOCK_INPUT;
+      xwidget_view_delete_all_in_window(w);
       window_resize_apply (p, horflag);
 
       windows_or_buffers_changed++;
diff --git a/src/xwidget.c b/src/xwidget.c
index 6b4cc2d459f..57243832ce3 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -1048,6 +1048,19 @@ xwidget_from_id (int id)
   return &xwidgets[id];
 }
 
+void      xwidget_view_delete_all_in_window(  struct window *w )
+{
+  //xxx
+  struct xwidget_view* xv = NULL;
+  for (int i = 0; i < MAX_XWIDGETS; i++){
+      xv =  &xwidget_views[i];
+      if(xv->w == w){
+        gtk_widget_destroy(xv->widgetwindow);
+      }
+  }
+}
+
+
 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++)
diff --git a/src/xwidget.h b/src/xwidget.h
index d5077bb0623..732dac5e7c2 100644
--- a/src/xwidget.h
+++ b/src/xwidget.h
@@ -85,3 +85,4 @@ void assert_valid_xwidget_id(int id,char *str);
 int 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 );