Changeset 211fd68 in mainline for uspace/app/barber/barber.c

Timestamp:

2024-03-08T10:41:31Z (10 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

0a411bbf

Parents:

cd27cd1

git-author:

Jiri Svoboda <jiri@…> (2024-03-07 18:41:21)

git-committer:

Jiri Svoboda <jiri@…> (2024-03-08 10:41:31)

Message:

Add text mode support to Barber

File:

• uspace/app/barber/barber.c (modified) (12 diffs)

uspace/app/barber/barber.c

@@ -50 +50 @@
 #include <ui/image.h>
 #include "images.h"
+#include "images_tiny.h"
 
 #define NAME  "barber"
@@ -60 +61 @@
 #define MIN_LOAD  (LOAD_UNIT / 4)
 #define MAX_LOAD  (LOAD_UNIT / 3)
-
-#define FRAME_WIDTH   59
-#define FRAME_HEIGHT  192
 
 #define LED_PERIOD  1000000
@@ -97 +95 @@
 static unsigned int frame = 0;
 static unsigned int fps = MIN_FPS;
+static gfx_coord_t frame_width;
+static gfx_coord_t frame_height;
 
 static void led_timer_callback(void *);
@@ -119 +119 @@
 }
 
-static bool decode_frames(gfx_context_t *gc)
+static bool decode_frames(gfx_context_t *gc, image_t *img)
 {
         gfx_rect_t rect;
@@ -125 +125 @@
 
         for (unsigned int i = 0; i < FRAMES; i++) {
-                rc = decode_tga_gz(gc, images[i].addr, images[i].size,
+                rc = decode_tga_gz(gc, img[i].addr, img[i].size,
                     &frame_bmp[i], &rect);
                 if (rc != EOK) {
@@ -132 +132 @@
                 }
 
-                (void) rect;
+                (void)rect;
         }
 
@@ -238 +238 @@
         rect.p0.x = 0;
         rect.p0.y = 0;
-        rect.p1.x = FRAME_WIDTH;
-        rect.p1.y = FRAME_HEIGHT;
+        rect.p1.x = frame_width;
+        rect.p1.y = frame_height;
 
         ui_image_set_bmp(frame_img, frame_bmp[frame], &rect);
@@ -299 +299 @@
 int main(int argc, char *argv[])
 {
-        const char *display_spec = UI_DISPLAY_DEFAULT;
+        const char *display_spec = UI_ANY_DEFAULT;
         barber_t barber;
         ui_t *ui;
@@ -310 +310 @@
         gfx_context_t *gc;
         gfx_coord2_t off;
+        image_t *img;
         int i;
 
@@ -355 +356 @@
         }
 
+        if (ui_is_textmode(ui)) {
+                frame_width = 10;
+                frame_height = 16;
+        } else {
+                frame_width = 59;
+                frame_height = 192;
+        }
+
         rect.p0.x = 0;
         rect.p0.y = 0;
-        rect.p1.x = FRAME_WIDTH;
-        rect.p1.y = FRAME_HEIGHT;
+        rect.p1.x = frame_width;
+        rect.p1.y = frame_height;
 
         ui_wnd_params_init(&params);
@@ -367 +376 @@
          * to rect
          */
-        ui_wdecor_rect_from_app(params.style, &rect, &wrect);
+        ui_wdecor_rect_from_app(ui, params.style, &rect, &wrect);
         off = wrect.p0;
         gfx_rect_rtranslate(&off, &wrect, &params.rect);
@@ -384 +393 @@
         ui_window_set_cb(window, &window_cb, (void *) &barber);
 
-        if (!decode_frames(gc))
+        img = ui_is_textmode(ui) ? image_tinys : images;
+
+        if (!decode_frames(gc, img))
                 return 1;