summaryrefslogtreecommitdiff
path: root/src/xdisp.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge from emacs--rel--22Miles Bader2008-04-241-2/+8
|\ | | | | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1126
| * (x_y_to_hpos_vpos, fast_find_position) [HAVE_CARBON]:YAMAMOTO Mitsuharu2008-04-231-2/+8
| | | | | | | | Make functions non-static.
| * (next_overlay_string): Don't set overlay_strings_at_end_processed_p ifChong Yidong2008-03-311-1/+1
| | | | | | | | we're currently reading from a display string.
| * (update_tool_bar, redisplay_tool_bar, redisplay_window)YAMAMOTO Mitsuharu2008-03-291-3/+3
| | | | | | | | [USE_MAC_TOOLBAR]: Sync with GTK+ tool bar display.
* | (pos_visible_p): Check if iterator stops on a display string.Chong Yidong2008-04-201-16/+19
| |
* | Revert changes included by mistake in previous commit.Glenn Morris2008-04-101-2/+2
| |
* | (truncate-partial-width-windows): Doc fix.Glenn Morris2008-04-101-3/+4
| |
* | (redisplay_internal) [!WINDOWSNT]: Conditionalize last change.Jason Rumney2008-04-091-0/+2
| |
* | * xdisp.c (redisplay_internal): Reset tty's color_mode when switchingStefan Monnier2008-04-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | to another frame. * frame.c (do_switch_frame): Refine the top_frame/async_visible code. Don't call set_tty_color_mode. (store_frame_param): Reset previous_frame rather than call set_tty_color_mode. * term.c (set_tty_color_mode): Rewrite. * dispextern.h (set_tty_color_mode): New type. * termchar.h (struct tty_display_info): Add `previous_color_mode'.
* | (try_window_id): Don't forget to reset delta_bytes.Stefan Monnier2008-04-011-1/+2
| |
* | * keyboard.c (pending_funcalls): New var.Stefan Monnier2008-03-291-28/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (timer_check): Run it. (syms_of_keyboard): Initialize it. * terminal.c (Qrun_hook_with_args, Qdelete_terminal_functions) (Vdelete_terminal_functions): New vars. (syms_of_terminal): Initialize them. (Fdelete_terminal): Run delete-terminal-functions. * xdisp.c (safe_eval): Rewrite. (safe_call2): New fun. * frame.c (Qdelete_frame_functions): New var. (syms_of_frame): Initialize it. (Fdelete_frame): Use it and use safe_call2 and pending_funcalls. * lisp.h (safe_call2, pending_funcalls): Declare.
* | (redisplay_internal): Reset selected_frame earlier.Stefan Monnier2008-03-261-0/+8
| |
* | (format_mode_line_unwind_data): Add window argument.Stefan Monnier2008-03-191-6/+16
| | | | | | | | | | (unwind_format_mode_line): Restore selected window. (x_consider_frame_title, Fformat_mode_line): Set selected window.
* | Merge from emacs--rel--22Miles Bader2008-03-101-6/+3
|\ \ | |/ | | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1095
| * (handle_single_display_spec): Undo 2007-10-16 changes.YAMAMOTO Mitsuharu2008-03-031-6/+3
| | | | | | | | | | Don't pretend as if characters with display property haven't been consumed for string-replacing-string case.
| * (get_overlay_strings_1): Add missing argument type.Chong Yidong2008-02-291-0/+1
| |
| * *** empty log message ***Juanma Barranquero2008-02-171-1/+1
| |
* | (GET_NEXT_DISPLAY_ELEMENT): New macro.Kim F. Storm2008-03-081-5/+6
| | | | | | | | | | (get_next_display_element, next_element_from_string) (next_element_from_ellipsis, next_element_from_buffer): Use it.
* | (next_overlay_string): Don't set overlay_strings_at_end_processed_p ifChong Yidong2008-02-291-1/+1
| | | | | | | | we're currently reading from a display string.
* | (get_overlay_strings_1): Fix typo.Stefan Monnier2008-02-291-1/+1
| |
* | (get_overlay_strings_1): Add missing argument type.Chong Yidong2008-02-291-0/+1
| |
* | (handle_auto_composed_prop): Don't make composition if it->stringKenichi Handa2008-02-281-1/+1
| | | | | | | | is a string.
* | (display_mode_element): Cancel the previous change.Kenichi Handa2008-02-281-18/+9
| | | | | | | | (decode_mode_spec): Likewise.
* | (get_next_display_element, next_element_from_display_vector):Kim F. Storm2008-02-271-29/+30
| | | | | | | | Adapt to new glyph type and new glyph code encoding.
* | * dispextern.h (face_at_buffer_position, face_for_overlay_string)Stefan Monnier2008-02-261-15/+17
| | | | | | | | | | | | | | | | | | | | (face_at_string_position): * xfaces.c (face_at_buffer_position, face_for_overlay_string) (face_at_string_position): * xdisp.c (display_string, next_overlay_change): * buffer.h (overlays_at): * buffer.c (overlays_at): Use EMACS_INT for buffer positions. Update callers.
* | (x_produce_glyphs): For a visible glyph, assure at leastKenichi Handa2008-02-251-0/+8
| | | | | | | | 1-pixel width.
* | (struct glyph_string): New member padding_p.Kenichi Handa2008-02-251-4/+15
| |
* | Allow fine-grained image-cache flushing.Stefan Monnier2008-02-241-29/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dispextern.h (struct image): Add `dependencies' field. (clear_image_caches): Change arg to Lisp_Object. * image.c (make_image): Initialize `dependencies' field. (clear_image_cache): Change arg to allow fine-grained flushing. Perform the flush even if image-cache-eviction-delay is nil. (clear_image_caches): Change arg to Lisp_Object. (Fclear_image_cache): Expand meaning of the argument. (mark_image): Mark `dependencies' field. * xfaces.c (clear_face_cache): Adapt arg to call to clear_image_caches. (lface_hash): Use XHASH rather than XFASTINT. (face_at_buffer_position): Fix int -> EMACS_INT position. * xdisp.c (next_overlay_change): Fix int -> EMACS_INT position. (select_frame_for_redisplay): Remove code duplication. (redisplay_internal): Adapt arg to call to clear_image_caches.
* | Consolidate the image_cache to the terminal struct.Stefan Monnier2008-02-221-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * termhooks.h (P_): Remove redundant def. (struct terminal): New field `image_cache'. * frame.h (FRAME_IMAGE_CACHE): New macro. Use it everywhere in place of FRAME_X_IMAGE_CACHE. * xterm.h (struct x_display_info): Remove image_cache field. (FRAME_X_IMAGE_CACHE): Remove. Use FRAME_IMAGE_CACHE instead. * w32term.h (struct w32_display_info): Remove image_cache field. (FRAME_X_IMAGE_CACHE): Remove. Use FRAME_IMAGE_CACHE instead. * macterm.h (struct mac_display_info): Remove image_cache field. (FRAME_X_IMAGE_CACHE): Remove. Use FRAME_IMAGE_CACHE instead. * xterm.c (x_term_init): * w32term.c (w32_term_init): * macterm.c (mac_term_init): Set the image_cache in the terminal. * dispextern.h (clear_image_cache, forall_images_in_image_cache): Remove declarations. (clear_image_caches, mark_image_cache): New declarations. * xfaces.c (clear_face_cache): * xdisp.c (redisplay_internal): Use clear_image_caches. * image.c (clear_image_cache): Don't check that a frame is on a window-system before checking if it shares the same cache. (clear_image_caches): New function. (Fclear_image_cache): Use it. (mark_image): Move from allo.c. (mark_image_cache): Move from alloc.c and forall_images_in_image_cache. * alloc.c (mark_image, mark_image_cache): Move to image.c. (mark_object): Don't call mark_image_cache for frames. (mark_terminals): Call mark_image_cache.
* | (display_mode_element): Fix previous change.Kenichi Handa2008-02-211-1/+1
| |
* | (decode_mode_spec): New arg string.Kenichi Handa2008-02-211-9/+17
| | | | | | | | (display_mode_element): Adjusted for the above change.
* | *** empty log message ***Juanma Barranquero2008-02-171-9/+9
| |
* | (handle_composition_prop): Set it->c to the fistKenichi Handa2008-02-171-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | characte of the composed region. (fill_composite_glyph_string): Set base_face->font_info to s->font_info. Get a face for ascii from base_face->ascii_face. (BUILD_COMPOSITE_GLYPH_STRING): Call fill_composite_glyph_string with a face already decided. (x_produce_glyphs): Be sure to set it->ascent and it->descent to non-negative. (x_produce_glyphs): If the composition method is ..._WITH_GLYPH_STRING, call font_prepare_composition unconditionally.
* | * xselect.c (x_handle_dnd_message):Stefan Monnier2008-02-071-20/+21
| | | | | | | | | | | | | | | | | | | | | | * xmenu.c (digest_single_submenu, xmenu_show): * xdisp.c (with_echo_area_buffer_unwind_data, format_mode_line_unwind_data) (unwind_format_mode_line, display_menu_bar): * eval.c (Ffetch_bytecode): * doc.c (store_function_docstring): * ccl.c (resolve_symbol_ccl_program, ccl_get_compiled_code) (Fccl_execute, Fccl_execute_on_string, Fregister_code_conversion_map): * buffer.c (add_overlay_mod_hooklist): Use ASET.
* | (x_produce_glyphs): Don't set it->ascent and it->descentKenichi Handa2008-02-061-1/+4
| | | | | | | | to negative value.
* | Merge from emacs--devo--0Miles Bader2008-01-301-24/+61
|\ \ | | | | | | | | | Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-324
| * | (pos_visible_p): Handle the case where charpos falls onChong Yidong2008-01-261-0/+22
| | | | | | | | | | | | invisible text covered with an ellipsis.
| * | (redisplay_window): Run Qwindow_text_change_functions andRichard M. Stallman2008-01-251-6/+27
| | | | | | | | | | | | | | | | | | jump back to beginning. Move some other initializations after that. (Qwindow_text_change_functions, (Vwindow_text_change_functions): New variables. (syms_of_xdisp): Init them.
| * | (Qauto_hscroll_mode): New var.Stefan Monnier2008-01-191-15/+12
| | | | | | | | | | | | | | | | | | | | | (syms_of_xdisp): Initialize it. (hscroll_window_tree): Use it to lookup `auto-hscroll-mode' in each window's buffer. (hscroll_windows): Don't check automatic_hscrolling_p here.
| * | * movemail.c:Dan Nicolaescu2008-01-131-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * make-docfile.c: Remove reference to symbols defined by systems not supported anymore: MAC_OS8, XENIX and STRIDE. * (src/m/mips.h): * (src/m/intel386.h): * callproc.c: * config.in: * ecrt0.c: * emacs.c: * fileio.c: * frame.c: * getpagesize.h: * keyboard.c: * lread.c: * process.c: * puresize.h: * sysdep.c: * systty.h: * syswait.h: * unexec.c: * xdisp.c: * alloc.c: Remove code containing references to symbols defined by unsupported systems.
* | | Merge from emacs--devo--0Miles Bader2008-01-091-1/+1
|\ \ \ | |/ / | | | | | | Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-312
| * | Merge from emacs--rel--22Miles Bader2008-01-081-1/+1
| |\ \ | | |/ | | | | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
| | * Add 2008 to copyright years.Glenn Morris2008-01-081-1/+1
| | |
* | | Merge from emacs--devo--0Miles Bader2007-12-291-0/+18
|\ \ \ | |/ / | | | | | | Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-306
| * | Merge from emacs--rel--22Miles Bader2007-12-281-0/+18
| |\ \ | | |/ | | | | | | Revision: emacs@sv.gnu.org/emacs--devo--0--patch-966
| | * (phys_cursor_in_rect_p): Check if cursor is in fringe area.YAMAMOTO Mitsuharu2007-12-241-0/+18
| | |
* | | (handle_auto_composed_prop): Change the argument toKenichi Handa2007-12-251-14/+20
| | | | | | | | | | | | auto-composition-function.
* | | (handle_auto_composed_prop): Don't get a character atKenichi Handa2007-12-141-36/+10
| | | | | | | | | | | | | | | the position here, and call font_at with the arg C -1. Don't check the range of the existing composition at the point.
* | | (handle_auto_composed_prop): Use Fget_text_propertyKenichi Handa2007-12-131-8/+12
| | | | | | | | | | | | instead of get_property_and_range.
* | | Merge from emacs--devo--0Miles Bader2007-12-061-2/+6
|\ \ \ | |/ / | | | | | | Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294