fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to stick to the GNU coding standards for the sake of consistency.

Browse Source 
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2011-03-15 10:52:38 +01:00
parent d6e5347340
commit 84d1daf41d
1 changed files with 170 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

303
src/utils.c
View File

@ -175,8 +175,10 @@ erase_window_part (WINDOW *win, int first_col, int first_row, int last_col,
int c, r; int c, r;
for (r = first_row; r <= last_row; r++) for (r = first_row; r <= last_row; r++)
for (c = first_col; c <= last_col; c++) {
mvwprintw (win, r, c, " "); for (c = first_col; c <= last_col; c++)
mvwprintw (win, r, c, " ");
}
wnoutrefresh (win); wnoutrefresh (win);
} }
@ -215,11 +217,11 @@ print_in_middle (WINDOW *win, int starty, int startx, int width, char *string)
int len = strlen (string); int len = strlen (string);
int x, y; int x, y;
if (!win) win = stdscr; win = win ? win : stdscr;
getyx (win, y, x); getyx (win, y, x);
if (startx) x = startx; x = startx ? startx : x;
if (starty) y = starty; y = starty ? starty : y;
if (!width) width = 80; width = width ? width : 80;
x += (width - len) / 2; x += (width - len) / 2;
@ -240,16 +242,21 @@ showstring (WINDOW *win, int x, int y, char *str, int len, int scroff,
wclrtoeol (win); wclrtoeol (win);
/* print scrolling indicator */ /* print scrolling indicator */
if (scroff > 0 && scroff < len - col) c = '*'; if (scroff > 0 && scroff < len - col)
else if (scroff > 0) c = '<'; c = '*';
else if (scroff < len - col) c = '>'; else if (scroff > 0)
c = '<';
else if (scroff < len - col)
c = '>';
mvwprintw (win, y, col - 1, "%c", c); mvwprintw (win, y, col - 1, "%c", c);
/* print cursor */ /* print cursor */
wmove (win, y, curpos - scroff); wmove (win, y, curpos - scroff);
if (curpos >= len) waddch (win, SPACE | A_REVERSE); if (curpos >= len)
else waddch (win, str[curpos] | A_REVERSE); waddch (win, SPACE | A_REVERSE);
else
waddch (win, str[curpos] | A_REVERSE);
} }
/* Delete a character at the given position in string. */ /* Delete a character at the given position in string. */
@ -296,71 +303,82 @@ getstring (WINDOW *win, char *str, int l, int x, int y)
custom_apply_attr (win, ATTR_HIGHEST); custom_apply_attr (win, ATTR_HIGHEST);
for (;;) { for (;;) {
while (curpos < scroff) scroff -= pgsize; while (curpos < scroff)
while (curpos >= scroff + col - 1) scroff += pgsize; scroff -= pgsize;
while (curpos >= scroff + col - 1)
scroff += pgsize;
showstring (win, x, y, str, len, scroff, curpos); showstring (win, x, y, str, len, scroff, curpos);
wins_doupdate (); wins_doupdate ();
if ((ch = wgetch (win)) == '\n') break; if ((ch = wgetch (win)) == '\n') break;
switch (ch) { switch (ch)
case KEY_BACKSPACE: /* delete one character */ {
case 330: case KEY_BACKSPACE: /* delete one character */
case 127: case 330:
case CTRL ('H'): case 127:
if (curpos > 0) { case CTRL ('H'):
del_char ((--curpos), str); if (curpos > 0)
len--; {
} del_char ((--curpos), str);
else bell (); len--;
break; }
case CTRL ('D'): /* delete next character */ else
if (curpos < len) { bell ();
del_char (curpos, str); break;
len--; case CTRL ('D'): /* delete next character */
} if (curpos < len)
else bell (); {
break; del_char (curpos, str);
case CTRL ('W'): /* delete a word */ len--;
if (curpos > 0) { }
while (curpos && str[curpos - 1] == ' ') { else
del_char ((--curpos), str); bell ();
len--; break;
case CTRL ('W'): /* delete a word */
if (curpos > 0) {
while (curpos && str[curpos - 1] == ' ')
{
del_char ((--curpos), str);
len--;
}
while (curpos && str[curpos - 1] != ' ')
{
del_char ((--curpos), str);
len--;
}
} }
while (curpos && str[curpos - 1] != ' ') { else
del_char ((--curpos), str); bell ();
len--; break;
} case CTRL ('K'): /* delete to end-of-line */
} str[curpos] = 0;
else bell (); len = curpos;
break; break;
case CTRL ('K'): /* delete to end-of-line */ case CTRL ('A'): /* go to begginning of string */
str[curpos] = 0; curpos = 0;
len = curpos; break;
break; case CTRL ('E'): /* go to end of string */
case CTRL ('A'): /* go to begginning of string */ curpos = len;
curpos = 0; break;
break; case KEY_LEFT: /* move one char backward */
case CTRL ('E'): /* go to end of string */ case CTRL ('B'):
curpos = len; if (curpos > 0) curpos--;
break; break;
case KEY_LEFT: /* move one char backward */ case KEY_RIGHT: /* move one char forward */
case CTRL ('B'): case CTRL ('F'):
if (curpos > 0) curpos--; if (curpos < len) curpos++;
break; break;
case KEY_RIGHT: /* move one char forward */ case ESCAPE: /* cancel editing */
case CTRL ('F'): return (GETSTRING_ESC);
if (curpos < len) curpos++; break;
break; default: /* insert one character */
case ESCAPE: /* cancel editing */ if (len < l - 1)
return (GETSTRING_ESC); {
break; ins_char ((curpos++), ch, str);
default: /* insert one character */ len++;
if (len < l - 1) { }
ins_char ((curpos++), ch, str); }
len++;
}
}
} }
custom_remove_attr (win, ATTR_HIGHEST); custom_remove_attr (win, ATTR_HIGHEST);
@ -383,12 +401,13 @@ updatestring (WINDOW *win, char **str, int x, int y)
ret = getstring (win, buf, BUFSIZ, x, y); ret = getstring (win, buf, BUFSIZ, x, y);
if (ret == GETSTRING_VALID) { if (ret == GETSTRING_VALID)
len = strlen (buf); {
*str = mem_realloc (*str, len + 1, 1); len = strlen (buf);
EXIT_IF (*str == 0, _("out of memory")); *str = mem_realloc (*str, len + 1, 1);
(void)memcpy (*str, buf, len + 1); EXIT_IF (*str == 0, _("out of memory"));
} (void)memcpy (*str, buf, len + 1);
}
mem_free (buf); mem_free (buf);
return ret; return ret;
@ -399,8 +418,10 @@ int
is_all_digit (char *string) is_all_digit (char *string)
{ {
for (; *string; string++) for (; *string; string++)
if (!isdigit ((int)*string)) {
return 0; if (!isdigit ((int)*string))
return 0;
}
return 1; return 1;
} }
@ -454,10 +475,11 @@ date_sec2date_str (long sec, char *datefmt)
if (sec == 0) if (sec == 0)
(void)snprintf (datestr, BUFSIZ, "0"); (void)snprintf (datestr, BUFSIZ, "0");
else { else
lt = localtime ((time_t *)&sec); {
strftime (datestr, BUFSIZ, datefmt, lt); lt = localtime ((time_t *)&sec);
} strftime (datestr, BUFSIZ, datefmt, lt);
}
return datestr; return datestr;
} }
@ -562,12 +584,15 @@ check_time (char *string)
int h, m; int h, m;
int ret = 0; int ret = 0;
if (min) { if (min)
h = atoi (hour); {
m = atoi (min); h = atoi (hour);
if (h >= 0 && h < 24 && m >= 0 && m < MININSEC) ret = 1; m = atoi (min);
} if (h >= 0 && h < 24 && m >= 0 && m < MININSEC)
else if (strlen(s) < 4 && is_all_digit(s) && atoi(s) > 0) ret = 2; ret = 1;
}
else if (strlen(s) < 4 && is_all_digit(s) && atoi(s) > 0)
ret = 2;
xfree(s); xfree(s);
return ret; return ret;
@ -775,62 +800,72 @@ parse_date (char *date_string, enum datefmt datefmt, int *year, int *month,
int in[3] = {0, 0, 0}, n = 0; int in[3] = {0, 0, 0}, n = 0;
int d, m, y; int d, m, y;
if (!date_string) return 0; if (!date_string)
return 0;
/* parse string into in[], read up to three integers */ /* parse string into in[], read up to three integers */
for (p = date_string; *p; p++) { for (p = date_string; *p; p++)
if (*p == sep) { {
if ((++n) > 2) return 0; if (*p == sep)
{
if ((++n) > 2)
return 0;
}
else if ((*p >= '0') && (*p <= '9'))
in[n] = in[n] * 10 + (int)(*p - '0');
else
return 0;
} }
else if ((*p >= '0') && (*p <= '9')) {
in[n] = in[n] * 10 + (int)(*p - '0');
}
else
return 0;
}
if ((!slctd_date && n < 2) || in[n] == 0) return 0; if ((!slctd_date && n < 2) || in[n] == 0)
return 0;
/* convert into day, month and year, depending on the date format */ /* convert into day, month and year, depending on the date format */
switch (datefmt) { switch (datefmt)
case DATEFMT_MMDDYYYY: {
m = in[n > 0 ? 0 : 1]; case DATEFMT_MMDDYYYY:
d = in[n > 0 ? 1 : 0]; m = in[n > 0 ? 0 : 1];
y = in[2]; d = in[n > 0 ? 1 : 0];
break; y = in[2];
case DATEFMT_DDMMYYYY: break;
d = in[0]; case DATEFMT_DDMMYYYY:
m = in[1]; d = in[0];
y = in[2]; m = in[1];
break; y = in[2];
case DATEFMT_YYYYMMDD: break;
case DATEFMT_ISO: case DATEFMT_YYYYMMDD:
y = in[0]; case DATEFMT_ISO:
m = in[n - 1]; y = in[0];
d = in[n]; m = in[n - 1];
break; d = in[n];
default: break;
return 0; default:
} return 0;
}
if (y > 0 && y < 100) { if (y > 0 && y < 100)
/* convert "YY" format into "YYYY" */ {
y += slctd_date->yyyy - slctd_date->yyyy % 100; /* convert "YY" format into "YYYY" */
} y += slctd_date->yyyy - slctd_date->yyyy % 100;
else if (n < 2) { }
/* set year and, optionally, month if short from is used */ else if (n < 2)
y = slctd_date->yyyy; {
if (n < 1) m = slctd_date->mm; /* set year and, optionally, month if short from is used */
} y = slctd_date->yyyy;
if (n < 1) m = slctd_date->mm;
}
/* check if date is valid, take leap years into account */ /* check if date is valid, take leap years into account */
if (y < 1902 || y > 2037 || m < 1 || m > 12 || d < 1 || if (y < 1902 || y > 2037 || m < 1 || m > 12 || d < 1 ||
d > days[m - 1] + (m == 2 && ISLEAP (y)) ? 1 : 0) d > days[m - 1] + (m == 2 && ISLEAP (y)) ? 1 : 0)
return 0; return 0;
if (year) *year = y; if (year)
if (month) *month = m; *year = y;
if (day) *day = d; if (month)
*month = m;
if (day)
*day = d;
return 1; return 1;
} }
@ -838,8 +873,10 @@ parse_date (char *date_string, enum datefmt datefmt, int *year, int *month,
void void
str_toupper (char *s) str_toupper (char *s)
{ {
if (!s) return; if (!s)
for (; *s; s++) *s = toupper (*s); return;
for (; *s; s++)
*s = toupper (*s);
} }
void void