Commit 021f2e1a authored by Andreas Schwab's avatar Andreas Schwab

* src/frame.h (MOUSE_HL_INFO): Remove excess parens.

parent 73c3f81d
2011-10-29 Andreas Schwab <schwab@linux-m68k.org>
* frame.h (MOUSE_HL_INFO): Remove excess parens.
2011-10-29 Eli Zaretskii <eliz@gnu.org> 2011-10-29 Eli Zaretskii <eliz@gnu.org>
Fix the `xbytecode' command. Fix the `xbytecode' command.
......
...@@ -538,12 +538,12 @@ typedef struct frame *FRAME_PTR; ...@@ -538,12 +538,12 @@ typedef struct frame *FRAME_PTR;
does not have FRAME_X_DISPLAY_INFO. */ does not have FRAME_X_DISPLAY_INFO. */
#ifdef HAVE_WINDOW_SYSTEM #ifdef HAVE_WINDOW_SYSTEM
# define MOUSE_HL_INFO(F) \ # define MOUSE_HL_INFO(F) \
(FRAME_WINDOW_P(F) \ (FRAME_WINDOW_P(F) \
? &(FRAME_X_DISPLAY_INFO(F)->mouse_highlight) \ ? &FRAME_X_DISPLAY_INFO(F)->mouse_highlight \
: &(((F)->output_data.tty->display_info)->mouse_highlight)) : &(F)->output_data.tty->display_info->mouse_highlight)
#else #else
# define MOUSE_HL_INFO(F) \ # define MOUSE_HL_INFO(F) \
(&(((F)->output_data.tty->display_info)->mouse_highlight)) (&(F)->output_data.tty->display_info->mouse_highlight)
#endif #endif
/* Nonzero if frame F is still alive (not deleted). */ /* Nonzero if frame F is still alive (not deleted). */
...@@ -594,7 +594,7 @@ typedef struct frame *FRAME_PTR; ...@@ -594,7 +594,7 @@ typedef struct frame *FRAME_PTR;
/* Lines above the top-most window in frame F. */ /* Lines above the top-most window in frame F. */
#define FRAME_TOP_MARGIN(F) \ #define FRAME_TOP_MARGIN(F) \
(FRAME_MENU_BAR_LINES (F) + FRAME_TOOL_BAR_LINES (F)) (FRAME_MENU_BAR_LINES (F) + FRAME_TOOL_BAR_LINES (F))
/* Pixel height of the top margin above. */ /* Pixel height of the top margin above. */
...@@ -659,11 +659,11 @@ typedef struct frame *FRAME_PTR; ...@@ -659,11 +659,11 @@ typedef struct frame *FRAME_PTR;
and which side they are on. */ and which side they are on. */
#define FRAME_VERTICAL_SCROLL_BAR_TYPE(f) ((f)->vertical_scroll_bar_type) #define FRAME_VERTICAL_SCROLL_BAR_TYPE(f) ((f)->vertical_scroll_bar_type)
#define FRAME_HAS_VERTICAL_SCROLL_BARS(f) \ #define FRAME_HAS_VERTICAL_SCROLL_BARS(f) \
((f)->vertical_scroll_bar_type != vertical_scroll_bar_none) ((f)->vertical_scroll_bar_type != vertical_scroll_bar_none)
#define FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT(f) \ #define FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT(f) \
((f)->vertical_scroll_bar_type == vertical_scroll_bar_left) ((f)->vertical_scroll_bar_type == vertical_scroll_bar_left)
#define FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT(f) \ #define FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT(f) \
((f)->vertical_scroll_bar_type == vertical_scroll_bar_right) ((f)->vertical_scroll_bar_type == vertical_scroll_bar_right)
/* Width that a scroll bar in frame F should have, if there is one. /* Width that a scroll bar in frame F should have, if there is one.
Measured in pixels. Measured in pixels.
...@@ -680,13 +680,13 @@ typedef struct frame *FRAME_PTR; ...@@ -680,13 +680,13 @@ typedef struct frame *FRAME_PTR;
the right in this frame, or there are no scroll bars, value is 0. */ the right in this frame, or there are no scroll bars, value is 0. */
#define FRAME_LEFT_SCROLL_BAR_COLS(f) \ #define FRAME_LEFT_SCROLL_BAR_COLS(f) \
(FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f) \ (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f) \
? FRAME_CONFIG_SCROLL_BAR_COLS (f) \ ? FRAME_CONFIG_SCROLL_BAR_COLS (f) \
: 0) : 0)
/* Width of a left scroll bar in frame F, measured in pixels */ /* Width of a left scroll bar in frame F, measured in pixels */
#define FRAME_LEFT_SCROLL_BAR_AREA_WIDTH(f) \ #define FRAME_LEFT_SCROLL_BAR_AREA_WIDTH(f) \
(FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f) \ (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f) \
? (FRAME_CONFIG_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f)) \ ? (FRAME_CONFIG_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f)) \
: 0) : 0)
...@@ -696,13 +696,13 @@ typedef struct frame *FRAME_PTR; ...@@ -696,13 +696,13 @@ typedef struct frame *FRAME_PTR;
the left in this frame, or there are no scroll bars, value is 0. */ the left in this frame, or there are no scroll bars, value is 0. */
#define FRAME_RIGHT_SCROLL_BAR_COLS(f) \ #define FRAME_RIGHT_SCROLL_BAR_COLS(f) \
(FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f) \ (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f) \
? FRAME_CONFIG_SCROLL_BAR_COLS (f) \ ? FRAME_CONFIG_SCROLL_BAR_COLS (f) \
: 0) : 0)
/* Width of a right scroll bar area in frame F, measured in pixels */ /* Width of a right scroll bar area in frame F, measured in pixels */
#define FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH(f) \ #define FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH(f) \
(FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f) \ (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_RIGHT (f) \
? (FRAME_CONFIG_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f)) \ ? (FRAME_CONFIG_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f)) \
: 0) : 0)
...@@ -710,9 +710,9 @@ typedef struct frame *FRAME_PTR; ...@@ -710,9 +710,9 @@ typedef struct frame *FRAME_PTR;
/* Actual width of a scroll bar in frame F, measured in columns. */ /* Actual width of a scroll bar in frame F, measured in columns. */
#define FRAME_SCROLL_BAR_COLS(f) \ #define FRAME_SCROLL_BAR_COLS(f) \
(FRAME_HAS_VERTICAL_SCROLL_BARS (f) \ (FRAME_HAS_VERTICAL_SCROLL_BARS (f) \
? FRAME_CONFIG_SCROLL_BAR_COLS (f) \ ? FRAME_CONFIG_SCROLL_BAR_COLS (f) \
: 0) : 0)
/* Actual width of a scroll bar area in frame F, measured in pixels. */ /* Actual width of a scroll bar area in frame F, measured in pixels. */
...@@ -731,21 +731,21 @@ typedef struct frame *FRAME_PTR; ...@@ -731,21 +731,21 @@ typedef struct frame *FRAME_PTR;
not including scroll bars and fringes. */ not including scroll bars and fringes. */
#define SET_FRAME_COLS(f, val) \ #define SET_FRAME_COLS(f, val) \
(FRAME_COLS (f) = (val), \ (FRAME_COLS (f) = (val), \
(f)->total_cols = FRAME_TOTAL_COLS_ARG (f, FRAME_COLS (f))) (f)->total_cols = FRAME_TOTAL_COLS_ARG (f, FRAME_COLS (f)))
/* Given a value WIDTH for frame F's nominal width, /* Given a value WIDTH for frame F's nominal width,
return the value that FRAME_TOTAL_COLS should have. */ return the value that FRAME_TOTAL_COLS should have. */
#define FRAME_TOTAL_COLS_ARG(f, width) \ #define FRAME_TOTAL_COLS_ARG(f, width) \
((width) \ ((width) \
+ FRAME_SCROLL_BAR_COLS (f) \ + FRAME_SCROLL_BAR_COLS (f) \
+ FRAME_FRINGE_COLS (f)) + FRAME_FRINGE_COLS (f))
/* Maximum + 1 legitimate value for FRAME_CURSOR_X. */ /* Maximum + 1 legitimate value for FRAME_CURSOR_X. */
#define FRAME_CURSOR_X_LIMIT(f) \ #define FRAME_CURSOR_X_LIMIT(f) \
(FRAME_COLS (f) + FRAME_LEFT_SCROLL_BAR_COLS (f)) (FRAME_COLS (f) + FRAME_LEFT_SCROLL_BAR_COLS (f))
/* Nonzero if frame F has scroll bars. */ /* Nonzero if frame F has scroll bars. */
...@@ -938,18 +938,18 @@ extern Lisp_Object selected_frame; ...@@ -938,18 +938,18 @@ extern Lisp_Object selected_frame;
float. Value is a C integer. */ float. Value is a C integer. */
#define FRAME_PIXEL_X_FROM_CANON_X(F, X) \ #define FRAME_PIXEL_X_FROM_CANON_X(F, X) \
(INTEGERP (X) \ (INTEGERP (X) \
? XINT (X) * FRAME_COLUMN_WIDTH (F) \ ? XINT (X) * FRAME_COLUMN_WIDTH (F) \
: (int) (XFLOAT_DATA (X) * FRAME_COLUMN_WIDTH (F))) : (int) (XFLOAT_DATA (X) * FRAME_COLUMN_WIDTH (F)))
/* Convert canonical value Y to pixels. F is the frame whose /* Convert canonical value Y to pixels. F is the frame whose
canonical character height is to be used. X must be a Lisp integer canonical character height is to be used. X must be a Lisp integer
or float. Value is a C integer. */ or float. Value is a C integer. */
#define FRAME_PIXEL_Y_FROM_CANON_Y(F, Y) \ #define FRAME_PIXEL_Y_FROM_CANON_Y(F, Y) \
(INTEGERP (Y) \ (INTEGERP (Y) \
? XINT (Y) * FRAME_LINE_HEIGHT (F) \ ? XINT (Y) * FRAME_LINE_HEIGHT (F) \
: (int) (XFLOAT_DATA (Y) * FRAME_LINE_HEIGHT (F))) : (int) (XFLOAT_DATA (Y) * FRAME_LINE_HEIGHT (F)))
/* Convert pixel-value X to canonical units. F is the frame whose /* Convert pixel-value X to canonical units. F is the frame whose
canonical character width is to be used. X is a C integer. Result canonical character width is to be used. X is a C integer. Result
...@@ -957,9 +957,9 @@ extern Lisp_Object selected_frame; ...@@ -957,9 +957,9 @@ extern Lisp_Object selected_frame;
otherwise it's a Lisp integer. */ otherwise it's a Lisp integer. */
#define FRAME_CANON_X_FROM_PIXEL_X(F, X) \ #define FRAME_CANON_X_FROM_PIXEL_X(F, X) \
((X) % FRAME_COLUMN_WIDTH (F) != 0 \ ((X) % FRAME_COLUMN_WIDTH (F) != 0 \
? make_float ((double) (X) / FRAME_COLUMN_WIDTH (F)) \ ? make_float ((double) (X) / FRAME_COLUMN_WIDTH (F)) \
: make_number ((X) / FRAME_COLUMN_WIDTH (F))) : make_number ((X) / FRAME_COLUMN_WIDTH (F)))
/* Convert pixel-value Y to canonical units. F is the frame whose /* Convert pixel-value Y to canonical units. F is the frame whose
canonical character height is to be used. Y is a C integer. canonical character height is to be used. Y is a C integer.
...@@ -967,9 +967,9 @@ extern Lisp_Object selected_frame; ...@@ -967,9 +967,9 @@ extern Lisp_Object selected_frame;
otherwise it's a Lisp integer. */ otherwise it's a Lisp integer. */
#define FRAME_CANON_Y_FROM_PIXEL_Y(F, Y) \ #define FRAME_CANON_Y_FROM_PIXEL_Y(F, Y) \
((Y) % FRAME_LINE_HEIGHT (F) \ ((Y) % FRAME_LINE_HEIGHT (F) \
? make_float ((double) (Y) / FRAME_LINE_HEIGHT (F)) \ ? make_float ((double) (Y) / FRAME_LINE_HEIGHT (F)) \
: make_number ((Y) / FRAME_LINE_HEIGHT (F))) : make_number ((Y) / FRAME_LINE_HEIGHT (F)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment