* xterm.h (FRAME_X_SCREEN_NUMBER): Add comment.

(BLACK_PIX_DEFAULT, WHITE_PIX_DEFAULT): Use FRAME_X_SCREEN_NUMBER.

diff --git a/src/ChangeLog b/src/ChangeLog
index 00f3fa8eccfd3470be723d9ea31169b5511b6459..102818e04a53974dd9bffa6d409d115bb7d95f4e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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>:

diff --git a/src/xterm.h b/src/xterm.h
index 3c091b7afcdf3bf0827b2622f5968e5743720ad2..aa128cb50724b386abaf333e790cf89435489982 100644 (file)
--- 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.  */