Selector: Ellipsify long paths in "Copying to RAMCard..." dialog

Fixes #867.

Author: inexorabletash

RELEASE-NOTES.md

@@ -49,6 +49,7 @@ Project Page: https://github.com/a2stuff/a2d
 ### Selector
 
 * Prevent crash after alert is shown from File > Run a Program... ([#832](https://github.com/a2stuff/a2d/issues/832))
+* Ellipsify long paths in "Copying to RAMCard..." dialog. ([#867](https://github.com/a2stuff/a2d/issues/867))
 
 ### Disk Copy
 

res/notes/testplan.md

@@ -1236,6 +1236,7 @@ Prerequisite: In DeskTop, Apple Menu > Control Panels > Options, check Show Shor
 * Configure a shortcut for a program with many associated files to copy to RAMCard "at first use". Invoke the shortcut. Verify that the files are copied to the RAMCard, and that the program starts correctly. Return to Shortcuts by quitting the program. Eject the disk containing the program. Invoke the shortcut. Verify that the program starts correctly.
 * Configure a shortcut for a folder (or another target type that can't be run outside of DeskTop, e.g. an image or desk accessory) to copy to RAMCard "at first use". Invoke the shortcut. When the "Unable to run the program." alert is shown, verify that the list of shortcuts renders correctly. Click OK. Verify that the list of shortcuts renders correctly.
 * Configure a shortcut for a program with many associated files to copy to RAMCard "at first use". Invoke the shortcut. While the program's files are being copied to RAMCard, press Escape to cancel. Verify that not all of the files were copied to the RAMCard. Invoke the shortcut again. Verify that the files are copied to the RAMCard and that the program starts correctly.
+* Configure a shortcut for a program with a long path to copy to RAMCard "at first use". Invoke the shortcut. Verify that long paths do not render over the dialog's frame.
 
 * Configure a shortcut for the BINSCII system utility. Launch Shortcuts. Invoke the BINSCII system file. Verify that the display is not truncated.
 

src/desktop/main.s

@@ -13847,75 +13847,7 @@ cursor_ibeam_flag:          ; high bit set if I-beam, clear if pointer
         FALL_THROUGH_TO DrawDialogPath
 .endproc ; DrawDialogPathBuf0
 
-;;; Draw a path (long string) in the progress dialog by without intruding
-;;; into the border. If the string is too long, it is shrunk from the
-;;; center with "..." inserted.
-;;; Inputs: A,X = string address
-;;; Trashes $06...$0C
-.proc DrawDialogPath
-        ptr := $6
-        stax    ptr
-
-loop:   jsr     measure
-        bcc     draw            ; already short enough
-
-        jsr     ellipsify
-        jmp     loop
-
-        ;; Draw
-draw:   MGTK_CALL MGTK::DrawText, txt
-        rts
-
-        ;; Measure
-measure:
-        txt := $8
-        len := $A
-        result := $B
-
-        ldy     #0
-        lda     (ptr),y
-        sta     len
-        ldxy    ptr
-        inxy
-        stxy    txt
-        MGTK_CALL MGTK::TextWidth, txt
-        cmp16   result, #kProgressDialogPathWidth
-        rts
-
-ellipsify:
-        ldy     #0
-        lda     (ptr),y         ; length
-        sta     length
-        pha
-        sec                     ; shrink length by one
-        sbc     #1
-        sta     (ptr),y
-        pla
-        lsr                     ; /= 2
-
-        pha                     ; A = length/2
-
-        tay
-:       iny                     ; shift chars from midpoint to
-        lda     (ptr),y         ; end of string down by one
-        dey
-        sta     (ptr),y
-        iny
-        length := *+1
-        cpy     #SELF_MODIFIED_BYTE
-        bne     :-
-
-        pla                     ; A = length/2
-
-        tay                     ; overwrite midpoint with
-        lda     #'.'            ; "..."
-        sta     (ptr),y
-        iny
-        sta     (ptr),y
-        iny
-        sta     (ptr),y
-        rts
-.endproc ; DrawDialogPath
+        .include "../lib/drawdialogpath.s"
 
 ;;; ============================================================
 ;;; Save/Restore window state at shutdown/launch

src/lib/drawdialogpath.s

@@ -0,0 +1,73 @@
+;;; Draw a path (long string) in the progress dialog by without intruding
+;;; into the border. If the string is too long, it is shrunk from the
+;;; center with "..." inserted.
+;;; Inputs: A,X = string address
+;;; Trashes $06...$0C
+
+;;; `kProgressDialogPathWidth` must be defined
+
+.proc DrawDialogPath
+        ptr := $6
+        stax    ptr
+
+loop:   jsr     measure
+        bcc     draw            ; already short enough
+
+        jsr     ellipsify
+        jmp     loop
+
+        ;; Draw
+draw:   MGTK_CALL MGTK::DrawText, txt
+        rts
+
+        ;; Measure
+measure:
+        txt := $8
+        len := $A
+        result := $B
+
+        ldy     #0
+        lda     (ptr),y
+        sta     len
+        ldxy    ptr
+        inxy
+        stxy    txt
+        MGTK_CALL MGTK::TextWidth, txt
+        cmp16   result, #kProgressDialogPathWidth
+        rts
+
+ellipsify:
+        ldy     #0
+        lda     (ptr),y         ; length
+        sta     length
+        pha
+        sec                     ; shrink length by one
+        sbc     #1
+        sta     (ptr),y
+        pla
+        lsr                     ; /= 2
+
+        pha                     ; A = length/2
+
+        tay
+:       iny                     ; shift chars from midpoint to
+        lda     (ptr),y         ; end of string down by one
+        dey
+        sta     (ptr),y
+        iny
+        length := *+1
+        cpy     #SELF_MODIFIED_BYTE
+        bne     :-
+
+        pla                     ; A = length/2
+
+        tay                     ; overwrite midpoint with
+        lda     #'.'            ; "..."
+        sta     (ptr),y
+        iny
+        sta     (ptr),y
+        iny
+        sta     (ptr),y
+        rts
+.endproc ; DrawDialogPath
+

src/selector/ovl_file_copy.s

@@ -104,6 +104,10 @@ pathname_dst:
 pathname_src:
         .res    ::kPathBufferSize, 0
 
+;;; Copy of `pathname_src` modified for display
+display_path:
+        .res    ::kPathBufferSize, 0
+
 ;;; Paths for overall operation
 dst_path:       .res    64, 0
 src_path:       .res    64, 0
@@ -925,8 +929,13 @@ nextwinfo:      .addr   0
 
         DEFINE_LABEL download, res_string_label_download, 116, 16
 
-        DEFINE_POINT pos_copying, 20, 32
-        DEFINE_POINT pos_remaining, 20, 45
+        kProgressDialogDefaultX = 20
+        kProgressDialogPathLeft = 100
+        kProgressDialogPathWidth = winfo::kWidth - kProgressDialogPathLeft - kProgressDialogDefaultX
+
+        DEFINE_POINT pos_copying, kProgressDialogDefaultX, 32
+        DEFINE_POINT pos_path, kProgressDialogPathLeft, 32
+        DEFINE_POINT pos_remaining, kProgressDialogDefaultX, 45
 
 str_copying:
         PASCAL_STRING res_string_label_copying
@@ -1013,7 +1022,9 @@ ep2:    dec     file_count
         MGTK_CALL MGTK::PaintRect, rect_clear_count
         MGTK_CALL MGTK::MoveTo, pos_copying
         param_call DrawString, str_copying
-        param_call DrawString, pathname_src
+        MGTK_CALL MGTK::MoveTo, pos_path
+        COPY_STRING pathname_src, display_path
+        param_call DrawDialogPath, display_path
         MGTK_CALL MGTK::MoveTo, pos_remaining
         param_call DrawString, str_files_remaining
         param_call DrawString, str_from_int
@@ -1102,6 +1113,8 @@ ret:    rts
 
 ;;; ============================================================
 
+        .include "../lib/drawdialogpath.s"
+
         ReadSetting := app::ReadSetting
         .include "../lib/inttostring.s"
         .include "../lib/drawstring.s"

src/selector/res/selector.res.bg

@@ -17,7 +17,7 @@
 .define res_string_button_desktop "raboten plot"
 .define res_char_button_desktop_shortcut 'D'
 .define res_string_label_download "kopirane w RAMCARD..."
-.define res_string_label_copying "kopirane: "
+.define res_string_label_copying "kopirane:"
 .define res_string_errmsg_not_enough_room "nqma dostaty~no mqsto w RAM kartata za kopirane na prilovenieto."
 .define res_string_errmsg_copy_incomplete "wyznikna gre{ka po wreme na izteglqneto. kopiraneto ne e zawyr{eno."
 .define res_string_label_files_to_copy "fajlowe za kopirane: "

src/selector/res/selector.res.da

@@ -17,7 +17,7 @@
 .define res_string_button_desktop "Skrivebord"
 .define res_char_button_desktop_shortcut 'S'
 .define res_string_label_download "Kopierer til RAMCard..."
-.define res_string_label_copying "Kopiering: "
+.define res_string_label_copying "Kopiering:"
 .define res_string_errmsg_not_enough_room "Ikke nok plads i RAMCard til at kopiere applikationen."
 .define res_string_errmsg_copy_incomplete "Der opstod en fejl under download. Kopien blev ikke f{rdiggjort."
 .define res_string_label_files_to_copy "Filer der skal kopieres: "

src/selector/res/selector.res.de

@@ -17,7 +17,7 @@
 .define res_string_button_desktop "Schreibtisch"
 .define res_char_button_desktop_shortcut 'S'
 .define res_string_label_download "Kopiere auf RAMCard..."
-.define res_string_label_copying "Kopiere: "
+.define res_string_label_copying "Kopiere:"
 .define res_string_errmsg_not_enough_room "Nicht genug Speicher auf RAMCard um Programm zu kopieren."
 .define res_string_errmsg_copy_incomplete "Ein Fehler trat w{hrend des Ladens auf. Kopieren nicht vollst{ndig."
 .define res_string_label_files_to_copy "Zu kopierende Dateien: "

src/selector/res/selector.res.en

@@ -17,7 +17,7 @@
 .define res_string_button_desktop "DeskTop"
 .define res_char_button_desktop_shortcut 'D'
 .define res_string_label_download "Copying to RAMCard..."
-.define res_string_label_copying "Copying: "
+.define res_string_label_copying "Copying:"
 .define res_string_errmsg_not_enough_room "Not enough room in the RAMCard to copy the application."
 .define res_string_errmsg_copy_incomplete "An error occurred during the download. The copy was not completed."
 .define res_string_label_files_to_copy "Files to copy: "

src/selector/res/selector.res.es

@@ -17,7 +17,7 @@
 .define res_string_button_desktop "Escritorio"
 .define res_char_button_desktop_shortcut 'E'
 .define res_string_label_download "Copiando a RAMDisk..."
-.define res_string_label_copying "Copiando: "
+.define res_string_label_copying "Copiando:"
 .define res_string_errmsg_not_enough_room "No hay sitio suficiente en la RAMDisk para copiar la aplicaci\x13n."
 .define res_string_errmsg_copy_incomplete "Ha ocurrido un error durante la descarga. La copia no se ha completado."
 .define res_string_label_files_to_copy "Archivos para copiar: "