mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-07 04:07:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

IME: support input method

Browse source
This commit is contained in:
tokyo4j 2024-02-09 16:52:37 +09:00 • committed by Johan Malm
parent 7e60c57b81
commit 334cd09106
7 changed files with 549 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

77
include/input/ime.h Normal file
View file

@ -0,0 +1,77 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef LABWC_IME_H
#define LABWC_IME_H
#include <wlr/types/wlr_text_input_v3.h>
#include <wlr/types/wlr_input_method_v2.h>
#include "labwc.h"
struct keyboard;
/*
* The relay structure manages the relationship between text-inputs and
* input-method on a given seat. Multiple text-inputs may be bound to a relay,
* but at most one will be "active" (commucating with input-method) at a time.
* At most one input-method may be bound to the seat. When an input-method and
* an active text-input is present, the relay passes messages between them.
*/
struct input_method_relay {
struct seat *seat;
struct wl_list text_inputs; /* struct text_input.link */
struct wlr_input_method_v2 *input_method;
struct wlr_surface *focused_surface;
/*
* Text-input which is enabled by the client and communicating with
* input-method.
* This must be NULL if input-method is not present.
* Its client must be the same as that of focused_surface.
*/
struct text_input *active_text_input;
struct wl_listener new_text_input;
struct wl_listener new_input_method;
struct wl_listener input_method_commit;
struct wl_listener input_method_grab_keyboard;
struct wl_listener input_method_destroy;
struct wl_listener keyboard_grab_destroy;
struct wl_listener focused_surface_destroy;
};
struct text_input {
struct input_method_relay *relay;
struct wlr_text_input_v3 *input;
struct wl_list link;
struct wl_listener enable;
struct wl_listener commit;
struct wl_listener disable;
struct wl_listener destroy;
};
/*
* Forward key event to keyboard grab of the seat from the keyboard
* if the keyboard grab exists.
* Returns true if the key event was forwarded.
*/
bool input_method_keyboard_grab_forward_key(struct keyboard *keyboard,
struct wlr_keyboard_key_event *event);
/*
* Forward modifier state to keyboard grab of the seat from the keyboard
* if the keyboard grab exists.
* Returns true if the modifier state was forwarded.
*/
bool input_method_keyboard_grab_forward_modifiers(struct keyboard *keyboard);
struct input_method_relay *input_method_relay_create(struct seat *seat);
void input_method_relay_finish(struct input_method_relay *relay);
/* Updates currently focused surface. Surface must belong to the same seat. */
void input_method_relay_set_focus(struct input_method_relay *relay,
struct wlr_surface *surface);
#endif

8
include/labwc.h
View file

@ -40,10 +40,13 @@
#include <wlr/types/wlr_virtual_pointer_v1.h>
#include <wlr/types/wlr_virtual_keyboard_v1.h>
#include <wlr/types/wlr_tearing_control_v1.h>
#include <wlr/types/wlr_text_input_v3.h>
#include <wlr/types/wlr_input_method_v2.h>
#include <wlr/util/log.h>
#include "config/keybind.h"
#include "config/rcxml.h"
#include "input/cursor.h"
#include "input/ime.h"
#include "regions.h"
#include "session-lock.h"
#if HAVE_NLS
@ -120,6 +123,8 @@ struct seat {
/* if set, views cannot receive focus */
struct wlr_layer_surface_v1 *focused_layer;
struct input_method_relay *input_method_relay;
/**
* pressed view/surface/node will usually be NULL and is only set on
* button press while the mouse is over a view or surface, and reset
@ -324,6 +329,9 @@ struct server {
struct wlr_tearing_control_manager_v1 *tearing_control;
struct wl_listener tearing_new_object;
struct wlr_input_method_manager_v2 *input_method_manager;
struct wlr_text_input_manager_v3 *text_input_manager;
/* Set when in cycle (alt-tab) mode */
struct osd_state {
struct view *cycle_view;