diff options
| author | Dmitry Antipov | 2013-09-15 10:50:41 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-09-15 10:50:41 +0400 |
| commit | 07013c68954574404c3f7fc640ec4bfc34a4e3b8 (patch) | |
| tree | f2c6c3cbd2da850dbf1c665ee6cec1e1e0155485 /src/xterm.h | |
| parent | 307532421098fd42d632b169a0eed9e04a47e822 (diff) | |
| download | emacs-07013c68954574404c3f7fc640ec4bfc34a4e3b8.tar.gz emacs-07013c68954574404c3f7fc640ec4bfc34a4e3b8.zip | |
* xterm.h (FRAME_X_SCREEN_NUMBER): Add comment.
(BLACK_PIX_DEFAULT, WHITE_PIX_DEFAULT): Use FRAME_X_SCREEN_NUMBER.
Diffstat (limited to 'src/xterm.h')
| -rw-r--r-- | src/xterm.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/xterm.h b/src/xterm.h index 3c091b7afcd..aa128cb5072 100644 --- a/src/xterm.h +++ b/src/xterm.h | |||
| @@ -78,10 +78,11 @@ typedef GtkWidget *xt_or_gtk_widget; | |||
| 78 | #include "dispextern.h" | 78 | #include "dispextern.h" |
| 79 | #include "termhooks.h" | 79 | #include "termhooks.h" |
| 80 | 80 | ||
| 81 | #define BLACK_PIX_DEFAULT(f) BlackPixel (FRAME_X_DISPLAY (f), \ | 81 | /* Black and white pixel values for the screen which frame F is on. */ |
| 82 | XScreenNumberOfScreen (FRAME_X_SCREEN (f))) | 82 | #define BLACK_PIX_DEFAULT(f) \ |
| 83 | #define WHITE_PIX_DEFAULT(f) WhitePixel (FRAME_X_DISPLAY (f), \ | 83 | BlackPixel (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f)) |
| 84 | XScreenNumberOfScreen (FRAME_X_SCREEN (f))) | 84 | #define WHITE_PIX_DEFAULT(f) \ |
| 85 | WhitePixel (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f)) | ||
| 85 | 86 | ||
| 86 | #define FONT_WIDTH(f) ((f)->max_width) | 87 | #define FONT_WIDTH(f) ((f)->max_width) |
| 87 | #define FONT_HEIGHT(f) ((f)->ascent + (f)->descent) | 88 | #define FONT_HEIGHT(f) ((f)->ascent + (f)->descent) |
| @@ -707,6 +708,8 @@ enum | |||
| 707 | 708 | ||
| 708 | /* This is the `Screen *' which frame F is on. */ | 709 | /* This is the `Screen *' which frame F is on. */ |
| 709 | #define FRAME_X_SCREEN(f) (FRAME_DISPLAY_INFO (f)->screen) | 710 | #define FRAME_X_SCREEN(f) (FRAME_DISPLAY_INFO (f)->screen) |
| 711 | |||
| 712 | /* This is the screen index number of screen which frame F is on. */ | ||
| 710 | #define FRAME_X_SCREEN_NUMBER(f) XScreenNumberOfScreen (FRAME_X_SCREEN (f)) | 713 | #define FRAME_X_SCREEN_NUMBER(f) XScreenNumberOfScreen (FRAME_X_SCREEN (f)) |
| 711 | 714 | ||
| 712 | /* This is the Visual which frame F is on. */ | 715 | /* This is the Visual which frame F is on. */ |