OLD | NEW |
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_gtk.h" | 5 #include "base/message_loop/message_pump_gtk.h" |
6 | 6 |
7 #include <gtk/gtk.h> | 7 #include <gtk/gtk.h> |
8 #include <gdk/gdkx.h> | 8 #include <gdk/gdkx.h> |
9 | 9 |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 MessagePumpGtk::~MessagePumpGtk() { | 68 MessagePumpGtk::~MessagePumpGtk() { |
69 gdk_event_handler_set(reinterpret_cast<GdkEventFunc>(gtk_main_do_event), | 69 gdk_event_handler_set(reinterpret_cast<GdkEventFunc>(gtk_main_do_event), |
70 this, NULL); | 70 this, NULL); |
71 } | 71 } |
72 | 72 |
73 void MessagePumpGtk::DispatchEvents(GdkEvent* event) { | 73 void MessagePumpGtk::DispatchEvents(GdkEvent* event) { |
74 UNSHIPPED_TRACE_EVENT1("task", "MessagePumpGtk::DispatchEvents", | 74 UNSHIPPED_TRACE_EVENT1("task", "MessagePumpGtk::DispatchEvents", |
75 "type", EventToTypeString(event)); | 75 "type", EventToTypeString(event)); |
76 | 76 |
77 WillProcessEvent(event); | 77 WillProcessEvent(event); |
78 | 78 gtk_main_do_event(event); |
79 MessagePumpDispatcher* dispatcher = GetDispatcher(); | |
80 if (!dispatcher) | |
81 gtk_main_do_event(event); | |
82 else if (!dispatcher->Dispatch(event)) | |
83 Quit(); | |
84 | |
85 DidProcessEvent(event); | 79 DidProcessEvent(event); |
86 } | 80 } |
87 | 81 |
88 // static | 82 // static |
89 Display* MessagePumpGtk::GetDefaultXDisplay() { | 83 Display* MessagePumpGtk::GetDefaultXDisplay() { |
90 static GdkDisplay* display = gdk_display_get_default(); | 84 static GdkDisplay* display = gdk_display_get_default(); |
91 if (!display) { | 85 if (!display) { |
92 // GTK / GDK has not been initialized, which is a decision we wish to | 86 // GTK / GDK has not been initialized, which is a decision we wish to |
93 // support, for example for the GPU process. | 87 // support, for example for the GPU process. |
94 static Display* xdisplay = XOpenDisplay(NULL); | 88 static Display* xdisplay = XOpenDisplay(NULL); |
95 return xdisplay; | 89 return xdisplay; |
96 } | 90 } |
97 return GDK_DISPLAY_XDISPLAY(display); | 91 return GDK_DISPLAY_XDISPLAY(display); |
98 } | 92 } |
99 | 93 |
| 94 void MessagePumpGtk::AddObserver(MessagePumpGdkObserver* observer) { |
| 95 observers_.AddObserver(observer); |
| 96 } |
| 97 |
| 98 void MessagePumpGtk::RemoveObserver(MessagePumpGdkObserver* observer) { |
| 99 observers_.RemoveObserver(observer); |
| 100 } |
| 101 |
100 void MessagePumpGtk::WillProcessEvent(GdkEvent* event) { | 102 void MessagePumpGtk::WillProcessEvent(GdkEvent* event) { |
101 FOR_EACH_OBSERVER(MessagePumpObserver, observers(), WillProcessEvent(event)); | 103 FOR_EACH_OBSERVER(MessagePumpGdkObserver, |
| 104 observers_, |
| 105 WillProcessEvent(event)); |
102 } | 106 } |
103 | 107 |
104 void MessagePumpGtk::DidProcessEvent(GdkEvent* event) { | 108 void MessagePumpGtk::DidProcessEvent(GdkEvent* event) { |
105 FOR_EACH_OBSERVER(MessagePumpObserver, observers(), DidProcessEvent(event)); | 109 FOR_EACH_OBSERVER(MessagePumpGdkObserver, |
| 110 observers_, |
| 111 DidProcessEvent(event)); |
106 } | 112 } |
107 | 113 |
108 // static | 114 // static |
109 void MessagePumpGtk::EventDispatcher(GdkEvent* event, gpointer data) { | 115 void MessagePumpGtk::EventDispatcher(GdkEvent* event, gpointer data) { |
110 MessagePumpGtk* message_pump = reinterpret_cast<MessagePumpGtk*>(data); | 116 MessagePumpGtk* message_pump = reinterpret_cast<MessagePumpGtk*>(data); |
111 message_pump->DispatchEvents(event); | 117 message_pump->DispatchEvents(event); |
112 } | 118 } |
113 | 119 |
114 } // namespace base | 120 } // namespace base |
OLD | NEW |