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

exit_calcurse() added and status_bar() modified to use wins_slctd()

Browse Source
This commit is contained in:
Frederic Culot 2007-07-23 19:26:38 +00:00
parent 9f4f274337
commit ab0cc2c606
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/utils.c
View File

@ -1,4 +1,4 @@
/* $calcurse: utils.c,v 1.31 2007/07/21 19:33:24 culot Exp $ */ /* $calcurse: utils.c,v 1.32 2007/07/23 19:26:38 culot Exp $ */
/* /*
* Calcurse - text-based organizer * Calcurse - text-based organizer
@ -42,6 +42,16 @@
static unsigned status_page; static unsigned status_page;
/* General routine to exit calcurse properly. */
void
exit_calcurse(void)
{
endwin();
erase();
calendar_stop_date_thread();
exit(EXIT_SUCCESS);
}
/* /*
* Print a message in the status bar. * Print a message in the status bar.
* Message texts for first line and second line are to be provided. * Message texts for first line and second line are to be provided.
@ -383,8 +393,9 @@ border_nocolor(WINDOW *window)
* utils.h, depending on which panel the added keybind is assigned to. * utils.h, depending on which panel the added keybind is assigned to.
*/ */
void void
status_bar(int which_pan) status_bar(void)
{ {
window_e which_pan;
int cmd_length, space_between_cmds, start, end, i, j = 0; int cmd_length, space_between_cmds, start, end, i, j = 0;
const int pos[NB_PANELS + 1] = const int pos[NB_PANELS + 1] =
{0, NB_CAL_CMDS, NB_CAL_CMDS + NB_APP_CMDS, TOTAL_CMDS}; {0, NB_CAL_CMDS, NB_CAL_CMDS + NB_APP_CMDS, TOTAL_CMDS};
@ -434,6 +445,7 @@ status_bar(int which_pan)
/* Drawing the keybinding with attribute and label without. */ /* Drawing the keybinding with attribute and label without. */
erase_status_bar(); erase_status_bar();
which_pan = wins_slctd();
start = pos[which_pan] + 2*CMDS_PER_LINE*(status_page - 1); start = pos[which_pan] + 2*CMDS_PER_LINE*(status_page - 1);
end = MIN(start + 2*CMDS_PER_LINE, pos[which_pan + 1]); end = MIN(start + 2*CMDS_PER_LINE, pos[which_pan + 1]);
for (i = start; i < end; i += 2) { for (i = start; i < end; i += 2) {

5
src/utils.h
View File

@ -1,4 +1,4 @@
/* $calcurse: utils.h,v 1.20 2007/07/21 19:33:24 culot Exp $ */ /* $calcurse: utils.h,v 1.21 2007/07/23 19:26:38 culot Exp $ */
/* /*
* Calcurse - text-based organizer * Calcurse - text-based organizer
@ -53,6 +53,7 @@ typedef struct { /* structure defining a keybinding */
char *label; char *label;
} binding_t; } binding_t;
void exit_calcurse(void);
void status_mesg(char *, char *); void status_mesg(char *, char *);
void erase_status_bar(void); void erase_status_bar(void);
void erase_window_part(WINDOW *, int, int, int, int); void erase_window_part(WINDOW *, int, int, int, int);
@ -67,7 +68,7 @@ int updatestring(WINDOW *, char **, int, int);
int is_all_digit(char *); int is_all_digit(char *);
void border_color(WINDOW *); void border_color(WINDOW *);
void border_nocolor(WINDOW *); void border_nocolor(WINDOW *);
void status_bar(int); void status_bar(void);
long date2sec(date_t, unsigned, unsigned); long date2sec(date_t, unsigned, unsigned);
char *date_sec2hour_str(long); char *date_sec2hour_str(long);
char *date_sec2date_str(long); char *date_sec2date_str(long);