usptream + doc

3 files changed, 104 insertions, 66 deletions

diff --git a/README.xwidget b/README.xwidget
index f30ae3e2445..31b36c6a3b2 100644
--- a/README.xwidget
+++ b/README.xwidget
@@ -27,7 +27,7 @@ necessary to support the Emacs window paradigm.
 ** building
 bzr co bzr+ssh://bzr.savannah.gnu.org/emacs/xwidget/
 #the below compiler flags shouldn't be strictly necessary
-export CFLAGS=" -g -DGLYPH_DEBUG=1"
+export CFLAGS=" -g"
 ./configure --with-xwidgets --enable-asserts --with-x-toolkit=gtk3
 make -j4
 gdb -ex run src/emacs
@@ -203,9 +203,55 @@ This app will work by providing a socket that an app plugs into. The
 socket window is copied efficientlp by means of composition to a
 number of other windows, that then are plugged into the different
 Emacs sockets. 
+** old 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.
+    When this happens the xwidget doesnt move on screen as it should.
+    This mightbe because of x_scroll_run. Emacs decides to scroll the screen by blitting sometimes.
+    then emacs doesnt try to actualy call the paint routines, which means this here code will never
+    run so the xwidget wont know it has been moved.
+
+    Solved temporarily by never optimizing in try_window_reusing_current_matrix().
+
+    BUG the phantoming code doesnt work very well when the live xwidget is off screen.
+    you will get weirdo display artefacts. Composition ought to solve this, since that means the live window is
+    always available in an off-screen buffer. My current attempt at composition doesnt work properly however.
+
+    //allocation debugging. the correct values cant be expected to show upp immediately, but eventually they should get to be ok
+    // this is because we dont know when the container gets around to doing layout
+    //GtkAllocation galloc;
+    //gtk_widget_get_allocation(GTK_WIDGET (xv->widgetwindow), &galloc);
+    //printf("allocation %d %d , %d %d\n", galloc.x,galloc.y,galloc.width,galloc.height);
+
+
+*** old notes about the old live/phantom scheme
+
+   //TODO:
+   // 1) always draw live xwidget in slected window
+   // (2) if there were no live instances of the xwidget in selected window, also draw it live)
+   // 3) if there was a live xwidget previously, now phantom it.
+
+   else
+     {
+       //ok, we are painting the xwidgets in non-selected window, so draw a phantom
+       //printf("draw phantom xwidget at:%d %d\n",x,y);
+       //xwidget_composite_draw_phantom (xw, x, y, clipx, clipy); //TODO MVC there will be very few cases of phantoming
+     }
+
+
+   atm this works as follows: only check if xwidgets are displayed in the
+   "selected window". if not, hide them or phantom them.
+
+   this means valid cases like xwidgets being displayed only once in
+   non-selected windows, does not work well. they should also be visible
+   in that case not phantomed.
+
 * ToDo:s
-** new annoying trace
+** DONE new annoying trace
+   CLOSED: [2011-08-13 Sat 16:16]
 maybe related to scroll inhibiting or cursor inhibiting code.
+It appears actually to be related to GLYPH_DEBUG=1. this flag is no
+longer needed.
 *** the trace
 Breakpoint 1, abort () at emacs.c:383
 383       kill (getpid (), SIGABRT);
@@ -725,7 +771,8 @@ rather than gwfixed.
 
 *** DONE support configure
     CLOSED: [2011-07-12 Tue 18:48]
-*** TODO ifdef all xwidget code
+*** DONE ifdef all xwidget code
+    CLOSED: [2011-08-13 Sat 16:19]
 so you can reliably disable the code at compiletime
 ** DONE translate clicks 
    CLOSED: [2011-07-03 Sun 22:12]
@@ -1021,10 +1068,19 @@ and then compare by resizing in Epiphany, which is also webkit based.
     CLOSED: [2011-08-01 Mon 22:38]
 was rather hurried. end result is that the lisp layer only really
 allows for one webkit session.
-*** TODO extract DOM so SHR can render it
+*** TODO extract DOM to lisp
 then the SHR html renderer from Gnus could render the DOM as created
