From 9f55f6aca0a64ccb5e997f1848b95b32a3b74bfd Mon Sep 17 00:00:00 2001
From: Andrew <dent.ace@gmail.com>
Date: Wed, 28 May 2025 23:08:58 +0100
Subject: [PATCH] demos/cslide: Post-SVN tidy

- Move source code from `trunk` into root directory.
- Update build files and ASM include paths.
---
 data/Tupfile.lua                               |  2 +-
 programs/build_all.bat                         |  2 +-
 programs/demos/cslide/{trunk => }/Tupfile.lua  |  2 +-
 programs/demos/cslide/{trunk => }/build_en.bat |  0
 programs/demos/cslide/{trunk => }/build_ru.bat |  0
 programs/demos/cslide/{trunk => }/cslide.asm   | 17 ++++++++++-------
 6 files changed, 13 insertions(+), 10 deletions(-)
 rename programs/demos/cslide/{trunk => }/Tupfile.lua (79%)
 rename programs/demos/cslide/{trunk => }/build_en.bat (100%)
 rename programs/demos/cslide/{trunk => }/build_ru.bat (100%)
 rename programs/demos/cslide/{trunk => }/cslide.asm (98%)

diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index d8a643f52..1a6028343 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -484,7 +484,7 @@ tup.append_table(img_files, {
  {"DEVELOP/EXAMPLES/CIRCLE", VAR_PROGS .. "/develop/examples/circle/trunk/circle"},
  {"DEVELOP/EXAMPLES/COLORREF", VAR_PROGS .. "/demos/colorref/colorref"},
  {"DEVELOP/EXAMPLES/CONGET", VAR_PROGS .. "/develop/libraries/console_coff/examples/test_gets"},
- {"DEVELOP/EXAMPLES/CSLIDE", VAR_PROGS .. "/demos/cslide/trunk/cslide"},
+ {"DEVELOP/EXAMPLES/CSLIDE", VAR_PROGS .. "/demos/cslide/cslide"},
  {"DEVELOP/EXAMPLES/THREAD", VAR_PROGS .. "/develop/examples/thread/trunk/thread"},
  {"File Managers/KFAR", VAR_PROGS .. "/fs/kfar/trunk/kfar"},
  {"File Managers/OPENDIAL", VAR_PROGS .. "/fs/opendial/opendial"},
diff --git a/programs/build_all.bat b/programs/build_all.bat
index 87d400663..7ece61736 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -211,7 +211,7 @@ fasm demos\bcdclk\bcdclk.asm %BIN%\demos\bcdclk
 fasm demos\bgitest\trunk\bgitest.asm %BIN%\fonts\bgitest
 fasm demos\colorref\colorref.asm %BIN%\demos\colorref
 fasm demos\crownscr\crownscr.asm %BIN%\3d\crownscr
-fasm demos\cslide\trunk\cslide.asm %BIN%\demos\cslide
+fasm demos\cslide\cslide.asm %BIN%\demos\cslide
 fasm demos\eyes\trunk\eyes.asm %BIN%\demos\eyes
 fasm demos\fire\trunk\fire.asm %BIN%\demos\fire
 fasm demos\fire2\trunk\fire2.asm %BIN%\demos\fire2
diff --git a/programs/demos/cslide/trunk/Tupfile.lua b/programs/demos/cslide/Tupfile.lua
similarity index 79%
rename from programs/demos/cslide/trunk/Tupfile.lua
rename to programs/demos/cslide/Tupfile.lua
index edca97950..ac018d636 100644
--- a/programs/demos/cslide/trunk/Tupfile.lua
+++ b/programs/demos/cslide/Tupfile.lua
@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
diff --git a/programs/demos/cslide/trunk/build_en.bat b/programs/demos/cslide/build_en.bat
similarity index 100%
rename from programs/demos/cslide/trunk/build_en.bat
rename to programs/demos/cslide/build_en.bat
diff --git a/programs/demos/cslide/trunk/build_ru.bat b/programs/demos/cslide/build_ru.bat
similarity index 100%
rename from programs/demos/cslide/trunk/build_ru.bat
rename to programs/demos/cslide/build_ru.bat
diff --git a/programs/demos/cslide/trunk/cslide.asm b/programs/demos/cslide/cslide.asm
similarity index 98%
rename from programs/demos/cslide/trunk/cslide.asm
rename to programs/demos/cslide/cslide.asm
index 3f5cae91d..57487ba5e 100644
--- a/programs/demos/cslide/trunk/cslide.asm
+++ b/programs/demos/cslide/cslide.asm
@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;                                          ;
 ;   Color Slider Control Demonstration     ;
@@ -20,8 +23,8 @@ use32
                dd     0x0 , 0x0               ; I_Param , I_Icon
 
 include 'lang.inc'
-include '..\..\..\macros.inc'
-include '..\..\..\KOSfuncs.inc'
+include '..\..\macros.inc'
+include '..\..\KOSfuncs.inc'
 START:                          ; start of execution
 
     call draw_window            ; at first, draw the window
@@ -50,7 +53,7 @@ still:
 
   button:                       ; button
     mcall SF_GET_BUTTON         ; get id
-    
+
     shr  eax,8
 
     cmp  eax,1                   ; button id=1 ?
@@ -72,7 +75,7 @@ draw_window:
     mcall SF_REDRAW, SSF_BEGIN_DRAW
     mcall SF_CREATE_WINDOW, <100,200>, <100,200>, 0x14ffffff, , title
     mcall SF_REDRAW, SSF_END_DRAW
-	
+
     call draw_slider_info
 
     xor  ecx,ecx
@@ -151,7 +154,7 @@ ret
 
 draw_slider_info:
 ;Repaint value background
-   mcall SF_DRAW_RECT, 144*65536+36, 72*65536+9, 0x00ffffff 
+   mcall SF_DRAW_RECT, 144*65536+36, 72*65536+9, 0x00ffffff
 ;Draw Color Box
    xor edx, edx
    movzx ecx,word [slider_1+12]
@@ -164,7 +167,7 @@ draw_slider_info:
    mov ebx, 0x00860035
    mov ecx, 0x00590040
    mov eax, SF_DRAW_RECT
-   mcall 
+   mcall
 ;draw current value of slider
    mov ecx, edx
    mov eax, SF_DRAW_NUMBER
@@ -340,4 +343,4 @@ ret
 
 ; DATA AREA
 title     db  'Color Slider',0
-I_END:
\ No newline at end of file
+I_END: