Major codebase cleanup and overhaul.
+ editor removes per-buffer fields. + switching from internal use of 'int' to 'size_t'. + deleting old code + double checking relevancy of comments. A lot has changed in 5 years, even more so in the past week. + fixing a few vestigal memory errors from the overhaul. + fixing search behavior
This commit is contained in:
156
scratch.c
156
scratch.c
@@ -2,15 +2,20 @@
|
||||
* scratch.c - ideas in progress
|
||||
*/
|
||||
|
||||
#include "buffer.h"
|
||||
#include "abuf.h"
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
|
||||
#define REFLOW_MARGIN 72
|
||||
|
||||
void
|
||||
reflow_region(void)
|
||||
{
|
||||
int start_row, end_row, i, col, wlen, this_len;
|
||||
struct erow *row;
|
||||
struct abuf buf = ABUF_INIT;
|
||||
struct abuf out = ABUF_INIT;
|
||||
int start_row, end_row, i, col, wlen, this_len;
|
||||
abuf *row;
|
||||
struct abuf buf = ABUF_INIT;
|
||||
struct abuf out = ABUF_INIT;
|
||||
int in_paragraph = 0;
|
||||
int indent_len = 0;
|
||||
char indent[REFLOW_MARGIN + 1];
|
||||
@@ -19,38 +24,38 @@ reflow_region(void)
|
||||
char *p = NULL;
|
||||
char *s = NULL;
|
||||
|
||||
if (editor.mark_set) {
|
||||
if (editor.mark_cury < editor.cury ||
|
||||
(editor.mark_cury == editor.cury &&
|
||||
editor.mark_curx < editor.curx)) {
|
||||
start_row = editor.mark_cury;
|
||||
end_row = editor.cury;
|
||||
} else {
|
||||
start_row = editor.cury;
|
||||
end_row = editor.mark_cury;
|
||||
}
|
||||
} else {
|
||||
start_row = end_row = editor.cury;
|
||||
while (start_row > 0 && editor.row[start_row - 1].size > 0) {
|
||||
start_row--;
|
||||
}
|
||||
if (EMARK_SET) {
|
||||
if (EMARK_CURY < ECURY ||
|
||||
(EMARK_CURY == ECURY &&
|
||||
EMARK_CURX < ECURX)) {
|
||||
start_row = EMARK_CURY;
|
||||
end_row = ECURY;
|
||||
} else {
|
||||
start_row = ECURY;
|
||||
end_row = EMARK_CURY;
|
||||
}
|
||||
} else {
|
||||
start_row = end_row = ECURY;
|
||||
while (start_row > 0 && EROW[start_row - 1].size > 0) {
|
||||
start_row--;
|
||||
}
|
||||
|
||||
while (end_row < editor.nrows - 1 &&
|
||||
editor.row[end_row + 1].size > 0) {
|
||||
end_row++;
|
||||
}
|
||||
}
|
||||
while (end_row < ENROWS - 1 &&
|
||||
EROW[end_row + 1].size > 0) {
|
||||
end_row++;
|
||||
}
|
||||
}
|
||||
|
||||
if (start_row >= editor.nrows) {
|
||||
return;
|
||||
}
|
||||
if (start_row >= ENROWS) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (end_row >= editor.nrows) {
|
||||
end_row = editor.nrows - 1;
|
||||
}
|
||||
if (end_row >= ENROWS) {
|
||||
end_row = ENROWS - 1;
|
||||
}
|
||||
|
||||
for (i = start_row; i <= end_row; i++) {
|
||||
row = &editor.row[i];
|
||||
for (i = start_row; i <= end_row; i++) {
|
||||
row = &EROW[i];
|
||||
|
||||
if (row->size == 0) {
|
||||
if (in_paragraph) {
|
||||
@@ -62,21 +67,21 @@ reflow_region(void)
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!in_paragraph) {
|
||||
indent_len = 0;
|
||||
while (indent_len < row->size &&
|
||||
(row->line[indent_len] == ' ' ||
|
||||
row->line[indent_len] == '\t')) {
|
||||
indent[indent_len] = row->line[indent_len], indent_len++;
|
||||
}
|
||||
if (!in_paragraph) {
|
||||
indent_len = 0;
|
||||
while (indent_len < (int)row->size &&
|
||||
(row->b[indent_len] == ' ' ||
|
||||
row->b[indent_len] == '\t')) {
|
||||
indent[indent_len] = row->b[indent_len], indent_len++;
|
||||
}
|
||||
|
||||
indent[indent_len] = '\0';
|
||||
in_paragraph = 1;
|
||||
}
|
||||
indent[indent_len] = '\0';
|
||||
in_paragraph = 1;
|
||||
}
|
||||
|
||||
ab_append(&buf, row->line + indent_len, row->size - indent_len);
|
||||
ab_append(&buf, " ", 1);
|
||||
}
|
||||
ab_append(&buf, row->b + indent_len, row->size - indent_len);
|
||||
ab_append(&buf, " ", 1);
|
||||
}
|
||||
|
||||
if (in_paragraph) {
|
||||
ab_append(&buf, "\n", 1);
|
||||
@@ -145,18 +150,57 @@ reflow_region(void)
|
||||
ab_free(&out);
|
||||
|
||||
|
||||
for (i = end_row; i >= start_row; i--) {
|
||||
delete_row(i);
|
||||
}
|
||||
for (i = end_row; i >= start_row; i--) {
|
||||
delete_row(i);
|
||||
}
|
||||
|
||||
s = buf.b;
|
||||
while ((e = strchr(s, '\n'))) {
|
||||
erow_insert(start_row++, s, e - s);
|
||||
s = e + 1;
|
||||
}
|
||||
s = buf.b;
|
||||
while ((e = strchr(s, '\n'))) {
|
||||
erow_insert(start_row++, s, e - s);
|
||||
s = e + 1;
|
||||
}
|
||||
|
||||
ab_free(&buf);
|
||||
|
||||
editor.dirty++;
|
||||
editor_set_status("Region reflowed to %d columns", REFLOW_MARGIN);
|
||||
}
|
||||
EDIRTY++;
|
||||
editor_set_status("Region reflowed to %d columns", REFLOW_MARGIN);
|
||||
}
|
||||
|
||||
|
||||
static inline
|
||||
void clamp_curx_to_row(void)
|
||||
{
|
||||
abuf *row = NULL;
|
||||
int maxx = 0;
|
||||
|
||||
if (ECURY >= ENROWS) {
|
||||
return;
|
||||
}
|
||||
|
||||
row = &EROW[ECURY];
|
||||
if (ECURX < 0) {
|
||||
ECURX = 0;
|
||||
}
|
||||
|
||||
maxx = (int) row->size;
|
||||
if (ECURX > maxx) {
|
||||
ECURX = maxx;
|
||||
}
|
||||
}
|
||||
|
||||
static inline
|
||||
void set_cursor(int col, int row)
|
||||
{
|
||||
if (row < 0) {
|
||||
row = 0;
|
||||
}
|
||||
|
||||
if (row > ENROWS) {
|
||||
row = ENROWS;
|
||||
}
|
||||
|
||||
ECURY = row;
|
||||
ECURX = col;
|
||||
|
||||
clamp_curx_to_row();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user