Apple-2-SW/a2d
1
0
Fork 0
mirror of https://github.com/mi57730/a2d.git synced 2024-11-25 10:30:50 +00:00
Code Issues Projects Releases Wiki Activity

Add space prefix to file count, fix count pos

Browse Source
This commit is contained in:
Joshua Bell 2018-12-15 18:07:14 -08:00
parent bb11e91e33
commit ab7b6c884d
2 changed files with 74 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/desktop_aux.s
View File

@ -2916,7 +2916,7 @@ str_delete_locked_file:
PASCAL_STRING "This file is locked, do you want to delete it anyway ?"
LB16A: DEFINE_POINT 145, 59
LB16E: DEFINE_POINT 200, 59
LB16E: DEFINE_POINT 204, 59
LB172: DEFINE_POINT 300, 59
;; "New Folder" dialog strings

133
desktop/desktop_main.s
View File

@ -9104,6 +9104,64 @@ open: MLI_RELAY_CALL OPEN, open_params
load_dynamic_routine := load_dynamic_routine_impl::load
restore_dynamic_routine := load_dynamic_routine_impl::restore
;;; ============================================================
.proc show_clock
lda MACHID
and #1 ; bit 0 = clock card
beq done
MLI_RELAY_CALL GET_TIME, 0
lda TIMEHI ; hours
and #%00011111
;; AM/PM
ldx #'A'
cmp #12
bcc :+
ldx #'P'
sec
sbc #12
: stx str_clock + 7
;; Hours
cmp #0 ; 0 -> 12
bne :+
lda #12
: ldx #' ' ; Leading space or 1?
cmp #10
bcc :+
ldx #'1'
sec
sbc #10
: stx str_clock + 1 ; Tens place
ora #'0'
sta str_clock + 2 ; Ones place
;; Minutes
lda TIMELO
and #%00111111
ldx #0 ; Subtract off tens (in X)
: cmp #10
bcc :+
inx
sec
sbc #10
bpl :-
: ora #'0'
sta str_clock + 5 ; Ones place
txa
ora #'0'
sta str_clock + 4 ; Tens place
;; Assumes call from main loop, where grafport3 is initialized.
MGTK_RELAY_CALL MGTK::MoveTo, pos_clock
addr_call draw_text1, str_clock
done: rts
.endproc
;;; ============================================================
PAD_TO $8F00
;;; ============================================================
@ -14110,72 +14168,27 @@ saved_proc_buf:
.proc compose_file_count_string
ldax file_count
jsr int_to_string
jsr append_space_after_int
ldx str_from_int
: lda str_from_int,x
sta str_file_count,x
dex
bpl :-
ldy #1
copy #' ', str_file_count,y
ldx #0
: cpx str_from_int
beq :+
inx
iny
copy str_from_int,x, str_file_count,y
bne :-
: iny
copy #' ', str_file_count,y
sty str_file_count
rts
.endproc
;;; ============================================================
.proc show_clock
lda MACHID
and #1 ; bit 0 = clock card
beq done
MLI_RELAY_CALL GET_TIME, 0
lda TIMEHI ; hours
and #%00011111
;; AM/PM
ldx #'A'
cmp #12
bcc :+
ldx #'P'
sec
sbc #12
: stx str_clock + 7
;; Hours
cmp #0 ; 0 -> 12
bne :+
lda #12
: ldx #' ' ; Leading space or 1?
cmp #10
bcc :+
ldx #'1'
sec
sbc #10
: stx str_clock + 1 ; Tens place
ora #'0'
sta str_clock + 2 ; Ones place
;; Minutes
lda TIMELO
and #%00111111
ldx #0 ; Subtract off tens (in X)
: cmp #10
bcc :+
inx
sec
sbc #10
bpl :-
: ora #'0'
sta str_clock + 5 ; Ones place
txa
ora #'0'
sta str_clock + 4 ; Tens place
;; Assumes call from main loop, where grafport3 is initialized.
MGTK_RELAY_CALL MGTK::MoveTo, pos_clock
addr_call draw_text1, str_clock
done: rts
.endproc
PAD_TO $BE63
;;; ============================================================