Skip to content

refactor: optimize globalconf initialization #4064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cnjhb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: optimize globalconf initialization #4064

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions awesome.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,15 @@

#include <glib-unix.h>

awesome_t globalconf;
awesome_t globalconf = {
.keygrabber = LUA_REFNIL,
.mousegrabber = LUA_REFNIL,
.exit_code = EXIT_SUCCESS,
.focus = {
.need_update = true,
},
.preferred_icon_size = 0,
};

/** argv used to run awesome */
static char **awesome_argv;
Expand Down Expand Up @@ -582,9 +590,6 @@ main(int argc, char **argv)
setvbuf(stdout, NULL, _IOLBF, 0);
setvbuf(stderr, NULL, _IOLBF, 0);

globalconf.keygrabber = LUA_REFNIL;
globalconf.mousegrabber = LUA_REFNIL;
globalconf.exit_code = EXIT_SUCCESS;
globalconf.api_level = awesome_default_api_level();
buffer_init(&globalconf.startup_errors);
string_array_init(&searchpath);
Expand Down Expand Up @@ -675,12 +680,6 @@ main(int argc, char **argv)
sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
sigaction(SIGCHLD, &sa, 0);

/* We have no clue where the input focus is right now */
globalconf.focus.need_update = true;

/* set the default preferred icon size */
globalconf.preferred_icon_size = 0;

/* X stuff */
globalconf.connection = xcb_connect(NULL, &globalconf.default_screen);
if(xcb_connection_has_error(globalconf.connection))
Expand Down
Loading