Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 8019 → Rev 8020

/programs/cmm/TWB/img.h
56,19 → 56,6
data.set(getid, _data);
}
 
void DrawLibimgImage(dword _x, _y, _data, _data_len)
{
libimg_image im;
img_decode stdcall (_data, _data_len, 0);
$or eax, eax
$jz __ERROR__
im.image = EAX;
im.set_vars();
im.draw(_x, _y, im.w, im.h, 0, 0);
__ERROR__:
}
 
void _img::draw(int _x, _y, _start, _height)
{
int i, img_x, img_y;
86,6 → 73,19
}
}
 
void DrawLibimgImage(dword _x, _y, _data, _data_len)
{
libimg_image im;
img_decode stdcall (_data, _data_len, 0);
$or eax, eax
$jz __ERROR__
im.image = EAX;
im.set_vars();
im.draw(_x, _y, im.w, im.h, 0, 0);
__ERROR__:
}
 
/*
 
void ImageCache::Images(dword left1, top1, width1)
/programs/cmm/TWB/parse_tag.h
106,6 → 106,7
ESBYTE[i+1] = '\0';
}
strlwr(#attr);
strrtrim(#val);
 
attributes.add(#attr);
values.add(#val);
/programs/cmm/appearance/appearance.c
132,7 → 132,7
select_list.ProcessMouse(mouse.x, mouse.y);
SelectList_Draw();
EventSetNewCurrent();
open_lmenu(Form.left+mouse.x+5, Form.top+mouse.y+skin_height, 1, 0, MENU_LIST);
open_lmenu(mouse.x, mouse.y, MENU_TOP_RIGHT, NULL, MENU_LIST);
}
break;
 
/programs/cmm/browser/WebView.c
32,7 → 32,7
 
#define URL_SIZE 4000
 
char version[]="WebView 2.65";
char version[]="WebView 2.65b";
 
#include "texts.h"
#include "cache.h"
789,27 → 789,28
 
void EventShowPageMenu()
{
open_lmenu(Form.left + mouse.x+4, Form.top + skin_height + mouse.y, MENU_ALIGN_TOP_LEFT, NULL, #rmb_menu);
open_lmenu(mouse.x, mouse.y, MENU_TOP_LEFT, NULL, #rmb_menu);
menu_id = VIEW_SOURCE;
}
 
void EventShowLinkMenu()
{
open_lmenu(Form.left + mouse.x+4, Form.top + skin_height + mouse.y, MENU_ALIGN_TOP_LEFT, NULL, #link_menu);
open_lmenu(mouse.x, mouse.y, MENU_TOP_LEFT, NULL, #link_menu);
menu_id = IN_NEW_TAB;
}
 
void EventShowMainMenu()
{
open_lmenu(Form.left + Form.cwidth - PADDING, Form.top + skin_height + PADDING + TSZE + 3,
MENU_ALIGN_TOP_RIGHT, NULL, #main_menu);
open_lmenu(Form.cwidth - PADDING -4, PADDING + TSZE + 3,
MENU_TOP_RIGHT, NULL, #main_menu);
menu_id = OPEN_FILE;
}
 
void EventShowEncodingsList()
{
open_lmenu(Form.left + Form.cwidth, Form.top + skin_height + Form.cheight - STATUSBAR_H + 12,
MENU_ALIGN_BOT_RIGHT, WB1.cur_encoding + 1, "UTF-8\nKOI8-RU\nCP1251\nCP1252\nISO8859-5\nCP866");
open_lmenu(Form.cwidth-4, Form.cheight - STATUSBAR_H + 12,
MENU_BOT_RIGHT, WB1.cur_encoding + 1,
"UTF-8\nKOI8-RU\nCP1251\nCP1252\nISO8859-5\nCP866");
menu_id = ENCODINGS;
}
 
/programs/cmm/eolite/Eolite.c
3,8 → 3,8
 
// 70.5 - get volume info and label
 
#define TITLE "Eolite File Manager 4.46c"
#define ABOUT_TITLE "EOLITE 4.46c"
#define TITLE "Eolite File Manager 4.46d"
#define ABOUT_TITLE "EOLITE 4.46d"
 
#ifndef AUTOBUILD
#include "lang.h--"
172,6 → 172,7
param[strrchr(#param, '/')-1] = '\0';
strcpy(#path, #param + 3);
properties_dialog();
ExitProcess();
return;
case 'd':
strcpy(#file_path, #param + 3);
178,11 → 179,13
itdir = dir_exists(#file_path);
DisplayOperationForm(DELETE_FLAG);
DeleteSingleElement();
ExitProcess();
return;
case 'v':
cut_active = param[2] - '0';
strcpy(#path, #param + 4);
PasteThread();
ExitProcess();
return;
}
}
/programs/cmm/eolite/include/menu.h
140,15 → 140,13
text = #file_actions;
active_menu = MENU_FILE;
}
open_lmenu(mouse.x+Form.left+5, mouse.y+Form.top+3
+skin_height, MENU_ALIGN_TOP_LEFT, NULL, text);
open_lmenu(mouse.x, mouse.y+3, MENU_TOP_LEFT, NULL, text);
}
 
void EventShowBurgerMenu()
{
active_menu = MENU_BURGER;
open_lmenu(Form.width-10+Form.left, 35+Form.top+skin_height,
MENU_ALIGN_TOP_RIGHT, NULL, #burger_menu_items);
open_lmenu(Form.cwidth-6, 35, MENU_TOP_RIGHT, NULL, #burger_menu_items);
}
 
bool GetMenuClick()
/programs/cmm/examples/menu.c
44,13 → 44,13
if (id==1) ExitProcess();
if (id==butv.id) {
menu_id = butv.id;
open_lmenu(Form.left+3 + butv.x, Form.top+skin_height + butv.y + butv.h,
MENU_ALIGN_TOP_LEFT, current_veg, #vegetables);
open_lmenu(butv.x, butv.y + butv.h, MENU_TOP_LEFT,
current_veg, #vegetables);
}
if (id==buta.id) {
menu_id = buta.id;
open_lmenu(Form.left+5 + buta.x + buta.w, Form.top+skin_height + buta.y + buta.h,
MENU_ALIGN_TOP_RIGHT, current_animal, #animals);
open_lmenu(buta.x + buta.w, buta.y + buta.h,
MENU_TOP_RIGHT, current_animal, #animals);
}
break;
 
/programs/cmm/iconedit/iconedit.c
743,14 → 743,14
 
void EventShowImageMenu()
{
open_lmenu(Form.left+5 + image_menu_btn.x, Form.top+skin_height +
image_menu_btn.y + image_menu_btn.h, MENU_ALIGN_TOP_LEFT, NULL, #image_menu_items);
open_lmenu(image_menu_btn.x, image_menu_btn.y + image_menu_btn.h,
MENU_TOP_LEFT, NULL, #image_menu_items);
}
 
void EventShowEditMenu()
{
open_lmenu(Form.left+5 + image_menu_btn.x, Form.top+skin_height +
image_menu_btn.y + image_menu_btn.h, MENU_ALIGN_TOP_LEFT, NULL, #edit_menu_items);
open_lmenu(image_menu_btn.x, image_menu_btn.y + image_menu_btn.h,
MENU_TOP_LEFT, NULL, #edit_menu_items);
}
 
void EventCheckMenuItemSelected()
/programs/cmm/lib/gui/menu.h
3,10 → 3,10
 
:dword menu_process_id;
 
#define MENU_ALIGN_TOP_LEFT 0
#define MENU_ALIGN_TOP_RIGHT 1
#define MENU_ALIGN_BOT_LEFT 2
#define MENU_ALIGN_BOT_RIGHT 3
#define MENU_TOP_LEFT 0
#define MENU_TOP_RIGHT 1
#define MENU_BOT_LEFT 2
#define MENU_BOT_RIGHT 3
 
:dword shared_mem = NULL;
:char shared_name[] = "LMENU";
17,8 → 17,8
if (EDX) shared_mem = memopen(#shared_name, 16, SHM_WRITE);
}
ESDWORD[shared_mem ] = _selected;
ESDWORD[shared_mem + 4] = _x;
ESDWORD[shared_mem + 8] = _y;
ESDWORD[shared_mem + 4] = _x + Form.left + 5;
ESDWORD[shared_mem + 8] = _y + Form.top + skin_height;
ESDWORD[shared_mem + 12] = _position;
menu_process_id = RunProgram("/sys/develop/menu", _text1);
}
/programs/cmm/misc/calypte.c
437,8 → 437,8
 
void EventShowMenu(dword _menu_item_x, _menu_list, _id, _selected)
{
open_lmenu(Form.left+5 + _menu_item_x, Form.top+skin_height + TOPPANELH,
MENU_ALIGN_TOP_LEFT, _selected, _menu_list);
open_lmenu(_menu_item_x, TOPPANELH, MENU_TOP_LEFT,
_selected, _menu_list);
menu_id = _id;
}
 
/programs/cmm/quark/quark.c
379,8 → 379,8
void EventShowCharsetsList()
{
menu_id = CHANGE_CHARSET;
open_lmenu(Form.left + Form.cwidth, Form.top + skin_height
+ Form.cheight - 6, MENU_ALIGN_BOT_RIGHT, user_encoding+1,
open_lmenu(Form.cwidth-4, Form.cheight - 6, MENU_BOT_RIGHT,
user_encoding+1,
"UTF-8\nKOI8-RU\nCP1251\nCP1252\nISO8859-5\nCP866\nAUTO");
}
 
387,8 → 387,7
void EventShowReopenMenu()
{
menu_id = REOPEN_IN_APP;
open_lmenu(Form.left+5 + reopenin_mx + 23, Form.top+29+skin_height,
MENU_ALIGN_TOP_RIGHT, NULL,
open_lmenu(reopenin_mx + 23, 29, MENU_TOP_RIGHT, NULL,
"Tinypad\nTextEdit\nWebView\nFB2Read\nHexView\nOther");
}
 
395,8 → 394,7
void EventShowThemesList()
{
menu_id = COLOR_SCHEME;
open_lmenu(Form.left+5 + theme_mx + 23,
Form.top+29+skin_height, MENU_ALIGN_TOP_RIGHT,
open_lmenu(theme_mx + 23, 29, MENU_TOP_RIGHT,
curcol_scheme+1, #color_scheme_names);
}
 
403,8 → 401,7
void EventShowRmbMenu()
{
menu_id = RMB_MENU;
open_lmenu(Form.left + mouse.x+4, Form.top + skin_height + mouse.y,
MENU_ALIGN_TOP_LEFT, NULL, #rmb_menu);
open_lmenu(mouse.x, mouse.y, MENU_TOP_LEFT, NULL, #rmb_menu);
}