Implement Responsive Client-Side Autoscaling

centrallix-lib/include/datatypes.h

@@ -28,12 +28,12 @@ typedef union _DT
         unsigned int    Second:6;
         unsigned int    Minute:6;
         unsigned int    Hour:5;
-        unsigned int    Day:5;
-        unsigned int    Month:4;
-        unsigned int    Year:12;
+        unsigned int    Day:5;   /* 1-based */
+        unsigned int    Month:4; /* 0-based */
+        unsigned int    Year:12; /* 1900-based: so 2002 is 102. */
         }
         Part;
-    long long		Value;
+    long long		Value; /* NOT seconds since the epoch! */
     }
     DateTime, *pDateTime;
 

centrallix-lib/include/qprintf.h

@@ -32,6 +32,15 @@
 
 #include <stdarg.h>
 
+/*** A function to grow a string buffer.
+ *** 
+ *** @param str    The string buffer being grown.
+ *** @param size   A pointer to the current size of the string buffer.
+ *** @param offset An offset up to which data must be preserved.
+ *** @param args   Arguments for growing the buffer.
+ *** @param req    The requested size.
+ ***/
+// typedef int (*qpf_grow_fn_t)(char** str, size_t* size, size_t offset, void* args, size_t req);
 typedef int (*qpf_grow_fn_t)(char**, size_t*, size_t, void*, size_t);
 
 typedef struct _QPS

centrallix-lib/include/util.h

@@ -30,5 +30,36 @@ extern "C" {
 }
 #endif
 
-#endif	/* UTILITY_H */
+/** TODO: ISRAEL - Remove these after the dups branch is merged. **/
+
+/*** @brief Returns the smaller of two values.
+ *** 
+ *** @param a The first value.
+ *** @param b The second value.
+ *** @return The smaller of the two values.
+ *** 
+ *** @note This macro uses GCC extensions to ensure type safety.
+ ***/
+#define min(a, b) \
+    ({ \
+    __typeof__ (a) _a = (a); \
+    __typeof__ (b) _b = (b); \
+    (_a < _b) ? _a : _b; \
+    })
 
+/*** @brief Returns the larger of two values.
+ *** 
+ *** @param a The first value.
+ *** @param b The second value.
+ *** @return The larger of the two values.
+ *** 
+ *** @note This macro uses GCC extensions to ensure type safety.
+ ***/
+#define max(a, b) \
+    ({ \
+    __typeof__ (a) _a = (a); \
+    __typeof__ (b) _b = (b); \
+    (_a > _b) ? _a : _b; \
+    })
+
+#endif	/* UTILITY_H */

centrallix-lib/src/cxsec.c

@@ -147,19 +147,22 @@ cxsecVerifySymbol_n(const char* sym, size_t n)
 	 ** significant security risks in the event of a locale mismatch!!
 	 **/
 	if (n <= 0 || (*sym != '_' && (*sym < 'A' || *sym > 'Z') && (*sym < 'a' || *sym > 'z')))
-	    return -1;
+	    goto err;
 	n--;
 
 	/** Next chars may be 1) end of string, 2) digits, 3) alpha, or 4) underscore **/
 	sym++;
 	while(n)
 	    {
 	    if (*sym != '_' && (*sym < 'A' || *sym > 'Z') && (*sym < 'a' || *sym > 'z') && (*sym < '0' || *sym > '9'))
-		return -1;
+		goto err;
 	    sym++;
 	    n--;
 	    }
 
-    return 0;
-    }
+	return 0;
 
+	err:
+	fprintf(stderr, "WARNING: '%s' (of length %lu) is not a valid symbol!\n", sym, n);
+	return -1;
+    }

centrallix-lib/src/qprintf.c

