X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b229c8a9112ff3ecbf5b05c3c5469ade34517a9c..5a410e4453e28ee77ee3ad7a407ca71692f9f30f:/src/motif/utils.cpp?ds=sidebyside diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp index b9ddd16c51..77bdbe3d6b 100644 --- a/src/motif/utils.cpp +++ b/src/motif/utils.cpp @@ -22,22 +22,13 @@ #endif #include "wx/setup.h" #include "wx/utils.h" +#include "wx/apptrait.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 -#include -#include #include -#include -#include -#include -#include -#include -#include -#include #if (defined(__SUNCC__) || defined(__CLCC__)) #include @@ -50,6 +41,8 @@ #include "wx/unix/execute.h" #include +#include + #include "wx/motif/private.h" #if wxUSE_RESOURCES @@ -87,57 +80,20 @@ static char *GetIniFile (char *dest, const char *filename); // ---------------------------------------------------------------------------- // 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); - // 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(); } } -#if 0 -// Check whether this window wants to process messages, e.g. Stop button -// in long calculations. -bool wxCheckForInterrupt(wxWindow *wnd) -{ - 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; -} -#endif - // ---------------------------------------------------------------------------- // wxExecute stuff // ---------------------------------------------------------------------------- @@ -171,25 +127,34 @@ int wxAddProcessCallback(wxEndProcessData *proc_data, int fd) // ---------------------------------------------------------------------------- // Emit a beeeeeep +#ifndef __EMX__ +// on OS/2, we use the wxBell from wxBase library (src/os2/utils.cpp) void wxBell() { // Use current setting for the bell - XBell ((Display*) wxGetDisplay(), 0); + XBell (wxGlobalDisplay(), 0); } +#endif -int wxGetOsVersion(int *majorVsn, int *minorVsn) +wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo() { + static wxToolkitInfo info; + + info.shortName = _T("motif"); + info.name = _T("wxMotif"); +#ifdef __WXUNIVERSAL__ + info.shortName << _T("univ"); + info.name << _T("/wxUniversal"); +#endif // 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()); - if (majorVsn) - *majorVsn = ProtocolVersion (display); - if (minorVsn) - *minorVsn = ProtocolRevision (display); - - return wxMOTIF_X; + Display *display = wxGlobalDisplay(); + info.versionMajor = ProtocolVersion (display); + info.versionMinor = ProtocolRevision (display); + info.os = wxMOTIF_X; + return info; } // ---------------------------------------------------------------------------- @@ -336,7 +301,7 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value, { if (!wxResourceDatabase) { - Display *display = (Display*) wxGetDisplay(); + Display *display = wxGlobalDisplay(); wxXMergeDatabases (wxTheApp, display); } @@ -548,8 +513,8 @@ void wxGetMousePosition( int* x, int* y ) #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), @@ -568,7 +533,7 @@ bool wxColourDisplay() // Returns depth of screen int wxDisplayDepth() { - Display *dpy = (Display*) wxGetDisplay(); + Display *dpy = wxGlobalDisplay(); return DefaultDepth (dpy, DefaultScreen (dpy)); } @@ -576,7 +541,7 @@ int wxDisplayDepth() // Get size of display void wxDisplaySize(int *width, int *height) { - Display *dpy = (Display*) wxGetDisplay(); + Display *dpy = wxGlobalDisplay(); if ( width ) *width = DisplayWidth (dpy, DefaultScreen (dpy)); @@ -586,7 +551,7 @@ void wxDisplaySize(int *width, int *height) void wxDisplaySizeMM(int *width, int *height) { - Display *dpy = (Display*) wxGetDisplay(); + Display *dpy = wxGlobalDisplay(); if ( width ) *width = DisplayWidthMM(dpy, DefaultScreen (dpy)); @@ -614,8 +579,6 @@ WXDisplay *wxGetDisplay() { if (gs_currentDisplay) return gs_currentDisplay; - if (wxTheApp && wxTheApp->GetTopLevelWidget()) - return XtDisplay ((Widget) wxTheApp->GetTopLevelWidget()); else if (wxTheApp) return wxTheApp->GetInitialDisplay(); return NULL; @@ -1063,6 +1026,7 @@ char wxFindMnemonic (const char *s) char mnem = 0; int len = strlen (s); int i; + for (i = 0; i < len; i++) { if (s[i] == '&') @@ -1080,19 +1044,18 @@ char wxFindMnemonic (const char *s) 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; +#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: @@ -1103,62 +1066,68 @@ char * wxFindAccelerator (const char *s) Alt+k --> Metak Ctrl+Shift+A --> Ctrl ShiftA + and handle Ctrl-N & similia */ static char buf[256]; + 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 + if( plus == wxString::npos && minus == wxString::npos ) { - strcat (buf, ""); - strcat (buf, s); - break; + strcat( buf, "" ); + 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) { +#if 1 // 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 } - // Change a widget's foreground and background colours. - void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour) { // When should we specify the foreground, if it's calculated @@ -1205,14 +1174,6 @@ extern void wxDoChangeFont(WXWidget widget, wxFont& font) } -bool wxWindowIsVisible(Window win) -{ - XWindowAttributes wa; - XGetWindowAttributes(wxGlobalDisplay(), win, &wa); - - return (wa.map_state == IsViewable); -} - wxString wxXmStringToString( const XmString& xmString ) { char *txt; @@ -1235,3 +1196,73 @@ 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; +} + +// ---------------------------------------------------------------------------- +// Miscellaneous functions +// ---------------------------------------------------------------------------- + +WXWidget wxCreateBorderWidget( WXWidget parent, long style ) +{ + Widget borderWidget = (Widget)NULL, parentWidget = (Widget)parent; + + if (style & wxSIMPLE_BORDER) + { + borderWidget = XtVaCreateManagedWidget + ( + "simpleBorder", + xmFrameWidgetClass, parentWidget, + XmNshadowType, XmSHADOW_ETCHED_IN, + XmNshadowThickness, 1, + NULL + ); + } + else if (style & wxSUNKEN_BORDER) + { + borderWidget = XtVaCreateManagedWidget + ( + "sunkenBorder", + xmFrameWidgetClass, parentWidget, + XmNshadowType, XmSHADOW_IN, + NULL + ); + } + else if (style & wxRAISED_BORDER) + { + borderWidget = XtVaCreateManagedWidget + ( + "raisedBorder", + xmFrameWidgetClass, parentWidget, + XmNshadowType, XmSHADOW_OUT, + NULL + ); + } + + return borderWidget; +}