some attempts at real-world usefulness

4 files changed, 125 insertions, 22 deletions

diff --git a/README.xwidget b/README.xwidget
index 89c07127b5c..6ac7469fd08 100644
--- a/README.xwidget
+++ b/README.xwidget
@@ -24,8 +24,10 @@ The xwidget code attempts to keep the visual appearance of the views
 in sync with through an Observer pattern implementation.
 
 ** building
-export CFLAGS="-g"
+export CFLAGS=" -g -DGLYPH_DEBUG=1"
+#export CFLAGS="-g"
 ./configure   --with-x-toolkit=gtk3 --with-xwidgets
+make -j4
 
 ** MVC and Xembedd
 The MVC approach appears to be at least in principle robust for plain gtk
@@ -138,6 +140,61 @@ this is aproach worked so-so.
 
 * ToDo:s
 
+** TODO annoying backtrace
+sadly happens a lot.
+- happens even with no initialized xwidgets
+-                    + row->glyphs[area][i].face_id
+or similar code, so row is invalid for some reason.
+xwidgets currently disable some redisplay opimizations so it might be
+an actual emacs bug manifesting without optimizations.
+
+*** bt 1
+      /* Compute the width of this line.  */
+      row->pixel_width = row->x;
+      for (i = 0; i < row->used[TEXT_AREA]; ++i)
+        row->pixel_width += row->glyphs[TEXT_AREA][i].pixel_width;
+
+(gdb) bt
+#0  0x000000000045c340 in compute_line_metrics (it=0x7fffffff8a20)
+    at xdisp.c:17549
+#1  0x00000000004603da in display_line (it=0x7fffffff8a20) at xdisp.c:18792
+#2  0x0000000000457646 in try_window (window=23403045, pos=..., flags=1)
+    at xdisp.c:15399
+#3  0x00000000004559c9 in redisplay_window (window=23403045, just_this_one_p=0)
+    at xdisp.c:14944
+#4  0x0000000000450247 in redisplay_window_0 (window=23403045) at xdisp.c:13152
+#5  0x00000000005fdcd9 in internal_condition_case_1 (bfun=
+    0x450208 <redisplay_window_0>, arg=23403045, handlers=12691046, hfun=
+    0x4501d9 <redisplay_window_error>) at eval.c:1538
+#6  0x00000000004501ba in redisplay_windows (window=23403045) at xdisp.c:13132
+#7  0x000000000044f19c in redisplay_internal () at xdisp.c:12706
+#8  0x000000000044f9f2 in redisplay_preserve_echo_area (from_where=7)
+    at xdisp.c:12964
+#9  0x0000000000568525 in swallow_events (do_display=1) at keyboard.c:4197
+#10 0x0000000000422554 in sit_for (timeout=40, reading=1, do_display=1)
+    at dispnew.c:5963
+#11 0x000000000056512c in read_char (commandflag=1, nmaps=8, maps=
+    0x7fffffffd3f0, prev_event=12720514, used_mouse_menu=0x7fffffffd604, 
+    end_time=0x0) at keyboard.c:2689
+#12 0x0000000000572c59 in read_key_sequence (keybuf=0x7fffffffd850, bufsize=
+    30, prompt=12720514, dont_downcase_last=0, can_return_switch_frame=1, 
+---Type <return> to continue, or q <return> to quit---
+    fix_current_buffer=1) at keyboard.c:9291
+#13 0x0000000000562897 in command_loop_1 () at keyboard.c:1446
+#14 0x00000000005fdb52 in internal_condition_case (bfun=
+    0x5624b4 <command_loop_1>, handlers=12772898, hfun=0x561dab <cmd_error>)
+    at eval.c:1493
+#15 0x00000000005621ab in command_loop_2 (ignore=12720514) at keyboard.c:1157
+#16 0x00000000005fd4ce in internal_catch (tag=12768770, func=
+    0x562185 <command_loop_2>, arg=12720514) at eval.c:1247
+#17 0x000000000056215e in command_loop () at keyboard.c:1136
+#18 0x00000000005618f9 in recursive_edit_1 () at keyboard.c:757
+#19 0x0000000000561a95 in Frecursive_edit () at keyboard.c:821
+#20 0x000000000055fba2 in main (argc=1, argv=0x7fffffffe188) at emacs.c:1704
+
+
+*** bt 2
+
 ** DONE Examine using XComposite rather than GTK off-screen
   rendering. This would make xembed widgets work much better. This
   would probably be rathter difficult, but could open up other
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 4c94b7e291c..3ef379c4ffe 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -15,8 +15,10 @@ see xwidget.c for types suitable for TYPE.
     (put-text-property (point) (+ 1 (point)) 'display (list 'xwidget ':xwidget id))
     id))
 
-
-
+(defun xwidget-at (pos)
+  (caddr  (get-text-property pos 'display)
+))
+         
 (defun xwidget-socket-handler ()
   "creates plug for socket. TODO"
   (interactive)
@@ -60,25 +62,34 @@ defaults to the string looking like a url around the cursor position."
 ;;todo.
 ;; - support browse-url with xwidget-webkit
 ;; - check that the webkit support is compiled in
-(define-derived-mode xwidget-webkit-mode special-mode "xwidget-webkit" "xwidget webkit special mode" )
-(defvar xwidget-webkit-last-session nil)
+(define-derived-mode xwidget-webkit-mode view-mode "xwidget-webkit" "xwidget webkit view mode" )
+
+(defvar xwidget-webkit-last-session-buffer nil)
+
+(defun  xwidget-webkit-last-session ()
+  (if (buffer-live-p xwidget-webkit-last-session-buffer)
+      (save-excursion
+        (switch-to-buffer xwidget-webkit-last-session-buffer)
+        (xwidget-at 1))
+    nil))
+
 (defun xwidget-webkit-new-session (url)
-  (save-excursion
-    (let*
-        ((bufname (generate-new-buffer-name "*xwidget-webkit*"))
-         )
-      (set-buffer (get-buffer-create bufname))
-      (insert " ")
-      (setq xwidget-webkit-last-session (xwidget-insert 1 'webkit-osr  bufname 1000 1000))
-      (xwidget-webkit-mode)
-      (xwidget-webkit-goto-uri xwidget-webkit-last-session url ))
-    )
+
+  (let*
+      ((bufname (generate-new-buffer-name "*xwidget-webkit*"))
+       )
+    (setq xwidget-webkit-last-session-buffer (switch-to-buffer (get-buffer-create bufname)))
+    (insert " ")
+    (xwidget-insert 1 'webkit-osr  bufname 1000 1000)
+    (xwidget-webkit-mode)
+    (xwidget-webkit-goto-uri ( xwidget-webkit-last-session) url ))
+    
 
   )
 
 (defun xwidget-webkit-goto-url (url)
-  (if xwidget-webkit-last-session
-      (xwidget-webkit-goto-uri xwidget-webkit-last-session url)
+  (if ( xwidget-webkit-last-session)
+      (xwidget-webkit-goto-uri ( xwidget-webkit-last-session) url)
     ( xwidget-webkit-new-session url)))
 
 
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++)