diff --git a/software/ugophy/gopher.asm b/software/ugophy/gopher.asm index 51fc134..bb0928d 100644 --- a/software/ugophy/gopher.asm +++ b/software/ugophy/gopher.asm @@ -109,7 +109,7 @@ reqErr call putStringZ xor a ld (connectionOpen), a - jp showPage + ret ; Load data to ram via gopher ; HL - data pointer @@ -184,6 +184,10 @@ openURI: call input + ld a, (iBuff) + or a + jp z, backToPage + ld b, 19 ld c, 0 call gotoXY @@ -206,7 +210,7 @@ openURI: ld bc, d_port call openPage jp showPage - ret + data_pointer defw #4000 data_recv defw 0 diff --git a/software/ugophy/main.asm b/software/ugophy/main.asm index 3366f96..effdd9a 100644 --- a/software/ugophy/main.asm +++ b/software/ugophy/main.asm @@ -46,8 +46,8 @@ wsLp halt connecting_wifi db 13, ' Connecting to WiFi', 13, 0 open_lbl db 'Opening connection to ', 0 -path db '/unomenu' - defs 247 +path db '/ncmenu' + defs 248 server db 'nihirash.net' defs 58 port db '70' diff --git a/software/ugophy/render.asm b/software/ugophy/render.asm index 511331b..9a594f2 100644 --- a/software/ugophy/render.asm +++ b/software/ugophy/render.asm @@ -24,18 +24,24 @@ controls: jr z, showLp cp 'q' - jr z, pageCursorUp + jp z, pageCursorUp cp 'a' - jr z, pageCursorDown + jp z, pageCursorDown cp 13 jp z, selectItem cp 'b' - jr z, historyBack + jp z, historyBack cp 'o' + jp z, pageScrollUp + + cp 'p' + jp z, pageScrollDn + + cp 'n' jp z, openURI jp showLp @@ -298,6 +304,9 @@ playMusic: ld bc, 322 ldir + ld hl, (show_offset) + push hl + ld hl, server_buffer ld de, file_buffer ld bc, port_buffer @@ -324,7 +333,16 @@ playLp: call #4008 call setTurbo4Mode - jp historyBack + + ld hl, server + ld de, path + ld bc, port + call openPage + + pop hl + ld (show_offset), hl + + jp backToPage findFnme: push hl @@ -571,10 +589,9 @@ findNextBlock: jp findNextBlock show_offset db 0 - display $ cursor_pos db 1 -head db " UGophy - ZX-UNO Gopher client v. 0.7b (c) Alexander Sharikhin", 13,0 +head db " UGophy - ZX-UNO Gopher client v. 0.7c (c) Alexander Sharikhin", 13,0 cleanLine db " ",0 playing db "Playing... Hold to stop!", 0