From 5cb26370fb1b1e3ad7a13897aadfc26f960d2f1d Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Mon, 30 Aug 1999 23:14:25 +0000 Subject: [PATCH] (FRAME_WINDOW_WIDTH_ARG): Add in FRAME_FLAGS_AREA_COLS once instead of twice. (FRAME_LEFT_FLAGS_AREA_WIDTH): New. --- src/frame.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/frame.h b/src/frame.h index 8ff3091491a..3aca26d7534 100644 --- a/src/frame.h +++ b/src/frame.h @@ -511,7 +511,7 @@ typedef struct frame *FRAME_PTR; #define FRAME_WINDOW_WIDTH_ARG(f, width) \ ((width) \ + FRAME_SCROLL_BAR_WIDTH (f) \ - + 2 * FRAME_FLAGS_AREA_COLS (f)) + + FRAME_FLAGS_AREA_COLS (f)) /* Maximum + 1 legitimate value for FRAME_CURSOR_X. */ #define FRAME_CURSOR_X_LIMIT(f) \ @@ -660,17 +660,18 @@ extern Lisp_Object Vterminal_frame; (FRAME_WINDOW_P (F) ? FRAME_DEFAULT_FONT_WIDTH (F) : 1) /* Pixel width of areas used to display truncation marks, continuation - marks, overlay arrows. This is 0 for terminal frames. Other - terminal headers must define FRAME_X_TRUNC_WIDTH. */ + marks, overlay arrows. This is 0 for terminal frames. */ #ifdef HAVE_WINDOW_SYSTEM #define FRAME_FLAGS_AREA_COLS(F) \ (FRAME_WINDOW_P ((F)) ? FRAME_X_FLAGS_AREA_COLS ((F)) : 0) -#define FRAME_FLAGS_AREA_WIDTH(F) \ - (FRAME_FLAGS_AREA_COLS ((F)) * CANON_X_UNIT ((F))) +#define FRAME_FLAGS_AREA_WIDTH(F) FRAME_X_FLAGS_AREA_WIDTH (F) +#define FRAME_LEFT_FLAGS_AREA_WIDTH(F) FRAME_X_LEFT_FLAGS_AREA_WIDTH (F) + #else #define FRAME_FLAGS_AREA_WIDTH(F) 0 #define FRAME_FLAGS_AREA_COLS(F) 0 +#define FRAME_LEFT_FLAGS_AREA_WIDTH(F) 0 #endif -- 2.39.5