Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid calling gtk_window_get_position() from "configure-event" handler, if possible.

Browse Source 
This avoids a round trip to the X server, which is expensive over a remote connection.
Closes #15116


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2013-08-17 16:25:13 +00:00
parent fa0681e744
commit c37b0f0907
2 changed files with 68 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/gtk/toplevel.h
View File

@@ -94,6 +94,8 @@ public:
virtual void GTKHandleRealized(); virtual void GTKHandleRealized();
void GTKConfigureEvent(int x, int y);
// do *not* call this to iconize the frame, this is a private function! // do *not* call this to iconize the frame, this is a private function!
void SetIconizeState(bool iconic); void SetIconizeState(bool iconic);
@@ -108,7 +110,11 @@ public:
m_gdkDecor; m_gdkDecor;
// size of WM decorations // size of WM decorations
wxSize m_decorSize; struct DecorSize
{
int left, right, top, bottom;
};
DecorSize m_decorSize;
// private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and // private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and
// wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle. // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle.
@@ -119,7 +125,7 @@ public:
// return the size of the window without WM decorations // return the size of the window without WM decorations
void GTKDoGetSize(int *width, int *height) const; void GTKDoGetSize(int *width, int *height) const;
void GTKUpdateDecorSize(const wxSize& decorSize); void GTKUpdateDecorSize(const DecorSize& decorSize);
protected: protected:
// give hints to the Window Manager for how the size // give hints to the Window Manager for how the size
@@ -145,7 +151,7 @@ protected:
private: private:
void Init(); void Init();
wxSize& GetCachedDecorSize(); DecorSize& GetCachedDecorSize();
// size hint increments // size hint increments
int m_incWidth, m_incHeight; int m_incWidth, m_incHeight;

96
src/gtk/toplevel.cpp
View File

