Revert "Merge pull request #845 from cspiegel/garglk-window-colors"

This reverts commit 86aa5f3, reversing changes made to 6b62fa9.
garglk · May 25, 2024 · cc41029 · cc41029
1 parent 156af51
commit cc41029
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 23 deletions.
diff --git a/garglk/cheapglk/glk.h b/garglk/cheapglk/glk.h
@@ -64,7 +64,6 @@ typedef int32_t glsi32;
 #define GLK_MODULE_GARGLKBLEEP
 #define GLK_MODULE_GARGLKWINSIZE
 #define GLK_MODULE_GARGLK_FILE_RESOURCES
-#define GLK_MODULE_GARGLK_GET_COLORS
 
 /* Define a macro for a function attribute that indicates a function that
     never returns. (E.g., glk_exit().) We try to do this only in C compilers
@@ -522,7 +521,6 @@ extern void garglk_set_zcolors(glui32 fg, glui32 bg);
 extern void garglk_set_zcolors_stream(strid_t str, glui32 fg, glui32 bg);
 extern void garglk_set_reversevideo(glui32 reverse);
 extern void garglk_set_reversevideo_stream(strid_t str, glui32 reverse);
-extern void garglk_get_colors(glui32 wintype, glui32 style, glui32 *fg, glui32 *bg);
 
 extern void garglk_zbleep(glui32 number);
 

diff --git a/garglk/config.cpp b/garglk/config.cpp
@@ -127,27 +127,6 @@ const Styles gli_gstyles_def = gli_gstyles;
 
 std::vector<garglk::ConfigFile> garglk::all_configs;
 
-void garglk_get_colors(glui32 wintype, glui32 style, glui32 *fg, glui32 *bg)
-{
-    auto styles = wintype == wintype_TextGrid ? gli_gstyles : gli_tstyles;
-
-    if (style >= style_NUMSTYLES) {
-        return;
-    }
-
-    if (fg != nullptr) {
-        *fg = (styles[style].fg[0] << 16) |
-              (styles[style].fg[1] <<  8) |
-              (styles[style].fg[2] <<  0);
-    }
-
-    if (bg != nullptr) {
-        *bg = (styles[style].bg[0] << 16) |
-              (styles[style].bg[1] <<  8) |
-              (styles[style].bg[2] <<  0);
-    }
-}
-
 static FontFace font2idx(const std::string &font)
 {
     const static std::unordered_map<std::string, FontFace> facemap = {