Spaceraven/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

C--: update structure

Browse Source 
WebView: fix very old bug related with named colors

git-svn-id: svn://kolibrios.org@5499 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2015-03-05 20:55:28 +00:00
parent 1f31c584e7
commit 698c85d52f
26 changed files with 162 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/cmm/TWB/colors.h
View File

@ -186,7 +186,7 @@ dword GetColor(char* color_str)
else else
for (ii=0; color_specs[ii].name!=0; ii++) for (ii=0; color_specs[ii].name!=0; ii++)
{ {
if (!strcmp(color_str, color_specs[ii].name)) return color_specs[ii].rgb; if (!strcmpi(color_str, color_specs[ii].name)) return color_specs[ii].rgb;
} }
return text_colors[0]; return text_colors[0];

6
programs/cmm/appearance/appearance.c
View File

@ -11,8 +11,8 @@
#include "..\lib\dll.h" #include "..\lib\dll.h"
#include "..\lib\file_system.h" #include "..\lib\file_system.h"
#include "..\lib\list_box.h" #include "..\lib\list_box.h"
#include "..\lib\figures.h" #include "..\lib\gui.h"
#include "..\lib\lib.obj\box_lib.h" #include "..\lib\obj\box_lib.h"
#ifdef LANG_RUS #ifdef LANG_RUS
?define WINDOW_HEADER "“á¯à ¢«¥­¨¥ ⥬®©" ?define WINDOW_HEADER "“á¯à ¢«¥­¨¥ ⥬®©"
@ -165,7 +165,7 @@ void main()
mem_Init(); mem_Init();
SetEventMask(0x27); SetEventMask(0x27);
if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("'Fatal Error: library doesn't exists /rd/1/lib/box_lib.obj' -E"); if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("'Fatal Error: library doesn't exists /rd/1/lib/box_obj' -E");
list[SKINS].current = list[WALLPAPERS].current = -1; list[SKINS].current = list[WALLPAPERS].current = -1;
list[SKINS].first = list[WALLPAPERS].first = 0; list[SKINS].first = list[WALLPAPERS].first = 0;
TabClick(WALLPAPERS); TabClick(WALLPAPERS);

10
programs/cmm/browser/WebView.c
View File

@ -11,7 +11,7 @@
#define MEMSIZE 0x100000 #define MEMSIZE 0x100000
#include "..\lib\kolibri.h" #include "..\lib\kolibri.h"
#include "..\lib\strings.h" #include "..\lib\strings.h"
#include "..\lib\figures.h" #include "..\lib\gui.h"
#include "..\lib\encoding.h" #include "..\lib\encoding.h"
#include "..\lib\file_system.h" #include "..\lib\file_system.h"
#include "..\lib\mem.h" #include "..\lib\mem.h"
@ -21,10 +21,10 @@
#include "..\lib\cursor.h" #include "..\lib\cursor.h"
//*.obj libraries //*.obj libraries
#include "..\lib\lib.obj\box_lib.h" #include "..\lib\obj\box_lib.h"
#include "..\lib\lib.obj\libio_lib.h" #include "..\lib\obj\libio_lib.h"
#include "..\lib\lib.obj\libimg_lib.h" #include "..\lib\obj\libimg_lib.h"
#include "..\lib\lib.obj\http.h" #include "..\lib\obj\http.h"
//useful patterns //useful patterns
#include "..\lib\patterns\libimg_load_skin.h" #include "..\lib\patterns\libimg_load_skin.h"

6
programs/cmm/dicty/dicty.c
View File

