1. 14 Jul, 2011 1 commit
    • Eli Zaretskii's avatar
      Fix declarations of variables related to bidi cache indices. · c965adc5
      Eli Zaretskii authored
       src/bidi.c (bidi_cache_fetch_state, bidi_cache_search)
       (bidi_cache_find_level_change, bidi_cache_ensure_space)
       (bidi_cache_iterator_state, bidi_cache_find)
       (bidi_find_other_level_edge, bidi_cache_start_stack): All
       variables related to cache indices are now EMACS_INT.
      c965adc5
  2. 09 Jul, 2011 4 commits
  3. 07 Jul, 2011 1 commit
  4. 05 Jul, 2011 1 commit
    • Eli Zaretskii's avatar
      Empty the bidi cache "stack" when it->sp is zeroed. · 57b3e30b
      Eli Zaretskii authored
      Solves crashes due to overflow of bidi cache stack.
      Make sure cache is saved and restored around all temporary iterations.
      
       src/dispnew.c (buffer_posn_from_coords): Save and restore the bidi
       cache around display iteration.
       src/window.c (Fwindow_end, window_scroll_pixel_based)
       (displayed_window_lines, Frecenter): Save and restore the bidi
       cache around display iteration.
       src/bidi.c (bidi_unshelve_cache): Ensure we have enough space before
       restoring the shelved cache.
       (bidi_cache_ensure_space): Don't assume the required size is just
       one BIDI_CACHE_CHUNK away.
       src/xdisp.c (back_to_previous_visible_line_start, reseat_1)
       (init_iterator): Empty the bidi cache "stack".
      57b3e30b
  5. 03 Jul, 2011 1 commit
    • Eli Zaretskii's avatar
      Save and restore bidi cache when saving and restoring the iterator. · ed94e6d7
      Eli Zaretskii authored
      Not tested, just compiled.
      
       src/bidi.c (bidi_shelve_cache, bidi_unshelve_cache): New functions.
       src/dispextern.h (bidi_shelve_cache, bidi_unshelve_cache): Declare
       prototypes.
       src/xdisp.c (SAVE_IT, RESTORE_IT): New macros.
       (pos_visible_p, face_before_or_after_it_pos)
       (back_to_previous_visible_line_start)
       (move_it_in_display_line_to, move_it_in_display_line)
       (move_it_to, move_it_vertically_backward, move_it_by_lines)
       (try_scrolling, redisplay_window, display_line): Use them when
       saving a temporary copy of the iterator and restoring it back.
      ed94e6d7
  6. 02 Jul, 2011 2 commits
    • Eli Zaretskii's avatar
      Start fixing cursor motion around invisible text. · 6eec7596
      Eli Zaretskii authored
      Hit a MAJOR design problem in pushing and popping bidi iterator state.
      
       src/xdisp.c (reseat_1): Call bidi_init_it to resync the bidi
       iterator with IT's position.
       (handle_stop, back_to_previous_visible_line_start, reseat_1):
       Reset the from_disp_prop_p flag.
       src/bidi.c (bidi_cache_search): Don't assume bidi_cache_last_idx is
       always valid if bidi_cache_idx is valid.
       (bidi_cache_find_level_change): xassert that bidi_cache_last_idx
       is valid if it's going to be used.
      6eec7596
    • Eli Zaretskii's avatar
      Fix the use case of popping from display property. · a2eaa31d
      Eli Zaretskii authored
       src/dispextern.h (struct iterator_stack_entry, struct it): New
       member from_disp_prop_p.
       src/xdisp.c (push_it, pop_it): Save and restore from_disp_prop_p.
       (handle_single_display_spec, push_display_prop): Set the
       from_disp_prop_p flag.
       (get_overlay_strings_1): Reset the from_disp_prop_p flag.
       (pop_it): Call iterate_out_of_display_property only if we are
       popping after iteration over a string that came from a display
       property.  Fix a typo in popping stretch info.  Add an assertion
       for verifying that the iterator position is in sync with the bidi
       iterator.
       (handle_single_display_spec, get_overlay_strings_1)
       (push_display_prop): Fix initialization of paragraph direction for
       string when that of the parent object is not yet determined.
      a2eaa31d
  7. 01 Jul, 2011 2 commits
    • Eli Zaretskii's avatar
      Support bidi reordering of unibyte strings. Fix crash displaying "All" in... · f3014ef5
      Eli Zaretskii authored
      Support bidi reordering of unibyte strings.  Fix crash displaying "All" in mode line of an empty buffer.
      
       src/dispextern.h (struct bidi_string_data): New member `unibyte'.
       src/xdisp.c (handle_single_display_spec, next_overlay_string)
       (get_overlay_strings_1, reseat_1, reseat_to_string)
       (push_display_prop): Set up the `unibyte' member of bidi_it.string
       correctly.  Don't assume unibyte strings are not bidi-reordered.
       (compute_display_string_pos)
       (compute_display_string_end): Fix handling the case of C string.
       src/bidi.c (bidi_count_bytes, bidi_char_at_pos): Accept an
       additional argument UNIBYTE, and support unibyte strings.  All
       callers changed.
       (bidi_fetch_char): Support unibyte strings.
      f3014ef5
    • Eli Zaretskii's avatar
      Fix typos in comments. Use xassert. · 7e2ad32c
      Eli Zaretskii authored
      7e2ad32c
  8. 25 Jun, 2011 2 commits
    • Eli Zaretskii's avatar
      Initial version of display/overlay strings is working. · a1344e7d
      Eli Zaretskii authored
       src/xdisp.c (set_iterator_to_next, get_visually_first_element): Use
       it->bidi_it.string.schars rather than it->string_nchars when
       testing whether we're beyond string end, because string_nchars is
       zero for strings that come from overlays and display properties.
       src/bidi.c (bidi_cache_iterator_state): Fix a bug with testing
       character positions against the cached range, when we use a
       stacked cache.
       src/dispextern.h (struct iterator_stack_entry): New member
       paragraph_embedding.
       src/xdisp.c (push_it, pop_it): Save and restore it.
      a1344e7d
    • Eli Zaretskii's avatar
      Set up the bidi iterator for iterating display strings and overlay strings. · 0c22566f
      Eli Zaretskii authored
      Not tested yet, just compiled.
      
       src/xdisp.c (handle_single_display_spec, next_overlay_string)
       (get_overlay_strings_1, push_display_prop): Set up the bidi
       iterator for displaying display or overlay strings.
       (forward_to_next_line_start): Don't use the shortcut if
       bidi-iterating.
       (back_to_previous_visible_line_start): If handle_display_prop
       pushed the iterator stack, restore the internal state of the bidi
       iterator by calling bidi_pop_it same number of times.
       (reseat_at_next_visible_line_start): If ON_NEWLINE_P is non-zero,
       and we are bidi-iterating, don't decrement the iterator position;
       instead, set the first_elt flag in the bidi iterator, to produce
       the same effect.
       (reseat_1): Remove redundant setting of string_from_display_prop_p.
       (push_display_prop): xassert that we are iterating a buffer.
       (push_it, pop_it): Save and restore the state of the
       bidi iterator.  Save and restore the bidi_p flag.
       (pop_it): Iterate out of display property for string iteration as
       well.
       (iterate_out_of_display_property): Support iteration over strings.
       (handle_single_display_spec): Set up it->bidi_it for iteration
       over a display string, and call bidi_init_it.
       src/bidi.c (bidi_cache_start_stack, bidi_push_it): Use IT_STACK_SIZE.
       src/dispextern.h (struct iterator_stack_entry): New member bidi_p.
       (struct it): Member bidi_p is now a bit field 1 bit wide.
      0c22566f
  9. 23 Jun, 2011 2 commits
  10. 19 Jun, 2011 1 commit
    • Eli Zaretskii's avatar
      Fix display of R2L buffer names in Buffer-menu. · cce4b0a7
      Eli Zaretskii authored
       lisp/buff-menu.el (Buffer-menu-buffer+size): Accept an additional
       argument LRM; if non-nil, append an invisible LRM character to the
       buffer name.
       (list-buffers-noselect): Call Buffer-menu-buffer+size with the
       last argument non-nil, when formatting buffer names.
      cce4b0a7
  11. 18 Jun, 2011 6 commits
  12. 16 Jun, 2011 1 commit
    • Eli Zaretskii's avatar
      Fix display of R2L strings in mode line. · 578b494e
      Eli Zaretskii authored
      Composed characters still don't work.
      
       src/xdisp.c (init_iterator): Don't initialize it->bidi_p for strings
       here.
       (reseat_to_string): Initialize it->bidi_p for strings here.
       (next_element_from_string, next_element_from_c_string)
       (next_element_from_buffer): Add xassert's for correspondence
       between IT's object being iterated and it->bidi_it.string
       structure.
       src/bidi.c (bidi_level_of_next_char): Fix the logic for looking up
       the sentinel state in the cache.
      578b494e
  13. 13 Jun, 2011 1 commit
    • Eli Zaretskii's avatar
      Fix string handling to avoid data relocation gotcha. · 9f257352
      Eli Zaretskii authored
      Bugs in mode-line display still there.
      
       src/xdisp.c (compute_display_string_pos)
       (compute_display_string_end, reseat_to_string): Don't assume
       it->bidi_it.string.s always points to string.lstring's data.
       src/bidi.c (bidi_fetch_char, bidi_paragraph_init)
       (bidi_resolve_explicit_1, bidi_resolve_explicit)
       (bidi_resolve_weak, bidi_level_of_next_char): Don't assume
       string.s always points to string.lstring's data.
      9f257352
  14. 11 Jun, 2011 3 commits
    • Eli Zaretskii's avatar
      Fixed a bug with displaying strings padded with blanks. · f23590cc
      Eli Zaretskii authored
       src/xdisp.c (set_iterator_to_next): Advance string position
       correctly when padding it with blanks.
      f23590cc
    • Eli Zaretskii's avatar
      Initial version of string reordering. Tested only on mode line and · 34c48e57
      Eli Zaretskii authored
      TTY menu bar.  Display is buggy.
      
       src/xdisp.c (next_element_from_buffer): Improve commentary for when
       the iterator is before prev_stop.
       (init_iterator): Initialize bidi_p from the default value of
       bidi-display-reordering, not from buffer-local value.  Use the
       buffer-local value only if initializing for buffer iteration.
       (handle_invisible_prop): Support invisible properties on strings
       that are being bidi-reordered.
       (reseat_to_string): Enable bidi-related code.
       (set_iterator_to_next): Support bidi reordering of C strings and
       Lisp strings.
       (next_element_from_string): Support bidi reordering of Lisp strings.
       (handle_stop_backwards): Support Lisp strings as well.
       (display_mode_line, display_mode_element): Temporarily force L2R
       paragraph direction.
       (display_string): Support display of R2L glyph rows.  Use
       IT_STRING_CHARPOS when displaying from a Lisp string.
      34c48e57
    • Eli Zaretskii's avatar
      Only commentary changes, no functionality changed. · 4b988f8b
      Eli Zaretskii authored
       src/xdisp.c (next_element_from_buffer): Improve commentary for when
       the iterator is before prev_stop.
      4b988f8b
  15. 10 Jun, 2011 1 commit
    • Eli Zaretskii's avatar
      Tested and fixed compute_display_string_pos for buffer iteration. · 9f4ef500
      Eli Zaretskii authored
      Also fixed an unrelated bug caused by vertical-motion.
      
       src/xdisp.c (Fcurrent_bidi_paragraph_direction): Initialize
       itb.string.lstring.
       (compute_display_string_pos, compute_display_string_end):
       Fix calculation of the object to scan.  Fixes an error when using
       arrow keys.
       (next_element_from_buffer): Don't abort when IT_CHARPOS is before
       base_level_stop; instead, set base_level_stop to BEGV.  Fixes
       crashes in vertical-motion.
      9f4ef500
  16. 09 Jun, 2011 3 commits
    • Eli Zaretskii's avatar
      Adapt compute_display_string_pos to iteration over strings. · 6db161be
      Eli Zaretskii authored
      Just compiled, not yet tested.
      
       src/xdisp.c (compute_display_string_pos): First arg is now struct
       `text_pos *'; all callers changed.  Support display properties on
       Lisp strings.
       (compute_display_string_end): Support display properties on Lisp
       strings.
       (init_iterator, reseat_1, reseat_to_string): Initialize the
       string.bufpos member to 0 (zero, for compatibility with IT_CHARPOS
       when iterating on a string not from display properties).
       src/bidi.c (bidi_fetch_char): Support strings with display
       properties.
       src/dispextern.h (struct bidi_string_data): New member bufpos.
       (compute_display_string_pos): Update prototype.
      6db161be
    • Eli Zaretskii's avatar
      Add code to initialize bidi iterator for displaying strings. · bb269206
      Eli Zaretskii authored
      For now, ifdef'ed away.  Some more testing.
      
       src/bidi.c (bidi_level_of_next_char): Allow the sentinel "position"
       to pass the test for valid cached positions.
       src/xdisp.c (init_iterator): Call bidi_init_it only of a valid
       buffer position was specified.  Initialize paragraph_embedding to L2R.
       (reseat_to_string): Initialize the bidi iterator (for now ifdef'ed out).
       (display_string): If we need to ignore text properties of
       LISP_STRING, set IT->stop_charpos to IT->end_charpos.  (The
       original value of -1 will not work with bidi.)
       src/dispextern.h (struct bidi_string_data): New member lstring.
      bb269206
    • Eli Zaretskii's avatar
      Tested with buffer reordering, fixed one crash. · d9334cb7
      Eli Zaretskii authored
       src/xdisp.c (Fcurrent_bidi_paragraph_direction): Initialize
       itb.string.s to NULL (avoids a crash in bidi_paragraph_init).
      d9334cb7
  17. 08 Jun, 2011 1 commit
    • Eli Zaretskii's avatar
      Started work on string reordering. Just compiled, not yet tested. · 87e67904
      Eli Zaretskii authored
       src/bidi.c (bidi_paragraph_info): Delete unused struct.
       (bidi_cache_idx, bidi_cache_last_idx): Declare EMACS_INT.
       (bidi_cache_start): New variable.
       (bidi_cache_reset): Reset bidi_cache_idx to bidi_cache_start, not
       to zero.
       (bidi_cache_fetch_state, bidi_cache_search)
       (bidi_cache_find_level_change, bidi_cache_iterator_state)
       (bidi_cache_find, bidi_peek_at_next_level)
       (bidi_level_of_next_char, bidi_find_other_level_edge)
       (bidi_move_to_visually_next): Compare cache index with
       bidi_cache_start rather than with zero.
       (bidi_fetch_char): Accept new argument STRING; all callers
       changed.  Support iteration over a string.
       (bidi_paragraph_init, bidi_resolve_explicit_1)
       (bidi_resolve_explicit, bidi_resolve_weak)
       (bidi_level_of_next_char, bidi_move_to_visually_next): Support
       iteration over a string.
       (bidi_set_sor_type, bidi_resolve_explicit_1)
       (bidi_resolve_explicit, bidi_type_of_next_char): ignore_bn_limit
       can now be zero (for strings); special values 0 and -1 were
       changed to -1 and -2, respectively.
       (bidi_char_at_pos): New function.
       (bidi_paragraph_init, bidi_resolve_explicit, bidi_resolve_weak):
       Call it instead of FETCH_MULTIBYTE_CHAR.
       (bidi_move_to_visually_next): Abort if charpos or bytepos were not
       initialized to valid values.
       (bidi_init_it): Don't initialize charpos and bytepos with invalid
       values.
       src/xdisp.c (compute_display_string_pos)
       (compute_display_string_end): Accept additional argument STRING.
       (init_iterator, reseat_1): Initialize bidi_it->string.s to NULL.
       (reseat_to_string): Initialize bidi_it->string.s and
       bidi_it->string.schars.
       src/dispextern.h (struct bidi_string_data): New structure.
       (struct bidi_it): New member `string'.  Make flag members be 1-bit
       fields, and put them last in the struct.
       (compute_display_string_pos, compute_display_string_end): Update
       prototypes.
      87e67904
  18. 04 Jun, 2011 1 commit
  19. 03 Jun, 2011 1 commit
  20. 31 May, 2011 1 commit
  21. 28 May, 2011 3 commits
    • Eli Zaretskii's avatar
      Fix cursor motion across display strings covering reordered text. · 0e14fe90
      Eli Zaretskii authored
       src/xdisp.c (set_cursor_from_row): Set start and stop points
       according to the row's direction when priming the loop that looks
       for the glyph on which to display cursor.
       (single_display_spec_intangible_p): Function deleted.
       (display_prop_intangible_p): Reimplement to call
       handle_display_spec instead of single_display_spec_intangible_p.
       Accept 3 additional arguments needed by handle_display_spec.  This
       fixes incorrect cursor motion across display property with complex
       values: lists, `(when COND...)' forms, etc.
       (single_display_spec_string_p): Support property values that are
       lists with the argument STRING its top-level element.
       (display_prop_string_p): Fix the condition for processing a
       property that is a list to be consistent with handle_display_spec.
       src/keyboard.c (adjust_point_for_property): Adjust the call to
       display_prop_intangible_p to its new signature.
       src/dispextern.h (display_prop_intangible_p): Adjust prototype.
      0e14fe90
    • Eli Zaretskii's avatar
      Fix cursor motion near overlays covering reordered text. · c40e2fb2
      Eli Zaretskii authored
       src/xdisp.c (set_cursor_from_row): Set start and stop points of the
       loop that looks for the glyph on which to display cursor according
       to the row's direction.
      c40e2fb2
    • Eli Zaretskii's avatar
  22. 21 May, 2011 1 commit
    • Eli Zaretskii's avatar
      Discovery of replacing display properties now uses the same code · fc6f18ce
      Eli Zaretskii authored
      as the display engine.  Tested OK with display properties whose
      value is a list.
      
       src/dispextern.h (struct bidi_it): New member frame_window_p.
       (bidi_init_it, compute_display_string_pos): Update prototypes.
       src/bidi.c (bidi_fetch_char): Accept additional argument
       FRAME_WINDOW_P and pass it to compute_display_string_pos.  All
       callers changed.
       (bidi_init_it): Accept additional argument FRAME_WINDOW_P and use
       it to initialize the frame_window_p member of struct bidi_it.
       src/xdisp.c (handle_display_spec): New function, refactored from the
       last portion of handle_display_prop.
       (compute_display_string_pos): Accept additional argument
       FRAME_WINDOW_P.  Call handle_display_spec to determine whether the
       value of a `display' property is a "replacing spec".
       (handle_single_display_spec): Accept 2 additional arguments BUFPOS
       and FRAME_WINDOW_P.  If IT is NULL, don't set up the iterator from
       the display property, but just return a value indicating whether
       the display property will replace the characters it covers.
       (Fcurrent_bidi_paragraph_direction): Initialize the nchars and
       frame_window_p members of struct bidi_it.
      fc6f18ce