Mercurial > emacs
comparison src/xdisp.c @ 35267:5695de532559
(Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
and GLYPHS.
(Fdump_tool_bar_row) [GLYPH_DEBUG]: Add parameters ROW
and GLYPHS.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Fri, 12 Jan 2001 14:09:24 +0000 |
parents | 4e6bbe9c1780 |
children | a959d4b99e4d |
comparison
equal
deleted
inserted
replaced
35266:75be5e26b830 | 35267:5695de532559 |
---|---|
7161 /* The size of the string we might be able to reuse. */ | 7161 /* The size of the string we might be able to reuse. */ |
7162 size = (STRINGP (f->desired_tool_bar_string) | 7162 size = (STRINGP (f->desired_tool_bar_string) |
7163 ? XSTRING (f->desired_tool_bar_string)->size | 7163 ? XSTRING (f->desired_tool_bar_string)->size |
7164 : 0); | 7164 : 0); |
7165 | 7165 |
7166 /* We need one space in the string for each image. */ | |
7167 size_needed = f->n_tool_bar_items; | |
7168 | |
7166 /* Reuse f->desired_tool_bar_string, if possible. */ | 7169 /* Reuse f->desired_tool_bar_string, if possible. */ |
7167 size_needed = f->n_tool_bar_items; | |
7168 if (size < size_needed) | 7170 if (size < size_needed) |
7169 f->desired_tool_bar_string = Fmake_string (make_number (size_needed), | 7171 f->desired_tool_bar_string = Fmake_string (make_number (size_needed), |
7170 make_number (' ')); | 7172 make_number (' ')); |
7171 else | 7173 else |
7172 { | 7174 { |
11344 | 11346 |
11345 row = MATRIX_ROW (matrix, vpos); | 11347 row = MATRIX_ROW (matrix, vpos); |
11346 | 11348 |
11347 if (glyphs != 1) | 11349 if (glyphs != 1) |
11348 { | 11350 { |
11349 fprintf (stderr, "Row Start End Used oEI><O\\CTZFes X Y W H V A P\n"); | 11351 fprintf (stderr, "Row Start End Used oEI><O\\CTZFesm X Y W H V A P\n"); |
11350 fprintf (stderr, "=======================================================================\n"); | 11352 fprintf (stderr, "=======================================================================\n"); |
11351 | 11353 |
11352 fprintf (stderr, "%3d %5d %5d %4d %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d\ | 11354 fprintf (stderr, "%3d %5d %5d %4d %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d\ |
11353 %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d %4d %4d %4d %4d %4d %4d %4d\n", | 11355 %1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d%1.1d %4d %4d %4d %4d %4d %4d %4d\n", |
11354 row - matrix->rows, | 11356 row - matrix->rows, |
11355 MATRIX_ROW_START_CHARPOS (row), | 11357 MATRIX_ROW_START_CHARPOS (row), |
11356 MATRIX_ROW_END_CHARPOS (row), | 11358 MATRIX_ROW_END_CHARPOS (row), |
11357 row->used[TEXT_AREA], | 11359 row->used[TEXT_AREA], |
11358 row->contains_overlapping_glyphs_p, | 11360 row->contains_overlapping_glyphs_p, |
11366 row->displays_text_p, | 11368 row->displays_text_p, |
11367 row->ends_at_zv_p, | 11369 row->ends_at_zv_p, |
11368 row->fill_line_p, | 11370 row->fill_line_p, |
11369 row->ends_in_middle_of_char_p, | 11371 row->ends_in_middle_of_char_p, |
11370 row->starts_in_middle_of_char_p, | 11372 row->starts_in_middle_of_char_p, |
11373 row->mouse_face_p, | |
11371 row->x, | 11374 row->x, |
11372 row->y, | 11375 row->y, |
11373 row->pixel_width, | 11376 row->pixel_width, |
11374 row->height, | 11377 row->height, |
11375 row->visible_height, | 11378 row->visible_height, |
11527 INTEGERP (glyphs) ? XINT (glyphs) : 2); | 11530 INTEGERP (glyphs) ? XINT (glyphs) : 2); |
11528 return Qnil; | 11531 return Qnil; |
11529 } | 11532 } |
11530 | 11533 |
11531 | 11534 |
11532 DEFUN ("dump-tool-bar-row", Fdump_tool_bar_row, Sdump_tool_bar_row, | 11535 DEFUN ("dump-tool-bar-row", Fdump_tool_bar_row, Sdump_tool_bar_row, 1, 2, "", |
11533 0, 0, "", "") | 11536 "Dump glyph row ROW of the tool-bar of the current frame to stderr.\n\ |
11534 () | 11537 GLYPH 0 means don't dump glyphs.\n\ |
11538 GLYPH 1 means dump glyphs in short form.\n\ | |
11539 GLYPH > 1 or omitted means dump glyphs in long form.") | |
11540 (row, glyphs) | |
11541 Lisp_Object row, glyphs; | |
11535 { | 11542 { |
11536 struct frame *sf = SELECTED_FRAME (); | 11543 struct frame *sf = SELECTED_FRAME (); |
11537 struct glyph_matrix *m = (XWINDOW (sf->tool_bar_window) | 11544 struct glyph_matrix *m = (XWINDOW (sf->tool_bar_window)->current_matrix); |
11538 ->current_matrix); | 11545 dump_glyph_row (m, XINT (row), INTEGERP (glyphs) ? XINT (glyphs) : 2); |
11539 dump_glyph_row (m, 0, 1); | |
11540 return Qnil; | 11546 return Qnil; |
11541 } | 11547 } |
11542 | 11548 |
11543 | 11549 |
11544 DEFUN ("trace-redisplay-toggle", Ftrace_redisplay_toggle, | 11550 DEFUN ("trace-redisplay-toggle", Ftrace_redisplay_toggle, |