Skip to content
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.

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

Added 'concice' option #44

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ usage : tty-clock [-iuvsScbtrahDBxn] [-C [0-7]] [-f format] [-d delay] [-a nsdel
-B Enable blinking colon
-d delay Set the delay between two redraws of the clock. Default 1s.
-a nsdelay Additional delay between two redraws in nanoseconds. Default 0ns.
-m Disable margin, removing unused space around the clock.
6 changes: 6 additions & 0 deletions tty-clock.1
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ Switch time output to the 12\-hour format.
.TP
Q
Quit.
.TP
M
Toggles margin around the clock.
.SH "OPTIONS"
.LP
.TP
Expand Down Expand Up @@ -110,6 +113,9 @@ Set the delay (in seconds) between two redraws of the clock. Default 1s.
.TP
\fB\-a\fR \fInsdelay\fR
Additional delay (in nanoseconds) between two redraws of the clock. Default 0ns.
.TP
\fB\-m\fR
Disable margin, removing unused space around the clock.
.SH "EXAMPLES"
.LP
To invoke
Expand Down
51 changes: 38 additions & 13 deletions ttyclock.c
Original file line number Diff line number Diff line change
Expand Up @@ -252,21 +252,25 @@ draw_clock(void)
ttyclock.geo.h);
}

/* x and y origin - top left corner of the clock */
int xorigin = ttyclock.option.nomargin && !ttyclock.option.box ? 0 : 1;
int yorigin = ttyclock.option.nomargin && !ttyclock.option.box ? 0 : 1;

/* Draw hour numbers */
draw_number(ttyclock.date.hour[0], 1, 1);
draw_number(ttyclock.date.hour[1], 1, 8);
draw_number(ttyclock.date.hour[0], yorigin, xorigin);
draw_number(ttyclock.date.hour[1], yorigin, xorigin + 7);
chtype dotcolor = COLOR_PAIR(1);
if (ttyclock.option.blink && time(NULL) % 2 == 0)
dotcolor = COLOR_PAIR(2);

/* 2 dot for number separation */
wbkgdset(ttyclock.framewin, dotcolor);
mvwaddstr(ttyclock.framewin, 2, 16, " ");
mvwaddstr(ttyclock.framewin, 4, 16, " ");
mvwaddstr(ttyclock.framewin, yorigin + 1, xorigin + 15, " ");
mvwaddstr(ttyclock.framewin, yorigin + 3, xorigin + 15, " ");

/* Draw minute numbers */
draw_number(ttyclock.date.minute[0], 1, 20);
draw_number(ttyclock.date.minute[1], 1, 27);
draw_number(ttyclock.date.minute[0], yorigin, xorigin + 19);
draw_number(ttyclock.date.minute[1], yorigin, xorigin + 26);

/* Draw the date */
if (ttyclock.option.bold)
Expand All @@ -277,7 +281,7 @@ draw_clock(void)
if (ttyclock.option.date)
{
wbkgdset(ttyclock.datewin, (COLOR_PAIR(2)));
mvwprintw(ttyclock.datewin, (DATEWINH / 2), 1, "%s", ttyclock.date.datestr);
mvwprintw(ttyclock.datewin, yorigin + (DATEWINH / 2) - 1, xorigin, "%s", ttyclock.date.datestr);
wrefresh(ttyclock.datewin);
}

Expand All @@ -286,12 +290,12 @@ draw_clock(void)
{
/* Again 2 dot for number separation */
wbkgdset(ttyclock.framewin, dotcolor);
mvwaddstr(ttyclock.framewin, 2, NORMFRAMEW, " ");
mvwaddstr(ttyclock.framewin, 4, NORMFRAMEW, " ");
mvwaddstr(ttyclock.framewin, yorigin + 1, xorigin + NORMFRAMEW - 1, " ");
mvwaddstr(ttyclock.framewin, yorigin + 3, xorigin + NORMFRAMEW - 1, " ");

/* Draw second numbers */
draw_number(ttyclock.date.second[0], 1, 39);
draw_number(ttyclock.date.second[1], 1, 46);
draw_number(ttyclock.date.second[0], yorigin, xorigin + 38);
draw_number(ttyclock.date.second[1], yorigin, xorigin + 45);
}

return;
Expand Down Expand Up @@ -402,6 +406,9 @@ set_box(bool b)
{
ttyclock.option.box = b;

if (ttyclock.option.nomargin)
clock_move(ttyclock.geo.x, ttyclock.geo.y, ttyclock.geo.w, ttyclock.geo.h);

wbkgdset(ttyclock.framewin, COLOR_PAIR(0));
wbkgdset(ttyclock.datewin, COLOR_PAIR(0));

Expand All @@ -420,6 +427,15 @@ set_box(bool b)
wrefresh(ttyclock.framewin);
}

void
set_nomargin(bool b)
{
ttyclock.option.nomargin = b;
clock_move(ttyclock.geo.x, ttyclock.geo.y, ttyclock.geo.w, ttyclock.geo.h);

return;
}

void
key_event(void)
{
Expand Down Expand Up @@ -533,6 +549,11 @@ key_event(void)
set_box(!ttyclock.option.box);
break;

case 'm':
case 'M':
set_nomargin(!ttyclock.option.nomargin);
break;

case '0': case '1': case '2': case '3':
case '4': case '5': case '6': case '7':
i = c - '0';
Expand Down Expand Up @@ -569,7 +590,7 @@ main(int argc, char **argv)

atexit(cleanup);

while ((c = getopt(argc, argv, "iuvsScbtrhBxnDC:f:d:T:a:")) != -1)
while ((c = getopt(argc, argv, "miuvsScbtrhBxnDC:f:d:T:a:")) != -1)
{
switch(c)
{
Expand All @@ -594,7 +615,8 @@ main(int argc, char **argv)
" -D Hide date \n"
" -B Enable blinking colon \n"
" -d delay Set the delay between two redraws of the clock. Default 1s. \n"
" -a nsdelay Additional delay between two redraws in nanoseconds. Default 0ns.\n");
" -a nsdelay Additional delay between two redraws in nanoseconds. Default 0ns.\n"
" -m Disable margin, removing unused space around the clock.\n");
exit(EXIT_SUCCESS);
break;
case 'i':
Expand Down Expand Up @@ -668,6 +690,9 @@ main(int argc, char **argv)
case 'n':
ttyclock.option.noquit = true;
break;
case 'm':
ttyclock.option.nomargin = true;
break;
}
}

Expand Down
1 change: 1 addition & 0 deletions ttyclock.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ typedef struct
long delay;
bool blink;
long nsdelay;
bool nomargin;
} option;

/* Clock geometry */
Expand Down