From: Kim F. Storm <storm@cua.dk>
Date: Fri, 8 Feb 2002 23:48:50 +0000 (+0000)
Subject: (CURRENT_MODE_LINE_FACE_ID): New macro.
X-Git-Tag: ttn-vms-21-2-B4~16762
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f6911ea7833b323eb0dcb2d5ffffaa8265026de1;p=emacs.git

(CURRENT_MODE_LINE_FACE_ID): New macro.
(CURRENT_MODE_LINE_HEIGHT): Use it.
(enum face_id): Add MODE_LINE_INACTIVE_FACE_ID.
---

diff --git a/src/dispextern.h b/src/dispextern.h
index 5fd50d0fd90..36342f7265d 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -923,6 +923,14 @@ extern struct glyph_row scratch_glyph_row;
       ? 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 @@ extern struct glyph_row scratch_glyph_row;
       : (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 @@ enum face_id
 {
   DEFAULT_FACE_ID,
   MODE_LINE_FACE_ID,
+  MODE_LINE_INACTIVE_FACE_ID,
   TOOL_BAR_FACE_ID,
   FRINGE_FACE_ID,
   HEADER_LINE_FACE_ID,