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

Merge remote-tracking branch 'upstream/master' into reparse

Browse Source
This commit is contained in:
Dorota Czaplejewicz
2019-09-10 08:54:43 +00:00
parent 31c12e5182 db8340181f
commit 99c577be60
13 changed files with 27 additions and 1391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Cargo.lock generated
View File

@ -1,5 +1,10 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
name = "bitflags"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "dtoa"
version = "0.4.4"
@ -35,6 +40,7 @@ dependencies = [
name = "rs"
version = "0.1.0"
dependencies = [
"bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_yaml 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)",
@ -93,6 +99,7 @@ dependencies = [
]
[metadata]
"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
"checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
"checksum maplit 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"

1
Cargo.toml
View File

@ -3,6 +3,7 @@ name = "rs"
version = "0.1.0"
[dependencies]
bitflags = "1.1"
maplit = "1.0"
serde = { version = "1.0", features = ["derive"] }
serde_yaml = "0.8"

1
bindings/vala/Eek-0.90.metadata
View File

@ -1 +0,0 @@
Eek cheader_filename="eek/eek.h"

1
bindings/vala/EekGtk-0.90.metadata
View File

@ -1 +0,0 @@
EekGtk cheader_filename="eek/eek-gtk.h"

1
bindings/vala/EekXkl-0.90.metadata
View File

@ -1 +0,0 @@
EekXkl cheader_filename="eek/eek-xkl.h"

1
bindings/vala/eek-0.90.deps
View File

@ -1 +0,0 @@
gio-2.0

1
bindings/vala/eek-gtk-0.90.deps
View File

@ -1 +0,0 @@
eek-0.90

2
bindings/vala/eek-xkl-0.90.deps
View File

@ -1,2 +0,0 @@
eek-0.90
x11

16
data/style.css
View File

@ -19,9 +19,21 @@
}
#Return {
background: #6480ff
background: #1c71d8;
border-color: #1a5fb4
}
#Return:active {
background: #1c71d8;
border-color: #3584e4;
}
#Shift_L {
background: #363438
background: #2b292f;
border-color: #3e3a44
}
#Shift_L:active {
background: #1c71d8;
border-color: #3584e4;
}

3
debian/control vendored
View File

@ -5,7 +5,8 @@ Maintainer: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Build-Depends:
cargo,
debhelper (>= 10),
meson (>=0.43.0),
meson (>=0.51.0),
ninja-build,
pkg-config,
libglib2.0-dev,
libgtk-3-dev,

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

@ -319,32 +319,6 @@ eek_gtk_keyboard_real_unmap (GtkWidget *self)
GTK_WIDGET_CLASS (eek_gtk_keyboard_parent_class)->unmap (self);
}
static gboolean
eek_gtk_keyboard_real_query_tooltip (GtkWidget *widget,
gint x,
gint y,
gboolean keyboard_tooltip,
GtkTooltip *tooltip)
{
EekGtkKeyboard *self = EEK_GTK_KEYBOARD (widget);
EekGtkKeyboardPrivate *priv = eek_gtk_keyboard_get_instance_private (self);
struct squeek_view *view = level_keyboard_current(priv->keyboard);
struct squeek_button *button = eek_renderer_find_button_by_position (priv->renderer,
view,
(gdouble)x,
(gdouble)y);
if (button) {
//struct squeek_symbol *symbol = eek_key_get_symbol_at_index(key, 0, priv->keyboard->level);
const gchar *text = NULL; // FIXME
if (text) {
gtk_tooltip_set_text (tooltip, text);
return TRUE;
}
}
return FALSE;
}
static void
eek_gtk_keyboard_set_property (GObject *object,
guint prop_id,
@ -367,6 +341,7 @@ eek_gtk_keyboard_dispose (GObject *object)
if (priv->renderer) {
g_object_unref (priv->renderer);
priv->renderer = NULL;
priv->renderer = NULL;
}
if (priv->keyboard) {
@ -399,8 +374,6 @@ eek_gtk_keyboard_class_init (EekGtkKeyboardClass *klass)
eek_gtk_keyboard_real_button_release_event;
widget_class->motion_notify_event =
eek_gtk_keyboard_real_motion_notify_event;
widget_class->query_tooltip =
eek_gtk_keyboard_real_query_tooltip;
widget_class->touch_event = handle_touch_event;
gobject_class->set_property = eek_gtk_keyboard_set_property;

1350
src/bitflags.rs
View File

File diff suppressed because it is too large Load Diff

5
src/lib.rs
View File

@ -1,10 +1,9 @@
#[macro_use]
extern crate bitflags;
#[macro_use]
extern crate maplit;
extern crate serde;
#[macro_use]
mod bitflags;
mod data;
mod float_ord;
mod imservice;