WebSVN – Kolibri OS – Diff – /programs/other/TinyHashView/thashview.c

 /* Copyright (C) 2019-2021 Logaev Maxim (turbocat2001), GPLv2 */
 #include
 #include
 #include
-#include
 #include
 #include
 #include
 #include
 #include
 #define FALSE 0;
 #define MAX_HASH_LEN 65 //  ªá¨¬ «ì ï ¤«¨  áâà®ª¨
 #define WINDOW_W 665
 #define VERSION "%s - thashview 2.6.1"
 #define EDIT_TEXT_SIZE 0x10000000
+#define DATA(type, addr, offset) *((type*)((uint8_t*)addr+offset))
-struct kolibri_system_colors sys_color_table;
+ksys_colors_table_t sys_color_table;
 char hash_str_md5[MAX_HASH_LEN]=   "Click the 'MD5:' button to show the md5-checksum!"; //ë¢®¤ MD5
 char hash_str_sha1[MAX_HASH_LEN]=  "Click the 'SHA1:' button to show the sha1-checksum!"; //ë¢®¤ SHA1
     BTN_PASTE=50       //áâ ¢¨âì ¢ edit_box(¯®ª  ¢ à §à ¡®âª¥)
 };
 void notify_show(char *text)
 {
-   start_app("/sys/@notify", text);
+   _ksys_exec("/sys/@notify", text);
+}
 void* safe_malloc(size_t size) // ¥§®¯ áë© malloc. ®ª §ë¢ ¥â ã¢¥¤®¬«¥¨¥ ®¡ ®è¨¡ª¥ ¨ § ªàë¢ ¥â ¯à®£à ¬¬ã ¥á«¨ ¯ ¬ïâì ¥ ¡ë«  ¢ë¤¥«¥
+}
 void redraw_window() //¨áã¥¬ ®ª®