-by Webkit.
-*** TODO C-X b in other buffer from webkit
+by Webkit. 
+
+made a simple oxperimental DOM tree traverser. It can be expanded to
+return a lisp representation, LDOM.
+
+in order to bring lisp and DOM closer together the LDOM can include a
+mapping to the originating DOM node. so, find a node in LDOM, and the
+cell maps to the original DOM. but since the LDOM is a copy it can get
+out of sync. DOM events might help.
+*** DONE C-X b in other buffer from webkit
+    CLOSED: [2011-08-12 Fri 22:20]
 bafflingly resets the webkit view to the top. Maybe the window
 reconfiguration hook code? further mystification is added because it
 only seems to happen with ido mode enabled.
@@ -1033,6 +1089,7 @@ in comparison with image-mode which does the right thing, I discovered
 that image-mode has special code to handle scrolling. the browser mode
 and image mode has some similarities.
 
+I made some delegation code frrom webkit mode to image mode.
 ** TODO xwidget image display  spec compatibility
 some history: the first version of the xwidget display spec was
 the same as an image spec. This turned out not to be fantastic because
@@ -1147,46 +1204,6 @@ defined controls.
 Added: [2011-08-11 Thu 10:53]
 
 
-* old 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.
-    When this happens the xwidget doesnt move on screen as it should.
-    This mightbe because of x_scroll_run. Emacs decides to scroll the screen by blitting sometimes.
-    then emacs doesnt try to actualy call the paint routines, which means this here code will never
-    run so the xwidget wont know it has been moved.
-
-    Solved temporarily by never optimizing in try_window_reusing_current_matrix().
-
-    BUG the phantoming code doesnt work very well when the live xwidget is off screen.
-    you will get weirdo display artefacts. Composition ought to solve this, since that means the live window is
-    always available in an off-screen buffer. My current attempt at composition doesnt work properly however.
-
-    //allocation debugging. the correct values cant be expected to show upp immediately, but eventually they should get to be ok
-    // this is because we dont know when the container gets around to doing layout
-    //GtkAllocation galloc;
-    //gtk_widget_get_allocation(GTK_WIDGET (xv->widgetwindow), &galloc);
-    //printf("allocation %d %d , %d %d\n", galloc.x,galloc.y,galloc.width,galloc.height);
-
-
-*** old notes about the old live/phantom scheme
-
-   //TODO:
-   // 1) always draw live xwidget in slected window
-   // (2) if there were no live instances of the xwidget in selected window, also draw it live)
-   // 3) if there was a live xwidget previously, now phantom it.
-
-   else
-     {
-       //ok, we are painting the xwidgets in non-selected window, so draw a phantom
-       //printf("draw phantom xwidget at:%d %d\n",x,y);
-       //xwidget_composite_draw_phantom (xw, x, y, clipx, clipy); //TODO MVC there will be very few cases of phantoming
-     }
-
-
-   atm this works as follows: only check if xwidgets are displayed in the
-   "selected window". if not, hide them or phantom them.
-
-   this means valid cases like xwidgets being displayed only once in
-   non-selected windows, does not work well. they should also be visible
-   in that case not phantomed.
+** TODO SEB
+the SEB site does something funny so I can't insert text in fields
 
diff --git a/src/ChangeLog b/src/ChangeLog
index af9586037d7..5c65159a841 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2011-08-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (iterate_out_of_display_property): xassert that
+        IT->position is set to within IT->object's boundaries.  Break from
+        the loop as soon as EOB is reached; avoids infloops in redisplay
+        when IT->position is set up wrongly due to some bug.  Set
+        IT->current to match the bidi iterator unconditionally.
+        (push_display_prop): Allow GET_FROM_STRING as IT->method on
+        entry.  Force push_it to save on the stack the current
+        buffer/string position, to be restored by pop_it.  Fix flags in
+        the iterator structure wrt the object coming from a display
+        property, as `line-prefix' and `wrap-prefix' are not ``replacing''
+        properties.  (Bug#9284)
+
 2011-08-09  Andreas Schwab  <schwab@linux-m68k.org>
 
         * fontset.c (fontset_get_font_group): Add proper type checks.
diff --git a/src/xdisp.c b/src/xdisp.c
index b58c8da8203..ea5d1ae34c8 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5356,6 +5356,8 @@ iterate_out_of_display_property (struct it *it)
   EMACS_INT eob = (buffer_p ? ZV : it->end_charpos);
   EMACS_INT bob = (buffer_p ? BEGV : 0);
 
+  xassert (eob >= CHARPOS (it->position) && CHARPOS (it->position) >= bob);
+
   /* Maybe initialize paragraph direction.  If we are at the beginning
      of a new paragraph, next_element_from_buffer may not have a
      chance to do that.  */
@@ -5364,7 +5366,8 @@ iterate_out_of_display_property (struct it *it)
   /* prev_stop can be zero, so check against BEGV as well.  */
   while (it->bidi_it.charpos >= bob
          && it->prev_stop <= it->bidi_it.charpos
-         && it->bidi_it.charpos < CHARPOS (it->position))
+         && it->bidi_it.charpos < CHARPOS (it->position)
+         && it->bidi_it.charpos < eob)
     bidi_move_to_visually_next (&it->bidi_it);
   /* Record the stop_pos we just crossed, for when we cross it
      back, maybe.  */
