wxDC::SetFont can now handle invalid font and doesn't assert anymore (other ports...

[wxWidgets.git] / src / motif / utils.cpp

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 1e026d61b376a2b8f7b9319f1c1cd7b565a02d1d..9f6ed67e35324661f01c31c2ea15611c891a352c 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -6,13 +6,19 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-// Note: this is done in utilscmn.cpp now.
-// #pragma implementation
-// #pragma implementation "utils.h"
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#ifdef __VMS
+#define XtDisplay XTDISPLAY

 #endif
 
 #include "wx/setup.h"
 #endif
 
 #include "wx/setup.h"


@@ -20,6 +26,7 @@
 #include "wx/app.h"
 #include "wx/msgdlg.h"
 #include "wx/cursor.h"
 #include "wx/app.h"
 #include "wx/msgdlg.h"
 #include "wx/cursor.h"

+#include "wx/window.h" // for wxTopLevelWindows

 
 #include <ctype.h>
 #include <stdarg.h>
 
 #include <ctype.h>
 #include <stdarg.h>


@@ -34,147 +41,53 @@
 #include <netdb.h>
 #include <signal.h>
 
 #include <netdb.h>
 #include <signal.h>
 

-#if defined(__SVR4__) && !defined(__HPUX__)
-#include <sys/systeminfo.h>
-#endif
-

 #if (defined(__SUNCC__) || defined(__CLCC__))
 #if (defined(__SUNCC__) || defined(__CLCC__))

-#include <sysent.h>
+    #include <sysent.h>

 #endif
 
 #endif
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <Xm/Xm.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
+
+#include "wx/unix/execute.h"

 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+

 // Yuck this is really BOTH site and platform dependent
 // so we should use some other strategy!
 #ifdef sun
 // Yuck this is really BOTH site and platform dependent
 // so we should use some other strategy!
 #ifdef sun

-# define DEFAULT_XRESOURCE_DIR "/usr/openwin/lib/app-defaults"
+    #define DEFAULT_XRESOURCE_DIR "/usr/openwin/lib/app-defaults"

 #else
 #else

-# define DEFAULT_XRESOURCE_DIR "/usr/lib/X11/app-defaults"
+    #define DEFAULT_XRESOURCE_DIR "/usr/lib/X11/app-defaults"

 #endif
 
 static char *GetIniFile (char *dest, const char *filename);
 
 #endif
 
 static char *GetIniFile (char *dest, const char *filename);
 

-extern wxList wxTopLevelWindows;
-
-// Get full hostname (eg. DoDo.BSn-Germany.crg.de)
-bool wxGetHostName(char *buf, int maxSize)
-{
-#if defined(__SVR4__) && !defined(__HPUX__)
-    return (sysinfo (SI_HOSTNAME, buf, maxSize) != -1);
-#else /* BSD Sockets */
-    char name[255];
-    struct hostent *h;
-    
-    // Get hostname
-    if (gethostname (name, sizeof (name) / sizeof (char) - 1) == -1)
-        return FALSE;
-    // Get official full name of host
-    strncpy (buf
-        ,(h = gethostbyname (name)) != NULL ? h->h_name : name
-        ,maxSize - 1);
-    return TRUE;
-#endif
-}
-
-// Get user ID e.g. jacs
-bool wxGetUserId(char *buf, int maxSize)
-{
-#ifdef VMS
-    *buf = '\0'; // return empty string
-    return FALSE;
-#else
-    struct passwd *who;
-    
-    if ((who = getpwuid (getuid ())) != NULL)
-    {
-        strncpy (buf, who->pw_name, maxSize - 1);
-        return TRUE;
-    }
-    return FALSE;
-#endif
-}
-
-// Get user name e.g. Julian Smart
-bool wxGetUserName(char *buf, int maxSize)
-{
-#ifdef VMS
-    *buf = '\0'; // return empty string
-    return FALSE;
-#else
-    struct passwd *who;
-    
-    if ((who = getpwuid (getuid ())) != NULL)
-    {
-        strncpy (buf, who->pw_gecos, maxSize - 1);
-        return TRUE;
-    }
-    return FALSE;
-#endif
-}
-
-int wxKill(long pid, int sig)
-{
-    int unixSignal = 0;
-    switch (sig)
-    {
-    case wxSIGTERM:
-    default:
-        unixSignal = SIGTERM;
-    }
-    return kill( (int)pid, unixSignal);
-}
-
-//
-// Execute a program in an Interactive Shell
-//
-bool wxShell(const wxString& command)
-{
-#ifdef VMS
-    return(FALSE);
-#else
-#if defined(sun) || defined(__ultrix) || defined(__bsdi__)
-    pid_t pid = vfork ();
-#else
-    pid_t pid = fork ();
-#endif
-    switch( pid ) {
-    case -1:                   /* error */
-        return(FALSE);
-    case 0:                    /* child */
-        // Generic X windows terminal window
-        if (command != "")
-            execlp("xterm", "-e", (char *) (const char*) command, NULL);
-        else
-            execlp("xterm", NULL);
-        _exit(127);
-    }
-    return TRUE;
-#endif
-    // End VMS
-}
-
-// Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
-long wxGetFreeMemory()
-{
-    return -1;
-}
+// ============================================================================
+// implementation
+// ============================================================================

 
 

-void wxSleep(int nSecs)
-{
-    sleep(nSecs);
-}
+// ----------------------------------------------------------------------------
+// async event processing
+// ----------------------------------------------------------------------------

 
 // Consume all events until no more left
 void wxFlushEvents()
 {
     Display *display = (Display*) wxGetDisplay();
 
 // Consume all events until no more left
 void wxFlushEvents()
 {
     Display *display = (Display*) wxGetDisplay();

-    
+

     XSync (display, FALSE);
     XSync (display, FALSE);

-    XEvent event;
+

     // XtAppPending returns availability of events AND timers/inputs, which
     // XtAppPending returns availability of events AND timers/inputs, which

-    // are processed via callbacks, so XtAppNextEvent will not return if 
+    // are processed via callbacks, so XtAppNextEvent will not return if

     // there are no events. So added '& XtIMXEvent' - Sergey.
     while (XtAppPending ((XtAppContext) wxTheApp->GetAppContext()) & XtIMXEvent)
     {
     // there are no events. So added '& XtIMXEvent' - Sergey.
     while (XtAppPending ((XtAppContext) wxTheApp->GetAppContext()) & XtIMXEvent)
     {


@@ -184,36 +97,70 @@ void wxFlushEvents()
     }
 }
 
     }
 }
 

-// Output a debug message, in a system dependent fashion.
-void wxDebugMsg(const char *fmt ...)
+// Check whether this window wants to process messages, e.g. Stop button
+// in long calculations.
+bool wxCheckForInterrupt(wxWindow *wnd)

 {
 {

-    va_list ap;
-    char buffer[BUFSIZ];
-    
-    if (!wxTheApp->GetWantDebugOutput())
-        return ;
-    
-    va_start (ap, fmt);
-    
-    vsprintf (buffer, fmt, ap);
-    cerr << buffer;
-    
-    va_end (ap);
+    wxCHECK_MSG( wnd, FALSE, "NULL window in wxCheckForInterrupt" );
+
+    Display *dpy=(Display*) wnd->GetXDisplay();
+    Window win=(Window) wnd->GetXWindow();
+    XEvent event;
+    XFlush(dpy);
+    if (wnd->GetMainWidget())
+    {
+        XmUpdateDisplay((Widget)(wnd->GetMainWidget()));
+    }
+
+    bool hadEvents = FALSE;
+    while( XCheckMaskEvent(dpy,
+                           ButtonPressMask|ButtonReleaseMask|ButtonMotionMask|
+                           PointerMotionMask|KeyPressMask|KeyReleaseMask,
+                           &event) )
+    {
+        if ( event.xany.window == win )
+        {
+            hadEvents = TRUE;
+
+            XtDispatchEvent(&event);
+        }
+    }
+
+    return hadEvents;

 }
 
 }
 

