emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r114288: * xterm.h (FRAME_X_SCREEN_NUMBER): Add comm


From: Dmitry Antipov
Subject: [Emacs-diffs] trunk r114288: * xterm.h (FRAME_X_SCREEN_NUMBER): Add comment.
Date: Sun, 15 Sep 2013 06:51:14 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 114288
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Sun 2013-09-15 10:50:41 +0400
message:
  * xterm.h (FRAME_X_SCREEN_NUMBER): Add comment.
  (BLACK_PIX_DEFAULT, WHITE_PIX_DEFAULT): Use FRAME_X_SCREEN_NUMBER.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xterm.h                    xterm.h-20091113204419-o5vbwnq5f7feedwu-228
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-14 09:26:42 +0000
+++ b/src/ChangeLog     2013-09-15 06:50:41 +0000
@@ -1,3 +1,8 @@
+2013-09-15  Dmitry Antipov  <address@hidden>
+
+       * xterm.h (FRAME_X_SCREEN_NUMBER): Add comment.
+       (BLACK_PIX_DEFAULT, WHITE_PIX_DEFAULT): Use FRAME_X_SCREEN_NUMBER.
+
 2013-09-14  Eli Zaretskii  <address@hidden>
 
        * buffer.c (syms_of_buffer) <left-margin-width, right-margin-width>:

=== modified file 'src/xterm.h'
--- a/src/xterm.h       2013-09-13 15:03:51 +0000
+++ b/src/xterm.h       2013-09-15 06:50:41 +0000
@@ -78,10 +78,11 @@
 #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 @@
 
 /* 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.  */


reply via email to

[Prev in Thread] Current Thread [Next in Thread]