github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlCore: X11 Chameleon improvements

Browse source
This commit is contained in:
Mirek Fidler 2026-04-22 13:28:37 +02:00
parent 2f2f7a4af6
commit ec3b2cee7a
3 changed files with 107 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

101
uppsrc/CtrlLib/Ch.cpp
View file

@ -870,107 +870,6 @@ void ChFlatDarkSkin()
ChMakeSkin(0, SWhiteGray(), SGray(), adj);
}
#ifdef GUI_X11
void ChHostSkin()
{
String s = Sys("dump_xsettings");
StringStream ss(s);
String font_name, theme;
int scaling = 1;
int xdpi = 98347;
while(!ss.IsEof()) {
String l = ss.GetLine();
int q = l.Find(' ');
if(q >= 0) {
String id = l.Mid(0, q);
String value = l.Mid(q + 1);
if(id == "Gdk/WindowScalingFactor")
scaling = max(Atoi(value), 1);
if(id == "Gtk/FontName")
font_name = value;
if(id == "Xft/DPI")
xdpi = Nvl(StrInt(value), 98347);
if(id == "Net/ThemeName")
theme = value;
}
}
int fontface = Font::ARIAL;
int fontheight = 13;
bool bold = false;
bool italic = false;
const char *q = strrchr(font_name, ' ');
if(q) {
int h = atoi(q);
if(h)
fontheight = h;
String face(font_name, q);
fontface = Font::FindFaceNameIndex(face);
if(fontface == 0) {
for(;;) {
const char *q = strrchr(face, ' ');
if(!q) break;
const char *s = q + 1;
if(stricmp(s, "Bold") == 0 || stricmp(s, "Heavy") == 0)
bold = true;
else
if(stricmp(s, "Italic") == 0 || stricmp(s, "Oblique") == 0)
italic = true;
else
if(stricmp(s, "Regular") == 0 || stricmp(s, "Light") || stricmp(s, "Medium"))
;
else
continue;
face = String(~face, q);
}
fontface = Font::FindFaceNameIndex(face);
if(fontface == 0) {
if(ToUpper(face[0]) == 'M')
fontface = Font::COURIER;
else
if(ToUpper(face[0]) == 'S' && ToUpper(face[1]) == 'e')
fontface = Font::ROMAN;
else
fontface = Font::ARIAL;
}
}
}
Font gui_font = Font(fontface, fround(fontheight * xdpi / (72*1024.0))).Bold(bold).Italic(italic);
Font::SetDefaultFont(gui_font);
SColorFace_Write(Color(242, 241, 240));
SColorMenu_Write(Color(242, 241, 240));
SColorHighlight_Write(Color(50, 50, 250));
auto ThemeHasWord = [&](const char *text) {
int q = ToLower(theme).Find(text);
if(q >= 0) {
if(q > 0) {
int c = theme[q];
if(IsLetter(c) && IsLower(c) == IsLower(*text))
return false;
}
int l = strlen(text);
int c = theme[q + l];
if(IsLetter(c) && IsLower(c) == IsLower(text[l - 1]))
return false;
return true;
}
return false;
};
if(ThemeHasWord("dark") || ThemeHasWord("inverse") || ThemeHasWord("black"))
ChDarkSkin();
else
ChStdSkin();
}
#endif
Vector<Tuple<void (*)(), String>> GetAllChSkins()
{
return Vector<Tuple<void (*)(), String>> {

106
uppsrc/CtrlLib/ChX11.cpp Normal file
View file

@ -0,0 +1,106 @@
#include "CtrlLib.h"
#ifdef GUI_X11
namespace Upp {
void ChHostSkin()
{
String s = Sys("dump_xsettings");
StringStream ss(s);
String font_name, theme;
int scaling = 1;
int xdpi = 98347;
while(!ss.IsEof()) {
String l = ss.GetLine();
int q = l.Find(' ');
if(q >= 0) {
String id = l.Mid(0, q);
String value = l.Mid(q + 1);
if(id == "Gdk/WindowScalingFactor")
scaling = max(Atoi(value), 1);
if(id == "Gtk/FontName")
font_name = value;
if(id == "Xft/DPI")
xdpi = Nvl(StrInt(value), 98347);
if(id == "Net/ThemeName")
theme = value;
}
}
int fontface = Font::ARIAL;
int fontheight = 13;
bool bold = false;
bool italic = false;
const char *q = strrchr(font_name, ' ');
if(q) {
int h = atoi(q);
if(h)
fontheight = h;
String face(font_name, q);
fontface = Font::FindFaceNameIndex(face);
if(fontface == 0) {
for(;;) {
const char *q = strrchr(face, ' ');
if(!q) break;
const char *s = q + 1;
if(stricmp(s, "Bold") == 0 || stricmp(s, "Heavy") == 0)
bold = true;
else
if(stricmp(s, "Italic") == 0 || stricmp(s, "Oblique") == 0)
italic = true;
else
if(stricmp(s, "Regular") == 0 || stricmp(s, "Light") || stricmp(s, "Medium"))
;
else
continue;
face = String(~face, q);
}
fontface = Font::FindFaceNameIndex(face);
if(fontface == 0) {
if(ToUpper(face[0]) == 'M')
fontface = Font::COURIER;
else
if(ToUpper(face[0]) == 'S' && ToUpper(face[1]) == 'e')
fontface = Font::ROMAN;
else
fontface = Font::ARIAL;
}
}
}
Font gui_font = Font(fontface, fround(fontheight * xdpi / (72*1024.0))).Bold(bold).Italic(italic);
Font::SetDefaultFont(gui_font);
SColorFace_Write(Color(242, 241, 240));
SColorMenu_Write(Color(242, 241, 240));
SColorHighlight_Write(Color(50, 50, 250));
auto ThemeHasWord = [&](const char *text) {
int q = ToLower(theme).Find(text);
if(q >= 0) {
if(q > 0) {
int pc = theme[q - 1];
if(!(IsUpper(theme[q]) && IsLower(pc) || !IsLetter(pc)))
return false;
}
int l = strlen(text);
int nc = theme[q + l];
if(!(IsLower(text[l - 1]) && IsUpper(nc) || !IsLetter(nc)))
return false;
return true;
}
return false;
};
if(ThemeHasWord("dark") || ThemeHasWord("inverse") || ThemeHasWord("black"))
ChDarkSkin();
else
ChStdSkin();
}
}
#endif

1
uppsrc/CtrlLib/CtrlLib.upp
View file

@ -119,6 +119,7 @@ file
Ctrls.iml,
XPTheme.dli,
ChWin32.cpp,
ChX11.cpp,
ChGtk3.cpp,
ChCocoMM.h,
ChCocoMM.mm,