s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

submission: Take over virtual_keyboard handling

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2020-01-12 20:09:05 +00:00
parent aafecfac02
commit 326bb9319f
14 changed files with 147 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
eek/eek-gtk-keyboard.c
View File

@ -39,6 +39,7 @@
#include "eekboard/eekboard-context-service.h" #include "eekboard/eekboard-context-service.h"
#include "src/layout.h" #include "src/layout.h"
#include "src/submission.h"
enum { enum {
PROP_0, PROP_0,
@ -55,6 +56,7 @@ typedef struct _EekGtkKeyboardPrivate
{ {
EekRenderer *renderer; EekRenderer *renderer;
EekboardContextService *eekboard_context; // unowned reference EekboardContextService *eekboard_context; // unowned reference
struct submission *submission; // unowned reference
LevelKeyboard *keyboard; // unowned reference; it's kept in server-context (FIXME) LevelKeyboard *keyboard; // unowned reference; it's kept in server-context (FIXME)
GdkEventSequence *sequence; // unowned reference GdkEventSequence *sequence; // unowned reference
@ -123,7 +125,8 @@ static void depress(EekGtkKeyboard *self,
{ {
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self); EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
squeek_layout_depress(priv->keyboard->layout, priv->eekboard_context->virtual_keyboard, squeek_layout_depress(priv->keyboard->layout,
priv->submission,
x, y, eek_renderer_get_transformation(priv->renderer), time, self); x, y, eek_renderer_get_transformation(priv->renderer), time, self);
} }
@ -131,7 +134,8 @@ static void drag(EekGtkKeyboard *self,
gdouble x, gdouble y, guint32 time) gdouble x, gdouble y, guint32 time)
{ {
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self); EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
squeek_layout_drag(priv->keyboard->layout, priv->eekboard_context->virtual_keyboard, squeek_layout_drag(priv->keyboard->layout,
priv->submission,
x, y, eek_renderer_get_transformation(priv->renderer), time, x, y, eek_renderer_get_transformation(priv->renderer), time,
priv->eekboard_context, self); priv->eekboard_context, self);
} }
@ -140,7 +144,8 @@ static void release(EekGtkKeyboard *self, guint32 time)
{ {
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self); EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
squeek_layout_release(priv->keyboard->layout, priv->eekboard_context->virtual_keyboard, squeek_layout_release(priv->keyboard->layout,
priv->submission,
eek_renderer_get_transformation(priv->renderer), time, eek_renderer_get_transformation(priv->renderer), time,
priv->eekboard_context, self); priv->eekboard_context, self);
} }
@ -230,7 +235,8 @@ eek_gtk_keyboard_real_unmap (GtkWidget *self)
if (priv->keyboard) { if (priv->keyboard) {
squeek_layout_release_all_only( squeek_layout_release_all_only(
priv->keyboard->layout, priv->eekboard_context->virtual_keyboard, priv->keyboard->layout,
priv->submission,
gdk_event_get_time(NULL)); gdk_event_get_time(NULL));
} }
@ -265,7 +271,8 @@ eek_gtk_keyboard_dispose (GObject *object)
if (priv->keyboard) { if (priv->keyboard) {
squeek_layout_release_all_only( squeek_layout_release_all_only(
priv->keyboard->layout, priv->eekboard_context->virtual_keyboard, priv->keyboard->layout,
priv->submission,
gdk_event_get_time(NULL)); gdk_event_get_time(NULL));
priv->keyboard = NULL; priv->keyboard = NULL;
} }
@ -312,12 +319,14 @@ eek_gtk_keyboard_init (EekGtkKeyboard *self)
* Returns: a #GtkWidget * Returns: a #GtkWidget
*/ */
GtkWidget * GtkWidget *
eek_gtk_keyboard_new (LevelKeyboard *keyboard, EekboardContextService *eekservice) eek_gtk_keyboard_new (LevelKeyboard *keyboard, EekboardContextService *eekservice,
struct submission *submission)
{ {
EekGtkKeyboard *ret = EEK_GTK_KEYBOARD(g_object_new (EEK_TYPE_GTK_KEYBOARD, NULL)); EekGtkKeyboard *ret = EEK_GTK_KEYBOARD(g_object_new (EEK_TYPE_GTK_KEYBOARD, NULL));
EekGtkKeyboardPrivate *priv = (EekGtkKeyboardPrivate*)eek_gtk_keyboard_get_instance_private (ret); EekGtkKeyboardPrivate *priv = (EekGtkKeyboardPrivate*)eek_gtk_keyboard_get_instance_private (ret);
priv->keyboard = keyboard; priv->keyboard = keyboard;
priv->eekboard_context = eekservice; priv->eekboard_context = eekservice;
priv->submission = submission;
return GTK_WIDGET(ret); return GTK_WIDGET(ret);
} }

3
eek/eek-gtk-keyboard.h
View File

@ -30,6 +30,7 @@
#include "eek/eek-types.h" #include "eek/eek-types.h"
struct submission;
typedef struct _LevelKeyboard LevelKeyboard; // including causes weird bugs typedef struct _LevelKeyboard LevelKeyboard; // including causes weird bugs
G_BEGIN_DECLS G_BEGIN_DECLS
@ -47,7 +48,7 @@ struct _EekGtkKeyboardClass
}; };
GType eek_gtk_keyboard_get_type (void) G_GNUC_CONST; GType eek_gtk_keyboard_get_type (void) G_GNUC_CONST;
GtkWidget *eek_gtk_keyboard_new (LevelKeyboard *keyboard, EekboardContextService *eekservice); GtkWidget *eek_gtk_keyboard_new (LevelKeyboard *keyboard, EekboardContextService *eekservice, struct submission *submission);
G_END_DECLS G_END_DECLS
#endif /* EEK_GTK_KEYBOARD_H */ #endif /* EEK_GTK_KEYBOARD_H */

