/////////////////////////////////////////////////////////////////////////////
-// Name: utils.cpp
+// Name: src/motif/utils.cpp
// Purpose: Various utilities
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
-// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// headers
// ----------------------------------------------------------------------------
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-#include "wx/setup.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+ #include "wx/dcmemory.h"
+ #include "wx/bitmap.h"
+#endif
+
#include "wx/apptrait.h"
-#include "wx/app.h"
-#include "wx/dcmemory.h"
-#include "wx/bitmap.h"
#include "wx/evtloop.h"
+#include "wx/private/eventloopsourcesmanager.h"
+#include "wx/motif/private/timer.h"
#include <string.h>
#pragma message disable nosimpint
#endif
-#include "wx/unix/execute.h"
-
#include <Xm/Xm.h>
#include <Xm/Frame.h>
#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
-// ----------------------------------------------------------------------------
-
-// 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"
-#else
- #define DEFAULT_XRESOURCE_DIR "/usr/lib/X11/app-defaults"
-#endif
-
-#if wxUSE_RESOURCES
-static char *GetIniFile (char *dest, const char *filename);
-#endif
// ============================================================================
// implementation
Display *display = (Display*)wxdisplay;
wxEventLoop evtLoop;
- XSync (display, FALSE);
+ XSync (display, False);
while (evtLoop.Pending())
{
}
}
-// ----------------------------------------------------------------------------
-// wxExecute stuff
-// ----------------------------------------------------------------------------
+#if wxUSE_EVENTLOOP_SOURCE
-static void xt_notify_end_process(XtPointer data, int *WXUNUSED(fid),
- XtInputId *id)
+extern "C"
{
- wxEndProcessData *proc_data = (wxEndProcessData *)data;
- wxHandleProcessTermination(proc_data);
-
- // VZ: I think they should be the same...
- wxASSERT( (int)*id == proc_data->tag );
-
- XtRemoveInput(*id);
-}
-
-int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
+static
+void
+wxMotifInputHandler(XtPointer data,
+ int* WXUNUSED(fd),
+ XtInputId* WXUNUSED(inputId))
{
- XtInputId id = XtAppAddInput((XtAppContext) wxTheApp->GetAppContext(),
- fd,
- (XtPointer *) XtInputReadMask,
- (XtInputCallbackProc) xt_notify_end_process,
- (XtPointer) proc_data);
-
- return (int)id;
-}
+ wxEventLoopSourceHandler * const
+ handler = static_cast<wxEventLoopSourceHandler *>(data);
-// ----------------------------------------------------------------------------
-// misc
-// ----------------------------------------------------------------------------
-
-// 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 (wxGlobalDisplay(), 0);
+ handler->OnReadWaiting();
}
-#endif
-
-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 = wxGlobalDisplay();
- info.versionMajor = ProtocolVersion (display);
- info.versionMinor = ProtocolRevision (display);
- info.os = wxMOTIF_X;
- return info;
}
-// ----------------------------------------------------------------------------
-// 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.
-static char * GetIniFile (char *dest, const char *filename)
+// This class exists just to call XtRemoveInput() in its dtor, the real work of
+// dispatching events on the file descriptor to the handler is done by
+// wxMotifInputHandler callback above.
+class wxMotifEventLoopSource : public wxEventLoopSource
{
- char *home = NULL;
- if (filename && wxIsAbsolutePath(filename))
- {
- strcpy(dest, filename);
- }
- else if ((home = wxGetUserHome("")) != NULL)
+public:
+ wxMotifEventLoopSource(XtInputId inputId,
+ wxEventLoopSourceHandler *handler,
+ int flags)
+ : wxEventLoopSource(handler, flags),
+ m_inputId(inputId)
{
- 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;
-}
-static char *GetResourcePath(char *buf, const char *name, bool create = FALSE)
-{
- if (create && wxFileExists (name) ) {
- strcpy(buf, name);
- return buf; // Exists so ...
- }
-
- if (*name == '/')
- strcpy(buf, name);
- else {
- // Put in standard place for resource files if not absolute
- strcpy (buf, DEFAULT_XRESOURCE_DIR);
- strcat (buf, "/");
- strcat (buf, wxFileNameFromPath (name).c_str());
- }
-
- if (create) {
- // Touch the file to create it
- FILE *fd = fopen (buf, "w");
- if (fd) fclose (fd);
+ virtual ~wxMotifEventLoopSource()
+ {
+ XtRemoveInput(m_inputId);
}
- return buf;
-}
-/*
-* We have a cache for writing different resource files,
-* which will only get flushed when we call wxFlushResources().
-* Build up a list of resource databases waiting to be written.
-*
-*/
+private:
+ const XtInputId m_inputId;
-wxList wxResourceCache (wxKEY_STRING);
+ wxDECLARE_NO_COPY_CLASS(wxMotifEventLoopSource);
+};
-void
-wxFlushResources (void)
+class wxMotifEventLoopSourcesManager : public wxEventLoopSourcesManagerBase
{
- char nameBuffer[512];
-
- wxNode *node = wxResourceCache.First ();
- while (node)
+public:
+ wxEventLoopSource *
+ AddSourceForFD(int fd, wxEventLoopSourceHandler* handler, int flags)
{
- 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);
- wxNode *next = node->Next ();
- delete node;
- node = next;
- }
-}
+ wxCHECK_MSG( wxTheApp, NULL, "Must create wxTheApp first" );
-static XrmDatabase wxResourceDatabase = 0;
+ // The XtInputXXXMask values cannot be combined (hence "Mask" is a
+ // complete misnomer), and supporting those would make the code more
+ // complicated and we don't need them for now.
+ wxCHECK_MSG( !(flags & (wxEVENT_SOURCE_OUTPUT |
+ wxEVENT_SOURCE_EXCEPTION)),
+ NULL,
+ "Monitoring FDs for output/errors not supported" );
-void wxXMergeDatabases (wxApp * theApp, Display * display);
+ wxCHECK_MSG( flags & wxEVENT_SOURCE_INPUT,
+ NULL,
+ "Should be monitoring for input" );
-bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
-{
- char buffer[500];
-
- (void) GetIniFile (buffer, file);
+ XtInputId inputId = XtAppAddInput
+ (
+ (XtAppContext) wxTheApp->GetAppContext(),
+ fd,
+ (XtPointer) XtInputReadMask,
+ wxMotifInputHandler,
+ handler
+ );
+ if ( inputId < 0 )
+ return 0;
- XrmDatabase database;
- wxNode *node = wxResourceCache.Find (buffer);
- if (node)
- database = (XrmDatabase) node->Data ();
- else
- {
- database = XrmGetFileDatabase (buffer);
- wxResourceCache.Append (buffer, (wxObject *) database);
+ return new wxMotifEventLoopSource(inputId, handler, flags);
}
+};
- char resName[300];
- strcpy (resName, section.c_str());
- strcat (resName, ".");
- strcat (resName, entry.c_str());
-
- XrmPutStringResource (&database, resName, value);
- return TRUE;
-}
-
-bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)
-{
- char buf[50];
- sprintf(buf, "%.4f", value);
- return wxWriteResource(section, entry, buf, file);
-}
-
-bool wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file)
+wxEventLoopSourcesManagerBase* wxGUIAppTraits::GetEventLoopSourcesManager()
{
- char buf[50];
- sprintf(buf, "%ld", value);
- return wxWriteResource(section, entry, buf, file);
-}
+ static wxMotifEventLoopSourcesManager s_eventLoopSourcesManager;
-bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file)
-{
- char buf[50];
- sprintf(buf, "%d", value);
- return wxWriteResource(section, entry, buf, file);
+ return &s_eventLoopSourcesManager;
}
-bool wxGetResource(const wxString& section, const wxString& entry, char **value, const wxString& file)
-{
- if (!wxResourceDatabase)
- {
- Display *display = wxGlobalDisplay();
- wxXMergeDatabases (wxTheApp, display);
- }
-
- XrmDatabase database;
-
- 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);
+#endif // wxUSE_EVENTLOOP_SOURCE
- wxNode *node = wxResourceCache.Find (buffer);
- if (node)
- database = (XrmDatabase) node->Data ();
- else
- {
- database = XrmGetFileDatabase (buffer);
- wxResourceCache.Append (buffer, (wxObject *) database);
- }
- }
- else
- database = wxResourceDatabase;
-
- 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...
- if (!success)
- {
- buf[0] = (isupper (buf[0]) ? tolower (buf[0]) : toupper (buf[0]));
- success = XrmGetResource (database, buf, "*", str_type,
- &xvalue);
- }
- if (success)
- {
- if (*value)
- delete[] *value;
-
- *value = new char[xvalue.size + 1];
- strncpy (*value, xvalue.addr, (int) xvalue.size);
- return TRUE;
- }
- return FALSE;
-}
+// ----------------------------------------------------------------------------
+// misc
+// ----------------------------------------------------------------------------
-bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file)
+// Emit a beeeeeep
+void wxBell()
{
- char *s = NULL;
- bool succ = wxGetResource(section, entry, (char **)&s, file);
- if (succ)
- {
- *value = (float)strtod(s, NULL);
- delete[] s;
- return TRUE;
- }
- else return FALSE;
+ // Use current setting for the bell
+ XBell (wxGlobalDisplay(), 0);
}
-bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file)
+wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
{
- char *s = NULL;
- bool succ = wxGetResource(section, entry, (char **)&s, file);
- if (succ)
- {
- *value = strtol(s, NULL, 10);
- delete[] s;
- return TRUE;
- }
- else return FALSE;
-}
+ // XmVERSION and XmREVISION are defined in Xm/Xm.h
+ if ( verMaj )
+ *verMaj = XmVERSION;
+ if ( verMin )
+ *verMin = XmREVISION;
-bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file)
-{
- char *s = NULL;
- bool succ = wxGetResource(section, entry, (char **)&s, file);
- if (succ)
- {
- // Handle True, False here
- // 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
- else if (*s == 'F' || *s == 'N' || *s == 'D' || *s == 'R' || *s == 'C')
- *value = FALSE;
- // Handle as Integer
- else
- *value = (int) strtol (s, NULL, 10);
- delete[] s;
- return TRUE;
- }
- else
- return FALSE;
+ return wxPORT_MOTIF;
}
-void wxXMergeDatabases (wxApp * theApp, Display * display)
+wxEventLoopBase* wxGUIAppTraits::CreateEventLoop()
{
- 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, classname.c_str());
-
- /* 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
- */
-
- if (XResourceManagerString (display) != NULL)
- {
- serverDB = XrmGetStringDatabase (XResourceManagerString (display));
- }
- else
- {
- (void) GetIniFile (filename, NULL);
- serverDB = XrmGetFileDatabase (filename);
- }
- XrmMergeDatabases (serverDB, &wxResourceDatabase);
-
- /* 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);
- wxString hostname = wxGetHostName();
- if ( !!hostname )
- strncat(environment, hostname, 1024 - len);
- }
- homeDB = XrmGetFileDatabase (environment);
- XrmMergeDatabases (homeDB, &wxResourceDatabase);
+ return new wxEventLoop;
}
-#if 0
-
-/*
-* Not yet used but may be useful.
-*
-*/
-void
-wxSetDefaultResources (const Widget w, const char **resourceSpec, const char *name)
+wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer* timer)
{
- int i;
- Display *dpy = XtDisplay (w); // Retrieve the display pointer
-
- XrmDatabase rdb = NULL; // A resource data base
-
- // Create an empty resource database
- rdb = XrmGetStringDatabase ("");
-
- // Add the Component resources, prepending the name of the component
-
- i = 0;
- while (resourceSpec[i] != NULL)
- {
- char buf[1000];
-
- sprintf (buf, "*%s%s", name, resourceSpec[i++]);
- XrmPutLineResource (&rdb, buf);
- }
-
- // Merge them into the Xt database, with lowest precendence
-
- if (rdb)
- {
-#if (XlibSpecificationRelease>=5)
- XrmDatabase db = XtDatabase (dpy);
- XrmCombineDatabase (rdb, &db, FALSE);
-#else
- XrmMergeDatabases (dpy->db, &rdb);
- dpy->db = rdb;
-#endif
- }
+ return new wxMotifTimerImpl(timer);
}
-#endif
-// 0
-
-#endif // wxUSE_RESOURCES
// ----------------------------------------------------------------------------
// display info
*x = xev.x_root;
*y = xev.y_root;
#endif
-};
+}
-// Return TRUE if we have a colour display
+// Return true if we have a colour display
bool wxColourDisplay()
{
return wxDisplayDepth() > 1;
*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;
{
gs_displayName = display_name;
- if ( display_name.IsEmpty() )
+ if ( display_name.empty() )
{
gs_currentDisplay = NULL;
- return TRUE;
+ return true;
}
else
{
if (display)
{
gs_currentDisplay = (WXDisplay*) display;
- return TRUE;
+ return true;
}
else
- return FALSE;
+ return false;
}
}
return wxGenericFindWindowAtPoint(pt);
}
-// ----------------------------------------------------------------------------
-// keycode translations
-// ----------------------------------------------------------------------------
-
-#include <X11/keysym.h>
-
-// FIXME what about tables??
-
-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;
- }
-
- return id;
-}
-
-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;
- }
-
- return keySym;
-}
-
// ----------------------------------------------------------------------------
// Some colour manipulation routines
// ----------------------------------------------------------------------------
case 4: r = t, g = p, b = v; break;
case 5: r = v, g = p, b = q; break;
}
- rgb->red = r << 8;
- rgb->green = g << 8;
- rgb->blue = b << 8;
+ rgb->red = (unsigned short)(r << 8);
+ rgb->green = (unsigned short)(g << 8);
+ rgb->blue = (unsigned short)(b << 8);
}
void wxXColorToHSV(wxHSV *hsv,XColor *rgb)
{
if (!XAllocColor(d,cmp,xc))
{
- // cout << "wxAllocColor : Warning : Can not allocate color, attempt find nearest !\n";
+ // cout << "wxAllocColor : Warning : cannot allocate color, attempt find nearest !\n";
wxAllocNearestColor(d,cmp,xc);
}
}
-#ifdef __WXDEBUG__
wxString wxGetXEventName(XEvent& event)
{
#if wxUSE_NANOX
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;
+ static char* event_name[] = {
+ wxMOTIF_STR(""), wxMOTIF_STR("unknown(-)"), // 0-1
+ wxMOTIF_STR("KeyPress"), wxMOTIF_STR("KeyRelease"), wxMOTIF_STR("ButtonPress"), wxMOTIF_STR("ButtonRelease"), // 2-5
+ wxMOTIF_STR("MotionNotify"), wxMOTIF_STR("EnterNotify"), wxMOTIF_STR("LeaveNotify"), wxMOTIF_STR("FocusIn"), // 6-9
+ wxMOTIF_STR("FocusOut"), wxMOTIF_STR("KeymapNotify"), wxMOTIF_STR("Expose"), wxMOTIF_STR("GraphicsExpose"), // 10-13
+ wxMOTIF_STR("NoExpose"), wxMOTIF_STR("VisibilityNotify"), wxMOTIF_STR("CreateNotify"), // 14-16
+ wxMOTIF_STR("DestroyNotify"), wxMOTIF_STR("UnmapNotify"), wxMOTIF_STR("MapNotify"), wxMOTIF_STR("MapRequest"),// 17-20
+ wxMOTIF_STR("ReparentNotify"), wxMOTIF_STR("ConfigureNotify"), wxMOTIF_STR("ConfigureRequest"), // 21-23
+ wxMOTIF_STR("GravityNotify"), wxMOTIF_STR("ResizeRequest"), wxMOTIF_STR("CirculateNotify"), // 24-26
+ wxMOTIF_STR("CirculateRequest"), wxMOTIF_STR("PropertyNotify"), wxMOTIF_STR("SelectionClear"), // 27-29
+ wxMOTIF_STR("SelectionRequest"), wxMOTIF_STR("SelectionNotify"), wxMOTIF_STR("ColormapNotify"), // 30-32
+ wxMOTIF_STR("ClientMessage"), wxMOTIF_STR("MappingNotify"), // 33-34
+ wxMOTIF_STR("unknown(+)")}; // 35
+ type = wxMin(35, type); type = wxMax(1, type);
+ wxString str(event_name[type]);
+ return str;
#endif
}
-#endif
// ----------------------------------------------------------------------------
// accelerators
char* wxFindAccelerator( const char *s )
{
#if 1
+ wxUnusedVar(s);
// VZ: this function returns incorrect keysym which completely breaks kbd
// handling
return NULL;
XmString wxFindAcceleratorText (const char *s)
{
#if 1
+ wxUnusedVar(s);
// VZ: this function returns incorrect keysym which completely breaks kbd
// handling
return NULL;
// Change a widget's foreground and background colours.
void wxDoChangeForegroundColour(WXWidget widget, wxColour& foregroundColour)
{
+ if (!foregroundColour.IsOk())
+ return;
+
// When should we specify the foreground, if it's calculated
// by wxComputeColours?
// Solution: say we start with the default (computed) foreground colour.
NULL);
}
-void wxDoChangeBackgroundColour(WXWidget widget, wxColour& backgroundColour, bool changeArmColour)
+void wxDoChangeBackgroundColour(WXWidget widget, const wxColour& backgroundColour, bool changeArmColour)
{
+ if (!backgroundColour.IsOk())
+ return;
+
wxComputeColours (XtDisplay((Widget) widget), & backgroundColour,
- (wxColour*) NULL);
+ NULL);
XtVaSetValues ((Widget) widget,
XmNbackground, g_itemColors[wxBACK_INDEX].pixel,
NULL);
}
-extern void wxDoChangeFont(WXWidget widget, wxFont& font)
+extern void wxDoChangeFont(WXWidget widget, const wxFont& font)
{
- // Lesstif 0.87 hangs here, but 0.93 does not
-#if !wxCHECK_LESSTIF() || wxCHECK_LESSTIF_VERSION( 0, 93 )
+ // Lesstif 0.87 hangs here, but 0.93 does not; MBN: sometimes it does
+#if !wxCHECK_LESSTIF() // || wxCHECK_LESSTIF_VERSION( 0, 93 )
Widget w = (Widget)widget;
XtVaSetValues( w,
- wxFont::GetFontTag(), font.GetFontType( XtDisplay(w) ),
+ wxFont::GetFontTag(), font.GetFontTypeC( XtDisplay(w) ),
NULL );
+#else
+ wxUnusedVar(widget);
+ wxUnusedVar(font);
#endif
}
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);
// Creates a bitmap with transparent areas drawn in
// the given colour.
-wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, wxColour& colour)
+wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, const wxColour& colour)
{
wxBitmap newBitmap(bitmap.GetWidth(),
bitmap.GetHeight(),
wxMemoryDC destDC;
wxMemoryDC srcDC;
- srcDC.SelectObject(bitmap);
+ srcDC.SelectObjectAsSource(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);
+ &srcDC, 0, 0, wxCOPY, true);
return newBitmap;
}
NULL
);
}
- else if (style & wxSUNKEN_BORDER)
+ else if ((style & wxSUNKEN_BORDER) || (style & wxBORDER_THEME))
{
borderWidget = XtVaCreateManagedWidget
(
projects / wxWidgets.git / blobdiff