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 "chrome/browser/ui/libgtk2ui/gtk2_util.h" | 5 #include "chrome/browser/ui/libgtk2ui/gtk2_util.h" |
6 | 6 |
| 7 #include <gdk/gdk.h> |
| 8 #include <gdk/gdkx.h> |
7 #include <gtk/gtk.h> | 9 #include <gtk/gtk.h> |
8 | 10 |
9 #include "base/command_line.h" | 11 #include "base/command_line.h" |
10 #include "base/environment.h" | 12 #include "base/environment.h" |
11 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 14 #include "ui/aura/window.h" |
| 15 #include "ui/aura/window_tree_host.h" |
12 #include "ui/base/accelerators/accelerator.h" | 16 #include "ui/base/accelerators/accelerator.h" |
13 #include "ui/events/event_constants.h" | 17 #include "ui/events/event_constants.h" |
14 #include "ui/events/keycodes/keyboard_code_conversion_x.h" | 18 #include "ui/events/keycodes/keyboard_code_conversion_x.h" |
15 #include "ui/gfx/size.h" | 19 #include "ui/gfx/size.h" |
16 | 20 |
17 namespace { | 21 namespace { |
18 | 22 |
| 23 const char kAuraTransientParent[] = "aura-transient-parent"; |
| 24 |
19 void CommonInitFromCommandLine(const CommandLine& command_line, | 25 void CommonInitFromCommandLine(const CommandLine& command_line, |
20 void (*init_func)(gint*, gchar***)) { | 26 void (*init_func)(gint*, gchar***)) { |
21 const std::vector<std::string>& args = command_line.argv(); | 27 const std::vector<std::string>& args = command_line.argv(); |
22 int argc = args.size(); | 28 int argc = args.size(); |
23 scoped_ptr<char *[]> argv(new char *[argc + 1]); | 29 scoped_ptr<char *[]> argv(new char *[argc + 1]); |
24 for (size_t i = 0; i < args.size(); ++i) { | 30 for (size_t i = 0; i < args.size(); ++i) { |
25 // TODO(piman@google.com): can gtk_init modify argv? Just being safe | 31 // TODO(piman@google.com): can gtk_init modify argv? Just being safe |
26 // here. | 32 // here. |
27 argv[i] = strdup(args[i].c_str()); | 33 argv[i] = strdup(args[i].c_str()); |
28 } | 34 } |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 flags |= (state & GDK_CONTROL_MASK) ? ui::EF_CONTROL_DOWN : ui::EF_NONE; | 96 flags |= (state & GDK_CONTROL_MASK) ? ui::EF_CONTROL_DOWN : ui::EF_NONE; |
91 flags |= (state & GDK_SHIFT_MASK) ? ui::EF_SHIFT_DOWN : ui::EF_NONE; | 97 flags |= (state & GDK_SHIFT_MASK) ? ui::EF_SHIFT_DOWN : ui::EF_NONE; |
92 flags |= (state & GDK_MOD1_MASK) ? ui::EF_ALT_DOWN : ui::EF_NONE; | 98 flags |= (state & GDK_MOD1_MASK) ? ui::EF_ALT_DOWN : ui::EF_NONE; |
93 flags |= (state & GDK_BUTTON1_MASK) ? ui::EF_LEFT_MOUSE_BUTTON : ui::EF_NONE; | 99 flags |= (state & GDK_BUTTON1_MASK) ? ui::EF_LEFT_MOUSE_BUTTON : ui::EF_NONE; |
94 flags |= | 100 flags |= |
95 (state & GDK_BUTTON2_MASK) ? ui::EF_MIDDLE_MOUSE_BUTTON : ui::EF_NONE; | 101 (state & GDK_BUTTON2_MASK) ? ui::EF_MIDDLE_MOUSE_BUTTON : ui::EF_NONE; |
96 flags |= (state & GDK_BUTTON3_MASK) ? ui::EF_RIGHT_MOUSE_BUTTON : ui::EF_NONE; | 102 flags |= (state & GDK_BUTTON3_MASK) ? ui::EF_RIGHT_MOUSE_BUTTON : ui::EF_NONE; |
97 return flags; | 103 return flags; |
98 } | 104 } |
99 | 105 |
| 106 // Set |dialog| as transient for |parent|, which will keep it on top and center |
| 107 // it above |parent|. |
| 108 void SetGtkTransientForAura(GtkWidget* dialog, aura::Window* parent) { |
| 109 gtk_widget_realize(dialog); |
| 110 GdkWindow* gdk_window = gtk_widget_get_window(dialog); |
| 111 |
| 112 // TODO(erg): Check to make sure we're using X11 if wayland or some other |
| 113 // display server ever happens. Otherwise, this will crash. |
| 114 XSetTransientForHint(GDK_WINDOW_XDISPLAY(gdk_window), |
| 115 GDK_WINDOW_XID(gdk_window), |
| 116 parent->GetHost()->GetAcceleratedWidget()); |
| 117 |
| 118 // We also set the |parent| as a property of |dialog|, so that we can unlink |
| 119 // the two later. |
| 120 g_object_set_data(G_OBJECT(dialog), kAuraTransientParent, parent); |
| 121 } |
| 122 |
| 123 aura::Window* GetAuraTransientParent(GtkWidget* dialog) { |
| 124 return reinterpret_cast<aura::Window*>( |
| 125 g_object_get_data(G_OBJECT(dialog), kAuraTransientParent)); |
| 126 } |
| 127 |
| 128 void ClearAuraTransientParent(GtkWidget* dialog) { |
| 129 g_object_set_data(G_OBJECT(dialog), kAuraTransientParent, NULL); |
| 130 } |
| 131 |
100 } // namespace libgtk2ui | 132 } // namespace libgtk2ui |
OLD | NEW |