#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/win_gtk.h"
+#include "wx/gtk/private.h"
+#include "wx/gtk/private/gtk2-compat.h"
+#include "wx/gtk/private/win_gtk.h"
-#include "wx/unix/utilsx11.h"
+#if wxUSE_LIBHILDON
+ #include <hildon-widgets/hildon-program.h>
+ #include <hildon-widgets/hildon-window.h>
+#endif // wxUSE_LIBHILDON
-// XA_CARDINAL
-#include <X11/Xatom.h>
+#if wxUSE_LIBHILDON2
+ #include <hildon/hildon.h>
+#endif // wxUSE_LIBHILDON2
// ----------------------------------------------------------------------------
// data
// ----------------------------------------------------------------------------
-extern int g_openDialogs;
-extern wxWindowGTK *g_delayedFocus;
+// this is incremented while a modal dialog is shown
+int wxOpenModalDialogsCount = 0;
// the frame that is currently active (i.e. its child has focus). It is
// used to generate wxActivateEvents
-static wxTopLevelWindowGTK *g_activeFrame = (wxTopLevelWindowGTK*) NULL;
-static wxTopLevelWindowGTK *g_lastActiveFrame = (wxTopLevelWindowGTK*) NULL;
+static wxTopLevelWindowGTK *g_activeFrame = NULL;
+static wxTopLevelWindowGTK *g_lastActiveFrame = NULL;
// if we detect that the app has got/lost the focus, we set this variable to
// either TRUE or FALSE and an activate event will be sent during the next
// 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;
wxLogTrace(wxT("activate"), wxT("Activating frame %p (from focus_in)"), g_activeFrame);
wxActivateEvent event(wxEVT_ACTIVATE, true, g_activeFrame->GetId());
event.SetEventObject(g_activeFrame);
- g_activeFrame->GetEventHandler()->ProcessEvent(event);
+ g_activeFrame->HandleWindowEvent(event);
return FALSE;
}
//-----------------------------------------------------------------------------
extern "C" {
-static gboolean gtk_frame_focus_out_callback( GtkWidget *widget,
- GdkEventFocus *WXUNUSED(gdk_event),
- wxTopLevelWindowGTK *win )
+static
+gboolean gtk_frame_focus_out_callback(GtkWidget * WXUNUSED(widget),
+ 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;
wxLogTrace(wxT("activate"), wxT("Activating frame %p (from focus_in)"), g_activeFrame);
wxActivateEvent event(wxEVT_ACTIVATE, false, g_activeFrame->GetId());
event.SetEventObject(g_activeFrame);
- g_activeFrame->GetEventHandler()->ProcessEvent(event);
+ g_activeFrame->HandleWindowEvent(event);
g_activeFrame = NULL;
}
}
//-----------------------------------------------------------------------------
-// "size_allocate"
+// "size_allocate" from m_wxwindow
//-----------------------------------------------------------------------------
extern "C" {
-static void gtk_frame_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxTopLevelWindowGTK *win )
+static void
+size_allocate(GtkWidget*, GtkAllocation* alloc, wxTopLevelWindowGTK* win)
{
- if (!win->m_hasVMT)
- return;
-
- if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
+ if (win->m_oldClientWidth != alloc->width ||
+ win->m_oldClientHeight != alloc->height)
{
-/*
- wxPrintf( wxT("gtk_frame_size_callback from ") );
- if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
- wxPrintf( win->GetClassInfo()->GetClassName() );
- wxPrintf( wxT(" %d %d %d %d\n"), (int)alloc->x,
- (int)alloc->y,
- (int)alloc->width,
- (int)alloc->height );
-*/
-
- // Tell the wxWindow class about the new size
- win->m_width = alloc->width;
- win->m_height = alloc->height;
-
- win->GtkUpdateSize();
- }
-}
-}
+ win->m_oldClientWidth = alloc->width;
+ win->m_oldClientHeight = alloc->height;
-// ----------------------------------------------------------------------------
-// "size_request"
-// ----------------------------------------------------------------------------
+ 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;
-extern "C" {
-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
- int w, h;
- win->GTKDoGetSize(&w, &h);
-
- requisition->height = h;
- requisition->width = w;
+ if (!win->IsIconized())
+ {
+ wxSizeEvent event(size, win->GetId());
+ event.SetEventObject(win);
+ win->HandleWindowEvent(event);
+ }
+ // else the window is currently unmapped, don't generate size events
+ }
}
}
+
//-----------------------------------------------------------------------------
// "delete_event"
//-----------------------------------------------------------------------------
wxTopLevelWindowGTK *win )
{
if (win->IsEnabled() &&
- (g_openDialogs == 0 || (win->GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) ||
+ (wxOpenModalDialogsCount == 0 || (win->GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) ||
win->IsGrabbed()))
win->Close();
}
}
-
//-----------------------------------------------------------------------------
// "configure_event"
//-----------------------------------------------------------------------------
GdkEventConfigure *WXUNUSED(event),
wxTopLevelWindowGTK *win )
{
- if (!win->m_hasVMT || !win->IsShown())
+ if (!win->IsShown())
return FALSE;
wxPoint point;
win->m_y = point.y;
wxMoveEvent mevent(point, win->GetId());
mevent.SetEventObject( win );
- win->GetEventHandler()->ProcessEvent( mevent );
+ win->HandleWindowEvent( mevent );
return FALSE;
}
// "realize" from m_widget
//-----------------------------------------------------------------------------
-// we cannot MWM hints and icons before the widget has been realized,
+// 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()
{
- // All this is for Motif Window Manager "hints" and is supposed to be
- // recognized by other WM as well. Not tested.
- 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) == 0)
- 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 = GetIcons();
+ if (icons.GetIconCount())
+ SetIcons(icons);
- // reset the icon
- wxIconBundle iconsOld = win->GetIcons();
- if ( !iconsOld.IsEmpty() )
+#ifdef __WXGTK3__
+ if (gtk_window_get_has_resize_grip(GTK_WINDOW(m_widget)))
{
- win->SetIcon( wxNullIcon );
- win->SetIcons( iconsOld );
+ // 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
}
//-----------------------------------------------------------------------------
extern "C" {
static gboolean
-gtk_frame_map_callback( GtkWidget * WXUNUSED(widget),
+gtk_frame_map_callback( GtkWidget*,
GdkEvent * WXUNUSED(event),
wxTopLevelWindow *win )
{
- win->SetIconizeState(false);
+ const bool wasIconized = win->IsIconized();
+ if (wasIconized)
+ {
+ // Because GetClientSize() returns (0,0) when IsIconized() is true,
+ // a size event must be generated, just in case GetClientSize() was
+ // called while iconized. This specifically happens when restoring a
+ // 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;
+ gtk_widget_queue_resize(win->m_wxwindow);
+ }
+ // it is possible for m_isShown to be false here, see bug #9909
+ if (win->wxWindowBase::Show(true))
+ {
+ wxShowEvent eventShow(win->GetId(), true);
+ 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;
}
}
//-----------------------------------------------------------------------------
-// "expose_event" of m_client
+
+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);
+ 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_DISPLAY_XDISPLAY(display),
+ GDK_WINDOW_XID(window),
+ xproperty,
+ 0, 4, false, XA_CARDINAL,
+ &type, &format, &nitems, &bytes_after, &data);
+ const bool success = status == Success && data && nitems == 4;
+ if (success)
+ {
+ long* p = (long*)data;
+ if (left) *left = int(p[0]);
+ if (right) *right = int(p[1]);
+ if (top) *top = int(p[2]);
+ if (bottom) *bottom = int(p[3]);
+ }
+ if (data)
+ XFree(data);
+ return success;
+#else
+ return false;
+#endif
+}
+
+#ifdef GDK_WINDOWING_X11
+//-----------------------------------------------------------------------------
+// "property_notify_event" from m_widget
//-----------------------------------------------------------------------------
extern "C" {
-static gboolean
-gtk_window_expose_callback( GtkWidget *widget,
- GdkEventExpose *gdk_event,
- wxWindow *win )
+static gboolean property_notify_event(
+ GtkWidget*, GdkEventProperty* event, wxTopLevelWindowGTK* win)
{
- GtkPizza *pizza = GTK_PIZZA(widget);
+ // Watch for changes to _NET_FRAME_EXTENTS property
+ 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;
+ }
- gtk_paint_flat_box (win->m_widget->style,
- pizza->bin_window, GTK_STATE_NORMAL,
- GTK_SHADOW_NONE,
- &gdk_event->area,
- win->m_widget,
- (char *)"base",
- 0, 0, -1, -1);
+ wxSize decorSize = win->m_decorSize;
+ int left, right, top, bottom;
+ if (wxGetFrameExtents(event->window, &left, &right, &top, &bottom))
+ decorSize.Set(left + right, top + bottom);
- return FALSE;
+ 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;
+}
+}
+#endif // GDK_WINDOWING_X11
+
// ----------------------------------------------------------------------------
// wxTopLevelWindowGTK creation
// ----------------------------------------------------------------------------
void wxTopLevelWindowGTK::Init()
{
- m_sizeSet = false;
- m_miniEdge = 0;
- m_miniTitle = 0;
- m_mainWidget = (GtkWidget*) NULL;
+ m_mainWidget = NULL;
m_isIconized = false;
m_fsIsShowing = false;
- m_fsSaveFlag = 0;
m_themeEnabled = true;
- m_gdkDecor = m_gdkFunc = 0;
+ m_gdkDecor =
+ m_gdkFunc = 0;
m_grabbed = false;
+ m_deferShow = true;
+ m_deferShowAllowed = true;
+ m_updateDecorSize = true;
+ m_netFrameExtentsTimerId = 0;
+ m_incWidth = m_incHeight = 0;
m_urgency_hint = -2;
}
// e.g. in wxTaskBarIconAreaGTK
if (m_widget == NULL)
{
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+ // we must create HildonWindow and not a normal GtkWindow as the latter
+ // doesn't look correctly in Maemo environment and it must also be
+ // registered with the main program object
+ m_widget = hildon_window_new();
+ hildon_program_add_window(wxTheApp->GetHildonProgram(),
+ HILDON_WINDOW(m_widget));
+#else // !wxUSE_LIBHILDON || !wxUSE_LIBHILDON2
+ m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
{
- m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
// Tell WM that this is a dialog window and make it center
// on parent by default (this is what GtkDialog ctor does):
gtk_window_set_type_hint(GTK_WINDOW(m_widget),
}
else
{
- m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-#if GTK_CHECK_VERSION(2,1,0)
- if (!gtk_check_version(2,1,0))
+ if (style & wxFRAME_TOOL_WINDOW)
{
- if (style & wxFRAME_TOOL_WINDOW)
- {
- gtk_window_set_type_hint(GTK_WINDOW(m_widget),
- GDK_WINDOW_TYPE_HINT_UTILITY);
-
- // On some WMs, like KDE, a TOOL_WINDOW will still show
- // on the taskbar, but on Gnome a TOOL_WINDOW will not.
- // For consistency between WMs and with Windows, we
- // should set the NO_TASKBAR flag which will apply
- // the set_skip_taskbar_hint if it is available,
- // ensuring no taskbar entry will appear.
- style |= wxFRAME_NO_TASKBAR;
- }
+ gtk_window_set_type_hint(GTK_WINDOW(m_widget),
+ GDK_WINDOW_TYPE_HINT_UTILITY);
+
+ // On some WMs, like KDE, a TOOL_WINDOW will still show
+ // on the taskbar, but on Gnome a TOOL_WINDOW will not.
+ // For consistency between WMs and with Windows, we
+ // should set the NO_TASKBAR flag which will apply
+ // the set_skip_taskbar_hint if it is available,
+ // ensuring no taskbar entry will appear.
+ style |= wxFRAME_NO_TASKBAR;
}
-#endif
}
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON || !wxUSE_LIBHILDON2
+
+ g_object_ref(m_widget);
}
wxWindow *topParent = wxGetTopLevelParent(m_parent);
GTK_WINDOW(topParent->m_widget) );
}
-#if GTK_CHECK_VERSION(2,2,0)
- if (!gtk_check_version(2,2,0))
+ if (style & wxFRAME_NO_TASKBAR)
{
- if (style & wxFRAME_NO_TASKBAR)
- {
- gtk_window_set_skip_taskbar_hint(GTK_WINDOW(m_widget), TRUE);
- }
+ gtk_window_set_skip_taskbar_hint(GTK_WINDOW(m_widget), TRUE);
}
-#endif
-#ifdef __WXGTK24__
- if (!gtk_check_version(2,4,0))
+ if (style & wxSTAY_ON_TOP)
{
- if (style & wxSTAY_ON_TOP)
- {
- gtk_window_set_keep_above(GTK_WINDOW(m_widget), TRUE);
- }
+ gtk_window_set_keep_above(GTK_WINDOW(m_widget), TRUE);
}
-#endif
+ 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 holds the toolbar, the menubar and the client area
- m_mainWidget = gtk_pizza_new();
+ // m_mainWidget is a GtkVBox, holding the bars and client area (m_wxwindow)
+ 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 );
- if (m_miniEdge == 0) // wxMiniFrame has its own version.
- {
- // For m_mainWidget themes
- g_signal_connect (m_mainWidget, "expose_event",
- G_CALLBACK (gtk_window_expose_callback), this);
- }
-
- // m_wxwindow only represents the client area without toolbar and menubar
- m_wxwindow = gtk_pizza_new();
+ // 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 );
- // the user resized the frame by dragging etc.
- g_signal_connect (m_widget, "size_allocate",
- G_CALLBACK (gtk_frame_size_callback), 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
- gtk_window_set_default_size( GTK_WINDOW(m_widget), m_width, m_height );
-
- // 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);
- // decorations
- if ((style & wxSIMPLE_BORDER) || (style & wxNO_BORDER))
+ // 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
{
- m_gdkDecor = 0;
- m_gdkFunc = 0;
+ gtk_widget_add_events(m_widget, GDK_PROPERTY_CHANGE_MASK);
+ g_signal_connect(m_widget, "property_notify_event",
+ G_CALLBACK(property_notify_event), this);
}
- else
- if (m_miniEdge > 0)
+#endif // GDK_WINDOWING_X11
+
+ // translate wx decorations styles into Motif WM hints (they are recognized
+ // by other WMs as well)
+
+ // always enable moving the window as we have no separate flag for enabling
+ // it
+ m_gdkFunc = GDK_FUNC_MOVE;
+
+ if ( style & wxCLOSE_BOX )
+ m_gdkFunc |= GDK_FUNC_CLOSE;
+
+ if ( style & wxMINIMIZE_BOX )
+ m_gdkFunc |= GDK_FUNC_MINIMIZE;
+
+ if ( style & wxMAXIMIZE_BOX )
+ m_gdkFunc |= GDK_FUNC_MAXIMIZE;
+
+ if ( (style & wxSIMPLE_BORDER) || (style & wxNO_BORDER) )
{
m_gdkDecor = 0;
- m_gdkFunc = 0;
-
- if ((style & wxRESIZE_BORDER) != 0)
- m_gdkFunc |= GDK_FUNC_RESIZE;
}
- else
+ else // have border
{
- m_gdkDecor = (long) GDK_DECOR_BORDER;
- m_gdkFunc = (long) GDK_FUNC_MOVE;
+ m_gdkDecor = GDK_DECOR_BORDER;
- // All this is for Motif Window Manager "hints" and is supposed to be
- // recognized by other WMs as well.
- if ((style & wxCAPTION) != 0)
- {
+ if ( style & wxCAPTION )
m_gdkDecor |= GDK_DECOR_TITLE;
- }
- if ((style & wxCLOSE_BOX) != 0)
- {
- m_gdkFunc |= GDK_FUNC_CLOSE;
- }
- if ((style & wxSYSTEM_MENU) != 0)
- {
+
+ if ( style & wxSYSTEM_MENU )
m_gdkDecor |= GDK_DECOR_MENU;
- }
- if ((style & wxMINIMIZE_BOX) != 0)
- {
- m_gdkFunc |= GDK_FUNC_MINIMIZE;
+
+ if ( style & wxMINIMIZE_BOX )
m_gdkDecor |= GDK_DECOR_MINIMIZE;
- }
- if ((style & wxMAXIMIZE_BOX) != 0)
- {
- m_gdkFunc |= GDK_FUNC_MAXIMIZE;
+
+ if ( style & wxMAXIMIZE_BOX )
m_gdkDecor |= GDK_DECOR_MAXIMIZE;
- }
- if ((style & wxRESIZE_BORDER) != 0)
+
+ if ( style & wxRESIZE_BORDER )
{
m_gdkFunc |= GDK_FUNC_RESIZE;
m_gdkDecor |= GDK_DECOR_RESIZEH;
}
}
+ // 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);
+ gtk_window_set_default_size(GTK_WINDOW(m_widget), w, h);
+
return true;
}
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) )
+ {
+ hildon_program_remove_window(wxTheApp->GetHildonProgram(),
+ HILDON_WINDOW(m_widget));
+ }
+#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+
if (m_grabbed)
{
- wxFAIL_MSG(_T("Window still grabbed"));
+ wxFAIL_MSG(wxT("Window still grabbed"));
RemoveGrab();
}
- m_isBeingDeleted = true;
+ SendDestroyEvent();
// it may also be GtkScrolledWindow in the case of an MDI child
if (GTK_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;
}
-bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
+bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long)
{
if (show == m_fsIsShowing)
return false; // return what?
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);
-#if GTK_CHECK_VERSION(2,2,0)
// 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) && !gtk_check_version(2,2,0) )
+ if ( method == wxX11_FS_WMSPEC )
+#endif // GDK_WINDOWING_X11
{
if (show)
- {
- m_fsSaveFlag = style;
gtk_window_fullscreen( GTK_WINDOW( m_widget ) );
- }
else
- {
- m_fsSaveFlag = 0;
gtk_window_unfullscreen( GTK_WINDOW( m_widget ) );
- }
}
+#ifdef GDK_WINDOWING_X11
else
-#endif // GTK+ >= 2.2.0
{
- GdkWindow *window = m_widget->window;
+ GdkWindow* window = gtk_widget_get_window(m_widget);
+ Window xid = GDK_WINDOW_XID(window);
if (show)
{
- m_fsSaveFlag = style;
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;
- if (method != wxX11_FS_WMSPEC)
- {
- // don't do it always, Metacity hates it
- m_fsSaveGdkFunc = m_gdkFunc;
- m_fsSaveGdkDecor = m_gdkDecor;
- m_gdkFunc = m_gdkDecor = 0;
- gdk_window_set_decorations(window, (GdkWMDecoration)0);
- gdk_window_set_functions(window, (GdkWMFunction)0);
- }
+ m_fsSaveGdkFunc = m_gdkFunc;
+ m_fsSaveGdkDecor = m_gdkDecor;
+ m_gdkFunc = m_gdkDecor = 0;
+ 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
{
- m_fsSaveFlag = 0;
- if (method != wxX11_FS_WMSPEC)
- {
- // don't do it always, Metacity hates it
- m_gdkFunc = m_fsSaveGdkFunc;
- m_gdkDecor = m_fsSaveGdkDecor;
- 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),
+ m_gdkFunc = m_fsSaveGdkFunc;
+ m_gdkDecor = m_fsSaveGdkDecor;
+ gdk_window_set_decorations(window, (GdkWMDecoration)m_gdkDecor);
+ gdk_window_set_functions(window, (GdkWMFunction)m_gdkFunc);
+
+ 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
- if ( show && !IsShown() )
+ if (show)
Show();
return true;
// overridden wxWindow methods
// ----------------------------------------------------------------------------
+void wxTopLevelWindowGTK::Refresh( bool WXUNUSED(eraseBackground), const wxRect *WXUNUSED(rect) )
+{
+ wxCHECK_RET( m_widget, wxT("invalid frame") );
+
+ gtk_widget_queue_draw( m_widget );
+
+ 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") );
- if (show == IsShown())
- return false;
+#ifdef GDK_WINDOWING_X11
+ bool deferShow = show && !m_isShown && m_deferShow;
+ if (deferShow)
+ {
+ 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);
+ if (deferShow)
+ {
+ 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 (show && !m_sizeSet)
+ m_deferShow = deferShow;
+ }
+ if (deferShow)
{
- /* by calling GtkOnSize here, we don't have to call
- either after showing the frame, which would entail
- much ugly flicker or from within the size_allocate
- handler, because GTK 1.1.X forbids that. */
+ // Initial show. If WM supports _NET_REQUEST_FRAME_EXTENTS, defer
+ // calling gtk_widget_show() until _NET_FRAME_EXTENTS property
+ // notification is received, so correct frame extents are known.
+ // This allows resizing m_widget to keep the overall size in sync with
+ // what wxWidgets expects it to be without an obvious change in the
+ // window size immediately after it becomes visible.
+
+ // Realize m_widget, so m_widget->window can be used. Realizing normally
+ // 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).
+ GtkAllocation alloc;
+ gtk_widget_get_allocation(m_widget, &alloc);
+ const int alloc_width = alloc.width;
+ if (alloc_width == 1)
+ {
+ alloc.width = 2;
+ gtk_widget_set_allocation(m_widget, &alloc);
+ }
+ gtk_widget_realize(m_widget);
+ if (alloc_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;
+ 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_window_get_display(window),
+ gdk_atom_intern("_NET_REQUEST_FRAME_EXTENTS", false));
+ xevent.format = 32;
+ 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);
+ }
- GtkOnSize();
+ // defer calling gtk_widget_show()
+ m_isShown = true;
+ return true;
}
+#endif // GDK_WINDOWING_X11
- wxTopLevelWindowBase::Show(show);
+ 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
+ // top down), before the initial size_allocate signals occur.
+ wxSizeEvent event(GetSize(), GetId());
+ event.SetEventObject(this);
+ HandleWindowEvent(event);
+ }
- if (!show)
+ bool change = base_type::Show(show);
+
+ if (change && !show)
{
// make sure window has a non-default position, so when it is shown
// again, it won't be repositioned by WM as if it were a new window
gtk_window_move((GtkWindow*)m_widget, m_x, m_y);
}
- return true;
+ return change;
+}
+
+void wxTopLevelWindowGTK::ShowWithoutActivating()
+{
+ if (!m_isShown)
+ {
+ gtk_window_set_focus_on_map(GTK_WINDOW(m_widget), false);
+ Show(true);
+ }
}
void wxTopLevelWindowGTK::Raise()
void wxTopLevelWindowGTK::GTKDoGetSize(int *width, int *height) const
{
- return wxTopLevelWindowBase::DoGetSize(width, height);
-}
-
-void wxTopLevelWindowGTK::GTKDoSetSize(int width, int height)
-{
- // avoid recursions
- if (m_resizing)
- return;
- m_resizing = true;
-
- int old_width = m_width;
- int old_height = m_height;
-
- if ( width != -1 )
- m_width = width;
- if ( height != -1 )
- m_height = height;
-
- ConstrainSize();
-
- if ( m_width != old_width || m_height != old_height )
- {
- gtk_window_resize( GTK_WINDOW(m_widget), m_width, m_height );
-
- /* we set the size in GtkOnSize, i.e. mostly the actual resizing is
- done either directly before the frame is shown or in idle time
- so that different calls to SetSize() don't lead to flicker. */
- m_sizeSet = false;
+ wxSize size(m_width, m_height);
+ size -= m_decorSize;
+ if (size.x < 0) size.x = 0;
+ if (size.y < 0) size.y = 0;
+#if wxUSE_LIBHILDON2
+ if (width) {
+ if (size.x == 720)
+ *width = 696;
+ else
+ *width = size.x;
}
-
- m_resizing = false;
+ if (height) {
+ if (size.y == 420)
+ *height = 396;
+ else if (size.y == 270)
+ *height = 246;
+ else
+ *height = size.y;
+ }
+#else // wxUSE_LIBHILDON2
+ if (width) *width = size.x;
+ if (height) *height = size.y;
+#endif // wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON2
}
void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{
wxCHECK_RET( m_widget, wxT("invalid frame") );
- // this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow
- wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
-
-
// deal with the position first
int old_x = m_x;
int old_y = m_y;
gtk_window_move( GTK_WINDOW(m_widget), m_x, m_y );
}
-
- // and now change the size: as we want to set the size of the entire
- // window, including decorations, we must adjust the size passed to
- // GTKDoSetSize() which takes with the size of undecorated frame only
- if ( width != -1 || height != -1 )
+ const wxSize oldSize(m_width, m_height);
+ if (width >= 0)
+ m_width = width;
+ 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)
{
- int wTotal,
- hTotal;
- DoGetSize(&wTotal, &hTotal);
-
- int wUndec,
- hUndec;
- GTKDoGetSize(&wUndec, &hUndec);
-
- if ( width != -1 )
- width -= wTotal - wUndec;
- if ( height != -1 )
- height -= hTotal - hUndec;
- }
+ m_deferShowAllowed = true;
- GTKDoSetSize(width, height);
-}
+ int w, h;
+ GTKDoGetSize(&w, &h);
+ gtk_window_resize(GTK_WINDOW(m_widget), w, h);
-void wxTopLevelWindowGTK::DoGetSize(int *width, int *height) const
-{
- wxCHECK_RET( m_widget, wxT("invalid frame") );
-
- if ( !m_widget->window )
- {
- // this can happen if we're called before the window is realized, so
- // don't assert but just return the stored values
- GTKDoGetSize(width, height);
- return;
+ GetClientSize(&m_oldClientWidth, &m_oldClientHeight);
+ wxSizeEvent event(GetSize(), GetId());
+ event.SetEventObject(this);
+ HandleWindowEvent(event);
}
+}
- GdkRectangle rect;
- gdk_window_get_frame_extents(m_widget->window, &rect);
+void wxTopLevelWindowGTK::DoSetClientSize(int width, int height)
+{
+ base_type::DoSetClientSize(width, height);
- if ( width )
- *width = rect.width;
- if ( height )
- *height = rect.height;
+ // Since client size is being explicitly set, don't change it later
+ // Has to be done after calling base because it calls SetSize,
+ // which sets this true
+ m_deferShowAllowed = false;
}
void wxTopLevelWindowGTK::DoGetClientSize( int *width, int *height ) const
{
+ wxASSERT_MSG(m_widget, wxT("invalid frame"));
+
if ( IsIconized() )
{
// for consistency with wxMSW, client area is supposed to be empty for
*width = 0;
if ( height )
*height = 0;
-
- return;
}
-
- wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
-
- if (height)
- {
- *height = m_height - 2 * m_miniEdge - m_miniTitle;
- if (*height < 0)
- *height = 0;
- }
- if (width)
+ else
{
- *width = m_width - 2 * m_miniEdge;
- if (*width < 0)
- *width = 0;
+ 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)
+ // 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 (minSize.y > m_decorSize.y)
+ hints.min_height = minSize.y - m_decorSize.y;
+ if (maxSize.x > 0)
{
- hints_mask |= GDK_HINT_MIN_SIZE;
- hints.min_width = minSize.x > 0 ? minSize.x : 0;
- hints.min_height = minSize.y > 0 ? minSize.y : 0;
+ hints.max_width = maxSize.x - m_decorSize.x;
+ if (hints.max_width < hints.min_width)
+ hints.max_width = hints.min_width;
}
- if (maxSize.x > 0 || maxSize.y > 0)
+ if (maxSize.y > 0)
{
- hints_mask |= GDK_HINT_MAX_SIZE;
- hints.max_width = maxSize.x > 0 ? maxSize.x : INT_MAX;
- hints.max_height = maxSize.y > 0 ? maxSize.y : INT_MAX;
+ hints.max_height = maxSize.y - m_decorSize.y;
+ 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);
}
-
-void wxTopLevelWindowGTK::GtkOnSize()
+#ifdef GDK_WINDOWING_X11
+void wxTopLevelWindowGTK::GTKUpdateDecorSize(const wxSize& decorSize)
{
- // avoid recursions
- if (m_resizing) return;
- m_resizing = true;
-
- if ( m_wxwindow == NULL ) return;
-
- ConstrainSize();
-
- if (m_mainWidget)
+ if (!IsMaximized() && !IsFullScreen())
+ GetCachedDecorSize() = decorSize;
+ if (m_updateDecorSize && m_decorSize != decorSize)
+ {
+ 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
+ if (w >= m_minWidth - decorSize.x && h >= m_minHeight - decorSize.y )
+ {
+ gtk_window_resize(GTK_WINDOW(m_widget), w, h);
+ resized = true;
+ }
+ }
+ if (!resized)
+ {
+ // adjust overall size to match change in frame extents
+ m_width += diff.x;
+ m_height += diff.y;
+ if (m_width < 1) m_width = 1;
+ if (m_height < 1) m_height = 1;
+ m_oldClientWidth = 0;
+ gtk_widget_queue_resize(m_wxwindow);
+ }
+ }
+ if (m_deferShow)
{
- gtk_pizza_set_size( GTK_PIZZA(m_mainWidget),
- m_wxwindow,
- 0, 0, m_width, m_height);
+ // gtk_widget_show() was deferred, do it now
+ m_deferShow = false;
+ GetClientSize(&m_oldClientWidth, &m_oldClientHeight);
+ wxSizeEvent sizeEvent(GetSize(), GetId());
+ sizeEvent.SetEventObject(this);
+ HandleWindowEvent(sizeEvent);
+
+ gtk_widget_show(m_widget);
+
+ wxShowEvent showEvent(GetId(), true);
+ showEvent.SetEventObject(this);
+ HandleWindowEvent(showEvent);
}
+}
+#endif // GDK_WINDOWING_X11
- m_sizeSet = true;
-
- // send size event to frame
- wxSizeEvent event( wxSize(m_width,m_height), GetId() );
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent( event );
-
- m_resizing = false;
+wxSize& wxTopLevelWindowGTK::GetCachedDecorSize()
+{
+ static wxSize size[8];
+
+ int index = 0;
+ // title bar
+ if (m_gdkDecor & (GDK_DECOR_MENU | GDK_DECOR_MINIMIZE | GDK_DECOR_MAXIMIZE | GDK_DECOR_TITLE))
+ index = 1;
+ // border
+ if (m_gdkDecor & GDK_DECOR_BORDER)
+ index |= 2;
+ // utility window decor can be different
+ if (m_windowStyle & wxFRAME_TOOL_WINDOW)
+ index |= 4;
+ return size[index];
}
void wxTopLevelWindowGTK::OnInternalIdle()
{
- if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow))
- {
- GtkOnSize();
-
- // we'll come back later
- return;
- }
-
- // set the focus if not done yet and if we can already do it
- if ( GTK_WIDGET_REALIZED(m_wxwindow) )
- {
- if ( g_delayedFocus &&
- wxGetTopLevelParent((wxWindow*)g_delayedFocus) == this )
- {
- wxLogTrace(_T("focus"),
- _T("Setting focus from wxTLW::OnIdle() to %s(%s)"),
- g_delayedFocus->GetClassInfo()->GetClassName(),
- g_delayedFocus->GetLabel().c_str());
-
- g_delayedFocus->SetFocus();
- g_delayedFocus = NULL;
- }
- }
-
- wxWindow::OnInternalIdle();
+ wxTopLevelWindowBase::OnInternalIdle();
// Synthetize activate events.
if ( g_sendActivateEvent != -1 )
{
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
- wxTopLevelWindowBase::SetIcons( icons );
-
- GList *list = NULL;
+ base_type::SetIcons(icons);
- const size_t numIcons = icons.GetIconCount();
- for ( size_t i = 0; i < numIcons; i++ )
+ // 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_get_realized(m_widget))
{
- list = g_list_prepend(list, icons.GetIconByIndex(i).GetPixbuf());
+ GList* list = NULL;
+ for (size_t i = icons.GetIconCount(); i--;)
+ list = g_list_prepend(list, icons.GetIconByIndex(i).GetPixbuf());
+ gtk_window_set_icon_list(GTK_WINDOW(m_widget), list);
+ g_list_free(list);
}
-
- gtk_window_set_icon_list(GTK_WINDOW(m_widget), list);
- g_list_free(list);
}
// ----------------------------------------------------------------------------
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,
- _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
-
- GdkWindow *window = NULL;
- if (m_wxwindow)
- {
- window = GTK_PIZZA(m_wxwindow)->bin_window;
- do_shape_combine_region(window, region);
- }
- window = m_widget->window;
- return do_shape_combine_region(window, region);
-}
-
bool wxTopLevelWindowGTK::IsActive()
{
return (this == (wxTopLevelWindowGTK*)g_activeFrame);
bool new_hint_value = false;
// FIXME: This is a workaround to focus handling problem
- // If RequestUserAttention is called for example right after a wxSleep, OnInternalIdle hasn't
- // yet been processed, and the internal focus system is not up to date yet.
- // wxYieldIfNeeded ensures the processing of it, but can have unwanted side effects - MR
- ::wxYieldIfNeeded();
+ // If RequestUserAttention is called for example right after a wxSleep, OnInternalIdle
+ // hasn't yet been processed, and the internal focus system is not up to date yet.
+ // YieldFor(wxEVT_CATEGORY_UI) ensures the processing of it (hopefully it
+ // won't have side effects) - MR
+ wxEventLoopBase::GetActive()->YieldFor(wxEVT_CATEGORY_UI);
if(m_urgency_hint >= 0)
g_source_remove(m_urgency_hint);
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 )
{
-#if defined(__WXGTK24__) || GTK_CHECK_VERSION(2,2,0)
// Store which styles were changed
long styleChanges = style ^ m_windowStyle;
-#endif
// Process wxWindow styles. This also updates the internal variable
// Therefore m_windowStyle bits carry now the _new_ style values
if (!m_widget)
return;
-#ifdef __WXGTK24__
- if ( (styleChanges & wxSTAY_ON_TOP) && !gtk_check_version(2,4,0) )
- gtk_window_set_keep_above(GTK_WINDOW(m_widget), m_windowStyle & wxSTAY_ON_TOP);
-#endif // GTK+ 2.4
-#if GTK_CHECK_VERSION(2,2,0)
- if ( (styleChanges & wxFRAME_NO_TASKBAR) && !gtk_check_version(2,2,0) )
+ if ( styleChanges & wxSTAY_ON_TOP )
{
- gtk_window_set_skip_taskbar_hint(GTK_WINDOW(m_widget), m_windowStyle & wxFRAME_NO_TASKBAR);
+ gtk_window_set_keep_above(GTK_WINDOW(m_widget),
+ m_windowStyle & wxSTAY_ON_TOP);
}
-#endif // GTK+ 2.2
-}
-#include <X11/Xlib.h>
-
-/* 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);
+ if ( styleChanges & wxFRAME_NO_TASKBAR )
+ {
+ gtk_window_set_skip_taskbar_hint(GTK_WINDOW(m_widget),
+ m_windowStyle & wxFRAME_NO_TASKBAR);
}
-
- 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));
-
- unsigned int opacity = alpha * 0x1010101;
+#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)
XDeleteProperty(dpy, win, XInternAtom(dpy, "_NET_WM_WINDOW_OPACITY", False));
else
+ {
+ long opacity = alpha * 0x1010101L;
XChangeProperty(dpy, win, XInternAtom(dpy, "_NET_WM_WINDOW_OPACITY", False),
XA_CARDINAL, 32, PropModeReplace,
(unsigned char *) &opacity, 1L);
+ }
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