diff -Nru caribou-0.3.5/aclocal.m4 caribou-0.3.91/aclocal.m4 --- caribou-0.3.5/aclocal.m4 2011-08-12 07:45:21.000000000 +0000 +++ caribou-0.3.91/aclocal.m4 2011-09-05 23:45:11.000000000 +0000 @@ -1268,101 +1268,6 @@ AC_MSG_ERROR([Vala $1 not found.])])])]) ]) -dnl -*- mode: autoconf -*- -dnl Copyright 2009 Johan Dahlin -dnl -dnl This file is free software; the author(s) gives unlimited -dnl permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl - -# serial 1 - -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first - - dnl enable/disable introspection - m4_if([$2], [require], - [dnl - enable_introspection=yes - ],[dnl - AC_ARG_ENABLE(introspection, - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], - [Enable introspection for this build]),, - [enable_introspection=auto]) - ])dnl - - AC_MSG_CHECKING([for gobject-introspection]) - - dnl presence/version checking - AS_CASE([$enable_introspection], - [no], [dnl - found_introspection="no (disabled, use --enable-introspection to enable)" - ],dnl - [yes],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0],, - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], - found_introspection=yes, - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) - ],dnl - [auto],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) - ],dnl - [dnl - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) - ])dnl - - AC_MSG_RESULT([$found_introspection]) - - INTROSPECTION_SCANNER= - INTROSPECTION_COMPILER= - INTROSPECTION_GENERATE= - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) - AC_SUBST(INTROSPECTION_GENERATE) - AC_SUBST(INTROSPECTION_GIRDIR) - AC_SUBST(INTROSPECTION_TYPELIBDIR) - AC_SUBST(INTROSPECTION_CFLAGS) - AC_SUBST(INTROSPECTION_LIBS) - AC_SUBST(INTROSPECTION_MAKEFILE) - - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -]) - - -dnl Usage: -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) - -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -]) - -dnl Usage: -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) - - -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -]) - # nls.m4 serial 5 (gettext-0.18) dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, dnl Inc. @@ -2283,6 +2188,101 @@ ] ) +dnl -*- mode: autoconf -*- +dnl Copyright 2009 Johan Dahlin +dnl +dnl This file is free software; the author(s) gives unlimited +dnl permission to copy and/or distribute it, with or without +dnl modifications, as long as this notice is preserved. +dnl + +# serial 1 + +m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([LT_INIT],[$0])dnl setup libtool first + + dnl enable/disable introspection + m4_if([$2], [require], + [dnl + enable_introspection=yes + ],[dnl + AC_ARG_ENABLE(introspection, + AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], + [Enable introspection for this build]),, + [enable_introspection=auto]) + ])dnl + + AC_MSG_CHECKING([for gobject-introspection]) + + dnl presence/version checking + AS_CASE([$enable_introspection], + [no], [dnl + found_introspection="no (disabled, use --enable-introspection to enable)" + ],dnl + [yes],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0],, + AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], + found_introspection=yes, + AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) + ],dnl + [auto],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) + ],dnl + [dnl + AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) + ])dnl + + AC_MSG_RESULT([$found_introspection]) + + INTROSPECTION_SCANNER= + INTROSPECTION_COMPILER= + INTROSPECTION_GENERATE= + INTROSPECTION_GIRDIR= + INTROSPECTION_TYPELIBDIR= + if test "x$found_introspection" = "xyes"; then + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection + fi + AC_SUBST(INTROSPECTION_SCANNER) + AC_SUBST(INTROSPECTION_COMPILER) + AC_SUBST(INTROSPECTION_GENERATE) + AC_SUBST(INTROSPECTION_GIRDIR) + AC_SUBST(INTROSPECTION_TYPELIBDIR) + AC_SUBST(INTROSPECTION_CFLAGS) + AC_SUBST(INTROSPECTION_LIBS) + AC_SUBST(INTROSPECTION_MAKEFILE) + + AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") +]) + + +dnl Usage: +dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) + +AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) +]) + +dnl Usage: +dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) + + +AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) +]) + m4_include([m4/gnome-doc-utils.m4]) m4_include([m4/intltool.m4]) m4_include([m4/libtool.m4]) diff -Nru caribou-0.3.5/bin/antler-keyboard.in caribou-0.3.91/bin/antler-keyboard.in --- caribou-0.3.5/bin/antler-keyboard.in 2011-06-13 21:35:11.000000000 +0000 +++ caribou-0.3.91/bin/antler-keyboard.in 2011-08-31 16:19:27.000000000 +0000 @@ -25,7 +25,7 @@ if [ $script_dir == "@libexecdir@" ] then - datadir="$(@PYTHON@ -c "import glib; print ':'.join(glib.get_system_data_dirs())")" + datadir="$(@PYTHON@ -c "from gi.repository import GLib; print ':'.join(GLib.get_system_data_dirs())")" export PYTHONPATH="${prefix}/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" diff -Nru caribou-0.3.5/bin/caribou-preferences.in caribou-0.3.91/bin/caribou-preferences.in --- caribou-0.3.5/bin/caribou-preferences.in 2011-06-13 21:35:11.000000000 +0000 +++ caribou-0.3.91/bin/caribou-preferences.in 2011-08-31 16:19:27.000000000 +0000 @@ -25,7 +25,7 @@ if [ $script_dir == "@bindir@" ] then - datadir="$(@PYTHON@ -c "import glib; print ':'.join(glib.get_system_data_dirs())")" + datadir="$(@PYTHON@ -c "from gi.repository import GLib; print ':'.join(GLib.get_system_data_dirs())")" export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}" export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}" export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:LD_LIBRARY_PATH}" diff -Nru caribou-0.3.5/caribou/antler/antler_settings.py caribou-0.3.91/caribou/antler/antler_settings.py --- caribou-0.3.5/caribou/antler/antler_settings.py 2011-07-18 17:10:01.000000000 +0000 +++ caribou-0.3.91/caribou/antler/antler_settings.py 2011-09-05 22:19:56.000000000 +0000 @@ -7,16 +7,19 @@ SettingsGroup("appearance", _("Appearance"), [ StringSetting( "keyboard_type", _("Keyboard Type"), "touch", - _("The keyboard geometery Caribou should use"), - _("The keyboard geometery determines the shape " + _("The keyboard geometry Caribou should use"), + _("The keyboard geometry determines the shape " "and complexity of the keyboard, it could range from " "a 'natural' look and feel good for composing simple " "text, to a fullscale keyboard."), + # Translators: Keyboard type (similar to touch/tactile device) allowed=[(('touch'), _('Touch')), + # Translators: Keyboard type (conventional keyboard) (('fullscale'), _('Full scale')), + # Translators: Keyboard type (scanned grid by rows/columns) (('scan'), _('Scan'))]), BooleanSetting("use_system", _("Use System Theme"), - True, _("Use System Theme")), + False, _("Use System Theme")), FloatSetting("min_alpha", _("Minimum Alpha"), 0.2, _("Minimal opacity of keyboard"), min=0.0, max=1.0), diff -Nru caribou-0.3.5/caribou/antler/keyboard_view.py caribou-0.3.91/caribou/antler/keyboard_view.py --- caribou-0.3.5/caribou/antler/keyboard_view.py 2011-07-18 17:10:01.000000000 +0000 +++ caribou-0.3.91/caribou/antler/keyboard_view.py 2011-09-05 22:19:56.000000000 +0000 @@ -3,9 +3,9 @@ from antler_settings import AntlerSettings from gi.repository import Gtk from gi.repository import Gdk +from gi.repository import GObject +from gi.repository import GLib from gi.repository import Caribou -import gobject -import glib import os from math import ceil @@ -30,7 +30,7 @@ class AntlerKey(Gtk.Button): def __init__(self, key, spacing=0): - gobject.GObject.__init__(self) + GObject.GObject.__init__(self) self.caribou_key = key.weak_ref() self.set_label(self._get_key_label()) self._spacing = spacing @@ -71,7 +71,7 @@ if not unichar.isspace() and unichar != u'\x00': label = unichar - return "%s" % glib.markup_escape_text(label.encode('utf-8')) + return "%s" % GLib.markup_escape_text(label.encode('utf-8')) def _caribou_key_pressed (self, key, _key): self.set_state_flags(Gtk.StateFlags.ACTIVE, False) @@ -87,8 +87,9 @@ if self.caribou_key(): self.caribou_key().release() - def do_get_preferred_width_for_height(self, h): + def do_get_preferred_width(self): w = self.caribou_key().props.width + h, _ = self.get_preferred_height() width = int(h * w + ceil(w - 1) * self._spacing) return (width, width) @@ -106,7 +107,7 @@ class AntlerSubLevel(Gtk.Window): def __init__(self, key): - gobject.GObject.__init__(self, type=Gtk.WindowType.POPUP) + GObject.GObject.__init__(self, type=Gtk.WindowType.POPUP) self.set_decorated(False) self.set_resizable(False) @@ -138,7 +139,7 @@ KEY_SPAN = 4 def __init__(self, level=None, spacing=6): - gobject.GObject.__init__(self, orientation=Gtk.Orientation.HORIZONTAL) + GObject.GObject.__init__(self, orientation=Gtk.Orientation.HORIZONTAL) self.set_spacing(12) self._columns = [] self._keys_map = {} @@ -243,17 +244,20 @@ class AntlerKeyboardView(Gtk.Notebook): def __init__(self, keyboard_type): - gobject.GObject.__init__(self) + GObject.GObject.__init__(self) settings = AntlerSettings() self.set_show_tabs(False) + ctx = self.get_style_context() + ctx.add_class("antler-keyboard-window") + use_system = settings.use_system use_system.connect("value-changed", self._on_use_system_theme_changed) self._app_css_provider = Gtk.CssProvider() self._load_style( self._app_css_provider, "style.css", - [glib.get_user_data_dir()] + list(glib.get_system_data_dirs())) + [GLib.get_user_data_dir()] + list(GLib.get_system_data_dirs())) if not use_system.value: Gtk.StyleContext.add_provider_for_screen( @@ -262,7 +266,7 @@ self._user_css_provider = Gtk.CssProvider() self._load_style(self._user_css_provider, "user-style.css", - [glib.get_user_data_dir()]) + [GLib.get_user_data_dir()]) Gtk.StyleContext.add_provider_for_screen( Gdk.Screen.get_default(), self._user_css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION + 1) diff -Nru caribou-0.3.5/caribou/antler/main.py caribou-0.3.91/caribou/antler/main.py --- caribou-0.3.5/caribou/antler/main.py 2011-08-12 07:20:01.000000000 +0000 +++ caribou-0.3.91/caribou/antler/main.py 2011-08-31 16:19:27.000000000 +0000 @@ -1,17 +1,16 @@ -from gi.repository import Caribou +from gi.repository import Caribou, GObject from window import AntlerWindowEntry from keyboard_view import AntlerKeyboardView -import gobject import sys class AntlerKeyboardService(Caribou.KeyboardService): def __init__(self): - gobject.GObject.__init__(self) + GObject.GObject.__init__(self) self.register_keyboard("Antler") self.window = AntlerWindowEntry(AntlerKeyboardView) def run(self): - loop = gobject.MainLoop() + loop = GObject.MainLoop() loop.run() def do_show(self, timestamp): diff -Nru caribou-0.3.5/caribou/antler/window.py caribou-0.3.91/caribou/antler/window.py --- caribou-0.3.5/caribou/antler/window.py 2011-08-12 07:19:40.000000000 +0000 +++ caribou-0.3.91/caribou/antler/window.py 2011-09-05 22:19:56.000000000 +0000 @@ -22,57 +22,65 @@ from gi.repository import Gtk from gi.repository import Gdk +from gi.repository import GObject from gi.repository import Clutter from antler_settings import AntlerSettings from math import sqrt import os import sys -import gobject Clutter.init("antler") class AnimatedWindowBase(Gtk.Window, Clutter.Animatable): __gproperties__ = { - 'antler-window-position' : (gobject.TYPE_PYOBJECT, 'Window position', - 'Window position in X, Y coordinates', - gobject.PARAM_READWRITE) + 'antler-window-x' : (GObject.TYPE_INT, 'Window position', + 'Window X coordinate', + GObject.G_MININT, GObject.G_MAXINT, 0, + GObject.PARAM_READWRITE), + 'antler-window-y' : (GObject.TYPE_INT, 'Window position', + 'Window Y coordinate', + GObject.G_MININT, GObject.G_MAXINT, 0, + GObject.PARAM_READWRITE) } def __init__(self): - gobject.GObject.__init__(self, type=Gtk.WindowType.POPUP) + GObject.GObject.__init__(self, type=Gtk.WindowType.POPUP) # animation self._stage = Clutter.Stage.get_default() self._move_animation = None self._opacity_animation = None def do_get_property(self, property): - if property.name == "antler-window-position": - return self.get_position() + if property.name == "antler-window-x": + return self.get_position()[0] + elif property.name == "antler-window-y": + return self.get_position()[1] else: raise AttributeError, 'unknown property %s' % property.name def do_set_property(self, property, value): - if property.name == "antler-window-position": + if property.name == "antler-window-x": if value is not None: - x, y = value - self.move(x, y) + self.move(value, self.get_position()[1]) + elif property.name == "antler-window-y": + if value is not None: + self.move(self.get_position()[0], value) else: raise AttributeError, 'unknown property %s' % property.name def do_animate_property(self, animation, prop_name, initial_value, final_value, progress, gvalue): - if prop_name == "antler-window-position": - ix, iy = initial_value - fx, fy = final_value - dx = int((fx - ix) * progress) - dy = int((fy - iy) * progress) - new_value = (ix + dx, iy + dy) - self.move(*new_value) + if prop_name == "antler-window-x": + dx = int(initial_value * progress) + self.move(initial_value + dx, self.get_position()[1]) + return True + elif prop_name == "antler-window-y": + dy = int(initial_value * progress) + self.move(self.get_position()[0], initial_value + dy) return True if prop_name == "opacity": opacity = initial_value + ((final_value - initial_value) * progress) - gobject.idle_add(lambda: self.set_opacity(opacity)) - + GObject.idle_add(lambda: self.set_opacity(opacity)) return True else: return False @@ -81,7 +89,8 @@ self._move_animation = Clutter.Animation(object=self, mode=mode, duration=250) - self._move_animation.bind("antler-window-position", (x, y)) + self._move_animation.bind("antler-window-x", x) + self._move_animation.bind("antler-window-y", y) timeline = self._move_animation.get_timeline() timeline.start() @@ -132,9 +141,9 @@ self.min_alpha = min_alpha if self.max_alpha != self.min_alpha: if self._poll_tid == 0: - self._poll_tid = gobject.timeout_add(100, self._proximity_check) + self._poll_tid = GObject.timeout_add(100, self._proximity_check) elif self._poll_tid != 0: - gobject.source_remove(self._poll_tid) + GObject.source_remove(self._poll_tid) def _onmapped(self, obj, event, settings): if self.is_composited(): diff -Nru caribou-0.3.5/caribou/settings/preferences_window.py caribou-0.3.91/caribou/settings/preferences_window.py --- caribou-0.3.5/caribou/settings/preferences_window.py 2011-06-13 21:35:11.000000000 +0000 +++ caribou-0.3.91/caribou/settings/preferences_window.py 2011-08-31 16:19:27.000000000 +0000 @@ -20,7 +20,7 @@ from caribou.settings.setting_types import * -import gobject +from gi.repository import GObject from gi.repository import Gdk from gi.repository import Gtk @@ -230,7 +230,7 @@ __gtype_name__ = "PreferencesDialog" def __init__(self, settings_manager): - gobject.GObject.__init__(self) + GObject.GObject.__init__(self) self.add_button(Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE) self.set_border_width(6) self.set_title(settings_manager.groups.label) @@ -243,7 +243,7 @@ __gtype_name__ = "PreferencesWindow" def __init__(self, settings_manager): - gobject.GObject.__init__(self) + GObject.GObject.__init__(self) self.set_border_width(6) self.set_title(settings_manager.groups.label) diff -Nru caribou-0.3.5/caribou/settings/setting_types.py caribou-0.3.91/caribou/settings/setting_types.py --- caribou-0.3.5/caribou/settings/setting_types.py 2011-08-10 10:26:49.000000000 +0000 +++ caribou-0.3.91/caribou/settings/setting_types.py 2011-09-05 22:19:56.000000000 +0000 @@ -1,5 +1,4 @@ -import gobject -from gi.repository import GLib +from gi.repository import GLib, GObject ENTRY_DEFAULT=0 ENTRY_COMBO=1 @@ -10,17 +9,17 @@ ENTRY_CHECKBOX=6 ENTRY_RADIO=7 -class Setting(gobject.GObject): +class Setting(GObject.GObject): __gsignals__ = {'value-changed' : - (gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, - (gobject.TYPE_PYOBJECT,)), + (GObject.SIGNAL_RUN_FIRST, + GObject.TYPE_NONE, + (GObject.TYPE_PYOBJECT,)), 'sensitivity-changed' : - (gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, - (gobject.TYPE_BOOLEAN,))} + (GObject.SIGNAL_RUN_FIRST, + GObject.TYPE_NONE, + (GObject.TYPE_BOOLEAN,))} def __init__(self, name, label, children=[]): - gobject.GObject.__init__(self) + GObject.GObject.__init__(self) self.name = name self.label = label self.children = children @@ -108,8 +107,8 @@ return bool(self.value) @property - def default_value(self): - return "%r" % self.value + def gvariant(self): + return GLib.Variant(self.variant_type, self.value) class BooleanSetting(ValueSetting): variant_type = 'b' @@ -118,19 +117,12 @@ # Almost anything could be a boolean. return bool(val) - @property - def default_value(self): - if self.value: - return "true" - else: - return "false" - class IntegerSetting(ValueSetting): variant_type = 'i' entry_type = ENTRY_SPIN def __init__(self, *args, **kwargs): - self.min = kwargs.pop('min', gobject.G_MININT) - self.max = kwargs.pop('max', gobject.G_MAXINT) + self.min = kwargs.pop('min', GObject.G_MININT) + self.max = kwargs.pop('max', GObject.G_MAXINT) ValueSetting.__init__(self, *args, **kwargs) def convert_value(self, val): @@ -140,8 +132,8 @@ variant_type = 'd' entry_type = ENTRY_SPIN def __init__(self, *args, **kwargs): - self.min = kwargs.pop('min', gobject.G_MINFLOAT) - self.max = kwargs.pop('max', gobject.G_MAXFLOAT) + self.min = kwargs.pop('min', GObject.G_MINFLOAT) + self.max = kwargs.pop('max', GObject.G_MAXFLOAT) ValueSetting.__init__(self, *args, **kwargs) def convert_value(self, val): diff -Nru caribou-0.3.5/configure caribou-0.3.91/configure --- caribou-0.3.5/configure 2011-08-12 07:45:23.000000000 +0000 +++ caribou-0.3.91/configure 2011-09-05 23:45:12.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for caribou 0.3.5. +# Generated by GNU Autoconf 2.68 for caribou 0.3.91. # # Report bugs to . # @@ -631,8 +631,8 @@ # Identity of this package. PACKAGE_NAME='caribou' PACKAGE_TARNAME='caribou' -PACKAGE_VERSION='0.3.5' -PACKAGE_STRING='caribou 0.3.5' +PACKAGE_VERSION='0.3.91' +PACKAGE_STRING='caribou 0.3.91' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=caribou' PACKAGE_URL='' @@ -1470,7 +1470,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures caribou 0.3.5 to adapt to many kinds of systems. +\`configure' configures caribou 0.3.91 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1540,7 +1540,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of caribou 0.3.5:";; + short | recursive ) echo "Configuration of caribou 0.3.91:";; esac cat <<\_ACEOF @@ -1673,7 +1673,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -caribou configure 0.3.5 +caribou configure 0.3.91 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2042,7 +2042,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by caribou $as_me 0.3.5, which was +It was created by caribou $as_me 0.3.91, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -11245,7 +11245,7 @@ # Define the identity of the package. PACKAGE='caribou' - VERSION='0.3.5' + VERSION='0.3.91' cat >>confdefs.h <<_ACEOF @@ -12033,7 +12033,7 @@ -PYGOBJECT_REQUIRED=2.27.92 +PYGOBJECT_REQUIRED=2.90.3 GTK_REQUIRED=3.0.0 CLUTTER_REQUIRED=1.5.11 GDK_REQUIRED=3.0.0 @@ -12048,12 +12048,12 @@ elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - pygobject-2.0 >= \$PYGOBJECT_REQUIRED, + pygobject-3.0 >= \$PYGOBJECT_REQUIRED, gtk+-3.0 >= \$GTK_REQUIRED, clutter-1.0 >= \$CLUTTER_REQUIRED \""; } >&5 ($PKG_CONFIG --exists --print-errors " - pygobject-2.0 >= $PYGOBJECT_REQUIRED, + pygobject-3.0 >= $PYGOBJECT_REQUIRED, gtk+-3.0 >= $GTK_REQUIRED, clutter-1.0 >= $CLUTTER_REQUIRED ") 2>&5 @@ -12061,7 +12061,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CARIBOU_CFLAGS=`$PKG_CONFIG --cflags " - pygobject-2.0 >= $PYGOBJECT_REQUIRED, + pygobject-3.0 >= $PYGOBJECT_REQUIRED, gtk+-3.0 >= $GTK_REQUIRED, clutter-1.0 >= $CLUTTER_REQUIRED " 2>/dev/null` @@ -12076,12 +12076,12 @@ elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - pygobject-2.0 >= \$PYGOBJECT_REQUIRED, + pygobject-3.0 >= \$PYGOBJECT_REQUIRED, gtk+-3.0 >= \$GTK_REQUIRED, clutter-1.0 >= \$CLUTTER_REQUIRED \""; } >&5 ($PKG_CONFIG --exists --print-errors " - pygobject-2.0 >= $PYGOBJECT_REQUIRED, + pygobject-3.0 >= $PYGOBJECT_REQUIRED, gtk+-3.0 >= $GTK_REQUIRED, clutter-1.0 >= $CLUTTER_REQUIRED ") 2>&5 @@ -12089,7 +12089,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CARIBOU_LIBS=`$PKG_CONFIG --libs " - pygobject-2.0 >= $PYGOBJECT_REQUIRED, + pygobject-3.0 >= $PYGOBJECT_REQUIRED, gtk+-3.0 >= $GTK_REQUIRED, clutter-1.0 >= $CLUTTER_REQUIRED " 2>/dev/null` @@ -12113,13 +12113,13 @@ fi if test $_pkg_short_errors_supported = yes; then CARIBOU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " - pygobject-2.0 >= $PYGOBJECT_REQUIRED, + pygobject-3.0 >= $PYGOBJECT_REQUIRED, gtk+-3.0 >= $GTK_REQUIRED, clutter-1.0 >= $CLUTTER_REQUIRED " 2>&1` else CARIBOU_PKG_ERRORS=`$PKG_CONFIG --print-errors " - pygobject-2.0 >= $PYGOBJECT_REQUIRED, + pygobject-3.0 >= $PYGOBJECT_REQUIRED, gtk+-3.0 >= $GTK_REQUIRED, clutter-1.0 >= $CLUTTER_REQUIRED " 2>&1` @@ -12128,7 +12128,7 @@ echo "$CARIBOU_PKG_ERRORS" >&5 as_fn_error $? "Package requirements ( - pygobject-2.0 >= $PYGOBJECT_REQUIRED, + pygobject-3.0 >= $PYGOBJECT_REQUIRED, gtk+-3.0 >= $GTK_REQUIRED, clutter-1.0 >= $CLUTTER_REQUIRED ) were not met: @@ -12212,11 +12212,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Vala compiler found. You will not be able to compile .vala source files." >&5 $as_echo "$as_me: WARNING: No Vala compiler found. You will not be able to compile .vala source files." >&2;} else - if test -n "0.9.3"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking $VALAC is at least version 0.9.3" >&5 -$as_echo_n "checking $VALAC is at least version 0.9.3... " >&6; } + if test -n "0.13"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking $VALAC is at least version 0.13" >&5 +$as_echo_n "checking $VALAC is at least version 0.13... " >&6; } am__vala_version=`$VALAC --version | sed 's/Vala *//'` - as_arg_v1=0.9.3 + as_arg_v1=0.13 as_arg_v2="$am__vala_version" awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null case $? in #( @@ -12229,7 +12229,7 @@ 2) : { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "Vala 0.9.3 not found." "$LINENO" 5 ;; #( + as_fn_error $? "Vala 0.13 not found." "$LINENO" 5 ;; #( *) : ;; esac @@ -14941,7 +14941,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by caribou $as_me 0.3.5, which was +This file was extended by caribou $as_me 0.3.91, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14998,7 +14998,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -caribou config.status 0.3.5 +caribou config.status 0.3.91 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru caribou-0.3.5/configure.ac caribou-0.3.91/configure.ac --- caribou-0.3.5/configure.ac 2011-08-12 07:44:35.000000000 +0000 +++ caribou-0.3.91/configure.ac 2011-09-05 23:35:19.000000000 +0000 @@ -1,6 +1,6 @@ AC_PREREQ([2.63]) AC_INIT([caribou], - [0.3.5], + [0.3.91], [https://bugzilla.gnome.org/enter_bug.cgi?product=caribou], [caribou]) @@ -23,20 +23,20 @@ AM_PATH_PYTHON(2.4) dnl == Library dependencies == -PYGOBJECT_REQUIRED=2.27.92 +PYGOBJECT_REQUIRED=2.90.3 GTK_REQUIRED=3.0.0 CLUTTER_REQUIRED=1.5.11 GDK_REQUIRED=3.0.0 PKG_CHECK_MODULES(CARIBOU, [ - pygobject-2.0 >= $PYGOBJECT_REQUIRED, + pygobject-3.0 >= $PYGOBJECT_REQUIRED, gtk+-3.0 >= $GTK_REQUIRED, clutter-1.0 >= $CLUTTER_REQUIRED ]) AC_SUBST(CARIBOU_CFLAGS) AC_SUBST(CARIBOU_LIBS) -AM_PROG_VALAC([0.9.3]) +AM_PROG_VALAC([0.13]) AC_SUBST(VALAC) AC_SUBST(VALAFLAGS) diff -Nru caribou-0.3.5/debian/changelog caribou-0.3.91/debian/changelog --- caribou-0.3.5/debian/changelog 2011-08-30 15:48:54.000000000 +0000 +++ caribou-0.3.91/debian/changelog 2011-09-06 07:14:23.000000000 +0000 @@ -1,5 +1,11 @@ -caribou (0.3.5-0ubuntu1~11.10~ricotz1) oneiric; urgency=low +caribou (0.3.91-0ubuntu1~11.10~ricotz0) oneiric; urgency=low + + * New upstream release + + -- Rico Tzschichholz Tue, 06 Sep 2011 09:14:23 +0200 + +caribou (0.3.5-1) UNRELEASED; urgency=low * Initial release - -- Rico Tzschichholz Tue, 30 Aug 2011 17:21:45 +0200 + -- Rico Tzschichholz Fri, 02 Sep 2011 20:07:17 +0200 diff -Nru caribou-0.3.5/debian/control caribou-0.3.91/debian/control --- caribou-0.3.5/debian/control 2011-08-30 15:47:33.000000000 +0000 +++ caribou-0.3.91/debian/control 2011-09-06 07:14:23.000000000 +0000 @@ -1,12 +1,15 @@ Source: caribou +Section: libs Priority: optional -Maintainer: Ubuntu Core Developers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Rico Tzschichholz Build-Depends: debhelper (>= 8), autotools-dev, intltool (>= 0.35.0), python-support (>= 0.90), python-gobject-dev (>= 2.27.92), - valac-0.12 (>= 0.12), + valac-0.14 (>= 0.13), gnome-doc-utils, gobject-introspection (>= 0.10.7), libgirepository1.0-dev (>= 0.10.7), @@ -20,7 +23,8 @@ libxml2-dev, libxtst-dev Standards-Version: 3.9.2 -Section: libs +Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/experimental/caribou +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/experimental/caribou/ Package: libcaribou0 Architecture: any diff -Nru caribou-0.3.5/debian/copyright caribou-0.3.91/debian/copyright --- caribou-0.3.5/debian/copyright 2011-08-30 09:46:28.000000000 +0000 +++ caribou-0.3.91/debian/copyright 2011-09-06 07:14:23.000000000 +0000 @@ -1,12 +1,13 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 -Name: Folks -Maintainer: Travis Reitter -Source: http://ftp.gnome.org/pub/GNOME/sources/folks/ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166 +Name: Caribou +Source: http://git.gnome.org/browse/caribou Files: * -Copyright: 2008 Nokia Corporation - 2008 Zeeshan Ali (Khattak) - 2010 Collabora Ltd +Copyright: 2009-2011, Eitan Isaacson + 2010, Warp Networks S.L. + 2009, Adaptive Technology Resource Centre + 2009, Flavio Percoco + 2009, Sun Microsystems, Inc. License: LGPL-2.1+ This library is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -25,20 +26,21 @@ Public License can be found in "/usr/share/common-licenses/LGPL-2.1". Files: debian/* -Copyright: 2010 Laurent Bigonville -License: GPL-2+ - This package is free software; you can redistribute it and/or modify +Copyright: 2011, Rico Tzschichholz +License: GPL-3+ + 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; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. . - This package is distributed in the hope that it will be useful, + 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 + along with this program. If not, see . . - On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + '/usr/share/common-licenses/GPL-3'. diff -Nru caribou-0.3.5/debian/watch caribou-0.3.91/debian/watch --- caribou-0.3.5/debian/watch 2011-08-30 14:39:57.000000000 +0000 +++ caribou-0.3.91/debian/watch 2011-09-06 07:14:23.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://ftp.gnome.org/pub/GNOME/sources/caribou/([0-9.]+)/folks-(.*).tar.bz2 +http://ftp.gnome.org/pub/GNOME/sources/caribou/([0-9.]+)/caribou-(.*).tar.bz2 diff -Nru caribou-0.3.5/libcaribou/_Caribou-1.0.gir caribou-0.3.91/libcaribou/_Caribou-1.0.gir --- caribou-0.3.5/libcaribou/_Caribou-1.0.gir 2011-08-12 07:45:38.000000000 +0000 +++ caribou-0.3.91/libcaribou/_Caribou-1.0.gir 2011-09-05 23:45:29.000000000 +0000 @@ -2,7 +2,6 @@ - @@ -33,7 +32,7 @@ - + @@ -43,7 +42,7 @@ - + @@ -53,7 +52,7 @@ - + @@ -63,7 +62,7 @@ - + @@ -73,7 +72,7 @@ - + @@ -83,7 +82,7 @@ - + @@ -119,7 +118,7 @@ - + @@ -135,7 +134,7 @@ - + @@ -151,7 +150,7 @@ - + @@ -166,7 +165,7 @@ - + @@ -182,7 +181,7 @@ - + @@ -198,7 +197,7 @@ - + @@ -280,7 +279,7 @@ - + @@ -299,7 +298,7 @@ - + @@ -318,7 +317,7 @@ - + @@ -337,7 +336,7 @@ - + @@ -347,7 +346,7 @@ - + @@ -357,7 +356,7 @@ - + @@ -367,7 +366,7 @@ - + @@ -377,7 +376,7 @@ - + @@ -387,7 +386,7 @@ - + @@ -397,7 +396,7 @@ - + @@ -407,21 +406,38 @@ - + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -437,12 +453,34 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + @@ -458,43 +496,82 @@ - + - + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + - + @@ -612,7 +689,7 @@ - + @@ -679,12 +756,12 @@ - + - + @@ -701,7 +778,7 @@ - + @@ -727,12 +804,12 @@ - + - + @@ -792,12 +869,12 @@ - + - + @@ -885,17 +962,27 @@ - - - - - - + + + + + + + + + + + + + + + + @@ -909,7 +996,17 @@ - + + + + + + + + + + + @@ -945,12 +1042,12 @@ - + - + @@ -1055,7 +1152,7 @@ - + @@ -1065,12 +1162,12 @@ - + - + @@ -1080,36 +1177,52 @@ - + + + + + + - - + + + + + + + - + + + + - + - + + + + @@ -1120,28 +1233,34 @@ - + + + + - + - + + + + - + @@ -1204,7 +1323,7 @@ - + @@ -1214,7 +1333,7 @@ - + @@ -1224,7 +1343,7 @@ - + @@ -1234,28 +1353,34 @@ - + + + + - + - + + + + - + diff -Nru caribou-0.3.5/libcaribou/caribou-1.0.vapi caribou-0.3.91/libcaribou/caribou-1.0.vapi --- caribou-0.3.5/libcaribou/caribou-1.0.vapi 2011-08-12 07:45:38.000000000 +0000 +++ caribou-0.3.91/libcaribou/caribou-1.0.vapi 2011-09-05 23:45:29.000000000 +0000 @@ -1,6 +1,5 @@ -/* caribou-1.0.vapi generated by valac 0.12.0, do not modify. */ +/* caribou-1.0.vapi generated by valac 0.13.3, do not modify. */ -[CCode (cprefix = "Caribou", lower_case_cprefix = "caribou_", gir_namespace = "_Caribou", gir_version = "1.0")] namespace Caribou { [CCode (cheader_filename = "caribou.h")] public class ColumnModel : Caribou.ScannableGroup, Caribou.IScannableItem, Caribou.IKeyboardObject { @@ -94,7 +93,6 @@ } [CCode (cheader_filename = "caribou.h")] public class XAdapter : GLib.Object { - [CCode (cheader_filename = "caribou.h")] public delegate void KeyButtonCallback (uint keybuttoncode, bool pressed); public XAdapter (); public uint get_current_group (out string group_name, out string variant_name); @@ -137,13 +135,13 @@ public abstract bool scan_selected { get; set; } public abstract bool scan_stepping { get; set; } } - [CCode (cprefix = "CARIBOU_MODIFIER_STATE_", cheader_filename = "caribou.h")] + [CCode (cheader_filename = "caribou.h")] public enum ModifierState { NONE, LATCHED, LOCKED } - [CCode (cprefix = "CARIBOU_SCAN_GROUPING_", cheader_filename = "caribou.h")] + [CCode (cheader_filename = "caribou.h")] public enum ScanGrouping { NONE, SUBGROUPS, diff -Nru caribou-0.3.5/libcaribou/caribou.h caribou-0.3.91/libcaribou/caribou.h --- caribou-0.3.5/libcaribou/caribou.h 2011-08-12 07:45:38.000000000 +0000 +++ caribou-0.3.91/libcaribou/caribou.h 2011-09-05 23:45:29.000000000 +0000 @@ -1,4 +1,4 @@ -/* caribou.h generated by valac 0.12.0, the Vala compiler, do not modify */ +/* caribou.h generated by valac 0.13.3, the Vala compiler, do not modify */ #ifndef __CARIBOU_H__ @@ -8,6 +8,7 @@ #include #include #include +#include #include #include diff -Nru caribou-0.3.5/libcaribou/caribou-internals-1.0.vapi caribou-0.3.91/libcaribou/caribou-internals-1.0.vapi --- caribou-0.3.5/libcaribou/caribou-internals-1.0.vapi 2011-08-12 07:45:38.000000000 +0000 +++ caribou-0.3.91/libcaribou/caribou-internals-1.0.vapi 2011-09-05 23:45:29.000000000 +0000 @@ -1,10 +1,8 @@ -/* caribou-internals-1.0.vapi generated by valac 0.12.0, do not modify. */ +/* caribou-internals-1.0.vapi generated by valac 0.13.3, do not modify. */ -[CCode (cprefix = "Caribou", lower_case_cprefix = "caribou_", gir_namespace = "_Caribou", gir_version = "1.0")] namespace Caribou { [CCode (cheader_filename = "caribou-internals.h")] public class XAdapter : GLib.Object { - [CCode (cheader_filename = "caribou-internals.h")] public delegate void KeyButtonCallback (uint keybuttoncode, bool pressed); public static Caribou.XAdapter get_default (); public void keyval_press (uint keyval); @@ -153,18 +151,18 @@ public signal void key_pressed (Caribou.KeyModel key); public signal void key_released (Caribou.KeyModel key); } - [CCode (type_id = "CARIBOU_TYPE_MODIFIER_MAP_ENTRY", cheader_filename = "caribou-internals.h")] + [CCode (cheader_filename = "caribou-internals.h")] internal struct ModifierMapEntry { public string name; public Gdk.ModifierType mask; } - [CCode (cprefix = "CARIBOU_MODIFIER_STATE_", cheader_filename = "caribou-internals.h")] + [CCode (cheader_filename = "caribou-internals.h")] public enum ModifierState { NONE, LATCHED, LOCKED } - [CCode (cprefix = "CARIBOU_SCAN_GROUPING_", cheader_filename = "caribou-internals.h")] + [CCode (cheader_filename = "caribou-internals.h")] public enum ScanGrouping { NONE, SUBGROUPS, diff -Nru caribou-0.3.5/libcaribou/caribou-internals.h caribou-0.3.91/libcaribou/caribou-internals.h --- caribou-0.3.5/libcaribou/caribou-internals.h 2011-08-12 07:45:38.000000000 +0000 +++ caribou-0.3.91/libcaribou/caribou-internals.h 2011-09-05 23:45:29.000000000 +0000 @@ -1,4 +1,4 @@ -/* caribou-internals.h generated by valac 0.12.0, the Vala compiler, do not modify */ +/* caribou-internals.h generated by valac 0.13.3, the Vala compiler, do not modify */ #ifndef __CARIBOU_INTERNALS_H__ @@ -8,10 +8,10 @@ #include #include #include +#include #include #include #include -#include #include G_BEGIN_DECLS diff -Nru caribou-0.3.5/libcaribou/column-model.c caribou-0.3.91/libcaribou/column-model.c --- caribou-0.3.5/libcaribou/column-model.c 2011-08-12 07:45:38.000000000 +0000 +++ caribou-0.3.91/libcaribou/column-model.c 2011-09-05 23:45:29.000000000 +0000 @@ -1,4 +1,4 @@ -/* column-model.c generated by valac 0.12.0, the Vala compiler +/* column-model.c generated by valac 0.13.3, the Vala compiler * generated from column-model.vala, do not modify */ @@ -147,12 +147,12 @@ CaribouColumnModel* caribou_column_model_construct (GType object_type); CaribouScannableGroup* caribou_scannable_group_construct (GType object_type); void caribou_column_model_add_key (CaribouColumnModel* self, CaribouKeyModel* key); -static void _lambda1_ (CaribouKeyModel* k, CaribouColumnModel* self); -static void __lambda1__caribou_ikeyboard_object_key_clicked (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); -static void _lambda2_ (CaribouKeyModel* k, CaribouColumnModel* self); -static void __lambda2__caribou_ikeyboard_object_key_pressed (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); -static void _lambda3_ (CaribouKeyModel* k, CaribouColumnModel* self); -static void __lambda3__caribou_ikeyboard_object_key_released (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); +static void __lambda1_ (CaribouColumnModel* self, CaribouKeyModel* k); +static void ___lambda1__caribou_ikeyboard_object_key_clicked (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); +static void __lambda2_ (CaribouColumnModel* self, CaribouKeyModel* k); +static void ___lambda2__caribou_ikeyboard_object_key_pressed (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); +static void __lambda3_ (CaribouColumnModel* self, CaribouKeyModel* k); +static void ___lambda3__caribou_ikeyboard_object_key_released (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); CaribouKeyModel* caribou_column_model_get_key (CaribouColumnModel* self, gint index); CaribouKeyModel* caribou_column_model_first_key (CaribouColumnModel* self); static CaribouIScannableItem** caribou_column_model_real_get_scan_children (CaribouScannableGroup* base, int* result_length1); @@ -168,7 +168,7 @@ CaribouColumnModel* caribou_column_model_construct (GType object_type) { CaribouColumnModel * self = NULL; - GeeArrayList* _tmp0_ = NULL; + GeeArrayList* _tmp0_; self = (CaribouColumnModel*) caribou_scannable_group_construct (object_type); _tmp0_ = gee_array_list_new (CARIBOU_TYPE_KEY_MODEL, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL); _g_object_unref0 (self->priv->keys); @@ -182,65 +182,87 @@ } -static void _lambda1_ (CaribouKeyModel* k, CaribouColumnModel* self) { +static void __lambda1_ (CaribouColumnModel* self, CaribouKeyModel* k) { + CaribouKeyModel* _tmp0_; g_return_if_fail (k != NULL); - g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-clicked", k); + _tmp0_ = k; + g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-clicked", _tmp0_); } -static void __lambda1__caribou_ikeyboard_object_key_clicked (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { - _lambda1_ (key, self); +static void ___lambda1__caribou_ikeyboard_object_key_clicked (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { + __lambda1_ (self, key); } -static void _lambda2_ (CaribouKeyModel* k, CaribouColumnModel* self) { +static void __lambda2_ (CaribouColumnModel* self, CaribouKeyModel* k) { + CaribouKeyModel* _tmp0_; g_return_if_fail (k != NULL); - g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-pressed", k); + _tmp0_ = k; + g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-pressed", _tmp0_); } -static void __lambda2__caribou_ikeyboard_object_key_pressed (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { - _lambda2_ (key, self); +static void ___lambda2__caribou_ikeyboard_object_key_pressed (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { + __lambda2_ (self, key); } -static void _lambda3_ (CaribouKeyModel* k, CaribouColumnModel* self) { +static void __lambda3_ (CaribouColumnModel* self, CaribouKeyModel* k) { + CaribouKeyModel* _tmp0_; g_return_if_fail (k != NULL); - g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-released", k); + _tmp0_ = k; + g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-released", _tmp0_); } -static void __lambda3__caribou_ikeyboard_object_key_released (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { - _lambda3_ (key, self); +static void ___lambda3__caribou_ikeyboard_object_key_released (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { + __lambda3_ (self, key); } void caribou_column_model_add_key (CaribouColumnModel* self, CaribouKeyModel* key) { + CaribouKeyModel* _tmp0_; + CaribouKeyModel* _tmp1_; + CaribouKeyModel* _tmp2_; + GeeArrayList* _tmp3_; + CaribouKeyModel* _tmp4_; g_return_if_fail (self != NULL); g_return_if_fail (key != NULL); - g_signal_connect_object ((CaribouIKeyboardObject*) key, "key-clicked", (GCallback) __lambda1__caribou_ikeyboard_object_key_clicked, self, 0); - g_signal_connect_object ((CaribouIKeyboardObject*) key, "key-pressed", (GCallback) __lambda2__caribou_ikeyboard_object_key_pressed, self, 0); - g_signal_connect_object ((CaribouIKeyboardObject*) key, "key-released", (GCallback) __lambda3__caribou_ikeyboard_object_key_released, self, 0); - gee_abstract_collection_add ((GeeAbstractCollection*) self->priv->keys, key); + _tmp0_ = key; + g_signal_connect_object ((CaribouIKeyboardObject*) _tmp0_, "key-clicked", (GCallback) ___lambda1__caribou_ikeyboard_object_key_clicked, self, 0); + _tmp1_ = key; + g_signal_connect_object ((CaribouIKeyboardObject*) _tmp1_, "key-pressed", (GCallback) ___lambda2__caribou_ikeyboard_object_key_pressed, self, 0); + _tmp2_ = key; + g_signal_connect_object ((CaribouIKeyboardObject*) _tmp2_, "key-released", (GCallback) ___lambda3__caribou_ikeyboard_object_key_released, self, 0); + _tmp3_ = self->priv->keys; + _tmp4_ = key; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp3_, _tmp4_); } CaribouKeyModel* caribou_column_model_get_key (CaribouColumnModel* self, gint index) { CaribouKeyModel* result = NULL; - gpointer _tmp0_ = NULL; + GeeArrayList* _tmp0_; + gint _tmp1_; + gpointer _tmp2_ = NULL; g_return_val_if_fail (self != NULL, NULL); - _tmp0_ = gee_abstract_list_get ((GeeAbstractList*) self->priv->keys, index); - result = (CaribouKeyModel*) _tmp0_; + _tmp0_ = self->priv->keys; + _tmp1_ = index; + _tmp2_ = gee_abstract_list_get ((GeeAbstractList*) _tmp0_, _tmp1_); + result = (CaribouKeyModel*) _tmp2_; return result; } CaribouKeyModel* caribou_column_model_first_key (CaribouColumnModel* self) { CaribouKeyModel* result = NULL; - gpointer _tmp0_ = NULL; + GeeArrayList* _tmp0_; + gpointer _tmp1_ = NULL; g_return_val_if_fail (self != NULL, NULL); - _tmp0_ = gee_abstract_list_first ((GeeAbstractList*) self->priv->keys); - result = (CaribouKeyModel*) _tmp0_; + _tmp0_ = self->priv->keys; + _tmp1_ = gee_abstract_list_first ((GeeAbstractList*) _tmp0_); + result = (CaribouKeyModel*) _tmp1_; return result; } @@ -248,14 +270,20 @@ static CaribouIScannableItem** caribou_column_model_real_get_scan_children (CaribouScannableGroup* base, int* result_length1) { CaribouColumnModel * self; CaribouIScannableItem** result = NULL; - gint _tmp0_; - gpointer* _tmp1_ = NULL; - CaribouIScannableItem** _tmp2_; + GeeArrayList* _tmp0_; + gint _tmp1_ = 0; + gpointer* _tmp2_ = NULL; + CaribouIScannableItem** _tmp3_; + gint _tmp3__length1; self = (CaribouColumnModel*) base; - _tmp1_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) self->priv->keys, &_tmp0_); - _tmp2_ = (CaribouIScannableItem**) _tmp1_; - *result_length1 = _tmp0_; - result = _tmp2_; + _tmp0_ = self->priv->keys; + _tmp2_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) _tmp0_, &_tmp1_); + _tmp3_ = (CaribouIScannableItem**) _tmp2_; + _tmp3__length1 = _tmp1_; + if (result_length1) { + *result_length1 = _tmp3__length1; + } + result = _tmp3_; return result; } @@ -263,14 +291,20 @@ static CaribouIKeyboardObject** caribou_column_model_real_get_children (CaribouIKeyboardObject* base, int* result_length1) { CaribouColumnModel * self; CaribouIKeyboardObject** result = NULL; - gint _tmp0_; - gpointer* _tmp1_ = NULL; - CaribouIKeyboardObject** _tmp2_; + GeeArrayList* _tmp0_; + gint _tmp1_ = 0; + gpointer* _tmp2_ = NULL; + CaribouIKeyboardObject** _tmp3_; + gint _tmp3__length1; self = (CaribouColumnModel*) base; - _tmp1_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) self->priv->keys, &_tmp0_); - _tmp2_ = (CaribouIKeyboardObject**) _tmp1_; - *result_length1 = _tmp0_; - result = _tmp2_; + _tmp0_ = self->priv->keys; + _tmp2_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) _tmp0_, &_tmp1_); + _tmp3_ = (CaribouIKeyboardObject**) _tmp2_; + _tmp3__length1 = _tmp1_; + if (result_length1) { + *result_length1 = _tmp3__length1; + } + result = _tmp3_; return result; } @@ -278,16 +312,20 @@ static gboolean caribou_column_model_real_get_scan_stepping (CaribouIScannableItem* base) { gboolean result; CaribouColumnModel* self; + gboolean _tmp0_; self = (CaribouColumnModel*) base; - result = self->priv->_scan_stepping; + _tmp0_ = self->priv->_scan_stepping; + result = _tmp0_; return result; } static void caribou_column_model_real_set_scan_stepping (CaribouIScannableItem* base, gboolean value) { CaribouColumnModel* self; + gboolean _tmp0_; self = (CaribouColumnModel*) base; - self->priv->_scan_stepping = value; + _tmp0_ = value; + self->priv->_scan_stepping = _tmp0_; g_object_notify ((GObject *) self, "scan-stepping"); } @@ -295,16 +333,20 @@ static gboolean caribou_column_model_real_get_scan_selected (CaribouIScannableItem* base) { gboolean result; CaribouColumnModel* self; + gboolean _tmp0_; self = (CaribouColumnModel*) base; - result = self->priv->_scan_selected; + _tmp0_ = self->priv->_scan_selected; + result = _tmp0_; return result; } static void caribou_column_model_real_set_scan_selected (CaribouIScannableItem* base, gboolean value) { CaribouColumnModel* self; + gboolean _tmp0_; self = (CaribouColumnModel*) base; - self->priv->_scan_selected = value; + _tmp0_ = value; + self->priv->_scan_selected = _tmp0_; g_object_notify ((GObject *) self, "scan-selected"); } @@ -332,7 +374,7 @@ static void caribou_column_model_caribou_ikeyboard_object_interface_init (CaribouIKeyboardObjectIface * iface) { caribou_column_model_caribou_ikeyboard_object_parent_iface = g_type_interface_peek_parent (iface); - iface->get_children = (CaribouIKeyboardObject** (*)(CaribouIKeyboardObject* ,int*)) caribou_column_model_real_get_children; + iface->get_children = (CaribouIKeyboardObject** (*)(CaribouIKeyboardObject*, int*)) caribou_column_model_real_get_children; } diff -Nru caribou-0.3.5/libcaribou/external-libs.vapi caribou-0.3.91/libcaribou/external-libs.vapi --- caribou-0.3.5/libcaribou/external-libs.vapi 2011-07-18 17:10:01.000000000 +0000 +++ caribou-0.3.91/libcaribou/external-libs.vapi 2011-08-30 00:44:28.000000000 +0000 @@ -133,7 +133,9 @@ public ushort size_syms; public ushort num_syms; + [CCode (array_length = false, array_null_terminated = true)] public uint[] syms; + [CCode (array_length = false, array_null_terminated = true)] public SymMap[] key_sym_map; public uchar[] modmap; diff -Nru caribou-0.3.5/libcaribou/group-model.c caribou-0.3.91/libcaribou/group-model.c --- caribou-0.3.5/libcaribou/group-model.c 2011-08-12 07:45:38.000000000 +0000 +++ caribou-0.3.91/libcaribou/group-model.c 2011-09-05 23:45:29.000000000 +0000 @@ -1,4 +1,4 @@ -/* group-model.c generated by valac 0.12.0, the Vala compiler +/* group-model.c generated by valac 0.13.3, the Vala compiler * generated from group-model.vala, do not modify */ @@ -104,12 +104,12 @@ void caribou_group_model_add_level (CaribouGroupModel* self, const gchar* lname, CaribouLevelModel* level); static void caribou_group_model_on_level_toggled (CaribouGroupModel* self, const gchar* new_level); static void _caribou_group_model_on_level_toggled_caribou_level_model_level_toggled (CaribouLevelModel* _sender, const gchar* new_level, gpointer self); -static void _lambda9_ (CaribouKeyModel* k, CaribouGroupModel* self); -static void __lambda9__caribou_ikeyboard_object_key_clicked (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); -static void _lambda10_ (CaribouKeyModel* k, CaribouGroupModel* self); -static void __lambda10__caribou_ikeyboard_object_key_pressed (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); -static void _lambda11_ (CaribouKeyModel* k, CaribouGroupModel* self); -static void __lambda11__caribou_ikeyboard_object_key_released (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); +static void __lambda9_ (CaribouGroupModel* self, CaribouKeyModel* k); +static void ___lambda9__caribou_ikeyboard_object_key_clicked (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); +static void __lambda10_ (CaribouGroupModel* self, CaribouKeyModel* k); +static void ___lambda10__caribou_ikeyboard_object_key_pressed (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); +static void __lambda11_ (CaribouGroupModel* self, CaribouKeyModel* k); +static void ___lambda11__caribou_ikeyboard_object_key_released (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); const gchar* caribou_level_model_get_mode (CaribouLevelModel* self); gchar** caribou_group_model_get_levels (CaribouGroupModel* self, int* result_length1); CaribouLevelModel* caribou_group_model_get_level (CaribouGroupModel* self, const gchar* level_name); @@ -122,22 +122,32 @@ CaribouGroupModel* caribou_group_model_construct (GType object_type, const gchar* group, const gchar* variant) { CaribouGroupModel * self = NULL; - gchar* _tmp0_; + const gchar* _tmp0_; gchar* _tmp1_; - GeeHashMap* _tmp2_ = NULL; + const gchar* _tmp2_; + gchar* _tmp3_; + GHashFunc _tmp4_; + GEqualFunc _tmp5_; + GeeHashMap* _tmp6_; + const gchar* _tmp7_; g_return_val_if_fail (group != NULL, NULL); g_return_val_if_fail (variant != NULL, NULL); self = (CaribouGroupModel*) g_object_new (object_type, NULL); - _tmp0_ = g_strdup (group); + _tmp0_ = group; + _tmp1_ = g_strdup (_tmp0_); _g_free0 (self->group); - self->group = _tmp0_; - _tmp1_ = g_strdup (variant); + self->group = _tmp1_; + _tmp2_ = variant; + _tmp3_ = g_strdup (_tmp2_); _g_free0 (self->variant); - self->variant = _tmp1_; - _tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, CARIBOU_TYPE_LEVEL_MODEL, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_str_hash, g_str_equal, NULL); + self->variant = _tmp3_; + _tmp4_ = g_str_hash; + _tmp5_ = g_str_equal; + _tmp6_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, CARIBOU_TYPE_LEVEL_MODEL, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp4_, _tmp5_, NULL); _g_object_unref0 (self->priv->levels); - self->priv->levels = _tmp2_; - caribou_group_model_set_active_level (self, self->priv->default_level); + self->priv->levels = _tmp6_; + _tmp7_ = self->priv->default_level; + caribou_group_model_set_active_level (self, _tmp7_); return self; } @@ -157,21 +167,29 @@ gchar* caribou_group_model_create_group_name (const gchar* group, const gchar* variant) { gchar* result = NULL; + const gchar* _tmp0_; g_return_val_if_fail (group != NULL, NULL); g_return_val_if_fail (variant != NULL, NULL); - if (g_strcmp0 (variant, "") != 0) { - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - _tmp0_ = string_to_string (group); - _tmp1_ = string_to_string (variant); - _tmp2_ = g_strconcat (_tmp0_, "_", _tmp1_, NULL); - result = _tmp2_; + _tmp0_ = variant; + if (g_strcmp0 (_tmp0_, "") != 0) { + const gchar* _tmp1_; + const gchar* _tmp2_ = NULL; + const gchar* _tmp3_; + const gchar* _tmp4_ = NULL; + gchar* _tmp5_ = NULL; + _tmp1_ = group; + _tmp2_ = string_to_string (_tmp1_); + _tmp3_ = variant; + _tmp4_ = string_to_string (_tmp3_); + _tmp5_ = g_strconcat (_tmp2_, "_", _tmp4_, NULL); + result = _tmp5_; return result; } else { - gchar* _tmp3_; - _tmp3_ = g_strdup (group); - result = _tmp3_; + const gchar* _tmp6_; + gchar* _tmp7_; + _tmp6_ = group; + _tmp7_ = g_strdup (_tmp6_); + result = _tmp7_; return result; } } @@ -182,99 +200,147 @@ } -static void _lambda9_ (CaribouKeyModel* k, CaribouGroupModel* self) { +static void __lambda9_ (CaribouGroupModel* self, CaribouKeyModel* k) { + CaribouKeyModel* _tmp0_; g_return_if_fail (k != NULL); - g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-clicked", k); + _tmp0_ = k; + g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-clicked", _tmp0_); } -static void __lambda9__caribou_ikeyboard_object_key_clicked (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { - _lambda9_ (key, self); +static void ___lambda9__caribou_ikeyboard_object_key_clicked (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { + __lambda9_ (self, key); } -static void _lambda10_ (CaribouKeyModel* k, CaribouGroupModel* self) { +static void __lambda10_ (CaribouGroupModel* self, CaribouKeyModel* k) { + CaribouKeyModel* _tmp0_; g_return_if_fail (k != NULL); - g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-pressed", k); + _tmp0_ = k; + g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-pressed", _tmp0_); } -static void __lambda10__caribou_ikeyboard_object_key_pressed (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { - _lambda10_ (key, self); +static void ___lambda10__caribou_ikeyboard_object_key_pressed (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { + __lambda10_ (self, key); } -static void _lambda11_ (CaribouKeyModel* k, CaribouGroupModel* self) { +static void __lambda11_ (CaribouGroupModel* self, CaribouKeyModel* k) { + CaribouKeyModel* _tmp0_; g_return_if_fail (k != NULL); - g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-released", k); + _tmp0_ = k; + g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-released", _tmp0_); } -static void __lambda11__caribou_ikeyboard_object_key_released (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { - _lambda11_ (key, self); +static void ___lambda11__caribou_ikeyboard_object_key_released (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { + __lambda11_ (self, key); } void caribou_group_model_add_level (CaribouGroupModel* self, const gchar* lname, CaribouLevelModel* level) { - const gchar* _tmp0_ = NULL; + GeeHashMap* _tmp0_; + const gchar* _tmp1_; + CaribouLevelModel* _tmp2_; + CaribouLevelModel* _tmp3_; + CaribouLevelModel* _tmp4_; + CaribouLevelModel* _tmp5_; + CaribouLevelModel* _tmp6_; + CaribouLevelModel* _tmp7_; + const gchar* _tmp8_; + const gchar* _tmp9_; g_return_if_fail (self != NULL); g_return_if_fail (lname != NULL); g_return_if_fail (level != NULL); - gee_abstract_map_set ((GeeAbstractMap*) self->priv->levels, lname, level); - g_signal_connect_object (level, "level-toggled", (GCallback) _caribou_group_model_on_level_toggled_caribou_level_model_level_toggled, self, 0); - g_signal_connect_object ((CaribouIKeyboardObject*) level, "key-clicked", (GCallback) __lambda9__caribou_ikeyboard_object_key_clicked, self, 0); - g_signal_connect_object ((CaribouIKeyboardObject*) level, "key-pressed", (GCallback) __lambda10__caribou_ikeyboard_object_key_pressed, self, 0); - g_signal_connect_object ((CaribouIKeyboardObject*) level, "key-released", (GCallback) __lambda11__caribou_ikeyboard_object_key_released, self, 0); - _tmp0_ = caribou_level_model_get_mode (level); - if (g_strcmp0 (_tmp0_, "default") == 0) { - gchar* _tmp1_; - _tmp1_ = g_strdup (lname); + _tmp0_ = self->priv->levels; + _tmp1_ = lname; + _tmp2_ = level; + gee_abstract_map_set ((GeeAbstractMap*) _tmp0_, _tmp1_, _tmp2_); + _tmp3_ = level; + g_signal_connect_object (_tmp3_, "level-toggled", (GCallback) _caribou_group_model_on_level_toggled_caribou_level_model_level_toggled, self, 0); + _tmp4_ = level; + g_signal_connect_object ((CaribouIKeyboardObject*) _tmp4_, "key-clicked", (GCallback) ___lambda9__caribou_ikeyboard_object_key_clicked, self, 0); + _tmp5_ = level; + g_signal_connect_object ((CaribouIKeyboardObject*) _tmp5_, "key-pressed", (GCallback) ___lambda10__caribou_ikeyboard_object_key_pressed, self, 0); + _tmp6_ = level; + g_signal_connect_object ((CaribouIKeyboardObject*) _tmp6_, "key-released", (GCallback) ___lambda11__caribou_ikeyboard_object_key_released, self, 0); + _tmp7_ = level; + _tmp8_ = caribou_level_model_get_mode (_tmp7_); + _tmp9_ = _tmp8_; + if (g_strcmp0 (_tmp9_, "default") == 0) { + const gchar* _tmp10_; + gchar* _tmp11_; + const gchar* _tmp12_; + _tmp10_ = lname; + _tmp11_ = g_strdup (_tmp10_); _g_free0 (self->priv->default_level); - self->priv->default_level = _tmp1_; - caribou_group_model_set_active_level (self, lname); + self->priv->default_level = _tmp11_; + _tmp12_ = lname; + caribou_group_model_set_active_level (self, _tmp12_); } } gchar** caribou_group_model_get_levels (CaribouGroupModel* self, int* result_length1) { gchar** result = NULL; - GeeSet* _tmp0_ = NULL; + GeeHashMap* _tmp0_; GeeSet* _tmp1_; - gint _tmp2_; - gpointer* _tmp3_ = NULL; - gchar** _tmp4_; - gchar** _tmp5_; + GeeSet* _tmp2_; + GeeSet* _tmp3_; + gint _tmp4_ = 0; + gpointer* _tmp5_ = NULL; + gchar** _tmp6_; + gint _tmp6__length1; + gchar** _tmp7_; + gint _tmp7__length1; g_return_val_if_fail (self != NULL, NULL); - _tmp0_ = gee_map_get_keys ((GeeMap*) self->priv->levels); - _tmp1_ = _tmp0_; - _tmp3_ = gee_collection_to_array ((GeeCollection*) _tmp1_, &_tmp2_); - _tmp4_ = (gchar**) _tmp3_; - _g_object_unref0 (_tmp1_); - _tmp5_ = _tmp4_; - *result_length1 = _tmp2_; - result = _tmp5_; + _tmp0_ = self->priv->levels; + _tmp1_ = gee_map_get_keys ((GeeMap*) _tmp0_); + _tmp2_ = _tmp1_; + _tmp3_ = _tmp2_; + _tmp5_ = gee_collection_to_array ((GeeCollection*) _tmp3_, &_tmp4_); + _tmp6_ = (gchar**) _tmp5_; + _tmp6__length1 = _tmp4_; + _g_object_unref0 (_tmp3_); + _tmp7_ = _tmp6_; + _tmp7__length1 = _tmp6__length1; + if (result_length1) { + *result_length1 = _tmp7__length1; + } + result = _tmp7_; return result; } CaribouLevelModel* caribou_group_model_get_level (CaribouGroupModel* self, const gchar* level_name) { CaribouLevelModel* result = NULL; - gpointer _tmp0_ = NULL; + GeeHashMap* _tmp0_; + const gchar* _tmp1_; + gpointer _tmp2_ = NULL; g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (level_name != NULL, NULL); - _tmp0_ = gee_abstract_map_get ((GeeAbstractMap*) self->priv->levels, level_name); - result = (CaribouLevelModel*) _tmp0_; + _tmp0_ = self->priv->levels; + _tmp1_ = level_name; + _tmp2_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp0_, _tmp1_); + result = (CaribouLevelModel*) _tmp2_; return result; } static void caribou_group_model_on_level_toggled (CaribouGroupModel* self, const gchar* new_level) { + const gchar* _tmp0_; g_return_if_fail (self != NULL); g_return_if_fail (new_level != NULL); - if (g_strcmp0 (new_level, "default") == 0) { - caribou_group_model_set_active_level (self, self->priv->default_level); + _tmp0_ = new_level; + if (g_strcmp0 (_tmp0_, "default") == 0) { + const gchar* _tmp1_; + _tmp1_ = self->priv->default_level; + caribou_group_model_set_active_level (self, _tmp1_); } else { - caribou_group_model_set_active_level (self, new_level); + const gchar* _tmp2_; + _tmp2_ = new_level; + caribou_group_model_set_active_level (self, _tmp2_); } } @@ -282,39 +348,53 @@ static CaribouIKeyboardObject** caribou_group_model_real_get_children (CaribouIKeyboardObject* base, int* result_length1) { CaribouGroupModel * self; CaribouIKeyboardObject** result = NULL; - GeeCollection* _tmp0_ = NULL; + GeeHashMap* _tmp0_; GeeCollection* _tmp1_; - gint _tmp2_; - gpointer* _tmp3_ = NULL; - CaribouIKeyboardObject** _tmp4_; - CaribouIKeyboardObject** _tmp5_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + gint _tmp4_ = 0; + gpointer* _tmp5_ = NULL; + CaribouIKeyboardObject** _tmp6_; + gint _tmp6__length1; + CaribouIKeyboardObject** _tmp7_; + gint _tmp7__length1; self = (CaribouGroupModel*) base; - _tmp0_ = gee_map_get_values ((GeeMap*) self->priv->levels); - _tmp1_ = _tmp0_; - _tmp3_ = gee_collection_to_array (_tmp1_, &_tmp2_); - _tmp4_ = (CaribouIKeyboardObject**) _tmp3_; - _g_object_unref0 (_tmp1_); - _tmp5_ = _tmp4_; - *result_length1 = _tmp2_; - result = _tmp5_; + _tmp0_ = self->priv->levels; + _tmp1_ = gee_map_get_values ((GeeMap*) _tmp0_); + _tmp2_ = _tmp1_; + _tmp3_ = _tmp2_; + _tmp5_ = gee_collection_to_array (_tmp3_, &_tmp4_); + _tmp6_ = (CaribouIKeyboardObject**) _tmp5_; + _tmp6__length1 = _tmp4_; + _g_object_unref0 (_tmp3_); + _tmp7_ = _tmp6_; + _tmp7__length1 = _tmp6__length1; + if (result_length1) { + *result_length1 = _tmp7__length1; + } + result = _tmp7_; return result; } const gchar* caribou_group_model_get_active_level (CaribouGroupModel* self) { const gchar* result; + const gchar* _tmp0_; g_return_val_if_fail (self != NULL, NULL); - result = self->priv->_active_level; + _tmp0_ = self->priv->_active_level; + result = _tmp0_; return result; } static void caribou_group_model_set_active_level (CaribouGroupModel* self, const gchar* value) { - gchar* _tmp0_; + const gchar* _tmp0_; + gchar* _tmp1_; g_return_if_fail (self != NULL); - _tmp0_ = g_strdup (value); + _tmp0_ = value; + _tmp1_ = g_strdup (_tmp0_); _g_free0 (self->priv->_active_level); - self->priv->_active_level = _tmp0_; + self->priv->_active_level = _tmp1_; g_object_notify ((GObject *) self, "active-level"); } @@ -331,7 +411,7 @@ static void caribou_group_model_caribou_ikeyboard_object_interface_init (CaribouIKeyboardObjectIface * iface) { caribou_group_model_caribou_ikeyboard_object_parent_iface = g_type_interface_peek_parent (iface); - iface->get_children = (CaribouIKeyboardObject** (*)(CaribouIKeyboardObject* ,int*)) caribou_group_model_real_get_children; + iface->get_children = (CaribouIKeyboardObject** (*)(CaribouIKeyboardObject*, int*)) caribou_group_model_real_get_children; } diff -Nru caribou-0.3.5/libcaribou/ikeyboard-object.c caribou-0.3.91/libcaribou/ikeyboard-object.c --- caribou-0.3.5/libcaribou/ikeyboard-object.c 2011-08-12 07:45:38.000000000 +0000 +++ caribou-0.3.91/libcaribou/ikeyboard-object.c 2011-09-05 23:45:29.000000000 +0000 @@ -1,4 +1,4 @@ -/* ikeyboard-object.c generated by valac 0.12.0, the Vala compiler +/* ikeyboard-object.c generated by valac 0.13.3, the Vala compiler * generated from ikeyboard-object.vala, do not modify */ @@ -55,50 +55,64 @@ static CaribouKeyModel** caribou_ikeyboard_object_real_get_keys (CaribouIKeyboardObject* self, int* result_length1) { CaribouKeyModel** result = NULL; - GeeArrayList* _tmp0_ = NULL; + GeeArrayList* _tmp0_; GeeArrayList* keys; - gint _tmp1_; + gint _tmp1_ = 0; CaribouIKeyboardObject** _tmp2_ = NULL; - gint _tmp7_; - gpointer* _tmp8_ = NULL; - CaribouKeyModel** _tmp9_; + GeeArrayList* _tmp11_; + gint _tmp12_ = 0; + gpointer* _tmp13_ = NULL; + CaribouKeyModel** _tmp14_; + gint _tmp14__length1; _tmp0_ = gee_array_list_new (CARIBOU_TYPE_KEY_MODEL, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL); keys = _tmp0_; _tmp2_ = caribou_ikeyboard_object_get_children (self, &_tmp1_); { - CaribouIKeyboardObject** obj_collection; - int obj_collection_length1; - int obj_it; + CaribouIKeyboardObject** obj_collection = NULL; + gint obj_collection_length1 = 0; + gint _obj_collection_size_ = 0; + gint obj_it = 0; obj_collection = _tmp2_; obj_collection_length1 = _tmp1_; for (obj_it = 0; obj_it < _tmp1_; obj_it = obj_it + 1) { CaribouIKeyboardObject* _tmp3_; - CaribouIKeyboardObject* obj; + CaribouIKeyboardObject* obj = NULL; _tmp3_ = _g_object_ref0 (obj_collection[obj_it]); obj = _tmp3_; { - gint _tmp4_; - CaribouKeyModel** _tmp5_ = NULL; + CaribouIKeyboardObject* _tmp4_; + gint _tmp5_ = 0; + CaribouKeyModel** _tmp6_ = NULL; CaribouKeyModel** obj_keys; gint obj_keys_length1; gint _obj_keys_size_; - _tmp5_ = caribou_ikeyboard_object_get_keys (obj, &_tmp4_); - obj_keys = _tmp5_; - obj_keys_length1 = _tmp4_; - _obj_keys_size_ = _tmp4_; + CaribouKeyModel** _tmp7_; + gint _tmp7__length1; + _tmp4_ = obj; + _tmp6_ = caribou_ikeyboard_object_get_keys (_tmp4_, &_tmp5_); + obj_keys = _tmp6_; + obj_keys_length1 = _tmp5_; + _obj_keys_size_ = obj_keys_length1; + _tmp7_ = obj_keys; + _tmp7__length1 = obj_keys_length1; { - CaribouKeyModel** key_collection; - int key_collection_length1; - int key_it; - key_collection = obj_keys; - key_collection_length1 = obj_keys_length1; - for (key_it = 0; key_it < obj_keys_length1; key_it = key_it + 1) { - CaribouKeyModel* _tmp6_; - CaribouKeyModel* key; - _tmp6_ = _g_object_ref0 (key_collection[key_it]); - key = _tmp6_; + CaribouKeyModel** key_collection = NULL; + gint key_collection_length1 = 0; + gint _key_collection_size_ = 0; + gint key_it = 0; + key_collection = _tmp7_; + key_collection_length1 = _tmp7__length1; + for (key_it = 0; key_it < _tmp7__length1; key_it = key_it + 1) { + CaribouKeyModel* _tmp8_; + CaribouKeyModel* key = NULL; + _tmp8_ = _g_object_ref0 (key_collection[key_it]); + key = _tmp8_; { - gee_abstract_collection_add ((GeeAbstractCollection*) keys, key); + GeeArrayList* _tmp9_; + CaribouKeyModel* _tmp10_; + _tmp9_ = keys; + _tmp10_ = key; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp9_, _tmp10_); _g_object_unref0 (key); } } @@ -109,10 +123,14 @@ } obj_collection = (_vala_array_free (obj_collection, obj_collection_length1, (GDestroyNotify) g_object_unref), NULL); } - _tmp8_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) keys, &_tmp7_); - _tmp9_ = (CaribouKeyModel**) _tmp8_; - *result_length1 = _tmp7_; - result = _tmp9_; + _tmp11_ = keys; + _tmp13_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) _tmp11_, &_tmp12_); + _tmp14_ = (CaribouKeyModel**) _tmp13_; + _tmp14__length1 = _tmp12_; + if (result_length1) { + *result_length1 = _tmp14__length1; + } + result = _tmp14_; _g_object_unref0 (keys); return result; } diff -Nru caribou-0.3.5/libcaribou/iscannable-group.c caribou-0.3.91/libcaribou/iscannable-group.c --- caribou-0.3.5/libcaribou/iscannable-group.c 2011-08-12 07:45:38.000000000 +0000 +++ caribou-0.3.91/libcaribou/iscannable-group.c 2011-09-05 23:45:29.000000000 +0000 @@ -1,4 +1,4 @@ -/* iscannable-group.c generated by valac 0.12.0, the Vala compiler +/* iscannable-group.c generated by valac 0.13.3, the Vala compiler * generated from iscannable-group.vala, do not modify */ diff -Nru caribou-0.3.5/libcaribou/iscannable-item.c caribou-0.3.91/libcaribou/iscannable-item.c --- caribou-0.3.5/libcaribou/iscannable-item.c 2011-08-12 07:45:38.000000000 +0000 +++ caribou-0.3.91/libcaribou/iscannable-item.c 2011-09-05 23:45:29.000000000 +0000 @@ -1,4 +1,4 @@ -/* iscannable-item.c generated by valac 0.12.0, the Vala compiler +/* iscannable-item.c generated by valac 0.13.3, the Vala compiler * generated from iscannable-item.vala, do not modify */ diff -Nru caribou-0.3.5/libcaribou/keyboard-model.c caribou-0.3.91/libcaribou/keyboard-model.c --- caribou-0.3.5/libcaribou/keyboard-model.c 2011-08-12 07:45:38.000000000 +0000 +++ caribou-0.3.91/libcaribou/keyboard-model.c 2011-09-05 23:45:29.000000000 +0000 @@ -1,4 +1,4 @@ -/* keyboard-model.c generated by valac 0.12.0, the Vala compiler +/* keyboard-model.c generated by valac 0.13.3, the Vala compiler * generated from keyboard-model.vala, do not modify */ @@ -187,23 +187,45 @@ static void caribou_keyboard_model_populate_group (CaribouKeyboardModel* self, const gchar* group, const gchar* variant) { - CaribouGroupModel* _tmp0_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + CaribouGroupModel* _tmp3_ = NULL; CaribouGroupModel* grp; + CaribouGroupModel* _tmp4_; g_return_if_fail (self != NULL); g_return_if_fail (group != NULL); g_return_if_fail (variant != NULL); - _tmp0_ = caribou_xml_deserializer_load_group (self->priv->_keyboard_type, group, variant); - grp = _tmp0_; - if (grp != NULL) { - gchar* _tmp1_ = NULL; - gchar* _tmp2_; - _tmp1_ = caribou_group_model_create_group_name (group, variant); - _tmp2_ = _tmp1_; - gee_abstract_map_set ((GeeAbstractMap*) self->priv->groups, _tmp2_, grp); - _g_free0 (_tmp2_); - g_signal_connect_object ((CaribouIKeyboardObject*) grp, "key-clicked", (GCallback) _caribou_keyboard_model_on_key_clicked_caribou_ikeyboard_object_key_clicked, self, 0); - g_signal_connect_object ((CaribouIKeyboardObject*) grp, "key-pressed", (GCallback) _caribou_keyboard_model_on_key_pressed_caribou_ikeyboard_object_key_pressed, self, 0); - g_signal_connect_object ((CaribouIKeyboardObject*) grp, "key-released", (GCallback) _caribou_keyboard_model_on_key_released_caribou_ikeyboard_object_key_released, self, 0); + _tmp0_ = self->priv->_keyboard_type; + _tmp1_ = group; + _tmp2_ = variant; + _tmp3_ = caribou_xml_deserializer_load_group (_tmp0_, _tmp1_, _tmp2_); + grp = _tmp3_; + _tmp4_ = grp; + if (_tmp4_ != NULL) { + GeeHashMap* _tmp5_; + const gchar* _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_ = NULL; + gchar* _tmp9_; + CaribouGroupModel* _tmp10_; + CaribouGroupModel* _tmp11_; + CaribouGroupModel* _tmp12_; + CaribouGroupModel* _tmp13_; + _tmp5_ = self->priv->groups; + _tmp6_ = group; + _tmp7_ = variant; + _tmp8_ = caribou_group_model_create_group_name (_tmp6_, _tmp7_); + _tmp9_ = _tmp8_; + _tmp10_ = grp; + gee_abstract_map_set ((GeeAbstractMap*) _tmp5_, _tmp9_, _tmp10_); + _g_free0 (_tmp9_); + _tmp11_ = grp; + g_signal_connect_object ((CaribouIKeyboardObject*) _tmp11_, "key-clicked", (GCallback) _caribou_keyboard_model_on_key_clicked_caribou_ikeyboard_object_key_clicked, self, 0); + _tmp12_ = grp; + g_signal_connect_object ((CaribouIKeyboardObject*) _tmp12_, "key-pressed", (GCallback) _caribou_keyboard_model_on_key_pressed_caribou_ikeyboard_object_key_pressed, self, 0); + _tmp13_ = grp; + g_signal_connect_object ((CaribouIKeyboardObject*) _tmp13_, "key-released", (GCallback) _caribou_keyboard_model_on_key_released_caribou_ikeyboard_object_key_released, self, 0); } _g_object_unref0 (grp); } @@ -215,69 +237,112 @@ static void caribou_keyboard_model_on_key_clicked (CaribouKeyboardModel* self, CaribouKeyModel* key) { - const gchar* _tmp0_ = NULL; + CaribouKeyModel* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + CaribouKeyModel* _tmp6_; g_return_if_fail (self != NULL); g_return_if_fail (key != NULL); - _tmp0_ = caribou_key_model_get_name (key); - if (g_strcmp0 (_tmp0_, "Caribou_Repeat") == 0) { - caribou_key_model_activate (self->priv->last_activated_key); + _tmp0_ = key; + _tmp1_ = caribou_key_model_get_name (_tmp0_); + _tmp2_ = _tmp1_; + if (g_strcmp0 (_tmp2_, "Caribou_Repeat") == 0) { + CaribouKeyModel* _tmp3_; + _tmp3_ = self->priv->last_activated_key; + caribou_key_model_activate (_tmp3_); } else { - CaribouKeyModel* _tmp1_; - _tmp1_ = _g_object_ref0 (key); + CaribouKeyModel* _tmp4_; + CaribouKeyModel* _tmp5_; + _tmp4_ = key; + _tmp5_ = _g_object_ref0 (_tmp4_); _g_object_unref0 (self->priv->last_activated_key); - self->priv->last_activated_key = _tmp1_; + self->priv->last_activated_key = _tmp5_; } - g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-clicked", key); + _tmp6_ = key; + g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-clicked", _tmp6_); } static void caribou_keyboard_model_on_key_pressed (CaribouKeyboardModel* self, CaribouKeyModel* key) { gboolean _tmp0_ = FALSE; - gboolean _tmp1_; + CaribouKeyModel* _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; + gboolean _tmp6_; g_return_if_fail (self != NULL); g_return_if_fail (key != NULL); - _tmp1_ = caribou_key_model_get_is_modifier (key); - if (_tmp1_) { - _tmp0_ = key->modifier_state == CARIBOU_MODIFIER_STATE_LATCHED; + _tmp1_ = key; + _tmp2_ = caribou_key_model_get_is_modifier (_tmp1_); + _tmp3_ = _tmp2_; + if (_tmp3_) { + CaribouKeyModel* _tmp4_; + CaribouModifierState _tmp5_; + _tmp4_ = key; + _tmp5_ = _tmp4_->modifier_state; + _tmp0_ = _tmp5_ == CARIBOU_MODIFIER_STATE_LATCHED; } else { _tmp0_ = FALSE; } - if (_tmp0_) { - gee_abstract_collection_add ((GeeAbstractCollection*) self->priv->active_mod_keys, key); + _tmp6_ = _tmp0_; + if (_tmp6_) { + GeeHashSet* _tmp7_; + CaribouKeyModel* _tmp8_; + _tmp7_ = self->priv->active_mod_keys; + _tmp8_ = key; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp7_, _tmp8_); } } static void caribou_keyboard_model_on_key_released (CaribouKeyboardModel* self, CaribouKeyModel* key) { - gboolean _tmp0_; + CaribouKeyModel* _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; g_return_if_fail (self != NULL); g_return_if_fail (key != NULL); - _tmp0_ = caribou_key_model_get_is_modifier (key); - if (!_tmp0_) { - gint _tmp1_; - gpointer* _tmp2_ = NULL; + _tmp0_ = key; + _tmp1_ = caribou_key_model_get_is_modifier (_tmp0_); + _tmp2_ = _tmp1_; + if (!_tmp2_) { + GeeHashSet* _tmp3_; + gint _tmp4_ = 0; + gpointer* _tmp5_ = NULL; CaribouKeyModel** modifiers; gint modifiers_length1; gint _modifiers_size_; - _tmp2_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) self->priv->active_mod_keys, &_tmp1_); - modifiers = (CaribouKeyModel**) _tmp2_; - modifiers_length1 = _tmp1_; - _modifiers_size_ = _tmp1_; + CaribouKeyModel** _tmp6_; + gint _tmp6__length1; + _tmp3_ = self->priv->active_mod_keys; + _tmp5_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) _tmp3_, &_tmp4_); + modifiers = (CaribouKeyModel**) _tmp5_; + modifiers_length1 = _tmp4_; + _modifiers_size_ = modifiers_length1; + _tmp6_ = modifiers; + _tmp6__length1 = modifiers_length1; { - CaribouKeyModel** modifier_collection; - int modifier_collection_length1; - int modifier_it; - modifier_collection = modifiers; - modifier_collection_length1 = modifiers_length1; - for (modifier_it = 0; modifier_it < modifiers_length1; modifier_it = modifier_it + 1) { - CaribouKeyModel* _tmp3_; - CaribouKeyModel* modifier; - _tmp3_ = _g_object_ref0 (modifier_collection[modifier_it]); - modifier = _tmp3_; + CaribouKeyModel** modifier_collection = NULL; + gint modifier_collection_length1 = 0; + gint _modifier_collection_size_ = 0; + gint modifier_it = 0; + modifier_collection = _tmp6_; + modifier_collection_length1 = _tmp6__length1; + for (modifier_it = 0; modifier_it < _tmp6__length1; modifier_it = modifier_it + 1) { + CaribouKeyModel* _tmp7_; + CaribouKeyModel* modifier = NULL; + _tmp7_ = _g_object_ref0 (modifier_collection[modifier_it]); + modifier = _tmp7_; { - if (modifier->modifier_state == CARIBOU_MODIFIER_STATE_LATCHED) { - modifier->modifier_state = CARIBOU_MODIFIER_STATE_NONE; - caribou_key_model_release (modifier); + CaribouKeyModel* _tmp8_; + CaribouModifierState _tmp9_; + _tmp8_ = modifier; + _tmp9_ = _tmp8_->modifier_state; + if (_tmp9_ == CARIBOU_MODIFIER_STATE_LATCHED) { + CaribouKeyModel* _tmp10_; + CaribouKeyModel* _tmp11_; + _tmp10_ = modifier; + _tmp10_->modifier_state = CARIBOU_MODIFIER_STATE_NONE; + _tmp11_ = modifier; + caribou_key_model_release (_tmp11_); } _g_object_unref0 (modifier); } @@ -290,63 +355,89 @@ gchar** caribou_keyboard_model_get_groups (CaribouKeyboardModel* self, int* result_length1) { gchar** result = NULL; - GeeSet* _tmp0_ = NULL; + GeeHashMap* _tmp0_; GeeSet* _tmp1_; - gint _tmp2_; - gpointer* _tmp3_ = NULL; - gchar** _tmp4_; - gchar** _tmp5_; + GeeSet* _tmp2_; + GeeSet* _tmp3_; + gint _tmp4_ = 0; + gpointer* _tmp5_ = NULL; + gchar** _tmp6_; + gint _tmp6__length1; + gchar** _tmp7_; + gint _tmp7__length1; g_return_val_if_fail (self != NULL, NULL); - _tmp0_ = gee_map_get_keys ((GeeMap*) self->priv->groups); - _tmp1_ = _tmp0_; - _tmp3_ = gee_collection_to_array ((GeeCollection*) _tmp1_, &_tmp2_); - _tmp4_ = (gchar**) _tmp3_; - _g_object_unref0 (_tmp1_); - _tmp5_ = _tmp4_; - *result_length1 = _tmp2_; - result = _tmp5_; + _tmp0_ = self->priv->groups; + _tmp1_ = gee_map_get_keys ((GeeMap*) _tmp0_); + _tmp2_ = _tmp1_; + _tmp3_ = _tmp2_; + _tmp5_ = gee_collection_to_array ((GeeCollection*) _tmp3_, &_tmp4_); + _tmp6_ = (gchar**) _tmp5_; + _tmp6__length1 = _tmp4_; + _g_object_unref0 (_tmp3_); + _tmp7_ = _tmp6_; + _tmp7__length1 = _tmp6__length1; + if (result_length1) { + *result_length1 = _tmp7__length1; + } + result = _tmp7_; return result; } CaribouGroupModel* caribou_keyboard_model_get_group (CaribouKeyboardModel* self, const gchar* group_name) { CaribouGroupModel* result = NULL; - gpointer _tmp0_ = NULL; + GeeHashMap* _tmp0_; + const gchar* _tmp1_; + gpointer _tmp2_ = NULL; g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (group_name != NULL, NULL); - _tmp0_ = gee_abstract_map_get ((GeeAbstractMap*) self->priv->groups, group_name); - result = (CaribouGroupModel*) _tmp0_; + _tmp0_ = self->priv->groups; + _tmp1_ = group_name; + _tmp2_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp0_, _tmp1_); + result = (CaribouGroupModel*) _tmp2_; return result; } static void caribou_keyboard_model_on_group_changed (CaribouKeyboardModel* self, guint grpid, const gchar* group, const gchar* variant) { - gchar* _tmp0_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_ = NULL; gchar* group_name; - gpointer _tmp1_ = NULL; - CaribouGroupModel* _tmp2_; - gboolean _tmp3_; + GeeHashMap* _tmp3_; + const gchar* _tmp4_; + gpointer _tmp5_ = NULL; + CaribouGroupModel* _tmp6_; + gboolean _tmp7_; g_return_if_fail (self != NULL); g_return_if_fail (group != NULL); g_return_if_fail (variant != NULL); - _tmp0_ = caribou_group_model_create_group_name (group, variant); - group_name = _tmp0_; - _tmp1_ = gee_abstract_map_get ((GeeAbstractMap*) self->priv->groups, group_name); - _tmp2_ = (CaribouGroupModel*) _tmp1_; - _tmp3_ = _tmp2_ != NULL; - _g_object_unref0 (_tmp2_); - if (_tmp3_) { - caribou_keyboard_model_set_active_group (self, group_name); + _tmp0_ = group; + _tmp1_ = variant; + _tmp2_ = caribou_group_model_create_group_name (_tmp0_, _tmp1_); + group_name = _tmp2_; + _tmp3_ = self->priv->groups; + _tmp4_ = group_name; + _tmp5_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp3_, _tmp4_); + _tmp6_ = (CaribouGroupModel*) _tmp5_; + _tmp7_ = _tmp6_ != NULL; + _g_object_unref0 (_tmp6_); + if (_tmp7_) { + const gchar* _tmp8_; + _tmp8_ = group_name; + caribou_keyboard_model_set_active_group (self, _tmp8_); } else { - gint _tmp4_; - gchar** _tmp5_ = NULL; - gchar** _tmp6_; - gint _tmp6__length1; - _tmp5_ = caribou_keyboard_model_get_groups (self, &_tmp4_); - _tmp6_ = _tmp5_; - _tmp6__length1 = _tmp4_; - caribou_keyboard_model_set_active_group (self, _tmp6_[0]); - _tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL); + gint _tmp9_ = 0; + gchar** _tmp10_ = NULL; + gchar** _tmp11_; + gint _tmp11__length1; + const gchar* _tmp12_; + _tmp10_ = caribou_keyboard_model_get_groups (self, &_tmp9_); + _tmp11_ = _tmp10_; + _tmp11__length1 = _tmp9_; + _tmp12_ = _tmp11_[0]; + caribou_keyboard_model_set_active_group (self, _tmp12_); + _tmp11_ = (_vala_array_free (_tmp11_, _tmp11__length1, (GDestroyNotify) g_free), NULL); } _g_free0 (group_name); } @@ -355,21 +446,31 @@ static CaribouIKeyboardObject** caribou_keyboard_model_real_get_children (CaribouIKeyboardObject* base, int* result_length1) { CaribouKeyboardModel * self; CaribouIKeyboardObject** result = NULL; - GeeCollection* _tmp0_ = NULL; + GeeHashMap* _tmp0_; GeeCollection* _tmp1_; - gint _tmp2_; - gpointer* _tmp3_ = NULL; - CaribouIKeyboardObject** _tmp4_; - CaribouIKeyboardObject** _tmp5_; + GeeCollection* _tmp2_; + GeeCollection* _tmp3_; + gint _tmp4_ = 0; + gpointer* _tmp5_ = NULL; + CaribouIKeyboardObject** _tmp6_; + gint _tmp6__length1; + CaribouIKeyboardObject** _tmp7_; + gint _tmp7__length1; self = (CaribouKeyboardModel*) base; - _tmp0_ = gee_map_get_values ((GeeMap*) self->priv->groups); - _tmp1_ = _tmp0_; - _tmp3_ = gee_collection_to_array (_tmp1_, &_tmp2_); - _tmp4_ = (CaribouIKeyboardObject**) _tmp3_; - _g_object_unref0 (_tmp1_); - _tmp5_ = _tmp4_; - *result_length1 = _tmp2_; - result = _tmp5_; + _tmp0_ = self->priv->groups; + _tmp1_ = gee_map_get_values ((GeeMap*) _tmp0_); + _tmp2_ = _tmp1_; + _tmp3_ = _tmp2_; + _tmp5_ = gee_collection_to_array (_tmp3_, &_tmp4_); + _tmp6_ = (CaribouIKeyboardObject**) _tmp5_; + _tmp6__length1 = _tmp4_; + _g_object_unref0 (_tmp3_); + _tmp7_ = _tmp6_; + _tmp7__length1 = _tmp6__length1; + if (result_length1) { + *result_length1 = _tmp7__length1; + } + result = _tmp7_; return result; } @@ -388,36 +489,44 @@ const gchar* caribou_keyboard_model_get_active_group (CaribouKeyboardModel* self) { const gchar* result; + const gchar* _tmp0_; g_return_val_if_fail (self != NULL, NULL); - result = self->priv->_active_group; + _tmp0_ = self->priv->_active_group; + result = _tmp0_; return result; } static void caribou_keyboard_model_set_active_group (CaribouKeyboardModel* self, const gchar* value) { - gchar* _tmp0_; + const gchar* _tmp0_; + gchar* _tmp1_; g_return_if_fail (self != NULL); - _tmp0_ = g_strdup (value); + _tmp0_ = value; + _tmp1_ = g_strdup (_tmp0_); _g_free0 (self->priv->_active_group); - self->priv->_active_group = _tmp0_; + self->priv->_active_group = _tmp1_; g_object_notify ((GObject *) self, "active-group"); } const gchar* caribou_keyboard_model_get_keyboard_type (CaribouKeyboardModel* self) { const gchar* result; + const gchar* _tmp0_; g_return_val_if_fail (self != NULL, NULL); - result = self->priv->_keyboard_type; + _tmp0_ = self->priv->_keyboard_type; + result = _tmp0_; return result; } static void caribou_keyboard_model_set_keyboard_type (CaribouKeyboardModel* self, const gchar* value) { - gchar* _tmp0_; + const gchar* _tmp0_; + gchar* _tmp1_; g_return_if_fail (self != NULL); - _tmp0_ = g_strdup (value); + _tmp0_ = value; + _tmp1_ = g_strdup (_tmp0_); _g_free0 (self->priv->_keyboard_type); - self->priv->_keyboard_type = _tmp0_; + self->priv->_keyboard_type = _tmp1_; g_object_notify ((GObject *) self, "keyboard-type"); } @@ -441,59 +550,105 @@ gint variants_length1 = 0; gint _variants_size_ = 0; gint i = 0; - CaribouXAdapter* _tmp0_ = NULL; - gchar** _tmp1_ = NULL; - gint _tmp2_; - gchar** _tmp3_ = NULL; - gint _tmp4_; - GeeHashMap* _tmp5_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - guint _tmp9_; - GeeHashSet* _tmp10_ = NULL; + const gchar* _tmp0_; + CaribouXAdapter* _tmp1_ = NULL; + CaribouXAdapter* _tmp2_; + CaribouXAdapter* _tmp3_; + gchar** _tmp4_ = NULL; + gint _tmp5_ = 0; + gchar** _tmp6_ = NULL; + gint _tmp7_ = 0; + GHashFunc _tmp8_; + GEqualFunc _tmp9_; + GeeHashMap* _tmp10_; + CaribouXAdapter* _tmp22_; + gchar* _tmp23_ = NULL; + gchar* _tmp24_ = NULL; + guint _tmp25_ = 0U; + guint _tmp26_; + const gchar* _tmp27_; + const gchar* _tmp28_; + GeeHashSet* _tmp29_; parent_class = G_OBJECT_CLASS (caribou_keyboard_model_parent_class); obj = parent_class->constructor (type, n_construct_properties, construct_properties); self = CARIBOU_KEYBOARD_MODEL (obj); - g_assert (self->priv->_keyboard_type != NULL); - _tmp0_ = caribou_xadapter_get_default (); + _tmp0_ = self->priv->_keyboard_type; + g_assert (_tmp0_ != NULL); + _tmp1_ = caribou_xadapter_get_default (); _g_object_unref0 (self->priv->xadapter); - self->priv->xadapter = _tmp0_; - g_signal_connect_object (self->priv->xadapter, "group-changed", (GCallback) _caribou_keyboard_model_on_group_changed_caribou_xadapter_group_changed, self, 0); - caribou_xadapter_get_groups (self->priv->xadapter, &_tmp1_, &_tmp2_, &_tmp3_, &_tmp4_); + self->priv->xadapter = _tmp1_; + _tmp2_ = self->priv->xadapter; + g_signal_connect_object (_tmp2_, "group-changed", (GCallback) _caribou_keyboard_model_on_group_changed_caribou_xadapter_group_changed, self, 0); + _tmp3_ = self->priv->xadapter; + caribou_xadapter_get_groups (_tmp3_, &_tmp4_, &_tmp5_, &_tmp6_, &_tmp7_); grps = (_vala_array_free (grps, grps_length1, (GDestroyNotify) g_free), NULL); - grps = _tmp1_; - grps_length1 = _tmp2_; + grps = _tmp4_; + grps_length1 = _tmp5_; + _grps_size_ = grps_length1; variants = (_vala_array_free (variants, variants_length1, (GDestroyNotify) g_free), NULL); - variants = _tmp3_; - variants_length1 = _tmp4_; - _tmp5_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, CARIBOU_TYPE_GROUP_MODEL, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_str_hash, g_str_equal, NULL); + variants = _tmp6_; + variants_length1 = _tmp7_; + _variants_size_ = variants_length1; + _tmp8_ = g_str_hash; + _tmp9_ = g_str_equal; + _tmp10_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, CARIBOU_TYPE_GROUP_MODEL, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tmp8_, _tmp9_, NULL); _g_object_unref0 (self->priv->groups); - self->priv->groups = _tmp5_; + self->priv->groups = _tmp10_; { - gboolean _tmp6_; + gboolean _tmp11_; i = 0; - _tmp6_ = TRUE; + _tmp11_ = TRUE; while (TRUE) { - if (!_tmp6_) { - i++; + gboolean _tmp12_; + gint _tmp14_; + gchar** _tmp15_; + gint _tmp15__length1; + gchar** _tmp16_; + gint _tmp16__length1; + gint _tmp17_; + const gchar* _tmp18_; + gchar** _tmp19_; + gint _tmp19__length1; + gint _tmp20_; + const gchar* _tmp21_; + _tmp12_ = _tmp11_; + if (!_tmp12_) { + gint _tmp13_; + _tmp13_ = i; + i = _tmp13_ + 1; } - _tmp6_ = FALSE; - if (!(i < grps_length1)) { + _tmp11_ = FALSE; + _tmp14_ = i; + _tmp15_ = grps; + _tmp15__length1 = grps_length1; + if (!(_tmp14_ < _tmp15__length1)) { break; } - caribou_keyboard_model_populate_group (self, grps[i], variants[i]); + _tmp16_ = grps; + _tmp16__length1 = grps_length1; + _tmp17_ = i; + _tmp18_ = _tmp16_[_tmp17_]; + _tmp19_ = variants; + _tmp19__length1 = variants_length1; + _tmp20_ = i; + _tmp21_ = _tmp19_[_tmp20_]; + caribou_keyboard_model_populate_group (self, _tmp18_, _tmp21_); } } - _tmp9_ = caribou_xadapter_get_current_group (self->priv->xadapter, &_tmp7_, &_tmp8_); + _tmp22_ = self->priv->xadapter; + _tmp25_ = caribou_xadapter_get_current_group (_tmp22_, &_tmp23_, &_tmp24_); _g_free0 (group); - group = _tmp7_; + group = _tmp23_; _g_free0 (variant); - variant = _tmp8_; - grpid = _tmp9_; - caribou_keyboard_model_on_group_changed (self, grpid, group, variant); - _tmp10_ = gee_hash_set_new (CARIBOU_TYPE_KEY_MODEL, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); + variant = _tmp24_; + grpid = _tmp25_; + _tmp26_ = grpid; + _tmp27_ = group; + _tmp28_ = variant; + caribou_keyboard_model_on_group_changed (self, _tmp26_, _tmp27_, _tmp28_); + _tmp29_ = gee_hash_set_new (CARIBOU_TYPE_KEY_MODEL, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); _g_object_unref0 (self->priv->active_mod_keys); - self->priv->active_mod_keys = _tmp10_; + self->priv->active_mod_keys = _tmp29_; variants = (_vala_array_free (variants, variants_length1, (GDestroyNotify) g_free), NULL); grps = (_vala_array_free (grps, grps_length1, (GDestroyNotify) g_free), NULL); _g_free0 (variant); @@ -516,7 +671,7 @@ static void caribou_keyboard_model_caribou_ikeyboard_object_interface_init (CaribouIKeyboardObjectIface * iface) { caribou_keyboard_model_caribou_ikeyboard_object_parent_iface = g_type_interface_peek_parent (iface); - iface->get_children = (CaribouIKeyboardObject** (*)(CaribouIKeyboardObject* ,int*)) caribou_keyboard_model_real_get_children; + iface->get_children = (CaribouIKeyboardObject** (*)(CaribouIKeyboardObject*, int*)) caribou_keyboard_model_real_get_children; } diff -Nru caribou-0.3.5/libcaribou/keyboard-service.c caribou-0.3.91/libcaribou/keyboard-service.c --- caribou-0.3.5/libcaribou/keyboard-service.c 2011-08-12 07:45:38.000000000 +0000 +++ caribou-0.3.91/libcaribou/keyboard-service.c 2011-09-05 23:45:29.000000000 +0000 @@ -1,12 +1,12 @@ -/* keyboard-service.c generated by valac 0.12.0, the Vala compiler +/* keyboard-service.c generated by valac 0.13.3, the Vala compiler * generated from keyboard-service.vala, do not modify */ #include #include +#include #include #include -#include #include @@ -176,14 +176,16 @@ void caribou_keyboard_service_register_keyboard (CaribouKeyboardService* self, const gchar* name) { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_ = NULL; + gchar* _tmp2_ = NULL; gchar* dbus_name; g_return_if_fail (self != NULL); g_return_if_fail (name != NULL); - _tmp0_ = string_to_string (name); - _tmp1_ = g_strconcat ("org.gnome.Caribou.", _tmp0_, NULL); - dbus_name = _tmp1_; + _tmp0_ = name; + _tmp1_ = string_to_string (_tmp0_); + _tmp2_ = g_strconcat ("org.gnome.Caribou.", _tmp1_, NULL); + dbus_name = _tmp2_; g_bus_own_name_with_closures (G_BUS_TYPE_SESSION, dbus_name, G_BUS_NAME_OWNER_FLAGS_NONE, (GClosure*) ((_caribou_keyboard_service_on_bus_acquired_gbus_acquired_callback == NULL) ? NULL : g_cclosure_new ((GCallback) _caribou_keyboard_service_on_bus_acquired_gbus_acquired_callback, g_object_ref (self), g_object_unref)), (GClosure*) ((_caribou_keyboard_service_on_impl_name_acquired_gbus_name_acquired_callback == NULL) ? NULL : g_cclosure_new ((GCallback) _caribou_keyboard_service_on_impl_name_acquired_gbus_name_acquired_callback, g_object_ref (self), g_object_unref)), (GClosure*) ((_caribou_keyboard_service_on_impl_name_lost_gbus_name_lost_callback == NULL) ? NULL : g_cclosure_new ((GCallback) _caribou_keyboard_service_on_impl_name_lost_gbus_name_lost_callback, g_object_ref (self), g_object_unref))); _g_free0 (dbus_name); } @@ -196,26 +198,38 @@ static void caribou_keyboard_service_on_impl_name_lost (CaribouKeyboardService* self, GDBusConnection* conn, const gchar* name) { + FILE* _tmp0_; + const gchar* _tmp1_; g_return_if_fail (self != NULL); g_return_if_fail (conn != NULL); g_return_if_fail (name != NULL); - fprintf (stderr, "Could not acquire %s\n", name); + _tmp0_ = stderr; + _tmp1_ = name; + fprintf (_tmp0_, "Could not acquire %s\n", _tmp1_); } static void caribou_keyboard_service_on_name_lost (CaribouKeyboardService* self, GDBusConnection* conn, const gchar* name) { + FILE* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; g_return_if_fail (self != NULL); g_return_if_fail (conn != NULL); g_return_if_fail (name != NULL); - fprintf (stderr, "Could not acquire %s\n", name); - caribou_keyboard_service_name_lost (self, name); + _tmp0_ = stderr; + _tmp1_ = name; + fprintf (_tmp0_, "Could not acquire %s\n", _tmp1_); + _tmp2_ = name; + caribou_keyboard_service_name_lost (self, _tmp2_); } static void caribou_keyboard_service_real_name_lost (CaribouKeyboardService* self, const gchar* name) { + FILE* _tmp0_; g_return_if_fail (self != NULL); g_return_if_fail (name != NULL); - fprintf (stderr, "default\n"); + _tmp0_ = stderr; + fprintf (_tmp0_, "default\n"); } @@ -243,33 +257,43 @@ static void caribou_keyboard_service_on_generic_name_acquired (CaribouKeyboardService* self, GDBusConnection* conn, const gchar* name) { - gchar* _tmp0_; - gchar* path; GError * _inner_error_ = NULL; g_return_if_fail (self != NULL); g_return_if_fail (conn != NULL); g_return_if_fail (name != NULL); - _tmp0_ = g_strdup ("/org/gnome/Caribou/Keyboard"); - path = _tmp0_; - caribou_keyboard_service_register_object (self, conn, path, &_inner_error_); - if (_inner_error_ != NULL) { - _g_free0 (path); - if (_inner_error_->domain == G_IO_ERROR) { - goto __catch0_g_io_error; + { + gchar* _tmp0_; + gchar* path; + GDBusConnection* _tmp1_; + _tmp0_ = g_strdup ("/org/gnome/Caribou/Keyboard"); + path = _tmp0_; + _tmp1_ = conn; + caribou_keyboard_service_register_object (self, _tmp1_, path, &_inner_error_); + if (_inner_error_ != NULL) { + _g_free0 (path); + if (_inner_error_->domain == G_IO_ERROR) { + goto __catch0_g_io_error; + } + _g_free0 (path); + g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return; } _g_free0 (path); - g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); - g_clear_error (&_inner_error_); - return; } - _g_free0 (path); goto __finally0; __catch0_g_io_error: { - GError * e; + GError* e = NULL; + FILE* _tmp2_; + GError* _tmp3_; + const gchar* _tmp4_; e = _inner_error_; _inner_error_ = NULL; - fprintf (stderr, "Could not register service: %s\n", e->message); + _tmp2_ = stderr; + _tmp3_ = e; + _tmp4_ = _tmp3_->message; + fprintf (_tmp2_, "Could not register service: %s\n", _tmp4_); _g_error_free0 (e); } __finally0: diff -Nru caribou-0.3.5/libcaribou/key-model.c caribou-0.3.91/libcaribou/key-model.c --- caribou-0.3.5/libcaribou/key-model.c 2011-08-12 07:45:38.000000000 +0000 +++ caribou-0.3.91/libcaribou/key-model.c 2011-09-05 23:45:29.000000000 +0000 @@ -1,4 +1,4 @@ -/* key-model.c generated by valac 0.12.0, the Vala compiler +/* key-model.c generated by valac 0.13.3, the Vala compiler * generated from key-model.vala, do not modify */ @@ -157,8 +157,8 @@ static CaribouKeyModel** caribou_key_model_real_get_keys (CaribouIKeyboardObject* base, int* result_length1); static CaribouIKeyboardObject** caribou_key_model_real_get_children (CaribouIKeyboardObject* base, int* result_length1); void caribou_key_model_activate (CaribouKeyModel* self); -static gboolean _lambda0_ (CaribouKeyModel* self); -static gboolean __lambda0__gsource_func (gpointer self); +static gboolean __lambda0_ (CaribouKeyModel* self); +static gboolean ___lambda0__gsource_func (gpointer self); const gchar* caribou_key_model_get_align (CaribouKeyModel* self); void caribou_key_model_set_align (CaribouKeyModel* self, const gchar* value); gdouble caribou_key_model_get_width (CaribouKeyModel* self); @@ -180,56 +180,84 @@ CaribouKeyModel* caribou_key_model_construct (GType object_type, const gchar* name) { CaribouKeyModel * self = NULL; + const gchar* _tmp0_; gint i; - CaribouXAdapter* _tmp6_ = NULL; - GeeArrayList* _tmp7_ = NULL; + GdkModifierType _tmp17_; + CaribouXAdapter* _tmp20_ = NULL; + GeeArrayList* _tmp21_; g_return_val_if_fail (name != NULL, NULL); self = (CaribouKeyModel*) g_object_new (object_type, NULL); - caribou_key_model_set_name (self, name); + _tmp0_ = name; + caribou_key_model_set_name (self, _tmp0_); self->priv->mod_mask = (GdkModifierType) 0; i = 0; { - CaribouModifierMapEntry _tmp0_; - CaribouModifierMapEntry _tmp1_ = {0}; + gint _tmp1_; + CaribouModifierMapEntry _tmp2_; + CaribouModifierMapEntry _tmp3_ = {0}; CaribouModifierMapEntry entry; - caribou_modifier_map_entry_copy (&CARIBOU_KEY_MODEL_mod_map[i], &_tmp1_); - _tmp0_ = _tmp1_; - entry = _tmp0_; + _tmp1_ = i; + _tmp2_ = CARIBOU_KEY_MODEL_mod_map[_tmp1_]; + caribou_modifier_map_entry_copy (&_tmp2_, &_tmp3_); + entry = _tmp3_; { - gboolean _tmp2_; - _tmp2_ = TRUE; + gboolean _tmp4_; + _tmp4_ = TRUE; while (TRUE) { - if (!_tmp2_) { - CaribouModifierMapEntry _tmp3_; - CaribouModifierMapEntry _tmp4_ = {0}; - i = i + 1; - caribou_modifier_map_entry_copy (&CARIBOU_KEY_MODEL_mod_map[i], &_tmp4_); - _tmp3_ = _tmp4_; + gboolean _tmp5_; + CaribouModifierMapEntry _tmp10_; + const gchar* _tmp11_; + const gchar* _tmp12_; + CaribouModifierMapEntry _tmp13_; + const gchar* _tmp14_; + _tmp5_ = _tmp4_; + if (!_tmp5_) { + gint _tmp6_; + gint _tmp7_; + CaribouModifierMapEntry _tmp8_; + CaribouModifierMapEntry _tmp9_ = {0}; + _tmp6_ = i; + i = _tmp6_ + 1; + _tmp7_ = i; + _tmp8_ = CARIBOU_KEY_MODEL_mod_map[_tmp7_]; + caribou_modifier_map_entry_copy (&_tmp8_, &_tmp9_); caribou_modifier_map_entry_destroy (&entry); - entry = _tmp3_; + entry = _tmp9_; } - _tmp2_ = FALSE; - if (!(entry.name != NULL)) { + _tmp4_ = FALSE; + _tmp10_ = entry; + _tmp11_ = _tmp10_.name; + if (!(_tmp11_ != NULL)) { break; } - if (g_strcmp0 (name, entry.name) == 0) { - self->priv->mod_mask = entry.mask; + _tmp12_ = name; + _tmp13_ = entry; + _tmp14_ = _tmp13_.name; + if (g_strcmp0 (_tmp12_, _tmp14_) == 0) { + CaribouModifierMapEntry _tmp15_; + GdkModifierType _tmp16_; + _tmp15_ = entry; + _tmp16_ = _tmp15_.mask; + self->priv->mod_mask = _tmp16_; } } } caribou_modifier_map_entry_destroy (&entry); } - if (self->priv->mod_mask == 0) { - guint _tmp5_; - _tmp5_ = gdk_keyval_from_name (name); - caribou_key_model_set_keyval (self, _tmp5_); + _tmp17_ = self->priv->mod_mask; + if (_tmp17_ == 0) { + const gchar* _tmp18_; + guint _tmp19_ = 0U; + _tmp18_ = name; + _tmp19_ = gdk_keyval_from_name (_tmp18_); + caribou_key_model_set_keyval (self, _tmp19_); } - _tmp6_ = caribou_xadapter_get_default (); + _tmp20_ = caribou_xadapter_get_default (); _g_object_unref0 (self->priv->xadapter); - self->priv->xadapter = _tmp6_; - _tmp7_ = gee_array_list_new (CARIBOU_TYPE_KEY_MODEL, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL); + self->priv->xadapter = _tmp20_; + _tmp21_ = gee_array_list_new (CARIBOU_TYPE_KEY_MODEL, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL); _g_object_unref0 (self->priv->extended_keys); - self->priv->extended_keys = _tmp7_; + self->priv->extended_keys = _tmp21_; return self; } @@ -245,17 +273,25 @@ void caribou_key_model_add_subkey (CaribouKeyModel* self, CaribouKeyModel* key) { + CaribouKeyModel* _tmp0_; + GeeArrayList* _tmp1_; + CaribouKeyModel* _tmp2_; g_return_if_fail (self != NULL); g_return_if_fail (key != NULL); - g_signal_connect_object ((CaribouIKeyboardObject*) key, "key-clicked", (GCallback) _caribou_key_model_on_subkey_clicked_caribou_ikeyboard_object_key_clicked, self, 0); - gee_abstract_collection_add ((GeeAbstractCollection*) self->priv->extended_keys, key); + _tmp0_ = key; + g_signal_connect_object ((CaribouIKeyboardObject*) _tmp0_, "key-clicked", (GCallback) _caribou_key_model_on_subkey_clicked_caribou_ikeyboard_object_key_clicked, self, 0); + _tmp1_ = self->priv->extended_keys; + _tmp2_ = key; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp1_, _tmp2_); } static void caribou_key_model_on_subkey_clicked (CaribouKeyModel* self, CaribouKeyModel* key) { + CaribouKeyModel* _tmp0_; g_return_if_fail (self != NULL); g_return_if_fail (key != NULL); - g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-clicked", key); + _tmp0_ = key; + g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-clicked", _tmp0_); caribou_key_model_set_show_subkeys (self, FALSE); } @@ -269,43 +305,75 @@ void caribou_key_model_press (CaribouKeyModel* self) { gboolean _tmp0_; - guint _tmp1_; + gboolean _tmp1_; + guint _tmp5_ = 0U; g_return_if_fail (self != NULL); _tmp0_ = caribou_key_model_get_is_modifier (self); - if (_tmp0_) { - if (self->modifier_state == CARIBOU_MODIFIER_STATE_NONE) { + _tmp1_ = _tmp0_; + if (_tmp1_) { + CaribouModifierState _tmp2_; + _tmp2_ = self->modifier_state; + if (_tmp2_ == CARIBOU_MODIFIER_STATE_NONE) { + CaribouXAdapter* _tmp3_; + GdkModifierType _tmp4_; self->modifier_state = CARIBOU_MODIFIER_STATE_LATCHED; - caribou_xadapter_mod_lock (self->priv->xadapter, (guint) self->priv->mod_mask); + _tmp3_ = self->priv->xadapter; + _tmp4_ = self->priv->mod_mask; + caribou_xadapter_mod_lock (_tmp3_, (guint) _tmp4_); } else { self->modifier_state = CARIBOU_MODIFIER_STATE_NONE; } } - _tmp1_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 1000, _caribou_key_model_on_key_held_gsource_func, g_object_ref (self), g_object_unref); - self->priv->hold_tid = _tmp1_; + _tmp5_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 1000, _caribou_key_model_on_key_held_gsource_func, g_object_ref (self), g_object_unref); + self->priv->hold_tid = _tmp5_; g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-pressed", self); } void caribou_key_model_release (CaribouKeyModel* self) { - gboolean _tmp0_; - g_return_if_fail (self != NULL); - if (self->priv->hold_tid != 0) { - g_source_remove (self->priv->hold_tid); + guint _tmp0_; + gboolean _tmp2_; + gboolean _tmp3_; + guint _tmp7_; + guint _tmp12_; + g_return_if_fail (self != NULL); + _tmp0_ = self->priv->hold_tid; + if (_tmp0_ != ((guint) 0)) { + guint _tmp1_; + _tmp1_ = self->priv->hold_tid; + g_source_remove (_tmp1_); } - _tmp0_ = caribou_key_model_get_is_modifier (self); - if (_tmp0_) { - if (self->modifier_state == CARIBOU_MODIFIER_STATE_NONE) { - caribou_xadapter_mod_unlock (self->priv->xadapter, (guint) self->priv->mod_mask); + _tmp2_ = caribou_key_model_get_is_modifier (self); + _tmp3_ = _tmp2_; + if (_tmp3_) { + CaribouModifierState _tmp4_; + _tmp4_ = self->modifier_state; + if (_tmp4_ == CARIBOU_MODIFIER_STATE_NONE) { + CaribouXAdapter* _tmp5_; + GdkModifierType _tmp6_; + _tmp5_ = self->priv->xadapter; + _tmp6_ = self->priv->mod_mask; + caribou_xadapter_mod_unlock (_tmp5_, (guint) _tmp6_); } else { return; } } - if (self->priv->_keyval != 0) { - caribou_xadapter_keyval_press (self->priv->xadapter, self->priv->_keyval); - caribou_xadapter_keyval_release (self->priv->xadapter, self->priv->_keyval); + _tmp7_ = self->priv->_keyval; + if (_tmp7_ != ((guint) 0)) { + CaribouXAdapter* _tmp8_; + guint _tmp9_; + CaribouXAdapter* _tmp10_; + guint _tmp11_; + _tmp8_ = self->priv->xadapter; + _tmp9_ = self->priv->_keyval; + caribou_xadapter_keyval_press (_tmp8_, _tmp9_); + _tmp10_ = self->priv->xadapter; + _tmp11_ = self->priv->_keyval; + caribou_xadapter_keyval_release (_tmp10_, _tmp11_); } g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-released", self); - if (self->priv->hold_tid != 0) { + _tmp12_ = self->priv->hold_tid; + if (_tmp12_ != ((guint) 0)) { g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-clicked", self); self->priv->hold_tid = (guint) 0; } else { @@ -316,22 +384,32 @@ static gboolean caribou_key_model_on_key_held (CaribouKeyModel* self) { gboolean result = FALSE; - gint _tmp0_; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_; + GeeArrayList* _tmp0_; + gint _tmp1_; + gint _tmp2_; + gboolean _tmp3_ = FALSE; + gboolean _tmp4_; + gboolean _tmp5_; + gboolean _tmp7_; g_return_val_if_fail (self != NULL, FALSE); self->priv->hold_tid = (guint) 0; - _tmp0_ = gee_collection_get_size ((GeeCollection*) self->priv->extended_keys); - if (_tmp0_ != 0) { + _tmp0_ = self->priv->extended_keys; + _tmp1_ = gee_collection_get_size ((GeeCollection*) _tmp0_); + _tmp2_ = _tmp1_; + if (_tmp2_ != 0) { caribou_key_model_set_show_subkeys (self, TRUE); } - _tmp2_ = caribou_key_model_get_is_modifier (self); - if (_tmp2_) { - _tmp1_ = self->modifier_state == CARIBOU_MODIFIER_STATE_LATCHED; + _tmp4_ = caribou_key_model_get_is_modifier (self); + _tmp5_ = _tmp4_; + if (_tmp5_) { + CaribouModifierState _tmp6_; + _tmp6_ = self->modifier_state; + _tmp3_ = _tmp6_ == CARIBOU_MODIFIER_STATE_LATCHED; } else { - _tmp1_ = FALSE; + _tmp3_ = FALSE; } - if (_tmp1_) { + _tmp7_ = _tmp3_; + if (_tmp7_) { self->modifier_state = CARIBOU_MODIFIER_STATE_LOCKED; } g_signal_emit_by_name (self, "key-hold"); @@ -342,14 +420,20 @@ CaribouKeyModel** caribou_key_model_get_extended_keys (CaribouKeyModel* self, int* result_length1) { CaribouKeyModel** result = NULL; - gint _tmp0_; - gpointer* _tmp1_ = NULL; - CaribouKeyModel** _tmp2_; + GeeArrayList* _tmp0_; + gint _tmp1_ = 0; + gpointer* _tmp2_ = NULL; + CaribouKeyModel** _tmp3_; + gint _tmp3__length1; g_return_val_if_fail (self != NULL, NULL); - _tmp1_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) self->priv->extended_keys, &_tmp0_); - _tmp2_ = (CaribouKeyModel**) _tmp1_; - *result_length1 = _tmp0_; - result = _tmp2_; + _tmp0_ = self->priv->extended_keys; + _tmp2_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) _tmp0_, &_tmp1_); + _tmp3_ = (CaribouKeyModel**) _tmp2_; + _tmp3__length1 = _tmp1_; + if (result_length1) { + *result_length1 = _tmp3__length1; + } + result = _tmp3_; return result; } @@ -357,20 +441,26 @@ static CaribouKeyModel** caribou_key_model_real_get_keys (CaribouIKeyboardObject* base, int* result_length1) { CaribouKeyModel * self; CaribouKeyModel** result = NULL; - GeeArrayList* _tmp0_ = NULL; + GeeArrayList* _tmp0_; GeeArrayList* all_keys; - gint _tmp1_; - gpointer* _tmp2_ = NULL; - CaribouKeyModel** _tmp3_; + GeeArrayList* _tmp1_; + gint _tmp2_ = 0; + gpointer* _tmp3_ = NULL; + CaribouKeyModel** _tmp4_; + gint _tmp4__length1; self = (CaribouKeyModel*) base; _tmp0_ = gee_array_list_new (CARIBOU_TYPE_KEY_MODEL, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL); all_keys = _tmp0_; gee_abstract_collection_add ((GeeAbstractCollection*) all_keys, self); - gee_abstract_collection_add_all ((GeeAbstractCollection*) all_keys, (GeeCollection*) self->priv->extended_keys); - _tmp2_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) all_keys, &_tmp1_); - _tmp3_ = (CaribouKeyModel**) _tmp2_; - *result_length1 = _tmp1_; - result = _tmp3_; + _tmp1_ = self->priv->extended_keys; + gee_abstract_collection_add_all ((GeeAbstractCollection*) all_keys, (GeeCollection*) _tmp1_); + _tmp3_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) all_keys, &_tmp2_); + _tmp4_ = (CaribouKeyModel**) _tmp3_; + _tmp4__length1 = _tmp2_; + if (result_length1) { + *result_length1 = _tmp4__length1; + } + result = _tmp4_; _g_object_unref0 (all_keys); return result; } @@ -379,19 +469,25 @@ static CaribouIKeyboardObject** caribou_key_model_real_get_children (CaribouIKeyboardObject* base, int* result_length1) { CaribouKeyModel * self; CaribouIKeyboardObject** result = NULL; - gint _tmp0_; - gpointer* _tmp1_ = NULL; - CaribouIKeyboardObject** _tmp2_; + GeeArrayList* _tmp0_; + gint _tmp1_ = 0; + gpointer* _tmp2_ = NULL; + CaribouIKeyboardObject** _tmp3_; + gint _tmp3__length1; self = (CaribouKeyModel*) base; - _tmp1_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) self->priv->extended_keys, &_tmp0_); - _tmp2_ = (CaribouIKeyboardObject**) _tmp1_; - *result_length1 = _tmp0_; - result = _tmp2_; + _tmp0_ = self->priv->extended_keys; + _tmp2_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) _tmp0_, &_tmp1_); + _tmp3_ = (CaribouIKeyboardObject**) _tmp2_; + _tmp3__length1 = _tmp1_; + if (result_length1) { + *result_length1 = _tmp3__length1; + } + result = _tmp3_; return result; } -static gboolean _lambda0_ (CaribouKeyModel* self) { +static gboolean __lambda0_ (CaribouKeyModel* self) { gboolean result = FALSE; caribou_key_model_release (self); result = FALSE; @@ -399,9 +495,9 @@ } -static gboolean __lambda0__gsource_func (gpointer self) { +static gboolean ___lambda0__gsource_func (gpointer self) { gboolean result; - result = _lambda0_ (self); + result = __lambda0_ (self); return result; } @@ -409,65 +505,79 @@ void caribou_key_model_activate (CaribouKeyModel* self) { g_return_if_fail (self != NULL); caribou_key_model_press (self); - g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, __lambda0__gsource_func, g_object_ref (self), g_object_unref); + g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 200, ___lambda0__gsource_func, g_object_ref (self), g_object_unref); } const gchar* caribou_key_model_get_align (CaribouKeyModel* self) { const gchar* result; + const gchar* _tmp0_; g_return_val_if_fail (self != NULL, NULL); - result = self->priv->_align; + _tmp0_ = self->priv->_align; + result = _tmp0_; return result; } void caribou_key_model_set_align (CaribouKeyModel* self, const gchar* value) { - gchar* _tmp0_; + const gchar* _tmp0_; + gchar* _tmp1_; g_return_if_fail (self != NULL); - _tmp0_ = g_strdup (value); + _tmp0_ = value; + _tmp1_ = g_strdup (_tmp0_); _g_free0 (self->priv->_align); - self->priv->_align = _tmp0_; + self->priv->_align = _tmp1_; g_object_notify ((GObject *) self, "align"); } gdouble caribou_key_model_get_width (CaribouKeyModel* self) { gdouble result; + gdouble _tmp0_; g_return_val_if_fail (self != NULL, 0.0); - result = self->priv->_width; + _tmp0_ = self->priv->_width; + result = _tmp0_; return result; } void caribou_key_model_set_width (CaribouKeyModel* self, gdouble value) { + gdouble _tmp0_; g_return_if_fail (self != NULL); - self->priv->_width = value; + _tmp0_ = value; + self->priv->_width = _tmp0_; g_object_notify ((GObject *) self, "width"); } const gchar* caribou_key_model_get_toggle (CaribouKeyModel* self) { const gchar* result; + const gchar* _tmp0_; g_return_val_if_fail (self != NULL, NULL); - result = self->priv->_toggle; + _tmp0_ = self->priv->_toggle; + result = _tmp0_; return result; } void caribou_key_model_set_toggle (CaribouKeyModel* self, const gchar* value) { - gchar* _tmp0_; + const gchar* _tmp0_; + gchar* _tmp1_; g_return_if_fail (self != NULL); - _tmp0_ = g_strdup (value); + _tmp0_ = value; + _tmp1_ = g_strdup (_tmp0_); _g_free0 (self->priv->_toggle); - self->priv->_toggle = _tmp0_; + self->priv->_toggle = _tmp1_; g_object_notify ((GObject *) self, "toggle"); } gboolean caribou_key_model_get_is_modifier (CaribouKeyModel* self) { gboolean result; + GdkModifierType _tmp0_; g_return_val_if_fail (self != NULL, FALSE); - result = self->priv->mod_mask != 0; + _tmp0_ = self->priv->mod_mask; + result = _tmp0_ != 0; return result; } @@ -480,48 +590,60 @@ gboolean caribou_key_model_get_show_subkeys (CaribouKeyModel* self) { gboolean result; + gboolean _tmp0_; g_return_val_if_fail (self != NULL, FALSE); - result = self->priv->_show_subkeys; + _tmp0_ = self->priv->_show_subkeys; + result = _tmp0_; return result; } static void caribou_key_model_set_show_subkeys (CaribouKeyModel* self, gboolean value) { + gboolean _tmp0_; g_return_if_fail (self != NULL); - self->priv->_show_subkeys = value; + _tmp0_ = value; + self->priv->_show_subkeys = _tmp0_; g_object_notify ((GObject *) self, "show-subkeys"); } const gchar* caribou_key_model_get_name (CaribouKeyModel* self) { const gchar* result; + const gchar* _tmp0_; g_return_val_if_fail (self != NULL, NULL); - result = self->priv->_name; + _tmp0_ = self->priv->_name; + result = _tmp0_; return result; } static void caribou_key_model_set_name (CaribouKeyModel* self, const gchar* value) { - gchar* _tmp0_; + const gchar* _tmp0_; + gchar* _tmp1_; g_return_if_fail (self != NULL); - _tmp0_ = g_strdup (value); + _tmp0_ = value; + _tmp1_ = g_strdup (_tmp0_); _g_free0 (self->priv->_name); - self->priv->_name = _tmp0_; + self->priv->_name = _tmp1_; g_object_notify ((GObject *) self, "name"); } guint caribou_key_model_get_keyval (CaribouKeyModel* self) { guint result; + guint _tmp0_; g_return_val_if_fail (self != NULL, 0U); - result = self->priv->_keyval; + _tmp0_ = self->priv->_keyval; + result = _tmp0_; return result; } static void caribou_key_model_set_keyval (CaribouKeyModel* self, guint value) { + guint _tmp0_; g_return_if_fail (self != NULL); - self->priv->_keyval = value; + _tmp0_ = value; + self->priv->_keyval = _tmp0_; g_object_notify ((GObject *) self, "keyval"); } @@ -529,16 +651,20 @@ static gboolean caribou_key_model_real_get_scan_stepping (CaribouIScannableItem* base) { gboolean result; CaribouKeyModel* self; + gboolean _tmp0_; self = (CaribouKeyModel*) base; - result = self->priv->_scan_stepping; + _tmp0_ = self->priv->_scan_stepping; + result = _tmp0_; return result; } static void caribou_key_model_real_set_scan_stepping (CaribouIScannableItem* base, gboolean value) { CaribouKeyModel* self; + gboolean _tmp0_; self = (CaribouKeyModel*) base; - self->priv->_scan_stepping = value; + _tmp0_ = value; + self->priv->_scan_stepping = _tmp0_; g_object_notify ((GObject *) self, "scan-stepping"); } @@ -546,17 +672,23 @@ static gboolean caribou_key_model_real_get_scan_selected (CaribouIScannableItem* base) { gboolean result; CaribouKeyModel* self; + gboolean _tmp0_; self = (CaribouKeyModel*) base; - result = self->priv->_scan_selected; + _tmp0_ = self->priv->_scan_selected; + result = _tmp0_; return result; } static void caribou_key_model_real_set_scan_selected (CaribouIScannableItem* base, gboolean value) { CaribouKeyModel* self; + gboolean _tmp0_; + gboolean _tmp1_; self = (CaribouKeyModel*) base; - self->priv->_scan_selected = value; - if (self->priv->_scan_selected) { + _tmp0_ = value; + self->priv->_scan_selected = _tmp0_; + _tmp1_ = self->priv->_scan_selected; + if (_tmp1_) { caribou_key_model_activate (self); } g_object_notify ((GObject *) self, "scan-selected"); @@ -594,8 +726,8 @@ static void caribou_key_model_caribou_ikeyboard_object_interface_init (CaribouIKeyboardObjectIface * iface) { caribou_key_model_caribou_ikeyboard_object_parent_iface = g_type_interface_peek_parent (iface); - iface->get_keys = (CaribouKeyModel** (*)(CaribouIKeyboardObject* ,int*)) caribou_key_model_real_get_keys; - iface->get_children = (CaribouIKeyboardObject** (*)(CaribouIKeyboardObject* ,int*)) caribou_key_model_real_get_children; + iface->get_keys = (CaribouKeyModel** (*)(CaribouIKeyboardObject*, int*)) caribou_key_model_real_get_keys; + iface->get_children = (CaribouIKeyboardObject** (*)(CaribouIKeyboardObject*, int*)) caribou_key_model_real_get_children; } @@ -729,8 +861,15 @@ void caribou_modifier_map_entry_copy (const CaribouModifierMapEntry* self, CaribouModifierMapEntry* dest) { - dest->name = g_strdup (self->name); - dest->mask = self->mask; + const gchar* _tmp0_; + const gchar* _tmp1_; + GdkModifierType _tmp2_; + _tmp0_ = (*self).name; + _tmp1_ = g_strdup (_tmp0_); + _g_free0 ((*dest).name); + (*dest).name = _tmp1_; + _tmp2_ = (*self).mask; + (*dest).mask = _tmp2_; } diff -Nru caribou-0.3.5/libcaribou/level-model.c caribou-0.3.91/libcaribou/level-model.c --- caribou-0.3.5/libcaribou/level-model.c 2011-08-12 07:45:38.000000000 +0000 +++ caribou-0.3.91/libcaribou/level-model.c 2011-09-05 23:45:29.000000000 +0000 @@ -1,4 +1,4 @@ -/* level-model.c generated by valac 0.12.0, the Vala compiler +/* level-model.c generated by valac 0.13.3, the Vala compiler * generated from level-model.vala, do not modify */ @@ -161,10 +161,10 @@ void caribou_level_model_add_row (CaribouLevelModel* self, CaribouRowModel* row); static void caribou_level_model_on_key_clicked (CaribouLevelModel* self, CaribouKeyModel* key); static void _caribou_level_model_on_key_clicked_caribou_ikeyboard_object_key_clicked (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); -static void _lambda7_ (CaribouKeyModel* k, CaribouLevelModel* self); -static void __lambda7__caribou_ikeyboard_object_key_pressed (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); -static void _lambda8_ (CaribouKeyModel* k, CaribouLevelModel* self); -static void __lambda8__caribou_ikeyboard_object_key_released (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); +static void __lambda7_ (CaribouLevelModel* self, CaribouKeyModel* k); +static void ___lambda7__caribou_ikeyboard_object_key_pressed (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); +static void __lambda8_ (CaribouLevelModel* self, CaribouKeyModel* k); +static void ___lambda8__caribou_ikeyboard_object_key_released (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); CaribouRowModel** caribou_level_model_get_rows (CaribouLevelModel* self, int* result_length1); const gchar* caribou_key_model_get_toggle (CaribouKeyModel* self); const gchar* caribou_level_model_get_mode (CaribouLevelModel* self); @@ -179,13 +179,15 @@ CaribouLevelModel* caribou_level_model_construct (GType object_type, const gchar* mode) { CaribouLevelModel * self = NULL; - GeeArrayList* _tmp0_ = NULL; + const gchar* _tmp0_; + GeeArrayList* _tmp1_; g_return_val_if_fail (mode != NULL, NULL); self = (CaribouLevelModel*) caribou_scannable_group_construct (object_type); - caribou_level_model_set_mode (self, mode); - _tmp0_ = gee_array_list_new (CARIBOU_TYPE_ROW_MODEL, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL); + _tmp0_ = mode; + caribou_level_model_set_mode (self, _tmp0_); + _tmp1_ = gee_array_list_new (CARIBOU_TYPE_ROW_MODEL, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL); _g_object_unref0 (self->priv->rows); - self->priv->rows = _tmp0_; + self->priv->rows = _tmp1_; return self; } @@ -200,67 +202,99 @@ } -static void _lambda7_ (CaribouKeyModel* k, CaribouLevelModel* self) { +static void __lambda7_ (CaribouLevelModel* self, CaribouKeyModel* k) { + CaribouKeyModel* _tmp0_; g_return_if_fail (k != NULL); - g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-pressed", k); + _tmp0_ = k; + g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-pressed", _tmp0_); } -static void __lambda7__caribou_ikeyboard_object_key_pressed (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { - _lambda7_ (key, self); +static void ___lambda7__caribou_ikeyboard_object_key_pressed (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { + __lambda7_ (self, key); } -static void _lambda8_ (CaribouKeyModel* k, CaribouLevelModel* self) { +static void __lambda8_ (CaribouLevelModel* self, CaribouKeyModel* k) { + CaribouKeyModel* _tmp0_; g_return_if_fail (k != NULL); - g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-released", k); + _tmp0_ = k; + g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-released", _tmp0_); } -static void __lambda8__caribou_ikeyboard_object_key_released (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { - _lambda8_ (key, self); +static void ___lambda8__caribou_ikeyboard_object_key_released (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { + __lambda8_ (self, key); } void caribou_level_model_add_row (CaribouLevelModel* self, CaribouRowModel* row) { + CaribouRowModel* _tmp0_; + CaribouRowModel* _tmp1_; + CaribouRowModel* _tmp2_; + GeeArrayList* _tmp3_; + CaribouRowModel* _tmp4_; g_return_if_fail (self != NULL); g_return_if_fail (row != NULL); - g_signal_connect_object ((CaribouIKeyboardObject*) row, "key-clicked", (GCallback) _caribou_level_model_on_key_clicked_caribou_ikeyboard_object_key_clicked, self, 0); - g_signal_connect_object ((CaribouIKeyboardObject*) row, "key-pressed", (GCallback) __lambda7__caribou_ikeyboard_object_key_pressed, self, 0); - g_signal_connect_object ((CaribouIKeyboardObject*) row, "key-released", (GCallback) __lambda8__caribou_ikeyboard_object_key_released, self, 0); - gee_abstract_collection_add ((GeeAbstractCollection*) self->priv->rows, row); + _tmp0_ = row; + g_signal_connect_object ((CaribouIKeyboardObject*) _tmp0_, "key-clicked", (GCallback) _caribou_level_model_on_key_clicked_caribou_ikeyboard_object_key_clicked, self, 0); + _tmp1_ = row; + g_signal_connect_object ((CaribouIKeyboardObject*) _tmp1_, "key-pressed", (GCallback) ___lambda7__caribou_ikeyboard_object_key_pressed, self, 0); + _tmp2_ = row; + g_signal_connect_object ((CaribouIKeyboardObject*) _tmp2_, "key-released", (GCallback) ___lambda8__caribou_ikeyboard_object_key_released, self, 0); + _tmp3_ = self->priv->rows; + _tmp4_ = row; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp3_, _tmp4_); } CaribouRowModel** caribou_level_model_get_rows (CaribouLevelModel* self, int* result_length1) { CaribouRowModel** result = NULL; - gint _tmp0_; - gpointer* _tmp1_ = NULL; - CaribouRowModel** _tmp2_; + GeeArrayList* _tmp0_; + gint _tmp1_ = 0; + gpointer* _tmp2_ = NULL; + CaribouRowModel** _tmp3_; + gint _tmp3__length1; g_return_val_if_fail (self != NULL, NULL); - _tmp1_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) self->priv->rows, &_tmp0_); - _tmp2_ = (CaribouRowModel**) _tmp1_; - *result_length1 = _tmp0_; - result = _tmp2_; + _tmp0_ = self->priv->rows; + _tmp2_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) _tmp0_, &_tmp1_); + _tmp3_ = (CaribouRowModel**) _tmp2_; + _tmp3__length1 = _tmp1_; + if (result_length1) { + *result_length1 = _tmp3__length1; + } + result = _tmp3_; return result; } static void caribou_level_model_on_key_clicked (CaribouLevelModel* self, CaribouKeyModel* key) { - const gchar* _tmp0_ = NULL; + CaribouKeyModel* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + CaribouKeyModel* _tmp7_; g_return_if_fail (self != NULL); g_return_if_fail (key != NULL); - _tmp0_ = caribou_key_model_get_toggle (key); - if (g_strcmp0 (_tmp0_, "") != 0) { - const gchar* _tmp1_ = NULL; - _tmp1_ = caribou_key_model_get_toggle (key); - g_signal_emit_by_name (self, "level-toggled", _tmp1_); + _tmp0_ = key; + _tmp1_ = caribou_key_model_get_toggle (_tmp0_); + _tmp2_ = _tmp1_; + if (g_strcmp0 (_tmp2_, "") != 0) { + CaribouKeyModel* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp5_; + _tmp3_ = key; + _tmp4_ = caribou_key_model_get_toggle (_tmp3_); + _tmp5_ = _tmp4_; + g_signal_emit_by_name (self, "level-toggled", _tmp5_); } else { - if (g_strcmp0 (self->priv->_mode, "latched") == 0) { + const gchar* _tmp6_; + _tmp6_ = self->priv->_mode; + if (g_strcmp0 (_tmp6_, "latched") == 0) { g_signal_emit_by_name (self, "level-toggled", "default"); } } - g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-clicked", key); + _tmp7_ = key; + g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-clicked", _tmp7_); } @@ -268,25 +302,37 @@ CaribouLevelModel * self; CaribouIScannableItem** result = NULL; CaribouScanGrouping _tmp0_; + CaribouScanGrouping _tmp1_; self = (CaribouLevelModel*) base; _tmp0_ = caribou_iscannable_group_get_scan_grouping ((CaribouIScannableGroup*) self); - if (_tmp0_ == CARIBOU_SCAN_GROUPING_LINEAR) { - gint _tmp1_; - CaribouKeyModel** _tmp2_ = NULL; - CaribouIScannableItem** _tmp3_; - _tmp2_ = caribou_ikeyboard_object_get_keys ((CaribouIKeyboardObject*) self, &_tmp1_); - _tmp3_ = (CaribouIScannableItem**) _tmp2_; - *result_length1 = _tmp1_; - result = _tmp3_; + _tmp1_ = _tmp0_; + if (_tmp1_ == CARIBOU_SCAN_GROUPING_LINEAR) { + gint _tmp2_ = 0; + CaribouKeyModel** _tmp3_ = NULL; + CaribouIScannableItem** _tmp4_; + gint _tmp4__length1; + _tmp3_ = caribou_ikeyboard_object_get_keys ((CaribouIKeyboardObject*) self, &_tmp2_); + _tmp4_ = (CaribouIScannableItem**) _tmp3_; + _tmp4__length1 = _tmp2_; + if (result_length1) { + *result_length1 = _tmp4__length1; + } + result = _tmp4_; return result; } else { - gint _tmp4_; - gpointer* _tmp5_ = NULL; - CaribouIScannableItem** _tmp6_; - _tmp5_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) self->priv->rows, &_tmp4_); - _tmp6_ = (CaribouIScannableItem**) _tmp5_; - *result_length1 = _tmp4_; - result = _tmp6_; + GeeArrayList* _tmp5_; + gint _tmp6_ = 0; + gpointer* _tmp7_ = NULL; + CaribouIScannableItem** _tmp8_; + gint _tmp8__length1; + _tmp5_ = self->priv->rows; + _tmp7_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) _tmp5_, &_tmp6_); + _tmp8_ = (CaribouIScannableItem**) _tmp7_; + _tmp8__length1 = _tmp6_; + if (result_length1) { + *result_length1 = _tmp8__length1; + } + result = _tmp8_; return result; } } @@ -295,13 +341,17 @@ static CaribouIKeyboardObject** caribou_level_model_real_get_children (CaribouIKeyboardObject* base, int* result_length1) { CaribouLevelModel * self; CaribouIKeyboardObject** result = NULL; - gint _tmp0_; + gint _tmp0_ = 0; CaribouRowModel** _tmp1_ = NULL; CaribouIKeyboardObject** _tmp2_; + gint _tmp2__length1; self = (CaribouLevelModel*) base; _tmp1_ = caribou_level_model_get_rows (self, &_tmp0_); _tmp2_ = (CaribouIKeyboardObject**) _tmp1_; - *result_length1 = _tmp0_; + _tmp2__length1 = _tmp0_; + if (result_length1) { + *result_length1 = _tmp2__length1; + } result = _tmp2_; return result; } @@ -309,18 +359,22 @@ const gchar* caribou_level_model_get_mode (CaribouLevelModel* self) { const gchar* result; + const gchar* _tmp0_; g_return_val_if_fail (self != NULL, NULL); - result = self->priv->_mode; + _tmp0_ = self->priv->_mode; + result = _tmp0_; return result; } static void caribou_level_model_set_mode (CaribouLevelModel* self, const gchar* value) { - gchar* _tmp0_; + const gchar* _tmp0_; + gchar* _tmp1_; g_return_if_fail (self != NULL); - _tmp0_ = g_strdup (value); + _tmp0_ = value; + _tmp1_ = g_strdup (_tmp0_); _g_free0 (self->priv->_mode); - self->priv->_mode = _tmp0_; + self->priv->_mode = _tmp1_; g_object_notify ((GObject *) self, "mode"); } @@ -339,7 +393,7 @@ static void caribou_level_model_caribou_ikeyboard_object_interface_init (CaribouIKeyboardObjectIface * iface) { caribou_level_model_caribou_ikeyboard_object_parent_iface = g_type_interface_peek_parent (iface); - iface->get_children = (CaribouIKeyboardObject** (*)(CaribouIKeyboardObject* ,int*)) caribou_level_model_real_get_children; + iface->get_children = (CaribouIKeyboardObject** (*)(CaribouIKeyboardObject*, int*)) caribou_level_model_real_get_children; } diff -Nru caribou-0.3.5/libcaribou/libxklavier.vapi caribou-0.3.91/libcaribou/libxklavier.vapi --- caribou-0.3.5/libcaribou/libxklavier.vapi 2011-06-08 18:15:53.000000000 +0000 +++ caribou-0.3.91/libcaribou/libxklavier.vapi 2011-08-30 00:44:28.000000000 +0000 @@ -15,9 +15,12 @@ } [CCode (cheader_filename = "libxklavier/xklavier.h")] public class ConfigRec : GLib.Object { + [CCode (array_length = false, array_null_terminated = true)] public string[] layouts; public weak string model; + [CCode (array_length = false, array_null_terminated = true)] public string[] options; + [CCode (array_length = false, array_null_terminated = true)] public string[] variants; [CCode (has_construct_function = false)] public ConfigRec (); diff -Nru caribou-0.3.5/libcaribou/row-model.c caribou-0.3.91/libcaribou/row-model.c --- caribou-0.3.5/libcaribou/row-model.c 2011-08-12 07:45:38.000000000 +0000 +++ caribou-0.3.91/libcaribou/row-model.c 2011-09-05 23:45:29.000000000 +0000 @@ -1,4 +1,4 @@ -/* row-model.c generated by valac 0.12.0, the Vala compiler +/* row-model.c generated by valac 0.13.3, the Vala compiler * generated from row-model.vala, do not modify */ @@ -158,12 +158,12 @@ CaribouRowModel* caribou_row_model_construct (GType object_type); CaribouScannableGroup* caribou_scannable_group_construct (GType object_type); void caribou_row_model_add_column (CaribouRowModel* self, CaribouColumnModel* column); -static void _lambda4_ (CaribouKeyModel* k, CaribouRowModel* self); -static void __lambda4__caribou_ikeyboard_object_key_clicked (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); -static void _lambda5_ (CaribouKeyModel* k, CaribouRowModel* self); -static void __lambda5__caribou_ikeyboard_object_key_pressed (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); -static void _lambda6_ (CaribouKeyModel* k, CaribouRowModel* self); -static void __lambda6__caribou_ikeyboard_object_key_released (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); +static void __lambda4_ (CaribouRowModel* self, CaribouKeyModel* k); +static void ___lambda4__caribou_ikeyboard_object_key_clicked (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); +static void __lambda5_ (CaribouRowModel* self, CaribouKeyModel* k); +static void ___lambda5__caribou_ikeyboard_object_key_pressed (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); +static void __lambda6_ (CaribouRowModel* self, CaribouKeyModel* k); +static void ___lambda6__caribou_ikeyboard_object_key_released (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self); CaribouColumnModel** caribou_row_model_get_columns (CaribouRowModel* self, int* result_length1); static CaribouIScannableItem** caribou_row_model_real_get_scan_children (CaribouScannableGroup* base, int* result_length1); CaribouScanGrouping caribou_iscannable_group_get_scan_grouping (CaribouIScannableGroup* self); @@ -180,7 +180,7 @@ CaribouRowModel* caribou_row_model_construct (GType object_type) { CaribouRowModel * self = NULL; - GeeArrayList* _tmp0_ = NULL; + GeeArrayList* _tmp0_; self = (CaribouRowModel*) caribou_scannable_group_construct (object_type); _tmp0_ = gee_array_list_new (CARIBOU_TYPE_COLUMN_MODEL, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL); _g_object_unref0 (self->priv->columns); @@ -194,59 +194,81 @@ } -static void _lambda4_ (CaribouKeyModel* k, CaribouRowModel* self) { +static void __lambda4_ (CaribouRowModel* self, CaribouKeyModel* k) { + CaribouKeyModel* _tmp0_; g_return_if_fail (k != NULL); - g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-clicked", k); + _tmp0_ = k; + g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-clicked", _tmp0_); } -static void __lambda4__caribou_ikeyboard_object_key_clicked (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { - _lambda4_ (key, self); +static void ___lambda4__caribou_ikeyboard_object_key_clicked (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { + __lambda4_ (self, key); } -static void _lambda5_ (CaribouKeyModel* k, CaribouRowModel* self) { +static void __lambda5_ (CaribouRowModel* self, CaribouKeyModel* k) { + CaribouKeyModel* _tmp0_; g_return_if_fail (k != NULL); - g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-pressed", k); + _tmp0_ = k; + g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-pressed", _tmp0_); } -static void __lambda5__caribou_ikeyboard_object_key_pressed (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { - _lambda5_ (key, self); +static void ___lambda5__caribou_ikeyboard_object_key_pressed (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { + __lambda5_ (self, key); } -static void _lambda6_ (CaribouKeyModel* k, CaribouRowModel* self) { +static void __lambda6_ (CaribouRowModel* self, CaribouKeyModel* k) { + CaribouKeyModel* _tmp0_; g_return_if_fail (k != NULL); - g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-released", k); + _tmp0_ = k; + g_signal_emit_by_name ((CaribouIKeyboardObject*) self, "key-released", _tmp0_); } -static void __lambda6__caribou_ikeyboard_object_key_released (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { - _lambda6_ (key, self); +static void ___lambda6__caribou_ikeyboard_object_key_released (CaribouIKeyboardObject* _sender, CaribouKeyModel* key, gpointer self) { + __lambda6_ (self, key); } void caribou_row_model_add_column (CaribouRowModel* self, CaribouColumnModel* column) { + CaribouColumnModel* _tmp0_; + CaribouColumnModel* _tmp1_; + CaribouColumnModel* _tmp2_; + GeeArrayList* _tmp3_; + CaribouColumnModel* _tmp4_; g_return_if_fail (self != NULL); g_return_if_fail (column != NULL); - g_signal_connect_object ((CaribouIKeyboardObject*) column, "key-clicked", (GCallback) __lambda4__caribou_ikeyboard_object_key_clicked, self, 0); - g_signal_connect_object ((CaribouIKeyboardObject*) column, "key-pressed", (GCallback) __lambda5__caribou_ikeyboard_object_key_pressed, self, 0); - g_signal_connect_object ((CaribouIKeyboardObject*) column, "key-released", (GCallback) __lambda6__caribou_ikeyboard_object_key_released, self, 0); - gee_abstract_collection_add ((GeeAbstractCollection*) self->priv->columns, column); + _tmp0_ = column; + g_signal_connect_object ((CaribouIKeyboardObject*) _tmp0_, "key-clicked", (GCallback) ___lambda4__caribou_ikeyboard_object_key_clicked, self, 0); + _tmp1_ = column; + g_signal_connect_object ((CaribouIKeyboardObject*) _tmp1_, "key-pressed", (GCallback) ___lambda5__caribou_ikeyboard_object_key_pressed, self, 0); + _tmp2_ = column; + g_signal_connect_object ((CaribouIKeyboardObject*) _tmp2_, "key-released", (GCallback) ___lambda6__caribou_ikeyboard_object_key_released, self, 0); + _tmp3_ = self->priv->columns; + _tmp4_ = column; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp3_, _tmp4_); } CaribouColumnModel** caribou_row_model_get_columns (CaribouRowModel* self, int* result_length1) { CaribouColumnModel** result = NULL; - gint _tmp0_; - gpointer* _tmp1_ = NULL; - CaribouColumnModel** _tmp2_; + GeeArrayList* _tmp0_; + gint _tmp1_ = 0; + gpointer* _tmp2_ = NULL; + CaribouColumnModel** _tmp3_; + gint _tmp3__length1; g_return_val_if_fail (self != NULL, NULL); - _tmp1_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) self->priv->columns, &_tmp0_); - _tmp2_ = (CaribouColumnModel**) _tmp1_; - *result_length1 = _tmp0_; - result = _tmp2_; + _tmp0_ = self->priv->columns; + _tmp2_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) _tmp0_, &_tmp1_); + _tmp3_ = (CaribouColumnModel**) _tmp2_; + _tmp3__length1 = _tmp1_; + if (result_length1) { + *result_length1 = _tmp3__length1; + } + result = _tmp3_; return result; } @@ -255,25 +277,37 @@ CaribouRowModel * self; CaribouIScannableItem** result = NULL; CaribouScanGrouping _tmp0_; + CaribouScanGrouping _tmp1_; self = (CaribouRowModel*) base; _tmp0_ = caribou_iscannable_group_get_scan_grouping ((CaribouIScannableGroup*) self); - if (_tmp0_ == CARIBOU_SCAN_GROUPING_ROWS) { - gint _tmp1_; - CaribouKeyModel** _tmp2_ = NULL; - CaribouIScannableItem** _tmp3_; - _tmp2_ = caribou_ikeyboard_object_get_keys ((CaribouIKeyboardObject*) self, &_tmp1_); - _tmp3_ = (CaribouIScannableItem**) _tmp2_; - *result_length1 = _tmp1_; - result = _tmp3_; + _tmp1_ = _tmp0_; + if (_tmp1_ == CARIBOU_SCAN_GROUPING_ROWS) { + gint _tmp2_ = 0; + CaribouKeyModel** _tmp3_ = NULL; + CaribouIScannableItem** _tmp4_; + gint _tmp4__length1; + _tmp3_ = caribou_ikeyboard_object_get_keys ((CaribouIKeyboardObject*) self, &_tmp2_); + _tmp4_ = (CaribouIScannableItem**) _tmp3_; + _tmp4__length1 = _tmp2_; + if (result_length1) { + *result_length1 = _tmp4__length1; + } + result = _tmp4_; return result; } else { - gint _tmp4_; - gpointer* _tmp5_ = NULL; - CaribouIScannableItem** _tmp6_; - _tmp5_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) self->priv->columns, &_tmp4_); - _tmp6_ = (CaribouIScannableItem**) _tmp5_; - *result_length1 = _tmp4_; - result = _tmp6_; + GeeArrayList* _tmp5_; + gint _tmp6_ = 0; + gpointer* _tmp7_ = NULL; + CaribouIScannableItem** _tmp8_; + gint _tmp8__length1; + _tmp5_ = self->priv->columns; + _tmp7_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) _tmp5_, &_tmp6_); + _tmp8_ = (CaribouIScannableItem**) _tmp7_; + _tmp8__length1 = _tmp6_; + if (result_length1) { + *result_length1 = _tmp8__length1; + } + result = _tmp8_; return result; } } @@ -282,13 +316,17 @@ static CaribouIKeyboardObject** caribou_row_model_real_get_children (CaribouIKeyboardObject* base, int* result_length1) { CaribouRowModel * self; CaribouIKeyboardObject** result = NULL; - gint _tmp0_; + gint _tmp0_ = 0; CaribouColumnModel** _tmp1_ = NULL; CaribouIKeyboardObject** _tmp2_; + gint _tmp2__length1; self = (CaribouRowModel*) base; _tmp1_ = caribou_row_model_get_columns (self, &_tmp0_); _tmp2_ = (CaribouIKeyboardObject**) _tmp1_; - *result_length1 = _tmp0_; + _tmp2__length1 = _tmp0_; + if (result_length1) { + *result_length1 = _tmp2__length1; + } result = _tmp2_; return result; } @@ -297,16 +335,20 @@ static gboolean caribou_row_model_real_get_scan_stepping (CaribouIScannableItem* base) { gboolean result; CaribouRowModel* self; + gboolean _tmp0_; self = (CaribouRowModel*) base; - result = self->priv->_scan_stepping; + _tmp0_ = self->priv->_scan_stepping; + result = _tmp0_; return result; } static void caribou_row_model_real_set_scan_stepping (CaribouIScannableItem* base, gboolean value) { CaribouRowModel* self; + gboolean _tmp0_; self = (CaribouRowModel*) base; - self->priv->_scan_stepping = value; + _tmp0_ = value; + self->priv->_scan_stepping = _tmp0_; g_object_notify ((GObject *) self, "scan-stepping"); } @@ -314,16 +356,20 @@ static gboolean caribou_row_model_real_get_scan_selected (CaribouIScannableItem* base) { gboolean result; CaribouRowModel* self; + gboolean _tmp0_; self = (CaribouRowModel*) base; - result = self->priv->_scan_selected; + _tmp0_ = self->priv->_scan_selected; + result = _tmp0_; return result; } static void caribou_row_model_real_set_scan_selected (CaribouIScannableItem* base, gboolean value) { CaribouRowModel* self; + gboolean _tmp0_; self = (CaribouRowModel*) base; - self->priv->_scan_selected = value; + _tmp0_ = value; + self->priv->_scan_selected = _tmp0_; g_object_notify ((GObject *) self, "scan-selected"); } @@ -351,7 +397,7 @@ static void caribou_row_model_caribou_ikeyboard_object_interface_init (CaribouIKeyboardObjectIface * iface) { caribou_row_model_caribou_ikeyboard_object_parent_iface = g_type_interface_peek_parent (iface); - iface->get_children = (CaribouIKeyboardObject** (*)(CaribouIKeyboardObject* ,int*)) caribou_row_model_real_get_children; + iface->get_children = (CaribouIKeyboardObject** (*)(CaribouIKeyboardObject*, int*)) caribou_row_model_real_get_children; } diff -Nru caribou-0.3.5/libcaribou/scannable-group.c caribou-0.3.91/libcaribou/scannable-group.c --- caribou-0.3.5/libcaribou/scannable-group.c 2011-08-12 07:45:38.000000000 +0000 +++ caribou-0.3.91/libcaribou/scannable-group.c 2011-09-05 23:45:29.000000000 +0000 @@ -1,4 +1,4 @@ -/* scannable-group.c generated by valac 0.12.0, the Vala compiler +/* scannable-group.c generated by valac 0.13.3, the Vala compiler * generated from scannable-group.vala, do not modify */ @@ -141,14 +141,20 @@ static CaribouIScannableItem** caribou_scannable_group_real_get_step_path (CaribouIScannableGroup* base, int* result_length1) { CaribouScannableGroup * self; CaribouIScannableItem** result = NULL; - gint _tmp0_; - gpointer* _tmp1_ = NULL; - CaribouIScannableItem** _tmp2_; + GeeLinkedList* _tmp0_; + gint _tmp1_ = 0; + gpointer* _tmp2_ = NULL; + CaribouIScannableItem** _tmp3_; + gint _tmp3__length1; self = (CaribouScannableGroup*) base; - _tmp1_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) self->priv->_step_path, &_tmp0_); - _tmp2_ = (CaribouIScannableItem**) _tmp1_; - *result_length1 = _tmp0_; - result = _tmp2_; + _tmp0_ = self->priv->_step_path; + _tmp2_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) _tmp0_, &_tmp1_); + _tmp3_ = (CaribouIScannableItem**) _tmp2_; + _tmp3__length1 = _tmp1_; + if (result_length1) { + *result_length1 = _tmp3__length1; + } + result = _tmp3_; return result; } @@ -156,41 +162,59 @@ static CaribouIScannableItem** caribou_scannable_group_real_get_selected_path (CaribouIScannableGroup* base, int* result_length1) { CaribouScannableGroup * self; CaribouIScannableItem** result = NULL; - gint _tmp0_; - gpointer* _tmp1_ = NULL; - CaribouIScannableItem** _tmp2_; + GeeLinkedList* _tmp0_; + gint _tmp1_ = 0; + gpointer* _tmp2_ = NULL; + CaribouIScannableItem** _tmp3_; + gint _tmp3__length1; self = (CaribouScannableGroup*) base; - _tmp1_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) self->priv->_selected_path, &_tmp0_); - _tmp2_ = (CaribouIScannableItem**) _tmp1_; - *result_length1 = _tmp0_; - result = _tmp2_; + _tmp0_ = self->priv->_selected_path; + _tmp2_ = gee_abstract_collection_to_array ((GeeAbstractCollection*) _tmp0_, &_tmp1_); + _tmp3_ = (CaribouIScannableItem**) _tmp2_; + _tmp3__length1 = _tmp1_; + if (result_length1) { + *result_length1 = _tmp3__length1; + } + result = _tmp3_; return result; } static void caribou_scannable_group_add_to_step_path (CaribouScannableGroup* self, CaribouIScannableItem* item) { - gpointer _tmp0_ = NULL; + GeeLinkedList* _tmp0_; CaribouIScannableItem* _tmp1_; + GeeLinkedList* _tmp2_; + gpointer _tmp3_ = NULL; + CaribouIScannableItem* _tmp4_; g_return_if_fail (self != NULL); g_return_if_fail (item != NULL); - gee_abstract_collection_add ((GeeAbstractCollection*) self->priv->_step_path, item); - _tmp0_ = gee_deque_peek_tail ((GeeDeque*) self->priv->_step_path); - _tmp1_ = (CaribouIScannableItem*) _tmp0_; - g_signal_emit_by_name ((CaribouIScannableGroup*) self, "step-item-changed", _tmp1_); - _g_object_unref0 (_tmp1_); + _tmp0_ = self->priv->_step_path; + _tmp1_ = item; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp0_, _tmp1_); + _tmp2_ = self->priv->_step_path; + _tmp3_ = gee_deque_peek_tail ((GeeDeque*) _tmp2_); + _tmp4_ = (CaribouIScannableItem*) _tmp3_; + g_signal_emit_by_name ((CaribouIScannableGroup*) self, "step-item-changed", _tmp4_); + _g_object_unref0 (_tmp4_); } static void caribou_scannable_group_add_to_selected_path (CaribouScannableGroup* self, CaribouIScannableItem* item) { - gpointer _tmp0_ = NULL; + GeeLinkedList* _tmp0_; CaribouIScannableItem* _tmp1_; + GeeLinkedList* _tmp2_; + gpointer _tmp3_ = NULL; + CaribouIScannableItem* _tmp4_; g_return_if_fail (self != NULL); g_return_if_fail (item != NULL); - gee_abstract_collection_add ((GeeAbstractCollection*) self->priv->_selected_path, item); - _tmp0_ = gee_deque_peek_tail ((GeeDeque*) self->priv->_selected_path); - _tmp1_ = (CaribouIScannableItem*) _tmp0_; - g_signal_emit_by_name ((CaribouIScannableGroup*) self, "selected-item-changed", _tmp1_); - _g_object_unref0 (_tmp1_); + _tmp0_ = self->priv->_selected_path; + _tmp1_ = item; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp0_, _tmp1_); + _tmp2_ = self->priv->_selected_path; + _tmp3_ = gee_deque_peek_tail ((GeeDeque*) _tmp2_); + _tmp4_ = (CaribouIScannableItem*) _tmp3_; + g_signal_emit_by_name ((CaribouIScannableGroup*) self, "selected-item-changed", _tmp4_); + _g_object_unref0 (_tmp4_); } @@ -202,47 +226,65 @@ static CaribouIScannableItem* caribou_scannable_group_get_stepping_child (CaribouScannableGroup* self) { CaribouIScannableItem* result = NULL; gint _tmp0_; - CaribouIScannableItem** _tmp1_ = NULL; - CaribouIScannableItem** _tmp2_; - gint _tmp2__length1; - CaribouIScannableItem* _tmp3_; - CaribouIScannableItem* _tmp4_; + gint _tmp1_ = 0; + CaribouIScannableItem** _tmp2_ = NULL; + CaribouIScannableItem** _tmp3_; + gint _tmp3__length1; + gint _tmp4_; + CaribouIScannableItem* _tmp5_; + CaribouIScannableItem* _tmp6_; + CaribouIScannableItem* _tmp7_; g_return_val_if_fail (self != NULL, NULL); - if (self->priv->_scan_child_index < 0) { + _tmp0_ = self->priv->_scan_child_index; + if (_tmp0_ < 0) { result = NULL; return result; } - _tmp1_ = caribou_scannable_group_get_scan_children (self, &_tmp0_); - _tmp2_ = _tmp1_; - _tmp2__length1 = _tmp0_; - _tmp3_ = _g_object_ref0 (_tmp2_[self->priv->_scan_child_index]); - _tmp4_ = _tmp3_; - _tmp2_ = (_vala_array_free (_tmp2_, _tmp2__length1, (GDestroyNotify) g_object_unref), NULL); - result = _tmp4_; + _tmp2_ = caribou_scannable_group_get_scan_children (self, &_tmp1_); + _tmp3_ = _tmp2_; + _tmp3__length1 = _tmp1_; + _tmp4_ = self->priv->_scan_child_index; + _tmp5_ = _tmp3_[_tmp4_]; + _tmp6_ = _g_object_ref0 (_tmp5_); + _tmp7_ = _tmp6_; + _tmp3_ = (_vala_array_free (_tmp3_, _tmp3__length1, (GDestroyNotify) g_object_unref), NULL); + result = _tmp7_; return result; } static CaribouIScannableItem* caribou_scannable_group_get_single_child (CaribouScannableGroup* self, CaribouIScannableItem* item) { CaribouIScannableItem* result = NULL; + CaribouIScannableItem* _tmp0_; g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (item != NULL, NULL); - if (CARIBOU_IS_SCANNABLE_GROUP (item)) { - CaribouIScannableItem* _tmp0_; - gint _tmp1_; - CaribouIScannableItem** _tmp2_ = NULL; + _tmp0_ = item; + if (CARIBOU_IS_SCANNABLE_GROUP (_tmp0_)) { + CaribouIScannableItem* _tmp1_; + gint _tmp2_ = 0; + CaribouIScannableItem** _tmp3_ = NULL; CaribouIScannableItem** children; gint children_length1; gint _children_size_; - _tmp0_ = item; - _tmp2_ = caribou_scannable_group_get_scan_children (CARIBOU_IS_SCANNABLE_GROUP (_tmp0_) ? ((CaribouScannableGroup*) _tmp0_) : NULL, &_tmp1_); - children = _tmp2_; - children_length1 = _tmp1_; - _children_size_ = _tmp1_; - if (children_length1 == 1) { - CaribouIScannableItem* _tmp3_; - _tmp3_ = _g_object_ref0 (children[0]); - result = _tmp3_; + CaribouIScannableItem** _tmp4_; + gint _tmp4__length1; + _tmp1_ = item; + _tmp3_ = caribou_scannable_group_get_scan_children (CARIBOU_IS_SCANNABLE_GROUP (_tmp1_) ? ((CaribouScannableGroup*) _tmp1_) : NULL, &_tmp2_); + children = _tmp3_; + children_length1 = _tmp2_; + _children_size_ = children_length1; + _tmp4_ = children; + _tmp4__length1 = children_length1; + if (_tmp4__length1 == 1) { + CaribouIScannableItem** _tmp5_; + gint _tmp5__length1; + CaribouIScannableItem* _tmp6_; + CaribouIScannableItem* _tmp7_; + _tmp5_ = children; + _tmp5__length1 = children_length1; + _tmp6_ = _tmp5_[0]; + _tmp7_ = _g_object_ref0 (_tmp6_); + result = _tmp7_; children = (_vala_array_free (children, children_length1, (GDestroyNotify) g_object_unref), NULL); return result; } @@ -257,56 +299,84 @@ CaribouIScannableItem* result = NULL; CaribouIScannableItem* _tmp0_ = NULL; CaribouIScannableItem* step_child; - gpointer _tmp1_ = NULL; + GeeLinkedList* _tmp1_; + gpointer _tmp2_ = NULL; CaribouIScannableItem* selected_leaf; - gpointer _tmp7_ = NULL; + CaribouIScannableItem* _tmp3_; + GeeLinkedList* _tmp20_; + gpointer _tmp21_ = NULL; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = caribou_scannable_group_get_stepping_child (self); step_child = _tmp0_; - _tmp1_ = gee_deque_peek_tail ((GeeDeque*) self->priv->_selected_path); - selected_leaf = (CaribouIScannableItem*) _tmp1_; - if (selected_leaf != NULL) { - CaribouIScannableItem* _tmp2_ = NULL; - CaribouIScannableItem* _tmp3_; - g_assert (CARIBOU_IS_ISCANNABLE_GROUP (selected_leaf)); - _tmp2_ = caribou_iscannable_group_child_select (CARIBOU_ISCANNABLE_GROUP (selected_leaf)); - _tmp3_ = _tmp2_; - caribou_scannable_group_add_to_selected_path (self, _tmp3_); - _g_object_unref0 (_tmp3_); + _tmp1_ = self->priv->_selected_path; + _tmp2_ = gee_deque_peek_tail ((GeeDeque*) _tmp1_); + selected_leaf = (CaribouIScannableItem*) _tmp2_; + _tmp3_ = selected_leaf; + if (_tmp3_ != NULL) { + CaribouIScannableItem* _tmp4_; + CaribouIScannableItem* _tmp5_; + CaribouIScannableItem* _tmp6_ = NULL; + CaribouIScannableItem* _tmp7_; + _tmp4_ = selected_leaf; + g_assert (CARIBOU_IS_ISCANNABLE_GROUP (_tmp4_)); + _tmp5_ = selected_leaf; + _tmp6_ = caribou_iscannable_group_child_select (CARIBOU_ISCANNABLE_GROUP (_tmp5_)); + _tmp7_ = _tmp6_; + caribou_scannable_group_add_to_selected_path (self, _tmp7_); + _g_object_unref0 (_tmp7_); } else { - if (step_child != NULL) { - caribou_iscannable_item_set_scan_selected (step_child, TRUE); - caribou_scannable_group_add_to_selected_path (self, step_child); + CaribouIScannableItem* _tmp8_; + _tmp8_ = step_child; + if (_tmp8_ != NULL) { + CaribouIScannableItem* _tmp9_; + CaribouIScannableItem* _tmp10_; + _tmp9_ = step_child; + caribou_iscannable_item_set_scan_selected (_tmp9_, TRUE); + _tmp10_ = step_child; + caribou_scannable_group_add_to_selected_path (self, _tmp10_); caribou_scannable_group_set_scan_child_index (self, -1); { - CaribouIScannableItem* _tmp4_ = NULL; + CaribouIScannableItem* _tmp11_; + CaribouIScannableItem* _tmp12_ = NULL; CaribouIScannableItem* child; - _tmp4_ = caribou_scannable_group_get_single_child (self, step_child); - child = _tmp4_; + _tmp11_ = step_child; + _tmp12_ = caribou_scannable_group_get_single_child (self, _tmp11_); + child = _tmp12_; { - gboolean _tmp5_; - _tmp5_ = TRUE; + gboolean _tmp13_; + _tmp13_ = TRUE; while (TRUE) { - if (!_tmp5_) { - CaribouIScannableItem* _tmp6_ = NULL; - _tmp6_ = caribou_scannable_group_get_single_child (self, child); + gboolean _tmp14_; + CaribouIScannableItem* _tmp17_; + CaribouIScannableItem* _tmp18_; + CaribouIScannableItem* _tmp19_; + _tmp14_ = _tmp13_; + if (!_tmp14_) { + CaribouIScannableItem* _tmp15_; + CaribouIScannableItem* _tmp16_ = NULL; + _tmp15_ = child; + _tmp16_ = caribou_scannable_group_get_single_child (self, _tmp15_); _g_object_unref0 (child); - child = _tmp6_; + child = _tmp16_; } - _tmp5_ = FALSE; - if (!(child != NULL)) { + _tmp13_ = FALSE; + _tmp17_ = child; + if (!(_tmp17_ != NULL)) { break; } - caribou_iscannable_item_set_scan_selected (child, TRUE); - caribou_scannable_group_add_to_selected_path (self, child); + _tmp18_ = child; + caribou_iscannable_item_set_scan_selected (_tmp18_, TRUE); + _tmp19_ = child; + caribou_scannable_group_add_to_selected_path (self, _tmp19_); } } _g_object_unref0 (child); } } } - _tmp7_ = gee_deque_peek_tail ((GeeDeque*) self->priv->_selected_path); - result = (CaribouIScannableItem*) _tmp7_; + _tmp20_ = self->priv->_selected_path; + _tmp21_ = gee_deque_peek_tail ((GeeDeque*) _tmp20_); + result = (CaribouIScannableItem*) _tmp21_; _g_object_unref0 (selected_leaf); _g_object_unref0 (step_child); return result; @@ -320,29 +390,42 @@ static void caribou_scannable_group_real_scan_reset (CaribouIScannableGroup* base) { CaribouScannableGroup * self; - gint _tmp0_; - CaribouIScannableItem** _tmp1_ = NULL; + GeeLinkedList* _tmp0_; + GeeLinkedList* _tmp1_; + gint _tmp2_ = 0; + CaribouIScannableItem** _tmp3_ = NULL; self = (CaribouScannableGroup*) base; - gee_abstract_collection_clear ((GeeAbstractCollection*) self->priv->_selected_path); - gee_abstract_collection_clear ((GeeAbstractCollection*) self->priv->_step_path); + _tmp0_ = self->priv->_selected_path; + gee_abstract_collection_clear ((GeeAbstractCollection*) _tmp0_); + _tmp1_ = self->priv->_step_path; + gee_abstract_collection_clear ((GeeAbstractCollection*) _tmp1_); caribou_scannable_group_set_scan_child_index (self, -1); - _tmp1_ = caribou_scannable_group_get_scan_children (self, &_tmp0_); + _tmp3_ = caribou_scannable_group_get_scan_children (self, &_tmp2_); { - CaribouIScannableItem** item_collection; - int item_collection_length1; - int item_it; - item_collection = _tmp1_; - item_collection_length1 = _tmp0_; - for (item_it = 0; item_it < _tmp0_; item_it = item_it + 1) { - CaribouIScannableItem* _tmp2_; - CaribouIScannableItem* item; - _tmp2_ = _g_object_ref0 (item_collection[item_it]); - item = _tmp2_; + CaribouIScannableItem** item_collection = NULL; + gint item_collection_length1 = 0; + gint _item_collection_size_ = 0; + gint item_it = 0; + item_collection = _tmp3_; + item_collection_length1 = _tmp2_; + for (item_it = 0; item_it < _tmp2_; item_it = item_it + 1) { + CaribouIScannableItem* _tmp4_; + CaribouIScannableItem* item = NULL; + _tmp4_ = _g_object_ref0 (item_collection[item_it]); + item = _tmp4_; { - caribou_iscannable_item_set_scan_stepping (item, FALSE); - caribou_iscannable_item_set_scan_selected (item, FALSE); - if (CARIBOU_IS_ISCANNABLE_GROUP (item)) { - caribou_iscannable_group_scan_reset (CARIBOU_ISCANNABLE_GROUP (item)); + CaribouIScannableItem* _tmp5_; + CaribouIScannableItem* _tmp6_; + CaribouIScannableItem* _tmp7_; + _tmp5_ = item; + caribou_iscannable_item_set_scan_stepping (_tmp5_, FALSE); + _tmp6_ = item; + caribou_iscannable_item_set_scan_selected (_tmp6_, FALSE); + _tmp7_ = item; + if (CARIBOU_IS_ISCANNABLE_GROUP (_tmp7_)) { + CaribouIScannableItem* _tmp8_; + _tmp8_ = item; + caribou_iscannable_group_scan_reset (CARIBOU_ISCANNABLE_GROUP (_tmp8_)); } _g_object_unref0 (item); } @@ -358,75 +441,133 @@ CaribouIScannableItem* result = NULL; CaribouIScannableItem* _tmp0_ = NULL; CaribouIScannableItem* step_child; - gpointer _tmp1_ = NULL; + GeeLinkedList* _tmp1_; + gpointer _tmp2_ = NULL; CaribouIScannableItem* selected_leaf; - gpointer _tmp8_ = NULL; + CaribouIScannableItem* _tmp3_; + GeeLinkedList* _tmp34_; + gpointer _tmp35_ = NULL; self = (CaribouScannableGroup*) base; _tmp0_ = caribou_scannable_group_get_stepping_child (self); step_child = _tmp0_; - _tmp1_ = gee_deque_peek_tail ((GeeDeque*) self->priv->_selected_path); - selected_leaf = (CaribouIScannableItem*) _tmp1_; - if (selected_leaf != NULL) { - g_assert (step_child == NULL); - if (CARIBOU_IS_ISCANNABLE_GROUP (selected_leaf)) { - CaribouIScannableItem* _tmp2_ = NULL; - _tmp2_ = caribou_iscannable_group_child_step (CARIBOU_ISCANNABLE_GROUP (selected_leaf), cycles); + _tmp1_ = self->priv->_selected_path; + _tmp2_ = gee_deque_peek_tail ((GeeDeque*) _tmp1_); + selected_leaf = (CaribouIScannableItem*) _tmp2_; + _tmp3_ = selected_leaf; + if (_tmp3_ != NULL) { + CaribouIScannableItem* _tmp4_; + CaribouIScannableItem* _tmp5_; + CaribouIScannableItem* _tmp9_; + _tmp4_ = step_child; + g_assert (_tmp4_ == NULL); + _tmp5_ = selected_leaf; + if (CARIBOU_IS_ISCANNABLE_GROUP (_tmp5_)) { + CaribouIScannableItem* _tmp6_; + gint _tmp7_; + CaribouIScannableItem* _tmp8_ = NULL; + _tmp6_ = selected_leaf; + _tmp7_ = cycles; + _tmp8_ = caribou_iscannable_group_child_step (CARIBOU_ISCANNABLE_GROUP (_tmp6_), _tmp7_); _g_object_unref0 (step_child); - step_child = _tmp2_; + step_child = _tmp8_; } - if (step_child != NULL) { - caribou_scannable_group_add_to_step_path (self, step_child); + _tmp9_ = step_child; + if (_tmp9_ != NULL) { + CaribouIScannableItem* _tmp10_; + _tmp10_ = step_child; + caribou_scannable_group_add_to_step_path (self, _tmp10_); } else { - gee_abstract_collection_clear ((GeeAbstractCollection*) self->priv->_step_path); + GeeLinkedList* _tmp11_; + _tmp11_ = self->priv->_step_path; + gee_abstract_collection_clear ((GeeAbstractCollection*) _tmp11_); } } else { - gboolean _tmp3_ = FALSE; - if (step_child != NULL) { - _tmp3_ = TRUE; + gboolean _tmp12_ = FALSE; + CaribouIScannableItem* _tmp13_; + gboolean _tmp15_; + _tmp13_ = step_child; + if (_tmp13_ != NULL) { + _tmp12_ = TRUE; } else { - _tmp3_ = self->priv->_scan_child_index == (-1); + gint _tmp14_; + _tmp14_ = self->priv->_scan_child_index; + _tmp12_ = _tmp14_ == (-1); } - if (_tmp3_) { - gint _tmp4_; - CaribouIScannableItem** _tmp5_ = NULL; + _tmp15_ = _tmp12_; + if (_tmp15_) { + CaribouIScannableItem* _tmp16_; + gint _tmp17_ = 0; + CaribouIScannableItem** _tmp18_ = NULL; CaribouIScannableItem** children; gint children_length1; gint _children_size_; - g_assert (selected_leaf == NULL); - _tmp5_ = caribou_scannable_group_get_scan_children (self, &_tmp4_); - children = _tmp5_; - children_length1 = _tmp4_; - _children_size_ = _tmp4_; - if (self->priv->_scan_child_index == (-1)) { + gint _tmp19_; + gint _tmp20_; + CaribouIScannableItem** _tmp21_; + gint _tmp21__length1; + gint _tmp23_; + gint _tmp24_; + _tmp16_ = selected_leaf; + g_assert (_tmp16_ == NULL); + _tmp18_ = caribou_scannable_group_get_scan_children (self, &_tmp17_); + children = _tmp18_; + children_length1 = _tmp17_; + _children_size_ = children_length1; + _tmp19_ = self->priv->_scan_child_index; + if (_tmp19_ == (-1)) { self->priv->_cycle_count = 0; } - if (self->priv->_scan_child_index == (children_length1 - 1)) { + _tmp20_ = self->priv->_scan_child_index; + _tmp21_ = children; + _tmp21__length1 = children_length1; + if (_tmp20_ == (_tmp21__length1 - 1)) { + gint _tmp22_; caribou_scannable_group_set_scan_child_index (self, -1); - self->priv->_cycle_count++; + _tmp22_ = self->priv->_cycle_count; + self->priv->_cycle_count = _tmp22_ + 1; } - if (self->priv->_cycle_count < cycles) { - gint _tmp6_; - CaribouIScannableItem* _tmp7_; - if (step_child != NULL) { - caribou_iscannable_item_set_scan_stepping (step_child, FALSE); + _tmp23_ = self->priv->_cycle_count; + _tmp24_ = cycles; + if (_tmp23_ < _tmp24_) { + CaribouIScannableItem* _tmp25_; + CaribouIScannableItem** _tmp27_; + gint _tmp27__length1; + gint _tmp28_; + CaribouIScannableItem* _tmp29_; + CaribouIScannableItem* _tmp30_; + CaribouIScannableItem* _tmp31_; + CaribouIScannableItem* _tmp32_; + _tmp25_ = step_child; + if (_tmp25_ != NULL) { + CaribouIScannableItem* _tmp26_; + _tmp26_ = step_child; + caribou_iscannable_item_set_scan_stepping (_tmp26_, FALSE); } - _tmp6_ = self->priv->_scan_child_index + 1; - caribou_scannable_group_set_scan_child_index (self, _tmp6_); - _tmp7_ = _g_object_ref0 (children[_tmp6_]); + _tmp27_ = children; + _tmp27__length1 = children_length1; + _tmp28_ = self->priv->_scan_child_index; + caribou_scannable_group_set_scan_child_index (self, _tmp28_ + 1); + _tmp29_ = _tmp27_[_tmp28_ + 1]; + _tmp30_ = _g_object_ref0 (_tmp29_); _g_object_unref0 (step_child); - step_child = _tmp7_; - caribou_iscannable_item_set_scan_stepping (step_child, TRUE); - caribou_scannable_group_add_to_step_path (self, step_child); + step_child = _tmp30_; + _tmp31_ = step_child; + caribou_iscannable_item_set_scan_stepping (_tmp31_, TRUE); + _tmp32_ = step_child; + caribou_scannable_group_add_to_step_path (self, _tmp32_); } else { - gee_abstract_collection_clear ((GeeAbstractCollection*) self->priv->_step_path); + GeeLinkedList* _tmp33_; + _tmp33_ = self->priv->_step_path; + gee_abstract_collection_clear ((GeeAbstractCollection*) _tmp33_); } children = (_vala_array_free (children, children_length1, (GDestroyNotify) g_object_unref), NULL); } else { g_warn_if_reached (); } } - _tmp8_ = gee_deque_peek_tail ((GeeDeque*) self->priv->_step_path); - result = (CaribouIScannableItem*) _tmp8_; + _tmp34_ = self->priv->_step_path; + _tmp35_ = gee_deque_peek_tail ((GeeDeque*) _tmp34_); + result = (CaribouIScannableItem*) _tmp35_; _g_object_unref0 (selected_leaf); _g_object_unref0 (step_child); return result; @@ -443,33 +584,44 @@ static CaribouScanGrouping caribou_scannable_group_real_get_scan_grouping (CaribouIScannableGroup* base) { CaribouScanGrouping result; CaribouScannableGroup* self; + CaribouScanGrouping _tmp0_; self = (CaribouScannableGroup*) base; - result = self->priv->_scan_grouping; + _tmp0_ = self->priv->_scan_grouping; + result = _tmp0_; return result; } static void caribou_scannable_group_real_set_scan_grouping (CaribouIScannableGroup* base, CaribouScanGrouping value) { CaribouScannableGroup* self; - gint _tmp0_; - CaribouIScannableItem** _tmp1_ = NULL; + CaribouScanGrouping _tmp0_; + gint _tmp1_ = 0; + CaribouIScannableItem** _tmp2_ = NULL; self = (CaribouScannableGroup*) base; - self->priv->_scan_grouping = value; - _tmp1_ = caribou_scannable_group_get_scan_children (self, &_tmp0_); + _tmp0_ = value; + self->priv->_scan_grouping = _tmp0_; + _tmp2_ = caribou_scannable_group_get_scan_children (self, &_tmp1_); { - CaribouIScannableItem** item_collection; - int item_collection_length1; - int item_it; - item_collection = _tmp1_; - item_collection_length1 = _tmp0_; - for (item_it = 0; item_it < _tmp0_; item_it = item_it + 1) { - CaribouIScannableItem* _tmp2_; - CaribouIScannableItem* item; - _tmp2_ = _g_object_ref0 (item_collection[item_it]); - item = _tmp2_; + CaribouIScannableItem** item_collection = NULL; + gint item_collection_length1 = 0; + gint _item_collection_size_ = 0; + gint item_it = 0; + item_collection = _tmp2_; + item_collection_length1 = _tmp1_; + for (item_it = 0; item_it < _tmp1_; item_it = item_it + 1) { + CaribouIScannableItem* _tmp3_; + CaribouIScannableItem* item = NULL; + _tmp3_ = _g_object_ref0 (item_collection[item_it]); + item = _tmp3_; { - if (CARIBOU_IS_ISCANNABLE_GROUP (item)) { - caribou_iscannable_group_set_scan_grouping (CARIBOU_ISCANNABLE_GROUP (item), value); + CaribouIScannableItem* _tmp4_; + _tmp4_ = item; + if (CARIBOU_IS_ISCANNABLE_GROUP (_tmp4_)) { + CaribouIScannableItem* _tmp5_; + CaribouScanGrouping _tmp6_; + _tmp5_ = item; + _tmp6_ = value; + caribou_iscannable_group_set_scan_grouping (CARIBOU_ISCANNABLE_GROUP (_tmp5_), _tmp6_); } _g_object_unref0 (item); } @@ -482,15 +634,19 @@ static gint caribou_scannable_group_get_scan_child_index (CaribouScannableGroup* self) { gint result; + gint _tmp0_; g_return_val_if_fail (self != NULL, 0); - result = self->priv->_scan_child_index; + _tmp0_ = self->priv->_scan_child_index; + result = _tmp0_; return result; } static void caribou_scannable_group_set_scan_child_index (CaribouScannableGroup* self, gint value) { + gint _tmp0_; g_return_if_fail (self != NULL); - self->priv->_scan_child_index = value; + _tmp0_ = value; + self->priv->_scan_child_index = _tmp0_; } @@ -498,8 +654,8 @@ GObject * obj; GObjectClass * parent_class; CaribouScannableGroup * self; - GeeLinkedList* _tmp0_ = NULL; - GeeLinkedList* _tmp1_ = NULL; + GeeLinkedList* _tmp0_; + GeeLinkedList* _tmp1_; parent_class = G_OBJECT_CLASS (caribou_scannable_group_parent_class); obj = parent_class->constructor (type, n_construct_properties, construct_properties); self = CARIBOU_SCANNABLE_GROUP (obj); @@ -528,12 +684,12 @@ static void caribou_scannable_group_caribou_iscannable_group_interface_init (CaribouIScannableGroupIface * iface) { caribou_scannable_group_caribou_iscannable_group_parent_iface = g_type_interface_peek_parent (iface); - iface->get_scan_children = (CaribouIScannableItem** (*)(CaribouIScannableGroup* ,int*)) caribou_scannable_group_get_scan_children; - iface->get_step_path = (CaribouIScannableItem** (*)(CaribouIScannableGroup* ,int*)) caribou_scannable_group_real_get_step_path; - iface->get_selected_path = (CaribouIScannableItem** (*)(CaribouIScannableGroup* ,int*)) caribou_scannable_group_real_get_selected_path; + iface->get_scan_children = (CaribouIScannableItem** (*)(CaribouIScannableGroup*, int*)) caribou_scannable_group_get_scan_children; + iface->get_step_path = (CaribouIScannableItem** (*)(CaribouIScannableGroup*, int*)) caribou_scannable_group_real_get_step_path; + iface->get_selected_path = (CaribouIScannableItem** (*)(CaribouIScannableGroup*, int*)) caribou_scannable_group_real_get_selected_path; iface->child_select = (CaribouIScannableItem* (*)(CaribouIScannableGroup*)) caribou_scannable_group_child_select; iface->scan_reset = (void (*)(CaribouIScannableGroup*)) caribou_scannable_group_real_scan_reset; - iface->child_step = (CaribouIScannableItem* (*)(CaribouIScannableGroup* ,gint)) caribou_scannable_group_real_child_step; + iface->child_step = (CaribouIScannableItem* (*)(CaribouIScannableGroup*, gint)) caribou_scannable_group_real_child_step; iface->get_scan_grouping = caribou_scannable_group_real_get_scan_grouping; iface->set_scan_grouping = caribou_scannable_group_real_set_scan_grouping; } diff -Nru caribou-0.3.5/libcaribou/scanner.c caribou-0.3.91/libcaribou/scanner.c --- caribou-0.3.5/libcaribou/scanner.c 2011-08-12 07:45:38.000000000 +0000 +++ caribou-0.3.91/libcaribou/scanner.c 2011-09-05 23:45:29.000000000 +0000 @@ -1,4 +1,4 @@ -/* scanner.c generated by valac 0.12.0, the Vala compiler +/* scanner.c generated by valac 0.13.3, the Vala compiler * generated from scanner.vala, do not modify */ @@ -232,12 +232,12 @@ static void block2_data_unref (Block2Data* _data2_); void caribou_xadapter_register_key_func (CaribouXAdapter* self, guint keyval, CaribouXAdapterKeyButtonCallback func, void* func_target); static void _caribou_scanner_switch_pressed_caribou_xadapter_key_button_callback (guint keybuttoncode, gboolean pressed, gpointer self); -static void _lambda12_ (Block2Data* _data2_); -static void __lambda12__caribou_scanner_unconfigure_switch_func (gpointer self); +static void ___lambda12_ (Block2Data* _data2_); +static void ____lambda12__caribou_scanner_unconfigure_switch_func (gpointer self); gint caribou_scanner_get_mouse_button (CaribouScanner* self); void caribou_xadapter_register_button_func (CaribouXAdapter* self, guint button, CaribouXAdapterKeyButtonCallback func, void* func_target); -static void _lambda13_ (Block1Data* _data1_); -static void __lambda13__caribou_scanner_unconfigure_switch_func (gpointer self); +static void ____lambda13_ (Block1Data* _data1_); +static void _____lambda13__caribou_scanner_unconfigure_switch_func (gpointer self); CaribouScanner* caribou_scanner_new (void); CaribouScanner* caribou_scanner_construct (GType object_type); gboolean caribou_scanner_get_bind_settings (CaribouScanner* self); @@ -262,7 +262,7 @@ static void caribou_scanner_do_bind_settings (CaribouScanner* self) { - GSettings* _tmp0_ = NULL; + GSettings* _tmp0_; GSettings* caribou_settings; gchar* _tmp1_; gchar* _tmp2_; @@ -277,6 +277,8 @@ gchar** settings; gint settings_length1; gint _settings_size_; + gchar** _tmp11_; + gint _tmp11__length1; g_return_if_fail (self != NULL); _tmp0_ = g_settings_new ("org.gnome.caribou"); caribou_settings = _tmp0_; @@ -301,20 +303,29 @@ _tmp10_[8] = _tmp9_; settings = _tmp10_; settings_length1 = 9; - _settings_size_ = 9; + _settings_size_ = settings_length1; + _tmp11_ = settings; + _tmp11__length1 = settings_length1; { - gchar** setting_collection; - int setting_collection_length1; - int setting_it; - setting_collection = settings; - setting_collection_length1 = settings_length1; - for (setting_it = 0; setting_it < settings_length1; setting_it = setting_it + 1) { - gchar* _tmp11_; - gchar* setting; - _tmp11_ = g_strdup (setting_collection[setting_it]); - setting = _tmp11_; + gchar** setting_collection = NULL; + gint setting_collection_length1 = 0; + gint _setting_collection_size_ = 0; + gint setting_it = 0; + setting_collection = _tmp11_; + setting_collection_length1 = _tmp11__length1; + for (setting_it = 0; setting_it < _tmp11__length1; setting_it = setting_it + 1) { + gchar* _tmp12_; + gchar* setting = NULL; + _tmp12_ = g_strdup (setting_collection[setting_it]); + setting = _tmp12_; { - g_settings_bind (caribou_settings, setting, self, setting, G_SETTINGS_BIND_GET); + GSettings* _tmp13_; + const gchar* _tmp14_; + const gchar* _tmp15_; + _tmp13_ = caribou_settings; + _tmp14_ = setting; + _tmp15_ = setting; + g_settings_bind (_tmp13_, _tmp14_, self, _tmp15_, G_SETTINGS_BIND_GET); _g_free0 (setting); } } @@ -326,17 +337,21 @@ static gboolean caribou_scanner_select (CaribouScanner* self) { gboolean result = FALSE; - CaribouIScannableItem* _tmp0_ = NULL; + CaribouIScannableGroup* _tmp0_; + CaribouIScannableItem* _tmp1_ = NULL; CaribouIScannableItem* item; + CaribouIScannableItem* _tmp2_; g_return_val_if_fail (self != NULL, FALSE); - _tmp0_ = caribou_iscannable_group_child_select (self->priv->root_group); - item = _tmp0_; - if (CARIBOU_IS_ISCANNABLE_GROUP (item)) { - CaribouIScannableItem* _tmp1_ = NULL; - CaribouIScannableItem* _tmp2_; - _tmp1_ = caribou_scanner_step (self); - _tmp2_ = _tmp1_; - _g_object_unref0 (_tmp2_); + _tmp0_ = self->priv->root_group; + _tmp1_ = caribou_iscannable_group_child_select (_tmp0_); + item = _tmp1_; + _tmp2_ = item; + if (CARIBOU_IS_ISCANNABLE_GROUP (_tmp2_)) { + CaribouIScannableItem* _tmp3_ = NULL; + CaribouIScannableItem* _tmp4_; + _tmp3_ = caribou_scanner_step (self); + _tmp4_ = _tmp3_; + _g_object_unref0 (_tmp4_); result = TRUE; _g_object_unref0 (item); return result; @@ -351,35 +366,45 @@ static void caribou_scanner_switch_pressed (CaribouScanner* self, guint code, gboolean pressed) { + gboolean _tmp0_; g_return_if_fail (self != NULL); - if (pressed) { - if (!self->priv->started) { - CaribouIScannableItem* _tmp0_ = NULL; - CaribouIScannableItem* _tmp1_; - _tmp0_ = caribou_scanner_step (self); - _tmp1_ = _tmp0_; - _g_object_unref0 (_tmp1_); - caribou_scanner_start (self); - return; - } - caribou_scanner_stop (self); - if (self->priv->_inverse_scanning) { + _tmp0_ = pressed; + if (_tmp0_) { + gboolean _tmp1_; + gboolean _tmp4_; + _tmp1_ = self->priv->started; + if (!_tmp1_) { CaribouIScannableItem* _tmp2_ = NULL; CaribouIScannableItem* _tmp3_; _tmp2_ = caribou_scanner_step (self); _tmp3_ = _tmp2_; _g_object_unref0 (_tmp3_); caribou_scanner_start (self); + return; + } + caribou_scanner_stop (self); + _tmp4_ = self->priv->_inverse_scanning; + if (_tmp4_) { + CaribouIScannableItem* _tmp5_ = NULL; + CaribouIScannableItem* _tmp6_; + _tmp5_ = caribou_scanner_step (self); + _tmp6_ = _tmp5_; + _g_object_unref0 (_tmp6_); + caribou_scanner_start (self); } else { - gboolean _tmp4_ = FALSE; - gboolean _tmp5_; - _tmp5_ = caribou_scanner_select (self); - if (_tmp5_) { - _tmp4_ = TRUE; + gboolean _tmp7_ = FALSE; + gboolean _tmp8_ = FALSE; + gboolean _tmp10_; + _tmp8_ = caribou_scanner_select (self); + if (_tmp8_) { + _tmp7_ = TRUE; } else { - _tmp4_ = self->priv->_autorestart; + gboolean _tmp9_; + _tmp9_ = self->priv->_autorestart; + _tmp7_ = _tmp9_; } - if (_tmp4_) { + _tmp10_ = _tmp7_; + if (_tmp10_) { caribou_scanner_start (self); } } @@ -403,47 +428,72 @@ void caribou_scanner_set_keyboard (CaribouScanner* self, CaribouKeyboardModel* keyboard) { - const gchar* _tmp0_ = NULL; - CaribouGroupModel* _tmp1_ = NULL; + CaribouKeyboardModel* _tmp0_; + CaribouKeyboardModel* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + CaribouGroupModel* _tmp4_ = NULL; CaribouGroupModel* group; - CaribouKeyboardModel* _tmp2_; - const gchar* _tmp3_ = NULL; - CaribouLevelModel* _tmp4_ = NULL; - CaribouLevelModel* _tmp5_; - gint _tmp6_; - gchar** _tmp7_ = NULL; + CaribouKeyboardModel* _tmp5_; + CaribouKeyboardModel* _tmp6_; + CaribouKeyboardModel* _tmp7_; + CaribouGroupModel* _tmp8_; + CaribouGroupModel* _tmp9_; + const gchar* _tmp10_; + const gchar* _tmp11_; + CaribouLevelModel* _tmp12_ = NULL; + CaribouLevelModel* _tmp13_; + CaribouKeyboardModel* _tmp14_; + gint _tmp15_ = 0; + gchar** _tmp16_ = NULL; g_return_if_fail (self != NULL); g_return_if_fail (keyboard != NULL); - _tmp0_ = caribou_keyboard_model_get_active_group (keyboard); - _tmp1_ = caribou_keyboard_model_get_group (keyboard, _tmp0_); - group = _tmp1_; - _tmp2_ = _g_object_ref0 (keyboard); + _tmp0_ = keyboard; + _tmp1_ = keyboard; + _tmp2_ = caribou_keyboard_model_get_active_group (_tmp1_); + _tmp3_ = _tmp2_; + _tmp4_ = caribou_keyboard_model_get_group (_tmp0_, _tmp3_); + group = _tmp4_; + _tmp5_ = keyboard; + _tmp6_ = _g_object_ref0 (_tmp5_); _g_object_unref0 (self->priv->keyboard); - self->priv->keyboard = _tmp2_; - g_signal_connect_object ((GObject*) self->priv->keyboard, "notify::active-group", (GCallback) _caribou_scanner_on_group_changed_g_object_notify, self, 0); - _tmp3_ = caribou_group_model_get_active_level (group); - _tmp4_ = caribou_group_model_get_level (group, _tmp3_); - _tmp5_ = _tmp4_; - caribou_scanner_set_active_level (self, _tmp5_); - _g_object_unref0 (_tmp5_); - _tmp7_ = caribou_keyboard_model_get_groups (keyboard, &_tmp6_); + self->priv->keyboard = _tmp6_; + _tmp7_ = self->priv->keyboard; + g_signal_connect_object ((GObject*) _tmp7_, "notify::active-group", (GCallback) _caribou_scanner_on_group_changed_g_object_notify, self, 0); + _tmp8_ = group; + _tmp9_ = group; + _tmp10_ = caribou_group_model_get_active_level (_tmp9_); + _tmp11_ = _tmp10_; + _tmp12_ = caribou_group_model_get_level (_tmp8_, _tmp11_); + _tmp13_ = _tmp12_; + caribou_scanner_set_active_level (self, _tmp13_); + _g_object_unref0 (_tmp13_); + _tmp14_ = keyboard; + _tmp16_ = caribou_keyboard_model_get_groups (_tmp14_, &_tmp15_); { - gchar** group_name_collection; - int group_name_collection_length1; - int group_name_it; - group_name_collection = _tmp7_; - group_name_collection_length1 = _tmp6_; - for (group_name_it = 0; group_name_it < _tmp6_; group_name_it = group_name_it + 1) { - gchar* _tmp8_; - gchar* group_name; - _tmp8_ = g_strdup (group_name_collection[group_name_it]); - group_name = _tmp8_; + gchar** group_name_collection = NULL; + gint group_name_collection_length1 = 0; + gint _group_name_collection_size_ = 0; + gint group_name_it = 0; + group_name_collection = _tmp16_; + group_name_collection_length1 = _tmp15_; + for (group_name_it = 0; group_name_it < _tmp15_; group_name_it = group_name_it + 1) { + gchar* _tmp17_; + gchar* group_name = NULL; + _tmp17_ = g_strdup (group_name_collection[group_name_it]); + group_name = _tmp17_; { - CaribouGroupModel* _tmp9_ = NULL; - _tmp9_ = caribou_keyboard_model_get_group (keyboard, group_name); + CaribouKeyboardModel* _tmp18_; + const gchar* _tmp19_; + CaribouGroupModel* _tmp20_ = NULL; + CaribouGroupModel* _tmp21_; + _tmp18_ = keyboard; + _tmp19_ = group_name; + _tmp20_ = caribou_keyboard_model_get_group (_tmp18_, _tmp19_); _g_object_unref0 (group); - group = _tmp9_; - g_signal_connect_object ((GObject*) group, "notify::active-level", (GCallback) _caribou_scanner_on_level_changed_g_object_notify, self, 0); + group = _tmp20_; + _tmp21_ = group; + g_signal_connect_object ((GObject*) _tmp21_, "notify::active-level", (GCallback) _caribou_scanner_on_level_changed_g_object_notify, self, 0); _g_free0 (group_name); } } @@ -454,62 +504,84 @@ static void caribou_scanner_on_level_changed (CaribouScanner* self, GObject* obj, GParamSpec* prop) { - CaribouGroupModel* _tmp0_; + GObject* _tmp0_; + CaribouGroupModel* _tmp1_; CaribouGroupModel* group; - const gchar* _tmp1_ = NULL; - CaribouLevelModel* _tmp2_ = NULL; - CaribouLevelModel* _tmp3_; + const gchar* _tmp2_; + const gchar* _tmp3_; + CaribouLevelModel* _tmp4_ = NULL; + CaribouLevelModel* _tmp5_; g_return_if_fail (self != NULL); g_return_if_fail (obj != NULL); g_return_if_fail (prop != NULL); - _tmp0_ = _g_object_ref0 (CARIBOU_GROUP_MODEL (obj)); - group = _tmp0_; - _tmp1_ = caribou_group_model_get_active_level (group); - _tmp2_ = caribou_group_model_get_level (group, _tmp1_); + _tmp0_ = obj; + _tmp1_ = _g_object_ref0 (CARIBOU_GROUP_MODEL (_tmp0_)); + group = _tmp1_; + _tmp2_ = caribou_group_model_get_active_level (group); _tmp3_ = _tmp2_; - caribou_scanner_set_active_level (self, _tmp3_); - _g_object_unref0 (_tmp3_); + _tmp4_ = caribou_group_model_get_level (group, _tmp3_); + _tmp5_ = _tmp4_; + caribou_scanner_set_active_level (self, _tmp5_); + _g_object_unref0 (_tmp5_); _g_object_unref0 (group); } static void caribou_scanner_on_group_changed (CaribouScanner* self, GObject* obj, GParamSpec* prop) { - const gchar* _tmp0_ = NULL; - CaribouGroupModel* _tmp1_ = NULL; + CaribouKeyboardModel* _tmp0_; + CaribouKeyboardModel* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + CaribouGroupModel* _tmp4_ = NULL; CaribouGroupModel* group; - const gchar* _tmp2_ = NULL; - CaribouLevelModel* _tmp3_ = NULL; - CaribouLevelModel* _tmp4_; + const gchar* _tmp5_; + const gchar* _tmp6_; + CaribouLevelModel* _tmp7_ = NULL; + CaribouLevelModel* _tmp8_; g_return_if_fail (self != NULL); g_return_if_fail (obj != NULL); g_return_if_fail (prop != NULL); - _tmp0_ = caribou_keyboard_model_get_active_group (self->priv->keyboard); - _tmp1_ = caribou_keyboard_model_get_group (self->priv->keyboard, _tmp0_); - group = _tmp1_; - _tmp2_ = caribou_group_model_get_active_level (group); - _tmp3_ = caribou_group_model_get_level (group, _tmp2_); - _tmp4_ = _tmp3_; - caribou_scanner_set_active_level (self, _tmp4_); - _g_object_unref0 (_tmp4_); + _tmp0_ = self->priv->keyboard; + _tmp1_ = self->priv->keyboard; + _tmp2_ = caribou_keyboard_model_get_active_group (_tmp1_); + _tmp3_ = _tmp2_; + _tmp4_ = caribou_keyboard_model_get_group (_tmp0_, _tmp3_); + group = _tmp4_; + _tmp5_ = caribou_group_model_get_active_level (group); + _tmp6_ = _tmp5_; + _tmp7_ = caribou_group_model_get_level (group, _tmp6_); + _tmp8_ = _tmp7_; + caribou_scanner_set_active_level (self, _tmp8_); + _g_object_unref0 (_tmp8_); _g_object_unref0 (group); } static void caribou_scanner_set_active_level (CaribouScanner* self, CaribouLevelModel* level) { - CaribouIScannableGroup* _tmp0_; + CaribouLevelModel* _tmp0_; + CaribouIScannableGroup* _tmp1_; + CaribouIScannableGroup* _tmp2_; + CaribouScanGrouping _tmp3_; g_return_if_fail (self != NULL); g_return_if_fail (level != NULL); - _tmp0_ = _g_object_ref0 (CARIBOU_ISCANNABLE_GROUP (level)); + _tmp0_ = level; + _tmp1_ = _g_object_ref0 (CARIBOU_ISCANNABLE_GROUP (_tmp0_)); _g_object_unref0 (self->priv->root_group); - self->priv->root_group = _tmp0_; - caribou_iscannable_group_set_scan_grouping (self->priv->root_group, self->priv->_scan_grouping); + self->priv->root_group = _tmp1_; + _tmp2_ = self->priv->root_group; + _tmp3_ = self->priv->_scan_grouping; + caribou_iscannable_group_set_scan_grouping (_tmp2_, _tmp3_); } void caribou_scanner_reset (CaribouScanner* self) { + CaribouIScannableGroup* _tmp0_; g_return_if_fail (self != NULL); - if (self->priv->root_group != NULL) { - caribou_iscannable_group_scan_reset (self->priv->root_group); + _tmp0_ = self->priv->root_group; + if (_tmp0_ != NULL) { + CaribouIScannableGroup* _tmp1_; + _tmp1_ = self->priv->root_group; + caribou_iscannable_group_scan_reset (_tmp1_); } } @@ -535,30 +607,44 @@ static void caribou_scanner_start (CaribouScanner* self) { gboolean _tmp0_ = FALSE; - guint _tmp1_; + gboolean _tmp1_; + gboolean _tmp3_; + gdouble _tmp4_; + guint _tmp5_ = 0U; g_return_if_fail (self != NULL); - if (self->priv->started) { + _tmp1_ = self->priv->started; + if (_tmp1_) { _tmp0_ = TRUE; } else { - _tmp0_ = self->priv->root_group == NULL; + CaribouIScannableGroup* _tmp2_; + _tmp2_ = self->priv->root_group; + _tmp0_ = _tmp2_ == NULL; } - if (_tmp0_) { + _tmp3_ = _tmp0_; + if (_tmp3_) { return; } self->priv->started = TRUE; - _tmp1_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) ((gint) (self->priv->_step_time * 1000)), _caribou_scanner_scan_gsource_func, g_object_ref (self), g_object_unref); - self->priv->scan_tid = _tmp1_; + _tmp4_ = self->priv->_step_time; + _tmp5_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) ((gint) (_tmp4_ * 1000)), _caribou_scanner_scan_gsource_func, g_object_ref (self), g_object_unref); + self->priv->scan_tid = _tmp5_; } static void caribou_scanner_stop (CaribouScanner* self) { + gboolean _tmp0_; + guint _tmp1_; g_return_if_fail (self != NULL); - if (!self->priv->started) { + _tmp0_ = self->priv->started; + if (!_tmp0_) { return; } self->priv->started = FALSE; - if (self->priv->scan_tid != 0) { - g_source_remove (self->priv->scan_tid); + _tmp1_ = self->priv->scan_tid; + if (_tmp1_ != ((guint) 0)) { + guint _tmp2_; + _tmp2_ = self->priv->scan_tid; + g_source_remove (_tmp2_); } self->priv->scan_tid = (guint) 0; } @@ -566,12 +652,18 @@ static CaribouIScannableItem* caribou_scanner_step (CaribouScanner* self) { CaribouIScannableItem* result = NULL; - CaribouIScannableItem* _tmp0_ = NULL; + CaribouIScannableGroup* _tmp0_; + gint _tmp1_; + CaribouIScannableItem* _tmp2_ = NULL; CaribouIScannableItem* item; + CaribouIScannableItem* _tmp3_; g_return_val_if_fail (self != NULL, NULL); - _tmp0_ = caribou_iscannable_group_child_step (self->priv->root_group, self->priv->_scan_cycles); - item = _tmp0_; - if (item == NULL) { + _tmp0_ = self->priv->root_group; + _tmp1_ = self->priv->_scan_cycles; + _tmp2_ = caribou_iscannable_group_child_step (_tmp0_, _tmp1_); + item = _tmp2_; + _tmp3_ = item; + if (_tmp3_ == NULL) { caribou_scanner_reset (self); } result = item; @@ -581,18 +673,20 @@ static gboolean caribou_scanner_scan (CaribouScanner* self) { gboolean result = FALSE; + gboolean _tmp0_; g_return_val_if_fail (self != NULL, FALSE); - if (self->priv->_inverse_scanning) { + _tmp0_ = self->priv->_inverse_scanning; + if (_tmp0_) { caribou_scanner_select (self); } else { - CaribouIScannableItem* _tmp0_ = NULL; - CaribouIScannableItem* _tmp1_; - gboolean _tmp2_; - _tmp0_ = caribou_scanner_step (self); - _tmp1_ = _tmp0_; - _tmp2_ = _tmp1_ != NULL; - _g_object_unref0 (_tmp1_); - result = _tmp2_; + CaribouIScannableItem* _tmp1_ = NULL; + CaribouIScannableItem* _tmp2_; + gboolean _tmp3_; + _tmp1_ = caribou_scanner_step (self); + _tmp2_ = _tmp1_; + _tmp3_ = _tmp2_ != NULL; + _g_object_unref0 (_tmp2_); + result = _tmp3_; return result; } result = TRUE; @@ -601,9 +695,17 @@ static void caribou_scanner_unconfigure_switch (CaribouScanner* self) { + CaribouScannerUnconfigureSwitchFunc _tmp0_; + void* _tmp0__target; g_return_if_fail (self != NULL); - if (self->priv->unconfigure_switch_func != NULL) { - self->priv->unconfigure_switch_func (self->priv->unconfigure_switch_func_target); + _tmp0_ = self->priv->unconfigure_switch_func; + _tmp0__target = self->priv->unconfigure_switch_func_target; + if (_tmp0_ != NULL) { + CaribouScannerUnconfigureSwitchFunc _tmp1_; + void* _tmp1__target; + _tmp1_ = self->priv->unconfigure_switch_func; + _tmp1__target = self->priv->unconfigure_switch_func_target; + _tmp1_ (_tmp1__target); } (self->priv->unconfigure_switch_func_target_destroy_notify == NULL) ? NULL : (self->priv->unconfigure_switch_func_target_destroy_notify (self->priv->unconfigure_switch_func_target), NULL); self->priv->unconfigure_switch_func = NULL; @@ -650,101 +752,133 @@ } -static void _lambda12_ (Block2Data* _data2_) { +static void ___lambda12_ (Block2Data* _data2_) { Block1Data* _data1_; CaribouScanner * self; + CaribouXAdapter* _tmp0_; + guint _tmp1_; _data1_ = _data2_->_data1_; self = _data1_->self; - caribou_xadapter_register_key_func (_data1_->xadapter, _data2_->keyval, NULL, NULL); + _tmp0_ = _data1_->xadapter; + _tmp1_ = _data2_->keyval; + caribou_xadapter_register_key_func (_tmp0_, _tmp1_, NULL, NULL); } -static void __lambda12__caribou_scanner_unconfigure_switch_func (gpointer self) { - _lambda12_ (self); +static void ____lambda12__caribou_scanner_unconfigure_switch_func (gpointer self) { + ___lambda12_ (self); } -static void _lambda13_ (Block1Data* _data1_) { +static void ____lambda13_ (Block1Data* _data1_) { CaribouScanner * self; - gint _tmp0_; + CaribouXAdapter* _tmp0_; + gint _tmp1_; + gint _tmp2_; self = _data1_->self; - _tmp0_ = caribou_scanner_get_mouse_button (self); - caribou_xadapter_register_key_func (_data1_->xadapter, (guint) _tmp0_, NULL, NULL); + _tmp0_ = _data1_->xadapter; + _tmp1_ = caribou_scanner_get_mouse_button (self); + _tmp2_ = _tmp1_; + caribou_xadapter_register_key_func (_tmp0_, (guint) _tmp2_, NULL, NULL); } -static void __lambda13__caribou_scanner_unconfigure_switch_func (gpointer self) { - _lambda13_ (self); +static void _____lambda13__caribou_scanner_unconfigure_switch_func (gpointer self) { + ____lambda13_ (self); } static void caribou_scanner_configure_switch (CaribouScanner* self) { Block1Data* _data1_; gboolean _tmp0_; - CaribouXAdapter* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - const gchar* _tmp3_ = NULL; + gboolean _tmp1_; + CaribouXAdapter* _tmp2_ = NULL; + gboolean _tmp3_ = FALSE; + const gchar* _tmp4_; + const gchar* _tmp5_; + gboolean _tmp8_; g_return_if_fail (self != NULL); _data1_ = g_slice_new0 (Block1Data); _data1_->_ref_count_ = 1; _data1_->self = g_object_ref (self); _tmp0_ = caribou_scanner_get_scan_enabled (self); - if (!_tmp0_) { + _tmp1_ = _tmp0_; + if (!_tmp1_) { block1_data_unref (_data1_); _data1_ = NULL; return; } caribou_scanner_unconfigure_switch (self); - _tmp1_ = caribou_xadapter_get_default (); - _data1_->xadapter = _tmp1_; - _tmp3_ = caribou_scanner_get_switch_device (self); - if (g_strcmp0 (_tmp3_, "keyboard") == 0) { - const gchar* _tmp4_ = NULL; - _tmp4_ = caribou_scanner_get_keyboard_key (self); - _tmp2_ = _tmp4_ != NULL; + _tmp2_ = caribou_xadapter_get_default (); + _data1_->xadapter = _tmp2_; + _tmp4_ = caribou_scanner_get_switch_device (self); + _tmp5_ = _tmp4_; + if (g_strcmp0 (_tmp5_, "keyboard") == 0) { + const gchar* _tmp6_; + const gchar* _tmp7_; + _tmp6_ = caribou_scanner_get_keyboard_key (self); + _tmp7_ = _tmp6_; + _tmp3_ = _tmp7_ != NULL; } else { - _tmp2_ = FALSE; + _tmp3_ = FALSE; } - if (_tmp2_) { + _tmp8_ = _tmp3_; + if (_tmp8_) { Block2Data* _data2_; - const gchar* _tmp5_ = NULL; - guint _tmp6_; + const gchar* _tmp9_; + const gchar* _tmp10_; + guint _tmp11_ = 0U; + CaribouXAdapter* _tmp12_; + guint _tmp13_; _data2_ = g_slice_new0 (Block2Data); _data2_->_ref_count_ = 1; _data2_->_data1_ = block1_data_ref (_data1_); - _tmp5_ = caribou_scanner_get_keyboard_key (self); - _tmp6_ = gdk_keyval_from_name (_tmp5_); - _data2_->keyval = _tmp6_; - caribou_xadapter_register_key_func (_data1_->xadapter, _data2_->keyval, _caribou_scanner_switch_pressed_caribou_xadapter_key_button_callback, self); + _tmp9_ = caribou_scanner_get_keyboard_key (self); + _tmp10_ = _tmp9_; + _tmp11_ = gdk_keyval_from_name (_tmp10_); + _data2_->keyval = _tmp11_; + _tmp12_ = _data1_->xadapter; + _tmp13_ = _data2_->keyval; + caribou_xadapter_register_key_func (_tmp12_, _tmp13_, _caribou_scanner_switch_pressed_caribou_xadapter_key_button_callback, self); (self->priv->unconfigure_switch_func_target_destroy_notify == NULL) ? NULL : (self->priv->unconfigure_switch_func_target_destroy_notify (self->priv->unconfigure_switch_func_target), NULL); self->priv->unconfigure_switch_func = NULL; self->priv->unconfigure_switch_func_target = NULL; self->priv->unconfigure_switch_func_target_destroy_notify = NULL; - self->priv->unconfigure_switch_func = __lambda12__caribou_scanner_unconfigure_switch_func; + self->priv->unconfigure_switch_func = ____lambda12__caribou_scanner_unconfigure_switch_func; self->priv->unconfigure_switch_func_target = block2_data_ref (_data2_); self->priv->unconfigure_switch_func_target_destroy_notify = block2_data_unref; block2_data_unref (_data2_); _data2_ = NULL; } else { - gboolean _tmp7_ = FALSE; - const gchar* _tmp8_ = NULL; - _tmp8_ = caribou_scanner_get_switch_device (self); - if (g_strcmp0 (_tmp8_, "mouse") == 0) { - gint _tmp9_; - _tmp9_ = caribou_scanner_get_mouse_button (self); - _tmp7_ = _tmp9_ != 0; + gboolean _tmp14_ = FALSE; + const gchar* _tmp15_; + const gchar* _tmp16_; + gboolean _tmp19_; + _tmp15_ = caribou_scanner_get_switch_device (self); + _tmp16_ = _tmp15_; + if (g_strcmp0 (_tmp16_, "mouse") == 0) { + gint _tmp17_; + gint _tmp18_; + _tmp17_ = caribou_scanner_get_mouse_button (self); + _tmp18_ = _tmp17_; + _tmp14_ = _tmp18_ != 0; } else { - _tmp7_ = FALSE; + _tmp14_ = FALSE; } - if (_tmp7_) { - gint _tmp10_; - _tmp10_ = caribou_scanner_get_mouse_button (self); - caribou_xadapter_register_button_func (_data1_->xadapter, (guint) _tmp10_, _caribou_scanner_switch_pressed_caribou_xadapter_key_button_callback, self); + _tmp19_ = _tmp14_; + if (_tmp19_) { + CaribouXAdapter* _tmp20_; + gint _tmp21_; + gint _tmp22_; + _tmp20_ = _data1_->xadapter; + _tmp21_ = caribou_scanner_get_mouse_button (self); + _tmp22_ = _tmp21_; + caribou_xadapter_register_button_func (_tmp20_, (guint) _tmp22_, _caribou_scanner_switch_pressed_caribou_xadapter_key_button_callback, self); (self->priv->unconfigure_switch_func_target_destroy_notify == NULL) ? NULL : (self->priv->unconfigure_switch_func_target_destroy_notify (self->priv->unconfigure_switch_func_target), NULL); self->priv->unconfigure_switch_func = NULL; self->priv->unconfigure_switch_func_target = NULL; self->priv->unconfigure_switch_func_target_destroy_notify = NULL; - self->priv->unconfigure_switch_func = __lambda13__caribou_scanner_unconfigure_switch_func; + self->priv->unconfigure_switch_func = _____lambda13__caribou_scanner_unconfigure_switch_func; self->priv->unconfigure_switch_func_target = block1_data_ref (_data1_); self->priv->unconfigure_switch_func_target_destroy_notify = block1_data_unref; } @@ -768,32 +902,46 @@ gboolean caribou_scanner_get_bind_settings (CaribouScanner* self) { gboolean result; + gboolean _tmp0_; g_return_val_if_fail (self != NULL, FALSE); - result = self->priv->_bind_settings; + _tmp0_ = self->priv->_bind_settings; + result = _tmp0_; return result; } static void caribou_scanner_set_bind_settings (CaribouScanner* self, gboolean value) { + gboolean _tmp0_; g_return_if_fail (self != NULL); - self->priv->_bind_settings = value; + _tmp0_ = value; + self->priv->_bind_settings = _tmp0_; g_object_notify ((GObject *) self, "bind-settings"); } gint caribou_scanner_get_scan_grouping (CaribouScanner* self) { gint result; + CaribouScanGrouping _tmp0_; g_return_val_if_fail (self != NULL, 0); - result = (gint) self->priv->_scan_grouping; + _tmp0_ = self->priv->_scan_grouping; + result = (gint) _tmp0_; return result; } void caribou_scanner_set_scan_grouping (CaribouScanner* self, gint value) { + gint _tmp0_; + CaribouIScannableGroup* _tmp1_; g_return_if_fail (self != NULL); - self->priv->_scan_grouping = (CaribouScanGrouping) value; - if (self->priv->root_group != NULL) { - caribou_iscannable_group_set_scan_grouping (self->priv->root_group, self->priv->_scan_grouping); + _tmp0_ = value; + self->priv->_scan_grouping = (CaribouScanGrouping) _tmp0_; + _tmp1_ = self->priv->root_group; + if (_tmp1_ != NULL) { + CaribouIScannableGroup* _tmp2_; + CaribouScanGrouping _tmp3_; + _tmp2_ = self->priv->root_group; + _tmp3_ = self->priv->_scan_grouping; + caribou_iscannable_group_set_scan_grouping (_tmp2_, _tmp3_); } caribou_scanner_reset (self); g_object_notify ((GObject *) self, "scan-grouping"); @@ -802,16 +950,22 @@ gboolean caribou_scanner_get_scan_enabled (CaribouScanner* self) { gboolean result; + gboolean _tmp0_; g_return_val_if_fail (self != NULL, FALSE); - result = self->priv->_scan_enabled; + _tmp0_ = self->priv->_scan_enabled; + result = _tmp0_; return result; } void caribou_scanner_set_scan_enabled (CaribouScanner* self, gboolean value) { + gboolean _tmp0_; + gboolean _tmp1_; g_return_if_fail (self != NULL); - self->priv->_scan_enabled = value; - if (self->priv->_scan_enabled) { + _tmp0_ = value; + self->priv->_scan_enabled = _tmp0_; + _tmp1_ = self->priv->_scan_enabled; + if (_tmp1_) { caribou_scanner_enable (self); } else { caribou_scanner_disable (self); @@ -822,20 +976,30 @@ gdouble caribou_scanner_get_step_time (CaribouScanner* self) { gdouble result; + gdouble _tmp0_; g_return_val_if_fail (self != NULL, 0.0); - result = self->priv->_step_time; + _tmp0_ = self->priv->_step_time; + result = _tmp0_; return result; } void caribou_scanner_set_step_time (CaribouScanner* self, gdouble value) { + gdouble _tmp0_; + guint _tmp1_; g_return_if_fail (self != NULL); - self->priv->_step_time = value; - if (self->priv->scan_tid != 0) { - guint _tmp0_; - g_source_remove (self->priv->scan_tid); - _tmp0_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) ((gint) (self->priv->_step_time * 1000)), _caribou_scanner_scan_gsource_func, g_object_ref (self), g_object_unref); - self->priv->scan_tid = _tmp0_; + _tmp0_ = value; + self->priv->_step_time = _tmp0_; + _tmp1_ = self->priv->scan_tid; + if (_tmp1_ != ((guint) 0)) { + guint _tmp2_; + gdouble _tmp3_; + guint _tmp4_ = 0U; + _tmp2_ = self->priv->scan_tid; + g_source_remove (_tmp2_); + _tmp3_ = self->priv->_step_time; + _tmp4_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) ((gint) (_tmp3_ * 1000)), _caribou_scanner_scan_gsource_func, g_object_ref (self), g_object_unref); + self->priv->scan_tid = _tmp4_; } g_object_notify ((GObject *) self, "step-time"); } @@ -843,18 +1007,22 @@ const gchar* caribou_scanner_get_switch_device (CaribouScanner* self) { const gchar* result; + const gchar* _tmp0_; g_return_val_if_fail (self != NULL, NULL); - result = self->priv->_switch_device; + _tmp0_ = self->priv->_switch_device; + result = _tmp0_; return result; } void caribou_scanner_set_switch_device (CaribouScanner* self, const gchar* value) { - gchar* _tmp0_; + const gchar* _tmp0_; + gchar* _tmp1_; g_return_if_fail (self != NULL); - _tmp0_ = g_strdup (value); + _tmp0_ = value; + _tmp1_ = g_strdup (_tmp0_); _g_free0 (self->priv->_switch_device); - self->priv->_switch_device = _tmp0_; + self->priv->_switch_device = _tmp1_; caribou_scanner_configure_switch (self); g_object_notify ((GObject *) self, "switch-device"); } @@ -862,18 +1030,22 @@ const gchar* caribou_scanner_get_keyboard_key (CaribouScanner* self) { const gchar* result; + const gchar* _tmp0_; g_return_val_if_fail (self != NULL, NULL); - result = self->priv->_keyboard_key; + _tmp0_ = self->priv->_keyboard_key; + result = _tmp0_; return result; } void caribou_scanner_set_keyboard_key (CaribouScanner* self, const gchar* value) { - gchar* _tmp0_; + const gchar* _tmp0_; + gchar* _tmp1_; g_return_if_fail (self != NULL); - _tmp0_ = g_strdup (value); + _tmp0_ = value; + _tmp1_ = g_strdup (_tmp0_); _g_free0 (self->priv->_keyboard_key); - self->priv->_keyboard_key = _tmp0_; + self->priv->_keyboard_key = _tmp1_; caribou_scanner_configure_switch (self); g_object_notify ((GObject *) self, "keyboard-key"); } @@ -881,15 +1053,19 @@ gint caribou_scanner_get_mouse_button (CaribouScanner* self) { gint result; + gint _tmp0_; g_return_val_if_fail (self != NULL, 0); - result = self->priv->_mouse_button; + _tmp0_ = self->priv->_mouse_button; + result = _tmp0_; return result; } void caribou_scanner_set_mouse_button (CaribouScanner* self, gint value) { + gint _tmp0_; g_return_if_fail (self != NULL); - self->priv->_mouse_button = value; + _tmp0_ = value; + self->priv->_mouse_button = _tmp0_; caribou_scanner_configure_switch (self); g_object_notify ((GObject *) self, "mouse-button"); } @@ -897,45 +1073,57 @@ gint caribou_scanner_get_scan_cycles (CaribouScanner* self) { gint result; + gint _tmp0_; g_return_val_if_fail (self != NULL, 0); - result = self->priv->_scan_cycles; + _tmp0_ = self->priv->_scan_cycles; + result = _tmp0_; return result; } void caribou_scanner_set_scan_cycles (CaribouScanner* self, gint value) { + gint _tmp0_; g_return_if_fail (self != NULL); - self->priv->_scan_cycles = value; + _tmp0_ = value; + self->priv->_scan_cycles = _tmp0_; g_object_notify ((GObject *) self, "scan-cycles"); } gboolean caribou_scanner_get_autorestart (CaribouScanner* self) { gboolean result; + gboolean _tmp0_; g_return_val_if_fail (self != NULL, FALSE); - result = self->priv->_autorestart; + _tmp0_ = self->priv->_autorestart; + result = _tmp0_; return result; } void caribou_scanner_set_autorestart (CaribouScanner* self, gboolean value) { + gboolean _tmp0_; g_return_if_fail (self != NULL); - self->priv->_autorestart = value; + _tmp0_ = value; + self->priv->_autorestart = _tmp0_; g_object_notify ((GObject *) self, "autorestart"); } gboolean caribou_scanner_get_inverse_scanning (CaribouScanner* self) { gboolean result; + gboolean _tmp0_; g_return_val_if_fail (self != NULL, FALSE); - result = self->priv->_inverse_scanning; + _tmp0_ = self->priv->_inverse_scanning; + result = _tmp0_; return result; } void caribou_scanner_set_inverse_scanning (CaribouScanner* self, gboolean value) { + gboolean _tmp0_; g_return_if_fail (self != NULL); - self->priv->_inverse_scanning = value; + _tmp0_ = value; + self->priv->_inverse_scanning = _tmp0_; g_object_notify ((GObject *) self, "inverse-scanning"); } @@ -945,6 +1133,7 @@ GObjectClass * parent_class; CaribouScanner * self; gchar* _tmp0_; + gboolean _tmp1_; parent_class = G_OBJECT_CLASS (caribou_scanner_parent_class); obj = parent_class->constructor (type, n_construct_properties, construct_properties); self = CARIBOU_SCANNER (obj); @@ -953,7 +1142,8 @@ _tmp0_ = g_strdup ("keyboard"); _g_free0 (self->priv->_switch_device); self->priv->_switch_device = _tmp0_; - if (self->priv->_bind_settings) { + _tmp1_ = self->priv->_bind_settings; + if (_tmp1_) { caribou_scanner_do_bind_settings (self); } return obj; diff -Nru caribou-0.3.5/libcaribou/xadapter.c caribou-0.3.91/libcaribou/xadapter.c --- caribou-0.3.5/libcaribou/xadapter.c 2011-08-12 07:45:38.000000000 +0000 +++ caribou-0.3.91/libcaribou/xadapter.c 2011-09-05 23:45:29.000000000 +0000 @@ -1,4 +1,4 @@ -/* xadapter.c generated by valac 0.12.0, the Vala compiler +/* xadapter.c generated by valac 0.13.3, the Vala compiler * generated from xadapter.vala, do not modify */ @@ -146,6 +146,7 @@ static void caribou_xadapter_finalize (GObject* obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static gint _vala_array_length (gpointer array); static gpointer _g_object_ref0 (gpointer self) { @@ -155,15 +156,19 @@ CaribouXAdapter* caribou_xadapter_get_default (void) { CaribouXAdapter* result = NULL; - CaribouXAdapter* _tmp1_; - if (caribou_xadapter_instance == NULL) { - CaribouXAdapter* _tmp0_ = NULL; - _tmp0_ = caribou_xadapter_new (); + CaribouXAdapter* _tmp0_; + CaribouXAdapter* _tmp2_; + CaribouXAdapter* _tmp3_; + _tmp0_ = caribou_xadapter_instance; + if (_tmp0_ == NULL) { + CaribouXAdapter* _tmp1_; + _tmp1_ = caribou_xadapter_new (); _g_object_unref0 (caribou_xadapter_instance); - caribou_xadapter_instance = _tmp0_; + caribou_xadapter_instance = _tmp1_; } - _tmp1_ = _g_object_ref0 (caribou_xadapter_instance); - result = _tmp1_; + _tmp2_ = caribou_xadapter_instance; + _tmp3_ = _g_object_ref0 (_tmp2_); + result = _tmp3_; return result; } @@ -176,61 +181,162 @@ static GdkFilterReturn caribou_xadapter_x_event_filter (CaribouXAdapter* self, GdkXEvent* xevent, GdkEvent* event) { GdkFilterReturn result = 0; void* pointer; + void* _tmp0_; XkbEvent* xkbev; + void* _tmp1_; XEvent* xev; - gboolean _tmp0_ = FALSE; + XklEngine* _tmp2_; + XEvent* _tmp3_; + gboolean _tmp4_ = FALSE; + XEvent* _tmp5_; + gint _tmp6_; + gboolean _tmp9_; g_return_val_if_fail (self != NULL, 0); + g_return_val_if_fail (xevent != NULL, 0); g_return_val_if_fail (event != NULL, 0); pointer = xevent; - xkbev = (XkbEvent*) pointer; - xev = (XEvent*) pointer; - xkl_engine_filter_events (self->priv->xkl_engine, xev); - if ((*xev).type == ButtonPress) { - _tmp0_ = TRUE; + _tmp0_ = pointer; + xkbev = (XkbEvent*) _tmp0_; + _tmp1_ = pointer; + xev = (XEvent*) _tmp1_; + _tmp2_ = self->priv->xkl_engine; + _tmp3_ = xev; + xkl_engine_filter_events (_tmp2_, _tmp3_); + _tmp5_ = xev; + _tmp6_ = (*_tmp5_).type; + if (_tmp6_ == ((gint) ButtonPress)) { + _tmp4_ = TRUE; } else { - _tmp0_ = (*xev).type == ButtonRelease; - } - if (_tmp0_) { - gconstpointer _tmp1_ = NULL; - CaribouXAdapterKeyButtonHandler* _tmp2_; + XEvent* _tmp7_; + gint _tmp8_; + _tmp7_ = xev; + _tmp8_ = (*_tmp7_).type; + _tmp4_ = _tmp8_ == ((gint) ButtonRelease); + } + _tmp9_ = _tmp4_; + if (_tmp9_) { + GHashTable* _tmp10_; + XEvent* _tmp11_; + XButtonEvent _tmp12_; + guint _tmp13_; + gconstpointer _tmp14_ = NULL; + CaribouXAdapterKeyButtonHandler* _tmp15_; CaribouXAdapterKeyButtonHandler* handler; - _tmp1_ = g_hash_table_lookup (self->priv->button_funcs, GUINT_TO_POINTER ((*xev).xbutton.button)); - _tmp2_ = _caribou_xadapter_key_button_handler_ref0 (CARIBOU_XADAPTER_KEY_BUTTON_HANDLER ((CaribouXAdapterKeyButtonHandler*) _tmp1_)); - handler = _tmp2_; - if (handler != NULL) { - CaribouXAdapterKeyButtonCallback _tmp3_ = NULL; - void* _tmp4_ = NULL; - _tmp3_ = caribou_xadapter_key_button_handler_get_cb (handler, &_tmp4_); - _tmp3_ ((*xev).xbutton.button, (*xev).type == ButtonPress, _tmp4_); + CaribouXAdapterKeyButtonHandler* _tmp16_; + _tmp10_ = self->priv->button_funcs; + _tmp11_ = xev; + _tmp12_ = (*_tmp11_).xbutton; + _tmp13_ = _tmp12_.button; + _tmp14_ = g_hash_table_lookup (_tmp10_, GUINT_TO_POINTER (_tmp13_)); + _tmp15_ = _caribou_xadapter_key_button_handler_ref0 (CARIBOU_XADAPTER_KEY_BUTTON_HANDLER ((CaribouXAdapterKeyButtonHandler*) _tmp14_)); + handler = _tmp15_; + _tmp16_ = handler; + if (_tmp16_ != NULL) { + CaribouXAdapterKeyButtonHandler* _tmp17_; + CaribouXAdapterKeyButtonCallback _tmp18_; + void* _tmp18__target; + CaribouXAdapterKeyButtonCallback _tmp19_; + void* _tmp19__target; + XEvent* _tmp20_; + XButtonEvent _tmp21_; + guint _tmp22_; + XEvent* _tmp23_; + gint _tmp24_; + _tmp17_ = handler; + _tmp18_ = caribou_xadapter_key_button_handler_get_cb (_tmp17_, &_tmp18__target); + _tmp19_ = _tmp18_; + _tmp19__target = _tmp18__target; + _tmp20_ = xev; + _tmp21_ = (*_tmp20_).xbutton; + _tmp22_ = _tmp21_.button; + _tmp23_ = xev; + _tmp24_ = (*_tmp23_).type; + _tmp19_ (_tmp22_, _tmp24_ == ((gint) ButtonPress), _tmp19__target); } _caribou_xadapter_key_button_handler_unref0 (handler); } else { - gboolean _tmp5_ = FALSE; - if ((*xev).type == KeyPress) { - _tmp5_ = TRUE; + gboolean _tmp25_ = FALSE; + XEvent* _tmp26_; + gint _tmp27_; + gboolean _tmp30_; + _tmp26_ = xev; + _tmp27_ = (*_tmp26_).type; + if (_tmp27_ == ((gint) KeyPress)) { + _tmp25_ = TRUE; } else { - _tmp5_ = (*xev).type == KeyRelease; + XEvent* _tmp28_; + gint _tmp29_; + _tmp28_ = xev; + _tmp29_ = (*_tmp28_).type; + _tmp25_ = _tmp29_ == ((gint) KeyRelease); } - if (_tmp5_) { - gconstpointer _tmp6_ = NULL; - CaribouXAdapterKeyButtonHandler* _tmp7_; + _tmp30_ = _tmp25_; + if (_tmp30_) { + GHashTable* _tmp31_; + XEvent* _tmp32_; + XKeyEvent _tmp33_; + guint _tmp34_; + gconstpointer _tmp35_ = NULL; + CaribouXAdapterKeyButtonHandler* _tmp36_; CaribouXAdapterKeyButtonHandler* handler; - _tmp6_ = g_hash_table_lookup (self->priv->key_funcs, GUINT_TO_POINTER ((*xev).xkey.keycode)); - _tmp7_ = _caribou_xadapter_key_button_handler_ref0 (CARIBOU_XADAPTER_KEY_BUTTON_HANDLER ((CaribouXAdapterKeyButtonHandler*) _tmp6_)); - handler = _tmp7_; - if (handler != NULL) { - CaribouXAdapterKeyButtonCallback _tmp8_ = NULL; - void* _tmp9_ = NULL; - _tmp8_ = caribou_xadapter_key_button_handler_get_cb (handler, &_tmp9_); - _tmp8_ ((*xev).xkey.keycode, (*xev).type == KeyPress, _tmp9_); + CaribouXAdapterKeyButtonHandler* _tmp37_; + _tmp31_ = self->priv->key_funcs; + _tmp32_ = xev; + _tmp33_ = (*_tmp32_).xkey; + _tmp34_ = _tmp33_.keycode; + _tmp35_ = g_hash_table_lookup (_tmp31_, GUINT_TO_POINTER (_tmp34_)); + _tmp36_ = _caribou_xadapter_key_button_handler_ref0 (CARIBOU_XADAPTER_KEY_BUTTON_HANDLER ((CaribouXAdapterKeyButtonHandler*) _tmp35_)); + handler = _tmp36_; + _tmp37_ = handler; + if (_tmp37_ != NULL) { + CaribouXAdapterKeyButtonHandler* _tmp38_; + CaribouXAdapterKeyButtonCallback _tmp39_; + void* _tmp39__target; + CaribouXAdapterKeyButtonCallback _tmp40_; + void* _tmp40__target; + XEvent* _tmp41_; + XKeyEvent _tmp42_; + guint _tmp43_; + XEvent* _tmp44_; + gint _tmp45_; + _tmp38_ = handler; + _tmp39_ = caribou_xadapter_key_button_handler_get_cb (_tmp38_, &_tmp39__target); + _tmp40_ = _tmp39_; + _tmp40__target = _tmp39__target; + _tmp41_ = xev; + _tmp42_ = (*_tmp41_).xkey; + _tmp43_ = _tmp42_.keycode; + _tmp44_ = xev; + _tmp45_ = (*_tmp44_).type; + _tmp40_ (_tmp43_, _tmp45_ == ((gint) KeyPress), _tmp40__target); } _caribou_xadapter_key_button_handler_unref0 (handler); } else { - if ((*xkbev).any.xkb_type == XkbStateNotify) { + XkbEvent* _tmp46_; + XkbAnyEvent _tmp47_; + gint _tmp48_; + gint _tmp49_; + _tmp46_ = xkbev; + _tmp47_ = (*_tmp46_).any; + _tmp48_ = _tmp47_.xkb_type; + _tmp49_ = XkbStateNotify; + if (_tmp48_ == _tmp49_) { + XkbEvent* _tmp50_; XkbStateNotifyEvent* sevent; - sevent = &(*xkbev).state; - if (((*sevent).changed & XkbModifierStateMask) != 0) { - self->priv->modifiers = (guchar) (*sevent).mods; + XkbStateNotifyEvent* _tmp51_; + guint _tmp52_; + gint _tmp53_; + _tmp50_ = xkbev; + sevent = &(*_tmp50_).state; + _tmp51_ = sevent; + _tmp52_ = (*_tmp51_).changed; + _tmp53_ = XkbModifierStateMask; + if ((_tmp52_ & _tmp53_) != ((guint) 0)) { + XkbStateNotifyEvent* _tmp54_; + guint _tmp55_; + _tmp54_ = sevent; + _tmp55_ = (*_tmp54_).mods; + self->priv->modifiers = (guchar) _tmp55_; } } } @@ -243,17 +349,29 @@ static void caribou_xadapter_xkl_state_changed (XklEngine* xklengine, gint type, gint group, gboolean restore, CaribouXAdapter* _self_) { gchar* group_name = NULL; gchar* variant_name = NULL; - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + CaribouXAdapter* _tmp0_; + gint _tmp1_; + CaribouXAdapter* _tmp2_; + gchar* _tmp3_ = NULL; + gchar* _tmp4_ = NULL; + CaribouXAdapter* _tmp5_; + CaribouXAdapter* _tmp6_; + guchar _tmp7_; g_return_if_fail (xklengine != NULL); g_return_if_fail (_self_ != NULL); - _self_->priv->group = (guchar) group; - caribou_xadapter_get_current_group (_self_, &_tmp0_, &_tmp1_); + _tmp0_ = _self_; + _tmp1_ = group; + _tmp0_->priv->group = (guchar) _tmp1_; + _tmp2_ = _self_; + caribou_xadapter_get_current_group (_tmp2_, &_tmp3_, &_tmp4_); _g_free0 (group_name); - group_name = _tmp0_; + group_name = _tmp3_; _g_free0 (variant_name); - variant_name = _tmp1_; - g_signal_emit_by_name (_self_, "group-changed", (guint) _self_->priv->group, group_name, variant_name); + variant_name = _tmp4_; + _tmp5_ = _self_; + _tmp6_ = _self_; + _tmp7_ = _tmp6_->priv->group; + g_signal_emit_by_name (_tmp5_, "group-changed", (guint) _tmp7_, group_name, variant_name); _g_free0 (variant_name); _g_free0 (group_name); } @@ -262,37 +380,84 @@ static guchar caribou_xadapter_get_reserved_keycode (CaribouXAdapter* self) { guchar result = '\0'; guchar i = '\0'; + XkbDescRec* _tmp0_; XkbDescRec* xkbdesc; - gint _tmp5_; + Display* _tmp27_; + guchar _tmp28_ = '\0'; g_return_val_if_fail (self != NULL, '\0'); - xkbdesc = self->priv->xkbdesc; + _tmp0_ = self->priv->xkbdesc; + xkbdesc = _tmp0_; { - gboolean _tmp0_; - i = (guchar) xkbdesc->max_key_code; - _tmp0_ = TRUE; + XkbDescRec* _tmp1_; + gchar _tmp2_; + gboolean _tmp3_; + _tmp1_ = xkbdesc; + _tmp2_ = _tmp1_->max_key_code; + i = (guchar) _tmp2_; + _tmp3_ = TRUE; while (TRUE) { - if (!_tmp0_) { - i = (guchar) (i - 1); + gboolean _tmp4_; + guchar _tmp6_; + XkbDescRec* _tmp7_; + gchar _tmp8_; + XkbDescRec* _tmp9_; + XkbClientMapRec* _tmp10_; + XkbSymMapRec* _tmp11_; + gint _tmp11__length1; + guchar _tmp12_; + XkbSymMapRec _tmp13_; + guchar _tmp14_; + gint _tmp15_; + _tmp4_ = _tmp3_; + if (!_tmp4_) { + guchar _tmp5_; + _tmp5_ = i; + i = (guchar) (_tmp5_ - 1); } - _tmp0_ = FALSE; - if (!(i >= xkbdesc->min_key_code)) { + _tmp3_ = FALSE; + _tmp6_ = i; + _tmp7_ = xkbdesc; + _tmp8_ = _tmp7_->min_key_code; + if (!(_tmp6_ >= ((guchar) _tmp8_))) { break; } - if (xkbdesc->map->key_sym_map[i].kt_index[0] == XkbOneLevelIndex) { - gint _tmp1_; - _tmp1_ = XKeycodeToKeysym (self->priv->xdisplay, i, 0); - if (_tmp1_ != 0) { - Window _tmp2_; - Window _tmp3_; - gint _tmp4_; + _tmp9_ = xkbdesc; + _tmp10_ = _tmp9_->map; + _tmp11_ = _tmp10_->key_sym_map; + _tmp11__length1 = _vala_array_length (_tmp10_->key_sym_map); + _tmp12_ = i; + _tmp13_ = _tmp11_[_tmp12_]; + _tmp14_ = _tmp13_.kt_index[0]; + _tmp15_ = XkbOneLevelIndex; + if (((gint) _tmp14_) == _tmp15_) { + Display* _tmp16_; + guchar _tmp17_; + gint _tmp18_ = 0; + _tmp16_ = self->priv->xdisplay; + _tmp17_ = i; + _tmp18_ = XKeycodeToKeysym (_tmp16_, _tmp17_, 0); + if (_tmp18_ != 0) { + Display* _tmp19_; + guchar _tmp20_; + Window _tmp21_ = 0; + Display* _tmp22_; + Display* _tmp23_; + guchar _tmp24_; + Window _tmp25_ = 0; + gint _tmp26_ = 0; gdk_error_trap_push (); - _tmp2_ = gdk_x11_get_default_root_xwindow (); - XGrabKey (self->priv->xdisplay, (gint) i, (guint) 0, _tmp2_, TRUE, (gint) GrabModeSync, (gint) GrabModeSync); - XFlush (self->priv->xdisplay); - _tmp3_ = gdk_x11_get_default_root_xwindow (); - XUngrabKey (self->priv->xdisplay, (gint) i, (guint) 0, _tmp3_); - _tmp4_ = gdk_error_trap_pop (); - if (_tmp4_ == 0) { + _tmp19_ = self->priv->xdisplay; + _tmp20_ = i; + _tmp21_ = gdk_x11_get_default_root_xwindow (); + XGrabKey (_tmp19_, (gint) _tmp20_, (guint) 0, _tmp21_, TRUE, (gint) GrabModeSync, (gint) GrabModeSync); + _tmp22_ = self->priv->xdisplay; + XFlush (_tmp22_); + _tmp23_ = self->priv->xdisplay; + _tmp24_ = i; + _tmp25_ = gdk_x11_get_default_root_xwindow (); + XUngrabKey (_tmp23_, (gint) _tmp24_, (guint) 0, _tmp25_); + _tmp26_ = gdk_error_trap_pop (); + if (_tmp26_ == 0) { result = i; return result; } @@ -300,8 +465,9 @@ } } } - _tmp5_ = XKeysymToKeycode (self->priv->xdisplay, (guint) 0x0023); - result = (guchar) _tmp5_; + _tmp27_ = self->priv->xdisplay; + _tmp28_ = XKeysymToKeycode (_tmp27_, (gulong) 0x0023); + result = (guchar) _tmp28_; return result; } @@ -314,22 +480,70 @@ static void caribou_xadapter_replace_keycode (CaribouXAdapter* self, guint keysym) { + guchar _tmp0_; + Display* _tmp5_; + XkbDescRec* _tmp6_; + XkbClientMapRec* _tmp7_; + XkbSymMapRec* _tmp8_; + gint _tmp8__length1; + guchar _tmp9_; + XkbSymMapRec _tmp10_; + gushort _tmp11_; guint offset; + XkbDescRec* _tmp12_; + XkbClientMapRec* _tmp13_; + guint* _tmp14_; + gint _tmp14__length1; + guint _tmp15_; + guint _tmp16_; + guint _tmp17_; + Display* _tmp18_; + gint _tmp19_; + XkbDescRec* _tmp20_; + Display* _tmp21_; + guint _tmp22_; + guint _tmp23_; g_return_if_fail (self != NULL); - if (self->priv->reserved_keycode == 0) { - guchar _tmp0_; - gint _tmp1_; - _tmp0_ = caribou_xadapter_get_reserved_keycode (self); - self->priv->reserved_keycode = _tmp0_; - _tmp1_ = XKeycodeToKeysym (self->priv->xdisplay, self->priv->reserved_keycode, 0); - self->priv->reserved_keysym = (guint) _tmp1_; - } - XFlush (self->priv->xdisplay); - offset = (guint) self->priv->xkbdesc->map->key_sym_map[self->priv->reserved_keycode].offset; - self->priv->xkbdesc->map->syms[offset] = keysym; - XkbSetMap (self->priv->xdisplay, (guint) XkbAllMapComponentsMask, self->priv->xkbdesc); - XFlush (self->priv->xdisplay); - if (keysym != self->priv->reserved_keysym) { + _tmp0_ = self->priv->reserved_keycode; + if (((gint) _tmp0_) == 0) { + guchar _tmp1_ = '\0'; + Display* _tmp2_; + guchar _tmp3_; + gint _tmp4_ = 0; + _tmp1_ = caribou_xadapter_get_reserved_keycode (self); + self->priv->reserved_keycode = _tmp1_; + _tmp2_ = self->priv->xdisplay; + _tmp3_ = self->priv->reserved_keycode; + _tmp4_ = XKeycodeToKeysym (_tmp2_, _tmp3_, 0); + self->priv->reserved_keysym = (guint) _tmp4_; + } + _tmp5_ = self->priv->xdisplay; + XFlush (_tmp5_); + _tmp6_ = self->priv->xkbdesc; + _tmp7_ = _tmp6_->map; + _tmp8_ = _tmp7_->key_sym_map; + _tmp8__length1 = _vala_array_length (_tmp7_->key_sym_map); + _tmp9_ = self->priv->reserved_keycode; + _tmp10_ = _tmp8_[_tmp9_]; + _tmp11_ = _tmp10_.offset; + offset = (guint) _tmp11_; + _tmp12_ = self->priv->xkbdesc; + _tmp13_ = _tmp12_->map; + _tmp14_ = _tmp13_->syms; + _tmp14__length1 = _vala_array_length (_tmp13_->syms); + _tmp15_ = offset; + _tmp16_ = keysym; + _tmp14_[_tmp15_] = _tmp16_; + _tmp17_ = _tmp14_[_tmp15_]; + _tmp18_ = self->priv->xdisplay; + _tmp19_ = XkbAllMapComponentsMask; + _tmp20_ = self->priv->xkbdesc; + XkbSetMap (_tmp18_, (guint) _tmp19_, _tmp20_); + _tmp21_ = self->priv->xdisplay; + XFlush (_tmp21_); + _tmp22_ = keysym; + _tmp23_ = self->priv->reserved_keysym; + if (_tmp22_ != _tmp23_) { g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, _caribou_xadapter_reset_reserved_gsource_func, g_object_ref (self), g_object_unref); } } @@ -337,8 +551,10 @@ static gboolean caribou_xadapter_reset_reserved (CaribouXAdapter* self) { gboolean result = FALSE; + guint _tmp0_; g_return_val_if_fail (self != NULL, FALSE); - caribou_xadapter_replace_keycode (self, self->priv->reserved_keysym); + _tmp0_ = self->priv->reserved_keysym; + caribou_xadapter_replace_keycode (self, _tmp0_); result = FALSE; return result; } @@ -350,8 +566,8 @@ static gboolean caribou_xadapter_best_keycode_keyval_match (CaribouXAdapter* self, guint keyval, guchar* keycode, guint* modmask) { - guchar _keycode = '\0'; - guint _modmask = 0U; + guchar _vala_keycode = '\0'; + guint _vala_modmask = 0U; gboolean result = FALSE; GdkKeymap* _tmp0_ = NULL; GdkKeymap* _tmp1_; @@ -359,91 +575,132 @@ GdkKeymapKey* kmk = NULL; gint kmk_length1 = 0; gint _kmk_size_ = 0; - GdkKeymapKey* _tmp2_ = NULL; - gint _tmp3_; - gboolean _tmp4_; - GdkKeymapKey* _tmp5_; - GdkKeymapKey* _tmp6_; + GdkKeymap* _tmp2_; + guint _tmp3_; + GdkKeymapKey* _tmp4_ = NULL; + gint _tmp5_ = 0; + gboolean _tmp6_ = FALSE; + GdkKeymapKey* _tmp7_; + gint _tmp7__length1; + GdkKeymapKey* _tmp8_; + gint _tmp8__length1; + GdkKeymapKey _tmp9_; GdkKeymapKey best_match; - GdkModifierType _tmp7_ = 0; + GdkKeymapKey* _tmp10_; + gint _tmp10__length1; + GdkKeymapKey _tmp15_; + guint _tmp16_; + GdkModifierType _tmp17_ = 0; + GdkKeymapKey _tmp18_; + gint _tmp19_; + GdkModifierType _tmp20_; g_return_val_if_fail (self != NULL, FALSE); _tmp0_ = gdk_keymap_get_default (); _tmp1_ = _g_object_ref0 (_tmp0_); kmap = _tmp1_; - _tmp4_ = gdk_keymap_get_entries_for_keyval (kmap, keyval, &_tmp2_, &_tmp3_); + _tmp2_ = kmap; + _tmp3_ = keyval; + _tmp6_ = gdk_keymap_get_entries_for_keyval (_tmp2_, _tmp3_, &_tmp4_, &_tmp5_); kmk = (g_free (kmk), NULL); - _tmp5_ = (_tmp6_ = _tmp2_, (_tmp6_ == NULL) ? ((gpointer) _tmp6_) : _vala_array_dup1 (_tmp6_, _tmp3_)); - kmk = _tmp5_; - kmk_length1 = _tmp3_; - if (!_tmp4_) { + _tmp7_ = (_tmp4_ != NULL) ? _vala_array_dup1 (_tmp4_, _tmp5_) : ((gpointer) _tmp4_); + _tmp7__length1 = _tmp5_; + kmk = _tmp7_; + kmk_length1 = _tmp7__length1; + _kmk_size_ = kmk_length1; + if (!_tmp6_) { result = FALSE; kmk = (g_free (kmk), NULL); _g_object_unref0 (kmap); if (keycode) { - *keycode = _keycode; + *keycode = _vala_keycode; } if (modmask) { - *modmask = _modmask; + *modmask = _vala_modmask; } return result; } - best_match = kmk[0]; + _tmp8_ = kmk; + _tmp8__length1 = kmk_length1; + _tmp9_ = _tmp8_[0]; + best_match = _tmp9_; + _tmp10_ = kmk; + _tmp10__length1 = kmk_length1; { - GdkKeymapKey* km_collection; - int km_collection_length1; - int km_it; - km_collection = kmk; - km_collection_length1 = kmk_length1; - for (km_it = 0; km_it < kmk_length1; km_it = km_it + 1) { - GdkKeymapKey km; + GdkKeymapKey* km_collection = NULL; + gint km_collection_length1 = 0; + gint _km_collection_size_ = 0; + gint km_it = 0; + km_collection = _tmp10_; + km_collection_length1 = _tmp10__length1; + for (km_it = 0; km_it < _tmp10__length1; km_it = km_it + 1) { + GdkKeymapKey km = {0}; km = km_collection[km_it]; { - if (km.group == self->priv->group) { - best_match = km; + GdkKeymapKey _tmp11_; + gint _tmp12_; + guchar _tmp13_; + _tmp11_ = km; + _tmp12_ = _tmp11_.group; + _tmp13_ = self->priv->group; + if (_tmp12_ == ((gint) _tmp13_)) { + GdkKeymapKey _tmp14_; + _tmp14_ = km; + best_match = _tmp14_; } } } } - _keycode = (guchar) best_match.keycode; - if (best_match.level == 1) { - _tmp7_ = GDK_SHIFT_MASK; + _tmp15_ = best_match; + _tmp16_ = _tmp15_.keycode; + _vala_keycode = (guchar) _tmp16_; + _tmp18_ = best_match; + _tmp19_ = _tmp18_.level; + if (_tmp19_ == 1) { + _tmp17_ = GDK_SHIFT_MASK; } else { - _tmp7_ = 0; + _tmp17_ = 0; } - _modmask = (guint) _tmp7_; + _tmp20_ = _tmp17_; + _vala_modmask = (guint) _tmp20_; result = TRUE; kmk = (g_free (kmk), NULL); _g_object_unref0 (kmap); if (keycode) { - *keycode = _keycode; + *keycode = _vala_keycode; } if (modmask) { - *modmask = _modmask; + *modmask = _vala_modmask; } return result; } static guchar caribou_xadapter_keycode_for_keyval (CaribouXAdapter* self, guint keyval, guint* modmask) { - guint _modmask = 0U; + guint _vala_modmask = 0U; guchar result = '\0'; guchar keycode; - guchar _tmp0_; - guint _tmp1_; - gboolean _tmp2_; + guint _tmp0_; + guchar _tmp1_ = '\0'; + guint _tmp2_ = 0U; + gboolean _tmp3_ = FALSE; g_return_val_if_fail (self != NULL, '\0'); keycode = (guchar) 0; - _tmp2_ = caribou_xadapter_best_keycode_keyval_match (self, keyval, &_tmp0_, &_tmp1_); - keycode = _tmp0_; - _modmask = _tmp1_; - if (!_tmp2_) { - caribou_xadapter_replace_keycode (self, keyval); - keycode = self->priv->reserved_keycode; - _modmask = (guint) 0; + _tmp0_ = keyval; + _tmp3_ = caribou_xadapter_best_keycode_keyval_match (self, _tmp0_, &_tmp1_, &_tmp2_); + keycode = _tmp1_; + _vala_modmask = _tmp2_; + if (!_tmp3_) { + guint _tmp4_; + guchar _tmp5_; + _tmp4_ = keyval; + caribou_xadapter_replace_keycode (self, _tmp4_); + _tmp5_ = self->priv->reserved_keycode; + keycode = _tmp5_; + _vala_modmask = (guint) 0; } result = keycode; if (modmask) { - *modmask = _modmask; + *modmask = _vala_modmask; } return result; } @@ -452,189 +709,351 @@ void caribou_xadapter_keyval_press (CaribouXAdapter* self, guint keyval) { guint mask = 0U; guint _tmp0_; - guchar _tmp1_; + guint _tmp1_ = 0U; + guchar _tmp2_ = '\0'; guchar keycode; + guint _tmp3_; + Display* _tmp5_; + guchar _tmp6_; + Display* _tmp7_; g_return_if_fail (self != NULL); - _tmp1_ = caribou_xadapter_keycode_for_keyval (self, keyval, &_tmp0_); - mask = _tmp0_; - keycode = _tmp1_; - if (mask != 0) { - caribou_xadapter_mod_latch (self, mask); - } - XTestFakeKeyEvent (self->priv->xdisplay, keycode, TRUE, CurrentTime); - XFlush (self->priv->xdisplay); + _tmp0_ = keyval; + _tmp2_ = caribou_xadapter_keycode_for_keyval (self, _tmp0_, &_tmp1_); + mask = _tmp1_; + keycode = _tmp2_; + _tmp3_ = mask; + if (_tmp3_ != ((guint) 0)) { + guint _tmp4_; + _tmp4_ = mask; + caribou_xadapter_mod_latch (self, _tmp4_); + } + _tmp5_ = self->priv->xdisplay; + _tmp6_ = keycode; + XTestFakeKeyEvent (_tmp5_, _tmp6_, TRUE, CurrentTime); + _tmp7_ = self->priv->xdisplay; + XFlush (_tmp7_); } void caribou_xadapter_keyval_release (CaribouXAdapter* self, guint keyval) { - guchar _tmp0_; + guint _tmp0_; + guchar _tmp1_ = '\0'; guchar keycode; + Display* _tmp2_; + Display* _tmp3_; g_return_if_fail (self != NULL); - _tmp0_ = caribou_xadapter_keycode_for_keyval (self, keyval, NULL); - keycode = _tmp0_; - XTestFakeKeyEvent (self->priv->xdisplay, keycode, FALSE, CurrentTime); - XFlush (self->priv->xdisplay); + _tmp0_ = keyval; + _tmp1_ = caribou_xadapter_keycode_for_keyval (self, _tmp0_, NULL); + keycode = _tmp1_; + _tmp2_ = self->priv->xdisplay; + XTestFakeKeyEvent (_tmp2_, keycode, FALSE, CurrentTime); + _tmp3_ = self->priv->xdisplay; + XFlush (_tmp3_); } void caribou_xadapter_mod_lock (CaribouXAdapter* self, guint mask) { + Display* _tmp0_; + gint _tmp1_; + guint _tmp2_; + guint _tmp3_; + Display* _tmp4_; g_return_if_fail (self != NULL); - XkbLockModifiers (self->priv->xdisplay, (guint) XkbUseCoreKbd, mask, mask); - XFlush (self->priv->xdisplay); + _tmp0_ = self->priv->xdisplay; + _tmp1_ = XkbUseCoreKbd; + _tmp2_ = mask; + _tmp3_ = mask; + XkbLockModifiers (_tmp0_, (guint) _tmp1_, _tmp2_, _tmp3_); + _tmp4_ = self->priv->xdisplay; + XFlush (_tmp4_); } void caribou_xadapter_mod_unlock (CaribouXAdapter* self, guint mask) { + Display* _tmp0_; + gint _tmp1_; + guint _tmp2_; + Display* _tmp3_; g_return_if_fail (self != NULL); - XkbLockModifiers (self->priv->xdisplay, (guint) XkbUseCoreKbd, mask, (guint) 0); - XFlush (self->priv->xdisplay); + _tmp0_ = self->priv->xdisplay; + _tmp1_ = XkbUseCoreKbd; + _tmp2_ = mask; + XkbLockModifiers (_tmp0_, (guint) _tmp1_, _tmp2_, (guint) 0); + _tmp3_ = self->priv->xdisplay; + XFlush (_tmp3_); } void caribou_xadapter_mod_latch (CaribouXAdapter* self, guint mask) { + Display* _tmp0_; + gint _tmp1_; + guint _tmp2_; + guint _tmp3_; + Display* _tmp4_; g_return_if_fail (self != NULL); - XkbLatchModifiers (self->priv->xdisplay, (guint) XkbUseCoreKbd, mask, mask); - XFlush (self->priv->xdisplay); + _tmp0_ = self->priv->xdisplay; + _tmp1_ = XkbUseCoreKbd; + _tmp2_ = mask; + _tmp3_ = mask; + XkbLatchModifiers (_tmp0_, (guint) _tmp1_, _tmp2_, _tmp3_); + _tmp4_ = self->priv->xdisplay; + XFlush (_tmp4_); } void caribou_xadapter_mod_unlatch (CaribouXAdapter* self, guint mask) { + Display* _tmp0_; + gint _tmp1_; + guint _tmp2_; + Display* _tmp3_; g_return_if_fail (self != NULL); - XkbLatchModifiers (self->priv->xdisplay, (guint) XkbUseCoreKbd, mask, (guint) 0); - XFlush (self->priv->xdisplay); + _tmp0_ = self->priv->xdisplay; + _tmp1_ = XkbUseCoreKbd; + _tmp2_ = mask; + XkbLatchModifiers (_tmp0_, (guint) _tmp1_, _tmp2_, (guint) 0); + _tmp3_ = self->priv->xdisplay; + XFlush (_tmp3_); } guint caribou_xadapter_get_current_group (CaribouXAdapter* self, gchar** group_name, gchar** variant_name) { - gchar* _group_name = NULL; - gchar* _variant_name = NULL; + gchar* _vala_group_name = NULL; + gchar* _vala_variant_name = NULL; guint result = 0U; - XklConfigRec* _tmp0_ = NULL; + XklConfigRec* _tmp0_; XklConfigRec* config_rec; - gchar* _tmp1_; - gchar* _tmp2_; + XklConfigRec* _tmp1_; + XklEngine* _tmp2_; + XklConfigRec* _tmp3_; + gchar** _tmp4_; + gint _tmp4__length1; + guchar _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + XklConfigRec* _tmp8_; + gchar** _tmp9_; + gint _tmp9__length1; + guchar _tmp10_; + const gchar* _tmp11_; + gchar* _tmp12_; + const gchar* _tmp13_; + guchar _tmp15_; g_return_val_if_fail (self != NULL, 0U); _tmp0_ = xkl_config_rec_new (); config_rec = _tmp0_; - xkl_config_rec_get_from_server (config_rec, self->priv->xkl_engine); - _tmp1_ = g_strdup (config_rec->layouts[self->priv->group]); - _g_free0 (_group_name); - _group_name = _tmp1_; - _tmp2_ = g_strdup (config_rec->variants[self->priv->group]); - _g_free0 (_variant_name); - _variant_name = _tmp2_; - if (_variant_name == NULL) { - gchar* _tmp3_; - _tmp3_ = g_strdup (""); - _g_free0 (_variant_name); - _variant_name = _tmp3_; + _tmp1_ = config_rec; + _tmp2_ = self->priv->xkl_engine; + xkl_config_rec_get_from_server (_tmp1_, _tmp2_); + _tmp3_ = config_rec; + _tmp4_ = _tmp3_->layouts; + _tmp4__length1 = _vala_array_length (_tmp3_->layouts); + _tmp5_ = self->priv->group; + _tmp6_ = _tmp4_[_tmp5_]; + _tmp7_ = g_strdup (_tmp6_); + _g_free0 (_vala_group_name); + _vala_group_name = _tmp7_; + _tmp8_ = config_rec; + _tmp9_ = _tmp8_->variants; + _tmp9__length1 = _vala_array_length (_tmp8_->variants); + _tmp10_ = self->priv->group; + _tmp11_ = _tmp9_[_tmp10_]; + _tmp12_ = g_strdup (_tmp11_); + _g_free0 (_vala_variant_name); + _vala_variant_name = _tmp12_; + _tmp13_ = _vala_variant_name; + if (_tmp13_ == NULL) { + gchar* _tmp14_; + _tmp14_ = g_strdup (""); + _g_free0 (_vala_variant_name); + _vala_variant_name = _tmp14_; } - result = (guint) self->priv->group; + _tmp15_ = self->priv->group; + result = (guint) _tmp15_; _g_object_unref0 (config_rec); if (group_name) { - *group_name = _group_name; + *group_name = _vala_group_name; } else { - _g_free0 (_group_name); + _g_free0 (_vala_group_name); } if (variant_name) { - *variant_name = _variant_name; + *variant_name = _vala_variant_name; } else { - _g_free0 (_variant_name); + _g_free0 (_vala_variant_name); } return result; } void caribou_xadapter_get_groups (CaribouXAdapter* self, gchar*** group_names, int* group_names_length1, gchar*** variant_names, int* variant_names_length1) { - gchar** _group_names = NULL; - int _group_names_length1 = 0; - gchar** _variant_names = NULL; - int _variant_names_length1 = 0; + gchar** _vala_group_names = NULL; + int _vala_group_names_length1 = 0; + gchar** _vala_variant_names = NULL; + int _vala_variant_names_length1 = 0; gint i = 0; - XklConfigRec* _tmp0_ = NULL; + XklConfigRec* _tmp0_; XklConfigRec* config_rec; - gchar** _tmp2_ = NULL; - gchar** _tmp3_ = NULL; + XklConfigRec* _tmp1_; + XklEngine* _tmp2_; + gint _tmp12_; + gchar** _tmp13_ = NULL; + gint _tmp14_; + gchar** _tmp15_ = NULL; g_return_if_fail (self != NULL); _tmp0_ = xkl_config_rec_new (); config_rec = _tmp0_; - xkl_config_rec_get_from_server (config_rec, self->priv->xkl_engine); + _tmp1_ = config_rec; + _tmp2_ = self->priv->xkl_engine; + xkl_config_rec_get_from_server (_tmp1_, _tmp2_); { - gboolean _tmp1_; + gboolean _tmp3_; i = 0; - _tmp1_ = TRUE; + _tmp3_ = TRUE; while (TRUE) { - if (!_tmp1_) { - i++; + gboolean _tmp4_; + gint _tmp6_; + XklConfigRec* _tmp7_; + gchar** _tmp8_; + gint _tmp8__length1; + gint _tmp9_; + const gchar* _tmp10_; + _tmp4_ = _tmp3_; + if (!_tmp4_) { + gint _tmp5_; + _tmp5_ = i; + i = _tmp5_ + 1; } - _tmp1_ = FALSE; - if (!(i < 4)) { + _tmp3_ = FALSE; + _tmp6_ = i; + if (!(_tmp6_ < 4)) { break; } - if (config_rec->layouts[i] == NULL) { - i--; + _tmp7_ = config_rec; + _tmp8_ = _tmp7_->layouts; + _tmp8__length1 = _vala_array_length (_tmp7_->layouts); + _tmp9_ = i; + _tmp10_ = _tmp8_[_tmp9_]; + if (_tmp10_ == NULL) { + gint _tmp11_; + _tmp11_ = i; + i = _tmp11_ - 1; break; } } } - _tmp2_ = g_new0 (gchar*, (i + 1) + 1); - _group_names = (_vala_array_free (_group_names, _group_names_length1, (GDestroyNotify) g_free), NULL); - _group_names = _tmp2_; - _group_names_length1 = i + 1; - _tmp3_ = g_new0 (gchar*, (i + 1) + 1); - _variant_names = (_vala_array_free (_variant_names, _variant_names_length1, (GDestroyNotify) g_free), NULL); - _variant_names = _tmp3_; - _variant_names_length1 = i + 1; + _tmp12_ = i; + _tmp13_ = g_new0 (gchar*, (_tmp12_ + 1) + 1); + _vala_group_names = (_vala_array_free (_vala_group_names, _vala_group_names_length1, (GDestroyNotify) g_free), NULL); + _vala_group_names = _tmp13_; + _vala_group_names_length1 = _tmp12_ + 1; + _tmp14_ = i; + _tmp15_ = g_new0 (gchar*, (_tmp14_ + 1) + 1); + _vala_variant_names = (_vala_array_free (_vala_variant_names, _vala_variant_names_length1, (GDestroyNotify) g_free), NULL); + _vala_variant_names = _tmp15_; + _vala_variant_names_length1 = _tmp14_ + 1; { - gboolean _tmp4_; - _tmp4_ = TRUE; + gboolean _tmp16_; + _tmp16_ = TRUE; while (TRUE) { - gchar* _tmp5_; - gchar* _tmp6_; - if (!_tmp4_) { - i--; + gboolean _tmp17_; + gint _tmp19_; + gchar** _tmp20_; + gint _tmp20__length1; + gint _tmp21_; + XklConfigRec* _tmp22_; + gchar** _tmp23_; + gint _tmp23__length1; + gint _tmp24_; + const gchar* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; + XklConfigRec* _tmp28_; + gchar** _tmp29_; + gint _tmp29__length1; + gint _tmp30_; + const gchar* _tmp31_; + _tmp17_ = _tmp16_; + if (!_tmp17_) { + gint _tmp18_; + _tmp18_ = i; + i = _tmp18_ - 1; } - _tmp4_ = FALSE; - if (!(i >= 0)) { + _tmp16_ = FALSE; + _tmp19_ = i; + if (!(_tmp19_ >= 0)) { break; } - _tmp5_ = g_strdup (config_rec->layouts[i]); - _tmp6_ = _tmp5_; - _g_free0 (_group_names[i]); - _group_names[i] = _tmp6_; - if (config_rec->variants[i] != NULL) { - gchar* _tmp7_; - gchar* _tmp8_; - _tmp7_ = g_strdup (config_rec->variants[i]); - _tmp8_ = _tmp7_; - _g_free0 (_variant_names[i]); - _variant_names[i] = _tmp8_; + _tmp20_ = _vala_group_names; + _tmp20__length1 = _vala_group_names_length1; + _tmp21_ = i; + _tmp22_ = config_rec; + _tmp23_ = _tmp22_->layouts; + _tmp23__length1 = _vala_array_length (_tmp22_->layouts); + _tmp24_ = i; + _tmp25_ = _tmp23_[_tmp24_]; + _tmp26_ = g_strdup (_tmp25_); + _g_free0 (_tmp20_[_tmp21_]); + _tmp20_[_tmp21_] = _tmp26_; + _tmp27_ = _tmp20_[_tmp21_]; + _tmp28_ = config_rec; + _tmp29_ = _tmp28_->variants; + _tmp29__length1 = _vala_array_length (_tmp28_->variants); + _tmp30_ = i; + _tmp31_ = _tmp29_[_tmp30_]; + if (_tmp31_ != NULL) { + gchar** _tmp32_; + gint _tmp32__length1; + gint _tmp33_; + XklConfigRec* _tmp34_; + gchar** _tmp35_; + gint _tmp35__length1; + gint _tmp36_; + const gchar* _tmp37_; + gchar* _tmp38_; + gchar* _tmp39_; + _tmp32_ = _vala_variant_names; + _tmp32__length1 = _vala_variant_names_length1; + _tmp33_ = i; + _tmp34_ = config_rec; + _tmp35_ = _tmp34_->variants; + _tmp35__length1 = _vala_array_length (_tmp34_->variants); + _tmp36_ = i; + _tmp37_ = _tmp35_[_tmp36_]; + _tmp38_ = g_strdup (_tmp37_); + _g_free0 (_tmp32_[_tmp33_]); + _tmp32_[_tmp33_] = _tmp38_; + _tmp39_ = _tmp32_[_tmp33_]; } else { - gchar* _tmp9_; - gchar* _tmp10_; - _tmp9_ = g_strdup (""); - _tmp10_ = _tmp9_; - _g_free0 (_variant_names[i]); - _variant_names[i] = _tmp10_; + gchar** _tmp40_; + gint _tmp40__length1; + gint _tmp41_; + gchar* _tmp42_; + gchar* _tmp43_; + _tmp40_ = _vala_variant_names; + _tmp40__length1 = _vala_variant_names_length1; + _tmp41_ = i; + _tmp42_ = g_strdup (""); + _g_free0 (_tmp40_[_tmp41_]); + _tmp40_[_tmp41_] = _tmp42_; + _tmp43_ = _tmp40_[_tmp41_]; } } } _g_object_unref0 (config_rec); if (group_names) { - *group_names = _group_names; + *group_names = _vala_group_names; } else { - _group_names = (_vala_array_free (_group_names, _group_names_length1, (GDestroyNotify) g_free), NULL); + _vala_group_names = (_vala_array_free (_vala_group_names, _vala_group_names_length1, (GDestroyNotify) g_free), NULL); } if (group_names_length1) { - *group_names_length1 = _group_names_length1; + *group_names_length1 = _vala_group_names_length1; } if (variant_names) { - *variant_names = _variant_names; + *variant_names = _vala_variant_names; } else { - _variant_names = (_vala_array_free (_variant_names, _variant_names_length1, (GDestroyNotify) g_free), NULL); + _vala_variant_names = (_vala_array_free (_vala_variant_names, _vala_variant_names_length1, (GDestroyNotify) g_free), NULL); } if (variant_names_length1) { - *variant_names_length1 = _variant_names_length1; + *variant_names_length1 = _vala_variant_names_length1; } } @@ -642,49 +1061,113 @@ void caribou_xadapter_register_key_func (CaribouXAdapter* self, guint keyval, CaribouXAdapterKeyButtonCallback func, void* func_target) { guchar keycode = '\0'; guint modmask = 0U; - guchar _tmp0_; - guint _tmp1_; - gboolean _tmp2_; + guint _tmp0_; + guchar _tmp1_ = '\0'; + guint _tmp2_ = 0U; + gboolean _tmp3_ = FALSE; + CaribouXAdapterKeyButtonCallback _tmp5_; + void* _tmp5__target; g_return_if_fail (self != NULL); - _tmp2_ = caribou_xadapter_best_keycode_keyval_match (self, keyval, &_tmp0_, &_tmp1_); - keycode = _tmp0_; - modmask = _tmp1_; - if (!_tmp2_) { - g_warning ("xadapter.vala:290: No good keycode for %d", (gint) keyval); + _tmp0_ = keyval; + _tmp3_ = caribou_xadapter_best_keycode_keyval_match (self, _tmp0_, &_tmp1_, &_tmp2_); + keycode = _tmp1_; + modmask = _tmp2_; + if (!_tmp3_) { + guint _tmp4_; + _tmp4_ = keyval; + g_warning ("xadapter.vala:290: No good keycode for %d", (gint) _tmp4_); return; } - if (func != NULL) { - CaribouXAdapterKeyButtonHandler* _tmp3_ = NULL; + _tmp5_ = func; + _tmp5__target = func_target; + if (_tmp5_ != NULL) { + CaribouXAdapterKeyButtonCallback _tmp6_; + void* _tmp6__target; + CaribouXAdapterKeyButtonHandler* _tmp7_; CaribouXAdapterKeyButtonHandler* handler; - CaribouXAdapterKeyButtonHandler* _tmp4_; - _tmp3_ = caribou_xadapter_key_button_handler_new (func, func_target); - handler = _tmp3_; - _tmp4_ = _caribou_xadapter_key_button_handler_ref0 (handler); - g_hash_table_insert (self->priv->key_funcs, GUINT_TO_POINTER ((guint) keycode), _tmp4_); - XGrabKey (self->priv->xdisplay, (gint) keycode, (guint) 0, (Window) self->priv->xid, TRUE, (gint) GrabModeAsync, (gint) GrabModeAsync); + GHashTable* _tmp8_; + guchar _tmp9_; + CaribouXAdapterKeyButtonHandler* _tmp10_; + CaribouXAdapterKeyButtonHandler* _tmp11_; + Display* _tmp12_; + guchar _tmp13_; + XID _tmp14_; + _tmp6_ = func; + _tmp6__target = func_target; + _tmp7_ = caribou_xadapter_key_button_handler_new (_tmp6_, _tmp6__target); + handler = _tmp7_; + _tmp8_ = self->priv->key_funcs; + _tmp9_ = keycode; + _tmp10_ = handler; + _tmp11_ = _caribou_xadapter_key_button_handler_ref0 (_tmp10_); + g_hash_table_insert (_tmp8_, GUINT_TO_POINTER ((guint) _tmp9_), _tmp11_); + _tmp12_ = self->priv->xdisplay; + _tmp13_ = keycode; + _tmp14_ = self->priv->xid; + XGrabKey (_tmp12_, (gint) _tmp13_, (guint) 0, (Window) _tmp14_, TRUE, (gint) GrabModeAsync, (gint) GrabModeAsync); _caribou_xadapter_key_button_handler_unref0 (handler); } else { - g_hash_table_remove (self->priv->key_funcs, GUINT_TO_POINTER ((guint) keycode)); - XUngrabKey (self->priv->xdisplay, (gint) keycode, (guint) 0, (Window) self->priv->xid); + GHashTable* _tmp15_; + guchar _tmp16_; + Display* _tmp17_; + guchar _tmp18_; + XID _tmp19_; + _tmp15_ = self->priv->key_funcs; + _tmp16_ = keycode; + g_hash_table_remove (_tmp15_, GUINT_TO_POINTER ((guint) _tmp16_)); + _tmp17_ = self->priv->xdisplay; + _tmp18_ = keycode; + _tmp19_ = self->priv->xid; + XUngrabKey (_tmp17_, (gint) _tmp18_, (guint) 0, (Window) _tmp19_); } } void caribou_xadapter_register_button_func (CaribouXAdapter* self, guint button, CaribouXAdapterKeyButtonCallback func, void* func_target) { + CaribouXAdapterKeyButtonCallback _tmp0_; + void* _tmp0__target; g_return_if_fail (self != NULL); - if (func != NULL) { - CaribouXAdapterKeyButtonHandler* _tmp0_ = NULL; + _tmp0_ = func; + _tmp0__target = func_target; + if (_tmp0_ != NULL) { + CaribouXAdapterKeyButtonCallback _tmp1_; + void* _tmp1__target; + CaribouXAdapterKeyButtonHandler* _tmp2_; CaribouXAdapterKeyButtonHandler* handler; - CaribouXAdapterKeyButtonHandler* _tmp1_; - _tmp0_ = caribou_xadapter_key_button_handler_new (func, func_target); - handler = _tmp0_; - _tmp1_ = _caribou_xadapter_key_button_handler_ref0 (handler); - g_hash_table_insert (self->priv->button_funcs, GUINT_TO_POINTER (button), _tmp1_); - XGrabButton (self->priv->xdisplay, button, (guint) 0, (Window) self->priv->xid, TRUE, (guint) (ButtonPressMask | ButtonReleaseMask), (gint) GrabModeAsync, (gint) GrabModeAsync, (Window) 0, (guint) 0); + GHashTable* _tmp3_; + guint _tmp4_; + CaribouXAdapterKeyButtonHandler* _tmp5_; + CaribouXAdapterKeyButtonHandler* _tmp6_; + Display* _tmp7_; + guint _tmp8_; + XID _tmp9_; + _tmp1_ = func; + _tmp1__target = func_target; + _tmp2_ = caribou_xadapter_key_button_handler_new (_tmp1_, _tmp1__target); + handler = _tmp2_; + _tmp3_ = self->priv->button_funcs; + _tmp4_ = button; + _tmp5_ = handler; + _tmp6_ = _caribou_xadapter_key_button_handler_ref0 (_tmp5_); + g_hash_table_insert (_tmp3_, GUINT_TO_POINTER (_tmp4_), _tmp6_); + _tmp7_ = self->priv->xdisplay; + _tmp8_ = button; + _tmp9_ = self->priv->xid; + XGrabButton (_tmp7_, _tmp8_, (guint) 0, (Window) _tmp9_, TRUE, (guint) (ButtonPressMask | ButtonReleaseMask), (gint) GrabModeAsync, (gint) GrabModeAsync, (Window) 0, (guint) 0); _caribou_xadapter_key_button_handler_unref0 (handler); } else { - g_hash_table_remove (self->priv->button_funcs, GUINT_TO_POINTER (button)); - XUngrabButton (self->priv->xdisplay, button, (guint) 0, (Window) self->priv->xid); + GHashTable* _tmp10_; + guint _tmp11_; + Display* _tmp12_; + guint _tmp13_; + XID _tmp14_; + _tmp10_ = self->priv->button_funcs; + _tmp11_ = button; + g_hash_table_remove (_tmp10_, GUINT_TO_POINTER (_tmp11_)); + _tmp12_ = self->priv->xdisplay; + _tmp13_ = button; + _tmp14_ = self->priv->xid; + XUngrabButton (_tmp12_, _tmp13_, (guint) 0, (Window) _tmp14_); } } @@ -705,7 +1188,8 @@ typedef void (*GMarshalFunc_VOID__UINT_STRING_STRING) (gpointer data1, guint arg_1, const char* arg_2, const char* arg_3, gpointer data2); register GMarshalFunc_VOID__UINT_STRING_STRING callback; register GCClosure * cc; - register gpointer data1, data2; + register gpointer data1; + register gpointer data2; cc = (GCClosure *) closure; g_return_if_fail (n_param_values == 4); if (G_CCLOSURE_SWAP_DATA (closure)) { @@ -741,50 +1225,100 @@ GdkWindow* _tmp0_ = NULL; GdkWindow* _tmp1_; GdkWindow* rootwin; - GdkDisplay* _tmp2_ = NULL; - Display* _tmp3_ = NULL; - Window _tmp4_; - XkbDescRec* _tmp5_ = NULL; - XklEngine* _tmp6_ = NULL; - XklEngine* _tmp7_; - XklState* _tmp8_ = NULL; - XkbStateRec _tmp9_ = {0}; - GHashTable* _tmp10_ = NULL; - GHashTable* _tmp11_ = NULL; + GdkWindow* _tmp2_; + GdkDisplay* _tmp3_ = NULL; + Display* _tmp4_ = NULL; + GdkWindow* _tmp5_; + Window _tmp6_ = 0; + Display* _tmp7_; + gint _tmp8_; + gint _tmp9_; + XkbDescRec* _tmp10_ = NULL; + Display* _tmp11_; + XklEngine* _tmp12_ = NULL; + XklEngine* _tmp13_; + XklEngine* _tmp14_; + XklEngine* _tmp15_; + XklState* _tmp16_ = NULL; + XklState* _tmp17_; + gint32 _tmp18_; + XklEngine* _tmp19_; + Display* _tmp20_; + gint _tmp21_; + XkbStateRec _tmp22_ = {0}; + XkbStateRec _tmp23_; + guchar _tmp24_; + GHashFunc _tmp25_; + GEqualFunc _tmp26_; + GHashTable* _tmp27_; + GHashFunc _tmp28_; + GEqualFunc _tmp29_; + GHashTable* _tmp30_; + Display* _tmp31_; + gint _tmp32_; + gint _tmp33_; + gint _tmp34_; + gint _tmp35_; + gint _tmp36_; parent_class = G_OBJECT_CLASS (caribou_xadapter_parent_class); obj = parent_class->constructor (type, n_construct_properties, construct_properties); self = CARIBOU_XADAPTER (obj); _tmp0_ = gdk_get_default_root_window (); _tmp1_ = _g_object_ref0 (_tmp0_); rootwin = _tmp1_; - _tmp2_ = gdk_window_get_display (rootwin); - _tmp3_ = gdk_x11_display_get_xdisplay (_tmp2_); - self->priv->xdisplay = _tmp3_; - _tmp4_ = gdk_x11_window_get_xid (rootwin); - self->priv->xid = (XID) _tmp4_; - _tmp5_ = XkbGetKeyboard (self->priv->xdisplay, (guint) XkbGBN_AllComponentsMask, (guint) XkbUseCoreKbd); + _tmp2_ = rootwin; + _tmp3_ = gdk_window_get_display (_tmp2_); + _tmp4_ = gdk_x11_display_get_xdisplay (_tmp3_); + self->priv->xdisplay = _tmp4_; + _tmp5_ = rootwin; + _tmp6_ = gdk_x11_window_get_xid (_tmp5_); + self->priv->xid = (XID) _tmp6_; + _tmp7_ = self->priv->xdisplay; + _tmp8_ = XkbGBN_AllComponentsMask; + _tmp9_ = XkbUseCoreKbd; + _tmp10_ = XkbGetKeyboard (_tmp7_, (guint) _tmp8_, (guint) _tmp9_); _0 (self->priv->xkbdesc); - self->priv->xkbdesc = _tmp5_; - _tmp6_ = xkl_engine_get_instance (self->priv->xdisplay); - _tmp7_ = _g_object_ref0 (_tmp6_); + self->priv->xkbdesc = _tmp10_; + _tmp11_ = self->priv->xdisplay; + _tmp12_ = xkl_engine_get_instance (_tmp11_); + _tmp13_ = _g_object_ref0 (_tmp12_); _g_object_unref0 (self->priv->xkl_engine); - self->priv->xkl_engine = _tmp7_; - xkl_engine_start_listen (self->priv->xkl_engine, (guint) XKLL_TRACK_KEYBOARD_STATE); - _tmp8_ = xkl_engine_get_current_state (self->priv->xkl_engine); - xkl_state = _tmp8_; - self->priv->group = (guchar) xkl_state->group; - g_signal_connect_object (self->priv->xkl_engine, "X-state-changed", (GCallback) caribou_xadapter_xkl_state_changed, (GObject*) self, G_CONNECT_AFTER); - XkbGetState (self->priv->xdisplay, (guint) XkbUseCoreKbd, &_tmp9_); - xkb_state = _tmp9_; - self->priv->modifiers = xkb_state.mods; + self->priv->xkl_engine = _tmp13_; + _tmp14_ = self->priv->xkl_engine; + xkl_engine_start_listen (_tmp14_, (guint) XKLL_TRACK_KEYBOARD_STATE); + _tmp15_ = self->priv->xkl_engine; + _tmp16_ = xkl_engine_get_current_state (_tmp15_); + xkl_state = _tmp16_; + _tmp17_ = xkl_state; + _tmp18_ = _tmp17_->group; + self->priv->group = (guchar) _tmp18_; + _tmp19_ = self->priv->xkl_engine; + g_signal_connect_object (_tmp19_, "X-state-changed", (GCallback) caribou_xadapter_xkl_state_changed, (GObject*) self, G_CONNECT_AFTER); + _tmp20_ = self->priv->xdisplay; + _tmp21_ = XkbUseCoreKbd; + XkbGetState (_tmp20_, (guint) _tmp21_, &_tmp22_); + xkb_state = _tmp22_; + _tmp23_ = xkb_state; + _tmp24_ = _tmp23_.mods; + self->priv->modifiers = _tmp24_; self->priv->reserved_keycode = (guchar) 0; - _tmp10_ = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, _caribou_xadapter_key_button_handler_unref0_); + _tmp25_ = g_direct_hash; + _tmp26_ = g_direct_equal; + _tmp27_ = g_hash_table_new_full (_tmp25_, _tmp26_, NULL, _caribou_xadapter_key_button_handler_unref0_); _g_hash_table_unref0 (self->priv->button_funcs); - self->priv->button_funcs = _tmp10_; - _tmp11_ = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, _caribou_xadapter_key_button_handler_unref0_); + self->priv->button_funcs = _tmp27_; + _tmp28_ = g_direct_hash; + _tmp29_ = g_direct_equal; + _tmp30_ = g_hash_table_new_full (_tmp28_, _tmp29_, NULL, _caribou_xadapter_key_button_handler_unref0_); _g_hash_table_unref0 (self->priv->key_funcs); - self->priv->key_funcs = _tmp11_; - XkbSelectEvents (self->priv->xdisplay, (guint) XkbUseCoreKbd, (gulong) (XkbStateNotifyMask | XkbAccessXNotifyMask), (gulong) (XkbStateNotifyMask | XkbAccessXNotifyMask)); + self->priv->key_funcs = _tmp30_; + _tmp31_ = self->priv->xdisplay; + _tmp32_ = XkbUseCoreKbd; + _tmp33_ = XkbStateNotifyMask; + _tmp34_ = XkbAccessXNotifyMask; + _tmp35_ = XkbStateNotifyMask; + _tmp36_ = XkbAccessXNotifyMask; + XkbSelectEvents (_tmp31_, (guint) _tmp32_, (gulong) (_tmp33_ | _tmp34_), (gulong) (_tmp35_ | _tmp36_)); gdk_window_add_filter (GDK_WINDOW (NULL), _caribou_xadapter_x_event_filter_gdk_filter_func, self); _g_object_unref0 (rootwin); return obj; @@ -793,8 +1327,12 @@ static CaribouXAdapterKeyButtonHandler* caribou_xadapter_key_button_handler_construct (GType object_type, CaribouXAdapterKeyButtonCallback cb, void* cb_target) { CaribouXAdapterKeyButtonHandler* self = NULL; + CaribouXAdapterKeyButtonCallback _tmp0_; + void* _tmp0__target; self = (CaribouXAdapterKeyButtonHandler*) g_type_create_instance (object_type); - caribou_xadapter_key_button_handler_set_cb (self, cb, cb_target); + _tmp0_ = cb; + _tmp0__target = cb_target; + caribou_xadapter_key_button_handler_set_cb (self, _tmp0_, _tmp0__target); return self; } @@ -807,24 +1345,32 @@ static CaribouXAdapterKeyButtonCallback caribou_xadapter_key_button_handler_get_cb (CaribouXAdapterKeyButtonHandler* self, gpointer* result_target) { CaribouXAdapterKeyButtonCallback result; CaribouXAdapterKeyButtonCallback _tmp0_; + void* _tmp0__target; + CaribouXAdapterKeyButtonCallback _tmp1_; + void* _tmp1__target; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = self->priv->_cb; - *result_target = self->priv->_cb_target; - result = _tmp0_; + _tmp0__target = self->priv->_cb_target; + _tmp1_ = _tmp0_; + _tmp1__target = _tmp0__target; + *result_target = _tmp1__target; + result = _tmp1_; return result; } static void caribou_xadapter_key_button_handler_set_cb (CaribouXAdapterKeyButtonHandler* self, CaribouXAdapterKeyButtonCallback value, gpointer value_target) { CaribouXAdapterKeyButtonCallback _tmp0_; + void* _tmp0__target; g_return_if_fail (self != NULL); _tmp0_ = value; + _tmp0__target = value_target; (self->priv->_cb_target_destroy_notify == NULL) ? NULL : (self->priv->_cb_target_destroy_notify (self->priv->_cb_target), NULL); self->priv->_cb = NULL; self->priv->_cb_target = NULL; self->priv->_cb_target_destroy_notify = NULL; self->priv->_cb = _tmp0_; - self->priv->_cb_target = value_target; + self->priv->_cb_target = _tmp0__target; self->priv->_cb_target_destroy_notify = NULL; } @@ -1011,8 +1557,12 @@ static void caribou_xadapter_finalize (GObject* obj) { CaribouXAdapter * self; + XkbDescRec* _tmp0_; + gint _tmp1_; self = CARIBOU_XADAPTER (obj); - XkbFreeKeyboard (self->priv->xkbdesc, (guint) XkbGBN_AllComponentsMask, TRUE); + _tmp0_ = self->priv->xkbdesc; + _tmp1_ = XkbGBN_AllComponentsMask; + XkbFreeKeyboard (_tmp0_, (guint) _tmp1_, TRUE); _0 (self->priv->xkbdesc); _g_object_unref0 (self->priv->xkl_engine); _g_hash_table_unref0 (self->priv->button_funcs); @@ -1051,4 +1601,16 @@ } +static gint _vala_array_length (gpointer array) { + int length; + length = 0; + if (array) { + while (((gpointer*) array)[length]) { + length++; + } + } + return length; +} + + diff -Nru caribou-0.3.5/libcaribou/xml-deserializer.c caribou-0.3.91/libcaribou/xml-deserializer.c --- caribou-0.3.5/libcaribou/xml-deserializer.c 2011-08-12 07:45:38.000000000 +0000 +++ caribou-0.3.91/libcaribou/xml-deserializer.c 2011-09-05 23:45:29.000000000 +0000 @@ -1,4 +1,4 @@ -/* xml-deserializer.c generated by valac 0.12.0, the Vala compiler +/* xml-deserializer.c generated by valac 0.13.3, the Vala compiler * generated from xml-deserializer.vala, do not modify */ @@ -155,52 +155,71 @@ gchar* caribou_xml_deserializer_get_layout_file_inner (const gchar* data_dir, const gchar* group, const gchar* variant) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + const gchar* _tmp2_; const gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; - gchar** _tmp5_ = NULL; + const gchar* _tmp5_; + const gchar* _tmp6_ = NULL; + gchar* _tmp7_ = NULL; + gchar** _tmp8_ = NULL; gchar** files; gint files_length1; gint _files_size_; + gchar** _tmp9_; + gint _tmp9__length1; g_return_val_if_fail (data_dir != NULL, NULL); g_return_val_if_fail (group != NULL, NULL); g_return_val_if_fail (variant != NULL, NULL); - _tmp0_ = string_to_string (group); - _tmp1_ = string_to_string (variant); - _tmp2_ = g_strconcat (_tmp0_, "_", _tmp1_, ".xml", NULL); - _tmp3_ = string_to_string (group); - _tmp4_ = g_strconcat (_tmp3_, ".xml", NULL); - _tmp5_ = g_new0 (gchar*, 2 + 1); - _tmp5_[0] = _tmp2_; - _tmp5_[1] = _tmp4_; - files = _tmp5_; + _tmp0_ = group; + _tmp1_ = string_to_string (_tmp0_); + _tmp2_ = variant; + _tmp3_ = string_to_string (_tmp2_); + _tmp4_ = g_strconcat (_tmp1_, "_", _tmp3_, ".xml", NULL); + _tmp5_ = group; + _tmp6_ = string_to_string (_tmp5_); + _tmp7_ = g_strconcat (_tmp6_, ".xml", NULL); + _tmp8_ = g_new0 (gchar*, 2 + 1); + _tmp8_[0] = _tmp4_; + _tmp8_[1] = _tmp7_; + files = _tmp8_; files_length1 = 2; - _files_size_ = 2; + _files_size_ = files_length1; + _tmp9_ = files; + _tmp9__length1 = files_length1; { - gchar** fn_collection; - int fn_collection_length1; - int fn_it; - fn_collection = files; - fn_collection_length1 = files_length1; - for (fn_it = 0; fn_it < files_length1; fn_it = fn_it + 1) { - gchar* _tmp6_; - gchar* fn; - _tmp6_ = g_strdup (fn_collection[fn_it]); - fn = _tmp6_; + gchar** fn_collection = NULL; + gint fn_collection_length1 = 0; + gint _fn_collection_size_ = 0; + gint fn_it = 0; + fn_collection = _tmp9_; + fn_collection_length1 = _tmp9__length1; + for (fn_it = 0; fn_it < _tmp9__length1; fn_it = fn_it + 1) { + gchar* _tmp10_; + gchar* fn = NULL; + _tmp10_ = g_strdup (fn_collection[fn_it]); + fn = _tmp10_; { - gchar* _tmp7_ = NULL; + const gchar* _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_ = NULL; gchar* layout_fn; - GFile* _tmp8_ = NULL; + const gchar* _tmp14_; + GFile* _tmp15_ = NULL; GFile* fp; - gboolean _tmp9_; - _tmp7_ = g_build_filename (data_dir, fn, NULL); - layout_fn = _tmp7_; - _tmp8_ = g_file_new_for_path (layout_fn); - fp = _tmp8_; - _tmp9_ = g_file_query_exists (fp, NULL); - if (_tmp9_) { + GFile* _tmp16_; + gboolean _tmp17_ = FALSE; + _tmp11_ = data_dir; + _tmp12_ = fn; + _tmp13_ = g_build_filename (_tmp11_, _tmp12_, NULL); + layout_fn = _tmp13_; + _tmp14_ = layout_fn; + _tmp15_ = g_file_new_for_path (_tmp14_); + fp = _tmp15_; + _tmp16_ = fp; + _tmp17_ = g_file_query_exists (_tmp16_, NULL); + if (_tmp17_) { result = layout_fn; _g_object_unref0 (fp); _g_free0 (fn); @@ -236,11 +255,17 @@ const gchar* _tmp0_ = NULL; gchar* _tmp1_; gchar* custom_dir; - const gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar** _tmp5_; - gchar** _tmp6_ = NULL; - GError* _tmp13_ = NULL; + const gchar* _tmp2_; + const gchar* _tmp6_ = NULL; + const gchar* _tmp7_; + gchar* _tmp8_ = NULL; + gchar** _tmp9_; + gchar** _tmp10_ = NULL; + GList* _tmp15_; + GList* _tmp22_; + const gchar* _tmp27_; + const gchar* _tmp28_; + GError* _tmp29_; GError * _inner_error_ = NULL; g_return_val_if_fail (keyboard_type != NULL, NULL); g_return_val_if_fail (group != NULL, NULL); @@ -249,49 +274,69 @@ _tmp0_ = g_getenv ("CARIBOU_LAYOUTS_DIR"); _tmp1_ = g_strdup (_tmp0_); custom_dir = _tmp1_; - if (custom_dir != NULL) { - gchar* _tmp2_ = NULL; - _tmp2_ = g_build_filename (custom_dir, "layouts", keyboard_type, NULL); - dirs = g_list_append (dirs, _tmp2_); - } - _tmp3_ = g_get_user_data_dir (); - _tmp4_ = g_build_filename (_tmp3_, "caribou", "layouts", keyboard_type, NULL); - dirs = g_list_append (dirs, _tmp4_); - _tmp6_ = _tmp5_ = g_get_system_data_dirs (); - { - gchar** dir_collection; - int dir_collection_length1; - int dir_it; - dir_collection = _tmp6_; - dir_collection_length1 = _vala_array_length (_tmp5_); - for (dir_it = 0; dir_it < _vala_array_length (_tmp5_); dir_it = dir_it + 1) { - gchar* _tmp7_; - gchar* dir; - _tmp7_ = g_strdup (dir_collection[dir_it]); - dir = _tmp7_; + _tmp2_ = custom_dir; + if (_tmp2_ != NULL) { + const gchar* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_ = NULL; + _tmp3_ = custom_dir; + _tmp4_ = keyboard_type; + _tmp5_ = g_build_filename (_tmp3_, "layouts", _tmp4_, NULL); + dirs = g_list_append (dirs, _tmp5_); + } + _tmp6_ = g_get_user_data_dir (); + _tmp7_ = keyboard_type; + _tmp8_ = g_build_filename (_tmp6_, "caribou", "layouts", _tmp7_, NULL); + dirs = g_list_append (dirs, _tmp8_); + _tmp10_ = _tmp9_ = g_get_system_data_dirs (); + { + gchar** dir_collection = NULL; + gint dir_collection_length1 = 0; + gint _dir_collection_size_ = 0; + gint dir_it = 0; + dir_collection = _tmp10_; + dir_collection_length1 = _vala_array_length (_tmp9_); + for (dir_it = 0; dir_it < _vala_array_length (_tmp9_); dir_it = dir_it + 1) { + gchar* _tmp11_; + gchar* dir = NULL; + _tmp11_ = g_strdup (dir_collection[dir_it]); + dir = _tmp11_; { - gchar* _tmp8_ = NULL; - _tmp8_ = g_build_filename (dir, "caribou", "layouts", keyboard_type, NULL); - dirs = g_list_append (dirs, _tmp8_); + const gchar* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_ = NULL; + _tmp12_ = dir; + _tmp13_ = keyboard_type; + _tmp14_ = g_build_filename (_tmp12_, "caribou", "layouts", _tmp13_, NULL); + dirs = g_list_append (dirs, _tmp14_); _g_free0 (dir); } } } + _tmp15_ = dirs; { - GList* data_dir_collection; - GList* data_dir_it; - data_dir_collection = dirs; + GList* data_dir_collection = NULL; + GList* data_dir_it = NULL; + data_dir_collection = _tmp15_; for (data_dir_it = data_dir_collection; data_dir_it != NULL; data_dir_it = data_dir_it->next) { - gchar* _tmp9_; - gchar* data_dir; - _tmp9_ = g_strdup ((const gchar*) data_dir_it->data); - data_dir = _tmp9_; + gchar* _tmp16_; + gchar* data_dir = NULL; + _tmp16_ = g_strdup ((const gchar*) data_dir_it->data); + data_dir = _tmp16_; { - gchar* _tmp10_ = NULL; + const gchar* _tmp17_; + const gchar* _tmp18_; + const gchar* _tmp19_; + gchar* _tmp20_ = NULL; gchar* fn; - _tmp10_ = caribou_xml_deserializer_get_layout_file_inner (data_dir, group, variant); - fn = _tmp10_; - if (fn != NULL) { + const gchar* _tmp21_; + _tmp17_ = data_dir; + _tmp18_ = group; + _tmp19_ = variant; + _tmp20_ = caribou_xml_deserializer_get_layout_file_inner (_tmp17_, _tmp18_, _tmp19_); + fn = _tmp20_; + _tmp21_ = fn; + if (_tmp21_ != NULL) { result = fn; _g_free0 (data_dir); _g_free0 (custom_dir); @@ -303,21 +348,26 @@ } } } + _tmp22_ = dirs; { - GList* data_dir_collection; - GList* data_dir_it; - data_dir_collection = dirs; + GList* data_dir_collection = NULL; + GList* data_dir_it = NULL; + data_dir_collection = _tmp22_; for (data_dir_it = data_dir_collection; data_dir_it != NULL; data_dir_it = data_dir_it->next) { - gchar* _tmp11_; - gchar* data_dir; - _tmp11_ = g_strdup ((const gchar*) data_dir_it->data); - data_dir = _tmp11_; + gchar* _tmp23_; + gchar* data_dir = NULL; + _tmp23_ = g_strdup ((const gchar*) data_dir_it->data); + data_dir = _tmp23_; { - gchar* _tmp12_ = NULL; + const gchar* _tmp24_; + gchar* _tmp25_ = NULL; gchar* fn; - _tmp12_ = caribou_xml_deserializer_get_layout_file_inner (data_dir, "us", ""); - fn = _tmp12_; - if (fn != NULL) { + const gchar* _tmp26_; + _tmp24_ = data_dir; + _tmp25_ = caribou_xml_deserializer_get_layout_file_inner (_tmp24_, "us", ""); + fn = _tmp25_; + _tmp26_ = fn; + if (_tmp26_ != NULL) { result = fn; _g_free0 (data_dir); _g_free0 (custom_dir); @@ -329,8 +379,10 @@ } } } - _tmp13_ = g_error_new (G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "Could not find layout file for %s %s", group, variant); - _inner_error_ = _tmp13_; + _tmp27_ = group; + _tmp28_ = variant; + _tmp29_ = g_error_new (G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "Could not find layout file for %s %s", _tmp27_, _tmp28_); + _inner_error_ = _tmp29_; if (_inner_error_->domain == G_IO_ERROR) { g_propagate_error (error, _inner_error_); _g_free0 (custom_dir); @@ -351,38 +403,65 @@ CaribouGroupModel* caribou_xml_deserializer_load_group (const gchar* keyboard_type, const gchar* group, const gchar* variant) { CaribouGroupModel* result = NULL; xmlDoc* doc = NULL; - gchar* _tmp0_ = NULL; - gchar* fn; - xmlDoc* _tmp1_ = NULL; - CaribouGroupModel* _tmp3_ = NULL; + const gchar* _tmp12_; + const gchar* _tmp13_; + CaribouGroupModel* _tmp14_; CaribouGroupModel* grp; + xmlDoc* _tmp15_; + xmlNode* _tmp16_; xmlNode* node; + CaribouGroupModel* _tmp17_; + xmlNode* _tmp18_; + xmlDoc* _tmp19_; GError * _inner_error_ = NULL; g_return_val_if_fail (keyboard_type != NULL, NULL); g_return_val_if_fail (group != NULL, NULL); g_return_val_if_fail (variant != NULL, NULL); - _tmp0_ = caribou_xml_deserializer_get_layout_file (keyboard_type, group, variant, &_inner_error_); - fn = _tmp0_; - if (_inner_error_ != NULL) { - goto __catch1_g_error; - } - _tmp1_ = xmlParseFile (fn); - doc = _tmp1_; - if (doc == NULL) { - GError* _tmp2_ = NULL; - _tmp2_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load XML text reader for %s", fn); - _inner_error_ = _tmp2_; + { + const gchar* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_ = NULL; + gchar* fn; + const gchar* _tmp4_; + xmlDoc* _tmp5_ = NULL; + xmlDoc* _tmp6_; + _tmp0_ = keyboard_type; + _tmp1_ = group; + _tmp2_ = variant; + _tmp3_ = caribou_xml_deserializer_get_layout_file (_tmp0_, _tmp1_, _tmp2_, &_inner_error_); + fn = _tmp3_; + if (_inner_error_ != NULL) { + goto __catch1_g_error; + } + _tmp4_ = fn; + _tmp5_ = xmlParseFile (_tmp4_); + doc = _tmp5_; + _tmp6_ = doc; + if (_tmp6_ == NULL) { + const gchar* _tmp7_; + GError* _tmp8_; + _tmp7_ = fn; + _tmp8_ = g_error_new (G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load XML text reader for %s", _tmp7_); + _inner_error_ = _tmp8_; + _g_free0 (fn); + goto __catch1_g_error; + } _g_free0 (fn); - goto __catch1_g_error; } - _g_free0 (fn); goto __finally1; __catch1_g_error: { - GError * e; + GError* e = NULL; + FILE* _tmp9_; + GError* _tmp10_; + const gchar* _tmp11_; e = _inner_error_; _inner_error_ = NULL; - fprintf (stdout, "Failed to load XML: %s\n", e->message); + _tmp9_ = stdout; + _tmp10_ = e; + _tmp11_ = _tmp10_->message; + fprintf (_tmp9_, "Failed to load XML: %s\n", _tmp11_); result = NULL; _g_error_free0 (e); return result; @@ -393,11 +472,18 @@ g_clear_error (&_inner_error_); return NULL; } - _tmp3_ = caribou_group_model_new (group, variant); - grp = _tmp3_; - node = doc->children; - caribou_xml_deserializer_create_levels_from_xml (grp, node); - xmlFreeDoc (doc); + _tmp12_ = group; + _tmp13_ = variant; + _tmp14_ = caribou_group_model_new (_tmp12_, _tmp13_); + grp = _tmp14_; + _tmp15_ = doc; + _tmp16_ = _tmp15_->children; + node = _tmp16_; + _tmp17_ = grp; + _tmp18_ = node; + caribou_xml_deserializer_create_levels_from_xml (_tmp17_, _tmp18_); + _tmp19_ = doc; + xmlFreeDoc (_tmp19_); xmlCleanupParser (); result = grp; return result; @@ -405,39 +491,75 @@ void caribou_xml_deserializer_create_levels_from_xml (CaribouGroupModel* group, xmlNode* node) { + xmlNode* _tmp0_; + const gchar* _tmp1_; g_return_if_fail (group != NULL); - g_assert (g_strcmp0 (node->name, "layout") == 0); + _tmp0_ = node; + _tmp1_ = _tmp0_->name; + g_assert (g_strcmp0 (_tmp1_, "layout") == 0); { + xmlNode* _tmp2_; + xmlNode* _tmp3_; xmlNode* iter; - iter = node->children; + _tmp2_ = node; + _tmp3_ = _tmp2_->children; + iter = _tmp3_; { - gboolean _tmp0_; - _tmp0_ = TRUE; + gboolean _tmp4_; + _tmp4_ = TRUE; while (TRUE) { - gchar* _tmp1_ = NULL; + gboolean _tmp5_; + xmlNode* _tmp8_; + xmlNode* _tmp9_; + xmlElementType _tmp10_; + xmlNode* _tmp11_; + gchar* _tmp12_ = NULL; gchar* levelname; - gchar* _tmp2_ = NULL; + xmlNode* _tmp13_; + gchar* _tmp14_ = NULL; gchar* mode; - CaribouLevelModel* _tmp3_ = NULL; + const gchar* _tmp15_; + CaribouLevelModel* _tmp16_; CaribouLevelModel* level; - if (!_tmp0_) { - iter = iter->next; + CaribouLevelModel* _tmp17_; + xmlNode* _tmp18_; + CaribouGroupModel* _tmp19_; + const gchar* _tmp20_; + CaribouLevelModel* _tmp21_; + _tmp5_ = _tmp4_; + if (!_tmp5_) { + xmlNode* _tmp6_; + xmlNode* _tmp7_; + _tmp6_ = iter; + _tmp7_ = _tmp6_->next; + iter = _tmp7_; } - _tmp0_ = FALSE; - if (!(iter != NULL)) { + _tmp4_ = FALSE; + _tmp8_ = iter; + if (!(_tmp8_ != NULL)) { break; } - if (iter->type != XML_ELEMENT_NODE) { + _tmp9_ = iter; + _tmp10_ = _tmp9_->type; + if (_tmp10_ != XML_ELEMENT_NODE) { continue; } - _tmp1_ = xmlGetProp (iter, "name"); - levelname = _tmp1_; - _tmp2_ = xmlGetProp (iter, "mode"); - mode = _tmp2_; - _tmp3_ = caribou_level_model_new (mode); - level = _tmp3_; - caribou_xml_deserializer_load_rows (level, iter); - caribou_group_model_add_level (group, levelname, level); + _tmp11_ = iter; + _tmp12_ = xmlGetProp (_tmp11_, "name"); + levelname = _tmp12_; + _tmp13_ = iter; + _tmp14_ = xmlGetProp (_tmp13_, "mode"); + mode = _tmp14_; + _tmp15_ = mode; + _tmp16_ = caribou_level_model_new (_tmp15_); + level = _tmp16_; + _tmp17_ = level; + _tmp18_ = iter; + caribou_xml_deserializer_load_rows (_tmp17_, _tmp18_); + _tmp19_ = group; + _tmp20_ = levelname; + _tmp21_ = level; + caribou_group_model_add_level (_tmp19_, _tmp20_, _tmp21_); _g_object_unref0 (level); _g_free0 (mode); _g_free0 (levelname); @@ -448,62 +570,118 @@ void caribou_xml_deserializer_load_rows (CaribouLevelModel* level, xmlNode* node) { + xmlNode* _tmp0_; + const gchar* _tmp1_; g_return_if_fail (level != NULL); - g_assert (g_strcmp0 (node->name, "level") == 0); + _tmp0_ = node; + _tmp1_ = _tmp0_->name; + g_assert (g_strcmp0 (_tmp1_, "level") == 0); { + xmlNode* _tmp2_; + xmlNode* _tmp3_; xmlNode* i; - i = node->children; + _tmp2_ = node; + _tmp3_ = _tmp2_->children; + i = _tmp3_; { - gboolean _tmp0_; - _tmp0_ = TRUE; + gboolean _tmp4_; + _tmp4_ = TRUE; while (TRUE) { - CaribouRowModel* _tmp1_ = NULL; + gboolean _tmp5_; + xmlNode* _tmp8_; + xmlNode* _tmp9_; + xmlElementType _tmp10_; + CaribouRowModel* _tmp11_; CaribouRowModel* row; - if (!_tmp0_) { - i = i->next; + CaribouLevelModel* _tmp12_; + CaribouRowModel* _tmp13_; + _tmp5_ = _tmp4_; + if (!_tmp5_) { + xmlNode* _tmp6_; + xmlNode* _tmp7_; + _tmp6_ = i; + _tmp7_ = _tmp6_->next; + i = _tmp7_; } - _tmp0_ = FALSE; - if (!(i != NULL)) { + _tmp4_ = FALSE; + _tmp8_ = i; + if (!(_tmp8_ != NULL)) { break; } - if (i->type != XML_ELEMENT_NODE) { + _tmp9_ = i; + _tmp10_ = _tmp9_->type; + if (_tmp10_ != XML_ELEMENT_NODE) { continue; } - _tmp1_ = caribou_row_model_new (); - row = _tmp1_; - caribou_level_model_add_row (level, row); + _tmp11_ = caribou_row_model_new (); + row = _tmp11_; + _tmp12_ = level; + _tmp13_ = row; + caribou_level_model_add_row (_tmp12_, _tmp13_); { + xmlNode* _tmp14_; + xmlNode* _tmp15_; xmlNode* i2; - i2 = i->children; + _tmp14_ = i; + _tmp15_ = _tmp14_->children; + i2 = _tmp15_; { - gboolean _tmp2_; - _tmp2_ = TRUE; + gboolean _tmp16_; + _tmp16_ = TRUE; while (TRUE) { - gchar* _tmp5_ = NULL; - gchar* _tmp6_; - if (!_tmp2_) { - i2 = i2->next; + gboolean _tmp17_; + xmlNode* _tmp20_; + xmlNode* _tmp21_; + xmlElementType _tmp22_; + xmlNode* _tmp23_; + const gchar* _tmp24_; + CaribouRowModel* _tmp30_; + xmlNode* _tmp31_; + gchar* _tmp32_ = NULL; + gchar* _tmp33_; + xmlNode* _tmp34_; + _tmp17_ = _tmp16_; + if (!_tmp17_) { + xmlNode* _tmp18_; + xmlNode* _tmp19_; + _tmp18_ = i2; + _tmp19_ = _tmp18_->next; + i2 = _tmp19_; } - _tmp2_ = FALSE; - if (!(i2 != NULL)) { + _tmp16_ = FALSE; + _tmp20_ = i2; + if (!(_tmp20_ != NULL)) { break; } - if (i2->type != XML_ELEMENT_NODE) { + _tmp21_ = i2; + _tmp22_ = _tmp21_->type; + if (_tmp22_ != XML_ELEMENT_NODE) { continue; } - if (g_strcmp0 (i2->name, "key") == 0) { - gchar* _tmp3_ = NULL; - gchar* _tmp4_; - _tmp3_ = xmlGetProp (i, "align"); - _tmp4_ = _tmp3_; - caribou_xml_deserializer_load_column (row, _tmp4_, i); - _g_free0 (_tmp4_); + _tmp23_ = i2; + _tmp24_ = _tmp23_->name; + if (g_strcmp0 (_tmp24_, "key") == 0) { + CaribouRowModel* _tmp25_; + xmlNode* _tmp26_; + gchar* _tmp27_ = NULL; + gchar* _tmp28_; + xmlNode* _tmp29_; + _tmp25_ = row; + _tmp26_ = i; + _tmp27_ = xmlGetProp (_tmp26_, "align"); + _tmp28_ = _tmp27_; + _tmp29_ = i; + caribou_xml_deserializer_load_column (_tmp25_, _tmp28_, _tmp29_); + _g_free0 (_tmp28_); break; } - _tmp5_ = xmlGetProp (i2, "align"); - _tmp6_ = _tmp5_; - caribou_xml_deserializer_load_column (row, _tmp6_, i2); - _g_free0 (_tmp6_); + _tmp30_ = row; + _tmp31_ = i2; + _tmp32_ = xmlGetProp (_tmp31_, "align"); + _tmp33_ = _tmp32_; + _tmp34_ = i2; + caribou_xml_deserializer_load_column (_tmp30_, _tmp33_, _tmp34_); + _g_free0 (_tmp33_); } } } @@ -515,35 +693,61 @@ void caribou_xml_deserializer_load_column (CaribouRowModel* row, const gchar* align, xmlNode* node) { - CaribouColumnModel* _tmp0_ = NULL; + CaribouColumnModel* _tmp0_; CaribouColumnModel* column; + CaribouRowModel* _tmp1_; + CaribouColumnModel* _tmp2_; g_return_if_fail (row != NULL); _tmp0_ = caribou_column_model_new (); column = _tmp0_; - caribou_row_model_add_column (row, column); + _tmp1_ = row; + _tmp2_ = column; + caribou_row_model_add_column (_tmp1_, _tmp2_); { + xmlNode* _tmp3_; + xmlNode* _tmp4_; xmlNode* i; - i = node->children; + _tmp3_ = node; + _tmp4_ = _tmp3_->children; + i = _tmp4_; { - gboolean _tmp1_; - _tmp1_ = TRUE; + gboolean _tmp5_; + _tmp5_ = TRUE; while (TRUE) { - CaribouKeyModel* _tmp2_ = NULL; - CaribouKeyModel* _tmp3_; - if (!_tmp1_) { - i = i->next; - } - _tmp1_ = FALSE; - if (!(i != NULL)) { + gboolean _tmp6_; + xmlNode* _tmp9_; + xmlNode* _tmp10_; + xmlElementType _tmp11_; + CaribouColumnModel* _tmp12_; + xmlNode* _tmp13_; + const gchar* _tmp14_; + CaribouKeyModel* _tmp15_ = NULL; + CaribouKeyModel* _tmp16_; + _tmp6_ = _tmp5_; + if (!_tmp6_) { + xmlNode* _tmp7_; + xmlNode* _tmp8_; + _tmp7_ = i; + _tmp8_ = _tmp7_->next; + i = _tmp8_; + } + _tmp5_ = FALSE; + _tmp9_ = i; + if (!(_tmp9_ != NULL)) { break; } - if (i->type != XML_ELEMENT_NODE) { + _tmp10_ = i; + _tmp11_ = _tmp10_->type; + if (_tmp11_ != XML_ELEMENT_NODE) { continue; } - _tmp2_ = caribou_xml_deserializer_load_key (i, align); - _tmp3_ = _tmp2_; - caribou_column_model_add_key (column, _tmp3_); - _g_object_unref0 (_tmp3_); + _tmp12_ = column; + _tmp13_ = i; + _tmp14_ = align; + _tmp15_ = caribou_xml_deserializer_load_key (_tmp13_, _tmp14_); + _tmp16_ = _tmp15_; + caribou_column_model_add_key (_tmp12_, _tmp16_); + _g_object_unref0 (_tmp16_); } } } @@ -553,53 +757,119 @@ static gdouble double_parse (const gchar* str) { gdouble result = 0.0; - gdouble _tmp0_; + const gchar* _tmp0_; + gdouble _tmp1_ = 0.0; g_return_val_if_fail (str != NULL, 0.0); - _tmp0_ = g_ascii_strtod (str, NULL); - result = _tmp0_; + _tmp0_ = str; + _tmp1_ = g_ascii_strtod (_tmp0_, NULL); + result = _tmp1_; return result; } CaribouKeyModel* caribou_xml_deserializer_load_key (xmlNode* node, const gchar* align) { CaribouKeyModel* result = NULL; - gchar* _tmp0_ = NULL; + xmlNode* _tmp0_; + const gchar* _tmp1_; + xmlNode* _tmp2_; + gchar* _tmp3_ = NULL; gchar* name; - CaribouKeyModel* _tmp1_ = NULL; + const gchar* _tmp4_; + const gchar* _tmp5_; + CaribouKeyModel* _tmp6_; CaribouKeyModel* key; - g_assert (g_strcmp0 (node->name, "key") == 0); - _tmp0_ = xmlGetProp (node, "name"); - name = _tmp0_; - g_assert (name != NULL); - _tmp1_ = caribou_key_model_new (name); - key = _tmp1_; - if (align != NULL) { - caribou_key_model_set_align (key, align); + const gchar* _tmp7_; + _tmp0_ = node; + _tmp1_ = _tmp0_->name; + g_assert (g_strcmp0 (_tmp1_, "key") == 0); + _tmp2_ = node; + _tmp3_ = xmlGetProp (_tmp2_, "name"); + name = _tmp3_; + _tmp4_ = name; + g_assert (_tmp4_ != NULL); + _tmp5_ = name; + _tmp6_ = caribou_key_model_new (_tmp5_); + key = _tmp6_; + _tmp7_ = align; + if (_tmp7_ != NULL) { + CaribouKeyModel* _tmp8_; + const gchar* _tmp9_; + _tmp8_ = key; + _tmp9_ = align; + caribou_key_model_set_align (_tmp8_, _tmp9_); } { + xmlNode* _tmp10_; + xmlAttr* _tmp11_; xmlAttr* prop; - prop = node->properties; + _tmp10_ = node; + _tmp11_ = _tmp10_->properties; + prop = _tmp11_; { - gboolean _tmp2_; - _tmp2_ = TRUE; + gboolean _tmp12_; + _tmp12_ = TRUE; while (TRUE) { - if (!_tmp2_) { - prop = prop->next; - } - _tmp2_ = FALSE; - if (!(prop != NULL)) { + gboolean _tmp13_; + xmlAttr* _tmp16_; + xmlAttr* _tmp17_; + const gchar* _tmp18_; + _tmp13_ = _tmp12_; + if (!_tmp13_) { + xmlAttr* _tmp14_; + xmlAttr* _tmp15_; + _tmp14_ = prop; + _tmp15_ = _tmp14_->next; + prop = _tmp15_; + } + _tmp12_ = FALSE; + _tmp16_ = prop; + if (!(_tmp16_ != NULL)) { break; } - if (g_strcmp0 (prop->name, "toggle") == 0) { - caribou_key_model_set_toggle (key, prop->children->content); + _tmp17_ = prop; + _tmp18_ = _tmp17_->name; + if (g_strcmp0 (_tmp18_, "toggle") == 0) { + CaribouKeyModel* _tmp19_; + xmlAttr* _tmp20_; + xmlNode* _tmp21_; + const gchar* _tmp22_; + _tmp19_ = key; + _tmp20_ = prop; + _tmp21_ = _tmp20_->children; + _tmp22_ = _tmp21_->content; + caribou_key_model_set_toggle (_tmp19_, _tmp22_); } else { - if (g_strcmp0 (prop->name, "align") == 0) { - caribou_key_model_set_align (key, prop->children->content); + xmlAttr* _tmp23_; + const gchar* _tmp24_; + _tmp23_ = prop; + _tmp24_ = _tmp23_->name; + if (g_strcmp0 (_tmp24_, "align") == 0) { + CaribouKeyModel* _tmp25_; + xmlAttr* _tmp26_; + xmlNode* _tmp27_; + const gchar* _tmp28_; + _tmp25_ = key; + _tmp26_ = prop; + _tmp27_ = _tmp26_->children; + _tmp28_ = _tmp27_->content; + caribou_key_model_set_align (_tmp25_, _tmp28_); } else { - if (g_strcmp0 (prop->name, "width") == 0) { - gdouble _tmp3_; - _tmp3_ = double_parse (prop->children->content); - caribou_key_model_set_width (key, _tmp3_); + xmlAttr* _tmp29_; + const gchar* _tmp30_; + _tmp29_ = prop; + _tmp30_ = _tmp29_->name; + if (g_strcmp0 (_tmp30_, "width") == 0) { + CaribouKeyModel* _tmp31_; + xmlAttr* _tmp32_; + xmlNode* _tmp33_; + const gchar* _tmp34_; + gdouble _tmp35_ = 0.0; + _tmp31_ = key; + _tmp32_ = prop; + _tmp33_ = _tmp32_->children; + _tmp34_ = _tmp33_->content; + _tmp35_ = double_parse (_tmp34_); + caribou_key_model_set_width (_tmp31_, _tmp35_); } } } @@ -607,28 +877,48 @@ } } { + xmlNode* _tmp36_; + xmlNode* _tmp37_; xmlNode* i; - i = node->children; + _tmp36_ = node; + _tmp37_ = _tmp36_->children; + i = _tmp37_; { - gboolean _tmp4_; - _tmp4_ = TRUE; + gboolean _tmp38_; + _tmp38_ = TRUE; while (TRUE) { - CaribouKeyModel* _tmp5_ = NULL; - CaribouKeyModel* _tmp6_; - if (!_tmp4_) { - i = i->next; - } - _tmp4_ = FALSE; - if (!(i != NULL)) { + gboolean _tmp39_; + xmlNode* _tmp42_; + xmlNode* _tmp43_; + xmlElementType _tmp44_; + CaribouKeyModel* _tmp45_; + xmlNode* _tmp46_; + CaribouKeyModel* _tmp47_ = NULL; + CaribouKeyModel* _tmp48_; + _tmp39_ = _tmp38_; + if (!_tmp39_) { + xmlNode* _tmp40_; + xmlNode* _tmp41_; + _tmp40_ = i; + _tmp41_ = _tmp40_->next; + i = _tmp41_; + } + _tmp38_ = FALSE; + _tmp42_ = i; + if (!(_tmp42_ != NULL)) { break; } - if (i->type != XML_ELEMENT_NODE) { + _tmp43_ = i; + _tmp44_ = _tmp43_->type; + if (_tmp44_ != XML_ELEMENT_NODE) { continue; } - _tmp5_ = caribou_xml_deserializer_load_key (i, NULL); - _tmp6_ = _tmp5_; - caribou_key_model_add_subkey (key, _tmp6_); - _g_object_unref0 (_tmp6_); + _tmp45_ = key; + _tmp46_ = i; + _tmp47_ = caribou_xml_deserializer_load_key (_tmp46_, NULL); + _tmp48_ = _tmp47_; + caribou_key_model_add_subkey (_tmp45_, _tmp48_); + _g_object_unref0 (_tmp48_); } } } diff -Nru caribou-0.3.5/modules/gtk2/caribou-gtk-module.c caribou-0.3.91/modules/gtk2/caribou-gtk-module.c --- caribou-0.3.5/modules/gtk2/caribou-gtk-module.c 2011-08-12 07:46:15.000000000 +0000 +++ caribou-0.3.91/modules/gtk2/caribou-gtk-module.c 2011-09-05 23:45:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* caribou-gtk-module.c generated by valac 0.13.1.204-b292, the Vala compiler +/* caribou-gtk-module.c generated by valac 0.13.3, the Vala compiler * generated from caribou-gtk-module.vala, do not modify */ @@ -696,6 +696,7 @@ GtkWindow* _tmp21_; gconstpointer _tmp22_ = NULL; g_return_val_if_fail (self != NULL, 0); + g_return_val_if_fail (xevent != NULL, 0); g_return_val_if_fail (evt != NULL, 0); _data1_ = g_slice_new0 (Block1Data); _data1_->_ref_count_ = 1; diff -Nru caribou-0.3.5/modules/gtk2/caribou-gtk-module.h caribou-0.3.91/modules/gtk2/caribou-gtk-module.h --- caribou-0.3.5/modules/gtk2/caribou-gtk-module.h 2011-08-12 07:46:15.000000000 +0000 +++ caribou-0.3.91/modules/gtk2/caribou-gtk-module.h 2011-09-05 23:45:45.000000000 +0000 @@ -1,4 +1,4 @@ -/* caribou-gtk-module.h generated by valac 0.13.1.204-b292, the Vala compiler, do not modify */ +/* caribou-gtk-module.h generated by valac 0.13.3, the Vala compiler, do not modify */ #ifndef __CARIBOU_GTK_MODULE_H__ diff -Nru caribou-0.3.5/modules/gtk3/caribou-gtk-module.c caribou-0.3.91/modules/gtk3/caribou-gtk-module.c --- caribou-0.3.5/modules/gtk3/caribou-gtk-module.c 2011-08-12 07:46:14.000000000 +0000 +++ caribou-0.3.91/modules/gtk3/caribou-gtk-module.c 2011-09-05 23:45:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* caribou-gtk-module.c generated by valac 0.13.1.204-b292, the Vala compiler +/* caribou-gtk-module.c generated by valac 0.13.3, the Vala compiler * generated from caribou-gtk-module.vala, do not modify */ @@ -687,6 +687,7 @@ GtkWindow* _tmp18_; gconstpointer _tmp19_ = NULL; g_return_val_if_fail (self != NULL, 0); + g_return_val_if_fail (xevent != NULL, 0); g_return_val_if_fail (evt != NULL, 0); _data1_ = g_slice_new0 (Block1Data); _data1_->_ref_count_ = 1; diff -Nru caribou-0.3.5/modules/gtk3/caribou-gtk-module.h caribou-0.3.91/modules/gtk3/caribou-gtk-module.h --- caribou-0.3.5/modules/gtk3/caribou-gtk-module.h 2011-08-12 07:46:14.000000000 +0000 +++ caribou-0.3.91/modules/gtk3/caribou-gtk-module.h 2011-09-05 23:45:44.000000000 +0000 @@ -1,4 +1,4 @@ -/* caribou-gtk-module.h generated by valac 0.13.1.204-b292, the Vala compiler, do not modify */ +/* caribou-gtk-module.h generated by valac 0.13.3, the Vala compiler, do not modify */ #ifndef __CARIBOU_GTK_MODULE_H__ diff -Nru caribou-0.3.5/NEWS caribou-0.3.91/NEWS --- caribou-0.3.5/NEWS 2011-08-12 07:44:26.000000000 +0000 +++ caribou-0.3.91/NEWS 2011-09-05 23:37:29.000000000 +0000 @@ -1,3 +1,28 @@ +============== +Version 0.3.91 +============== + +What's New +========== +- Update Antler to latest GTK+ 3.2 shenanigans. +- Require pygobject 3.0. +- Fixes to bugs that were. + +New And Updated Translations +============================ +- Marek Černocký (cs) +- Kristjan SCHMIDT (eo) +- Jorge González (es) +- Arash Mousavi (fa) +- Claude Paroz (fr) +- Fran Dieguez (gl) +- Kjartan Maraas (nb) +- Antonio Fernandes C. Neto (pt_BR) +- Daniel Nylander (sv) +- Dr.T.Vasudevan (ta) +- Chao-Hsiung Liao (zh_HK) +- Chao-Hsiung Liao (zh_TW) + ============= Version 0.3.5 ============= diff -Nru caribou-0.3.5/po/cs.po caribou-0.3.91/po/cs.po --- caribou-0.3.5/po/cs.po 2011-08-04 17:14:00.000000000 +0000 +++ caribou-0.3.91/po/cs.po 2011-09-05 17:31:38.000000000 +0000 @@ -8,8 +8,8 @@ "Project-Id-Version: caribou master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=caribou&keywords=I18N+L10N&component=default\n" -"POT-Creation-Date: 2011-07-18 17:10+0000\n" -"PO-Revision-Date: 2011-07-21 08:21+0200\n" +"POT-Creation-Date: 2011-09-03 21:06+0000\n" +"PO-Revision-Date: 2011-09-04 11:40+0200\n" "Last-Translator: Marek Černocký \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -220,12 +220,12 @@ msgstr "Typ klávesnice" #: ../caribou/antler/antler_settings.py:10 -msgid "The keyboard geometery Caribou should use" +msgid "The keyboard geometry Caribou should use" msgstr "Konfigurace klávesnice, kterou by měla aplikace Caribou použít" #: ../caribou/antler/antler_settings.py:11 msgid "" -"The keyboard geometery determines the shape and complexity of the keyboard, " +"The keyboard geometry determines the shape and complexity of the keyboard, " "it could range from a 'natural' look and feel good for composing simple " "text, to a fullscale keyboard." msgstr "" @@ -233,49 +233,46 @@ "„přirozeného“ vzhledu s dobrým dojmem při psaní jednoduchého textu po " "nejrozsáhlejší klávesnici." -#: ../caribou/antler/antler_settings.py:15 +#. Translators: Keyboard type (similar to touch/tactile device) +#: ../caribou/antler/antler_settings.py:16 msgid "Touch" msgstr "Dotyk" -#: ../caribou/antler/antler_settings.py:16 +#. Translators: Keyboard type (conventional keyboard) +#: ../caribou/antler/antler_settings.py:18 msgid "Full scale" msgstr "Plné měřítko" -#: ../caribou/antler/antler_settings.py:17 +#. Translators: Keyboard type (scanned grid by rows/columns) +#: ../caribou/antler/antler_settings.py:20 msgid "Scan" msgstr "Skenovat" -#: ../caribou/antler/antler_settings.py:18 -#: ../caribou/antler/antler_settings.py:19 +#: ../caribou/antler/antler_settings.py:21 +#: ../caribou/antler/antler_settings.py:22 msgid "Use System Theme" msgstr "Použít systémový motiv" -#: ../caribou/antler/antler_settings.py:20 +#: ../caribou/antler/antler_settings.py:23 msgid "Minimum Alpha" msgstr "Minimální alfa" -#: ../caribou/antler/antler_settings.py:21 +#: ../caribou/antler/antler_settings.py:24 msgid "Minimal opacity of keyboard" msgstr "Minimální průsvitnost klávesnice" -#: ../caribou/antler/antler_settings.py:23 +#: ../caribou/antler/antler_settings.py:26 msgid "Maximum Alpha" msgstr "Maximální alfa" -#: ../caribou/antler/antler_settings.py:24 +#: ../caribou/antler/antler_settings.py:27 msgid "Maximal opacity of keyboard" msgstr "Maximální průsvitnost klávesnice" -#: ../caribou/antler/antler_settings.py:26 +#: ../caribou/antler/antler_settings.py:29 msgid "Maximum Distance" msgstr "Maximální vzdálenost" -#: ../caribou/antler/antler_settings.py:27 +#: ../caribou/antler/antler_settings.py:30 msgid "Maximum distance when keyboard is hidden" -msgstr "Maximální vzdálenost, když je klávesnice skryta" - -#~ msgid "Block" -#~ msgstr "Blok" - -#~ msgid "Scan in reverse order" -#~ msgstr "Skenovat v obráceném pořadí" +msgstr "Maximální vzdálenost, když je klávesnice skryta" \ No newline at end of file diff -Nru caribou-0.3.5/po/eo.po caribou-0.3.91/po/eo.po --- caribou-0.3.5/po/eo.po 1970-01-01 00:00:00.000000000 +0000 +++ caribou-0.3.91/po/eo.po 2011-09-05 17:31:38.000000000 +0000 @@ -0,0 +1,271 @@ +# Esperanto translation for caribou. +# Copyright (C) 2011 Free Software Foundation, Inc. +# This file is distributed under the same license as the caribou package. +# Kristjan SCHMIDT , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: caribou master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=caribou&keywords=I18N+L10N&component=default\n" +"POT-Creation-Date: 2011-09-03 21:11+0000\n" +"PO-Revision-Date: 2011-09-04 00:24+0200\n" +"Last-Translator: Kristjan SCHMIDT \n" +"Language-Team: Esperanto \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#: ../caribou/settings/caribou_settings.py:5 +msgid "Caribou Preferences" +msgstr "Agordoj de Caribou" + +#: ../caribou/settings/caribou_settings.py:6 +msgid "Scanning" +msgstr "Skanante" + +#: ../caribou/settings/caribou_settings.py:8 +msgid "Enable scanning" +msgstr "Enŝalti skanadon" + +#: ../caribou/settings/caribou_settings.py:9 +msgid "Enable switch scanning" +msgstr "" + +#: ../caribou/settings/caribou_settings.py:12 +msgid "General" +msgstr "Ĝenerale" + +#: ../caribou/settings/caribou_settings.py:13 +msgid "Scanning mode" +msgstr "Skan-reĝimo" + +#: ../caribou/settings/caribou_settings.py:15 +msgid "Scanning type, subgroups, rows or linear" +msgstr "" + +#: ../caribou/settings/caribou_settings.py:16 +msgid "Subgroups" +msgstr "Subgrupoj" + +#: ../caribou/settings/caribou_settings.py:17 +msgid "Rows" +msgstr "Vicoj" + +#: ../caribou/settings/caribou_settings.py:18 +msgid "Linear" +msgstr "Lineare" + +#: ../caribou/settings/caribou_settings.py:20 +msgid "Step time" +msgstr "" + +#: ../caribou/settings/caribou_settings.py:21 +msgid "Time between key transitions" +msgstr "" + +#: ../caribou/settings/caribou_settings.py:24 +msgid "Inverse scanning" +msgstr "" + +#: ../caribou/settings/caribou_settings.py:25 +msgid "Step with the switch, activate by dwelling" +msgstr "" + +#: ../caribou/settings/caribou_settings.py:28 +msgid "Auto-restart scanning" +msgstr "" + +#: ../caribou/settings/caribou_settings.py:29 +msgid "Automatically restart scanning after item activation" +msgstr "" + +#: ../caribou/settings/caribou_settings.py:30 +msgid "Scan cycles" +msgstr "" + +#: ../caribou/settings/caribou_settings.py:31 +msgid "One" +msgstr "Unu" + +#: ../caribou/settings/caribou_settings.py:32 +msgid "Two" +msgstr "Du" + +#: ../caribou/settings/caribou_settings.py:33 +msgid "Three" +msgstr "Tri" + +#: ../caribou/settings/caribou_settings.py:34 +msgid "Four" +msgstr "Kvar" + +#: ../caribou/settings/caribou_settings.py:35 +msgid "Five" +msgstr "Kvin" + +#: ../caribou/settings/caribou_settings.py:38 +msgid "Input" +msgstr "Enigo" + +#: ../caribou/settings/caribou_settings.py:39 +msgid "Switch device" +msgstr "Ŝanĝi aparaton" + +#: ../caribou/settings/caribou_settings.py:41 +msgid "Switch device, keyboard or mouse" +msgstr "Ŝanĝi aparaton, klavaro aŭ muson" + +#: ../caribou/settings/caribou_settings.py:43 +msgid "Keyboard" +msgstr "Klavaro" + +#: ../caribou/settings/caribou_settings.py:44 +msgid "Mouse" +msgstr "Muso" + +#: ../caribou/settings/caribou_settings.py:46 +msgid "Switch key" +msgstr "Ŝanĝi klavon" + +#: ../caribou/settings/caribou_settings.py:48 +msgid "Key to use with scanning mode" +msgstr "Klavo por uzi en la skan-reĝimo" + +#: ../caribou/settings/caribou_settings.py:50 +msgid "Right shift" +msgstr "Dekstra majuskliga klavo" + +#: ../caribou/settings/caribou_settings.py:51 +msgid "Left shift" +msgstr "Maldekstra majuskliga klavo" + +#: ../caribou/settings/caribou_settings.py:52 +msgid "Space" +msgstr "Spaco-klavo" + +#: ../caribou/settings/caribou_settings.py:53 +msgid "Alt Gr" +msgstr "" + +#: ../caribou/settings/caribou_settings.py:54 +msgid "Num lock" +msgstr "Nombra baskulo" + +#: ../caribou/settings/caribou_settings.py:55 +msgid "Switch button" +msgstr "Ŝanĝi butonon" + +#: ../caribou/settings/caribou_settings.py:58 +msgid "Mouse button to use in the scanning mode" +msgstr "Musbutono por uzi en la skan-reĝimo" + +#: ../caribou/settings/caribou_settings.py:60 +msgid "Button 1" +msgstr "Butono 1" + +#: ../caribou/settings/caribou_settings.py:61 +msgid "Button 2" +msgstr "Butono 2" + +#: ../caribou/settings/caribou_settings.py:62 +msgid "Button 3" +msgstr "Butono 3" + +#: ../caribou/__init__.py:2 +msgid "Caribou" +msgstr "" + +#: ../caribou/daemon/main.py:31 +#, python-format +msgid "Error starting %s" +msgstr "" + +#: ../caribou/daemon/main.py:42 +#, python-format +msgid "" +"In order to use %s, accessibility needs to be enabled. Do you want to enable " +"it now?" +msgstr "" + +#: ../caribou/daemon/main.py:56 +#, python-format +msgid "Accessibility has been enabled. Log out and back in again to use %s." +msgstr "" + +#: ../caribou/daemon/main.py:153 +msgid "WARNING - Caribou: unhandled editable widget:" +msgstr "" + +#: ../caribou/antler/antler_settings.py:5 +msgid "Antler Preferences" +msgstr "" + +#: ../caribou/antler/antler_settings.py:6 +msgid "Antler" +msgstr "" + +#: ../caribou/antler/antler_settings.py:7 +msgid "Appearance" +msgstr "" + +#: ../caribou/antler/antler_settings.py:9 +msgid "Keyboard Type" +msgstr "Klavar-tipo" + +#: ../caribou/antler/antler_settings.py:10 +msgid "The keyboard geometry Caribou should use" +msgstr "" + +#: ../caribou/antler/antler_settings.py:11 +msgid "" +"The keyboard geometry determines the shape and complexity of the keyboard, " +"it could range from a 'natural' look and feel good for composing simple " +"text, to a fullscale keyboard." +msgstr "" + +#. Translators: Keyboard type (similar to touch/tactile device) +#: ../caribou/antler/antler_settings.py:16 +msgid "Touch" +msgstr "Tuŝi" + +#. Translators: Keyboard type (conventional keyboard) +#: ../caribou/antler/antler_settings.py:18 +msgid "Full scale" +msgstr "" + +#. Translators: Keyboard type (scanned grid by rows/columns) +#: ../caribou/antler/antler_settings.py:20 +msgid "Scan" +msgstr "Skani" + +#: ../caribou/antler/antler_settings.py:21 +#: ../caribou/antler/antler_settings.py:22 +msgid "Use System Theme" +msgstr "Uzi sistem-etoson" + +#: ../caribou/antler/antler_settings.py:23 +msgid "Minimum Alpha" +msgstr "Minimuma alfo" + +#: ../caribou/antler/antler_settings.py:24 +msgid "Minimal opacity of keyboard" +msgstr "" + +#: ../caribou/antler/antler_settings.py:26 +msgid "Maximum Alpha" +msgstr "Maksimuma alfo" + +#: ../caribou/antler/antler_settings.py:27 +#, fuzzy +msgid "Maximal opacity of keyboard" +msgstr "Maksimuma opakeco de la klavaro" + +#: ../caribou/antler/antler_settings.py:29 +msgid "Maximum Distance" +msgstr "Maksimuma distanco" + +#: ../caribou/antler/antler_settings.py:30 +msgid "Maximum distance when keyboard is hidden" +msgstr "Maksimuma distanco se la klavaro estas kaŝate" diff -Nru caribou-0.3.5/po/es.po caribou-0.3.91/po/es.po --- caribou-0.3.5/po/es.po 2011-08-04 17:14:00.000000000 +0000 +++ caribou-0.3.91/po/es.po 2011-09-05 17:31:38.000000000 +0000 @@ -2,22 +2,22 @@ # Copyright (C) 2010 caribou's COPYRIGHT HOLDER # This file is distributed under the same license as the caribou package. # FIRST AUTHOR , YEAR. -# Jorge González , 2010. # Daniel Mustieles , 2011. +# Jorge González , 2010, 2011. # msgid "" msgstr "" "Project-Id-Version: caribou.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=caribou&keywords=I18N+L10N&component=default\n" -"POT-Creation-Date: 2011-07-18 17:10+0000\n" -"PO-Revision-Date: 2011-07-19 11:01+0200\n" -"Last-Translator: Daniel Mustieles \n" -"Language-Team: Español \n" +"POT-Creation-Date: 2011-09-03 21:06+0000\n" +"PO-Revision-Date: 2011-09-04 10:21+0200\n" +"Last-Translator: Jorge González \n" +"Language-Team: Español; Castellano \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" #: ../caribou/settings/caribou_settings.py:5 msgid "Caribou Preferences" @@ -221,57 +221,65 @@ msgstr "Tipo de teclado" #: ../caribou/antler/antler_settings.py:10 -msgid "The keyboard geometery Caribou should use" +#| msgid "The keyboard geometery Caribou should use" +msgid "The keyboard geometry Caribou should use" msgstr "La geometría del teclado que Caribou debe usar" #: ../caribou/antler/antler_settings.py:11 +#| msgid "" +#| "The keyboard geometery determines the shape and complexity of the " +#| "keyboard, it could range from a 'natural' look and feel good for " +#| "composing simple text, to a fullscale keyboard." msgid "" -"The keyboard geometery determines the shape and complexity of the keyboard, " +"The keyboard geometry determines the shape and complexity of the keyboard, " "it could range from a 'natural' look and feel good for composing simple " "text, to a fullscale keyboard." msgstr "" -"La geometría del teclado determina la forma y la complejidad del teclado. " -"Puede ir desde un aspecto «natural», bueno para escribir textos sencillos " -"hasta un teclado a escala completa." +"La geometría del teclado determina la forma y la complejidad del teclado; " +"puede ir desde un aspecto «natural», bueno para escribir simple texto, hasta " +"un teclado a escala completa." -#: ../caribou/antler/antler_settings.py:15 +#. Translators: Keyboard type (similar to touch/tactile device) +#: ../caribou/antler/antler_settings.py:16 msgid "Touch" msgstr "Tocar" -#: ../caribou/antler/antler_settings.py:16 +#. Translators: Keyboard type (conventional keyboard) +#: ../caribou/antler/antler_settings.py:18 msgid "Full scale" msgstr "Escala completa" -#: ../caribou/antler/antler_settings.py:17 +#. Translators: Keyboard type (scanned grid by rows/columns) +#: ../caribou/antler/antler_settings.py:20 msgid "Scan" msgstr "Escanear" -#: ../caribou/antler/antler_settings.py:18 -#: ../caribou/antler/antler_settings.py:19 +#: ../caribou/antler/antler_settings.py:21 +#: ../caribou/antler/antler_settings.py:22 msgid "Use System Theme" msgstr "Usar el tema del sistema" -#: ../caribou/antler/antler_settings.py:20 +#: ../caribou/antler/antler_settings.py:23 msgid "Minimum Alpha" msgstr "Alfa mínima" -#: ../caribou/antler/antler_settings.py:21 +#: ../caribou/antler/antler_settings.py:24 msgid "Minimal opacity of keyboard" msgstr "Opacidad del teclado mínima" -#: ../caribou/antler/antler_settings.py:23 +#: ../caribou/antler/antler_settings.py:26 msgid "Maximum Alpha" msgstr "Alfa máxima" -#: ../caribou/antler/antler_settings.py:24 +#: ../caribou/antler/antler_settings.py:27 msgid "Maximal opacity of keyboard" msgstr "Opacidad del teclado máxima" -#: ../caribou/antler/antler_settings.py:26 +#: ../caribou/antler/antler_settings.py:29 msgid "Maximum Distance" msgstr "Distancia máxima" -#: ../caribou/antler/antler_settings.py:27 +#: ../caribou/antler/antler_settings.py:30 msgid "Maximum distance when keyboard is hidden" msgstr "Distancia máxima cuando el teclado está oculto" diff -Nru caribou-0.3.5/po/fa.po caribou-0.3.91/po/fa.po --- caribou-0.3.5/po/fa.po 2011-04-14 23:34:18.000000000 +0000 +++ caribou-0.3.91/po/fa.po 2011-08-31 22:39:21.000000000 +0000 @@ -2,254 +2,268 @@ # Copyright (C) 2010 caribou's COPYRIGHT HOLDER # This file is distributed under the same license as the caribou package. # Mahyar Moghimi , 2010. +# Arash Mousavi , 2011. # msgid "" msgstr "" "Project-Id-Version: caribou master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=caribou&component=default\n" -"POT-Creation-Date: 2011-03-09 18:16+0000\n" -"PO-Revision-Date: 2010-08-19 11:16+0330\n" -"Last-Translator: Mahyar Moghimi \n" -"Language-Team: Persian \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=caribou&keywords=I18N+L10N&component=default\n" +"POT-Creation-Date: 2011-07-18 17:10+0000\n" +"PO-Revision-Date: 2011-08-31 13:47+0330\n" +"Last-Translator: Arash Mousavi \n" +"Language-Team: Persian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Persian\n" +"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n" +"X-Poedit-SourceCharset: utf-8\n" -#: ../caribou/ui/main.py:238 -msgid "WARNING - Caribou: unhandled editable widget:" -msgstr "اخطار - کاریبو: عنصر قابل ویرایش گردانده نشده" - -#: ../caribou/common/settings.py:31 ../caribou/common/settings.py:88 -#, fuzzy -#| msgid "Keyboard _layout:" -msgid "Keyboard" -msgstr "_چیدمان صفحه‌کلید" - -#: ../caribou/common/settings.py:32 ../caribou/common/settings.py:70 -msgid "General" -msgstr "کلی" - -#: ../caribou/common/settings.py:34 -#, fuzzy -#| msgid "Keyboard _layout:" -msgid "Keyboard layout" -msgstr "_چیدمان صفحه‌کلید" - -#: ../caribou/common/settings.py:35 -msgid "The layout Caribou should use." -msgstr "" - -#: ../caribou/common/settings.py:36 -msgid "" -"The layout should be in the data directory of Caribou (usually /usr/share/" -"caribou/keyboards) and should be a .xml or .json file." -msgstr "" - -#: ../caribou/common/settings.py:40 ../caribou/common/settings.py:110 -#, fuzzy -#| msgid "Colors" -msgid "Color" -msgstr "رنگ‌ها" - -#: ../caribou/common/settings.py:42 -msgid "Use system theme" -msgstr "" +#: ../caribou/settings/caribou_settings.py:5 +msgid "Caribou Preferences" +msgstr "اختیارات کاریبو" -#: ../caribou/common/settings.py:43 -msgid "Use the default theme colors" -msgstr "" +#: ../caribou/settings/caribou_settings.py:6 +msgid "Scanning" +msgstr "در حال پایش" -#: ../caribou/common/settings.py:47 -#, fuzzy -#| msgid "Normal state:" -msgid "Normal state" -msgstr "وضعیت عادی" +#: ../caribou/settings/caribou_settings.py:8 +msgid "Enable scanning" +msgstr "فعال‌سازی پایش" -#: ../caribou/common/settings.py:48 -msgid "Color of the keys when there is no event on them" -msgstr "" +#: ../caribou/settings/caribou_settings.py:9 +msgid "Enable switch scanning" +msgstr "فعال‌سازی پایش تعویضی" -#: ../caribou/common/settings.py:51 -#, fuzzy -#| msgid "Mouse over:" -msgid "Mouse over" -msgstr "موشی روش رفت" +#: ../caribou/settings/caribou_settings.py:12 +msgid "General" +msgstr "کلی" -#: ../caribou/common/settings.py:52 -msgid "Color of the keys when the mouse goes over the key" -msgstr "" +#: ../caribou/settings/caribou_settings.py:13 +msgid "Scanning mode" +msgstr "حالت پایش" -#: ../caribou/common/settings.py:54 -msgid "Font and size" -msgstr "" +#: ../caribou/settings/caribou_settings.py:15 +msgid "Scanning type, subgroups, rows or linear" +msgstr "نوع پایش، زیرگروه ها، ردیف‌ها یا خطی" -#: ../caribou/common/settings.py:56 -msgid "Use system fonts" -msgstr "" +#: ../caribou/settings/caribou_settings.py:16 +msgid "Subgroups" +msgstr "زیرگروه‌ها" -#: ../caribou/common/settings.py:57 -msgid "Use the default system font for keyboard" -msgstr "" +#: ../caribou/settings/caribou_settings.py:17 +msgid "Rows" +msgstr "ردیف‌ها" -#: ../caribou/common/settings.py:59 -msgid "Key font" -msgstr "" +#: ../caribou/settings/caribou_settings.py:18 +msgid "Linear" +msgstr "خطی" -#: ../caribou/common/settings.py:60 -msgid "Custom font for keyboard" -msgstr "" +#: ../caribou/settings/caribou_settings.py:20 +msgid "Step time" +msgstr "زمان مرحله" -#: ../caribou/common/settings.py:63 -msgid "Scanning" -msgstr "" +#: ../caribou/settings/caribou_settings.py:21 +msgid "Time between key transitions" +msgstr "زمان بین انتقال کلید" -#: ../caribou/common/settings.py:65 -msgid "Enable scanning" -msgstr "" +#: ../caribou/settings/caribou_settings.py:24 +msgid "Inverse scanning" +msgstr "پایش معکوس" -#: ../caribou/common/settings.py:66 -msgid "Enable switch scanning" -msgstr "" +#: ../caribou/settings/caribou_settings.py:25 +msgid "Step with the switch, activate by dwelling" +msgstr "مرحله با تعویض‌گر، قابل فعال شدن با مکث" -#: ../caribou/common/settings.py:71 -msgid "Scanning mode" -msgstr "" +#: ../caribou/settings/caribou_settings.py:28 +msgid "Auto-restart scanning" +msgstr "شروع خودکار مجدد پایش" -#: ../caribou/common/settings.py:73 -msgid "Scanning type, block or row" -msgstr "" +#: ../caribou/settings/caribou_settings.py:29 +msgid "Automatically restart scanning after item activation" +msgstr "بعد از فعال شدن مورد، پایش به طور خودکار مجددا شروع شود" -#: ../caribou/common/settings.py:74 -msgid "Block" -msgstr "" +#: ../caribou/settings/caribou_settings.py:30 +msgid "Scan cycles" +msgstr "دوره‌های پایش" -#: ../caribou/common/settings.py:75 -msgid "Row" -msgstr "" +#: ../caribou/settings/caribou_settings.py:31 +msgid "One" +msgstr "یک" -#: ../caribou/common/settings.py:76 -msgid "Step time" -msgstr "" +#: ../caribou/settings/caribou_settings.py:32 +msgid "Two" +msgstr "دو" -#: ../caribou/common/settings.py:77 -msgid "Time between key transitions" -msgstr "" +#: ../caribou/settings/caribou_settings.py:33 +msgid "Three" +msgstr "سه" -#: ../caribou/common/settings.py:80 -msgid "Reverse scanning" -msgstr "" +#: ../caribou/settings/caribou_settings.py:34 +msgid "Four" +msgstr "چهار" -#: ../caribou/common/settings.py:81 -msgid "Scan in reverse order" -msgstr "" +#: ../caribou/settings/caribou_settings.py:35 +msgid "Five" +msgstr "پنج" -#: ../caribou/common/settings.py:83 +#: ../caribou/settings/caribou_settings.py:38 msgid "Input" -msgstr "" +msgstr "ورودی" -#: ../caribou/common/settings.py:84 +#: ../caribou/settings/caribou_settings.py:39 msgid "Switch device" -msgstr "" +msgstr "دستگاه تعویض" -#: ../caribou/common/settings.py:86 +#: ../caribou/settings/caribou_settings.py:41 msgid "Switch device, keyboard or mouse" -msgstr "" +msgstr "دستگاه تعویض، صفحه‌کلید یا موشی" -#: ../caribou/common/settings.py:89 -#, fuzzy +#: ../caribou/settings/caribou_settings.py:43 +#| msgid "Keyboard _layout:" +msgid "Keyboard" +msgstr "صفحه‌کلید" + +#: ../caribou/settings/caribou_settings.py:44 #| msgid "Mouse over:" msgid "Mouse" -msgstr "موشی روش رفت" +msgstr "موشی" -#: ../caribou/common/settings.py:91 +#: ../caribou/settings/caribou_settings.py:46 msgid "Switch key" -msgstr "" +msgstr "کلید تعویض" -#: ../caribou/common/settings.py:94 +#: ../caribou/settings/caribou_settings.py:48 msgid "Key to use with scanning mode" -msgstr "" +msgstr "کلید جهت استفاده در حالت پایش" -#: ../caribou/common/settings.py:96 +#: ../caribou/settings/caribou_settings.py:50 msgid "Right shift" -msgstr "" +msgstr "تبدیل راست" -#: ../caribou/common/settings.py:97 +#: ../caribou/settings/caribou_settings.py:51 msgid "Left shift" -msgstr "" +msgstr "تبدیل چپ" -#: ../caribou/common/settings.py:98 +#: ../caribou/settings/caribou_settings.py:52 +msgid "Space" +msgstr "فاصله" + +#: ../caribou/settings/caribou_settings.py:53 msgid "Alt Gr" -msgstr "" +msgstr "Alt Gr" -#: ../caribou/common/settings.py:99 +#: ../caribou/settings/caribou_settings.py:54 msgid "Num lock" -msgstr "" +msgstr "قفل اعداد" -#: ../caribou/common/settings.py:100 +#: ../caribou/settings/caribou_settings.py:55 msgid "Switch button" -msgstr "" +msgstr "کلید تعویض" -#: ../caribou/common/settings.py:103 +#: ../caribou/settings/caribou_settings.py:58 msgid "Mouse button to use in the scanning mode" -msgstr "" +msgstr "کلید موشی جهت استفاده در حالت پایش" -#: ../caribou/common/settings.py:105 +#: ../caribou/settings/caribou_settings.py:60 msgid "Button 1" -msgstr "" +msgstr "دکمه ۱" -#: ../caribou/common/settings.py:106 +#: ../caribou/settings/caribou_settings.py:61 msgid "Button 2" -msgstr "" +msgstr "دکمه ۲" -#: ../caribou/common/settings.py:107 +#: ../caribou/settings/caribou_settings.py:62 msgid "Button 3" -msgstr "" - -#: ../caribou/common/settings.py:111 -msgid "Block color" -msgstr "" - -#: ../caribou/common/settings.py:112 -msgid "Color of block scans" -msgstr "" - -#: ../caribou/common/settings.py:113 -msgid "Row color" -msgstr "" - -#: ../caribou/common/settings.py:114 -msgid "Color of row scans" -msgstr "" +msgstr "دکمه ۳" -#: ../caribou/common/settings.py:115 -msgid "Key color" -msgstr "" - -#: ../caribou/common/settings.py:116 -msgid "Color of key scans" -msgstr "" +#: ../caribou/__init__.py:2 +msgid "Caribou" +msgstr "کاریبو" + +#: ../caribou/daemon/main.py:31 +#, python-format +msgid "Error starting %s" +msgstr "خطا در هنگام شروع %s" + +#: ../caribou/daemon/main.py:42 +#, python-format +msgid "In order to use %s, accessibility needs to be enabled. Do you want to enable it now?" +msgstr "جهت استفاده از %s، لازم است دسترسی‌پذیری فعال شود. آیا می‌خواهید آن را هم‌اکنون غیرفعال کنید؟" + +#: ../caribou/daemon/main.py:56 +#, python-format +msgid "Accessibility has been enabled. Log out and back in again to use %s." +msgstr "دسترسی‌پذیری فعال شده است. برای استفاده از %s از سیستم خارج و مجددا وارد شوید." -#: ../caribou/common/settings.py:118 -msgid "Cancel color" -msgstr "" - -#: ../caribou/common/settings.py:119 -msgid "Color of cancel scan" -msgstr "" - -#: ../caribou/ui/preferences_window.py:51 -msgid "Caribou Preferences" -msgstr "اختیارات کاریبو" +#: ../caribou/daemon/main.py:153 +msgid "WARNING - Caribou: unhandled editable widget:" +msgstr "اخطار - کاریبو: ویجت غیرقابل ویرایش:" -#~ msgid "Key _size:" -#~ msgstr "ا_ندازه‌ی کلیدی:" +#: ../caribou/antler/antler_settings.py:5 +#| msgid "Caribou Preferences" +msgid "Antler Preferences" +msgstr "ترجیحات آنتلر" + +#: ../caribou/antler/antler_settings.py:6 +msgid "Antler" +msgstr "آنتلر" + +#: ../caribou/antler/antler_settings.py:7 +msgid "Appearance" +msgstr "ظاهر" -#~ msgid "Key s_pacing:" -#~ msgstr "_فاصله‌دهی کلیدی" +#: ../caribou/antler/antler_settings.py:9 +#| msgid "Keyboard _layout:" +msgid "Keyboard Type" +msgstr "نوع صفحه‌کلید" -#~ msgid "Keys" -#~ msgstr "کلید‌ها" +#: ../caribou/antler/antler_settings.py:10 +msgid "The keyboard geometery Caribou should use" +msgstr "مختصات صفحه‌کلید کاریبو با استفاده کند از" + +#: ../caribou/antler/antler_settings.py:11 +msgid "The keyboard geometery determines the shape and complexity of the keyboard, it could range from a 'natural' look and feel good for composing simple text, to a fullscale keyboard." +msgstr "مختصات صفحه‌کلید، شکل و پیچیدگی صفحه‌کلید را تعیین می‌کند، این می‌تواند باز‌ه‌ای از یک نمای «طبیعی» برای ساخت یک متن ساده تا یک صفحه‌کلید با مقیاس کامل را در بر بگیرد." + +#: ../caribou/antler/antler_settings.py:15 +msgid "Touch" +msgstr "لمسی" + +#: ../caribou/antler/antler_settings.py:16 +msgid "Full scale" +msgstr "مقیاس کامل" + +#: ../caribou/antler/antler_settings.py:17 +msgid "Scan" +msgstr "پایش" + +#: ../caribou/antler/antler_settings.py:18 +#: ../caribou/antler/antler_settings.py:19 +msgid "Use System Theme" +msgstr "استفاده از تم سیستم" + +#: ../caribou/antler/antler_settings.py:20 +msgid "Minimum Alpha" +msgstr "حداقل آلفا" + +#: ../caribou/antler/antler_settings.py:21 +msgid "Minimal opacity of keyboard" +msgstr "کمترین شفافیت صفحه‌کلید" + +#: ../caribou/antler/antler_settings.py:23 +msgid "Maximum Alpha" +msgstr "حداکثر آلفا" + +#: ../caribou/antler/antler_settings.py:24 +msgid "Maximal opacity of keyboard" +msgstr "حداکثر شفافیت صفحه‌کلید" + +#: ../caribou/antler/antler_settings.py:26 +msgid "Maximum Distance" +msgstr "حداکثر فاصله" + +#: ../caribou/antler/antler_settings.py:27 +msgid "Maximum distance when keyboard is hidden" +msgstr "حداکثر فاصله در هنگامی که صفحه‌کلید مخفی است" -#~ msgid "_Test settings here:" -#~ msgstr "حالات را اینجا آ_زمایش کنید:" diff -Nru caribou-0.3.5/po/fr.po caribou-0.3.91/po/fr.po --- caribou-0.3.5/po/fr.po 2011-04-14 23:34:18.000000000 +0000 +++ caribou-0.3.91/po/fr.po 2011-09-05 17:31:38.000000000 +0000 @@ -1,15 +1,16 @@ # French translation for caribou. -# Copyright (C) 2010 Listed translators +# Copyright (C) 2010-2011 Listed translators # This file is distributed under the same license as the caribou package. -# Claude Paroz , 2010. +# Claude Paroz , 2010-2011 +# Alain Lojewski , 2011 # msgid "" msgstr "" "Project-Id-Version: caribou master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=caribou&component=default\n" -"POT-Creation-Date: 2011-01-03 19:14+0000\n" -"PO-Revision-Date: 2010-12-19 20:05+0100\n" +"product=caribou&keywords=I18N+L10N&component=default\n" +"POT-Creation-Date: 2011-09-03 21:06+0000\n" +"PO-Revision-Date: 2011-09-03 23:11+0200\n" "Last-Translator: Claude Paroz \n" "Language-Team: GNOME French Team \n" "MIME-Version: 1.0\n" @@ -17,219 +18,261 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../caribou/ui/main.py:135 -msgid "WARNING - Caribou: unhandled editable widget:" -msgstr "ATTENTION - Caribou : composant graphique éditable non géré :" - -#: ../caribou/common/settings.py:33 ../caribou/common/settings.py:90 -msgid "Keyboard" -msgstr "Clavier" - -#: ../caribou/common/settings.py:34 ../caribou/common/settings.py:72 -msgid "General" -msgstr "Général" - -#: ../caribou/common/settings.py:36 -msgid "Keyboard layout" -msgstr "Agencement de clavier" - -#: ../caribou/common/settings.py:37 -msgid "The layout Caribou should use." -msgstr "L'agencement que Caribou doit utiliser." - -#: ../caribou/common/settings.py:38 -msgid "" -"The layout should be in the data directory of Caribou (usually /usr/share/" -"caribou/keyboards) and should be a .xml or .json file." -msgstr "" -"L'agencement doit se trouver dans le répertoire de données de Caribou " -"(généralement /usr/share/caribou/keyboards) et doit être au format .xml ou ." -"json." - -#: ../caribou/common/settings.py:42 ../caribou/common/settings.py:112 -msgid "Color" -msgstr "Couleur" - -#: ../caribou/common/settings.py:44 -msgid "Use system theme" -msgstr "Utiliser le thème système" - -#: ../caribou/common/settings.py:45 -msgid "Use the default theme colors" -msgstr "Utiliser les couleurs du thème par défaut" - -#: ../caribou/common/settings.py:49 -msgid "Normal state" -msgstr "État normal" - -#: ../caribou/common/settings.py:50 -msgid "Color of the keys when there is no event on them" -msgstr "Couleur des touches quand elles ne sont la cible d'aucun événement" - -#: ../caribou/common/settings.py:53 -msgid "Mouse over" -msgstr "Survol de la souris" - -#: ../caribou/common/settings.py:54 -msgid "Color of the keys when the mouse goes over the key" -msgstr "Couleur des touches quand la souris passe sur elles" - -#: ../caribou/common/settings.py:56 -msgid "Font and size" -msgstr "Police et taille" - -#: ../caribou/common/settings.py:58 -msgid "Use system fonts" -msgstr "Utiliser les polices du système" - -#: ../caribou/common/settings.py:59 -msgid "Use the default system font for keyboard" -msgstr "Utiliser la police par défaut du système pour le clavier" - -#: ../caribou/common/settings.py:61 -msgid "Key font" -msgstr "Police des touches" - -#: ../caribou/common/settings.py:62 -msgid "Custom font for keyboard" -msgstr "Police personalisée pour le clavier" +#: ../caribou/settings/caribou_settings.py:5 +msgid "Caribou Preferences" +msgstr "Préférences de Caribou" -#: ../caribou/common/settings.py:65 +#: ../caribou/settings/caribou_settings.py:6 msgid "Scanning" msgstr "Balayage" -#: ../caribou/common/settings.py:67 +#: ../caribou/settings/caribou_settings.py:8 msgid "Enable scanning" msgstr "Activer le balayage" -#: ../caribou/common/settings.py:68 +#: ../caribou/settings/caribou_settings.py:9 msgid "Enable switch scanning" msgstr "Activer la sélection par balayage" -#: ../caribou/common/settings.py:73 +#: ../caribou/settings/caribou_settings.py:12 +msgid "General" +msgstr "Général" + +#: ../caribou/settings/caribou_settings.py:13 msgid "Scanning mode" msgstr "Mode de balayage" -#: ../caribou/common/settings.py:75 -msgid "Scanning type, block or row" -msgstr "Type de balayage, par bloc ou par ligne" - -#: ../caribou/common/settings.py:76 -msgid "Block" -msgstr "Bloc" - -#: ../caribou/common/settings.py:77 -msgid "Row" -msgstr "Ligne" +#: ../caribou/settings/caribou_settings.py:15 +msgid "Scanning type, subgroups, rows or linear" +msgstr "Type de balayage, par sous-groupes, par lignes ou linéaire" + +#: ../caribou/settings/caribou_settings.py:16 +msgid "Subgroups" +msgstr "Sous-groupes" + +#: ../caribou/settings/caribou_settings.py:17 +msgid "Rows" +msgstr "Lignes" + +#: ../caribou/settings/caribou_settings.py:18 +msgid "Linear" +msgstr "Linéaire" -#: ../caribou/common/settings.py:78 +#: ../caribou/settings/caribou_settings.py:20 msgid "Step time" msgstr "Durée des séquences" -#: ../caribou/common/settings.py:79 +#: ../caribou/settings/caribou_settings.py:21 msgid "Time between key transitions" msgstr "Délai entre le changement de touche" -#: ../caribou/common/settings.py:82 -msgid "Reverse scanning" +#: ../caribou/settings/caribou_settings.py:24 +msgid "Inverse scanning" msgstr "Balayage inverse" -#: ../caribou/common/settings.py:83 -msgid "Scan in reverse order" -msgstr "Effectuer le balayage dans l'ordre inverse" +#: ../caribou/settings/caribou_settings.py:25 +msgid "Step with the switch, activate by dwelling" +msgstr "Avance par bouton, activation par maintien" + +#: ../caribou/settings/caribou_settings.py:28 +msgid "Auto-restart scanning" +msgstr "Redémarrer le balayage automatiquement" + +#: ../caribou/settings/caribou_settings.py:29 +msgid "Automatically restart scanning after item activation" +msgstr "Redémarrer le balayage automatiquement après l'activation d'un élément" + +#: ../caribou/settings/caribou_settings.py:30 +msgid "Scan cycles" +msgstr "Cycles de balayage" + +#: ../caribou/settings/caribou_settings.py:31 +msgid "One" +msgstr "Un" + +#: ../caribou/settings/caribou_settings.py:32 +msgid "Two" +msgstr "Deux" + +#: ../caribou/settings/caribou_settings.py:33 +msgid "Three" +msgstr "Trois" + +#: ../caribou/settings/caribou_settings.py:34 +msgid "Four" +msgstr "Quatre" + +#: ../caribou/settings/caribou_settings.py:35 +msgid "Five" +msgstr "Cinq" -#: ../caribou/common/settings.py:85 +#: ../caribou/settings/caribou_settings.py:38 msgid "Input" msgstr "Entrée" -#: ../caribou/common/settings.py:86 +#: ../caribou/settings/caribou_settings.py:39 msgid "Switch device" msgstr "Périphérique de sélection" -#: ../caribou/common/settings.py:88 +#: ../caribou/settings/caribou_settings.py:41 msgid "Switch device, keyboard or mouse" msgstr "Périphérique de sélection, clavier ou souris" -#: ../caribou/common/settings.py:91 +#: ../caribou/settings/caribou_settings.py:43 +msgid "Keyboard" +msgstr "Clavier" + +#: ../caribou/settings/caribou_settings.py:44 msgid "Mouse" msgstr "Souris" -#: ../caribou/common/settings.py:93 +#: ../caribou/settings/caribou_settings.py:46 msgid "Switch key" msgstr "Touche de sélection" -#: ../caribou/common/settings.py:96 +#: ../caribou/settings/caribou_settings.py:48 msgid "Key to use with scanning mode" msgstr "Touche à utiliser en mode balayage" -#: ../caribou/common/settings.py:98 +#: ../caribou/settings/caribou_settings.py:50 msgid "Right shift" msgstr "Maj. de droite" -#: ../caribou/common/settings.py:99 +#: ../caribou/settings/caribou_settings.py:51 msgid "Left shift" msgstr "Maj. de gauche" -#: ../caribou/common/settings.py:100 +#: ../caribou/settings/caribou_settings.py:52 +msgid "Space" +msgstr "Espace" + +#: ../caribou/settings/caribou_settings.py:53 msgid "Alt Gr" msgstr "Alt Gr" -#: ../caribou/common/settings.py:101 +#: ../caribou/settings/caribou_settings.py:54 msgid "Num lock" msgstr "Verr. Num." -#: ../caribou/common/settings.py:102 +#: ../caribou/settings/caribou_settings.py:55 msgid "Switch button" msgstr "Bouton de sélection" -#: ../caribou/common/settings.py:105 +#: ../caribou/settings/caribou_settings.py:58 msgid "Mouse button to use in the scanning mode" msgstr "Bouton de souris à utiliser en mode balayage" -#: ../caribou/common/settings.py:107 +#: ../caribou/settings/caribou_settings.py:60 msgid "Button 1" msgstr "Bouton 1" -#: ../caribou/common/settings.py:108 +#: ../caribou/settings/caribou_settings.py:61 msgid "Button 2" msgstr "Bouton 2" -#: ../caribou/common/settings.py:109 +#: ../caribou/settings/caribou_settings.py:62 msgid "Button 3" msgstr "Bouton 3" -#: ../caribou/common/settings.py:113 -msgid "Block color" -msgstr "Couleur de bloc" - -#: ../caribou/common/settings.py:114 -msgid "Color of block scans" -msgstr "Couleur des balayages par bloc" - -#: ../caribou/common/settings.py:115 -msgid "Row color" -msgstr "Couleur de ligne" - -#: ../caribou/common/settings.py:116 -msgid "Color of row scans" -msgstr "Couleur des balayages par ligne" - -#: ../caribou/common/settings.py:117 -msgid "Key color" -msgstr "Couleur de touche" - -#: ../caribou/common/settings.py:118 -msgid "Color of key scans" -msgstr "Couleur des balayages par touche" - -#: ../caribou/common/settings.py:120 -msgid "Cancel color" -msgstr "Couleur d'annulation" - -#: ../caribou/common/settings.py:121 -msgid "Color of cancel scan" -msgstr "Couleur des balayages d'annulation" +#: ../caribou/__init__.py:2 +msgid "Caribou" +msgstr "Caribou" + +#: ../caribou/daemon/main.py:31 +#, python-format +msgid "Error starting %s" +msgstr "Erreur de démarrage %s" -#: ../caribou/ui/preferences_window.py:50 -msgid "Caribou Preferences" -msgstr "Préférences de Caribou" +#: ../caribou/daemon/main.py:42 +#, python-format +msgid "" +"In order to use %s, accessibility needs to be enabled. Do you want to enable " +"it now?" +msgstr "" +"Pour pouvoir utiliser %s, l'outil d'accessibilité doit être activé. Voulez-" +"vous l'activer maintenant ?" + +#: ../caribou/daemon/main.py:56 +#, python-format +msgid "Accessibility has been enabled. Log out and back in again to use %s." +msgstr "" +"L'outil d'accessibilité est activé. Veuillez vous déconnecter et vous " +"reconnecter pour utiliser %s." + +#: ../caribou/daemon/main.py:153 +msgid "WARNING - Caribou: unhandled editable widget:" +msgstr "ATTENTION - Caribou : composant graphique éditable non géré :" + +#: ../caribou/antler/antler_settings.py:5 +msgid "Antler Preferences" +msgstr "Préférences d'Antler" + +#: ../caribou/antler/antler_settings.py:6 +msgid "Antler" +msgstr "Antler" + +#: ../caribou/antler/antler_settings.py:7 +msgid "Appearance" +msgstr "Apparence" + +#: ../caribou/antler/antler_settings.py:9 +msgid "Keyboard Type" +msgstr "Type de clavier" + +#: ../caribou/antler/antler_settings.py:10 +msgid "The keyboard geometry Caribou should use" +msgstr "L'agencement de clavier que Caribou doit utiliser" + +#: ../caribou/antler/antler_settings.py:11 +msgid "" +"The keyboard geometry determines the shape and complexity of the keyboard, " +"it could range from a 'natural' look and feel good for composing simple " +"text, to a fullscale keyboard." +msgstr "" +"L'agencement du clavier définit sa forme et sa complexité. Ça peut aller " +"d'un design « simple » pour ne saisir que du texte, à une disposition " +"beaucoup plus complète." + +#. Translators: Keyboard type (similar to touch/tactile device) +#: ../caribou/antler/antler_settings.py:16 +msgid "Touch" +msgstr "Tactile" + +#. Translators: Keyboard type (conventional keyboard) +#: ../caribou/antler/antler_settings.py:18 +msgid "Full scale" +msgstr "Complet" + +#. Translators: Keyboard type (scanned grid by rows/columns) +#: ../caribou/antler/antler_settings.py:20 +msgid "Scan" +msgstr "À balayage" + +#: ../caribou/antler/antler_settings.py:21 +#: ../caribou/antler/antler_settings.py:22 +msgid "Use System Theme" +msgstr "Utiliser le thème système" + +#: ../caribou/antler/antler_settings.py:23 +msgid "Minimum Alpha" +msgstr "Alpha minimum" + +#: ../caribou/antler/antler_settings.py:24 +msgid "Minimal opacity of keyboard" +msgstr "Opacité minimum du clavier" + +#: ../caribou/antler/antler_settings.py:26 +msgid "Maximum Alpha" +msgstr "Alpha maximum" + +#: ../caribou/antler/antler_settings.py:27 +msgid "Maximal opacity of keyboard" +msgstr "Opacité maximum du clavier" + +#: ../caribou/antler/antler_settings.py:29 +msgid "Maximum Distance" +msgstr "Distance maximum" + +#: ../caribou/antler/antler_settings.py:30 +msgid "Maximum distance when keyboard is hidden" +msgstr "Distance maximum pour le clavier caché" diff -Nru caribou-0.3.5/po/gl.po caribou-0.3.91/po/gl.po --- caribou-0.3.5/po/gl.po 2011-04-14 23:34:18.000000000 +0000 +++ caribou-0.3.91/po/gl.po 2011-09-05 17:31:38.000000000 +0000 @@ -1,235 +1,350 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Xosé M. Lamas , 2011. +# Fran Dieguez , 2011. # msgid "" msgstr "" "Project-Id-Version: Caribou\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:16+0100\n" -"PO-Revision-Date: 2011-01-14 23:17+0100\n" -"Last-Translator: marcoslans \n" -"Language-Team: Galician \n" +"POT-Creation-Date: 2011-09-04 18:38+0200\n" +"PO-Revision-Date: 2011-09-04 18:43+0200\n" +"Last-Translator: Fran Dieguez \n" +"Language-Team: Galego \n" "Language: gl\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bits\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Poedit-Language: Galician\n" -#: ../caribou/ui/main.py:149 -msgid "WARNING - Caribou: unhandled editable widget:" -msgstr "AVISO - Caribou: widget editábel non manexado:" - -#: ../caribou/common/settings.py:33 ../caribou/common/settings.py:90 -msgid "Keyboard" -msgstr "Teclado" - -#: ../caribou/common/settings.py:34 ../caribou/common/settings.py:72 -msgid "General" -msgstr "Xeral" - -#: ../caribou/common/settings.py:36 -msgid "Keyboard layout" -msgstr "Disposición do teclado" - -#: ../caribou/common/settings.py:37 -msgid "The layout Caribou should use." -msgstr "Disposición do teclado que usará Caribou." - -#: ../caribou/common/settings.py:38 -msgid "" -"The layout should be in the data directory of Caribou (usually /usr/share/" -"caribou/keyboards) and should be a .xml or .json file." -msgstr "" -"A disposición debería estar no cartafol de datos de Caribou (xeralmente /usr/" -"share/caribou/keyboards) e debería ser un ficheiro .xml ou .json." - -#: ../caribou/common/settings.py:42 ../caribou/common/settings.py:112 -msgid "Color" -msgstr "Cor" - -#: ../caribou/common/settings.py:44 -msgid "Use system theme" -msgstr "Usar o tema do sistema" - -#: ../caribou/common/settings.py:45 -msgid "Use the default theme colors" -msgstr "Usar as cores do tema predefinido" - -#: ../caribou/common/settings.py:49 -msgid "Normal state" -msgstr "Estado normal" - -#: ../caribou/common/settings.py:50 -msgid "Color of the keys when there is no event on them" -msgstr "Cor das teclas cando non hai actividade sobre elas" - -#: ../caribou/common/settings.py:53 -msgid "Mouse over" -msgstr "Rato enriba" - -#: ../caribou/common/settings.py:54 -msgid "Color of the keys when the mouse goes over the key" -msgstr "Cor das teclas cando o rato pasa sobre elas" - -#: ../caribou/common/settings.py:56 -msgid "Font and size" -msgstr "Tipo e tamaño da letra" - -#: ../caribou/common/settings.py:58 -msgid "Use system fonts" -msgstr "Usar os tipos de letra do sistema" - -#: ../caribou/common/settings.py:59 -msgid "Use the default system font for keyboard" -msgstr "Usar o tipo de letra predefinido do sistema para o teclado" - -#: ../caribou/common/settings.py:61 -msgid "Key font" -msgstr "Tipo de letra das teclas" - -#: ../caribou/common/settings.py:62 -msgid "Custom font for keyboard" -msgstr "Personalizar o tipo de letra das teclas" +#: ../caribou/settings/caribou_settings.py:5 +msgid "Caribou Preferences" +msgstr "Preferencias de Caribou" -#: ../caribou/common/settings.py:65 +#: ../caribou/settings/caribou_settings.py:6 msgid "Scanning" msgstr "Análise" -#: ../caribou/common/settings.py:67 +#: ../caribou/settings/caribou_settings.py:8 msgid "Enable scanning" msgstr "Activar a análise" -#: ../caribou/common/settings.py:68 +#: ../caribou/settings/caribou_settings.py:9 msgid "Enable switch scanning" msgstr "Activar a selección de análise" -#: ../caribou/common/settings.py:73 +#: ../caribou/settings/caribou_settings.py:12 +msgid "General" +msgstr "Xeral" + +#: ../caribou/settings/caribou_settings.py:13 msgid "Scanning mode" msgstr "Modo de análise" -#: ../caribou/common/settings.py:75 -msgid "Scanning type, block or row" +#: ../caribou/settings/caribou_settings.py:15 +msgid "Scanning type, subgroups, rows or linear" msgstr "Tipo de análise, por bloque ou por ringleira" -#: ../caribou/common/settings.py:76 -msgid "Block" -msgstr "Bloque" - -#: ../caribou/common/settings.py:77 -msgid "Row" -msgstr "Ringleira" +#: ../caribou/settings/caribou_settings.py:16 +msgid "Subgroups" +msgstr "Subgrupos" + +#: ../caribou/settings/caribou_settings.py:17 +msgid "Rows" +msgstr "Filas" + +#: ../caribou/settings/caribou_settings.py:18 +msgid "Linear" +msgstr "Lineal" -#: ../caribou/common/settings.py:78 +#: ../caribou/settings/caribou_settings.py:20 msgid "Step time" msgstr "Duración das secuencias" -#: ../caribou/common/settings.py:79 +#: ../caribou/settings/caribou_settings.py:21 msgid "Time between key transitions" msgstr "Duración das transicións entre teclas" -#: ../caribou/common/settings.py:82 -msgid "Reverse scanning" +#: ../caribou/settings/caribou_settings.py:24 +msgid "Inverse scanning" msgstr "Análise inversa" -#: ../caribou/common/settings.py:83 -msgid "Scan in reverse order" -msgstr "Analizar en orde inversa" +#: ../caribou/settings/caribou_settings.py:25 +msgid "Step with the switch, activate by dwelling" +msgstr "Paso co interruptor, activado cunha pulsación ao pousarse" + +#: ../caribou/settings/caribou_settings.py:28 +msgid "Auto-restart scanning" +msgstr "Reiniciar automáticamente o análise" + +#: ../caribou/settings/caribou_settings.py:29 +msgid "Automatically restart scanning after item activation" +msgstr "Reiniciar automáticamente o análise despois da activación do elemento" + +#: ../caribou/settings/caribou_settings.py:30 +msgid "Scan cycles" +msgstr "Ciclos de análise" + +#: ../caribou/settings/caribou_settings.py:31 +msgid "One" +msgstr "Un" + +#: ../caribou/settings/caribou_settings.py:32 +msgid "Two" +msgstr "Dous" + +#: ../caribou/settings/caribou_settings.py:33 +msgid "Three" +msgstr "Tres" + +#: ../caribou/settings/caribou_settings.py:34 +msgid "Four" +msgstr "Catro" + +#: ../caribou/settings/caribou_settings.py:35 +msgid "Five" +msgstr "Cinco" -#: ../caribou/common/settings.py:85 +#: ../caribou/settings/caribou_settings.py:38 msgid "Input" msgstr "Entrada" -#: ../caribou/common/settings.py:86 +#: ../caribou/settings/caribou_settings.py:39 msgid "Switch device" msgstr "Selector de dispositivo" -#: ../caribou/common/settings.py:88 +#: ../caribou/settings/caribou_settings.py:41 msgid "Switch device, keyboard or mouse" msgstr "Seleccionar un dispositivo, teclado ou rato" -#: ../caribou/common/settings.py:91 +#: ../caribou/settings/caribou_settings.py:43 +msgid "Keyboard" +msgstr "Teclado" + +#: ../caribou/settings/caribou_settings.py:44 msgid "Mouse" msgstr "Rato" -#: ../caribou/common/settings.py:93 +#: ../caribou/settings/caribou_settings.py:46 msgid "Switch key" msgstr "Selector de tecla" -#: ../caribou/common/settings.py:96 +#: ../caribou/settings/caribou_settings.py:48 msgid "Key to use with scanning mode" msgstr "Tecla para usar co modo de análise" -#: ../caribou/common/settings.py:98 +#: ../caribou/settings/caribou_settings.py:50 msgid "Right shift" msgstr "Maiús. dereita" -#: ../caribou/common/settings.py:99 +#: ../caribou/settings/caribou_settings.py:51 msgid "Left shift" msgstr "Maiús. esquerda" -#: ../caribou/common/settings.py:100 +#: ../caribou/settings/caribou_settings.py:52 +msgid "Space" +msgstr "Espazo" + +#: ../caribou/settings/caribou_settings.py:53 msgid "Alt Gr" msgstr "Alt Gr" -#: ../caribou/common/settings.py:101 +#: ../caribou/settings/caribou_settings.py:54 msgid "Num lock" msgstr "Bloq Num" -#: ../caribou/common/settings.py:102 +#: ../caribou/settings/caribou_settings.py:55 msgid "Switch button" msgstr "Botón selector" -#: ../caribou/common/settings.py:105 +#: ../caribou/settings/caribou_settings.py:58 msgid "Mouse button to use in the scanning mode" msgstr "Botón do rato a usar no modo de análise" -#: ../caribou/common/settings.py:107 +#: ../caribou/settings/caribou_settings.py:60 msgid "Button 1" msgstr "Botón 1" -#: ../caribou/common/settings.py:108 +#: ../caribou/settings/caribou_settings.py:61 msgid "Button 2" msgstr "Botón 2" -#: ../caribou/common/settings.py:109 +#: ../caribou/settings/caribou_settings.py:62 msgid "Button 3" msgstr "Botón 3" -#: ../caribou/common/settings.py:113 -msgid "Block color" -msgstr "Cor do bloque" - -#: ../caribou/common/settings.py:114 -msgid "Color of block scans" -msgstr "Cor das análises por bloque" - -#: ../caribou/common/settings.py:115 -msgid "Row color" -msgstr "Cor da fila" - -#: ../caribou/common/settings.py:116 -msgid "Color of row scans" -msgstr "Cor das análises por fila" - -#: ../caribou/common/settings.py:117 -msgid "Key color" -msgstr "Cor da tecla" - -#: ../caribou/common/settings.py:118 -msgid "Color of key scans" -msgstr "Cor das análises por tecla" - -#: ../caribou/common/settings.py:120 -msgid "Cancel color" -msgstr "Cor de cancelación" - -#: ../caribou/common/settings.py:121 -msgid "Color of cancel scan" -msgstr "Cor da cancelación de análises" +#: ../caribou/__init__.py:2 +msgid "Caribou" +msgstr "Caribou" + +#: ../caribou/daemon/main.py:31 +#, python-format +msgid "Error starting %s" +msgstr "Erro iniciando %s" -#: ../caribou/ui/preferences_window.py:51 -msgid "Caribou Preferences" -msgstr "Preferencias de Caribou" +#: ../caribou/daemon/main.py:42 +#, python-format +msgid "" +"In order to use %s, accessibility needs to be enabled. Do you want to enable " +"it now?" +msgstr "" +"Para poder usar %s, precisa habilitar a Accesibilidade. Quéres habilitala " +"agora" + +#: ../caribou/daemon/main.py:56 +#, python-format +msgid "Accessibility has been enabled. Log out and back in again to use %s." +msgstr "Accesibilidade foi habilitada. Sae e inicia de novo para usar %s." + +#: ../caribou/daemon/main.py:153 +msgid "WARNING - Caribou: unhandled editable widget:" +msgstr "AVISO - Caribou: widget editábel non manexado:" + +#: ../caribou/antler/antler_settings.py:5 +msgid "Antler Preferences" +msgstr "Preferencias de Antler" + +#: ../caribou/antler/antler_settings.py:6 +msgid "Antler" +msgstr "Antler" + +#: ../caribou/antler/antler_settings.py:7 +msgid "Appearance" +msgstr "Aparencia" + +#: ../caribou/antler/antler_settings.py:9 +msgid "Keyboard Type" +msgstr "Tipo de Teclado" + +#: ../caribou/antler/antler_settings.py:10 +msgid "The keyboard geometry Caribou should use" +msgstr "A xeometría do teclado que Caribou debe usar" + +#: ../caribou/antler/antler_settings.py:11 +msgid "" +"The keyboard geometry determines the shape and complexity of the keyboard, " +"it could range from a 'natural' look and feel good for composing simple " +"text, to a fullscale keyboard." +msgstr "" +"A xeometría do teclado determina a forma e complexidade do teclado, pode ir " +"desde un aspecto «natural», bo para escribir texto, ate un teclado a escala " +"completa." + +#. Translators: Keyboard type (similar to touch/tactile device) +#: ../caribou/antler/antler_settings.py:16 +msgid "Touch" +msgstr "Táctil" + +#. Translators: Keyboard type (conventional keyboard) +#: ../caribou/antler/antler_settings.py:18 +msgid "Full scale" +msgstr "Completo" + +#. Translators: Keyboard type (scanned grid by rows/columns) +#: ../caribou/antler/antler_settings.py:20 +msgid "Scan" +msgstr "Analizar" + +#: ../caribou/antler/antler_settings.py:21 +#: ../caribou/antler/antler_settings.py:22 +msgid "Use System Theme" +msgstr "Usar o tema do sistema" + +#: ../caribou/antler/antler_settings.py:23 +msgid "Minimum Alpha" +msgstr "Alfa mínima" + +#: ../caribou/antler/antler_settings.py:24 +msgid "Minimal opacity of keyboard" +msgstr "Opacidade mínima do teclado" + +#: ../caribou/antler/antler_settings.py:26 +msgid "Maximum Alpha" +msgstr "Alfa máxima" + +#: ../caribou/antler/antler_settings.py:27 +msgid "Maximal opacity of keyboard" +msgstr "Opacidade máxima do teclado" + +#: ../caribou/antler/antler_settings.py:29 +msgid "Maximum Distance" +msgstr "Distancia máxima" + +#: ../caribou/antler/antler_settings.py:30 +msgid "Maximum distance when keyboard is hidden" +msgstr "Distancia máxima cando o teclado está agochado" + +#~ msgid "Keyboard layout" +#~ msgstr "Disposición do teclado" + +#~ msgid "" +#~ "The layout should be in the data directory of Caribou (usually /usr/share/" +#~ "caribou/keyboards) and should be a .xml or .json file." +#~ msgstr "" +#~ "A disposición debería estar no cartafol de datos de Caribou (xeralmente /" +#~ "usr/share/caribou/keyboards) e debería ser un ficheiro .xml ou .json." + +#~ msgid "Color" +#~ msgstr "Cor" + +#~ msgid "Use the default theme colors" +#~ msgstr "Usar as cores do tema predefinido" + +#~ msgid "Normal state" +#~ msgstr "Estado normal" + +#~ msgid "Color of the keys when there is no event on them" +#~ msgstr "Cor das teclas cando non hai actividade sobre elas" + +#~ msgid "Mouse over" +#~ msgstr "Rato enriba" + +#~ msgid "Color of the keys when the mouse goes over the key" +#~ msgstr "Cor das teclas cando o rato pasa sobre elas" + +#~ msgid "Font and size" +#~ msgstr "Tipo e tamaño da letra" + +#~ msgid "Use system fonts" +#~ msgstr "Usar os tipos de letra do sistema" + +#~ msgid "Use the default system font for keyboard" +#~ msgstr "Usar o tipo de letra predefinido do sistema para o teclado" + +#~ msgid "Key font" +#~ msgstr "Tipo de letra das teclas" + +#~ msgid "Custom font for keyboard" +#~ msgstr "Personalizar o tipo de letra das teclas" + +#~ msgid "Block" +#~ msgstr "Bloque" + +#~ msgid "Scan in reverse order" +#~ msgstr "Analizar en orde inversa" + +#~ msgid "Block color" +#~ msgstr "Cor do bloque" + +#~ msgid "Color of block scans" +#~ msgstr "Cor das análises por bloque" + +#~ msgid "Row color" +#~ msgstr "Cor da fila" + +#~ msgid "Color of row scans" +#~ msgstr "Cor das análises por fila" + +#~ msgid "Key color" +#~ msgstr "Cor da tecla" + +#~ msgid "Color of key scans" +#~ msgstr "Cor das análises por tecla" + +#~ msgid "Cancel color" +#~ msgstr "Cor de cancelación" + +#~ msgid "Color of cancel scan" +#~ msgstr "Cor da cancelación de análises" diff -Nru caribou-0.3.5/po/LINGUAS caribou-0.3.91/po/LINGUAS --- caribou-0.3.5/po/LINGUAS 2011-05-05 19:29:06.000000000 +0000 +++ caribou-0.3.91/po/LINGUAS 2011-09-05 17:31:38.000000000 +0000 @@ -10,6 +10,7 @@ de el en_GB +eo es fa fr diff -Nru caribou-0.3.5/po/nb.po caribou-0.3.91/po/nb.po --- caribou-0.3.5/po/nb.po 2011-06-08 18:15:53.000000000 +0000 +++ caribou-0.3.91/po/nb.po 2011-08-31 22:42:15.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: caribou\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-07 16:34+0200\n" -"PO-Revision-Date: 2011-06-07 16:36+0200\n" +"POT-Creation-Date: 2011-08-31 21:18+0200\n" +"PO-Revision-Date: 2011-08-31 21:22+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian Bokmål \n" "Language: \n" @@ -26,7 +26,7 @@ #: ../caribou/settings/caribou_settings.py:8 msgid "Enable scanning" -msgstr "" +msgstr "Slå på søking" #: ../caribou/settings/caribou_settings.py:9 msgid "Enable switch scanning" @@ -46,7 +46,7 @@ #: ../caribou/settings/caribou_settings.py:16 msgid "Subgroups" -msgstr "" +msgstr "Undergrupper" #: ../caribou/settings/caribou_settings.py:17 msgid "Rows" @@ -110,11 +110,11 @@ #: ../caribou/settings/caribou_settings.py:39 msgid "Switch device" -msgstr "" +msgstr "Bytt enhet" #: ../caribou/settings/caribou_settings.py:41 msgid "Switch device, keyboard or mouse" -msgstr "" +msgstr "Bytt enhet, tastatur eller mus" #: ../caribou/settings/caribou_settings.py:43 msgid "Keyboard" @@ -174,7 +174,7 @@ #: ../caribou/__init__.py:2 msgid "Caribou" -msgstr "" +msgstr "Caribou" #: ../caribou/daemon/main.py:31 #, python-format @@ -214,9 +214,8 @@ msgstr "Type tastatur" #: ../caribou/antler/antler_settings.py:10 -#, fuzzy msgid "The keyboard geometery Caribou should use" -msgstr "Utforming som Caribou skal bruke." +msgstr "Tastaturgeometri som Caribou skal bruke" #: ../caribou/antler/antler_settings.py:11 msgid "" @@ -230,34 +229,38 @@ msgstr "Berøring" #: ../caribou/antler/antler_settings.py:16 +msgid "Full scale" +msgstr "Full skala" + +#: ../caribou/antler/antler_settings.py:17 msgid "Scan" msgstr "Søk" -#: ../caribou/antler/antler_settings.py:17 #: ../caribou/antler/antler_settings.py:18 +#: ../caribou/antler/antler_settings.py:19 msgid "Use System Theme" msgstr "Bruk systemets tema" -#: ../caribou/antler/antler_settings.py:19 +#: ../caribou/antler/antler_settings.py:20 msgid "Minimum Alpha" msgstr "" -#: ../caribou/antler/antler_settings.py:20 +#: ../caribou/antler/antler_settings.py:21 msgid "Minimal opacity of keyboard" msgstr "" -#: ../caribou/antler/antler_settings.py:22 +#: ../caribou/antler/antler_settings.py:23 msgid "Maximum Alpha" msgstr "" -#: ../caribou/antler/antler_settings.py:23 +#: ../caribou/antler/antler_settings.py:24 msgid "Maximal opacity of keyboard" msgstr "" -#: ../caribou/antler/antler_settings.py:25 +#: ../caribou/antler/antler_settings.py:26 msgid "Maximum Distance" -msgstr "" +msgstr "Maksimal distanse" -#: ../caribou/antler/antler_settings.py:26 +#: ../caribou/antler/antler_settings.py:27 msgid "Maximum distance when keyboard is hidden" -msgstr "" +msgstr "Maksimal distanse når tastaturet er skjult" diff -Nru caribou-0.3.5/po/pt_BR.po caribou-0.3.91/po/pt_BR.po --- caribou-0.3.5/po/pt_BR.po 2011-08-04 17:14:00.000000000 +0000 +++ caribou-0.3.91/po/pt_BR.po 2011-09-05 17:31:38.000000000 +0000 @@ -7,11 +7,10 @@ msgid "" msgstr "" "Project-Id-Version: caribou master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=caribou&keywords=I18N+L10N&component=default\n" -"POT-Creation-Date: 2011-07-18 17:10+0000\n" -"PO-Revision-Date: 2011-06-27 20:25-0200\n" -"Last-Translator: Gabriel Speckhahn \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-08-31 22:34-0400\n" +"PO-Revision-Date: 2011-08-31 23:01-0300\n" +"Last-Translator: Antonio Fernandes C. Neto \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -224,7 +223,7 @@ #: ../caribou/antler/antler_settings.py:10 msgid "The keyboard geometery Caribou should use" -msgstr "A geometria eo teclado que o Caribou deve usar" +msgstr "A geometria e o teclado que o Caribou deve usar" #: ../caribou/antler/antler_settings.py:11 msgid "" @@ -242,7 +241,7 @@ #: ../caribou/antler/antler_settings.py:16 msgid "Full scale" -msgstr "" +msgstr "Escala completa" #: ../caribou/antler/antler_settings.py:17 msgid "Scan" @@ -276,4 +275,3 @@ #: ../caribou/antler/antler_settings.py:27 msgid "Maximum distance when keyboard is hidden" msgstr "Distância máxima quando o teclado permanece oculto" - diff -Nru caribou-0.3.5/po/sv.po caribou-0.3.91/po/sv.po --- caribou-0.3.5/po/sv.po 2011-04-14 23:34:18.000000000 +0000 +++ caribou-0.3.91/po/sv.po 2011-09-05 17:31:38.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: caribou\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-24 16:56+0100\n" -"PO-Revision-Date: 2011-03-24 16:53+0100\n" +"POT-Creation-Date: 2011-09-01 15:49+0200\n" +"PO-Revision-Date: 2011-09-01 15:50+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -16,230 +16,311 @@ "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../caribou/ui/main.py:238 -msgid "WARNING - Caribou: unhandled editable widget:" -msgstr "VARNING - Caribou: ohanterad redigerbar widget:" - -#: ../caribou/common/settings.py:31 ../caribou/common/settings.py:88 -msgid "Keyboard" -msgstr "Tangentbord" - -#: ../caribou/common/settings.py:32 ../caribou/common/settings.py:70 -msgid "General" -msgstr "Allmänt" - -#: ../caribou/common/settings.py:34 -msgid "Keyboard layout" -msgstr "Tangentbordslayout" - -#: ../caribou/common/settings.py:35 -msgid "The layout Caribou should use." -msgstr "Layouten som Caribou ska använda." - -#: ../caribou/common/settings.py:36 -msgid "" -"The layout should be in the data directory of Caribou (usually /usr/share/" -"caribou/keyboards) and should be a .xml or .json file." -msgstr "" -"Layouten ska finnas i Caribous datakatalog (oftast /usr/share/caribou/" -"keyboards) och ska vara av typen .xml eller .json." - -#: ../caribou/common/settings.py:40 ../caribou/common/settings.py:110 -msgid "Color" -msgstr "Färg" - -#: ../caribou/common/settings.py:42 -msgid "Use system theme" -msgstr "Använd systemtema" - -#: ../caribou/common/settings.py:43 -msgid "Use the default theme colors" -msgstr "Använd standardfärger från tema" - -#: ../caribou/common/settings.py:47 -msgid "Normal state" -msgstr "Normalt tillstånd" - -#: ../caribou/common/settings.py:48 -msgid "Color of the keys when there is no event on them" -msgstr "Färg för tangenterna när det inte finns någon händelse på dem" - -#: ../caribou/common/settings.py:51 -msgid "Mouse over" -msgstr "Muspekare över" - -#: ../caribou/common/settings.py:52 -msgid "Color of the keys when the mouse goes over the key" -msgstr "Färg för tangenterna när muspekaren dras över tangenten" - -#: ../caribou/common/settings.py:54 -msgid "Font and size" -msgstr "Typsnitt och storlek" - -#: ../caribou/common/settings.py:56 -msgid "Use system fonts" -msgstr "Använd systemtypsnitt" - -#: ../caribou/common/settings.py:57 -msgid "Use the default system font for keyboard" -msgstr "Använd systemets standardtypsnitt för tangentbordet" - -#: ../caribou/common/settings.py:59 -msgid "Key font" -msgstr "Tangenttypsnitt" - -#: ../caribou/common/settings.py:60 -msgid "Custom font for keyboard" -msgstr "Anpassat typsnitt för tangentbordet" +#: ../caribou/settings/caribou_settings.py:5 +msgid "Caribou Preferences" +msgstr "Inställningar för Caribou" -#: ../caribou/common/settings.py:63 +#: ../caribou/settings/caribou_settings.py:6 msgid "Scanning" msgstr "Avsökning" -#: ../caribou/common/settings.py:65 +#: ../caribou/settings/caribou_settings.py:8 msgid "Enable scanning" msgstr "Aktivera avsökning" -#: ../caribou/common/settings.py:66 +#: ../caribou/settings/caribou_settings.py:9 msgid "Enable switch scanning" msgstr "Aktivera brytaravsökning" -#: ../caribou/common/settings.py:71 +#: ../caribou/settings/caribou_settings.py:12 +msgid "General" +msgstr "Allmänt" + +#: ../caribou/settings/caribou_settings.py:13 msgid "Scanning mode" msgstr "Avsökningsläge" -#: ../caribou/common/settings.py:73 -msgid "Scanning type, block or row" +#: ../caribou/settings/caribou_settings.py:15 +#, fuzzy +msgid "Scanning type, subgroups, rows or linear" msgstr "Avsökningsläge, block eller rad" -#: ../caribou/common/settings.py:74 -msgid "Block" -msgstr "Block" - -#: ../caribou/common/settings.py:75 -msgid "Row" -msgstr "Rad" +#: ../caribou/settings/caribou_settings.py:16 +msgid "Subgroups" +msgstr "Undergrupper" + +#: ../caribou/settings/caribou_settings.py:17 +msgid "Rows" +msgstr "Rader" + +#: ../caribou/settings/caribou_settings.py:18 +msgid "Linear" +msgstr "Linjär" -#: ../caribou/common/settings.py:76 +#: ../caribou/settings/caribou_settings.py:20 msgid "Step time" msgstr "Stegtid" -#: ../caribou/common/settings.py:77 +#: ../caribou/settings/caribou_settings.py:21 msgid "Time between key transitions" msgstr "Tid mellan tangentövergångar" -#: ../caribou/common/settings.py:80 -msgid "Reverse scanning" +#: ../caribou/settings/caribou_settings.py:24 +msgid "Inverse scanning" msgstr "Omvänd avsökning" -#: ../caribou/common/settings.py:81 -msgid "Scan in reverse order" -msgstr "Sök av i omvänd ordning" +#: ../caribou/settings/caribou_settings.py:25 +msgid "Step with the switch, activate by dwelling" +msgstr "" -#: ../caribou/common/settings.py:83 +#: ../caribou/settings/caribou_settings.py:28 +msgid "Auto-restart scanning" +msgstr "" + +#: ../caribou/settings/caribou_settings.py:29 +msgid "Automatically restart scanning after item activation" +msgstr "" + +#: ../caribou/settings/caribou_settings.py:30 +msgid "Scan cycles" +msgstr "" + +#: ../caribou/settings/caribou_settings.py:31 +msgid "One" +msgstr "Ett" + +#: ../caribou/settings/caribou_settings.py:32 +msgid "Two" +msgstr "Två" + +#: ../caribou/settings/caribou_settings.py:33 +msgid "Three" +msgstr "Tre" + +#: ../caribou/settings/caribou_settings.py:34 +msgid "Four" +msgstr "Fyra" + +#: ../caribou/settings/caribou_settings.py:35 +msgid "Five" +msgstr "Fem" + +#: ../caribou/settings/caribou_settings.py:38 msgid "Input" msgstr "Inmatning" -#: ../caribou/common/settings.py:84 +#: ../caribou/settings/caribou_settings.py:39 msgid "Switch device" msgstr "Brytarenhet" -#: ../caribou/common/settings.py:86 +#: ../caribou/settings/caribou_settings.py:41 msgid "Switch device, keyboard or mouse" msgstr "Brytarenhet, tangentbord eller mus" -#: ../caribou/common/settings.py:89 +#: ../caribou/settings/caribou_settings.py:43 +msgid "Keyboard" +msgstr "Tangentbord" + +#: ../caribou/settings/caribou_settings.py:44 msgid "Mouse" msgstr "Mus" -#: ../caribou/common/settings.py:91 +#: ../caribou/settings/caribou_settings.py:46 msgid "Switch key" msgstr "Växlingstangent" -#: ../caribou/common/settings.py:94 +#: ../caribou/settings/caribou_settings.py:48 msgid "Key to use with scanning mode" msgstr "Tangent att använda med avsökningsläget" -#: ../caribou/common/settings.py:96 +#: ../caribou/settings/caribou_settings.py:50 msgid "Right shift" msgstr "Höger skift" -#: ../caribou/common/settings.py:97 +#: ../caribou/settings/caribou_settings.py:51 msgid "Left shift" msgstr "Vänster skift" -#: ../caribou/common/settings.py:98 +#: ../caribou/settings/caribou_settings.py:52 +msgid "Space" +msgstr "Blanksteg" + +#: ../caribou/settings/caribou_settings.py:53 msgid "Alt Gr" msgstr "Alt Gr" -#: ../caribou/common/settings.py:99 +#: ../caribou/settings/caribou_settings.py:54 msgid "Num lock" msgstr "Num lock" -#: ../caribou/common/settings.py:100 +#: ../caribou/settings/caribou_settings.py:55 msgid "Switch button" msgstr "Växlingsknapp" -#: ../caribou/common/settings.py:103 +#: ../caribou/settings/caribou_settings.py:58 msgid "Mouse button to use in the scanning mode" msgstr "Musknapp att använda i avsökningsläget" -#: ../caribou/common/settings.py:105 +#: ../caribou/settings/caribou_settings.py:60 msgid "Button 1" msgstr "Knapp 1" -#: ../caribou/common/settings.py:106 +#: ../caribou/settings/caribou_settings.py:61 msgid "Button 2" msgstr "Knapp 2" -#: ../caribou/common/settings.py:107 +#: ../caribou/settings/caribou_settings.py:62 msgid "Button 3" msgstr "Knapp 3" -#: ../caribou/common/settings.py:111 -msgid "Block color" -msgstr "Blockfärg" - -#: ../caribou/common/settings.py:112 -msgid "Color of block scans" -msgstr "Färg för blockavsökningar" - -#: ../caribou/common/settings.py:113 -msgid "Row color" -msgstr "Radfärg" - -#: ../caribou/common/settings.py:114 -msgid "Color of row scans" -msgstr "Färg för radavsökningar" - -#: ../caribou/common/settings.py:115 -msgid "Key color" -msgstr "Tangentfärg" - -#: ../caribou/common/settings.py:116 -msgid "Color of key scans" -msgstr "Färg för tangentavsökningar" - -#: ../caribou/common/settings.py:118 -msgid "Cancel color" -msgstr "Avbrytsfärg" - -#: ../caribou/common/settings.py:119 -msgid "Color of cancel scan" -msgstr "Färg för avbryt avsökning" +#: ../caribou/__init__.py:2 +msgid "Caribou" +msgstr "Caribou" + +#: ../caribou/daemon/main.py:31 +#, python-format +msgid "Error starting %s" +msgstr "Fel vid start av %s" + +#: ../caribou/daemon/main.py:42 +#, python-format +msgid "In order to use %s, accessibility needs to be enabled. Do you want to enable it now?" +msgstr "" -#: ../caribou/ui/preferences_window.py:51 -msgid "Caribou Preferences" -msgstr "Inställningar för Caribou" +#: ../caribou/daemon/main.py:56 +#, python-format +msgid "Accessibility has been enabled. Log out and back in again to use %s." +msgstr "" + +#: ../caribou/daemon/main.py:153 +msgid "WARNING - Caribou: unhandled editable widget:" +msgstr "VARNING - Caribou: ohanterad redigerbar widget:" + +#: ../caribou/antler/antler_settings.py:5 +msgid "Antler Preferences" +msgstr "Inställningar för Antler" + +#: ../caribou/antler/antler_settings.py:6 +msgid "Antler" +msgstr "Antler" + +#: ../caribou/antler/antler_settings.py:7 +msgid "Appearance" +msgstr "Utseende" + +#: ../caribou/antler/antler_settings.py:9 +msgid "Keyboard Type" +msgstr "Tangentbordstyp" + +#: ../caribou/antler/antler_settings.py:10 +#, fuzzy +msgid "The keyboard geometery Caribou should use" +msgstr "Layouten som Caribou ska använda." + +#: ../caribou/antler/antler_settings.py:11 +msgid "The keyboard geometery determines the shape and complexity of the keyboard, it could range from a 'natural' look and feel good for composing simple text, to a fullscale keyboard." +msgstr "" + +#: ../caribou/antler/antler_settings.py:15 +msgid "Touch" +msgstr "" + +#: ../caribou/antler/antler_settings.py:16 +msgid "Full scale" +msgstr "" + +#: ../caribou/antler/antler_settings.py:17 +#, fuzzy +msgid "Scan" +msgstr "Avsökning" + +#: ../caribou/antler/antler_settings.py:18 +#: ../caribou/antler/antler_settings.py:19 +msgid "Use System Theme" +msgstr "Använd systemtema" +#: ../caribou/antler/antler_settings.py:20 +msgid "Minimum Alpha" +msgstr "" + +#: ../caribou/antler/antler_settings.py:21 +msgid "Minimal opacity of keyboard" +msgstr "" + +#: ../caribou/antler/antler_settings.py:23 +msgid "Maximum Alpha" +msgstr "" + +#: ../caribou/antler/antler_settings.py:24 +msgid "Maximal opacity of keyboard" +msgstr "" + +#: ../caribou/antler/antler_settings.py:26 +msgid "Maximum Distance" +msgstr "" + +#: ../caribou/antler/antler_settings.py:27 +msgid "Maximum distance when keyboard is hidden" +msgstr "" + +#~ msgid "Keyboard layout" +#~ msgstr "Tangentbordslayout" +#~ msgid "" +#~ "The layout should be in the data directory of Caribou (usually /usr/share/" +#~ "caribou/keyboards) and should be a .xml or .json file." +#~ msgstr "" +#~ "Layouten ska finnas i Caribous datakatalog (oftast /usr/share/caribou/" +#~ "keyboards) och ska vara av typen .xml eller .json." +#~ msgid "Color" +#~ msgstr "Färg" +#~ msgid "Use the default theme colors" +#~ msgstr "Använd standardfärger från tema" +#~ msgid "Normal state" +#~ msgstr "Normalt tillstånd" +#~ msgid "Color of the keys when there is no event on them" +#~ msgstr "Färg för tangenterna när det inte finns någon händelse på dem" +#~ msgid "Mouse over" +#~ msgstr "Muspekare över" +#~ msgid "Color of the keys when the mouse goes over the key" +#~ msgstr "Färg för tangenterna när muspekaren dras över tangenten" +#~ msgid "Font and size" +#~ msgstr "Typsnitt och storlek" +#~ msgid "Use system fonts" +#~ msgstr "Använd systemtypsnitt" +#~ msgid "Use the default system font for keyboard" +#~ msgstr "Använd systemets standardtypsnitt för tangentbordet" +#~ msgid "Key font" +#~ msgstr "Tangenttypsnitt" +#~ msgid "Custom font for keyboard" +#~ msgstr "Anpassat typsnitt för tangentbordet" +#~ msgid "Block" +#~ msgstr "Block" +#~ msgid "Row" +#~ msgstr "Rad" +#~ msgid "Scan in reverse order" +#~ msgstr "Sök av i omvänd ordning" +#~ msgid "Block color" +#~ msgstr "Blockfärg" +#~ msgid "Color of block scans" +#~ msgstr "Färg för blockavsökningar" +#~ msgid "Row color" +#~ msgstr "Radfärg" +#~ msgid "Color of row scans" +#~ msgstr "Färg för radavsökningar" +#~ msgid "Key color" +#~ msgstr "Tangentfärg" +#~ msgid "Color of key scans" +#~ msgstr "Färg för tangentavsökningar" +#~ msgid "Cancel color" +#~ msgstr "Avbrytsfärg" +#~ msgid "Color of cancel scan" +#~ msgstr "Färg för avbryt avsökning" #~ msgid "Keys" #~ msgstr "Tangenter" - #~ msgid "_Test settings here:" #~ msgstr "_Testa inställningarna här:" - #~ msgid "Key _size:" #~ msgstr "Tangent_storlek:" - #~ msgid "Key s_pacing:" #~ msgstr "Tangent_mellanrum:" + diff -Nru caribou-0.3.5/po/ta.po caribou-0.3.91/po/ta.po --- caribou-0.3.5/po/ta.po 2010-08-16 16:39:26.000000000 +0000 +++ caribou-0.3.91/po/ta.po 2011-09-05 17:31:38.000000000 +0000 @@ -1,62 +1,289 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # -# Dr.T.Vasudevan , 2010. +# Dr.T.Vasudevan , 2010, 2011. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-05 21:51+0530\n" -"PO-Revision-Date: 2010-08-05 21:53+0530\n" +"POT-Creation-Date: 2011-09-01 21:25+0530\n" +"PO-Revision-Date: 2011-09-02 16:38+0530\n" "Last-Translator: Dr.T.Vasudevan \n" -"Language-Team: Tamil <>\n" +"Language-Team: Tamil \n" +"Language: ta\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../caribou/ui/main.py:134 -msgid "WARNING - Caribou: unhandled editable widget:" -msgstr "எச்சரிக்கை: கரிபோ: கையாளாத திருத்தக்கூடிய விட்செட்:" - -#: ../data/caribou-prefs.ui.h:1 +#: ../caribou/settings/caribou_settings.py:5 msgid "Caribou Preferences" msgstr "கரிபோ விருப்பத்தேர்வுகள்" -#: ../data/caribou-prefs.ui.h:2 -msgid "Colors" -msgstr "வண்ணங்கள்" +#: ../caribou/settings/caribou_settings.py:6 +msgid "Scanning" +msgstr " வருடுகிறது" + +#: ../caribou/settings/caribou_settings.py:8 +msgid "Enable scanning" +msgstr "வருடலை செயலாக்கு" + +#: ../caribou/settings/caribou_settings.py:9 +msgid "Enable switch scanning" +msgstr "மாற் வருடலை செயலாக்கு" -#: ../data/caribou-prefs.ui.h:3 +#: ../caribou/settings/caribou_settings.py:12 msgid "General" msgstr "பொது" -#: ../data/caribou-prefs.ui.h:4 -msgid "Key _size:" -msgstr "_s விசை அளவு:" - -#: ../data/caribou-prefs.ui.h:5 -msgid "Key s_pacing:" -msgstr "_p விசை இடைவெளி" - -#: ../data/caribou-prefs.ui.h:6 -msgid "Keyboard _layout:" -msgstr "_l விசைப்பலகை அமைப்பு:" - -#: ../data/caribou-prefs.ui.h:7 -msgid "Keys" -msgstr "விசைகள்" - -#: ../data/caribou-prefs.ui.h:8 -msgid "Mouse over:" -msgstr "சொடுக்கி மேலோட்டம்:" - -#: ../data/caribou-prefs.ui.h:9 -msgid "Normal state:" -msgstr "இயல்பான நிலை:" - -#: ../data/caribou-prefs.ui.h:10 -msgid "_Test settings here:" -msgstr "_T அமைப்பை இங்கே சோதிக்கவும்:" +#: ../caribou/settings/caribou_settings.py:13 +msgid "Scanning mode" +msgstr "வருடல் பாங்கு" + +#: ../caribou/settings/caribou_settings.py:15 +msgid "Scanning type, subgroups, rows or linear" +msgstr "வருடல் பாங்கு, துணைகுழுக்கள், வரிகள் அல்லது நேர்கோடு" + +#: ../caribou/settings/caribou_settings.py:16 +msgid "Subgroups" +msgstr "துணைகுழுக்கள்" + +#: ../caribou/settings/caribou_settings.py:17 +msgid "Rows" +msgstr "வரிகள் " + +#: ../caribou/settings/caribou_settings.py:18 +msgid "Linear" +msgstr "நேர்கோடு" + +#: ../caribou/settings/caribou_settings.py:20 +msgid "Step time" +msgstr "படி நேரம்" + +#: ../caribou/settings/caribou_settings.py:21 +msgid "Time between key transitions" +msgstr "விசை மாற்றங்களுக்கு இடையே நேரம் " + +#: ../caribou/settings/caribou_settings.py:24 +msgid "Inverse scanning" +msgstr "தலைகீழ் வருடல்" + +#: ../caribou/settings/caribou_settings.py:25 +msgid "Step with the switch, activate by dwelling" +msgstr "மாற்றியால் படி நகர், நிலையா இருப்பதால் செயலாக்கு" + +#: ../caribou/settings/caribou_settings.py:28 +msgid "Auto-restart scanning" +msgstr "தானியங்கி மீள்துவக்க வருடல்" + +#: ../caribou/settings/caribou_settings.py:29 +msgid "Automatically restart scanning after item activation" +msgstr "உருப்படி செயலானதும் தானியங்கியாக வருடலை மறுதுவக்கம் செய் " + +#: ../caribou/settings/caribou_settings.py:30 +msgid "Scan cycles" +msgstr "வருடல் சுழல்கள்" + +#: ../caribou/settings/caribou_settings.py:31 +msgid "One" +msgstr "ஒன்று" + +#: ../caribou/settings/caribou_settings.py:32 +msgid "Two" +msgstr "இரண்டு" + +#: ../caribou/settings/caribou_settings.py:33 +msgid "Three" +msgstr "மூன்று" + +#: ../caribou/settings/caribou_settings.py:34 +msgid "Four" +msgstr "நான்கு" + +#: ../caribou/settings/caribou_settings.py:35 +msgid "Five" +msgstr "ஐந்து " + +#: ../caribou/settings/caribou_settings.py:38 +msgid "Input" +msgstr "உள்ளீடு" + +#: ../caribou/settings/caribou_settings.py:39 +msgid "Switch device" +msgstr "சாதனத்தை மாற்று" + +#: ../caribou/settings/caribou_settings.py:41 +msgid "Switch device, keyboard or mouse" +msgstr "சாதனத்தை, விசைப்பலகையை, சொடுக்கியை மாற்று" + +#: ../caribou/settings/caribou_settings.py:43 +msgid "Keyboard" +msgstr "விசைப்பலகை" + +#: ../caribou/settings/caribou_settings.py:44 +msgid "Mouse" +msgstr "சொடுக்கி" + +#: ../caribou/settings/caribou_settings.py:46 +msgid "Switch key" +msgstr "மாற்றி விசை" + +#: ../caribou/settings/caribou_settings.py:48 +msgid "Key to use with scanning mode" +msgstr "வருடல் பாங்குக்கு பயன்படுத்த வேண்டிய விசை" + +#: ../caribou/settings/caribou_settings.py:50 +msgid "Right shift" +msgstr "வலது நகர்வு" + +#: ../caribou/settings/caribou_settings.py:51 +msgid "Left shift" +msgstr "இடது நகர்வு" + +#: ../caribou/settings/caribou_settings.py:52 +msgid "Space" +msgstr "இடம்" + +#: ../caribou/settings/caribou_settings.py:53 +msgid "Alt Gr" +msgstr "Alt Gr" + +#: ../caribou/settings/caribou_settings.py:54 +msgid "Num lock" +msgstr "எண் பூட்டு" + +#: ../caribou/settings/caribou_settings.py:55 +msgid "Switch button" +msgstr "மாற்றி பொத்தான்" + +#: ../caribou/settings/caribou_settings.py:58 +msgid "Mouse button to use in the scanning mode" +msgstr "வருடல் பாங்குக்கு பயன்படுத்த சொடுக்கி பொத்தான்" + +#: ../caribou/settings/caribou_settings.py:60 +msgid "Button 1" +msgstr "பொத்தான் 1" + +#: ../caribou/settings/caribou_settings.py:61 +msgid "Button 2" +msgstr "பொத்தான் 2" + +#: ../caribou/settings/caribou_settings.py:62 +msgid "Button 3" +msgstr "பொத்தான் 3" + +#: ../caribou/__init__.py:2 +msgid "Caribou" +msgstr "காரிபௌ" + +#: ../caribou/daemon/main.py:31 +#, python-format +msgid "Error starting %s" +msgstr "%s ஐ துவக்குவதில் பிழை" + +#: ../caribou/daemon/main.py:42 +#, python-format +msgid "" +"In order to use %s, accessibility needs to be enabled. Do you want to enable " +"it now?" +msgstr "%s ஐ பயன்படுத்த அணுகலை செயலாக்க வேண்டும். இப்போது செயலாக்கலாமா?" + +#: ../caribou/daemon/main.py:56 +#, python-format +msgid "Accessibility has been enabled. Log out and back in again to use %s." +msgstr "" +"அணுகல் செயலாக்கப்பட்டது. வெளியேறி மீண்டும் உள்நுழைந்து %s ஐ பயன்படுத்தலாம்." + +#: ../caribou/daemon/main.py:153 +msgid "WARNING - Caribou: unhandled editable widget:" +msgstr "எச்சரிக்கை: கரிபோ: கையாளாத திருத்தக்கூடிய விட்செட்:" + +#: ../caribou/antler/antler_settings.py:5 +msgid "Antler Preferences" +msgstr "ஆன்ட்லர் விருப்பத்தேர்வுகள்" + +#: ../caribou/antler/antler_settings.py:6 +msgid "Antler" +msgstr "ஆன்ட்லர்" + +#: ../caribou/antler/antler_settings.py:7 +msgid "Appearance" +msgstr "தோற்றம்" + +#: ../caribou/antler/antler_settings.py:9 +msgid "Keyboard Type" +msgstr "விசைப்பலகை வகை:" + +#: ../caribou/antler/antler_settings.py:10 +msgid "The keyboard geometery Caribou should use" +msgstr "கரிபோ பயன்படுத்த வேன்டிய விசைப்பலகை இட அமைவு" + +#: ../caribou/antler/antler_settings.py:11 +msgid "" +"The keyboard geometery determines the shape and complexity of the keyboard, " +"it could range from a 'natural' look and feel good for composing simple " +"text, to a fullscale keyboard." +msgstr "" +"விசைப்பலகை இட அமைவு அதன் வடிவையும் சிக்கலையும் தீர்மானிக்கிறது. இது எளிய உரை " +"தயாரிப்புக்கு ஒரு இயற்கையான திருப்தி அளிக்கும் காட்சியிலிருந்து முழு அளவு " +"விசைப்பலகை வரை இருக்கலாம்." + +#: ../caribou/antler/antler_settings.py:15 +msgid "Touch" +msgstr "தொடுதல்" + +#: ../caribou/antler/antler_settings.py:16 +msgid "Full scale" +msgstr "முழு அளவு" + +#: ../caribou/antler/antler_settings.py:17 +msgid "Scan" +msgstr "வருடு" + +#: ../caribou/antler/antler_settings.py:18 +#: ../caribou/antler/antler_settings.py:19 +msgid "Use System Theme" +msgstr "கணினி கருத்துக்களை பயன்படுத்து" + +#: ../caribou/antler/antler_settings.py:20 +msgid "Minimum Alpha" +msgstr "குறைந்த பட்ச ஆல்பா" + +#: ../caribou/antler/antler_settings.py:21 +msgid "Minimal opacity of keyboard" +msgstr "குறைந்த பட்ச விசைப்பலகை ஒளி ஊடுருவல்" + +#: ../caribou/antler/antler_settings.py:23 +msgid "Maximum Alpha" +msgstr "அதிகபட்ச ஆல்பா" + +#: ../caribou/antler/antler_settings.py:24 +msgid "Maximal opacity of keyboard" +msgstr "அதிகபட்ச விசைப்பலகை ஒளி ஊடுருவல்" + +#: ../caribou/antler/antler_settings.py:26 +msgid "Maximum Distance" +msgstr "அதிகபட்ச தூரம்" + +#: ../caribou/antler/antler_settings.py:27 +msgid "Maximum distance when keyboard is hidden" +msgstr "விசைப்பலகை மறைக்கப்பட்ட போது அதிகபட்ச தூரம்" + +#~ msgid "Colors" +#~ msgstr "வண்ணங்கள்" + +#~ msgid "Key _size:" +#~ msgstr "_s விசை அளவு:" + +#~ msgid "Key s_pacing:" +#~ msgstr "_p விசை இடைவெளி" + +#~ msgid "Keys" +#~ msgstr "விசைகள்" + +#~ msgid "Normal state:" +#~ msgstr "இயல்பான நிலை:" +#~ msgid "_Test settings here:" +#~ msgstr "_T அமைப்பை இங்கே சோதிக்கவும்:" diff -Nru caribou-0.3.5/po/zh_HK.po caribou-0.3.91/po/zh_HK.po --- caribou-0.3.5/po/zh_HK.po 2010-07-19 18:42:02.000000000 +0000 +++ caribou-0.3.91/po/zh_HK.po 2011-09-05 17:31:38.000000000 +0000 @@ -1,60 +1,288 @@ # Chinese (Hong Kong) translation for caribou. # Copyright (C) 2010 caribou's COPYRIGHT HOLDER # This file is distributed under the same license as the caribou package. -# FIRST AUTHOR , YEAR. +# Chao-Hsiung Liao , 2010. # msgid "" msgstr "" "Project-Id-Version: caribou 0.1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-14 19:39+0800\n" -"PO-Revision-Date: 2010-07-14 19:39+0800\n" +"POT-Creation-Date: 2011-09-03 19:08+0800\n" +"PO-Revision-Date: 2011-09-03 19:08+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Hong Kong) \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../caribou/ui/main.py:107 -msgid "WARNING - Caribou: unhandled editable widget:" -msgstr "警告 - Caribou：未處理的可編輯視窗元件：" - -#: ../data/caribou-prefs.ui.h:1 +#: ../caribou/settings/caribou_settings.py:5 msgid "Caribou Preferences" msgstr "Caribou 偏好設定" -#: ../data/caribou-prefs.ui.h:2 -msgid "Colors" -msgstr "顏色" +#: ../caribou/settings/caribou_settings.py:6 +msgid "Scanning" +msgstr "掃描" + +#: ../caribou/settings/caribou_settings.py:8 +msgid "Enable scanning" +msgstr "啟用掃描" + +#: ../caribou/settings/caribou_settings.py:9 +msgid "Enable switch scanning" +msgstr "啟用切換掃描" -#: ../data/caribou-prefs.ui.h:3 +#: ../caribou/settings/caribou_settings.py:12 msgid "General" msgstr "一般" -#: ../data/caribou-prefs.ui.h:4 -msgid "Key _size:" -msgstr "按鍵大小(_S):" - -#: ../data/caribou-prefs.ui.h:5 -msgid "Key s_pacing:" -msgstr "按鍵間距(_P):" - -#: ../data/caribou-prefs.ui.h:6 -msgid "Keyboard _layout:" -msgstr "鍵盤配置(_L):" - -#: ../data/caribou-prefs.ui.h:7 -msgid "Keys" -msgstr "按鍵" - -#: ../data/caribou-prefs.ui.h:8 -msgid "Mouse over:" -msgstr "滑鼠停駐：" - -#: ../data/caribou-prefs.ui.h:9 -msgid "Normal state:" -msgstr "一般狀態：" - -#: ../data/caribou-prefs.ui.h:10 -msgid "_Test settings here:" -msgstr "在這裏測試設定值(_T):" +#: ../caribou/settings/caribou_settings.py:13 +msgid "Scanning mode" +msgstr "掃描模式" + +#: ../caribou/settings/caribou_settings.py:15 +msgid "Scanning type, subgroups, rows or linear" +msgstr "掃描類型、子羣組、列或線性" + +#: ../caribou/settings/caribou_settings.py:16 +msgid "Subgroups" +msgstr "子羣組" + +#: ../caribou/settings/caribou_settings.py:17 +msgid "Rows" +msgstr "列" + +#: ../caribou/settings/caribou_settings.py:18 +msgid "Linear" +msgstr "線性" + +#: ../caribou/settings/caribou_settings.py:20 +#, fuzzy +msgid "Step time" +msgstr "日期/時刻：" + +#: ../caribou/settings/caribou_settings.py:21 +#, fuzzy +msgid "Time between key transitions" +msgstr "移動棋子延遲時間 (亳秒)" + +#: ../caribou/settings/caribou_settings.py:24 +#, fuzzy +msgid "Inverse scanning" +msgstr "停止掃描" + +#: ../caribou/settings/caribou_settings.py:25 +msgid "Step with the switch, activate by dwelling" +msgstr "" + +#: ../caribou/settings/caribou_settings.py:28 +msgid "Auto-restart scanning" +msgstr "自動重新掃描" + +#: ../caribou/settings/caribou_settings.py:29 +msgid "Automatically restart scanning after item activation" +msgstr "在項目生效後自動重新開始掃描" + +#: ../caribou/settings/caribou_settings.py:30 +msgid "Scan cycles" +msgstr "掃描循環" + +#: ../caribou/settings/caribou_settings.py:31 +msgid "One" +msgstr "一" + +#: ../caribou/settings/caribou_settings.py:32 +msgid "Two" +msgstr "二" + +#: ../caribou/settings/caribou_settings.py:33 +msgid "Three" +msgstr "三" + +#: ../caribou/settings/caribou_settings.py:34 +msgid "Four" +msgstr "四" + +#: ../caribou/settings/caribou_settings.py:35 +msgid "Five" +msgstr "五" + +#: ../caribou/settings/caribou_settings.py:38 +msgid "Input" +msgstr "輸入" + +#: ../caribou/settings/caribou_settings.py:39 +msgid "Switch device" +msgstr "切換裝置" + +#: ../caribou/settings/caribou_settings.py:41 +msgid "Switch device, keyboard or mouse" +msgstr "切換裝置、鍵盤或滑鼠" + +#: ../caribou/settings/caribou_settings.py:43 +msgid "Keyboard" +msgstr "鍵盤" + +#: ../caribou/settings/caribou_settings.py:44 +msgid "Mouse" +msgstr "滑鼠" + +#: ../caribou/settings/caribou_settings.py:46 +msgid "Switch key" +msgstr "切換鍵" + +#: ../caribou/settings/caribou_settings.py:48 +msgid "Key to use with scanning mode" +msgstr "掃描模式使用的按鍵" + +#: ../caribou/settings/caribou_settings.py:50 +msgid "Right shift" +msgstr "右 shift" + +#: ../caribou/settings/caribou_settings.py:51 +msgid "Left shift" +msgstr "左 shift" + +#: ../caribou/settings/caribou_settings.py:52 +msgid "Space" +msgstr "空白鍵" + +#: ../caribou/settings/caribou_settings.py:53 +msgid "Alt Gr" +msgstr "Alt Gr" + +#: ../caribou/settings/caribou_settings.py:54 +msgid "Num lock" +msgstr "Num lock" + +#: ../caribou/settings/caribou_settings.py:55 +msgid "Switch button" +msgstr "切換按鈕" + +#: ../caribou/settings/caribou_settings.py:58 +msgid "Mouse button to use in the scanning mode" +msgstr "掃描模式使用的滑鼠按鍵" + +#: ../caribou/settings/caribou_settings.py:60 +msgid "Button 1" +msgstr "按鈕 1" + +#: ../caribou/settings/caribou_settings.py:61 +msgid "Button 2" +msgstr "按鈕 2" + +#: ../caribou/settings/caribou_settings.py:62 +msgid "Button 3" +msgstr "按鈕 3" + +#: ../caribou/__init__.py:2 +msgid "Caribou" +msgstr "Caribou" + +#: ../caribou/daemon/main.py:31 +#, fuzzy, python-format +msgid "Error starting %s" +msgstr "啟動儲存區羣組時出現錯誤" + +#: ../caribou/daemon/main.py:42 +#, python-format +msgid "" +"In order to use %s, accessibility needs to be enabled. Do you want to enable " +"it now?" +msgstr "為了使用 %s，需要啟用無障礙功能。現在你是否想要啟用它？" + +#: ../caribou/daemon/main.py:56 +#, python-format +msgid "Accessibility has been enabled. Log out and back in again to use %s." +msgstr "無障礙功能已啟用。請登出後再回來以便使用 %s。" + +#: ../caribou/daemon/main.py:153 +msgid "WARNING - Caribou: unhandled editable widget:" +msgstr "警告 - Caribou：未處理的可編輯視窗元件：" + +#: ../caribou/antler/antler_settings.py:5 +msgid "Antler Preferences" +msgstr "Antler 偏好設定" + +#: ../caribou/antler/antler_settings.py:6 +msgid "Antler" +msgstr "Antler" + +#: ../caribou/antler/antler_settings.py:7 +msgid "Appearance" +msgstr "外觀" + +#: ../caribou/antler/antler_settings.py:9 +msgid "Keyboard Type" +msgstr "鍵盤類型" + +#: ../caribou/antler/antler_settings.py:10 +msgid "The keyboard geometery Caribou should use" +msgstr "Caribou 應使用的鍵盤大小" + +#: ../caribou/antler/antler_settings.py:11 +msgid "" +"The keyboard geometery determines the shape and complexity of the keyboard, " +"it could range from a 'natural' look and feel good for composing simple " +"text, to a fullscale keyboard." +msgstr "" + +#: ../caribou/antler/antler_settings.py:15 +#, fuzzy +msgid "Touch" +msgstr "Wacom touch 功能" + +#: ../caribou/antler/antler_settings.py:16 +msgid "Full scale" +msgstr "全尺寸" + +#: ../caribou/antler/antler_settings.py:17 +msgid "Scan" +msgstr "掃描" + +#: ../caribou/antler/antler_settings.py:18 +#: ../caribou/antler/antler_settings.py:19 +msgid "Use System Theme" +msgstr "使用系統布景" + +#: ../caribou/antler/antler_settings.py:20 +msgid "Minimum Alpha" +msgstr "最小透明度" + +#: ../caribou/antler/antler_settings.py:21 +msgid "Minimal opacity of keyboard" +msgstr "鍵盤的最小透明度" + +#: ../caribou/antler/antler_settings.py:23 +msgid "Maximum Alpha" +msgstr "最大透明度" + +#: ../caribou/antler/antler_settings.py:24 +msgid "Maximal opacity of keyboard" +msgstr "鍵盤的最大透明度" + +#: ../caribou/antler/antler_settings.py:26 +msgid "Maximum Distance" +msgstr "最大距離" + +#: ../caribou/antler/antler_settings.py:27 +msgid "Maximum distance when keyboard is hidden" +msgstr "當鍵盤隱藏時的距離" + +#~ msgid "Colors" +#~ msgstr "顏色" + +#~ msgid "Key _size:" +#~ msgstr "按鍵大小(_S):" + +#~ msgid "Key s_pacing:" +#~ msgstr "按鍵間距(_P):" + +#~ msgid "Keys" +#~ msgstr "按鍵" + +#~ msgid "Normal state:" +#~ msgstr "一般狀態：" + +#~ msgid "_Test settings here:" +#~ msgstr "在這裡測試設定值(_T):" diff -Nru caribou-0.3.5/po/zh_TW.po caribou-0.3.91/po/zh_TW.po --- caribou-0.3.5/po/zh_TW.po 2010-07-19 18:42:02.000000000 +0000 +++ caribou-0.3.91/po/zh_TW.po 2011-09-05 17:31:38.000000000 +0000 @@ -1,60 +1,288 @@ # Chinese (Taiwan) translation for caribou. # Copyright (C) 2010 caribou's COPYRIGHT HOLDER # This file is distributed under the same license as the caribou package. -# FIRST AUTHOR , YEAR. +# Chao-Hsiung Liao , 2010. # msgid "" msgstr "" "Project-Id-Version: caribou 0.1.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-14 19:39+0800\n" -"PO-Revision-Date: 2010-07-13 21:22+0800\n" +"POT-Creation-Date: 2011-09-03 19:08+0800\n" +"PO-Revision-Date: 2011-09-03 09:23+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Taiwan) \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../caribou/ui/main.py:107 -msgid "WARNING - Caribou: unhandled editable widget:" -msgstr "警告 - Caribou：未處理的可編輯視窗元件：" - -#: ../data/caribou-prefs.ui.h:1 +#: ../caribou/settings/caribou_settings.py:5 msgid "Caribou Preferences" msgstr "Caribou 偏好設定" -#: ../data/caribou-prefs.ui.h:2 -msgid "Colors" -msgstr "顏色" +#: ../caribou/settings/caribou_settings.py:6 +msgid "Scanning" +msgstr "掃描" + +#: ../caribou/settings/caribou_settings.py:8 +msgid "Enable scanning" +msgstr "啟用掃描" + +#: ../caribou/settings/caribou_settings.py:9 +msgid "Enable switch scanning" +msgstr "啟用切換掃描" -#: ../data/caribou-prefs.ui.h:3 +#: ../caribou/settings/caribou_settings.py:12 msgid "General" msgstr "一般" -#: ../data/caribou-prefs.ui.h:4 -msgid "Key _size:" -msgstr "按鍵大小(_S):" - -#: ../data/caribou-prefs.ui.h:5 -msgid "Key s_pacing:" -msgstr "按鍵間距(_P):" - -#: ../data/caribou-prefs.ui.h:6 -msgid "Keyboard _layout:" -msgstr "鍵盤配置(_L):" - -#: ../data/caribou-prefs.ui.h:7 -msgid "Keys" -msgstr "按鍵" - -#: ../data/caribou-prefs.ui.h:8 -msgid "Mouse over:" -msgstr "滑鼠停駐：" - -#: ../data/caribou-prefs.ui.h:9 -msgid "Normal state:" -msgstr "一般狀態：" - -#: ../data/caribou-prefs.ui.h:10 -msgid "_Test settings here:" -msgstr "在這裡測試設定值(_T):" +#: ../caribou/settings/caribou_settings.py:13 +msgid "Scanning mode" +msgstr "掃描模式" + +#: ../caribou/settings/caribou_settings.py:15 +msgid "Scanning type, subgroups, rows or linear" +msgstr "掃描類型、子群組、列或線性" + +#: ../caribou/settings/caribou_settings.py:16 +msgid "Subgroups" +msgstr "子群組" + +#: ../caribou/settings/caribou_settings.py:17 +msgid "Rows" +msgstr "列" + +#: ../caribou/settings/caribou_settings.py:18 +msgid "Linear" +msgstr "線性" + +#: ../caribou/settings/caribou_settings.py:20 +#, fuzzy +msgid "Step time" +msgstr "日期/時刻：" + +#: ../caribou/settings/caribou_settings.py:21 +#, fuzzy +msgid "Time between key transitions" +msgstr "移動棋子延遲時間 (亳秒)" + +#: ../caribou/settings/caribou_settings.py:24 +#, fuzzy +msgid "Inverse scanning" +msgstr "停止掃描" + +#: ../caribou/settings/caribou_settings.py:25 +msgid "Step with the switch, activate by dwelling" +msgstr "" + +#: ../caribou/settings/caribou_settings.py:28 +msgid "Auto-restart scanning" +msgstr "自動重新掃描" + +#: ../caribou/settings/caribou_settings.py:29 +msgid "Automatically restart scanning after item activation" +msgstr "在項目生效後自動重新開始掃描" + +#: ../caribou/settings/caribou_settings.py:30 +msgid "Scan cycles" +msgstr "掃描循環" + +#: ../caribou/settings/caribou_settings.py:31 +msgid "One" +msgstr "一" + +#: ../caribou/settings/caribou_settings.py:32 +msgid "Two" +msgstr "二" + +#: ../caribou/settings/caribou_settings.py:33 +msgid "Three" +msgstr "三" + +#: ../caribou/settings/caribou_settings.py:34 +msgid "Four" +msgstr "四" + +#: ../caribou/settings/caribou_settings.py:35 +msgid "Five" +msgstr "五" + +#: ../caribou/settings/caribou_settings.py:38 +msgid "Input" +msgstr "輸入" + +#: ../caribou/settings/caribou_settings.py:39 +msgid "Switch device" +msgstr "切換裝置" + +#: ../caribou/settings/caribou_settings.py:41 +msgid "Switch device, keyboard or mouse" +msgstr "切換裝置、鍵盤或滑鼠" + +#: ../caribou/settings/caribou_settings.py:43 +msgid "Keyboard" +msgstr "鍵盤" + +#: ../caribou/settings/caribou_settings.py:44 +msgid "Mouse" +msgstr "滑鼠" + +#: ../caribou/settings/caribou_settings.py:46 +msgid "Switch key" +msgstr "切換鍵" + +#: ../caribou/settings/caribou_settings.py:48 +msgid "Key to use with scanning mode" +msgstr "掃描模式使用的按鍵" + +#: ../caribou/settings/caribou_settings.py:50 +msgid "Right shift" +msgstr "右 shift" + +#: ../caribou/settings/caribou_settings.py:51 +msgid "Left shift" +msgstr "左 shift" + +#: ../caribou/settings/caribou_settings.py:52 +msgid "Space" +msgstr "空白鍵" + +#: ../caribou/settings/caribou_settings.py:53 +msgid "Alt Gr" +msgstr "Alt Gr" + +#: ../caribou/settings/caribou_settings.py:54 +msgid "Num lock" +msgstr "Num lock" + +#: ../caribou/settings/caribou_settings.py:55 +msgid "Switch button" +msgstr "切換按鈕" + +#: ../caribou/settings/caribou_settings.py:58 +msgid "Mouse button to use in the scanning mode" +msgstr "掃描模式使用的滑鼠按鍵" + +#: ../caribou/settings/caribou_settings.py:60 +msgid "Button 1" +msgstr "按鈕 1" + +#: ../caribou/settings/caribou_settings.py:61 +msgid "Button 2" +msgstr "按鈕 2" + +#: ../caribou/settings/caribou_settings.py:62 +msgid "Button 3" +msgstr "按鈕 3" + +#: ../caribou/__init__.py:2 +msgid "Caribou" +msgstr "Caribou" + +#: ../caribou/daemon/main.py:31 +#, fuzzy, python-format +msgid "Error starting %s" +msgstr "啟動儲存區群組時出現錯誤" + +#: ../caribou/daemon/main.py:42 +#, python-format +msgid "" +"In order to use %s, accessibility needs to be enabled. Do you want to enable " +"it now?" +msgstr "為了使用 %s，需要啟用無障礙功能。現在您是否想要啟用它？" + +#: ../caribou/daemon/main.py:56 +#, python-format +msgid "Accessibility has been enabled. Log out and back in again to use %s." +msgstr "無障礙功能已啟用。請登出後再回來以便使用 %s。" + +#: ../caribou/daemon/main.py:153 +msgid "WARNING - Caribou: unhandled editable widget:" +msgstr "警告 - Caribou：未處理的可編輯視窗元件：" + +#: ../caribou/antler/antler_settings.py:5 +msgid "Antler Preferences" +msgstr "Antler 偏好設定" + +#: ../caribou/antler/antler_settings.py:6 +msgid "Antler" +msgstr "Antler" + +#: ../caribou/antler/antler_settings.py:7 +msgid "Appearance" +msgstr "外觀" + +#: ../caribou/antler/antler_settings.py:9 +msgid "Keyboard Type" +msgstr "鍵盤類型" + +#: ../caribou/antler/antler_settings.py:10 +msgid "The keyboard geometery Caribou should use" +msgstr "Caribou 應使用的鍵盤大小" + +#: ../caribou/antler/antler_settings.py:11 +msgid "" +"The keyboard geometery determines the shape and complexity of the keyboard, " +"it could range from a 'natural' look and feel good for composing simple " +"text, to a fullscale keyboard." +msgstr "" + +#: ../caribou/antler/antler_settings.py:15 +#, fuzzy +msgid "Touch" +msgstr "Wacom touch 功能" + +#: ../caribou/antler/antler_settings.py:16 +msgid "Full scale" +msgstr "全尺寸" + +#: ../caribou/antler/antler_settings.py:17 +msgid "Scan" +msgstr "掃描" + +#: ../caribou/antler/antler_settings.py:18 +#: ../caribou/antler/antler_settings.py:19 +msgid "Use System Theme" +msgstr "使用系統布景" + +#: ../caribou/antler/antler_settings.py:20 +msgid "Minimum Alpha" +msgstr "最小透明度" + +#: ../caribou/antler/antler_settings.py:21 +msgid "Minimal opacity of keyboard" +msgstr "鍵盤的最小透明度" + +#: ../caribou/antler/antler_settings.py:23 +msgid "Maximum Alpha" +msgstr "最大透明度" + +#: ../caribou/antler/antler_settings.py:24 +msgid "Maximal opacity of keyboard" +msgstr "鍵盤的最大透明度" + +#: ../caribou/antler/antler_settings.py:26 +msgid "Maximum Distance" +msgstr "最大距離" + +#: ../caribou/antler/antler_settings.py:27 +msgid "Maximum distance when keyboard is hidden" +msgstr "當鍵盤隱藏時的距離" + +#~ msgid "Colors" +#~ msgstr "顏色" + +#~ msgid "Key _size:" +#~ msgstr "按鍵大小(_S):" + +#~ msgid "Key s_pacing:" +#~ msgstr "按鍵間距(_P):" + +#~ msgid "Keys" +#~ msgstr "按鍵" + +#~ msgid "Normal state:" +#~ msgstr "一般狀態：" + +#~ msgid "_Test settings here:" +#~ msgstr "在這裡測試設定值(_T):" diff -Nru caribou-0.3.5/README caribou-0.3.91/README --- caribou-0.3.5/README 2011-08-12 07:41:07.000000000 +0000 +++ caribou-0.3.91/README 2011-09-05 23:35:28.000000000 +0000 @@ -1,4 +1,4 @@ -Caribou 0.3.5 +Caribou 0.3.91 Description =========== diff -Nru caribou-0.3.5/tools/fix_gir.py caribou-0.3.91/tools/fix_gir.py --- caribou-0.3.5/tools/fix_gir.py 2011-05-25 18:23:17.000000000 +0000 +++ caribou-0.3.91/tools/fix_gir.py 2011-08-31 22:39:48.000000000 +0000 @@ -22,7 +22,9 @@ return find_ancestor(parent, name) def fix_vfuncs(dom): - for f in dom.getElementsByTagName("callback"): + for f in dom.getElementsByTagName("field"): + callbacks = f.getElementsByTagName("callback") + record = find_ancestor(f, "record") if not record: continue @@ -33,20 +35,8 @@ assert(name.endswith("Class") or name.endswith("Iface")) assert(cname.endswith("Class") or name.endswith("Iface")) - params = (f.getElementsByTagName("parameters") or [None])[0] - - if not params: - params = dom.createElement("parameters") - f.insertBefore(params, f.firstChild) - - param = dom.createElement("parameter") - param.setAttribute("name", "self") - param.setAttribute("transfer-ownership", "none") - ptype = dom.createElement("type") - ptype.setAttribute("name", name[:-5]) - ptype.setAttribute("c:type", cname[:-5]) - param.appendChild(ptype) - params.insertBefore(param, params.firstChild) + if len(callbacks) == 2: + callbacks[-1].parentNode.removeChild(callbacks[-1]) if __name__ == "__main__": import sys diff -Nru caribou-0.3.5/tools/make_schema.py caribou-0.3.91/tools/make_schema.py --- caribou-0.3.5/tools/make_schema.py 2011-08-10 10:26:49.000000000 +0000 +++ caribou-0.3.91/tools/make_schema.py 2011-09-05 22:19:56.000000000 +0000 @@ -57,7 +57,8 @@ key.setAttribute('type', setting.variant_type) schemalist.appendChild(key) self._append_children_element_value_pairs( - doc, key, [('default', setting.default_value), + doc, key, [('default', + getattr(setting.gvariant, "print")(False)), ('_summary', setting.short_desc), ('_description', setting.long_desc)])