| 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 // 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 1291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1302 PictFormatGreen | PictFormatGreenMask | | 1302 PictFormatGreen | PictFormatGreenMask | |
| 1303 PictFormatBlue | PictFormatBlueMask | | 1303 PictFormatBlue | PictFormatBlueMask | |
| 1304 PictFormatAlphaMask; | 1304 PictFormatAlphaMask; |
| 1305 | 1305 |
| 1306 pictformat = XRenderFindFormat(dpy, kMask, &templ, 0 /* first result */); | 1306 pictformat = XRenderFindFormat(dpy, kMask, &templ, 0 /* first result */); |
| 1307 | 1307 |
| 1308 if (!pictformat) { | 1308 if (!pictformat) { |
| 1309 // Not all X servers support xRGB32 formats. However, the XRENDER spec says | 1309 // Not all X servers support xRGB32 formats. However, the XRENDER spec says |
| 1310 // that they must support an ARGB32 format, so we can always return that. | 1310 // that they must support an ARGB32 format, so we can always return that. |
| 1311 pictformat = XRenderFindStandardFormat(dpy, PictStandardARGB32); | 1311 pictformat = XRenderFindStandardFormat(dpy, PictStandardARGB32); |
| 1312 CHECK(pictformat) << "XRENDER ARGB32 not supported."; | 1312 // XRENDER ARGB32 not supported. |
| 1313 CHECK(pictformat); |
| 1313 } | 1314 } |
| 1314 | 1315 |
| 1315 return pictformat; | 1316 return pictformat; |
| 1316 } | 1317 } |
| 1317 | 1318 |
| 1318 void SetX11ErrorHandlers(XErrorHandler error_handler, | 1319 void SetX11ErrorHandlers(XErrorHandler error_handler, |
| 1319 XIOErrorHandler io_error_handler) { | 1320 XIOErrorHandler io_error_handler) { |
| 1320 XSetErrorHandler(error_handler ? error_handler : DefaultX11ErrorHandler); | 1321 XSetErrorHandler(error_handler ? error_handler : DefaultX11ErrorHandler); |
| 1321 XSetIOErrorHandler( | 1322 XSetIOErrorHandler( |
| 1322 io_error_handler ? io_error_handler : DefaultX11IOErrorHandler); | 1323 io_error_handler ? io_error_handler : DefaultX11IOErrorHandler); |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1475 return colormap_; | 1476 return colormap_; |
| 1476 } | 1477 } |
| 1477 | 1478 |
| 1478 #endif | 1479 #endif |
| 1479 | 1480 |
| 1480 // ---------------------------------------------------------------------------- | 1481 // ---------------------------------------------------------------------------- |
| 1481 // End of x11_util_internal.h | 1482 // End of x11_util_internal.h |
| 1482 | 1483 |
| 1483 | 1484 |
| 1484 } // namespace ui | 1485 } // namespace ui |
| OLD | NEW |