BLACKBOX

Author: oddstream

.gitignore

@@ -9,7 +9,7 @@
             "name": "Heavy Debug",
             "type": "cppdbg",
             "request": "launch",
-            "program": "${workspaceFolder}/csol",
+            "program": "${workspaceFolder}/gomps4",
             "args": ["--nolerp","--noflip","--noload","-w","1024","--height","1024","Quick Win"],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
@@ -27,7 +27,7 @@
               "name": "Launch",
               "type": "cppdbg",
               "request":"launch",
-              "program":"${workspaceRoot}/csol",
+              "program":"${workspaceRoot}/gomps4",
               "miDebuggerPath": "/usr/bin/gdb",
             },
             "preLaunchTask": "build debug"
@@ -36,7 +36,7 @@
             "name": "Debug",
             "type": "cppdbg",
             "request": "launch",
-            "program": "${workspaceFolder}/csol",
+            "program": "${workspaceFolder}/gomps4",
             "args": ["--pack=default"],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
@@ -54,7 +54,7 @@
               "name": "Launch",
               "type": "cppdbg",
               "request":"launch",
-              "program":"${workspaceRoot}/csol",
+              "program":"${workspaceRoot}/gomps4",
               "miDebuggerPath": "/usr/bin/gdb",
             },
             "preLaunchTask": "build debug"
@@ -63,7 +63,7 @@
             "name": "Fallback",
             "type": "cppdbg",
             "request": "launch",
-            "program": "${workspaceFolder}/csol",
+            "program": "${workspaceFolder}/gomps4",
             "args": ["--variant=Fallback","--noload"],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
@@ -81,7 +81,7 @@
               "name": "Launch",
               "type": "cppdbg",
               "request":"launch",
-              "program":"${workspaceRoot}/csol",
+              "program":"${workspaceRoot}/gomps4",
               "miDebuggerPath": "/usr/bin/gdb",
             },
             "preLaunchTask": "build debug"
@@ -101,7 +101,7 @@
               "name": "Launch",
               "type": "cppdbg",
               "request":"launch",
-              "program":"${workspaceRoot}/csol",
+              "program":"${workspaceRoot}/gomps4",
               "miDebuggerPath": "/usr/bin/gdb"
             },
             "preLaunchTask": "build release",

.vscode/c_cpp_properties.json

@@ -16,6 +16,5 @@
         "raylib.h": "c",
         "typeinfo": "c",
         "string.h": "c",
-        "util.h": "c"
     }
 }

.vscode/launch.json

@@ -1,7 +1,7 @@
 # https://www.gnu.org/software/make/manual/make.html
 # make -recon
 
-PROJECT_NAME ?= csol
+PROJECT_NAME ?= gomps4
 BUILD_MODE ?= DEBUG
 EXECUTABLE ?= $(PROJECT_NAME)
 

.vscode/settings.json

@@ -175,7 +175,7 @@ void BaizeResetState(struct Baize *const self, struct Array *undoStack)
     }
     self->undoStack = undoStack ? undoStack : UndoStackNew();
 
-    self->savedPosition = 0;
+    self->bookmark = 0;
 
     self->touchedPile = NULL;
     self->touchedWidget = NULL;

.vscode/tasks.json

