Subversion Repositories Kolibri OS

Rev

Rev 5452 | Rev 6218 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 5452 Rev 5872
Line 9... Line 9...
9 
	mcall	12,1
 9 
	mcall	12,1
Line 10... Line 10...
10 
 
 10 
 
Line 11... Line 11...
11 
	mcall	48,3,system_colours,10*4
 11 
	mcall	48,3,system_colours,10*4
12 
 
 - 
 
13 
	mov	eax, [system_colours+4*6]
 - 
 
14 
;	sub	eax, 0x101010
 - 
 
15 
;	mov	[wcolor], eax
 12 
 
16 
 
 13 
	mov	eax, [system_colours+4*6]
17 
	mov	edx,[system_colours+4*6]
 14 
	mov	edx,[system_colours+4*6]
18 
	mov	eax,COLOR_CHANGE_MAGNITUDE
 15 
	mov	eax,COLOR_CHANGE_MAGNITUDE
Line 83... Line 80...
83 
align 4
 80 
align 4
84 
fill_window:
81 
fill_window:
85 
	movzx	ebx,word [screenxy+2]
 82 
	movzx	ebx,word [screenxy+2]
86 
	xor	ecx,ecx
 83 
	xor	ecx,ecx
87 
	mov	edx,[wcolor]
 84 
	mov	edx,[wcolor]
88 
;	add	edx,0x161616
 - 
 
89 
	mov	eax,COLOR_CHANGE_MAGNITUDE_0
 85 
	mov	eax,COLOR_CHANGE_MAGNITUDE_0
90 
	imul	eax,dword [soften_height]
 86 
	imul	eax,dword [soften_height]
91 
	call	subtract_color_change_magnitude
 87 
	call	subtract_color_change_magnitude
92 
	cmp	[soften_up],dword 0
 88 
	cmp	[soften_up],dword 0
93 
	je	no_su
 89 
	je	no_su
94 
;--------------------------------------
 90 
;--------------------------------------
95 
align 4
 91 
align 4
96 
@@:			; debug.inc has macros with the same name
 - 
 
97 
;	sub	edx,0x040404
 92 
@@:
98 
	mov	eax,COLOR_CHANGE_MAGNITUDE_0
 93 
	mov	eax,COLOR_CHANGE_MAGNITUDE_0
99 
	call	add_color_change_magnitude
 94 
	call	add_color_change_magnitude
100 
; draw soften_up - the width of 5 pixels
 95 
; draw soften_up - the width of 5 pixels
101 
	and	edx,0x00FFFFFF
 96 
	and	edx,0x00FFFFFF
102 
	mcall	38
 97 
	mcall	38
Line 144... Line 139...
144 
	rol	ecx,16
 139 
	rol	ecx,16
145 
	add	ecx,[soften_height]
 140 
	add	ecx,[soften_height]
146 
;--------------------------------------
 141 
;--------------------------------------
147 
align 4
 142 
align 4
148 
@@:
 143 
@@:
149 
;	mov	esi,stripe
 - 
 
150 
	mov	edx,[wcolor]
 144 
	mov	edx,[wcolor]
151 
;--------------------------------------
 145 
;--------------------------------------
152 
align 4
 146 
align 4
153 
newline3:
 147 
newline3:
154 
	and	edx,0x00FFFFFF
 148 
	and	edx,0x00FFFFFF
Line 179... Line 173...
179 
 
 173 
 
180 
	mov	ecx,1 *65536
 174 
	mov	ecx,1 *65536
181 
	add	ecx,[height]
 175 
	add	ecx,[height]
182 
	dec	ecx
 176 
	dec	ecx
183 
	mov	edx,101
 - 
 
184 
;	add	edx,[button_frames]
 177 
	mov	edx,101
185 
	or	edx,0x40000000
 178 
	or	edx,0x40000000
Line 186... Line 179...
186 
	mcall	8,<0,9>,,,[wcolor]	; ABS LEFT
 179 
	mcall	8,<0,9>,,,[wcolor]	; ABS LEFT
