beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 23:50:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Kernel: Process, replace internal data type to CharacterMapData

Browse source
This commit is contained in:
Hüseyin ASLITÜRK 2020-06-11 22:06:36 +03:00 committed by Andreas Kling
parent f79b410baa
commit f4d14c42d0
Notes: sideshowbarker 2024-07-19 05:40:56 +09:00 
Author: https://github.com/asliturk
Commit: https://github.com/SerenityOS/serenity/commit/f4d14c42d0e
Pull-request: https://github.com/SerenityOS/serenity/pull/2536
Reviewed-by: https://github.com/awesomekling
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Kernel/Process.cpp
View file

@ -80,6 +80,7 @@
#include <LibC/signal_numbers.h> #include <LibC/signal_numbers.h>
#include <LibELF/Loader.h> #include <LibELF/Loader.h>
#include <LibELF/Validation.h> #include <LibELF/Validation.h>
#include <LibKeyboard/CharacterMapData.h>
//#define PROCESS_DEBUG //#define PROCESS_DEBUG
//#define DEBUG_POLL_SELECT //#define DEBUG_POLL_SELECT
@ -4302,22 +4303,31 @@ int Process::sys$setkeymap(const Syscall::SC_setkeymap_params* user_params)
if (!validate_read_and_copy_typed(&params, user_params)) if (!validate_read_and_copy_typed(&params, user_params))
return -EFAULT; return -EFAULT;
Keyboard::CharacterMapData character_map_data;
const char* map = params.map; const char* map = params.map;
const char* shift_map = params.shift_map; const char* shift_map = params.shift_map;
const char* alt_map = params.alt_map; const char* alt_map = params.alt_map;
const char* altgr_map = params.altgr_map; const char* altgr_map = params.altgr_map;
if (!validate_read(map, 0x80)) if (!validate_read(map, CHAR_MAP_SIZE))
return -EFAULT; return -EFAULT;
if (!validate_read(shift_map, 0x80)) if (!validate_read(shift_map, CHAR_MAP_SIZE))
return -EFAULT; return -EFAULT;
if (!validate_read(alt_map, 0x80)) if (!validate_read(alt_map, CHAR_MAP_SIZE))
return -EFAULT; return -EFAULT;
if (!validate_read(altgr_map, 0x80)) if (!validate_read(altgr_map, CHAR_MAP_SIZE))
return -EFAULT; return -EFAULT;
for (int i = 0; i < CHAR_MAP_SIZE; i++) {
character_map_data.map[i] = map[i];
character_map_data.shift_map[i] = shift_map[i];
character_map_data.alt_map[i] = alt_map[i];
character_map_data.altgr_map[i] = altgr_map[i];
}
SmapDisabler disabler; SmapDisabler disabler;
KeyboardDevice::the().set_maps(map, shift_map, alt_map, altgr_map); KeyboardDevice::the().set_maps(character_map_data);
return 0; return 0;
} }