Add %o to print for Bool, some graphics work, add copy to FileMgr

Author: Slapparoo

05-HomeKeyPlugIns.ZC

@@ -58,7 +58,7 @@ Bool MyPutKey(I64 ch, I64 sc)
 						return TRUE;
                 }
 		}
-	}
+	}
 
 	if (sc & SCF_ALT && !(sc & SCF_CTRL))
 	{

08-Display.DD

@@ -140,7 +140,7 @@ U0 FontEd()
 	  if (0 <= k < FONT_WIDTH*FONT_HEIGHT) {
 	    if (mouse.lb||msg_code==MESSAGE_MS_L_DOWN)
 	      Bts(&fp[cur_ch * FONT_HEIGHT],k);
-	    if (mouse.rb||msg_code==MESSAGE_MS_R_DOWN)
+	    if (mouse.rb||msg_code==MESSAGE_MS_R_DOWN)
 	      Btr(&fp[cur_ch * FONT_HEIGHT],k);
 	  }
 	  break;

Demo/Graphics/FontEd_8x12.ZC

@@ -52,6 +52,12 @@ $FG,2$"%Z"$FG$ $LK,"DefineListLoad",A="MN:DefineListLoad"$() subentry.	Pass sub_
 $FG,2$"%Q"$FG$ convert "\" to "\\" and quote to backslash quote. (For use in creating strs in strs.)
 
 $FG,2$"%q"$FG$ rev a $FG,2$"%Q"$FG$.
+
+$FG,2$"%x"$FG$ Hex number.
+ 
+$FG,2$"%b"$FG$ Binary number$FG$.
+
+$FG,2$"%o"$FG$ Bool$FG$.
 $ID,-2$
 
 $FG,5$$TX+CX,"Print Family"$$FG$

Doc/Print.DD

@@ -71,7 +71,7 @@ SYS_FRAMEBUFFER_LIST::	DU8	sizeof(CVideoInfo) * VBE_MODES_NUM	DUP(0);
 //REQUESTED_SCREEN_WIDTH:		DU16	1024;
 //REQUESTED_SCREEN_HEIGHT:	DU16	768;
 REQUESTED_SCREEN_WIDTH:		DU16	1280;
-REQUESTED_SCREEN_HEIGHT:	DU16	1024;
+REQUESTED_SCREEN_HEIGHT:	DU16	1024;
 
 VBE_TEMP_MODE:		DU8 	sizeof(CVBEMode)	DUP(0);
 VBE_INFO:			DU8 	sizeof(CVBEInfo)	DUP(0);

Kernel/KGlobals.ZC

@@ -47,9 +47,9 @@ extern class CTask;
 #define F64_MAX 	(0x7FEFFFFFFFFFFFFF(F64))
 #define F64_MIN 	(0xFFEFFFFFFFFFFFFF(F64))
 #define inf 		(0x7FF0000000000000(F64))
-#define � 			(0x7FF0000000000000(F64))
+#define ì 			(0x7FF0000000000000(F64))
 #define pi			(0x400921FB54442D18(F64))
-#define � 			(0x400921FB54442D18(F64))
+#define ã 			(0x400921FB54442D18(F64))
 #define exp_1 		(0x4005BF0A8B145769(F64)) //The number "e"
 #define log2_10 	(0x400A934F0979A371(F64))
 #define log2_e		(0x3FF71547652B82FE(F64))
@@ -1690,7 +1690,7 @@ public class CAutoCompleteDictGlobals
 #define OPTf_KEEP_PRIVATE 			7
 #define OPTf_NO_REG_VAR 			8	//Applied to functions, not statements
 #define OPTf_GLOBALS_ON_DATA_HEAP 	9
-//Disable 10-byte float consts for �,log2_10,log10_2,loge_2
+//Disable 10-byte float consts for ã,log2_10,log10_2,loge_2
 #define OPTf_NO_BUILTIN_CONST 		10	//Applied to functions, not statements
 #define OPTf_USE_IMM64				11	//Not completely implemented
 #define OPTf_DECIMAL_ONLY			12	//Only allow decimal numbers (no 0x or 0b prefixed numbers)
@@ -2703,7 +2703,7 @@ class CPCIDev
 //Physical Region Descriptor Table
 #define AHCI_PRD_MAX_BYTES		(4 * 1024 * 1024) //Max bytes that can go in one PRD entry ($ER$4 MiB). Section 4.2.3.3 Fig. 17 (DBC) 
 #define AHCI_PRDT_MAX_BLOCKS	(U16_MAX + 1) 	  //Max blocks you can transfer in one command. 
-#define AHCI_PRDT_MAX_LEN		8 				  //Max PRD entries in one command. This is equal to (MAX_BLOCKS * BLK_SIZE) � MAX_BYTES.
+#define AHCI_PRDT_MAX_LEN		8 				  //Max PRD entries in one command. This is equal to (MAX_BLOCKS * BLK_SIZE) ö MAX_BYTES.
 
 //Global Host Control (Controller) flags
 #define AHCI_GHCf_HBA_RESET			0
@@ -3642,7 +3642,7 @@ public class CDevGlobals
 #define ROPF_PROBABILITY_DITHER 	0x80000000
 
 #help_index "Graphics/Color"
-#define TRANSPARENT32	0xFF000000
+#define TRANSPARENT32	0xFF000000  // one bit is probably better than all bits
 #define TRANSPARENT		0xFF
 #define BLACK 			0
 #define BLUE			1
@@ -3682,7 +3682,7 @@ public U32 class CBGR24
 };
 public U32 class CBGR32
 {
-	U8		b, g, r, a;
+	U8		blue, green, red, rop;
 };
 public I64 class CBGR48
 {
@@ -4394,6 +4394,72 @@ public class CDC
     U8				bitsPerPixel; // 4 (legacy) or 32, 4 is stored in mem as U8 
 };
 
