indenting + cleaning XInput usage

3 files changed, 23 insertions, 19 deletions

diff --git a/libxklavier/xklavier.c b/libxklavier/xklavier.c
index bbb4dd7..412b0b1 100644
--- a/libxklavier/xklavier.c
+++ b/libxklavier/xklavier.c
@@ -413,7 +413,7 @@ xkl_default_log_appender(const gchar file[], const gchar function[],
 			 gint level, const gchar format[], va_list args)
 {
 	time_t now = time(NULL);
-	fprintf(stdout, "[%08ld,%03d,%s:%s/] \t", (long)now, level, file,
+	fprintf(stdout, "[%08ld,%03d,%s:%s/] \t", (long) now, level, file,
 		function);
 	vfprintf(stdout, format, args);
 }
@@ -625,8 +625,8 @@ xkl_engine_constructor(GType type,
 	engine = XKL_ENGINE(obj);
 
 	display =
-	    (Display *) g_value_peek_pointer(construct_properties[0].
-					     value);
+	    (Display *)
+	    g_value_peek_pointer(construct_properties[0].value);
 
 	xkl_engine_priv(engine, display) = display;
 
diff --git a/libxklavier/xklavier_evt_xkb.c b/libxklavier/xklavier_evt_xkb.c
index 64cea89..046e138 100644
--- a/libxklavier/xklavier_evt_xkb.c
+++ b/libxklavier/xklavier_evt_xkb.c
@@ -33,7 +33,8 @@
 static gint
 xkl_xinput_process_x_event(XklEngine * engine, XEvent * xev)
 {
-	XDevicePresenceNotifyEvent* dpne = (XDevicePresenceNotifyEvent*)xev;
+	XDevicePresenceNotifyEvent *dpne =
+	    (XDevicePresenceNotifyEvent *) xev;
 	xkl_debug(200, "XInput event detected: %d\n", dpne->devchange);
 	if (dpne->devchange == DeviceEnabled) {
 		xkl_debug(150, "Device enabled: %d\n", dpne->deviceid);
@@ -86,8 +87,8 @@ xkl_xkb_process_x_event(XklEngine * engine, XEvent * xev)
 		if (kev->state.changed & GROUP_CHANGE_MASK)
 			xkl_engine_process_state_modification(engine,
 							      GROUP_CHANGED,
-							      kev->state.
-							      locked_group,
+							      kev->
+							      state.locked_group,
 							      0, FALSE);
 		else {		/* ...not interested... */
 
@@ -98,8 +99,8 @@ xkl_xkb_process_x_event(XklEngine * engine, XEvent * xev)
 				xkl_debug(0,
 					  "ATTENTION! Currently cached group %d is not equal to the current group from the event: %d\n!",
 					  xkl_engine_priv(engine,
-							  curr_state).
-					  group, kev->state.locked_group);
+							  curr_state).group,
+					  kev->state.locked_group);
 		}
 
 		break;
@@ -173,8 +174,8 @@ xkl_xkb_set_indicators(XklEngine * engine, const XklState * window_state)
 	ForPhysIndicators(i, bit) if (cached->names->indicators[i] != None) {
 		gboolean status;
 		status = xkl_xkb_set_indicator(engine, i,
-					       (window_state->
-						indicators & bit) != 0);
+					       (window_state->indicators &
+						bit) != 0);
 		xkl_debug(150, "Set indicator \"%s\"/%d to %d: %d\n",
 			  xkl_engine_backend(engine, XklXkb,
 					     indicator_names)[i],
diff --git a/libxklavier/xklavier_xkb.c b/libxklavier/xklavier_xkb.c
index 134fcc1..9a1d5ba 100644
--- a/libxklavier/xklavier_xkb.c
+++ b/libxklavier/xklavier_xkb.c
@@ -96,11 +96,14 @@ xkl_xkb_resume_listen(XklEngine * engine)
 			      XkbNamesNotify, XKB_NAMES_EVT_DTL_MASK,
 			      XKB_NAMES_EVT_DTL_MASK);
 #ifdef HAVE_XINPUT
-	DevicePresence(display, xitype, xiclass);
-	XSelectExtensionEvent(display,
-			      xkl_engine_priv(engine, root_window),
-			      &xiclass, 1);
-	xkl_engine_backend(engine, XklXkb, xi_event_type) = xitype;
+	if (xkl_engine_priv(engine, features) | XKLF_DEVICE_DISCOVERY) {
+		DevicePresence(display, xitype, xiclass);
+		XSelectExtensionEvent(display,
+				      xkl_engine_priv(engine, root_window),
+				      &xiclass, 1);
+		xkl_engine_backend(engine, XklXkb, xi_event_type) = xitype;
+	} else
+		xkl_engine_backend(engine, XklXkb, xi_event_type) = -1;
 #endif
 	return 0;
 }
@@ -350,8 +353,8 @@ xkl_xkb_get_server_state(XklEngine * engine, XklState * current_state_out)
 				 &current_state_out->indicators))
 		current_state_out->indicators &=
 		    xkl_engine_backend(engine, XklXkb,
-				       cached_desc)->indicators->
-		    phys_indicators;
+				       cached_desc)->
+		    indicators->phys_indicators;
 	else
 		current_state_out->indicators = 0;
 }
@@ -399,8 +402,8 @@ xkl_xkb_set_indicator(XklEngine * engine, gint indicator_num, gboolean set)
 						     xkl_engine_backend
 						     (engine, XklXkb,
 						      device_id),
-						     cached->names->
-						     indicators
+						     cached->
+						     names->indicators
 						     [indicator_num], set,
 						     False, NULL);
 			else {