if (show)
{
wxString msg;
- msg.Printf("Mapping window of type %s", GetClassInfo()->GetClassName());
- wxLogDebug(msg);
+ msg.Printf("Mapping window of type %s", GetClassInfo()->GetClassName());
+ wxLogDebug(msg);
XMapWindow(xdisp, xwin);
- XSync(xdisp, False);
+ XSync(xdisp, False);
}
else
{
wxString msg;
- msg.Printf("Unmapping window of type %s", GetClassInfo()->GetClassName());
- wxLogDebug(msg);
+ msg.Printf("Unmapping window of type %s", GetClassInfo()->GetClassName());
+ wxLogDebug(msg);
XUnmapWindow(xdisp, xwin);
}
GC xgc = XCreateGC( xdisplay, xwindow, 0, NULL );
XSetGraphicsExposures( xdisplay, xgc, True );
- int cw = 0;
- int ch = 0;
- GetClientSize( &cw, &ch );
+ int s_x;
+ int s_y;
+ int cw;
+ int ch;
+ if (rect)
+ {
+ s_x = rect->x;
+ s_y = rect->y;
+ cw = rect->width;
+ ch = rect->height;
+ }
+ else
+ {
+ s_x = 0;
+ s_y = 0;
+ GetClientSize( &cw, &ch );
+ }
+
+ wxPoint offset = GetClientAreaOrigin();
+ s_x += offset.x;
+ s_y += offset.y;
+
int w = cw - abs(dx);
int h = ch - abs(dy);
-
+
if ((h < 0) || (w < 0))
{
Refresh();
}
else
{
- int s_x = 0;
- int s_y = 0;
- if (dx < 0) s_x = -dx;
- if (dy < 0) s_y = -dy;
- int d_x = 0;
- int d_y = 0;
+ 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 (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;
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 );
- wxRect rect;
- if (dx < 0) rect.x = cw+dx; else rect.x = 0;
- if (dy < 0) rect.y = ch+dy; else rect.y = 0;
- if (dy != 0) rect.width = cw; else rect.width = abs(dx);
- if (dx != 0) rect.height = ch; else rect.height = abs(dy);
+ // printf( "rect %d %d %d %d\n", rect.x, rect.y, rect.width, rect.height );
m_updateRegion.Union( rect );
m_clearRegion.Union( rect );
if (window)
{
- XSync(wxGlobalDisplay(), False);
+ XSync(wxGlobalDisplay(), False); // Is this really a good idea?
XWindowAttributes attr;
Status status = XGetWindowAttributes( wxGlobalDisplay(), window, &attr );
wxASSERT(status);
void wxWindowX11::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
- if (!GetMainWindow())
- return;
+ Window xwindow = (Window) GetMainWindow();
- XWindowChanges windowChanges;
- windowChanges.x = 0;
- windowChanges.y = 0;
- windowChanges.width = 0;
- windowChanges.height = 0;
- windowChanges.stack_mode = 0;
- int valueMask = 0;
+ 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))
{
- int yy = 0;
+ int yy = 0;
AdjustForParentClientOrigin( x, yy, sizeFlags);
- windowChanges.x = x;
- valueMask |= CWX;
+ new_x = x;
}
if (y != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
{
- int xx = 0;
+ int xx = 0;
AdjustForParentClientOrigin( xx, y, sizeFlags);
- windowChanges.y = y;
- valueMask |= CWY;
+ new_y = y;
}
- if (width != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+ if (width != -1)
{
- windowChanges.width = width /* - m_borderSize*2 */;
- if (windowChanges.width == 0)
- windowChanges.width = 1;
- valueMask |= CWWidth;
+ new_w = width;
+ if (new_w <= 0)
+ new_w = 20;
}
- if (height != -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+ if (height != -1)
{
- windowChanges.height = height /* -m_borderSize*2*/;
- if (windowChanges.height == 0)
- windowChanges.height = 1;
- valueMask |= CWHeight;
+ new_h = height;
+ if (new_h <= 0)
+ new_h = 20;
}
-
- XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(),
- valueMask, & windowChanges);
- XSync(wxGlobalDisplay(), False);
+
+ DoMoveWindow( new_x, new_y, new_w, new_h );
}
void wxWindowX11::DoSetClientSize(int width, int height)
{
- if (!GetMainWindow())
- return;
+ Window xwindow = (Window) GetMainWindow();
- XWindowChanges windowChanges;
- int valueMask = 0;
+ 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)
- {
- windowChanges.width = width ;
- valueMask |= CWWidth;
- }
+ new_w = width;
+
if (height != -1)
- {
- windowChanges.height = height ;
- valueMask |= CWHeight;
- }
- XConfigureWindow(wxGlobalDisplay(), (Window) GetMainWindow(),
- valueMask, & windowChanges);
- XSync(wxGlobalDisplay(), False);
+ new_h = height;
+
+ DoMoveWindow( new_x, new_y, new_w, new_h );
}
// For implementation purposes - sometimes decorations make the client area
void wxWindowX11::DoMoveWindow(int x, int y, int width, int height)
{
- DoSetSize(x, y, width, 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 );
}
// ---------------------------------------------------------------------------
if (!GetEventHandler()->ProcessEvent(erase_event))
{
- printf( "Hallo!\n" );
Window xwindow = (Window) GetMainWindow();
Display *xdisplay = wxGlobalDisplay();
GC xgc = XCreateGC( xdisplay, xwindow, 0, NULL );
upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
upd ++;
}
+ XFreeGC( xdisplay, xgc );
}
m_clearRegion.Clear();
}
projects / wxWidgets.git / blobdiff