diff --git a/protocol/meson.build b/protocol/meson.build index 71af0107d4849dd277dfd1c992adc2330272b2ca..1dbd21d73bd099e67c0bcedf71ff3d75a687e6e0 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -13,6 +13,7 @@ wl_protos = [ ['input-method-unstable-v2.xml'], ['phoc-layer-shell-effects-unstable-v1.xml'], ['phosh-private.xml'], + ['text-input-unstable-v3.xml'], ['virtual-keyboard-unstable-v1.xml'], ['wlr-foreign-toplevel-management-unstable-v1.xml'], ['wlr-gamma-control-unstable-v1.xml'], diff --git a/protocol/text-input-unstable-v3.xml b/protocol/text-input-unstable-v3.xml new file mode 100644 index 0000000000000000000000000000000000000000..1fae54d7ba7617a2e218835ec56f4813161df3af --- /dev/null +++ b/protocol/text-input-unstable-v3.xml @@ -0,0 +1,457 @@ + + + + + Copyright © 2012, 2013 Intel Corporation + Copyright © 2015, 2016 Jan Arne Petersen + Copyright © 2017, 2018 Red Hat, Inc. + Copyright © 2018 Purism SPC + + Permission to use, copy, modify, distribute, and sell this + software and its documentation for any purpose is hereby granted + without fee, provided that the above copyright notice appear in + all copies and that both that copyright notice and this permission + notice appear in supporting documentation, and that the name of + the copyright holders not be used in advertising or publicity + pertaining to distribution of the software without specific, + written prior permission. The copyright holders make no + representations about the suitability of this software for any + purpose. It is provided "as is" without express or implied + warranty. + + THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY + SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, + ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF + THIS SOFTWARE. + + + + This protocol allows compositors to act as input methods and to send text + to applications. A text input object is used to manage state of what are + typically text entry fields in the application. + + This document adheres to the RFC 2119 when using words like "must", + "should", "may", etc. + + Warning! The protocol described in this file is experimental and + backward incompatible changes may be made. Backward compatible changes + may be added together with the corresponding interface version bump. + Backward incompatible changes are done by bumping the version number in + the protocol and interface names and resetting the interface version. + Once the protocol is to be declared stable, the 'z' prefix and the + version number in the protocol and interface names are removed and the + interface version number is reset. + + + + + The zwp_text_input_v3 interface represents text input and input methods + associated with a seat. It provides enter/leave events to follow the + text input focus for a seat. + + Requests are used to enable/disable the text-input object and set + state information like surrounding and selected text or the content type. + The information about the entered text is sent to the text-input object + via the preedit_string and commit_string events. + + Text is valid UTF-8 encoded, indices and lengths are in bytes. Indices + must not point to middle bytes inside a code point: they must either + point to the first byte of a code point or to the end of the buffer. + Lengths must be measured between two valid indices. + + Focus moving throughout surfaces will result in the emission of + zwp_text_input_v3.enter and zwp_text_input_v3.leave events. The focused + surface must commit zwp_text_input_v3.enable and + zwp_text_input_v3.disable requests as the keyboard focus moves across + editable and non-editable elements of the UI. Those two requests are not + expected to be paired with each other, the compositor must be able to + handle consecutive series of the same request. + + State is sent by the state requests (set_surrounding_text, + set_content_type and set_cursor_rectangle) and a commit request. After an + enter event or disable request all state information is invalidated and + needs to be resent by the client. + + + + + Destroy the wp_text_input object. Also disables all surfaces enabled + through this wp_text_input object. + + + + + + Requests text input on the surface previously obtained from the enter + event. + + This request must be issued every time the active text input changes + to a new one, including within the current surface. Use + zwp_text_input_v3.disable when there is no longer any input focus on + the current surface. + + Clients must not enable more than one text input on the single seat + and should disable the current text input before enabling the new one. + At most one instance of text input may be in enabled state per instance, + Requests to enable the another text input when some text input is active + must be ignored by compositor. + + This request resets all state associated with previous enable, disable, + set_surrounding_text, set_text_change_cause, set_content_type, and + set_cursor_rectangle requests, as well as the state associated with + preedit_string, commit_string, and delete_surrounding_text events. + + The set_surrounding_text, set_content_type and set_cursor_rectangle + requests must follow if the text input supports the necessary + functionality. + + State set with this request is double-buffered. It will get applied on + the next zwp_text_input_v3.commit request, and stay valid until the + next committed enable or disable request. + + The changes must be applied by the compositor after issuing a + zwp_text_input_v3.commit request. + + + + + + Explicitly disable text input on the current surface (typically when + there is no focus on any text entry inside the surface). + + State set with this request is double-buffered. It will get applied on + the next zwp_text_input_v3.commit request. + + + + + + Sets the surrounding plain text around the input, excluding the preedit + text. + + The client should notify the compositor of any changes in any of the + values carried with this request, including changes caused by handling + incoming text-input events as well as changes caused by other + mechanisms like keyboard typing. + + If the client is unaware of the text around the cursor, it should not + issue this request, to signify lack of support to the compositor. + + Text is UTF-8 encoded, and should include the cursor position, the + complete selection and additional characters before and after them. + There is a maximum length of wayland messages, so text can not be + longer than 4000 bytes. + + Cursor is the byte offset of the cursor within text buffer. + + Anchor is the byte offset of the selection anchor within text buffer. + If there is no selected text, anchor is the same as cursor. + + If any preedit text is present, it is replaced with a cursor for the + purpose of this event. + + Values set with this request are double-buffered. They will get applied + on the next zwp_text_input_v3.commit request, and stay valid until the + next committed enable or disable request. + + The initial state for affected fields is empty, meaning that the text + input does not support sending surrounding text. If the empty values + get applied, subsequent attempts to change them may have no effect. + + + + + + + + + Reason for the change of surrounding text or cursor posision. + + + + + + + + Tells the compositor why the text surrounding the cursor changed. + + Whenever the client detects an external change in text, cursor, or + anchor posision, it must issue this request to the compositor. This + request is intended to give the input method a chance to update the + preedit text in an appropriate way, e.g. by removing it when the user + starts typing with a keyboard. + + cause describes the source of the change. + + The value set with this request is double-buffered. It must be applied + and reset to initial at the next zwp_text_input_v3.commit request. + + The initial value of cause is input_method. + + + + + + + Content hint is a bitmask to allow to modify the behavior of the text + input. + + + + + + + + + + + + + + + + + The content purpose allows to specify the primary purpose of a text + input. + + This allows an input method to show special purpose input panels with + extra characters or to disallow some characters. + + + + + + + + + + + + + + + + + + + + Sets the content purpose and content hint. While the purpose is the + basic purpose of an input field, the hint flags allow to modify some of + the behavior. + + Values set with this request are double-buffered. They will get applied + on the next zwp_text_input_v3.commit request. + Subsequent attempts to update them may have no effect. The values + remain valid until the next committed enable or disable request. + + The initial value for hint is none, and the initial value for purpose + is normal. + + + + + + + + Marks an area around the cursor as a x, y, width, height rectangle in + surface local coordinates. + + Allows the compositor to put a window with word suggestions near the + cursor, without obstructing the text being input. + + If the client is unaware of the position of edited text, it should not + issue this request, to signify lack of support to the compositor. + + Values set with this request are double-buffered. They will get applied + on the next zwp_text_input_v3.commit request, and stay valid until the + next committed enable or disable request. + + The initial values describing a cursor rectangle are empty. That means + the text input does not support describing the cursor area. If the + empty values get applied, subsequent attempts to change them may have + no effect. + + + + + + + + + + Atomically applies state changes recently sent to the compositor. + + The commit request establishes and updates the state of the client, and + must be issued after any changes to apply them. + + Text input state (enabled status, content purpose, content hint, + surrounding text and change cause, cursor rectangle) is conceptually + double-buffered within the context of a text input, i.e. between a + committed enable request and the following committed enable or disable + request. + + Protocol requests modify the pending state, as opposed to the current + state in use by the input method. A commit request atomically applies + all pending state, replacing the current state. After commit, the new + pending state is as documented for each related request. + + Requests are applied in the order of arrival. + + Neither current nor pending state are modified unless noted otherwise. + + The compositor must count the number of commit requests coming from + each zwp_text_input_v3 object and use the count as the serial in done + events. + + + + + + Notification that this seat's text-input focus is on a certain surface. + + If client has created multiple text input objects, compositor must send + this event to all of them. + + When the seat has the keyboard capability the text-input focus follows + the keyboard focus. This event sets the current surface for the + text-input object. + + + + + + + Notification that this seat's text-input focus is no longer on a + certain surface. The client should reset any preedit string previously + set. + + The leave notification clears the current surface. It is sent before + the enter notification for the new focus. After leave event, compositor + must ignore requests from any text input instances until next enter + event. + + When the seat has the keyboard capability the text-input focus follows + the keyboard focus. + + + + + + + Notify when a new composing text (pre-edit) should be set at the + current cursor position. Any previously set composing text must be + removed. Any previously existing selected text must be removed. + + The argument text contains the pre-edit string buffer. + + The parameters cursor_begin and cursor_end are counted in bytes + relative to the beginning of the submitted text buffer. Cursor should + be hidden when both are equal to -1. + + They could be represented by the client as a line if both values are + the same, or as a text highlight otherwise. + + Values set with this event are double-buffered. They must be applied + and reset to initial on the next zwp_text_input_v3.done event. + + The initial value of text is an empty string, and cursor_begin, + cursor_end and cursor_hidden are all 0. + + + + + + + + + Notify when text should be inserted into the editor widget. The text to + commit could be either just a single character after a key press or the + result of some composing (pre-edit). + + Values set with this event are double-buffered. They must be applied + and reset to initial on the next zwp_text_input_v3.done event. + + The initial value of text is an empty string. + + + + + + + Notify when the text around the current cursor position should be + deleted. + + Before_length and after_length are the number of bytes before and after + the current cursor index (excluding the selection) to delete. + + If a preedit text is present, in effect before_length is counted from + the beginning of it, and after_length from its end (see done event + sequence). + + Values set with this event are double-buffered. They must be applied + and reset to initial on the next zwp_text_input_v3.done event. + + The initial values of both before_length and after_length are 0. + + + + + + + + Instruct the application to apply changes to state requested by the + preedit_string, commit_string and delete_surrounding_text events. The + state relating to these events is double-buffered, and each one + modifies the pending state. This event replaces the current state with + the pending state. + + The application must proceed by evaluating the changes in the following + order: + + 1. Replace existing preedit string with the cursor. + 2. Delete requested surrounding text. + 3. Insert commit string with the cursor at its end. + 4. Calculate surrounding text to send. + 5. Insert new preedit text in cursor position. + 6. Place cursor inside preedit text. + + The serial number reflects the last state of the zwp_text_input_v3 + object known to the compositor. The value of the serial argument must + be equal to the number of commit requests already issued on that object. + + When the client receives a done event with a serial different than the + number of past commit requests, it must proceed with evaluating and + applying the changes as normal, except it should not change the current + state of the zwp_text_input_v3 object. All pending state requests + (set_surrounding_text, set_content_type and set_cursor_rectangle) on + the zwp_text_input_v3 object should be sent and committed after + receiving a zwp_text_input_v3.done event with a matching serial. + + + + + + + + A factory for text-input objects. This object is a global singleton. + + + + + Destroy the wp_text_input_manager object. + + + + + + Creates a new text-input object for a given seat. + + + + + + diff --git a/src/osk-manager.c b/src/osk-manager.c index fe0f923550f011fac5f1f0e6c3d707d2ddc8ad21..3626b53934d12620cc3667accc39fcb678abd91c 100644 --- a/src/osk-manager.c +++ b/src/osk-manager.c @@ -46,6 +46,8 @@ struct _PhoshOskManager PhoshOsk0SmPuriOSK0 *proxy; gboolean visible; gboolean available; + + struct zwp_text_input_v3 *text_input; }; G_DEFINE_TYPE (PhoshOskManager, phosh_osk_manager, G_TYPE_OBJECT) @@ -71,7 +73,7 @@ phosh_osk_manager_get_property (GObject *object, } } - +/* static void on_osk0_set_visible_done (PhoshOsk0SmPuriOSK0 *proxy, GAsyncResult *res, @@ -92,20 +94,81 @@ on_osk0_set_visible_done (PhoshOsk0SmPuriOSK0 *proxy, g_object_unref (self); } +*/ + +static void text_input_handle_enter(void *data, + struct zwp_text_input_v3 *zwp_text_input_v3, + struct wl_surface *surface) { + zwp_text_input_v3_enable(zwp_text_input_v3); + zwp_text_input_v3_commit(zwp_text_input_v3); +} + +static void text_input_handle_leave(void *data, + struct zwp_text_input_v3 *zwp_text_input_v3, + struct wl_surface *surface) { + zwp_text_input_v3_disable(zwp_text_input_v3); + zwp_text_input_v3_commit(zwp_text_input_v3); +} + +static void text_input_commit_string(void *data, + struct zwp_text_input_v3 *zwp_text_input_v3, + const char *text) { +} + +static void text_input_delete_surrounding_text(void *data, + struct zwp_text_input_v3 *zwp_text_input_v3, + uint32_t before_length, uint32_t after_length) { +} + +static void text_input_preedit_string(void *data, + struct zwp_text_input_v3 *zwp_text_input_v3, + const char *text, int32_t cursor_begin, int32_t cursor_end) { +} + +static void text_input_handle_done(void *data, + struct zwp_text_input_v3 *zwp_text_input_v3, + uint32_t incoming_serial) { + // TODO: check if the number of commits matches incoming_serial +} + +static const struct zwp_text_input_v3_listener text_input_listener = { + .enter = text_input_handle_enter, + .leave = text_input_handle_leave, + .commit_string = text_input_commit_string, + .delete_surrounding_text = text_input_delete_surrounding_text, + .preedit_string = text_input_preedit_string, + .done = text_input_handle_done, +}; static void set_visible_real (PhoshOskManager *self, gboolean visible) { + PhoshWayland *wl; + g_return_if_fail (G_IS_DBUS_PROXY (self->proxy)); g_debug ("Setting osk to %svisible", visible ? "" : "not "); - phosh_osk0_sm_puri_osk0_call_set_visible ( - self->proxy, - visible, - NULL, - (GAsyncReadyCallback) on_osk0_set_visible_done, - g_object_ref (self)); + + if (!self->text_input) { + wl = phosh_wayland_get_default (); + self->text_input = zwp_text_input_manager_v3_get_text_input ( + phosh_wayland_get_zwp_text_input_manager_v3 (wl), + phosh_wayland_get_wl_seat (wl)); + + zwp_text_input_v3_add_listener(self->text_input, &text_input_listener, self); + } + + if (visible) { + zwp_text_input_v3_enable (self->text_input); + zwp_text_input_v3_set_content_type (self->text_input, 0, ZWP_TEXT_INPUT_V3_CONTENT_PURPOSE_NORMAL); + } else { + zwp_text_input_v3_disable (self->text_input); + } + + zwp_text_input_v3_commit (self->text_input); + + self->visible = visible; } @@ -208,15 +271,16 @@ phosh_osk_manager_constructed (GObject *object) "notify::locked", G_CALLBACK (on_shell_locked_changed), self); -} + } -static void + static void phosh_osk_manager_dispose (GObject *object) { PhoshOskManager *self = PHOSH_OSK_MANAGER (object); g_clear_object (&self->proxy); + g_clear_pointer (&self->text_input, zwp_text_input_v3_destroy); G_OBJECT_CLASS (phosh_osk_manager_parent_class)->dispose (object); } diff --git a/src/phosh-wayland.c b/src/phosh-wayland.c index 8b41a72abb88da36955f480559023b083d1eba05..464e8d839b136e385bb7c0886bf565c9bb834c98 100644 --- a/src/phosh-wayland.c +++ b/src/phosh-wayland.c @@ -39,6 +39,7 @@ struct _PhoshWayland { struct phosh_private *phosh_private; uint32_t phosh_private_version; struct zwp_virtual_keyboard_manager_v1 *zwp_virtual_keyboard_manager_v1; + struct zwp_text_input_manager_v3 *zwp_text_input_manager_v3; struct wl_display *display; struct wl_registry *registry; struct wl_seat *wl_seat; @@ -165,7 +166,15 @@ registry_handle_global (void *data, name, &zwp_virtual_keyboard_manager_v1_interface, 1); - } + } else if (!strcmp (interface, zwp_text_input_manager_v3_interface.name)) { + self->zwp_text_input_manager_v3 = + wl_registry_bind ( + registry, + name, + &zwp_text_input_manager_v3_interface, + 1); + } + } @@ -316,6 +325,7 @@ phosh_wayland_dispose (GObject *object) g_clear_pointer (&self->zwlr_output_power_manager_v1, zwlr_output_power_manager_v1_destroy); g_clear_pointer (&self->zwlr_screencopy_manager_v1, zwlr_screencopy_manager_v1_destroy); g_clear_pointer (&self->zwp_virtual_keyboard_manager_v1, zwp_virtual_keyboard_manager_v1_destroy); + g_clear_pointer (&self->zwp_text_input_manager_v3, zwp_text_input_manager_v3_destroy); g_clear_pointer (&self->zxdg_output_manager_v1, zxdg_output_manager_v1_destroy); g_clear_pointer (&self->zphoc_layer_shell_effects_v1, zphoc_layer_shell_effects_v1_destroy); @@ -514,6 +524,14 @@ phosh_wayland_get_zwp_virtual_keyboard_manager_v1 (PhoshWayland *self) return self->zwp_virtual_keyboard_manager_v1; } +struct zwp_text_input_manager_v3* +phosh_wayland_get_zwp_text_input_manager_v3 (PhoshWayland *self) +{ + g_return_val_if_fail (PHOSH_IS_WAYLAND (self), NULL); + + return self->zwp_text_input_manager_v3; +} + /** * phosh_wayland_get_wl_outputs: diff --git a/src/phosh-wayland.h b/src/phosh-wayland.h index e59591bed025c1cb98dec5e43e87213543a3f294..a95a3d9358d02fd2ff050d0424c1787d7e6a3f72 100644 --- a/src/phosh-wayland.h +++ b/src/phosh-wayland.h @@ -8,12 +8,14 @@ #pragma once #include "idle-client-protocol.h" +#include "text-input-unstable-v3-client-protocol.h" #include "virtual-keyboard-unstable-v1-client-protocol.h" #include "wlr-foreign-toplevel-management-unstable-v1-client-protocol.h" #include "wlr-input-inhibitor-unstable-v1-client-protocol.h" #include "wlr-layer-shell-unstable-v1-client-protocol.h" #include "wlr-gamma-control-unstable-v1-client-protocol.h" #include "wlr-output-management-unstable-v1-client-protocol.h" +#include "wlr-output-management-unstable-v1-client-protocol.h" #include "wlr-output-power-management-unstable-v1-client-protocol.h" #include "wlr-screencopy-unstable-v1-client-protocol.h" #include "wlr-screencopy-unstable-v1-client-protocol.h" @@ -73,6 +75,7 @@ struct zwlr_output_power_manager_v1 *phosh_wayland_get_zwlr_output_power_manager struct zxdg_output_manager_v1 *phosh_wayland_get_zxdg_output_manager_v1 (PhoshWayland *self); struct zwlr_screencopy_manager_v1 *phosh_wayland_get_zwlr_screencopy_manager_v1 (PhoshWayland *self); struct zwp_virtual_keyboard_manager_v1 *phosh_wayland_get_zwp_virtual_keyboard_manager_v1 (PhoshWayland *self); +struct zwp_text_input_manager_v3 *phosh_wayland_get_zwp_text_input_manager_v3 (PhoshWayland *self); void phosh_wayland_roundtrip (PhoshWayland *self); PhoshWaylandSeatCapabilities phosh_wayland_get_seat_capabilities (PhoshWayland *self); struct zphoc_layer_shell_effects_v1 *phosh_wayland_get_zphoc_layer_shell_effects_v1 (PhoshWayland *self);