Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7994 → Rev 7995

/programs/cmm/taskbar2/compile.bat
File deleted
\ No newline at end of file
/programs/cmm/taskbar2/build.bat
0,0 → 1,5
C-- taskbar2.c
@del @taskbar
@rename taskbar2.com @taskbar
@del warning.txt
@pause
/programs/cmm/taskbar2/taskbar2.c
1,4 → 1,4
#define MEMSIZE 4096*20
#define MEMSIZE 1024*80
 
//===================================================//
// //
30,6 → 30,8
 
llist list;
 
_ini ini = { "/sys/settings/appicons.ini", "icons"};
 
proc_info Form;
proc_info Process;
 
64,9 → 66,6
load_dll(libimg, #libimg_init,1);
load_dll(libini, #lib_init,1);
 
skin.load("/sys/icons32.png");
skin.replace_color(0x00000000, COLOR_BG);
 
ini_get_int stdcall ("/sys/appicons.ini", "taskbar", "attachement", ATTACHEMENT_BOTTOM);
attachement = EAX;
 
76,11 → 75,8
GetProcessInfo(#Form, SelfInfo);
SetWindowLayerBehaviour(-1, ZPOS_DESKTOP);
SetEventMask(EVM_REDRAW+EVM_KEY+EVM_BUTTON+EVM_MOUSE+EVM_MOUSE_FILTER);
loop()
loop() switch(@WaitEventTimeout(50))
{
WaitEventTimeout(50);
switch(EAX & 0xFF)
{
case evMouse:
if (!CheckActiveProcess(Form.ID)) break;
mouse.get();
95,7 → 91,7
}
break;
case evButton:
btn = GetButtonID();
btn = @GetButtonID();
btn -= 100;
if (btn < attached.count) RunProgram(attached.get(btn), NULL);
else EventSetActiveProcess(btn);
107,7 → 103,6
DrawProcessList();
}
}
}
 
 
void GetProcessList()
158,19 → 153,12
{
if (proc_list[i+list.first]==0) {
status_color = COLOR_BG;
ini_get_int stdcall (
"/sys/appicons.ini",
"icons",
attached.get(i+list.first)+strrchr(attached.get(i+list.first),'/'),
0
);
icon_n = EAX;
icon_n = ini.GetInt(attached.get(i+list.first)+strrchr(attached.get(i+list.first),'/'), 2);
}
else {
GetProcessInfo(#Process, proc_list[i+list.first]);
strlwr(#Process.name);
ini_get_int stdcall ("/sys/appicons.ini", "icons", #Process.name, 0);
icon_n = EAX;
icon_n = ini.GetInt(#Process.name, 2);
if (CheckActiveProcess(Process.ID)) && (Process.status_window!=2) {
current_process_id = Process.ID;
status_color = COLOR_ACTIVE;
181,7 → 169,7
}
DrawWideRectangle(posx, posy, 40, 40, CELL_PADDING, COLOR_BG);
DefineButton(posx, posy, CELLW-1, CELLH, 100+i+BT_HIDE+BT_NOFRAME, NULL);
img_draw stdcall(skin.image, posx+CELL_PADDING, posy+CELL_PADDING, 32, 32, 0, 32*icon_n);
DrawIcon32(posx+CELL_PADDING, posy+CELL_PADDING, COLOR_BG, icon_n);
 
if (ATTACHEMENT_BOTTOM==attachement) DrawBar(posx, posy+CELLH-ACTIVE_SIZE, CELLW, ACTIVE_SIZE, status_color);
if (ATTACHEMENT_LEFT ==attachement) DrawBar(posx, posy, ACTIVE_SIZE, CELLH, status_color);
231,7 → 219,7
void GetAttachedItems()
{
attached.drop();
ini_enum_keys stdcall ("/sys/appicons.ini", "attached", #draw_icons_from_section);
ini_enum_keys stdcall ("/sys/settings/appicons.ini", "attached", #draw_icons_from_section);
}
//===================================================//
// //