This is the mail archive of the
cygwin-xfree@cygwin.com
mailing list for the Cygwin XFree86 project.
Xaw - Problems with keyboard focus easy to fix (Doh!)
- From: Harold L Hunt II <huntharo at msu dot edu>
- To: cygx <cygwin-xfree at cygwin dot com>
- Date: Mon, 17 Nov 2003 14:37:03 -0500
- Subject: Xaw - Problems with keyboard focus easy to fix (Doh!)
- Reply-to: cygwin-xfree at cygwin dot com
There is a fix in the Xaw library for fixing the VendorShell, just as in
LessTif. I simply enabled a Windows-specific version of this fix based
off of Zhangrong Huang's LessTif fix.
The patch is attached. I did a build test of this and ran a
non-recompiled xterm.exe against it: keyboard focus worked without the
mouse pointer being in the xterm window.
I'd like to get this released quickly, but I have to work for the moment.
Harold
Index: Vendor.c
===================================================================
RCS file: /cvs/xc/lib/Xaw/Vendor.c,v
retrieving revision 1.9
diff -u -r1.9 Vendor.c
--- Vendor.c 31 May 2002 18:45:44 -0000 1.9
+++ Vendor.c 17 Nov 2003 19:33:56 -0000
@@ -111,11 +111,13 @@
*
***************************************************************************/
-#ifdef __UNIXOS2__
+#if defined(__UNIXOS2__) || defined(__CYGWIN__)
/* to fix the EditRes problem because of wrong linker semantics */
extern WidgetClass vendorShellWidgetClass; /* from Xt/Vendor.c */
extern VendorShellClassRec _XawVendorShellClassRec;
extern void _XawFixupVendorShell();
+
+#if defined(__UNIXOS2__)
unsigned long _DLL_InitTerm(unsigned long mod,unsigned long flag)
{
switch (flag) {
@@ -130,6 +132,25 @@
return 0;
}
}
+#endif
+
+#if defined(__CYGWIN__)
+int __stdcall
+DllMain(unsigned long mod_handle, unsigned long flag, void *routine)
+{
+ switch (flag)
+ {
+ case 1: /* DLL_PROCESS_ATTACH - process attach */
+ vendorShellWidgetClass = (WidgetClass)(&_XawVendorShellClassRec);
+ _XawFixupVendorShell();
+ break;
+ case 0: /* DLL_PROCESS_DETACH - process detach */
+ break;
+ }
+ return 1;
+}
+#endif
+
#define vendorShellClassRec _XawVendorShellClassRec
#endif
@@ -337,7 +358,7 @@
}
}
-#if defined(__osf__) || defined(__UNIXOS2__)
+#if defined(__osf__) || defined(__UNIXOS2__) || defined(__CYGWIN__)
/* stupid OSF/1 shared libraries have the wrong semantics */
/* symbols do not get resolved external to the shared library */
void _XawFixupVendorShell()