arthur/beluga
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

meson bulid changes
Meson Build and Deploy / build (push) Failing after 29s
Details

Browse Source
This commit is contained in:
Arthur Barraux
2025-09-24 11:04:16 +02:00
parent d8fc7d2d67
commit 8844d2f064
3 changed files with 123 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meson.build
+2 -2
View File
@@ -33,7 +33,7 @@ if cc.get_id() == 'clang'
endif endif
# Include directory # Include directory
inc_dir = include_directories('include', 'lisp-interpreter/dist') inc_dir = include_directories('include')
# Source files # Source files
src_files = files( src_files = files(
@@ -49,7 +49,7 @@ src_files = files(
) )
# Executable # Executable
executable('editor', executable('beluga',
src_files, src_files,
include_directories : inc_dir, include_directories : inc_dir,
install : true, install : true,
src/init.c
+7 -2
View File
@@ -1,7 +1,6 @@
#include "../include/init.h" #include "../include/init.h"
#include "data.h" #include "../include/data.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
extern struct editorConfig; extern struct editorConfig;
@@ -21,4 +20,10 @@ void initEditor() {
die("getWindowSize"); die("getWindowSize");
} }
E.screenrows -= 2; E.screenrows -= 2;
// E.fd_init_file = fopen("../config/init.el", "r");
// E.ctx = lisp_init();
// E.ctx_data = lisp_read_file(E.fd_init_file, &E.ctx_error, E.ctx);
// lisp_printf(stderr, E.ctx_data);
} }
src/terminal.c
+114 -112
View File
@@ -1,146 +1,148 @@
#include "../include/terminal.h" #include "../include/terminal.h"
#include "data.h" #include "../include/data.h"
#include <stdio.h>
void die(const char *s) { void die(const char *s) {
write(STDOUT_FILENO, "\x1b[2J", 4); write(STDOUT_FILENO, "\x1b[2J", 4);
write(STDOUT_FILENO, CURSOR_TOP_LEFT, 3); write(STDOUT_FILENO, CURSOR_TOP_LEFT, 3);
perror(s); perror(s);
exit(1); exit(1);
} }
void disableRawMode() { void disableRawMode() {
if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &E.orig_termios) == -1) { if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &E.orig_termios) == -1) {
die("tcsetattr"); die("tcsetattr");
} }
} }
void enableRawMode() { void enableRawMode() {
if (tcgetattr(STDIN_FILENO, &E.orig_termios) == -1) { if (tcgetattr(STDIN_FILENO, &E.orig_termios) == -1) {
die("tcgetattr"); die("tcgetattr");
} }
struct termios raw = E.orig_termios; struct termios raw = E.orig_termios;
raw.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON); raw.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON);
raw.c_oflag &= ~(OPOST); raw.c_oflag &= ~(OPOST);
raw.c_cflag |= (CS8); raw.c_cflag |= (CS8);
raw.c_lflag &= ~(ECHO | ICANON | ISIG | IEXTEN); raw.c_lflag &= ~(ECHO | ICANON | ISIG | IEXTEN);
raw.c_cc[VMIN] = 0; raw.c_cc[VMIN] = 0;
raw.c_cc[VTIME] = 1; raw.c_cc[VTIME] = 1;
if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &raw) == -1) { if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &raw) == -1) {
die("tcgetattr"); die("tcgetattr");
} }
} }
int editorReadKey() { int editorReadKey() {
int nread; int nread;
char c; char c;
char seq[3]; char seq[3];
while ((nread = read(STDIN_FILENO, &c, 1)) != 1) { while ((nread = read(STDIN_FILENO, &c, 1)) != 1) {
if (nread == -1 && errno != EAGAIN) { if (nread == -1 && errno != EAGAIN) {
die("read"); die("read");
}
} }
}
if (c == '\x1b') { if (c == '\x1b') {
if (read(STDIN_FILENO, &seq[0], 1) != 1 || if (read(STDIN_FILENO, &seq[0], 1) != 1 ||
read(STDIN_FILENO, &seq[1], 1) != 1) { read(STDIN_FILENO, &seq[1], 1) != 1) {
return '\x1b'; return '\x1b';
}
if (seq[0] == '[') {
if (seq[1] >= '0' && seq[1] <= '9') {
if (read(STDIN_FILENO, &seq[2], 1) != 1) {
return '\x1b';
} }
if (seq[2] == '~') { if (seq[0] == '[') {
switch (seq[1]) { if (seq[1] >= '0' && seq[1] <= '9') {
case '1': if (read(STDIN_FILENO, &seq[2], 1) != 1) {
return BEG_LINE; return '\x1b';
case '3': }
return DEL_KEY; if (seq[2] == '~') {
case '4': switch (seq[1]) {
return END_LINE; case '1':
case '5': return BEG_LINE;
return PAGE_UP; case '3':
case '6': return DEL_KEY;
return PAGE_DOWN; case '4':
case '7': return END_LINE;
return BEG_LINE; case '5':
case '8': return PAGE_UP;
return END_LINE; case '6':
} return PAGE_DOWN;
} case '7':
} else { return BEG_LINE;
case '8':
return END_LINE;
}
}
} else {
switch (seq[1]) { switch (seq[1]) {
case 'A': case 'A':
return ARROW_UP; return ARROW_UP;
case 'B': case 'B':
return ARROW_DOWN; return ARROW_DOWN;
case 'C': case 'C':
return ARROW_RIGHT; return ARROW_RIGHT;
case 'D': case 'D':
return ARROW_LEFT; return ARROW_LEFT;
case 'H': case 'H':
return BEG_LINE; return BEG_LINE;
case 'F': case 'F':
return END_LINE; return END_LINE;
}
}
} else if (seq[0] == 'O') {
switch (seq[1]) {
case 'H':
return BEG_LINE;
case 'F':
return END_LINE;
}
} }
} return '\x1b';
} else if (seq[0] == 'O') { } else {
switch (seq[1]) { return c;
case 'H':
return BEG_LINE;
case 'F':
return END_LINE;
}
} }
return '\x1b';
} else {
return c;
}
} }
int getCursorPosition(int *rows, int *cols) { int getCursorPosition(int *rows, int *cols) {
char buf[32]; char buf[32];
unsigned int i = 0; unsigned int i = 0;
if (write(STDOUT_FILENO, "\x1b[6n", 4) != 4) { if (write(STDOUT_FILENO, "\x1b[6n", 4) != 4) {
return -1; return -1;
}
while (i < sizeof(buf) - 1) {
if (read(STDIN_FILENO, &buf[i], 1) != 1) {
break;
} }
if (buf[i] == 'R') {
break; while (i < sizeof(buf) - 1) {
if (read(STDIN_FILENO, &buf[i], 1) != 1) {
break;
}
if (buf[i] == 'R') {
break;
}
++i;
} }
++i; buf[i] = '\0';
}
buf[i] = '\0';
if (buf[0] != '\x1b' || buf[1] != '[') { if (buf[0] != '\x1b' || buf[1] != '[') {
return -1; return -1;
} }
if (sscanf(&buf[2], "%d;%d", rows, cols) != 2) { if (sscanf(&buf[2], "%d;%d", rows, cols) != 2) {
return -1; return -1;
} }
return 0; return 0;
} }
int getWindowSize(int *rows, int *cols) { int getWindowSize(int *rows, int *cols) {
struct winsize ws; struct winsize ws;
if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0) { if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0) {
if (write(STDOUT_FILENO, "\x1b[999C\x1b[999B", 12) != 12) { if (write(STDOUT_FILENO, "\x1b[999C\x1b[999B", 12) != 12) {
return -1; return -1;
}
return getCursorPosition(rows, cols);
} else {
*cols = ws.ws_col;
*rows = ws.ws_row;
return 0;
} }
return getCursorPosition(rows, cols);
} else {
*cols = ws.ws_col;
*rows = ws.ws_row;
return 0;
}
} }