Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/renderer_host/render_widget_host_view_gtk.h" | 5 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h" |
| 6 | 6 |
| 7 // If this gets included after the gtk headers, then a bunch of compiler | 7 // If this gets included after the gtk headers, then a bunch of compiler |
| 8 // errors happen because of a "#define Status int" in Xlib.h, which interacts | 8 // errors happen because of a "#define Status int" in Xlib.h, which interacts |
| 9 // badly with net::URLRequestStatus::Status. | 9 // badly with net::URLRequestStatus::Status. |
| 10 #include "chrome/common/render_messages.h" | 10 #include "chrome/common/render_messages.h" |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 227 // Called when we are shadowed or unshadowed by a keyboard grab (which will | 227 // Called when we are shadowed or unshadowed by a keyboard grab (which will |
| 228 // occur for activatable popups, such as dropdown menus). Popup windows do not | 228 // occur for activatable popups, such as dropdown menus). Popup windows do not |
| 229 // take focus, so we never get a focus out or focus in event when they are | 229 // take focus, so we never get a focus out or focus in event when they are |
| 230 // shown, and must rely on this signal instead. | 230 // shown, and must rely on this signal instead. |
| 231 static void OnGrabNotify(GtkWidget* widget, gboolean was_grabbed, | 231 static void OnGrabNotify(GtkWidget* widget, gboolean was_grabbed, |
| 232 RenderWidgetHostViewGtk* host_view) { | 232 RenderWidgetHostViewGtk* host_view) { |
| 233 if (was_grabbed) { | 233 if (was_grabbed) { |
| 234 if (host_view->was_focused_before_grab_) | 234 if (host_view->was_focused_before_grab_) |
| 235 host_view->im_context_->OnFocusIn(); | 235 host_view->im_context_->OnFocusIn(); |
| 236 } else { | 236 } else { |
| 237 host_view->was_focused_before_grab_ = host_view->HasFocus(); | 237 host_view->was_focused_before_grab_ = host_view->im_context_->IsFocused(); |
|
Evan Stade
2011/08/04 04:00:47
seems like was_focused_before_grab_ is not really
kinaba
2011/08/04 04:24:37
Done.
| |
| 238 if (host_view->was_focused_before_grab_) { | 238 if (host_view->was_focused_before_grab_) { |
| 239 gdk_window_set_cursor(widget->window, NULL); | 239 gdk_window_set_cursor(widget->window, NULL); |
| 240 host_view->im_context_->OnFocusOut(); | 240 host_view->im_context_->OnFocusOut(); |
| 241 } | 241 } |
| 242 } | 242 } |
| 243 } | 243 } |
| 244 | 244 |
| 245 static gboolean OnButtonPressReleaseEvent( | 245 static gboolean OnButtonPressReleaseEvent( |
| 246 GtkWidget* widget, | 246 GtkWidget* widget, |
| 247 GdkEventButton* event, | 247 GdkEventButton* event, |
| (...skipping 936 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1184 } | 1184 } |
| 1185 | 1185 |
| 1186 // static | 1186 // static |
| 1187 RenderWidgetHostView* | 1187 RenderWidgetHostView* |
| 1188 RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView( | 1188 RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView( |
| 1189 gfx::NativeView widget) { | 1189 gfx::NativeView widget) { |
| 1190 gpointer user_data = g_object_get_data(G_OBJECT(widget), | 1190 gpointer user_data = g_object_get_data(G_OBJECT(widget), |
| 1191 kRenderWidgetHostViewKey); | 1191 kRenderWidgetHostViewKey); |
| 1192 return reinterpret_cast<RenderWidgetHostView*>(user_data); | 1192 return reinterpret_cast<RenderWidgetHostView*>(user_data); |
| 1193 } | 1193 } |
| OLD | NEW |