diff --git a/taro-ctl.cr b/taro-ctl.cr index 1004890..9bb7dfa 100644 --- a/taro-ctl.cr +++ b/taro-ctl.cr @@ -123,7 +123,7 @@ module Taro end def list_mboxes - mailCmd ="mdirs ${MBOX_ROOT}" + mailCmd ="for x in $(mdirs ${MBOX_ROOT}); do echo ${x#$MBOX_ROOT/}; done" io = IO::Memory.new Process.run(mailCmd, shell: true, output: io) diff --git a/taro-ls.tal b/taro-ls.tal index 588f5a0..9a5b072 100644 --- a/taro-ls.tal +++ b/taro-ls.tal @@ -29,7 +29,7 @@ ( program ) -|0100 ( _> ) +|0100 ( -> ) ( theme ) #028d .System/r DEO2 @@ -47,7 +47,7 @@ ;on_stdin .Console/vector DEO2 BRK -@on_stdin ( _> ) +@on_stdin ( -> ) .decoding LDZ #01 EQU ,&must_decode JCN #01 .decoding STZ @@ -88,16 +88,16 @@ BRK BRK -@decode_inc_count ( __ current* ) +@decode_inc_count ( -- current* ) .decoding/processed LDZ2 INC2 DUP2 .decoding/processed STZ2 JMP2r -@decode_is_done ( __ bit ) +@decode_is_done ( -- bit ) #01 .list/update STZ .decoding/processed LDZ2 .decoding/count LDZ2 EQU2 JMP2r -@on_mouse ( _> ) +@on_mouse ( -> ) get_select_idx_by_mouse @@ -127,7 +127,7 @@ JMP2r &done BRK -@handle_rsz ( __ mousestate ) +@handle_rsz ( -- mousestate ) ( chk_x_rsz ) .Mouse/x DEI2 .Screen/width DEI2 #0002 SUB2 GTH2 ,&inc_x JCN @@ -160,7 +160,7 @@ BRK JMP2r -@on_screen ( _> ) +@on_screen ( -> ) .list/update LDZ #00 EQU ,&no_list JCN @@ -177,7 +177,7 @@ JMP2r BRK -@clear_fg ( _> ) +@clear_fg ( -> ) .Screen/width DEI2 #0000 &whilex EQU2k ,&endx JCN DUP2 ,&x STR2 @@ -194,7 +194,7 @@ JMP2r &x $2 &y $2 -@draw_resize_handle ( _> ) +@draw_resize_handle ( -> ) .Screen/width DEI2 #0008 SUB2 .Screen/x DEO2 .Screen/height DEI2 #0008 SUB2 .Screen/y DEO2 @@ -203,7 +203,7 @@ JMP2r JMP2r -@strlen ( addr __ len ) +@strlen ( addr -- len ) DUP2 &loop @@ -212,14 +212,14 @@ JMP2r JMP2r -@store_char ( char __ char ) +@store_char ( char -- char ) #00 .list/elem_offset LDZ ;word ADD2 STA .list/elem_offset LDZ INC .list/elem_offset STZ JMP2r -@shouldnt_draw_word ( __ flag ) +@shouldnt_draw_word ( -- flag ) .list/offset LDZ2 .list/top LDZ2 LTH2 ,&no JCN .list/offset LDZ2 .list/top LDZ2 #00 .list/height LDZ ADD2 #0001 SUB2 GTH2 ,&no JCN @@ -229,7 +229,7 @@ JMP2r #01 JMP2r -@draw_list_elem ( _> ) +@draw_list_elem ( -> ) ( ;get_entry_color JSR2 #0c NEQ ,&no_store_cart JCN ;store_cart JSR2 ) @@ -242,7 +242,7 @@ JMP2r JMP2r -@get_entry_color ( __ colorByte ) +@get_entry_color ( -- colorByte ) .list/offset LDZ2 .list/select_index LDZ2 @@ -255,7 +255,7 @@ JMP2r #03 JMP2r -@finish_line ( _> ) +@finish_line ( -> ) ;blank .Screen/addr DEO2 &while .Screen/x DEI2 @@ -269,7 +269,7 @@ JMP2r JMP2r -@draw_mail_list ( _> ) +@draw_mail_list ( -> ) #0000 .Screen/x DEO2 TOP_SECTION .Screen/y DEO2 @@ -307,7 +307,7 @@ JMP2r JMP2r -@draw_cursor ( _> ) +@draw_cursor ( -> ) .Mouse/x DEI2 .Screen/x DEO2 .Mouse/y DEI2 .Screen/y DEO2 @@ -316,15 +316,15 @@ JMP2r JMP2r -@print ( short* __ ) +@print ( short* -- ) SWP ,&byte JSR - &byte ( byte __ ) DUP #04 SFT ,&char JSR - &char ( char __ ) #0f AND DUP #09 GTH #27 MUL ADD #30 ADD #18 DEO + &byte ( byte -- ) DUP #04 SFT ,&char JSR + &char ( char -- ) #0f AND DUP #09 GTH #27 MUL ADD #30 ADD #18 DEO JMP2r -@print_str ( str* __ ) +@print_str ( str* -- ) &while LDAk #18 DEO @@ -333,7 +333,7 @@ JMP2r JMP2r -@get_select_idx_by_mouse ( _> ) +@get_select_idx_by_mouse ( -> ) .Mouse/scrolly DEI2 #0000 EQU2 ,&no_scroll JCN .Mouse/scrolly DEI2 #0001 EQU2 ,&scroll_down JCN @@ -363,7 +363,7 @@ JMP2r JMP2r -@try_scroll_up_mouse ( _> ) +@try_scroll_up_mouse ( -> ) .list/len LDZ2 #00 .list/height LDZ LTH2 ,&no_scroll_up JCN .list/top LDZ2 #0000 EQU2 ,&no_scroll_up JCN .list/top LDZ2 #0001 SUB2 .list/top STZ2 @@ -372,7 +372,7 @@ JMP2r &no_scroll_up JMP2r -@try_scroll_down_mouse ( _> ) +@try_scroll_down_mouse ( -> ) .list/len LDZ2 #00 .list/height LDZ LTH2 ,&no_scroll_down JCN .list/top LDZ2 #00 .list/height LDZ ADD2 .list/len LDZ2 EQU2 ,&no_scroll_down JCN .list/top LDZ2 INC2 .list/top STZ2 @@ -381,7 +381,7 @@ JMP2r &no_scroll_down JMP2r -@draw_scrollbar ( _> ) +@draw_scrollbar ( -> ) .Screen/width DEI2 #0008 SUB2 .Screen/x DEO2 TOP_SECTION .Screen/y DEO2 @@ -418,13 +418,13 @@ JMP2r JMP2r -@update_sb_pos ( _> ) +@update_sb_pos ( -> ) .list/top LDZ2 .sb/step LDZ2 DIV2 .sb/pos STZ2 JMP2r -@draw_str ( addr x y color __ ) +@draw_str ( addr x y color -- ) STH ( save color ) .Screen/y DEO2 ( set y )