Changeset bb65ccb3 in mainline

Timestamp:

2023-04-14T13:05:15Z (21 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.

Location:

uspace/app/taskbar

Files:

• clock.c (modified) (5 diffs)
• clock.h (modified) (1 diff)
• taskbar.c (modified) (6 diffs)
• types/taskbar.h (modified) (2 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 {

uspace/app/taskbar/clock.h

@@ -54 +54 @@
 extern void taskbar_clock_set_rect(taskbar_clock_t *, gfx_rect_t *);
 
+void american_clock_format(struct tm time, char *buf, size_t bsize);
+void american_seconds_clock_format(struct tm time, char *buf, size_t bsize);
+void italian_clock_format(struct tm time, char *buf, size_t bsize);
+void italian_seconds_clock_format(struct tm time, char *buf, size_t bsize);
+void set_clock_format(void);
+
+typedef void (*ClockFormat)(struct tm, char *, size_t);
+
 #endif
 

uspace/app/taskbar/taskbar.c

@@ -38 +38 @@
 #include <stdlib.h>
 #include <str.h>
+#include <str_error.h>
 #include <ui/fixed.h>
 #include <ui/label.h>
@@ -47 +48 @@
 #include "taskbar.h"
 #include "wndlist.h"
+#include <task.h>
+
+#define NAME  "taskbar"
+
+static const char *display_spec = UI_DISPLAY_DEFAULT;
+
+bool TaskLauncherIsOpen = false;
+task_id_t TaskLauncherid;
 
 static void taskbar_wnd_close(ui_window_t *, void *);
@@ -55 +64 @@
         .pos = taskbar_wnd_pos
 };
+
+static void buttonApps_clicked(ui_pbutton_t *, void *);
+
+static ui_pbutton_cb_t buttonApps_cb = {
+        .clicked = buttonApps_clicked
+};
+
+static int app_launchl(const char *, ...);
 
 /** Window close button was clicked.
@@ -129 +146 @@
         ui_wnd_params_init(&params);
         params.caption = "Task Bar";
-        params.placement = ui_wnd_place_bottom_left;
+        params.placement = ui_wnd_place_bottom_left_absolute;
 
         /* Window has no titlebar */
@@ -169 +186 @@
         }
 
-        rc = ui_label_create(ui_res, "HelenOS", &taskbar->label);
-        if (rc != EOK) {
-                printf("Error creating label.\n");
-                goto error;
-        }
+        rc = ui_pbutton_create(ui_res, "Apps", &taskbar->buttonApps);
+        if (rc != EOK) {
+                printf("Error creating Application Menu.\n");
+                goto error;
+        }
+        
+        ui_pbutton_set_cb(taskbar->buttonApps, &buttonApps_cb, NULL);
 
         ui_window_get_app_rect(taskbar->window, &rect);
         if (ui_is_textmode(taskbar->ui)) {
                 rect.p0.x += 1;
+                rect.p1.x = rect.p0.x + 71;
         } else {
                 rect.p0.x += 10;
-        }
-        ui_label_set_rect(taskbar->label, &rect);
-        ui_label_set_halign(taskbar->label, gfx_halign_left);
-        ui_label_set_valign(taskbar->label, gfx_valign_center);
-
-        rc = ui_fixed_add(taskbar->fixed, ui_label_ctl(taskbar->label));
-        if (rc != EOK) {
-                printf("Error adding control to layout.\n");
-                ui_label_destroy(taskbar->label);
+                rect.p1.x = rect.p0.x +70;
+        }
+        ui_pbutton_set_rect(taskbar->buttonApps, &rect);
+        ui_pbutton_set_default(taskbar->buttonApps, true);
+
+        rc = ui_fixed_add(taskbar->fixed, ui_pbutton_ctl(taskbar->buttonApps));
+        if (rc != EOK) {
+                printf("Error adding Application Menu control to layout.\n");
+                ui_pbutton_destroy(taskbar->buttonApps);
                 goto error;
         }
@@ -274 +294 @@
 }
 
+/** Application Menu was clicked.
+ *
+ * @param pbutton Application Menu button
+ * @param arg Argument
+ */
+static void buttonApps_clicked(ui_pbutton_t *pbutton, void *arg)
+{
+        //taskbar_t *taskbar = (taskbar_t *) arg;
+        
+        if(!TaskLauncherIsOpen)
+        {
+                if(app_launchl("/app/appslauncher", NULL) == EOK)
+                {
+                        /*if(ui_pbutton_set_caption(pbutton, "Close") != EOK)
+                                printf("Error changing entry text.\n");
+                        ui_pbutton_paint(pbutton);*/
+                }
+                else
+                {
+                        printf("Can't open launcher.\n");
+                        //return;
+                }
+        }
+        else
+        {
+                if (task_kill(TaskLauncherid) == EOK)
+                {
+                        /*if(ui_pbutton_set_caption(pbutton, "Apps") != EOK)
+                                printf("Error changing entry text.\n");
+                        ui_pbutton_paint(pbutton);*/
+                }
+                else
+                {
+                        printf("Can't kill launcher.\n");
+                }
+        }
+        
+        TaskLauncherIsOpen = !TaskLauncherIsOpen;
+}
+
+static int app_launchl(const char *app, ...)
+{
+        errno_t rc;
+        task_id_t id;
+        task_wait_t wait;
+        va_list ap;
+        const char *arg;
+        const char **argv;
+        const char **argp;
+        int cnt = 0;
+        int i;
+
+        va_start(ap, app);
+        do {
+                arg = va_arg(ap, const char *);
+                cnt++;
+        } while (arg != NULL);
+        va_end(ap);
+
+        argv = calloc(cnt + 4, sizeof(const char *));
+        if (argv == NULL)
+                return -1;
+
+        task_exit_t texit;
+        int retval;
+
+        argp = argv;
+        *argp++ = app;
+
+        if (str_cmp(display_spec, UI_DISPLAY_DEFAULT) != 0) {
+                *argp++ = "-d";
+                *argp++ = display_spec;
+        }
+
+        va_start(ap, app);
+        do {
+                arg = va_arg(ap, const char *);
+                *argp++ = arg;
+        } while (arg != NULL);
+        va_end(ap);
+
+        *argp++ = NULL;
+
+        printf("%s: Spawning %s", NAME, app);
+        for (i = 0; argv[i] != NULL; i++) {
+                printf(" %s", argv[i]);
+        }
+        printf("\n");
+
+        rc = task_spawnv(&id, &wait, app, argv);
+        if (rc != EOK) {
+                TaskLauncherid = -1;
+                printf("%s: Error spawning %s (%s)\n", NAME, app, str_error(rc));
+                return -1;
+        }
+        
+        TaskLauncherid = id;
+
+        rc = task_wait(&wait, &texit, &retval);
+        if ((rc != EOK) || (texit != TASK_EXIT_NORMAL)) {
+                printf("%s: Error retrieving retval from %s (%s)\n", NAME,
+                    app, str_error(rc));
+                return -1;
+        }
+
+        return retval;
+}
+
 /** @}
  */

uspace/app/taskbar/types/taskbar.h

@@ -39 +39 @@
 #include <types/common.h>
 #include <ui/fixed.h>
-#include <ui/label.h>
+#include <ui/pbutton.h>
 #include <ui/ui.h>
 #include <ui/window.h>
@@ -53 +53 @@
         /** Fixed layout */
         ui_fixed_t *fixed;
-        ui_label_t *label;
+        /** Taskbar Application Menu */
+        ui_pbutton_t *buttonApps;
         /** Window list */
         wndlist_t *wndlist;