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

Side by Side Diff: ui/events/keycodes/keyboard_code_conversion_xkb.h

Issue 1284433002: Revise ui::DomKey to unify character and non-character codes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IsDead Created 5 years, 3 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
OLDNEW
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 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 #ifndef UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_XKB_H_ 5 #ifndef UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_XKB_H_
6 #define UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_XKB_H_ 6 #define UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_XKB_H_
7 7
8 // These functions are used by X11 targets and by Ozone/XKBcommon targets. 8 // These functions are used by X11 targets and by Ozone/XKBcommon targets.
9 9
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
11 #include "ui/events/events_base_export.h" 11 #include "ui/events/events_base_export.h"
12 #include "ui/events/keycodes/dom/dom_key.h"
12 #include "ui/events/keycodes/xkb_keysym.h" 13 #include "ui/events/keycodes/xkb_keysym.h"
13 14
14 namespace ui { 15 namespace ui {
15 16
16 enum class DomKey;
17
18 // Returns the DomKey associated with a non-character xkb_keysym_t. 17 // Returns the DomKey associated with a non-character xkb_keysym_t.
19 // Returns DomKey::NONE for unrecognized keysyms, which includes 18 // Returns DomKey::NONE for unrecognized keysyms, which includes
20 // all printable characters. 19 // all printable characters.
21 EVENTS_BASE_EXPORT DomKey NonPrintableXKeySymToDomKey(xkb_keysym_t keysym); 20 EVENTS_BASE_EXPORT DomKey NonPrintableXKeySymToDomKey(xkb_keysym_t keysym);
22 21
23 // TODO(kpschoedel) crbug.com/442757 22 // TODO(kpschoedel) crbug.com/442757
24 // Returns the dead key combining character associated with an xkb_keysym_t, 23 // Returns the dead key combining character associated with an xkb_keysym_t,
25 // or 0 if the keysym is not recognized. 24 // or 0 if the keysym is not recognized.
26 // base::char16 DeadXKeySymToCombiningCharacter(xkb_keysym_t keysym); 25 // base::char16 DeadXKeySymToCombiningCharacter(xkb_keysym_t keysym);
27 26
28 // Return the DomKey determined by the XKB layout result (keysym, character). 27 // Return the DomKey determined by the XKB layout result (keysym, character).
29 EVENTS_BASE_EXPORT DomKey 28 EVENTS_BASE_EXPORT DomKey
30 XKeySymToDomKey(xkb_keysym_t keysym, base::char16 character); 29 XKeySymToDomKey(xkb_keysym_t keysym, base::char16 character);
31 30
32 } // namespace ui 31 } // namespace ui
33 32
34 #endif // UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_XKB_H_ 33 #endif // UI_EVENTS_KEYCODES_KEYBOARD_CODE_CONVERSION_XKB_H_
OLDNEW
« no previous file with comments | « ui/events/keycodes/keyboard_code_conversion_x.cc ('k') | ui/events/keycodes/keyboard_code_conversion_xkb.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698