Mercurial > hg > xemacs-beta

comparison src/redisplay.c @ 5198:bc3ede8f29a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix spacing in some files -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-04-09 Ben Wing <ben@xemacs.org> * fileio.c (check_writable): * fileio.c (Fdo_auto_save): * redisplay-xlike-inc.c (separate_textual_runs_nomule): * redisplay-xlike-inc.c (separate_textual_runs_xft_nomule): * redisplay-xlike-inc.c (separate_textual_runs_xft_mule): * redisplay-xlike-inc.c (separate_textual_runs_mule): * redisplay-xlike-inc.c (XLIKE_output_string): * redisplay-xlike-inc.c (XLIKE_output_vertical_divider): * redisplay.c (create_text_block): * redisplay.c (regenerate_window): * redisplay.c (redisplay_window): * redisplay.c (redisplay_device): * redisplay.c (window_line_number): * redisplay.c (point_would_be_visible): * redisplay.c (compute_display_line_dynarr_usage): * specifier.c (prune_specifiers): * specifier.c (finalize_specifier): * specifier.c (make_magic_specifier): * specifier.c (charset_matches_specifier_tag_set_p): * specifier.c (Fdefine_specifier_tag): * specifier.c (setup_device_initial_specifier_tags): * specifier.c (bodily_specifier): * specifier.c (add_spec_to_ghost_specifier): * specifier.c (remove_ghost_specifier): * specifier.c (set_specifier_fallback): * specifier.c (specifier_instance_from_inst_list): * specifier.c (set_specifier_caching): Fix coding style to correspond to GNU standard.
author Ben Wing <ben@xemacs.org>
date Fri, 09 Apr 2010 23:38:02 -0500
parents 97eb4942aec8
children 39304a35b6b3 308d34e9f07d
comparison
equal deleted inserted replaced
5197:ce8ffb95bbe3 5198:bc3ede8f29a8
2221 data.cursor_type = CURSOR_ON; 2221 data.cursor_type = CURSOR_ON;
2222 } 2222 }
2223 else if (MINI_WINDOW_P (w) && !active_minibuffer) 2223 else if (MINI_WINDOW_P (w) && !active_minibuffer)
2224 data.cursor_type = NO_CURSOR; 2224 data.cursor_type = NO_CURSOR;
2225 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)) && 2225 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)) &&
2226 EQ(DEVICE_CONSOLE(d), Vselected_console) && 2226 EQ (DEVICE_CONSOLE (d), Vselected_console) &&
2227 d == XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d))))&& 2227 d == XDEVICE (CONSOLE_SELECTED_DEVICE (XCONSOLE (DEVICE_CONSOLE (d))))&&
2228 f == XFRAME(DEVICE_SELECTED_FRAME(d))) 2228 f == XFRAME (DEVICE_SELECTED_FRAME (d)))
2229 { 2229 {
2230 data.byte_cursor_charpos = BYTE_BUF_PT (b); 2230 data.byte_cursor_charpos = BYTE_BUF_PT (b);
2231 data.cursor_type = CURSOR_ON; 2231 data.cursor_type = CURSOR_ON;
2232 } 2232 }
2233 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f))) 2233 else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)))
5517 { 5517 {
5518 struct prop_block pb; 5518 struct prop_block pb;
5519 Lisp_Object string; 5519 Lisp_Object string;
5520 prop = Dynarr_new (prop_block); 5520 prop = Dynarr_new (prop_block);
5521 5521
5522 string = concat2(Vminibuf_preprompt, Vminibuf_prompt); 5522 string = concat2 (Vminibuf_preprompt, Vminibuf_prompt);
5523 pb.type = PROP_MINIBUF_PROMPT; 5523 pb.type = PROP_MINIBUF_PROMPT;
5524 pb.data.p_string.str = XSTRING_DATA(string); 5524 pb.data.p_string.str = XSTRING_DATA (string);
5525 pb.data.p_string.len = XSTRING_LENGTH(string); 5525 pb.data.p_string.len = XSTRING_LENGTH (string);
5526 Dynarr_add (prop, pb); 5526 Dynarr_add (prop, pb);
5527 } 5527 }
5528 else 5528 else
5529 prop = 0; 5529 prop = 0;
5530 5530
6259 6259
6260 /* Is this window the selected window on its frame? */ 6260 /* Is this window the selected window on its frame? */
6261 selected_in_its_frame = (w == XWINDOW (FRAME_SELECTED_WINDOW (f))); 6261 selected_in_its_frame = (w == XWINDOW (FRAME_SELECTED_WINDOW (f)));
6262 selected_globally = 6262 selected_globally =
6263 selected_in_its_frame && 6263 selected_in_its_frame &&
6264 EQ(DEVICE_CONSOLE(d), Vselected_console) && 6264 EQ (DEVICE_CONSOLE (d), Vselected_console) &&
6265 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d && 6265 XDEVICE (CONSOLE_SELECTED_DEVICE (XCONSOLE (DEVICE_CONSOLE (d)))) == d &&
6266 XFRAME(DEVICE_SELECTED_FRAME(d)) == f; 6266 XFRAME (DEVICE_SELECTED_FRAME (d)) == f;
6267 if (skip_selected && selected_in_its_frame) 6267 if (skip_selected && selected_in_its_frame)
6268 return; 6268 return;
6269 6269
6270 /* It is possible that the window is not fully initialized yet. */ 6270 /* It is possible that the window is not fully initialized yet. */
6271 if (NILP (w->buffer)) 6271 if (NILP (w->buffer))
7067 if (f->icon_changed || f->windows_changed) 7067 if (f->icon_changed || f->windows_changed)
7068 update_frame_icon (f); 7068 update_frame_icon (f);
7069 7069
7070 if (FRAME_REPAINT_P (f)) 7070 if (FRAME_REPAINT_P (f))
7071 { 7071 {
7072 if (CLASS_REDISPLAY_FLAGS_CHANGEDP(f)) 7072 if (CLASS_REDISPLAY_FLAGS_CHANGEDP (f))
7073 { 7073 {
7074 int preempted = redisplay_frame (f, 1); 7074 int preempted = redisplay_frame (f, 1);
7075 if (preempted) 7075 if (preempted)
7076 return 1; 7076 return 1;
7077 } 7077 }
7241 struct buffer *b = XBUFFER (w->buffer); 7241 struct buffer *b = XBUFFER (w->buffer);
7242 /* Be careful in the order of these tests. The first clause will 7242 /* Be careful in the order of these tests. The first clause will
7243 fail if DEVICE_SELECTED_FRAME == Qnil (since w->frame cannot be). 7243 fail if DEVICE_SELECTED_FRAME == Qnil (since w->frame cannot be).
7244 This can occur when the frame title is computed really early */ 7244 This can occur when the frame title is computed really early */
7245 Charbpos pos = 7245 Charbpos pos =
7246 ((EQ(DEVICE_SELECTED_FRAME(d), w->frame) && 7246 ((EQ (DEVICE_SELECTED_FRAME (d), w->frame) &&
7247 (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame(d)))) && 7247 (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame (d)))) &&
7248 EQ(DEVICE_CONSOLE(d), Vselected_console) && 7248 EQ (DEVICE_CONSOLE (d), Vselected_console) &&
7249 XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d ) 7249 XDEVICE (CONSOLE_SELECTED_DEVICE (XCONSOLE (DEVICE_CONSOLE (d)))) == d )
7250 ? BUF_PT (b) 7250 ? BUF_PT (b)
7251 : marker_position (w->pointm[type])); 7251 : marker_position (w->pointm[type]));
7252 EMACS_INT line; 7252 EMACS_INT line;
7253 7253
7254 line = buffer_line_number (b, pos, 1); 7254 line = buffer_line_number (b, pos, 1);
7986 int 7986 int
7987 point_would_be_visible (struct window *w, Charbpos startp, Charbpos point, 7987 point_would_be_visible (struct window *w, Charbpos startp, Charbpos point,
7988 int partially) 7988 int partially)
7989 { 7989 {
7990 struct buffer *b = XBUFFER (w->buffer); 7990 struct buffer *b = XBUFFER (w->buffer);
7991 int pixpos = -WINDOW_TEXT_TOP_CLIP(w); 7991 int pixpos = -WINDOW_TEXT_TOP_CLIP (w);
7992 int bottom = WINDOW_TEXT_HEIGHT (w); 7992 int bottom = WINDOW_TEXT_HEIGHT (w);
7993 int start_elt; 7993 int start_elt;
7994 7994
7995 /* If point is before the intended start it obviously can't be visible. */ 7995 /* If point is before the intended start it obviously can't be visible. */
7996 if (point < startp) 7996 if (point < startp)
9707 9707
9708 total = Dynarr_memory_usage (dyn, ustats); 9708 total = Dynarr_memory_usage (dyn, ustats);
9709 for (i = 0; i < Dynarr_largest (dyn); i++) 9709 for (i = 0; i < Dynarr_largest (dyn); i++)
9710 { 9710 {
9711 struct display_line *dl = &Dynarr_at (dyn, i); 9711 struct display_line *dl = &Dynarr_at (dyn, i);
9712 total += compute_display_block_dynarr_usage(dl->display_blocks, ustats); 9712 total += compute_display_block_dynarr_usage (dl->display_blocks, ustats);
9713 total += compute_glyph_block_dynarr_usage (dl->left_glyphs, ustats); 9713 total += compute_glyph_block_dynarr_usage (dl->left_glyphs, ustats);
9714 total += compute_glyph_block_dynarr_usage (dl->right_glyphs, ustats); 9714 total += compute_glyph_block_dynarr_usage (dl->right_glyphs, ustats);
9715 } 9715 }
9716 9716
9717 return total; 9717 return total;