@ -3,9 +3,9 @@
#include "..\lib\strings.h" #include "..\lib\strings.h"
#include "..\lib\mem.h" #include "..\lib\mem.h"
#include "..\lib\file_system.h" #include "..\lib\file_system.h"
#include "..\lib\figures.h" #include "..\lib\gui.h"
#include "..\lib\dll.h" #include "..\lib\dll.h"
#include "..\lib\lib.obj\box_lib.h" #include "..\lib\obj\box_lib.h"
unsigned char speaker[23*40*3]= FROM "speaker.raw"; unsigned char speaker[23*40*3]= FROM "speaker.raw";
@ -35,7 +35,7 @@ void main()
{ {
int id, key; int id, key;
mem_Init(); mem_Init();
if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("Error while loading GUI library /sys/lib/boxlib.obj"); if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("Error while loading GUI library /sys/lib/boxobj");
dict_folder = abspath(DICT_DIRECROTY); dict_folder = abspath(DICT_DIRECROTY);
OpenDictionary(0); OpenDictionary(0);

10
programs/cmm/downloader/Downloader.c
View File

@ -2,7 +2,7 @@
//libraries //libraries
#include "..\lib\kolibri.h" #include "..\lib\kolibri.h"
#include "..\lib\strings.h" #include "..\lib\strings.h"
#include "..\lib\figures.h" #include "..\lib\gui.h"
#include "..\lib\encoding.h" #include "..\lib\encoding.h"
#include "..\lib\draw_buf.h" #include "..\lib\draw_buf.h"
#include "..\lib\file_system.h" #include "..\lib\file_system.h"
@ -10,9 +10,9 @@
#include "..\lib\dll.h" #include "..\lib\dll.h"
#include "..\lib\list_box.h" #include "..\lib\list_box.h"
//*.obj libraries //*.obj libraries
#include "..\lib\lib.obj\box_lib.h" #include "..\lib\obj\box_lib.h"
#include "..\lib\lib.obj\libio_lib.h" #include "..\lib\obj\libio_lib.h"
#include "..\lib\lib.obj\http.h" #include "..\lib\obj\http.h"
char header[]="New Downloader v0.6"; char header[]="New Downloader v0.6";
@ -49,7 +49,7 @@ void main()
char notify_message[4296]; char notify_message[4296];
mem_Init(); mem_Init();
if (load_dll2(boxlib, #box_lib_init,0)!=0) {notify("System Error: library doesn't exists /rd/1/lib/box_lib.obj"); ExitProcess();} if (load_dll2(boxlib, #box_lib_init,0)!=0) {notify("System Error: library doesn't exists /rd/1/lib/box_obj"); ExitProcess();}
if (load_dll2(libio, #libio_init,1)!=0) notify("Error: library doesn't exists - libio"); if (load_dll2(libio, #libio_init,1)!=0) notify("Error: library doesn't exists - libio");
if (load_dll2(libHTTP, #http_lib_init,1)!=0) notify("Error: library doesn't exists - http"); if (load_dll2(libHTTP, #http_lib_init,1)!=0) notify("Error: library doesn't exists - http");
if (!URL) strcpy(#URL, "http://builds.kolibrios.org/eng/latest-iso.7z"); if (!URL) strcpy(#URL, "http://builds.kolibrios.org/eng/latest-iso.7z");

2
programs/cmm/end/end.c
View File

@ -1,6 +1,6 @@
#define MEMSIZE 0x3E80 #define MEMSIZE 0x3E80
#include "..\lib\kolibri.h" #include "..\lib\kolibri.h"
#include "..\lib\figures.h" #include "..\lib\gui.h"
#include "..\lib\strings.h" #include "..\lib\strings.h"
#include "..\lib\random.h" #include "..\lib\random.h"
#include "..\lib\mem.h" #include "..\lib\mem.h"

12
programs/cmm/eolite/Eolite.c
View File

@ -13,13 +13,13 @@
#include "..\lib\mem.h" #include "..\lib\mem.h"
#include "..\lib\dll.h" #include "..\lib\dll.h"
#include "..\lib\file_system.h" #include "..\lib\file_system.h"
#include "..\lib\figures.h" #include "..\lib\gui.h"
#include "..\lib\list_box.h" #include "..\lib\list_box.h"
#include "..\lib\copyf.h" #include "..\lib\copyf.h"
#include "..\lib\random.h" #include "..\lib\random.h"
//obj //obj
#include "..\lib\lib.obj\libini.h" #include "..\lib\obj\libini.h"
#include "..\lib\lib.obj\box_lib.h" #include "..\lib\obj\box_lib.h"
//images //images
#include "imgs\toolbar.txt" #include "imgs\toolbar.txt"
#include "imgs\left_p.txt" #include "imgs\left_p.txt"
@ -38,7 +38,7 @@
?define WAIT_DELETING_FOLDER "“¤ «ï¥âáï ¯ ¯ª . <20>®¤®¦¨â¥..." ?define WAIT_DELETING_FOLDER "“¤ «ï¥âáï ¯ ¯ª . <20>®¤®¦¨â¥..."
?define NOT_CREATE_FOLDER "<EFBFBD>¥ 㤠«®áì ᮧ¤ âì ¯ ¯ªã." ?define NOT_CREATE_FOLDER "<EFBFBD>¥ 㤠«®áì ᮧ¤ âì ¯ ¯ªã."
?define NOT_CREATE_FILE "<EFBFBD>¥ 㤠«®áì ᮧ¤ âì ä ©«." ?define NOT_CREATE_FILE "<EFBFBD>¥ 㤠«®áì ᮧ¤ âì ä ©«."
?define ERROR_1 "Žè¨¡ª  ¯à¨ § £à㧪¥ ¡¨¡«¨®â¥ª¨ /rd/1/lib/box_lib.obj" ?define ERROR_1 "Žè¨¡ª  ¯à¨ § £à㧪¥ ¡¨¡«¨®â¥ª¨ /rd/1/lib/box_obj"
?define T_PASTE_WINDOW "Š®¯¨àãî..." ?define T_PASTE_WINDOW "Š®¯¨àãî..."
?define T_PASTE_WINDOW_TEXT "Š®¯¨àã¥âáï ä ©«:" ?define T_PASTE_WINDOW_TEXT "Š®¯¨àã¥âáï ä ©«:"
?define T_CANCEL_PASTE "Š®¯¨à®¢ ­¨¥ ¯à¥ªà é¥­®. <20> ¯ª  ᪮¯¨à®¢ ­  ­¥ ¯®«­®áâìî." ?define T_CANCEL_PASTE "Š®¯¨à®¢ ­¨¥ ¯à¥ªà é¥­®. <20> ¯ª  ᪮¯¨à®¢ ­  ­¥ ¯®«­®áâìî."
@ -56,7 +56,7 @@
?define WAIT_DELETING_FOLDER "Deleting folder. Please, wait..." ?define WAIT_DELETING_FOLDER "Deleting folder. Please, wait..."
?define NOT_CREATE_FOLDER "Kataloogi ei saa luua." ?define NOT_CREATE_FOLDER "Kataloogi ei saa luua."
?define NOT_CREATE_FILE "Faili ei saa luua." ?define NOT_CREATE_FILE "Faili ei saa luua."
?define ERROR_1 "Viga teegi laadimisel /rd/1/lib/box_lib.obj" ?define ERROR_1 "Viga teegi laadimisel /rd/1/lib/box_obj"
?define T_PASTE_WINDOW "Kopeerin..." ?define T_PASTE_WINDOW "Kopeerin..."
?define T_PASTE_WINDOW_TEXT "Kopeerin faili:" ?define T_PASTE_WINDOW_TEXT "Kopeerin faili:"
?define T_CANCEL_PASTE "Copy process terminated. Folder copied incompletely." ?define T_CANCEL_PASTE "Copy process terminated. Folder copied incompletely."
@ -74,7 +74,7 @@
?define WAIT_DELETING_FOLDER "Deleting folder. Please, wait..." ?define WAIT_DELETING_FOLDER "Deleting folder. Please, wait..."
?define NOT_CREATE_FOLDER "Folder can not be created." ?define NOT_CREATE_FOLDER "Folder can not be created."
?define NOT_CREATE_FILE "File can not be created." ?define NOT_CREATE_FILE "File can not be created."
?define ERROR_1 "Error while loading library /rd/1/lib/box_lib.obj" ?define ERROR_1 "Error while loading library /rd/1/lib/box_obj"
?define T_PASTE_WINDOW "Copying..." ?define T_PASTE_WINDOW "Copying..."
?define T_PASTE_WINDOW_TEXT "Copying file:" ?define T_PASTE_WINDOW_TEXT "Copying file:"
?define T_CANCEL_PASTE "Copy process terminated. Folder copied incompletely." ?define T_CANCEL_PASTE "Copy process terminated. Folder copied incompletely."

19
programs/cmm/lib/figures.h → programs/cmm/lib/gui.h
View File

@ -63,7 +63,6 @@
} }
} }
:void MoreLessBox(dword x,y,s, bt_id_more, bt_id_less, color_border, color_button, color_text, value, text) :void MoreLessBox(dword x,y,s, bt_id_more, bt_id_less, color_border, color_button, color_text, value, text)
{ {
#define VALUE_FIELD_W 26; #define VALUE_FIELD_W 26;
@ -77,7 +76,6 @@
WriteText(x+VALUE_FIELD_W+s+s+10, s / 2 + y -3, 0x80, color_text, text); WriteText(x+VALUE_FIELD_W+s+s+10, s / 2 + y -3, 0x80, color_text, text);
} }
:void DrawProgressBar(dword st_x, st_y, st_w, st_h, col_fon, col_border, col_fill, col_text, progress_percent) :void DrawProgressBar(dword st_x, st_y, st_w, st_h, col_fon, col_border, col_fill, col_text, progress_percent)
{ {
int progress_w; int progress_w;
@ -106,7 +104,6 @@
DrawBar(x,y+8,w,1,0x4E00E7); DrawBar(x,y+8,w,1,0x4E00E7);
} }
:void PutShadow(dword x,y,w,h,skinned,strength) :void PutShadow(dword x,y,w,h,skinned,strength)
{ {
proc_info wForm; proc_info wForm;
@ -119,14 +116,6 @@
mem_Free(shadow_buf); mem_Free(shadow_buf);
} }
:void DrawPopupShadow(dword x,y,w,h,skinned)
{
PutShadow(w+x+1,y,1,h+2,skinned,2);
PutShadow(w+x+2,y+1,1,h+2,skinned,1);
PutShadow(x,y+h+2,w+2,1,skinned,2);
PutShadow(x+1,y+h+3,w+1,1,skinned,1);
}
:void DrawPopup(dword x,y,w,h,skinned, col_work,col_border) :void DrawPopup(dword x,y,w,h,skinned, col_work,col_border)
{ {
DrawRectangle(x,y,w,h,col_border); DrawRectangle(x,y,w,h,col_border);
@ -136,6 +125,14 @@
DrawPopupShadow(x,y,w,h-1,skinned); DrawPopupShadow(x,y,w,h-1,skinned);
} }
:void DrawPopupShadow(dword x,y,w,h,skinned)
{
PutShadow(w+x+1,y,1,h+2,skinned,2);
PutShadow(w+x+2,y+1,1,h+2,skinned,1);
PutShadow(x,y+h+2,w+2,1,skinned,2);
PutShadow(x+1,y+h+3,w+1,1,skinned,1);
}
:void GrayScaleImage(dword color_image, w, h) :void GrayScaleImage(dword color_image, w, h)
{ {
dword i,gray,rr,gg,bb; dword i,gray,rr,gg,bb;

2
programs/cmm/lib/lib.obj/box_lib.h → programs/cmm/lib/obj/box_lib.h
View File

@ -1,6 +1,6 @@
//BOX_LIB - Asper //BOX_LIB - Asper
dword boxlib = #aEdit_box_lib; dword boxlib = #aEdit_box_lib;
char aEdit_box_lib[]="/sys/lib/box_lib.obj"; char aEdit_box_lib[]="/sys/lib/box_obj";
dword box_lib_init = #aboxlib_init; dword box_lib_init = #aboxlib_init;

0
programs/cmm/lib/lib.obj/http.h → programs/cmm/lib/obj/http.h
View File

0
programs/cmm/lib/lib.obj/iconv.h → programs/cmm/lib/obj/iconv.h
View File

0
programs/cmm/lib/lib.obj/libimg_lib.h → programs/cmm/lib/obj/libimg_lib.h
View File

0
programs/cmm/lib/lib.obj/libini.h → programs/cmm/lib/obj/libini.h
View File

0
programs/cmm/lib/lib.obj/libio_lib.h → programs/cmm/lib/obj/libio_lib.h
View File

0
programs/cmm/lib/lib.obj/netcode.h → programs/cmm/lib/obj/netcode.h
View File

0
programs/cmm/lib/lib.obj/network.h → programs/cmm/lib/obj/network.h
View File

0
programs/cmm/lib/lib.obj/truetype.h → programs/cmm/lib/obj/truetype.h
View File

0
programs/cmm/lib/lib.obj/xml.h → programs/cmm/lib/obj/xml.h
View File

0
programs/cmm/lib/socket_new.h → programs/cmm/lib/socket.h
View File

18
programs/cmm/liza/liza.c
View File

@ -7,19 +7,19 @@
#include "../lib/mem.h" #include "../lib/mem.h"
#include "../lib/dll.h" #include "../lib/dll.h"
#include "../lib/encoding.h" #include "../lib/encoding.h"
#include "../lib/figures.h" #include "../lib/gui.h"
#include "../lib/file_system.h" #include "../lib/file_system.h"
#include "../lib/list_box.h" #include "../lib/list_box.h"
#include "../lib/socket_new.h" #include "../lib/socket.h"
#include "../lib/draw_buf.h" #include "../lib/draw_buf.h"
#include "../lib/cursor.h" #include "../lib/cursor.h"
//*.obj libraries //*.obj libraries
#include "../lib/lib.obj/box_lib.h" #include "../lib/obj/box_lib.h"
#include "../lib/lib.obj/network.h" #include "../lib/obj/network.h"
#include "../lib/lib.obj/libio_lib.h" #include "../lib/obj/libio_lib.h"
#include "../lib/lib.obj/libimg_lib.h" #include "../lib/obj/libimg_lib.h"
#include "../lib/lib.obj/netcode.h" #include "../lib/obj/netcode.h"
#include "../lib/lib.obj/iconv.h" #include "../lib/obj/iconv.h"
//images //images
byte letter_icons[sizeof(file "img/letter_icons.raw")] = FROM "img/letter_icons.raw"; byte letter_icons[sizeof(file "img/letter_icons.raw")] = FROM "img/letter_icons.raw";
#include "img/letter_icons.h" #include "img/letter_icons.h"
@ -102,7 +102,7 @@ char version[]=" WebView 0.1";
void main() { void main() {
mem_Init(); mem_Init();
CursorPointer.Load(#CursorFile); CursorPointer.Load(#CursorFile);
if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("Error while loading library - box_lib.obj"); if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("Error while loading library - box_obj");
if (load_dll2(network_lib, #network_lib_init,0)!=0) notify("Error while loading library - network.obj"); if (load_dll2(network_lib, #network_lib_init,0)!=0) notify("Error while loading library - network.obj");
if (load_dll2(netcode_lib, #base64_encode,0)!=0) notify("Error while loading library - netcode.obj"); if (load_dll2(netcode_lib, #base64_encode,0)!=0) notify("Error while loading library - netcode.obj");
if (load_dll2(iconv_lib, #iconv_open,0)!=0) { notify("Error while loading library - iconv.obj"); use_iconv=2; } if (load_dll2(iconv_lib, #iconv_open,0)!=0) { notify("Error while loading library - iconv.obj"); use_iconv=2; }

2
programs/cmm/notify/notify.c
View File

@ -5,7 +5,7 @@
#include "..\lib\kolibri.h" #include "..\lib\kolibri.h"
#include "..\lib\strings.h" #include "..\lib\strings.h"
#include "..\lib\mem.h" #include "..\lib\mem.h"
#include "..\lib\figures.h" #include "..\lib\gui.h"
dword shadow_buf_24, shadow_buf_32, lighter_pixel1, lighter_pixel2; dword shadow_buf_24, shadow_buf_32, lighter_pixel1, lighter_pixel2;

8
programs/cmm/panels_cfg/panels_cfg.c
View File

@ -5,11 +5,11 @@
#include "..\lib\mem.h" #include "..\lib\mem.h"
#include "..\lib\file_system.h" #include "..\lib\file_system.h"
#include "..\lib\dll.h" #include "..\lib\dll.h"
#include "..\lib\figures.h" #include "..\lib\gui.h"
#include "..\lib\lib.obj\libio_lib.h" #include "..\lib\obj\libio_lib.h"
#include "..\lib\lib.obj\libini.h" #include "..\lib\obj\libini.h"
#include "..\lib\lib.obj\box_lib.h" #include "..\lib\obj\box_lib.h"
#include "..\lib\patterns\libimg_load_skin.h" #include "..\lib\patterns\libimg_load_skin.h"

10
programs/cmm/pixie/pixie.c
View File

@ -11,12 +11,12 @@
#include "..\lib\dll.h" #include "..\lib\dll.h"
#include "..\lib\file_system.h" #include "..\lib\file_system.h"
#include "..\lib\list_box.h" #include "..\lib\list_box.h"
#include "..\lib\figures.h" #include "..\lib\gui.h"
#include "..\lib\lib.obj\box_lib.h" #include "..\lib\obj\box_lib.h"
#include "..\lib\lib.obj\libio_lib.h" #include "..\lib\obj\libio_lib.h"
#include "..\lib\lib.obj\libimg_lib.h" #include "..\lib\obj\libimg_lib.h"
#include "..\lib\lib.obj\libini.h" #include "..\lib\obj\libini.h"
#include "..\lib\patterns\libimg_load_skin.h" #include "..\lib\patterns\libimg_load_skin.h"

8
programs/cmm/software_widget/software_widget.c
View File

@ -8,11 +8,11 @@ SOFTWARE CENTER v2.31
#include "..\lib\mem.h" #include "..\lib\mem.h"
#include "..\lib\file_system.h" #include "..\lib\file_system.h"
#include "..\lib\dll.h" #include "..\lib\dll.h"
#include "..\lib\figures.h" #include "..\lib\gui.h"
#include "..\lib\lib.obj\libio_lib.h" #include "..\lib\obj\libio_lib.h"
#include "..\lib\lib.obj\libimg_lib.h" #include "..\lib\obj\libimg_lib.h"
#include "..\lib\lib.obj\libini.h" #include "..\lib\obj\libini.h"
#include "..\lib\patterns\libimg_load_skin.h" #include "..\lib\patterns\libimg_load_skin.h"

4
programs/cmm/tmpdisk/t_gui.c
View File

@ -2,8 +2,8 @@
///////////////////////// GUI //////////////////// ///////////////////////// GUI ////////////////////
///////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////
#include "..\lib\figures.h" #include "..\lib\gui.h"
#include "..\lib\lib.obj\box_lib.h" #include "..\lib\obj\box_lib.h"
#ifdef LANG_RUS #ifdef LANG_RUS
unsigned char *but_text[]={ unsigned char *but_text[]={

4
programs/cmm/tmpdisk/tmpdisk.c
View File

@ -5,8 +5,8 @@
#include "..\lib\file_system.h" #include "..\lib\file_system.h"
#include "..\lib\dll.h" #include "..\lib\dll.h"
#include "..\lib\lib.obj\libio_lib.h" #include "..\lib\obj\libio_lib.h"
#include "..\lib\lib.obj\libini.h" #include "..\lib\obj\libini.h"
#ifndef AUTOBUILD #ifndef AUTOBUILD
#include "lang.h--" #include "lang.h--"