Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 14199afeb5 | |||
| 9f3558c430 | |||
| ce64e4637d | |||
| 36013e42e4 | |||
| dd667c1ef5 | |||
| c9977b0fc0 | |||
| dd2c888766 | |||
| 2967998893 | |||
| a400cdf5ad | |||
| c8a43fb328 | |||
| 3ea7c31cba | |||
| 115091e517 | |||
| 1b9b618e3a | |||
| 527759de09 |
37
.github/workflows/release.yml
vendored
Normal file
37
.github/workflows/release.yml
vendored
Normal file
@@ -0,0 +1,37 @@
|
||||
name: Release
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v*'
|
||||
workflow_dispatch: {}
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
jobs:
|
||||
homebrew:
|
||||
name: Bump Homebrew formula
|
||||
# Skip this job in case of git pushes to prerelease tags
|
||||
if: ${{ github.event_name != 'push' || !contains(github.ref, '-') }}
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: read
|
||||
steps:
|
||||
- name: Extract version
|
||||
id: extract-version
|
||||
run: |
|
||||
echo "tag-name=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
|
||||
|
||||
- uses: mislav/bump-homebrew-formula-action@v3
|
||||
with:
|
||||
formula-name: ke
|
||||
formula-path: Formula/ke.rb
|
||||
homebrew-tap: kisom/homebrew-tap
|
||||
base-branch: master
|
||||
commit-message: |
|
||||
{{formulaName}} {{version}}
|
||||
|
||||
Created by https://github.com/mislav/bump-homebrew-formula-action
|
||||
env:
|
||||
COMMITTER_TOKEN: ${{ secrets.GH_CPAT }}
|
||||
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
*.log
|
||||
build
|
||||
@@ -2,10 +2,11 @@ cmake_minimum_required(VERSION 3.15)
|
||||
project(ke C) # Specify C language explicitly
|
||||
|
||||
set(CMAKE_C_STANDARD 99)
|
||||
set(KE_VERSION "1.0.0")
|
||||
set(KE_VERSION "1.0.10")
|
||||
|
||||
set(CMAKE_C_FLAGS "-Wall -Wextra -pedantic -Wshadow -Werror -std=c99 -g")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_DEFAULT_SOURCE -D_XOPEN_SOURCE")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
|
||||
|
||||
|
||||
# Add executable
|
||||
@@ -13,9 +14,3 @@ add_executable(ke main.c)
|
||||
|
||||
# Define KE_VERSION for use in C code (e.g., #define KE_VERSION)
|
||||
target_compile_definitions(ke PRIVATE KE_VERSION="ke version ${KE_VERSION}")
|
||||
|
||||
# Set output properties
|
||||
set_target_properties(ke PROPERTIES
|
||||
FOLDER bin
|
||||
RUNTIME_OUTPUT_DIRECTORY bin
|
||||
)
|
||||
@@ -6,4 +6,9 @@ used fairly often.
|
||||
|
||||
See the man page for more info.
|
||||
|
||||
It should be available via homebrew, even:
|
||||
|
||||
brew tap kisom/homebrew-tap
|
||||
brew install ke
|
||||
|
||||
Released under an ISC license.
|
||||
4
ke.1
4
ke.1
@@ -24,10 +24,10 @@ saving a file can be done with either C-k s or C-k C-s.
|
||||
.Bl -tag -width xxxxxxxxxxxx -offset indent
|
||||
.It C-k BACKSPACE
|
||||
Delete from the cursor to the beginning of the line.
|
||||
.It C-k C-d
|
||||
Delete the current row.
|
||||
.It C-k d
|
||||
Delete from the cursor to the end of the line.
|
||||
.It C-k C-d
|
||||
Delete the entire link.
|
||||
.It C-k e
|
||||
Edit a new file. Also C-k C-e.
|
||||
.It C-k f
|
||||
|
||||
135
main.c
135
main.c
@@ -14,7 +14,6 @@
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <limits.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
@@ -25,6 +24,10 @@
|
||||
#include <unistd.h>
|
||||
|
||||
|
||||
#ifndef KE_VERSION
|
||||
#define KE_VERSION "ke dev build"
|
||||
#endif
|
||||
|
||||
#define ESCSEQ "\x1b["
|
||||
#define CTRL_KEY(key) ((key)&0x1f)
|
||||
#define TAB_STOP 8
|
||||
@@ -44,6 +47,41 @@
|
||||
#define TAB_STOP 8
|
||||
|
||||
|
||||
#define INITIAL_CAPACITY 64
|
||||
|
||||
int
|
||||
next_power_of_2(int n)
|
||||
{
|
||||
if (n < 2) {
|
||||
n = 2;
|
||||
}
|
||||
|
||||
n--;
|
||||
n |= n >> 1;
|
||||
n |= n >> 2;
|
||||
n |= n >> 4;
|
||||
n |= n >> 8;
|
||||
n |= n >> 16;
|
||||
|
||||
return n + 1;
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
cap_growth(int cap, int sz)
|
||||
{
|
||||
if (cap == 0) {
|
||||
cap = INITIAL_CAPACITY;
|
||||
}
|
||||
|
||||
while (cap <= sz) {
|
||||
cap = next_power_of_2(cap + 1);
|
||||
}
|
||||
|
||||
return cap;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Function and struct declarations.
|
||||
*/
|
||||
@@ -67,13 +105,15 @@ struct erow {
|
||||
|
||||
int size;
|
||||
int rsize;
|
||||
|
||||
int cap;
|
||||
};
|
||||
|
||||
char nibble_to_hex(char c);
|
||||
int erow_render_to_cursor(struct erow *row, int cx);
|
||||
int erow_cursor_to_render(struct erow *row, int rx);
|
||||
int erow_init(struct erow *row, int len);
|
||||
void erow_update(struct erow *row);
|
||||
int erow_init(struct erow *row, int len);
|
||||
void erow_insert(int at, char *s, int len);
|
||||
void erow_free(struct erow *row);
|
||||
void editor_set_status(const char *fmt, ...);
|
||||
@@ -102,7 +142,6 @@ void move_cursor(int16_t c);
|
||||
void newline(void);
|
||||
void process_kcommand(int16_t c);
|
||||
void process_normal(int16_t c);
|
||||
void navonly_escape(int16_t c);
|
||||
void process_escape(int16_t c);
|
||||
int process_keypress(void);
|
||||
void enable_termraw(void);
|
||||
@@ -181,7 +220,7 @@ init_editor(void)
|
||||
editor.rows = 0;
|
||||
|
||||
if (get_winsz(&editor.rows, &editor.cols) == -1) {
|
||||
die("can't get window size - is this an interactive terminal?");
|
||||
die("can't get window size");
|
||||
}
|
||||
editor.rows--; /* status bar */
|
||||
editor.rows--; /* message line */
|
||||
@@ -202,8 +241,7 @@ init_editor(void)
|
||||
|
||||
|
||||
/*
|
||||
* reset_editor presumes that editor has been initialized. That is,
|
||||
* before reset_editor is called, init_editor should be called.
|
||||
* reset_editor presumes that editor has been initialized.
|
||||
*/
|
||||
void
|
||||
reset_editor(void)
|
||||
@@ -225,37 +263,24 @@ reset_editor(void)
|
||||
void
|
||||
ab_append(struct abuf *buf, const char *s, int len)
|
||||
{
|
||||
const int delta = (len < 0) ? 0 : len;
|
||||
char *nc = buf->b;
|
||||
int sz;
|
||||
|
||||
assert((delta >= 0 && buf->len < INT_MAX - delta));
|
||||
sz = buf->len + delta;
|
||||
char *nc = buf->b;
|
||||
int sz = buf->len + len;
|
||||
|
||||
if (sz >= buf->cap) {
|
||||
if (buf->cap == 0) {
|
||||
buf->cap = 1;
|
||||
}
|
||||
|
||||
while (sz > buf->cap) {
|
||||
if (buf->cap < INT_MAX/2) {
|
||||
buf->cap *= INT_MAX;
|
||||
break;
|
||||
if (buf->cap == 0) {
|
||||
buf->cap = 1;
|
||||
} else {
|
||||
buf->cap *= 2;
|
||||
}
|
||||
buf->cap *= 2;
|
||||
}
|
||||
|
||||
assert(sz <= buf->cap);
|
||||
|
||||
nc = realloc(nc, buf->cap);
|
||||
assert(nc != NULL);
|
||||
}
|
||||
|
||||
if (delta > 0) {
|
||||
memcpy(&nc[buf->len], s, (size_t)delta);
|
||||
buf->b = nc;
|
||||
buf->len += delta;
|
||||
}
|
||||
memcpy(&nc[buf->len], s, len);
|
||||
buf->b = nc;
|
||||
buf->len += len; /* DANGER: overflow */
|
||||
}
|
||||
|
||||
|
||||
@@ -373,8 +398,9 @@ erow_init(struct erow *row, int len)
|
||||
row->rsize = 0;
|
||||
row->render = NULL;
|
||||
row->line = NULL;
|
||||
row->cap = cap_growth(0, len);
|
||||
|
||||
row->line = malloc(len+1);
|
||||
row->line = malloc(row->cap);
|
||||
assert(row->line != NULL);
|
||||
if (row->line == NULL) {
|
||||
return -1;
|
||||
@@ -425,14 +451,14 @@ erow_free(struct erow *row)
|
||||
void
|
||||
die(const char *s)
|
||||
{
|
||||
/*
|
||||
* NOTE(kyle): this is a duplication of the code in display.c
|
||||
* but I would like to be able to import these files from there.
|
||||
*/
|
||||
write(STDOUT_FILENO, "\x1b[2J", 4);
|
||||
write(STDOUT_FILENO, "\x1b[H", 3);
|
||||
|
||||
if (errno != 0) {
|
||||
perror(s);
|
||||
} else {
|
||||
fprintf(stderr, "%s\n", s);
|
||||
}
|
||||
perror(s);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
@@ -645,14 +671,9 @@ rows_to_buffer(int *buflen)
|
||||
}
|
||||
|
||||
if (len == 0) {
|
||||
if (buflen != NULL) {
|
||||
*buflen = 0;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
assert(buflen != NULL);
|
||||
|
||||
*buflen = len;
|
||||
buf = malloc(len);
|
||||
assert(buf != NULL);
|
||||
@@ -710,7 +731,7 @@ save_file(void)
|
||||
status = 0;
|
||||
|
||||
save_exit:
|
||||
if (fd != -1) close(fd);
|
||||
if (fd) close(fd);
|
||||
if (buf) {
|
||||
free(buf);
|
||||
buf = NULL;
|
||||
@@ -956,11 +977,7 @@ editor_openfile(void)
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
/* open_file() will handle freeing the previous file/buffer state
|
||||
* via reset_editor() and will strdup() the filename internally. */
|
||||
open_file(filename);
|
||||
free(filename);
|
||||
}
|
||||
|
||||
|
||||
@@ -1178,25 +1195,7 @@ process_normal(int16_t c)
|
||||
void
|
||||
process_escape(int16_t c)
|
||||
{
|
||||
struct erow *row = NULL;
|
||||
|
||||
/* if there are no rows, there's nothing to do */
|
||||
if (editor.nrows <= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (editor.cury <0) {
|
||||
editor.cury = 0;
|
||||
} else if (editor.cury >= editor.nrows) {
|
||||
editor.cury = editor.nrows - 1;
|
||||
}
|
||||
|
||||
row = &editor.row[editor.cury];
|
||||
if (editor.curx < 0) {
|
||||
editor.curx = 0;
|
||||
} else if (editor.curx > row->size) {
|
||||
editor.curx = row->size;
|
||||
}
|
||||
struct erow *row = &editor.row[editor.cury];
|
||||
|
||||
editor_set_status("hi");
|
||||
|
||||
@@ -1210,12 +1209,7 @@ process_escape(int16_t c)
|
||||
editor.curx = 0;
|
||||
break;
|
||||
case BACKSPACE:
|
||||
row = &editor.row[editor.cury]; /* cury may have changed */
|
||||
if (editor.curx == 0 || editor.curx < row->size) {
|
||||
break;
|
||||
}
|
||||
|
||||
if ((unsigned char)isalnum(row->line[editor.curx])) {
|
||||
if (isalnum(row->line[editor.curx])) {
|
||||
editor_set_status("is alnum");
|
||||
while (editor.curx > 0 && isalnum(row->line[editor.curx])) {
|
||||
process_normal(BACKSPACE);
|
||||
@@ -1344,8 +1338,7 @@ draw_rows(struct abuf *ab)
|
||||
{
|
||||
assert(editor.cols >= 0);
|
||||
|
||||
int cols = editor.cols > 0 ? editor.cols : 1;
|
||||
char buf[cols];
|
||||
char buf[editor.cols];
|
||||
int buflen, filerow, padding;
|
||||
int y;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user