diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-07-15 15:12:01 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-07-15 15:12:17 +0200 |
| commit | 19366be186a9a2efff1e6abfe8db59cd9f5f5843 (patch) | |
| tree | 3abb4adeab1a4e86a08bb5bfe61dedf8be178a1c /contrib/wx-patches/toplevel.cpp.diff | |
| parent | 249c6818f171b75930736872d61b0cdcda7e9832 (diff) | |
| parent | a35ee9633690fbadc001b2d8fe1dd3ebb852dc25 (diff) | |
Merge remote-tracking branch 'satoshi/qtui'
Conflicts (resolved by copying files from remote branch):
.gitignore
src/cryptopp/cpu.cpp
src/cryptopp/cpu.h
src/cryptopp/cryptlib.h
src/cryptopp/iterhash.h
src/cryptopp/misc.h
src/cryptopp/secblock.h
src/cryptopp/sha.cpp
src/cryptopp/sha.h
src/cryptopp/smartptr.h
src/json/json_spirit_reader.cpp
src/json/json_spirit_value.cpp
src/json/json_spirit_writer.cpp
Diffstat (limited to 'contrib/wx-patches/toplevel.cpp.diff')
| -rw-r--r-- | contrib/wx-patches/toplevel.cpp.diff | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/contrib/wx-patches/toplevel.cpp.diff b/contrib/wx-patches/toplevel.cpp.diff new file mode 100644 index 0000000000..359abf28d4 --- /dev/null +++ b/contrib/wx-patches/toplevel.cpp.diff @@ -0,0 +1,86 @@ +--- /wxWidgets/trunk/src/gtk/toplevel.cpp (revision 67326)
++++ /wxWidgets/trunk/src/gtk/toplevel.cpp (revision 67496)
+@@ -72,4 +72,8 @@
+ // send any activate events at all
+ static int g_sendActivateEvent = -1;
++
++// Whether _NET_REQUEST_FRAME_EXTENTS support is working
++// 0 == not tested yet, 1 == working, 2 == broken
++static int gs_requestFrameExtentsStatus;
+
+ //-----------------------------------------------------------------------------
+@@ -432,4 +436,12 @@
+ if (event->state == GDK_PROPERTY_NEW_VALUE && event->atom == property)
+ {
++ if (win->m_netFrameExtentsTimerId)
++ {
++ // WM support for _NET_REQUEST_FRAME_EXTENTS is working
++ gs_requestFrameExtentsStatus = 1;
++ g_source_remove(win->m_netFrameExtentsTimerId);
++ win->m_netFrameExtentsTimerId = 0;
++ }
++
+ wxSize decorSize = win->m_decorSize;
+ int left, right, top, bottom;
+@@ -439,4 +451,22 @@
+ win->GTKUpdateDecorSize(decorSize);
+ }
++ return false;
++}
++}
++
++extern "C" {
++static gboolean request_frame_extents_timeout(void* data)
++{
++ // WM support for _NET_REQUEST_FRAME_EXTENTS is broken
++ gs_requestFrameExtentsStatus = 2;
++ gdk_threads_enter();
++ wxTopLevelWindowGTK* win = static_cast<wxTopLevelWindowGTK*>(data);
++ win->m_netFrameExtentsTimerId = 0;
++ wxSize decorSize = win->m_decorSize;
++ int left, right, top, bottom;
++ if (wxGetFrameExtents(gtk_widget_get_window(win->m_widget), &left, &right, &top, &bottom))
++ decorSize.Set(left + right, top + bottom);
++ win->GTKUpdateDecorSize(decorSize);
++ gdk_threads_leave();
+ return false;
+ }
+@@ -459,4 +489,5 @@
+ m_deferShowAllowed = true;
+ m_updateDecorSize = true;
++ m_netFrameExtentsTimerId = 0;
+
+ m_urgency_hint = -2;
+@@ -811,5 +842,6 @@
+ if (deferShow)
+ {
+- deferShow = m_deferShowAllowed && !GTK_WIDGET_REALIZED(m_widget);
++ deferShow = gs_requestFrameExtentsStatus != 2 &&
++ m_deferShowAllowed && !gtk_widget_get_realized(m_widget);
+ if (deferShow)
+ {
+@@ -829,11 +861,4 @@
+ // GetSize()/SetSize() because it makes window bigger between each
+ // restore and save.
+- m_updateDecorSize = deferShow;
+- }
+- if (deferShow)
+- {
+- // Fluxbox support for _NET_REQUEST_FRAME_EXTENTS is broken
+- const char* name = gdk_x11_screen_get_window_manager_name(screen);
+- deferShow = strcmp(name, "Fluxbox") != 0;
+ m_updateDecorSize = deferShow;
+ }
+@@ -875,4 +900,12 @@
+ (XEvent*)&xevent);
+
++ if (gs_requestFrameExtentsStatus == 0)
++ {
++ // if WM does not respond to request within 1 second,
++ // we assume support for _NET_REQUEST_FRAME_EXTENTS is not working
++ m_netFrameExtentsTimerId =
++ g_timeout_add(1000, request_frame_extents_timeout, this);
++ }
++
+ // defer calling gtk_widget_show()
+ m_isShown = true;
|