Return printable character when Ctrl+2 is pressed [chromium/src : main]
Hyomin Kim (Gerrit)
Attention is currently required from: Hyomin Kim.
Hyomin Kim uploaded patch set #4 to this change.
Return printable character when Ctrl+2 is pressed
Bug: 1410732
Change-Id: Id2282448454e178803ef192aacb5fca31fee5c5d
---
M ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
1 file changed, 1 insertion(+), 1 deletion(-)
To view, visit change 4714468. To unsubscribe, or for help writing mail filters, visit settings.
Hyomin Kim (Gerrit)
Attention is currently required from: Hyomin Kim.
Hyomin Kim uploaded patch set #5 to this change.
Return printable character when Ctrl+2 is pressed
When Ctrl+2 is pressed, the return value from XKB is 0,
referring to [0]. So condition [1] has to be skipped
in this case. In order to get [2] to return the printable
character.
[0]
https://github.com/xkbcommon/libxkbcommon/blob/master/src/state.c#L899
[1]
ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc;l=824
[2]
Bug: 1410732
Change-Id: Id2282448454e178803ef192aacb5fca31fee5c5d
---
M ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
1 file changed, 1 insertion(+), 1 deletion(-)
To view, visit change 4714468. To unsubscribe, or for help writing mail filters, visit settings.
Hyomin Kim (Gerrit)
Attention is currently required from: Hyomin Kim.
Hyomin Kim uploaded patch set #6 to this change.
Return printable character when Ctrl+2 is pressed
When Ctrl+2 is pressed, the return value from XKB is 0,
referring to [0]. So condition [1] has to be skipped
in this case. In order to get [2] to return the printable
character.
[0]
https://github.com/xkbcommon/libxkbcommon/blob/master/src/state.c#L899
[1]
src/+/main:ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc;l=824
[2]
Bug: 1410732
Change-Id: Id2282448454e178803ef192aacb5fca31fee5c5d
---
M ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
1 file changed, 1 insertion(+), 1 deletion(-)
To view, visit change 4714468. To unsubscribe, or for help writing mail filters, visit settings.
Hyomin Kim (Gerrit)
Attention is currently required from: Hyomin Kim.
Hyomin Kim uploaded patch set #7 to this change.
Return printable character when Ctrl+2 is pressed
When Ctrl+2 is pressed, the return value from XKB is 0,
referring to [0]. So condition [1] has to be skipped
in this case. In order to get [2] to return the printable
character.
[0]
https://github.com/xkbcommon/libxkbcommon/blob/master/src/state.c#L899
[1]
https://source.chromium.org/chromium/chromium/src/+/main:ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc;l=824
[2]
https://source.chromium.org/chromium/chromium/src/+/main:ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc;l=837
Bug: 1410732
Change-Id: Id2282448454e178803ef192aacb5fca31fee5c5d
---
M ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
1 file changed, 1 insertion(+), 1 deletion(-)
To view, visit change 4714468. To unsubscribe, or for help writing mail filters, visit settings.
Hyomin Kim (Gerrit)
Attention is currently required from: Michael Spang, Rob Schonberger.
Hyomin Kim would like Michael Spang and Rob Schonberger to review this change.
Return printable character when Ctrl+2 is pressed
When Ctrl+2 is pressed, the return value from XKB is 0,
referring to [0]. So condition [1] has to be skipped
in this case. In order to get [2] to return the printable
character.
[0]
https://github.com/xkbcommon/libxkbcommon/blob/master/src/state.c#L899
[1]
https://source.chromium.org/chromium/chromium/src/+/main:ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc;l=824
[2]
https://source.chromium.org/chromium/chromium/src/+/main:ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc;l=837
Bug: 1410732
Change-Id: Id2282448454e178803ef192aacb5fca31fee5c5d
---
M ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
index 229193eb..11b1147 100644
--- a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
+++ b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
@@ -821,7 +821,7 @@
*key_code = DomCodeToUsLayoutNonLocatedKeyboardCode(dom_code);
return true;
}
- if (character == 0) {
+ if (character == 0 && !(dom_code == DomCode::DIGIT2 && (flags & EF_CONTROL_DOWN))){
*dom_key = DomKey::UNIDENTIFIED;
*key_code = DomCodeToUsLayoutNonLocatedKeyboardCode(dom_code);
return true;
To view, visit change 4714468. To unsubscribe, or for help writing mail filters, visit settings.
Hyomin Kim (Gerrit)
Hyomin Kim (Gerrit)
Hyomin Kim uploaded patch set #3 to this change.
Return printable character when Ctrl+2 is pressed
When Ctrl+2 is pressed, the return value from XKB is 0,
referring to [0]. So condition [1] has to be skipped
in this case. In order to get [2] to return the printable
character.
[0]
https://github.com/xkbcommon/libxkbcommon/blob/master/src/state.c#L899
[1]
https://source.chromium.org/chromium/chromium/src/+/main:ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc;l=824
[2]
https://source.chromium.org/chromium/chromium/src/+/main:ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc;l=837
Bug: 1410732
Change-Id: I5385ec8d64ad1da27571c4b6f02911e6e27e46f8
---
M ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
1 file changed, 2 insertions(+), 1 deletion(-)
To view, visit change 4721787. To unsubscribe, or for help writing mail filters, visit settings.
Hyomin Kim (Gerrit)
Attention is currently required from: Robert Kroeger, Scott Violet.
Hyomin Kim would like Robert Kroeger and Scott Violet to review this change.
Return printable character when Ctrl+2 is pressed
When Ctrl+2 is pressed, the return value from XKB is 0,
referring to [0]. So condition [1] has to be skipped
in this case. In order to get [2] to return the printable
character.
[0]
https://github.com/xkbcommon/libxkbcommon/blob/master/src/state.c#L899
[1]
https://source.chromium.org/chromium/chromium/src/+/main:ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc;l=824
[2]
https://source.chromium.org/chromium/chromium/src/+/main:ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc;l=837
Bug: 1410732
Change-Id: I5385ec8d64ad1da27571c4b6f02911e6e27e46f8
---
M ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
index 229193eb..1be068b3 100644
--- a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
+++ b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
@@ -821,7 +821,8 @@
*key_code = DomCodeToUsLayoutNonLocatedKeyboardCode(dom_code);
return true;
}
- if (character == 0) {
+ if (character == 0 &&
+ !(dom_code == DomCode::DIGIT2 && (flags & EF_CONTROL_DOWN))) {
*dom_key = DomKey::UNIDENTIFIED;
*key_code = DomCodeToUsLayoutNonLocatedKeyboardCode(dom_code);
return true;
To view, visit change 4721787. To unsubscribe, or for help writing mail filters, visit settings.
Scott Violet (Gerrit)
Attention is currently required from: Hyomin Kim, Robert Kroeger.
1 comment:
File ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc:
Patch Set #3, Line 824:
if (character == 0 &&Why is control-2 special? What spec/doc necessitates it being handled differently?
To view, visit change 4721787. To unsubscribe, or for help writing mail filters, visit settings.
Hyomin Kim (Gerrit)
Attention is currently required from: Robert Kroeger.
Hyomin Kim uploaded patch set #5 to this change.
Return printable character when Ctrl+2 is pressed
When Ctrl+2 is pressed, the return value from XKB is 0,
referring to [0]. So condition [1] has to be skipped
in this case. In order to get [2] to return the printable
character.
[0]
https://github.com/xkbcommon/libxkbcommon/blob/master/src/state.c#L899
[1]
https://source.chromium.org/chromium/chromium/src/+/main:ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc;l=824
[2]
https://source.chromium.org/chromium/chromium/src/+/main:ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc;l=837
Bug: 1410732
Change-Id: I5385ec8d64ad1da27571c4b6f02911e6e27e46f8
---
M ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
1 file changed, 1 insertion(+), 1 deletion(-)
To view, visit change 4721787. To unsubscribe, or for help writing mail filters, visit settings.
Hyomin Kim (Gerrit)
Attention is currently required from: Hyomin Kim, Robert Kroeger.
Hyomin Kim uploaded patch set #6 to this change.
The following approvals got outdated and were removed: Commit-Queue+1 by Hyomin Kim
Return printable character when Ctrl+2 is pressed
When Ctrl+2 is pressed, the return value from XKB is 0,
referring to [0]. So condition [1] has to be skipped
in this case. In order to get [2] to return the printable
character.
[0]
https://github.com/xkbcommon/libxkbcommon/blob/master/src/state.c#L899
[1]
https://source.chromium.org/chromium/chromium/src/+/main:ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc;l=824
[2]
https://source.chromium.org/chromium/chromium/src/+/main:ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc;l=837
Bug: 1410732
Change-Id: I5385ec8d64ad1da27571c4b6f02911e6e27e46f8
---
M ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
1 file changed, 2 insertions(+), 2 deletions(-)
To view, visit change 4721787. To unsubscribe, or for help writing mail filters, visit settings.
Hyomin Kim (Gerrit)
Attention is currently required from: Robert Kroeger.
Hyomin Kim uploaded patch set #7 to this change.
Return printable character when Ctrl+2 is pressed
The control modifier of 2(^2) should be treated as same as the one of atsign(^@), which is NULL. Please refer to the issue of libXKBCommon[0] for further information
[0]
https://github.com/xkbcommon/libxkbcommon/issues/368
Bug: 1410732
Change-Id: I5385ec8d64ad1da27571c4b6f02911e6e27e46f8
---
M ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
1 file changed, 2 insertions(+), 2 deletions(-)
To view, visit change 4721787. To unsubscribe, or for help writing mail filters, visit settings.
Hyomin Kim (Gerrit)
Attention is currently required from: Robert Kroeger, Scott Violet.
Patch set 7:Commit-Queue +1
1 comment:
File ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc:
Patch Set #3, Line 824:
if (character == 0 &&Why is control-2 special? What spec/doc necessitates it being handled differently?
As I mentioned in the commit message, control+2 has to be treated as control+@. Please refer to the issue above.a
To view, visit change 4721787. To unsubscribe, or for help writing mail filters, visit settings.
Scott Violet (Gerrit)
Attention is currently required from: Hyomin Kim, Michael Spang, Robert Kroeger.
Scott Violet would like Michael Spang to review this change authored by Hyomin Kim.
Return printable character when Ctrl+2 is pressed
The control modifier of 2(^2) should be treated as same as the one of atsign(^@), which is NULL. Please refer to the issue of libXKBCommon[0] for further information
[0]
https://github.com/xkbcommon/libxkbcommon/issues/368
Bug: 1410732
Change-Id: I5385ec8d64ad1da27571c4b6f02911e6e27e46f8
---
M ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
index 229193eb..d8633d6 100644
--- a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
+++ b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
@@ -812,8 +812,8 @@
#endif // BUILDFLAG(IS_CHROMEOS)
// Classify the keysym and convert to DOM and VKEY representations.
- if (xkb_keysym != XKB_KEY_at || (flags & EF_CONTROL_DOWN) == 0) {
- // Non-character key. (We only support NUL as ^@.)
+ if (dom_code != DomCode::DIGIT2 || (flags & EF_CONTROL_DOWN) == 0) {
+ // Non-character key. (We only support NUL as ^@ and ^2.)
*dom_key = NonPrintableXKeySymToDomKey(xkb_keysym);
if (*dom_key != DomKey::NONE) {
*key_code = NonPrintableDomKeyToKeyboardCode(*dom_key);
To view, visit change 4721787. To unsubscribe, or for help writing mail filters, visit settings.
Scott Violet (Gerrit)
Attention is currently required from: Hyomin Kim, Michael Spang, Robert Kroeger.
To view, visit change 4721787. To unsubscribe, or for help writing mail filters, visit settings.
Robert Kroeger (Gerrit)
Attention is currently required from: Hyomin Kim, Michael Spang.
Hyomin Kim has uploaded this change for review.
Return printable character when Ctrl+2 is pressed
The control modifier of 2(^2) should be treated as same as the one of atsign(^@), which is NULL. Please refer to the issue of libXKBCommon[0] for further information
[0]
https://github.com/xkbcommon/libxkbcommon/issues/368
Bug: 1410732
Change-Id: I5385ec8d64ad1da27571c4b6f02911e6e27e46f8
---
M ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
index 229193eb..d8633d6 100644
--- a/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
+++ b/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc
@@ -812,8 +812,8 @@
#endif // BUILDFLAG(IS_CHROMEOS)
// Classify the keysym and convert to DOM and VKEY representations.
- if (xkb_keysym != XKB_KEY_at || (flags & EF_CONTROL_DOWN) == 0) {
- // Non-character key. (We only support NUL as ^@.)
+ if (dom_code != DomCode::DIGIT2 || (flags & EF_CONTROL_DOWN) == 0) {
+ // Non-character key. (We only support NUL as ^@ and ^2.)
*dom_key = NonPrintableXKeySymToDomKey(xkb_keysym);
if (*dom_key != DomKey::NONE) {
*key_code = NonPrintableDomKeyToKeyboardCode(*dom_key);
To view, visit change 4721787. To unsubscribe, or for help writing mail filters, visit settings.
Robert Kroeger (Gerrit)
Attention is currently required from: Hyomin Kim, Michael Spang.
To view, visit change 4721787. To unsubscribe, or for help writing mail filters, visit settings.
Michael Spang (Gerrit)
Attention is currently required from: Hyomin Kim, Scott Violet.
1 comment:
Patchset:
+spang Michael, are you familiar with this area?
Not at this level of detail, I would definitely ask Kevin.
To view, visit change 4721787. To unsubscribe, or for help writing mail filters, visit settings.