+public class CDC32
+{// equal to CDC except the: 
+// * Color 
+// * CDC's 
+// Dither etc but the size should be ==
+	U0				 start;
+	CDate			 cdt;
+	I32				 x0, y0,
+					 width, width_internal,
+					 height,
+					 flags;
+	U0				 end;
+	CBGR24			 palette[COLORS_NUM];
+
+	//public (Change directly)
+	CBGR32	 		color,
+					 bkcolor, //Set for use with $LK,"ROP_COLLISION",A="MN:ROP_COLLISION"$
+					 color2; //Internally used for $LK,"GrFloodFill",A="MN:GrFloodFill"$()
+	CD3I32			 ls; //Light source (should be normalized to 65536).
+
+	//dither_probability_i16 is basically a U16.
+	//It is activated by $LK,"ROPF_PROBABILITY_DITHER",A="MN:ROPF_PROBABILITY_DITHER"$.
+	// a positive value will make things lighter
+    // a negitive value will make things darker
+    // it only needs to be U8 
+	//See $LK,"::/Demo/Graphics/SunMoon.ZC"$ and	$LK,"::/Demo/Graphics/Shading.ZC"$.
+	I64				 dither_probability_i16;
+
+	CDC32			*brush;
+
+	//Set with $LK,"DCMat4x4Set",A="MN:DCMat4x4Set"$().  $LK,"Free",A="MN:Free"$() before setting.
+	I64				*r, //rotation matrix of quads decimal in lo
+					 r_norm; //shifted 32 bits.	Used for scaling thick
+
+	//public (Change directly)
+	I32				 x, y, z,
+					 thick;
+
+	//Can be changed from the default $LK,"DCTransform",A="MN:DCTransform"$()
+	U0			   (*transform)(CDC32 *dc, I64 *x, I64 *y, I64 *z);
+
+	//Can be changed from the default $LK,"DCLighting",A="MN:DCLighting"$()
+	U0			   (*lighting)(CDC32 *dc, CD3I32 *p1, CD3I32 *p2, CD3I32 *p3, CBGR32 color);
+
+	//Set by $LK,"DCSymmetrySet",A="MN:DCSymmetrySet"$() or $LK,"DCSymmetry3Set",A="MN:DCSymmetry3Set"$()
+	CGrSym			 sym;
+
+	I32				 cur_x, cur_y, cur_z, pad;
+	I64				 collision_count;
+
+	I64				 nearest_dist,
+					 min_x, max_x, min_y, max_y; //Set by $LK,"DCF_RECORD_EXTENTS",A="MN:DCF_RECORD_EXTENTS"$ (screen coordinates)
+
+	U32				 dc_signature, pad;
+	CTask			*mem_task, *win_task;
+	CDC32				*alias;
+	U32				*body;
+
+	//Set by $LK,"DCDepthBufAlloc",A="MN:DCDepthBufAlloc"$()
+	I32				*depth_buf;
+	I64				 db_z; //private
+#assert !($$ & 7)
+    U8				bitsPerPixel; // 4 (legacy) or 32, 4 is stored in mem as U8 
+};
+
+
 #define "Char/Input;StdIn"
 //StrGet flags
 #define SGF_SHIFT_ESC_EXIT			1 //This kills task on <SHIFT-ESC>
@@ -4555,6 +4621,20 @@ class CProgress
 #define PRINTF_NEG_AUX_FORMAT_NUM	0x800
 
 // toggle whether DoDoc inserts the cusrsor position at save
-#define DD_INSERT_CURSOR 1
+#define DD_NO_INSERT_CURSOR 		1
+
+#help_index "Package Manager"
+class CInstallerPackage {
+	U8* name;
+	U8* version;
+	U8* dependancies;
+	U8* url;
+	U8* addFiles;
+	U8* removeFiles;
+	U8* description;
+    Bool rebuildKernel;
+	Bool rebuildCompiler;
+	Bool reboot;
+};
 
-#help_index ""
+#help_index ""

Kernel/KStart16.ZC

