# HG changeset patch # User Kim F. Storm # Date 1013212130 0 # Node ID d3a48ed9857d52a4dbf0291143b91aa3b7ee6da9 # Parent b3c0fc9495247849985f7cb1ae253b2220b7dd73 (CURRENT_MODE_LINE_FACE_ID): New macro. (CURRENT_MODE_LINE_HEIGHT): Use it. (enum face_id): Add MODE_LINE_INACTIVE_FACE_ID. diff -r b3c0fc949524 -r d3a48ed9857d src/dispextern.h --- a/src/dispextern.h Fri Feb 08 23:48:02 2002 +0000 +++ b/src/dispextern.h Fri Feb 08 23:48:50 2002 +0000 @@ -923,6 +923,14 @@ ? MATRIX_HEADER_LINE_ROW (MATRIX)->height \ : 0) +/* Return the desired face id for the mode line of window W. + This depends on whether the window is selected or not. */ + +#define CURRENT_MODE_LINE_FACE_ID(W) \ + ((W) == selected_window \ + ? MODE_LINE_FACE_ID \ + : MODE_LINE_INACTIVE_FACE_ID) + /* Return the current height of the mode line of window W. If not known from current_mode_line_height, look at W's current glyph matrix, or return a default based on the height of the font of the @@ -934,7 +942,7 @@ : (MATRIX_MODE_LINE_HEIGHT ((W)->current_matrix) \ ? MATRIX_MODE_LINE_HEIGHT ((W)->current_matrix) \ : estimate_mode_line_height (XFRAME ((W)->frame), \ - MODE_LINE_FACE_ID))) + CURRENT_MODE_LINE_FACE_ID (W)))) /* Return the current height of the header line of window W. If not known from current_header_line_height, look at W's current glyph @@ -1353,6 +1361,7 @@ { DEFAULT_FACE_ID, MODE_LINE_FACE_ID, + MODE_LINE_INACTIVE_FACE_ID, TOOL_BAR_FACE_ID, FRINGE_FACE_ID, HEADER_LINE_FACE_ID,