Compare commits

...

5 Commits

Author SHA1 Message Date
minjaesong
051177f7f7 taut: slider knob char 2026-05-27 00:34:04 +09:00
minjaesong
5f873fa2d1 taut: inst viewer wip 2026-05-26 23:34:16 +09:00
minjaesong
a7db53e81c taut: sample viewer wip 2026-05-26 23:05:51 +09:00
minjaesong
8d473c223c more wintex and shuffling things around 2026-05-26 10:48:27 +09:00
minjaesong
5a25d394b9 wintex default theme changes 2026-05-26 09:43:19 +09:00
8 changed files with 2151 additions and 645 deletions

View File

@@ -442,7 +442,7 @@ _fsh.redrawAll = function() {
_fsh.openAddTodoDialog = function() { _fsh.openAddTodoDialog = function() {
let res = win.showDialog({ let res = win.showDialog({
title: "New Todo", title: "New Todo",
fields: [{label: "Text", initial: "", width: _fsh.TODO_TEXT_WIDTH}], fields: [{label: "Text:", initial: "", width: _fsh.TODO_TEXT_WIDTH}],
allowDelete: false allowDelete: false
}) })
_fsh.redrawAll() _fsh.redrawAll()
@@ -459,7 +459,7 @@ _fsh.openEditTodoDialog = function(index) {
if (!entry) return if (!entry) return
let res = win.showDialog({ let res = win.showDialog({
title: "Edit Todo", title: "Edit Todo",
fields: [{label: "Text", initial: entry[0], width: _fsh.TODO_TEXT_WIDTH}], fields: [{label: "Text:", initial: entry[0], width: _fsh.TODO_TEXT_WIDTH}],
allowDelete: true allowDelete: true
}) })
_fsh.redrawAll() _fsh.redrawAll()
@@ -479,8 +479,8 @@ _fsh.openAddQaDialog = function() {
let res = win.showDialog({ let res = win.showDialog({
title: "New Quick Access", title: "New Quick Access",
fields: [ fields: [
{label: "Label", initial: "", width: _fsh.QA_LABEL_WIDTH}, {label: "Label:", initial: "", width: _fsh.QA_LABEL_WIDTH},
{label: "Command", initial: "", width: _fsh.QA_CMD_WIDTH} {label: "Command:", initial: "", width: _fsh.QA_CMD_WIDTH}
], ],
allowDelete: false allowDelete: false
}) })
@@ -500,8 +500,8 @@ _fsh.openEditQaDialog = function(index) {
let res = win.showDialog({ let res = win.showDialog({
title: "Edit Quick Access", title: "Edit Quick Access",
fields: [ fields: [
{label: "Label", initial: entry[0], width: _fsh.QA_LABEL_WIDTH}, {label: "Label:", initial: entry[0], width: _fsh.QA_LABEL_WIDTH},
{label: "Command", initial: entry[1], width: _fsh.QA_CMD_WIDTH} {label: "Command:", initial: entry[1], width: _fsh.QA_CMD_WIDTH}
], ],
allowDelete: true allowDelete: true
}) })

File diff suppressed because it is too large Load Diff

View File

@@ -1,18 +1,23 @@
/** /**
* TAUT Sample Editor * TAUT Sample Editor (stub)
* Sub-program launched by taut.js when the Samples tab is active. * Sub-program launched from taut.js's Samples viewer. Rows 1-3 are owned by
* Rows 1-3 are owned by the parent; this program draws rows 4+. * the parent; this program draws rows 4+.
* *
* exec_args[1] = path to .taud file * exec_args:
* Sets _G.TAUT.UI.NEXTPANEL before returning to request a panel switch. * [1] = path to .taud file
* [2] = parent panel index (where to return)
* [3] = sample index to preload (-1 if none)
*
* Sets _G.TAUT.UI.NEXTPANEL on return to request a panel switch back.
* *
* Created by minjaesong on 2026-04-27 * Created by minjaesong on 2026-04-27
* Stub editing UI added on 2026-05-26
*/ */
const win = require("wintex") const win = require("wintex")
const PANEL_COUNT = 7 const PARENT_PANEL = (exec_args[2] !== undefined) ? (exec_args[2] | 0) : 3 // VIEW_SAMPLES
const MY_PANEL = 3 // VIEW_SAMPLES const SAMPLE_IDX = (exec_args[3] !== undefined) ? (exec_args[3] | 0) : -1
const [SCRH, SCRW] = con.getmaxyx() const [SCRH, SCRW] = con.getmaxyx()
const PANEL_Y = 4 const PANEL_Y = 4
@@ -21,38 +26,122 @@ const PANEL_H = SCRH - PANEL_Y
const colStatus = 253 const colStatus = 253
const colContent = 240 const colContent = 240
const colHdr = 230 const colHdr = 230
const colEmph = 211
const colDim = 246
const colBack = 255
const colSel = 41
function drawSampleEditContents(wo) { // Stub editor "fields": pretend toolbar. None of these write anything yet.
const TOOLS = [
{ key: 'L', label: 'Load .raw / .wav from disk' },
{ key: 'S', label: 'Save current sample to disk' },
{ key: 'D', label: 'Draw waveform freehand' },
{ key: 'X', label: 'Crop / trim selection' },
{ key: 'R', label: 'Resample' },
{ key: 'V', label: 'Reverse' },
{ key: 'N', label: 'Normalise to peak' },
{ key: 'F', label: 'Fade in / out' },
]
let toolCursor = 0
function drawSampleEditFrame() {
for (let y = PANEL_Y; y < SCRH; y++) { for (let y = PANEL_Y; y < SCRH; y++) {
con.move(y, 1) con.move(y, 1)
con.color_pair(colContent, 255) con.color_pair(colContent, colBack)
print(' '.repeat(SCRW)) print(' '.repeat(SCRW))
} }
// Title
con.move(PANEL_Y + 1, 3) con.move(PANEL_Y + 1, 3)
con.color_pair(colHdr, 255) con.color_pair(colHdr, colBack); print('[ Sample Editor ] ')
print('[ Sample Editor ]') con.color_pair(colEmph, colBack); print('Sample ')
con.move(PANEL_Y + 3, 3) con.color_pair(colStatus, colBack)
con.color_pair(colStatus, 255) if (SAMPLE_IDX >= 0) print('#' + (SAMPLE_IDX + 1).toString(16).toUpperCase().padStart(2, '0'))
print('placeholder — not yet implemented') else print('(none)')
con.move(PANEL_Y + 2, 3)
con.color_pair(colDim, colBack)
print('stub editor — actions below are placeholders only.')
}
function drawToolList() {
const x = 5
const y0 = PANEL_Y + 4
con.move(y0, x)
con.color_pair(colHdr, colBack); print('Editing actions')
con.move(y0 + 1, x)
con.color_pair(colDim, colBack); print('-'.repeat(16))
for (let i = 0; i < TOOLS.length; i++) {
const y = y0 + 3 + i
const t = TOOLS[i]
const sel = (i === toolCursor)
const back = sel ? colSel : colBack
con.move(y, x)
con.color_pair(colHdr, back); print(' ' + t.key + ' ')
con.color_pair(colStatus, back); print(' ')
con.color_pair(sel ? colEmph : colStatus, back)
const w = SCRW - x - 6
const lbl = t.label.length > w ? t.label.substring(0, w) : t.label.padEnd(w)
print(lbl)
}
// Drawing-area placeholder on the right
const dx = 38
const dy0 = PANEL_Y + 4
const dw = SCRW - dx - 2
const dh = SCRH - dy0 - 2
con.move(dy0, dx)
con.color_pair(colHdr, colBack); print('Waveform editor')
con.move(dy0 + 1, dx)
con.color_pair(colDim, colBack); print('-'.repeat(16))
// Empty drawing rectangle made of dots
for (let r = 0; r < dh; r++) {
con.move(dy0 + 3 + r, dx)
con.color_pair(colDim, colBack)
if (r === (dh >>> 1)) print('-'.repeat(dw)) // zero line
else print(' '.repeat(dw))
}
con.move(dy0 + 3 + (dh >>> 1) + 1, dx)
con.color_pair(colDim, colBack)
print('(drawing surface — not yet implemented)')
} }
function drawHints() { function drawHints() {
con.move(SCRH, 1) con.move(SCRH, 1)
con.color_pair(colStatus, 255) con.color_pair(colStatus, colBack)
print(' '.repeat(SCRW - 1)) print(' '.repeat(SCRW - 1))
con.move(SCRH, 1) con.move(SCRH, 1)
con.color_pair(colHdr, 255); print('Tab ') con.color_pair(colHdr, colBack); print('„28u„29u ')
con.color_pair(colStatus, 255); print('Panel') con.color_pair(colStatus, colBack); print('Tool ')
con.color_pair(colHdr, colBack); print('Enter ')
con.color_pair(colStatus, colBack); print('Apply ')
con.color_pair(colHdr, colBack); print('Esc/Tab ')
con.color_pair(colStatus, colBack); print('Back to viewer')
}
function flashAction(idx) {
const t = TOOLS[idx]
if (!t) return
con.move(SCRH - 2, 5)
con.color_pair(colEmph, colBack)
print(('Action: ' + t.label + ' (stub, no-op)').padEnd(SCRW - 8))
} }
function sampleEditInput(wo, event) { function sampleEditInput(wo, event) {
// placeholder — no interaction yet // wintex panel input — wired up but the loop below handles keys directly.
} }
const panel = new win.WindowObject(1, PANEL_Y, SCRW, PANEL_H, sampleEditInput, drawSampleEditContents, undefined, ()=>{}) function drawAll() {
drawSampleEditFrame()
drawToolList()
drawHints()
}
const panel = new win.WindowObject(1, PANEL_Y, SCRW, PANEL_H, sampleEditInput, drawAll, undefined, ()=>{})
panel.drawContents() panel.drawContents()
drawHints()
let done = false let done = false
while (!done) { while (!done) {
@@ -60,17 +149,32 @@ while (!done) {
if (event[0] !== 'key_down') return if (event[0] !== 'key_down') return
const keysym = event[1] const keysym = event[1]
const keyJustHit = (1 == event[2]) const keyJustHit = (1 == event[2])
const shiftDown = (event.includes(59) || event.includes(60))
if (!keyJustHit) return if (!keyJustHit) return
if (keysym === '<TAB>') { if (keysym === '<ESCAPE>' || keysym === '<TAB>') {
_G.TAUT.UI.NEXTPANEL = (MY_PANEL + (shiftDown ? -1 : 1) + PANEL_COUNT) % PANEL_COUNT _G.TAUT.UI.NEXTPANEL = PARENT_PANEL
done = true done = true
return return
} }
panel.processInput(event) if (keysym === '<UP>') { if (toolCursor > 0) toolCursor--; drawToolList(); return }
if (keysym === '<DOWN>') { if (toolCursor < TOOLS.length-1) toolCursor++; drawToolList(); return }
if (keysym === '\n') {
flashAction(toolCursor)
return
}
// Direct key shortcuts
for (let i = 0; i < TOOLS.length; i++) {
if (keysym === TOOLS[i].key.toLowerCase() || keysym === TOOLS[i].key) {
toolCursor = i
drawToolList()
flashAction(i)
return
}
}
}) })
} }

Binary file not shown.

View File

@@ -597,6 +597,32 @@ function showMessagePopup(title, message) {
}) })
} }
// Vertical-list popup: items are stacked rows, navigable with arrow keys /
// mouse, selection (Enter / left-click on row) returns that item's action.
// A single Close button sits below the list; Esc and Close both yield 'close'.
// Thin wrapper over win.showDialog — see wintex.mjs for the underlying schema.
function showActionListPopup(opts) {
const items = opts.items || []
const closeLabel = opts.closeLabel || 'Close'
const defaultIdx = items.findIndex(it => it.default)
const res = win.showDialog({
title: opts.title || '',
message: opts.message,
list: {
items: items,
height: items.length,
cursor: defaultIdx >= 0 ? defaultIdx : 0,
showScrollbar: false,
onActivate: (item) => item.action,
},
buttons: [{ label: closeLabel, action: 'close' }],
})
if (res.action === 'cancel') return { action: 'close' }
return { action: res.action }
}
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
const windows = [ const windows = [
@@ -891,17 +917,22 @@ function actRename() {
function actMore() { function actMore() {
if (path[windowMode].length === 0) return if (path[windowMode].length === 0) return
const cache = filePanelCache[windowMode][cursor[windowMode]] const cache = filePanelCache[windowMode][cursor[windowMode]]
if (!cache || !cache.file || cache.isDirectory) return if (!cache || !cache.file) return
const res = win.showDialog({ const items = cache.isDirectory
? [
{ label: 'Open terminal here', action: 'terminal', default: true },
]
: [
{ label: 'Execute', action: 'execute', default: true },
{ label: 'Edit', action: 'edit' },
{ label: 'Open terminal here', action: 'terminal' },
]
const res = showActionListPopup({
title: 'More', title: 'More',
message: cache.file.name, message: cache.file.name,
fields: [], items: items,
buttons: [
{ label: 'Execute', action: 'execute', default: true },
{ label: 'Edit', action: 'edit' },
{ label: 'Close', action: 'close' },
],
}) })
_redraw() _redraw()
@@ -930,7 +961,42 @@ function actMore() {
refreshFilePanelCache(windowMode) refreshFilePanelCache(windowMode)
pendingPostExecDrain = true pendingPostExecDrain = true
redraw() redraw()
return
} }
if (res.action === 'terminal') {
actTerminal(cache)
}
}
function actTerminal(cache) {
const targetDir = (cache && cache.isDirectory && cache.file)
? cache.file.fullPath
: getCurrentDirStr(windowMode)
if (!targetDir || targetDir.length === 0) return
// TVDOS shell.parse has no working escape inside quotes (the `^` ESCAPE
// state is a TODO), so we can't pass a quoted path through `command -k
// "cd \"X\""`. The outer quotes carry the whole `cd <path>` as one token;
// shell.execute then re-parses it. This works for paths without spaces;
// paths with spaces will only cd to the first component.
let errorlevel = 0
con.curs_set(1); clearScr(); con.move(1, 1)
try {
errorlevel = _G.shell.execute(`command -k "cd ${targetDir}"`)
}
catch (e) {
println(e)
errorlevel = 1
}
if (errorlevel) {
println("Hit Return/Enter key to continue . . . .")
sys.read()
}
firstRunLatch = true
con.curs_set(0); clearScr()
refreshFilePanelCache(windowMode)
pendingPostExecDrain = true
redraw()
} }
function actQuit() { exit = true } function actQuit() { exit = true }

View File

@@ -65,12 +65,12 @@ class WindowObject {
} }
if (this.titleRight !== undefined) { if (this.titleRight !== undefined) {
let tt = ''+this.titleRight let tt = ''+this.titleRight
con.move(this.y, this.x + this.width - tt.length - 2) con.move(this.y + this.height - 1, this.x + this.width - tt.length - 2)
print(`\x84${charset[4]}u`) print(`\x84${charset[4]}u`)
if (this.titleBackRight !== undefined) print(`\x1B[48;5;${this.titleBackRight}m`) if (this.titleBackRight !== undefined) print(`\x1B[48;5;${this.titleBackRight}m`)
print(`\x1B[38;5;${colourText}m${tt}`) print(`\x1B[38;5;${colourText}m${tt}`)
if (this.titleBackRight !== undefined) print(`\x1B[48;5;${oldBack}m`) if (this.titleBackRight !== undefined) print(`\x1B[48;5;${oldBack}m`)
print(`\x1B[38;5;${colour}m\x84${charset[1]}u`) print(`\x1B[38;5;${colour}m\x84${charset[3]}u`)
} }
@@ -181,34 +181,83 @@ function scrollHorz(dx, stringSize, stringViewSize, currentCursorPos, currentScr
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// Modal dialog with multiple input fields and OK/Cancel-style buttons. // Modal dialog with optional body text, input fields, a scrollable selection
// list, and OK/Cancel-style buttons. Layout from top to bottom:
// title bar, message, fields, list, buttons.
// //
// opts = { // opts = {
// title: string, // title: string,
// message: string | string[]? -- optional body text drawn above fields // message: string | string[]?, -- optional body text drawn above fields/list
// fields: [{label, initial?, width}, ...] -- omit / [] for no input field // drawFrame: function(wo)?, -- override for the window-frame painter;
// same contract as WindowObject's
// `drawFrame` slot. Useful when the caller
// wants its own border / title styling.
//
// fields: [{label, initial?, width, maxLength?}, ...] -- omit / [] for no input
// field. Label does NOT get auto-colon.
// `maxLength` caps insertable chars
// (default: width * 4).
//
// list: { -- optional vertical selection list
// items: [{label, ...}, ...], -- arbitrary user objects; only `label`
// is read by the default renderer.
// height: number, -- visible row count.
// width: number?, -- inner width override (default: popup w-4).
// cursor: number?, -- initial cursor row (default: first selectable).
// selectable: function(item, i)->bool?, -- default: every item selectable. Non-
// selectable rows are skipped by arrow keys.
// When NO row is selectable, arrow / PgUp
// / PgDn scroll the view instead.
// renderItem: function(ctx)?, -- per-row painter; ctx exposes
// { y, x, w, item, idx, isCursor, focused,
// listBg, selBg, fg, hlFg, dimFg }.
// Default prints `item.label`.
// onActivate: function(item, i, key)?, -- fired on Enter ('\n') / Space (' ')
// / left-click ('click'); return an
// action string to close the dialog,
// or null to stay open.
// showScrollbar: bool?, -- default: auto (true when overflowing).
// bg: number?, -- list background colour (default 242).
// },
//
// buttons: [{label, action, default?}, ...] -- defaults to [OK, Cancel] (+ Delete // buttons: [{label, action, default?}, ...] -- defaults to [OK, Cancel] (+ Delete
// if `allowDelete:true`) // if `allowDelete:true`)
// allowDelete: bool, -- inserts a Delete button (fsh compat) // allowDelete: bool, -- inserts a Delete button (fsh compat)
// colours: {fg?, bg?, fieldBg?, dimFg?, hlFg?, focusBg?} -- per-call overrides // colours: {fg?, bg?, fieldBg?, dimFg?, hlFg?, focusBg?, listBg?, listSelBg?}
// -- per-call overrides
// disableKeyRepeat: bool, -- when true, key won't repeat when held down
// onKey: function(ks, shiftDown, ctx)?, -- escape hatch for callers that need
// extra key bindings. Runs BEFORE the
// built-in handlers. Return true to
// consume the key. `ctx` exposes
// { render, close(result),
// getListCursor, setListCursor }.
// } // }
// //
// Returns {action, values}: `action` is the chosen button's `action` // Returns {action, values, listCursor, listItem}: `action` is the chosen button's
// (default "ok"/"cancel"/"delete"), or "cancel" on Esc; `values` is the array // `action` or the value returned from `onActivate` (default "ok"/"cancel"/"delete"),
// of field strings in field order. // or "cancel" on Esc; `values` is the array of field strings in field order;
// `listCursor` is the final cursor index (-1 if there is no list); `listItem` is
// the item at that index.
// //
// Behaviour: // Behaviour:
// - Tab / Shift+Tab and arrow Down / Up cycle focus across fields and buttons. // - Tab / Shift+Tab and arrow Down / Up cycle focus across fields, list, and buttons.
// - Left / Right inside a field move the caret; on a button they cycle focus. // Inside the list, arrow Up / Down move the cursor between selectable rows;
// PgUp/PgDn move a page; Home/End jump to the first/last selectable row.
// - Left / Right inside a field move the caret; on the list or a button they cycle focus.
// - Home / End jump to start / end of the focused field. // - Home / End jump to start / end of the focused field.
// - Enter on a field jumps to the next field, then to the first button. Enter // - Enter on a field jumps to the next field, then to the first button. Enter
// or Space on a button activates it. // or Space on a button activates it. Enter or Space on a list row invokes
// `onActivate(item, idx, key)`; if that returns a string, the dialog closes
// with that action.
// - Insert at caret. Backspace deletes left of caret; Forward-Del deletes right. // - Insert at caret. Backspace deletes left of caret; Forward-Del deletes right.
// - Blinking caret (`con.curs_set(1)`) is positioned on the focused field and // - Blinking caret (`con.curs_set(1)`) is positioned on the focused field and
// hidden when a button has focus. // hidden when the list or a button has focus.
// - Mouse: left-click on a button activates it; click on a field puts focus // - Mouse: left-click on a button activates it; click on a field puts focus
// on that field and positions the caret under the click. Mouse hover on a // on that field and positions the caret under the click; click on a list row
// button highlights it. // moves the cursor (and fires `onActivate` if defined); mouse-wheel inside the
// list scrolls it. Mouse hover on a button moves focus to it (the same focus
// the keyboard uses).
const _dialogScreen = con.getmaxyx() const _dialogScreen = con.getmaxyx()
const _dialogPixDim = graphics.getPixelDimension() const _dialogPixDim = graphics.getPixelDimension()
const _CELL_PW = (_dialogPixDim[0] / _dialogScreen[1]) | 0 const _CELL_PW = (_dialogPixDim[0] / _dialogScreen[1]) | 0
@@ -238,37 +287,87 @@ function showDialog(opts) {
: Array.isArray(message) ? message : Array.isArray(message) ? message
: ('' + message).split('\n') : ('' + message).split('\n')
const c = opts.colours || {} const c = opts.colours || {}
const fg = (c.fg != null) ? c.fg : 254 const fg = (c.fg != null) ? c.fg : 254
const bg = (c.bg != null) ? c.bg : 243 const bg = (c.bg != null) ? c.bg : 244
const fieldBg = (c.fieldBg != null) ? c.fieldBg : 240 const fieldBg = (c.fieldBg != null) ? c.fieldBg : 240
const dimFg = (c.dimFg != null) ? c.dimFg : 249 const dimFg = (c.dimFg != null) ? c.dimFg : 249
const hlFg = (c.hlFg != null) ? c.hlFg : 230 const hlFg = (c.hlFg != null) ? c.hlFg : 240
const focusBg = (c.focusBg != null) ? c.focusBg : bg const focusBg = (c.focusBg != null) ? c.focusBg : 253
const listBg = (c.listBg != null) ? c.listBg : 243
const listSelBg = (c.listSelBg != null) ? c.listSelBg : focusBg
// List state
const list = opts.list || null
const listItems = list ? (list.items || []) : []
const listSelectable = list && list.selectable ? list.selectable : (() => true)
const listHeight = list ? (list.height || Math.min(8, listItems.length)) : 0
const hasList = !!list
const listOnActivate = list ? list.onActivate : null
const listBgColour = (list && list.bg != null) ? list.bg : listBg
function firstSelectable(from, dir) {
if (!hasList || listItems.length === 0) return -1
let i = from
for (let n = 0; n < listItems.length; n++) {
if (i >= 0 && i < listItems.length && listSelectable(listItems[i], i)) return i
i += dir
if (i < 0) i = listItems.length - 1
if (i >= listItems.length) i = 0
}
return -1
}
let listCursor = hasList
? (list.cursor != null ? list.cursor : firstSelectable(0, +1))
: -1
let listScroll = 0
// Layout // Layout
const buttonGap = 3
const maxFieldW = fields.reduce((m, f) => Math.max(m, f.width), 16) const maxFieldW = fields.reduce((m, f) => Math.max(m, f.width), 16)
const longestMsg = messageLines.reduce((m, l) => Math.max(m, l.length), 0) const longestMsg = messageLines.reduce((m, l) => Math.max(m, l.length), 0)
// When the caller pins `list.width`, trust it — string `.length` overcounts
// visual width whenever items embed ANSI escapes or TVDOS \x84NNu sequences
// (e.g. taut's help popup, whose rows are pre-typeset with fg-colour escapes).
const longestItem = hasList && list.width == null
? listItems.reduce((m, it) => Math.max(m, (it.label || '').length), 0)
: 0
const titleW = title.length + 4 const titleW = title.length + 4
const btnRowW = buttons.reduce((s, b) => s + b.label.length + 5, 0) - 1 const btnRowW = buttons.reduce((s, b) => s + b.label.length + 4, 0) + buttonGap * Math.max(0, buttons.length - 1)
const w = Math.max(maxFieldW + 6, titleW + 4, longestMsg + 6, btnRowW + 4, 24) const listMinW = hasList
const msgTopOff = (messageLines.length > 0) ? 1 : 0 ? (list.width != null ? list.width + 4 : longestItem + 6)
const msgRows = messageLines.length + (messageLines.length > 0 ? 1 : 0) : 0
const w = Math.max(maxFieldW + 6, titleW + 4, longestMsg + 6, btnRowW + 4, listMinW, 24)
const msgRows = messageLines.length + (messageLines.length > 0 ? 1 : 0)
const fieldsBlockH = fields.length * 4 const fieldsBlockH = fields.length * 4
const buttonsRowOff = 1 + msgRows + (fields.length > 0 ? fieldsBlockH + 1 : 1) const listBlockH = hasList ? listHeight + 2 : 0 // top border + rows + bottom border
let bodyRows = msgRows
if (fields.length > 0) bodyRows += fieldsBlockH + 1 // +1 spacing after fields
if (hasList) bodyRows += listBlockH + 1 // +1 spacing after list
if (bodyRows === 0) bodyRows = 1 // at least one row above buttons
const buttonsRowOff = 1 + bodyRows
const h = buttonsRowOff + 2 const h = buttonsRowOff + 2
const screen = con.getmaxyx() const screen = con.getmaxyx()
const row = Math.max(2, Math.floor((screen[0] - h) / 2)) const row = Math.max(2, Math.floor((screen[0] - h) / 2))
const col = Math.max(2, Math.floor((screen[1] - w) / 2)) const col = Math.max(2, Math.floor((screen[1] - w) / 2))
// Pick initial focus: explicit default > first field > first button. // Focus layout: 0..fields.length-1 = fields, [+1 = list if present], then buttons.
const listFocusIdx = hasList ? fields.length : -1
const buttonsFocusBase = fields.length + (hasList ? 1 : 0)
const totalFocus = buttonsFocusBase + buttons.length
// Pick initial focus: explicit default > list > first field > first button.
let focusIdx = -1 let focusIdx = -1
for (let i = 0; i < buttons.length; i++) { for (let i = 0; i < buttons.length; i++) {
if (buttons[i].default) { focusIdx = fields.length + i; break } if (buttons[i].default) { focusIdx = buttonsFocusBase + i; break }
}
if (focusIdx < 0) {
if (fields.length > 0) focusIdx = 0
else if (hasList) focusIdx = listFocusIdx
else focusIdx = buttonsFocusBase
} }
if (focusIdx < 0) focusIdx = fields.length > 0 ? 0 : fields.length
const totalFocus = fields.length + buttons.length
let hoverBtn = -1
let done = null let done = null
function fieldScroll(cur, fw) { return cur < fw ? 0 : cur - fw + 1 } function fieldScroll(cur, fw) { return cur < fw ? 0 : cur - fw + 1 }
@@ -278,11 +377,27 @@ function showDialog(opts) {
function fieldBoxCol() { return col + 2 } function fieldBoxCol() { return col + 2 }
function fieldContentRegion(i) { return { x: fieldBoxCol() + 1, y: fieldContentRow(i), w: fields[i].width } } function fieldContentRegion(i) { return { x: fieldBoxCol() + 1, y: fieldContentRow(i), w: fields[i].width } }
function listBlockTopRow() {
return row + 1 + msgRows + (fields.length > 0 ? fieldsBlockH + 1 : 0)
}
function listBlockCol() { return col + 2 }
function listBlockWidth() { return w - 4 } // inner content width incl. borders
function listContentRow(i) { return listBlockTopRow() + 1 + (i - listScroll) }
function listContentCol() { return listBlockCol() + 1 }
function listScrollbarNeeded() {
if (!hasList) return false
if (list.showScrollbar != null) return list.showScrollbar
return listItems.length > listHeight
}
function listContentInnerW() {
return listBlockWidth() - 2 - (listScrollbarNeeded() ? 1 : 0)
}
function buttonRegions() { function buttonRegions() {
let bx = col + Math.floor((w - btnRowW) / 2) let bx = col + Math.floor((w - btnRowW) / 2)
return buttons.map(b => { return buttons.map(b => {
const r = { x: bx, y: row + buttonsRowOff, w: b.label.length + 4 } const r = { x: bx, y: row + buttonsRowOff, w: b.label.length + 4 }
bx += b.label.length + 5 bx += b.label.length + 4 + buttonGap
return r return r
}) })
} }
@@ -293,7 +408,7 @@ function showDialog(opts) {
con.move(r, col) con.move(r, col)
print(' '.repeat(w)) print(' '.repeat(w))
} }
const wo = new WindowObject(col, row, w, h, ()=>{}, ()=>{}, title) const wo = new WindowObject(col, row, w, h, ()=>{}, ()=>{}, title, opts.drawFrame)
wo.isHighlighted = true wo.isHighlighted = true
wo.titleBack = bg wo.titleBack = bg
wo.drawFrame() wo.drawFrame()
@@ -320,46 +435,127 @@ function showDialog(opts) {
// Label // Label
con.color_pair(fg, bg) con.color_pair(fg, bg)
con.move(fieldLabelRow(i), fbCol) con.move(fieldLabelRow(i), fbCol)
print(f.label + ':') print(f.label)
// Top border // Top border (3px padding w/ TSVM chr rom)
con.color_pair(fieldBg, bg) con.color_pair(fieldBg, bg)
con.move(fbRow, fbCol) con.move(fbRow, fbCol)
print('\u00EC' + '\u00A9'.repeat(fw) + '\u00ED') print('\u00EC' + '\u00A9'.repeat(fw) + '\u00ED')
// Side borders + content // Left border (3px padding w/ TSVM chr rom)
con.move(fbRow + 1, fbCol) con.move(fbRow + 1, fbCol)
print('\u00AB') print('\u00AB')
// the content
con.color_pair(fg, fieldBg) con.color_pair(fg, fieldBg)
const s = fieldScroll(cursors[i], fw) const s = fieldScroll(cursors[i], fw)
const vis = values[i].substring(s, s + fw) const vis = values[i].substring(s, s + fw)
print(vis.padEnd(fw, ' ')) print(vis.padEnd(fw, ' '))
// Right border (3px padding w/ TSVM chr rom)
con.color_pair(fieldBg, bg) con.color_pair(fieldBg, bg)
con.move(fbRow + 1, fbCol + fw + 1) con.move(fbRow + 1, fbCol + fw + 1)
print('\u00AA') print('\u00AA')
// Bottom border // Bottom border (3px padding w/ TSVM chr rom)
con.move(fbRow + 2, fbCol) con.move(fbRow + 2, fbCol)
print('\u00F4' + '\u00AC'.repeat(fw) + '\u00F5') print('\u00F4' + '\u00AC'.repeat(fw) + '\u00F5')
con.color_pair(fg, bg) con.color_pair(fg, bg)
} }
function drawList() {
if (!hasList) return
const lbCol = listBlockCol()
const lbRow = listBlockTopRow()
const lw = listBlockWidth()
const innerW = listContentInnerW()
const focused = (focusIdx === listFocusIdx)
const frameFg = focused ? fg : dimFg
const sbar = listScrollbarNeeded()
// Top border (drawField style)
con.color_pair(listBgColour, bg)
con.move(lbRow, lbCol)
print('\u00EC' + '\u00A9'.repeat(lw - 2) + '\u00ED')
// Side borders + rows
for (let r = 0; r < listHeight; r++) {
con.color_pair(listBgColour, bg)
con.move(lbRow + 1 + r, lbCol)
print('\u00AB')
con.move(lbRow + 1 + r, lbCol + lw - 1)
print('\u00AA')
const idx = listScroll + r
con.move(lbRow + 1 + r, lbCol + 1)
if (idx >= listItems.length) {
con.color_pair(fg, listBgColour)
print(' '.repeat(innerW))
continue
}
const it = listItems[idx]
const isCursor = (idx === listCursor)
const ctx = {
y: lbRow + 1 + r,
x: lbCol + 1,
w: innerW,
item: it,
idx: idx,
isCursor: isCursor,
focused: focused,
listBg: listBgColour,
selBg: listSelBg,
fg: fg,
hlFg: hlFg,
dimFg: dimFg,
}
if (list.renderItem) {
list.renderItem(ctx)
} else {
const useFg = (isCursor && focused) ? hlFg : fg
const useBg = (isCursor && focused) ? listSelBg : listBgColour
con.color_pair(useFg, useBg)
const label = (it.label || '').substring(0, innerW - 1)
print(' ' + label.padEnd(innerW - 1, ' '))
}
// Scrollbar column
if (sbar) {
con.color_pair(dimFg, listBgColour)
con.move(lbRow + 1 + r, lbCol + lw - 2)
const maxScroll = Math.max(1, listItems.length - listHeight)
const indPos = (maxScroll <= 0) ? 0 : ((listScroll * (listHeight - 1) / maxScroll) | 0)
let trough = (r === 0) ? 0xBA : (r === listHeight - 1) ? 0xBC : 0xBB
con.addch(r === indPos ? (trough + 3) : trough)
}
}
// Bottom border
con.color_pair(listBgColour, bg)
con.move(lbRow + 1 + listHeight, lbCol)
print('\u00F4' + '\u00AC'.repeat(lw - 2) + '\u00F5')
con.color_pair(fg, bg)
}
function drawButton(i, regions) { function drawButton(i, regions) {
const b = buttons[i] const b = buttons[i]
const bIdx = fields.length + i const bIdx = buttonsFocusBase + i
const focused = (focusIdx === bIdx) const focused = (focusIdx === bIdx)
const hovered = (hoverBtn === i)
const r = regions[i] const r = regions[i]
let useFg, useBg const useFg = focused ? hlFg : fg
if (focused && hovered) { useFg = hlFg; useBg = focusBg } const useBg = focused ? focusBg : bg
else if (focused) { useFg = hlFg; useBg = focusBg }
else if (hovered) { useFg = hlFg; useBg = bg }
else { useFg = fg; useBg = bg }
con.color_pair(useFg, useBg) con.color_pair(useFg, useBg)
con.move(r.y, r.x) con.move(r.y, r.x-1)
print('[ ' + b.label + ' ]') if (focused) {
con.color_pair(useBg, bg)
print('\u00DE')
con.color_pair(useFg, useBg)
print('[ ' + b.label + ' ]')
con.color_pair(useBg, bg)
print('\u00DD')
}
else
print(' [ ' + b.label + ' ] ')
con.color_pair(fg, bg) con.color_pair(fg, bg)
} }
@@ -374,10 +570,59 @@ function showDialog(opts) {
} }
} }
function ensureListCursorVisible() {
if (!hasList) return
if (listCursor < 0) return
if (listCursor < listScroll) listScroll = listCursor
else if (listCursor >= listScroll + listHeight) listScroll = listCursor - listHeight + 1
const maxScroll = Math.max(0, listItems.length - listHeight)
if (listScroll > maxScroll) listScroll = maxScroll
if (listScroll < 0) listScroll = 0
}
function scrollListBy(dir) {
const maxScroll = Math.max(0, listItems.length - listHeight)
let s = listScroll + dir
if (s < 0) s = 0
if (s > maxScroll) s = maxScroll
listScroll = s
}
function moveListCursor(dir) {
if (!hasList || listItems.length === 0) return
// Scroll the view when nothing in the list is selectable (e.g. a help text body).
if (listCursor < 0) { scrollListBy(dir); return }
let next = listCursor
for (let n = 0; n < listItems.length; n++) {
next += dir
if (next < 0 || next >= listItems.length) return
if (listSelectable(listItems[next], next)) {
listCursor = next
ensureListCursorVisible()
return
}
}
}
function pageListCursor(dir) {
if (!hasList || listItems.length === 0) return
if (listCursor < 0) { scrollListBy(dir * listHeight); return }
let target = listCursor + dir * listHeight
if (target < 0) target = 0
if (target >= listItems.length) target = listItems.length - 1
// Snap to nearest selectable
let probe = target
const step = dir < 0 ? -1 : 1
while (probe >= 0 && probe < listItems.length && !listSelectable(listItems[probe], probe)) probe += step
if (probe < 0 || probe >= listItems.length) probe = firstSelectable(target, -step)
if (probe >= 0) { listCursor = probe; ensureListCursorVisible() }
}
function render() { function render() {
drawFrameBox() drawFrameBox()
drawMessage() drawMessage()
for (let i = 0; i < fields.length; i++) drawField(i) for (let i = 0; i < fields.length; i++) drawField(i)
drawList()
const regs = buttonRegions() const regs = buttonRegions()
for (let i = 0; i < buttons.length; i++) drawButton(i, regs) for (let i = 0; i < buttons.length; i++) drawButton(i, regs)
positionCaret() positionCaret()
@@ -389,7 +634,32 @@ function showDialog(opts) {
} }
function activateButton(i) { function activateButton(i) {
done = { action: buttons[i].action, values: values.slice() } done = {
action: buttons[i].action,
values: values.slice(),
listCursor: listCursor,
listItem: (hasList && listCursor >= 0) ? listItems[listCursor] : null,
}
}
function activateListItem(idx, key) {
if (!hasList || !listOnActivate) return false
if (idx < 0 || idx >= listItems.length) return false
if (!listSelectable(listItems[idx], idx)) return false
const result = listOnActivate(listItems[idx], idx, key)
if (result == null) {
// Callback consumed the event but kept the dialog open (e.g. radio
// toggle); reflect any state changes it made.
render()
return true
}
done = {
action: result,
values: values.slice(),
listCursor: idx,
listItem: listItems[idx],
}
return true
} }
function hitTestMouse(ev) { function hitTestMouse(ev) {
@@ -404,9 +674,42 @@ function showDialog(opts) {
const r = fieldContentRegion(i) const r = fieldContentRegion(i)
if (cy === r.y && cx >= r.x && cx < r.x + r.w) return { kind: 'field', idx: i, cx: cx, region: r } if (cy === r.y && cx >= r.x && cx < r.x + r.w) return { kind: 'field', idx: i, cx: cx, region: r }
} }
if (hasList) {
const lbRow = listBlockTopRow()
const lbCol = listBlockCol()
const innerW = listContentInnerW()
if (cy > lbRow && cy <= lbRow + listHeight && cx >= lbCol + 1 && cx < lbCol + 1 + innerW) {
const r = cy - (lbRow + 1)
const idx = listScroll + r
if (idx >= 0 && idx < listItems.length) return { kind: 'list', idx: idx }
}
if (cy > lbRow && cy <= lbRow + listHeight && cx >= lbCol && cx < lbCol + listBlockWidth()) {
return { kind: 'listblank' }
}
}
return null return null
} }
const externalCtx = {
render: () => render(),
close: (result) => {
done = Object.assign({
action: 'cancel',
values: values.slice(),
listCursor: listCursor,
listItem: (hasList && listCursor >= 0) ? listItems[listCursor] : null,
}, result || {})
},
getListCursor: () => listCursor,
setListCursor: (n) => {
if (!hasList) return
if (n < 0 || n >= listItems.length) return
listCursor = n
ensureListCursorVisible()
},
}
ensureListCursorVisible()
render() render()
let eventJustReceived = true let eventJustReceived = true
@@ -418,12 +721,12 @@ function showDialog(opts) {
if (ev[0] === 'mouse_move') { if (ev[0] === 'mouse_move') {
const hit = hitTestMouse(ev) const hit = hitTestMouse(ev)
const newHover = (hit && hit.kind === 'button') ? hit.idx : -1 if (hit && hit.kind === 'button') {
if (newHover !== hoverBtn) { const newFocus = buttonsFocusBase + hit.idx
hoverBtn = newHover if (newFocus !== focusIdx) {
const regs = buttonRegions() focusIdx = newFocus
for (let i = 0; i < buttons.length; i++) drawButton(i, regs) render()
positionCaret() }
} }
return return
} }
@@ -432,7 +735,7 @@ function showDialog(opts) {
const hit = hitTestMouse(ev) const hit = hitTestMouse(ev)
if (!hit) return if (!hit) return
if (hit.kind === 'button') { if (hit.kind === 'button') {
focusIdx = fields.length + hit.idx focusIdx = buttonsFocusBase + hit.idx
render() render()
activateButton(hit.idx) activateButton(hit.idx)
return return
@@ -444,19 +747,76 @@ function showDialog(opts) {
const newCur = s + (hit.cx - hit.region.x) const newCur = s + (hit.cx - hit.region.x)
cursors[hit.idx] = Math.min(values[hit.idx].length, Math.max(0, newCur)) cursors[hit.idx] = Math.min(values[hit.idx].length, Math.max(0, newCur))
render() render()
return
}
if (hit.kind === 'list') {
focusIdx = listFocusIdx
if (listSelectable(listItems[hit.idx], hit.idx)) {
listCursor = hit.idx
ensureListCursorVisible()
render()
if (activateListItem(hit.idx, 'click')) return
} else {
render()
}
return
}
if (hit.kind === 'listblank') {
focusIdx = listFocusIdx
render()
return
} }
return return
} }
if (ev[0] === 'mouse_wheel' && hasList) {
const hit = hitTestMouse(ev)
if (!hit || (hit.kind !== 'list' && hit.kind !== 'listblank')) return
const dy = (ev[3] | 0) * 3
const maxScroll = Math.max(0, listItems.length - listHeight)
let next = listScroll + dy
if (next < 0) next = 0
if (next > maxScroll) next = maxScroll
if (next !== listScroll) { listScroll = next; render() }
return
}
if (ev[0] !== 'key_down') return if (ev[0] !== 'key_down') return
if (1 !== ev[2]) return if (opts.disableKeyRepeat && 1 !== ev[2]) return
const ks = ev[1] const ks = ev[1]
const shiftDown = (ev.includes(59) || ev.includes(60)) const shiftDown = (ev.includes(59) || ev.includes(60))
if (ks === '<ESC>') { done = { action: 'cancel', values: values.slice() }; return } if (opts.onKey && opts.onKey(ks, shiftDown, externalCtx)) return
if (ks === '<ESC>') {
done = {
action: 'cancel',
values: values.slice(),
listCursor: listCursor,
listItem: (hasList && listCursor >= 0) ? listItems[listCursor] : null,
}
return
}
if (ks === '\t' || ks === '<TAB>') { moveFocus(shiftDown ? -1 : 1); return } if (ks === '\t' || ks === '<TAB>') { moveFocus(shiftDown ? -1 : 1); return }
if (ks === '<UP>') { moveFocus(-1); return }
if (ks === '<DOWN>') { moveFocus(+1); return } // Vertical movement: arrows operate within the list when it has focus.
if (ks === '<UP>') {
if (focusIdx === listFocusIdx) { moveListCursor(-1); render() }
else moveFocus(-1)
return
}
if (ks === '<DOWN>') {
if (focusIdx === listFocusIdx) { moveListCursor(+1); render() }
else moveFocus(+1)
return
}
if (ks === '<PAGE_UP>') {
if (focusIdx === listFocusIdx) { pageListCursor(-1); render() }
return
}
if (ks === '<PAGE_DOWN>') {
if (focusIdx === listFocusIdx) { pageListCursor(+1); render() }
return
}
if (ks === '<LEFT>') { if (ks === '<LEFT>') {
if (focusIdx < fields.length) { if (focusIdx < fields.length) {
@@ -472,16 +832,28 @@ function showDialog(opts) {
} }
if (ks === '<HOME>') { if (ks === '<HOME>') {
if (focusIdx < fields.length) { cursors[focusIdx] = 0; render() } if (focusIdx < fields.length) { cursors[focusIdx] = 0; render() }
else if (focusIdx === listFocusIdx) {
const t = firstSelectable(0, +1)
if (t >= 0) { listCursor = t; ensureListCursorVisible(); render() }
else { listScroll = 0; render() }
}
return return
} }
if (ks === '<END>') { if (ks === '<END>') {
if (focusIdx < fields.length) { cursors[focusIdx] = values[focusIdx].length; render() } if (focusIdx < fields.length) { cursors[focusIdx] = values[focusIdx].length; render() }
else if (focusIdx === listFocusIdx) {
const t = firstSelectable(listItems.length - 1, -1)
if (t >= 0) { listCursor = t; ensureListCursorVisible(); render() }
else { listScroll = Math.max(0, listItems.length - listHeight); render() }
}
return return
} }
if (focusIdx < fields.length) { if (focusIdx < fields.length) {
if (ks === '\n') { if (ks === '\n') {
focusIdx = (focusIdx < fields.length - 1) ? focusIdx + 1 : fields.length if (focusIdx < fields.length - 1) focusIdx = focusIdx + 1
else if (hasList) focusIdx = listFocusIdx
else focusIdx = buttonsFocusBase
render() render()
return return
} }
@@ -506,7 +878,10 @@ function showDialog(opts) {
} }
if (typeof ks === 'string' && ks.length === 1) { if (typeof ks === 'string' && ks.length === 1) {
const code = ks.charCodeAt(0) const code = ks.charCodeAt(0)
if (code >= 32 && code < 256 && values[focusIdx].length < fields[focusIdx].width * 4) { const cap = fields[focusIdx].maxLength != null
? fields[focusIdx].maxLength
: fields[focusIdx].width * 4
if (code >= 32 && code < 256 && values[focusIdx].length < cap) {
const v = values[focusIdx] const v = values[focusIdx]
const cur = cursors[focusIdx] const cur = cursors[focusIdx]
values[focusIdx] = v.substring(0, cur) + ks + v.substring(cur) values[focusIdx] = v.substring(0, cur) + ks + v.substring(cur)
@@ -515,12 +890,33 @@ function showDialog(opts) {
} }
return return
} }
} else if (focusIdx === listFocusIdx) {
if (ks === '\n' || ks === ' ') {
if (listCursor >= 0 && activateListItem(listCursor, ks)) return
}
} else { } else {
if (ks === '\n' || ks === ' ') { activateButton(focusIdx - fields.length); return } if (ks === '\n' || ks === ' ') { activateButton(focusIdx - buttonsFocusBase); return }
} }
}) })
} }
// Modal-dialog convention: wait for the user to release whatever key closed
// the dialog before handing control back. TVDOS's input strobo
// (TVDOS.SYS:input.withEvent) keeps re-firing `key_down` for a held key
// once its ~250 ms initial-press delay elapses; without this drain a brief
// hold on Enter inside a popup would surface as a fresh Enter to whatever
// the popup was covering, e.g. activating the file under zfm's More menu.
// A mouse close (or any path with no key held) leaves the head key at 0
// and skips the wait.
sys.poke(-40, 255)
const heldHead = sys.peek(-41)
if (heldHead !== 0) {
while (true) {
input.withEvent(() => {})
if (sys.peek(-41) !== heldHead) break
}
}
con.curs_set(0) con.curs_set(0)
con.color_pair(oldFG, oldBG) con.color_pair(oldFG, oldBG)
return done return done

View File

@@ -2409,6 +2409,8 @@ TODO:
[x] expose song table on UI (test with `insaniq2.taud`) [x] expose song table on UI (test with `insaniq2.taud`)
[x] 0x0000 - no-op; 0x0001 - key-off; 0x0002 - note-cut 0x0010..0x001F - INT0..INTF [x] 0x0000 - no-op; 0x0001 - key-off; 0x0002 - note-cut 0x0010..0x001F - INT0..INTF
[ ] establish hooks for the interrupts [ ] establish hooks for the interrupts
[ ] Samples and Instruments view (viewer on taut.js; editor on separate .js)
follow the ImpulseTracker design first, then improve from there
TODO - list of demo songs that MUST ship with Microtone: TODO - list of demo songs that MUST ship with Microtone:
* 4THSYM (rename to Fourth Symmetriad) — excellent piece for demonstrating NNAs and filter envelopes * 4THSYM (rename to Fourth Symmetriad) — excellent piece for demonstrating NNAs and filter envelopes