#include "wx/app.h"
#endif
-#include "wx/gtk/private.h"
#include "wx/evtloop.h"
#include "wx/sysopt.h"
#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
+#ifdef GDK_WINDOWING_X11
+ #include <gdk/gdkx.h>
+ #include <X11/Xatom.h> // XA_CARDINAL
+ #include "wx/unix/utilsx11.h"
+#endif
+#include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
#include "wx/gtk/private/win_gtk.h"
-#include "wx/unix/utilsx11.h"
-
-// XA_CARDINAL
-#include <X11/Xatom.h>
-
#if wxUSE_LIBHILDON
#include <hildon-widgets/hildon-program.h>
#include <hildon-widgets/hildon-window.h>
// 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;
+
//-----------------------------------------------------------------------------
// RequestUserAttention related functions
//-----------------------------------------------------------------------------
-extern "C" {
+#ifndef __WXGTK3__
static void wxgtk_window_set_urgency_hint (GtkWindow *win,
gboolean setting)
{
- wxASSERT_MSG( GTK_WIDGET_REALIZED(win), wxT("wxgtk_window_set_urgency_hint: GdkWindow not realized") );
- GdkWindow *window = GTK_WIDGET(win)->window;
- XWMHints *wm_hints;
+#if GTK_CHECK_VERSION(2,7,0)
+ if (gtk_check_version(2,7,0) == NULL)
+ gtk_window_set_urgency_hint(win, setting);
+ else
+#endif
+ {
+#ifdef GDK_WINDOWING_X11
+ GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(win));
+ wxCHECK_RET(window, "wxgtk_window_set_urgency_hint: GdkWindow not realized");
- wm_hints = XGetWMHints(GDK_WINDOW_XDISPLAY(window), GDK_WINDOW_XWINDOW(window));
+ Display* dpy = GDK_WINDOW_XDISPLAY(window);
+ Window xid = GDK_WINDOW_XID(window);
+ XWMHints* wm_hints = XGetWMHints(dpy, xid);
- if (!wm_hints)
- wm_hints = XAllocWMHints();
+ if (!wm_hints)
+ wm_hints = XAllocWMHints();
- if (setting)
- wm_hints->flags |= XUrgencyHint;
- else
- wm_hints->flags &= ~XUrgencyHint;
+ if (setting)
+ wm_hints->flags |= XUrgencyHint;
+ else
+ wm_hints->flags &= ~XUrgencyHint;
- XSetWMHints(GDK_WINDOW_XDISPLAY(window), GDK_WINDOW_XWINDOW(window), wm_hints);
- XFree(wm_hints);
+ XSetWMHints(dpy, xid, wm_hints);
+ XFree(wm_hints);
+#endif // GDK_WINDOWING_X11
+ }
}
+#define gtk_window_set_urgency_hint wxgtk_window_set_urgency_hint
+#endif
+extern "C" {
static gboolean gtk_frame_urgency_timer_callback( wxTopLevelWindowGTK *win )
{
-#if GTK_CHECK_VERSION(2,7,0)
- if(!gtk_check_version(2,7,0))
- gtk_window_set_urgency_hint(GTK_WINDOW( win->m_widget ), FALSE);
- else
-#endif
- wxgtk_window_set_urgency_hint(GTK_WINDOW( win->m_widget ), FALSE);
+ gtk_window_set_urgency_hint(GTK_WINDOW(win->m_widget), false);
win->m_urgency_hint = -2;
return FALSE;
g_source_remove( win->m_urgency_hint );
// no break, fallthrough to remove hint too
case -1:
-#if GTK_CHECK_VERSION(2,7,0)
- if(!gtk_check_version(2,7,0))
- gtk_window_set_urgency_hint(GTK_WINDOW( widget ), FALSE);
- else
-#endif
- {
- wxgtk_window_set_urgency_hint(GTK_WINDOW( widget ), FALSE);
- }
-
+ gtk_window_set_urgency_hint(GTK_WINDOW(widget), false);
win->m_urgency_hint = -2;
break;
GdkEventFocus *WXUNUSED(gdk_event),
wxTopLevelWindowGTK * WXUNUSED(win))
{
- // if the focus goes out of our app alltogether, OnIdle() will send
+ // if the focus goes out of our app altogether, OnIdle() will send
// wxActivateEvent, otherwise gtk_window_focus_in_callback() will reset
// g_sendActivateEvent to -1
g_sendActivateEvent = 0;
static void
size_allocate(GtkWidget*, GtkAllocation* alloc, wxTopLevelWindowGTK* win)
{
- if (win->m_oldClientWidth != alloc->width ||
- win->m_oldClientHeight != alloc->height)
+ win->m_useCachedClientSize = true;
+ if (win->m_clientWidth != alloc->width ||
+ win->m_clientHeight != alloc->height)
{
- win->m_oldClientWidth = alloc->width;
- win->m_oldClientHeight = alloc->height;
+ win->m_clientWidth = alloc->width;
+ win->m_clientHeight = alloc->height;
- wxSize size(win->m_widget->allocation.width,
- win->m_widget->allocation.height);
+ GtkAllocation a;
+ gtk_widget_get_allocation(win->m_widget, &a);
+ wxSize size(a.width, a.height);
size += win->m_decorSize;
win->m_width = size.x;
win->m_height = size.y;
}
}
-// ----------------------------------------------------------------------------
-// "size_request"
-// ----------------------------------------------------------------------------
-
-extern "C" {
-static
-void wxgtk_tlw_size_request_callback(GtkWidget * WXUNUSED(widget),
- GtkRequisition *requisition,
- wxTopLevelWindowGTK *win)
-{
- // we must return the size of the window without WM decorations, otherwise
- // GTK+ gets confused, so don't call just GetSize() here
- win->GTKDoGetSize(&requisition->width, &requisition->height);
-}
-}
-
//-----------------------------------------------------------------------------
// "delete_event"
//-----------------------------------------------------------------------------
GdkEventConfigure *WXUNUSED(event),
wxTopLevelWindowGTK *win )
{
- if (!win->m_hasVMT || !win->IsShown())
+ if (!win->IsShown())
return FALSE;
wxPoint point;
// we cannot the WM hints and icons before the widget has been realized,
// so we do this directly after realization
-extern "C" {
-static void
-gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget),
- wxTopLevelWindowGTK *win )
+void wxTopLevelWindowGTK::GTKHandleRealized()
{
- gdk_window_set_decorations(win->m_widget->window,
- (GdkWMDecoration)win->m_gdkDecor);
- gdk_window_set_functions(win->m_widget->window,
- (GdkWMFunction)win->m_gdkFunc);
+ wxNonOwnedWindow::GTKHandleRealized();
+
+ gdk_window_set_decorations(gtk_widget_get_window(m_widget),
+ (GdkWMDecoration)m_gdkDecor);
+ gdk_window_set_functions(gtk_widget_get_window(m_widget),
+ (GdkWMFunction)m_gdkFunc);
// GTK's shrinking/growing policy
- if ( !(win->m_gdkFunc & GDK_FUNC_RESIZE) )
- gtk_window_set_resizable(GTK_WINDOW(win->m_widget), FALSE);
+ if ( !(m_gdkFunc & GDK_FUNC_RESIZE) )
+ gtk_window_set_resizable(GTK_WINDOW(m_widget), FALSE);
+#ifndef __WXGTK3__
else
- gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
+ gtk_window_set_policy(GTK_WINDOW(m_widget), 1, 1, 1);
+#endif
- const wxIconBundle& icons = win->GetIcons();
+ const wxIconBundle& icons = GetIcons();
if (icons.GetIconCount())
- win->SetIcons(icons);
+ SetIcons(icons);
- if (win->HasFlag(wxFRAME_SHAPED))
- win->SetShape(win->m_shape); // it will really set the window shape now
-}
+#ifdef __WXGTK3__
+ if (gtk_window_get_has_resize_grip(GTK_WINDOW(m_widget)))
+ {
+ // Grip window can end up obscured, probably due to deferred show.
+ // Reset grip to ensure it is visible.
+ gtk_window_set_has_resize_grip(GTK_WINDOW(m_widget), false);
+ gtk_window_set_has_resize_grip(GTK_WINDOW(m_widget), true);
+ }
+#endif
}
//-----------------------------------------------------------------------------
wxTopLevelWindow *win )
{
const bool wasIconized = win->IsIconized();
- win->SetIconizeState(false);
if (wasIconized)
{
// Because GetClientSize() returns (0,0) when IsIconized() is true,
// tlw that was "rolled up" with some WMs.
// Queue a resize rather than sending size event directly to allow
// children to be made visible first.
- win->m_oldClientWidth = 0;
+ win->m_useCachedClientSize = false;
+ win->m_clientWidth = 0;
gtk_widget_queue_resize(win->m_wxwindow);
}
// it is possible for m_isShown to be false here, see bug #9909
eventShow.SetEventObject(win);
win->GetEventHandler()->ProcessEvent(eventShow);
}
+
// restore focus-on-map setting in case ShowWithoutActivating() was called
gtk_window_set_focus_on_map(GTK_WINDOW(win->m_widget), true);
+
return false;
}
}
//-----------------------------------------------------------------------------
-// "unmap_event" from m_widget
+// "window-state-event" from m_widget
//-----------------------------------------------------------------------------
extern "C" {
static gboolean
-gtk_frame_unmap_callback( GtkWidget * WXUNUSED(widget),
- GdkEvent * WXUNUSED(event),
+gtk_frame_window_state_callback( GtkWidget* WXUNUSED(widget),
+ GdkEventWindowState *event,
wxTopLevelWindow *win )
{
- win->SetIconizeState(true);
+ if (event->changed_mask & GDK_WINDOW_STATE_ICONIFIED)
+ win->SetIconizeState((event->new_window_state & GDK_WINDOW_STATE_ICONIFIED) != 0);
+
+ // if maximized bit changed and it is now set
+ if (event->changed_mask & event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED)
+ {
+ wxMaximizeEvent evt(win->GetId());
+ evt.SetEventObject(win);
+ win->HandleWindowEvent(evt);
+ }
+
+ if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN)
+ win->m_fsIsShowing = (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) != 0;
+
return false;
}
}
bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom)
{
+#ifdef GDK_WINDOWING_X11
static GdkAtom property = gdk_atom_intern("_NET_FRAME_EXTENTS", false);
- Atom xproperty = gdk_x11_atom_to_xatom_for_display(
- gdk_drawable_get_display(window), property);
+ GdkDisplay* display = gdk_window_get_display(window);
+ Atom xproperty = gdk_x11_atom_to_xatom_for_display(display, property);
Atom type;
int format;
gulong nitems, bytes_after;
guchar* data;
Status status = XGetWindowProperty(
- gdk_x11_drawable_get_xdisplay(window),
- gdk_x11_drawable_get_xid(window),
+ GDK_DISPLAY_XDISPLAY(display),
+ GDK_WINDOW_XID(window),
xproperty,
0, 4, false, XA_CARDINAL,
&type, &format, &nitems, &bytes_after, &data);
if (data)
XFree(data);
return success;
+#else
+ return false;
+#endif
}
+#ifdef GDK_WINDOWING_X11
//-----------------------------------------------------------------------------
// "property_notify_event" from m_widget
//-----------------------------------------------------------------------------
static GdkAtom property = gdk_atom_intern("_NET_FRAME_EXTENTS", false);
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;
if (wxGetFrameExtents(event->window, &left, &right, &top, &bottom))
}
}
+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;
+}
+}
+#endif // GDK_WINDOWING_X11
+
// ----------------------------------------------------------------------------
// wxTopLevelWindowGTK creation
// ----------------------------------------------------------------------------
m_deferShow = true;
m_deferShowAllowed = true;
m_updateDecorSize = true;
+ m_netFrameExtentsTimerId = 0;
+ m_incWidth = m_incHeight = 0;
m_urgency_hint = -2;
}
{
gtk_window_set_keep_above(GTK_WINDOW(m_widget), TRUE);
}
+ if (style & wxMAXIMIZE)
+ gtk_window_maximize(GTK_WINDOW(m_widget));
#if 0
if (!name.empty())
#endif
gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( title ) );
- GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
+ gtk_widget_set_can_focus(m_widget, false);
g_signal_connect (m_widget, "delete_event",
G_CALLBACK (gtk_frame_delete_callback), this);
// m_mainWidget is a GtkVBox, holding the bars and client area (m_wxwindow)
- m_mainWidget = gtk_vbox_new(false, 0);
+ m_mainWidget = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show( m_mainWidget );
- GTK_WIDGET_UNSET_FLAGS( m_mainWidget, GTK_CAN_FOCUS );
+ gtk_widget_set_can_focus(m_mainWidget, false);
gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget );
// m_wxwindow is the client area
m_wxwindow = wxPizza::New();
gtk_widget_show( m_wxwindow );
- gtk_container_add( GTK_CONTAINER(m_mainWidget), m_wxwindow );
+ gtk_box_pack_start(GTK_BOX(m_mainWidget), m_wxwindow, true, true, 0);
// we donm't allow the frame to get the focus as otherwise
// the frame will grab it at arbitrary focus changes
- GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
+ gtk_widget_set_can_focus(m_wxwindow, false);
if (m_parent) m_parent->AddChild( this );
g_signal_connect(m_wxwindow, "size_allocate",
G_CALLBACK(size_allocate), this);
- g_signal_connect (m_widget, "size_request",
- G_CALLBACK (wxgtk_tlw_size_request_callback), this);
PostCreation();
+#ifndef __WXGTK3__
if ((m_x != -1) || (m_y != -1))
gtk_widget_set_uposition( m_widget, m_x, m_y );
+#endif
- // we cannot set MWM hints and icons before the widget has
- // been realized, so we do this directly after realization
- g_signal_connect (m_widget, "realize",
- G_CALLBACK (gtk_frame_realized_callback), this);
-
- // map and unmap for iconized state
+ // for some reported size corrections
g_signal_connect (m_widget, "map_event",
G_CALLBACK (gtk_frame_map_callback), this);
- g_signal_connect (m_widget, "unmap_event",
- G_CALLBACK (gtk_frame_unmap_callback), this);
+
+ // for iconized state
+ g_signal_connect (m_widget, "window_state_event",
+ G_CALLBACK (gtk_frame_window_state_callback), this);
+
// for wxMoveEvent
g_signal_connect (m_widget, "configure_event",
g_signal_connect_after (m_widget, "focus_out_event",
G_CALLBACK (gtk_frame_focus_out_callback), this);
- gtk_widget_add_events(m_widget, GDK_PROPERTY_CHANGE_MASK);
- g_signal_connect(m_widget, "property_notify_event",
- G_CALLBACK(property_notify_event), this);
+ // GTK processes key events at the top level first, which handles for
+ // menu accelerators and shortcuts before passing the event on to the
+ // focus child window to begin propagation. We want to propagate
+ // first, so we connect gtk_window_propagate_key_event to
+ // key_press_event.
+ g_signal_connect (m_widget, "key_press_event",
+ G_CALLBACK (gtk_window_propagate_key_event), NULL);
+
+#ifdef GDK_WINDOWING_X11
+#ifdef __WXGTK3__
+ if (GDK_IS_X11_SCREEN(gtk_window_get_screen(GTK_WINDOW(m_widget))))
+#endif
+ {
+ gtk_widget_add_events(m_widget, GDK_PROPERTY_CHANGE_MASK);
+ g_signal_connect(m_widget, "property_notify_event",
+ G_CALLBACK(property_notify_event), this);
+ }
+#endif // GDK_WINDOWING_X11
// translate wx decorations styles into Motif WM hints (they are recognized
// by other WMs as well)
}
}
+ // GTK sometimes chooses very small size if max size hint is not explicitly set
+ DoSetSizeHints(m_minWidth, m_minHeight, m_maxWidth, m_maxHeight, m_incWidth, m_incHeight);
+
m_decorSize = GetCachedDecorSize();
int w, h;
GTKDoGetSize(&w, &h);
wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
{
+ if ( m_netFrameExtentsTimerId )
+ {
+ // Don't let the timer callback fire as the window pointer passed to it
+ // will become invalid very soon.
+ g_source_remove(m_netFrameExtentsTimerId);
+ }
+
#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
// it can also be a (standard) dialog
if ( HILDON_IS_WINDOW(m_widget) )
else
m_gdkFunc &= ~GDK_FUNC_CLOSE;
- if (GTK_WIDGET_REALIZED(m_widget) && (m_widget->window))
- gdk_window_set_functions( m_widget->window, (GdkWMFunction)m_gdkFunc );
+ GdkWindow* window = gtk_widget_get_window(m_widget);
+ if (window)
+ gdk_window_set_functions(window, (GdkWMFunction)m_gdkFunc);
return true;
}
m_fsIsShowing = show;
- wxX11FullScreenMethod method =
- wxGetFullScreenMethodX11((WXDisplay*)GDK_DISPLAY(),
- (WXWindow)GDK_ROOT_WINDOW());
+#ifdef GDK_WINDOWING_X11
+ Display* xdpy = GDK_DISPLAY_XDISPLAY(gtk_widget_get_display(m_widget));
+ Window xroot = GDK_WINDOW_XID(gtk_widget_get_root_window(m_widget));
+ wxX11FullScreenMethod method = wxGetFullScreenMethodX11(xdpy, (WXWindow)xroot);
// NB: gtk_window_fullscreen() uses freedesktop.org's WMspec extensions
// to switch to fullscreen, which is not always available. We must
// check if WM supports the spec and use legacy methods if it
// doesn't.
if ( method == wxX11_FS_WMSPEC )
+#endif // GDK_WINDOWING_X11
{
if (show)
gtk_window_fullscreen( GTK_WINDOW( m_widget ) );
else
gtk_window_unfullscreen( GTK_WINDOW( m_widget ) );
}
+#ifdef GDK_WINDOWING_X11
else
{
- GdkWindow *window = m_widget->window;
+ GdkWindow* window = gtk_widget_get_window(m_widget);
+ Window xid = GDK_WINDOW_XID(window);
if (show)
{
GetPosition( &m_fsSaveFrame.x, &m_fsSaveFrame.y );
GetSize( &m_fsSaveFrame.width, &m_fsSaveFrame.height );
- int screen_width,screen_height;
- wxDisplaySize( &screen_width, &screen_height );
+ GdkScreen* screen = gtk_widget_get_screen(m_widget);
+ const int screen_width = gdk_screen_get_width(screen);
+ const int screen_height = gdk_screen_get_height(screen);
gint client_x, client_y, root_x, root_y;
gint width, height;
gdk_window_set_decorations(window, (GdkWMDecoration)0);
gdk_window_set_functions(window, (GdkWMFunction)0);
- gdk_window_get_origin (m_widget->window, &root_x, &root_y);
- gdk_window_get_geometry (m_widget->window, &client_x, &client_y,
- &width, &height, NULL);
+ gdk_window_get_origin(window, &root_x, &root_y);
+ gdk_window_get_geometry(window, &client_x, &client_y, &width, &height);
- gdk_window_move_resize (m_widget->window, -client_x, -client_y,
- screen_width + 1, screen_height + 1);
+ gdk_window_move_resize(
+ window, -client_x, -client_y, screen_width + 1, screen_height + 1);
- wxSetFullScreenStateX11((WXDisplay*)GDK_DISPLAY(),
- (WXWindow)GDK_ROOT_WINDOW(),
- (WXWindow)GDK_WINDOW_XWINDOW(window),
+ wxSetFullScreenStateX11(xdpy,
+ (WXWindow)xroot,
+ (WXWindow)xid,
show, &m_fsSaveFrame, method);
}
else // hide
gdk_window_set_decorations(window, (GdkWMDecoration)m_gdkDecor);
gdk_window_set_functions(window, (GdkWMFunction)m_gdkFunc);
- wxSetFullScreenStateX11((WXDisplay*)GDK_DISPLAY(),
- (WXWindow)GDK_ROOT_WINDOW(),
- (WXWindow)GDK_WINDOW_XWINDOW(window),
+ wxSetFullScreenStateX11(xdpy,
+ (WXWindow)xroot,
+ (WXWindow)xid,
show, &m_fsSaveFrame, method);
SetSize(m_fsSaveFrame.x, m_fsSaveFrame.y,
m_fsSaveFrame.width, m_fsSaveFrame.height);
}
}
+#endif // GDK_WINDOWING_X11
// documented behaviour is to show the window if it's still hidden when
// showing it full screen
gtk_widget_queue_draw( m_widget );
- if (m_wxwindow && m_wxwindow->window)
- gdk_window_invalidate_rect( m_wxwindow->window, NULL, TRUE );
+ GdkWindow* window = NULL;
+ if (m_wxwindow)
+ window = gtk_widget_get_window(m_wxwindow);
+ if (window)
+ gdk_window_invalidate_rect(window, NULL, true);
}
bool wxTopLevelWindowGTK::Show( bool show )
{
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
+#ifdef GDK_WINDOWING_X11
bool deferShow = show && !m_isShown && m_deferShow;
if (deferShow)
{
- deferShow = m_deferShowAllowed && !GTK_WIDGET_REALIZED(m_widget);
- if (deferShow)
- {
- deferShow = g_signal_handler_find(m_widget,
+ deferShow = m_deferShowAllowed && gs_requestFrameExtentsStatus != 2 &&
+ !gtk_widget_get_realized(m_widget) &&
+ g_signal_handler_find(m_widget,
GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
g_signal_lookup("property_notify_event", GTK_TYPE_WIDGET),
- 0, NULL, NULL, this) != 0;
- }
- GdkScreen* screen = NULL;
+ 0, NULL, NULL, this);
if (deferShow)
{
- screen = gtk_widget_get_screen(m_widget);
+ GdkScreen* screen = gtk_widget_get_screen(m_widget);
GdkAtom atom = gdk_atom_intern("_NET_REQUEST_FRAME_EXTENTS", false);
deferShow = gdk_x11_screen_supports_net_wm_hint(screen, atom) != 0;
+
// If _NET_REQUEST_FRAME_EXTENTS not supported, don't allow changes
// to m_decorSize, it breaks saving/restoring window size with
// 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;
- }
m_deferShow = deferShow;
}
// causes the widget tree to be size_allocated, which generates size
// events in the wrong order. However, the size_allocates will not be
// done if the allocation is not the default (1,1).
- const int alloc_width = m_widget->allocation.width;
+ GtkAllocation alloc;
+ gtk_widget_get_allocation(m_widget, &alloc);
+ const int alloc_width = alloc.width;
if (alloc_width == 1)
- m_widget->allocation.width = 2;
+ {
+ alloc.width = 2;
+ gtk_widget_set_allocation(m_widget, &alloc);
+ }
gtk_widget_realize(m_widget);
if (alloc_width == 1)
- m_widget->allocation.width = 1;
+ {
+ alloc.width = 1;
+ gtk_widget_set_allocation(m_widget, &alloc);
+ }
// send _NET_REQUEST_FRAME_EXTENTS
XClientMessageEvent xevent;
memset(&xevent, 0, sizeof(xevent));
xevent.type = ClientMessage;
- xevent.window = gdk_x11_drawable_get_xid(m_widget->window);
+ GdkWindow* window = gtk_widget_get_window(m_widget);
+ xevent.window = GDK_WINDOW_XID(window);
xevent.message_type = gdk_x11_atom_to_xatom_for_display(
- gdk_drawable_get_display(m_widget->window),
+ gdk_window_get_display(window),
gdk_atom_intern("_NET_REQUEST_FRAME_EXTENTS", false));
xevent.format = 32;
- Display* display = gdk_x11_drawable_get_xdisplay(m_widget->window);
+ Display* display = GDK_DISPLAY_XDISPLAY(gdk_window_get_display(window));
XSendEvent(display, DefaultRootWindow(display), false,
SubstructureNotifyMask | SubstructureRedirectMask,
(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;
return true;
}
+#endif // GDK_WINDOWING_X11
- if (show && !GTK_WIDGET_REALIZED(m_widget))
+ if (show && !gtk_widget_get_realized(m_widget))
{
// size_allocate signals occur in reverse order (bottom to top).
// Things work better if the initial wxSizeEvents are sent (from the
HandleWindowEvent(event);
}
- bool change = wxTopLevelWindowBase::Show(show);
+ bool change = base_type::Show(show);
if (change && !show)
{
{
wxCHECK_RET( m_widget, wxT("invalid frame") );
- m_deferShowAllowed = true;
-
// deal with the position first
int old_x = m_x;
int old_y = m_y;
if (height >= 0)
m_height = height;
ConstrainSize();
+ if (m_width < 1) m_width = 1;
+ if (m_height < 1) m_height = 1;
if (m_width != oldSize.x || m_height != oldSize.y)
{
+ m_deferShowAllowed = true;
+ m_useCachedClientSize = false;
+
int w, h;
GTKDoGetSize(&w, &h);
gtk_window_resize(GTK_WINDOW(m_widget), w, h);
- GetClientSize(&m_oldClientWidth, &m_oldClientHeight);
+ DoGetClientSize(&m_clientWidth, &m_clientHeight);
wxSizeEvent event(GetSize(), GetId());
event.SetEventObject(this);
HandleWindowEvent(event);
void wxTopLevelWindowGTK::DoSetClientSize(int width, int height)
{
- wxTopLevelWindowBase::DoSetClientSize(width, height);
+ base_type::DoSetClientSize(width, height);
// Since client size is being explicitly set, don't change it later
// Has to be done after calling base because it calls SetSize,
if ( height )
*height = 0;
}
+ else if (m_useCachedClientSize)
+ base_type::DoGetClientSize(width, height);
else
{
GTKDoGetSize(width, height);
int maxW, int maxH,
int incW, int incH )
{
- wxTopLevelWindowBase::DoSetSizeHints( minW, minH, maxW, maxH, incW, incH );
+ base_type::DoSetSizeHints(minW, minH, maxW, maxH, incW, incH);
+ m_incWidth = incW;
+ m_incHeight = incH;
const wxSize minSize = GetMinSize();
const wxSize maxSize = GetMaxSize();
GdkGeometry hints;
- int hints_mask = 0;
- if (minSize.x > 0 || minSize.y > 0)
- {
- hints_mask |= GDK_HINT_MIN_SIZE;
+ // always set both min and max hints, otherwise GTK will
+ // make assumptions we don't want about the unset values
+ int hints_mask = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE;
+ hints.min_width = 1;
+ hints.min_height = 1;
+ hints.max_width = INT_MAX;
+ hints.max_height = INT_MAX;
+ if (minSize.x > m_decorSize.x)
hints.min_width = minSize.x - m_decorSize.x;
- if (hints.min_width < 0)
- hints.min_width = 0;
+ if (minSize.y > m_decorSize.y)
hints.min_height = minSize.y - m_decorSize.y;
- if (hints.min_height < 0)
- hints.min_height = 0;
- }
- if (maxSize.x > 0 || maxSize.y > 0)
+ if (maxSize.x > 0)
{
- hints_mask |= GDK_HINT_MAX_SIZE;
hints.max_width = maxSize.x - m_decorSize.x;
- if (hints.max_width < 0)
- hints.max_width = INT_MAX;
+ if (hints.max_width < hints.min_width)
+ hints.max_width = hints.min_width;
+ }
+ if (maxSize.y > 0)
+ {
hints.max_height = maxSize.y - m_decorSize.y;
- if (hints.max_height < 0)
- hints.max_height = INT_MAX;
+ if (hints.max_height < hints.min_height)
+ hints.max_height = hints.min_height;
}
if (incW > 0 || incH > 0)
{
(GtkWindow*)m_widget, NULL, &hints, (GdkWindowHints)hints_mask);
}
+#ifdef GDK_WINDOWING_X11
void wxTopLevelWindowGTK::GTKUpdateDecorSize(const wxSize& decorSize)
{
if (!IsMaximized() && !IsFullScreen())
GetCachedDecorSize() = decorSize;
if (m_updateDecorSize && m_decorSize != decorSize)
{
+ m_useCachedClientSize = false;
const wxSize diff = decorSize - m_decorSize;
m_decorSize = decorSize;
bool resized = false;
+ if (m_minWidth > 0 || m_minHeight > 0 || m_maxWidth > 0 || m_maxHeight > 0)
+ {
+ // update size hints, they depend on m_decorSize
+ DoSetSizeHints(m_minWidth, m_minHeight, m_maxWidth, m_maxHeight, m_incWidth, m_incHeight);
+ }
if (m_deferShow)
{
// keep overall size unchanged by shrinking m_widget
int w, h;
GTKDoGetSize(&w, &h);
// but not if size would be less than minimum, it won't take effect
- const wxSize minSize = GetMinSize();
- if (w >= minSize.x && h >= minSize.y)
+ if (w >= m_minWidth - decorSize.x && h >= m_minHeight - decorSize.y )
{
gtk_window_resize(GTK_WINDOW(m_widget), w, h);
resized = true;
// adjust overall size to match change in frame extents
m_width += diff.x;
m_height += diff.y;
- if (m_width < 0) m_width = 0;
- if (m_height < 0) m_height = 0;
- m_oldClientWidth = 0;
+ if (m_width < 1) m_width = 1;
+ if (m_height < 1) m_height = 1;
+ m_clientWidth = 0;
gtk_widget_queue_resize(m_wxwindow);
}
}
{
// gtk_widget_show() was deferred, do it now
m_deferShow = false;
- GetClientSize(&m_oldClientWidth, &m_oldClientHeight);
+ DoGetClientSize(&m_clientWidth, &m_clientHeight);
wxSizeEvent sizeEvent(GetSize(), GetId());
sizeEvent.SetEventObject(this);
HandleWindowEvent(sizeEvent);
HandleWindowEvent(showEvent);
}
}
+#endif // GDK_WINDOWING_X11
wxSize& wxTopLevelWindowGTK::GetCachedDecorSize()
{
void wxTopLevelWindowGTK::OnInternalIdle()
{
- wxWindow::OnInternalIdle();
+ wxTopLevelWindowBase::OnInternalIdle();
// Synthetize activate events.
if ( g_sendActivateEvent != -1 )
{
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
- wxTopLevelWindowBase::SetIcons( icons );
+ base_type::SetIcons(icons);
// Setting icons before window is realized can cause a GTK assertion if
// another TLW is realized before this one, and it has this one as it's
// transient parent. The life demo exibits this problem.
- if (GTK_WIDGET_REALIZED(m_widget))
+ if (gtk_widget_get_realized(m_widget))
{
GList* list = NULL;
for (size_t i = icons.GetIconCount(); i--;)
bool wxTopLevelWindowGTK::IsMaximized() const
{
- if(!m_widget->window)
- return false;
-
- return gdk_window_get_state(m_widget->window) & GDK_WINDOW_STATE_MAXIMIZED;
+ GdkWindow* window = NULL;
+ if (m_widget)
+ window = gtk_widget_get_window(m_widget);
+ return window && (gdk_window_get_state(window) & GDK_WINDOW_STATE_MAXIMIZED);
}
void wxTopLevelWindowGTK::Restore()
}
}
-
-// helper
-static bool do_shape_combine_region(GdkWindow* window, const wxRegion& region)
-{
- if (window)
- {
- if (region.IsEmpty())
- {
- gdk_window_shape_combine_mask(window, NULL, 0, 0);
- }
- else
- {
- gdk_window_shape_combine_region(window, region.GetRegion(), 0, 0);
- return true;
- }
- }
- return false;
-}
-
-
-bool wxTopLevelWindowGTK::SetShape(const wxRegion& region)
-{
- wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,
- wxT("Shaped windows must be created with the wxFRAME_SHAPED style."));
-
- if ( GTK_WIDGET_REALIZED(m_widget) )
- {
- if ( m_wxwindow )
- do_shape_combine_region(m_wxwindow->window, region);
-
- return do_shape_combine_region(m_widget->window, region);
- }
- else // not realized yet
- {
- // store the shape to set, it will be really set once we're realized
- m_shape = region;
-
- // we don't know if we're going to succeed or fail, be optimistic by
- // default
- return true;
- }
-}
-
bool wxTopLevelWindowGTK::IsActive()
{
return (this == (wxTopLevelWindowGTK*)g_activeFrame);
m_urgency_hint = -2;
- if( GTK_WIDGET_REALIZED(m_widget) && !IsActive() )
+ if( gtk_widget_get_realized(m_widget) && !IsActive() )
{
new_hint_value = true;
}
}
-#if GTK_CHECK_VERSION(2,7,0)
- if(!gtk_check_version(2,7,0))
- gtk_window_set_urgency_hint(GTK_WINDOW( m_widget ), new_hint_value);
- else
-#endif
- wxgtk_window_set_urgency_hint(GTK_WINDOW( m_widget ), new_hint_value);
+ gtk_window_set_urgency_hint(GTK_WINDOW(m_widget), new_hint_value);
}
void wxTopLevelWindowGTK::SetWindowStyleFlag( long style )
}
}
-/* Get the X Window between child and the root window.
- This should usually be the WM managed XID */
-static Window wxGetTopmostWindowX11(Display *dpy, Window child)
-{
- Window root, parent;
- Window* children;
- unsigned int nchildren;
-
- XQueryTree(dpy, child, &root, &parent, &children, &nchildren);
- XFree(children);
-
- while (parent != root) {
- child = parent;
- XQueryTree(dpy, child, &root, &parent, &children, &nchildren);
- XFree(children);
- }
-
- return child;
-}
-
bool wxTopLevelWindowGTK::SetTransparent(wxByte alpha)
{
- if (!m_widget || !m_widget->window)
+ GdkWindow* window = NULL;
+ if (m_widget)
+ window = gtk_widget_get_window(m_widget);
+ if (window == NULL)
return false;
- Display* dpy = GDK_WINDOW_XDISPLAY (m_widget->window);
- // We need to get the X Window that has the root window as the immediate parent
- // and m_widget->window as a child. This should be the X Window that the WM manages and
- // from which the opacity property is checked from.
- Window win = wxGetTopmostWindowX11(dpy, GDK_WINDOW_XID (m_widget->window));
-
+#ifdef GDK_WINDOWING_X11
+ Display* dpy = GDK_WINDOW_XDISPLAY(window);
+ Window win = GDK_WINDOW_XID(window);
// Using pure Xlib to not have a GTK version check mess due to gtk2.0 not having GdkDisplay
if (alpha == 0xff)
}
XSync(dpy, False);
return true;
+#else // !GDK_WINDOWING_X11
+ return false;
+#endif // GDK_WINDOWING_X11 / !GDK_WINDOWING_X11
}
bool wxTopLevelWindowGTK::CanSetTransparent()
{
// allow to override automatic detection as it's far from perfect
- static const wxChar *SYSOPT_TRANSPARENT = wxT("gtk.tlw.can-set-transparent");
+ const wxString SYSOPT_TRANSPARENT = "gtk.tlw.can-set-transparent";
if ( wxSystemOptions::HasOption(SYSOPT_TRANSPARENT) )
{
return wxSystemOptions::GetOptionInt(SYSOPT_TRANSPARENT) != 0;
}
+#ifdef __WXGTK3__
+ return gtk_widget_is_composited(m_widget) != 0;
+#else
#if GTK_CHECK_VERSION(2,10,0)
if (!gtk_check_version(2,10,0))
{
- return (gtk_widget_is_composited (m_widget));
+ return gtk_widget_is_composited(m_widget) != 0;
}
else
#endif // In case of lower versions than gtk+-2.10.0 we could look for _NET_WM_CM_Sn ourselves
{
return false;
}
+#endif // !__WXGTK3__
#if 0 // Don't be optimistic here for the sake of wxAUI
int opcode, event, error;
projects / wxWidgets.git / blobdiff