Skip to content
Snippets Groups Projects
Commit 685ee2f2 authored by Deucе's avatar Deucе :ok_hand_tone4:
Browse files

Finally got ChromeOS icon/toltip working!

It appears its matching based on the class, not the application.
Since this was hard-coded to CIOLIB based on the idea of using
resources to customize all CIOLIB windows, this didn't match the
SyncTERM .desktop file, so ChromeOS assumed it was "something else"

Add yet another ciolib_initial_* variable to set this, and she's
finally good!
parent c1b387c2
No related branches found
No related tags found
1 merge request!463MRC mods by Codefenix (2024-10-20)
Pipeline #4391 passed
...@@ -93,6 +93,7 @@ CIOLIBEXPORT enum ciolib_scaling ciolib_initial_scaling_type = CIOLIB_SCALING_IN ...@@ -93,6 +93,7 @@ CIOLIBEXPORT enum ciolib_scaling ciolib_initial_scaling_type = CIOLIB_SCALING_IN
CIOLIBEXPORT const void * ciolib_initial_icon = syncicon64; CIOLIBEXPORT const void * ciolib_initial_icon = syncicon64;
CIOLIBEXPORT size_t ciolib_initial_icon_width = SYNCICON64_WIDTH; CIOLIBEXPORT size_t ciolib_initial_icon_width = SYNCICON64_WIDTH;
CIOLIBEXPORT const char *ciolib_initial_program_name = "CIOLIB"; CIOLIBEXPORT const char *ciolib_initial_program_name = "CIOLIB";
CIOLIBEXPORT const char *ciolib_initial_program_class = "CIOLIB";
CIOLIBEXPORT const uint32_t *ciolib_r2yptr; CIOLIBEXPORT const uint32_t *ciolib_r2yptr;
CIOLIBEXPORT const uint32_t *ciolib_y2rptr; CIOLIBEXPORT const uint32_t *ciolib_y2rptr;
......
...@@ -420,6 +420,7 @@ CIOLIBEXPORTVAR enum ciolib_scaling ciolib_initial_scaling_type; ...@@ -420,6 +420,7 @@ CIOLIBEXPORTVAR enum ciolib_scaling ciolib_initial_scaling_type;
CIOLIBEXPORTVAR const void * ciolib_initial_icon; CIOLIBEXPORTVAR const void * ciolib_initial_icon;
CIOLIBEXPORTVAR size_t ciolib_initial_icon_width; CIOLIBEXPORTVAR size_t ciolib_initial_icon_width;
CIOLIBEXPORTVAR const char *ciolib_initial_program_name; CIOLIBEXPORTVAR const char *ciolib_initial_program_name;
CIOLIBEXPORTVAR const char *ciolib_initial_program_class;
CIOLIBEXPORTVAR const uint32_t *ciolib_r2yptr; CIOLIBEXPORTVAR const uint32_t *ciolib_r2yptr;
CIOLIBEXPORTVAR const uint32_t *ciolib_y2rptr; CIOLIBEXPORTVAR const uint32_t *ciolib_y2rptr;
......
...@@ -582,7 +582,7 @@ static int init_window() ...@@ -582,7 +582,7 @@ static int init_window()
classhints=x11.XAllocClassHint(); classhints=x11.XAllocClassHint();
if (classhints) { if (classhints) {
classhints->res_name = ciolib_initial_program_name; classhints->res_name = ciolib_initial_program_name;
classhints->res_class = "CIOLIB"; classhints->res_class = ciolib_initial_program_class;
} }
wmhints=x11.XAllocWMHints(); wmhints=x11.XAllocWMHints();
wmhints->flags = 0; wmhints->flags = 0;
......
...@@ -1561,6 +1561,7 @@ main(int argc, char **argv) ...@@ -1561,6 +1561,7 @@ main(int argc, char **argv)
ciolib_initial_icon_width = syncterm_icon.width; ciolib_initial_icon_width = syncterm_icon.width;
ciolib_initial_scaling = settings.scaling_factor; ciolib_initial_scaling = settings.scaling_factor;
ciolib_initial_program_name = "syncterm"; ciolib_initial_program_name = "syncterm";
ciolib_initial_program_class = "SyncTERM";
ciolib_mode = settings.output_mode; ciolib_mode = settings.output_mode;
if (settings.startup_mode != SCREEN_MODE_CURRENT) if (settings.startup_mode != SCREEN_MODE_CURRENT)
text_mode = screen_to_ciolib(settings.startup_mode); text_mode = screen_to_ciolib(settings.startup_mode);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment