X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec5d77998a16fbdf328ec689a48449c84f0d4336..e2a5251d0109a1be6b9ce5c818d89f56ebfaeae1:/src/motif/utils.cpp?ds=sidebyside diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp index 9f6ed67e35..56c48759cb 100644 --- a/src/motif/utils.cpp +++ b/src/motif/utils.cpp @@ -20,13 +20,13 @@ #ifdef __VMS #define XtDisplay XTDISPLAY #endif - #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 #include @@ -38,7 +38,6 @@ #include #include #include -#include #include #if (defined(__SUNCC__) || defined(__CLCC__)) @@ -48,15 +47,22 @@ #ifdef __VMS__ #pragma message disable nosimpint #endif -#include -#ifdef __VMS__ -#pragma message enable nosimpint -#endif #include "wx/unix/execute.h" +#include #include "wx/motif/private.h" +#if wxUSE_RESOURCES +#include "X11/Xresource.h" +#endif + +#include "X11/Xutil.h" + +#ifdef __VMS__ +#pragma message enable nosimpint +#endif + // ---------------------------------------------------------------------------- // private functions // ---------------------------------------------------------------------------- @@ -69,7 +75,9 @@ #define DEFAULT_XRESOURCE_DIR "/usr/lib/X11/app-defaults" #endif +#if wxUSE_RESOURCES static char *GetIniFile (char *dest, const char *filename); +#endif // ============================================================================ // implementation @@ -97,6 +105,7 @@ void wxFlushEvents() } } +#if 0 // Check whether this window wants to process messages, e.g. Stop button // in long calculations. bool wxCheckForInterrupt(wxWindow *wnd) @@ -128,6 +137,7 @@ bool wxCheckForInterrupt(wxWindow *wnd) return hadEvents; } +#endif // ---------------------------------------------------------------------------- // wxExecute stuff @@ -187,6 +197,8 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn) // 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. @@ -217,8 +229,6 @@ static char * GetIniFile (char *dest, const char *filename) return dest; } -#if wxUSE_RESOURCES - static char *GetResourcePath(char *buf, const char *name, bool create = FALSE) { if (create && wxFileExists (name) ) { @@ -232,7 +242,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, "/"); - strcat (buf, (const char*) wxFileNameFromPath (name)); + strcat (buf, wxFileNameFromPath (name).c_str()); } if (create) { @@ -294,9 +304,9 @@ bool wxWriteResource(const wxString& section, const wxString& entry, const wxStr } char resName[300]; - strcpy (resName, (const char*) section); + strcpy (resName, section.c_str()); strcat (resName, "."); - strcat (resName, (const char*) entry); + strcat (resName, entry.c_str()); XrmPutStringResource (&database, resName, value); return TRUE; @@ -440,7 +450,7 @@ void wxXMergeDatabases (wxApp * theApp, Display * display) 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); @@ -526,91 +536,17 @@ wxSetDefaultResources (const Widget w, const char **resourceSpec, const char *na #endif // wxUSE_RESOURCES -// ---------------------------------------------------------------------------- -// busy cursor stuff -// ---------------------------------------------------------------------------- - -static int wxBusyCursorCount = 0; - -// Helper function -static void -wxXSetBusyCursor (wxWindow * win, wxCursor * cursor) -{ - Display *display = (Display*) win->GetXDisplay(); - - Window xwin = (Window) win->GetXWindow(); - if (!xwin) - return; - - XSetWindowAttributes attrs; - - if (cursor) - { - attrs.cursor = (Cursor) cursor->GetXCursor(display); - } - else - { - // Restore old cursor - if (win->GetCursor().Ok()) - attrs.cursor = (Cursor) win->GetCursor().GetXCursor(display); - else - attrs.cursor = None; - } - if (xwin) - XChangeWindowAttributes (display, xwin, CWCursor, &attrs); - - XFlush (display); - - for(wxNode *node = win->GetChildren().First (); node; node = node->Next()) - { - wxWindow *child = (wxWindow *) node->Data (); - wxXSetBusyCursor (child, cursor); - } -} - -// Set the cursor to the busy cursor for all windows -void wxBeginBusyCursor(wxCursor *cursor) -{ - wxBusyCursorCount++; - if (wxBusyCursorCount == 1) - { - for(wxNode *node = wxTopLevelWindows.First (); node; node = node->Next()) - { - wxWindow *win = (wxWindow *) node->Data (); - wxXSetBusyCursor (win, cursor); - } - } -} - -// Restore cursor to normal -void wxEndBusyCursor() -{ - if (wxBusyCursorCount == 0) - return; - - wxBusyCursorCount--; - if (wxBusyCursorCount == 0) - { - for(wxNode *node = wxTopLevelWindows.First (); node; node = node->Next()) - { - wxWindow *win = (wxWindow *) node->Data (); - wxXSetBusyCursor (win, NULL); - } - } -} - -// TRUE if we're between the above two calls -bool wxIsBusy() -{ - return (wxBusyCursorCount > 0); -} - // ---------------------------------------------------------------------------- // display info // ---------------------------------------------------------------------------- void wxGetMousePosition( int* x, int* y ) { +#if wxUSE_NANOX + // TODO + *x = 0; + *y = 0; +#else XMotionEvent xev; Window root, child; XQueryPointer((Display*) wxGetDisplay(), @@ -621,6 +557,7 @@ void wxGetMousePosition( int* x, int* y ) &(xev.state)); *x = xev.x_root; *y = xev.y_root; +#endif }; // Return TRUE if we have a colour display @@ -670,7 +607,7 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height) } -// Configurable display in Motif +// Configurable display in wxX11 and wxMotif static WXDisplay *gs_currentDisplay = NULL; static wxString gs_displayName; @@ -678,20 +615,18 @@ WXDisplay *wxGetDisplay() { if (gs_currentDisplay) return gs_currentDisplay; - if (wxTheApp && wxTheApp->GetTopLevelWidget()) return XtDisplay ((Widget) wxTheApp->GetTopLevelWidget()); else if (wxTheApp) return wxTheApp->GetInitialDisplay(); - else - return (WXDisplay*) NULL; + return NULL; } bool wxSetDisplay(const wxString& display_name) { gs_displayName = display_name; - if ( !display_name ) + if ( display_name.IsEmpty() ) { gs_currentDisplay = NULL; @@ -702,9 +637,9 @@ bool wxSetDisplay(const wxString& display_name) 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, @@ -733,108 +668,6 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt) return wxGenericFindWindowAtPoint(pt); } -// ---------------------------------------------------------------------------- -// accelerators -// ---------------------------------------------------------------------------- - -// Find the letter corresponding to the mnemonic, for Motif -char wxFindMnemonic (const char *s) -{ - char mnem = 0; - int len = strlen (s); - int i; - for (i = 0; i < len; i++) - { - if (s[i] == '&') - { - // Carefully handle && - if ((i + 1) <= len && s[i + 1] == '&') - i++; - else - { - mnem = s[i + 1]; - break; - } - } - } - return mnem; -} - -char * wxFindAccelerator (const char *s) -{ - // 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++; - /* - Now we need to format it as X standard: - - input output - - F7 --> F7 - Ctrl+N --> CtrlN - Alt+k --> Metak - Ctrl+Shift+A --> Ctrl ShiftA - - */ - - wxBuffer[0] = '\0'; - char *tmp = copystring (s); - s = tmp; - char *p = tmp; - - while (1) - { - while (*p && *p != '+') - p++; - if (*p) - { - *p = '\0'; - if (wxBuffer[0]) - strcat (wxBuffer, " "); - if (strcmp (s, "Alt")) - strcat (wxBuffer, s); - else - strcat (wxBuffer, "Meta"); - s = p++; - } - else - { - strcat (wxBuffer, ""); - strcat (wxBuffer, s); - break; - } - } - delete[]tmp; - return wxBuffer; -#endif -} - -XmString wxFindAcceleratorText (const char *s) -{ - // 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++; - XmString text = XmStringCreateSimple ((char *)s); - return text; -#endif -} - // ---------------------------------------------------------------------------- // keycode translations // ---------------------------------------------------------------------------- @@ -1144,6 +977,7 @@ void wxXColorToHSV(wxHSV *hsv,XColor *rgb) void wxAllocNearestColor(Display *d,Colormap cmp,XColor *xc) { +#if !wxUSE_NANOX int llp; int screen = DefaultScreen(d); @@ -1180,6 +1014,7 @@ void wxAllocNearestColor(Display *d,Colormap cmp,XColor *xc) */ delete[] color_defs; +#endif } void wxAllocColor(Display *d,Colormap cmp,XColor *xc) @@ -1191,9 +1026,137 @@ void wxAllocColor(Display *d,Colormap cmp,XColor *xc) } } +#ifdef __WXDEBUG__ +wxString wxGetXEventName(XEvent& event) +{ +#if wxUSE_NANOX + wxString str(wxT("(some event)")); + return str; +#else + int type = event.xany.type; + static char* event_name[] = { + "", "unknown(-)", // 0-1 + "KeyPress", "KeyRelease", "ButtonPress", "ButtonRelease", // 2-5 + "MotionNotify", "EnterNotify", "LeaveNotify", "FocusIn", // 6-9 + "FocusOut", "KeymapNotify", "Expose", "GraphicsExpose", // 10-13 + "NoExpose", "VisibilityNotify", "CreateNotify", // 14-16 + "DestroyNotify", "UnmapNotify", "MapNotify", "MapRequest",// 17-20 + "ReparentNotify", "ConfigureNotify", "ConfigureRequest", // 21-23 + "GravityNotify", "ResizeRequest", "CirculateNotify", // 24-26 + "CirculateRequest", "PropertyNotify", "SelectionClear", // 27-29 + "SelectionRequest", "SelectionNotify", "ColormapNotify", // 30-32 + "ClientMessage", "MappingNotify", // 33-34 + "unknown(+)"}; // 35 + type = wxMin(35, type); type = wxMax(1, type); + wxString str(event_name[type]); + return str; +#endif +} +#endif + +// ---------------------------------------------------------------------------- +// accelerators +// ---------------------------------------------------------------------------- + +// Find the letter corresponding to the mnemonic, for Motif +char wxFindMnemonic (const char *s) +{ + char mnem = 0; + int len = strlen (s); + int i; + for (i = 0; i < len; i++) + { + if (s[i] == '&') + { + // Carefully handle && + if ((i + 1) <= len && s[i + 1] == '&') + i++; + else + { + mnem = s[i + 1]; + break; + } + } + } + return mnem; +} + +char * wxFindAccelerator (const char *s) +{ + // 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++; + /* + Now we need to format it as X standard: + + input output + + F7 --> F7 + Ctrl+N --> CtrlN + Alt+k --> Metak + Ctrl+Shift+A --> Ctrl ShiftA + + */ + + static char buf[256]; + buf[0] = '\0'; + char *tmp = copystring (s); + s = tmp; + char *p = tmp; + + while (1) + { + 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 + { + strcat (buf, ""); + strcat (buf, s); + break; + } + } + delete[]tmp; + return buf; +#endif +} + +XmString wxFindAcceleratorText (const char *s) +{ + // 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++; + XmString text = XmStringCreateSimple ((char *)s); + return text; +#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. @@ -1231,3 +1194,72 @@ void wxDoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, boo 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 + +} + +bool wxWindowIsVisible(Window win) +{ + XWindowAttributes wa; + XGetWindowAttributes(wxGlobalDisplay(), win, &wa); + + return (wa.map_state == IsViewable); +} + +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 ) +{ + return XmStringCreateLtoR((char *)str.c_str(), XmSTRING_DEFAULT_CHARSET); +} + +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; +}