Mercurial > emacs
comparison src/xterm.h @ 112332:28ca83ef1128
Merge from mainline.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Mon, 17 Jan 2011 11:24:36 -0800 |
parents | 568ea4e08e90 |
children | 42e22c4f06b7 |
comparison
equal
deleted
inserted
replaced
112331:f6578f2bd119 | 112332:28ca83ef1128 |
---|---|
268 | 268 |
269 /* Atom used in toolkit scroll bar client messages. */ | 269 /* Atom used in toolkit scroll bar client messages. */ |
270 Atom Xatom_Scrollbar; | 270 Atom Xatom_Scrollbar; |
271 | 271 |
272 /* Atom used in XEmbed client messages. */ | 272 /* Atom used in XEmbed client messages. */ |
273 Atom Xatom_XEMBED, Xatom_XEMBED_INFO;; | 273 Atom Xatom_XEMBED, Xatom_XEMBED_INFO; |
274 | 274 |
275 /* The frame (if any) which has the X window that has keyboard focus. | 275 /* The frame (if any) which has the X window that has keyboard focus. |
276 Zero if none. This is examined by Ffocus_frame in xfns.c. Note | 276 Zero if none. This is examined by Ffocus_frame in xfns.c. Note |
277 that a mere EnterNotify event can set this; if you need to know the | 277 that a mere EnterNotify event can set this; if you need to know the |
278 last frame specified in a FocusIn or FocusOut event, use | 278 last frame specified in a FocusIn or FocusOut event, use |
279 x_focus_event_frame. */ | 279 x_focus_event_frame. */ |
1110 #define STORE_NATIVE_RECT(nr,rx,ry,rwidth,rheight) \ | 1110 #define STORE_NATIVE_RECT(nr,rx,ry,rwidth,rheight) \ |
1111 ((nr).x = (rx), \ | 1111 ((nr).x = (rx), \ |
1112 (nr).y = (ry), \ | 1112 (nr).y = (ry), \ |
1113 (nr).width = (rwidth), \ | 1113 (nr).width = (rwidth), \ |
1114 (nr).height = (rheight)) | 1114 (nr).height = (rheight)) |
1115 |