mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-03 07:15:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

unicode-input: move input (key press) handling to unicode_mode_input()

Browse source
This commit is contained in:
Daniel Eklöf 2022-07-28 19:34:13 +02:00
parent 8967dd9cfe
commit 001f96c4e3
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 72 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

59
input.c
View file

@ -1411,64 +1411,7 @@ key_press_release(struct seat *seat, struct terminal *term, uint32_t serial,
if (pressed) { if (pressed) {
if (seat->unicode_mode.active) { if (seat->unicode_mode.active) {
if (sym == XKB_KEY_Return || unicode_mode_input(seat, term, sym);
sym == XKB_KEY_space ||
sym == XKB_KEY_KP_Enter ||
sym == XKB_KEY_KP_Space)
{
char utf8[MB_CUR_MAX];
size_t chars = c32rtomb(
utf8, seat->unicode_mode.character, &(mbstate_t){0});
LOG_DBG("Unicode input: 0x%06x -> %.*s",
seat->unicode_mode.character, (int)chars, utf8);
if (chars != (size_t)-1) {
if (term->is_searching)
search_add_chars(term, utf8, chars);
else
term_to_slave(term, utf8, chars);
}
unicode_mode_deactivate(seat);
}
else if (sym == XKB_KEY_Escape ||
(seat->kbd.ctrl && (sym == XKB_KEY_c ||
sym == XKB_KEY_d ||
sym == XKB_KEY_g)))
{
unicode_mode_deactivate(seat);
}
else if (sym == XKB_KEY_BackSpace) {
if (seat->unicode_mode.count > 0) {
seat->unicode_mode.character >>= 4;
seat->unicode_mode.count--;
unicode_mode_updated(seat);
}
}
else if (seat->unicode_mode.count < 6) {
int digit = -1;
/* 0-9, a-f, A-F */
if (sym >= XKB_KEY_0 && sym <= XKB_KEY_9)
digit = sym - XKB_KEY_0;
else if (sym >= XKB_KEY_a && sym <= XKB_KEY_f)
digit = 0xa + (sym - XKB_KEY_a);
else if (sym >= XKB_KEY_A && sym <= XKB_KEY_F)
digit = 0xa + (sym - XKB_KEY_A);
if (digit >= 0) {
xassert(digit >= 0 && digit <= 0xf);
seat->unicode_mode.character <<= 4;
seat->unicode_mode.character |= digit;
seat->unicode_mode.count++;
unicode_mode_updated(seat);
}
}
return; return;
} }

67
unicode-mode.c
View file

@ -1,6 +1,10 @@
#include "unicode-mode.h" #include "unicode-mode.h"
#define LOG_MODULE "unicode-input"
#define LOG_ENABLE_DBG 0
#include "log.h"
#include "render.h" #include "render.h"
#include "search.h"
void void
unicode_mode_activate(struct seat *seat) unicode_mode_activate(struct seat *seat)
@ -36,3 +40,66 @@ unicode_mode_updated(struct seat *seat)
else else
render_refresh(term); render_refresh(term);
} }
void
unicode_mode_input(struct seat *seat, struct terminal *term,
xkb_keysym_t sym)
{
if (sym == XKB_KEY_Return ||
sym == XKB_KEY_space ||
sym == XKB_KEY_KP_Enter ||
sym == XKB_KEY_KP_Space)
{
char utf8[MB_CUR_MAX];
size_t chars = c32rtomb(
utf8, seat->unicode_mode.character, &(mbstate_t){0});
LOG_DBG("Unicode input: 0x%06x -> %.*s",
seat->unicode_mode.character, (int)chars, utf8);
if (chars != (size_t)-1) {
if (term->is_searching)
search_add_chars(term, utf8, chars);
else
term_to_slave(term, utf8, chars);
}
unicode_mode_deactivate(seat);
}
else if (sym == XKB_KEY_Escape ||
(seat->kbd.ctrl && (sym == XKB_KEY_c ||
sym == XKB_KEY_d ||
sym == XKB_KEY_g)))
{
unicode_mode_deactivate(seat);
}
else if (sym == XKB_KEY_BackSpace) {
if (seat->unicode_mode.count > 0) {
seat->unicode_mode.character >>= 4;
seat->unicode_mode.count--;
unicode_mode_updated(seat);
}
}
else if (seat->unicode_mode.count < 6) {
int digit = -1;
/* 0-9, a-f, A-F */
if (sym >= XKB_KEY_0 && sym <= XKB_KEY_9)
digit = sym - XKB_KEY_0;
else if (sym >= XKB_KEY_a && sym <= XKB_KEY_f)
digit = 0xa + (sym - XKB_KEY_a);
else if (sym >= XKB_KEY_A && sym <= XKB_KEY_F)
digit = 0xa + (sym - XKB_KEY_A);
if (digit >= 0) {
xassert(digit >= 0 && digit <= 0xf);
seat->unicode_mode.character <<= 4;
seat->unicode_mode.character |= digit;
seat->unicode_mode.count++;
unicode_mode_updated(seat);
}
}
}

4
unicode-mode.h
View file

@ -1,7 +1,11 @@
#pragma once #pragma once
#include <xkbcommon/xkbcommon-keysyms.h>
#include "wayland.h" #include "wayland.h"
void unicode_mode_activate(struct seat *seat); void unicode_mode_activate(struct seat *seat);
void unicode_mode_deactivate(struct seat *seat); void unicode_mode_deactivate(struct seat *seat);
void unicode_mode_updated(struct seat *seat); void unicode_mode_updated(struct seat *seat);
void unicode_mode_input(struct seat *seat, struct terminal *term,
xkb_keysym_t sym);