styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix formatting 

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2015-10-26 10:24:28 -04:00
parent fb5fce9720
commit 5c2b91e7b2
1 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/bin/e_comp_wl_input.c
View File

@ -20,7 +20,7 @@ _e_comp_wl_input_update_seat_caps(void)
caps |= WL_SEAT_CAPABILITY_TOUCH; caps |= WL_SEAT_CAPABILITY_TOUCH;
EINA_LIST_FOREACH(e_comp_wl->seat.resources, l, res) EINA_LIST_FOREACH(e_comp_wl->seat.resources, l, res)
wl_seat_send_capabilities(res, caps); wl_seat_send_capabilities(res, caps);
} }
static void static void
@ -126,9 +126,13 @@ _e_comp_wl_input_cb_keyboard_unbind(struct wl_resource *resource)
e_comp_wl->kbd.resources = e_comp_wl->kbd.resources =
eina_list_remove(e_comp_wl->kbd.resources, resource); eina_list_remove(e_comp_wl->kbd.resources, resource);
EINA_LIST_FOREACH_SAFE(e_comp_wl->kbd.focused, l, ll, res) EINA_LIST_FOREACH_SAFE(e_comp_wl->kbd.focused, l, ll, res)
if (res == resource) {
e_comp_wl->kbd.focused = if (res == resource)
eina_list_remove_list(e_comp_wl->kbd.focused, l); {
e_comp_wl->kbd.focused =
eina_list_remove_list(e_comp_wl->kbd.focused, l);
}
}
} }
void void
@ -169,8 +173,7 @@ _e_comp_wl_input_cb_keyboard_get(struct wl_client *client, struct wl_resource *r
wl_resource_get_version(resource), id); wl_resource_get_version(resource), id);
if (!res) if (!res)
{ {
ERR("Could not create keyboard on seat %s: %m", ERR("Could not create keyboard on seat %s: %m", e_comp_wl->seat.name);
e_comp_wl->seat.name);
wl_client_post_no_memory(client); wl_client_post_no_memory(client);
return; return;
} }
@ -187,8 +190,7 @@ _e_comp_wl_input_cb_keyboard_get(struct wl_client *client, struct wl_resource *r
/* send current keymap */ /* send current keymap */
wl_keyboard_send_keymap(res, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1, wl_keyboard_send_keymap(res, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
e_comp_wl->xkb.fd, e_comp_wl->xkb.fd, e_comp_wl->xkb.size);
e_comp_wl->xkb.size);
/* if the client owns the focused surface, we need to send an enter */ /* if the client owns the focused surface, we need to send an enter */
focused = e_client_focused_get(); focused = e_client_focused_get();
@ -210,23 +212,23 @@ _e_comp_wl_input_cb_touch_unbind(struct wl_resource *resource)
static void static void
_e_comp_wl_input_cb_touch_get(struct wl_client *client EINA_UNUSED, struct wl_resource *resource, uint32_t id EINA_UNUSED) _e_comp_wl_input_cb_touch_get(struct wl_client *client EINA_UNUSED, struct wl_resource *resource, uint32_t id EINA_UNUSED)
{ {
struct wl_resource *res; struct wl_resource *res;
/* try to create pointer resource */ /* try to create pointer resource */
res = wl_resource_create(client, &wl_touch_interface, res = wl_resource_create(client, &wl_touch_interface,
wl_resource_get_version(resource), id); wl_resource_get_version(resource), id);
if (!res) if (!res)
{ {
ERR("Could not create touch on seat %s: %m", ERR("Could not create touch on seat %s: %m",
e_comp_wl->seat.name); e_comp_wl->seat.name);
wl_client_post_no_memory(client); wl_client_post_no_memory(client);
return; return;
} }
e_comp_wl->touch.resources = e_comp_wl->touch.resources =
eina_list_append(e_comp_wl->touch.resources, res); eina_list_append(e_comp_wl->touch.resources, res);
wl_resource_set_implementation(res, &_e_touch_interface, wl_resource_set_implementation(res, &_e_touch_interface,
e_comp->wl_comp_data, e_comp->wl_comp_data,
_e_comp_wl_input_cb_touch_unbind); _e_comp_wl_input_cb_touch_unbind);
} }
@ -403,8 +405,7 @@ _e_comp_wl_input_keymap_update(struct xkb_keymap *keymap)
/* send updated keymap */ /* send updated keymap */
EINA_LIST_FOREACH(e_comp_wl->kbd.resources, l, res) EINA_LIST_FOREACH(e_comp_wl->kbd.resources, l, res)
wl_keyboard_send_keymap(res, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1, wl_keyboard_send_keymap(res, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1,
e_comp_wl->xkb.fd, e_comp_wl->xkb.fd, e_comp_wl->xkb.size);
e_comp_wl->xkb.size);
/* update modifiers */ /* update modifiers */
e_comp_wl_input_keyboard_modifiers_update(); e_comp_wl_input_keyboard_modifiers_update();
@ -501,23 +502,20 @@ e_comp_wl_input_keyboard_modifiers_serialize(void)
xkb_mod_mask_t mod; xkb_mod_mask_t mod;
xkb_layout_index_t grp; xkb_layout_index_t grp;
mod = xkb_state_serialize_mods(e_comp_wl->xkb.state, mod = xkb_state_serialize_mods(e_comp_wl->xkb.state, XKB_STATE_DEPRESSED);
XKB_STATE_DEPRESSED);
changed |= mod != e_comp_wl->kbd.mod_depressed; changed |= mod != e_comp_wl->kbd.mod_depressed;
e_comp_wl->kbd.mod_depressed = mod; e_comp_wl->kbd.mod_depressed = mod;
mod = xkb_state_serialize_mods(e_comp_wl->xkb.state, mod = xkb_state_serialize_mods(e_comp_wl->xkb.state, XKB_STATE_MODS_LATCHED);
XKB_STATE_MODS_LATCHED);
changed |= mod != e_comp_wl->kbd.mod_latched; changed |= mod != e_comp_wl->kbd.mod_latched;
e_comp_wl->kbd.mod_latched = mod; e_comp_wl->kbd.mod_latched = mod;
mod = xkb_state_serialize_mods(e_comp_wl->xkb.state, mod = xkb_state_serialize_mods(e_comp_wl->xkb.state, XKB_STATE_MODS_LOCKED);
XKB_STATE_MODS_LOCKED);
changed |= mod != e_comp_wl->kbd.mod_locked; changed |= mod != e_comp_wl->kbd.mod_locked;
e_comp_wl->kbd.mod_locked = mod; e_comp_wl->kbd.mod_locked = mod;
grp = xkb_state_serialize_layout(e_comp_wl->xkb.state, grp = xkb_state_serialize_layout(e_comp_wl->xkb.state,
XKB_STATE_LAYOUT_EFFECTIVE); XKB_STATE_LAYOUT_EFFECTIVE);
changed |= grp != e_comp_wl->kbd.mod_group; changed |= grp != e_comp_wl->kbd.mod_group;
e_comp_wl->kbd.mod_group = grp; e_comp_wl->kbd.mod_group = grp;
return changed; return changed;