WebSVN – Kolibri OS – Path Comparison – /

Regard whitespace Rev 7783 → Rev 7784

 /programs/cmm/browser/WebView.c
 ,7 → 44,6
 #include "history.h"
 #define PADDING 9
-#define SKIN_Y 24
 #define TSZE 25
 #define STATUSBAR_H 15
 #define TAB_H 20
 ,7 → 95,9
 edit_box address_box = {, PADDING+TSZE*2+PADDING+6, PADDING+3, 0xffffff,
 x94AECE, 0xffffff, 0xffffff,0x10000000,URL_SIZE-2,#editURL,0,,19,19};
+char editbox_icons[] = FROM "editbox_icons.raw";
 void LoadLibraries()
 {
         load_dll(boxlib,    #box_lib_init,0);
 ,9 → 139,7
         LoadLibraries();
         CreateDir("/tmp0/1/Downloads");
         //CreateDir("/tmp0/1/WebView_Cache");
-        Libimg_LoadImage(#skin, "/sys/toolbar.png");
         HandleParam();
-        skin.h = 26;
         WB1.list.SetFont(8, 14, 10011000b);
         WB1.list.no_selection = true;
         WB1.custom_encoding = -1;
 ,7 → 846,7
 void DrawOmnibox()
 {
-        int skin_x_offset;
+        int imgxoff;
         DrawOvalBorder(address_box.left-2, address_box.top-3, address_box.width+18, 24, system.color.work_graph,
                 system.color.work_graph, system.color.work_graph, system.color.work_dark);
 ,10 → 857,9
         if (address_box.flags & ed_focus) address_box.flags = ed_focus; else address_box.flags = 0;
         EditBox_UpdateText(#address_box, address_box.flags);
         edit_box_draw stdcall(#address_box);
-        if (http.transfer > 0) skin_x_offset = 85; else skin_x_offset = 68;
-        img_draw stdcall(skin.image, address_box.left+address_box.width+1,
-                address_box.top-1, 16, skin.h-3, skin_x_offset, SKIN_Y+2);
-        DefineHiddenButton(address_box.left+address_box.width-1, address_box.top-2, 17, skin.h-3, REFRESH_BUTTON);
+        if (http.transfer) imgxoff = 16*23*3; else imgxoff = 0;
+        _PutImage(address_box.left+address_box.width+1, address_box.top-1, 16, 23, imgxoff + #editbox_icons);
+        DefineHiddenButton(address_box.left+address_box.width-1, address_box.top-2, 17, 23, REFRESH_BUTTON);
         DrawProgress();
 }

/programs/cmm/browser/editbox_icons.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/programs/cmm/browser/editbox_icons.raw
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /programs/cmm/menu/menu.c
 ,29 → 138,43
 void draw_list()
 {
         int i, item_y;
+        dword name_color;
+        dword hotkey_color;
-        dword active_background_color = MixColors(system.color.work_button, system.color.work,230);
-        dword active_top_border_color = MixColors(system.color.work_graph, system.color.work_button,240);
-        dword inactive_text_shadow_color = MixColors(system.color.work,0xFFFfff,150);
-        dword text_color;
-        bool skin_dark = skin_is_dark();
+        static dword inactive_background_color;
+        static dword active_background_color;
+        static dword active_top_border_color;
+        static dword inactive_text_shadow_color;
+        static bool skin_dark;
+        static bool colors_set;
+        if (!colors_set) {
+                colors_set = true;
+                inactive_background_color = MixColors(system.color.work, 0xFFFfff,230);
+                active_background_color = MixColors(system.color.work_button, system.color.work,230);
+                active_top_border_color = MixColors(system.color.work_graph, system.color.work_button,240);
+                inactive_text_shadow_color = MixColors(system.color.work,0xFFFfff,120);
+                skin_dark = skin_is_dark();
+        }
         for (i=0; i<menu1.count; i++;)
         {
                 item_y = i*ITEM_H+menu1.y;
                 if (i==menu1.cur_y) {
-                        text_color = system.color.work_button_text;
+                        hotkey_color = name_color = system.color.work_button_text;
                         DrawBar(menu1.x, item_y+1,        menu1.w, ITEM_H-2, active_background_color);
                         DrawBar(menu1.x, item_y,          menu1.w, 1, active_top_border_color);
                         DrawBar(menu1.x, item_y+ITEM_H-1, menu1.w, 1, system.color.work_light);
-                        WriteText(13 + max_name_len, item_y + menu1.text_y, 0x80, text_color, hotkeys.get(i));
                 } else {
-                        text_color = system.color.work_text;
-                        DrawBar(menu1.x, item_y, menu1.w, ITEM_H, system.color.work);
-                        if (!skin_dark) WriteText(13+1, item_y + menu1.text_y +1, 0x80, inactive_text_shadow_color, names.get(i));
-                        WriteText(13 + max_name_len, item_y + menu1.text_y, 0x80, system.color.work_graph, hotkeys.get(i));
+                        name_color = system.color.work_text;
+                        hotkey_color = system.color.work_graph;
+                        DrawBar(menu1.x, item_y, menu1.w, ITEM_H, inactive_background_color);
+                        if (!skin_dark) WriteText(13+1, item_y + menu1.text_y +1, 0x80,
+                                inactive_text_shadow_color, names.get(i));
                 }
-                WriteText(13, item_y + menu1.text_y, 0x80, text_color, names.get(i));
+                WriteText(-strlen(hotkeys.get(i))*6 + 13 + max_name_len + max_hotkey_len,
+                        item_y + menu1.text_y, 0x80, hotkey_color, hotkeys.get(i));
+                WriteText(13, item_y + menu1.text_y, 0x80, name_color, names.get(i));
         }
         if (selected) WriteText(5, selected-1*ITEM_H + menu1.y + menu1.text_y, 0x80, 0xEE0000, "\x10");
 }

 /programs/cmm/txtread/txtread.c
 ,8 → 26,8
 //===================================================//
 #define TOOLBAR_H 34
-#define TOOLBAR_ICON_WIDTH  26
-#define TOOLBAR_ICON_HEIGHT 24
+#define TOOLBAR_ICON_WIDTH  24
+#define TOOLBAR_ICON_HEIGHT 22
 #define DEFAULT_EDITOR "/sys/tinypad"
 ,13 → 415,14
         incn x;
         DefineAndDrawWindow(Form.left,Form.top,Form.width,Form.height,0x73,0,#title,0);
         GetProcessInfo(#Form, SelfInfo);
+        system.color.get();
         if (Form.status_window>2) return;
         if (Form.width  < 200) { MoveSize(OLD,OLD,200,OLD); return; }
         if (Form.height < 200) { MoveSize(OLD,OLD,OLD,200); return; }
-        DrawBar(0, 0, Form.cwidth, TOOLBAR_H - 1, 0xe1e1e1);
-        DrawBar(0, TOOLBAR_H - 1, Form.cwidth, 1, 0x7F7F7F);
+        DrawBar(0, 0, Form.cwidth, TOOLBAR_H - 1, system.color.work);
+        DrawBar(0, TOOLBAR_H - 1, Form.cwidth, 1, system.color.work_graph);
         x.n = 0;
         DrawToolbarButton(OPEN_FILE,       x.inc(8));
 ,8 → 457,11
 void DrawToolbarButton(char image_id, int x)
 {
-        DefineButton(x+1, 6, TOOLBAR_ICON_WIDTH-2, TOOLBAR_ICON_HEIGHT-2, 10+image_id + BT_HIDE, 0);
-        img_draw stdcall(skin.image, x, 5, TOOLBAR_ICON_WIDTH, TOOLBAR_ICON_HEIGHT, TOOLBAR_ICON_WIDTH-1*image_id, 0);
+        DefineButton(x+1, 6, TOOLBAR_ICON_WIDTH, TOOLBAR_ICON_HEIGHT, 10+image_id + BT_HIDE, 0);
+        //img_draw stdcall(skin.image, x, 5, TOOLBAR_ICON_WIDTH, TOOLBAR_ICON_HEIGHT, TOOLBAR_ICON_WIDTH-1*image_id, 0);
+        DrawOvalBorder(x, 5, TOOLBAR_ICON_WIDTH, TOOLBAR_ICON_HEIGHT, system.color.work_graph,
+                system.color.work_graph,system.color.work_graph, system.color.work_dark);
+        img_draw stdcall(skin.image, x+1, 5+1, TOOLBAR_ICON_WIDTH, TOOLBAR_ICON_HEIGHT, TOOLBAR_ICON_WIDTH*image_id, 0);
 }
 void DrawScroller()

/programs/develop/param/trunk/param.asm
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/programs/develop/param/trunk/cmdipc.inc
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

 /programs/media/kiv/trunk/kiv.asm
 ,7 → 2173,7
 s_header        db ' - Kolibri Image Viewer',0
 window_style    dd 0x53FFFFFF
-window          BOX 101, 144, 529, 324  ; left top width height
+window          BOX 101, 144, 750, 600  ; left top width height
 window_prev     BOX 0, 0, 0, 0
 window_save     BOX 0, 0, 0, 0  ; restore after slide show
 client          BOX 0, 0, 0, 0

 /programs/other/outdated/param/trunk/cmdipc.inc
 ,0 → 1,221
+include "..\..\..\..\macros.inc"
+initipc:
+ mov eax,9
+ mov ebx,prc
+ or ecx,-1
+ mcall
+ mov ecx,eax
+loop1:
+ push ecx
+ mov eax,9
+ mov ebx,prc
+ mcall
+ cmp word [prc+10],'CM'
+ jne no_cmd
+ cmp byte [prc+12],'D'
+ jne no_cmd
+ mov ebx,[prc+30]
+ mov dword [cmdpid],ebx
+ mov dword [cmdnumb],ecx
+no_cmd:
+ pop ecx
+ loop loop1
+ cmp dword [cmdpid],0
+ jne no_exit
+ jmp exit
+no_exit:
+ mov eax,60
+ mov ebx,2
+ mov ecx,dword [cmdpid]
+ mov edx,printf
+ mov esi,4
+ mcall
+ call initcmd
+waitcmdinit:
+ mov eax,40
+ mov ebx,01000000b
+ mcall
+ mov eax,23
+ mov ebx,100
+ mcall
+ cmp eax,7
+ je cmd_ok
+ jmp exit
+cmd_ok:
+ cmp byte [ipcb+16],'.'
+ jne exit
+ mov eax,18
+ mov ebx,3
+ mov ecx,dword [cmdnumb]
+ mcall
+ ret
+pause1:
+ mov eax,5
+ mov ebx,1
+ mcall
+ ret
+exit:
+ or eax,-1
+ mcall
+cls:
+ mov eax,60
+ mov ebx,2
+ mov ecx,dword [cmdpid]
+ mov edx,ipccls
+ mov esi,4
+ mcall
+ call pause1
+ ret
+print:
+ mov ecx,84
+loopprt:
+ mov edi,stripc
+ add edi,ecx
+ mov esi,fill_symbol
+ movsb
+ loop loopprt
+ cld
+ mov ecx,4
+ mov edi,stripc
+ mov esi,printf
+ rep movsb
+ cld
+ mov edx,79
+ sub edx,eax
+ mov ecx,79
+ sub ecx,edx
+ mov edi,stripc+4
+ mov esi,ebx
+ rep movsb
+ mov eax,60
+ mov ebx,2
+ mov ecx,dword [cmdpid]
+ mov edx,stripc
+ mov esi,84
+ mcall
+ call pause1
+ ret
+eol:
+ mov eax,60
+ mov ebx,2
+ mov ecx,dword [cmdpid]
+ mov edx,ipceol
+ mov esi,4
+ mcall
+ call pause1
+ ret
+initcmd:
+ mov eax,60
+ mov ebx,2
+ mov ecx,dword [cmdpid]
+ mov edx,ipckey
+ mov esi,4
+ mcall
+ mov eax,60
+ mov ebx,1
+ mov ecx,ipcb
+ mov edx,28
+ mcall
+ cld
+ mov ecx,28
+ mov edi,ipcb
+ mov esi,ipcc
+ rep movsb
+ ret
+getkey:
+ call initcmd
+waitagain:
+ mov eax,40
+ mov ebx,01000000b
+ mcall
+ mov eax,10
+ mcall
+ cmp eax,7
+ jne waitagain
+ mov edi,key
+ mov esi,ipcb+16
+ movsb
+ ret
+endipc:
+ mov eax,60
+ mov ebx,2
+ mov ecx,dword [cmdpid]
+ mov edx,ipcend
+ mov esi,4
+ mcall
+ jmp exit
+cmdpid dd 0
+cmdnumb dd 0
+printf db '~ppp'
+ipceol db '~lll'
+ipcend db '~eee'
+ipccls db '~ccc'
+ipckey db '~kkk'
+key db 0
+ipcb:
+ db 0
+ db 0,0,0
+ dd 8
+times 20 db 0
+ipcc:
+ db 0
+ db 0,0,0
+ dd 8
+times 20 db 0
+stripc: times 84 db 0
+fill_symbol db 0
+prc: times 52 db 0
 Property changes:
 Added: svn:eol-style
 +native
 \ No newline at end of property

/programs/other/outdated/param/trunk/Tupfile.lua
0,0 → 1,3
if tup.getconfig("NO_FASM") ~= "" then return end
tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > lang.inc", {"lang.inc"})
tup.rule({"param.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "param")

/programs/other/outdated/param/trunk/build_en.bat
0,0 → 1,5
@erase lang.inc
@echo lang fix en >lang.inc
@fasm param.asm param
@erase lang.inc
@pause

/programs/other/outdated/param/trunk/build_ru.bat
0,0 → 1,5
@erase lang.inc
@echo lang fix ru >lang.inc
@fasm param.asm param
@erase lang.inc
@pause

 /programs/other/outdated/param/trunk/param.asm
 ,0 → 1,56
+use32
+   org 0x0
+   db 'MENUET01'
+   dd 0x01
+   dd START
+   dd I_END
+   dd 0x100000
+   dd 0x7fff0
+   dd I_PARAM              ; ãª § â¥«ì   ¯ à ¬¥âàë
+include "lang.inc"
+include "cmdipc.inc"       ; ®¤ª«îç¨âì ä ©« CMDIPC.INC
+START:
+ call initipc              ; ¨¨æ¨ «¨§¨à®¢ âì ¤«ï à ¡®âë á CMD
+ mov eax,47                ; ¢ë¢¥áâ¨ á®®¡é¥¨¥
+ mov ebx,mess
+ call print
+ call eol                  ; ¯à®¯ãáâ¨âì áâà®ªã
+ call eol
+ cmp [I_PARAM],byte 0      ; ¯à®¢¥à¨âì, ¥áâì «¨ ¯ à ¬¥âàë
+ jz noparam
+ mov eax,43
+ mov ebx,mess1
+ call print
+ call eol
+ mov eax,30                ; ¢ë¢¥áâ¨ ¯ à ¬¥âàë
+ mov ebx,I_PARAM
+ call print
+ jmp end1                  ; ¯¥à¥å®¤ ¢ ª®¥æ ¯à®£à ¬¬ë
+noparam:
+ mov eax,40                ; ¢ë¢¥áâ¨ á®®¡é¥¨¥ ® â®¬, çâ® ¥â ¯ à ¬¥âà®¢
+ mov ebx,mess2
+ call print
+end1:
+ jmp endipc               ; § ¢¥àè¨âì ¯à®£à ¬¬ã
+mess db 'PARAM.ASM - Test params in IPC programs for CMD'
+mess1 db 'This program was started with this params: '
+mess2 db 'This program was started without params!'
+I_PARAM db 0
+I_END:
 Property changes:
 Added: svn:eol-style
 +native
 \ No newline at end of property

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7783 → Rev 7784