1
eek/eek-types.h
View File

@ -38,6 +38,7 @@ G_BEGIN_DECLS
typedef struct _EekBounds EekBounds; typedef struct _EekBounds EekBounds;
typedef struct _EekboardContextService EekboardContextService; typedef struct _EekboardContextService EekboardContextService;
typedef struct _ServerContextService ServerContextService;
typedef struct _LevelKeyboard LevelKeyboard; typedef struct _LevelKeyboard LevelKeyboard;
/** /**

35
eekboard/eekboard-context-service.c
View File

@ -39,6 +39,7 @@
#include "wayland.h" #include "wayland.h"
#include "eek/eek-keyboard.h"
#include "eek/eek-xml-layout.h" #include "eek/eek-xml-layout.h"
#include "src/server-context-service.h" #include "src/server-context-service.h"
@ -73,6 +74,8 @@ struct _EekboardContextServicePrivate {
// Maybe TODO: it's used only for fetching layout type. // Maybe TODO: it's used only for fetching layout type.
// Maybe let UI push the type to this structure? // Maybe let UI push the type to this structure?
ServerContextService *ui; // unowned reference ServerContextService *ui; // unowned reference
/// Needed for keymap changes after keyboard updates
struct submission *submission; // unowned
}; };
G_DEFINE_TYPE_WITH_PRIVATE (EekboardContextService, eekboard_context_service, G_TYPE_OBJECT); G_DEFINE_TYPE_WITH_PRIVATE (EekboardContextService, eekboard_context_service, G_TYPE_OBJECT);
@ -222,10 +225,12 @@ eekboard_context_service_update_layout(EekboardContextService *context, enum squ
LevelKeyboard *previous_keyboard = context->priv->keyboard; LevelKeyboard *previous_keyboard = context->priv->keyboard;
context->priv->keyboard = keyboard; context->priv->keyboard = keyboard;
// The keymap will get set even if the window is hidden. // Update the keymap if necessary.
// It's not perfect, // Done directly here instead of in "keyboard" update handler
// but simpler than adding a check in the window showing procedure // to keep keymap-related actions close together.
eekboard_context_service_set_keymap(context, keyboard); if (context->priv->submission) {
submission_set_keyboard(context->priv->submission, keyboard);
}
g_object_notify (G_OBJECT(context), "keyboard"); g_object_notify (G_OBJECT(context), "keyboard");
@ -262,12 +267,6 @@ static void
eekboard_context_service_constructed (GObject *object) eekboard_context_service_constructed (GObject *object)
{ {
EekboardContextService *context = EEKBOARD_CONTEXT_SERVICE (object); EekboardContextService *context = EEKBOARD_CONTEXT_SERVICE (object);
context->virtual_keyboard = zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(
squeek_wayland->virtual_keyboard_manager,
squeek_wayland->seat);
if (!context->virtual_keyboard) {
g_error("Programmer error: Failed to receive a virtual keyboard instance");
}
update_layout_and_type(context); update_layout_and_type(context);
} }
@ -363,14 +362,6 @@ eekboard_context_service_get_keyboard (EekboardContextService *context)
return context->priv->keyboard; return context->priv->keyboard;
} }
void eekboard_context_service_set_keymap(EekboardContextService *context,
const LevelKeyboard *keyboard)
{
zwp_virtual_keyboard_v1_keymap(context->virtual_keyboard,
WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
keyboard->keymap_fd, keyboard->keymap_len);
}
void eekboard_context_service_set_hint_purpose(EekboardContextService *context, void eekboard_context_service_set_hint_purpose(EekboardContextService *context,
uint32_t hint, uint32_t purpose) uint32_t hint, uint32_t purpose)
{ {
@ -394,7 +385,13 @@ eekboard_context_service_get_overlay(EekboardContextService *context) {
return context->priv->overlay; return context->priv->overlay;
} }
EekboardContextService *eekboard_context_service_new() EekboardContextService *eekboard_context_service_new(void)
{ {
return g_object_new (EEKBOARD_TYPE_CONTEXT_SERVICE, NULL); return g_object_new (EEKBOARD_TYPE_CONTEXT_SERVICE, NULL);
} }
void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission) {
context->priv->submission = submission;
if (context->priv->submission) {
submission_set_keyboard(context->priv->submission, context->priv->keyboard);
}
}

7
eekboard/eekboard-context-service.h
View File

@ -22,7 +22,8 @@
#ifndef EEKBOARD_CONTEXT_SERVICE_H #ifndef EEKBOARD_CONTEXT_SERVICE_H
#define EEKBOARD_CONTEXT_SERVICE_H 1 #define EEKBOARD_CONTEXT_SERVICE_H 1
#include <eek/eek.h> #include "src/submission.h"
#include "src/layout.h"
#include "virtual-keyboard-unstable-v1-client-protocol.h" #include "virtual-keyboard-unstable-v1-client-protocol.h"
#include "text-input-unstable-v3-client-protocol.h" #include "text-input-unstable-v3-client-protocol.h"
@ -58,8 +59,6 @@ struct _EekboardContextService {
GObject parent; GObject parent;
EekboardContextServicePrivate *priv; EekboardContextServicePrivate *priv;
struct zwp_virtual_keyboard_v1 *virtual_keyboard;
}; };
/** /**
@ -84,10 +83,10 @@ struct _EekboardContextServiceClass {
gpointer pdummy[24]; gpointer pdummy[24];
}; };
EekboardContextService *eekboard_context_service_new();
GType eekboard_context_service_get_type GType eekboard_context_service_get_type
(void) G_GNUC_CONST; (void) G_GNUC_CONST;
EekboardContextService *eekboard_context_service_new(void); EekboardContextService *eekboard_context_service_new(void);
void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission);
void eekboard_context_service_destroy (EekboardContextService *context); void eekboard_context_service_destroy (EekboardContextService *context);
LevelKeyboard *eekboard_context_service_get_keyboard(EekboardContextService *context); LevelKeyboard *eekboard_context_service_get_keyboard(EekboardContextService *context);

14
src/imservice.c
View File

@ -23,11 +23,19 @@ static const struct zwp_input_method_v2_listener input_method_listener = {
.unavailable = imservice_handle_unavailable, .unavailable = imservice_handle_unavailable,
}; };
struct submission* get_submission(struct zwp_input_method_manager_v2 *manager, struct submission* get_submission(struct zwp_input_method_manager_v2 *immanager,
struct zwp_virtual_keyboard_manager_v1 *vkmanager,
struct wl_seat *seat, struct wl_seat *seat,
EekboardContextService *state) { EekboardContextService *state) {
struct zwp_input_method_v2 *im = zwp_input_method_manager_v2_get_input_method(manager, seat); struct zwp_input_method_v2 *im = NULL;
return submission_new(im, state); if (immanager) {
im = zwp_input_method_manager_v2_get_input_method(immanager, seat);
}
struct zwp_virtual_keyboard_v1 *vk = NULL;
if (vkmanager) {
vk = zwp_virtual_keyboard_manager_v1_create_virtual_keyboard(vkmanager, seat);
}
return submission_new(im, vk, state);
} }
/// Un-inlined /// Un-inlined

13
src/layout.h
View File

@ -33,17 +33,22 @@ const char *squeek_layout_get_keymap(const struct squeek_layout*);
enum squeek_arrangement_kind squeek_layout_get_kind(const struct squeek_layout *); enum squeek_arrangement_kind squeek_layout_get_kind(const struct squeek_layout *);
void squeek_layout_free(struct squeek_layout*); void squeek_layout_free(struct squeek_layout*);
void squeek_layout_release(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard, void squeek_layout_release(struct squeek_layout *layout,
struct submission *submission,
struct transformation widget_to_layout, struct transformation widget_to_layout,
uint32_t timestamp, uint32_t timestamp,
EekboardContextService *manager, EekboardContextService *manager,
EekGtkKeyboard *ui_keyboard); EekGtkKeyboard *ui_keyboard);
void squeek_layout_release_all_only(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard, uint32_t timestamp); void squeek_layout_release_all_only(struct squeek_layout *layout,
void squeek_layout_depress(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard, struct submission *submission,
uint32_t timestamp);
void squeek_layout_depress(struct squeek_layout *layout,
struct submission *submission,
double x_widget, double y_widget, double x_widget, double y_widget,
struct transformation widget_to_layout, struct transformation widget_to_layout,
uint32_t timestamp, EekGtkKeyboard *ui_keyboard); uint32_t timestamp, EekGtkKeyboard *ui_keyboard);
void squeek_layout_drag(struct squeek_layout *layout, struct zwp_virtual_keyboard_v1 *virtual_keyboard, void squeek_layout_drag(struct squeek_layout *layout,
struct submission *submission,
double x_widget, double y_widget, double x_widget, double y_widget,
struct transformation widget_to_layout, struct transformation widget_to_layout,
uint32_t timestamp, EekboardContextService *manager, uint32_t timestamp, EekboardContextService *manager,

49
src/layout.rs
View File

@ -27,7 +27,7 @@ use ::action::Action;
use ::drawing; use ::drawing;
use ::keyboard::{ KeyState, PressType }; use ::keyboard::{ KeyState, PressType };
use ::manager; use ::manager;
use ::submission::{ Timestamp, VirtualKeyboard }; use ::submission::{ Submission, Timestamp };
use ::util::find_max_double; use ::util::find_max_double;
use std::borrow::Borrow; use std::borrow::Borrow;
@ -143,6 +143,11 @@ pub mod c {
} }
} }
} }
// This is constructed only in C, no need for warnings
#[allow(dead_code)]
#[repr(transparent)]
pub struct LevelKeyboard(*const c_void);
// The following defined in Rust. TODO: wrap naked pointers to Rust data inside RefCells to prevent multiple writers // The following defined in Rust. TODO: wrap naked pointers to Rust data inside RefCells to prevent multiple writers
@ -244,19 +249,12 @@ pub mod c {
pub mod procedures { pub mod procedures {
use super::*; use super::*;
use ::vkeyboard::c::ZwpVirtualKeyboardV1;
// This is constructed only in C, no need for warnings
#[allow(dead_code)]
#[repr(transparent)]
pub struct LevelKeyboard(*const c_void);
/// Release pointer in the specified position /// Release pointer in the specified position
#[no_mangle] #[no_mangle]
pub extern "C" pub extern "C"
fn squeek_layout_release( fn squeek_layout_release(
layout: *mut Layout, layout: *mut Layout,
virtual_keyboard: ZwpVirtualKeyboardV1, // TODO: receive a reference to the backend submission: *mut Submission,
widget_to_layout: Transformation, widget_to_layout: Transformation,
time: u32, time: u32,
manager: manager::c::Manager, manager: manager::c::Manager,
@ -264,7 +262,7 @@ pub mod c {
) { ) {
let time = Timestamp(time); let time = Timestamp(time);
let layout = unsafe { &mut *layout }; let layout = unsafe { &mut *layout };
let virtual_keyboard = VirtualKeyboard(virtual_keyboard); let submission = unsafe { &mut *submission };
let ui_backend = UIBackend { let ui_backend = UIBackend {
widget_to_layout, widget_to_layout,
keyboard: ui_keyboard, keyboard: ui_keyboard,
@ -276,7 +274,7 @@ pub mod c {
let key: &Rc<RefCell<KeyState>> = key.borrow(); let key: &Rc<RefCell<KeyState>> = key.borrow();
seat::handle_release_key( seat::handle_release_key(
layout, layout,
&virtual_keyboard, submission,
Some(&ui_backend), Some(&ui_backend),
time, time,
Some(manager), Some(manager),
@ -291,18 +289,18 @@ pub mod c {
pub extern "C" pub extern "C"
fn squeek_layout_release_all_only( fn squeek_layout_release_all_only(
layout: *mut Layout, layout: *mut Layout,
virtual_keyboard: ZwpVirtualKeyboardV1, // TODO: receive a reference to the backend submission: *mut Submission,
time: u32, time: u32,
) { ) {
let layout = unsafe { &mut *layout }; let layout = unsafe { &mut *layout };
let virtual_keyboard = VirtualKeyboard(virtual_keyboard); let submission = unsafe { &mut *submission };
// The list must be copied, // The list must be copied,
// because it will be mutated in the loop // because it will be mutated in the loop
for key in layout.pressed_keys.clone() { for key in layout.pressed_keys.clone() {
let key: &Rc<RefCell<KeyState>> = key.borrow(); let key: &Rc<RefCell<KeyState>> = key.borrow();
seat::handle_release_key( seat::handle_release_key(
layout, layout,
&virtual_keyboard, submission,
None, // don't update UI None, // don't update UI
Timestamp(time), Timestamp(time),
None, // don't switch layouts None, // don't switch layouts
@ -315,13 +313,14 @@ pub mod c {
pub extern "C" pub extern "C"
fn squeek_layout_depress( fn squeek_layout_depress(
layout: *mut Layout, layout: *mut Layout,
virtual_keyboard: ZwpVirtualKeyboardV1, // TODO: receive a reference to the backend submission: *mut Submission,
x_widget: f64, y_widget: f64, x_widget: f64, y_widget: f64,
widget_to_layout: Transformation, widget_to_layout: Transformation,
time: u32, time: u32,
ui_keyboard: EekGtkKeyboard, ui_keyboard: EekGtkKeyboard,
) { ) {
let layout = unsafe { &mut *layout }; let layout = unsafe { &mut *layout };
let submission = unsafe { &mut *submission };
let point = widget_to_layout.forward( let point = widget_to_layout.forward(
Point { x: x_widget, y: y_widget } Point { x: x_widget, y: y_widget }
); );
@ -335,7 +334,7 @@ pub mod c {
if let Some(state) = state { if let Some(state) = state {
seat::handle_press_key( seat::handle_press_key(
layout, layout,
&VirtualKeyboard(virtual_keyboard), submission,
Timestamp(time), Timestamp(time),
&state, &state,
); );
@ -351,7 +350,7 @@ pub mod c {
pub extern "C" pub extern "C"
fn squeek_layout_drag( fn squeek_layout_drag(
layout: *mut Layout, layout: *mut Layout,
virtual_keyboard: ZwpVirtualKeyboardV1, // TODO: receive a reference to the backend submission: *mut Submission,
x_widget: f64, y_widget: f64, x_widget: f64, y_widget: f64,
widget_to_layout: Transformation, widget_to_layout: Transformation,
time: u32, time: u32,
@ -360,7 +359,7 @@ pub mod c {
) { ) {
let time = Timestamp(time); let time = Timestamp(time);
let layout = unsafe { &mut *layout }; let layout = unsafe { &mut *layout };
let virtual_keyboard = VirtualKeyboard(virtual_keyboard); let submission = unsafe { &mut *submission };
let ui_backend = UIBackend { let ui_backend = UIBackend {
widget_to_layout, widget_to_layout,
keyboard: ui_keyboard, keyboard: ui_keyboard,
@ -389,7 +388,7 @@ pub mod c {
} else { } else {
seat::handle_release_key( seat::handle_release_key(
layout, layout,
&virtual_keyboard, submission,
Some(&ui_backend), Some(&ui_backend),
time, time,
Some(manager), Some(manager),
@ -400,7 +399,7 @@ pub mod c {
if !found { if !found {
seat::handle_press_key( seat::handle_press_key(
layout, layout,
&virtual_keyboard, submission,
time, time,
&state, &state,
); );
@ -411,7 +410,7 @@ pub mod c {
let key: &Rc<RefCell<KeyState>> = wrapped_key.borrow(); let key: &Rc<RefCell<KeyState>> = wrapped_key.borrow();
seat::handle_release_key( seat::handle_release_key(
layout, layout,
&virtual_keyboard, submission,
Some(&ui_backend), Some(&ui_backend),
time, time,
Some(manager), Some(manager),
@ -854,7 +853,7 @@ mod seat {
pub fn handle_press_key( pub fn handle_press_key(
layout: &mut Layout, layout: &mut Layout,
virtual_keyboard: &VirtualKeyboard, submission: &mut Submission,
time: Timestamp, time: Timestamp,
rckey: &Rc<RefCell<KeyState>>, rckey: &Rc<RefCell<KeyState>>,
) { ) {
@ -862,7 +861,7 @@ mod seat {
eprintln!("Warning: key {:?} was already pressed", rckey); eprintln!("Warning: key {:?} was already pressed", rckey);
} }
let mut key = rckey.borrow_mut(); let mut key = rckey.borrow_mut();
virtual_keyboard.switch( submission.virtual_keyboard.switch(
&key.keycodes, &key.keycodes,
PressType::Pressed, PressType::Pressed,
time, time,
@ -872,7 +871,7 @@ mod seat {
pub fn handle_release_key( pub fn handle_release_key(
layout: &mut Layout, layout: &mut Layout,
virtual_keyboard: &VirtualKeyboard, submission: &mut Submission,
ui: Option<&UIBackend>, ui: Option<&UIBackend>,
time: Timestamp, time: Timestamp,
manager: Option<manager::c::Manager>, manager: Option<manager::c::Manager>,
@ -894,7 +893,7 @@ mod seat {
match action { match action {
Action::Submit { text: _, keys: _ } => { Action::Submit { text: _, keys: _ } => {
unstick_locks(layout).apply(); unstick_locks(layout).apply();
virtual_keyboard.switch( submission.virtual_keyboard.switch(
&key.keycodes, &key.keycodes,
PressType::Released, PressType::Released,
time, time,

10
src/server-context-service.c
View File

@ -24,6 +24,7 @@
#include "eek/eek-gtk-keyboard.h" #include "eek/eek-gtk-keyboard.h"
#include "eek/layersurface.h" #include "eek/layersurface.h"
#include "eekboard/eekboard-context-service.h" #include "eekboard/eekboard-context-service.h"
#include "submission.h"
#include "wayland.h" #include "wayland.h"
#include "server-context-service.h" #include "server-context-service.h"
@ -41,10 +42,12 @@ struct _ServerContextService {
GObject parent; GObject parent;
EekboardContextService *state; // unowned EekboardContextService *state; // unowned
/// Needed for instantiating the widget
struct submission *submission; // unowned
gboolean visible; gboolean visible;
PhoshLayerSurface *window; PhoshLayerSurface *window;
GtkWidget *widget; GtkWidget *widget; // nullable
guint hiding; guint hiding;
guint last_requested_height; guint last_requested_height;
enum squeek_arrangement_kind last_type; enum squeek_arrangement_kind last_type;
@ -224,7 +227,7 @@ make_widget (ServerContextService *context)
LevelKeyboard *keyboard = eekboard_context_service_get_keyboard (context->state); LevelKeyboard *keyboard = eekboard_context_service_get_keyboard (context->state);
context->widget = eek_gtk_keyboard_new (keyboard, context->state); context->widget = eek_gtk_keyboard_new (keyboard, context->state, context->submission);
gtk_widget_set_has_tooltip (context->widget, TRUE); gtk_widget_set_has_tooltip (context->widget, TRUE);
gtk_container_add (GTK_CONTAINER(context->window), context->widget); gtk_container_add (GTK_CONTAINER(context->window), context->widget);
@ -395,9 +398,10 @@ server_context_service_init (ServerContextService *state) {
} }
ServerContextService * ServerContextService *
server_context_service_new (EekboardContextService *state) server_context_service_new (EekboardContextService *state, struct submission *submission)
{ {
ServerContextService *ui = g_object_new (SERVER_TYPE_CONTEXT_SERVICE, NULL); ServerContextService *ui = g_object_new (SERVER_TYPE_CONTEXT_SERVICE, NULL);
ui->submission = submission;
ui->state = state; ui->state = state;
g_signal_connect (state, g_signal_connect (state,
"notify::keyboard", "notify::keyboard",

3
src/server-context-service.h
View File

@ -19,6 +19,7 @@
#define SERVER_CONTEXT_SERVICE_H 1 #define SERVER_CONTEXT_SERVICE_H 1
#include "src/layout.h" #include "src/layout.h"
#include "src/submission.h"
G_BEGIN_DECLS G_BEGIN_DECLS
@ -35,7 +36,7 @@ typedef struct _ServerContextService ServerContextService;
GType server_context_service_get_type GType server_context_service_get_type
(void) G_GNUC_CONST; (void) G_GNUC_CONST;
ServerContextService *server_context_service_new(EekboardContextService *state); ServerContextService *server_context_service_new(EekboardContextService *state, struct submission *submission);
enum squeek_arrangement_kind server_context_service_get_layout_type(ServerContextService *); enum squeek_arrangement_kind server_context_service_get_layout_type(ServerContextService *);
void server_context_service_show_keyboard (ServerContextService *context); void server_context_service_show_keyboard (ServerContextService *context);
void server_context_service_hide_keyboard (ServerContextService *context); void server_context_service_hide_keyboard (ServerContextService *context);

20
src/server-main.c
View File

@ -193,6 +193,10 @@ main (int argc, char **argv)
exit(1); exit(1);
} }
if (!instance.wayland.input_method_manager) {
g_warning("Wayland input method interface not available");
}
instance.settings_context = eekboard_context_service_new(); instance.settings_context = eekboard_context_service_new();
// set up dbus // set up dbus
@ -261,14 +265,16 @@ main (int argc, char **argv)
exit (1); exit (1);
} }
if (instance.wayland.input_method_manager) { instance.submission = get_submission(instance.wayland.input_method_manager,
// Cannot fail instance.wayland.virtual_keyboard_manager,
instance.submission = get_submission(instance.wayland.input_method_manager, instance.wayland.seat,
instance.wayland.seat, instance.settings_context);
instance.settings_context);
}
ServerContextService *ui_context = server_context_service_new(instance.settings_context); eekboard_context_service_set_submission(instance.settings_context, instance.submission);
ServerContextService *ui_context = server_context_service_new(
instance.settings_context,
instance.submission);
if (!ui_context) { if (!ui_context) {
g_error("Could not initialize GUI"); g_error("Could not initialize GUI");
exit(1); exit(1);

21
src/submission.rs
View File

@ -17,12 +17,13 @@
* and those events SHOULD NOT cause any lost events. * and those events SHOULD NOT cause any lost events.
* */ * */
use ::imservice::IMService;
//use ::vkeyboard::VirtualKeyboard;
/// Temporary reexport to keep stuff based directly on virtual-keyboard working /// Temporary reexport to keep stuff based directly on virtual-keyboard working
/// until a unified handler appears and prompts a rework. /// until a unified handler appears and prompts a rework.
pub use vkeyboard::*; pub use vkeyboard::*;
use ::imservice::IMService;
/// Gathers stuff defined in C or called by C /// Gathers stuff defined in C or called by C
pub mod c { pub mod c {
use super::*; use super::*;
@ -30,6 +31,8 @@ pub mod c {
use std::os::raw::c_void; use std::os::raw::c_void;
use ::imservice::c::InputMethod; use ::imservice::c::InputMethod;
use ::layout::c::LevelKeyboard;
use ::vkeyboard::c::ZwpVirtualKeyboardV1;
// The following defined in C // The following defined in C
@ -45,6 +48,7 @@ pub mod c {
pub extern "C" pub extern "C"
fn submission_new( fn submission_new(
im: *mut InputMethod, im: *mut InputMethod,
vk: ZwpVirtualKeyboardV1,
state_manager: *const StateManager state_manager: *const StateManager
) -> *mut Submission { ) -> *mut Submission {
let imservice = if im.is_null() { let imservice = if im.is_null() {
@ -56,10 +60,12 @@ pub mod c {
Box::<Submission>::into_raw(Box::new( Box::<Submission>::into_raw(Box::new(
Submission { Submission {
imservice, imservice,
virtual_keyboard: VirtualKeyboard(vk),
} }
)) ))
} }
/// Use to initialize the UI reference
#[no_mangle] #[no_mangle]
pub extern "C" pub extern "C"
fn submission_set_ui(submission: *mut Submission, ui_manager: *const UIManager) { fn submission_set_ui(submission: *mut Submission, ui_manager: *const UIManager) {
@ -75,10 +81,21 @@ pub mod c {
} }
}; };
} }
#[no_mangle]
pub extern "C"
fn submission_set_keyboard(submission: *mut Submission, keyboard: LevelKeyboard) {
if submission.is_null() {
panic!("Null submission pointer");
}
let submission: &mut Submission = unsafe { &mut *submission };
submission.virtual_keyboard.update_keymap(keyboard);
}
} }
pub struct Submission { pub struct Submission {
// used by C callbacks internally, TODO: make use with virtual keyboard // used by C callbacks internally, TODO: make use with virtual keyboard
#[allow(dead_code)] #[allow(dead_code)]
imservice: Option<Box<IMService>>, imservice: Option<Box<IMService>>,
pub virtual_keyboard: VirtualKeyboard,
} }

18
src/vkeyboard.rs
View File

@ -1,9 +1,11 @@
/*! Managing the events belonging to virtual-keyboard interface. */ /*! Managing the events belonging to virtual-keyboard interface. */
use ::keyboard::{ KeyCode, PressType }; use ::keyboard::{ KeyCode, PressType };
use ::layout::c::LevelKeyboard;
/// Gathers stuff defined in C or called by C /// Gathers stuff defined in C or called by C
pub mod c { pub mod c {
use super::*;
use std::os::raw::c_void; use std::os::raw::c_void;
#[repr(transparent)] #[repr(transparent)]
@ -12,14 +14,17 @@ pub mod c {
#[no_mangle] #[no_mangle]
extern "C" { extern "C" {
/// Checks if point falls within bounds,
/// which are relative to origin and rotated by angle (I think)
pub fn eek_virtual_keyboard_v1_key( pub fn eek_virtual_keyboard_v1_key(
virtual_keyboard: ZwpVirtualKeyboardV1, virtual_keyboard: ZwpVirtualKeyboardV1,
timestamp: u32, timestamp: u32,
keycode: u32, keycode: u32,
press: u32, press: u32,
); );
pub fn eek_virtual_keyboard_update_keymap(
virtual_keyboard: ZwpVirtualKeyboardV1,
keyboard: LevelKeyboard,
);
} }
} }
@ -64,4 +69,13 @@ impl VirtualKeyboard {
} }
} }
} }
pub fn update_keymap(&self, keyboard: LevelKeyboard) {
unsafe {
c::eek_virtual_keyboard_update_keymap(
self.0,
keyboard,
);
}
}
} }

