Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Side by Side Diff: base/message_loop/message_pump_aurax11.cc

Issue 23537016: gtk: Some code cleanup for the message-pump. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/message_loop/message_pump_aurax11.h ('k') | base/message_loop/message_pump_glib.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/message_loop/message_pump_aurax11.h" 5 #include "base/message_loop/message_pump_aurax11.h"
6 6
7 #include <glib.h> 7 #include <glib.h>
8 #include <X11/X.h> 8 #include <X11/X.h>
9 #include <X11/extensions/XInput2.h> 9 #include <X11/extensions/XInput2.h>
10 #include <X11/XKBlib.h> 10 #include <X11/XKBlib.h>
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 void MessagePumpAuraX11::AddDispatcherForRootWindow( 177 void MessagePumpAuraX11::AddDispatcherForRootWindow(
178 MessagePumpDispatcher* dispatcher) { 178 MessagePumpDispatcher* dispatcher) {
179 root_window_dispatchers_.AddObserver(dispatcher); 179 root_window_dispatchers_.AddObserver(dispatcher);
180 } 180 }
181 181
182 void MessagePumpAuraX11::RemoveDispatcherForRootWindow( 182 void MessagePumpAuraX11::RemoveDispatcherForRootWindow(
183 MessagePumpDispatcher* dispatcher) { 183 MessagePumpDispatcher* dispatcher) {
184 root_window_dispatchers_.RemoveObserver(dispatcher); 184 root_window_dispatchers_.RemoveObserver(dispatcher);
185 } 185 }
186 186
187 void MessagePumpAuraX11::AddObserver(MessagePumpObserver* observer) {
188 observers_.AddObserver(observer);
189 }
190
191 void MessagePumpAuraX11::RemoveObserver(MessagePumpObserver* observer) {
192 observers_.RemoveObserver(observer);
193 }
194
187 bool MessagePumpAuraX11::DispatchXEvents() { 195 bool MessagePumpAuraX11::DispatchXEvents() {
188 Display* display = GetDefaultXDisplay(); 196 Display* display = GetDefaultXDisplay();
189 DCHECK(display); 197 DCHECK(display);
190 MessagePumpDispatcher* dispatcher = 198 MessagePumpDispatcher* dispatcher =
191 GetDispatcher() ? GetDispatcher() : this; 199 GetDispatcher() ? GetDispatcher() : this;
192 200
193 // In the general case, we want to handle all pending events before running 201 // In the general case, we want to handle all pending events before running
194 // the tasks. This is what happens in the message_pump_glib case. 202 // the tasks. This is what happens in the message_pump_glib case.
195 while (XPending(display)) { 203 while (XPending(display)) {
196 XEvent xev; 204 XEvent xev;
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 if (FindEventTarget(xev) == x_root_window_) { 306 if (FindEventTarget(xev) == x_root_window_) {
299 FOR_EACH_OBSERVER(MessagePumpDispatcher, root_window_dispatchers_, 307 FOR_EACH_OBSERVER(MessagePumpDispatcher, root_window_dispatchers_,
300 Dispatch(xev)); 308 Dispatch(xev));
301 return true; 309 return true;
302 } 310 }
303 MessagePumpDispatcher* dispatcher = GetDispatcherForXEvent(xev); 311 MessagePumpDispatcher* dispatcher = GetDispatcherForXEvent(xev);
304 return dispatcher ? dispatcher->Dispatch(xev) : true; 312 return dispatcher ? dispatcher->Dispatch(xev) : true;
305 } 313 }
306 314
307 } // namespace base 315 } // namespace base
OLDNEW
« no previous file with comments | « base/message_loop/message_pump_aurax11.h ('k') | base/message_loop/message_pump_glib.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698