Aren/kolibrios
1
0
Fork 0
mirror of https://github.com/KolibriOS/kolibrios.git synced 2024-11-22 17:01:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

cmm: mass renaming

Browse Source 
git-svn-id: svn://kolibrios.org@9602 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2022-01-09 06:36:16 +00:00
parent 61980e7ae3
commit 36e64a3f84
43 changed files with 169 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,7 +115,7 @@ void draw_screen()
{
char i;
int icon_n=1;
DrawRectangle(WINW-180-1,SCRY-1, 145+1,170+1, sc.work_graph);
DrawRectangle(WINW-180-1,SCRY-1, 145+1,170+1, sc.line);
DrawBar(SCRX,SCRY,145,170,0xFFFfff);
DrawBar(SCRX+25,SCRY+5,144-25,20,0xBBDDFF);
for (i=0; i<8; i++) {

4
programs/cmm/appearance/ui_elements_preview.h
View File

@ -22,8 +22,8 @@ void DrawUiElementsPreview(dword x,y,h)
:void DrawStEditBoxPos(dword x,y, edit_box_pointer)
{
dword c_inactive = MixColors(sc.work_graph, sc.work, 128);
dword c_active = MixColors(sc.work_graph, 0, 128);
dword c_inactive = MixColors(sc.line, sc.work, 128);
dword c_active = MixColors(sc.line, 0, 128);
ESI = edit_box_pointer;
ESI.edit_box.left = x;
ESI.edit_box.top = y;

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

@ -137,7 +137,7 @@ void main()
void DrawPanelsImage(dword y, n)
{
_PutImage(22, y, PIMG_W, PIMG_H, n * PIMG_W * PIMG_H * 3 + #panels_img_data);
PutImage(22, y, PIMG_W, PIMG_H, n * PIMG_W * PIMG_H * 3 + #panels_img_data);
}
void SetDisabledMode()

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

@ -385,8 +385,8 @@ void draw_window()
if (!application_mode) {
DrawBar(0,0, Form.cwidth,PADDING, sc.work);
DrawBar(0,PADDING+TSZE+1, Form.cwidth,PADDING-1, sc.work);
DrawBar(0,TOOLBAR_H-2, Form.cwidth,1, MixColors(sc.work_dark, sc.work, 180));
DrawBar(0,TOOLBAR_H-1, Form.cwidth,1, sc.work_graph);
DrawBar(0,TOOLBAR_H-2, Form.cwidth,1, MixColors(sc.dark, sc.work, 180));
DrawBar(0,TOOLBAR_H-1, Form.cwidth,1, sc.line);
DrawBar(0, PADDING, omnibox_edit.left-2, TSZE+1, sc.work);
DrawBar(omnibox_edit.left+omnibox_edit.width+18, PADDING, Form.cwidth-omnibox_edit.left-omnibox_edit.width-18, TSZE+1, sc.work);
@ -394,7 +394,7 @@ void draw_window()
DrawTopPanelButton(FORWARD_BUTTON, PADDING+TSZE+PADDING-2, PADDING, 31, false);
DrawTopPanelButton(SANDWICH_BUTTON, Form.cwidth-PADDING-TSZE-3, PADDING, -1, burger_active); //burger menu
DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, sc.work_graph);
DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, sc.line);
DrawRectangle(WB1.list.x + WB1.list.w, WB1.list.y, scroll_wv.size_x,
WB1.list.h-1, scroll_wv.bckg_col);
@ -901,8 +901,8 @@ void DrawOmnibox()
{
int imgxoff;
if (application_mode) return;
DrawOvalBorder(omnibox_edit.left-2, omnibox_edit.top-3, omnibox_edit.width+18, 24, sc.work_graph,
sc.work_graph, sc.work_graph, sc.work_dark);
DrawOvalBorder(omnibox_edit.left-2, omnibox_edit.top-3, omnibox_edit.width+18, 24, sc.line,
sc.line, sc.line, sc.dark);
DrawBar(omnibox_edit.left-1, omnibox_edit.top-2, omnibox_edit.width+18, 1, 0xD8DCD8);
DrawBar(omnibox_edit.left-1, omnibox_edit.top-1, omnibox_edit.width+18, 1, omnibox_edit.color);
DrawBar(omnibox_edit.left-1, omnibox_edit.top, 1, 22, omnibox_edit.color);
@ -911,7 +911,7 @@ void DrawOmnibox()
EditBox_UpdateText(#omnibox_edit, omnibox_edit.flags);
edit_box_draw stdcall(#omnibox_edit);
if (http.transfer) imgxoff = 16*23*3; else imgxoff = 0;
_PutImage(omnibox_edit.left+omnibox_edit.width+1, omnibox_edit.top-1, 16, 23, imgxoff + #editbox_icons);
PutImage(omnibox_edit.left+omnibox_edit.width+1, omnibox_edit.top-1, 16, 23, imgxoff + #editbox_icons);
DefineHiddenButton(omnibox_edit.left+omnibox_edit.width-1, omnibox_edit.top-2, 17, 23, REFRESH_BUTTON);
DrawProgress();

18
programs/cmm/browser/tabs.h
View File

@ -84,25 +84,25 @@ void DrawTab(int _id)
if (_id==tab.active) {
tab.save_state();
bgcol = sc.work_light;
border_bottom_color = sc.work_light;
bgcol = sc.light;
border_bottom_color = sc.light;
} else {
bgcol=sc.work;
border_bottom_color = sc.work_graph;
border_bottom_color = sc.line;
}
if (tabdata[_id].header) {
strncpy(#header_no_version, #tabdata[_id].header, strlen(#tabdata[_id].header)-sizeof(version)-2);
strncpy(#name, #header_no_version, tab_w-CLOSE_S/6-2);
}
DrawBar(xxx, TOOLBAR_H, 1, TAB_H, sc.work_dark);
DrawBar(xxx, TOOLBAR_H, 1, TAB_H, sc.dark);
DrawBar(xxx+1, TOOLBAR_H, tab_w-1, TAB_H-1, bgcol);
DrawBar(xxx+1, TOOLBAR_H+TAB_H-1, tab_w-1, 1, border_bottom_color);
DefineHiddenButton(xxx, TOOLBAR_H-1, tab_w, TAB_H, TAB_ID+_id);
WriteTextCenter(xxx, TOOLBAR_H+6, tab_w-CLOSE_S, sc.work_text, #name);
DefineHiddenButton(xxx+tab_w-CLOSE_S-3, TOOLBAR_H+3, CLOSE_S-1, CLOSE_S-1, TAB_CLOSE_ID+_id);
DrawBar(xxx+tab_w-CLOSE_S-3, TOOLBAR_H+3, CLOSE_S, CLOSE_S, sc.work_dark);
WriteText(xxx+tab_w-CLOSE_S+1, TOOLBAR_H+5, 0x80, sc.work_light, "x");
DrawBar(xxx+tab_w-CLOSE_S-3, TOOLBAR_H+3, CLOSE_S, CLOSE_S, sc.dark);
WriteText(xxx+tab_w-CLOSE_S+1, TOOLBAR_H+5, 0x80, sc.light, "x");
}
void DrawActiveTab()
@ -118,7 +118,7 @@ int DrawNewTabButton()
int xxx = tab.count * tab_w;
if (tab.count < TABS_MAX) {
DrawBar(xxx, TOOLBAR_H, 1, TAB_H, sc.work_graph);
DrawBar(xxx, TOOLBAR_H, 1, TAB_H, sc.line);
DrawBar(xxx+1, TOOLBAR_H, TAB_H, TAB_H-1, sc.button);
DrawRectangle3D(xxx+1, TOOLBAR_H, TAB_H, TAB_H-1, btn_light, btn_dark);
PutPixel(xxx+1+TAB_H, TOOLBAR_H, btn_dark);
@ -136,8 +136,8 @@ void DrawTabsBar()
tab_w = GetTabWidth();
for (i=0; i<tab.count; i++) DrawTab(i);
i = DrawNewTabButton();
DrawBar(i, TOOLBAR_H, Form.cwidth-i, TAB_H-1, MixColors(sc.work_dark, sc.work, 128));
DrawBar(i, TOOLBAR_H+TAB_H-1, Form.cwidth-i, 1, sc.work_graph);
DrawBar(i, TOOLBAR_H, Form.cwidth-i, TAB_H-1, MixColors(sc.dark, sc.work, 128));
DrawBar(i, TOOLBAR_H+TAB_H-1, Form.cwidth-i, 1, sc.line);
}
void EventTabClose(int _id)

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

@ -216,10 +216,10 @@ void ClipViewSelectListDraw()
void SelectList_DrawBorder() {
DrawRectangle3D(GAP-2, LIST_Y-2,
list.w+3, list.h+3,
sc.work_dark, sc.work_light);
sc.dark, sc.light);
DrawRectangle3D(GAP-1, LIST_Y-1,
list.w+1, list.h+1,
sc.work_graph, sc.work_graph);
sc.line, sc.line);
}
//===================================================//

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

@ -100,11 +100,11 @@ void main()
if (Form.height<140) { MoveSize(OLD,OLD,OLD,140); break; }
if (Form.width<400) { MoveSize(OLD,OLD,400,OLD); break; }
DrawBar(0, 0, Form.cwidth, TOPH, sc.work); //top bg
DrawBar(0, TOPH, Form.cwidth, 1, sc.work_graph);
DrawBar(0, TOPH, Form.cwidth, 1, sc.line);
edit1.width = Form.cwidth-edit1.left-edit1.left - 116;
edit_box_draw stdcall(#edit1);
DrawWideRectangle(edit1.left-2, edit1.top-2, edit1.width+3, 25, 2, 0xffffff);
DrawRectangle(edit1.left-3, edit1.top-3, edit1.width+4, 26, sc.work_graph);
DrawRectangle(edit1.left-3, edit1.top-3, edit1.width+4, 26, sc.line);
DrawTranslation();
DrawLangButtons();
}
@ -195,9 +195,9 @@ void SpeakerDraw()
} else {
DefineHiddenButton(x-5, y-5, 23+10, 20+9, BTN_SPEAKER);
if (!GetProcessSlot(speaker_id)) {
_PutImage(x, y, 23,20, #speaker);
PutImage(x, y, 23,20, #speaker);
} else {
_PutImage(x, y, 23,20, 23*20*3+#speaker);
PutImage(x, y, 23,20, 23*20*3+#speaker);
}
}
}

2
programs/cmm/downloader/dl.c
View File

@ -92,7 +92,7 @@ void ProcessKeyPress()
void DrawWindow()
{
sc.get();
pb.frame_color = sc.work_dark;
pb.frame_color = sc.dark;
DefineAndDrawWindow(110 + random(300), 100 + random(300), WIN_W+9,
WIN_H + 5 + skin_h, 0x34, sc.work, DL_WINDOW_HEADER, 0);

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

@ -249,7 +249,7 @@ void main()
if (mouse.x>=files.x+files.w) && (mouse.x<=files.x+files.w+16) && (mouse.y>files.y-17) && (mouse.y<files.y)
{
if (mouse.lkm) DrawRectangle3D(files.x+files.w+1,files.y-16,14,14,sc.work_dark,sc.work_light);
if (mouse.lkm) DrawRectangle3D(files.x+files.w+1,files.y-16,14,14,sc.dark,sc.light);
WHILE (mouse.lkm) && (files.first>0)
{
pause(8);
@ -257,12 +257,12 @@ void main()
List_ReDraw();
mouse.get();
}
DrawRectangle3D(files.x+files.w+1,files.y-16,14,14,sc.work_light,sc.work_dark);
DrawRectangle3D(files.x+files.w+1,files.y-16,14,14,sc.light,sc.dark);
}
if (mouse.x>=files.x+files.w) && (mouse.x<=files.x+files.w+16) && (mouse.y>files.y+files.h-16) && (mouse.y<files.y+files.h)
{
if (mouse.lkm) DrawRectangle3D(files.x+files.w+1,files.y+files.h-15,14,14,sc.work_dark,sc.work_light);
if (mouse.lkm) DrawRectangle3D(files.x+files.w+1,files.y+files.h-15,14,14,sc.dark,sc.light);
while (mouse.lkm) && (files.first<files.count-files.visible)
{
pause(8);
@ -270,7 +270,7 @@ void main()
List_ReDraw();
mouse.get();
}
DrawRectangle3D(files.x+files.w+1,files.y+files.h-15,14,14,sc.work_light,sc.work_dark);
DrawRectangle3D(files.x+files.w+1,files.y+files.h-15,14,14,sc.light,sc.dark);
}
//Scrooll
@ -577,7 +577,7 @@ void draw_window()
PutPaletteImage(#toolbar, 246, 34, 0, 0, 8, #toolbar_pal);
for (i=0; i<3; i++) DefineHiddenButton(toolbar_buttons_x[i]+2,7,31-5,29-5,BACK_BTN+i);
for (i=3; i<6; i++) DefineHiddenButton(toolbar_buttons_x[i], 5,31, 29, BACK_BTN+i);
DrawBar(127, 8, 1, 25, sc.work_graph);
DrawBar(127, 8, 1, 25, sc.line);
DrawBar(246,0, Form.cwidth - 246, 34, sc.work);
DrawDot(Form.cwidth-17,12);
DrawDot(Form.cwidth-17,12+6);
@ -585,12 +585,12 @@ void draw_window()
DefineHiddenButton(Form.cwidth-24,7,20,25,51+BT_NOFRAME); //dots
}
//main rectangles
DrawRectangle(1,40,Form.cwidth-3,Form.cheight - 42-status_bar_h,sc.work_graph);
DrawRectangle(1,40,Form.cwidth-3,Form.cheight - 42-status_bar_h,sc.line);
DrawBar(0,39,1,-show_status_bar.checked*status_bar_h + Form.cheight - 40, sc.work);
EBX = Form.cwidth-1 * 65536 + 1;
$int 64
for (i=0; i<6; i++) DrawBar(0, 34+i, Form.cwidth, 1, MixColors(sc.work_dark, sc.work, i*10));
for (i=0; i<6; i++) DrawBar(0, 5-i, Form.cwidth, 1, MixColors(sc.work_light, sc.work, i*10));
for (i=0; i<6; i++) DrawBar(0, 34+i, Form.cwidth, 1, MixColors(sc.dark, sc.work, i*10));
for (i=0; i<6; i++) DrawBar(0, 5-i, Form.cwidth, 1, MixColors(sc.light, sc.work, i*10));
llist_copy(#files_active, #files);
DrawStatusBar();
if (!getSelectedCount()) {
@ -617,7 +617,7 @@ void DrawButtonsAroundList()
if (sort_type==2) sorting_arrow_x = files.x + files.w - 90;
if (sort_type==3) sorting_arrow_x = strlen(T_SIZE)*3-30+files.x+files.w;
WriteText(sorting_arrow_x,files.y-12,0x80, sc.work_text, sorting_arrow_t);
DrawBar(files.x+files.w,files.y,1,files.h,sc.work_graph);
DrawBar(files.x+files.w,files.y,1,files.h,sc.line);
if (efm) && (files.x<5) {
DrawBar(files.x+files.w+16,files.y,1,files.h,EDX); //line between panel
}
@ -643,7 +643,7 @@ void DrawStatusBar()
int go_up_folder_exists=0;
dword topcolor;
if (show_status_bar.checked) topcolor=sc.work_light; else topcolor=sc.work;
if (show_status_bar.checked) topcolor=sc.light; else topcolor=sc.work;
DrawBar(0, Form.cheight - status_bar_h-1, Form.cwidth, 1, topcolor);
if (efm) {

2
programs/cmm/eolite/include/about.h
View File

@ -37,7 +37,7 @@ void about_dialog()
GetProcessInfo(#about_form, SelfInfo);
if (about_form.status_window>2) break;
logo_pal[0] = sc.work;
ESDWORD[#logo_pal+16] = sc.work_dark;
ESDWORD[#logo_pal+16] = sc.dark;
PutPaletteImage(#logo,86,86,about_form.cwidth-86/2,10,8,#logo_pal);
about_x = -strlen(ABOUT_TITLE)*18+about_form.cwidth/2;
WriteTextB(about_x+2,107,0x82,0xD49CD2,ABOUT_TITLE);

40
programs/cmm/eolite/include/gui.h
View File

@ -29,9 +29,9 @@ void DrawScroll(bool _scroll_used) {
}
}
//slider
DrawRectangle(sc_x,sc_slider_y,16,sc_slider_h,sc.work_graph);
DrawRectangle(sc_x,sc_slider_y,16,sc_slider_h,sc.line);
sc_x++;
DrawRectangle3D(sc_x,sc_slider_y+1,14,sc_slider_h-2, sc.work_light , sc.work_dark);
DrawRectangle3D(sc_x,sc_slider_y+1,14,sc_slider_h-2, sc.light , sc.dark);
for (i=0; i<13; i++) {
if (!_scroll_used) EDX = col.work_gradient[13-i]; else EDX = col.work_gradient[i];
DrawBar(sc_x + 1 + i, sc_slider_y+2, 1, sc_slider_h-3, EDX);
@ -39,11 +39,11 @@ void DrawScroll(bool _scroll_used) {
sc_center = sc_slider_h / 2 + sc_slider_y;
DrawBar(sc_x+2, sc_center, 10, 1, sc.work_graph);
DrawBar(sc_x+2, sc_center, 10, 1, sc.line);
DrawBar(sc_x+3, sc_center-3, 8, 1, EDX);
DrawBar(sc_x+3, sc_center+3, 8, 1, EDX);
DrawBar(sc_x+3, sc_center+1, 10, 1, sc.work_light);
DrawBar(sc_x+3, sc_center+1, 10, 1, sc.light);
DrawBar(sc_x+4, sc_center-2, 8, 1, EDX);
DrawBar(sc_x+4, sc_center+4, 8, 1, EDX);
@ -71,9 +71,9 @@ void DrawScroll(bool _scroll_used) {
void DrawFlatButtonSmall(dword x,y,width,height,id,text)
{
DrawRectangle(x,y,width,height,sc.work_graph);
DrawRectangle3D(x+1,y+1,width-2,height-2, sc.work_light, sc.work_dark);
PutPixel(x+width-1, y+1, sc.work_dark);
DrawRectangle(x,y,width,height,sc.line);
DrawRectangle3D(x+1,y+1,width-2,height-2, sc.light, sc.dark);
PutPixel(x+width-1, y+1, sc.dark);
DrawFilledBar(x+2, y+2, width-3, height-3);
if (id) DefineHiddenButton(x+1,y+1,width-2,height-2,id);
WriteText(-strlen(text)*6+width/2+x+1,height/2+y-3,0x80,sc.work_text,text);
@ -91,9 +91,9 @@ void DrawFuncButton(dword x,y,width,id,number,text)
DrawFlatButtonSmall(x,y,width,FH,id,text);
return;
}
DrawRectangle(x,y,width,FH,sc.work_graph);
DrawRectangle(x,y,width,FH,sc.line);
DrawRectangle3D(x+1,y+1,width-2,FH-2, 0x97D194, 0x00A100);
PutPixel(x+width-1, y+1, sc.work_dark);
PutPixel(x+width-1, y+1, sc.dark);
DrawBar(x+2, y+2, numw, FH-2, 0x6060FF);
WriteText(x+6,FH/2+y-2,0x80,0x444444,itoa(number));
$sub ebx, 1 <<16 + 1
@ -116,9 +116,9 @@ void DrawFuncButton(dword x,y,width,id,number,text)
void Tip(int y, dword caption, id, arrow)
{
DrawBar(SB_BLOCKX,y,SB_BLOCKW,1,col.list_bg);
DrawBar(SB_BLOCKX,y+1,1,16,sc.work_light);
DrawBar(SB_BLOCKX,y+1,1,16,sc.light);
DrawFilledBar(SB_BLOCKX+1, y+1, SB_BLOCKW-1, 16);
DrawBar(SB_BLOCKX,y+SB_BLOCKX,SB_BLOCKW,1,sc.work_graph);
DrawBar(SB_BLOCKX,y+SB_BLOCKX,SB_BLOCKW,1,sc.line);
WriteText(SB_BLOCKX+8,y+5,0x80,col.list_gb_text,caption);
if (id) DefineButton(159,y+1,16,16,id+BT_HIDE+BT_NOFRAME,0); //arrow button
WriteText(165,y+5,0x80,col.list_gb_text,arrow); //arrow
@ -134,7 +134,7 @@ void ActionsDraw(int actions_y)
DefineButton(SB_BLOCKX,actions_y,SB_BLOCKW-1,DEV_H,actions[i*3]+BT_HIDE,0xE4DFE1);
WriteText(45,actions_y+4,0x80,0,actions[i*3+1]);
WriteText(-strlen(actions[i*3+2])*6+SIDEBAR_W-SBPAD-7,actions_y+4,0x80,0x999999,actions[i*3+2]);
_PutImage(23,actions_y+2, 14,13, i*14*13*3+#factions);
PutImage(23,actions_y+2, 14,13, i*14*13*3+#factions);
}
}
@ -181,9 +181,9 @@ void DrawPathEolite()
PathShow.text_pointer = location[0];
PathShow.area_size_x = Form.cwidth-300;
DrawBar(PathShow.start_x-3, PathShow.start_y-6, PathShow.area_size_x+3, 19, col.odd_line);
DrawRectangle(PathShow.start_x-4,PathShow.start_y-7,PathShow.area_size_x+4,20,sc.work_graph);
DrawRectangle(PathShow.start_x-4,PathShow.start_y-7,PathShow.area_size_x+4,20,sc.line);
DefineHiddenButton(PathShow.start_x-4+1,PathShow.start_y-7+1,PathShow.area_size_x+4-2,20-2,BTN_PATH);
DrawBar(PathShow.start_x-4, PathShow.start_y+14, PathShow.area_size_x+5+18, 1, sc.work_light);
DrawBar(PathShow.start_x-4, PathShow.start_y+14, PathShow.area_size_x+5+18, 1, sc.light);
DrawFlatButtonSmall(PathShow.start_x+PathShow.area_size_x,PathShow.start_y-7,18,20, BTN_BREADCRUMB, "\x19");
@ -209,10 +209,10 @@ void DrawPathBarKfm()
draw_x = 3 + DDW;
draw_w = Form.cwidth/2 - draw_x - 17;
do {
DrawBar(draw_x, SELECTY-1, draw_w-KFM2_DEVH+1, 1, sc.work_graph);
DrawBar(draw_x, SELECTY-1, draw_w-KFM2_DEVH+1, 1, sc.line);
DrawBar(draw_x, SELECTY, draw_w-KFM2_DEVH+1, KFM2_DEVH, back_color);
DefineHiddenButton(draw_x, SELECTY, draw_w-KFM2_DEVH, KFM2_DEVH-1, BTN_PATH+i);
DrawBar(draw_x, SELECTY+KFM2_DEVH, draw_w-KFM2_DEVH+1, 1, sc.work_graph);
DrawBar(draw_x, SELECTY+KFM2_DEVH, draw_w-KFM2_DEVH+1, 1, sc.line);
kfont.WriteIntoWindow(draw_x + 3, math.max(KFM2_DEVH-kfont.height/2+SELECTY,0),
back_color, text_color, kfont.size.pt, location[i]+strrchr(location[i], '/'));
DrawFlatButtonSmall(draw_x+draw_w-KFM2_DEVH+1, SELECTY-1, KFM2_DEVH-1, KFM2_DEVH+1, BTN_BREADCRUMB+i, "\x19");
@ -286,7 +286,7 @@ void ClickOnBreadCrumb(unsigned clickid)
int DrawEolitePopup(dword b1_text, b2_text)
{
int popin_x = files.w - POPIN_W / 2 + files.x ;
DrawPopup(popin_x, 160, POPIN_W, 95, 1, sc.work, sc.work_graph);
DrawPopup(popin_x, 160, POPIN_W, 95, 1, sc.work, sc.line);
DrawCaptButton(popin_x+23+000, 215, 100, 26, POPUP_BTN1, sc.button, sc.button_text, b1_text);
DrawCaptButton(popin_x+23+114, 215, 100, 26, POPUP_BTN2, sc.button, sc.button_text, b2_text);
popin_text.left = popin_x+30;
@ -295,9 +295,9 @@ int DrawEolitePopup(dword b1_text, b2_text)
}
void DrawDot(dword x,y) {
dword col_pxl = MixColors(sc.work_graph, sc.work, 60);
DrawBar(x+1,y,2,4,sc.work_graph);
DrawBar(x,y+1,4,2,sc.work_graph);
dword col_pxl = MixColors(sc.line, sc.work, 60);
DrawBar(x+1,y,2,4,sc.line);
DrawBar(x,y+1,4,2,sc.line);
PutPixel(x,y,col_pxl);
PutPixel(x+3,y,EDX);
PutPixel(x,y+3,EDX);

10
programs/cmm/eolite/include/left_panel.h
View File

@ -110,7 +110,7 @@ void _SystemDiscs::Draw()
if (is_active) WriteText(draw_x+30,draw_y+5,0x80,0x555555,#dev_name);
WriteText(draw_x+29,draw_y+5,0x80,0,#dev_name);
}
_PutImage(draw_x+6,draw_y, 18,17, is_active*7+dev_icon*17*18*3+#devices);
PutImage(draw_x+6,draw_y, 18,17, is_active*7+dev_icon*17*18*3+#devices);
draw_y += DEV_H;
}
DrawBar(draw_x+6, draw_y, 18, 1, 0xFFFfff);
@ -134,9 +134,9 @@ void _SystemDiscs::DrawSelect(int draw_x, btid, dword _path)
GetDiskIconAndName(#dev_name, #dev_icon, #disc_name);
if (strstr(_path, #dev_name)-_path==0) break;
}
DrawRectangle(draw_x-1, SELECTY-1, DDW+2-KFM2_DEVH, KFM2_DEVH+1, sc.work_graph);
DrawRectangle(draw_x-1, SELECTY-1, DDW+2-KFM2_DEVH, KFM2_DEVH+1, sc.line);
DrawBar(draw_x, SELECTY, DDW+1-KFM2_DEVH, KFM2_DEVH, 0xFFFFFF);
_PutImage(draw_x + 5, SELECTY+2, 18,17, dev_icon*17*18*3+#devices);
PutImage(draw_x + 5, SELECTY+2, 18,17, dev_icon*17*18*3+#devices);
kfont.WriteIntoWindow(draw_x + 24, math.max(KFM2_DEVH-kfont.height/2+SELECTY,0), 0xFFFfff, 0x000000, kfont.size.pt, #dev_name+1);
DefineHiddenButton(draw_x, SELECTY, DDW-1, KFM2_DEVH-1, btid);
DrawFlatButtonSmall(draw_x+DDW-KFM2_DEVH+1, SELECTY-1, KFM2_DEVH-1, KFM2_DEVH+1, NULL, "\x19");
@ -150,7 +150,7 @@ void _SystemDiscs::DrawOptions(int draw_x)
SystemDiscs.Get();
DrawPopup(draw_x, optionsy, DDW, list.count*KFM2_DEVH, 1, -1, sc.work_graph);
DrawPopup(draw_x, optionsy, DDW, list.count*KFM2_DEVH, 1, -1, sc.line);
for (i=0;i<list.count;i++) {
strcpy(#dev_name, list.get(i));
@ -159,7 +159,7 @@ void _SystemDiscs::DrawOptions(int draw_x)
DrawBar(draw_x, optionsy, DDW, KFM2_DEVH, 0xFFFFFF);
DefineButton(draw_x, optionsy, DDW, KFM2_DEVH-1, 100+i+BT_HIDE,0xFFFFFF);
_PutImage(draw_x + 5, optionsy+2, 18,17, is_active*7+dev_icon*17*18*3+#devices);
PutImage(draw_x + 5, optionsy+2, 18,17, is_active*7+dev_icon*17*18*3+#devices);
if (is_active) kfont.bold = true;
//strncpy(#volume_label, GetVolumeLabel(#dev_name), sizeof(volume_label));
strcpy(#label_file_name, #dev_name);

4
programs/cmm/eolite/include/progress_dialog.h
View File

@ -45,7 +45,7 @@ void DisplayOperationForm(int operation_flag)
copy_bar.value = 0;
copy_bar.max = 0;
}
copy_bar.frame_color = sc.work_graph;
copy_bar.frame_color = sc.line;
if (copy_state == FILE_EXISTS) {
event_mode = #WaitEvent;
@ -96,7 +96,7 @@ void DisplayOperationForm(int operation_flag)
remember_choice.draw(PR_LEFT+225, REPLACEY+37);
}
DrawRectangle3D(PR_LEFT-1, PR_TOP-1, PR_W+1, PR_H+1, sc.work_dark, sc.work_light);
DrawRectangle3D(PR_LEFT-1, PR_TOP-1, PR_W+1, PR_H+1, sc.dark, sc.light);
}
}

2
programs/cmm/eolite/include/properties.h
View File

@ -94,7 +94,7 @@ void SetProperties(int mode)
void ShowConfirmQuestionPopin()
{
apply_question_active = true;
DrawPopup(15,80,250,90,1,sc.work, sc.work_graph);
DrawPopup(15,80,250,90,1,sc.work, sc.line);
WriteText(35, 102, 0x90, 0x000000, QUEST_1);
WriteText(65, 117, 0x90, 0x000000, QUEST_2);
DrawStandartCaptButton(62,138,B_SETINGS_APPLY_SUBFOLDER,T_YES);

12
programs/cmm/eolite/include/settings.h
View File

@ -200,7 +200,7 @@ void SetAppColors()
static dword bg_col;
dword old_list_bg_color = col.list_bg;
sc.get();
sc.work_dark = MixColors(0, sc.work, 35);
sc.dark = MixColors(0, sc.work, 35);
if (sc.work == 0) sc.work = 1;
if (bg_col == sc.work) return;
bg_col = sc.work;
@ -211,11 +211,11 @@ void SetAppColors()
col.list_bg = sc.work;
col.list_gb_text = sc.work_text;
col.list_text_hidden = 0xA6A6B7;
col.list_vert_line = sc.work_graph;
col.lpanel = MixColors(sc.work_graph, sc.work, 65);
col.list_vert_line = sc.line;
col.lpanel = MixColors(sc.line, sc.work, 65);
col.selec = col.selec_active = sc.button;
col.selec_text = sc.button_text;
if (col.list_bg==col.selec) col.selec = sc.work_graph; //for fucking skins
if (col.list_bg==col.selec) col.selec = sc.line; //for fucking skins
col.slider_bg_big = MixColors(0xCED0D0, sc.work, 35);
col.odd_line = MixColors(0xFFFfff, sc.work, 15);
for (i=0; blue_hl_pal[i]!=0; i++) waves_pal[i] = MixColors(col.lpanel, blue_hl_pal[i], 180);
@ -237,8 +237,8 @@ void SetAppColors()
for (i=0; blue_hl_pal[i]!=0; i++) waves_pal[i] = blue_hl_pal[i];
}
col.selec_inactive = MixColors(0xBBBbbb, col.list_bg, 65);
col.slider_bg_left = MixColors(sc.work_graph, col.slider_bg_big, 10);
for (i=0; i<20; i++) col.work_gradient[i] = MixColors(sc.work_light, sc.work, i*5);
col.slider_bg_left = MixColors(sc.line, col.slider_bg_big, 10);
for (i=0; i<20; i++) col.work_gradient[i] = MixColors(sc.light, sc.work, i*5);
if (old_list_bg_color!=col.list_bg) LoadIcons();
}

6
programs/cmm/examples/rgb.c
View File

@ -46,7 +46,7 @@ int id;
case evReDraw:
sc.get();
DefineAndDrawWindow(screen.w-fw/2,screen.h-fh/2,fw,fh+skin_h,0x33,0xE0DFE3,"Rainbow (rgb test)",0);
_PutImage(0,0,256,256,#image);
PutImage(0,0,256,256,#image);
DrawCaptButton(280,20, 110,30,DRAW1_BTN,sc.button,sc.button_text,"Draw 1");
DrawCaptButton(280,60, 110,30,DRAW2_BTN,sc.button,sc.button_text,"Draw 2");
DrawCaptButton(280,100,110,30,SETBG_BTN,sc.button,sc.button_text,"Background");
@ -106,7 +106,7 @@ int pos;
image[pos].g = 0;
}
}
_PutImage(0,0,256,256,#image);
PutImage(0,0,256,256,#image);
}
void EventDraw2()
@ -122,7 +122,7 @@ int t2;
image[t2].b = 0;
}
}
_PutImage(0,0,256,256,#image);
PutImage(0,0,256,256,#image);
}
void EventSetBackground(dword img_pointer, w,h)

10
programs/cmm/experimental/liza/mail_box.c
View File

@ -236,7 +236,7 @@ void MailBoxLoop() {
if (id==CHANGE_CHARSET)
{
DefineButton(0,0,Form.cwidth,Form.cheight, CLOSE_CHANGE_CHARSET+BT_HIDE+BT_NOFRAME);
DrawRectangle(Form.cwidth-100, Form.cheight-status_bar_h- 70, 70, 82, sc.work_graph);
DrawRectangle(Form.cwidth-100, Form.cheight-status_bar_h- 70, 70, 82, sc.line);
DrawRectangle3D(Form.cwidth-99, Form.cheight-status_bar_h- 69, 68, 80, 0xFFFfff, sc.work);
for (id=0; id<5; id++)
{
@ -264,7 +264,7 @@ void MailBoxLoop() {
if !(DefineWindow(MAILBOX_HEADER)) break;
scroll1.bckg_col = scroll_wv.bckg_col = 0xBBBbbb;
scroll1.frnt_col = scroll_wv.frnt_col = sc.work;
scroll1.line_col = scroll_wv.line_col = sc.work_graph;
scroll1.line_col = scroll_wv.line_col = sc.line;
DrawToolbar();
DrawMailBox();
@ -297,7 +297,7 @@ void DrawToolbar() {
DrawCaptButton(BUT_W+ 20, BUT_Y, BUT_W+10, BUT_H, SAVE_LETTER, sc.button, sc.button_text,"Save letter");
DrawCaptButton(Form.cwidth-BUT_W - 10, BUT_Y, BUT_W, BUT_H, EXIT_MAIL, sc.button, sc.button_text,"< Exit");
DrawBar(0, mail_list.y-3, mail_list.w,1, sc.work_graph);
DrawBar(0, mail_list.y-3, mail_list.w,1, sc.line);
DrawBar(0, mail_list.y-2, mail_list.w,1, 0xdfdfdf);
DrawBar(0, mail_list.y-1, mail_list.w,1, 0xf0f0f0);
}
@ -329,12 +329,12 @@ void DrawMailList() {
void DrawLetterInfo() {
int lt_y = mail_list.y+mail_list.h;
DrawBar(0, lt_y, mail_list.w, 1, sc.work_graph);
DrawBar(0, lt_y, mail_list.w, 1, sc.line);
DrawBar(0, lt_y+1, Form.cwidth, 1, LBUMP);
DrawBar(0, lt_y+2, Form.cwidth, LIST_INFO_H-4, sc.work);
WriteText(mail_list.w-30/2, lt_y, 0x80, 0x888888, "= = =");
WriteText(mail_list.w-30/2, lt_y+1, 0x80, 0xEeeeee, "= = =");
DrawBar(0, lt_y+LIST_INFO_H-2, Form.cwidth, 1, sc.work_graph); //bottom
DrawBar(0, lt_y+LIST_INFO_H-2, Form.cwidth, 1, sc.line); //bottom
DrawBar(0, lt_y+LIST_INFO_H-1, Form.cwidth, 1, 0xdfdfdf);
DrawBar(0, lt_y+LIST_INFO_H , Form.cwidth, 1, 0xf0f0f0);
WriteTextB(10, lt_y+8 , 0x80, sc.work_text, "From:");

2
programs/cmm/experimental/liza/settings.c
View File

@ -91,7 +91,7 @@ void DrawOptionsWindow()
int i;
incn y;
y.n=0;
DrawBar(0, Form.cheight - 40, Form.cwidth, 1, sc.work_graph);
DrawBar(0, Form.cheight - 40, Form.cwidth, 1, sc.line);
DrawBar(0, Form.cheight - 40+1, Form.cwidth, 1, LBUMP);
DrawCaptButton(Form.cwidth-79, Form.cheight-32, 70, 25, 19, sc.button, sc.button_text,"Apply");

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

@ -368,7 +368,7 @@ void DrawWindow()
right_bar.x = Form.cwidth - right_bar.w;
b_color_gradient.x = b_last_colors.x = b_default_palette.x = right_bar.x;
DrawBar(0, 0, Form.cwidth, TOPBAR_H-1, sc.work);
DrawBar(0, TOPBAR_H-1, Form.cwidth, 1, sc.work_graph);
DrawBar(0, TOPBAR_H-1, Form.cwidth, 1, sc.line);
DrawTopPanelButton1(#EventCreateNewIcon, ECTRL + SCAN_CODE_KEY_N, tx.set(7), 2);
DrawTopPanelButton1(#EventOpenIcon, ECTRL + SCAN_CODE_KEY_O, tx.inc(GAP_S), 0);
@ -450,7 +450,7 @@ void DrawEditArea()
left_side = canvas.x-wrapper.x-1;
top_side = canvas.y-wrapper.y-1;
DrawRectangle(wrapper.x-1, wrapper.y-1, wrapper.w, wrapper.h, sc.work_graph);
DrawRectangle(wrapper.x-1, wrapper.y-1, wrapper.w, wrapper.h, sc.line);
if (left_side>0)
{
@ -589,7 +589,7 @@ void DrawPreview()
if (image.columns > right_bar.w) return;
if (image.rows > preview_h) return;
_PutImage(right_bar.w - image.columns / 2 + x - 3,
PutImage(right_bar.w - image.columns / 2 + x - 3,
preview_h - image.rows / 2 + y,
image.columns, image.rows, image.get_image()
);
@ -606,7 +606,7 @@ void DrawImageWithBg(dword _x, _y, _col_to)
_x *= preview_size;
_y *= preview_size;
DrawWideRectangle(_x,_y, preview_size, preview_size, preview_size-image.columns/2, _col_to);
_PutImage(preview_size - image.columns / 2 + _x, preview_size - image.rows / 2 + _y,
PutImage(preview_size - image.columns / 2 + _x, preview_size - image.rows / 2 + _y,
image.columns, image.rows, image.get_image_with_replaced_color(color2, _col_to));
}

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

@ -155,7 +155,7 @@ void draw_window()
scroll_v.all_redraw = scroll_h.all_redraw = 1;
if (skin_is_dark())
{
scroll_v.bckg_col = scroll_h.bckg_col = sc.work_light;
scroll_v.bckg_col = scroll_h.bckg_col = sc.light;
scroll_v.frnt_col = scroll_h.frnt_col = sc.button;
scroll_v.line_col = scroll_h.line_col = sc.button_text;
}

8
programs/cmm/kf_font_viewer/font_viewer.c
View File

@ -54,7 +54,7 @@ void main()
_DRAW_WINDOW_CONTENT:
DrawBar(0, 0, WINW, BARH-1, sc.work);
DrawBar(0, BARH-1,WINW,1,sc.work_graph);
DrawBar(0, BARH-1,WINW,1,sc.line);
if (!kfont.font) {
DrawBar(0, BARH, WINW, WINH - BARH, 0xFFFfff);
@ -130,15 +130,15 @@ void draw_checkbox(dword _x, _checked)
{
#define SIZE 14
#define CHBOXY 7
DrawRectangle3D(_x, CHBOXY, SIZE, SIZE, sc.work_graph, sc.work_graph);
DrawRectangle3D(_x, CHBOXY, SIZE, SIZE, sc.line, sc.line);
if (_checked == false)
{
DrawRectangle3D(_x+1, CHBOXY+1, SIZE-2, SIZE-2, 0xDDDddd, 0xffffff);
DrawBar(_x+2, CHBOXY+2, SIZE-3, SIZE-3, 0xffffff);
} else {
if (checkbox_flag) _PutImage(_x+1, CHBOXY+1, 13, 13, checkbox_flag);
if (checkbox_flag) PutImage(_x+1, CHBOXY+1, 13, 13, checkbox_flag);
}
DrawRectangle3D(_x-1,CHBOXY-1,SIZE+2,SIZE+2,sc.work_dark,sc.work_light);
DrawRectangle3D(_x-1,CHBOXY-1,SIZE+2,SIZE+2,sc.dark,sc.light);
}
char title[PATHLEN];

16
programs/cmm/lib/gui.h
View File

@ -147,8 +147,8 @@
if (ESI.edit_box.flags & 100000000000b) bg = 0xCACACA; else bg = 0xFFFfff;
edit_box_draw stdcall (edit_box_pointer);
DrawRectangle3D(x-1, y-1, w+1, h+1, 0xE7E7E7, bg);
DrawRectangle(x-2, y-2, w+3, h+3, sc.work_graph);
DrawRectangle3D(x-3, y-3, w+5, h+5, sc.work_dark, sc.work_light);
DrawRectangle(x-2, y-2, w+3, h+3, sc.line);
DrawRectangle3D(x-3, y-3, w+5, h+5, sc.dark, sc.light);
}
#define DOT_W 37
@ -164,8 +164,8 @@
if (ESI.edit_box.flags & 100000000000b) bg = 0xCACACA; else bg = 0xFFFfff;
edit_box_draw stdcall (edit_box_pointer);
DrawRectangle3D(x-1, y-1, w+1, box_h+1, 0xE7E7E7, bg);
DrawRectangle(x-2, y-2, w+3, box_h+3, sc.work_graph);
DrawRectangle3D(x-3, y-3, w+DOT_W+5, box_h+5, sc.work_dark, sc.work_light);
DrawRectangle(x-2, y-2, w+3, box_h+3, sc.line);
DrawRectangle3D(x-3, y-3, w+DOT_W+5, box_h+5, sc.dark, sc.light);
WriteText(x-2, y-19, 0x90, sc.work_text, title);
DrawCaptButton(x+w+1, y-2, DOT_W, box_h+3, btn, sc.button, sc.button_text, "...");
@ -214,7 +214,7 @@
GetProcessInfo(#wForm, SelfInfo);
CopyScreen(shadow_buf, 5*skinned+x+wForm.left, GetSkinHeight()*skinned+y+wForm.top, w, h);
ShadowImage(shadow_buf, w, h, strength);
_PutImage(x,y,w,h,shadow_buf);
PutImage(x,y,w,h,shadow_buf);
mem_Free(shadow_buf);
}
@ -229,9 +229,9 @@
:void Draw3DPopup(dword x,y,w,h)
{
DrawRectangle3D(x,y,w,h, sc.work_dark, sc.work_graph);
DrawBar(x+1,y+1,w-1,1,sc.work_light);
DrawBar(x+1,y+2,1,h-2,sc.work_light);
DrawRectangle3D(x,y,w,h, sc.dark, sc.line);
DrawBar(x+1,y+1,w-1,1,sc.light);
DrawBar(x+1,y+2,1,h-2,sc.light);
DrawPopupShadow(x,y,w,h-1,0);
}

6
programs/cmm/lib/gui/checkbox.h
View File

@ -33,7 +33,7 @@ struct checkbox
DefineHiddenButton(x-1, y-1, strlen(text)*8 + SIZE + 17, SIZE+2, id+BT_NOFRAME);
UnsafeDefineButton(x, y, SIZE, SIZE, id, 0);
DrawRectangle(x, y, SIZE, SIZE, sc.work_graph);
DrawRectangle(x, y, SIZE, SIZE, sc.line);
if (disabled)
{
DrawRectangle(x+1, y+1, SIZE-2, SIZE-2, 0xffffff);
@ -48,11 +48,11 @@ struct checkbox
else if (checked == true)
{
if (!checkbox_flag) checkbox_flag = memopen("CHECKBOX", NULL, SHM_READ);
if (checkbox_flag) _PutImage(x+1, y+1, 13, 13, checkbox_flag);
if (checkbox_flag) PutImage(x+1, y+1, 13, 13, checkbox_flag);
else DrawBar(x+2, y+2, SIZE-3, SIZE-3, 0x58C33C);
}
if (text) WriteTextWithBg(x+SIZE+8, SIZE / 2 + y -7, 0xD0, text_col, text, sc.work);
DrawRectangle3D(x-1,y-1,SIZE+2,SIZE+2,sc.work_dark,sc.work_light);
DrawRectangle3D(x-1,y-1,SIZE+2,SIZE+2,sc.dark,sc.light);
}
:void checkbox::redraw()

6
programs/cmm/lib/gui/more_less_box.h
View File

@ -49,14 +49,14 @@
check_values();
x=_x; y=_y;
DrawRectangle(x, y, VALUE_FIELD_W+1, SIZE, sc.work_graph);
DrawRectangle(x, y, VALUE_FIELD_W+1, SIZE, sc.line);
DrawRectangle3D(x+1, y+1, VALUE_FIELD_W-2, SIZE-2, 0xDDDddd, 0xffffff);
if (disabled)
{
DrawRectangle(x+1, y+1, VALUE_FIELD_W-2, SIZE-2, 0xffffff);
DrawBar(x+2, y+2, VALUE_FIELD_W-3, SIZE-3, 0xCCCccc);
text_col = sc.work_graph;
text_col = sc.line;
}
else
{
@ -69,7 +69,7 @@
DrawCaptButton(VALUE_FIELD_W + x + 1, y, SIZE, SIZE, id_inc, sc.button, sc.button_text, "+");
DrawCaptButton(VALUE_FIELD_W + x + SIZE, y, SIZE, SIZE, id_dec, sc.button, sc.button_text, "-");
WriteTextWithBg(x+VALUE_FIELD_W+SIZE+SIZE+10, SIZE / 2 + y -7, 0xD0, text_col, text, sc.work);
DrawRectangle3D(x-1,y-1,VALUE_FIELD_W+SIZE+SIZE+2,SIZE+2,sc.work_dark,sc.work_light);
DrawRectangle3D(x-1,y-1,VALUE_FIELD_W+SIZE+SIZE+2,SIZE+2,sc.dark,sc.light);
}
:void more_less_box::redraw()

6
programs/cmm/lib/gui/sensor.h
View File

@ -23,8 +23,8 @@
:void sensor::draw_wrapper()
{
DrawRectangle(x-1, y-1, w+1, h+1, sc.work_graph);
DrawRectangle3D(x-2, y-2, w+3, h+3, sc.work, sc.work_light);
DrawRectangle(x-1, y-1, w+1, h+1, sc.line);
DrawRectangle3D(x-2, y-2, w+3, h+3, sc.work, sc.light);
}
:void sensor::draw_progress(dword progress_w)
@ -32,7 +32,7 @@
char textp[16];
DrawBar(x, y, w-progress_w, 1, MixColors(PROGRESS_ACTIVE, PROGRESS_BG, 200));
DrawBar(x, y+1, w-progress_w, h-2, PROGRESS_ACTIVE);
DrawBar(x, y+h-1, w-progress_w, 1, MixColors(PROGRESS_ACTIVE, sc.work_graph, 200));
DrawBar(x, y+h-1, w-progress_w, 1, MixColors(PROGRESS_ACTIVE, sc.line, 200));
DrawBar(x+w-progress_w, y, progress_w, h, PROGRESS_BG);
strcpy(#textp, itoa(w-progress_w*100/w));

4
programs/cmm/lib/gui/tabs.h
View File

@ -28,8 +28,8 @@
int i, xx=x;
if (w) {
DrawBar(x+1,y+0+TAB_HEIGHT,w,1, sc.work_graph);
DrawBar(x+1,y+1+TAB_HEIGHT,w,1, sc.work_light);
DrawBar(x+1,y+0+TAB_HEIGHT,w,1, sc.line);
DrawBar(x+1,y+1+TAB_HEIGHT,w,1, sc.light);
}
for (i=0; i<count; i++) {

18
programs/cmm/lib/kolibri.h
View File

@ -439,12 +439,7 @@ inline fastcall dword SetWindowLayerBehaviour(EDX, ESI)
:void WriteTextB(dword x,y,byte fontType, dword color, str_offset)
{
EAX = 4;
EBX = x<<16+y;
ECX = fontType<<24+color;
EDX = str_offset;
ESI = 0;
$int 0x40;
WriteText(x,y,fontType, color, str_offset);
$add ebx, 1<<16
$int 0x40
}
@ -523,7 +518,7 @@ inline fastcall dword SetWindowLayerBehaviour(EDX, ESI)
$int 64
}
:void _PutImage(dword x,y, w,h, data_offset)
:void PutImage(dword x,y, w,h, data_offset)
{
EAX = 7;
EBX = data_offset;
@ -584,12 +579,12 @@ inline fastcall void PutPixel( EBX,ECX,EDX)
:void DefineDragableWindow(dword _x, _y, _w, _h)
{
DefineAndDrawWindow(_x, _y, _w, _h, 0x41,0x000000,NULL,0b);
DefineAndDrawWindow(_x, _y, _w, _h, 0x41,0x000000,EDI,0b);
}
:void DefineUnDragableWindow(dword _x, _y, _w, _h)
{
DefineAndDrawWindow(_x, _y, _w, _h, 0x01, 0, 0, 0x01fffFFF);
DefineAndDrawWindow(_x, _y, _w, _h, 0x01, 0, EDI, 0x01fffFFF);
}
:void EventDragWindow()
@ -617,7 +612,7 @@ inline fastcall void PutPixel( EBX,ECX,EDX)
:void DefineHiddenButton(dword _x, _y, _w, _h, _id)
{
DefineButton(_x, _y, _w, _h, _id + BT_HIDE, 0);
DefineButton(_x, _y, _w, _h, _id + BT_HIDE, ESI);
}
inline fastcall void DeleteButton( EDX)
@ -637,8 +632,7 @@ inline fastcall dword GetStartTime()
:dword X_EventRedrawWindow,Y_EventRedrawWindow;
:void _EventRedrawWindow()
{
DefineAndDrawWindow(X_EventRedrawWindow,Y_EventRedrawWindow,1,1,0x34,0xFFFFFF,NULL,0);
//pause(10);
DefineAndDrawWindow(X_EventRedrawWindow,Y_EventRedrawWindow,1,1,0x34,0xFFFFFF,EDI,0);
ExitProcess();
}
:char REDRAW_BUFF_EVENT_[4096];

4
programs/cmm/lib/obj/box_lib.h
View File

@ -217,8 +217,8 @@ struct frame
:void DrawFrame(dword x,y,w,h,text)
{
frame123.font_color = sc.work_text;
frame123.ext_col = sc.work_graph;
frame123.int_col = sc.work_light;
frame123.ext_col = sc.line;
frame123.int_col = sc.light;
frame123.font_backgr_color = sc.work;
frame123.start_x = x;

6
programs/cmm/lib/patterns/select_list.h
View File

@ -55,15 +55,15 @@ signed SelectList_ProcessMouse()
void SelectList_DrawBorder() {
DrawRectangle3D(select_list.x-2, select_list.y-2,
select_list.w+3+scroll1.size_x, select_list.h+3,
sc.work_dark, sc.work_light);
DrawRectangle(select_list.x-1, select_list.y-1, select_list.w+1+scroll1.size_x, select_list.h+1, sc.work_graph);
sc.dark, sc.light);
DrawRectangle(select_list.x-1, select_list.y-1, select_list.w+1+scroll1.size_x, select_list.h+1, sc.line);
}
void SelectList_DrawScroller()
{
scroll1.bckg_col = MixColors(sc.work, 0xBBBbbb, 80);
scroll1.frnt_col = MixColors(sc.work,0xFFFfff,120);
scroll1.line_col = sc.work_graph;
scroll1.line_col = sc.line;
scroll1.max_area = select_list.count;
scroll1.cur_area = select_list.visible;

18
programs/cmm/lib/patterns/toolbar_button.h
View File

@ -14,21 +14,21 @@ inline fastcall replace_2cols(EDI, EDX, ESI, ECX, EBX, EAX)
#define TSZE 25
static dword lightest, i16_mem, old_work_light;
dword i16_size;
if (!lightest) || (old_work_light != sc.work_light) {
old_work_light = sc.work_light;
lightest = MixColors(sc.work_light, 0xFFFfff, skin_is_dark()*155 + 20);
if (!lightest) || (old_work_light != sc.light) {
old_work_light = sc.light;
lightest = MixColors(sc.light, 0xFFFfff, skin_is_dark()*155 + 20);
if (ESI = memopen("ICONS18", NULL, SHM_READ)) {
i16_size = EDX;
i16_mem = malloc(i16_size);
memmov(i16_mem, ESI, i16_size);
replace_2cols(i16_mem, i16_size, 0xffFFFfff, sc.work_light, 0xffCACBD6, sc.work_dark);
replace_2cols(i16_mem, i16_size, 0xffFFFfff, sc.light, 0xffCACBD6, sc.dark);
}
}
DrawWideRectangle(_x+1, _y+1, TSZE, TSZE, 5, sc.work_light);
DrawWideRectangle(_x+1, _y+1, TSZE, TSZE, 5, sc.light);
DefineHiddenButton(_x, _y, TSZE+1, TSZE+1, _button_id);
if (_icon_n==-1) {
DrawBar(_x+6, _y+5, 16, 16, sc.work_light);
DrawBar(_x+6, _y+7, 15, 3, sc.work_graph);
DrawBar(_x+6, _y+5, 16, 16, sc.light);
DrawBar(_x+6, _y+7, 15, 3, sc.line);
$add ecx,5*65536
$int 64
$add ecx,5*65536
@ -39,9 +39,9 @@ inline fastcall replace_2cols(EDI, EDX, ESI, ECX, EBX, EAX)
}
if (!pressed) {
DrawOvalBorder(_x, _y, TSZE, TSZE, lightest, sc.work_graph, sc.work_light, sc.work);
DrawOvalBorder(_x, _y, TSZE, TSZE, lightest, sc.line, sc.light, sc.work);
} else {
DrawOvalBorder(_x, _y, TSZE, TSZE, sc.work_graph, sc.work_light, sc.work_dark, sc.work);
DrawOvalBorder(_x, _y, TSZE, TSZE, sc.line, sc.light, sc.dark, sc.work);
PutShadow(_x+1, _y+1, TSZE, TSZE, true, 2);
}

6
programs/cmm/lib/system.h
View File

@ -5,14 +5,14 @@
dword
nonset1,
taskbar_color,
work_dark,
work_light,
dark,
light,
window_title,
work,
button,
button_text,
work_text,
work_graph;
line;
void get();
} sc;

14
programs/cmm/menu/menu.c
View File

@ -205,7 +205,7 @@ void draw_list()
colors_set = true;
inactive_background_color = MixColors(sc.work, 0xFFFfff,230);
active_background_color = MixColors(sc.button, sc.work,230);
active_top_border_color = MixColors(sc.work_graph, sc.button,240);
active_top_border_color = MixColors(sc.line, sc.button,240);
inactive_text_shadow_color = MixColors(sc.work,0xFFFfff,120);
skin_dark = skin_is_dark();
}
@ -214,22 +214,22 @@ void draw_list()
{
if (streq(names.get(i), "-")) {
DrawBar(menu1.x, item_y+0, menu1.w, 1, inactive_background_color);
DrawBar(menu1.x-1, item_y+1, menu1.w+1, 1, sc.work_dark);
DrawBar(menu1.x, item_y+2, menu1.w, 1, sc.work_light);
DrawBar(menu1.x-1, item_y+1, menu1.w+1, 1, sc.dark);
DrawBar(menu1.x, item_y+2, menu1.w, 1, sc.light);
DrawBar(menu1.x, item_y+3, menu1.w, 1, inactive_background_color);
//DrawBar(menu1.x, item_y+0, menu1.w, 4, inactive_background_color);
//DrawBar(13, item_y+1, menu1.w-24, 1, sc.work_dark);
//DrawBar(13, item_y+2, menu1.w-24, 1, sc.work_light);
//DrawBar(13, item_y+1, menu1.w-24, 1, sc.dark);
//DrawBar(13, item_y+2, menu1.w-24, 1, sc.light);
item_y += SEP_H;
} else {
if (item_i==menu1.cur_y) {
hotkey_color = name_color = sc.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, sc.work_light);
DrawBar(menu1.x, item_y+ITEM_H-1, menu1.w, 1, sc.light);
} else {
name_color = sc.work_text;
hotkey_color = sc.work_graph;
hotkey_color = sc.line;
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));

2
programs/cmm/misc/easyshot.c
View File

@ -159,7 +159,7 @@ void DrawWindow()
void DrawStatusBar(char *s)
{
I_Param = s;
WriteTextWithBg(PD, 35+PD, 0xD0, sc.work_text, I_Param, sc.work_light);
WriteTextWithBg(PD, 35+PD, 0xD0, sc.work_text, I_Param, sc.light);
}
dword ScreenshotBuf()

4
programs/cmm/misc/mblocks.c
View File

@ -154,8 +154,8 @@ void ReDraw_Game_Button(int id)
void Draw_Panel()
{
DrawBar(0, PANEL_Y, WIN_W, 1, sc.work_dark);
DrawBar(0, PANEL_Y+1, WIN_W, 1, sc.work_light);
DrawBar(0, PANEL_Y, WIN_W, 1, sc.dark);
DrawBar(0, PANEL_Y+1, WIN_W, 1, sc.light);
DrawBar(0, PANEL_Y+2, WIN_W, PANEL_H-2, sc.work);
DefineButton(9, PANEL_Y+5, 102, 26, 5, sc.button);
WriteText(20, PANEL_Y+11, 0x90, sc.button_text, LABEL_NEW_GAME);

10
programs/cmm/misc/reshare.c
View File

@ -115,7 +115,7 @@ void start_daemon()
$pop eax
if (sc.work != EAX) {
memmov(shared_i16w, icons16.imgsrc, size16);
replace_2cols(shared_i16w, size16, 0xffFFFfff, sc.work, 0xffCACBD6, sc.work_dark);
replace_2cols(shared_i16w, size16, 0xffFFFfff, sc.work, 0xffCACBD6, sc.dark);
}
} while(WaitEvent()==evDesktop);
}
@ -164,7 +164,7 @@ void start_ui()
sc.get();
DefineAndDrawWindow(80, 50, WINW+9, WINH+4+GetSkinHeight(), 0x74, 0, "@RESHARE - A service that provides shared resorces", 0);
DrawBar(0, 0, WINW, RESY-PAD-1, sc.work); //top bg
DrawBar(0, RESY-PAD-1, WINW, 1, sc.work_graph);
DrawBar(0, RESY-PAD-1, WINW, 1, sc.line);
WriteText(PAD, PAD, 0x90, sc.work_text, "Each tab name corresponds to memory name that can be accessed by sysfunc 68.22. Now availabe:");
draw_tabs();
}
@ -172,7 +172,7 @@ void start_ui()
void DrawFlatButton(dword _x, _y, _text, _id, _active)
{
if (_active) EDX = sc.button; else EDX = sc.work_light;
if (_active) EDX = sc.button; else EDX = sc.light;
DrawBar(_x, _y, BTNW, BTNH+1, EDX);
if (_active) EDX = sc.button_text; else EDX = sc.work_text;
@ -218,14 +218,14 @@ void draw_tab_icons32()
iconw = 18;
iconh = icons16.h;
} else {
_PutImage(WINW-13/2, WINH-RESY-13/2+RESY, 13, 13, #checkbox_flag);
PutImage(WINW-13/2, WINH-RESY-13/2+RESY, 13, 13, #checkbox_flag);
return;
}
for (i = 0; i < iconh/iconw; i++)
{
PutPaletteImage(iconw*iconw*4*i + iconimg, iconw, iconw, 50-iconw/2+x, y+RESY, 32, 0);
WriteText(-strlen(itoa(i))*8+50/2+x, y+RESY+iconw+5, 0x90, sc.work_graph, itoa(i));
WriteText(-strlen(itoa(i))*8+50/2+x, y+RESY+iconw+5, 0x90, sc.line, itoa(i));
x += 50;
if (x + 50 > WINW) {
x = PAD;

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

@ -130,8 +130,8 @@ void SetAppColors()
//dark colors
swc.list_bg = sc.work;
swc.text = sc.work_text;
swc.dark = sc.work_dark;
swc.light = sc.work_light;
swc.dark = sc.dark;
swc.light = sc.light;
} else {
//light colors
swc.list_bg = 0xF3F3F3;
@ -225,8 +225,8 @@ byte process_sections(dword sec_name, f_name)
void DrawTopBar()
{
DrawBar(0,0,Form.cwidth, list.y-2, sc.work);
DrawBar(0,list.y-2, Form.cwidth, 1, MixColors(sc.work, sc.work_graph, 180));
DrawBar(0,list.y-1, Form.cwidth, 1, sc.work_graph);
DrawBar(0,list.y-2, Form.cwidth, 1, MixColors(sc.work, sc.line, 180));
DrawBar(0,list.y-1, Form.cwidth, 1, sc.line);
kfont.WriteIntoWindowCenter(0,5, Form.cwidth, list.y, sc.work, sc.work_text, 16, #window_title);
}

2
programs/cmm/notes/engine.h
View File

@ -134,7 +134,7 @@ dword NOTES::DrawLine(int line_n, draw_h) {
{
drawy = item_h*line_n+5+y;
DefineButton(RED_LINE_X-CHBOX/2+x, drawy, CHBOX-1,CHBOX-1, CHECKBOX_ID+line_n+BT_HIDE, 0); //checkbox
_PutImage(RED_LINE_X-CHBOX/2+x,drawy, CHBOX,CHBOX, lines[line_n].state*CHBOX*CHBOX*3+#checkbox);
PutImage(RED_LINE_X-CHBOX/2+x,drawy, CHBOX,CHBOX, lines[line_n].state*CHBOX*CHBOX*3+#checkbox);
if (cur_text) WriteText(x+RED_LINE_X+6, drawy+2, 0x80, lines[line_n].state*0x777777, cur_text);
if (lines[line_n].state == true) DrawBar(x+RED_LINE_X+6, drawy+6, strlen(cur_text)*6, 1, 0x444444); //strike
DrawBar(WIN_W,drawy,1,item_h,0xBBBBBB); //fast fix; proper fix is to restrict WriteText() char length

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

@ -174,7 +174,7 @@ void draw_window()
DrawBar(2,2,WIN_W-3,TITLE_H-4,0xE08C5E);
WriteText(9,TITLE_H/2-6,0x90,0xA9613A,WINDOW_CAPTION);
WriteTextB(7,TITLE_H/2-7,0x90,0xFFFfff,WINDOW_CAPTION);
_PutImage(1, TITLE_H, 292,EDGE_H, #edge);
PutImage(1, TITLE_H, 292,EDGE_H, #edge);
PutPixel(notes.x, notes.y-1, COL_RED_LINE);
ECX-=1; $int 0x40;
DrawCloseButton(WIN_W-23,4,16,16);

1
programs/cmm/pixie2/compile_en.bat
View File

@ -2,4 +2,5 @@
@del pixie
@rename pixie.com pixie
@del warning.txt
if not exists pixie ( @pause )
@pause

14
programs/cmm/quark/quark.c
View File

@ -627,7 +627,7 @@ void DrawToolbar()
if (menu_id == REOPEN_IN_APP) reopa = true;
DrawBar(0, 0, Form.cwidth, TOOLBAR_H - 1, sc.work);
DrawBar(0, TOOLBAR_H - 1, Form.cwidth, 1, sc.work_graph);
DrawBar(0, TOOLBAR_H - 1, Form.cwidth, 1, sc.line);
x.set(-GAP_S+8);
TopBarBt(#EventOpenDialog, ECTRL+SCAN_CODE_KEY_O, 0, x.inc(GAP_S), false);
@ -644,7 +644,7 @@ void DrawStatusBar(dword _in_text)
static char status_text[64];
if (Form.status_window&ROLLED_UP) return;
if (_in_text) strncpy(#status_text, _in_text, sizeof(status_text));
DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, sc.work_graph);
DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, sc.line);
DrawBar(0,Form.cheight - STATUSBAR_H+1, Form.cwidth,STATUSBAR_H-1, sc.work);
WriteText(5, Form.cheight - STATUSBAR_H + 4, 0x80, sc.work_text, #status_text);
if (file_path[0]) {
@ -687,20 +687,20 @@ bool DrawSearch()
char matches[30];
int _y = Form.cheight - SEARCH_H - STATUSBAR_H;
if (!search.visible) return false;
DrawBar(0, _y, Form.cwidth, 1, sc.work_graph);
DrawBar(0, _y, Form.cwidth, 1, sc.line);
DrawBar(0, _y+1, Form.cwidth, SEARCH_H-1, sc.work);
search_box.top = _y + 6;
search_box.width = math.min(Form.width - 200, 150);
DrawRectangle(search_box.left-1, search_box.top-1, search_box.width+2, 23,sc.work_graph);
DrawRectangle(search_box.left-1, search_box.top-1, search_box.width+2, 23,sc.line);
edit_box_draw stdcall(#search_box);
DrawCaptButton(search_box.left+search_box.width+14, search_box.top-1, 30,
TOOLBAR_ICON_HEIGHT+1, BTN_FIND_PREVIOUS+10, sc.work_light, sc.work_text, "<");
TOOLBAR_ICON_HEIGHT+1, BTN_FIND_PREVIOUS+10, sc.light, sc.work_text, "<");
DrawCaptButton(search_box.left+search_box.width+44, search_box.top-1, 30,
TOOLBAR_ICON_HEIGHT+1, BTN_FIND_NEXT+10, sc.work_light, sc.work_text, ">");
TOOLBAR_ICON_HEIGHT+1, BTN_FIND_NEXT+10, sc.light, sc.work_text, ">");
sprintf(#matches, T_MATCHES, search.found.count);
WriteTextWithBg(search_box.left+search_box.width+14+85,
@ -708,7 +708,7 @@ bool DrawSearch()
DefineHiddenButton(Form.cwidth-26, search_box.top-1, TOOLBAR_ICON_HEIGHT+1,
TOOLBAR_ICON_HEIGHT+1, BTN_FIND_CLOSE+10);
WriteText(Form.cwidth-26+7, search_box.top+2, 0x81, sc.work_graph, "x");
WriteText(Form.cwidth-26+7, search_box.top+2, 0x81, sc.line, "x");
return true;
}

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

@ -169,7 +169,7 @@ void draw_window()
Form.cwidth-scroll1.size_x-1,
Form.cheight-TOOLBAR_H-1);
SelectList_Draw();
DrawBar(0, TOOLBAR_H-1, Form.cwidth, 1, sc.work_graph);
DrawBar(0, TOOLBAR_H-1, Form.cwidth, 1, sc.line);
DrawBar(0, 0, Form.cwidth, TOOLBAR_H-1, sc.work);
DrawEditBox(#edit_name);
WriteText(edit_name.left-2, edit_name.top-20, 0x90, sc.work_text, T_SEARCH_NAME);

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

@ -171,8 +171,8 @@ void main()
WriteText(GAP+5, WIN_CONTENT_Y-20, 0x90, sc.work_text, T_PROC_HEADER);
DefineButton(RIGHT_X-38,WIN_CONTENT_Y-25,18,18,BTN_SHOWHIDE_SENSORS,sc.button);
DrawRectangle3D(RIGHT_X-38,WIN_CONTENT_Y-25,19,18,sc.work_graph,sc.work_light);
PutPixel(RIGHT_X-38+19,WIN_CONTENT_Y-25,sc.work_light);
DrawRectangle3D(RIGHT_X-38,WIN_CONTENT_Y-25,19,18,sc.line,sc.light);
PutPixel(RIGHT_X-38+19,WIN_CONTENT_Y-25,sc.light);
EDX = "<\0>";
EDX += show_sensors * 2;
WriteText(RIGHT_X-38+5,WIN_CONTENT_Y-25+2,0x90,sc.button_text, EDX);

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

@ -148,14 +148,14 @@ void Main_Window()
if (Form.status_window&ROLLED_UP) break;
DrawBar(0,0, Form.cwidth,TOPPANELH, sc.work);
DrawBar(0,TOPPANELH, Form.cwidth,1, sc.work_graph);
DrawBar(0,TOPPANELH, Form.cwidth,1, sc.line);
WriteText(6, 9, 0x90, sc.work_text, SIZE_TEXT);
DrawRectangle(edit_disk_size.left-1, edit_disk_size.top-1, edit_disk_size.width+2, 23,sc.work_graph);
DrawRectangle(edit_disk_size.left-1, edit_disk_size.top-1, edit_disk_size.width+2, 23,sc.line);
edit_box_draw stdcall (#edit_disk_size);
x = 6 + DrawStandartCaptButton(6, 36, 10, T_ADD_DISK);
DrawStandartCaptButton(x, 36, 11, T_DELETE_DISK);
_PutImage(6+6, 42, 14,14, #icons_btn);
_PutImage(x+6, 42, 14,14, 14*14*3+#icons_btn);
PutImage(6+6, 42, 14,14, #icons_btn);
PutImage(x+6, 42, 14,14, 14*14*3+#icons_btn);
GetDisks();
DrawTmpDisks();
}
@ -231,7 +231,7 @@ void DrawTmpDisks()
byte i;
DrawBar(0,TOPPANELH+1, Form.cwidth,Form.cheight-TOPPANELH-BOTPANELH-2, 0xFFFFFF);
DrawBar(0,Form.cheight-BOTPANELH-1, Form.cwidth,1, sc.work_graph);
DrawBar(0,Form.cheight-BOTPANELH-1, Form.cwidth,1, sc.line);
DrawBar(0,Form.cheight-BOTPANELH, Form.cwidth,BOTPANELH, sc.work);
sprintf(#free_ram_text, FREE_RAM_TEXT, GetFreeRAM()/1024);
WriteText(10, Form.cheight-20, 0x90, sc.work_text, #free_ram_text);
@ -251,7 +251,7 @@ void DrawTmpDisks()
WriteText(disk_pos_x[i]+29,disk_pos_y[i]+6, 0x90, 0x222222, #disk_list[i].Item);
WriteText(disk_pos_x[i]+30,disk_pos_y[i]+24, 0x80, 0x555555,
ConvertSize(GetDiskSize(disk_list[i].Item[3] - '0')));
_PutImage(disk_pos_x[i]+9,disk_pos_y[i]+10, 15,9, #disk_icon);
PutImage(disk_pos_x[i]+9,disk_pos_y[i]+10, 15,9, #disk_icon);
if (selected==i) {
if ( edit_disk_size.flags & ed_focus)
selection_color = SELECTION_INACTIVE;