9
src/wayland.c
View File

@ -1,3 +1,5 @@
#include "eek/eek-keyboard.h"
#include "wayland.h" #include "wayland.h"
struct squeek_wayland *squeek_wayland = NULL; struct squeek_wayland *squeek_wayland = NULL;
@ -11,6 +13,13 @@ eek_virtual_keyboard_v1_key(struct zwp_virtual_keyboard_v1 *zwp_virtual_keyboard
zwp_virtual_keyboard_v1_key(zwp_virtual_keyboard_v1, time, key, state); zwp_virtual_keyboard_v1_key(zwp_virtual_keyboard_v1, time, key, state);
} }
void eek_virtual_keyboard_update_keymap(struct zwp_virtual_keyboard_v1 *zwp_virtual_keyboard_v1, const LevelKeyboard *keyboard) {
zwp_virtual_keyboard_v1_keymap(zwp_virtual_keyboard_v1,
WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
keyboard->keymap_fd, keyboard->keymap_len);
}
int squeek_output_add_listener(struct wl_output *wl_output, int squeek_output_add_listener(struct wl_output *wl_output,
const struct wl_output_listener *listener, void *data) { const struct wl_output_listener *listener, void *data) {
return wl_output_add_listener(wl_output, listener, data); return wl_output_add_listener(wl_output, listener, data);