aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.am4
-rw-r--r--lib/ibus-menu.vala275
-rw-r--r--lib/main.vala90
-rw-r--r--lib/source.vala8
4 files changed, 358 insertions, 19 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0e7cd266..7432d15c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,12 +2,14 @@ libexec_PROGRAMS = indicator-keyboard-service
AM_CFLAGS = -w -DGNOME_DESKTOP_USE_UNSTABLE_API
AM_LDFLAGS = -lm
-AM_VALAFLAGS = --metadatadir $(top_srcdir)/deps \
+AM_VALAFLAGS = --enable-experimental-non-null \
+ --metadatadir $(top_srcdir)/deps \
--vapidir $(top_srcdir)/deps
indicator_keyboard_service_SOURCES = main.vala \
source.vala \
common.vala \
+ ibus-menu.vala \
window-stack.vala \
unity-greeter.vala
indicator_keyboard_service_VALAFLAGS = $(AM_VALAFLAGS) \
diff --git a/lib/ibus-menu.vala b/lib/ibus-menu.vala
new file mode 100644
index 00000000..96bd40e9
--- /dev/null
+++ b/lib/ibus-menu.vala
@@ -0,0 +1,275 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: William Hua <william.hua@canonical.com>
+ */
+
+public class Indicator.Keyboard.IBusMenu : MenuModel {
+
+ private static uint radio_counter = 0;
+
+ private IBus.PropList? properties;
+
+ private Menu menu;
+ private SimpleActionGroup? action_group;
+
+ private string? radio_name;
+ private SimpleAction? radio_action;
+ private Gee.HashMap<string, IBus.Property> radio_properties;
+
+ private Gee.LinkedList<string> names;
+
+ public IBusMenu (SimpleActionGroup? action_group = null, IBus.PropList? properties = null) {
+ menu = new Menu ();
+
+ menu.items_changed.connect ((position, removed, added) => {
+ items_changed (position, removed, added);
+ });
+
+ names = new Gee.LinkedList<string> ();
+ set_action_group (action_group);
+ set_properties (properties);
+ }
+
+ ~IBusMenu () {
+ remove_actions ();
+ }
+
+ public signal void activate (IBus.Property property, IBus.PropState state);
+
+ private string get_action_name (string key) {
+ if (!action_name_is_valid (key)) {
+ var builder = new StringBuilder.sized (key.length + 1);
+
+ unichar letter = 0;
+ int index = 0;
+
+ while (key.get_next_char (ref index, out letter)) {
+ if (letter == '-' || letter == '.' || letter.isalnum ()) {
+ builder.append_unichar (letter);
+ } else {
+ builder.append_c ('-');
+ }
+ }
+
+ return builder.str;
+ } else {
+ return key;
+ }
+ }
+
+ private string? get_label (IBus.Property property) {
+ string? label = null;
+
+ if ((IBus.Text?) property.label != null) {
+ label = property.label.text;
+ }
+
+ if (label == null && (IBus.Text?) property.symbol != null) {
+ label = property.symbol.text;
+ }
+
+ return label;
+ }
+
+ private void append_normal_property (IBus.Property property) {
+ if (property.prop_type == IBus.PropType.NORMAL) {
+ if ((string?) property.key != null) {
+ var name = get_action_name (property.key);
+
+ if (action_group != null) {
+ var action = new SimpleAction (name, null);
+ action.activate.connect ((parameter) => { activate (property, property.state); });
+ ((!) action_group).add_action (action);
+ names.add (name);
+ }
+
+ menu.append (get_label (property), @"indicator.$name");
+ }
+ }
+ }
+
+ private void append_toggle_property (IBus.Property property) {
+ if (property.prop_type == IBus.PropType.TOGGLE) {
+ if ((string?) property.key != null) {
+ var name = get_action_name (property.key);
+
+ if (action_group != null) {
+ var state = new Variant.boolean (property.state == IBus.PropState.CHECKED);
+ var action = new SimpleAction.stateful (name, null, state);
+
+ action.activate.connect ((parameter) => {
+ action.change_state (new Variant.boolean (!action.get_state ().get_boolean ()));
+ });
+
+ action.change_state.connect ((value) => {
+ if (value != null) {
+ activate (property, ((!) value).get_boolean () ? IBus.PropState.CHECKED : IBus.PropState.UNCHECKED);
+ }
+ });
+
+ ((!) action_group).add_action (action);
+ names.add (name);
+ }
+
+ menu.append (get_label (property), @"indicator.$name");
+ }
+ }
+ }
+
+ private void append_radio_property (IBus.Property property) {
+ if (property.prop_type == IBus.PropType.RADIO) {
+ if ((string?) property.key != null) {
+ if (action_group != null && radio_name == null) {
+ radio_counter++;
+ radio_name = @"-private-$radio_counter";
+ radio_action = new SimpleAction.stateful ((!) radio_name, VariantType.STRING, new Variant.string (""));
+
+ ((!) radio_action).activate.connect ((parameter) => {
+ ((!) radio_action).change_state (parameter);
+ });
+
+ ((!) radio_action).change_state.connect ((value) => {
+ if (value != null) {
+ var key = ((!) value).get_string ();
+
+ if (radio_properties.has_key (key)) {
+ activate (radio_properties[key], IBus.PropState.CHECKED);
+ }
+ }
+ });
+
+ ((!) action_group).add_action ((!) radio_action);
+ names.add ((!) radio_name);
+ }
+
+ radio_properties[property.key] = property;
+
+ if (property.state == IBus.PropState.CHECKED) {
+ ((!) radio_action).change_state (new Variant.string (property.key));
+ }
+
+ var item = new MenuItem (get_label (property), null);
+ item.set_action_and_target_value (@"indicator.$((!) radio_name)", new Variant.string (property.key));
+ menu.append_item (item);
+ }
+ }
+ }
+
+ private void append_menu_property (IBus.Property property) {
+ if (property.prop_type == IBus.PropType.MENU) {
+ var submenu = new IBusMenu (action_group, ((!) property).sub_props);
+ submenu.activate.connect ((property, state) => { activate (property, state); });
+ menu.append_submenu (get_label (property), submenu);
+ }
+ }
+
+ private void append_property (IBus.Property? property) {
+ if (property != null && ((!) property).visible) {
+ switch (((!) property).prop_type) {
+ case IBus.PropType.NORMAL:
+ append_normal_property ((!) property);
+ break;
+
+ case IBus.PropType.TOGGLE:
+ append_toggle_property ((!) property);
+ break;
+
+ case IBus.PropType.RADIO:
+ append_radio_property ((!) property);
+ break;
+
+ case IBus.PropType.MENU:
+ append_menu_property ((!) property);
+ break;
+
+ case IBus.PropType.SEPARATOR:
+ break;
+ }
+ }
+ }
+
+ private void update_menu () {
+ menu.remove_all ();
+
+ if (properties != null) {
+ for (var i = 0; i < ((!) properties).properties.length; i++) {
+ append_property (((!) properties).get (i));
+ }
+ }
+ }
+
+ private void remove_actions () {
+ radio_action = null;
+ radio_name = null;
+
+ if (action_group != null) {
+ foreach (var name in names) {
+ ((!) action_group).remove_action (name);
+ }
+ }
+
+ names.clear ();
+ }
+
+ public void set_action_group (SimpleActionGroup? action_group) {
+ if (action_group != this.action_group) {
+ remove_actions ();
+ this.action_group = action_group;
+ update_menu ();
+ }
+ }
+
+ public void set_properties (IBus.PropList? properties) {
+ if (properties != this.properties) {
+ remove_actions ();
+ radio_properties = new Gee.HashMap<string, IBus.Property> ();
+ this.properties = properties;
+ update_menu ();
+ }
+ }
+
+ public override Variant get_item_attribute_value (int item_index, string attribute, VariantType? expected_type) {
+ return menu.get_item_attribute_value (item_index, attribute, expected_type);
+ }
+
+ public override void get_item_attributes (int item_index, out HashTable<string, Variant>? attributes) {
+ menu.get_item_attributes (item_index, out attributes);
+ }
+
+ public override MenuModel get_item_link (int item_index, string link) {
+ return menu.get_item_link (item_index, link);
+ }
+
+ public override void get_item_links (int item_index, out HashTable<string, MenuModel>? links) {
+ menu.get_item_links (item_index, out links);
+ }
+
+ public override int get_n_items () {
+ return menu.get_n_items ();
+ }
+
+ public override bool is_mutable () {
+ return menu.is_mutable ();
+ }
+
+ public override MenuAttributeIter iterate_item_attributes (int item_index) {
+ return menu.iterate_item_attributes (item_index);
+ }
+
+ public override MenuLinkIter iterate_item_links (int item_index) {
+ return menu.iterate_item_links (item_index);
+ }
+}
diff --git a/lib/main.vala b/lib/main.vala
index ffc558ba..8da58813 100644
--- a/lib/main.vala
+++ b/lib/main.vala
@@ -19,8 +19,9 @@
[DBus (name = "com.canonical.indicator.keyboard")]
public class Indicator.Keyboard.Service : Object {
+ private static const uint PROPERTIES_DELAY = 250;
+
private static Service service;
- private static IBus.Bus? ibus;
private bool force;
private bool use_gtk;
@@ -35,12 +36,17 @@ public class Indicator.Keyboard.Service : Object {
private Gee.HashMap<uint, uint>? window_sources;
private uint focused_window_id;
+ private IBus.Bus? ibus;
+ private IBus.PanelService? panel_service;
+ private uint panel_timeout;
+
private Source[]? sources;
private SimpleActionGroup? action_group;
private SimpleAction? indicator_action;
private MenuModel? menu_model;
private Menu? sources_menu;
+ private IBusMenu? ibus_menu;
private UnityGreeter? unity_greeter;
private string? greeter_user;
@@ -96,7 +102,7 @@ public class Indicator.Keyboard.Service : Object {
}
[DBus (visible = false)]
- private static IBus.Bus get_ibus () {
+ private IBus.Bus get_ibus () {
if (ibus == null) {
IBus.init ();
ibus = new IBus.Bus ();
@@ -210,7 +216,7 @@ public class Indicator.Keyboard.Service : Object {
if (source != null) {
var array = source_settings.get_value ("sources");
- for (int i = 0; i < array.n_children (); i++) {
+ for (var i = 0; i < array.n_children (); i++) {
unowned string type;
unowned string name;
@@ -543,6 +549,14 @@ public class Indicator.Keyboard.Service : Object {
break;
}
}
+
+ if (panel_service == null && sources[i].is_ibus) {
+ if (get_ibus ().request_name (IBus.SERVICE_PANEL, IBus.BusNameFlag.REPLACE_EXISTING) > 0) {
+ panel_service = new IBus.PanelService (get_ibus ().get_connection ());
+ ((!) panel_service).register_properties.connect (handle_registered_properties);
+ ((!) panel_service).update_property.connect (handle_updated_property);
+ }
+ }
}
}
@@ -550,6 +564,24 @@ public class Indicator.Keyboard.Service : Object {
}
[DBus (visible = false)]
+ private void handle_registered_properties (IBus.PropList list) {
+ if (panel_timeout > 0) {
+ GLib.Source.remove (panel_timeout);
+ panel_timeout = 0;
+ }
+
+ panel_timeout = Timeout.add (PROPERTIES_DELAY, () => {
+ update_ibus_menu (list);
+ panel_timeout = 0;
+ return false;
+ });
+ }
+
+ [DBus (visible = false)]
+ private void handle_updated_property (IBus.Property property) {
+ }
+
+ [DBus (visible = false)]
private void update_indicator_action () {
var visible = indicator_settings.get_boolean ("visible");
var current = source_settings.get_uint ("current");
@@ -600,7 +632,7 @@ public class Indicator.Keyboard.Service : Object {
var length = (int) sources.n_children ();
if (length > 0) {
- var offset = parameter.get_int32 () % length;
+ var offset = ((!) parameter).get_int32 () % length;
source_settings.set_uint ("current", (current + (length - offset)) % length);
}
}
@@ -610,28 +642,28 @@ public class Indicator.Keyboard.Service : Object {
protected virtual SimpleActionGroup create_action_group (Action root_action) {
var group = new SimpleActionGroup ();
- group.insert (root_action);
- group.insert (source_settings.create_action ("current"));
+ group.add_action (root_action);
+ group.add_action (source_settings.create_action ("current"));
var action = new SimpleAction ("next", null);
action.activate.connect (handle_middle_click);
- group.insert (action);
+ group.add_action (action);
action = new SimpleAction ("scroll", VariantType.INT32);
action.activate.connect (handle_scroll_wheel);
- group.insert (action);
+ group.add_action (action);
action = new SimpleAction ("map", null);
action.activate.connect (handle_activate_map);
- group.insert (action);
+ group.add_action (action);
action = new SimpleAction ("chart", null);
action.activate.connect (handle_activate_chart);
- group.insert (action);
+ group.add_action (action);
action = new SimpleAction ("settings", null);
action.activate.connect (handle_activate_settings);
- group.insert (action);
+ group.add_action (action);
return group;
}
@@ -649,12 +681,9 @@ public class Indicator.Keyboard.Service : Object {
private void update_sources_menu () {
if (sources_menu != null) {
var menu = get_sources_menu ();
-
- while (menu.get_n_items () > 0)
- menu.remove (0);
+ menu.remove_all ();
var sources = get_sources ();
-
for (var i = 0; i < sources.length; i++) {
var item = new MenuItem (sources[i].name, "indicator.current");
item.set_attribute (Menu.ATTRIBUTE_TARGET, "u", i);
@@ -682,12 +711,37 @@ public class Indicator.Keyboard.Service : Object {
}
[DBus (visible = false)]
- protected virtual MenuModel create_menu_model (MenuModel section_menu) {
+ private void update_ibus_menu (IBus.PropList list) {
+ if (ibus_menu != null) {
+ var menu = get_ibus_menu ();
+ menu.set_properties (list);
+ } else {
+ get_ibus_menu ();
+ }
+ }
+
+ [DBus (visible = false)]
+ private IBusMenu get_ibus_menu () {
+ if (ibus_menu == null) {
+ ibus_menu = new IBusMenu (get_action_group ());
+ ((!) ibus_menu).activate.connect ((property, state) => {
+ if (panel_service != null) {
+ ((!) panel_service).property_activate (property.key, state);
+ }
+ });
+ }
+
+ return (!) ibus_menu;
+ }
+
+ [DBus (visible = false)]
+ protected virtual MenuModel create_menu_model (MenuModel sources_menu, MenuModel ibus_menu) {
var menu = new Menu ();
var submenu = new Menu ();
- submenu.append_section (null, section_menu);
+ submenu.append_section (null, sources_menu);
+ submenu.append_section (null, ibus_menu);
if (!is_login_user ()) {
var section = new Menu ();
@@ -710,7 +764,7 @@ public class Indicator.Keyboard.Service : Object {
[DBus (visible = false)]
public MenuModel get_menu_model () {
if (menu_model == null) {
- menu_model = create_menu_model (get_sources_menu ());
+ menu_model = create_menu_model (get_sources_menu (), get_ibus_menu ());
}
return (!) menu_model;
diff --git a/lib/source.vala b/lib/source.vala
index 3e38a86e..1ee2650a 100644
--- a/lib/source.vala
+++ b/lib/source.vala
@@ -69,6 +69,14 @@ public class Indicator.Keyboard.Source : Object {
construct set { _use_gtk = value; icon = null; }
}
+ public bool is_xkb {
+ get { return xkb != null; }
+ }
+
+ public bool is_ibus {
+ get { return ibus != null; }
+ }
+
public Source (Variant variant, bool use_gtk = false) {
Object (use_gtk: use_gtk);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 08:44:27 +0000