BitHeaven/picom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split the first and second pass of get_cfg

Browse Source 
They are not separate functions

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui
2018-12-20 23:58:47 +00:00
parent 9b121447b9
commit 2a2958b68d
3 changed files with 147 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/compton.c
View File

@ -2730,8 +2730,11 @@ session_init(session_t *ps_old, int argc, char **argv) {
ps->ignore_tail = &ps->ignore_head;
gettimeofday(&ps->time_start, NULL);
// First pass
get_cfg(ps, argc, argv, true);
int exit_code;
if (get_early_config(argc, argv, &ps->o.config_file, &ps->o.show_all_xerrors,
&exit_code)) {
exit(exit_code);
}
// Inherit old Display if possible, primarily for resource leak checking
if (ps_old && ps_old->dpy)
@ -2828,7 +2831,7 @@ session_init(session_t *ps_old, int argc, char **argv) {
xcb_xfixes_query_version(ps->c, XCB_XFIXES_MAJOR_VERSION, XCB_XFIXES_MINOR_VERSION).sequence);
// Second pass
get_cfg(ps, argc, argv, false);
get_cfg(ps, argc, argv);
rebuild_shadow_exclude_reg(ps);