diff --git a/data/keyboards/geometry/compact.xml b/data/keyboards/geometry/compact.xml
index a468adde..46cf8838 100644
--- a/data/keyboards/geometry/compact.xml
+++ b/data/keyboards/geometry/compact.xml
@@ -5,43 +5,43 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -49,198 +49,198 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/data/keyboards/keyboards.xml b/data/keyboards/keyboards.xml
index 8b71cb48..79e788ea 100644
--- a/data/keyboards/keyboards.xml
+++ b/data/keyboards/keyboards.xml
@@ -1,88 +1,88 @@
+ geometry="compact" symbols="ar"
+ longname="Arabic" language="ar"/>
+ geometry="compact" symbols="be"
+ longname="Belarusian" language="be"/>
+ geometry="compact" symbols="fa"
+ longname="Farsi (ISIRI 2901-1994)" language="fa"/>
+ geometry="compact" symbols="he"
+ longname="Hebrew" language="he"/>
+ geometry="compact" symbols="ja-kana"
+ longname="Japanese (Kana)" language="ja"/>
+ geometry="compact" symbols="kk"
+ longname="Kazakh" language="kk"/>
+ geometry="compact" symbols="ks"
+ longname="Kashmiri" language="ks"/>
+ geometry="compact" symbols="my"
+ longname="Myanmar" language="my"/>
+ geometry="compact" symbols="us"
+ longname="Russian" language="ru"/>
+ geometry="compact" symbols="th"
+ longname="Thai" language="th"/>
+ geometry="compact" symbols="ua"
+ longname="Ukrainian" language="ua"/>
+ geometry="compact" symbols="ug"
+ longname="Uyghur" language="ug"/>
+ geometry="compact" symbols="us"
+ longname="US" language="en"/>
+ geometry="compact" symbols="zh-bopomofo"
+ longname="Chinese (Bopomofo)" language="zh"/>
+ geometry="compact" symbols="as-inscript"
+ longname="Assamese (Inscript)" language="as"/>
+ geometry="compact" symbols="bn-inscript"
+ longname="Bengali (Inscript)" language="bn"/>
+ geometry="compact" symbols="gu-inscript"
+ longname="Gujarati (Inscript)" language="gu"/>
+ geometry="compact" symbols="hi-inscript"
+ longname="Hindi (Inscript)" language="hi"/>
+ geometry="compact" symbols="kn-inscript"
+ longname="Kannada (Inscript)" language="kn"/>
+ geometry="compact" symbols="ks-inscript"
+ longname="Kashmiri Devanagari (Inscript)" language="ks"/>
+ geometry="compact" symbols="mai-inscript"
+ longname="Maithili (Inscript)" language="mai"/>
+ geometry="compact" symbols="ml-inscript"
+ longname="Malayalam (Inscript)" language="ml-inscript"/>
+ geometry="compact" symbols="mr-inscript"
+ longname="Marathi (Inscript)" language="mr"/>
+ geometry="compact" symbols="or-inscript"
+ longname="Oriya (Inscript)" language="or"/>
+ geometry="compact" symbols="pa-inscript"
+ longname="Punjabi (Inscript)" language="pa"/>
+ geometry="compact" symbols="sd-inscript"
+ longname="Sindhi (Inscript)" language="sd"/>
+ geometry="compact" symbols="ta-inscript"
+ longname="Tamil (Inscript)" language="ta"/>
+ geometry="compact" symbols="te-inscript"
+ longname="Telugu (Inscript)" language="te"/>
diff --git a/docs/reference/eek/eek-docs.sgml b/docs/reference/eek/eek-docs.sgml
index be6433b6..4937b0be 100644
--- a/docs/reference/eek/eek-docs.sgml
+++ b/docs/reference/eek/eek-docs.sgml
@@ -22,12 +22,12 @@
- Permission is granted to copy, distribute and/or modify this
- document under the terms of the GNU Free Documentation License,
- Version 1.3 or any later version published by the Free Software
- Foundation; with no Invariant Sections, no Front-Cover Texts and
- no Back-Cover Texts. A copy of the license is included in the
- section entitled "GNU Free Documentation License".
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU Free Documentation License,
+ Version 1.3 or any later version published by the Free Software
+ Foundation; with no Invariant Sections, no Front-Cover Texts and
+ no Back-Cover Texts. A copy of the license is included in the
+ section entitled "GNU Free Documentation License".
diff --git a/docs/reference/eekboard/eekboard-docs.sgml b/docs/reference/eekboard/eekboard-docs.sgml
index cf5dbfeb..36894b1b 100644
--- a/docs/reference/eekboard/eekboard-docs.sgml
+++ b/docs/reference/eekboard/eekboard-docs.sgml
@@ -22,12 +22,12 @@
- Permission is granted to copy, distribute and/or modify this
- document under the terms of the GNU Free Documentation License,
- Version 1.3 or any later version published by the Free Software
- Foundation; with no Invariant Sections, no Front-Cover Texts and
- no Back-Cover Texts. A copy of the license is included in the
- section entitled "GNU Free Documentation License".
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU Free Documentation License,
+ Version 1.3 or any later version published by the Free Software
+ Foundation; with no Invariant Sections, no Front-Cover Texts and
+ no Back-Cover Texts. A copy of the license is included in the
+ section entitled "GNU Free Documentation License".
diff --git a/eek/eek-keyboard-drawing.c b/eek/eek-keyboard-drawing.c
index bc01d607..1215e9e6 100644
--- a/eek/eek-keyboard-drawing.c
+++ b/eek/eek-keyboard-drawing.c
@@ -40,8 +40,8 @@ point_line_distance (gdouble ax, gdouble ay, gdouble nx, gdouble ny)
static void
normal_form (gdouble ax, gdouble ay,
- gdouble bx, gdouble by,
- gdouble * nx, gdouble * ny, gdouble * d)
+ gdouble bx, gdouble by,
+ gdouble * nx, gdouble * ny, gdouble * d)
{
gdouble l;
@@ -58,7 +58,7 @@ normal_form (gdouble ax, gdouble ay,
static void
inverse (gdouble a, gdouble b, gdouble c, gdouble d,
- gdouble * e, gdouble * f, gdouble * g, gdouble * h)
+ gdouble * e, gdouble * f, gdouble * g, gdouble * h)
{
gdouble det;
@@ -71,8 +71,8 @@ inverse (gdouble a, gdouble b, gdouble c, gdouble d,
}
static void
-multiply (gdouble a, gdouble b, gdouble c, gdouble d,
- gdouble e, gdouble f, gdouble * x, gdouble * y)
+multiply (gdouble a, gdouble b, gdouble c, gdouble d,
+ gdouble e, gdouble f, gdouble * x, gdouble * y)
{
*x = a * e + b * f;
*y = c * e + d * f;
@@ -80,7 +80,7 @@ multiply (gdouble a, gdouble b, gdouble c, gdouble d,
static void
intersect (gdouble n1x, gdouble n1y, gdouble d1,
- gdouble n2x, gdouble n2y, gdouble d2, gdouble * x, gdouble * y)
+ gdouble n2x, gdouble n2y, gdouble d2, gdouble * x, gdouble * y)
{
gdouble e, f, g, h;
@@ -94,8 +94,8 @@ intersect (gdouble n1x, gdouble n1y, gdouble d1,
*/
static void
rounded_corner (cairo_t * cr,
- gdouble bx, gdouble by,
- gdouble cx, gdouble cy, gdouble radius)
+ gdouble bx, gdouble by,
+ gdouble cx, gdouble cy, gdouble radius)
{
gdouble ax, ay;
gdouble n1x, n1y, d1;
diff --git a/eek/eek-serializable.c b/eek/eek-serializable.c
index f3882b42..04fba0bd 100644
--- a/eek/eek-serializable.c
+++ b/eek/eek-serializable.c
@@ -9,7 +9,7 @@
*
* This library 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
diff --git a/eek/eek-types.h b/eek/eek-types.h
index 749c2614..a8fd5669 100644
--- a/eek/eek-types.h
+++ b/eek/eek-types.h
@@ -100,13 +100,13 @@ typedef enum {
typedef enum
{
EEK_SHIFT_MASK = 1 << 0,
- EEK_LOCK_MASK = 1 << 1,
+ EEK_LOCK_MASK = 1 << 1,
EEK_CONTROL_MASK = 1 << 2,
- EEK_MOD1_MASK = 1 << 3,
- EEK_MOD2_MASK = 1 << 4,
- EEK_MOD3_MASK = 1 << 5,
- EEK_MOD4_MASK = 1 << 6,
- EEK_MOD5_MASK = 1 << 7,
+ EEK_MOD1_MASK = 1 << 3,
+ EEK_MOD2_MASK = 1 << 4,
+ EEK_MOD3_MASK = 1 << 5,
+ EEK_MOD4_MASK = 1 << 6,
+ EEK_MOD5_MASK = 1 << 7,
EEK_BUTTON1_MASK = 1 << 8,
EEK_BUTTON2_MASK = 1 << 9,
EEK_BUTTON3_MASK = 1 << 10,
diff --git a/eek/eek-xkb-layout.c b/eek/eek-xkb-layout.c
index c0fffef0..5a89431a 100644
--- a/eek/eek-xkb-layout.c
+++ b/eek/eek-xkb-layout.c
@@ -360,7 +360,7 @@ eek_xkb_layout_finalize (GObject *object)
g_free (priv->names.keycodes);
g_free (priv->names.geometry);
g_free (priv->names.symbols);
- XkbFreeKeyboard (priv->xkb, 0, TRUE); /* free_all = TRUE */
+ XkbFreeKeyboard (priv->xkb, 0, TRUE); /* free_all = TRUE */
G_OBJECT_CLASS (eek_xkb_layout_parent_class)->finalize (object);
}
diff --git a/eek/eek-xkb-layout.h b/eek/eek-xkb-layout.h
index 81bfc9ae..b3996436 100644
--- a/eek/eek-xkb-layout.h
+++ b/eek/eek-xkb-layout.h
@@ -69,4 +69,4 @@ gboolean eek_xkb_layout_set_names (EekXkbLayout *layout,
GError **error);
G_END_DECLS
-#endif /* #ifndef EEK_XKB_LAYOUT_H */
+#endif /* #ifndef EEK_XKB_LAYOUT_H */
diff --git a/eek/eek-xkl-layout.c b/eek/eek-xkl-layout.c
index a38873e5..997b7bdd 100644
--- a/eek/eek-xkl-layout.c
+++ b/eek/eek-xkl-layout.c
@@ -69,13 +69,13 @@ struct _EekXklLayoutPrivate
* Any ideas on architectural improvements are WELCOME
*/
extern gboolean xkl_xkb_config_native_prepare (XklEngine * engine,
- const XklConfigRec * data,
- XkbComponentNamesPtr
- component_names);
+ const XklConfigRec * data,
+ XkbComponentNamesPtr
+ component_names);
extern void xkl_xkb_config_native_cleanup (XklEngine * engine,
- XkbComponentNamesPtr
- component_names);
+ XkbComponentNamesPtr
+ component_names);
static gboolean set_xkb_component_names (EekXklLayout *layout,
XklConfigRec *config);
diff --git a/eek/eek-xkl-layout.h b/eek/eek-xkl-layout.h
index 966b2918..ba4068a2 100644
--- a/eek/eek-xkl-layout.h
+++ b/eek/eek-xkl-layout.h
@@ -94,4 +94,4 @@ gboolean eek_xkl_layout_get_option (EekXklLayout *layout,
const gchar *option);
G_END_DECLS
-#endif /* #ifndef EEK_XKL_LAYOUT_H */
+#endif /* #ifndef EEK_XKL_LAYOUT_H */
diff --git a/eek/eek-xml-layout.c b/eek/eek-xml-layout.c
index aa2efce2..818a2ef0 100644
--- a/eek/eek-xml-layout.c
+++ b/eek/eek-xml-layout.c
@@ -59,7 +59,7 @@ struct _EekXmlLayoutPrivate
G_DEFINE_BOXED_TYPE(EekXmlKeyboardDesc, eek_xml_keyboard_desc, eek_xml_keyboard_desc_copy, eek_xml_keyboard_desc_free);
-#define BUFSIZE 8192
+#define BUFSIZE 8192
static GList *parse_keyboards (const gchar *path,
GError **error);
@@ -1021,10 +1021,10 @@ eek_xml_layout_class_init (EekXmlLayoutClass *klass)
gobject_class->finalize = eek_xml_layout_finalize;
pspec = g_param_spec_string ("id",
- "ID",
- "ID",
- NULL,
- G_PARAM_CONSTRUCT_ONLY |
+ "ID",
+ "ID",
+ NULL,
+ G_PARAM_CONSTRUCT_ONLY |
G_PARAM_READWRITE);
g_object_class_install_property (gobject_class, PROP_ID, pspec);
}
diff --git a/src/client.c b/src/client.c
index 34c71c6a..ca53c63c 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1148,7 +1148,7 @@ void
client_disable_xtest (Client *client)
{
if (client->xkb) {
- XkbFreeKeyboard (client->xkb, 0, TRUE); /* free_all = TRUE */
+ XkbFreeKeyboard (client->xkb, 0, TRUE); /* free_all = TRUE */
client->xkb = NULL;
}
}