// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "window.h"
#endif
#include "wx/msgdlg.h"
#include "wx/frame.h"
#include "wx/scrolwin.h"
+#include "wx/scrolbar.h"
#include "wx/module.h"
#include "wx/menuitem.h"
#include "wx/log.h"
+#include "wx/fontutil.h"
+#include "wx/univ/renderer.h"
+#include "wx/hash.h"
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
#include "wx/x11/private.h"
#include "X11/Xutil.h"
+#if wxUSE_NANOX
+// For wxGetLocalTime, used by XButtonEventGetTime
+#include "wx/timer.h"
+#endif
+
#include <string.h>
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
extern wxHashTable *wxWidgetHashTable;
+extern wxHashTable *wxClientWidgetHashTable;
static wxWindow* g_captureWindow = NULL;
+static GC g_eraseGC;
// ----------------------------------------------------------------------------
// macros
void wxWindowX11::Init()
{
- // generic initializations first
- InitBase();
-
// X11-specific
- m_mainWidget = (WXWindow) 0;
+ m_mainWindow = (WXWindow) 0;
+ m_clientWindow = (WXWindow) 0;
+ m_insertIntoMain = FALSE;
+ m_updateNcArea = FALSE;
+
m_winCaptured = FALSE;
m_needsInputFocus = FALSE;
m_isShown = TRUE;
- m_isBeingDeleted = FALSE;
m_lastTS = 0;
m_lastButton = 0;
}
long style,
const wxString& name)
{
- wxCHECK_MSG( parent, FALSE, "can't create wxWindow without parent" );
+ wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") );
CreateBase(parent, id, pos, size, style, wxDefaultValidator, name);
parent->AddChild(this);
- int w = size.GetWidth();
- int h = size.GetHeight();
- int x = size.GetX();
- int y = size.GetY();
- if (w == -1) w = 20;
- if (h == -1) h = 20;
- if (x == -1) x = 0;
- if (y == -1) y = 0;
-
Display *xdisplay = (Display*) wxGlobalDisplay();
int xscreen = DefaultScreen( xdisplay );
+ Visual *xvisual = DefaultVisual( xdisplay, xscreen );
Colormap cm = DefaultColormap( xdisplay, xscreen );
m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
- m_backgroundColour.CalcPixel( (WXColormap) cm );
-
+ m_backgroundColour.CalcPixel( (WXColormap) cm );
+
m_foregroundColour = *wxBLACK;
- m_foregroundColour.CalcPixel( (WXColormap) cm );
+ m_foregroundColour.CalcPixel( (WXColormap) cm );
- Window parentWindow = (Window) parent->GetMainWindow();
+ Window xparent = (Window) parent->GetClientAreaWindow();
+ // Add window's own scrollbars to main window, not to client window
+ if (parent->GetInsertIntoMain())
+ {
+ // wxLogDebug( "Inserted into main: %s", GetName().c_str() );
+ xparent = (Window) parent->GetMainWindow();
+ }
+
+ // Size (not including the border) must be nonzero (or a Value error results)!
+ // Note: The Xlib manual doesn't mention this restriction of XCreateWindow.
wxSize size2(size);
- if (size2.x == -1)
- size2.x = 100;
- if (size2.y == -1)
- size2.y = 100;
+ if (size2.x <= 0)
+ size2.x = 20;
+ if (size2.y <= 0)
+ size2.y = 20;
wxPoint pos2(pos);
if (pos2.x == -1)
- pos2.x = 100;
+ pos2.x = 0;
if (pos2.y == -1)
- pos2.y = 100;
-
- Window xwindow = XCreateSimpleWindow(
- xdisplay, parentWindow,
- pos2.x, pos2.y, size2.x, size2.y, 0,
- m_backgroundColour.GetPixel(),
- m_backgroundColour.GetPixel() );
-
- m_mainWidget = (WXWindow) xwindow;
-
- // Select event types wanted
- XSelectInput( xdisplay, xwindow,
- ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
- ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
- KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
- PropertyChangeMask);
-
- wxAddWindowToTable( xwindow, (wxWindow*) this );
+ pos2.y = 0;
+
+#if wxUSE_TWO_WINDOWS
+ bool need_two_windows =
+ ((( wxSUNKEN_BORDER | wxRAISED_BORDER | wxSIMPLE_BORDER | wxHSCROLL | wxVSCROLL ) & m_windowStyle) != 0);
+#else
+ bool need_two_windows = FALSE;
+#endif
+
+#if wxUSE_NANOX
+ long xattributes = 0;
+#else
+ XSetWindowAttributes xattributes;
+ long xattributes_mask = 0;
+
+ xattributes_mask |= CWBackPixel;
+ xattributes.background_pixel = m_backgroundColour.GetPixel();
+
+ xattributes_mask |= CWBorderPixel;
+ xattributes.border_pixel = BlackPixel( xdisplay, xscreen );
+
+ xattributes_mask |= CWEventMask;
+#endif
+
+ if (need_two_windows)
+ {
+#if wxUSE_NANOX
+ long backColor, foreColor;
+ backColor = GR_RGB(m_backgroundColour.Red(), m_backgroundColour.Green(), m_backgroundColour.Blue());
+ foreColor = GR_RGB(m_foregroundColour.Red(), m_foregroundColour.Green(), m_foregroundColour.Blue());
+
+ Window xwindow = XCreateWindowWithColor( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y,
+ 0, 0, InputOutput, xvisual, backColor, foreColor);
+ XSelectInput( xdisplay, xwindow,
+ GR_EVENT_MASK_CLOSE_REQ | ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+ ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+ KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+ PropertyChangeMask );
+
+#else
+ // Normal X11
+ xattributes.event_mask =
+ ExposureMask | StructureNotifyMask | ColormapChangeMask;
+
+ Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y,
+ 0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
+
+#endif
+
+ XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
+
+ m_mainWindow = (WXWindow) xwindow;
+ wxAddWindowToTable( xwindow, (wxWindow*) this );
+
+ XMapWindow( xdisplay, xwindow );
+
+#if !wxUSE_NANOX
+ xattributes.event_mask =
+ ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+ ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+ KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+ PropertyChangeMask | VisibilityChangeMask ;
+
+ if (!HasFlag( wxFULL_REPAINT_ON_RESIZE ))
+ {
+ xattributes_mask |= CWBitGravity;
+ xattributes.bit_gravity = StaticGravity;
+ }
+#endif
+
+ if (HasFlag( wxSUNKEN_BORDER) || HasFlag( wxRAISED_BORDER))
+ {
+ pos2.x = 2;
+ pos2.y = 2;
+ size2.x -= 4;
+ size2.y -= 4;
+ }
+ else if (HasFlag( wxSIMPLE_BORDER ))
+ {
+ pos2.x = 1;
+ pos2.y = 1;
+ size2.x -= 2;
+ size2.y -= 2;
+ }
+ else
+ {
+ pos2.x = 0;
+ pos2.y = 0;
+ }
+
+ // Make again sure the size is nonzero.
+ if (size2.x <= 0)
+ size2.x = 1;
+ if (size2.y <= 0)
+ size2.y = 1;
+
+#if wxUSE_NANOX
+ backColor = GR_RGB(m_backgroundColour.Red(), m_backgroundColour.Green(), m_backgroundColour.Blue());
+ foreColor = GR_RGB(m_foregroundColour.Red(), m_foregroundColour.Green(), m_foregroundColour.Blue());
+
+ xwindow = XCreateWindowWithColor( xdisplay, xwindow, pos2.x, pos2.y, size2.x, size2.y,
+ 0, 0, InputOutput, xvisual, backColor, foreColor);
+ XSelectInput( xdisplay, xwindow,
+ GR_EVENT_MASK_CLOSE_REQ | ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+ ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+ KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+ PropertyChangeMask );
+
+#else
+ xwindow = XCreateWindow( xdisplay, xwindow, pos2.x, pos2.y, size2.x, size2.y,
+ 0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
+#endif
+
+ XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
+
+ m_clientWindow = (WXWindow) xwindow;
+ wxAddClientWindowToTable( xwindow, (wxWindow*) this );
+
+ XMapWindow( xdisplay, xwindow );
+ }
+ else
+ {
+ // wxLogDebug( "No two windows needed %s", GetName().c_str() );
+#if wxUSE_NANOX
+ long backColor, foreColor;
+ backColor = GR_RGB(m_backgroundColour.Red(), m_backgroundColour.Green(), m_backgroundColour.Blue());
+ foreColor = GR_RGB(m_foregroundColour.Red(), m_foregroundColour.Green(), m_foregroundColour.Blue());
+
+ Window xwindow = XCreateWindowWithColor( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y,
+ 0, 0, InputOutput, xvisual, backColor, foreColor);
+ XSelectInput( xdisplay, xwindow,
+ GR_EVENT_MASK_CLOSE_REQ | ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+ ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+ KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+ PropertyChangeMask );
+
+#else
+ xattributes.event_mask =
+ ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+ ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
+ KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
+ PropertyChangeMask | VisibilityChangeMask ;
+
+ if (!HasFlag( wxFULL_REPAINT_ON_RESIZE ))
+ {
+ xattributes_mask |= CWBitGravity;
+ xattributes.bit_gravity = NorthWestGravity;
+ }
+
+ Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y,
+ 0, DefaultDepth(xdisplay,xscreen), InputOutput, xvisual, xattributes_mask, &xattributes );
+#endif
+
+ XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
+
+ m_mainWindow = (WXWindow) xwindow;
+ m_clientWindow = m_mainWindow;
+ wxAddWindowToTable( xwindow, (wxWindow*) this );
+
+ XMapWindow( xdisplay, xwindow );
+ }
// Is a subwindow, so map immediately
m_isShown = TRUE;
- XMapWindow( xdisplay, xwindow );
// Without this, the cursor may not be restored properly (e.g. in splitter
// sample).
SetCursor(*wxSTANDARD_CURSOR);
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-
- // Set background to None which will prevent X11 from clearing the
- // background comletely.
- XSetWindowBackgroundPixmap( xdisplay, xwindow, None );
// Don't call this, it can have nasty repercussions for composite controls,
// for example
// Destructor
wxWindowX11::~wxWindowX11()
{
+ SendDestroyEvent();
+
if (g_captureWindow == this)
- g_captureWindow = NULL;
-
- m_isBeingDeleted = TRUE;
-
- // X11-specific actions first
- Window main = (Window) m_mainWidget;
- if ( main )
- {
- // Removes event handlers
- //DetachWidget(main);
- }
+ g_captureWindow = NULL;
- if (m_parent)
- m_parent->RemoveChild( this );
+ m_isBeingDeleted = TRUE;
DestroyChildren();
- // Destroy the window
- if (main)
+ if (m_clientWindow != m_mainWindow)
{
- XSelectInput( wxGlobalDisplay(), main, NoEventMask);
- wxDeleteWindowFromTable( main );
- XDestroyWindow( wxGlobalDisplay(), main );
- m_mainWidget = NULL;
+ // Destroy the cleint window
+ Window xwindow = (Window) m_clientWindow;
+ wxDeleteClientWindowFromTable( xwindow );
+ XDestroyWindow( wxGlobalDisplay(), xwindow );
+ m_clientWindow = NULL;
}
+
+ // Destroy the window
+ Window xwindow = (Window) m_mainWindow;
+ wxDeleteWindowFromTable( xwindow );
+ XDestroyWindow( wxGlobalDisplay(), xwindow );
+ m_mainWindow = NULL;
}
// ---------------------------------------------------------------------------
void wxWindowX11::SetFocus()
{
- Window xwindow = (Window) GetMainWindow();
-
+ Window xwindow = (Window) m_clientWindow;
+
wxCHECK_RET( xwindow, wxT("invalid window") );
+ wxCHECK_RET( AcceptsFocus(), wxT("set focus on window that doesn't accept the focus") );
+
+#if 0
+ if (GetName() == "scrollBar")
+ {
+ char *crash = NULL;
+ *crash = 0;
+ }
+#endif
+
if (wxWindowIsVisible(xwindow))
{
- // XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToParent, CurrentTime );
+ wxLogTrace( _T("focus"), _T("wxWindowX11::SetFocus: %s"), GetClassInfo()->GetClassName());
+ // XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToParent, CurrentTime );
+ XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToNone, CurrentTime );
m_needsInputFocus = FALSE;
}
else
if (xfocus)
{
wxWindow *win = wxGetWindowFromTable( xfocus );
+ if (!win)
+ {
+ win = wxGetClientWindowFromTable( xfocus );
+ }
return win;
}
return NULL;
}
-wxWindow *wxWindowX11::GetFocusWidget()
-{
- wxWindow *win = (wxWindow*) this;
- while (!win->IsTopLevel())
- {
- win = win->GetParent();
- if (!win)
- return (wxWindow*) NULL;
- }
-
- return win;
-}
-
// Enabling/disabling handled by event loop, and not sending events
// if disabled.
bool wxWindowX11::Enable(bool enable)
{
if ( !wxWindowBase::Enable(enable) )
return FALSE;
-
+
return TRUE;
}
{
wxWindowBase::Show(show);
- Window xwin = (Window) GetXWindow();
- Display *xdisp = (Display*) GetXDisplay();
+ Window xwindow = (Window) m_mainWindow;
+ Display *xdisp = wxGlobalDisplay();
if (show)
{
- wxString msg;
- msg.Printf("Mapping window of type %s", GetClassInfo()->GetClassName());
- wxLogDebug(msg);
- XMapWindow(xdisp, xwin);
- XSync(xdisp, False);
+ // wxLogDebug( "Mapping window of type %s", GetName().c_str() );
+ XMapWindow(xdisp, xwindow);
}
else
{
- wxString msg;
- msg.Printf("Unmapping window of type %s", GetClassInfo()->GetClassName());
- wxLogDebug(msg);
- XUnmapWindow(xdisp, xwin);
+ // wxLogDebug( "Unmapping window of type %s", GetName().c_str() );
+ XUnmapWindow(xdisp, xwindow);
}
return TRUE;
// Raise the window to the top of the Z order
void wxWindowX11::Raise()
{
- if (m_mainWidget)
- XRaiseWindow( wxGlobalDisplay(), (Window) m_mainWidget );
+ if (m_mainWindow)
+ XRaiseWindow( wxGlobalDisplay(), (Window) m_mainWindow );
}
// Lower the window to the bottom of the Z order
void wxWindowX11::Lower()
{
- if (m_mainWidget)
- XLowerWindow( wxGlobalDisplay(), (Window) m_mainWidget );
+ if (m_mainWindow)
+ XLowerWindow( wxGlobalDisplay(), (Window) m_mainWindow );
}
void wxWindowX11::DoCaptureMouse()
{
if ((g_captureWindow != NULL) && (g_captureWindow != this))
{
- wxASSERT_MSG(FALSE, "Trying to capture before mouse released.");
+ wxASSERT_MSG(FALSE, wxT("Trying to capture before mouse released."));
// Core dump now
int *tmp = NULL;
(*tmp) = 1;
return;
}
-
+
if (m_winCaptured)
return;
- Window xwindow = (Window) GetMainWindow();
+ Window xwindow = (Window) m_clientWindow;
wxCHECK_RET( xwindow, wxT("invalid window") );
-
+
g_captureWindow = (wxWindow*) this;
if (xwindow)
FALSE,
ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
GrabModeAsync,
- GrabModeAsync,
+ GrabModeAsync,
None,
None, /* cursor */ // TODO: This may need to be set to the cursor of this window
CurrentTime );
if (res != GrabSuccess)
{
wxString msg;
- msg.Printf("Failed to grab pointer for window %s", this->GetClassInfo()->GetClassName());
+ msg.Printf(wxT("Failed to grab pointer for window %s"), this->GetClassInfo()->GetClassName());
wxLogDebug(msg);
if (res == GrabNotViewable)
- {
- wxLogDebug("This is not a viewable window - perhaps not shown yet?");
- }
- g_captureWindow = NULL;
- return;
- }
+ wxLogDebug( wxT("This is not a viewable window - perhaps not shown yet?") );
- wxLogDebug("Grabbed pointer");
-
-#if 0
- res = XGrabButton(wxGlobalDisplay(), AnyButton, AnyModifier,
- (Window) GetMainWindow(),
- FALSE,
- ButtonPressMask | ButtonReleaseMask | ButtonMotionMask,
- GrabModeAsync,
- GrabModeAsync,
- None,
- None);
-
- if (res != GrabSuccess)
- {
- wxLogDebug("Failed to grab mouse buttons.");
- XUngrabPointer(wxGlobalDisplay(), CurrentTime);
+ g_captureWindow = NULL;
return;
}
-#endif
-#if 0
- res = XGrabKeyboard(wxGlobalDisplay(), (Window) GetMainWindow(),
- ShiftMask | LockMask | ControlMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask,
- FALSE,
- GrabModeAsync,
- GrabModeAsync,
- CurrentTime);
-
- if (res != GrabSuccess)
- {
- wxLogDebug("Failed to grab keyboard.");
- XUngrabPointer(wxGlobalDisplay(), CurrentTime);
- XUngrabButton(wxGlobalDisplay(), AnyButton, AnyModifier,
- (Window) GetMainWindow());
- return;
- }
-#endif
-
m_winCaptured = TRUE;
}
}
void wxWindowX11::DoReleaseMouse()
{
g_captureWindow = NULL;
-
+
if ( !m_winCaptured )
return;
- Window xwindow = (Window) GetMainWindow();
+ Window xwindow = (Window) m_clientWindow;
if (xwindow)
{
XUngrabPointer( wxGlobalDisplay(), CurrentTime );
-#if 0
- XUngrabButton( wxGlobalDisplay(), AnyButton, AnyModifier, xwindow);
- XUngrabKeyboard( wxGlobalDisplay(), CurrentTime );
-#endif
}
- wxLogDebug("Ungrabbed pointer");
+
+ // wxLogDebug( "Ungrabbed pointer in %s", GetName().c_str() );
m_winCaptured = FALSE;
}
return FALSE;
}
- Window xwindow = (Window) GetMainWindow();
+ Window xwindow = (Window) m_clientWindow;
wxCHECK_MSG( xwindow, FALSE, wxT("invalid window") );
-
+
wxCursor cursorToUse;
if (m_cursor.Ok())
cursorToUse = m_cursor;
Cursor xcursor = (Cursor) cursorToUse.GetCursor();
- XDefineCursor( (Display*) wxGlobalDisplay(), xwindow, xcursor );
+ XDefineCursor( wxGlobalDisplay(), xwindow, xcursor );
return TRUE;
}
// Coordinates relative to the window
void wxWindowX11::WarpPointer (int x, int y)
{
- Window xwindow = (Window) GetMainWindow();
+ Window xwindow = (Window) m_clientWindow;
wxCHECK_RET( xwindow, wxT("invalid window") );
-
+
XWarpPointer( wxGlobalDisplay(), None, xwindow, 0, 0, 0, 0, x, y);
}
{
// No scrolling requested.
if ((dx == 0) && (dy == 0)) return;
-
+
if (!m_updateRegion.IsEmpty())
{
m_updateRegion.Offset( dx, dy );
-
+
int cw = 0;
int ch = 0;
GetSize( &cw, &ch ); // GetClientSize() ??
m_updateRegion.Intersect( 0, 0, cw, ch );
}
-
+
if (!m_clearRegion.IsEmpty())
{
m_clearRegion.Offset( dx, dy );
-
+
int cw = 0;
int ch = 0;
GetSize( &cw, &ch ); // GetClientSize() ??
m_clearRegion.Intersect( 0, 0, cw, ch );
}
-
- Window xwindow = (Window) GetMainWindow();
+
+ Window xwindow = (Window) GetClientAreaWindow();
wxCHECK_RET( xwindow, wxT("invalid window") );
GC xgc = XCreateGC( xdisplay, xwindow, 0, NULL );
XSetGraphicsExposures( xdisplay, xgc, True );
- int s_x;
- int s_y;
+ int s_x = 0;
+ int s_y = 0;
int cw;
int ch;
if (rect)
{
s_x = rect->x;
s_y = rect->y;
+
cw = rect->width;
ch = rect->height;
}
s_y = 0;
GetClientSize( &cw, &ch );
}
-
+
+#if wxUSE_TWO_WINDOWS
+ wxPoint offset( 0,0 );
+#else
wxPoint offset = GetClientAreaOrigin();
s_x += offset.x;
s_y += offset.y;
+#endif
int w = cw - abs(dx);
int h = ch - abs(dy);
-
+
if ((h < 0) || (w < 0))
{
Refresh();
else
{
wxRect rect;
- if (dx < 0) rect.x = cw+dx; else rect.x = s_x;
- if (dy < 0) rect.y = ch+dy; else rect.y = s_y;
+ if (dx < 0) rect.x = cw+dx + offset.x; else rect.x = s_x;
+ if (dy < 0) rect.y = ch+dy + offset.y; else rect.y = s_y;
if (dy != 0) rect.width = cw; else rect.width = abs(dx);
if (dx != 0) rect.height = ch; else rect.height = abs(dy);
-
+
int d_x = s_x;
int d_y = s_y;
+
if (dx < 0) s_x += -dx;
if (dy < 0) s_y += -dy;
- if (dx > 0) d_x = dx;
- if (dy > 0) d_y = dy;
+ if (dx > 0) d_x = dx + offset.x;
+ if (dy > 0) d_y = dy + offset.y;
XCopyArea( xdisplay, xwindow, xwindow, xgc, s_x, s_y, w, h, d_x, d_y );
-
- // printf( "s_x %d s_y %d w %d h %d d_x %d d_y %d\n", s_x, s_y, w, h, d_x, d_y );
- // printf( "rect %d %d %d %d\n", rect.x, rect.y, rect.width, rect.height );
+ // wxLogDebug( "Copy: s_x %d s_y %d w %d h %d d_x %d d_y %d", s_x, s_y, w, h, d_x, d_y );
+
+ // wxLogDebug( "Update: %d %d %d %d", rect.x, rect.y, rect.width, rect.height );
m_updateRegion.Union( rect );
m_clearRegion.Union( rect );
}
-
+
XFreeGC( xdisplay, xgc );
}
// Get total size
void wxWindowX11::DoGetSize(int *x, int *y) const
{
- Window xwindow = (Window) GetMainWindow();
+ Window xwindow = (Window) m_mainWindow;
wxCHECK_RET( xwindow, wxT("invalid window") );
-
- XSync(wxGlobalDisplay(), False);
+
+ //XSync(wxGlobalDisplay(), False);
+
XWindowAttributes attr;
Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr );
wxASSERT(status);
-
+
if (status)
{
*x = attr.width /* + 2*m_borderSize */ ;
void wxWindowX11::DoGetPosition(int *x, int *y) const
{
- Window window = (Window) m_mainWidget;
+ Window window = (Window) m_mainWindow;
if (window)
{
- XSync(wxGlobalDisplay(), False);
+ //XSync(wxGlobalDisplay(), False);
XWindowAttributes attr;
Status status = XGetWindowAttributes(wxGlobalDisplay(), window, & attr);
wxASSERT(status);
-
+
if (status)
{
*x = attr.x;
*y = attr.y;
-
+
// We may be faking the client origin. So a window that's really at (0, 30)
// may appear (to wxWin apps) to be at (0, 0).
if (GetParent())
{
Display *display = wxGlobalDisplay();
Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display));
- Window thisWindow = (Window) m_mainWidget;
+ Window thisWindow = (Window) m_clientWindow;
Window childWindow;
int xx = *x;
{
Display *display = wxGlobalDisplay();
Window rootWindow = RootWindowOfScreen(DefaultScreenOfDisplay(display));
- Window thisWindow = (Window) m_mainWidget;
+ Window thisWindow = (Window) m_clientWindow;
Window childWindow;
int xx = *x;
// Get size *available for subwindows* i.e. excluding menu bar etc.
void wxWindowX11::DoGetClientSize(int *x, int *y) const
{
- Window window = (Window) m_mainWidget;
+ Window window = (Window) m_mainWindow;
if (window)
{
- XSync(wxGlobalDisplay(), False); // Is this really a good idea?
XWindowAttributes attr;
Status status = XGetWindowAttributes( wxGlobalDisplay(), window, &attr );
wxASSERT(status);
-
+
if (status)
{
*x = attr.width ;
void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
- Window xwindow = (Window) GetMainWindow();
+ // wxLogDebug("DoSetSize: %s (%ld) %d, %d %dx%d", GetClassInfo()->GetClassName(), GetId(), x, y, width, height);
+
+ Window xwindow = (Window) m_mainWindow;
wxCHECK_RET( xwindow, wxT("invalid window") );
XWindowAttributes attr;
Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr );
wxCHECK_RET( status, wxT("invalid window attributes") );
-
+
int new_x = attr.x;
int new_y = attr.y;
int new_w = attr.width;
int new_h = attr.height;
-
if (x != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
{
if (new_h <= 0)
new_h = 20;
}
-
+
DoMoveWindow( new_x, new_y, new_w, new_h );
}
void wxWindowX11::DoSetClientSize(int width, int height)
{
- Window xwindow = (Window) GetMainWindow();
+ // wxLogDebug("DoSetClientSize: %s (%ld) %dx%d", GetClassInfo()->GetClassName(), GetId(), width, height);
+
+ Window xwindow = (Window) m_mainWindow;
wxCHECK_RET( xwindow, wxT("invalid window") );
- XWindowAttributes attr;
- Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr );
- wxCHECK_RET( status, wxT("invalid window attributes") );
-
- int new_x = attr.x;
- int new_y = attr.y;
- int new_w = attr.width;
- int new_h = attr.height;
-
- if (width != -1)
- new_w = width;
-
- if (height != -1)
- new_h = height;
-
- DoMoveWindow( new_x, new_y, new_w, new_h );
+ XResizeWindow( wxGlobalDisplay(), xwindow, width, height );
+
+ if (m_mainWindow != m_clientWindow)
+ {
+ xwindow = (Window) m_clientWindow;
+
+ wxWindow *window = (wxWindow*) this;
+ wxRenderer *renderer = window->GetRenderer();
+ if (renderer)
+ {
+ wxRect border = renderer->GetBorderDimensions( (wxBorder)(m_windowStyle & wxBORDER_MASK) );
+ width -= border.x + border.width;
+ height -= border.y + border.height;
+ }
+
+ XResizeWindow( wxGlobalDisplay(), xwindow, width, height );
+ }
}
// For implementation purposes - sometimes decorations make the client area
return wxPoint(0, 0);
}
-// Makes an adjustment to the window position (for example, a frame that has
-// a toolbar that it manages itself).
-void wxWindowX11::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
+void wxWindowX11::DoMoveWindow(int x, int y, int width, int height)
{
- if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent())
+ Window xwindow = (Window) m_mainWindow;
+
+ wxCHECK_RET( xwindow, wxT("invalid window") );
+
+#if !wxUSE_NANOX
+
+ XMoveResizeWindow( wxGlobalDisplay(), xwindow, x, y, width, height );
+ if (m_mainWindow != m_clientWindow)
{
- wxPoint pt(GetParent()->GetClientAreaOrigin());
- x += pt.x; y += pt.y;
+ xwindow = (Window) m_clientWindow;
+
+ wxWindow *window = (wxWindow*) this;
+ wxRenderer *renderer = window->GetRenderer();
+ if (renderer)
+ {
+ wxRect border = renderer->GetBorderDimensions( (wxBorder)(m_windowStyle & wxBORDER_MASK) );
+ x = border.x;
+ y = border.y;
+ width -= border.x + border.width;
+ height -= border.y + border.height;
+ }
+ else
+ {
+ x = 0;
+ y = 0;
+ }
+
+ wxScrollBar *sb = window->GetScrollbar( wxHORIZONTAL );
+ if (sb && sb->IsShown())
+ {
+ wxSize size = sb->GetSize();
+ height -= size.y;
+ }
+ sb = window->GetScrollbar( wxVERTICAL );
+ if (sb && sb->IsShown())
+ {
+ wxSize size = sb->GetSize();
+ width -= size.x;
+ }
+
+ XMoveResizeWindow( wxGlobalDisplay(), xwindow, x, y, wxMax(1, width), wxMax(1, height) );
}
+
+#else
+
+ XWindowChanges windowChanges;
+ windowChanges.x = x;
+ windowChanges.y = y;
+ windowChanges.width = width;
+ windowChanges.height = height;
+ windowChanges.stack_mode = 0;
+ int valueMask = CWX | CWY | CWWidth | CWHeight;
+
+ XConfigureWindow( wxGlobalDisplay(), xwindow, valueMask, &windowChanges );
+
+#endif
}
void wxWindowX11::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
m_maxWidth = maxW;
m_maxHeight = maxH;
+#if !wxUSE_NANOX
XSizeHints sizeHints;
sizeHints.flags = 0;
-
+
if (minW > -1 && minH > -1)
{
sizeHints.flags |= PMinSize;
sizeHints.height_inc = incH;
}
- XSetWMNormalHints(wxGlobalDisplay(), (Window) GetMainWindow(), & sizeHints);
-}
-
-void wxWindowX11::DoMoveWindow(int x, int y, int width, int height)
-{
- Window xwindow = (Window) GetMainWindow();
-
- wxCHECK_RET( xwindow, wxT("invalid window") );
-
- XWindowChanges windowChanges;
- windowChanges.x = x;
- windowChanges.y = y;
- windowChanges.width = width;
- windowChanges.height = height;
- windowChanges.stack_mode = 0;
- int valueMask = CWX | CWY | CWWidth | CWHeight;
-
- XConfigureWindow( wxGlobalDisplay(), xwindow, valueMask, &windowChanges );
+ XSetWMNormalHints(wxGlobalDisplay(), (Window) m_mainWindow, &sizeHints );
+#endif
}
// ---------------------------------------------------------------------------
int wxWindowX11::GetCharHeight() const
{
- wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
+ wxCHECK_MSG( m_font.Ok(), 0, wxT("valid window font needed") );
+
+#if wxUSE_UNICODE
+ // There should be an easier way.
+ PangoLayout *layout = pango_layout_new( wxTheApp->GetPangoContext() );
+ pango_layout_set_font_description( layout, GetFont().GetNativeFontInfo()->description );
+ pango_layout_set_text(layout, "H", 1 );
+ int w,h;
+ pango_layout_get_pixel_size(layout, &w, &h);
+ g_object_unref( G_OBJECT( layout ) );
- WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay());
+ return h;
+#else
+ WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, wxGlobalDisplay());
int direction, ascent, descent;
XCharStruct overall;
// return (overall.ascent + overall.descent);
return (ascent + descent);
+#endif
}
int wxWindowX11::GetCharWidth() const
{
- wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
+ wxCHECK_MSG( m_font.Ok(), 0, wxT("valid window font needed") );
+
+#if wxUSE_UNICODE
+ // There should be an easier way.
+ PangoLayout *layout = pango_layout_new( wxTheApp->GetPangoContext() );
+ pango_layout_set_font_description( layout, GetFont().GetNativeFontInfo()->description );
+ pango_layout_set_text(layout, "H", 1 );
+ int w,h;
+ pango_layout_get_pixel_size(layout, &w, &h);
+ g_object_unref( G_OBJECT( layout ) );
- WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, GetXDisplay());
+ return w;
+#else
+ WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, wxGlobalDisplay());
int direction, ascent, descent;
XCharStruct overall;
&descent, &overall);
return overall.width;
+#endif
}
void wxWindowX11::GetTextExtent(const wxString& string,
wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") );
- WXFontStructPtr pFontStruct = fontToUse.GetFontStruct(1.0, GetXDisplay());
+ if (string.IsEmpty())
+ {
+ if (x) (*x) = 0;
+ if (y) (*y) = 0;
+ return;
+ }
+
+#if wxUSE_UNICODE
+ PangoLayout *layout = pango_layout_new( wxTheApp->GetPangoContext() );
+
+ PangoFontDescription *desc = fontToUse.GetNativeFontInfo()->description;
+ pango_layout_set_font_description(layout, desc);
+
+ const wxCharBuffer data = wxConvUTF8.cWC2MB( string );
+ pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
+
+ PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
+
+
+ PangoRectangle rect;
+ pango_layout_line_get_extents(line, NULL, &rect);
+
+ if (x) (*x) = (wxCoord) (rect.width / PANGO_SCALE);
+ if (y) (*y) = (wxCoord) (rect.height / PANGO_SCALE);
+ if (descent)
+ {
+ // Do something about metrics here
+ (*descent) = 0;
+ }
+ if (externalLeading) (*externalLeading) = 0; // ??
+
+ g_object_unref( G_OBJECT( layout ) );
+#else
+ WXFontStructPtr pFontStruct = fontToUse.GetFontStruct(1.0, wxGlobalDisplay());
int direction, ascent, descent2;
XCharStruct overall;
int slen = string.Len();
-#if 0
- if (use16)
- XTextExtents16((XFontStruct*) pFontStruct, (XChar2b *) (char*) (const char*) string, slen, &direction,
- &ascent, &descent2, &overall);
-#endif
-
- XTextExtents((XFontStruct*) pFontStruct, string.c_str(), slen,
+ XTextExtents((XFontStruct*) pFontStruct, (char*) string.c_str(), slen,
&direction, &ascent, &descent2, &overall);
if ( x )
*descent = descent2;
if (externalLeading)
*externalLeading = 0;
-
+#endif
}
// ----------------------------------------------------------------------------
{
int height,width;
GetSize( &width, &height );
-
+
// Schedule for later Updating in ::Update() or ::OnInternalIdle().
m_clearRegion.Clear();
m_clearRegion.Union( 0, 0, width, height );
{
int height,width;
GetSize( &width, &height );
-
+
// Schedule for later Updating in ::Update() or ::OnInternalIdle().
m_updateRegion.Clear();
m_updateRegion.Union( 0, 0, width, height );
void wxWindowX11::Update()
{
+ if (m_updateNcArea)
+ {
+ // wxLogDebug("wxWindowX11::UpdateNC: %s", GetClassInfo()->GetClassName());
+ // Send nc paint events.
+ SendNcPaintEvents();
+ }
+
if (!m_updateRegion.IsEmpty())
{
- // Actually send erase and paint events.
- X11SendPaintEvents();
+ // wxLogDebug("wxWindowX11::Update: %s", GetClassInfo()->GetClassName());
+ // Actually send erase events.
+ SendEraseEvents();
+
+ // Actually send paint events.
+ SendPaintEvents();
}
}
-void wxWindowX11::Clear()
+void wxWindowX11::SendEraseEvents()
{
- wxClientDC dc((wxWindow*) this);
- wxBrush brush(GetBackgroundColour(), wxSOLID);
- dc.SetBackground(brush);
- dc.Clear();
+ if (m_clearRegion.IsEmpty()) return;
+
+ wxClientDC dc( (wxWindow*)this );
+ dc.SetClippingRegion( m_clearRegion );
+
+ wxEraseEvent erase_event( GetId(), &dc );
+ erase_event.SetEventObject( this );
+
+ if (!GetEventHandler()->ProcessEvent(erase_event) )
+ {
+ Display *xdisplay = wxGlobalDisplay();
+ Window xwindow = (Window) GetClientAreaWindow();
+ XSetForeground( xdisplay, g_eraseGC, m_backgroundColour.GetPixel() );
+
+ wxRegionIterator upd( m_clearRegion );
+ while (upd)
+ {
+ XFillRectangle( xdisplay, xwindow, g_eraseGC,
+ upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
+ upd ++;
+ }
+ }
+
+ m_clearRegion.Clear();
}
-void wxWindowX11::X11SendPaintEvents()
+void wxWindowX11::SendPaintEvents()
{
+ // wxLogDebug("SendPaintEvents: %s (%ld)", GetClassInfo()->GetClassName(), GetId());
+
m_clipPaintRegion = TRUE;
- if (!m_clearRegion.IsEmpty())
+ wxPaintEvent paint_event( GetId() );
+ paint_event.SetEventObject( this );
+ GetEventHandler()->ProcessEvent( paint_event );
+
+ m_updateRegion.Clear();
+
+ m_clipPaintRegion = FALSE;
+}
+
+void wxWindowX11::SendNcPaintEvents()
+{
+ wxWindow *window = (wxWindow*) this;
+
+ // All this for drawing the small square between the scrollbars.
+ int width = 0;
+ int height = 0;
+ int x = 0;
+ int y = 0;
+ wxScrollBar *sb = window->GetScrollbar( wxHORIZONTAL );
+ if (sb && sb->IsShown())
{
- wxWindowDC dc( (wxWindow*)this );
- dc.SetClippingRegion( m_clearRegion );
-
- wxEraseEvent erase_event( GetId(), &dc );
- erase_event.SetEventObject( this );
-
- if (!GetEventHandler()->ProcessEvent(erase_event))
+ height = sb->GetSize().y;
+ y = sb->GetPosition().y;
+
+ sb = window->GetScrollbar( wxVERTICAL );
+ if (sb && sb->IsShown())
{
- Window xwindow = (Window) GetMainWindow();
+ width = sb->GetSize().x;
+ x = sb->GetPosition().x;
+
Display *xdisplay = wxGlobalDisplay();
- GC xgc = XCreateGC( xdisplay, xwindow, 0, NULL );
- XSetFillStyle( xdisplay, xgc, FillSolid );
- XSetForeground( xdisplay, xgc, m_backgroundColour.GetPixel() );
- wxRegionIterator upd( m_clearRegion );
- while (upd)
- {
- XFillRectangle( xdisplay, xwindow, xgc,
- upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
- upd ++;
- }
- XFreeGC( xdisplay, xgc );
+ Window xwindow = (Window) GetMainWindow();
+ Colormap cm = (Colormap) wxTheApp->GetMainColormap( wxGetDisplay() );
+ wxColour colour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
+ colour.CalcPixel( (WXColormap) cm );
+
+ XSetForeground( xdisplay, g_eraseGC, colour.GetPixel() );
+
+ XFillRectangle( xdisplay, xwindow, g_eraseGC, x, y, width, height );
}
- m_clearRegion.Clear();
}
wxNcPaintEvent nc_paint_event( GetId() );
nc_paint_event.SetEventObject( this );
GetEventHandler()->ProcessEvent( nc_paint_event );
- wxPaintEvent paint_event( GetId() );
- paint_event.SetEventObject( this );
- GetEventHandler()->ProcessEvent( paint_event );
-
- m_updateRegion.Clear();
-
- m_clipPaintRegion = FALSE;
+ m_updateNcArea = FALSE;
}
// ----------------------------------------------------------------------------
// Responds to colour changes: passes event on to children.
void wxWindowX11::OnSysColourChanged(wxSysColourChangedEvent& event)
{
- wxWindowList::Node *node = GetChildren().GetFirst();
+ wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
while ( node )
{
// Only propagate to non-top-level windows
}
}
+// See handler for InFocus case in app.cpp for details.
+wxWindow* g_GettingFocus = NULL;
+
void wxWindowX11::OnInternalIdle()
{
// Update invalidated regions.
Update();
-
+
// This calls the UI-update mechanism (querying windows for
// menu/toolbar/control state information)
- UpdateWindowUI();
+ if (wxUpdateUIEvent::CanUpdate((wxWindow*) this))
+ UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
// Set the input focus if couldn't do it before
if (m_needsInputFocus)
- SetFocus();
+ {
+#if 0
+ wxString msg;
+ msg.Printf("Setting focus for %s from OnInternalIdle\n", GetClassInfo()->GetClassName());
+ printf(msg.c_str());
+#endif
+ SetFocus();
+
+ // If it couldn't set the focus now, there's
+ // no point in trying again.
+ m_needsInputFocus = FALSE;
+ }
+ g_GettingFocus = NULL;
}
// ----------------------------------------------------------------------------
wxWindow *oldItem = NULL;
if ((oldItem = (wxWindow *)wxWidgetHashTable->Get ((long) w)))
{
- wxLogDebug("Widget table clash: new widget is %ld, %s",
- (long)w, win->GetClassInfo()->GetClassName());
+ wxLogDebug( wxT("Widget table clash: new widget is %ld, %s"),
+ (long)w, win->GetClassInfo()->GetClassName());
return FALSE;
}
wxWidgetHashTable->Put((long) w, win);
- wxLogTrace("widget", "XWindow 0x%08x <-> window %p (%s)",
- w, win, win->GetClassInfo()->GetClassName());
+ wxLogTrace( wxT("widget"), wxT("XWindow 0x%08x <-> window %p (%s)"),
+ (unsigned int) w, win, win->GetClassInfo()->GetClassName());
return TRUE;
}
}
// ----------------------------------------------------------------------------
-// add/remove window from the table
+// function which maintain the global hash table mapping client widgets
// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-// X11-specific accessors
-// ----------------------------------------------------------------------------
+bool wxAddClientWindowToTable(Window w, wxWindow *win)
+{
+ wxWindow *oldItem = NULL;
+ if ((oldItem = (wxWindow *)wxClientWidgetHashTable->Get ((long) w)))
+ {
+ wxLogDebug( wxT("Client window table clash: new window is %ld, %s"),
+ (long)w, win->GetClassInfo()->GetClassName());
+ return FALSE;
+ }
+
+ wxClientWidgetHashTable->Put((long) w, win);
+
+ wxLogTrace( wxT("widget"), wxT("XWindow 0x%08x <-> window %p (%s)"),
+ (unsigned int) w, win, win->GetClassInfo()->GetClassName());
+
+ return TRUE;
+}
-// Get the underlying X window
-WXWindow wxWindowX11::GetXWindow() const
+wxWindow *wxGetClientWindowFromTable(Window w)
{
- return GetMainWindow();
+ return (wxWindow *)wxClientWidgetHashTable->Get((long) w);
}
-// Get the underlying X display
-WXDisplay *wxWindowX11::GetXDisplay() const
+void wxDeleteClientWindowFromTable(Window w)
{
- return wxGetDisplay();
+ wxClientWidgetHashTable->Delete((long)w);
}
+// ----------------------------------------------------------------------------
+// add/remove window from the table
+// ----------------------------------------------------------------------------
+
+// ----------------------------------------------------------------------------
+// X11-specific accessors
+// ----------------------------------------------------------------------------
+
WXWindow wxWindowX11::GetMainWindow() const
{
- return m_mainWidget;
+ return m_mainWindow;
+}
+
+WXWindow wxWindowX11::GetClientAreaWindow() const
+{
+ return m_clientWindow;
}
// ----------------------------------------------------------------------------
bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window, XEvent *xevent)
{
- switch (xevent->xany.type)
+ switch (XEventGetType(xevent))
{
case EnterNotify:
case LeaveNotify:
{
wxEventType eventType = wxEVT_NULL;
- if (xevent->xany.type == EnterNotify)
+ if (XEventGetType(xevent) == EnterNotify)
{
//if (local_event.xcrossing.mode!=NotifyNormal)
// return ; // Ignore grab events
eventType = wxEVT_ENTER_WINDOW;
// canvas->GetEventHandler()->OnSetFocus();
}
- else if (xevent->xany.type == LeaveNotify)
+ else if (XEventGetType(xevent) == LeaveNotify)
{
//if (local_event.xcrossingr.mode!=NotifyNormal)
// return ; // Ignore grab events
eventType = wxEVT_LEAVE_WINDOW;
// canvas->GetEventHandler()->OnKillFocus();
}
- else if (xevent->xany.type == MotionNotify)
+ else if (XEventGetType(xevent) == MotionNotify)
{
eventType = wxEVT_MOTION;
}
- else if (xevent->xany.type == ButtonPress)
+ else if (XEventGetType(xevent) == ButtonPress)
{
- wxevent.SetTimestamp(xevent->xbutton.time);
+ wxevent.SetTimestamp(XButtonEventGetTime(xevent));
int button = 0;
- if (xevent->xbutton.button == Button1)
+ if (XButtonEventLChanged(xevent))
{
eventType = wxEVT_LEFT_DOWN;
button = 1;
}
- else if (xevent->xbutton.button == Button2)
+ else if (XButtonEventMChanged(xevent))
{
eventType = wxEVT_MIDDLE_DOWN;
button = 2;
}
- else if (xevent->xbutton.button == Button3)
+ else if (XButtonEventRChanged(xevent))
{
eventType = wxEVT_RIGHT_DOWN;
button = 3;
win->SetLastClick(button, ts);
}
}
- else if (xevent->xany.type == ButtonRelease)
+ else if (XEventGetType(xevent) == ButtonRelease)
{
- if (xevent->xbutton.button == Button1)
+ if (XButtonEventLChanged(xevent))
{
eventType = wxEVT_LEFT_UP;
}
- else if (xevent->xbutton.button == Button2)
+ else if (XButtonEventMChanged(xevent))
{
eventType = wxEVT_MIDDLE_UP;
}
- else if (xevent->xbutton.button == Button3)
+ else if (XButtonEventRChanged(xevent))
{
eventType = wxEVT_RIGHT_UP;
}
wxevent.SetEventType(eventType);
- wxevent.m_x = xevent->xbutton.x;
- wxevent.m_y = xevent->xbutton.y;
+ wxevent.m_x = XButtonEventGetX(xevent);
+ wxevent.m_y = XButtonEventGetY(xevent);
wxevent.m_leftDown = ((eventType == wxEVT_LEFT_DOWN)
- || (event_left_is_down (xevent)
+ || (XButtonEventLIsDown(xevent)
&& (eventType != wxEVT_LEFT_UP)));
wxevent.m_middleDown = ((eventType == wxEVT_MIDDLE_DOWN)
- || (event_middle_is_down (xevent)
+ || (XButtonEventMIsDown(xevent)
&& (eventType != wxEVT_MIDDLE_UP)));
wxevent.m_rightDown = ((eventType == wxEVT_RIGHT_DOWN)
- || (event_right_is_down (xevent)
+ || (XButtonEventRIsDown (xevent)
&& (eventType != wxEVT_RIGHT_UP)));
- wxevent.m_shiftDown = xevent->xbutton.state & ShiftMask;
- wxevent.m_controlDown = xevent->xbutton.state & ControlMask;
- wxevent.m_altDown = xevent->xbutton.state & Mod3Mask;
- wxevent.m_metaDown = xevent->xbutton.state & Mod1Mask;
+ wxevent.m_shiftDown = XButtonEventShiftIsDown(xevent);
+ wxevent.m_controlDown = XButtonEventCtrlIsDown(xevent);
+ wxevent.m_altDown = XButtonEventAltIsDown(xevent);
+ wxevent.m_metaDown = XButtonEventMetaIsDown(xevent);
wxevent.SetId(win->GetId());
wxevent.SetEventObject(win);
return FALSE;
}
-bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win), XEvent *xevent)
+bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win), XEvent *xevent, bool isAscii)
{
- switch (xevent->xany.type)
+ switch (XEventGetType(xevent))
{
case KeyPress:
case KeyRelease:
KeySym keySym;
(void) XLookupString ((XKeyEvent *) xevent, buf, 20, &keySym, NULL);
int id = wxCharCodeXToWX (keySym);
+ // id may be WXK_xxx code - these are outside ASCII range, so we
+ // can't just use toupper() on id.
+ // Only change this if we want the raw key that was pressed,
+ // and don't change it if we want an ASCII value.
+ if (!isAscii && (id >= 'a' && id <= 'z'))
+ {
+ id = id + 'A' - 'a';
+ }
- if (xevent->xkey.state & ShiftMask)
- wxevent.m_shiftDown = TRUE;
- if (xevent->xkey.state & ControlMask)
- wxevent.m_controlDown = TRUE;
- if (xevent->xkey.state & Mod3Mask)
- wxevent.m_altDown = TRUE;
- if (xevent->xkey.state & Mod1Mask)
- wxevent.m_metaDown = TRUE;
+ wxevent.m_shiftDown = XKeyEventShiftIsDown(xevent);
+ wxevent.m_controlDown = XKeyEventCtrlIsDown(xevent);
+ wxevent.m_altDown = XKeyEventAltIsDown(xevent);
+ wxevent.m_metaDown = XKeyEventMetaIsDown(xevent);
wxevent.SetEventObject(win);
wxevent.m_keyCode = id;
- wxevent.SetTimestamp(xevent->xkey.time);
+ wxevent.SetTimestamp(XKeyEventGetTime(xevent));
- wxevent.m_x = xevent->xbutton.x;
- wxevent.m_y = xevent->xbutton.y;
+ wxevent.m_x = XKeyEventGetX(xevent);
+ wxevent.m_y = XKeyEventGetY(xevent);
- if (id > -1)
- return TRUE;
- else
- return FALSE;
- break;
+ return id > -1;
}
default:
break;
Colormap cm = DefaultColormap( xdisplay, xscreen );
m_backgroundColour.CalcPixel( (WXColormap) cm );
-
- if (!GetMainWindow())
- return FALSE;
-
-/*
- XSetWindowAttributes attrib;
- attrib.background_pixel = colour.GetPixel();
- XChangeWindowAttributes(wxGlobalDisplay(),
- (Window) GetMainWindow(),
- CWBackPixel,
- & attrib);
-*/
+ // We don't set the background colour as we paint
+ // the background ourselves.
+ // XSetWindowBackground( xdisplay, (Window) m_clientWindow, m_backgroundColour.GetPixel() );
return TRUE;
}
wxWindow *wxGetActiveWindow()
{
// TODO
- wxFAIL_MSG("Not implemented");
+ wxFAIL_MSG(wxT("Not implemented"));
return NULL;
}
// Get the current mouse position.
wxPoint wxGetMousePosition()
{
+#if wxUSE_NANOX
+ /* TODO */
+ return wxPoint(0, 0);
+#else
Display *display = wxGlobalDisplay();
Window rootWindow = RootWindowOfScreen (DefaultScreenOfDisplay(display));
Window rootReturn, childReturn;
unsigned int maskReturn;
XQueryPointer (display,
- rootWindow,
- &rootReturn,
+ rootWindow,
+ &rootReturn,
&childReturn,
&rootX, &rootY, &winX, &winY, &maskReturn);
return wxPoint(rootX, rootY);
+#endif
}
int wxNoOptimize::ms_count = 0;
+
+// ----------------------------------------------------------------------------
+// wxDCModule
+// ----------------------------------------------------------------------------
+
+class wxWinModule : public wxModule
+{
+public:
+ bool OnInit();
+ void OnExit();
+
+private:
+ DECLARE_DYNAMIC_CLASS(wxWinModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxWinModule, wxModule)
+
+bool wxWinModule::OnInit()
+{
+ Display *xdisplay = wxGlobalDisplay();
+ int xscreen = DefaultScreen( xdisplay );
+ Window xroot = RootWindow( xdisplay, xscreen );
+ g_eraseGC = XCreateGC( xdisplay, xroot, 0, NULL );
+ XSetFillStyle( xdisplay, g_eraseGC, FillSolid );
+
+ return TRUE;
+}
+
+void wxWinModule::OnExit()
+{
+ Display *xdisplay = wxGlobalDisplay();
+ XFreeGC( xdisplay, g_eraseGC );
+}
+
+
projects / wxWidgets.git / blobdiff