-// Non-fatal error: pop up message box and (possibly) continue
-void wxError(const wxString& msg, const wxString& title)
+// ----------------------------------------------------------------------------
+// wxExecute stuff
+// ----------------------------------------------------------------------------
+
+static void xt_notify_end_process(XtPointer data, int *WXUNUSED(fid),
+                                  XtInputId *id)

 {
 {

-    cerr << (const char*) title << ": " << (const char*) msg << "\n";
+    wxEndProcessData *proc_data = (wxEndProcessData *)data;
+
+    wxHandleProcessTermination(proc_data);
+
+    // VZ: I think they should be the same...
+    wxASSERT( (int)*id == proc_data->tag );
+
+    XtRemoveInput(*id);

 }
 
 }
 

-// Fatal error: pop up message box and abort
-void wxFatalError(const wxString& msg, const wxString& title)
+int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)

 {
 {

-    cerr << (const char*) title << ": " << (const char*) msg << "\n";
-    exit (1);
+    XtInputId id = XtAppAddInput((XtAppContext) wxTheApp->GetAppContext(),
+                                 fd,
+                                 (XtPointer *) XtInputReadMask,
+                                 (XtInputCallbackProc) xt_notify_end_process,
+                                 (XtPointer) proc_data);
+
+    return (int)id;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// misc
+// ----------------------------------------------------------------------------
+

 // Emit a beeeeeep
 void wxBell()
 {
 // Emit a beeeeeep
 void wxBell()
 {


@@ -223,19 +170,53 @@ void wxBell()
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {

-    // TODO
+    // FIXME TODO

     // This code is WRONG!! Does NOT return the
     // Motif version of the libs but the X protocol
     // This code is WRONG!! Does NOT return the
     // Motif version of the libs but the X protocol

-    // version! @@@@@ Fix ME!!!!!!!!!
+    // version!

     Display *display = XtDisplay ((Widget) wxTheApp->GetTopLevelWidget());
     if (majorVsn)
         *majorVsn = ProtocolVersion (display);
     if (minorVsn)
         *minorVsn = ProtocolRevision (display);
     Display *display = XtDisplay ((Widget) wxTheApp->GetTopLevelWidget());
     if (majorVsn)
         *majorVsn = ProtocolVersion (display);
     if (minorVsn)
         *minorVsn = ProtocolRevision (display);

+

     return wxMOTIF_X;
 }
 
     return wxMOTIF_X;
 }
 

+// ----------------------------------------------------------------------------

 // Reading and writing resources (eg WIN.INI, .Xdefaults)
 // Reading and writing resources (eg WIN.INI, .Xdefaults)

+// ----------------------------------------------------------------------------
+
+// Read $HOME for what it says is home, if not
+// read $USER or $LOGNAME for user name else determine
+// the Real User, then determine the Real home dir.
+static char * GetIniFile (char *dest, const char *filename)
+{
+    char *home = NULL;
+    if (filename && wxIsAbsolutePath(filename))
+    {
+        strcpy(dest, filename);
+    }
+    else if ((home = wxGetUserHome("")) != NULL)
+    {
+        strcpy(dest, home);
+        if (dest[strlen(dest) - 1] != '/')
+            strcat (dest, "/");
+        if (filename == NULL)
+        {
+            if ((filename = getenv ("XENVIRONMENT")) == NULL)
+                filename = ".Xdefaults";
+        }
+        else if (*filename != '.')
+            strcat (dest, ".");
+        strcat (dest, filename);
+    } else
+    {
+        dest[0] = '\0';
+    }
+    return dest;
+}
+

 #if wxUSE_RESOURCES
 
 static char *GetResourcePath(char *buf, const char *name, bool create = FALSE)
 #if wxUSE_RESOURCES
 
 static char *GetResourcePath(char *buf, const char *name, bool create = FALSE)


@@ -244,7 +225,7 @@ static char *GetResourcePath(char *buf, const char *name, bool create = FALSE)
         strcpy(buf, name);
         return buf; // Exists so ...
     }
         strcpy(buf, name);
         return buf; // Exists so ...
     }

-    
+

     if (*name == '/')
         strcpy(buf, name);
     else {
     if (*name == '/')
         strcpy(buf, name);
     else {


@@ -253,7 +234,7 @@ static char *GetResourcePath(char *buf, const char *name, bool create = FALSE)
         strcat (buf, "/");
         strcat (buf, (const char*) wxFileNameFromPath (name));
     }
         strcat (buf, "/");
         strcat (buf, (const char*) wxFileNameFromPath (name));
     }

-    
+

     if (create) {
         // Touch the file to create it
         FILE *fd = fopen (buf, "w");
     if (create) {
         // Touch the file to create it
         FILE *fd = fopen (buf, "w");


@@ -271,18 +252,18 @@ static char *GetResourcePath(char *buf, const char *name, bool create = FALSE)
 
 wxList wxResourceCache (wxKEY_STRING);
 
 
 wxList wxResourceCache (wxKEY_STRING);
 

-void 
+void

 wxFlushResources (void)
 {
     char nameBuffer[512];
 wxFlushResources (void)
 {
     char nameBuffer[512];

-    
+

     wxNode *node = wxResourceCache.First ();
     while (node)
     {
         const char *file = node->GetKeyString();
         // If file doesn't exist, create it first.
         (void)GetResourcePath(nameBuffer, file, TRUE);
     wxNode *node = wxResourceCache.First ();
     while (node)
     {
         const char *file = node->GetKeyString();
         // If file doesn't exist, create it first.
         (void)GetResourcePath(nameBuffer, file, TRUE);

-        
+

         XrmDatabase database = (XrmDatabase) node->Data ();
         XrmPutFileDatabase (database, nameBuffer);
         XrmDestroyDatabase (database);
         XrmDatabase database = (XrmDatabase) node->Data ();
         XrmPutFileDatabase (database, nameBuffer);
         XrmDestroyDatabase (database);


@@ -299,9 +280,9 @@ void wxXMergeDatabases (wxApp * theApp, Display * display);
 bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
 {
     char buffer[500];
 bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
 {
     char buffer[500];

-    
+

     (void) GetIniFile (buffer, file);
     (void) GetIniFile (buffer, file);

-    
+

     XrmDatabase database;
     wxNode *node = wxResourceCache.Find (buffer);
     if (node)
     XrmDatabase database;
     wxNode *node = wxResourceCache.Find (buffer);
     if (node)


@@ -311,12 +292,12 @@ bool wxWriteResource(const wxString& section, const wxString& entry, const wxStr
         database = XrmGetFileDatabase (buffer);
         wxResourceCache.Append (buffer, (wxObject *) database);
     }
         database = XrmGetFileDatabase (buffer);
         wxResourceCache.Append (buffer, (wxObject *) database);
     }

-    
+

     char resName[300];
     strcpy (resName, (const char*) section);
     strcat (resName, ".");
     strcat (resName, (const char*) entry);
     char resName[300];
     strcpy (resName, (const char*) section);
     strcat (resName, ".");
     strcat (resName, (const char*) entry);

-    
+

     XrmPutStringResource (&database, resName, value);
     return TRUE;
 }
     XrmPutStringResource (&database, resName, value);
     return TRUE;
 }


@@ -349,17 +330,17 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
         Display *display = (Display*) wxGetDisplay();
         wxXMergeDatabases (wxTheApp, display);
     }
         Display *display = (Display*) wxGetDisplay();
         wxXMergeDatabases (wxTheApp, display);
     }

-    
+

     XrmDatabase database;
     XrmDatabase database;

-    
+

     if (file != "")
     {
         char buffer[500];
     if (file != "")
     {
         char buffer[500];

-        
+

         // Is this right? Trying to get it to look in the user's
         // home directory instead of current directory -- JACS
         (void) GetIniFile (buffer, file);
         // Is this right? Trying to get it to look in the user's
         // home directory instead of current directory -- JACS
         (void) GetIniFile (buffer, file);

-        
+

         wxNode *node = wxResourceCache.Find (buffer);
         if (node)
             database = (XrmDatabase) node->Data ();
         wxNode *node = wxResourceCache.Find (buffer);
         if (node)
             database = (XrmDatabase) node->Data ();


@@ -371,14 +352,14 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
     }
     else
         database = wxResourceDatabase;
     }
     else
         database = wxResourceDatabase;

-    
+

     XrmValue xvalue;
     char *str_type[20];
     char buf[150];
     strcpy (buf, section);
     strcat (buf, ".");
     strcat (buf, entry);
     XrmValue xvalue;
     char *str_type[20];
     char buf[150];
     strcpy (buf, section);
     strcat (buf, ".");
     strcat (buf, entry);

-    
+

     Bool success = XrmGetResource (database, buf, "*", str_type,
         &xvalue);
     // Try different combinations of upper/lower case, just in case...
     Bool success = XrmGetResource (database, buf, "*", str_type,
         &xvalue);
     // Try different combinations of upper/lower case, just in case...


@@ -392,7 +373,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
     {
         if (*value)
             delete[] *value;
     {
         if (*value)
             delete[] *value;

-        
+

         *value = new char[xvalue.size + 1];
         strncpy (*value, xvalue.addr, (int) xvalue.size);
         return TRUE;
         *value = new char[xvalue.size + 1];
         strncpy (*value, xvalue.addr, (int) xvalue.size);
         return TRUE;


@@ -433,7 +414,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
     if (succ)
     {
         // Handle True, False here
     if (succ)
     {
         // Handle True, False here

-        // True, Yes, Enables, Set or  Activated 
+        // True, Yes, Enables, Set or  Activated

         if (*s == 'T' || *s == 'Y' || *s == 'E' || *s == 'S' || *s == 'A')
             *value = TRUE;
         // False, No, Disabled, Reset, Cleared, Deactivated
         if (*s == 'T' || *s == 'Y' || *s == 'E' || *s == 'S' || *s == 'A')
             *value = TRUE;
         // False, No, Disabled, Reset, Cleared, Deactivated


@@ -453,24 +434,24 @@ void wxXMergeDatabases (wxApp * theApp, Display * display)
 {
     XrmDatabase homeDB, serverDB, applicationDB;
     char filenamebuf[1024];
 {
     XrmDatabase homeDB, serverDB, applicationDB;
     char filenamebuf[1024];

-    
+

     char *filename = &filenamebuf[0];
     char *environment;
     wxString classname = theApp->GetClassName();
     char name[256];
     (void) strcpy (name, "/usr/lib/X11/app-defaults/");
     (void) strcat (name, (const char*) classname);
     char *filename = &filenamebuf[0];
     char *environment;
     wxString classname = theApp->GetClassName();
     char name[256];
     (void) strcpy (name, "/usr/lib/X11/app-defaults/");
     (void) strcat (name, (const char*) classname);

-    
+

     /* Get application defaults file, if any */
     applicationDB = XrmGetFileDatabase (name);
     (void) XrmMergeDatabases (applicationDB, &wxResourceDatabase);
     /* Get application defaults file, if any */
     applicationDB = XrmGetFileDatabase (name);
     (void) XrmMergeDatabases (applicationDB, &wxResourceDatabase);

-    
+

     /* Merge server defaults, created by xrdb, loaded as a property of the root
     * window when the server initializes and loaded into the display
     * structure on XOpenDisplay;
     * if not defined, use .Xdefaults
     */
     /* Merge server defaults, created by xrdb, loaded as a property of the root
     * window when the server initializes and loaded into the display
     * structure on XOpenDisplay;
     * if not defined, use .Xdefaults
     */

-    
+

     if (XResourceManagerString (display) != NULL)
     {
         serverDB = XrmGetStringDatabase (XResourceManagerString (display));
     if (XResourceManagerString (display) != NULL)
     {
         serverDB = XrmGetStringDatabase (XResourceManagerString (display));


@@ -481,21 +462,19 @@ void wxXMergeDatabases (wxApp * theApp, Display * display)
         serverDB = XrmGetFileDatabase (filename);
     }
     XrmMergeDatabases (serverDB, &wxResourceDatabase);
         serverDB = XrmGetFileDatabase (filename);
     }
     XrmMergeDatabases (serverDB, &wxResourceDatabase);

-    
+

     /* Open XENVIRONMENT file, or if not defined, the .Xdefaults,
     * and merge into existing database
     */
     /* Open XENVIRONMENT file, or if not defined, the .Xdefaults,
     * and merge into existing database
     */

-    
+

     if ((environment = getenv ("XENVIRONMENT")) == NULL)
     {
         size_t len;
         environment = GetIniFile (filename, NULL);
         len = strlen (environment);
     if ((environment = getenv ("XENVIRONMENT")) == NULL)
     {
         size_t len;
         environment = GetIniFile (filename, NULL);
         len = strlen (environment);

-#if defined(__SVR4__) && !defined(__HPUX__)
-        (void) sysinfo (SI_HOSTNAME, environment + len, 1024 - len);
-#else
-        (void) gethostname (environment + len, 1024 - len);
-#endif
+        wxString hostname = wxGetHostName();
+        if ( !!hostname )
+            strncat(environment, hostname, 1024 - len);

     }
     homeDB = XrmGetFileDatabase (environment);
     XrmMergeDatabases (homeDB, &wxResourceDatabase);
     }
     homeDB = XrmGetFileDatabase (environment);
     XrmMergeDatabases (homeDB, &wxResourceDatabase);


@@ -507,30 +486,30 @@ void wxXMergeDatabases (wxApp * theApp, Display * display)
 * Not yet used but may be useful.
 *
 */
 * Not yet used but may be useful.
 *
 */

-void 
+void

 wxSetDefaultResources (const Widget w, const char **resourceSpec, const char *name)
 {
     int i;
 wxSetDefaultResources (const Widget w, const char **resourceSpec, const char *name)
 {
     int i;

-    Display *dpy = XtDisplay (w);      // Retrieve the display pointer
-    
-    XrmDatabase rdb = NULL;    // A resource data base
-    
+    Display *dpy = XtDisplay (w);    // Retrieve the display pointer
+
+    XrmDatabase rdb = NULL;    // A resource data base
+

     // Create an empty resource database
     rdb = XrmGetStringDatabase ("");
     // Create an empty resource database
     rdb = XrmGetStringDatabase ("");

-    
+

     // Add the Component resources, prepending the name of the component
     // Add the Component resources, prepending the name of the component

-    
+

     i = 0;
     while (resourceSpec[i] != NULL)
     {
         char buf[1000];
     i = 0;
     while (resourceSpec[i] != NULL)
     {
         char buf[1000];

-        
+

         sprintf (buf, "*%s%s", name, resourceSpec[i++]);
         XrmPutLineResource (&rdb, buf);
     }
         sprintf (buf, "*%s%s", name, resourceSpec[i++]);
         XrmPutLineResource (&rdb, buf);
     }

-    
+

     // Merge them into the Xt database, with lowest precendence
     // Merge them into the Xt database, with lowest precendence

-    
+

     if (rdb)
     {
 #if (XlibSpecificationRelease>=5)
     if (rdb)
     {
 #if (XlibSpecificationRelease>=5)


@@ -547,17 +526,24 @@ wxSetDefaultResources (const Widget w, const char **resourceSpec, const char *na
 
 #endif // wxUSE_RESOURCES
 
 
 #endif // wxUSE_RESOURCES
 

+// ----------------------------------------------------------------------------
+// busy cursor stuff
+// ----------------------------------------------------------------------------
+

 static int wxBusyCursorCount = 0;
 
 // Helper function
 static int wxBusyCursorCount = 0;
 
 // Helper function

-static void 
+static void

 wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
 {
     Display *display = (Display*) win->GetXDisplay();
 wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
 {
     Display *display = (Display*) win->GetXDisplay();

-    
+

     Window xwin = (Window) win->GetXWindow();
     Window xwin = (Window) win->GetXWindow();

+    if (!xwin)
+       return;
+

     XSetWindowAttributes attrs;
     XSetWindowAttributes attrs;

-    
+

     if (cursor)
     {
         attrs.cursor = (Cursor) cursor->GetXCursor(display);
     if (cursor)
     {
         attrs.cursor = (Cursor) cursor->GetXCursor(display);


@@ -565,16 +551,16 @@ wxXSetBusyCursor (wxWindow * win, wxCursor * cursor)
     else
     {
         // Restore old cursor
     else
     {
         // Restore old cursor

-        if (win->GetCursor()->Ok())
-            attrs.cursor = (Cursor) win->GetCursor()->GetXCursor(display);
+        if (win->GetCursor().Ok())
+            attrs.cursor = (Cursor) win->GetCursor().GetXCursor(display);

         else
             attrs.cursor = None;
     }
     if (xwin)
         XChangeWindowAttributes (display, xwin, CWCursor, &attrs);
         else
             attrs.cursor = None;
     }
     if (xwin)
         XChangeWindowAttributes (display, xwin, CWCursor, &attrs);

-    
+

     XFlush (display);
     XFlush (display);

-    
+

     for(wxNode *node = win->GetChildren().First (); node; node = node->Next())
     {
         wxWindow *child = (wxWindow *) node->Data ();
     for(wxNode *node = win->GetChildren().First (); node; node = node->Next())
     {
         wxWindow *child = (wxWindow *) node->Data ();


@@ -601,7 +587,7 @@ void wxEndBusyCursor()
 {
     if (wxBusyCursorCount == 0)
         return;
 {
     if (wxBusyCursorCount == 0)
         return;

-    
+

     wxBusyCursorCount--;
     if (wxBusyCursorCount == 0)
     {
     wxBusyCursorCount--;
     if (wxBusyCursorCount == 0)
     {


@@ -617,81 +603,22 @@ void wxEndBusyCursor()
 bool wxIsBusy()
 {
     return (wxBusyCursorCount > 0);
 bool wxIsBusy()
 {
     return (wxBusyCursorCount > 0);

-}    
-
-const char* wxGetHomeDir( wxString *home  )
-{
-    *home = wxGetUserHome( wxString() );
-    if (home->IsNull()) *home = "/";
-    return *home;
-};
-
-char *wxGetUserHome (const wxString& user)
-{
-#ifdef VMS
-    return(NULL);
-#else
-    struct passwd *who = NULL;
-    
-    if (user == "") {
-        register char *ptr;
-        
-        if ((ptr = getenv("HOME")) != NULL) 
-            return ptr;
-        if ((ptr = getenv("USER")) != NULL ||
-            (ptr = getenv("LOGNAME")) != NULL)
-        {
-            who = getpwnam( ptr );
-        }
-        // We now make sure the the user exists!
-        if (who == NULL)
-            who = getpwuid( getuid() );
-    } else
-        who = getpwnam ((const char*) user);
-    
-    return who ? who->pw_dir : (char*) NULL;
-#endif
-    // ifdef VMS

 }
 
 }
 

-// Check whether this window wants to process messages, e.g. Stop button
-// in long calculations.
-bool wxCheckForInterrupt(wxWindow *wnd)
-{
-    if(wnd){
-        Display *dpy=(Display*) wnd->GetXDisplay();
-        Window win=(Window) wnd->GetXWindow();
-        XEvent event;
-        XFlush(dpy);
-        if(wnd->GetMainWidget()){
-            XmUpdateDisplay((Widget)(wnd->GetMainWidget()));
-        }
-        while(XCheckMaskEvent(dpy,
-            ButtonPressMask|ButtonReleaseMask|ButtonMotionMask|
-            PointerMotionMask|KeyPressMask|KeyReleaseMask,
-            &event)){
-            if(event.xany.window==win)
-                XtDispatchEvent(&event);
-            //         else
-            //                 XBell(dpy,50);
-        }
-        return TRUE;//*** temporary?
-    }
-    else{
-        wxMessageBox("wnd==NULL !!!");
-        return FALSE;//*** temporary?
-    }
-}
+// ----------------------------------------------------------------------------
+// display info
+// ----------------------------------------------------------------------------

 
 void wxGetMousePosition( int* x, int* y )
 {
     XMotionEvent xev;
     Window root, child;
     XQueryPointer((Display*) wxGetDisplay(),
 
 void wxGetMousePosition( int* x, int* y )
 {
     XMotionEvent xev;
     Window root, child;
     XQueryPointer((Display*) wxGetDisplay(),

-        DefaultRootWindow((Display*) wxGetDisplay()), &root, &child,
-        &(xev.x_root), &(xev.y_root),
-        &(xev.x),      &(xev.y),
-        &(xev.state));
+                  DefaultRootWindow((Display*) wxGetDisplay()),
+                  &root, &child,
+                  &(xev.x_root), &(xev.y_root),
+                  &(xev.x),      &(xev.y),
+                  &(xev.state));

     *x = xev.x_root;
     *y = xev.y_root;
 };
     *x = xev.x_root;
     *y = xev.y_root;
 };


@@ -699,18 +626,14 @@ void wxGetMousePosition( int* x, int* y )
 // Return TRUE if we have a colour display
 bool wxColourDisplay()
 {
 // Return TRUE if we have a colour display
 bool wxColourDisplay()
 {

-    Display *dpy = (Display*) wxGetDisplay();
-    
-    if (DefaultDepth (dpy, DefaultScreen (dpy)) < 2)
-        return FALSE;
-    else
-        return TRUE;
+    return wxDisplayDepth() > 1;

 }
 
 // Returns depth of screen
 int wxDisplayDepth()
 {
     Display *dpy = (Display*) wxGetDisplay();
 }
 
 // Returns depth of screen
 int wxDisplayDepth()
 {
     Display *dpy = (Display*) wxGetDisplay();

+

     return DefaultDepth (dpy, DefaultScreen (dpy));
 }
 
     return DefaultDepth (dpy, DefaultScreen (dpy));
 }
 


@@ -718,12 +641,36 @@ int wxDisplayDepth()
 void wxDisplaySize(int *width, int *height)
 {
     Display *dpy = (Display*) wxGetDisplay();
 void wxDisplaySize(int *width, int *height)
 {
     Display *dpy = (Display*) wxGetDisplay();

-    
-    *width = DisplayWidth (dpy, DefaultScreen (dpy));
-    *height = DisplayHeight (dpy, DefaultScreen (dpy));
+
+    if ( width )
+        *width = DisplayWidth (dpy, DefaultScreen (dpy));
+    if ( height )
+        *height = DisplayHeight (dpy, DefaultScreen (dpy));
+}
+
+void wxDisplaySizeMM(int *width, int *height)
+{
+    Display *dpy = (Display*) wxGetDisplay();
+
+    if ( width )
+        *width = DisplayWidthMM(dpy, DefaultScreen (dpy));
+    if ( height )
+        *height = DisplayHeightMM(dpy, DefaultScreen (dpy));

 }
 
 }
 

-/* Configurable display in Motif */
+void wxClientDisplayRect(int *x, int *y, int *width, int *height)
+{
+    // This is supposed to return desktop dimensions minus any window
+    // manager panels, menus, taskbars, etc.  If there is a way to do that
+    // for this platform please fix this function, otherwise it defaults
+    // to the entire desktop.
+    if (x) *x = 0;
+    if (y) *y = 0;
+    wxDisplaySize(width, height);
+}
+
+
+// Configurable display in Motif

 static WXDisplay *gs_currentDisplay = NULL;
 static wxString gs_displayName;
 
 static WXDisplay *gs_currentDisplay = NULL;
 static wxString gs_displayName;
 


@@ -731,7 +678,7 @@ WXDisplay *wxGetDisplay()
 {
     if (gs_currentDisplay)
         return gs_currentDisplay;
 {
     if (gs_currentDisplay)
         return gs_currentDisplay;

-    
+

     if (wxTheApp && wxTheApp->GetTopLevelWidget())
         return XtDisplay ((Widget) wxTheApp->GetTopLevelWidget());
     else if (wxTheApp)
     if (wxTheApp && wxTheApp->GetTopLevelWidget())
         return XtDisplay ((Widget) wxTheApp->GetTopLevelWidget());
     else if (wxTheApp)


@@ -743,35 +690,37 @@ WXDisplay *wxGetDisplay()
 bool wxSetDisplay(const wxString& display_name)
 {
     gs_displayName = display_name;
 bool wxSetDisplay(const wxString& display_name)
 {
     gs_displayName = display_name;

-    
-    if (display_name.IsNull() || display_name.IsEmpty())
+
+    if ( !display_name )

     {
         gs_currentDisplay = NULL;
     {
         gs_currentDisplay = NULL;

+

         return TRUE;
     }
     else
     {
         Cardinal argc = 0;
         return TRUE;
     }
     else
     {
         Cardinal argc = 0;

-        
+

         Display *display = XtOpenDisplay((XtAppContext) wxTheApp->GetAppContext(),
             (const char*) display_name,
             (const char*) wxTheApp->GetAppName(),
             (const char*) wxTheApp->GetClassName(),
             NULL,
         Display *display = XtOpenDisplay((XtAppContext) wxTheApp->GetAppContext(),
             (const char*) display_name,
             (const char*) wxTheApp->GetAppName(),
             (const char*) wxTheApp->GetClassName(),
             NULL,

-# if XtSpecificationRelease < 5
-            0, &argc, NULL);
-# else
-        0, (int *)&argc, NULL);
-# endif
-        
+#if XtSpecificationRelease < 5
+            0, &argc,
+#else
+            0, (int *)&argc,
+#endif
+            NULL);
+

         if (display)
         {
             gs_currentDisplay = (WXDisplay*) display;
             return TRUE;
         if (display)
         {
             gs_currentDisplay = (WXDisplay*) display;
             return TRUE;

-        } else
+        }
+        else

             return FALSE;
     }
             return FALSE;
     }

-    return FALSE;

 }
 
 wxString wxGetDisplayName()
 }
 
 wxString wxGetDisplayName()


@@ -779,6 +728,15 @@ wxString wxGetDisplayName()
     return gs_displayName;
 }
 
     return gs_displayName;
 }
 

+wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
+{
+    return wxGenericFindWindowAtPoint(pt);
+}
+
+// ----------------------------------------------------------------------------
+// accelerators
+// ----------------------------------------------------------------------------
+

 // Find the letter corresponding to the mnemonic, for Motif
 char wxFindMnemonic (const char *s)
 {
 // Find the letter corresponding to the mnemonic, for Motif
 char wxFindMnemonic (const char *s)
 {


@@ -802,9 +760,14 @@ char wxFindMnemonic (const char *s)
     return mnem;
 }
 
     return mnem;
 }
 

-char * wxFindAccelerator (char *s)
+char * wxFindAccelerator (const char *s)

 {
 {

-    // The accelerator text is after the \t char.
+    // VZ: this function returns incorrect keysym which completely breaks kbd
+    //     handling
+    return NULL;
+
+#if 0
+   // The accelerator text is after the \t char.

     while (*s && *s != '\t')
         s++;
     if (*s == '\0')
     while (*s && *s != '\t')
         s++;
     if (*s == '\0')


@@ -812,21 +775,21 @@ char * wxFindAccelerator (char *s)
     s++;
     /*
     Now we need to format it as X standard:
     s++;
     /*
     Now we need to format it as X standard:

-    
+

       input            output
       input            output

-      
+

         F7           --> <Key>F7
         Ctrl+N       --> Ctrl<Key>N
         Alt+k        --> Meta<Key>k
         Ctrl+Shift+A --> Ctrl Shift<Key>A
         F7           --> <Key>F7
         Ctrl+N       --> Ctrl<Key>N
         Alt+k        --> Meta<Key>k
         Ctrl+Shift+A --> Ctrl Shift<Key>A

-        
+

     */
     */

-    
+

     wxBuffer[0] = '\0';
     char *tmp = copystring (s);
     s = tmp;
     wxBuffer[0] = '\0';
     char *tmp = copystring (s);
     s = tmp;

-    char *p = s;
-    
+    char *p = tmp;
+

     while (1)
     {
         while (*p && *p != '+')
     while (1)
     {
         while (*p && *p != '+')


@@ -840,8 +803,7 @@ char * wxFindAccelerator (char *s)
                 strcat (wxBuffer, s);
             else
                 strcat (wxBuffer, "Meta");
                 strcat (wxBuffer, s);
             else
                 strcat (wxBuffer, "Meta");

-            s = p + 1;
-            p = s;
+            s = p++;

         }
         else
         {
         }
         else
         {


@@ -852,293 +814,280 @@ char * wxFindAccelerator (char *s)
     }
     delete[]tmp;
     return wxBuffer;
     }
     delete[]tmp;
     return wxBuffer;

+#endif

 }
 
 }
 

-XmString wxFindAcceleratorText (char *s)
+XmString wxFindAcceleratorText (const char *s)

 {
 {

-    // The accelerator text is after the \t char.
+    // VZ: this function returns incorrect keysym which completely breaks kbd
+    //     handling
+    return NULL;
+
+#if 0
+   // The accelerator text is after the \t char.

     while (*s && *s != '\t')
         s++;
     if (*s == '\0')
         return (NULL);
     s++;
     while (*s && *s != '\t')
         s++;
     if (*s == '\0')
         return (NULL);
     s++;

-    XmString text = XmStringCreateSimple (s);
+    XmString text = XmStringCreateSimple ((char *)s);

     return text;
     return text;

+#endif

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// keycode translations
+// ----------------------------------------------------------------------------
+

 #include <X11/keysym.h>
 
 #include <X11/keysym.h>
 

+// FIXME what about tables??
+

 int wxCharCodeXToWX(KeySym keySym)
 {
     int id;
 int wxCharCodeXToWX(KeySym keySym)
 {
     int id;

-    switch (keySym) {
-    case XK_Shift_L:
-    case XK_Shift_R:
-        id = WXK_SHIFT; break;
-    case XK_Control_L:
-    case XK_Control_R:
-        id = WXK_CONTROL; break;
-    case XK_BackSpace:
-        id = WXK_BACK; break;
-    case XK_Delete:
-        id = WXK_DELETE; break;
-    case XK_Clear:
-        id = WXK_CLEAR; break;
-    case XK_Tab:
-        id = WXK_TAB; break;
-    case XK_numbersign:
-        id = '#'; break;
-    case XK_Return:
-        id = WXK_RETURN; break;
-    case XK_Escape:
-        id = WXK_ESCAPE; break;
-    case XK_Pause:
-    case XK_Break:
-        id = WXK_PAUSE; break;
-    case XK_Num_Lock:
-        id = WXK_NUMLOCK; break;
-    case XK_Scroll_Lock:
-        id = WXK_SCROLL; break;
-        
-    case XK_Home:
-        id = WXK_HOME; break;
-    case XK_End:
-        id = WXK_END; break;
-    case XK_Left:
-        id = WXK_LEFT; break;
-    case XK_Right:
-        id = WXK_RIGHT; break;
-    case XK_Up:
-        id = WXK_UP; break;
-    case XK_Down:
-        id = WXK_DOWN; break;
-    case XK_Next:
-        id = WXK_NEXT; break;
-    case XK_Prior:
-        id = WXK_PRIOR; break;
-    case XK_Menu:
-        id = WXK_MENU; break;
-    case XK_Select:
-        id = WXK_SELECT; break;
-    case XK_Cancel:
-        id = WXK_CANCEL; break;
-    case XK_Print:
-        id = WXK_PRINT; break;
-    case XK_Execute:
-        id = WXK_EXECUTE; break;
-    case XK_Insert:
-        id = WXK_INSERT; break;
-    case XK_Help:
-        id = WXK_HELP; break;
-        
-    case XK_KP_Multiply:
-        id = WXK_MULTIPLY; break;
-    case XK_KP_Add:
-        id = WXK_ADD; break;
-    case XK_KP_Subtract:
-        id = WXK_SUBTRACT; break;
-    case XK_KP_Divide:
-        id = WXK_DIVIDE; break;
-    case XK_KP_Decimal:
-        id = WXK_DECIMAL; break;
-    case XK_KP_Equal:
-        id = '='; break;
-    case XK_KP_Space:
-        id = ' '; break;
-    case XK_KP_Tab:
-        id = WXK_TAB; break;
-    case XK_KP_Enter:
-        id = WXK_RETURN; break;
-    case XK_KP_0:
-        id = WXK_NUMPAD0; break;
-    case XK_KP_1:
-        id = WXK_NUMPAD1; break;
-    case XK_KP_2:
-        id = WXK_NUMPAD2; break;
-    case XK_KP_3:
-        id = WXK_NUMPAD3; break;
-    case XK_KP_4:
-        id = WXK_NUMPAD4; break;
-    case XK_KP_5:
-        id = WXK_NUMPAD5; break;
-    case XK_KP_6:
-        id = WXK_NUMPAD6; break;
-    case XK_KP_7:
-        id = WXK_NUMPAD7; break;
-    case XK_KP_8:
-        id = WXK_NUMPAD8; break;
-    case XK_KP_9:
-        id = WXK_NUMPAD9; break;
-    case XK_F1:
-        id = WXK_F1; break;
-    case XK_F2:
-        id = WXK_F2; break;
-    case XK_F3:
-        id = WXK_F3; break;
-    case XK_F4:
-        id = WXK_F4; break;
-    case XK_F5:
-        id = WXK_F5; break;
-    case XK_F6:
-        id = WXK_F6; break;
-    case XK_F7:
-        id = WXK_F7; break;
-    case XK_F8:
-        id = WXK_F8; break;
-    case XK_F9:
-        id = WXK_F9; break;
-    case XK_F10:
-        id = WXK_F10; break;
-    case XK_F11:
-        id = WXK_F11; break;
-    case XK_F12:
-        id = WXK_F12; break;
-    case XK_F13:
-        id = WXK_F13; break;
-    case XK_F14:
-        id = WXK_F14; break;
-    case XK_F15:
-        id = WXK_F15; break;
-    case XK_F16:
-        id = WXK_F16; break;
-    case XK_F17:
-        id = WXK_F17; break;
-    case XK_F18:
-        id = WXK_F18; break;
-    case XK_F19:
-        id = WXK_F19; break;
-    case XK_F20:
-        id = WXK_F20; break;
-    case XK_F21:
-        id = WXK_F21; break;
-    case XK_F22:
-        id = WXK_F22; break;
-    case XK_F23:
-        id = WXK_F23; break;
-    case XK_F24:
-        id = WXK_F24; break;
-    default:
-        id = (keySym <= 255) ? (int)keySym : -1;
-  } // switch
-  return id;
+    switch (keySym)
+    {
+        case XK_Shift_L:
+        case XK_Shift_R:
+            id = WXK_SHIFT; break;
+        case XK_Control_L:
+        case XK_Control_R:
+            id = WXK_CONTROL; break;
+        case XK_BackSpace:
+            id = WXK_BACK; break;
+        case XK_Delete:
+            id = WXK_DELETE; break;
+        case XK_Clear:
+            id = WXK_CLEAR; break;
+        case XK_Tab:
+            id = WXK_TAB; break;
+        case XK_numbersign:
+            id = '#'; break;
+        case XK_Return:
+            id = WXK_RETURN; break;
+        case XK_Escape:
+            id = WXK_ESCAPE; break;
+        case XK_Pause:
+        case XK_Break:
+            id = WXK_PAUSE; break;
+        case XK_Num_Lock:
+            id = WXK_NUMLOCK; break;
+        case XK_Scroll_Lock:
+            id = WXK_SCROLL; break;
+
+        case XK_Home:
+            id = WXK_HOME; break;
+        case XK_End:
+            id = WXK_END; break;
+        case XK_Left:
+            id = WXK_LEFT; break;
+        case XK_Right:
+            id = WXK_RIGHT; break;
+        case XK_Up:
+            id = WXK_UP; break;
+        case XK_Down:
+            id = WXK_DOWN; break;
+        case XK_Next:
+            id = WXK_NEXT; break;
+        case XK_Prior:
+            id = WXK_PRIOR; break;
+        case XK_Menu:
+            id = WXK_MENU; break;
+        case XK_Select:
+            id = WXK_SELECT; break;
+        case XK_Cancel:
+            id = WXK_CANCEL; break;
+        case XK_Print:
+            id = WXK_PRINT; break;
+        case XK_Execute:
+            id = WXK_EXECUTE; break;
+        case XK_Insert:
+            id = WXK_INSERT; break;
+        case XK_Help:
+            id = WXK_HELP; break;
+
+        case XK_KP_Multiply:
+            id = WXK_MULTIPLY; break;
+        case XK_KP_Add:
+            id = WXK_ADD; break;
+        case XK_KP_Subtract:
+            id = WXK_SUBTRACT; break;
+        case XK_KP_Divide:
+            id = WXK_DIVIDE; break;
+        case XK_KP_Decimal:
+            id = WXK_DECIMAL; break;
+        case XK_KP_Equal:
+            id = '='; break;
+        case XK_KP_Space:
+            id = ' '; break;
+        case XK_KP_Tab:
+            id = WXK_TAB; break;
+        case XK_KP_Enter:
+            id = WXK_RETURN; break;
+        case XK_KP_0:
+            id = WXK_NUMPAD0; break;
+        case XK_KP_1:
+            id = WXK_NUMPAD1; break;
+        case XK_KP_2:
+            id = WXK_NUMPAD2; break;
+        case XK_KP_3:
+            id = WXK_NUMPAD3; break;
+        case XK_KP_4:
+            id = WXK_NUMPAD4; break;
+        case XK_KP_5:
+            id = WXK_NUMPAD5; break;
+        case XK_KP_6:
+            id = WXK_NUMPAD6; break;
+        case XK_KP_7:
+            id = WXK_NUMPAD7; break;
+        case XK_KP_8:
+            id = WXK_NUMPAD8; break;
+        case XK_KP_9:
+            id = WXK_NUMPAD9; break;
+        case XK_F1:
+            id = WXK_F1; break;
+        case XK_F2:
+            id = WXK_F2; break;
+        case XK_F3:
+            id = WXK_F3; break;
+        case XK_F4:
+            id = WXK_F4; break;
+        case XK_F5:
+            id = WXK_F5; break;
+        case XK_F6:
+            id = WXK_F6; break;
+        case XK_F7:
+            id = WXK_F7; break;
+        case XK_F8:
+            id = WXK_F8; break;
+        case XK_F9:
+            id = WXK_F9; break;
+        case XK_F10:
+            id = WXK_F10; break;
+        case XK_F11:
+            id = WXK_F11; break;
+        case XK_F12:
+            id = WXK_F12; break;
+        case XK_F13:
+            id = WXK_F13; break;
+        case XK_F14:
+            id = WXK_F14; break;
+        case XK_F15:
+            id = WXK_F15; break;
+        case XK_F16:
+            id = WXK_F16; break;
+        case XK_F17:
+            id = WXK_F17; break;
+        case XK_F18:
+            id = WXK_F18; break;
+        case XK_F19:
+            id = WXK_F19; break;
+        case XK_F20:
+            id = WXK_F20; break;
+        case XK_F21:
+            id = WXK_F21; break;
+        case XK_F22:
+            id = WXK_F22; break;
+        case XK_F23:
+            id = WXK_F23; break;
+        case XK_F24:
+            id = WXK_F24; break;
+        default:
+            id = (keySym <= 255) ? (int)keySym : -1;
+    }
+
+    return id;

 }
 
 KeySym wxCharCodeWXToX(int id)
 {
     KeySym keySym;
 }
 
 KeySym wxCharCodeWXToX(int id)
 {
     KeySym keySym;

-    
-    switch (id) {
-    case WXK_CANCEL:            keySym = XK_Cancel; break;
-    case WXK_BACK:              keySym = XK_BackSpace; break;
-    case WXK_TAB:              keySym = XK_Tab; break;
-    case WXK_CLEAR:            keySym = XK_Clear; break;
-    case WXK_RETURN:           keySym = XK_Return; break;
-    case WXK_SHIFT:            keySym = XK_Shift_L; break;
-    case WXK_CONTROL:          keySym = XK_Control_L; break;
-    case WXK_MENU :            keySym = XK_Menu; break;
-    case WXK_PAUSE:            keySym = XK_Pause; break;
-    case WXK_ESCAPE:           keySym = XK_Escape; break;
-    case WXK_SPACE:            keySym = ' '; break;
-    case WXK_PRIOR:            keySym = XK_Prior; break;
-    case WXK_NEXT :            keySym = XK_Next; break;
-    case WXK_END:              keySym = XK_End; break;
-    case WXK_HOME :            keySym = XK_Home; break;
-    case WXK_LEFT :            keySym = XK_Left; break;
-    case WXK_UP:               keySym = XK_Up; break;
-    case WXK_RIGHT:            keySym = XK_Right; break;
-    case WXK_DOWN :            keySym = XK_Down; break;
-    case WXK_SELECT:           keySym = XK_Select; break;
-    case WXK_PRINT:            keySym = XK_Print; break;
-    case WXK_EXECUTE:          keySym = XK_Execute; break;
-    case WXK_INSERT:           keySym = XK_Insert; break;
-    case WXK_DELETE:           keySym = XK_Delete; break;
-    case WXK_HELP :            keySym = XK_Help; break;
-    case WXK_NUMPAD0:          keySym = XK_KP_0; break;
-    case WXK_NUMPAD1:          keySym = XK_KP_1; break;
-    case WXK_NUMPAD2:          keySym = XK_KP_2; break;
-    case WXK_NUMPAD3:          keySym = XK_KP_3; break;
-    case WXK_NUMPAD4:          keySym = XK_KP_4; break;
-    case WXK_NUMPAD5:          keySym = XK_KP_5; break;
-    case WXK_NUMPAD6:          keySym = XK_KP_6; break;
-    case WXK_NUMPAD7:          keySym = XK_KP_7; break;
-    case WXK_NUMPAD8:          keySym = XK_KP_8; break;
-    case WXK_NUMPAD9:          keySym = XK_KP_9; break;
-    case WXK_MULTIPLY:         keySym = XK_KP_Multiply; break;
-    case WXK_ADD:              keySym = XK_KP_Add; break;
-    case WXK_SUBTRACT:         keySym = XK_KP_Subtract; break;
-    case WXK_DECIMAL:          keySym = XK_KP_Decimal; break;
-    case WXK_DIVIDE:           keySym = XK_KP_Divide; break;
-    case WXK_F1:               keySym = XK_F1; break;
-    case WXK_F2:               keySym = XK_F2; break;
-    case WXK_F3:               keySym = XK_F3; break;
-    case WXK_F4:               keySym = XK_F4; break;
-    case WXK_F5:               keySym = XK_F5; break;
-    case WXK_F6:               keySym = XK_F6; break;
-    case WXK_F7:               keySym = XK_F7; break;
-    case WXK_F8:               keySym = XK_F8; break;
-    case WXK_F9:               keySym = XK_F9; break;
-    case WXK_F10:              keySym = XK_F10; break;
-    case WXK_F11:              keySym = XK_F11; break;
-    case WXK_F12:              keySym = XK_F12; break;
-    case WXK_F13:              keySym = XK_F13; break;
-    case WXK_F14:              keySym = XK_F14; break;
-    case WXK_F15:              keySym = XK_F15; break;
-    case WXK_F16:              keySym = XK_F16; break;
-    case WXK_F17:              keySym = XK_F17; break;
-    case WXK_F18:              keySym = XK_F18; break;
-    case WXK_F19:              keySym = XK_F19; break;
-    case WXK_F20:              keySym = XK_F20; break;
-    case WXK_F21:              keySym = XK_F21; break;
-    case WXK_F22:              keySym = XK_F22; break;
-    case WXK_F23:              keySym = XK_F23; break;
-    case WXK_F24:              keySym = XK_F24; break;
-    case WXK_NUMLOCK:          keySym = XK_Num_Lock; break;
-    case WXK_SCROLL:           keySym = XK_Scroll_Lock; break;
-    default:                    keySym = id <= 255 ? (KeySym)id : 0;
-    } // switch
-    return keySym;
-}

 
 

-// Read $HOME for what it says is home, if not
-// read $USER or $LOGNAME for user name else determine
-// the Real User, then determine the Real home dir.
-static char * GetIniFile (char *dest, const char *filename)
-{
-    char *home = NULL;
-    if (filename && wxIsAbsolutePath(filename))
+    switch (id)

     {
     {

-        strcpy(dest, filename);
+        case WXK_CANCEL:            keySym = XK_Cancel; break;
+        case WXK_BACK:              keySym = XK_BackSpace; break;
+        case WXK_TAB:            keySym = XK_Tab; break;
+        case WXK_CLEAR:        keySym = XK_Clear; break;
+        case WXK_RETURN:        keySym = XK_Return; break;
+        case WXK_SHIFT:        keySym = XK_Shift_L; break;
+        case WXK_CONTROL:        keySym = XK_Control_L; break;
+        case WXK_MENU :        keySym = XK_Menu; break;
+        case WXK_PAUSE:        keySym = XK_Pause; break;
+        case WXK_ESCAPE:        keySym = XK_Escape; break;
+        case WXK_SPACE:        keySym = ' '; break;
+        case WXK_PRIOR:        keySym = XK_Prior; break;
+        case WXK_NEXT :        keySym = XK_Next; break;
+        case WXK_END:        keySym = XK_End; break;
+        case WXK_HOME :        keySym = XK_Home; break;
+        case WXK_LEFT :        keySym = XK_Left; break;
+        case WXK_UP:        keySym = XK_Up; break;
+        case WXK_RIGHT:        keySym = XK_Right; break;
+        case WXK_DOWN :        keySym = XK_Down; break;
+        case WXK_SELECT:        keySym = XK_Select; break;
+        case WXK_PRINT:        keySym = XK_Print; break;
+        case WXK_EXECUTE:        keySym = XK_Execute; break;
+        case WXK_INSERT:        keySym = XK_Insert; break;
+        case WXK_DELETE:        keySym = XK_Delete; break;
+        case WXK_HELP :        keySym = XK_Help; break;
+        case WXK_NUMPAD0:        keySym = XK_KP_0; break;
+        case WXK_NUMPAD1:        keySym = XK_KP_1; break;
+        case WXK_NUMPAD2:        keySym = XK_KP_2; break;
+        case WXK_NUMPAD3:        keySym = XK_KP_3; break;
+        case WXK_NUMPAD4:        keySym = XK_KP_4; break;
+        case WXK_NUMPAD5:        keySym = XK_KP_5; break;
+        case WXK_NUMPAD6:        keySym = XK_KP_6; break;
+        case WXK_NUMPAD7:        keySym = XK_KP_7; break;
+        case WXK_NUMPAD8:        keySym = XK_KP_8; break;
+        case WXK_NUMPAD9:        keySym = XK_KP_9; break;
+        case WXK_MULTIPLY:        keySym = XK_KP_Multiply; break;
+        case WXK_ADD:        keySym = XK_KP_Add; break;
+        case WXK_SUBTRACT:        keySym = XK_KP_Subtract; break;
+        case WXK_DECIMAL:        keySym = XK_KP_Decimal; break;
+        case WXK_DIVIDE:        keySym = XK_KP_Divide; break;
+        case WXK_F1:        keySym = XK_F1; break;
+        case WXK_F2:        keySym = XK_F2; break;
+        case WXK_F3:        keySym = XK_F3; break;
+        case WXK_F4:        keySym = XK_F4; break;
+        case WXK_F5:        keySym = XK_F5; break;
+        case WXK_F6:        keySym = XK_F6; break;
+        case WXK_F7:        keySym = XK_F7; break;
+        case WXK_F8:        keySym = XK_F8; break;
+        case WXK_F9:        keySym = XK_F9; break;
+        case WXK_F10:        keySym = XK_F10; break;
+        case WXK_F11:        keySym = XK_F11; break;
+        case WXK_F12:        keySym = XK_F12; break;
+        case WXK_F13:        keySym = XK_F13; break;
+        case WXK_F14:        keySym = XK_F14; break;
+        case WXK_F15:        keySym = XK_F15; break;
+        case WXK_F16:        keySym = XK_F16; break;
+        case WXK_F17:        keySym = XK_F17; break;
+        case WXK_F18:        keySym = XK_F18; break;
+        case WXK_F19:        keySym = XK_F19; break;
+        case WXK_F20:        keySym = XK_F20; break;
+        case WXK_F21:        keySym = XK_F21; break;
+        case WXK_F22:        keySym = XK_F22; break;
+        case WXK_F23:        keySym = XK_F23; break;
+        case WXK_F24:        keySym = XK_F24; break;
+        case WXK_NUMLOCK:    keySym = XK_Num_Lock; break;
+        case WXK_SCROLL:     keySym = XK_Scroll_Lock; break;
+        default:             keySym = id <= 255 ? (KeySym)id : 0;

     }
     }

-    else if ((home = wxGetUserHome("")) != NULL)
-    {
-        strcpy(dest, home);
-        if (dest[strlen(dest) - 1] != '/')
-            strcat (dest, "/");
-        if (filename == NULL)
-        {
-            if ((filename = getenv ("XENVIRONMENT")) == NULL)
-                filename = ".Xdefaults";
-        }
-        else if (*filename != '.')
-            strcat (dest, ".");
-        strcat (dest, filename);
-    } else
-    {
-        dest[0] = '\0';    
-    }
-    return dest;
+
+    return keySym;

 }
 
 }
 

-/*
-* Some colour manipulation routines
-*/
+// ----------------------------------------------------------------------------
+// Some colour manipulation routines
+// ----------------------------------------------------------------------------

 
 void wxHSVToXColor(wxHSV *hsv,XColor *rgb)
 {
     int h = hsv->h;
     int s = hsv->s;
     int v = hsv->v;
 
 void wxHSVToXColor(wxHSV *hsv,XColor *rgb)
 {
     int h = hsv->h;
     int s = hsv->s;
     int v = hsv->v;

-    int r, g, b;
+    int r = 0, g = 0, b = 0;

     int i, f;
     int p, q, t;
     s = (s * wxMAX_RGB) / wxMAX_SV;
     int i, f;
     int p, q, t;
     s = (s * wxMAX_RGB) / wxMAX_SV;


@@ -1150,7 +1099,7 @@ void wxHSVToXColor(wxHSV *hsv,XColor *rgb)
     p = v * (wxMAX_RGB - s) / wxMAX_RGB;
     q = v * (wxMAX_RGB - s * f / 60) / wxMAX_RGB;
     t = v * (wxMAX_RGB - s * (60 - f) / 60) / wxMAX_RGB;
     p = v * (wxMAX_RGB - s) / wxMAX_RGB;
     q = v * (wxMAX_RGB - s * f / 60) / wxMAX_RGB;
     t = v * (wxMAX_RGB - s * (60 - f) / 60) / wxMAX_RGB;

-    switch (i) 
+    switch (i)

     {
     case 0: r = v, g = t, b = p; break;
     case 1: r = q, g = v, b = p; break;
     {
     case 0: r = v, g = t, b = p; break;
     case 1: r = q, g = v, b = p; break;


@@ -1171,19 +1120,19 @@ void wxXColorToHSV(wxHSV *hsv,XColor *rgb)
     int b = rgb->blue >> 8;
     int maxv = wxMax3(r, g, b);
     int minv = wxMin3(r, g, b);
     int b = rgb->blue >> 8;
     int maxv = wxMax3(r, g, b);
     int minv = wxMin3(r, g, b);

-    int h, s, v;
+    int h = 0, s, v;

     v = maxv;
     if (maxv) s = (maxv - minv) * wxMAX_RGB / maxv;
     else s = 0;
     if (s == 0) h = 0;
     v = maxv;
     if (maxv) s = (maxv - minv) * wxMAX_RGB / maxv;
     else s = 0;
     if (s == 0) h = 0;

-    else 
+    else

     {
     {

-        int rc, gc, bc, hex;
+        int rc, gc, bc, hex = 0;

         rc = (maxv - r) * wxMAX_RGB / (maxv - minv);
         gc = (maxv - g) * wxMAX_RGB / (maxv - minv);
         bc = (maxv - b) * wxMAX_RGB / (maxv - minv);
         rc = (maxv - r) * wxMAX_RGB / (maxv - minv);
         gc = (maxv - g) * wxMAX_RGB / (maxv - minv);
         bc = (maxv - b) * wxMAX_RGB / (maxv - minv);

-        if (r == maxv) { h = bc - gc, hex = 0; } 
-        else if (g == maxv) { h = rc - bc, hex = 2; } 
+        if (r == maxv) { h = bc - gc, hex = 0; }
+        else if (g == maxv) { h = rc - bc, hex = 2; }

         else if (b == maxv) { h = gc - rc, hex = 4; }
         h = hex * 60 + (h * 60 / wxMAX_RGB);
         if (h < 0) h += 360;
         else if (b == maxv) { h = gc - rc, hex = 4; }
         h = hex * 60 + (h * 60 / wxMAX_RGB);
         if (h < 0) h += 360;


@@ -1196,19 +1145,19 @@ void wxXColorToHSV(wxHSV *hsv,XColor *rgb)
 void wxAllocNearestColor(Display *d,Colormap cmp,XColor *xc)
 {
     int llp;
 void wxAllocNearestColor(Display *d,Colormap cmp,XColor *xc)
 {
     int llp;

-    
+

     int screen = DefaultScreen(d);
     int num_colors = DisplayCells(d,screen);
     int screen = DefaultScreen(d);
     int num_colors = DisplayCells(d,screen);

-    
+

     XColor *color_defs = new XColor[num_colors];
     for(llp = 0;llp < num_colors;llp++) color_defs[llp].pixel = llp;
     XQueryColors(d,cmp,color_defs,num_colors);
     XColor *color_defs = new XColor[num_colors];
     for(llp = 0;llp < num_colors;llp++) color_defs[llp].pixel = llp;
     XQueryColors(d,cmp,color_defs,num_colors);

-    
+

     wxHSV hsv_defs, hsv;
     wxXColorToHSV(&hsv,xc);
     wxHSV hsv_defs, hsv;
     wxXColorToHSV(&hsv,xc);

-    
-    int diff, min_diff, pixel = 0;
-    
+
+    int diff, min_diff = 0, pixel = 0;
+

     for(llp = 0;llp < num_colors;llp++)
     {
         wxXColorToHSV(&hsv_defs,&color_defs[llp]);
     for(llp = 0;llp < num_colors;llp++)
     {
         wxXColorToHSV(&hsv_defs,&color_defs[llp]);


@@ -1219,14 +1168,17 @@ void wxAllocNearestColor(Display *d,Colormap cmp,XColor *xc)
         if (min_diff > diff) { min_diff = diff; pixel = llp; }
         if (min_diff == 0) break;
     }
         if (min_diff > diff) { min_diff = diff; pixel = llp; }
         if (min_diff == 0) break;
     }

-    
+

     xc -> red = color_defs[pixel].red;
     xc -> green = color_defs[pixel].green;
     xc -> blue = color_defs[pixel].blue;
     xc -> flags = DoRed | DoGreen | DoBlue;
     xc -> red = color_defs[pixel].red;
     xc -> green = color_defs[pixel].green;
     xc -> blue = color_defs[pixel].blue;
     xc -> flags = DoRed | DoGreen | DoBlue;

+
+/*  FIXME, TODO

     if (!XAllocColor(d,cmp,xc))
         cout << "wxAllocNearestColor : Warning : Cannot find nearest color !\n";
     if (!XAllocColor(d,cmp,xc))
         cout << "wxAllocNearestColor : Warning : Cannot find nearest color !\n";

-    
+*/
+

     delete[] color_defs;
 }
 
     delete[] color_defs;
 }
 


@@ -1255,7 +1207,7 @@ void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour)
     // Therefore SetBackgroundColour computes the foreground colour, and
     // SetForegroundColour changes the foreground colour. The ordering is
     // important.
     // Therefore SetBackgroundColour computes the foreground colour, and
     // SetForegroundColour changes the foreground colour. The ordering is
     // important.

-    
+

     XtVaSetValues ((Widget) widget,
         XmNforeground, foregroundColour.AllocColour(XtDisplay((Widget) widget)),
         NULL);
     XtVaSetValues ((Widget) widget,
         XmNforeground, foregroundColour.AllocColour(XtDisplay((Widget) widget)),
         NULL);


@@ -1265,18 +1217,17 @@ void wxDoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, boo
 {
     wxComputeColours (XtDisplay((Widget) widget), & backgroundColour,
         (wxColour*) NULL);
 {
     wxComputeColours (XtDisplay((Widget) widget), & backgroundColour,
         (wxColour*) NULL);

-    
+

     XtVaSetValues ((Widget) widget,
         XmNbackground, g_itemColors[wxBACK_INDEX].pixel,
         XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel,
         XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel,
         XmNforeground, g_itemColors[wxFORE_INDEX].pixel,
         NULL);
     XtVaSetValues ((Widget) widget,
         XmNbackground, g_itemColors[wxBACK_INDEX].pixel,
         XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel,
         XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel,
         XmNforeground, g_itemColors[wxFORE_INDEX].pixel,
         NULL);

-    
+

     if (changeArmColour)
         XtVaSetValues ((Widget) widget,
         XmNarmColor, g_itemColors[wxSELE_INDEX].pixel,
         NULL);
 }
 
     if (changeArmColour)
         XtVaSetValues ((Widget) widget,
         XmNarmColor, g_itemColors[wxSELE_INDEX].pixel,
         NULL);
 }
 

-