8000 Fix editing note (comment) line by zcsahok · Pull Request #474 · Tlf/tlf · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix editing note (comment) line #474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 23, 2025
Merged

Fix editing note (comment) line #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a25bf59
fix editing note (comment) line
zcsahok Jun 18, 2025
7ea98d5
replace non-printable characters in note by space and trim it
zcsahok Jun 18, 2025
9a30446
Merge branch 'Tlf:master' into fix_note_editing
zcsahok Jun 20, 2025
c42d50b
on a new line move editing cursor left to the rightmost non-empty pos…
zcsahok Jun 20, 2025
0b3d35e
added a hint about leaving note blank to skip it
zcsahok Jun 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
143 changes: 111 additions & 32 deletions src/edit_last.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ typedef struct {

#define RST_PATTERN "^\\s*(\\d+|-+)\\s*$"

static field_t fields[] = {
static field_t qso_fields[] = {
{
.start = 0, .end = 5, .tab = true, // band+mode
.pattern = "^[ 1]\\d{2}(CW |SSB|DIG)$"
Expand Down Expand Up @@ -83,15 +83,23 @@ static field_t fields[] = {
{.start = 54, .tab = true}, // exchange -- end set at runtime
};

#define FIELD_INDEX_CALL 4
#define FIELD_INDEX_EXCHANGE (G_N_ELEMENTS(fields) - 1)
#define QSO_FIELD_INDEX_CALL 4
#define QSO_FIELD_INDEX_EXCHANGE (G_N_ELEMENTS(qso_fields) - 1)

static field_t comment_fields[] = {
{
.start = 1, .end = 79, .tab = true // the whole line except leading semicolon
},
};

static char editbuffer[LOGLINELEN + 1];
static bool changed, needs_rescore;
static int editline;
static int field_index;
static int n_fields;
static field_t *fields; // either qso_fields or comment_fields
static field_t *current_field; // points to fields[field_index]
static int cursor;

/* highlight the edit line and set the cursor */
static void highlight_line(int row, char *line, int column) {
Expand Down Expand Up @@ -126,13 +134,80 @@ static void flash_field(int row, int column, char *value) {
// note: line will be re-displayed in the main loop
}

/*
align cursor to a valid position in current line
updates:
- cursor
- field_index
- current_field
*/
static void align_cursor(char *buffer) {
int new_column = 0;
int new_field_index = 0;
int min_distance = 999;

// check if rigth from cursor we have only spaces
bool spaces = true;
for (int i = cursor + 1; buffer[i]; ++i) {
if (buffer[i] != ' ') {
spaces = false;
break;
}
}
if (spaces) {
// then move cursor left until next non-empty position
// (it is assumed that fields are separated by spaces)
while (buffer[cursor] == ' ' && cursor > fields[0].start) {
--cursor;
}
}

for (int i = 0; i < n_fields; i++) {
// good case: column falls within a field
if (cursor >= fields[i].start && cursor <= fields[i].end) {
new_column = cursor;
new_field_index = i;
break;
}

// else: find the closest field
int c, d;
if (fields[i].start > cursor) { // field is to the right
c = fields[i].start;
d = c - cursor;
} else {
c = fields[i].end;
d = cursor - c;
}
if (d < min_distance) {
min_distance = d;
new_column = c;
new_field_index = i;
}
}

cursor = new_column;
field_index = new_field_index;
current_field = &fields[field_index];
}


/* get a copy of selected QSO into the buffer */
static void get_qso(int nr, char *buffer) {

assert(nr < NR_QSOS);
strcpy(buffer, QSOS(nr));
assert(strlen(buffer) == (LOGLINELEN - 1));

if (log_is_comment(buffer)) {
fields = comment_fields;
n_fields = G_N_ELEMENTS(comment_fields);
} else {
fields = qso_fields;
n_fields = G_N_ELEMENTS(qso_fields);
}

align_cursor(buffer);
}

/* save editbuffer back to log */
Expand Down Expand Up @@ -196,7 +271,7 @@ static void check_store_and_get_next_line(int direction) {

void edit_last(void) {

int j, b, k;
int j, k;

if (NR_QSOS == 0)
return; /* nothing to edit */
8000 Expand All @@ -206,45 +281,50 @@ void edit_last(void) {
const int topline = (NR_LINES > NR_QSOS ? NR_LINES - NR_QSOS : 0);

// set current end of exchange field
fields[FIELD_INDEX_EXCHANGE].end = fields[FIELD_INDEX_EXCHANGE].start +
contest->exchange_width - 1;

field_index = FIELD_INDEX_CALL;
current_field = &fields[field_index];
b = current_field->start;
qso_fields[QSO_FIELD_INDEX_EXCHANGE].end =
qso_fields[QSO_FIELD_INDEX_EXCHANGE].start +
contest->exchange_width - 1;

/* start with last QSO */
/* start with last QSO or comment (note) */
editline = NR_LINES - 1;
get_qso(NR_QSOS - (NR_LINES - editline), editbuffer);
changed = false;
needs_rescore = false;

// initial position: start of call field
cursor = qso_fields[QSO_FIELD_INDEX_CALL].start;

get_qso(NR_QSOS - (NR_LINES - editline), editbuffer);

while (true) {
highlight_line(editline, editbuffer, b);
highlight_line(editline, editbuffer, cursor);

j = key_get();

// Ctrl-A (^A) or <Home>, beginning of line.
if (j == CTRL_A || j == KEY_HOME) {
if (field_valid()) {
b = 0;
field_index = 0;
current_field = &fields[field_index];
cursor = current_field->start;
}

// Ctrl-E (^E) or <End>, end of exchange field.
// Ctrl-E (^E) or <End>, end of last field.
} else if (j == CTRL_E || j == KEY_END) {
if (field_valid()) {
b = fields[FIELD_INDEX_EXCHANGE].end;
field_index = n_fields - 1;
current_field = &fields[field_index];
cursor = current_field->end;
}

// <Tab>, switch to next tab field.
} else if (j == TAB) {
if (field_valid()) {
do {
field_index = (field_index + 1) % G_N_ELEMENTS(fields);
field_index = (field_index + 1) % n_fields;
} while (!fields[field_index].tab);

current_field = &fields[field_index];
b = current_field->start;
cursor = current_field->start;
}

// Up arrow, move to previous line.
Expand All @@ -260,7 +340,6 @@ void edit_last(void) {

// Down arrow, move to next line.
} else if (j == KEY_DOWN) {

if (editline < NR_LINES - 1) {
check_store_and_get_next_line(+1);
} else {
Expand All @@ -269,34 +348,34 @@ void edit_last(void) {

// Left arrow, move cursor one position left.
} else if (j == KEY_LEFT) {
if (b > current_field->start) {
b--;
if (cursor > current_field->start) {
cursor--;
} else if (field_valid() && field_index > 0) {
--field_index;
current_field = &fields[field_index];
b = current_field->end;
cursor = current_field->end;
}

// Right arrow, move cursor one position right.
} else if (j == KEY_RIGHT) {
if (b < current_field->end) {
b++;
} else if (field_valid() && field_index < G_N_ELEMENTS(fields) - 1) {
if (cursor < current_field->end) {
cursor++;
} else if (field_valid() && field_index < n_fields - 1) {
++field_index;
current_field = &fields[field_index];
b = current_field->start;
cursor = current_field->start;
}

// <Insert>, insert a space
} else if (j == KEY_IC) {
for (k = current_field->end; k > b; k--)
for (k = current_field->end; k > cursor; k--)
editbuffer[k] = editbuffer[k - 1];
editbuffer[b] = ' ';
editbuffer[cursor] = ' ';
changed = true;

// <Delete>, shift rest left
} else if (j == KEY_DC) {
for (k = b; k < current_field->end; k++)
for (k = cursor; k < current_field->end; k++)
editbuffer[k] = editbuffer[k + 1];
editbuffer[current_field->end] = ' ';
changed = true;
Expand All @@ -309,9 +388,9 @@ void edit_last(void) {

// Accept most all printable characters.
if (j >= ' ' && j < 'a') {
editbuffer[b] = j;
if (b < current_field->end) {
b++;
editbuffer[cursor] = j;
if (cursor < current_field->end) {
cursor++;
}
changed = true;
}
Expand Down
18 changes: 13 additions & 5 deletions src/note.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@

#include <stdlib.h>
#include <string.h>
#include <ctype.h>

#include "clear_display.h"
#include "globalvars.h" // Includes glib.h and tlf.h
#include "log_utils.h"
#include "nicebox.h" // Includes curses.h
#include "scroll_log.h"
#include "store_qso.h"
#include "ui_utils.h"


void include_note(void) {
Expand All @@ -44,16 +46,23 @@ void include_note(void) {
int i;

attron(A_STANDOUT);
mvprintw(15, 1,
" ");
nicebox(14, 0, 1, 78, "Note");
mvaddstr(15, 1, spaces(78));
nicebox(14, 0, 1, 78, "Note (leave blank to ignore)");
attron(A_STANDOUT);
move(15, 1);

echo();
getnstr(buffer, 78);
noecho();

// replace non-printable chars with space and trim buffer
for (char *p = buffer; *p; p++) {
if (!isprint(*p)) {
*p = ' ';
}
}
g_strstrip(buffer);

if (lan_active) {
sprintf(buffer2, "; Node %c, %d : ", thisnode, atoi(qsonrstr) - 1);
} else
Expand All @@ -62,7 +71,7 @@ void include_note(void) {
if (strlen(buffer) >= 1) {
strncat(buffer2, buffer, (LOGLINELEN - 1) - strlen(buffer2));
memset(buffer2 + strlen(buffer2), ' ',
(LOGLINELEN - 1) - strlen(buffer2)); /* fill spaces */
(LOGLINELEN - 1) - strlen(buffer2)); /* fill with spaces */
buffer2[LOGLINELEN - 1] = '\0';

store_qso(logfile, buffer2);
Expand All @@ -79,5 +88,4 @@ void include_note(void) {
for (i = 14; i <= 16; i++)
clear_line(i);

return;
}
2 changes: 1 addition & 1 deletion tlf.1.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,7 @@ In VOICE mode sends recorded message 5 (F5).
.
.TP
.BR ;\ (Semicolon)
Insert note in log.
Insert note in log. Leave the input field blank to skip adding the note.
.
.TP
.BR ,\ (comma)
Expand Down
0