Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Side by Side Diff: ui/base/cursor/cursor_loader_x11.cc

Issue 2705293009: Add MiddleClickAutoscroll cursors back on X11 (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/base/cursor/cursor_loader_x11.h" 5 #include "ui/base/cursor/cursor_loader_x11.h"
6 6
7 #include <float.h> 7 #include <float.h>
8 #include <X11/cursorfont.h> 8 #include <X11/cursorfont.h>
9 #include <X11/Xlib.h> 9 #include <X11/Xlib.h>
10 10
(...skipping 10 matching lines...) Expand all
21 #include "ui/gfx/image/image.h" 21 #include "ui/gfx/image/image.h"
22 #include "ui/gfx/skbitmap_operations.h" 22 #include "ui/gfx/skbitmap_operations.h"
23 #include "ui/gfx/skia_util.h" 23 #include "ui/gfx/skia_util.h"
24 24
25 namespace { 25 namespace {
26 26
27 // Returns CSS cursor name from an Aura cursor ID. 27 // Returns CSS cursor name from an Aura cursor ID.
28 const char* CursorCssNameFromId(int id) { 28 const char* CursorCssNameFromId(int id) {
29 switch (id) { 29 switch (id) {
30 case ui::kCursorMiddlePanning: 30 case ui::kCursorMiddlePanning:
31 return "all-scroll";
31 case ui::kCursorEastPanning: 32 case ui::kCursorEastPanning:
33 return "e-resize";
32 case ui::kCursorNorthPanning: 34 case ui::kCursorNorthPanning:
35 return "n-resize";
33 case ui::kCursorNorthEastPanning: 36 case ui::kCursorNorthEastPanning:
37 return "ne-resize";
34 case ui::kCursorNorthWestPanning: 38 case ui::kCursorNorthWestPanning:
39 return "nw-resize";
35 case ui::kCursorSouthPanning: 40 case ui::kCursorSouthPanning:
41 return "s-resize";
36 case ui::kCursorSouthEastPanning: 42 case ui::kCursorSouthEastPanning:
43 return "se-resize";
37 case ui::kCursorSouthWestPanning: 44 case ui::kCursorSouthWestPanning:
45 return "sw-resize";
38 case ui::kCursorWestPanning: 46 case ui::kCursorWestPanning:
39 NOTREACHED() << "There's no middle-click panning on Linux or ChromeOS"; 47 return "w-resize";
40 return "left_ptr";
41 case ui::kCursorNone: 48 case ui::kCursorNone:
42 return "none"; 49 return "none";
43 case ui::kCursorGrab: 50 case ui::kCursorGrab:
44 return "grab"; 51 return "grab";
45 case ui::kCursorGrabbing: 52 case ui::kCursorGrabbing:
46 return "grabbing"; 53 return "grabbing";
47 54
48 #if defined(OS_CHROMEOS) 55 #if defined(OS_CHROMEOS)
49 case ui::kCursorNull: 56 case ui::kCursorNull:
50 case ui::kCursorPointer: 57 case ui::kCursorPointer:
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 } 349 }
343 350
344 // As a last resort, return a left pointer. 351 // As a last resort, return a left pointer.
345 cursor = XCreateFontCursor(display_, XC_left_ptr); 352 cursor = XCreateFontCursor(display_, XC_left_ptr);
346 DCHECK(cursor); 353 DCHECK(cursor);
347 font_cursors_[id] = cursor; 354 font_cursors_[id] = cursor;
348 return cursor; 355 return cursor;
349 } 356 }
350 357
351 } // namespace ui 358 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698