comparison src/dispextern.h @ 41119:615c460b28c7

Fringe cleanup. (FRINGE_FACE_ID): Renamed from BITMAP_AREA_FACE_ID. Comments fixed. Use renamed symbols.
author Kim F. Storm <storm@cua.dk>
date Fri, 16 Nov 2001 13:01:09 +0000
parents 9687641007d3
children 0b6760fd748e
comparison
equal deleted inserted replaced
41118:cd9ef105b2f6 41119:615c460b28c7
666 /* 1 means this row contains glyphs that overlap each other because 666 /* 1 means this row contains glyphs that overlap each other because
667 of lbearing or rbearing. */ 667 of lbearing or rbearing. */
668 unsigned contains_overlapping_glyphs_p : 1; 668 unsigned contains_overlapping_glyphs_p : 1;
669 669
670 /* 1 means this row is a wide as the window it is displayed in, including 670 /* 1 means this row is a wide as the window it is displayed in, including
671 scroll bars, bitmap areas, and internal borders. This also 671 scroll bars, fringes, and internal borders. This also
672 implies that the row doesn't have marginal areas. */ 672 implies that the row doesn't have marginal areas. */
673 unsigned full_width_p : 1; 673 unsigned full_width_p : 1;
674 674
675 /* Non-zero means row is a mode or top-line. */ 675 /* Non-zero means row is a mode or top-line. */
676 unsigned mode_line_p : 1; 676 unsigned mode_line_p : 1;
966 (FRAME_WINDOW_P (F) ? FRAME_INTERNAL_BORDER_WIDTH (F) : 0) 966 (FRAME_WINDOW_P (F) ? FRAME_INTERNAL_BORDER_WIDTH (F) : 0)
967 967
968 /* Width of display region of window W. For terminal frames, this 968 /* Width of display region of window W. For terminal frames, this
969 equals the width of W since there are no vertical scroll bars. For 969 equals the width of W since there are no vertical scroll bars. For
970 window system frames, the value has to be corrected by the pixel 970 window system frames, the value has to be corrected by the pixel
971 width of vertical scroll bars, and bitmap areas. */ 971 width of vertical scroll bars, and fringes. */
972 972
973 #define WINDOW_DISPLAY_PIXEL_WIDTH(W) \ 973 #define WINDOW_DISPLAY_PIXEL_WIDTH(W) \
974 (((XFASTINT ((W)->width) \ 974 (((XFASTINT ((W)->width) \
975 - FRAME_SCROLL_BAR_WIDTH (XFRAME (WINDOW_FRAME ((W)))) \ 975 - FRAME_SCROLL_BAR_WIDTH (XFRAME (WINDOW_FRAME ((W)))) \
976 - FRAME_FLAGS_AREA_COLS (XFRAME (WINDOW_FRAME ((W))))) \ 976 - FRAME_FRINGE_COLS (XFRAME (WINDOW_FRAME ((W))))) \
977 * CANON_X_UNIT (XFRAME (WINDOW_FRAME ((W)))))) 977 * CANON_X_UNIT (XFRAME (WINDOW_FRAME ((W))))))
978 978
979 /* Height of the display region of W, including a mode line, if any. */ 979 /* Height of the display region of W, including a mode line, if any. */
980 980
981 #define WINDOW_DISPLAY_PIXEL_HEIGHT(W) \ 981 #define WINDOW_DISPLAY_PIXEL_HEIGHT(W) \
1015 1015
1016 #define WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X(W) \ 1016 #define WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X(W) \
1017 (FRAME_INTERNAL_BORDER_WIDTH_SAFE (XFRAME (WINDOW_FRAME ((W)))) \ 1017 (FRAME_INTERNAL_BORDER_WIDTH_SAFE (XFRAME (WINDOW_FRAME ((W)))) \
1018 + (WINDOW_LEFT_MARGIN ((W)) \ 1018 + (WINDOW_LEFT_MARGIN ((W)) \
1019 * CANON_X_UNIT (XFRAME (WINDOW_FRAME ((W))))) \ 1019 * CANON_X_UNIT (XFRAME (WINDOW_FRAME ((W))))) \
1020 + FRAME_LEFT_FLAGS_AREA_WIDTH (XFRAME (WINDOW_FRAME ((W))))) 1020 + FRAME_LEFT_FRINGE_WIDTH (XFRAME (WINDOW_FRAME ((W)))))
1021 1021
1022 /* Right edge of window W in pixels, relative to its frame. */ 1022 /* Right edge of window W in pixels, relative to its frame. */
1023 1023
1024 #define WINDOW_DISPLAY_RIGHT_EDGE_PIXEL_X(W) \ 1024 #define WINDOW_DISPLAY_RIGHT_EDGE_PIXEL_X(W) \
1025 (WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X ((W)) \ 1025 (WINDOW_DISPLAY_LEFT_EDGE_PIXEL_X ((W)) \
1350 enum face_id 1350 enum face_id
1351 { 1351 {
1352 DEFAULT_FACE_ID, 1352 DEFAULT_FACE_ID,
1353 MODE_LINE_FACE_ID, 1353 MODE_LINE_FACE_ID,
1354 TOOL_BAR_FACE_ID, 1354 TOOL_BAR_FACE_ID,
1355 BITMAP_AREA_FACE_ID, 1355 FRINGE_FACE_ID,
1356 HEADER_LINE_FACE_ID, 1356 HEADER_LINE_FACE_ID,
1357 SCROLL_BAR_FACE_ID, 1357 SCROLL_BAR_FACE_ID,
1358 BORDER_FACE_ID, 1358 BORDER_FACE_ID,
1359 CURSOR_FACE_ID, 1359 CURSOR_FACE_ID,
1360 MOUSE_FACE_ID, 1360 MOUSE_FACE_ID,