Improve things

This commit is contained in:
2025-02-05 22:32:31 +01:00
parent 9837729656
commit 2a2313dff7
6 changed files with 296 additions and 12 deletions

View File

@@ -12,21 +12,19 @@ prepText(SDL_Renderer *renderer, unsigned char pxSize, const char *file, uint8_t
out.size = pxSize;
out.color = (SDL_Color) {r, g, b, a};
unsigned char i = 0;
SDL_Surface *fontTempSurf = NULL;
do {
char tmpOut[2] = {i, 0};
fontTempSurf = TTF_RenderText_Solid(gFont, tmpOut, out.color);
out.surface[i] = TTF_RenderText_Solid(gFont, tmpOut, out.color);
SDL_Rect dstRect;
dstRect.x = 0;
dstRect.y = 0;
dstRect.w = pxSize;
dstRect.h = pxSize;
out.texture[i] = SDL_CreateTextureFromSurface(renderer, fontTempSurf);
out.texture[i] = SDL_CreateTextureFromSurface(renderer, out.surface[i]);
i++;
} while (i < 255);
SDL_FreeSurface(fontTempSurf);
TTF_CloseFont(gFont);
return out;
}
@@ -42,6 +40,12 @@ void renderText(SDL_Renderer *renderer, BitmapFont font, char *string, uint16_t
outRect.y = y;
while (*string) {
if (*string == '\n') {
outRect.x = x;
outRect.y += charRect.h + 4;
string++;
continue;
}
SDL_RenderCopy(renderer, font.texture[*string], &charRect, &outRect);
outRect.x += charRect.w + 1;
string++;

View File

@@ -11,6 +11,7 @@
typedef struct {
SDL_Texture *texture[256];
SDL_Surface *surface[256];
uint8_t size;
SDL_Color color;
} BitmapFont;

164
util/texteditor.c Normal file
View File

@@ -0,0 +1,164 @@
///
// Created by bruno on 5.2.2025.
///
#include "texteditor.h"
#include "font.h"
// Initialize the text editor
void init_editor(TextEditor *editor, BitmapFont *font, int x, int y, SDL_Renderer *renderer) {
for (int i = 0; i < MAX_LINES_ASM; i++) {
editor->lines[i].text[0] = '\0'; // Empty string
editor->lines[i].active = 0;
}
editor->lines[0].active = 1;
editor->line_count = 1;
editor->cursor_line = 0;
editor->cursor_line_offset = 0;
editor->cursor_pos = 0;
editor->readOnly = 0;
editor->rect.x = 0;
editor->rect.y = 0;
editor->rect.w = MAX_LINE_WIDTH * (font->size + 1);
editor->rect.h = MAX_LINES_DISPLAY * (font->size + 4);
editor->outRect = editor->rect;
editor->outRect.x = x;
editor->outRect.y = y;
editor->font = font;
editor->texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, editor->rect.w,
editor->rect.h);
}
// Insert a new line at a specific position
void insert_line(TextEditor *editor, int position, const char *text) {
if (editor->line_count >= MAX_LINES_ASM || position < 0 || position > editor->line_count) {
printf("Invalid position or max lines reached!\n");
return;
}
// Shift lines down if necessary
for (int i = editor->line_count; i > position; i--) {
strcpy(editor->lines[i].text, editor->lines[i - 1].text);
editor->lines[i].active = editor->lines[i - 1].active;
}
strncpy(editor->lines[position].text, text, MAX_LINE_WIDTH);
editor->lines[position].text[MAX_LINE_WIDTH] = '\0'; // Ensure null termination
editor->lines[position].active = 1;
editor->line_count++;
}
void insert_line_rel(TextEditor *editor) {
editor->cursor_pos = 0;
insert_line(editor, editor->cursor_line + 1, "");
editor->cursor_line++;
}
// Insert a character at the current cursor position
void insert_character(TextEditor *editor, char ch, SDL_Renderer *renderer) {
if (editor->cursor_line < 0 || editor->cursor_line >= editor->line_count) {
printf("Invalid cursor position!\n");
return;
}
Line *line = &editor->lines[editor->cursor_line];
int len = strlen(line->text);
if (len >= MAX_LINE_WIDTH || editor->cursor_pos > len) {
printf("Position out of bounds or line is full!\n");
return;
}
// Shift characters to the right
for (int i = len; i >= editor->cursor_pos; i--) {
line->text[i + 1] = line->text[i];
}
line->text[editor->cursor_pos] = ch;
editor->cursor_pos++;
generate_string_display(editor, renderer);
}
// Move cursor
void move_cursor_relative(TextEditor *editor, int line_offset, int pos_offset) {
int new_line = editor->cursor_line + line_offset;
int new_pos = editor->cursor_pos + pos_offset;
if (new_line < 0) new_line = 0;
if (new_line >= editor->line_count) new_line = editor->line_count - 1;
move_cursor(editor, new_line, new_pos);
}
// Move cursor
void move_cursor(TextEditor *editor, int new_line, int new_pos) {
if (new_line < 0) new_line = 0;
if (new_line >= editor->line_count) new_line = editor->line_count - 1;
int line_length = strlen(editor->lines[new_line].text);
if (new_pos < 0) new_pos = 0;
if (new_pos > line_length) new_pos = line_length;
editor->cursor_line = new_line;
editor->cursor_pos = new_pos;
}
// Generate a string from a given offset with a max line count
void generate_string_display(TextEditor *editor, SDL_Renderer *renderer) {
if (editor->cursor_line_offset < 0 || editor->cursor_line_offset >= editor->line_count) {
printf("Invalid start line!\n");
return;
}
int end_line = editor->cursor_line_offset + MAX_LINES_DISPLAY;
if (end_line > editor->line_count) end_line = editor->line_count;
memset(editor->displayString, 0, sizeof(editor->displayString));
SDL_SetRenderTarget(renderer, editor->texture);
SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
SDL_RenderClear(renderer);
SDL_Rect charRect;
charRect.x = 0;
charRect.y = 0;
charRect.w = editor->font->size;
charRect.h = editor->font->size;
SDL_Rect outRect = charRect;
outRect.x = 0;
outRect.y = 0;
for (int i = editor->cursor_line_offset; i < end_line; i++) {
if (editor->lines[i].active) {
strcat(editor->displayString, editor->lines[i].text);
char *linePTR = editor->lines[i].text;
while (*linePTR) {
SDL_RenderCopy(renderer, editor->font->texture[*linePTR], &charRect, &outRect);
outRect.x += charRect.w + 1;
linePTR++;
}
strcat(editor->displayString, "\n");
outRect.x = 0;
outRect.y += charRect.h + 4;
}
}
SDL_SetRenderTarget(renderer, NULL);
}
void editor_render(TextEditor *editor, SDL_Renderer * renderer) {
SDL_RenderCopy(renderer, editor->texture, &editor->rect, &editor->outRect);
}
// Generate a string for assembling
void generate_string(TextEditor *editor) {
memset(editor->outputString, 0, sizeof(editor->outputString));
for (int i = 0; i < MAX_LINES_ASM; i++) {
if (editor->lines[i].active) {
strcat(editor->outputString, editor->lines[i].text);
strcat(editor->outputString, "\n");
}
}
}

65
util/texteditor.h Normal file
View File

@@ -0,0 +1,65 @@
///
// Created by bruno on 5.2.2025.
///
#ifndef RISCB_TEXTEDITOR_H
#define RISCB_TEXTEDITOR_H
#define MAX_LINE_WIDTH 34 // Max chars per line (excluding '\0')
#define MAX_LINES_ASM 100 // Max number of lines
#define MAX_LINES_DISPLAY 10 // Max number of lines
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <SDL2/SDL_rect.h>
#include <SDL2/SDL_surface.h>
#include <SDL2/SDL_render.h>
#include "font.h"
typedef struct {
char text[MAX_LINE_WIDTH + 1]; // +1 for null terminator
int active; // Flag to check if the line is in use
} Line;
typedef struct {
Line lines[MAX_LINES_ASM]; // Array of lines
int line_count; // Number of active lines
int cursor_line; // Current cursor line
int cursor_line_offset; // Current cursor line
int cursor_pos; // Current cursor position in line
char outputString[MAX_LINE_WIDTH * MAX_LINES_ASM];
char displayString[MAX_LINE_WIDTH * MAX_LINES_DISPLAY];
SDL_Rect rect;
SDL_Rect outRect;
SDL_Texture *texture;
bool readOnly;
BitmapFont *font;
} TextEditor;
// Initialize the text editor
void init_editor(TextEditor *editor, BitmapFont *font, int x, int y, SDL_Renderer *renderer);
// Insert a new line at a specific position
void insert_line(TextEditor *editor, int position, const char *text);
// Insert a new line at a specific position
void insert_line_rel(TextEditor *editor);
void editor_render(TextEditor *editor, SDL_Renderer * renderer);
// Insert a character at the current cursor position
void insert_character(TextEditor *editor, char ch, SDL_Renderer *renderer);
// Move cursor (handled externally)
void move_cursor(TextEditor *editor, int new_line, int new_pos);
// Move cursor (handled externally)
void move_cursor_relative(TextEditor *editor, int line_offset, int pos_offset);
// Generate a string from a given offset with a max line count
void generate_string_display(TextEditor *editor, SDL_Renderer *renderer);
void generate_string(TextEditor *editor);
#endif //RISCB_TEXTEDITOR_H