* xterm.h (FRAME_X_SCREEN_NUMBER): Add comment.

(BLACK_PIX_DEFAULT, WHITE_PIX_DEFAULT): Use FRAME_X_SCREEN_NUMBER.

* xterm.h (FRAME_X_SCREEN_NUMBER): Add comment.
(BLACK_PIX_DEFAULT, WHITE_PIX_DEFAULT): Use FRAME_X_SCREEN_NUMBER.
07013c68 · Dmitry Antipov · 30753242 · 07013c68 · 07013c68
Commit 07013c68 authored Sep 15, 2013 by Dmitry Antipov
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 4 deletions

src/ChangeLog src/ChangeLog +5 -0

src/xterm.h src/xterm.h +7 -4

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2013-09-15  Dmitry Antipov  <dmantipov@yandex.ru>
+
+	* xterm.h (FRAME_X_SCREEN_NUMBER): Add comment.
+	(BLACK_PIX_DEFAULT, WHITE_PIX_DEFAULT): Use FRAME_X_SCREEN_NUMBER.
+
 2013-09-14  Eli Zaretskii  <eliz@gnu.org>

 	* buffer.c (syms_of_buffer) <left-margin-width, right-margin-width>:

--- a/src/xterm.h
+++ b/src/xterm.h
@@ -78,10 +78,11 @@ typedef GtkWidget *xt_or_gtk_widget;
 #include "dispextern.h"
 #include "termhooks.h"

-#define BLACK_PIX_DEFAULT(f) BlackPixel (FRAME_X_DISPLAY (f), \
-					 XScreenNumberOfScreen (FRAME_X_SCREEN (f)))
-#define WHITE_PIX_DEFAULT(f) WhitePixel (FRAME_X_DISPLAY (f), \
-					 XScreenNumberOfScreen (FRAME_X_SCREEN (f)))
+/* Black and white pixel values for the screen which frame F is on.  */
+#define BLACK_PIX_DEFAULT(f)					\
+  BlackPixel (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f))
+#define WHITE_PIX_DEFAULT(f)					\
+  WhitePixel (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f))

 #define FONT_WIDTH(f)	((f)->max_width)
 #define FONT_HEIGHT(f)	((f)->ascent + (f)->descent)
@@ -707,6 +708,8 @@ enum

 /* This is the `Screen *' which frame F is on.  */
 #define FRAME_X_SCREEN(f) (FRAME_DISPLAY_INFO (f)->screen)
+
+/* This is the screen index number of screen which frame F is on.  */
 #define FRAME_X_SCREEN_NUMBER(f) XScreenNumberOfScreen (FRAME_X_SCREEN (f))

 /* This is the Visual which frame F is on.  */