@@ -268,7 +268,7 @@ U8 sys_font_std_8x12[256*12]= {
 0x00,0x00,0x1E,0x30,0x1C,0x06,0x3E,0x00,0x00,0x00,0x00,0x00,//�
 0x00,0x00,0x00,0x00,0x3C,0x3C,0x3C,0x3C,0x00,0x00,0x00,0x00,//�
 0x00,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00,0x00,//�
-};
+};
 // https://www.zap.org.au/projects/console-fonts-distributed/psftx-centos-7.5/lat0-12.psfu
 U8 sys_font_lat0_8x12[256*12]={
 0x7e, 0xc3, 0x99, 0x99, 0xcf, 0xe7, 0xe7, 0xff, 0xe7, 0xe7, 0x7e, 0x00, // 0x00 

Kernel/KernelA.HH

@@ -438,6 +438,11 @@ to avoid this.
 							throw('StrPrint');
 						ptr = argv[cur_arg++];
 						break;
+					case 'o': // Bool
+						if (cur_arg >= argc)
+							throw('StrPrint');
+						if (argv[cur_arg++]) ptr = "TRUE"; else ptr = "FALSE";
+						break;
 
 					case 'S':
 						if (cur_arg >= argc)

Kernel/Lib/FontStd8x12.ZC

@@ -329,6 +329,47 @@ U0 FMRename(CDoc *doc)
 	}
 }
 
+U0 FMCopyFile(CDoc *doc)
+{
+	CEdFileName	 fn;
+	CDocEntry	*doc_e = doc->cur_entry;
+	CDirEntry	*tmpde = NULL, *parent;
+
+	if (doc_e->type_u8 == DOCT_MENU_VAL)
+	{
+		tmpde = doc_e->user_data;
+		if (parent = tmpde->parent)
+		{
+			Cd(parent->full_name);
+			StrCopy(fn.name, tmpde->name);
+			if (DocForm(&fn))
+			{
+				Silent;
+				Copy(tmpde->name, fn.name);
+				Silent(OFF);
+			}
+		}
+	}
+	else if (doc_e->type_u8 == DOCT_TREE)
+	{
+		tmpde = doc_e->user_data;
+		if (parent = tmpde->parent)
+		{
+			Cd(parent->full_name);
+			StrCopy(fn.name, tmpde->name);
+			if (DocForm(&fn))
+			{
+				if (StrCompare(tmpde->name, fn.name))
+				{
+					Silent;
+					CopyTree(tmpde->name, fn.name);
+					Silent(OFF);
+				}
+			}
+		}
+	}
+}
+
 U0 FMMkDir(CDoc *doc)
 {
 	CEdFileName	 fn;
@@ -588,6 +629,7 @@ U0 FMCopy(CDoc *doc)
 #define FMR_MAKE_ISO9660		11
 #define FMR_BURN_ISO			12
 #define FMR_HELP				13
+#define FMR_COPY				14
 
 I64 PopUpFMRight(U8 *header=NULL, U8 *footer=NULL)
 {
@@ -610,8 +652,11 @@ I64 PopUpFMRight(U8 *header=NULL, U8 *footer=NULL)
 					"$$CM+LX,1,3 $$$$BT,\"MAKE ISO.C (CD/DVD) FILE\",LE=FMR_MAKE_REDSEA_ISO_C$$"
 					"$$CM+LX,29,0$$$$BT,\"MAKE ISO (CD/DVD) FILE  \",LE=FMR_MAKE_ISO9660$$"
 					"$$CM+LX,1,3 $$$$BT,\"BURN ISO (CD/DVD) FILE  \",LE=FMR_BURN_ISO$$"
-					"$$CM+LX,29,0$$$$BT,\"HELP                    \",LE=FMR_HELP$$"
-					"$$CM+LX,1,3 $$$$BT,\"CANCEL                  \",LE=DOCM_CANCEL$$\n");
+					"$$CM+LX,29,0$$$$BT,\"COPY FILE               \",LE=FMR_COPY$$"
+					"$$CM+LX,1,3 $$$$BT,\"HELP                    \",LE=FMR_HELP$$"
+					"$$CM+LX,29,0$$$$BT,\"CANCEL                  \",LE=DOCM_CANCEL\n$$"
+
+);
 
 	if (footer)
 		DocPrint(doc, "%s", footer);
@@ -677,6 +722,10 @@ U0 FMRightClick()
 			Message(MESSAGE_KEY_DOWN, 'B', 0);
 			break;
 
+		case FMR_COPY:
+			Message(MESSAGE_KEY_DOWN, 'C', 0);
+			break;
+
 		case FMR_HELP:
 			PopUpEd("::/Doc/FileMgr.DD");
 			break;
@@ -841,6 +890,10 @@ public U8 *FileMgr(I64 mode=FM_NORMAL, CTask *mem_task=NULL)
 							FMRename(doc);
 							break;
 
+						case 'C':
+							FMCopyFile(doc);
+							break;
+
 						case 'd':
 							FMMkDir(doc);
 							break;