[UI] Display the current date and time in menu bar

Author: cyring

corefreq-cli-rsc-en.h

@@ -1533,6 +1533,7 @@
 #define RSC_MENU_ITEM_MENU_CODE_EN		"     [F2] Menu          "
 #define RSC_MENU_ITEM_VIEW_CODE_EN		"     [F3] View          "
 #define RSC_MENU_ITEM_WINDOW_CODE_EN		"    [F4] Window         "
+#define RSC_MENU_ITEM_DATE_TIME_CODE_EN		"[F2] %x %k:%M:%S"
 #define RSC_MENU_ITEM_SETTINGS_CODE_EN		" Settings           [s] "
 #define RSC_MENU_ITEM_SMBIOS_CODE_EN		" SMBIOS data        [B] "
 #define RSC_MENU_ITEM_KERNEL_CODE_EN		" Kernel data        [k] "

corefreq-cli-rsc-fr.h

@@ -911,6 +911,7 @@ do echo -en "$h$l\t""\xc3""\x$h$l""\t"; done; done;echo
 #define RSC_MENU_ITEM_MENU_CODE_FR        "     [F2] Menu          "
 #define RSC_MENU_ITEM_VIEW_CODE_FR        "     [F3] Vue           "
 #define RSC_MENU_ITEM_WINDOW_CODE_FR      "    [F4] Fen""\xaa""tre        "
+#define RSC_MENU_ITEM_DATE_TIME_CODE_FR   RSC_MENU_ITEM_DATE_TIME_CODE_EN
 #define RSC_MENU_ITEM_SETTINGS_CODE_FR    " R""\xa9""glages           [s] "
 #define RSC_MENU_ITEM_SMBIOS_CODE_FR      " Infos SMBIOS       [B] "
 #define RSC_MENU_ITEM_KERNEL_CODE_FR      " Infos Noyau        [k] "

corefreq-cli-rsc-theme-dflt.h

@@ -1739,6 +1739,12 @@
 	LKW,LKW,LKW,LKW,LKW, LKW, LKW,LKW,LKW,LKW,LKW,LKW		\
 }
 
+#define RSC_MENU_ITEM_DATE_TIME_THM_DFLT_ATTR				\
+{									\
+	HKW,_LKW,_LKW,HKW,LKW,LKW,LKW,LKW,LKW,LKW,LKW,LKW,		\
+	LKW, LKW, LKW,LKW,LKW,LKW,LKW,LKW,LKW,LKW,LKW,LKW		\
+}
+
 #define RSC_CREATE_MENU_FN_KEY_THM_DFLT_ATTR				\
 {									\
 	LKW,LKW,LKW,LKW,LKW,LKW,LKW,LKW, LKW,LKW,LKW,LKW,		\

corefreq-cli-rsc-theme-usr1.h

@@ -1739,6 +1739,12 @@
 	LKM,LKM,LKM,LKM,LKM, LKM, LKM,LKM,LKM,LKM,LKM,LKM		\
 }
 
+#define RSC_MENU_ITEM_DATE_TIME_THM_USR1_ATTR				\
+{									\
+	HKM,_LKM,_LKM,HKM,LKM,LKM,LKM,LKM,LKM,LKM,LKM,LKM,		\
+	LKM, LKM, LKM,LKM,LKM,LKM,LKM,LKM,LKM,LKM,LKM,LKM		\
+}
+
 #define RSC_CREATE_MENU_FN_KEY_THM_USR1_ATTR				\
 {									\
 	LKM,LKM,LKM,LKM,LKM,LKM,LKM,LKM, LKM,LKM,LKM,LKM,		\

corefreq-cli-rsc-theme-usr2.h

@@ -1739,6 +1739,12 @@
 	LWK,LWK,LWK,LWK,LWK, LWK, LWK,LWK,LWK,LWK,LWK,LWK		\
 }
 
+#define RSC_MENU_ITEM_DATE_TIME_THM_USR2_ATTR				\
+{									\
+	HKW,_LWK,_LWK,HKW,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,		\
+	LWK, LWK, LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK		\
+}
+
 #define RSC_CREATE_MENU_FN_KEY_THM_USR2_ATTR				\
 {									\
 	LWK,LWK,LWK,LWK,LWK,LWK,LWK,LWK, LWK,LWK,LWK,LWK,		\

corefreq-cli-rsc.c

@@ -285,6 +285,7 @@ DEF_LDB(RSC_CREATE_MENU_DISABLE);
 DEF_LDB(RSC_MENU_ITEM_MENU);
 DEF_LDB(RSC_MENU_ITEM_VIEW);
 DEF_LDB(RSC_MENU_ITEM_WINDOW);
+DEF_LDB(RSC_MENU_ITEM_DATE_TIME);
 DEF_LDB(RSC_CREATE_MENU_FN_KEY);
 DEF_LDB(RSC_CREATE_MENU_SHORTKEY);
 DEF_LDB(RSC_CREATE_MENU_CTRL_KEY);
@@ -1447,6 +1448,7 @@ RESOURCE_ST Resource[] = {
 	LDS(RSC_MENU_ITEM_MENU),
 	LDS(RSC_MENU_ITEM_VIEW),
 	LDS(RSC_MENU_ITEM_WINDOW),
+	LDS(RSC_MENU_ITEM_DATE_TIME),
 	LDT(RSC_MENU_ITEM_SETTINGS),
 	LDT(RSC_MENU_ITEM_SMBIOS),
 	LDT(RSC_MENU_ITEM_KERNEL),

corefreq-cli-rsc.h

@@ -1250,6 +1250,7 @@ enum {
 	RSC_MENU_ITEM_MENU,
 	RSC_MENU_ITEM_VIEW,
 	RSC_MENU_ITEM_WINDOW,
+	RSC_MENU_ITEM_DATE_TIME,
 	RSC_MENU_ITEM_SETTINGS,
 	RSC_MENU_ITEM_SMBIOS,
 	RSC_MENU_ITEM_KERNEL,

corefreq-cli.c

@@ -7452,15 +7452,19 @@ void ForEachCellPrint_Menu(Window *win, void *plist)
 void TOD_Refresh(TGrid *grid, DATA_TYPE data[])
 {
 	size_t timeLength;
-	char timeString[8];
+	char timeString[RSZ(MENU_ITEM_MENU) + 1];
 	struct tm *brokTime, localTime;
+
 	time_t currTime = time(NULL);
 	brokTime = localtime_r(&currTime, &localTime);
-	timeLength = strftime(timeString, MIN_WIDTH, "%k:%M", brokTime);
-	if ((timeLength > 0) && (timeLength <= 5)) {
-		memcpy(&grid->cell.item[grid->cell.length - timeLength],
-			timeString, timeLength);
-	}
+
+	timeLength = strftime(	timeString, RSZ(MENU_ITEM_MENU) + 1,
+			(char*) RSC(MENU_ITEM_DATE_TIME).CODE(), brokTime );
+
+    if ((timeLength > 0) && (timeLength <= RSZ(MENU_ITEM_MENU))) {
+	memcpy(grid->cell.item, timeString, timeLength);
+	memcpy(grid->cell.attr, RSC(MENU_ITEM_DATE_TIME).ATTR(), timeLength);
+    }
 }
 
 Window *CreateMenu(unsigned long long id, CUINT matrixSelectCol)
@@ -7473,16 +7477,16 @@ Window *CreateMenu(unsigned long long id, CUINT matrixSelectCol)
     if (wMenu != NULL)
     {
 /* Top Menu */
+      GridCall(
 	StoreTCell(wMenu, SCANKEY_NULL, RSC(MENU_ITEM_MENU).CODE(),
-					RSC(MENU_ITEM_MENU).ATTR());
+					RSC(MENU_ITEM_MENU).ATTR()),
+		TOD_Refresh);
 
 	StoreTCell(wMenu, SCANKEY_NULL, RSC(MENU_ITEM_VIEW).CODE(),
 					RSC(MENU_ITEM_VIEW).ATTR());
 
-      GridCall(
 	StoreTCell(wMenu, SCANKEY_NULL, RSC(MENU_ITEM_WINDOW).CODE(),
-					RSC(MENU_ITEM_WINDOW).ATTR()),
-		TOD_Refresh);
+					RSC(MENU_ITEM_WINDOW).ATTR());
 /* Row  1 */
 	StoreTCell(wMenu, SCANKEY_F1,	RSC(MENU_ITEM_KEYS).CODE(),
 					RSC(CREATE_MENU_FN_KEY).ATTR());