187 
 
 180 
 
188 
	mov	ebx,2*65536	;+6
 181 
	mov	ebx,2*65536	;+6
189 
	mov	bx,[height]
 182 
	mov	bx,[height]
190 
	shr	bx,1
 - 
 
191 
	sub	bx,3
 - 
 
192 
;	mov	ecx,[wcolor]
 183 
	shr	bx,1
193 
;	add	ecx,0x303030
 184 
	sub	bx,3
194 
	mov	edx,[wcolor]
 185 
	mov	edx,[wcolor]
195 
	mov	eax,COLOR_CHANGE_MAGNITUDE_2
 186 
	mov	eax,COLOR_CHANGE_MAGNITUDE_2
196 
	call	add_color_change_magnitude
 187 
	call	add_color_change_magnitude
Line 215... Line 206...
215 
	add	ecx,[height]
 206 
	add	ecx,[height]
216 
	dec	ecx
 207 
	dec	ecx
217 
	add	ebx,68*65536
 208 
	add	ebx,68*65536
218 
	mov	bx,10 ;9
 209 
	mov	bx,10	;9
219 
	mov	edx,102
 210 
	mov	edx,102
220 
;	add	edx,[button_frames]
 - 
 
221 
	or	edx,0x40000000
 211 
	or	edx,0x40000000
222 
	mcall	8,,,,[wcolor]	; ABS RIGHT
 212 
	mcall	8,,,,[wcolor]	; ABS RIGHT
Line 223... Line 213...
223 
 
 213 
 
224 
	mov	ebx,[max_x]
 214 
	mov	ebx,[max_x]
225 
	sub	ebx,6
 215 
	sub	ebx,6
226 
	shl	ebx,16
 216 
	shl	ebx,16
227 
	mov	bx,[height]
 217 
	mov	bx,[height]
228 
	shr	bx,1
 218 
	shr	bx,1
229 
	sub	bx,3
 - 
 
230 
;	mov	ecx,[wcolor]
 - 
 
231 
;	add	ecx,0x303030
 219 
	sub	bx,3
232 
	mov	edx,[wcolor]
 220 
	mov	edx,[wcolor]
233 
	mov	eax,COLOR_CHANGE_MAGNITUDE_2
 221 
	mov	eax,COLOR_CHANGE_MAGNITUDE_2
234 
	call	add_color_change_magnitude
 222 
	call	add_color_change_magnitude
235 
	mov	ecx,edx
 223 
	mov	ecx,edx
Line 254... Line 242...
254 
 
 242 
 
255 
	add	ebx, ML_SIZE shl 16
 243 
	add	ebx, ML_SIZE shl 16
256 
;--------------------------------------
 244 
;--------------------------------------
257 
align 4
 245 
align 4
258 
@@:
 - 
 
259 
;	call	calculate_button_y_coordinate_and_size
 246 
@@:
260 
        mov     ecx, [height]
 247 
        mov     ecx, [height]
261 
	mov	edx, 0x60d1ff01
 - 
 
262 
;	mov	edx, 0xd1ff01
 - 
 
263 
;	add	edx, [button_frames]
 248 
	mov	edx, 0x60d1ff01
Line 264... Line 249...
264 
	mcall	8,,,,[wcolor]	; MENU BUTTON
 249 
	mcall	8,,,,[wcolor]	; MENU BUTTON
265
250
266 
	mov	eax,ebx
 251 
	mov	eax,ebx
Line 283... Line 268...
283 
	mov	edx,[MenuButton_color]	;0x44aa44
 268 
	mov	edx,[MenuButton_color]	;0x44aa44
284 
	mov	esi,[wcolor]
 269 
	mov	esi,[wcolor]
285 
        add     ebx,3 shl 16 - 5
 270 
        add     ebx,3 shl 16 - 5
286 
	call	draw_appl_button
271 
	call	draw_appl_button
Line 287... Line 272...
287 
 
 272 
 
288 
	add	ebx, 6*65536
 273 
	add	ebx, 4*65536
289 
	mov	bx,[height]
 274 
	mov	bx,[height]
290 
	shr	bx,1
 275 
	shr	bx,1
291 
	sub	bx,3
 276 
	sub	bx,7
292 
	mov	ecx,[PanelText_color]
 277 
	mov	ecx,[PanelText_color]
293 
	or	ecx,0x10000000
 278 
	or	ecx,0x10000000
294 
	if lang eq et
 279 
	if lang eq et
295 
	mcall	4,,,m_text,5
 280 
	mcall	4,,,m_text,5
Line 322... Line 307...
322 
@@:
 307 
@@:
323 
; Inserted code for drawing buttons 103, 104, 105 (Clean, Restore, Exchange windows)
 308 
; Inserted code for drawing buttons 103, 104, 105 (Clean, Restore, Exchange windows)
324 
	mov	esi, dword [system_colours+24]    ; drawing buttons
 309 
	mov	esi, dword [system_colours+24]    ; drawing buttons
325 
	and	esi, 0x00ffffff
 310 
	and	esi, 0x00ffffff
326 
	mov	edx, 0x60000000 + 103
 311 
	mov	edx, 0x60000000 + 103
327 
;	call	calculate_button_y_coordinate_and_size
 - 
 
328 
        mov     ecx, [height]
 312 
        mov     ecx, [height]
329 
	mcall	8	;,,<3,13>
 313 
	mcall	8	;,,<3,13>
Line 330... Line 314...
330
314
331 
	call	calculate_button_y_coordinate_and_size
 315 
	call	calculate_button_y_coordinate_and_size
332 
	mov	edx,[CleanDesktopButton_color]	;time_bgr_color
 316 
	mov	edx,[CleanDesktopButton_color]	;time_bgr_color
333 
	mov	esi,[wcolor]
 317 
	mov	esi,[wcolor]
Line 334... Line -...
334 
	call	draw_appl_button
 - 
 
335
- 
 
336 
;	mov	ecx, dword [system_colours+28]
 318 
	call	draw_appl_button
337 
;	and	ecx, 0x00ffffff
 319 
 
338 
	mov	ecx,[PanelText_color]
 - 
 
339 
	add	ebx,5 shl 16
 320 
	mov	ecx,[PanelText_color]
340 
;	mov	bx,6
 321 
	add	ebx,5 shl 16
341 
	mov	bx,[height]
 322 
	mov	bx,[height]
342 
	shr	bx,1
 323 
	shr	bx,1
343 
	sub	bx,2
 324 
	sub	bx,2
Line 357... Line 338...
357 
	cmp	[run_appl],dword 0	; do not draw application buttons
 338 
	cmp	[run_appl],dword 0	; do not draw application buttons
358 
	je	.exit
 339 
	je	.exit
Line 359... Line 340...
359 
 
 340 
 
Line 360... Line -...
360 
	call	calculate_offset_X
 - 
 
361 
 
 341 
	call	calculate_offset_X
362 
;	mcall	14
 342 
 
Line 363... Line 343...
363 
	mov	eax,[screenxy]
 343 
	mov	eax,[screenxy]
364 
	shr	eax,16
 344 
	shr	eax,16
Line 414... Line 394...
414 
	shl	ebx,16
 394 
	shl	ebx,16
415 
	mov	bx, TAB_SIZE-1
 395 
	mov	bx, TAB_SIZE-1
416 
	mov	edx,edi
 396 
	mov	edx,edi
417 
	add	edx,52
 397 
	add	edx,52
418 
	or	edx,0x60000000
 398 
	or	edx,0x60000000
419 
;	mov	ecx, 1*65536
 - 
 
420 
;	add	ecx, [height]
 - 
 
421 
;	sub	ecx,3
 - 
 
422 
	mov	ecx, [height]
 399 
	mov	ecx, [height]
423 
	mcall	8,,,,[wcolor]
 400 
	mcall	8,,,,[wcolor]
Line 424... Line 401...
424 
 
 401 
 
425 
	inc	edi
 402 
	inc	edi