diff --git a/kernel/trunk/Makefile b/kernel/trunk/Makefile index 3a1a7e671..d9771e036 100644 --- a/kernel/trunk/Makefile +++ b/kernel/trunk/Makefile @@ -1,39 +1,40 @@ FASM=fasm FLAGS=-m 262144 languages=en_US|ru_RU|de_DE|et_EE|es_ES +lang?=en_US .PHONY: all kernel bootloader clean all: kernel bootloader kernel: check_lang - @echo "*** building kernel with language '$(lang)' ..." - @mkdir -p bin - @echo "lang fix $(lang)" > lang.inc - @echo "--- building 'bin/kernel.mnt' ..." - @$(FASM) $(FLAGS) kernel.asm bin/kernel.mnt - @$(FASM) $(FLAGS) kernel.asm -dextended_primary_loader=1 bin/kernel.bin - @rm -f lang.inc + @echo "*** building kernel with language '$(lang)' ..." + @mkdir -p bin + @echo "lang fix $(lang)" > lang.inc + @echo "--- building 'bin/kernel.mnt' ..." + @$(FASM) $(FLAGS) kernel.asm bin/kernel.mnt + @$(FASM) $(FLAGS) kernel.asm -dextended_primary_loader=1 bin/kernel.bin + @rm -f lang.inc bootloader: check_lang - @echo "*** building bootloader with language '$(lang)' ..." - @mkdir -p bin - @echo "lang fix $(lang)" > lang.inc - @echo "--- building 'bin/boot_fat12.bin' ..." - @$(FASM) $(FLAGS) bootloader/boot_fat12.asm bin/boot_fat12.bin - @rm -f lang.inc - + @echo "*** building bootloader with language '$(lang)' ..." + @mkdir -p bin + @echo "lang fix $(lang)" > lang.inc + @echo "--- building 'bin/boot_fat12.bin' ..." + @$(FASM) $(FLAGS) bootloader/boot_fat12.asm bin/boot_fat12.bin + @rm -f lang.inc + check_lang: - @case "$(lang)" in \ - $(languages)) \ - ;; \ - *) \ - echo "*** error: language is incorrect or not specified"; \ - exit 1; \ - ;; \ - esac + @case "$(lang)" in \ + $(languages)) \ + ;; \ + *) \ + echo "*** error: language is incorrect or not specified"; \ + exit 1; \ + ;; \ + esac clean: - rm -rf bin - rm -f lang.inc \ No newline at end of file + rm -rf bin + rm -f lang.inc diff --git a/kernel/trunk/gui/event.inc b/kernel/trunk/gui/event.inc index 500ca6b7c..8c833fb0a 100644 --- a/kernel/trunk/gui/event.inc +++ b/kernel/trunk/gui/event.inc @@ -590,7 +590,16 @@ align 4 mov edx, [BTN_BUFF] shr edx, 8 cmp edx, 0xFFFF ;-ID for Minimize-Button of Form + je .minimize_button + cmp edx, 0xFFFE ;-ID for Maximize-Button of Form jne .result + mov [window_maximize], 1 + call wakeup_osloop + dec byte[BTN_COUNT] + jmp .loop +;-------------------------------------- +align 4 +.minimize_button: mov [window_minimize], 1 call wakeup_osloop dec byte[BTN_COUNT] diff --git a/kernel/trunk/gui/skincode.inc b/kernel/trunk/gui/skincode.inc index 59b23f0ab..95d78cc76 100644 --- a/kernel/trunk/gui/skincode.inc +++ b/kernel/trunk/gui/skincode.inc @@ -205,6 +205,13 @@ align 4 ;-------------------------------------- align 4 .not_minimize: + dec eax + jnz .not_maximize + mov edx, skin_btn_maximize + jmp .next_button +;-------------------------------------- +align 4 +.not_maximize: add ebx, 12 jmp .lp2 ;-------------------------------------- @@ -223,10 +230,129 @@ align 4 ;-------------------------------------- align 4 .end_buttons: + cmp [skin_btn_maximize.width], 0 + jg .exit + cmp [skin_btn_close.width], 0 + jle .exit + cmp [skin_btn_minimize.width], 0 + jle .exit + + mov eax, [skin_btn_minimize.top] + mov [skin_btn_maximize.top], eax + mov eax, [skin_btn_minimize.width] + mov [skin_btn_maximize.width], eax + mov eax, [skin_btn_minimize.height] + mov [skin_btn_maximize.height], eax + + mov eax, [skin_btn_close.left] + mov edx, [skin_btn_minimize.left] + test eax, eax + jns .derive_left_maximize + test edx, edx + jns .exit + sub eax, edx + jle .exit + sub edx, eax + mov [skin_btn_maximize.left], edx + neg edx + add edx, 8 + cmp dx, [_skinmargins.right] + jle .exit + mov [_skinmargins.right], dx + jmp .exit +;-------------------------------------- +align 4 +.derive_left_maximize: + test edx, edx + js .exit + cmp edx, eax + jle .derive_left_reverse_maximize + sub edx, eax + shr edx, 1 + add eax, edx + jmp .set_left_maximize +;-------------------------------------- +align 4 +.derive_left_reverse_maximize: + sub eax, edx + jle .exit + sub edx, eax + mov eax, edx +;-------------------------------------- +align 4 +.set_left_maximize: + test eax, eax + js .exit + mov [skin_btn_maximize.left], eax + add eax, [skin_btn_maximize.width] + add eax, 8 + cmp ax, [_skinmargins.left] + jle .exit + mov [_skinmargins.left], ax .exit: ret ;------------------------------------------------------------------------------ align 4 +draw_skin_maximize_glyph: +;> edx = SYS_BUTTON pointer +;> esi = WDATA pointer + pushad + movzx eax, word [edx+4] + add eax, [esi+WDATA.box.left] + movzx ebx, word [edx+8] + add ebx, [esi+WDATA.box.top] + + mov ecx, [skin_btn_maximize.width] + sub ecx, 10 + jns .width_ok + xor ecx, ecx +.width_ok: + sar ecx, 1 + add eax, ecx + + mov ecx, [skin_btn_maximize.height] + sub ecx, 9 + jns .height_ok + xor ecx, ecx +.height_ok: + sar ecx, 1 + add ebx, ecx + + mov ecx, [common_colours+16] ; grab_text + test [esi+WDATA.fl_wstate], WSTATE_MAXIMIZED + jnz .restore + call .box + popad + ret +;-------------------------------------- +align 4 +.restore: + push eax ebx + add eax, 2 + call .box + pop ebx eax + add ebx, 2 + call .box + popad + ret +;-------------------------------------- +align 4 +.box: + push eax ebx ecx esi + mov esi, ecx + mov ecx, eax + add ecx, 8 + shl eax, 16 + mov ax, cx + mov ecx, ebx + add ecx, 7 + shl ebx, 16 + mov bx, cx + call draw_rectangle.forced + pop esi ecx ebx eax + ret +;------------------------------------------------------------------------------ +align 4 drawwindow_IV_caption: mov ebp, skin_active or al, al @@ -445,6 +571,44 @@ _noinside2: dec ebx mov word [eax+10], bx ; y size bts word [eax+12], 14 +;* maximize button + cmp [skin_btn_maximize.width], 0 + jle no_skin_add_button + cmp [skin_btn_maximize.height], 0 + jle no_skin_add_button + mov edi, [BTN_ADDR] + movzx eax, word [edi] + cmp eax, 1000 + jge no_skin_add_button + inc eax + mov [edi], ax + shl eax, 4 + add eax, edi + + mov bx, word [current_slot_idx] + mov [eax], bx + mov word [eax+2], -2 ; button id + xor ebx, ebx + cmp [skin_btn_maximize.left], 0 + jge @f + mov ebx, [esp] + mov ebx, [ebx+WDATA.box.width] + inc ebx +@@: + add ebx, [skin_btn_maximize.left] + mov word [eax+4], bx ; x start + mov ebx, [skin_btn_maximize.width] + dec ebx + mov word [eax+6], bx ; x size + mov ebx, [skin_btn_maximize.top] + mov word [eax+8], bx ; y start + mov ebx, [skin_btn_maximize.height] + dec ebx + mov word [eax+10], bx ; y size + bts word [eax+12], 14 + mov esi, [esp] + mov edx, eax + call draw_skin_maximize_glyph no_skin_add_button: pop edi popa diff --git a/kernel/trunk/gui/skindata.inc b/kernel/trunk/gui/skindata.inc index f9ddc1510..0ec758e1d 100644 --- a/kernel/trunk/gui/skindata.inc +++ b/kernel/trunk/gui/skindata.inc @@ -51,6 +51,7 @@ skin_udata: skin_btn_close SKIN_BUTTON skin_btn_minimize SKIN_BUTTON + skin_btn_maximize SKIN_BUTTON skin_active SKIN_DATA skin_inactive SKIN_DATA diff --git a/kernel/trunk/gui/window.inc b/kernel/trunk/gui/window.inc index b4d8660bc..a60cae5ce 100644 --- a/kernel/trunk/gui/window.inc +++ b/kernel/trunk/gui/window.inc @@ -1233,6 +1233,18 @@ align 4 window_check_events: + ; do we have window maximize/restore request? + cmp [window_maximize], 0 + je .check_minimize + + mov [window_maximize], 0 + mov esi, [thread_count] + movzx esi, word[WIN_POS + esi * 2] + call sys_window_maximize_handler + ret +;-------------------------------------- +align 4 +.check_minimize: ; do we have window minimize/restore request? cmp [window_minimize], 0 je .exit diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm index 0c5d3c563..402bbaf44 100644 --- a/kernel/trunk/kernel.asm +++ b/kernel/trunk/kernel.asm @@ -2307,6 +2307,7 @@ display_width_standard dd 0 display_height_standard dd 0 do_not_touch_winmap db 0 window_minimize db 0 +window_maximize db 0 sound_flag db 0 endg diff --git a/skins/ConLenov/8Metro/skin.inc b/skins/ConLenov/8Metro/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/ConLenov/8Metro/skin.inc +++ b/skins/ConLenov/8Metro/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/ConLenov/FlowerMoon/skin.inc b/skins/ConLenov/FlowerMoon/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/ConLenov/FlowerMoon/skin.inc +++ b/skins/ConLenov/FlowerMoon/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/ConLenov/GX/GX_Red/skin.inc b/skins/ConLenov/GX/GX_Red/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/ConLenov/GX/GX_Red/skin.inc +++ b/skins/ConLenov/GX/GX_Red/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/ConLenov/GX/GX_Violet/skin.inc b/skins/ConLenov/GX/GX_Violet/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/ConLenov/GX/GX_Violet/skin.inc +++ b/skins/ConLenov/GX/GX_Violet/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/ConLenov/Yaru/skin.inc b/skins/ConLenov/Yaru/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/ConLenov/Yaru/skin.inc +++ b/skins/ConLenov/Yaru/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/5imple Alpha/2.5imple Alpha/skin.inc b/skins/_old/5imple Alpha/2.5imple Alpha/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/5imple Alpha/2.5imple Alpha/skin.inc +++ b/skins/_old/5imple Alpha/2.5imple Alpha/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/Black_lace/2.Black_lace/skin.inc b/skins/_old/Black_lace/2.Black_lace/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/Black_lace/2.Black_lace/skin.inc +++ b/skins/_old/Black_lace/2.Black_lace/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/Cyclops/1.Cyclops/skin.inc b/skins/_old/Cyclops/1.Cyclops/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/Cyclops/1.Cyclops/skin.inc +++ b/skins/_old/Cyclops/1.Cyclops/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/Eyes/skin.inc b/skins/_old/Eyes/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/Eyes/skin.inc +++ b/skins/_old/Eyes/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/Grey/skin.inc b/skins/_old/Grey/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/Grey/skin.inc +++ b/skins/_old/Grey/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/MenuetOS/1.MenuetOS/skin.inc b/skins/_old/MenuetOS/1.MenuetOS/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/MenuetOS/1.MenuetOS/skin.inc +++ b/skins/_old/MenuetOS/1.MenuetOS/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/MetalColor/MCBlue/skin.inc b/skins/_old/MetalColor/MCBlue/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/MetalColor/MCBlue/skin.inc +++ b/skins/_old/MetalColor/MCBlue/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/MetalColor/MCRed/skin.inc b/skins/_old/MetalColor/MCRed/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/MetalColor/MCRed/skin.inc +++ b/skins/_old/MetalColor/MCRed/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/OpusOs_Blue/skin.inc b/skins/_old/OpusOs_Blue/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/OpusOs_Blue/skin.inc +++ b/skins/_old/OpusOs_Blue/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/OpusOs_D/skin.inc b/skins/_old/OpusOs_D/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/OpusOs_D/skin.inc +++ b/skins/_old/OpusOs_D/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/StyleVista/vista_basic/skin.inc b/skins/_old/StyleVista/vista_basic/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/StyleVista/vista_basic/skin.inc +++ b/skins/_old/StyleVista/vista_basic/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/StyleVista/vista_basic_black/skin.inc b/skins/_old/StyleVista/vista_basic_black/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/StyleVista/vista_basic_black/skin.inc +++ b/skins/_old/StyleVista/vista_basic_black/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/StyleXP/skin.inc b/skins/_old/StyleXP/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/StyleXP/skin.inc +++ b/skins/_old/StyleXP/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/WindowsXP/WinXP Classic blue/skin.inc b/skins/_old/WindowsXP/WinXP Classic blue/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/WindowsXP/WinXP Classic blue/skin.inc +++ b/skins/_old/WindowsXP/WinXP Classic blue/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/WindowsXP/WinXP Standard blue/skin.inc b/skins/_old/WindowsXP/WinXP Standard blue/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/WindowsXP/WinXP Standard blue/skin.inc +++ b/skins/_old/WindowsXP/WinXP Standard blue/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/WindowsXP/WinXP Standard olive_green/skin.inc b/skins/_old/WindowsXP/WinXP Standard olive_green/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/WindowsXP/WinXP Standard olive_green/skin.inc +++ b/skins/_old/WindowsXP/WinXP Standard olive_green/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/WindowsXP/WinXP Standard silver/skin.inc b/skins/_old/WindowsXP/WinXP Standard silver/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/WindowsXP/WinXP Standard silver/skin.inc +++ b/skins/_old/WindowsXP/WinXP Standard silver/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/black-glass/black-glass/black-glass.inc b/skins/_old/black-glass/black-glass/black-glass.inc index 365964eb3..c28656fb8 100644 --- a/skins/_old/black-glass/black-glass/black-glass.inc +++ b/skins/_old/black-glass/black-glass/black-glass.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -192,6 +192,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/black-glass/black-glass_light/black-glass.inc b/skins/_old/black-glass/black-glass_light/black-glass.inc index 365964eb3..c28656fb8 100644 --- a/skins/_old/black-glass/black-glass_light/black-glass.inc +++ b/skins/_old/black-glass/black-glass_light/black-glass.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -192,6 +192,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/dark_night/skin.inc b/skins/_old/dark_night/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/dark_night/skin.inc +++ b/skins/_old/dark_night/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/falloutskn/skin.inc b/skins/_old/falloutskn/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/falloutskn/skin.inc +++ b/skins/_old/falloutskn/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/first_skin/skin.inc b/skins/_old/first_skin/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/first_skin/skin.inc +++ b/skins/_old/first_skin/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/gliteskin/gliteskin_deepsky/skin.inc b/skins/_old/gliteskin/gliteskin_deepsky/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/gliteskin/gliteskin_deepsky/skin.inc +++ b/skins/_old/gliteskin/gliteskin_deepsky/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/gliteskin/gliteskin_red/skin.inc b/skins/_old/gliteskin/gliteskin_red/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/gliteskin/gliteskin_red/skin.inc +++ b/skins/_old/gliteskin/gliteskin_red/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/gnome_style/gnome_green/skin.inc b/skins/_old/gnome_style/gnome_green/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/gnome_style/gnome_green/skin.inc +++ b/skins/_old/gnome_style/gnome_green/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/humanoid_OSX/skin.inc b/skins/_old/humanoid_OSX/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/humanoid_OSX/skin.inc +++ b/skins/_old/humanoid_OSX/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/lightskin/skin.inc b/skins/_old/lightskin/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/lightskin/skin.inc +++ b/skins/_old/lightskin/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/macos_l/skin.inc b/skins/_old/macos_l/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/macos_l/skin.inc +++ b/skins/_old/macos_l/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/mage-scroll/skin.inc b/skins/_old/mage-scroll/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/mage-scroll/skin.inc +++ b/skins/_old/mage-scroll/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/nix/skin.inc b/skins/_old/nix/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/nix/skin.inc +++ b/skins/_old/nix/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/_old/win8/skin.inc b/skins/_old/win8/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/_old/win8/skin.inc +++ b/skins/_old/win8/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/dunkaist/mursky/skin.inc b/skins/dunkaist/mursky/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/dunkaist/mursky/skin.inc +++ b/skins/dunkaist/mursky/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/dunkaist/testtest/skin.inc b/skins/dunkaist/testtest/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/dunkaist/testtest/skin.inc +++ b/skins/dunkaist/testtest/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0 diff --git a/skins/skin.inc b/skins/skin.inc index 81a6bd8f3..2f7107d4d 100644 --- a/skins/skin.inc +++ b/skins/skin.inc @@ -37,7 +37,7 @@ ;---------------------------------------------------------------------------- ; ... ; buttons: -; dd = button type (1 = close, 2 = minimize) +; dd = button type (1 = close, 2 = minimize, 3 = maximize) ; dw = left button coord (could be negative) ; dw = top button coord (could be negative) ; dw = button width @@ -189,6 +189,7 @@ macro SKIN_BUTTONS [a] btn = 0 match =close,qq \\{ btn = 1 \\} match =minimize,qq \\{ btn = 2 \\} + match =maximize,qq \\{ btn = 3 \\} match [q1:q2][q3:q4],ww \\{ if btn <> 0