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 // This file defines utility functions for X11 (Linux only). This code has been | 5 // This file defines utility functions for X11 (Linux only). This code has been |
| 6 // ported from XCB since we can't use XCB on Ubuntu while its 32-bit support | 6 // ported from XCB since we can't use XCB on Ubuntu while its 32-bit support |
| 7 // remains woefully incomplete. | 7 // remains woefully incomplete. |
| 8 | 8 |
| 9 #include "ui/base/x/x11_util.h" | 9 #include "ui/base/x/x11_util.h" |
| 10 | 10 |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 209 render_supported_cached = true; | 209 render_supported_cached = true; |
| 210 | 210 |
| 211 return render_supported; | 211 return render_supported; |
| 212 } | 212 } |
| 213 | 213 |
| 214 int GetDefaultScreen(Display* display) { | 214 int GetDefaultScreen(Display* display) { |
| 215 return XDefaultScreen(display); | 215 return XDefaultScreen(display); |
| 216 } | 216 } |
| 217 | 217 |
| 218 Cursor GetXCursor(int cursor_shape) { | 218 Cursor GetXCursor(int cursor_shape) { |
| 219 static XCursorCache cache; | 219 CR_DEFINE_STATIC_LOCAL(XCursorCache, cache, ()); |
|
Mark Mentovai
2011/11/09 17:44:44
Break out. I won’t mention this again during this
Nico
2011/11/09 18:16:02
(Un)done. I won't say "done" for the other instanc
| |
| 220 return cache.GetCursor(cursor_shape); | 220 return cache.GetCursor(cursor_shape); |
| 221 } | 221 } |
| 222 | 222 |
| 223 XID GetX11RootWindow() { | 223 XID GetX11RootWindow() { |
| 224 return DefaultRootWindow(GetXDisplay()); | 224 return DefaultRootWindow(GetXDisplay()); |
| 225 } | 225 } |
| 226 | 226 |
| 227 bool GetCurrentDesktop(int* desktop) { | 227 bool GetCurrentDesktop(int* desktop) { |
| 228 return GetIntProperty(GetX11RootWindow(), "_NET_CURRENT_DESKTOP", desktop); | 228 return GetIntProperty(GetX11RootWindow(), "_NET_CURRENT_DESKTOP", desktop); |
| 229 } | 229 } |
| (...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 893 << "request_code " << static_cast<int>(error_event.request_code) << ", " | 893 << "request_code " << static_cast<int>(error_event.request_code) << ", " |
| 894 << "minor_code " << static_cast<int>(error_event.minor_code) | 894 << "minor_code " << static_cast<int>(error_event.minor_code) |
| 895 << " (" << request_str << ")"; | 895 << " (" << request_str << ")"; |
| 896 } | 896 } |
| 897 | 897 |
| 898 // ---------------------------------------------------------------------------- | 898 // ---------------------------------------------------------------------------- |
| 899 // End of x11_util_internal.h | 899 // End of x11_util_internal.h |
| 900 | 900 |
| 901 | 901 |
| 902 } // namespace ui | 902 } // namespace ui |
| OLD | NEW |