nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move stuff from main() to setup()

Browse Source
This commit is contained in:
Sascha Kruse 2012-10-20 19:41:30 +02:00
parent 3c8d8b00c6
commit 2f72f58b4a
1 changed files with 58 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
dunst.c
View File

@ -1276,25 +1276,69 @@ void update_screen_info()
void setup(void) void setup(void)
{ {
Window root;
XSetWindowAttributes wa;
notification_queue = l_init(); dc = initdc();
notification_history = l_init();
displayed_notifications = l_init(); initfont(dc, font);
init_shortcut(&close_ks);
init_shortcut(&close_all_ks);
init_shortcut(&history_ks);
grab_key(&close_ks);
ungrab_key(&close_ks);
grab_key(&close_all_ks);
ungrab_key(&close_all_ks);
grab_key(&history_ks);
ungrab_key(&history_ks);
colors[LOW] = initcolor(dc, lowfgcolor, lowbgcolor);
colors[NORM] = initcolor(dc, normfgcolor, normbgcolor);
colors[CRIT] = initcolor(dc, critfgcolor, critbgcolor);
color_strings[ColFG][LOW] = lowfgcolor;
color_strings[ColFG][NORM] = normfgcolor;
color_strings[ColFG][CRIT] = critfgcolor;
color_strings[ColBG][LOW] = lowbgcolor;
color_strings[ColBG][NORM] = normbgcolor;
color_strings[ColBG][CRIT] = critbgcolor;
scr.scr = monitor;
if (geom[0] == '-') {
geometry.negative_width = true;
geom++;
} else {
geometry.negative_width = false;
}
geometry.mask = XParseGeometry(geom,
&geometry.x, &geometry.y,
&geometry.w, &geometry.h);
screensaver_info = XScreenSaverAllocInfo();
window_dim.x = 0;
window_dim.y = 0;
window_dim.w = 0;
window_dim.h = 0;
if (scr.scr < 0) { if (scr.scr < 0) {
scr.scr = DefaultScreen(dc->dpy); scr.scr = DefaultScreen(dc->dpy);
} }
/* window */
Window root;
XSetWindowAttributes wa;
root = RootWindow(dc->dpy, DefaultScreen(dc->dpy)); root = RootWindow(dc->dpy, DefaultScreen(dc->dpy));
utf8 = XInternAtom(dc->dpy, "UTF8_STRING", false); utf8 = XInternAtom(dc->dpy, "UTF8_STRING", false);
/* menu geometry */
font_h = dc->font.height + FONT_HEIGHT_BORDER; font_h = dc->font.height + FONT_HEIGHT_BORDER;
update_screen_info(); update_screen_info();
/* menu window */
wa.override_redirect = true; wa.override_redirect = true;
wa.background_pixmap = ParentRelative; wa.background_pixmap = ParentRelative;
wa.event_mask = wa.event_mask =
@ -1536,11 +1580,14 @@ int main(int argc, char *argv[])
{ {
now = time(&now); now = time(&now);
notification_queue = l_init();
notification_history = l_init();
displayed_notifications = l_init();
rules = l_init(); rules = l_init();
for (int i = 0; i < LENGTH(default_rules); i++) { for (int i = 0; i < LENGTH(default_rules); i++) {
l_push(rules, &default_rules[i]); l_push(rules, &default_rules[i]);
} }
scr.scr = monitor;
cmdline_load(argc, argv); cmdline_load(argc, argv);
@ -1557,53 +1604,8 @@ int main(int argc, char *argv[])
usage(EXIT_SUCCESS); usage(EXIT_SUCCESS);
} }
dc = initdc();
init_shortcut(&close_ks);
init_shortcut(&close_all_ks);
init_shortcut(&history_ks);
if (geom[0] == '-') {
geometry.negative_width = true;
geom++;
} else {
geometry.negative_width = false;
}
geometry.mask = XParseGeometry(geom,
&geometry.x, &geometry.y,
&geometry.w, &geometry.h);
screensaver_info = XScreenSaverAllocInfo();
initdbus(); initdbus();
initfont(dc, font);
grab_key(&close_ks);
ungrab_key(&close_ks);
grab_key(&close_all_ks);
ungrab_key(&close_all_ks);
grab_key(&history_ks);
ungrab_key(&history_ks);
colors[LOW] = initcolor(dc, lowfgcolor, lowbgcolor);
colors[NORM] = initcolor(dc, normfgcolor, normbgcolor);
colors[CRIT] = initcolor(dc, critfgcolor, critbgcolor);
color_strings[ColFG][LOW] = lowfgcolor;
color_strings[ColFG][NORM] = normfgcolor;
color_strings[ColFG][CRIT] = critfgcolor;
color_strings[ColBG][LOW] = lowbgcolor;
color_strings[ColBG][NORM] = normbgcolor;
color_strings[ColBG][CRIT] = critbgcolor;
window_dim.x = 0;
window_dim.y = 0;
window_dim.w = 0;
window_dim.h = 0;
setup(); setup();
if (deprecated_mod) if (deprecated_mod)