1 From b0bdd62be712b69db9164e80d4190d2bc72dcb3c Mon Sep 17 00:00:00 2001
2 From: Enrique Turegano Pedruelo <epedruelo@netskope.com>
3 Date: Tue, 10 Jan 2023 21:30:47 +0000
4 Subject: [PATCH 05/10] Linux: Fix build without X11 (fixes issue #3431)
7 .../browser_platform_delegate_native_linux.cc | 15 +++++++++++++--
8 1 file changed, 13 insertions(+), 2 deletions(-)
10 diff --git a/libcef/browser/native/browser_platform_delegate_native_linux.cc b/libcef/browser/native/browser_platform_delegate_native_linux.cc
11 index 5972a3134..95ca3df39 100644
12 --- a/libcef/browser/native/browser_platform_delegate_native_linux.cc
13 +++ b/libcef/browser/native/browser_platform_delegate_native_linux.cc
15 #include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
16 #include "ui/events/keycodes/dom/dom_key.h"
17 #include "ui/events/keycodes/dom/keycode_converter.h"
18 -#include "ui/events/keycodes/keyboard_code_conversion_x.h"
19 -#include "ui/events/keycodes/keyboard_code_conversion_xkb.h"
20 #include "ui/events/keycodes/keysym_to_unicode.h"
21 #include "ui/gfx/font_render_params.h"
22 #include "ui/views/widget/widget.h"
24 #if BUILDFLAG(OZONE_PLATFORM_X11)
25 #include "libcef/browser/native/window_x11.h"
26 +#include "ui/events/keycodes/keyboard_code_conversion_x.h"
27 +#include "ui/events/keycodes/keyboard_code_conversion_xkb.h"
28 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h"
31 @@ -240,9 +240,15 @@ ui::KeyEvent CefBrowserPlatformDelegateNativeLinux::TranslateUiKeyEvent(
32 static_cast<ui::KeyboardCode>(key_event.windows_key_code);
33 ui::DomCode dom_code =
34 ui::KeycodeConverter::NativeKeycodeToDomCode(key_event.native_key_code);
36 +#if BUILDFLAG(OZONE_PLATFORM_X11)
37 int keysym = ui::XKeysymForWindowsKeyCode(
38 key_code, !!(key_event.modifiers & EVENTFLAG_SHIFT_DOWN));
39 char16_t character = ui::GetUnicodeCharacterFromXKeySym(keysym);
41 + char16_t character = key_event.character;
44 base::TimeTicks time_stamp = GetEventTimeStamp();
46 if (key_event.type == KEYEVENT_CHAR) {
47 @@ -262,7 +268,12 @@ ui::KeyEvent CefBrowserPlatformDelegateNativeLinux::TranslateUiKeyEvent(
51 +#if BUILDFLAG(OZONE_PLATFORM_X11)
52 ui::DomKey dom_key = ui::XKeySymToDomKey(keysym, character);
54 + ui::DomKey dom_key = ui::DomKey::NONE;
57 return ui::KeyEvent(type, key_code, dom_code, flags, dom_key, time_stamp);