mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-22 21:52:25 +01:00
fix: most lint issues
This commit is contained in:
parent
0fc908f92d
commit
2be0f1f8a9
6
.vscode/settings.json
vendored
Normal file
6
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"files.associations": {
|
||||||
|
"*.py": "python",
|
||||||
|
"stdio.h": "c"
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -86,8 +86,8 @@ run_clang_tidy() {
|
|||||||
run_cppcheck() {
|
run_cppcheck() {
|
||||||
print_step "Running cppcheck analysis..."
|
print_step "Running cppcheck analysis..."
|
||||||
|
|
||||||
cppcheck --enable=all --suppress=missingIncludeSystem --suppress=unusedFunction \
|
cppcheck --enable=all --check-level=exhaustive --suppress=missingIncludeSystem \
|
||||||
--suppress=constParameter --quiet --std=c99 main.c || {
|
--quiet --std=c23 main.c || {
|
||||||
print_warning "cppcheck found issues (see output above)"
|
print_warning "cppcheck found issues (see output above)"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,28 +1,35 @@
|
|||||||
|
#include <SDL2/SDL.h>
|
||||||
|
#include <SDL2/SDL_image.h>
|
||||||
|
#include <dirent.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <dirent.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#include <strings.h>
|
#include <strings.h>
|
||||||
#include <SDL2/SDL.h>
|
#include <sys/stat.h>
|
||||||
#include <SDL2/SDL_image.h>
|
|
||||||
|
|
||||||
#define WINDOW_WIDTH 800
|
#define WINDOW_WIDTH 800
|
||||||
#define WINDOW_HEIGHT 600
|
#define WINDOW_HEIGHT 600
|
||||||
#define MAX_PATH_LEN 512
|
#define MAX_PATH_LEN 512
|
||||||
#define MAX_FILES 1000
|
#define MAX_FILES 1000
|
||||||
|
|
||||||
|
// Auto-navigation and rendering constants
|
||||||
|
#define AUTO_NAV_INTERVAL_MS 100
|
||||||
|
#define BACKGROUND_COLOR_R 32
|
||||||
|
#define BACKGROUND_COLOR_G 32
|
||||||
|
#define BACKGROUND_COLOR_B 32
|
||||||
|
#define BACKGROUND_COLOR_A 255
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
char** files;
|
char **files;
|
||||||
int count;
|
int count;
|
||||||
int current_index;
|
int current_index;
|
||||||
char base_dir[MAX_PATH_LEN];
|
char base_dir[MAX_PATH_LEN];
|
||||||
} FileList;
|
} FileList;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
SDL_Window* window;
|
SDL_Window *window;
|
||||||
SDL_Renderer* renderer;
|
SDL_Renderer *renderer;
|
||||||
SDL_Texture* texture;
|
SDL_Texture *texture;
|
||||||
char current_file[MAX_PATH_LEN];
|
char current_file[MAX_PATH_LEN];
|
||||||
int image_width;
|
int image_width;
|
||||||
int image_height;
|
int image_height;
|
||||||
@ -42,19 +49,18 @@ typedef struct {
|
|||||||
} ImageViewer;
|
} ImageViewer;
|
||||||
|
|
||||||
// Function declarations
|
// Function declarations
|
||||||
static int is_image_file(const char* filename);
|
static int is_image_file(const char *filename);
|
||||||
static int init_file_list(FileList* list, const char* path);
|
static int init_file_list(FileList *list, const char *path);
|
||||||
static void cleanup_file_list(FileList* list);
|
static void cleanup_file_list(FileList *list);
|
||||||
static char* get_current_file_path(const FileList* list);
|
static char *get_current_file_path(const FileList *list);
|
||||||
static int navigate_to_file(FileList* list, const char* target_filename);
|
static int load_current_image(ImageViewer *viewer);
|
||||||
static int load_current_image(ImageViewer* viewer);
|
static int navigate_next_image(ImageViewer *viewer);
|
||||||
static int navigate_next_image(ImageViewer* viewer);
|
static int navigate_prev_image(ImageViewer *viewer);
|
||||||
static int navigate_prev_image(ImageViewer* viewer);
|
static void print_current_image_info(const ImageViewer *viewer);
|
||||||
static void print_current_image_info(const ImageViewer* viewer);
|
static void handle_auto_navigation(ImageViewer *viewer);
|
||||||
static void handle_auto_navigation(ImageViewer* viewer);
|
|
||||||
|
|
||||||
// Safe memory copy wrapper to address static analyzer warnings
|
// Safe memory copy wrapper to address static analyzer warnings
|
||||||
static int safe_copy_memory(void* dest, size_t dest_size, const void* src, size_t src_len) {
|
static int safe_copy_memory(void *dest, size_t dest_size, const void *src, size_t src_len) {
|
||||||
if (!dest || !src || dest_size == 0 || src_len == 0) {
|
if (!dest || !src || dest_size == 0 || src_len == 0) {
|
||||||
return 0; // Invalid parameters
|
return 0; // Invalid parameters
|
||||||
}
|
}
|
||||||
@ -63,12 +69,14 @@ static int safe_copy_memory(void* dest, size_t dest_size, const void* src, size_
|
|||||||
return 0; // Source too large for destination
|
return 0; // Source too large for destination
|
||||||
}
|
}
|
||||||
|
|
||||||
memcpy(dest, src, src_len); // NOLINT(clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling)
|
memcpy(dest,
|
||||||
return 1; // Success
|
src,
|
||||||
|
src_len); // NOLINT(clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling)
|
||||||
|
return 1; // Success
|
||||||
}
|
}
|
||||||
|
|
||||||
// Safe string copy with automatic null termination
|
// Safe string copy with automatic null termination
|
||||||
static int safe_copy_string(char* dest, size_t dest_size, const char* src, size_t src_len) {
|
static int safe_copy_string(char *dest, size_t dest_size, const char *src, size_t src_len) {
|
||||||
if (!dest || !src || dest_size <= 1) {
|
if (!dest || !src || dest_size <= 1) {
|
||||||
return 0; // Invalid parameters or dest too small for null terminator
|
return 0; // Invalid parameters or dest too small for null terminator
|
||||||
}
|
}
|
||||||
@ -83,12 +91,17 @@ static int safe_copy_string(char* dest, size_t dest_size, const char* src, size_
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Safe path formatting wrapper to address static analyzer warnings
|
// Safe path formatting wrapper to address static analyzer warnings
|
||||||
static int safe_format_path(char* dest, size_t dest_size, const char* dir, const char* filename) {
|
static int safe_format_path(char *dest, size_t dest_size, const char *dir, const char *filename) {
|
||||||
if (!dest || !dir || !filename || dest_size == 0) {
|
if (!dest || !dir || !filename || dest_size == 0) {
|
||||||
return 0; // Invalid parameters
|
return 0; // Invalid parameters
|
||||||
}
|
}
|
||||||
|
|
||||||
int ret = snprintf(dest, dest_size, "%s/%s", dir, filename); // NOLINT(clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling)
|
int ret = snprintf(
|
||||||
|
dest,
|
||||||
|
dest_size,
|
||||||
|
"%s/%s",
|
||||||
|
dir,
|
||||||
|
filename); // NOLINT(clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling)
|
||||||
if (ret < 0 || (size_t)ret >= dest_size) {
|
if (ret < 0 || (size_t)ret >= dest_size) {
|
||||||
return 0; // Formatting failed or path too long
|
return 0; // Formatting failed or path too long
|
||||||
}
|
}
|
||||||
@ -96,7 +109,7 @@ static int safe_format_path(char* dest, size_t dest_size, const char* dir, const
|
|||||||
return 1; // Success
|
return 1; // Success
|
||||||
}
|
}
|
||||||
|
|
||||||
static int init_viewer(ImageViewer* viewer) {
|
static int init_viewer(ImageViewer *viewer) {
|
||||||
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
|
if (SDL_Init(SDL_INIT_VIDEO) < 0) {
|
||||||
printf("SDL could not initialize! SDL_Error: %s\n", SDL_GetError());
|
printf("SDL could not initialize! SDL_Error: %s\n", SDL_GetError());
|
||||||
return 0;
|
return 0;
|
||||||
@ -151,18 +164,18 @@ static int init_viewer(ImageViewer* viewer) {
|
|||||||
viewer->left_key_held = 0;
|
viewer->left_key_held = 0;
|
||||||
viewer->right_key_held = 0;
|
viewer->right_key_held = 0;
|
||||||
viewer->last_auto_nav_time = 0;
|
viewer->last_auto_nav_time = 0;
|
||||||
viewer->auto_nav_interval = 100;
|
viewer->auto_nav_interval = AUTO_NAV_INTERVAL_MS;
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int load_image(ImageViewer* viewer, const char* filename) {
|
static int load_image(ImageViewer *viewer, const char *filename) {
|
||||||
if (viewer->texture) {
|
if (viewer->texture) {
|
||||||
SDL_DestroyTexture(viewer->texture);
|
SDL_DestroyTexture(viewer->texture);
|
||||||
viewer->texture = NULL;
|
viewer->texture = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
SDL_Surface* surface = IMG_Load(filename);
|
SDL_Surface *surface = IMG_Load(filename);
|
||||||
if (!surface) {
|
if (!surface) {
|
||||||
printf("Unable to load image %s! SDL_image Error: %s\n", filename, IMG_GetError());
|
printf("Unable to load image %s! SDL_image Error: %s\n", filename, IMG_GetError());
|
||||||
return 0;
|
return 0;
|
||||||
@ -206,8 +219,8 @@ static int load_image(ImageViewer* viewer, const char* filename) {
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void render_image(ImageViewer* viewer) {
|
static void render_image(ImageViewer *viewer) {
|
||||||
SDL_SetRenderDrawColor(viewer->renderer, 32, 32, 32, 255);
|
SDL_SetRenderDrawColor(viewer->renderer, BACKGROUND_COLOR_R, BACKGROUND_COLOR_G, BACKGROUND_COLOR_B, BACKGROUND_COLOR_A);
|
||||||
SDL_RenderClear(viewer->renderer);
|
SDL_RenderClear(viewer->renderer);
|
||||||
|
|
||||||
if (!viewer->texture) {
|
if (!viewer->texture) {
|
||||||
@ -230,12 +243,14 @@ static void render_image(ImageViewer* viewer) {
|
|||||||
SDL_RenderPresent(viewer->renderer);
|
SDL_RenderPresent(viewer->renderer);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void handle_zoom(ImageViewer* viewer, float zoom_delta, int mouse_x, int mouse_y) {
|
static void handle_zoom(ImageViewer *viewer, float zoom_delta, int mouse_x, int mouse_y) {
|
||||||
float old_zoom = viewer->zoom_factor;
|
float old_zoom = viewer->zoom_factor;
|
||||||
viewer->zoom_factor += zoom_delta;
|
viewer->zoom_factor += zoom_delta;
|
||||||
|
|
||||||
if (viewer->zoom_factor < 0.1f) viewer->zoom_factor = 0.1f;
|
if (viewer->zoom_factor < 0.1f)
|
||||||
if (viewer->zoom_factor > 10.0f) viewer->zoom_factor = 10.0f;
|
viewer->zoom_factor = 0.1f;
|
||||||
|
if (viewer->zoom_factor > 10.0f)
|
||||||
|
viewer->zoom_factor = 10.0f;
|
||||||
|
|
||||||
float zoom_ratio = viewer->zoom_factor / old_zoom;
|
float zoom_ratio = viewer->zoom_factor / old_zoom;
|
||||||
|
|
||||||
@ -245,8 +260,10 @@ static void handle_zoom(ImageViewer* viewer, float zoom_delta, int mouse_x, int
|
|||||||
int center_x = window_w / 2;
|
int center_x = window_w / 2;
|
||||||
int center_y = window_h / 2;
|
int center_y = window_h / 2;
|
||||||
|
|
||||||
viewer->offset_x = (viewer->offset_x - (mouse_x - center_x)) * zoom_ratio + (mouse_x - center_x);
|
viewer->offset_x =
|
||||||
viewer->offset_y = (viewer->offset_y - (mouse_y - center_y)) * zoom_ratio + (mouse_y - center_y);
|
(viewer->offset_x - (mouse_x - center_x)) * zoom_ratio + (mouse_x - center_x);
|
||||||
|
viewer->offset_y =
|
||||||
|
(viewer->offset_y - (mouse_y - center_y)) * zoom_ratio + (mouse_y - center_y);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void print_help() {
|
static void print_help() {
|
||||||
@ -262,7 +279,7 @@ static void print_help() {
|
|||||||
printf("===============================\n\n");
|
printf("===============================\n\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void cleanup_viewer(ImageViewer* viewer) {
|
static void cleanup_viewer(ImageViewer *viewer) {
|
||||||
if (viewer->texture) {
|
if (viewer->texture) {
|
||||||
SDL_DestroyTexture(viewer->texture);
|
SDL_DestroyTexture(viewer->texture);
|
||||||
}
|
}
|
||||||
@ -277,9 +294,10 @@ static void cleanup_viewer(ImageViewer* viewer) {
|
|||||||
SDL_Quit();
|
SDL_Quit();
|
||||||
}
|
}
|
||||||
|
|
||||||
static int is_image_file(const char* filename) {
|
static int is_image_file(const char *filename) {
|
||||||
const char* ext = strrchr(filename, '.');
|
const char *ext = strrchr(filename, '.');
|
||||||
if (!ext) return 0;
|
if (!ext)
|
||||||
|
return 0;
|
||||||
|
|
||||||
ext++; // Skip the dot
|
ext++; // Skip the dot
|
||||||
return (strcasecmp(ext, "jpg") == 0 || strcasecmp(ext, "jpeg") == 0 ||
|
return (strcasecmp(ext, "jpg") == 0 || strcasecmp(ext, "jpeg") == 0 ||
|
||||||
@ -288,7 +306,7 @@ static int is_image_file(const char* filename) {
|
|||||||
strcasecmp(ext, "tiff") == 0 || strcasecmp(ext, "webp") == 0);
|
strcasecmp(ext, "tiff") == 0 || strcasecmp(ext, "webp") == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int init_file_list(FileList* list, const char* path) {
|
static int init_file_list(FileList *list, const char *path) {
|
||||||
struct stat path_stat;
|
struct stat path_stat;
|
||||||
list->files = NULL;
|
list->files = NULL;
|
||||||
list->count = 0;
|
list->count = 0;
|
||||||
@ -301,7 +319,7 @@ static int init_file_list(FileList* list, const char* path) {
|
|||||||
|
|
||||||
if (S_ISDIR(path_stat.st_mode)) {
|
if (S_ISDIR(path_stat.st_mode)) {
|
||||||
// It's a directory - scan for image files
|
// It's a directory - scan for image files
|
||||||
DIR* dir = opendir(path);
|
DIR *dir = opendir(path);
|
||||||
if (!dir) {
|
if (!dir) {
|
||||||
printf("Error: Cannot open directory %s\n", path);
|
printf("Error: Cannot open directory %s\n", path);
|
||||||
return 0;
|
return 0;
|
||||||
@ -315,7 +333,7 @@ static int init_file_list(FileList* list, const char* path) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// First pass: count image files
|
// First pass: count image files
|
||||||
struct dirent* entry;
|
const struct dirent *entry;
|
||||||
while ((entry = readdir(dir)) != NULL) {
|
while ((entry = readdir(dir)) != NULL) {
|
||||||
if (entry->d_name[0] != '.' && is_image_file(entry->d_name)) {
|
if (entry->d_name[0] != '.' && is_image_file(entry->d_name)) {
|
||||||
// Build full path and check if it's a regular file
|
// Build full path and check if it's a regular file
|
||||||
@ -337,7 +355,7 @@ static int init_file_list(FileList* list, const char* path) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Allocate memory for file list
|
// Allocate memory for file list
|
||||||
list->files = malloc(list->count * sizeof(char*));
|
list->files = malloc(list->count * sizeof(char *));
|
||||||
if (!list->files) {
|
if (!list->files) {
|
||||||
printf("Error: Memory allocation failed\n");
|
printf("Error: Memory allocation failed\n");
|
||||||
closedir(dir);
|
closedir(dir);
|
||||||
@ -359,7 +377,8 @@ static int init_file_list(FileList* list, const char* path) {
|
|||||||
list->files[index] = malloc(strlen(entry->d_name) + 1);
|
list->files[index] = malloc(strlen(entry->d_name) + 1);
|
||||||
if (list->files[index]) {
|
if (list->files[index]) {
|
||||||
size_t name_len = strlen(entry->d_name);
|
size_t name_len = strlen(entry->d_name);
|
||||||
if (safe_copy_string(list->files[index], name_len + 1, entry->d_name, name_len)) {
|
if (safe_copy_string(
|
||||||
|
list->files[index], name_len + 1, entry->d_name, name_len)) {
|
||||||
index++;
|
index++;
|
||||||
} else {
|
} else {
|
||||||
free(list->files[index]);
|
free(list->files[index]);
|
||||||
@ -386,10 +405,12 @@ static int init_file_list(FileList* list, const char* path) {
|
|||||||
continue; // Skip if copy fails
|
continue; // Skip if copy fails
|
||||||
}
|
}
|
||||||
|
|
||||||
char* dot1 = strrchr(name1, '.');
|
char *dot1 = strrchr(name1, '.');
|
||||||
char* dot2 = strrchr(name2, '.');
|
char *dot2 = strrchr(name2, '.');
|
||||||
if (dot1) *dot1 = '\0';
|
if (dot1)
|
||||||
if (dot2) *dot2 = '\0';
|
*dot1 = '\0';
|
||||||
|
if (dot2)
|
||||||
|
*dot2 = '\0';
|
||||||
|
|
||||||
// Custom comparison: shorter names first, then alphabetical
|
// Custom comparison: shorter names first, then alphabetical
|
||||||
int should_swap = 0;
|
int should_swap = 0;
|
||||||
@ -405,7 +426,7 @@ static int init_file_list(FileList* list, const char* path) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (should_swap) {
|
if (should_swap) {
|
||||||
char* temp = list->files[j];
|
char *temp = list->files[j];
|
||||||
list->files[j] = list->files[j + 1];
|
list->files[j] = list->files[j + 1];
|
||||||
list->files[j + 1] = temp;
|
list->files[j + 1] = temp;
|
||||||
}
|
}
|
||||||
@ -422,8 +443,8 @@ static int init_file_list(FileList* list, const char* path) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Extract directory and filename
|
// Extract directory and filename
|
||||||
char* last_slash = strrchr(path, '/');
|
char *last_slash = strrchr(path, '/');
|
||||||
const char* target_filename;
|
const char *target_filename;
|
||||||
|
|
||||||
if (last_slash) {
|
if (last_slash) {
|
||||||
size_t dir_len = last_slash - path;
|
size_t dir_len = last_slash - path;
|
||||||
@ -441,20 +462,21 @@ static int init_file_list(FileList* list, const char* path) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Now scan the directory for all image files
|
// Now scan the directory for all image files
|
||||||
DIR* dir = opendir(list->base_dir);
|
DIR *dir = opendir(list->base_dir);
|
||||||
if (!dir) {
|
if (!dir) {
|
||||||
printf("Error: Cannot open directory %s\n", list->base_dir);
|
printf("Error: Cannot open directory %s\n", list->base_dir);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// First pass: count image files in directory
|
// First pass: count image files in directory
|
||||||
struct dirent* entry;
|
const struct dirent *entry;
|
||||||
list->count = 0;
|
list->count = 0;
|
||||||
while ((entry = readdir(dir)) != NULL) {
|
while ((entry = readdir(dir)) != NULL) {
|
||||||
if (entry->d_name[0] != '.' && is_image_file(entry->d_name)) {
|
if (entry->d_name[0] != '.' && is_image_file(entry->d_name)) {
|
||||||
// Build full path and check if it's a regular file
|
// Build full path and check if it's a regular file
|
||||||
char full_path[MAX_PATH_LEN * 2];
|
char full_path[MAX_PATH_LEN * 2];
|
||||||
if (!safe_format_path(full_path, sizeof(full_path), list->base_dir, entry->d_name)) {
|
if (!safe_format_path(
|
||||||
|
full_path, sizeof(full_path), list->base_dir, entry->d_name)) {
|
||||||
continue; // Skip if path formatting fails or path too long
|
continue; // Skip if path formatting fails or path too long
|
||||||
}
|
}
|
||||||
struct stat file_stat;
|
struct stat file_stat;
|
||||||
@ -471,7 +493,7 @@ static int init_file_list(FileList* list, const char* path) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Allocate memory for file list
|
// Allocate memory for file list
|
||||||
list->files = malloc(list->count * sizeof(char*));
|
list->files = malloc(list->count * sizeof(char *));
|
||||||
if (!list->files) {
|
if (!list->files) {
|
||||||
printf("Error: Memory allocation failed\n");
|
printf("Error: Memory allocation failed\n");
|
||||||
closedir(dir);
|
closedir(dir);
|
||||||
@ -485,7 +507,8 @@ static int init_file_list(FileList* list, const char* path) {
|
|||||||
if (entry->d_name[0] != '.' && is_image_file(entry->d_name)) {
|
if (entry->d_name[0] != '.' && is_image_file(entry->d_name)) {
|
||||||
// Build full path and check if it's a regular file
|
// Build full path and check if it's a regular file
|
||||||
char full_path[MAX_PATH_LEN * 2];
|
char full_path[MAX_PATH_LEN * 2];
|
||||||
if (!safe_format_path(full_path, sizeof(full_path), list->base_dir, entry->d_name)) {
|
if (!safe_format_path(
|
||||||
|
full_path, sizeof(full_path), list->base_dir, entry->d_name)) {
|
||||||
continue; // Skip if path formatting fails or path too long
|
continue; // Skip if path formatting fails or path too long
|
||||||
}
|
}
|
||||||
struct stat file_stat;
|
struct stat file_stat;
|
||||||
@ -493,7 +516,8 @@ static int init_file_list(FileList* list, const char* path) {
|
|||||||
list->files[index] = malloc(strlen(entry->d_name) + 1);
|
list->files[index] = malloc(strlen(entry->d_name) + 1);
|
||||||
if (list->files[index]) {
|
if (list->files[index]) {
|
||||||
size_t name_len = strlen(entry->d_name);
|
size_t name_len = strlen(entry->d_name);
|
||||||
if (safe_copy_string(list->files[index], name_len + 1, entry->d_name, name_len)) {
|
if (safe_copy_string(
|
||||||
|
list->files[index], name_len + 1, entry->d_name, name_len)) {
|
||||||
index++;
|
index++;
|
||||||
} else {
|
} else {
|
||||||
free(list->files[index]);
|
free(list->files[index]);
|
||||||
@ -520,10 +544,12 @@ static int init_file_list(FileList* list, const char* path) {
|
|||||||
continue; // Skip if copy fails
|
continue; // Skip if copy fails
|
||||||
}
|
}
|
||||||
|
|
||||||
char* dot1 = strrchr(name1, '.');
|
char *dot1 = strrchr(name1, '.');
|
||||||
char* dot2 = strrchr(name2, '.');
|
char *dot2 = strrchr(name2, '.');
|
||||||
if (dot1) *dot1 = '\0';
|
if (dot1)
|
||||||
if (dot2) *dot2 = '\0';
|
*dot1 = '\0';
|
||||||
|
if (dot2)
|
||||||
|
*dot2 = '\0';
|
||||||
|
|
||||||
// Custom comparison: shorter names first, then alphabetical
|
// Custom comparison: shorter names first, then alphabetical
|
||||||
int should_swap = 0;
|
int should_swap = 0;
|
||||||
@ -539,7 +565,7 @@ static int init_file_list(FileList* list, const char* path) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (should_swap) {
|
if (should_swap) {
|
||||||
char* temp = list->files[j];
|
char *temp = list->files[j];
|
||||||
list->files[j] = list->files[j + 1];
|
list->files[j] = list->files[j + 1];
|
||||||
list->files[j + 1] = temp;
|
list->files[j + 1] = temp;
|
||||||
}
|
}
|
||||||
@ -554,7 +580,8 @@ static int init_file_list(FileList* list, const char* path) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
printf("Found %d image files in directory, starting with: %s\n", list->count, target_filename);
|
printf(
|
||||||
|
"Found %d image files in directory, starting with: %s\n", list->count, target_filename);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
printf("Error: %s is neither a file nor a directory\n", path);
|
printf("Error: %s is neither a file nor a directory\n", path);
|
||||||
@ -564,7 +591,7 @@ static int init_file_list(FileList* list, const char* path) {
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void cleanup_file_list(FileList* list) {
|
static void cleanup_file_list(FileList *list) {
|
||||||
if (list->files) {
|
if (list->files) {
|
||||||
for (int i = 0; i < list->count; i++) {
|
for (int i = 0; i < list->count; i++) {
|
||||||
if (list->files[i]) {
|
if (list->files[i]) {
|
||||||
@ -578,21 +605,21 @@ static void cleanup_file_list(FileList* list) {
|
|||||||
list->current_index = 0;
|
list->current_index = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static char* get_current_file_path(const FileList* list) {
|
static char *get_current_file_path(const FileList *list) {
|
||||||
if (!list->files || list->current_index < 0 || list->current_index >= list->count) {
|
if (!list->files || list->current_index < 0 || list->current_index >= list->count) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static char full_path[MAX_PATH_LEN * 2];
|
static char full_path[MAX_PATH_LEN * 2];
|
||||||
if (!safe_format_path(full_path, sizeof(full_path), list->base_dir, list->files[list->current_index])) {
|
if (!safe_format_path(
|
||||||
|
full_path, sizeof(full_path), list->base_dir, list->files[list->current_index])) {
|
||||||
return NULL; // Path formatting failed or path too long
|
return NULL; // Path formatting failed or path too long
|
||||||
}
|
}
|
||||||
return full_path;
|
return full_path;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int load_current_image(ImageViewer *viewer) {
|
||||||
static int load_current_image(ImageViewer* viewer) {
|
const char *file_path = get_current_file_path(&viewer->file_list);
|
||||||
char* file_path = get_current_file_path(&viewer->file_list);
|
|
||||||
if (!file_path) {
|
if (!file_path) {
|
||||||
printf("No current file to load\n");
|
printf("No current file to load\n");
|
||||||
return 0;
|
return 0;
|
||||||
@ -601,21 +628,25 @@ static int load_current_image(ImageViewer* viewer) {
|
|||||||
return load_image(viewer, file_path);
|
return load_image(viewer, file_path);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int navigate_next_image(ImageViewer* viewer) {
|
static int navigate_next_image(ImageViewer *viewer) {
|
||||||
if (viewer->file_list.count <= 1) return 0;
|
if (viewer->file_list.count <= 1)
|
||||||
|
return 0;
|
||||||
|
|
||||||
viewer->file_list.current_index = (viewer->file_list.current_index + 1) % viewer->file_list.count;
|
viewer->file_list.current_index =
|
||||||
|
(viewer->file_list.current_index + 1) % viewer->file_list.count;
|
||||||
return load_current_image(viewer);
|
return load_current_image(viewer);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int navigate_prev_image(ImageViewer* viewer) {
|
static int navigate_prev_image(ImageViewer *viewer) {
|
||||||
if (viewer->file_list.count <= 1) return 0;
|
if (viewer->file_list.count <= 1)
|
||||||
|
return 0;
|
||||||
|
|
||||||
viewer->file_list.current_index = (viewer->file_list.current_index - 1 + viewer->file_list.count) % viewer->file_list.count;
|
viewer->file_list.current_index =
|
||||||
|
(viewer->file_list.current_index - 1 + viewer->file_list.count) % viewer->file_list.count;
|
||||||
return load_current_image(viewer);
|
return load_current_image(viewer);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void print_current_image_info(const ImageViewer* viewer) {
|
static void print_current_image_info(const ImageViewer *viewer) {
|
||||||
if (viewer->file_list.count > 1) {
|
if (viewer->file_list.count > 1) {
|
||||||
printf("Image %d/%d: %s\n",
|
printf("Image %d/%d: %s\n",
|
||||||
viewer->file_list.current_index + 1,
|
viewer->file_list.current_index + 1,
|
||||||
@ -624,12 +655,11 @@ static void print_current_image_info(const ImageViewer* viewer) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void handle_auto_navigation(ImageViewer* viewer) {
|
static void handle_auto_navigation(ImageViewer *viewer) {
|
||||||
Uint32 current_time = SDL_GetTicks();
|
Uint32 current_time = SDL_GetTicks();
|
||||||
|
|
||||||
if ((viewer->left_key_held || viewer->right_key_held) &&
|
if ((viewer->left_key_held || viewer->right_key_held) &&
|
||||||
(current_time - viewer->last_auto_nav_time >= viewer->auto_nav_interval)) {
|
(current_time - viewer->last_auto_nav_time >= viewer->auto_nav_interval)) {
|
||||||
|
|
||||||
if (viewer->left_key_held) {
|
if (viewer->left_key_held) {
|
||||||
if (navigate_prev_image(viewer)) {
|
if (navigate_prev_image(viewer)) {
|
||||||
print_current_image_info(viewer);
|
print_current_image_info(viewer);
|
||||||
@ -644,7 +674,7 @@ static void handle_auto_navigation(ImageViewer* viewer) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, char* argv[]) {
|
int main(int argc, char *argv[]) {
|
||||||
if (argc != 2) {
|
if (argc != 2) {
|
||||||
printf("Usage: %s <image_file_or_directory>\n", argv[0]);
|
printf("Usage: %s <image_file_or_directory>\n", argv[0]);
|
||||||
printf("Supported formats: JPG, JPEG, PNG, BMP, GIF, TIF, WEBP\n");
|
printf("Supported formats: JPG, JPEG, PNG, BMP, GIF, TIF, WEBP\n");
|
||||||
@ -697,28 +727,26 @@ int main(int argc, char* argv[]) {
|
|||||||
printf("Reset view\n");
|
printf("Reset view\n");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SDLK_f:
|
case SDLK_f: {
|
||||||
{
|
int window_w, window_h;
|
||||||
int window_w, window_h;
|
SDL_GetWindowSize(viewer.window, &window_w, &window_h);
|
||||||
SDL_GetWindowSize(viewer.window, &window_w, &window_h);
|
|
||||||
|
|
||||||
float scale_x = (float)window_w / viewer.image_width;
|
float scale_x = (float)window_w / viewer.image_width;
|
||||||
float scale_y = (float)window_h / viewer.image_height;
|
float scale_y = (float)window_h / viewer.image_height;
|
||||||
viewer.zoom_factor = (scale_x < scale_y) ? scale_x : scale_y;
|
viewer.zoom_factor = (scale_x < scale_y) ? scale_x : scale_y;
|
||||||
viewer.offset_x = 0;
|
viewer.offset_x = 0;
|
||||||
viewer.offset_y = 0;
|
viewer.offset_y = 0;
|
||||||
printf("Fit to window (zoom: %.2f)\n", viewer.zoom_factor);
|
printf("Fit to window (zoom: %.2f)\n", viewer.zoom_factor);
|
||||||
}
|
} break;
|
||||||
break;
|
|
||||||
|
|
||||||
case SDLK_PLUS:
|
case SDLK_PLUS:
|
||||||
case SDLK_EQUALS:
|
case SDLK_EQUALS:
|
||||||
handle_zoom(&viewer, 0.1f, WINDOW_WIDTH/2, WINDOW_HEIGHT/2);
|
handle_zoom(&viewer, 0.1f, WINDOW_WIDTH / 2, WINDOW_HEIGHT / 2);
|
||||||
printf("Zoom: %.2f\n", viewer.zoom_factor);
|
printf("Zoom: %.2f\n", viewer.zoom_factor);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SDLK_MINUS:
|
case SDLK_MINUS:
|
||||||
handle_zoom(&viewer, -0.1f, WINDOW_WIDTH/2, WINDOW_HEIGHT/2);
|
handle_zoom(&viewer, -0.1f, WINDOW_WIDTH / 2, WINDOW_HEIGHT / 2);
|
||||||
printf("Zoom: %.2f\n", viewer.zoom_factor);
|
printf("Zoom: %.2f\n", viewer.zoom_factor);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -762,15 +790,13 @@ int main(int argc, char* argv[]) {
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SDL_MOUSEWHEEL:
|
case SDL_MOUSEWHEEL: {
|
||||||
{
|
int mouse_x, mouse_y;
|
||||||
int mouse_x, mouse_y;
|
SDL_GetMouseState(&mouse_x, &mouse_y);
|
||||||
SDL_GetMouseState(&mouse_x, &mouse_y);
|
float zoom_delta = e.wheel.y * 0.1f;
|
||||||
float zoom_delta = e.wheel.y * 0.1f;
|
handle_zoom(&viewer, zoom_delta, mouse_x, mouse_y);
|
||||||
handle_zoom(&viewer, zoom_delta, mouse_x, mouse_y);
|
printf("Zoom: %.2f\n", viewer.zoom_factor);
|
||||||
printf("Zoom: %.2f\n", viewer.zoom_factor);
|
} break;
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case SDL_MOUSEBUTTONDOWN:
|
case SDL_MOUSEBUTTONDOWN:
|
||||||
if (e.button.button == SDL_BUTTON_LEFT) {
|
if (e.button.button == SDL_BUTTON_LEFT) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user