Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch for non-Latin keyboards.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2001-05-18 18:39:13 +00:00
parent ffe107c8c0
commit 2d4511658d
2 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gtk/window.cpp
View File

@@ -452,8 +452,9 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
// key code mapping routines // key code mapping routines
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static long map_to_unmodified_wx_keysym( KeySym keysym ) static long map_to_unmodified_wx_keysym( GdkEventKey *event )
{ {
KeySym keysym = event->keyval;
guint key_code = 0; guint key_code = 0;
switch (keysym) switch (keysym)
@@ -549,7 +550,11 @@ static long map_to_unmodified_wx_keysym( KeySym keysym )
case GDK_F12: key_code = WXK_F12; break; case GDK_F12: key_code = WXK_F12; break;
default: default:
{ {
if ((keysym & 0xF000) == 0) if (event->length == 1)
{
key_code = toupper( (unsigned char)*event->string );
}
else if ((keysym & 0xFF) == keysym)
{ {
guint upper = gdk_keyval_to_upper( (guint)keysym ); guint upper = gdk_keyval_to_upper( (guint)keysym );
keysym = (upper != 0 ? upper : keysym ); /* to be MSW compatible */ keysym = (upper != 0 ? upper : keysym ); /* to be MSW compatible */
@@ -561,8 +566,9 @@ static long map_to_unmodified_wx_keysym( KeySym keysym )
return (key_code); return (key_code);
} }
static long map_to_wx_keysym( KeySym keysym ) static long map_to_wx_keysym( GdkEventKey *event )
{ {
KeySym keysym = event->keyval;
guint key_code = 0; guint key_code = 0;
switch (keysym) switch (keysym)
@@ -648,7 +654,11 @@ static long map_to_wx_keysym( KeySym keysym )
case GDK_F12: key_code = WXK_F12; break; case GDK_F12: key_code = WXK_F12; break;
default: default:
{ {
if ((keysym & 0xF000) == 0) if (event->length == 1)
{
key_code = (unsigned char)*event->string;
}
else if ((keysym & 0xFF) == keysym)
{ {
key_code = (guint)keysym; key_code = (guint)keysym;
} }
@@ -897,7 +907,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
bool ret = FALSE; bool ret = FALSE;
long key_code = map_to_unmodified_wx_keysym( gdk_event->keyval ); long key_code = map_to_unmodified_wx_keysym( gdk_event );
/* sending unknown key events doesn't really make sense */ /* sending unknown key events doesn't really make sense */
if (key_code == 0) return FALSE; if (key_code == 0) return FALSE;
@@ -937,7 +947,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
/* wxMSW doesn't send char events with Alt pressed */ /* wxMSW doesn't send char events with Alt pressed */
/* Only send wxEVT_CHAR event if not processed yet. Thus, ALT-x /* Only send wxEVT_CHAR event if not processed yet. Thus, ALT-x
will only be sent if it is not in an accelerator table. */ will only be sent if it is not in an accelerator table. */
key_code = map_to_wx_keysym( gdk_event->keyval ); key_code = map_to_wx_keysym( gdk_event );
if ( (!ret) && if ( (!ret) &&
(key_code != 0)) (key_code != 0))
@@ -1055,7 +1065,7 @@ static gint gtk_window_key_release_callback( GtkWidget *widget, GdkEventKey *gdk
printf( "\n" ); printf( "\n" );
*/ */
long key_code = map_to_unmodified_wx_keysym( gdk_event->keyval ); long key_code = map_to_unmodified_wx_keysym( gdk_event );
/* sending unknown key events doesn't really make sense */ /* sending unknown key events doesn't really make sense */
if (key_code == 0) return FALSE; if (key_code == 0) return FALSE;

24
src/gtk1/window.cpp
View File

@@ -452,8 +452,9 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
// key code mapping routines // key code mapping routines
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static long map_to_unmodified_wx_keysym( KeySym keysym ) static long map_to_unmodified_wx_keysym( GdkEventKey *event )
{ {
KeySym keysym = event->keyval;
guint key_code = 0; guint key_code = 0;
switch (keysym) switch (keysym)
@@ -549,7 +550,11 @@ static long map_to_unmodified_wx_keysym( KeySym keysym )
case GDK_F12: key_code = WXK_F12; break; case GDK_F12: key_code = WXK_F12; break;
default: default:
{ {
if ((keysym & 0xF000) == 0) if (event->length == 1)
{
key_code = toupper( (unsigned char)*event->string );
}
else if ((keysym & 0xFF) == keysym)
{ {
guint upper = gdk_keyval_to_upper( (guint)keysym ); guint upper = gdk_keyval_to_upper( (guint)keysym );
keysym = (upper != 0 ? upper : keysym ); /* to be MSW compatible */ keysym = (upper != 0 ? upper : keysym ); /* to be MSW compatible */
@@ -561,8 +566,9 @@ static long map_to_unmodified_wx_keysym( KeySym keysym )
return (key_code); return (key_code);
} }
static long map_to_wx_keysym( KeySym keysym ) static long map_to_wx_keysym( GdkEventKey *event )
{ {
KeySym keysym = event->keyval;
guint key_code = 0; guint key_code = 0;
switch (keysym) switch (keysym)
@@ -648,7 +654,11 @@ static long map_to_wx_keysym( KeySym keysym )
case GDK_F12: key_code = WXK_F12; break; case GDK_F12: key_code = WXK_F12; break;
default: default:
{ {
if ((keysym & 0xF000) == 0) if (event->length == 1)
{
key_code = (unsigned char)*event->string;
}
else if ((keysym & 0xFF) == keysym)
{ {
key_code = (guint)keysym; key_code = (guint)keysym;
} }
@@ -897,7 +907,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
bool ret = FALSE; bool ret = FALSE;
long key_code = map_to_unmodified_wx_keysym( gdk_event->keyval ); long key_code = map_to_unmodified_wx_keysym( gdk_event );
/* sending unknown key events doesn't really make sense */ /* sending unknown key events doesn't really make sense */
if (key_code == 0) return FALSE; if (key_code == 0) return FALSE;
@@ -937,7 +947,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e
/* wxMSW doesn't send char events with Alt pressed */ /* wxMSW doesn't send char events with Alt pressed */
/* Only send wxEVT_CHAR event if not processed yet. Thus, ALT-x /* Only send wxEVT_CHAR event if not processed yet. Thus, ALT-x
will only be sent if it is not in an accelerator table. */ will only be sent if it is not in an accelerator table. */
key_code = map_to_wx_keysym( gdk_event->keyval ); key_code = map_to_wx_keysym( gdk_event );
if ( (!ret) && if ( (!ret) &&
(key_code != 0)) (key_code != 0))
@@ -1055,7 +1065,7 @@ static gint gtk_window_key_release_callback( GtkWidget *widget, GdkEventKey *gdk
printf( "\n" ); printf( "\n" );
*/ */
long key_code = map_to_unmodified_wx_keysym( gdk_event->keyval ); long key_code = map_to_unmodified_wx_keysym( gdk_event );
/* sending unknown key events doesn't really make sense */ /* sending unknown key events doesn't really make sense */
if (key_code == 0) return FALSE; if (key_code == 0) return FALSE;