mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

A fix for non-English input issue.

Browse Source 
Extended ASCII characters input issue, window title bar issue.
This commit is contained in:
cnjinhao
2014-12-23 17:09:30 +08:00
parent 7a42e8e2ed
commit 977a6c0e86
8 changed files with 52 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/gui/detail/linux_X11/bedrock.cpp
View File

@@ -954,7 +954,7 @@ namespace detail
}
keybuf[len] = 0;
nana::char_t keychar;
nana::char_t keychar = 0;
switch(status)
{
case XLookupKeySym:
@@ -983,8 +983,6 @@ namespace detail
keychar = keyboard::os_insert; break;
case XK_Delete:
keychar = keyboard::os_del; break;
default:
keychar = keysym;
}
context.platform.keychar = keychar;
if(keychar == keyboard::tab && (false == (msgwnd->flags.tab & detail::tab_type::eating))) //Tab
@@ -1001,7 +999,7 @@ namespace detail
{
context.is_alt_pressed = true;
}
else
else if(keychar)
{
arg_keyboard arg;
arg.ignore = false;
@@ -1019,7 +1017,7 @@ namespace detail
}
case XLookupChars:
{
const nana::char_t * charbuf;
const ::nana::char_t* charbuf;
#if defined(NANA_UNICODE)
nana::detail::charset_conv charset("UTF-32", "UTF-8");
const std::string& str = charset.charset(std::string(keybuf, keybuf + len));

3
source/gui/detail/native_window_interface.cpp
View File

@@ -1099,6 +1099,9 @@ namespace nana{
nana::detail::platform_scope_guard psg;
::XStringListToTextProperty(&text, 1, &name);
::XSetWMName(restrict::spec.open_display(), reinterpret_cast<Window>(wd), &name);
::XChangeProperty(restrict::spec.open_display(), reinterpret_cast<Window>(wd),
restrict::spec.atombase().net_wm_name, restrict::spec.atombase().utf8_string, 8,
PropModeReplace, reinterpret_cast<unsigned char*>(text), mbstr.size());
#endif
}

2
source/gui/widgets/skeletons/text_editor.cpp
View File

@@ -1193,7 +1193,7 @@ namespace nana{ namespace widgets
undo(false);
break;
default:
if (key >= 0xFF || (32 <= key && key <= 126))
if (key > 0x7F || (32 <= key && key <= 126))
put(key);
else if (sizeof(nana::char_t) == sizeof(char))
{ //Non-Unicode Version for Non-English characters