Author: toshok
Date: 2006-12-05 13:36:01 -0500 (Tue, 05 Dec 2006)
New Revision: 69061
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/X11Display.cs
Log:
2006-12-05 Chris Toshok <[EMAIL PROTECTED]>
* X11Display.cs: fix some compiler warnings, and also re-include
the autorepeat event filtering from XplatUIX11.cs.
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/ChangeLog
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/ChangeLog
2006-12-05 18:35:11 UTC (rev 69060)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/ChangeLog
2006-12-05 18:36:01 UTC (rev 69061)
@@ -1,3 +1,8 @@
+2006-12-05 Chris Toshok <[EMAIL PROTECTED]>
+
+ * X11Display.cs: fix some compiler warnings, and also re-include
+ the autorepeat event filtering from XplatUIX11.cs.
+
2006-12-01 Chris Toshok <[EMAIL PROTECTED]>
* X11Hwnd.cs: need to mark queue as "new" to quiet mcs.
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/X11Display.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/X11Display.cs
2006-12-05 18:35:11 UTC (rev 69060)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/X11Display.cs
2006-12-05 18:36:01 UTC (rev 69061)
@@ -1260,6 +1260,7 @@
Grab.Confined = false;
}
+#if notyet
private void TranslatePropertyToClipboard (IntPtr property)
{
IntPtr actual_atom;
@@ -1290,6 +1291,7 @@
Xlib.XFree(prop);
}
}
+#endif
// XXX should we be using @handle instead of Atoms.CLIPBOARD
here?
public int[] ClipboardAvailableFormats (IntPtr handle)
@@ -1728,6 +1730,23 @@
XEvent xevent = new XEvent ();
Xlib.XNextEvent (display, ref xevent);
+ // this is kind of a gross place to put
this, but we don't know about the
+ // key repeat state in X11ThreadQueue,
nor to we want the queue code calling
+ // XPeekEvent.
+ if (!detectable_key_auto_repeat &&
+ xevent.type ==
XEventName.KeyRelease &&
+ Xlib.XPending (display) > 0) {
+
+ XEvent nextevent = new XEvent
();
+ Xlib.XPeekEvent (display, ref
nextevent);
+
+ if (nextevent.type ==
XEventName.KeyPress &&
+ nextevent.KeyEvent.keycode
== xevent.KeyEvent.keycode &&
+ nextevent.KeyEvent.time ==
xevent.KeyEvent.time) {
+ continue;
+ }
+ }
+
X11Hwnd hwnd =
(X11Hwnd)Hwnd.GetObjectFromWindow(xevent.AnyEvent.window);
if (hwnd != null)
hwnd.Queue.Enqueue (xevent);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
