TRUE/FALSE -> true/false

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

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 179a3a43d630eed436a7752b6f847014070af82c..c43fe3189b5573b097002ad572f2f80ed9259287 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -23,22 +23,11 @@
 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/app.h"

-#include "wx/msgdlg.h"
-#include "wx/cursor.h"
-#include "wx/window.h" // for wxTopLevelWindows
+#include "wx/dcmemory.h"
+#include "wx/bitmap.h"
+#include "wx/evtloop.h"

 
 

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

 #include <string.h>
 #include <string.h>

-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <pwd.h>
-#include <errno.h>
-// #include <netdb.h>
-#include <signal.h>

 
 #if (defined(__SUNCC__) || defined(__CLCC__))
     #include <sysent.h>
 
 #if (defined(__SUNCC__) || defined(__CLCC__))
     #include <sysent.h>


@@ -50,14 +39,8 @@
 
 #include "wx/unix/execute.h"
 
 
 #include "wx/unix/execute.h"
 

-#ifdef __WXMOTIF__

 #include <Xm/Xm.h>
 #include "wx/motif/private.h"
 #include <Xm/Xm.h>
 #include "wx/motif/private.h"

-#endif
-
-#ifdef __WXX11__
-#include "wx/x11/private.h"
-#endif

 
 #if wxUSE_RESOURCES
 #include "X11/Xresource.h"
 
 #if wxUSE_RESOURCES
 #include "X11/Xresource.h"


@@ -81,7 +64,9 @@
     #define DEFAULT_XRESOURCE_DIR "/usr/lib/X11/app-defaults"
 #endif
 
     #define DEFAULT_XRESOURCE_DIR "/usr/lib/X11/app-defaults"
 #endif
 

+#if wxUSE_RESOURCES

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

+#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -92,70 +77,24 @@ static char *GetIniFile (char *dest, const char *filename);
 // ----------------------------------------------------------------------------
 
 // Consume all events until no more left
 // ----------------------------------------------------------------------------
 
 // Consume all events until no more left

-void wxFlushEvents()
+void wxFlushEvents(WXDisplay* wxdisplay)

 {
 {

-    Display *display = (Display*) wxGetDisplay();
+    Display *display = (Display*)wxdisplay;
+    wxEventLoop evtLoop;

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

-#ifdef __WXMOTIF__   
-    // XtAppPending returns availability of events AND timers/inputs, which
-    // are processed via callbacks, so XtAppNextEvent will not return if
-    // there are no events. So added '& XtIMXEvent' - Sergey.
-    while (XtAppPending ((XtAppContext) wxTheApp->GetAppContext()) & XtIMXEvent)
+    while (evtLoop.Pending())

     {
     {

-        XFlush (XtDisplay ((Widget) wxTheApp->GetTopLevelWidget()));
-        // Jan Lessner: works better when events are non-X events
-        XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMXEvent);
+        XFlush (display);
+        evtLoop.Dispatch();

     }
     }

-#endif
-#ifdef __WXX11__
-    // TODO for X11
-    // ??
-#endif
-}
-
-// Check whether this window wants to process messages, e.g. Stop button
-// in long calculations.
-bool wxCheckForInterrupt(wxWindow *wnd)
-{
-#ifdef __WXMOTIF__
-    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;
-#else
-    wxASSERT_MSG(FALSE, "wxCheckForInterrupt not yet implemented.");
-    return FALSE;
-#endif

 }
 
 // ----------------------------------------------------------------------------
 // wxExecute stuff
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
 // wxExecute stuff
 // ----------------------------------------------------------------------------

