bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Fix build without X11 (fixes issue #3431)

Browse Source
This commit is contained in:
Enrique Turegano Pedruelo
2023-01-10 21:30:47 +00:00
committed by Marshall Greenblatt
parent 2b2c6aa143
commit f6d626d979
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libcef/browser/native/browser_platform_delegate_native_linux.cc
View File

@ -16,14 +16,14 @@
#include "third_party/blink/public/mojom/renderer_preferences.mojom.h" #include "third_party/blink/public/mojom/renderer_preferences.mojom.h"
#include "ui/events/keycodes/dom/dom_key.h" #include "ui/events/keycodes/dom/dom_key.h"
#include "ui/events/keycodes/dom/keycode_converter.h" #include "ui/events/keycodes/dom/keycode_converter.h"
#include "ui/events/keycodes/keyboard_code_conversion_x.h"
#include "ui/events/keycodes/keyboard_code_conversion_xkb.h"
#include "ui/events/keycodes/keysym_to_unicode.h" #include "ui/events/keycodes/keysym_to_unicode.h"
#include "ui/gfx/font_render_params.h" #include "ui/gfx/font_render_params.h"
#include "ui/views/widget/widget.h" #include "ui/views/widget/widget.h"
#if BUILDFLAG(OZONE_PLATFORM_X11) #if BUILDFLAG(OZONE_PLATFORM_X11)
#include "libcef/browser/native/window_x11.h" #include "libcef/browser/native/window_x11.h"
#include "ui/events/keycodes/keyboard_code_conversion_x.h"
#include "ui/events/keycodes/keyboard_code_conversion_xkb.h"
#include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h" #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h"
#endif #endif
@ -251,9 +251,15 @@ ui::KeyEvent CefBrowserPlatformDelegateNativeLinux::TranslateUiKeyEvent(
static_cast<ui::KeyboardCode>(key_event.windows_key_code); static_cast<ui::KeyboardCode>(key_event.windows_key_code);
ui::DomCode dom_code = ui::DomCode dom_code =
ui::KeycodeConverter::NativeKeycodeToDomCode(key_event.native_key_code); ui::KeycodeConverter::NativeKeycodeToDomCode(key_event.native_key_code);
#if BUILDFLAG(OZONE_PLATFORM_X11)
int keysym = ui::XKeysymForWindowsKeyCode( int keysym = ui::XKeysymForWindowsKeyCode(
key_code, !!(key_event.modifiers & EVENTFLAG_SHIFT_DOWN)); key_code, !!(key_event.modifiers & EVENTFLAG_SHIFT_DOWN));
char16_t character = ui::GetUnicodeCharacterFromXKeySym(keysym); char16_t character = ui::GetUnicodeCharacterFromXKeySym(keysym);
#else
char16_t character = key_event.character;
#endif
base::TimeTicks time_stamp = GetEventTimeStamp(); base::TimeTicks time_stamp = GetEventTimeStamp();
if (key_event.type == KEYEVENT_CHAR) { if (key_event.type == KEYEVENT_CHAR) {
@ -273,7 +279,12 @@ ui::KeyEvent CefBrowserPlatformDelegateNativeLinux::TranslateUiKeyEvent(
NOTREACHED(); NOTREACHED();
} }
#if BUILDFLAG(OZONE_PLATFORM_X11)
ui::DomKey dom_key = ui::XKeySymToDomKey(keysym, character); ui::DomKey dom_key = ui::XKeySymToDomKey(keysym, character);
#else
ui::DomKey dom_key = ui::DomKey::NONE;
#endif
return ui::KeyEvent(type, key_code, dom_code, flags, dom_key, time_stamp); return ui::KeyEvent(type, key_code, dom_code, flags, dom_key, time_stamp);
} }