+{
     sprintf(title,VERSION, filename); // áâ  ¢«¨¢ ¥¬ § £®«®¢®ª ®ª
-    pos_t win_pos = get_mouse_pos(0); // ®«ãç ¥¬ ª®®à¤¨ âë ªãàá®à
+    ksys_pos_t win_pos = _ksys_get_mouse_pos(KSYS_MOUSE_SCREEN_POS); // ®«ãç ¥¬ ª®®à¤¨ âë ªãàá®à
-    begin_draw(); // ç¨ ¥¬ à¨á®¢ ¨¥ ¨â¥àä¥©á  )
+    _ksys_start_draw(); // ç¨ ¥¬ à¨á®¢ ¨¥ ¨â¥àä¥©á  )
-    sys_create_window(win_pos.x, win_pos.y, WINDOW_W, 150, title, sys_color_table.work_area, 0x14); // ®§¤ ñ¬ ®ª®.
     _ksys_create_window(win_pos.x, win_pos.y, WINDOW_W, 150, title, sys_color_table.work_area, 0x14); // ®§¤ ñ¬ ®ª®.
     edit_box_draw(&hash_edit_box); // ¨áã¥¬ edit_box
-    define_button(X_W(10,60), Y_H(30,20), BTN_MD5, GREEN); // ¯à¥¤¥«ï¥¬ ª®¯ªã md5
+    _ksys_define_button(10, 30, 60, 20, BTN_MD5, GREEN); // ¯à¥¤¥«ï¥¬ ª®¯ªã md5
-    define_button(X_W(10,60), Y_H(60,20), BTN_SHA1, GREEN);// ¯à¥¤¥«ï¥¬ ª®¯ªã sha1
+    _ksys_define_button(10, 60, 60, 20, BTN_SHA1, GREEN);// ¯à¥¤¥«ï¥¬ ª®¯ªã sha1
-    define_button(X_W(10,60), Y_H(90,20), BTN_SHA256, GREEN);// ¯à¥¤¥«ï¥¬ ª®¯ªã sha256
+    _ksys_define_button(10, 90, 60, 20, BTN_SHA256, GREEN);// ¯à¥¤¥«ï¥¬ ª®¯ªã sha256
-    draw_text_sys("MD5:", 15, 34, 0,   0x90000000 | sys_color_table.work_button_text); // ¨é¥¬ â¥ªáâ   ª®¯ª å
+    _ksys_draw_text("MD5:", 15, 34, 0,   0x90000000 | sys_color_table.work_button_text); // ¨é¥¬ â¥ªáâ   ª®¯ª å
-    draw_text_sys("SHA1:", 15, 64, 0,  0x90000000 | sys_color_table.work_button_text);
+    _ksys_draw_text("SHA1:", 15, 64, 0,  0x90000000 | sys_color_table.work_button_text);
-    draw_text_sys("SHA256:", 15,94, 0, 0x90000000 | sys_color_table.work_button_text);
+    _ksys_draw_text("SHA256:", 15,94, 0, 0x90000000 | sys_color_table.work_button_text);
-    draw_text_sys(hash_str_md5, 80, 34, 0, 0x90000000 | sys_color_table.work_text); // ë¢®¤¨¬ ª®âà®«ìë¥ áã¬¬ë ¢ ®ª®
+    _ksys_draw_text(hash_str_md5, 80, 34, 0, 0x90000000 | sys_color_table.work_text); // ë¢®¤¨¬ ª®âà®«ìë¥ áã¬¬ë ¢ ®ª®
+    _ksys_draw_text(hash_str_sha1, 80, 64, 0, 0x90000000 | sys_color_table.work_text);
-    draw_text_sys(hash_str_sha1, 80, 64, 0, 0x90000000 | sys_color_table.work_text);
+    _ksys_draw_text(hash_str_sha256, 80, 94, 0, 0x90000000| sys_color_table.work_text);
-    draw_text_sys(hash_str_sha256, 80, 94, 0, 0x90000000| sys_color_table.work_text);
-    define_button(X_W(610,42), Y_H(30, 20), BTN_COPY_MD5, sys_color_table.work_button); // ¯à¥¤¥«ï¥¬ ª®¯ª¨ ¤«ï ª®¯¨à®¢ ¨ï
+    _ksys_define_button(610, 30, 42, 20, BTN_COPY_MD5, sys_color_table.work_button); // ¯à¥¤¥«ï¥¬ ª®¯ª¨ ¤«ï ª®¯¨à®¢ ¨ï
-    define_button(X_W(610,42), Y_H(60, 20), BTN_COPY_SHA1, sys_color_table.work_button);
+    _ksys_define_button(610, 60, 42, 20, BTN_COPY_MD5, sys_color_table.work_button);
-    define_button(X_W(610,42), Y_H(90, 20), BTN_COPY_SHA256, sys_color_table.work_button);
+    _ksys_define_button(610, 90, 42, 20, BTN_COPY_MD5, sys_color_table.work_button);
-    draw_text_sys("Copy", 615, 34, 0,   0x90000000 | sys_color_table.work_button_text); // ¨è¥¬ copy   ¢á¥å ª®¯ª å ¤«ï ª®¯¨à®¢ ¨ï
+    _ksys_draw_text("Copy", 615, 34, 0,   0x90000000 | sys_color_table.work_button_text); // ¨è¥¬ copy   ¢á¥å ª®¯ª å ¤«ï ª®¯¨à®¢ ¨ï
-    draw_text_sys("Copy", 615, 64, 0,  0x90000000 | sys_color_table.work_button_text);
+    _ksys_draw_text("Copy", 615, 64, 0,  0x90000000 | sys_color_table.work_button_text);
-    draw_text_sys("Copy", 615, 94, 0, 0x90000000 | sys_color_table.work_button_text);
+    _ksys_draw_text("Copy", 615, 94, 0, 0x90000000 | sys_color_table.work_button_text);
-    define_button(X_W(592,60), Y_H(120,20), BTN_CMP, GREEN); // ¯à¥¤¥«ï¥¬ ª®¯ªã ¤«ï áà ¢¥¨ï ª®â®«ìëå áã¬¬
+    _ksys_define_button(592, 120, 60, 20, BTN_CMP, GREEN); // ¯à¥¤¥«ï¥¬ ª®¯ªã ¤«ï áà ¢¥¨ï ª®â®«ìëå áã¬¬
-    draw_text_sys("Compare", 595, 124 , 0,0x90000000 | sys_color_table.work_button_text); // ¨è¥¬ â¥ªá   ª®¯ª¥.
+    _ksys_draw_text("Compare", 595, 124 , 0,0x90000000 | sys_color_table.work_button_text); // ¨è¥¬ â¥ªá   ª®¯ª¥.
-    define_button(X_W(540, 45), Y_H(120,20), BTN_PASTE, sys_color_table.work_button); //®¯ª  ¤«ï ¢áâ ¢ª¨ (¥à ¡®â ¥â)
+    _ksys_define_button(540, 120, 45, 20, BTN_PASTE, sys_color_table.work_button); //®¯ª  ¤«ï ¢áâ ¢ª¨ (¥à ¡®â ¥â)
-    draw_text_sys("Paste", 543, 124 , 0,0x90000000 | sys_color_table.work_button_text); // ¥ªáâ paste   ª®¯ª¥
+    _ksys_draw_text("Paste", 543, 124 , 0,0x90000000 | sys_color_table.work_button_text); // ¥ªáâ paste   ª®¯ª¥
-    end_draw();
+    _ksys_end_draw();
+}
 void paste_to_edit_buffer()    // áâ ¢¨âì ¨§ ¡ãää¥à  ®¡¬¥
 {
     char *temp_buff=NULL;
-    if(kol_clip_num()>0){
+    if(_ksys_clip_num()>0){
-        temp_buff=kol_clip_get(kol_clip_num()-1);
+        temp_buff=_ksys_clip_get(_ksys_clip_num()-1);
         memset(edit_box_buff,0,MAX_HASH_LEN);
-        if(DATA(int, temp_buff,0)>0 && DATA(int,temp_buff,4)==CLIP_TEXT && DATA(int,temp_buff,8)==CLIP_CP866){
+        if(DATA(int, temp_buff,0)>0 && DATA(int,temp_buff,4)==KSYS_CLIP_TEXT && DATA(int,temp_buff,8)==KSYS_CLIP_CP866){
             strncpy(edit_box_buff,temp_buff+12, MAX_HASH_LEN-1);
             edit_box_set_text(&hash_edit_box,edit_box_buff);
             notify_show("'Pasted from clipboard!' -I");
             hash_edit_box.text_color = BLACK;
-            user_free(temp_buff);
+            free(temp_buff);
+        }
        text_hash_len==SHA1_BLOCK_SIZE ||
        text_hash_len==SHA256_BLOCK_SIZE) // á«¨ â¥ªáâ ï¢«ï¥âáï åíè-áâà®ª®©
+    {
         char *temp_buffer=safe_malloc(MAX_HASH_LEN+12); // ë¤¥«ï¥¬ ¯ ¬ïâì ¤«ï ¢à¥¬®£® ¡ãä¥à
         memset(temp_buffer, 0, MAX_HASH_LEN);   //  ã«ï¥¬ ¡ãä¥à
-        DATA(char,temp_buffer,4)=CLIP_TEXT;     // áâ  ¢«¨¢ ¥¬ TEXT ¤«ï ¡ãä¥à (¬¥é¥¨¥ 4 ¡ ©â )
+        DATA(char,temp_buffer,4)=KSYS_CLIP_TEXT;     // áâ  ¢«¨¢ ¥¬ TEXT ¤«ï ¡ãä¥à (¬¥é¥¨¥ 4 ¡ ©â )
-        DATA(char,temp_buffer,8)=CLIP_CP866;    // áâ  ¢«¨¢ ¥¬ ª®¤¨à®¢ªã CP866(¬¥é¥¨¥ 8 ¡ ©â)
+        DATA(char,temp_buffer,8)=KSYS_CLIP_CP866;    // áâ  ¢«¨¢ ¥¬ ª®¤¨à®¢ªã CP866(¬¥é¥¨¥ 8 ¡ ©â)
         strncpy(temp_buffer+12, text, MAX_HASH_LEN-1); // ®¯¨àã¥¬ ¤ ë¥ ¨§ text ¢® ¢à¥¬¥ë© ¡ãä¥à(¬¥é¥¨¥ 12 ¡ ©â)
-        kol_clip_set(strlen(text)+12, temp_buffer); // ë¯®«ï¥¬ á¨áâ¥¬ë© ¢ë§®¢ ¨ ¯¥à¥¬¥é ¥¬ ¤ ë¥ ¨§ ¢à¥¬¥®£® ¡ãä¥à  ¢ ¡ãä¥à ®¡¬¥
+        _ksys_clip_set(strlen(text)+12, temp_buffer); // ë¯®«ï¥¬ á¨áâ¥¬ë© ¢ë§®¢ ¨ ¯¥à¥¬¥é ¥¬ ¤ ë¥ ¨§ ¢à¥¬¥®£® ¡ãä¥à  ¢ ¡ãä¥à ®¡¬¥
         notify_show("'Copied to clipboard!' -I");
         free(temp_buffer); // á¢®¡®¦ ¥¬ ¢à¥¬¥ë© ¡ãä¥à.
+    }
+}
     if(NULL==fopen(filename,"rb")){ // á«¨ ä ©«  ¥â ¨«¨ ¥ ®âªàë¢ ¥âáï
         notify_show("'File not found!' -E");
         exit(0);
-    }
+    }
-    if(GetScreenSize()/65536
+    if(_ksys_screen_size().x
         notify_show("'Low screen resolution! Program will not display correctrly!' -W");
+    }
     int gui_event; // ¥à¥¬¥ ï ¤«ï åà ¥¨ï á®¡ëâ¨ï
     uint32_t pressed_button = 0; // ®¤  ¦ â®© ª®¯ª¨ ¢ ®ª¥
-    get_system_colors(&sys_color_table);
+    _ksys_get_system_colors(&sys_color_table);
     hash_edit_box.shift_color=sys_color_table.work_button;
-    set_event_mask(0xC0000027);// áâ  ¢«¨¢ ¥¬ ¬ áªã á®¡ëâ¨©
+    _ksys_set_event_mask(0xC0000027);// áâ  ¢«¨¢ ¥¬ ¬ áªã á®¡ëâ¨©
     do // ¨ª« ®¡à ¡®âª¨ á®¡ëâ¨©
+    {
-        gui_event = get_os_event(); // ®«ãç ¥¬ á®¡ëâ¨¥
+        gui_event = _ksys_get_event(); // ®«ãç ¥¬ á®¡ëâ¨¥
         switch(gui_event){ // ¡à ¡ âë¢ ¥¬ á®¡ëâ¨ï
-            case KOLIBRI_EVENT_NONE:
+            case KSYS_EVENT_NONE:
                 break;
-            case KOLIBRI_EVENT_REDRAW:
+            case KSYS_EVENT_REDRAW:
                 redraw_window();
                 break;
-            case KOLIBRI_EVENT_MOUSE:
+            case KSYS_EVENT_MOUSE:
                 edit_box_mouse(&hash_edit_box);
                 break;
-            case KOLIBRI_EVENT_KEY:
+            case KSYS_EVENT_KEY:
                 hash_edit_box.text_color = BLACK;
-                edit_box_key(&hash_edit_box,get_key().val);
+                edit_box_key(&hash_edit_box, _ksys_get_key().val);
                 break;
-            case KOLIBRI_EVENT_BUTTON: // ®¡ëâ¨¥ ®¡à ¡®âª¨ ª®¯®ª
+            case KSYS_EVENT_BUTTON: // ®¡ëâ¨¥ ®¡à ¡®âª¨ ª®¯®ª
-                pressed_button = get_os_button(); // ®«ãç¥¨¥ ª®¤   ¦ â®© ª®¯ª¨.
+                pressed_button = _ksys_get_button(); // ®«ãç¥¨¥ ª®¤   ¦ â®© ª®¯ª¨.
                 switch (pressed_button){ // à®¢¥àª  ª ª ï ª®¯ª  ¡ë«   ¦ â

Subversion Repositories Kolibri OS

(root)/programs/other/TinyHashView/thashview.c – Rev 8565 → 8707