-#ifdef __WXMOTIF__
+

 static void xt_notify_end_process(XtPointer data, int *WXUNUSED(fid),
                                   XtInputId *id)
 {
 static void xt_notify_end_process(XtPointer data, int *WXUNUSED(fid),
                                   XtInputId *id)
 {


@@ -168,11 +107,9 @@ static void xt_notify_end_process(XtPointer data, int *WXUNUSED(fid),
 
     XtRemoveInput(*id);
 }
 
     XtRemoveInput(*id);
 }

-#endif

 
 int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 {
 
 int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 {

-#ifdef __WXMOTIF__

     XtInputId id = XtAppAddInput((XtAppContext) wxTheApp->GetAppContext(),
                                  fd,
                                  (XtPointer *) XtInputReadMask,
     XtInputId id = XtAppAddInput((XtAppContext) wxTheApp->GetAppContext(),
                                  fd,
                                  (XtPointer *) XtInputReadMask,


@@ -180,11 +117,6 @@ int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
                                  (XtPointer) proc_data);
 
     return (int)id;
                                  (XtPointer) proc_data);
 
     return (int)id;

-#endif
-#ifdef __WXX11__
-    // TODO
-    return 0;
-#endif

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -195,37 +127,30 @@ int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 void wxBell()
 {
     // Use current setting for the bell
 void wxBell()
 {
     // Use current setting for the bell

-    XBell ((Display*) wxGetDisplay(), 0);
+    XBell (wxGlobalDisplay(), 0);

 }
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {
 }
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {

-#ifdef __WXMOTIF__

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

-    Display *display = XtDisplay ((Widget) wxTheApp->GetTopLevelWidget());
+    Display *display = wxGlobalDisplay();

     if (majorVsn)
         *majorVsn = ProtocolVersion (display);
     if (minorVsn)
         *minorVsn = ProtocolRevision (display);
 
     return wxMOTIF_X;
     if (majorVsn)
         *majorVsn = ProtocolVersion (display);
     if (minorVsn)
         *minorVsn = ProtocolRevision (display);
 
     return wxMOTIF_X;

-#endif
-#ifdef __WXX11__
-    if (majorVsn)
-        *majorVsn = 0;
-    if (minorVsn)
-        *minorVsn = 0;
-    return wxX11;
-#endif

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

+#if wxUSE_RESOURCES
+

 // 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.
 // 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.


@@ -256,8 +181,6 @@ static char * GetIniFile (char *dest, const char *filename)
     return dest;
 }
 
     return dest;
 }
 

-#if wxUSE_RESOURCES
-

 static char *GetResourcePath(char *buf, const char *name, bool create = FALSE)
 {
     if (create && wxFileExists (name) ) {
 static char *GetResourcePath(char *buf, const char *name, bool create = FALSE)
 {
     if (create && wxFileExists (name) ) {


@@ -271,7 +194,7 @@ static char *GetResourcePath(char *buf, const char *name, bool create = FALSE)
         // Put in standard place for resource files if not absolute
         strcpy (buf, DEFAULT_XRESOURCE_DIR);
         strcat (buf, "/");
         // Put in standard place for resource files if not absolute
         strcpy (buf, DEFAULT_XRESOURCE_DIR);
         strcat (buf, "/");

-        strcat (buf, (const char*) wxFileNameFromPath (name));
+        strcat (buf, wxFileNameFromPath (name).c_str());

     }
 
     if (create) {
     }
 
     if (create) {


@@ -333,9 +256,9 @@ bool wxWriteResource(const wxString& section, const wxString& entry, const wxStr
     }
 
     char resName[300];
     }
 
     char resName[300];

-    strcpy (resName, (const char*) section);
+    strcpy (resName, section.c_str());

     strcat (resName, ".");
     strcat (resName, ".");

-    strcat (resName, (const char*) entry);
+    strcat (resName, entry.c_str());

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


@@ -366,7 +289,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
 {
     if (!wxResourceDatabase)
     {
 {
     if (!wxResourceDatabase)
     {

-        Display *display = (Display*) wxGetDisplay();
+        Display *display = wxGlobalDisplay();

         wxXMergeDatabases (wxTheApp, display);
     }
 
         wxXMergeDatabases (wxTheApp, display);
     }
 


@@ -479,7 +402,7 @@ void wxXMergeDatabases (wxApp * theApp, Display * display)
     wxString classname = theApp->GetClassName();
     char name[256];
     (void) strcpy (name, "/usr/lib/X11/app-defaults/");
     wxString classname = theApp->GetClassName();
     char name[256];
     (void) strcpy (name, "/usr/lib/X11/app-defaults/");

-    (void) strcat (name, (const char*) classname);
+    (void) strcat (name, classname.c_str());

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


@@ -578,8 +501,8 @@ void wxGetMousePosition( int* x, int* y )
 #else
     XMotionEvent xev;
     Window root, child;
 #else
     XMotionEvent xev;
     Window root, child;

-    XQueryPointer((Display*) wxGetDisplay(),
-                  DefaultRootWindow((Display*) wxGetDisplay()),
+    XQueryPointer(wxGlobalDisplay(),
+                  DefaultRootWindow(wxGlobalDisplay()),

                   &root, &child,
                   &(xev.x_root), &(xev.y_root),
                   &(xev.x),      &(xev.y),
                   &root, &child,
                   &(xev.x_root), &(xev.y_root),
                   &(xev.x),      &(xev.y),


@@ -598,7 +521,7 @@ bool wxColourDisplay()
 // Returns depth of screen
 int wxDisplayDepth()
 {
 // Returns depth of screen
 int wxDisplayDepth()
 {

-    Display *dpy = (Display*) wxGetDisplay();
+    Display *dpy = wxGlobalDisplay();

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


@@ -606,7 +529,7 @@ int wxDisplayDepth()
 // Get size of display
 void wxDisplaySize(int *width, int *height)
 {
 // Get size of display
 void wxDisplaySize(int *width, int *height)
 {

-    Display *dpy = (Display*) wxGetDisplay();
+    Display *dpy = wxGlobalDisplay();

 
     if ( width )
         *width = DisplayWidth (dpy, DefaultScreen (dpy));
 
     if ( width )
         *width = DisplayWidth (dpy, DefaultScreen (dpy));


@@ -616,7 +539,7 @@ void wxDisplaySize(int *width, int *height)
 
 void wxDisplaySizeMM(int *width, int *height)
 {
 
 void wxDisplaySizeMM(int *width, int *height)
 {

-    Display *dpy = (Display*) wxGetDisplay();
+    Display *dpy = wxGlobalDisplay();

 
     if ( width )
         *width = DisplayWidthMM(dpy, DefaultScreen (dpy));
 
     if ( width )
         *width = DisplayWidthMM(dpy, DefaultScreen (dpy));


@@ -644,16 +567,9 @@ WXDisplay *wxGetDisplay()
 {
     if (gs_currentDisplay)
         return gs_currentDisplay;
 {
     if (gs_currentDisplay)
         return gs_currentDisplay;

-#ifdef __WXMOTIF__
-    if (wxTheApp && wxTheApp->GetTopLevelWidget())
-        return XtDisplay ((Widget) wxTheApp->GetTopLevelWidget());

     else if (wxTheApp)
         return wxTheApp->GetInitialDisplay();
     return NULL;
     else if (wxTheApp)
         return wxTheApp->GetInitialDisplay();
     return NULL;

-#endif
-#ifdef __WXX11__
-    return wxApp::GetDisplay();
-#endif

 }
 
 bool wxSetDisplay(const wxString& display_name)
 }
 
 bool wxSetDisplay(const wxString& display_name)


@@ -668,13 +584,12 @@ bool wxSetDisplay(const wxString& display_name)
     }
     else
     {
     }
     else
     {

-#ifdef __WXMOTIF__

         Cardinal argc = 0;
 
         Display *display = XtOpenDisplay((XtAppContext) wxTheApp->GetAppContext(),
         Cardinal argc = 0;
 
         Display *display = XtOpenDisplay((XtAppContext) wxTheApp->GetAppContext(),

-            (const char*) display_name,
-            (const char*) wxTheApp->GetAppName(),
-            (const char*) wxTheApp->GetClassName(),
+            display_name.c_str(),
+            wxTheApp->GetAppName().c_str(),
+            wxTheApp->GetClassName().c_str(),

             NULL,
 #if XtSpecificationRelease < 5
             0, &argc,
             NULL,
 #if XtSpecificationRelease < 5
             0, &argc,


@@ -690,18 +605,6 @@ bool wxSetDisplay(const wxString& display_name)
         }
         else
             return FALSE;
         }
         else
             return FALSE;

-#endif
-#ifdef __WXX11__
-        Display* display = XOpenDisplay((char*) display_name.c_str());
-
-        if (display)
-        {
-            gs_currentDisplay = (WXDisplay*) display;
-            return TRUE;
-        }
-        else
-            return FALSE;
-#endif

     }
 }
 
     }
 }
 


@@ -1101,7 +1004,6 @@ wxString wxGetXEventName(XEvent& event)
 }
 #endif
 
 }
 #endif
 

-#ifdef __WXMOTIF__

 // ----------------------------------------------------------------------------
 // accelerators
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // accelerators
 // ----------------------------------------------------------------------------


@@ -1112,6 +1014,7 @@ char wxFindMnemonic (const char *s)
     char mnem = 0;
     int len = strlen (s);
     int i;
     char mnem = 0;
     int len = strlen (s);
     int i;

+

     for (i = 0; i < len; i++)
     {
         if (s[i] == '&')
     for (i = 0; i < len; i++)
     {
         if (s[i] == '&')


@@ -1129,19 +1032,18 @@ char wxFindMnemonic (const char *s)
     return mnem;
 }
 
     return mnem;
 }
 

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

 {
 {

+#if 1

     // VZ: this function returns incorrect keysym which completely breaks kbd
     //     handling
     return NULL;
     // VZ: this function returns incorrect keysym which completely breaks kbd
     //     handling
     return NULL;

+#else
+    // The accelerator text is after the \t char.
+    s = strchr( s, '\t' );
+
+    if( !s ) return NULL;

 
 

-#if 0
-   // The accelerator text is after the \t char.
-    while (*s && *s != '\t')
-        s++;
-    if (*s == '\0')
-        return (NULL);
-    s++;

     /*
     Now we need to format it as X standard:
 
     /*
     Now we need to format it as X standard:
 


@@ -1152,65 +1054,68 @@ char * wxFindAccelerator (const char *s)
         Alt+k        --> Meta<Key>k
         Ctrl+Shift+A --> Ctrl Shift<Key>A
 
         Alt+k        --> Meta<Key>k
         Ctrl+Shift+A --> Ctrl Shift<Key>A
 

+        and handle Ctrl-N & similia

     */
 
     static char buf[256];
     */
 
     static char buf[256];

+

     buf[0] = '\0';
     buf[0] = '\0';

-    char *tmp = copystring (s);
-    s = tmp;
-    char *p = tmp;
+    wxString tmp = s + 1; // skip TAB
+    size_t index = 0;

 
 

-    while (1)
+    while( index < tmp.length() )

     {
     {

-        while (*p && *p != '+')
-            p++;
-        if (*p)
-        {
-            *p = '\0';
-            if (buf[0])
-                strcat (buf, " ");
-            if (strcmp (s, "Alt"))
-                strcat (buf, s);
-            else
-                strcat (buf, "Meta");
-            s = p++;
-        }
-        else
+        size_t plus  = tmp.find( '+', index );
+        size_t minus = tmp.find( '-', index );
+
+        // neither '+' nor '-', add <Key>
+        if( plus == wxString::npos && minus == wxString::npos )

         {
         {

-            strcat (buf, "<Key>");
-            strcat (buf, s);
-            break;
+            strcat( buf, "<Key>" );
+            strcat( buf, tmp.c_str() + index );
+
+            return buf;

         }
         }

+
+        // OK: npos is big and positive
+        size_t sep = wxMin( plus, minus );
+        wxString mod = tmp.substr( index, sep - index );
+
+        // Ctrl  -> Ctrl
+        // Shift -> Shift
+        // Alt   -> Meta
+        if( mod == "Alt" )
+            mod = "Meta";
+
+        if( buf[0] )
+            strcat( buf, " " );
+
+        strcat( buf, mod.c_str() );
+
+        index = sep + 1;

     }
     }

-    delete[]tmp;
-    return buf;
+
+    return NULL;

 #endif
 }
 
 XmString wxFindAcceleratorText (const char *s)
 {
 #endif
 }
 
 XmString wxFindAcceleratorText (const char *s)
 {

+#if 1

     // VZ: this function returns incorrect keysym which completely breaks kbd
     //     handling
     return NULL;
     // VZ: this function returns incorrect keysym which completely breaks kbd
     //     handling
     return NULL;

+#else
+    // The accelerator text is after the \t char.
+    s = strchr( s, '\t' );

 
 

-#if 0
-   // The accelerator text is after the \t char.
-    while (*s && *s != '\t')
-        s++;
-    if (*s == '\0')
-        return (NULL);
-    s++;
-    XmString text = XmStringCreateSimple ((char *)s);
-    return text;
+    if( !s ) return NULL;
+
+    return wxStringToXmString( s + 1 ); // skip TAB!

 #endif
 }
 
 #endif
 }
 

-
-// These functions duplicate those in wxWindow, but are needed
-// for use outside of wxWindow (e.g. wxMenu, wxMenuBar).
-

 // Change a widget's foreground and background colours.
 // Change a widget's foreground and background colours.

-

 void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour)
 {
     // When should we specify the foreground, if it's calculated
 void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour)
 {
     // When should we specify the foreground, if it's calculated


@@ -1245,13 +1150,64 @@ void wxDoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, boo
         NULL);
 }
 
         NULL);
 }
 

+extern void wxDoChangeFont(WXWidget widget, wxFont& font)
+{
+    // Lesstif 0.87 hangs here, but 0.93 does not
+#if !wxCHECK_LESSTIF() || wxCHECK_LESSTIF_VERSION( 0, 93 )
+    Widget w = (Widget)widget;
+    XtVaSetValues( w,
+                   wxFont::GetFontTag(), font.GetFontType( XtDisplay(w) ),
+                   NULL );

 #endif
 #endif

-    // __WXMOTIF__

 
 

-bool wxWindowIsVisible(Window win)
+}
+
+wxString wxXmStringToString( const XmString& xmString )
+{
+    char *txt;
+    if( XmStringGetLtoR( xmString, XmSTRING_DEFAULT_CHARSET, &txt ) )
+    {
+        wxString str(txt);
+        XtFree (txt);
+        return str;
+    }
+
+    return wxEmptyString;
+}
+
+XmString wxStringToXmString( const wxString& str )

 {
 {

-    XWindowAttributes wa;
-    XGetWindowAttributes(wxGlobalDisplay(), win, &wa);
+    return XmStringCreateLtoR((char *)str.c_str(), XmSTRING_DEFAULT_CHARSET);
+}

 
 

-    return (wa.map_state == IsViewable);
+XmString wxStringToXmString( const char* str )
+{
+    return XmStringCreateLtoR((char *)str, XmSTRING_DEFAULT_CHARSET);
+}
+
+// ----------------------------------------------------------------------------
+// wxBitmap utility functions
+// ----------------------------------------------------------------------------
+
+// Creates a bitmap with transparent areas drawn in
+// the given colour.
+wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, wxColour& colour)
+{
+    wxBitmap newBitmap(bitmap.GetWidth(),
+                       bitmap.GetHeight(),
+                       bitmap.GetDepth());
+    wxMemoryDC destDC;
+    wxMemoryDC srcDC;
+
+    srcDC.SelectObject(bitmap);
+    destDC.SelectObject(newBitmap);
+
+    wxBrush brush(colour, wxSOLID);
+    // destDC.SetOptimization(FALSE);
+    destDC.SetBackground(brush);
+    destDC.Clear();
+    destDC.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(),
+                &srcDC, 0, 0, wxCOPY, TRUE);
+
+    return newBitmap;

 }
 }