Chromium Code Reviews| Index: base/message_pump_aurax11.h |
| diff --git a/base/message_pump_aurax11.h b/base/message_pump_aurax11.h |
| index 1f860040791c85d4f2ba56cc6705bd9b3a0e1b7c..9dd8c40b587ecfef72936f68058665319ce0af20 100644 |
| --- a/base/message_pump_aurax11.h |
| +++ b/base/message_pump_aurax11.h |
| @@ -13,6 +13,11 @@ |
| #include <bitset> |
| +// It would be nice to including X11 headers here so that we use Window instead |
|
Daniel Erat
2012/08/15 20:30:57
nit: s/including/include/
|
| +// of its typedef of unsigned long, but we can't because everything in chrome |
| +// includes us through base/message_loop.h, and X11's crappy #define heavy |
| +// headers muck up half of chrome. |
| + |
| typedef struct _GPollFD GPollFD; |
| typedef struct _GSource GSource; |
| typedef struct _XDisplay Display; |
| @@ -33,10 +38,24 @@ class BASE_EXPORT MessagePumpAuraX11 : public MessagePumpGlib { |
| // Sets the default dispatcher to process native events. |
| static void SetDefaultDispatcher(MessagePumpDispatcher* dispatcher); |
| + // Returns the UI message pump. |
| + static MessagePumpAuraX11* Current(); |
| + |
| // Internal function. Called by the glib source dispatch function. Processes |
| // all available X events. |
| bool DispatchXEvents(); |
| + // Blocks on the X11 event queue until we receive notification from the |
| + // xserver that |w| has been mapped; events on |w| are pulled out from the |
|
Daniel Erat
2012/08/15 20:30:57
nit: s/events/StructureNotifyMask (see http://tron
|
| + // queue and dispatched out of order. |
| + // |
| + // For those that know X11, this is really a wrapper around XWindowEvent |
| + // which still makes sure the preempted event is dispatched instead of |
| + // dropped on the floor. This method exists because mapping a window is |
| + // asynchronous (and we receive an XEvent when mapped), while there are also |
| + // functions which require a mapped window. |
| + void BlockUntilWindowMapped(unsigned long w); |
|
Daniel Erat
2012/08/15 20:30:57
nit: s/w/window/
|
| + |
| protected: |
| virtual ~MessagePumpAuraX11(); |