From b779a8c309dfed91ee3b2812fe44b94def6034e8 Mon Sep 17 00:00:00 2001 From: randy Date: Thu, 28 Sep 2023 19:44:23 -0500 Subject: [PATCH] Forgot some things and add bin folder --- Makefile | 6 +++--- bin/.gitignore | 1 + source/config.h | 22 +++++++++++----------- 3 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 bin/.gitignore diff --git a/Makefile b/Makefile index 1e72e9a..436c39f 100755 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ -LIBS := -lm +LIBS := -lm -lSDL2 -lSDL2_ttf SOURCES := $(wildcard source/*.c) picker: source/*.c source/*.h - gcc $(SOURCES) $(LIBS) -lSDL2 -lSDL2_ttf -o bin/$@ + gcc $(SOURCES) $(LIBS) -o bin/$@ picker_debug: source/*.c source/*.h - gcc -g $(SOURCES) $(LIBS) -lSDL2 -lSDL2_ttf -o bin/$@ + gcc -g $(SOURCES) $(LIBS) -o bin/$@ install: make picker diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..cbe57f4 --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1 @@ +./bin ./LICENSE.txt ./Makefile ./project.vim ./README.md ./source ./tasks.md diff --git a/source/config.h b/source/config.h index 4046b78..042685b 100644 --- a/source/config.h +++ b/source/config.h @@ -19,20 +19,20 @@ Window_Layout config_layout = { .hue_slider.rel = (SDL_FRect){.x = 0.70, .y = 0.05, .w = 0.08, .h = 0.50}, .final_sample.rel = (SDL_FRect){.x = 0.05, .y = 0.65, .w = 0.20, .h = 0.20}, .info_container.rel = (SDL_FRect){.x = 0.05, .y = 0.65, .w = 0.90, .h = 0.30}, - .info_boxes.rel = (SDL_FRect){.x = 0.25, .y = 0.00, .w = 0.75, .h = 1.00}, - .rgb_info.rel = (SDL_FRect){.x = 0.00, .y = 0.00, .w = 1.00, .h = 0.50}, - .red_component.body.rel = (SDL_FRect){.x = 0.00, .y = 0.00, .w = 0.30, .h = 1.00}, - .green_component.body.rel = (SDL_FRect){.x = 0.00, .y = 0.40, .w = 0.30, .h = 1.00}, - .blue_component.body.rel = (SDL_FRect){.x = 0.00, .y = 0.80, .w = 0.30, .h = 1.00}, - .hsl_info.rel = (SDL_FRect){.x = 0.50, .y = 0.00, .w = 1.00, .h = 0.50}, - .hue_component.body.rel = (SDL_FRect){.x = 0.00, .y = 0.00, .w = 0.30, .h = 1.00}, - .sat_component.body.rel = (SDL_FRect){.x = 0.00, .y = 0.40, .w = 0.30, .h = 1.00}, - .lum_component.body.rel = (SDL_FRect){.x = 0.00, .y = 0.80, .w = 0.30, .h = 1.00} + .info_boxes.rel = (SDL_FRect){.x = 0.25, .y = 0.00, .w = 0.75, .h = 1.00}, + .rgb_info.rel = (SDL_FRect){.x = 0.00, .y = 0.00, .w = 1.00, .h = 0.50}, + .red_component.body.rel = (SDL_FRect){.x = 0.00, .y = 0.00, .w = 0.30, .h = 1.00}, + .green_component.body.rel = (SDL_FRect){.x = 0.00, .y = 0.40, .w = 0.30, .h = 1.00}, + .blue_component.body.rel = (SDL_FRect){.x = 0.00, .y = 0.80, .w = 0.30, .h = 1.00}, + .hsl_info.rel = (SDL_FRect){.x = 0.50, .y = 0.00, .w = 1.00, .h = 0.50}, + .hue_component.body.rel = (SDL_FRect){.x = 0.00, .y = 0.00, .w = 0.30, .h = 1.00}, + .sat_component.body.rel = (SDL_FRect){.x = 0.00, .y = 0.40, .w = 0.30, .h = 1.00}, + .lum_component.body.rel = (SDL_FRect){.x = 0.00, .y = 0.80, .w = 0.30, .h = 1.00} }; // For now we need a full path, maybe OpenFont can do automatic lookup -const char config_font_path[] = "/usr/share/fonts/TTF/iosevka-fixed-regular.ttf"; -const int config_font_size = 36; +const char config_font_path[] = "/usr/share/fonts/TTF/iosevka-term-regular.ttf"; +const int config_font_size = 32; const int config_framerate = 30; #endif //__PICKER_CONFIG__ -- 2.49.0