@@ -880,6 +880,14 @@ qpf_internal_Translate(pQPSession s, const char* srcbuf, size_t srcsize, char**
  *** change out from under this function to a new buffer if a realloc is
  *** done by the grow_fn function.  Do not store pointers to 'str'.  Go
  *** solely by offsets.
+ *** 
+ *** NULL, &(s->Tmpbuf), &(s->TmpbufSize), htr_internal_GrowFn, (void*)s, fmt, va
+ *** @param s Optional session struct.
+ *** @param str Pointer to a string buffer where data will be written.
+ *** @param size Pointer to the current size of the string buffer.
+ *** @param grow_fn A function to grow the string buffer.
+ *** @param format The format of data which should be written.
+ *** @param ap The arguments list to fulfill the provided format.
  ***/
 int
 qpfPrintf_va_internal(pQPSession s, char** str, size_t* size, qpf_grow_fn_t grow_fn, void* grow_arg, const char* format, va_list ap)
@@ -975,6 +983,12 @@ qpfPrintf_va_internal(pQPSession s, char** str, size_t* size, qpf_grow_fn_t grow
 		/** Simple specifiers **/
 		if (__builtin_expect(format[0] == '%', 0))
 		    {
+		    if (ignore)
+			{
+			format++;
+			continue;
+			}
+
 		    if (__builtin_expect(!nogrow, 1) && (__builtin_expect(cpoffset+2 <= *size, 1) || (grow_fn(str, size, cpoffset, grow_arg, cpoffset+2))))
 			(*str)[cpoffset++] = '%';
 		    else
@@ -987,6 +1001,12 @@ qpfPrintf_va_internal(pQPSession s, char** str, size_t* size, qpf_grow_fn_t grow
 		    }
 		else if (__builtin_expect(format[0] == '&',0))
 		    {
+		    if (ignore)
+			{
+			format++;
+			continue;
+			}
+
 		    if (__builtin_expect(!nogrow, 1) && (__builtin_expect(cpoffset+2 <= *size, 1) || (grow_fn(str, size, cpoffset, grow_arg, cpoffset+2))))
 			(*str)[cpoffset++] = '&';
 		    else
@@ -1448,5 +1468,3 @@ qpfRegisterExt(char* ext_spec, int (*ext_fn)(), int is_source)
 
     return;
     }
-
-

centrallix-os/apps/nav/default.tpl

@@ -5,7 +5,7 @@ default "widget/template"
 	{
 	bgcolor="#e0e0e0";
 	linkcolor="#0000ff";
-	font_name = "Arial";
+	font_name = "Arial, Helvetica, sans-serif";
 	font_size = 12;
 	icon = "/favicon.ico";
 	}

centrallix-os/samples/autoscale_test.app

@@ -0,0 +1,78 @@
+$Version=2$
+MyPage "widget/page"
+    {
+    title = "Responsive Testing Page";
+    bgcolor = "black";
+    textcolor = "#00f8ff";
+    width = 1000;
+    height = 1000;
+
+    auto "widget/hbox"
+	{
+	x=100; y=50; width=900; height=750;
+	spacing=20; row_height=300;
+	fl_width=100; fl_height=100;
+
+	pane0 "widget/pane" { fl_width=100; fl_height=100; width=190; height=180; bgcolor = "#9cf"; } // x=100; y=50;
+	pane1 "widget/pane" { fl_width=100; fl_height=100; width=130; height=180; bgcolor = "#ccc"; } // x=305; y=50;
+	pane2 "widget/pane" { fl_width=100; fl_height=100; width=80;  height=320; bgcolor = "#f99"; } // x=455; y=50;
+	pane3 "widget/pane" { fl_width=100; fl_height=100; width=150; height=140; bgcolor = "#9f9"; } // x=555; y=50;
+	pane4 "widget/pane" { fl_width=100; fl_height=100; width=90;  height=240; bgcolor = "#99f"; } // x=725; y=50;
+	pane5 "widget/pane" { fl_width=100; fl_height=100; width=230; height=100; bgcolor = "#ff9"; } // x=80;  y=390;
+	pane6 "widget/pane" { fl_width=100; fl_height=100; width=80;  height=200; bgcolor = "#f9f"; } // x=325; y=390;
+	pane7 "widget/pane" { fl_width=100; fl_height=100; width=170; height=220; bgcolor = "#9ff"; } // x=425; y=390;
+	pane8 "widget/pane" { fl_width=100; fl_height=100; width=110; height=200; bgcolor = "#fc9"; } // x=615; y=390;
+	pane9 "widget/pane" { fl_width=100; fl_height=100; width=130; height=120; bgcolor = "#cf9"; } // x=745; y=390;
+	}
+
+    // pane0 "widget/pane" { x=100; y=50;  width=190; height=180; bgcolor = "#9cf"; }
+    // pane1 "widget/pane" { x=305; y=50;  width=130; height=180; bgcolor = "#ccc"; }
+    // pane2 "widget/pane" { x=455; y=50;  width=80;  height=320; bgcolor = "#f99"; }
+    // pane3 "widget/pane" { x=555; y=50;  width=150; height=140; bgcolor = "#9f9"; }
+    // pane4 "widget/pane" { x=725; y=50;  width=90;  height=240; bgcolor = "#99f"; }
+    // pane5 "widget/pane" { x=80;  y=390; width=230; height=100; bgcolor = "#ff9"; }
+    // pane6 "widget/pane" { x=325; y=390; width=80;  height=200; bgcolor = "#f9f"; }
+    // pane7 "widget/pane" { x=425; y=390; width=170; height=220; bgcolor = "#9ff"; }
+    // pane8 "widget/pane" { x=615; y=390; width=110; height=200; bgcolor = "#fc9"; }
+    // pane9 "widget/pane" { x=745; y=390; width=130; height=120; bgcolor = "#cf9"; }
+
+    paneA "widget/pane" { x=40; y=680;  width=890; height=220; bgcolor = "#620"; }
+
+    // Outline the visible area. 
+    top_left0     "widget/pane" { x=0;   y=0;   width=10; height=10; bgcolor = "#f00"; }
+    top_right0    "widget/pane" { x=990; y=0;   width=10; height=10; bgcolor = "#ff0"; }
+    bottom_left0  "widget/pane" { x=0;   y=990; width=10; height=10; bgcolor = "#0f0"; }
+    bottom_right0 "widget/pane" { x=990; y=990; width=10; height=10; bgcolor = "#00f"; }
+
+    // Advance markers.
+    top_left1     "widget/pane" { x=100; y=100; width=10; height=10; fl_x=25; fl_y=25; fl_width=25; fl_height=25; bgcolor = "#a00"; }
+    top_right1    "widget/pane" { x=890; y=100; width=10; height=10; fl_x=25; fl_y=25; fl_width=25; fl_height=25; bgcolor = "#aa0"; }
+    bottom_left1  "widget/pane" { x=100; y=890; width=10; height=10; fl_x=25; fl_y=25; fl_width=25; fl_height=25; bgcolor = "#0a0"; }
+    bottom_right1 "widget/pane" { x=890; y=890; width=10; height=10; fl_x=25; fl_y=25; fl_width=25; fl_height=25; bgcolor = "#00a"; }
+
+    // Interior markers.
+    top_left2     "widget/pane" { x=250; y=250; width=10; height=10; fl_x=100; fl_y=100; fl_width=25; fl_height=25; bgcolor = "#700"; }
+    top_right2    "widget/pane" { x=740; y=250; width=10; height=10; fl_x=100; fl_y=100; fl_width=25; fl_height=25; bgcolor = "#770"; }
+    bottom_left2  "widget/pane" { x=250; y=740; width=10; height=10; fl_x=100; fl_y=100; fl_width=25; fl_height=25; bgcolor = "#070"; }
+    bottom_right2 "widget/pane" { x=740; y=740; width=10; height=10; fl_x=100; fl_y=100; fl_width=25; fl_height=25; bgcolor = "#007"; }
+
+    // Deep interior markers.
+    top_left3     "widget/pane" { x=400; y=400; width=10; height=10; fl_x=25; fl_y=25; fl_width=100; fl_height=100; bgcolor = "#500"; }
+    top_right3    "widget/pane" { x=590; y=400; width=10; height=10; fl_x=25; fl_y=25; fl_width=100; fl_height=100; bgcolor = "#550"; }
+    bottom_left3  "widget/pane" { x=400; y=590; width=10; height=10; fl_x=25; fl_y=25; fl_width=100; fl_height=100; bgcolor = "#050"; }
+    bottom_right3 "widget/pane" { x=590; y=590; width=10; height=10; fl_x=25; fl_y=25; fl_width=100; fl_height=100; bgcolor = "#005"; }
+
+    // Center marker.
+    center "widget/pane"
+	{
+	x=450; y=450; width=100; height=100; bgcolor = "orange";
+	centerer "widget/pane" { x=25; y=25; width=50; height=50; bgcolor = "purple"; } // Debug
+	}
+
+    button "widget/textbutton"
+	{
+	x = 450; y = 380; width = 100; height = 30; font_size=16; bgcolor="#0c0447ff";
+	text = "Resize";
+	connector "widget/connector" { event=Click; target=center; action=Resize; }
+	}
+    }

centrallix-os/samples/autoscale_test2.app

@@ -0,0 +1,19 @@
+$Version=2$
+MyPage "widget/page"
+    {
+    title = "Flex Testing Page";
+    bgcolor = "black";
+    textcolor = "#00f8ff";
+    width = 1000;
+    height = 1000;
+
+    box "widget/pane"
+        {
+        x=25; y=25; width=975; height=975; bgcolor = "#111";
+
+	// Note: fl_x and fl_y seem to be ignored.
+	standard "widget/pane" { x=100; y=100; width=100; height=100; fl_x=100; fl_y=100; fl_width=100; fl_height=100; bgcolor = "orange"; }
+	big      "widget/pane" { x=250; y=250; width=200; height=200; fl_x=10;  fl_y=50;  fl_width=10;  fl_height=10;  bgcolor = "purple"; }
+	double   "widget/pane" { x=500; y=500; width=200; height=200; fl_x=50;  fl_y=10;  fl_width=50;  fl_height=50;  bgcolor = "green";  }
+	}
+    }

centrallix-os/samples/clock.app

@@ -14,15 +14,13 @@ main "widget/page"
 	shadowx = 2;
 	shadowy = 2;
 	size=1;
-	moveable="true";
 	bold="true";
 	}
     clock2 "widget/clock"
 	{
 	background="/sys/images/fade_pixelate_01.gif";
 	x=15; y=55; width=80; height=20;
 	fgcolor1="white";
-	moveable="true";
 	bold="true";
 	}
     clock3 "widget/clock"
@@ -33,7 +31,6 @@ main "widget/page"
 	fgcolor1="orange";
 	fgcolor2="#666666";
 //	size=3;
-	moveable="true";
 	bold="true";
 	}
     }