feat: 0.4.5 Add init_s4c_color_pair_ex() to pass a background color i…

…ndex (#94)

- Bump s4c-scripts to 0.1.1

README.md

@@ -31,10 +31,10 @@
   -------------------------------------------------------------------------------
   Language                     files          blank        comment           code
   -------------------------------------------------------------------------------
-  C                                2            107            348            606
-  C/C++ Header                     2             45             50            158
+  C                                2            114            380            644
+  C/C++ Header                     2             47             50            167
   -------------------------------------------------------------------------------
-  SUM:                             4            152            398            764
+  SUM:                             4            161            430            811
   -------------------------------------------------------------------------------
   ```
 

configure.ac

@@ -1,5 +1,5 @@
 # Define the package name and version
-AC_INIT([sprites4curses], [0.4.4], [jgabaut@github.com])
+AC_INIT([sprites4curses], [0.4.5], [jgabaut@github.com])
 
 # Verify automake version and enable foreign option
 AM_INIT_AUTOMAKE([foreign -Wall])
@@ -83,7 +83,7 @@ AM_CONDITIONAL([LINUX_BUILD], [test "$build_linux" = "yes"])
 # Set a default version number if not specified externally
 AC_ARG_VAR([VERSION], [Version number])
 if test -z "$VERSION"; then
-  VERSION="0.4.4"
+  VERSION="0.4.5"
 fi
 
 # Output variables to the config.h header

documentation/s4c.doxyfile

@@ -48,7 +48,7 @@ PROJECT_NAME           = "sprites4curses"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "0.4.4"
+PROJECT_NUMBER         = "0.4.5"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

s4c-animate/animate.c

@@ -1,7 +1,7 @@
 // jgabaut @ github.com/jgabaut
 // SPDX-License-Identifier: GPL-3.0-only
 /*
-    Copyright (C) 2023  jgabaut
+    Copyright (C) 2023-2024  jgabaut
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -117,8 +117,9 @@ S4C_Sprite s4c_new_sprite(char data[][MAXCOLS], int frameheight, int framewidth,
  * Initialises a color pair from a passed S4C_Color pointer.
  * @param palette The S4C_Color pointer array at hand.
  * @param color_index The resulting color index for defined colorpair.
+ * @param bg_color_index The color index for background color of defined colorpair. Typical values are 0 or, only after use_default_colors(), -1.
  */
-void init_s4c_color_pair(S4C_Color* color, int color_index) {
+void init_s4c_color_pair_ex(S4C_Color* color, int color_index, int bg_color_index) {
 
 	if (color == NULL) {
 		fprintf(stderr,"Error: invalid S4C_Color at %s().",__func__);
@@ -137,8 +138,31 @@ void init_s4c_color_pair(S4C_Color* color, int color_index) {
 	int proportional_g = (((float)g + 1.0) / 256)*1000;
 	int proportional_b = (((float)b + 1.0) / 256)*1000;
 	init_color(color_index, proportional_r, proportional_g, proportional_b);
-   	init_pair(color_index, color_index, 0);
+   	init_pair(color_index, color_index, bg_color_index);
+}
+
+/**
+ * Initialises a color pair from a passed S4C_Color pointer.
+ * The background color index for the defined color pair is 0.
+ * @param palette The S4C_Color pointer array at hand.
+ * @param color_index The resulting color index for defined colorpair.
+ */
+void init_s4c_color_pair(S4C_Color* color, int color_index) {
+    init_s4c_color_pair_ex(color, color_index, 0);
 }
+
+/**
+ * Initialises a color pair from a passed S4C_Color pointer.
+ * It sets the background color index for the pair to -1.
+ * This is useless to any curses implementation that does not support use_default_colors().
+ * In that case, plain init_s4c_color_pair() should be used.
+ * @param palette The S4C_Color pointer array at hand.
+ * @param color_index The resulting color index for defined colorpair.
+ */
+void init_s4c_color_pair_default_bg(S4C_Color* color, int color_index) {
+    init_s4c_color_pair_ex(color, color_index, -1);
+}
+
 #endif
 
 const char* s4c_color_strings[S4C_MAX_COLOR_INDEX+1] = {

s4c-animate/animate.h

@@ -1,7 +1,7 @@
 // jgabaut @ github.com/jgabaut
 // SPDX-License-Identifier: GPL-3.0-only
 /*
-    Copyright (C) 2023  jgabaut
+    Copyright (C) 2023-2024  jgabaut
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -35,10 +35,10 @@
 #endif // S4C_RAYLIB_EXTENSION
 
 
-#define S4C_ANIMATE_VERSION "0.4.4"
+#define S4C_ANIMATE_VERSION "0.4.5"
 #define S4C_ANIMATE_MAJOR_VERSION 0
 #define S4C_ANIMATE_MINOR_VERSION 4
-#define S4C_ANIMATE_PATCH_VERSION 4
+#define S4C_ANIMATE_PATCH_VERSION 5
 
 #define S4C_MAJOR S4C_ANIMATE_MAJOR_VERSION
 #define S4C_MINOR S4C_ANIMATE_MINOR_VERSION
@@ -191,7 +191,9 @@ typedef struct animate_args {
 
 void init_s4c_color_pairs(FILE* palette_file);
 
+void init_s4c_color_pair_ex(S4C_Color* color, int color_index, int bg_color_index);
 void init_s4c_color_pair(S4C_Color* color, int color_index);
+void init_s4c_color_pair_default_bg(S4C_Color* color, int color_index);
 
 void test_s4c_color_pairs(WINDOW* win);