Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 8364 → Rev 8365

/programs/cmm/browser/TWB/TWB.c
455,6 → 455,8
if (!value) value = tag.get_value_of("data-src=");
if (!value) goto NOIMG;
 
if (!strcmp(value + strrchr(value, '.'), "svg")) goto NOIMG;
 
strlcpy(#img_path, value, sizeof(img_path)-1);
get_absolute_url(#img_path, history.current());
 
/programs/cmm/browser/TWB/special.h
46,6 → 46,8
"#9660", "v",
"#65122", "+",
 
"#8594", "->",
 
"uarr", "\24",
"darr", "\25",
"rarr", "\26",
/programs/cmm/browser/WebView.c
78,6 → 78,7
dword cur_img_url;
dword shared_url;
dword http_get_type;
dword render_start_time;
int menu_id=NULL;
 
char default_dir[] = "/rd/1";
701,6 → 702,7
strcat(#editURL, #anchors.current);
DrawOmnibox();
}
render_start_time = GetStartTime();
WB1.ParseHtml(_bufdata, _in_bufsize);
// REJECTED. Reason: infinite redirect at Google Results.
/*
949,6 → 951,7
DrawOmnibox();
WB1.ParseHtml(WB1.o_bufpointer, WB1.bufsize);
WB1.DrawPage();
debugln(sprintf(#param, "WebView: page rendered in %i sec", GetStartTime()-render_start_time/100));
}
 
stop:
/programs/cmm/lib/gui/sensor.h
1,7 → 1,7
 
#define MIN_PB_BLOCK_W 19
#define LOAD_CPU 0x2460C8
#define PROGRESS_ACTIVE 0x489FE4
#define PROGRESS_ACTIVE 0x62B7E4
#define PROGRESS_BG 0xFFFfff
#define PROGRESS_BG_TEXT 0x696969
 
/programs/demos/aclock/trunk/aclock.asm
25,14 → 25,14
; configuration stuff
;********************************************************************
 
%define APPNAME "AClock 1.1"
%define APPNAME "Clock"
%define STACKSIZE 1024
 
; default window position/dimensions (work area)
%define DEFAULT_XPOS -20
%define DEFAULT_YPOS 20
%define DEFAULT_WIDTH 100
%define DEFAULT_HEIGHT 100
%define DEFAULT_WIDTH 110
%define DEFAULT_HEIGHT 110
 
; minimal size (horizontal and vertical) of work area
%define MIN_WIDTH 100
/programs/develop/asciivju/trunk/asciivju.asm
16,7 → 16,10
FOCUS_SQUARE_COLOR = 0x000080FF
SWITCHER_BLINK_COLOR = 0x00808080
 
FONT_SMALL = 0x01000000
FONT_BIG = 0x10000000
 
 
start:
still:
mcall 10
33,6 → 36,8
je quit
cmp ax, 0xFFAA ; page switcher
je .switch_page ; any button with a character
cmp ax, 0xEEBB ; page switcher
je .switch_font
.change_focus:
mov bl, [symbol_focused]
mov [symbol_unfocused], bl
41,6 → 46,13
stdcall draw_table, 0
call draw_codes
jmp still
.switch_font:
cmp [font_type], FONT_SMALL
jne @f
mov [font_type], FONT_BIG
jmp redraw
@@: mov [font_type], FONT_SMALL
jmp redraw
.switch_page:
movzx bx, [symbol_start]
add bx, BUTTON_ID_SHIFT
77,6 → 89,7
stdcall draw_table, 1
call draw_codes
stdcall draw_page_switcher, 0
stdcall draw_font_switcher
 
@@:
mcall 12, 2
234,7 → 247,8
shl ebx, 16
add ebx, [button_y]
add ebx, 7
mcall 4, , 0x01000000, symbol_current, 1
mov ecx, [font_type]
mcall 4, , , symbol_current, 1
 
ret
endp
247,7 → 261,7
cmp [_blinking], 1 ; blinking?
jne @f
mov esi, SWITCHER_BLINK_COLOR
@@: mcall , <2,98>, <PANEL_Y+1,23>, 0x2000FFAA
@@: mcall , <2,98>, <PANEL_Y+1,23>, 0x0000FFAA
 
mov ecx, 0x81000000
mov edx, string_000_127
255,17 → 269,30
je @f
mov edx, string_128_255 ; ok, the second one
@@: mcall 4, <10,PANEL_Y+6>,
mcall , <115,PANEL_Y+6>, 0x81000000, string_ASCII_CODE
mcall , <278,PANEL_Y+6>, 0x81000000, string_ASCII_CODE
 
ret
endp
 
proc draw_font_switcher
 
mcall 8, <120,136>, <PANEL_Y+1,23>, 0x0000EEBB
 
mov edx, string_font_small
cmp [font_type], FONT_SMALL
je @f
mov edx, string_font_big
@@: mcall 4, <130,PANEL_Y+6>,,,10
 
ret
endp
 
 
proc draw_codes
 
movzx ecx, [symbol_focused]
mcall 47, 0x00030000, , <250,PANEL_Y+6>, 0x41000000, 0xAAAaaa
mcall , 0x00020100, , <500,PANEL_Y+6>,
mcall 47, 0x00030000, , <339,PANEL_Y+6>, 0x41000000, 0xAAAaaa
mcall , 0x00020100, , <508,PANEL_Y+6>,
 
ret
endp
278,11 → 305,15
szZ window_title ,'ASCIIVju'
szZ string_000_127 ,'000-127'
szZ string_128_255 ,'128-255'
szZ string_ASCII_CODE ,'ASCII Code: ASCII Hex-Code:'
szZ string_font_small ,'Font1 6x9 '
szZ string_font_big ,'Font2 8x14'
szZ string_ASCII_CODE ,'Code: Hex-Code:'
 
button_x dd 2
button_y dd 2
 
font_type dd FONT_SMALL
 
symbol_current db 0
symbol_start db 0