@@ -71,11 +71,15 @@ static wxTopLevelWindowGTK *g_lastActiveFrame = NULL;
// send any activate events at all // send any activate events at all
static int g_sendActivateEvent = -1; static int g_sendActivateEvent = -1;
#ifdef GDK_WINDOWING_X11
// Whether _NET_REQUEST_FRAME_EXTENTS support is working // Whether _NET_REQUEST_FRAME_EXTENTS support is working
static enum { static enum {
RFE_STATUS_UNKNOWN, RFE_STATUS_WORKING, RFE_STATUS_BROKEN RFE_STATUS_UNKNOWN, RFE_STATUS_WORKING, RFE_STATUS_BROKEN
} gs_requestFrameExtentsStatus; } gs_requestFrameExtentsStatus;
static bool gs_decorCacheValid;
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// RequestUserAttention related functions // RequestUserAttention related functions
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -257,7 +261,8 @@ size_allocate(GtkWidget*, GtkAllocation* alloc, wxTopLevelWindowGTK* win)
GtkAllocation a; GtkAllocation a;
gtk_widget_get_allocation(win->m_widget, &a); gtk_widget_get_allocation(win->m_widget, &a);
wxSize size(a.width, a.height); wxSize size(a.width, a.height);
size += win->m_decorSize; size.x += win->m_decorSize.left + win->m_decorSize.right;
size.y += win->m_decorSize.top + win->m_decorSize.bottom;
win->m_width = size.x; win->m_width = size.x;
win->m_height = size.y; win->m_height = size.y;
@@ -297,26 +302,38 @@ gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget),
extern "C" { extern "C" {
static gboolean static gboolean
gtk_frame_configure_callback( GtkWidget* widget, gtk_frame_configure_callback( GtkWidget*,
GdkEventConfigure *WXUNUSED(event), GdkEventConfigure* gdk_event,
wxTopLevelWindowGTK *win ) wxTopLevelWindowGTK *win )
{ {
if (!win->IsShown()) win->GTKConfigureEvent(gdk_event->x, gdk_event->y);
return FALSE; return false;
wxPoint point;
gtk_window_get_position((GtkWindow*)widget, &point.x, &point.y);
win->m_x = point.x;
win->m_y = point.y;
wxMoveEvent mevent(point, win->GetId());
mevent.SetEventObject( win );
win->HandleWindowEvent( mevent );
return FALSE;
} }
} }
void wxTopLevelWindowGTK::GTKConfigureEvent(int x, int y)
{
wxPoint point;
#ifdef GDK_WINDOWING_X11
if (gs_decorCacheValid)
{
const DecorSize& decorSize = GetCachedDecorSize();
point.x = x - decorSize.left;
point.y = y - decorSize.top;
}
else
#endif
{
gtk_window_get_position(GTK_WINDOW(m_widget), &point.x, &point.y);
}
m_x = point.x;
m_y = point.y;
wxMoveEvent event(point, GetId());
event.SetEventObject(this);
HandleWindowEvent(event);
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// "realize" from m_widget // "realize" from m_widget
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -478,10 +495,9 @@ static gboolean property_notify_event(
win->m_netFrameExtentsTimerId = 0; win->m_netFrameExtentsTimerId = 0;
} }
wxSize decorSize = win->m_decorSize; wxTopLevelWindowGTK::DecorSize decorSize = win->m_decorSize;
int left, right, top, bottom; gs_decorCacheValid = wxGetFrameExtents(event->window,
if (wxGetFrameExtents(event->window, &left, &right, &top, &bottom)) &decorSize.left, &decorSize.right, &decorSize.top, &decorSize.bottom);
decorSize.Set(left + right, top + bottom);
win->GTKUpdateDecorSize(decorSize); win->GTKUpdateDecorSize(decorSize);
} }
@@ -497,10 +513,9 @@ static gboolean request_frame_extents_timeout(void* data)
gdk_threads_enter(); gdk_threads_enter();
wxTopLevelWindowGTK* win = static_cast<wxTopLevelWindowGTK*>(data); wxTopLevelWindowGTK* win = static_cast<wxTopLevelWindowGTK*>(data);
win->m_netFrameExtentsTimerId = 0; win->m_netFrameExtentsTimerId = 0;
wxSize decorSize = win->m_decorSize; wxTopLevelWindowGTK::DecorSize decorSize = win->m_decorSize;
int left, right, top, bottom; wxGetFrameExtents(gtk_widget_get_window(win->m_widget),
if (wxGetFrameExtents(gtk_widget_get_window(win->m_widget), &left, &right, &top, &bottom)) &decorSize.left, &decorSize.right, &decorSize.top, &decorSize.bottom);
decorSize.Set(left + right, top + bottom);
win->GTKUpdateDecorSize(decorSize); win->GTKUpdateDecorSize(decorSize);
gdk_threads_leave(); gdk_threads_leave();
return false; return false;
@@ -526,6 +541,7 @@ void wxTopLevelWindowGTK::Init()
m_updateDecorSize = true; m_updateDecorSize = true;
m_netFrameExtentsTimerId = 0; m_netFrameExtentsTimerId = 0;
m_incWidth = m_incHeight = 0; m_incWidth = m_incHeight = 0;
memset(&m_decorSize, 0, sizeof(m_decorSize));
m_urgency_hint = -2; m_urgency_hint = -2;
} }
@@ -1036,7 +1052,8 @@ void wxTopLevelWindowGTK::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXU
void wxTopLevelWindowGTK::GTKDoGetSize(int *width, int *height) const void wxTopLevelWindowGTK::GTKDoGetSize(int *width, int *height) const
{ {
wxSize size(m_width, m_height); wxSize size(m_width, m_height);
size -= m_decorSize; size.x -= m_decorSize.left + m_decorSize.right;
size.y -= m_decorSize.top + m_decorSize.bottom;
if (size.x < 0) size.x = 0; if (size.x < 0) size.x = 0;
if (size.y < 0) size.y = 0; if (size.y < 0) size.y = 0;
#if wxUSE_LIBHILDON2 #if wxUSE_LIBHILDON2
@@ -1160,19 +1177,21 @@ void wxTopLevelWindowGTK::DoSetSizeHints( int minW, int minH,
hints.min_height = 1; hints.min_height = 1;
hints.max_width = INT_MAX; hints.max_width = INT_MAX;
hints.max_height = INT_MAX; hints.max_height = INT_MAX;
if (minSize.x > m_decorSize.x) const int decorSize_x = m_decorSize.left + m_decorSize.right;
hints.min_width = minSize.x - m_decorSize.x; const int decorSize_y = m_decorSize.top + m_decorSize.bottom;
if (minSize.y > m_decorSize.y) if (minSize.x > decorSize_x)
hints.min_height = minSize.y - m_decorSize.y; hints.min_width = minSize.x - decorSize_x;
if (minSize.y > decorSize_y)
hints.min_height = minSize.y - decorSize_y;
if (maxSize.x > 0) if (maxSize.x > 0)
{ {
hints.max_width = maxSize.x - m_decorSize.x; hints.max_width = maxSize.x - decorSize_x;
if (hints.max_width < hints.min_width) if (hints.max_width < hints.min_width)
hints.max_width = hints.min_width; hints.max_width = hints.min_width;
} }
if (maxSize.y > 0) if (maxSize.y > 0)
{ {
hints.max_height = maxSize.y - m_decorSize.y; hints.max_height = maxSize.y - decorSize_y;
if (hints.max_height < hints.min_height) if (hints.max_height < hints.min_height)
hints.max_height = hints.min_height; hints.max_height = hints.min_height;
} }
@@ -1187,14 +1206,16 @@ void wxTopLevelWindowGTK::DoSetSizeHints( int minW, int minH,
} }
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
void wxTopLevelWindowGTK::GTKUpdateDecorSize(const wxSize& decorSize) void wxTopLevelWindowGTK::GTKUpdateDecorSize(const DecorSize& decorSize)
{ {
if (!IsMaximized() && !IsFullScreen()) if (!IsMaximized() && !IsFullScreen())
GetCachedDecorSize() = decorSize; GetCachedDecorSize() = decorSize;
if (m_updateDecorSize && m_decorSize != decorSize) if (m_updateDecorSize && memcmp(&m_decorSize, &decorSize, sizeof(DecorSize)))
{ {
m_useCachedClientSize = false; m_useCachedClientSize = false;
const wxSize diff = decorSize - m_decorSize; const wxSize diff(
decorSize.left - m_decorSize.left + decorSize.right - m_decorSize.right,
decorSize.top - m_decorSize.top + decorSize.bottom - m_decorSize.bottom);
m_decorSize = decorSize; m_decorSize = decorSize;
bool resized = false; bool resized = false;
if (m_minWidth > 0 || m_minHeight > 0 || m_maxWidth > 0 || m_maxHeight > 0) if (m_minWidth > 0 || m_minHeight > 0 || m_maxWidth > 0 || m_maxHeight > 0)
@@ -1208,7 +1229,8 @@ void wxTopLevelWindowGTK::GTKUpdateDecorSize(const wxSize& decorSize)
int w, h; int w, h;
GTKDoGetSize(&w, &h); GTKDoGetSize(&w, &h);
// but not if size would be less than minimum, it won't take effect // but not if size would be less than minimum, it won't take effect
if (w >= m_minWidth - decorSize.x && h >= m_minHeight - decorSize.y ) if (w >= m_minWidth - (decorSize.left + decorSize.right) &&
h >= m_minHeight - (decorSize.top + decorSize.bottom))
{ {
gtk_window_resize(GTK_WINDOW(m_widget), w, h); gtk_window_resize(GTK_WINDOW(m_widget), w, h);
resized = true; resized = true;
@@ -1243,9 +1265,9 @@ void wxTopLevelWindowGTK::GTKUpdateDecorSize(const wxSize& decorSize)
} }
#endif // GDK_WINDOWING_X11 #endif // GDK_WINDOWING_X11
wxSize& wxTopLevelWindowGTK::GetCachedDecorSize() wxTopLevelWindowGTK::DecorSize& wxTopLevelWindowGTK::GetCachedDecorSize()
{ {
static wxSize size[8]; static DecorSize size[8];
int index = 0; int index = 0;
// title bar // title bar