diff options
| author |   Marius Vlad <marius.vlad@collabora.com> | 2022-12-28 16:21:01 +0200 |
|---|---|---|
| committer | Marius Vlad <marius.vlad@collabora.com> | 2022-12-28 18:27:23 +0200 |
| commit | c9d3edb4ee23a5630136ca4a67eaa3860f7651d1 (patch) | |
| tree | 50403cea6032ff2f6a73f399007aa10682bea05b /src/compositor.c | |
| parent | 76fa1b83638310c23bf3ca952e4479499b8ecb43 (diff) | |
input: Rename hide-cursor to disable-cursor
Since hide-cursor doesn't hide the cursor but disables the pointer,
better rename it to something much more appropriate.
While doing that, move also move the ini entry retrieval where is also
more suitable, along side the other parts that do that. Shouldn't be
any functional change while doing that.
Bug-AGL: SPEC-4658
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I8d1aab849b9a96177d17bb639c8e1e209205f7e7
Diffstat (limited to 'src/compositor.c')
| -rw-r--r-- | src/compositor.c | 17 |
1 files changed, 9 insertions, 8 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) { |