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 "ui/aura/root_window_host_linux.h" | 5 #include "ui/aura/root_window_host_linux.h" |
6 | 6 |
7 #include <X11/Xatom.h> | 7 #include <X11/Xatom.h> |
8 #include <X11/Xcursor/Xcursor.h> | 8 #include <X11/Xcursor/Xcursor.h> |
9 #include <X11/Xlib.h> | 9 #include <X11/Xlib.h> |
10 #include <X11/cursorfont.h> | 10 #include <X11/cursorfont.h> |
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
318 | 318 |
319 void Reload(float scale_factor) { | 319 void Reload(float scale_factor) { |
320 if (scale_factor_ == scale_factor) | 320 if (scale_factor_ == scale_factor) |
321 return; | 321 return; |
322 scale_factor_ = scale_factor; | 322 scale_factor_ = scale_factor; |
323 UnloadAll(); | 323 UnloadAll(); |
324 // The cursor's hot points are defined in chromeos cursor images at: | 324 // The cursor's hot points are defined in chromeos cursor images at: |
325 // http://folder/kuscher/projects/Chrome_OS/Pointers/focuspoint | 325 // http://folder/kuscher/projects/Chrome_OS/Pointers/focuspoint |
326 LoadImageCursor(ui::kCursorNull, IDR_AURA_CURSOR_PTR, 8, 3); | 326 LoadImageCursor(ui::kCursorNull, IDR_AURA_CURSOR_PTR, 8, 3); |
327 LoadImageCursor(ui::kCursorPointer, IDR_AURA_CURSOR_PTR, 8, 3); | 327 LoadImageCursor(ui::kCursorPointer, IDR_AURA_CURSOR_PTR, 8, 3); |
328 LoadImageCursor(ui::kCursorNoDrop, IDR_AURA_CURSOR_NO_DROP, 5, 4); | 328 LoadImageCursor(ui::kCursorNoDrop, IDR_AURA_CURSOR_NO_DROP, 3, 1); |
329 LoadImageCursor(ui::kCursorNotAllowed, IDR_AURA_CURSOR_NO_DROP, 5, 4); | 329 LoadImageCursor(ui::kCursorNotAllowed, IDR_AURA_CURSOR_NO_DROP, 3, 1); |
330 LoadImageCursor(ui::kCursorCopy, IDR_AURA_CURSOR_COPY, 5, 5); | 330 LoadImageCursor(ui::kCursorCopy, IDR_AURA_CURSOR_COPY, 3, 1); |
331 LoadImageCursor(ui::kCursorHand, IDR_AURA_CURSOR_HAND, 9, 4); | 331 LoadImageCursor(ui::kCursorHand, IDR_AURA_CURSOR_HAND, 9, 3); |
332 LoadImageCursor(ui::kCursorMove, IDR_AURA_CURSOR_MOVE, 12, 12); | 332 LoadImageCursor(ui::kCursorMove, IDR_AURA_CURSOR_MOVE, 11, 11); |
333 LoadImageCursor(ui::kCursorNorthEastResize, | 333 LoadImageCursor(ui::kCursorNorthEastResize, |
334 IDR_AURA_CURSOR_NORTH_EAST_RESIZE, 12, 11); | 334 IDR_AURA_CURSOR_NORTH_EAST_RESIZE, 12, 11); |
335 LoadImageCursor(ui::kCursorSouthWestResize, | 335 LoadImageCursor(ui::kCursorSouthWestResize, |
336 IDR_AURA_CURSOR_SOUTH_WEST_RESIZE, 12, 11); | 336 IDR_AURA_CURSOR_SOUTH_WEST_RESIZE, 12, 11); |
337 LoadImageCursor(ui::kCursorSouthEastResize, | 337 LoadImageCursor(ui::kCursorSouthEastResize, |
338 IDR_AURA_CURSOR_SOUTH_EAST_RESIZE, 11, 11); | 338 IDR_AURA_CURSOR_SOUTH_EAST_RESIZE, 11, 11); |
339 LoadImageCursor(ui::kCursorNorthWestResize, | 339 LoadImageCursor(ui::kCursorNorthWestResize, |
340 IDR_AURA_CURSOR_NORTH_WEST_RESIZE, 11, 11); | 340 IDR_AURA_CURSOR_NORTH_WEST_RESIZE, 11, 11); |
341 LoadImageCursor(ui::kCursorNorthResize, | 341 LoadImageCursor(ui::kCursorNorthResize, |
342 IDR_AURA_CURSOR_NORTH_RESIZE, 11, 10); | 342 IDR_AURA_CURSOR_NORTH_RESIZE, 11, 10); |
343 LoadImageCursor(ui::kCursorSouthResize, | 343 LoadImageCursor(ui::kCursorSouthResize, |
344 IDR_AURA_CURSOR_SOUTH_RESIZE, 11, 10); | 344 IDR_AURA_CURSOR_SOUTH_RESIZE, 11, 11); |
345 LoadImageCursor(ui::kCursorEastResize, IDR_AURA_CURSOR_EAST_RESIZE, 11, 11); | 345 LoadImageCursor(ui::kCursorEastResize, IDR_AURA_CURSOR_EAST_RESIZE, 11, 11); |
346 LoadImageCursor(ui::kCursorWestResize, IDR_AURA_CURSOR_WEST_RESIZE, 11, 11); | 346 LoadImageCursor(ui::kCursorWestResize, IDR_AURA_CURSOR_WEST_RESIZE, 11, 11); |
347 LoadImageCursor(ui::kCursorIBeam, IDR_AURA_CURSOR_IBEAM, 12, 11); | 347 LoadImageCursor(ui::kCursorIBeam, IDR_AURA_CURSOR_IBEAM, 12, 12); |
348 LoadImageCursor(ui::kCursorAlias, IDR_AURA_CURSOR_ALIAS, 8, 7); | 348 LoadImageCursor(ui::kCursorAlias, IDR_AURA_CURSOR_ALIAS, 8, 5); |
349 LoadImageCursor(ui::kCursorCell, IDR_AURA_CURSOR_CELL, 16, 15); | 349 LoadImageCursor(ui::kCursorCell, IDR_AURA_CURSOR_CELL, 12, 11); |
350 LoadImageCursor(ui::kCursorContextMenu, IDR_AURA_CURSOR_CONTEXT_MENU, 5, 5); | 350 LoadImageCursor(ui::kCursorContextMenu, IDR_AURA_CURSOR_CONTEXT_MENU, 3, 1); |
351 LoadImageCursor(ui::kCursorCross, IDR_AURA_CURSOR_CROSSHAIR, 15, 15); | 351 LoadImageCursor(ui::kCursorCross, IDR_AURA_CURSOR_CROSSHAIR, 12, 11); |
352 LoadImageCursor(ui::kCursorHelp, IDR_AURA_CURSOR_HELP, 5, 5); | 352 LoadImageCursor(ui::kCursorHelp, IDR_AURA_CURSOR_HELP, 3, 1); |
353 LoadImageCursor(ui::kCursorVerticalText, | 353 LoadImageCursor(ui::kCursorVerticalText, |
354 IDR_AURA_CURSOR_XTERM_HORIZ, 10, 12); | 354 IDR_AURA_CURSOR_XTERM_HORIZ, 12, 12); |
355 LoadImageCursor(ui::kCursorZoomIn, IDR_AURA_CURSOR_ZOOM_IN, 14, 13); | 355 LoadImageCursor(ui::kCursorZoomIn, IDR_AURA_CURSOR_ZOOM_IN, 12, 12); |
356 LoadImageCursor(ui::kCursorZoomOut, IDR_AURA_CURSOR_ZOOM_OUT, 15, 14); | 356 LoadImageCursor(ui::kCursorZoomOut, IDR_AURA_CURSOR_ZOOM_OUT, 11, 11); |
357 LoadImageCursor(ui::kCursorRowResize, IDR_AURA_CURSOR_ROW_RESIZE, 11, 11); | 357 LoadImageCursor(ui::kCursorRowResize, IDR_AURA_CURSOR_ROW_RESIZE, 11, 11); |
358 LoadImageCursor(ui::kCursorColumnResize, | 358 LoadImageCursor(ui::kCursorColumnResize, |
359 IDR_AURA_CURSOR_COL_RESIZE, 11, 10); | 359 IDR_AURA_CURSOR_COL_RESIZE, 11, 11); |
360 LoadImageCursor(ui::kCursorEastWestResize, | 360 LoadImageCursor(ui::kCursorEastWestResize, |
361 IDR_AURA_CURSOR_EAST_WEST_RESIZE, 11, 11); | 361 IDR_AURA_CURSOR_EAST_WEST_RESIZE, 11, 11); |
362 LoadImageCursor(ui::kCursorNorthSouthResize, | 362 LoadImageCursor(ui::kCursorNorthSouthResize, |
363 IDR_AURA_CURSOR_NORTH_SOUTH_RESIZE, 11, 10); | 363 IDR_AURA_CURSOR_NORTH_SOUTH_RESIZE, 11, 11); |
364 LoadImageCursor(ui::kCursorNorthEastSouthWestResize, | 364 LoadImageCursor(ui::kCursorNorthEastSouthWestResize, |
365 IDR_AURA_CURSOR_NORTH_EAST_SOUTH_WEST_RESIZE, 12, 11); | 365 IDR_AURA_CURSOR_NORTH_EAST_SOUTH_WEST_RESIZE, 12, 11); |
366 LoadImageCursor(ui::kCursorNorthWestSouthEastResize, | 366 LoadImageCursor(ui::kCursorNorthWestSouthEastResize, |
367 IDR_AURA_CURSOR_NORTH_WEST_SOUTH_EAST_RESIZE, 11, 11); | 367 IDR_AURA_CURSOR_NORTH_WEST_SOUTH_EAST_RESIZE, 11, 11); |
368 LoadAnimatedCursor(ui::kCursorWait, IDR_THROBBER, 7, 7); | 368 LoadAnimatedCursor(ui::kCursorWait, IDR_THROBBER, 7, 7); |
369 LoadAnimatedCursor(ui::kCursorProgress, IDR_THROBBER, 7, 7); | 369 LoadAnimatedCursor(ui::kCursorProgress, IDR_THROBBER, 7, 7); |
370 } | 370 } |
371 | 371 |
372 ~ImageCursors() { | 372 ~ImageCursors() { |
373 UnloadAll(); | 373 UnloadAll(); |
(...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1061 ui::ViewProp::GetValue(accelerated_widget, kRootWindowHostLinuxKey)); | 1061 ui::ViewProp::GetValue(accelerated_widget, kRootWindowHostLinuxKey)); |
1062 } | 1062 } |
1063 | 1063 |
1064 // static | 1064 // static |
1065 gfx::Size RootWindowHost::GetNativeScreenSize() { | 1065 gfx::Size RootWindowHost::GetNativeScreenSize() { |
1066 ::Display* xdisplay = base::MessagePumpAuraX11::GetDefaultXDisplay(); | 1066 ::Display* xdisplay = base::MessagePumpAuraX11::GetDefaultXDisplay(); |
1067 return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0)); | 1067 return gfx::Size(DisplayWidth(xdisplay, 0), DisplayHeight(xdisplay, 0)); |
1068 } | 1068 } |
1069 | 1069 |
1070 } // namespace aura | 1070 } // namespace aura |
OLD | NEW |