aboutsummaryrefslogtreecommitdiffstats
path: root/src/vars.c
diff options
context:
space:
mode:
authorFrederic Culot <calcurse@culot.org>2008-04-12 21:14:03 +0000
committerFrederic Culot <calcurse@culot.org>2008-04-12 21:14:03 +0000
commitefd782699b63038a36bf68eaa1230d2d10bd9b38 (patch)
treea8bf286c6aa9bbfc12192cefed63a98567a3f010 /src/vars.c
parent0c281d2c1e53248f0075f988fb4ba02f041bd170 (diff)
downloadcalcurse-efd782699b63038a36bf68eaa1230d2d10bd9b38.tar.gz
calcurse-efd782699b63038a36bf68eaa1230d2d10bd9b38.zip
Yet another style for source code. GNU style now used (I am fed up with tabs...)
Diffstat (limited to 'src/vars.c')
-rwxr-xr-xsrc/vars.c135
1 files changed, 68 insertions, 67 deletions
diff --git a/src/vars.c b/src/vars.c
index db09bf8..79e9b66 100755
--- a/src/vars.c
+++ b/src/vars.c
@@ -1,4 +1,4 @@
-/* $calcurse: vars.c,v 1.7 2008/04/09 20:38:29 culot Exp $ */
+/* $calcurse: vars.c,v 1.8 2008/04/12 21:14:03 culot Exp $ */
/*
* Calcurse - text-based organizer
@@ -45,29 +45,31 @@ bool colorize = false;
* variables to store calendar names
*/
int days[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
-char *monthnames[12] =
- { N_("January"),
- N_("February"),
- N_("March"),
- N_("April"),
- N_("May"),
- N_("June"),
- N_("July"),
- N_("August"),
- N_("September"),
- N_("October"),
- N_("November"),
- N_("December") };
-
-char *daynames[8] =
- { N_("Sun"),
- N_("Mon"),
- N_("Tue"),
- N_("Wed"),
- N_("Thu"),
- N_("Fri"),
- N_("Sat"),
- N_("Sun") };
+char *monthnames[12] = {
+ N_("January"),
+ N_("February"),
+ N_("March"),
+ N_("April"),
+ N_("May"),
+ N_("June"),
+ N_("July"),
+ N_("August"),
+ N_("September"),
+ N_("October"),
+ N_("November"),
+ N_("December")
+};
+
+char *daynames[8] = {
+ N_("Sun"),
+ N_("Mon"),
+ N_("Tue"),
+ N_("Wed"),
+ N_("Thu"),
+ N_("Fri"),
+ N_("Sat"),
+ N_("Sun")
+};
/*
* variables to store data path names, which are initialized in
@@ -85,51 +87,50 @@ struct pad_s *apad;
/* Variable to store notify-bar settings. */
struct nbar_s *nbar;
-
/*
* Variables init
*/
-void
-vars_init(conf_t *conf)
+void
+vars_init (conf_t *conf)
{
- char *PATH_VI = "/usr/bin/vi";
- char *PATH_LESS = "/usr/bin/less";
- char *ed, *pg;
-
- /* Variables for user configuration */
- conf->confirm_quit = true;
- conf->confirm_delete = true;
- conf->auto_save = true;
- conf->skip_system_dialogs = false;
- conf->skip_progress_bar = false;
- strncpy(conf->output_datefmt, "%D", 3);
- conf->input_datefmt = 1;
-
- /* Default external editor and pager */
- ed = getenv("VISUAL");
- if (ed == NULL || ed[0] == '\0')
- ed = getenv("EDITOR");
- if (ed == NULL || ed[0] == '\0')
- ed = PATH_VI;
- conf->editor = ed;
-
- pg = getenv("PAGER");
- if (pg == NULL || pg[0] == '\0')
- pg = PATH_LESS;
- conf->pager = pg;
-
- wins_set_layout(1);
-
- calendar_set_first_day_of_week(MONDAY);
-
- /* Pad structure to scroll text inside the appointment panel */
- apad = (struct pad_s *) malloc(sizeof(struct pad_s));
- apad->length = 1;
- apad->first_onscreen = 0;
-
- /* Attribute definitions for color and non-color terminals */
- custom_init_attr();
-
- /* Start at the current date */
- calendar_init_slctd_day();
+ char *PATH_VI = "/usr/bin/vi";
+ char *PATH_LESS = "/usr/bin/less";
+ char *ed, *pg;
+
+ /* Variables for user configuration */
+ conf->confirm_quit = true;
+ conf->confirm_delete = true;
+ conf->auto_save = true;
+ conf->skip_system_dialogs = false;
+ conf->skip_progress_bar = false;
+ strncpy (conf->output_datefmt, "%D", 3);
+ conf->input_datefmt = 1;
+
+ /* Default external editor and pager */
+ ed = getenv ("VISUAL");
+ if (ed == NULL || ed[0] == '\0')
+ ed = getenv ("EDITOR");
+ if (ed == NULL || ed[0] == '\0')
+ ed = PATH_VI;
+ conf->editor = ed;
+
+ pg = getenv ("PAGER");
+ if (pg == NULL || pg[0] == '\0')
+ pg = PATH_LESS;
+ conf->pager = pg;
+
+ wins_set_layout (1);
+
+ calendar_set_first_day_of_week (MONDAY);
+
+ /* Pad structure to scroll text inside the appointment panel */
+ apad = (struct pad_s *) malloc (sizeof (struct pad_s));
+ apad->length = 1;
+ apad->first_onscreen = 0;
+
+ /* Attribute definitions for color and non-color terminals */
+ custom_init_attr ();
+
+ /* Start at the current date */
+ calendar_init_slctd_day ();
}