ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

C locale fix

This commit is contained in:
Allen Webster 2017-05-29 13:00:18 -04:00
parent b2574e60c7
commit 6d6d58240a
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
linux_4ed.cpp
View File

@ -1739,22 +1739,15 @@ LinuxInputInit(Display *dpy, Window XWindow){
XIMStyle style; XIMStyle style;
unsigned long xim_event_mask = 0; unsigned long xim_event_mask = 0;
char *prev_locale = setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
char *prev_modifiers = XSetLocaleModifiers(""); XSetLocaleModifiers("");
b32 locale_supported = XSupportsLocale(); b32 locale_supported = XSupportsLocale();
fprintf(stderr, "Supported locale?: %s.\n", locale_supported ? "Yes" : "No"); fprintf(stderr, "Supported locale?: %s.\n", locale_supported ? "Yes" : "No");
if (!locale_supported){ if (!locale_supported){
fprintf(stderr, "Previous locale was %s\n", prev_locale); fprintf(stderr, "Reverting to 'C' ... ");
fprintf(stderr, "Previous modifiers were %s\n", prev_modifiers); setlocale(LC_ALL, "C");
fprintf(stderr, "Reverting to previous locale setup ... ");
if (prev_locale != 0){
setlocale(LC_ALL, prev_locale);
}
if (prev_modifiers != 0){
XSetLocaleModifiers(prev_modifiers);
}
locale_supported = XSupportsLocale(); locale_supported = XSupportsLocale();
fprintf(stderr, "Previous is supported? %s.\n", locale_supported ? "Yes" : "No"); fprintf(stderr, "C is supported? %s.\n", locale_supported ? "Yes" : "No");
} }
result.input_method = XOpenIM(dpy, 0, 0, 0); result.input_method = XOpenIM(dpy, 0, 0, 0);