Changeset bb65ccb3 in mainline for uspace/app/taskbar/clock.c

Timestamp:

2023-04-14T13:05:15Z (17 months ago)

Author:

GitHub <noreply@…>

Children:

00ef082

Parents:

4bfb5a0

git-author:

SimonJRiddix <69309548+simonjriddix@…> (2023-04-14 13:05:15)

git-committer:

GitHub <noreply@…> (2023-04-14 13:05:15)

Message:

add application launcher button & 12/24 h formats

taskbar with button to start the application launcher, 12/24 hour date formats have also been added.

File:

• uspace/app/taskbar/clock.c (modified) (5 diffs)

uspace/app/taskbar/clock.c

@@ -61 +61 @@
 };
 
+ClockFormat function_clock_format = american_clock_format;
+
+usec_t clock_refresh_seconds = 5 * 1000 * 1000;
+bool use_seconds = false;
+bool italian_format = true;
+
+void american_clock_format(struct tm time, char *buf, size_t bsize)
+{
+        if(time.tm_hour == 0)
+                snprintf(buf, bsize, "%02d:%02d PM", time.tm_hour, time.tm_min);
+        else if(time.tm_hour > 12)
+                snprintf(buf, bsize, "%02d:%02d PM", time.tm_hour % 12, time.tm_min);
+        else
+                snprintf(buf, bsize, "%02d:%02d AM", time.tm_hour, time.tm_min);
+}
+
+void american_seconds_clock_format(struct tm time, char *buf, size_t bsize)
+{
+        if(time.tm_hour == 0)
+                snprintf(buf, bsize, "%02d:%02d:%02d PM", time.tm_hour, time.tm_min, time.tm_sec);
+        else if(time.tm_hour > 12)
+                snprintf(buf, bsize, "%02d:%02d:%02d PM", time.tm_hour % 12, time.tm_min, time.tm_sec);
+        else
+                snprintf(buf, bsize, "%02d:%02d:%02d AM", time.tm_hour, time.tm_min, time.tm_sec);
+}
+
+void italian_clock_format(struct tm time, char *buf, size_t bsize)
+{
+        snprintf(buf, bsize, "%02d:%02d", time.tm_hour, time.tm_min);
+}
+
+void italian_seconds_clock_format(struct tm time, char *buf, size_t bsize)
+{
+        snprintf(buf, bsize, "%02d:%02d:%02d", time.tm_hour, time.tm_min, time.tm_sec);
+}
+
+void set_clock_format(void)
+{
+        if(italian_format)
+        {
+                function_clock_format = (use_seconds) ? italian_seconds_clock_format : italian_clock_format;
+        }
+        else
+        {
+                function_clock_format = (use_seconds) ? american_seconds_clock_format : american_clock_format;
+        }
+}
+
 /** Create task bar clock.
  *
@@ -71 +119 @@
         taskbar_clock_t *clock;
         errno_t rc;
+        
+        set_clock_format();
 
         clock = calloc(1, sizeof(taskbar_clock_t));
@@ -91 +141 @@
         fibril_mutex_initialize(&clock->lock);
         fibril_condvar_initialize(&clock->timer_done_cv);
-        fibril_timer_set(clock->timer, 1000000, taskbar_clock_timer, clock);
+        fibril_timer_set(clock->timer, clock_refresh_seconds, taskbar_clock_timer, clock);
 
         clock->window = window;
@@ -136 +186 @@
 {
         struct timespec ts;
-        struct tm tm;
+        struct tm time;
         errno_t rc;
 
         getrealtime(&ts);
-        rc = time_utc2tm(ts.tv_sec, &tm);
+        rc = time_utc2tm(ts.tv_sec, &time);
         if (rc != EOK)
                 return rc;
 
-        snprintf(buf, bsize, "%02d:%02d:%02d", tm.tm_hour, tm.tm_min,
-            tm.tm_sec);
+        function_clock_format(time, buf, bsize);
+        
         return EOK;
 }
@@ -327 +377 @@
 
         if (!clock->timer_cleanup) {
-                fibril_timer_set(clock->timer, 1000000, taskbar_clock_timer,
+                fibril_timer_set(clock->timer, clock_refresh_seconds, taskbar_clock_timer,
                     clock);
         } else {