add second toggle

clock.c

@@ -58,7 +58,13 @@ static const long number[10][LGNUM] = {
 };
 
 char *meridiem;
+
+char *cols;
+char *lines;
+
 int SCHANGE = 19;
+int maxcol;
+int maxlin;
 int hour[2];
 int min[2];
 int sec[2];
@@ -66,6 +72,7 @@ int mday;
 int mon;
 int year;
 
+int temp_dp;
 int defx=1;
 int defy=1;
 int bg = COLOR_BLACK;
@@ -89,7 +96,7 @@ start(void) {
 	 bg = -1;
 	 init_pair(1,COLOR_BLACK, COLOR_GREEN);
 	 init_pair(2, bg, bg);
-	 init_pair(3,COLOR_GREEN, COLOR_BLACK);
+	 init_pair(3,COLOR_GREEN, bg);
 
 	 curs_set(0);
 }
@@ -138,25 +145,9 @@ arrange_clock(int h1, int h2,
 			  int m1, int m2, 
 			  int s1, int s2) {
 	int i;
-	int temp_dp;
 
 	temp_dp = (enable_sec) ? 21 : 12;
 
-	for(i = defy + DEPTHB; i < defy + YLENGTH - SCHANGE; ++i){
-		 mvaddch(defx + DEPTHB, i, ACS_HLINE);
-		 mvaddch(defx + XLENGTH, i,ACS_HLINE);
-	}
-
-	for (i = defx + DEPTHB; i < defx + XLENGTH; ++i){
-		 mvaddch(i, defy + DEPTHB, ACS_VLINE);
-		 mvaddch(i, defy + YLENGTH - SCHANGE, ACS_VLINE);
-	}
-	 
-	mvaddch(defx + DEPTHB, defy + DEPTHB, ACS_ULCORNER);
-	mvaddch(defx + XLENGTH, defy + DEPTHB, ACS_LLCORNER);
-	mvaddch(defx + DEPTHB, defy + YLENGTH - SCHANGE, ACS_URCORNER);
-	mvaddch(defx + XLENGTH, defy + YLENGTH - SCHANGE, ACS_LRCORNER);
-
 	print_number(h1, defx, defy);
 	print_number(h2, defx, defy + 7);
 	 
@@ -170,7 +161,7 @@ arrange_clock(int h1, int h2,
 
 	print_number(m1, defx, defy + 19);
 	print_number(m2, defx, defy + 26);
-	
+
 	if(enable_sec){
 		
 		 attron(COLOR_PAIR(1));
@@ -181,7 +172,23 @@ arrange_clock(int h1, int h2,
 		 print_number(s1, defx, defy + 38);
 		 print_number(s2, defx, defy + 45);
 	 }
-		
+
+	for(i = defy + DEPTHB; i < defy + YLENGTH - SCHANGE; ++i){
+		 mvaddch(defx + DEPTHB, i, ACS_HLINE);
+		 mvaddch(defx + XLENGTH, i,ACS_HLINE);
+	}
+
+	for (i = defx + DEPTHB; i < defx + XLENGTH; ++i){
+		 mvaddch(i, defy + DEPTHB, ACS_VLINE);
+		 mvaddch(i, defy + YLENGTH - SCHANGE, ACS_VLINE);
+	}
+	 
+	mvaddch(defx + DEPTHB, defy + DEPTHB, ACS_ULCORNER);
+	mvaddch(defx + XLENGTH, defy + DEPTHB, ACS_LLCORNER);
+	mvaddch(defx + DEPTHB, defy + YLENGTH - SCHANGE, ACS_URCORNER);
+	mvaddch(defx + XLENGTH, defy + YLENGTH - SCHANGE, ACS_LRCORNER);
+
+	
 	move(defx + XLENGTH + 1,defy + temp_dp);
  	attron(COLOR_PAIR(3));
 	printw("%d/%d/%d",mday,mon,year);
@@ -210,8 +217,8 @@ check_key(void) {
 		case KEY_DOWN:
 		case 'j':
 		case 'J':
-			++defx;
-			clear();
+				++defx;
+				clear();
 			break;
 		case KEY_LEFT:
 		case 'h':
@@ -224,8 +231,20 @@ check_key(void) {
 		case KEY_RIGHT:	 
 		case 'l':
 		case 'L':
-			++defy;
-			clear();
+				++defy;
+				clear();
+			break;
+		case 's':
+		case 'S':
+			if(!enable_sec){
+				SCHANGE = 0;
+				clear();
+				enable_sec = 1;
+			} else {
+				SCHANGE = 19;
+				clear();
+				enable_sec = 0;
+			}
 			break;
 		case 'q':
 		case 'Q':
@@ -295,8 +314,8 @@ run(void) {
 
 int 
 main(int argc,char **argv) {
-	 int c;
-	 
+	int c;
+
 	static struct option long_options[] ={
 		{"help",	 0, NULL, 'h'},
 		{"version", 0, NULL, 'v'},