@@ -5373,14 +5376,11 @@ iterate_out_of_display_property (struct it *it)
   /* If we ended up not where pop_it put us, resync IT's
      positional members with the bidi iterator. */
   if (it->bidi_it.charpos != CHARPOS (it->position))
-    {
-      SET_TEXT_POS (it->position,
-                    it->bidi_it.charpos, it->bidi_it.bytepos);
-      if (buffer_p)
-        it->current.pos = it->position;
-      else
-        it->current.string_pos = it->position;
-    }
+    SET_TEXT_POS (it->position, it->bidi_it.charpos, it->bidi_it.bytepos);
+  if (buffer_p)
+    it->current.pos = it->position;
+  else
+    it->current.string_pos = it->position;
 }
 
 /* Restore IT's settings from IT->stack.  Called, for example, when no
@@ -18161,16 +18161,25 @@ cursor_row_p (struct glyph_row *row)
 
 
 
-/* Push the display property PROP so that it will be rendered at the
-   current position in IT.  Return 1 if PROP was successfully pushed,
-   0 otherwise.  */
+/* Push the property PROP so that it will be rendered at the current
+   position in IT.  Return 1 if PROP was successfully pushed, 0
+   otherwise.  Called from handle_line_prefix to handle the
+   `line-prefix' and `wrap-prefix' properties.  */
 
 static int
 push_display_prop (struct it *it, Lisp_Object prop)
 {
-  xassert (it->method == GET_FROM_BUFFER);
+  struct text_pos pos =
+    (it->method == GET_FROM_STRING) ? it->current.string_pos : it->current.pos;
 
-  push_it (it, NULL);
+  xassert (it->method == GET_FROM_BUFFER
+           || it->method == GET_FROM_STRING);
+
+  /* We need to save the current buffer/string position, so it will be
+     restored by pop_it, because iterate_out_of_display_property
+     depends on that being set correctly, but some situations leave
+     it->position not yet set when this function is called.  */
+  push_it (it, &pos);
 
   if (STRINGP (prop))
     {
@@ -18189,11 +18198,9 @@ push_display_prop (struct it *it, Lisp_Object prop)
       it->stop_charpos = 0;
       it->prev_stop = 0;
       it->base_level_stop = 0;
-      it->string_from_display_prop_p = 1;
-      it->from_disp_prop_p = 1;
 
       /* Force paragraph direction to be that of the parent
-         buffer.  */
+         buffer/string.  */
       if (it->bidi_p && it->bidi_it.paragraph_dir == R2L)
         it->paragraph_embedding = it->bidi_it.paragraph_dir;
       else
@@ -18206,7 +18213,7 @@ push_display_prop (struct it *it, Lisp_Object prop)
           it->bidi_it.string.s = NULL;
           it->bidi_it.string.schars = it->end_charpos;
           it->bidi_it.string.bufpos = IT_CHARPOS (*it);
-          it->bidi_it.string.from_disp_str = 1;
+          it->bidi_it.string.from_disp_str = it->string_from_display_prop_p;
           it->bidi_it.string.unibyte = !it->multibyte_p;
           bidi_init_it (0, 0, FRAME_WINDOW_P (it->f), &it->bidi_it);
         }