Mercurial > emacs
comparison src/xdisp.c @ 91915:6110ae9093e7
*** empty log message ***
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sun, 17 Feb 2008 21:56:39 +0000 |
parents | 1469de45e945 |
children | 4a8a943b5b75 |
comparison
equal
deleted
inserted
replaced
91914:7a656b1ea8b3 | 91915:6110ae9093e7 |
---|---|
2534 | 2534 |
2535 /* The window in which we iterate over current_buffer: */ | 2535 /* The window in which we iterate over current_buffer: */ |
2536 XSETWINDOW (it->window, w); | 2536 XSETWINDOW (it->window, w); |
2537 it->w = w; | 2537 it->w = w; |
2538 it->f = XFRAME (w->frame); | 2538 it->f = XFRAME (w->frame); |
2539 | 2539 |
2540 /* Extra space between lines (on window systems only). */ | 2540 /* Extra space between lines (on window systems only). */ |
2541 if (base_face_id == DEFAULT_FACE_ID | 2541 if (base_face_id == DEFAULT_FACE_ID |
2542 && FRAME_WINDOW_P (it->f)) | 2542 && FRAME_WINDOW_P (it->f)) |
2543 { | 2543 { |
2544 if (NATNUMP (current_buffer->extra_line_spacing)) | 2544 if (NATNUMP (current_buffer->extra_line_spacing)) |
5995 { | 5995 { |
5996 struct face *face = FACE_FROM_ID (it->f, it->face_id); | 5996 struct face *face = FACE_FROM_ID (it->f, it->face_id); |
5997 int pos = (it->s ? -1 | 5997 int pos = (it->s ? -1 |
5998 : STRINGP (it->string) ? IT_STRING_CHARPOS (*it) | 5998 : STRINGP (it->string) ? IT_STRING_CHARPOS (*it) |
5999 : IT_CHARPOS (*it)); | 5999 : IT_CHARPOS (*it)); |
6000 | 6000 |
6001 it->face_id = FACE_FOR_CHAR (it->f, face, it->c, pos, it->string); | 6001 it->face_id = FACE_FOR_CHAR (it->f, face, it->c, pos, it->string); |
6002 } | 6002 } |
6003 | 6003 |
6004 /* Is this character the last one of a run of characters with | 6004 /* Is this character the last one of a run of characters with |
6005 box? If yes, set IT->end_of_box_run_p to 1. */ | 6005 box? If yes, set IT->end_of_box_run_p to 1. */ |
8471 { | 8471 { |
8472 return resize_mini_window ((struct window *) a1, !NILP (exactly)); | 8472 return resize_mini_window ((struct window *) a1, !NILP (exactly)); |
8473 } | 8473 } |
8474 | 8474 |
8475 | 8475 |
8476 /* Resize mini-window W to fit the size of its contents. EXACT:P | 8476 /* Resize mini-window W to fit the size of its contents. EXACT_P |
8477 means size the window exactly to the size needed. Otherwise, it's | 8477 means size the window exactly to the size needed. Otherwise, it's |
8478 only enlarged until W's buffer is empty. | 8478 only enlarged until W's buffer is empty. |
8479 | 8479 |
8480 Set W->start to the right place to begin display. If the whole | 8480 Set W->start to the right place to begin display. If the whole |
8481 contents fit, start at the beginning. Otherwise, start so as | 8481 contents fit, start at the beginning. Otherwise, start so as |
8913 { | 8913 { |
8914 if (frame_garbaged) | 8914 if (frame_garbaged) |
8915 { | 8915 { |
8916 Lisp_Object tail, frame; | 8916 Lisp_Object tail, frame; |
8917 int changed_count = 0; | 8917 int changed_count = 0; |
8918 | 8918 |
8919 FOR_EACH_FRAME (tail, frame) | 8919 FOR_EACH_FRAME (tail, frame) |
8920 { | 8920 { |
8921 struct frame *f = XFRAME (frame); | 8921 struct frame *f = XFRAME (frame); |
8922 | 8922 |
8923 if (FRAME_VISIBLE_P (f) && FRAME_GARBAGED_P (f)) | 8923 if (FRAME_VISIBLE_P (f) && FRAME_GARBAGED_P (f)) |
8924 { | 8924 { |
8925 if (f->resized_p) | 8925 if (f->resized_p) |
8926 { | 8926 { |
8927 Fredraw_frame (frame); | 8927 Fredraw_frame (frame); |
8931 changed_count++; | 8931 changed_count++; |
8932 f->garbaged = 0; | 8932 f->garbaged = 0; |
8933 f->resized_p = 0; | 8933 f->resized_p = 0; |
8934 } | 8934 } |
8935 } | 8935 } |
8936 | 8936 |
8937 frame_garbaged = 0; | 8937 frame_garbaged = 0; |
8938 if (changed_count) | 8938 if (changed_count) |
8939 ++windows_or_buffers_changed; | 8939 ++windows_or_buffers_changed; |
8940 } | 8940 } |
8941 } | 8941 } |
11212 ++number_of_visible_frames; | 11212 ++number_of_visible_frames; |
11213 clear_desired_matrices (f); | 11213 clear_desired_matrices (f); |
11214 } | 11214 } |
11215 } | 11215 } |
11216 | 11216 |
11217 | 11217 |
11218 /* Notice any pending interrupt request to change frame size. */ | 11218 /* Notice any pending interrupt request to change frame size. */ |
11219 do_pending_window_change (1); | 11219 do_pending_window_change (1); |
11220 | 11220 |
11221 /* Clear frames marked as garbaged. */ | 11221 /* Clear frames marked as garbaged. */ |
11222 if (frame_garbaged) | 11222 if (frame_garbaged) |
21327 | 21327 |
21328 left = (leftmost | 21328 left = (leftmost |
21329 + grefx * (rightmost - leftmost) / 2 | 21329 + grefx * (rightmost - leftmost) / 2 |
21330 - nrefx * width / 2 | 21330 - nrefx * width / 2 |
21331 + xoff); | 21331 + xoff); |
21332 | 21332 |
21333 btm = ((grefy == 0 ? highest | 21333 btm = ((grefy == 0 ? highest |
21334 : grefy == 1 ? 0 | 21334 : grefy == 1 ? 0 |
21335 : grefy == 2 ? lowest | 21335 : grefy == 2 ? lowest |
21336 : (highest + lowest) / 2) | 21336 : (highest + lowest) / 2) |
21337 - (nrefy == 0 ? ascent + descent | 21337 - (nrefy == 0 ? ascent + descent |
23920 void | 23920 void |
23921 x_draw_vertical_border (w) | 23921 x_draw_vertical_border (w) |
23922 struct window *w; | 23922 struct window *w; |
23923 { | 23923 { |
23924 struct frame *f = XFRAME (WINDOW_FRAME (w)); | 23924 struct frame *f = XFRAME (WINDOW_FRAME (w)); |
23925 | 23925 |
23926 /* We could do better, if we knew what type of scroll-bar the adjacent | 23926 /* We could do better, if we knew what type of scroll-bar the adjacent |
23927 windows (on either side) have... But we don't :-( | 23927 windows (on either side) have... But we don't :-( |
23928 However, I think this works ok. ++KFS 2003-04-25 */ | 23928 However, I think this works ok. ++KFS 2003-04-25 */ |
23929 | 23929 |
23930 /* Redraw borders between horizontally adjacent windows. Don't | 23930 /* Redraw borders between horizontally adjacent windows. Don't |