From 876d1656cda7c3a41c4941079c6f4499c8372f51 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Fri, 5 Apr 2013 12:58:55 +0000 Subject: [PATCH] HTMLv: unused code deleted, a little bit more right menu work implementation git-svn-id: svn://kolibrios.org@3449 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/browser/HTMLv.c | 36 +------------------------ programs/cmm/browser/TWB.h | 2 +- programs/cmm/browser/include/menu_rmb.h | 6 ++--- 3 files changed, 4 insertions(+), 40 deletions(-) diff --git a/programs/cmm/browser/HTMLv.c b/programs/cmm/browser/HTMLv.c index 6544822faf..be23098662 100644 --- a/programs/cmm/browser/HTMLv.c +++ b/programs/cmm/browser/HTMLv.c @@ -24,6 +24,7 @@ #define URL param int use_truetype = 0; +char fontlol[64]; char editURL[sizeof(URL)], page_links[12000], @@ -50,41 +51,6 @@ mouse m; #include "include\menu_rmb.h" -void tre() -{ - char *font_picture; - char text[20]; - int width=600; - int height=20; -// char palette[256*4]; - int x; - - text_out stdcall ("hello world\0",#fontlol, 17, 0x0, 10, 10); - text_out stdcall ("heyeyey!\0",#fontlol, 27, 0x0, 10, 30); - text_out stdcall ("alarm!\0", #fontlol, 47, 0x00FF0000, 10, 70); - /* - strcpy(#text, "hello world\0"); - - debug("get width\n"); - get_width stdcall (#text, #fontinfo, height); - width=EAX; - for (x=0;x<20;x++) { - init_font(#fontinfo); - debug("yaya\n"); - font_picture=mem_Alloc(width*height); - text[1]=30+x; - truetype stdcall (#text, #fontinfo, font_picture, width, height); - - debug("blyad'!\n"); - - - - PutPaletteImage(font_picture,width,height,0,20*x,8,#palette); - mem_Free(font_picture); }*/ -} - -char fontlol[64]; - void main() { int btn; diff --git a/programs/cmm/browser/TWB.h b/programs/cmm/browser/TWB.h index d5215b5ee7..7ec7ac3db0 100644 --- a/programs/cmm/browser/TWB.h +++ b/programs/cmm/browser/TWB.h @@ -163,7 +163,7 @@ void TWebBrowser::Scan(int id) return; case HOME: - strcpy(#editURL, "http://kolibri-os.narod.ru"); + strcpy(#editURL, "http://kolibri-n.org/index.php"); case GOTOURL: case 0x0D: //enter strcpy(#URL, #editURL); diff --git a/programs/cmm/browser/include/menu_rmb.h b/programs/cmm/browser/include/menu_rmb.h index 11f6b6a8c9..4e41acf006 100644 --- a/programs/cmm/browser/include/menu_rmb.h +++ b/programs/cmm/browser/include/menu_rmb.h @@ -39,7 +39,8 @@ void menu_rmb() if (id1<0) || (id1+1>items_num) || (mm.x<0) || (mm.x>ITEM_WIDTH) break; if (mm.lkm) || (mm.pkm) { - WB1.Scan(ITEMS_LIST[items_cur*2+1]); + ActivateWindow(GetProcessSlot(Form.ID)); + SendWindowMessage(evKey, ITEMS_LIST[items_cur*2+1]); ExitProcess(); } if (items_cur<>id1) @@ -50,9 +51,6 @@ void menu_rmb() break; case evButton: - id1=GetButtonID()-10; - WB1.Scan(ITEMS_LIST[id1*2+1]); - ExitProcess(); break; case evKey: