~rabbits/potato

325083af9dbde3c39e27e67e75b026ed4b98c8f0 — Devine Lu Linvega 8 months ago f450d33 main
Fixed label collision
5 files changed, 26 insertions(+), 35 deletions(-)

M README.md
M src/apps.tal
M src/desktop.tal
M src/manifest.tal
M src/potato.tal
M README.md => README.md +3 -2
@@ 37,8 37,9 @@ The wallpaper is an invisible file called `.wallpaper` in the working directory,
- Change cursor icon on alt mod for drag.
- Fix mouse picking issue in Play app.
- Terminal.
- Text Reader scrollbar should be clickable
- Hex Viewer
- Remove scrollbar in text editor and add line numbers.
- Hex Viewer.
- `.wallpaper` should open as Picture.

## Support


M src/apps.tal => src/apps.tal +5 -3
@@ 1,3 1,5 @@


@size-apps-start ( @|about )




@@ 569,12 571,12 @@
		play-note [ LIT2 00 -Mouse/state ] DEO
		get-active-win !<draw-win>
	&zoomin ( -- )
		;app-play/on-draw/zoom LDA2 #0001 EQU2 ?&skip
		;app-play/on-draw/zoom LDA2 #0001 SUB2 ;app-play/on-draw/zoom STA2
		;app-play/zoom LDA2 #0001 EQU2 ?&skip
		;app-play/zoom LDA2 #0001 SUB2 ;app-play/zoom STA2
		get-active-win <draw-win>
		&skip JMP2r
	&zoomout ( -- )
		;app-play/on-draw/zoom LDA2 INC2 ;app-play/on-draw/zoom STA2
		;app-play/zoom LDA2 INC2 ;app-play/zoom STA2
		get-active-win !<draw-win>

@app-play/manifest ( * )

M src/desktop.tal => src/desktop.tal +1 -5
@@ 1,10 1,6 @@


@size-desktop-start


@manifest
	05 "Potato $1
@manifest 05 "Potato $1
	( > ) 01 "1 =open-about "About $1
	( > ) 01 "t =open-tile "Wallpaper $1
	( > ) 01 "k =open-color "Theme $1

M src/manifest.tal => src/manifest.tal +10 -11
@@ 52,7 52,8 @@
	untrap ;<draw-menu>/sel LDA DUP #ff EQU ?{
		DUP #00 <draw-sub>
		#ff ;<draw-menu>/sel STA
		<redraw-all> <draw-menu> }
		<redraw-all>
		<draw-menu> }
	POP JMP2r

@<menu-select> ( cat -- )


@@ 64,7 65,8 @@
	( unselected ) DUP #ff EQU ?{ DUP #00 <draw-sub> }
	POP
	( | draw )
	<redraw-all> #ff ;<draw-sub>/sel STA
	<redraw-all>
	#ff ;<draw-sub>/sel STA
	DUP ;<draw-menu>/sel STA
	#ff <draw-sub>
	!<draw-menu>


@@ 161,8 163,7 @@
		INC GTHk ?&loop
	POP2
	( | mix )
	DUP #00 NEQ STHr #00 NEQ #0101 NEQ2 ?{
		LIT "+ ;&buf sput }
	DUP #00 NEQ STHr #00 NEQ #0101 NEQ2 ?{ LIT "+ ;&buf sput }
	( | key )
	DUP #08 NEQ ?{ ;&bsp !&cat }
	DUP #09 NEQ ?{ ;&tab !&cat }


@@ 171,8 172,7 @@
	DUP #1b NEQ ?{ ;&esc !&cat }
	DUP #7f NEQ ?{ ;&del !&cat }
	DUP ;&buf sput &end POP ;&buf JMP2r
	&buf $8
	&buttons "ABsSUDLR $1
	&buf $8 &buttons "ABsSUDLR $1
	&cat ;&buf scat !&end
	&bsp "bsp $1
	&tab "tab $1


@@ 191,7 191,8 @@
	[ LIT2 &manifest =manifest ]
	&cat ( -- )
		#0b0a [ LIT2 &sel ff &id $1 ] EQU [ JMP SWP POP ] ;<draw-chr>/color STA
		INC2k <draw-text> #20 <draw-chr>
		INC2k <draw-text>
		#20 <draw-chr>
		skip-sub ,&id LDR INC ,&id STR
		LDAk ?&cat
	POP2 JMP2r


@@ 291,11 292,9 @@
(
@|assets )

@hand-icn
	2020 20b8 7c7c 3838
@hand-icn 2020 20b8 7c7c 3838

@blank-icn
	0000 0000 0000 0000
@blank-icn 0000 0000 0000 0000

~src/assets.tal


M src/potato.tal => src/potato.tal +7 -14
@@ 9,8 9,7 @@
|a0 @File &vector $2 &success $2 &stat $2 &delete $1 &append $1 &name $2 &length $2 &read $2 &write $2
|b0 @Disk &vector $2 &success $2 &stat $2 &delete $1 &append $1 &name $2 &length $2 &read $2 &write $2
|c0 @DateTime &year $2 &month $1 &day $1 &hour $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1

|0000
|000

	@cursor &color $1
	@sel &win $1


@@ 19,17 18,15 @@
	@bounds $2
	@dir $40
	( calendar )

	@year $2
	@month $1

|0100
|100

@on-reset ( -> )


@size-system-start
	;meta #06 DEO2
@size-system-start ;meta #06 DEO2
	( | theme )
	#500f .System/r DEO2
	#b70f .System/g DEO2


@@ 110,14 107,12 @@
	;buf/dir DUP2 .File/read DEO2
	( remove linebreaks )
	&w ( -- )
		LDAk #0a NEQ ?{
			STH2k #00 STH2r STA }
		LDAk #0a NEQ ?{ STH2k #00 STH2r STA }
		INC2 LDAk ?&w
	POP2 JMP2r

@<set-dir> ( path* -- )
	has-active-paths ?{
		;dir scpy #00 !<sel-icon> }
	has-active-paths ?{ ;dir scpy #00 !<sel-icon> }
	POP2 JMP2r

@push-dir ( path* -- )


@@ 131,8 126,7 @@
		;dir ;dict/home-ext scmp ?&skip
		;dir DUP2 scap/
		&l ( -- )
			LDAk LIT "/ EQU ?{
				#0001 SUB2 LTH2k ?&l }
			LDAk LIT "/ EQU ?{ #0001 SUB2 LTH2k ?&l }
		NIP2 #00 ROT ROT STA
		&skip POP2 #00 !<sel-icon> }
	POP2 JMP2r


@@ 592,8 586,7 @@
	;&buf shex <draw-dec>
	#20 <draw-chr>
	;dict/bytes !<draw-text>
	&buf $5
	&no-size .Screen/y DEI2k #0010 SUB2 ROT DEO2
	&buf $5 &no-size .Screen/y DEI2k #0010 SUB2 ROT DEO2
	.Screen/x DEI2k #0020 ADD2 ROT DEO2
	#0005 ADD2 !<draw-text>