X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1363811bb6338fb0dad6c16cfa47f46fb1eb3b99..5a618a14c627c87a2ea642bd8395b74d72e614ba:/src/motif/utils.cpp diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp index 287774c77b..fcb590abba 100644 --- a/src/motif/utils.cpp +++ b/src/motif/utils.cpp @@ -17,11 +17,15 @@ // headers // ---------------------------------------------------------------------------- +#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 #include @@ -33,18 +37,37 @@ #include #include #include -#include +// #include #include #if (defined(__SUNCC__) || defined(__CLCC__)) #include #endif -#include +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include "wx/unix/execute.h" +#ifdef __WXMOTIF__ +#include #include "wx/motif/private.h" +#endif + +#ifdef __WXX11__ +#include "wx/x11/private.h" +#endif + +#if wxUSE_RESOURCES +#include "X11/Xresource.h" +#endif + +#include "X11/Xutil.h" + +#ifdef __VMS__ +#pragma message enable nosimpint +#endif // ---------------------------------------------------------------------------- // private functions @@ -58,9 +81,9 @@ #define DEFAULT_XRESOURCE_DIR "/usr/lib/X11/app-defaults" #endif +#if wxUSE_RESOURCES static char *GetIniFile (char *dest, const char *filename); - -extern wxList wxTopLevelWindows; +#endif // ============================================================================ // implementation @@ -76,7 +99,8 @@ void wxFlushEvents() Display *display = (Display*) wxGetDisplay(); XSync (display, FALSE); - XEvent event; + +#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. @@ -86,12 +110,18 @@ void wxFlushEvents() // Jan Lessner: works better when events are non-X events XtAppProcessEvent((XtAppContext) wxTheApp->GetAppContext(), XtIMXEvent); } +#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(); @@ -118,13 +148,17 @@ bool wxCheckForInterrupt(wxWindow *wnd) } return hadEvents; +#else + wxASSERT_MSG(FALSE, "wxCheckForInterrupt not yet implemented."); + return FALSE; +#endif } // ---------------------------------------------------------------------------- // wxExecute stuff // ---------------------------------------------------------------------------- - -static void xt_notify_end_process(XtPointer data, int *fid, +#ifdef __WXMOTIF__ +static void xt_notify_end_process(XtPointer data, int *WXUNUSED(fid), XtInputId *id) { wxEndProcessData *proc_data = (wxEndProcessData *)data; @@ -136,9 +170,11 @@ static void xt_notify_end_process(XtPointer data, int *fid, XtRemoveInput(*id); } +#endif int wxAddProcessCallback(wxEndProcessData *proc_data, int fd) { +#ifdef __WXMOTIF__ XtInputId id = XtAppAddInput((XtAppContext) wxTheApp->GetAppContext(), fd, (XtPointer *) XtInputReadMask, @@ -146,6 +182,11 @@ int wxAddProcessCallback(wxEndProcessData *proc_data, int fd) (XtPointer) proc_data); return (int)id; +#endif +#ifdef __WXX11__ + // TODO + return 0; +#endif } // ---------------------------------------------------------------------------- @@ -161,6 +202,7 @@ void wxBell() 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 @@ -172,12 +214,22 @@ int wxGetOsVersion(int *majorVsn, int *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) // ---------------------------------------------------------------------------- +#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. @@ -208,8 +260,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) ) { @@ -223,7 +273,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) { @@ -285,9 +335,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; @@ -431,7 +481,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); @@ -463,8 +513,8 @@ void wxXMergeDatabases (wxApp * theApp, Display * display) size_t len; environment = GetIniFile (filename, NULL); len = strlen (environment); - wxString hostname; - if ( wxGetHostName(hostname) ) + wxString hostname = wxGetHostName(); + if ( !!hostname ) strncat(environment, hostname, 1024 - len); } homeDB = XrmGetFileDatabase (environment); @@ -517,91 +567,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(), @@ -612,6 +588,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 @@ -639,7 +616,29 @@ void wxDisplaySize(int *width, int *height) *height = DisplayHeight (dpy, DefaultScreen (dpy)); } -// Configurable display in Motif +void wxDisplaySizeMM(int *width, int *height) +{ + Display *dpy = (Display*) wxGetDisplay(); + + if ( width ) + *width = DisplayWidthMM(dpy, DefaultScreen (dpy)); + if ( height ) + *height = DisplayHeightMM(dpy, DefaultScreen (dpy)); +} + +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 wxX11 and wxMotif static WXDisplay *gs_currentDisplay = NULL; static wxString gs_displayName; @@ -647,20 +646,23 @@ WXDisplay *wxGetDisplay() { if (gs_currentDisplay) return gs_currentDisplay; - +#ifdef __WXMOTIF__ if (wxTheApp && wxTheApp->GetTopLevelWidget()) return XtDisplay ((Widget) wxTheApp->GetTopLevelWidget()); else if (wxTheApp) return wxTheApp->GetInitialDisplay(); - else - return (WXDisplay*) NULL; + return NULL; +#endif +#ifdef __WXX11__ + return wxApp::GetDisplay(); +#endif } bool wxSetDisplay(const wxString& display_name) { gs_displayName = display_name; - if ( !display_name ) + if ( display_name.IsEmpty() ) { gs_currentDisplay = NULL; @@ -668,12 +670,13 @@ bool wxSetDisplay(const wxString& display_name) } else { +#ifdef __WXMOTIF__ 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, @@ -689,105 +692,29 @@ bool wxSetDisplay(const wxString& display_name) } else return FALSE; - } - - return FALSE; -} - -wxString wxGetDisplayName() -{ - return gs_displayName; -} - -// ---------------------------------------------------------------------------- -// accelerators -// ---------------------------------------------------------------------------- +#endif +#ifdef __WXX11__ + Display* display = XOpenDisplay((char*) display_name.c_str()); -// 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] == '&') + if (display) { - // Carefully handle && - if ((i + 1) <= len && s[i + 1] == '&') - i++; - else - { - mnem = s[i + 1]; - break; - } + gs_currentDisplay = (WXDisplay*) display; + return TRUE; } + else + return FALSE; +#endif } - return mnem; } -char * wxFindAccelerator (char *s) +wxString wxGetDisplayName() { - // 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 = s; - - 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 + 1; - p = s; - } - else - { - strcat (wxBuffer, ""); - strcat (wxBuffer, s); - break; - } - } - delete[]tmp; - return wxBuffer; + return gs_displayName; } -XmString wxFindAcceleratorText (char *s) +wxWindow* wxFindWindowAtPoint(const wxPoint& pt) { - // The accelerator text is after the \t char. - while (*s && *s != '\t') - s++; - if (*s == '\0') - return (NULL); - s++; - XmString text = XmStringCreateSimple (s); - return text; + return wxGenericFindWindowAtPoint(pt); } // ---------------------------------------------------------------------------- @@ -1042,7 +969,7 @@ 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; @@ -1075,14 +1002,14 @@ void wxXColorToHSV(wxHSV *hsv,XColor *rgb) 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; 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); @@ -1099,6 +1026,7 @@ void wxXColorToHSV(wxHSV *hsv,XColor *rgb) void wxAllocNearestColor(Display *d,Colormap cmp,XColor *xc) { +#if !wxUSE_NANOX int llp; int screen = DefaultScreen(d); @@ -1111,7 +1039,7 @@ void wxAllocNearestColor(Display *d,Colormap cmp,XColor *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++) { @@ -1128,10 +1056,14 @@ void wxAllocNearestColor(Display *d,Colormap cmp,XColor *xc) 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"; +*/ delete[] color_defs; +#endif } void wxAllocColor(Display *d,Colormap cmp,XColor *xc) @@ -1143,6 +1075,138 @@ 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 + +#ifdef __WXMOTIF__ +// ---------------------------------------------------------------------------- +// 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). @@ -1183,3 +1247,48 @@ 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 + +} + +#endif + // __WXMOTIF__ + +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); +}