Author: andreia
Date: 2007-12-06 22:38:59 -0500 (Thu, 06 Dec 2007)
New Revision: 90891
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/X11Keyboard.cs
Log:
* X11Keyboard.cs: Use Xutf8LookupString to support international
characters under alternate codepages. Patch from #340878
2007-12-06 Andreia Gaita <[EMAIL PROTECTED]>
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-12-07 02:47:25 UTC (rev 90890)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-12-07 03:38:59 UTC (rev 90891)
@@ -1,3 +1,9 @@
+
+2007-12-06 Andreia Gaita <[EMAIL PROTECTED]>
+
+ * X11Keyboard.cs: Use Xutf8LookupString to support international
+ characters under alternate codepages. Patch from #340878
+
2007-12-06 Carlos Alberto Cortez <[EMAIL PROTECTED]>
* ListView.cs: When doing layout computations, set position in the
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/X11Keyboard.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/X11Keyboard.cs
2007-12-07 02:47:25 UTC (rev 90890)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/X11Keyboard.cs
2007-12-07 03:38:59 UTC (rev 90891)
@@ -695,7 +695,7 @@
status = IntPtr.Zero;
lookup_buffer.Length = 0;
if (xic != IntPtr.Zero)
- res = XmbLookupString (xic, ref xevent,
lookup_buffer, len, out keysym_res, out status);
+ res = Xutf8LookupString (xic, ref xevent,
lookup_buffer, len, out keysym_res, out status);
else
res = XLookupString (ref xevent, lookup_buffer,
len, out keysym_res, IntPtr.Zero);
@@ -724,13 +724,13 @@
[DllImport ("libX11")]
internal extern static int XLookupString(ref XEvent xevent,
StringBuilder buffer, int num_bytes, out IntPtr keysym, IntPtr status);
[DllImport ("libX11")]
- internal extern static int XmbLookupString(IntPtr xic, ref
XEvent xevent, StringBuilder buffer, int num_bytes, out IntPtr keysym, out
IntPtr status);
+ internal extern static int Xutf8LookupString(IntPtr xic, ref
XEvent xevent, StringBuilder buffer, int num_bytes, out IntPtr keysym, out
IntPtr status);
- internal static int XmbLookupString (IntPtr xic, ref XEvent
xevent, StringBuilder buffer, int num_bytes, out XKeySym keysym, out IntPtr
status) {
+ internal static int Xutf8LookupString (IntPtr xic, ref XEvent
xevent, StringBuilder buffer, int num_bytes, out XKeySym keysym, out IntPtr
status) {
IntPtr keysym_ret;
int ret;
- ret = XmbLookupString (xic, ref xevent, buffer,
num_bytes, out keysym_ret, out status);
+ ret = Xutf8LookupString (xic, ref xevent, buffer,
num_bytes, out keysym_ret, out status);
keysym = (XKeySym)keysym_ret.ToInt32();
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
