From 367949dbec062d8279bdd290f6666a91e7f7da7a Mon Sep 17 00:00:00 2001 From: eAndrew Date: Tue, 8 Apr 2014 18:39:01 +0000 Subject: [PATCH] Notify3: fix, char 10 == \n, faster animation git-svn-id: svn://kolibrios.org@4801 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/system/notify3/NOTIFY.ASM | 17 ++++++++++++----- programs/system/notify3/README.TXT | 4 ++-- programs/system/notify3/TEST.SH | 3 --- 3 files changed, 14 insertions(+), 10 deletions(-) delete mode 100644 programs/system/notify3/TEST.SH diff --git a/programs/system/notify3/NOTIFY.ASM b/programs/system/notify3/NOTIFY.ASM index 7c5036c9b3..204427ba2f 100644 --- a/programs/system/notify3/NOTIFY.ASM +++ b/programs/system/notify3/NOTIFY.ASM @@ -75,6 +75,13 @@ mov cl, [eax] cmpe cl, "\", .char + cmpne cl, 10, .copy + cmple esi, dword [text.max_len], @f + mov [text.max_len], esi + @@: + mov esi, 0 + mov cl, 0 + inc dword [text.lines] jmp .copy .char: @@ -353,11 +360,11 @@ cmpe [first_draw], byte 1, .draw_full mov [first_draw], byte 1 mov esi, [window.height] - mov ecx, LINEH / 2 + mov ecx, LINEH @@: mcall - add ecx, (LINEH / 2) shl 16 - sub esi, LINEH / 2 + add ecx, LINEH shl 16 + sub esi, LINEH push eax ebx mcall 5, 1 pop ebx eax @@ -532,9 +539,9 @@ ;---------------------------- - sz_ifile db "notify3.png", 0 + sz_ifile db "/sys/notify3.png", 0 sz_shname db "notify-mem-v01", 0 - sz_std db "'Notify 3. Keys list\n \n", \ + sz_std db "'Notify 3. Keys list\n ", 10, \ "d - disable auto-closing\n", \ "t - first line is title\n", \ "A - application icon\n", \ diff --git a/programs/system/notify3/README.TXT b/programs/system/notify3/README.TXT index d2527b7bdc..6831cde21d 100644 --- a/programs/system/notify3/README.TXT +++ b/programs/system/notify3/README.TXT @@ -9,7 +9,7 @@ 2.2 All charactes. If you won`t to write character of quote (" or '), you must - enter \ before it (\" or \'). New-line character is "\n". + enter \ before it (\" or \'). New-line character is "\n" or char 10. 2.3 d - disable auto-closing @@ -21,4 +21,4 @@ N - network icon I - info icon F - folder icon - C - component icon + C - component icon diff --git a/programs/system/notify3/TEST.SH b/programs/system/notify3/TEST.SH deleted file mode 100644 index f795b1edec..0000000000 --- a/programs/system/notify3/TEST.SH +++ /dev/null @@ -1,3 +0,0 @@ -#SHS -@notify "HTTP Downloader\nhttp://builds.kolibrios.org/rus/latest-img.7z\nhas been successfully downloaded" -tdN -@notify "RDSave\nRAM-диск сохранён успешно в /hd0/2/boot/kolibri.img" -tdF \ No newline at end of file