diff options
| -rw-r--r-- | src/compositor.c | 17 | ||||
| -rw-r--r-- | src/input.c | 14 | ||||
| -rw-r--r-- | src/ivi-compositor.h | 4 |
3 files changed, 18 insertions, 17 deletions
diff --git a/src/compositor.c b/src/compositor.c index 1f45a71..9e71552 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -1280,11 +1280,12 @@ choose_default_backend(void) } static int -compositor_init_config(struct weston_compositor *compositor, - struct weston_config *config) +compositor_init_config(struct ivi_compositor *ivi) { struct xkb_rule_names xkb_names; struct weston_config_section *section; + struct weston_compositor *compositor = ivi->compositor; + struct weston_config *config = ivi->config; int repaint_msec; bool vt_switching; bool require_input; @@ -1317,6 +1318,11 @@ compositor_init_config(struct weston_compositor *compositor, /* agl-compositor.ini [core] */ section = weston_config_get_section(config, "core", NULL, NULL); + weston_config_section_get_bool(section, "disable-cursor", + &ivi->disable_cursor, false); + weston_config_section_get_bool(section, "activate-by-default", + &ivi->activate_by_default, true); + weston_config_section_get_bool(section, "require-input", &require_input, true); compositor->require_input = require_input; @@ -1733,11 +1739,6 @@ int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_da if (!backend) backend = choose_default_backend(); } - /* from [core] */ - weston_config_section_get_bool(section, "hide-cursor", - &ivi.hide_cursor, false); - weston_config_section_get_bool(section, "activate-by-default", - &ivi.activate_by_default, true); display = wl_display_create(); loop = wl_display_get_event_loop(display); @@ -1779,7 +1780,7 @@ int wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_da goto error_signals; } - if (compositor_init_config(ivi.compositor, ivi.config) < 0) + if (compositor_init_config(&ivi) < 0) goto error_compositor; if (load_backend(&ivi, backend, &argc, argv) < 0) { diff --git a/src/input.c b/src/input.c index 1a143ce..026625f 100644 --- a/src/input.c +++ b/src/input.c @@ -108,7 +108,7 @@ ivi_shell_seat_handle_pointer_focus(struct wl_listener *listener, void *data) /* remove the POINTER capability such that the client will not install * a cursor surface */ - if (shseat->hide_cursor && !shseat->new_caps_sent && resources) { + if (shseat->disable_cursor && !shseat->new_caps_sent && resources) { caps &= ~WL_SEAT_CAPABILITY_POINTER; wl_resource_for_each(resource, &pointer->seat->base_resource_list) { wl_seat_send_capabilities(resource, caps); @@ -137,7 +137,7 @@ ivi_shell_seat_handle_caps_changed(struct wl_listener *listener, void *data) } static struct ivi_shell_seat * -ivi_shell_seat_create(struct weston_seat *seat, bool hide_cursor) +ivi_shell_seat_create(struct weston_seat *seat, bool disable_cursor) { struct ivi_shell_seat *shseat; @@ -148,7 +148,7 @@ ivi_shell_seat_create(struct weston_seat *seat, bool hide_cursor) } shseat->seat = seat; - shseat->hide_cursor = hide_cursor; + shseat->disable_cursor = disable_cursor; shseat->new_caps_sent = false; shseat->seat_destroy_listener.notify = ivi_shell_seat_handle_destroy; @@ -177,8 +177,8 @@ ivi_shell_handle_seat_created(struct wl_listener *listener, void *data) struct ivi_compositor *ivi = container_of(listener, struct ivi_compositor, seat_created_listener); - weston_log("Cursor is %s\n", ivi->hide_cursor ? "set" : "not set"); - ivi_shell_seat_create(seat, ivi->hide_cursor); + weston_log("Cursor is %s\n", ivi->disable_cursor ? "set" : "not set"); + ivi_shell_seat_create(seat, ivi->disable_cursor); } /* @@ -203,9 +203,9 @@ ivi_seat_init(struct ivi_compositor *ivi) struct weston_seat *seat; wl_list_for_each(seat, &ec->seat_list, link) { - weston_log("Seat %p, cursor is %s\n", seat, ivi->hide_cursor ? + weston_log("Seat %p, cursor is %s\n", seat, ivi->disable_cursor ? "set" : "not set"); - ivi_shell_seat_create(seat, ivi->hide_cursor); + ivi_shell_seat_create(seat, ivi->disable_cursor); } ivi->seat_created_listener.notify = ivi_shell_handle_seat_created; diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h index 463ae2b..6a72e2a 100644 --- a/src/ivi-compositor.h +++ b/src/ivi-compositor.h @@ -58,7 +58,7 @@ struct ivi_compositor { struct wl_listener heads_changed; bool init_failed; - bool hide_cursor; + bool disable_cursor; bool activate_by_default; bool keep_pending_surfaces; @@ -320,7 +320,7 @@ struct ivi_shell_seat { struct weston_seat *seat; struct weston_surface *focused_surface; - bool hide_cursor; + bool disable_cursor; bool new_caps_sent; struct wl_listener seat_destroy_listener; |