diff options
| author | Sergey Udaltsov <svu@gnome.org> | 2008-11-17 00:19:26 +0000 |
|---|---|---|
| committer | Sergey Udaltsov <svu@gnome.org> | 2008-11-17 00:19:26 +0000 |
| commit | e3fbdd56d927d40cb1f779f5a6125cad3d79f2d4 (patch) | |
| tree | 3d0ef5dd86cc8143e92307f3edc90f2c8f5239fc /libxklavier/xklavier_xkb.c | |
| parent | 14d5f7f6afa5fd00300fb2eb7363dcc8e473de6b (diff) | |
| download | libxklavier-e3fbdd56d927d40cb1f779f5a6125cad3d79f2d4.tar.gz | |
indenting + cleaning XInput usage
Diffstat (limited to 'libxklavier/xklavier_xkb.c')
| -rw-r--r-- | libxklavier/xklavier_xkb.c | 21 |
1 files changed, 12 insertions, 9 deletions
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) ¤t_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 { |