From f6f925e49d89444f86d242de3cb24b285bd7a965 Mon Sep 17 00:00:00 2001
From: leency <lipatov.kiril@gmail.com>
Date: Sat, 15 Mar 2025 15:38:17 +0200
Subject: [PATCH] asm pipet: add to IMG replacing cmm pipet, use cp866 lang for
 src

---
 data/Tupfile.lua                 | 2 +-
 programs/other/pipet/Tupfile.lua | 2 +-
 programs/other/pipet/pipet.asm   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 4be8d67e6..27169b365 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -474,6 +474,7 @@ tup.append_table(img_files, {
  {"DEVELOP/ENTROPYV", VAR_PROGS .. "/develop/entropyview/entropyview"},
  {"DEVELOP/FASM", VAR_PROGS .. "/develop/fasm/1.73/fasm"},
  {"DEVELOP/GENFILES", VAR_PROGS .. "/testing/genfiles/GenFiles"},
+ {"DEVELOP/PIPET", VAR_PROGS .. "/other/pipet/pipet"},
  {"DEVELOP/H2D2B", VAR_PROGS .. "/develop/h2d2b/trunk/h2d2b"},
  {"DEVELOP/HEED", VAR_PROGS .. "/develop/heed/trunk/heed"},
  {"DEVELOP/MTDBG", VAR_PROGS .. "/develop/mtdbg/mtdbg"},
@@ -669,7 +670,6 @@ tup.append_table(img_files, {
  {"TMPDISK", VAR_PROGS .. "/cmm/tmpdisk/tmpdisk.com"},
  {"DEVELOP/CLIPVIEW", VAR_PROGS .. "/cmm/clipview/clipview.com"},
  {"DEVELOP/MENU", VAR_PROGS .. "/cmm/menu/menu.com"},
- {"DEVELOP/PIPET", VAR_PROGS .. "/cmm/misc/pipet.com"},
  {"File Managers/EOLITE", VAR_PROGS .. "/cmm/eolite/Eolite.com"},
  {"File Managers/KFM2", VAR_PROGS .. "/cmm/misc/kfm2.com"},
  {"DEVELOP/DIFF", VAR_PROGS .. "/cmm/diff/diff.com"},
diff --git a/programs/other/pipet/Tupfile.lua b/programs/other/pipet/Tupfile.lua
index 5dfe97a7c..71502727e 100644
--- a/programs/other/pipet/Tupfile.lua
+++ b/programs/other/pipet/Tupfile.lua
@@ -1,2 +1,2 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("pipet.asm", "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "pipet")
+tup.rule("pipet.asm", FASM .. " -dlang=" .. tup.getconfig("LANG") .. " %f %o" .. tup.getconfig("KPACK_CMD"), "%B")
diff --git a/programs/other/pipet/pipet.asm b/programs/other/pipet/pipet.asm
index d8a1d30d0..cbadab710 100644
--- a/programs/other/pipet/pipet.asm
+++ b/programs/other/pipet/pipet.asm
@@ -223,7 +223,7 @@ draw_window:
 draw_base:
 
         mcall   13, <BUT_PIP_X, BUT_PIP_H>, <BUT_PIP_Y, BUT_PIP_H>, [win_cols.work_graph]
-        mcall     , <BUT_COL_X, BUT_COL_W>, <BUT_PIP_Y, BUT_PIP_H>,
+        mcall     , <BUT_COL_X, BUT_COL_W>, 
         mcall     , <BUT_HEX_X, BUT_HEX_W>, <BUT_HEX_Y, BUT_HEX_H>,
         mcall     ,                       , <BUT_RGB_Y, BUT_HEX_H>,
         mcall     , <BUT_REC_X, BUT_REC_W>, <BUT_REC_Y, BUT_REC_H>,
@@ -489,7 +489,7 @@ win_icons       dd 0x00000000
 pip_icon        dd 0x00000000
 
 if lang eq ru_RU
-                header  db 'Пипетка', 0
+                header  db '����⪠', 0
 else if lang eq es_ES
                 header  db "Pipeta", 0
 else