Mercurial > emacs
comparison src/xterm.c @ 25465:1b6d98e8c3ac
Remove unused bitmaps.
(continued_bits, continuation_bits, overlay_bits): Change images.
(x_draw_vertical_border): Use FRAME_X_RIGHT_FLAGS_AREA_WIDTH
instead of FRAME_X_FLAGS_AREA_WIDTH.
(x_after_update_window_line): Ditto.
(x_draw_bitmap): Likewise.
(x_draw_row_bitmaps): Likewise.
(x_draw_glyph_string_box): Likewise.
(x_draw_glyphs): Likewise.
(x_scroll_run): Likewise.
(expose_window_tree): Likewise.
(note_mode_line_highlight): Likewise.
(XTset_vertical_scroll_bar): Likewise.
(x_clip_to_row): Likewise.
(x_set_window_size): Likewise.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Mon, 30 Aug 1999 23:14:36 +0000 |
parents | 2869085f6edc |
children | 8d013f20532c |
comparison
equal
deleted
inserted
replaced
25464:080a7a9d6f79 | 25465:1b6d98e8c3ac |
---|---|
195 #define left_width 8 | 195 #define left_width 8 |
196 #define left_height 8 | 196 #define left_height 8 |
197 static unsigned char left_bits[] = { | 197 static unsigned char left_bits[] = { |
198 0x18, 0x0c, 0x06, 0x3f, 0x3f, 0x06, 0x0c, 0x18}; | 198 0x18, 0x0c, 0x06, 0x3f, 0x3f, 0x06, 0x0c, 0x18}; |
199 | 199 |
200 /* Marker for continued lines. */ | |
201 | |
202 #define continued_width 8 | |
203 #define continued_height 8 | |
204 static unsigned char continued_bits[] = { | |
205 0x30, 0x30, 0x30, 0x30, 0xb4, 0xfc, 0x78, 0x30}; | |
206 | |
207 #define continuation_width 8 | |
208 #define continuation_height 8 | |
209 static unsigned char continuation_bits[] = { | |
210 0x0c, 0x1e, 0x3f, 0x2d, 0x0c, 0x0c, 0x0c, 0x0c}; | |
211 | |
212 /* Right truncation arrow bitmap `->'. */ | 200 /* Right truncation arrow bitmap `->'. */ |
213 | 201 |
214 #define right_width 8 | 202 #define right_width 8 |
215 #define right_height 8 | 203 #define right_height 8 |
216 static unsigned char right_bits[] = { | 204 static unsigned char right_bits[] = { |
217 0x18, 0x30, 0x60, 0xfc, 0xfc, 0x60, 0x30, 0x18}; | 205 0x18, 0x30, 0x60, 0xfc, 0xfc, 0x60, 0x30, 0x18}; |
218 | 206 |
219 /* Overlay arrow bitmap; a filled `<>'. */ | 207 /* Marker for continued lines. */ |
220 | 208 |
221 #if 1 | 209 #define continued_width 8 |
210 #define continued_height 8 | |
211 static unsigned char continued_bits[] = { | |
212 0x3c, 0x7c, 0xc0, 0xe4, 0xfc, 0x7c, 0x3c, 0x7c}; | |
213 | |
214 /* Marker for continuation lines. */ | |
215 | |
216 #define continuation_width 8 | |
217 #define continuation_height 8 | |
218 static unsigned char continuation_bits[] = { | |
219 0x3c, 0x3e, 0x03, 0x27, 0x3f, 0x3e, 0x3c, 0x3e}; | |
220 | |
221 /* Overlay arrow bitmap. */ | |
222 | |
223 #if 0 | |
224 /* A bomb. */ | |
222 #define ov_width 8 | 225 #define ov_width 8 |
223 #define ov_height 8 | 226 #define ov_height 8 |
224 static unsigned char ov_bits[] = { | 227 static unsigned char ov_bits[] = { |
225 0x30, 0x08, 0x3c, 0x7e, 0x7a, 0x7a, 0x62, 0x3c}; | 228 0x30, 0x08, 0x3c, 0x7e, 0x7a, 0x7a, 0x62, 0x3c}; |
226 | 229 #else |
227 #elif 0 | 230 /* A triangular arrow. */ |
228 #define ov_width 8 | 231 #define ov_width 8 |
229 #define ov_height 8 | 232 #define ov_height 8 |
230 static unsigned char ov_bits[] = { | 233 static unsigned char ov_bits[] = { |
231 0x18, 0x04, 0x08, 0x1c, 0x3e, 0x3a, 0x32, 0x1c}; | 234 0x03, 0x0f, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 0x03}; |
232 #else | 235 |
233 #define ov_width 8 | |
234 #define ov_height 8 | |
235 static unsigned char ov_bits[] = { | |
236 0x18, 0x3c, 0x7e, 0xff, 0xff, 0x7e, 0x3c, 0x18}; | |
237 #endif | 236 #endif |
238 | 237 |
239 extern Lisp_Object Qhelp_echo; | 238 extern Lisp_Object Qhelp_echo; |
240 | 239 |
241 | 240 |
640 && !FRAME_HAS_VERTICAL_SCROLL_BARS (f)) | 639 && !FRAME_HAS_VERTICAL_SCROLL_BARS (f)) |
641 { | 640 { |
642 int x0, x1, y0, y1; | 641 int x0, x1, y0, y1; |
643 | 642 |
644 window_box_edges (w, -1, &x0, &y0, &x1, &y1); | 643 window_box_edges (w, -1, &x0, &y0, &x1, &y1); |
645 x1 += FRAME_X_FLAGS_AREA_WIDTH (f); | 644 x1 += FRAME_X_RIGHT_FLAGS_AREA_WIDTH (f); |
646 y1 -= 1; | 645 y1 -= 1; |
647 | 646 |
648 XDrawLine (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), | 647 XDrawLine (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
649 f->output_data.x->normal_gc, x1, y0, x1, y1); | 648 f->output_data.x->normal_gc, x1, y0, x1, y1); |
650 } | 649 } |
744 if (windows_or_buffers_changed) | 743 if (windows_or_buffers_changed) |
745 { | 744 { |
746 struct frame *f = XFRAME (w->frame); | 745 struct frame *f = XFRAME (w->frame); |
747 int width = FRAME_INTERNAL_BORDER_WIDTH (f); | 746 int width = FRAME_INTERNAL_BORDER_WIDTH (f); |
748 int height = desired_row->visible_height; | 747 int height = desired_row->visible_height; |
749 int x = window_box_right (w, -1) + FRAME_X_FLAGS_AREA_WIDTH (f); | 748 int x = (window_box_right (w, -1) |
749 + FRAME_X_RIGHT_FLAGS_AREA_WIDTH (f)); | |
750 int y = WINDOW_TO_FRAME_PIXEL_Y (w, max (0, desired_row->y)); | 750 int y = WINDOW_TO_FRAME_PIXEL_Y (w, max (0, desired_row->y)); |
751 | 751 |
752 XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), | 752 XClearArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
753 x, y, width, height, False); | 753 x, y, width, height, False); |
754 } | 754 } |
788 wd = left_width; | 788 wd = left_width; |
789 h = left_height; | 789 h = left_height; |
790 bits = left_bits; | 790 bits = left_bits; |
791 x = (WINDOW_TO_FRAME_PIXEL_X (w, 0) | 791 x = (WINDOW_TO_FRAME_PIXEL_X (w, 0) |
792 - wd | 792 - wd |
793 - (FRAME_X_FLAGS_AREA_WIDTH (f) - wd) / 2); | 793 - (FRAME_X_LEFT_FLAGS_AREA_WIDTH (f) - wd) / 2); |
794 break; | 794 break; |
795 | 795 |
796 case OVERLAY_ARROW_BITMAP: | 796 case OVERLAY_ARROW_BITMAP: |
797 wd = left_width; | 797 wd = left_width; |
798 h = left_height; | 798 h = left_height; |
799 bits = ov_bits; | 799 bits = ov_bits; |
800 x = (WINDOW_TO_FRAME_PIXEL_X (w, 0) | 800 x = (WINDOW_TO_FRAME_PIXEL_X (w, 0) |
801 - wd | 801 - wd |
802 - (FRAME_X_FLAGS_AREA_WIDTH (f) - wd) / 2); | 802 - (FRAME_X_LEFT_FLAGS_AREA_WIDTH (f) - wd) / 2); |
803 break; | 803 break; |
804 | 804 |
805 case RIGHT_TRUNCATION_BITMAP: | 805 case RIGHT_TRUNCATION_BITMAP: |
806 wd = right_width; | 806 wd = right_width; |
807 h = right_height; | 807 h = right_height; |
808 bits = right_bits; | 808 bits = right_bits; |
809 x = window_box_right (w, -1); | 809 x = window_box_right (w, -1); |
810 x += (FRAME_X_FLAGS_AREA_WIDTH (f) - wd) / 2; | 810 x += (FRAME_X_RIGHT_FLAGS_AREA_WIDTH (f) - wd) / 2; |
811 break; | 811 break; |
812 | 812 |
813 case CONTINUED_LINE_BITMAP: | 813 case CONTINUED_LINE_BITMAP: |
814 wd = right_width; | 814 wd = right_width; |
815 h = right_height; | 815 h = right_height; |
816 bits = continued_bits; | 816 bits = continued_bits; |
817 x = window_box_right (w, -1); | 817 x = window_box_right (w, -1); |
818 x += (FRAME_X_FLAGS_AREA_WIDTH (f) - wd) / 2; | 818 x += (FRAME_X_RIGHT_FLAGS_AREA_WIDTH (f) - wd) / 2; |
819 break; | 819 break; |
820 | 820 |
821 case CONTINUATION_LINE_BITMAP: | 821 case CONTINUATION_LINE_BITMAP: |
822 wd = continuation_width; | 822 wd = continuation_width; |
823 h = continuation_height; | 823 h = continuation_height; |
824 bits = continuation_bits; | 824 bits = continuation_bits; |
825 x = (WINDOW_TO_FRAME_PIXEL_X (w, 0) | 825 x = (WINDOW_TO_FRAME_PIXEL_X (w, 0) |
826 - wd | 826 - wd |
827 - (FRAME_X_FLAGS_AREA_WIDTH (f) - wd) / 2); | 827 - (FRAME_X_LEFT_FLAGS_AREA_WIDTH (f) - wd) / 2); |
828 break; | 828 break; |
829 | 829 |
830 case ZV_LINE_BITMAP: | 830 case ZV_LINE_BITMAP: |
831 wd = zv_width; | 831 wd = zv_width; |
832 h = zv_height; | 832 h = zv_height; |
833 bits = zv_bits; | 833 bits = zv_bits; |
834 x = (WINDOW_TO_FRAME_PIXEL_X (w, 0) | 834 x = (WINDOW_TO_FRAME_PIXEL_X (w, 0) |
835 - wd | 835 - wd |
836 - (FRAME_X_FLAGS_AREA_WIDTH (f) - wd) / 2); | 836 - (FRAME_X_LEFT_FLAGS_AREA_WIDTH (f) - wd) / 2); |
837 break; | 837 break; |
838 | 838 |
839 default: | 839 default: |
840 abort (); | 840 abort (); |
841 } | 841 } |
893 bitmap = NO_BITMAP; | 893 bitmap = NO_BITMAP; |
894 | 894 |
895 /* Clear flags area if no bitmap to draw or if bitmap doesn't fill | 895 /* Clear flags area if no bitmap to draw or if bitmap doesn't fill |
896 the flags area. */ | 896 the flags area. */ |
897 if (bitmap == NO_BITMAP | 897 if (bitmap == NO_BITMAP |
898 || FRAME_FLAGS_BITMAP_WIDTH (f) < FRAME_X_FLAGS_AREA_WIDTH (f) | 898 || FRAME_FLAGS_BITMAP_WIDTH (f) < FRAME_X_LEFT_FLAGS_AREA_WIDTH (f) |
899 || row->height > FRAME_FLAGS_BITMAP_HEIGHT (f)) | 899 || row->height > FRAME_FLAGS_BITMAP_HEIGHT (f)) |
900 { | 900 { |
901 /* If W has a vertical border to its left, don't draw over it. */ | 901 /* If W has a vertical border to its left, don't draw over it. */ |
902 int border = ((XFASTINT (w->left) > 0 | 902 int border = ((XFASTINT (w->left) > 0 |
903 && !FRAME_HAS_VERTICAL_SCROLL_BARS (f)) | 903 && !FRAME_HAS_VERTICAL_SCROLL_BARS (f)) |
917 XSetForeground (FRAME_X_DISPLAY (f), face->gc, face->background); | 917 XSetForeground (FRAME_X_DISPLAY (f), face->gc, face->background); |
918 | 918 |
919 XFillRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), | 919 XFillRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
920 face->gc, | 920 face->gc, |
921 (left | 921 (left |
922 - FRAME_X_FLAGS_AREA_WIDTH (f) | 922 - FRAME_X_LEFT_FLAGS_AREA_WIDTH (f) |
923 + border), | 923 + border), |
924 WINDOW_TO_FRAME_PIXEL_Y (w, max (top_line_height, | 924 WINDOW_TO_FRAME_PIXEL_Y (w, max (top_line_height, |
925 row->y)), | 925 row->y)), |
926 FRAME_X_FLAGS_AREA_WIDTH (f) - border, | 926 FRAME_X_LEFT_FLAGS_AREA_WIDTH (f) - border, |
927 row->visible_height); | 927 row->visible_height); |
928 if (!face->stipple) | 928 if (!face->stipple) |
929 XSetForeground (FRAME_X_DISPLAY (f), face->gc, face->foreground); | 929 XSetForeground (FRAME_X_DISPLAY (f), face->gc, face->foreground); |
930 } | 930 } |
931 | 931 |
942 bitmap = NO_BITMAP; | 942 bitmap = NO_BITMAP; |
943 | 943 |
944 /* Clear flags area if no bitmap to draw of if bitmap doesn't fill | 944 /* Clear flags area if no bitmap to draw of if bitmap doesn't fill |
945 the flags area. */ | 945 the flags area. */ |
946 if (bitmap == NO_BITMAP | 946 if (bitmap == NO_BITMAP |
947 || FRAME_FLAGS_BITMAP_WIDTH (f) < FRAME_X_FLAGS_AREA_WIDTH (f) | 947 || FRAME_FLAGS_BITMAP_WIDTH (f) < FRAME_X_RIGHT_FLAGS_AREA_WIDTH (f) |
948 || row->height > FRAME_FLAGS_BITMAP_HEIGHT (f)) | 948 || row->height > FRAME_FLAGS_BITMAP_HEIGHT (f)) |
949 { | 949 { |
950 int right = window_box_right (w, -1); | 950 int right = window_box_right (w, -1); |
951 | 951 |
952 if (top_line_height < 0) | 952 if (top_line_height < 0) |
963 XFillRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), | 963 XFillRectangle (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
964 face->gc, | 964 face->gc, |
965 right, | 965 right, |
966 WINDOW_TO_FRAME_PIXEL_Y (w, max (top_line_height, | 966 WINDOW_TO_FRAME_PIXEL_Y (w, max (top_line_height, |
967 row->y)), | 967 row->y)), |
968 FRAME_X_FLAGS_AREA_WIDTH (f), | 968 FRAME_X_RIGHT_FLAGS_AREA_WIDTH (f), |
969 row->visible_height); | 969 row->visible_height); |
970 if (!face->stipple) | 970 if (!face->stipple) |
971 XSetForeground (FRAME_X_DISPLAY (f), face->gc, face->foreground); | 971 XSetForeground (FRAME_X_DISPLAY (f), face->gc, face->foreground); |
972 } | 972 } |
973 | 973 |
3267 | 3267 |
3268 last_x = window_box_right (s->w, s->area); | 3268 last_x = window_box_right (s->w, s->area); |
3269 if (s->row->full_width_p | 3269 if (s->row->full_width_p |
3270 && !s->w->pseudo_window_p) | 3270 && !s->w->pseudo_window_p) |
3271 { | 3271 { |
3272 last_x += FRAME_X_FLAGS_AREA_WIDTH (s->f); | 3272 last_x += FRAME_X_RIGHT_FLAGS_AREA_WIDTH (s->f); |
3273 if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (s->f)) | 3273 if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (s->f)) |
3274 last_x += FRAME_SCROLL_BAR_WIDTH (s->f) * CANON_X_UNIT (s->f); | 3274 last_x += FRAME_SCROLL_BAR_WIDTH (s->f) * CANON_X_UNIT (s->f); |
3275 } | 3275 } |
3276 | 3276 |
3277 /* The glyph that may have a right box line. */ | 3277 /* The glyph that may have a right box line. */ |
4317 if (row->full_width_p) | 4317 if (row->full_width_p) |
4318 { | 4318 { |
4319 /* X is relative to the left edge of W, without scroll bars | 4319 /* X is relative to the left edge of W, without scroll bars |
4320 or flag areas. */ | 4320 or flag areas. */ |
4321 struct frame *f = XFRAME (w->frame); | 4321 struct frame *f = XFRAME (w->frame); |
4322 int width = FRAME_FLAGS_AREA_WIDTH (f); | 4322 /* int width = FRAME_FLAGS_AREA_WIDTH (f); */ |
4323 int window_left_x = WINDOW_LEFT_MARGIN (w) * CANON_X_UNIT (f); | 4323 int window_left_x = WINDOW_LEFT_MARGIN (w) * CANON_X_UNIT (f); |
4324 | 4324 |
4325 x += window_left_x; | 4325 x += window_left_x; |
4326 area_width = XFASTINT (w->width) * CANON_X_UNIT (f); | 4326 area_width = XFASTINT (w->width) * CANON_X_UNIT (f); |
4327 last_x = window_left_x + area_width; | 4327 last_x = window_left_x + area_width; |
4328 | 4328 |
4329 if (FRAME_HAS_VERTICAL_SCROLL_BARS (f)) | 4329 if (FRAME_HAS_VERTICAL_SCROLL_BARS (f)) |
4330 { | 4330 { |
4331 width = FRAME_SCROLL_BAR_WIDTH (f) * CANON_X_UNIT (f); | 4331 int width = FRAME_SCROLL_BAR_WIDTH (f) * CANON_X_UNIT (f); |
4332 if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f)) | 4332 if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f)) |
4333 last_x += width; | 4333 last_x += width; |
4334 else | 4334 else |
4335 x -= width; | 4335 x -= width; |
4336 } | 4336 } |
4963 | 4963 |
4964 /* Get frame-relative bounding box of the text display area of W, | 4964 /* Get frame-relative bounding box of the text display area of W, |
4965 without mode lines. Include in this box the flags areas to the | 4965 without mode lines. Include in this box the flags areas to the |
4966 left and right of W. */ | 4966 left and right of W. */ |
4967 window_box (w, -1, &x, &y, &width, &height); | 4967 window_box (w, -1, &x, &y, &width, &height); |
4968 width += 2 * FRAME_X_FLAGS_AREA_WIDTH (f); | 4968 width += FRAME_X_FLAGS_AREA_WIDTH (f); |
4969 x -= FRAME_X_FLAGS_AREA_WIDTH (f); | 4969 x -= FRAME_X_LEFT_FLAGS_AREA_WIDTH (f); |
4970 | 4970 |
4971 from_y = WINDOW_TO_FRAME_PIXEL_Y (w, run->current_y); | 4971 from_y = WINDOW_TO_FRAME_PIXEL_Y (w, run->current_y); |
4972 to_y = WINDOW_TO_FRAME_PIXEL_Y (w, run->desired_y); | 4972 to_y = WINDOW_TO_FRAME_PIXEL_Y (w, run->desired_y); |
4973 bottom_y = y + height; | 4973 bottom_y = y + height; |
4974 | 4974 |
5125 /* Frame-relative pixel rectangle of W. */ | 5125 /* Frame-relative pixel rectangle of W. */ |
5126 window_box (w, -1, &window_x, &window_y, &window_width, | 5126 window_box (w, -1, &window_x, &window_y, &window_width, |
5127 &window_height); | 5127 &window_height); |
5128 window_rect.x | 5128 window_rect.x |
5129 = (window_x | 5129 = (window_x |
5130 - FRAME_X_FLAGS_AREA_WIDTH (f) | 5130 - FRAME_X_LEFT_FLAGS_AREA_WIDTH (f) |
5131 - FRAME_LEFT_SCROLL_BAR_WIDTH (f) * CANON_X_UNIT (f)); | 5131 - FRAME_LEFT_SCROLL_BAR_WIDTH (f) * CANON_X_UNIT (f)); |
5132 window_rect.y = window_y; | 5132 window_rect.y = window_y; |
5133 window_rect.width | 5133 window_rect.width |
5134 = (window_width | 5134 = (window_width |
5135 + 2 * FRAME_X_FLAGS_AREA_WIDTH (f) | 5135 + FRAME_X_FLAGS_AREA_WIDTH (f) |
5136 + FRAME_SCROLL_BAR_WIDTH (f) * CANON_X_UNIT (f)); | 5136 + FRAME_SCROLL_BAR_WIDTH (f) * CANON_X_UNIT (f)); |
5137 window_rect.height | 5137 window_rect.height |
5138 = window_height + CURRENT_MODE_LINE_HEIGHT (w); | 5138 = window_height + CURRENT_MODE_LINE_HEIGHT (w); |
5139 | 5139 |
5140 if (x_intersect_rectangles (r, &window_rect, &intersection_rect)) | 5140 if (x_intersect_rectangles (r, &window_rect, &intersection_rect)) |
6004 | 6004 |
6005 /* Find the glyph under X. */ | 6005 /* Find the glyph under X. */ |
6006 glyph = row->glyphs[TEXT_AREA]; | 6006 glyph = row->glyphs[TEXT_AREA]; |
6007 end = glyph + row->used[TEXT_AREA]; | 6007 end = glyph + row->used[TEXT_AREA]; |
6008 x0 = - (FRAME_LEFT_SCROLL_BAR_WIDTH (f) * CANON_X_UNIT (f) | 6008 x0 = - (FRAME_LEFT_SCROLL_BAR_WIDTH (f) * CANON_X_UNIT (f) |
6009 + FRAME_X_FLAGS_AREA_WIDTH (f)); | 6009 + FRAME_X_LEFT_FLAGS_AREA_WIDTH (f)); |
6010 while (glyph < end | 6010 while (glyph < end |
6011 && x >= x0 + glyph->pixel_width) | 6011 && x >= x0 + glyph->pixel_width) |
6012 { | 6012 { |
6013 x0 += glyph->pixel_width; | 6013 x0 += glyph->pixel_width; |
6014 ++glyph; | 6014 ++glyph; |
7895 scroll_bar_area_width = FRAME_SCROLL_BAR_COLS (f) * CANON_X_UNIT (f); | 7895 scroll_bar_area_width = FRAME_SCROLL_BAR_COLS (f) * CANON_X_UNIT (f); |
7896 | 7896 |
7897 if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f)) | 7897 if (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f)) |
7898 pixel_left = (window_x | 7898 pixel_left = (window_x |
7899 + window_width | 7899 + window_width |
7900 + FRAME_FLAGS_AREA_WIDTH (f) | 7900 + FRAME_LEFT_FLAGS_AREA_WIDTH (f) |
7901 + scroll_bar_area_width | 7901 + scroll_bar_area_width |
7902 - pixel_width + 1); | 7902 - pixel_width + 1); |
7903 else | 7903 else |
7904 pixel_left = (window_x | 7904 pixel_left = (window_x |
7905 - FRAME_FLAGS_AREA_WIDTH (f) | 7905 - FRAME_LEFT_FLAGS_AREA_WIDTH (f) |
7906 - scroll_bar_area_width); | 7906 - scroll_bar_area_width); |
7907 | 7907 |
7908 /* Does the scroll bar exist yet? */ | 7908 /* Does the scroll bar exist yet? */ |
7909 if (NILP (w->vertical_scroll_bar)) | 7909 if (NILP (w->vertical_scroll_bar)) |
7910 bar = x_scroll_bar_create (w, pixel_top, pixel_left, pixel_width, | 7910 bar = x_scroll_bar_create (w, pixel_top, pixel_left, pixel_width, |
9715 | 9715 |
9716 /* If clipping to the whole line, including trunc marks, extend | 9716 /* If clipping to the whole line, including trunc marks, extend |
9717 the rectangle to the left and increase its width. */ | 9717 the rectangle to the left and increase its width. */ |
9718 if (whole_line_p) | 9718 if (whole_line_p) |
9719 { | 9719 { |
9720 clip_rect.x -= FRAME_X_FLAGS_AREA_WIDTH (f); | 9720 clip_rect.x -= FRAME_X_LEFT_FLAGS_AREA_WIDTH (f); |
9721 clip_rect.width += 2 * FRAME_X_FLAGS_AREA_WIDTH (f); | 9721 clip_rect.width += FRAME_X_FLAGS_AREA_WIDTH (f); |
9722 } | 9722 } |
9723 | 9723 |
9724 XSetClipRectangles (FRAME_X_DISPLAY (f), gc, 0, 0, &clip_rect, 1, Unsorted); | 9724 XSetClipRectangles (FRAME_X_DISPLAY (f), gc, 0, 0, &clip_rect, 1, Unsorted); |
9725 } | 9725 } |
9726 | 9726 |
10814 ? 0 | 10814 ? 0 |
10815 : FRAME_SCROLL_BAR_PIXEL_WIDTH (f) > 0 | 10815 : FRAME_SCROLL_BAR_PIXEL_WIDTH (f) > 0 |
10816 ? FRAME_SCROLL_BAR_PIXEL_WIDTH (f) | 10816 ? FRAME_SCROLL_BAR_PIXEL_WIDTH (f) |
10817 : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.x->font))); | 10817 : (FRAME_SCROLL_BAR_COLS (f) * FONT_WIDTH (f->output_data.x->font))); |
10818 f->output_data.x->flags_areas_extra | 10818 f->output_data.x->flags_areas_extra |
10819 = 2 * FRAME_FLAGS_AREA_WIDTH (f); | 10819 = FRAME_FLAGS_AREA_WIDTH (f); |
10820 pixelwidth = CHAR_TO_PIXEL_WIDTH (f, cols); | 10820 pixelwidth = CHAR_TO_PIXEL_WIDTH (f, cols); |
10821 pixelheight = CHAR_TO_PIXEL_HEIGHT (f, rows); | 10821 pixelheight = CHAR_TO_PIXEL_HEIGHT (f, rows); |
10822 | 10822 |
10823 f->output_data.x->win_gravity = NorthWestGravity; | 10823 f->output_data.x->win_gravity = NorthWestGravity; |
10824 x_wm_set_size_hint (f, (long) 0, 0); | 10824 x_wm_set_size_hint (f, (long) 0, 0); |