@@ -33,7 +33,7 @@ struct Baize {
 
     struct Array *tail;
     struct Array *undoStack;
-    size_t savedPosition;
+    size_t bookmark;
     Vector2 lastTouch;
     struct Pile *touchedPile;
 

Makefile

@@ -282,6 +282,7 @@ static void DrawUnicodeCard(struct Card *const self, struct Pack *const pack, _B
     DrawTextCodepoint(pack->unicodeFont, glyph, cpos, pack->width * pack->unicodeFontExpansion, cardColor);
 }
 
+#if 0
 static void DrawScaledCard(struct Card *const self, struct Pack *const pack, _Bool showFace)
 {
     static int suitSymbol[4] = {
@@ -313,6 +314,7 @@ static void DrawScaledCard(struct Card *const self, struct Pack *const pack, _Bo
         DrawRectangleRoundedLines(rc, pack->roundness, 9, 2.0f, (Color){192,192,192,255}); // Silver
     }
 }
+#endif
 
 void CardDraw(struct Card *const self)
 {
@@ -397,7 +399,7 @@ void CardDraw(struct Card *const self)
     } else if (pack->unicodeFont.baseSize) {
         DrawUnicodeCard(self, pack, showFace);
     } else {
-        DrawScaledCard(self, pack, showFace);
+        // DrawScaledCard(self, pack, showFace);
     }
 }
 

Makefile.Android

@@ -171,7 +171,7 @@ int main(int argc, char* argv[], char* envp[])
     //     fprintf(stderr, "%d:%d,%d\n", n, w, h);
     // }
 
-    InitWindow(640*2, 480*2, "Oddstream Solitaire");
+    InitWindow(640*2, 480*2, "Solitaire");
 
 #ifdef PLATFORM_DESKTOP
     if (windowWidth == 0 || windowHeight == 0) {

Makefile.old

@@ -28,19 +28,17 @@ struct StatusBar* StatusBarNew(void)
 
 void StatusBarLayoutWidgets(struct Container *const self)
 {
-    const float padding = (14.0f);
-
     size_t index;
     for ( struct Widget *w = ArrayFirst(self->widgets, &index); w; w = ArrayNext(self->widgets, &index) ) {
         switch (w->align) {
         case -1:
-            w->rect.x = 0.0f + padding;
+            w->rect.x = 0.0f + WIDGET_PADDING;
             break;
         case 0:
-            w->rect.x = (self->rect.width / 2.0f) - (w->rect.width / 2.0f);
+            w->rect.x = (self->rect.width - w->rect.width) / 2.0f;
             break;
         case 1:
-            w->rect.x = self->rect.width - w->rect.width - padding;
+            w->rect.x = self->rect.width - w->rect.width - WIDGET_PADDING;
             break;
         default:
             break;

array.c

@@ -23,7 +23,6 @@ struct TextWidget* TextWidgetNew(struct Container *parent, enum IconName frame,
         self->font = font;
         self->fontSize = fontSize;
         self->text = NULL;
-        self->mte = (Vector2){0};
     }
     return self;
 }
@@ -32,21 +31,24 @@ void TextWidgetSetText(struct TextWidget *const self, const char* text)
 {
     extern float fontSpacing;
 
-    if ( self->text ) {
+    if (self->text) {
         free(self->text);
         self->text = NULL;
     }
-    if ( text ) {
+    if (text) {
         self->text = UtilStrDup(text);
-        self->mte = MeasureTextEx(*(self->font), text, self->fontSize, fontSpacing);
-        if ( self->frame == NONE ) {
-            self->super.rect.width = self->mte.x;
-            self->super.rect.height = self->mte.y;
+        Vector2 mte = MeasureTextEx(*(self->font), self->text, self->fontSize, fontSpacing);
+        if (self->frame == NONE) {
+            self->super.rect.width = mte.x;
+            self->super.rect.height = mte.y;
         } else {
-            self->super.rect.width = ICON_SIZE + self->mte.x;
-            self->super.rect.height = ICON_SIZE + self->mte.y;
+            self->super.rect.width = ICON_SIZE + WIDGET_PADDING + mte.x;
+            self->super.rect.height = ICON_SIZE;
         }
     }
+    // the size of this widget has changed, so it needs to be repositioned in it's parent container
+    struct Widget *w = (struct Widget*)self;
+    w->parent->vtable->Layout(w->parent, GetScreenWidth(), GetScreenHeight());
 }
 
 void TextWidgetDraw(struct Widget *const self)
@@ -62,36 +64,51 @@ void TextWidgetDraw(struct Widget *const self)
     Vector2 pos;
     pos.x = con->rect.x + self->rect.x;
     pos.y = con->rect.y + self->rect.y;
+
+    // draw the icon, if there is one
     if ( tw->frame != NONE ) {
         extern struct Spritesheet *ssIcons;
-        Rectangle rectIcon = WidgetScreenRect(&(tw->super));
+        Rectangle rectIcon = WidgetScreenRect((struct Widget*)tw);
         rectIcon.width = ICON_SIZE;
         rectIcon.height = ICON_SIZE;
 
         if (!UtilRectangleWithinRectangle(rectIcon, con->rect)) {
+#ifdef _DEBUG
+            Rectangle r = WidgetScreenRect((struct Widget*)tw);
+            DrawRectangleLines(r.x, r.y, r.width, r.height, RED);
+#endif
             return;
         }
         if ( self->bcf && CheckCollisionPointRec(GetMousePosition(), WidgetScreenRect(self)) ) {
             rectIcon.x += 2.0f;
             rectIcon.y += 2.0f;
         }
         SpritesheetDraw(ssIcons, tw->frame, 1.0f, 0.0f, rectIcon);
-
-        pos.x += ICON_SIZE;
     }
+
+    // draw the text to the right of the icon
     if ( tw->text ) {
-        Rectangle rectText = WidgetScreenRect(&(tw->super));
-        if (!UtilRectangleWithinRectangle(rectText, con->rect)) {
-            return;
-        }
+        Rectangle rectText = WidgetScreenRect((struct Widget*)tw);
+
         if ( tw->frame != NONE ) {
+            pos.x += ICON_SIZE;
             pos.x += WIDGET_PADDING;
             pos.y += WIDGET_PADDING / 2.0f;//self->parent->rect.y + (ICON_SIZE / 2.0f) - (self->rect.height / 2.0f);
         }
+
+        if (!UtilRectangleWithinRectangle(rectText, con->rect)) {
+#ifdef _DEBUG
+            Rectangle r = WidgetScreenRect((struct Widget*)tw);
+            DrawRectangleLines(r.x, r.y, r.width, r.height, RED);
+#endif
+            return;
+        }
+
         if ( self->bcf && CheckCollisionPointRec(GetMousePosition(), WidgetScreenRect(self)) ) {
             pos.x += 2.0f;
             pos.y += 2.0f;
         }
+
         DrawTextEx(*(tw->font), tw->text, pos, tw->fontSize, fontSpacing, uiTextColor);
     }
 

array.h

@@ -2,10 +2,19 @@
 
 #include <stdio.h>
 
-#define CSOL_INFO(x, ...)       do{fprintf(stdout, "INFO: %s: " x "\n", __func__, ##__VA_ARGS__);}while(0)
+#define TERM_RED   "\x1B[31m"
+#define TERM_GRN   "\x1B[32m"
+#define TERM_YEL   "\x1B[33m"
+#define TERM_BLU   "\x1B[34m"
+#define TERM_MAG   "\x1B[35m"
+#define TERM_CYN   "\x1B[36m"
+#define TERM_WHT   "\x1B[37m"
+#define TERM_RESET "\x1B[0m"
+
+#define CSOL_INFO(x, ...)       do{fprintf(stdout, TERM_GRN "INFO: %s: " x "\n" TERM_RESET, __func__, ##__VA_ARGS__);}while(0)
 #ifdef _DEBUG
-#define CSOL_WARNING(x, ...)    do{fprintf(stderr, "\x1B[33mWARNING: %s: " x "\n", __func__, ##__VA_ARGS__);}while(0)
-#define CSOL_ERROR(x, ...)      do{fprintf(stderr, "\x1B[31mERROR: %s: " x "\n", __func__, ##__VA_ARGS__);}while(0)
+#define CSOL_WARNING(x, ...)    do{fprintf(stderr, TERM_YEL "WARNING: %s: " x "\n" TERM_RESET, __func__, ##__VA_ARGS__);}while(0)
+#define CSOL_ERROR(x, ...)      do{fprintf(stderr, TERM_RED "ERROR: %s: " x "\n" TERM_RESET, __func__, ##__VA_ARGS__);}while(0)
 #else
 #define CSOL_WARNING(x, ...)
 #define CSOL_ERROR(x, ...)

assets/Acme-Regular.ttf

@@ -47,14 +47,12 @@ struct WidgetVtable {
     void (*Update)(struct Widget *const self);
     void (*Draw)(struct Widget *const self);
     void (*Free)(struct Widget *const self);
-    // NotifyCallback
 };
 
 struct Widget {
     struct WidgetVtable *vtable;
     struct Container *parent;
     int align;  // alignment in parent container: left=-1, center=0, right=+1
-    // _Bool disabled;
     CommandFunction bcf;
     void* param;        // NULL, or a pointer to a block of memory, owned by the widget
     Rectangle rect;    // x, y relative to parent
@@ -80,7 +78,6 @@ struct TextWidget {
     Font *font;
     float fontSize;
     char *text;
-    Vector2 mte;    // cached result from MeasureTextEx()
 };
 
 struct TextWidget* TextWidgetNew(struct Container *parent, enum IconName frame, Font *font, float fontSize, int align, CommandFunction cf, void* param);