Code Review
/
src
/
agl-compositor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
shell: Reset the area activation
[src/agl-compositor.git]
/
src
/
compositor.c
diff --git
a/src/compositor.c
b/src/compositor.c
index
1f45a71
..
9e71552
100644
(file)
--- a/
src/compositor.c
+++ b/
src/compositor.c
@@
-1280,11
+1280,12
@@
choose_default_backend(void)
}
static int
}
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 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;
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);
/* 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;
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();
}
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);
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;
}
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) {
goto error_compositor;
if (load_backend(&ivi, backend, &argc, argv) < 0) {