| /programs/cmm/TWB/links.h |
|---|
| 24,7 → 24,6 |
| unsigned int unic_count; |
| unsigned int active; |
| bool HoverAndProceed(); |
| bool Click(); |
| void AddLink(); |
| void AddText(); |
| dword GetURL(); |
| 82,8 → 81,16 |
| PathShow_data status_text = {0, 17,250, 6, 250}; |
| bool LinksArray::Click(dword list_first) |
| bool LinksArray::HoverAndProceed(dword mx, my, list_y, list_first) |
| { |
| int i; |
| if (!count) return true; |
| for (i=0; i<count; i++) |
| { |
| if (mx>links[i].x) && (my>links[i].y) |
| && (mx<links[i].x+links[i].w) && (my<links[i].y+links[i].h) |
| && (my>list_y+list_first) |
| { |
| if (mouse.lkm) && (mouse.down) { |
| DrawRectangle(links[active].x, -list_first + links[active].y, |
| links[active].w, links[active].h, 0); |
| 110,19 → 117,7 |
| EventShowLinkMenu(); |
| return false; |
| } |
| } |
| bool LinksArray::HoverAndProceed(dword mx, my, list_y, list_first) |
| { |
| int i; |
| if (!count) return true; |
| for (i=0; i<count; i++) |
| { |
| if (mx>links[i].x) && (my>links[i].y) |
| && (mx<links[i].x+links[i].w) && (my<links[i].y+links[i].h) |
| && (my>list_y+list_first) |
| { |
| if (active!=i) { |
| if (active==i) return false; |
| CursorPointer.Load(#CursorFile); |
| CursorPointer.Set(); |
| 136,8 → 131,6 |
| active = i; |
| DrawStatusBar(links[active].link); |
| } |
| Click(list_first); |
| return true; |
| } |
| } |
| /programs/cmm/browser/texts.h |
|---|
| 1,4 → 1,4 |
| char version[]="WebView 2.5c"; |
| char version[]="WebView 2.5b"; |
| #ifdef LANG_RUS |
| char page_not_found[] = FROM "html\\page_not_found_ru.htm""\0"; |
| /programs/cmm/browser/WebView.c |
|---|
| 131,8 → 131,6 |
| } else if (!strncmp(#param, "-source ", 8)) { |
| source_mode = true; |
| history.add(#param + 8); |
| } else if (!strncmp(#param, "-new ", 5)) { |
| history.add(#param + 5); |
| } else { |
| if (GetProcessesCount("WEBVIEW") == 1) { |
| history.add(#param); |
| 165,8 → 163,8 |
| case evMouse: |
| edit_box_mouse stdcall (#address_box); |
| mouse.get(); |
| PageLinks.HoverAndProceed(mouse.x, WB1.list.first + mouse.y, WB1.list.y, WB1.list.first); |
| if (PageLinks.active == -1) && (mouse.pkm) && (mouse.up) { |
| if (PageLinks.HoverAndProceed(mouse.x, WB1.list.first + mouse.y, WB1.list.y, WB1.list.first)) |
| && (mouse.pkm) && (mouse.up) { |
| if (WB1.list.MouseOver(mouse.x, mouse.y)) EventShowPageMenu(); |
| break; |
| } |
| 630,14 → 628,11 |
| void EventClickLink(dword _click_URL) |
| { |
| char new_url[URL_SIZE+1]; |
| char new_url_full[URL_SIZE+1]; |
| if (open_new_window) { |
| strncpy(#new_url, _click_URL, sizeof(new_url)); |
| strcpy(#new_url, _click_URL); |
| GetAbsoluteURL(#new_url, history.current()); |
| strcpy(#new_url_full, "-new "); |
| strncat(#new_url_full, #new_url, sizeof(new_url_full)); |
| RunProgram(#program_path, #new_url_full); |
| RunProgram(#program_path, #new_url); |
| return; |
| } |