summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorDave Davenport <qball@gmpclient.org>2016-02-28 18:22:00 +0100
committerDave Davenport <qball@gmpclient.org>2016-02-28 18:22:00 +0100
commitcc5db086bf228e45487968dc352df1557f5e542b (patch)
tree82125c2888cf5227d4015140ea40a3e41ce22a47 /source
parentef98b3928a97210ae725f40373eede6e372edd78 (diff)
Indenting
Diffstat (limited to 'source')
-rw-r--r--source/keyb.c3
-rw-r--r--source/x11-helper.c10
2 files changed, 6 insertions, 7 deletions
diff --git a/source/keyb.c b/source/keyb.c
index 2a320aa9..db4fc515 100644
--- a/source/keyb.c
+++ b/source/keyb.c
@@ -111,8 +111,7 @@ void parse_keys_abe ( void )
abe[iter].num_bindings = 0;
// Iter over bindings.
- for ( char *entry = strtok_r ( keystr, ",", &sp ); entry != NULL; entry = strtok_r ( NULL, ",", &sp ) )
- {
+ for ( char *entry = strtok_r ( keystr, ",", &sp ); entry != NULL; entry = strtok_r ( NULL, ",", &sp ) ) {
abe[iter].kb = g_realloc ( abe[iter].kb, ( abe[iter].num_bindings + 1 ) * sizeof ( KeyBinding ) );
KeyBinding *kb = &( abe[iter].kb[abe[iter].num_bindings] );
x11_parse_key ( entry, &( kb->modmask ), &( kb->keysym ) );
diff --git a/source/x11-helper.c b/source/x11-helper.c
index b99c4814..849b5d4e 100644
--- a/source/x11-helper.c
+++ b/source/x11-helper.c
@@ -438,17 +438,17 @@ void x11_parse_key ( char *combo, unsigned int *mod, xkb_keysym_t *key )
i--;
}
xkb_keysym_t sym = XKB_KEY_NoSymbol;
- if ( ( modmask&x11_mod_masks[X11MOD_SHIFT] ) != 0 ){
+ if ( ( modmask & x11_mod_masks[X11MOD_SHIFT] ) != 0 ) {
gchar * str = g_utf8_next_char ( combo + i );
// If it is a single char, we make a capital out of it.
- if ( str != NULL && *str == '\0'){
- int l = 0;
- char buff[8];
+ if ( str != NULL && *str == '\0' ) {
+ int l = 0;
+ char buff[8];
gunichar v = g_utf8_get_char ( combo + i );
gunichar u = g_unichar_toupper ( v );
if ( ( l = g_unichar_to_utf8 ( u, buff ) ) ) {
buff[l] = '\0';
- sym = xkb_keysym_from_name ( buff, XKB_KEYSYM_NO_FLAGS );
+ sym = xkb_keysym_from_name ( buff, XKB_KEYSYM_NO_FLAGS );
}
}
}