/////////////////////////////////////////////////////////////////////////////
-// Name: windows.cpp
+// Name: src/x11/windows.cpp
// Purpose: wxWindow
// Author: Julian Smart
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if defined(__BORLANDC__)
+#pragma hdrstop
+#endif
+
// ============================================================================
// declarations
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "window.h"
-#endif
-
-#include "wx/setup.h"
#include "wx/menu.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
// global variables for this module
// ----------------------------------------------------------------------------
-extern wxHashTable *wxWidgetHashTable;
-extern wxHashTable *wxClientWidgetHashTable;
static wxWindow* g_captureWindow = NULL;
static GC g_eraseGC;
void wxWindowX11::Init()
{
- // generic initializations first
- InitBase();
-
// X11-specific
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_insertIntoMain = false;
+ m_updateNcArea = false;
+
+ m_winCaptured = false;
+ m_needsInputFocus = false;
+ m_isShown = true;
m_lastTS = 0;
m_lastButton = 0;
}
// real construction (Init() must have been called before!)
bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
+ const wxPoint& pos,
+ const wxSize& size,
+ 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);
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 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);
size2.y = 20;
wxPoint pos2(pos);
- if (pos2.x == -1)
+ if (pos2.x == wxDefaultCoord)
pos2.x = 0;
- if (pos2.y == -1)
+ if (pos2.y == wxDefaultCoord)
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;
+ bool need_two_windows = false;
#endif
#if wxUSE_NANOX
#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,
+
+ 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 =
+ xattributes.event_mask =
ExposureMask | StructureNotifyMask | ColormapChangeMask;
- Window xwindow = XCreateWindow( xdisplay, xparent, pos2.x, pos2.y, size2.x, size2.y,
+ 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 =
+#if !wxUSE_NANOX
+ xattributes.event_mask =
ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
PropertyChangeMask | VisibilityChangeMask ;
- if (HasFlag( wxNO_FULL_REPAINT_ON_RESIZE ))
+ 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;
if (size2.y <= 0)
size2.y = 1;
-#if wxUSE_NANOX
+#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,
+
+ 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,
+ 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
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,
+
+ 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 =
+ xattributes.event_mask =
ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
PropertyChangeMask | VisibilityChangeMask ;
- if (HasFlag( wxNO_FULL_REPAINT_ON_RESIZE ))
+ 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,
+
+ 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;
+ m_isShown = true;
// Without this, the cursor may not be restored properly (e.g. in splitter
// sample).
// for example
// SetSize(pos.x, pos.y, size.x, size.y);
- return TRUE;
+ return true;
}
// Destructor
wxWindowX11::~wxWindowX11()
{
+ SendDestroyEvent();
+
if (g_captureWindow == this)
g_captureWindow = NULL;
-
- m_isBeingDeleted = TRUE;
-
- if (m_parent)
- m_parent->RemoveChild( this );
+
+ m_isBeingDeleted = true;
DestroyChildren();
XDestroyWindow( wxGlobalDisplay(), xwindow );
m_clientWindow = NULL;
}
-
+
// Destroy the window
Window xwindow = (Window) m_mainWindow;
wxDeleteWindowFromTable( xwindow );
void wxWindowX11::SetFocus()
{
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") );
-
+
+ // Don't assert; we might be trying to set the focus for a panel
+ // with only static controls, so the panel returns false from AcceptsFocus.
+ // The app should be not be expected to deal with this.
+ if (!AcceptsFocus())
+ return;
+
#if 0
if (GetName() == "scrollBar")
{
*crash = 0;
}
#endif
-
+
if (wxWindowIsVisible(xwindow))
{
wxLogTrace( _T("focus"), _T("wxWindowX11::SetFocus: %s"), GetClassInfo()->GetClassName());
// XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToParent, CurrentTime );
XSetInputFocus( wxGlobalDisplay(), xwindow, RevertToNone, CurrentTime );
- m_needsInputFocus = FALSE;
+ m_needsInputFocus = false;
}
else
{
- m_needsInputFocus = TRUE;
+ m_needsInputFocus = true;
}
}
// Get the window with the focus
-wxWindow *wxWindowBase::FindFocus()
+wxWindow *wxWindowBase::DoFindFocus()
{
Window xfocus = (Window) 0;
int revert = 0;
bool wxWindowX11::Enable(bool enable)
{
if ( !wxWindowBase::Enable(enable) )
- return FALSE;
-
- return TRUE;
+ return false;
+
+ return true;
}
bool wxWindowX11::Show(bool show)
XUnmapWindow(xdisp, xwindow);
}
- return TRUE;
+ return true;
}
// Raise the window to the top of the Z order
XLowerWindow( wxGlobalDisplay(), (Window) m_mainWindow );
}
+void wxWindowX11::SetLabel(const wxString& WXUNUSED(label))
+{
+ // TODO
+}
+
+wxString wxWindowX11::GetLabel() const
+{
+ // TODO
+ return wxEmptyString;
+}
+
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) m_clientWindow;
wxCHECK_RET( xwindow, wxT("invalid window") );
-
+
g_captureWindow = (wxWindow*) this;
if (xwindow)
wxLogDebug(msg);
if (res == GrabNotViewable)
wxLogDebug( wxT("This is not a viewable window - perhaps not shown yet?") );
-
+
g_captureWindow = NULL;
return;
}
- m_winCaptured = TRUE;
+ m_winCaptured = true;
}
}
void wxWindowX11::DoReleaseMouse()
{
g_captureWindow = NULL;
-
+
if ( !m_winCaptured )
return;
{
XUngrabPointer( wxGlobalDisplay(), CurrentTime );
}
-
+
// wxLogDebug( "Ungrabbed pointer in %s", GetName().c_str() );
- m_winCaptured = FALSE;
+ m_winCaptured = false;
}
bool wxWindowX11::SetFont(const wxFont& font)
if ( !wxWindowBase::SetFont(font) )
{
// nothing to do
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
bool wxWindowX11::SetCursor(const wxCursor& cursor)
if ( !wxWindowBase::SetCursor(cursor) )
{
// no change
- return FALSE;
+ return false;
}
Window xwindow = (Window) m_clientWindow;
- wxCHECK_MSG( xwindow, FALSE, wxT("invalid window") );
-
+ wxCHECK_MSG( xwindow, false, wxT("invalid window") );
+
wxCursor cursorToUse;
if (m_cursor.Ok())
cursorToUse = m_cursor;
XDefineCursor( wxGlobalDisplay(), xwindow, xcursor );
- return TRUE;
+ return true;
}
// Coordinates relative to the window
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) GetClientAreaWindow();
wxCHECK_RET( xwindow, wxT("invalid window") );
{
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
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();
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 + 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 );
-
+
// 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 );
+
+ // Move Clients, but not the scrollbars
+ // FIXME: There may be a better method to move a lot of Windows within X11
+ wxScrollBar *sbH = ((wxWindow *) this)->GetScrollbar( wxHORIZONTAL );
+ wxScrollBar *sbV = ((wxWindow *) this)->GetScrollbar( wxVERTICAL );
+ wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+ while ( node )
+ {
+ // Only propagate to non-top-level windows
+ wxWindow *win = node->GetData();
+ if ( win->GetParent() && win != sbH && win != sbV )
+ {
+ wxPoint pos = win->GetPosition();
+ // Add the delta to the old Position
+ pos.x += dx;
+ pos.y += dy;
+ win->SetPosition(pos);
+ }
+ node = node->GetNext();
+ }
}
// ---------------------------------------------------------------------------
bool wxWindowX11::PreResize()
{
- return TRUE;
+ return true;
}
// Get total size
Window xwindow = (Window) m_mainWindow;
wxCHECK_RET( xwindow, wxT("invalid window") );
-
+
//XSync(wxGlobalDisplay(), False);
XWindowAttributes attr;
Status status = XGetWindowAttributes( wxGlobalDisplay(), xwindow, &attr );
wxASSERT(status);
-
+
if (status)
{
*x = attr.width /* + 2*m_borderSize */ ;
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())
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)
{
// 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 (x != wxDefaultCoord || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
{
int yy = 0;
AdjustForParentClientOrigin( x, yy, sizeFlags);
new_x = x;
}
- if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+ if (y != wxDefaultCoord || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
{
int xx = 0;
AdjustForParentClientOrigin( xx, y, sizeFlags);
new_y = y;
}
- if (width != -1)
+ if (width != wxDefaultCoord)
{
new_w = width;
if (new_w <= 0)
new_w = 20;
}
- if (height != -1)
+ if (height != wxDefaultCoord)
{
new_h = height;
if (new_h <= 0)
new_h = 20;
}
-
+
DoMoveWindow( new_x, new_y, new_w, new_h );
}
void wxWindowX11::DoSetClientSize(int width, int height)
{
// wxLogDebug("DoSetClientSize: %s (%ld) %dx%d", GetClassInfo()->GetClassName(), GetId(), width, height);
-
+
Window xwindow = (Window) m_mainWindow;
wxCHECK_RET( xwindow, wxT("invalid window") );
XResizeWindow( wxGlobalDisplay(), xwindow, width, height );
-
+
if (m_mainWindow != m_clientWindow)
{
xwindow = (Window) m_clientWindow;
-
+
wxWindow *window = (wxWindow*) this;
wxRenderer *renderer = window->GetRenderer();
if (renderer)
width -= border.x + border.width;
height -= border.y + border.height;
}
-
+
XResizeWindow( wxGlobalDisplay(), xwindow, width, height );
}
}
-// For implementation purposes - sometimes decorations make the client area
-// smaller
-wxPoint wxWindowX11::GetClientAreaOrigin() const
-{
- return wxPoint(0, 0);
-}
-
void wxWindowX11::DoMoveWindow(int x, int y, int width, int height)
{
Window xwindow = (Window) m_mainWindow;
if (m_mainWindow != m_clientWindow)
{
xwindow = (Window) m_clientWindow;
-
+
wxWindow *window = (wxWindow*) this;
wxRenderer *renderer = window->GetRenderer();
if (renderer)
x = 0;
y = 0;
}
-
+
wxScrollBar *sb = window->GetScrollbar( wxHORIZONTAL );
if (sb && sb->IsShown())
{
wxSize size = sb->GetSize();
width -= size.x;
}
-
+
XMoveResizeWindow( wxGlobalDisplay(), xwindow, x, y, wxMax(1, width), wxMax(1, height) );
}
-
-#else
+
+#else
XWindowChanges windowChanges;
windowChanges.x = x;
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)
+void wxWindowX11::DoSetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
{
m_minWidth = minW;
m_minHeight = minH;
#if !wxUSE_NANOX
XSizeHints sizeHints;
sizeHints.flags = 0;
-
+
if (minW > -1 && minH > -1)
{
sizeHints.flags |= PMinSize;
int wxWindowX11::GetCharHeight() const
{
- wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
+ wxFont font(GetFont());
+ wxCHECK_MSG( 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_font_description( layout, font.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 ) );
-
+
return h;
#else
- WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, wxGlobalDisplay());
+ WXFontStructPtr pFontStruct = font.GetFontStruct(1.0, wxGlobalDisplay());
int direction, ascent, descent;
XCharStruct overall;
int wxWindowX11::GetCharWidth() const
{
- wxCHECK_MSG( m_font.Ok(), 0, "valid window font needed" );
+ wxFont font(GetFont());
+ wxCHECK_MSG( 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_font_description( layout, font.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 ) );
-
+
return w;
#else
- WXFontStructPtr pFontStruct = m_font.GetFontStruct(1.0, wxGlobalDisplay());
+ WXFontStructPtr pFontStruct = font.GetFontStruct(1.0, wxGlobalDisplay());
int direction, ascent, descent;
XCharStruct overall;
}
void wxWindowX11::GetTextExtent(const wxString& string,
- int *x, int *y,
- int *descent, int *externalLeading,
- const wxFont *theFont) const
+ int *x, int *y,
+ int *descent, int *externalLeading,
+ const wxFont *theFont) const
{
- wxFont fontToUse = m_font;
+ wxFont fontToUse = GetFont();
if (theFont) fontToUse = *theFont;
wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") );
- if (string.IsEmpty())
+ if (string.empty())
{
if (x) (*x) = 0;
if (y) (*y) = 0;
#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)
{
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 );
// Send nc paint events.
SendNcPaintEvents();
}
-
+
if (!m_updateRegion.IsEmpty())
{
// wxLogDebug("wxWindowX11::Update: %s", GetClassInfo()->GetClassName());
// Actually send erase events.
SendEraseEvents();
-
+
// Actually send paint events.
SendPaintEvents();
}
}
-void wxWindowX11::Clear()
-{
-// wxClientDC dc((wxWindow*) this);
-// wxBrush brush(GetBackgroundColour(), wxSOLID);
-// dc.SetBackground(brush);
-// dc.Clear();
-}
-
void wxWindowX11::SendEraseEvents()
{
if (m_clearRegion.IsEmpty()) return;
-
+
wxClientDC dc( (wxWindow*)this );
dc.SetClippingRegion( m_clearRegion );
-
+
wxEraseEvent erase_event( GetId(), &dc );
erase_event.SetEventObject( this );
Display *xdisplay = wxGlobalDisplay();
Window xwindow = (Window) GetClientAreaWindow();
XSetForeground( xdisplay, g_eraseGC, m_backgroundColour.GetPixel() );
-
+
wxRegionIterator upd( m_clearRegion );
while (upd)
{
upd ++;
}
}
-
+
m_clearRegion.Clear();
}
{
// wxLogDebug("SendPaintEvents: %s (%ld)", GetClassInfo()->GetClassName(), GetId());
- m_clipPaintRegion = TRUE;
-
+ m_clipPaintRegion = true;
+
wxPaintEvent paint_event( GetId() );
paint_event.SetEventObject( this );
GetEventHandler()->ProcessEvent( paint_event );
-
+
m_updateRegion.Clear();
-
- m_clipPaintRegion = FALSE;
+
+ m_clipPaintRegion = false;
}
void wxWindowX11::SendNcPaintEvents()
{
height = sb->GetSize().y;
y = sb->GetPosition().y;
-
+
sb = window->GetScrollbar( wxVERTICAL );
if (sb && sb->IsShown())
{
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 );
}
}
-
+
wxNcPaintEvent nc_paint_event( GetId() );
nc_paint_event.SetEventObject( this );
GetEventHandler()->ProcessEvent( nc_paint_event );
-
- m_updateNcArea = 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
if ( win->GetParent() )
{
wxSysColourChangedEvent event2;
- event.m_eventObject = win;
+ event.SetEventObject(win);
win->GetEventHandler()->ProcessEvent(event2);
}
{
// 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)
printf(msg.c_str());
#endif
SetFocus();
-
+
// If it couldn't set the focus now, there's
// no point in trying again.
- m_needsInputFocus = FALSE;
+ m_needsInputFocus = false;
}
g_GettingFocus = NULL;
}
// ----------------------------------------------------------------------------
-// function which maintain the global hash table mapping Widgets to wxWindows
+// function which maintain the global hash table mapping Widgets to wxWidgets
// ----------------------------------------------------------------------------
-bool wxAddWindowToTable(Window w, wxWindow *win)
+static bool DoAddWindowToTable(wxWindowHash *hash, Window w, wxWindow *win)
{
- wxWindow *oldItem = NULL;
- if ((oldItem = (wxWindow *)wxWidgetHashTable->Get ((long) w)))
+ if ( !hash->insert(wxWindowHash::value_type(w, win)).second )
{
- wxLogDebug( wxT("Widget table clash: new widget is %ld, %s"),
- (long)w, win->GetClassInfo()->GetClassName());
- return FALSE;
+ wxLogDebug( wxT("Widget table clash: new widget is 0x%08x, %s"),
+ (unsigned int)w, win->GetClassInfo()->GetClassName());
+ return false;
}
- wxWidgetHashTable->Put((long) w, win);
-
wxLogTrace( wxT("widget"), wxT("XWindow 0x%08x <-> window %p (%s)"),
(unsigned int) w, win, win->GetClassInfo()->GetClassName());
- return TRUE;
+ return true;
}
-wxWindow *wxGetWindowFromTable(Window w)
+static inline wxWindow *DoGetWindowFromTable(wxWindowHash *hash, Window w)
{
- return (wxWindow *)wxWidgetHashTable->Get((long) w);
+ wxWindowHash::iterator i = hash->find(w);
+ return i == hash->end() ? NULL : i->second;
}
-void wxDeleteWindowFromTable(Window w)
+static inline void DoDeleteWindowFromTable(wxWindowHash *hash, Window w)
{
- wxWidgetHashTable->Delete((long)w);
+ wxLogTrace( wxT("widget"), wxT("XWindow 0x%08x deleted"), (unsigned int) w);
+
+ hash->erase(w);
}
// ----------------------------------------------------------------------------
-// function which maintain the global hash table mapping client widgets
+// public wrappers
// ----------------------------------------------------------------------------
-bool wxAddClientWindowToTable(Window w, wxWindow *win)
+bool wxAddWindowToTable(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;
- }
+ return DoAddWindowToTable(wxWidgetHashTable, w, win);
+}
- wxClientWidgetHashTable->Put((long) w, win);
+wxWindow *wxGetWindowFromTable(Window w)
+{
+ return DoGetWindowFromTable(wxWidgetHashTable, w);
+}
- wxLogTrace( wxT("widget"), wxT("XWindow 0x%08x <-> window %p (%s)"),
- (unsigned int) w, win, win->GetClassInfo()->GetClassName());
+void wxDeleteWindowFromTable(Window w)
+{
+ DoDeleteWindowFromTable(wxWidgetHashTable, w);
+}
- return TRUE;
+bool wxAddClientWindowToTable(Window w, wxWindow *win)
+{
+ return DoAddWindowToTable(wxClientWidgetHashTable, w, win);
}
wxWindow *wxGetClientWindowFromTable(Window w)
{
- return (wxWindow *)wxClientWidgetHashTable->Get((long) w);
+ return DoGetWindowFromTable(wxClientWidgetHashTable, w);
}
void wxDeleteClientWindowFromTable(Window w)
{
- wxClientWidgetHashTable->Delete((long)w);
+ DoDeleteWindowFromTable(wxClientWidgetHashTable, w);
}
-// ----------------------------------------------------------------------------
-// add/remove window from the table
-// ----------------------------------------------------------------------------
-
// ----------------------------------------------------------------------------
// X11-specific accessors
// ----------------------------------------------------------------------------
{
eventType = wxEVT_RIGHT_UP;
}
- else return FALSE;
+ else return false;
}
else
{
- return FALSE;
+ return false;
}
wxevent.SetEventType(eventType);
wxevent.SetId(win->GetId());
wxevent.SetEventObject(win);
- return TRUE;
+ return true;
}
}
- return FALSE;
+ return false;
}
bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window WXUNUSED(win), XEvent *xevent, bool isAscii)
default:
break;
}
- return FALSE;
+ return false;
}
// ----------------------------------------------------------------------------
Colormap cm = DefaultColormap( xdisplay, xscreen );
m_backgroundColour.CalcPixel( (WXColormap) cm );
-
+
// We don't set the background colour as we paint
// the background ourselves.
// XSetWindowBackground( xdisplay, (Window) m_clientWindow, m_backgroundColour.GetPixel() );
-
- return TRUE;
+
+ return true;
}
bool wxWindowX11::SetForegroundColour(const wxColour& col)
{
if ( !wxWindowBase::SetForegroundColour(col) )
- return FALSE;
+ return false;
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
wxWindow *wxGetActiveWindow()
{
// TODO
- wxFAIL_MSG("Not implemented");
+ wxFAIL_MSG(wxT("Not implemented"));
return NULL;
}
Window xroot = RootWindow( xdisplay, xscreen );
g_eraseGC = XCreateGC( xdisplay, xroot, 0, NULL );
XSetFillStyle( xdisplay, g_eraseGC, FillSolid );
-
- return TRUE;
+
+ return true;
}
void wxWinModule::OnExit()
Display *xdisplay = wxGlobalDisplay();
XFreeGC( xdisplay, g_eraseGC );
}
-
-
projects / wxWidgets.git / blobdiff