X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4161a2a08e622ba55f66610e26892f5fda37e6f..c96d7bec67801a380d029990ad1df5e2c9fc207b:/src/gtk/toplevel.cpp diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp index 51ac28e480..caca06176d 100644 --- a/src/gtk/toplevel.cpp +++ b/src/gtk/toplevel.cpp @@ -45,6 +45,11 @@ // XA_CARDINAL #include +#if wxUSE_LIBHILDON + #include + #include +#endif // wxUSE_LIBHILDON + // ---------------------------------------------------------------------------- // data // ---------------------------------------------------------------------------- @@ -215,27 +220,30 @@ static wxSize& GetDecorSize(int decor) } //----------------------------------------------------------------------------- -// "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; - - wxSize sizeDecor; - if (!win->IsFullScreen()) - sizeDecor = GetDecorSize(win->m_gdkDecor); - const int w = alloc->width + sizeDecor.x; - const int h = alloc->height + sizeDecor.y; - - if (win->m_width != w || win->m_height != h) + if (win->m_oldClientWidth != alloc->width || + win->m_oldClientHeight != alloc->height) { - win->m_width = w; - win->m_height = h; - - win->GtkUpdateSize(); + win->m_oldClientWidth = alloc->width; + win->m_oldClientHeight = alloc->height; + wxSize sizeDecor; + if (!win->IsFullScreen()) + sizeDecor = GetDecorSize(win->m_gdkDecor); + win->m_width = win->m_widget->allocation.width + sizeDecor.x; + win->m_height = win->m_widget->allocation.height + sizeDecor.y; + if (!win->IsIconized()) + { + wxSizeEvent event(win->GetSize(), win->GetId()); + event.SetEventObject(win); + win->GetEventHandler()->ProcessEvent(event); + } + // else the window is currently unmapped, don't generate size events } } } @@ -362,12 +370,26 @@ gtk_frame_map_callback( GtkWidget* widget, // Update window size and frame extents cache win->m_width = rect.width; win->m_height = rect.height; - win->GtkUpdateSize(); decorSize = size; } } + const bool wasIconized = win->IsIconized(); + win->SetIconizeState(false); + + 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); + } + return false; } } @@ -400,18 +422,8 @@ static gboolean property_notify_event( if (event->state == GDK_PROPERTY_NEW_VALUE && event->atom == property && win->IsDecorCacheable() && !win->IsFullScreen()) { - Atom xproperty; -#if GTK_CHECK_VERSION(2, 2, 0) - if (gtk_check_version(2, 2, 0) == NULL) - { - xproperty = gdk_x11_atom_to_xatom_for_display( - gdk_drawable_get_display(event->window), property); - } - else -#endif - { - xproperty = gdk_x11_atom_to_xatom(property); - } + Atom xproperty = gdk_x11_atom_to_xatom_for_display( + gdk_drawable_get_display(event->window), property); Atom type; int format; gulong nitems, bytes_after; @@ -434,8 +446,9 @@ static gboolean property_notify_event( win->m_height += size.y - decorSize.y; if (win->m_width < 0) win->m_width = 0; if (win->m_height < 0) win->m_height = 0; - win->GtkUpdateSize(); decorSize = size; + win->m_oldClientWidth = 0; + gtk_widget_queue_resize(win->m_wxwindow); } } if (data) @@ -445,15 +458,17 @@ static gboolean property_notify_event( } } +BEGIN_EVENT_TABLE(wxTopLevelWindowGTK, wxTopLevelWindowBase) + EVT_SYS_COLOUR_CHANGED(wxTopLevelWindowGTK::OnSysColourChanged) +END_EVENT_TABLE() + + // ---------------------------------------------------------------------------- // wxTopLevelWindowGTK creation // ---------------------------------------------------------------------------- void wxTopLevelWindowGTK::Init() { - m_sizeSet = false; - m_miniEdge = 0; - m_miniTitle = 0; m_mainWidget = (GtkWidget*) NULL; m_isIconized = false; m_fsIsShowing = false; @@ -493,9 +508,17 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, // e.g. in wxTaskBarIconAreaGTK if (m_widget == NULL) { +#if wxUSE_LIBHILDON + // 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 + 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), @@ -505,26 +528,21 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, } 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_LIBHILDON } wxWindow *topParent = wxGetTopLevelParent(m_parent); @@ -536,25 +554,15 @@ bool wxTopLevelWindowGTK::Create( wxWindow *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 0 if (!name.empty()) @@ -567,14 +575,14 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, 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_vbox_new(false, 0); gtk_widget_show( m_mainWidget ); GTK_WIDGET_UNSET_FLAGS( m_mainWidget, GTK_CAN_FOCUS ); gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget ); - // 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 ); @@ -584,9 +592,8 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, 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); @@ -627,15 +634,6 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, m_gdkFunc = 0; } else - if (m_miniEdge > 0) - { - m_gdkDecor = 0; - m_gdkFunc = 0; - - if ((style & wxRESIZE_BORDER) != 0) - m_gdkFunc |= GDK_FUNC_RESIZE; - } - else { m_gdkDecor = GDK_DECOR_BORDER; m_gdkFunc = GDK_FUNC_MOVE; @@ -681,6 +679,11 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, wxTopLevelWindowGTK::~wxTopLevelWindowGTK() { +#if wxUSE_LIBHILDON + hildon_program_remove_window(wxTheApp->GetHildonProgram(), + HILDON_WINDOW(m_widget)); +#endif // wxUSE_LIBHILDON + if (m_grabbed) { wxFAIL_MSG(_T("Window still grabbed")); @@ -725,12 +728,11 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long) wxGetFullScreenMethodX11((WXDisplay*)GDK_DISPLAY(), (WXWindow)GDK_ROOT_WINDOW()); -#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 ) { if (show) gtk_window_fullscreen( GTK_WINDOW( m_widget ) ); @@ -738,7 +740,6 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long) gtk_window_unfullscreen( GTK_WINDOW( m_widget ) ); } else -#endif // GTK+ >= 2.2.0 { GdkWindow *window = m_widget->window; @@ -753,15 +754,11 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long) 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, @@ -777,14 +774,10 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long) } else // hide { - 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); - } + 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(), @@ -812,22 +805,19 @@ bool wxTopLevelWindowGTK::Show( bool show ) { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - if (show == IsShown()) - return false; - - if (show && !m_sizeSet) + if (show && !IsShown()) { - /* 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. */ - - GtkOnSize(); + // 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); + GetEventHandler()->ProcessEvent(event); } - wxTopLevelWindowBase::Show(show); + bool change = wxTopLevelWindowBase::Show(show); - if (!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 @@ -835,7 +825,7 @@ bool wxTopLevelWindowGTK::Show( bool show ) gtk_window_move((GtkWindow*)m_widget, m_x, m_y); } - return true; + return change; } void wxTopLevelWindowGTK::Raise() @@ -869,10 +859,6 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si { 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; @@ -896,8 +882,6 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si gtk_window_move( GTK_WINDOW(m_widget), m_x, m_y ); } - m_resizing = true; - const wxSize oldSize(m_width, m_height); if (width >= 0) m_width = width; @@ -909,13 +893,18 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si int w, h; GTKDoGetSize(&w, &h); gtk_window_resize(GTK_WINDOW(m_widget), w, h); - GtkUpdateSize(); + + GetClientSize(&m_oldClientWidth, &m_oldClientHeight); + wxSizeEvent event(GetSize(), GetId()); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); } - m_resizing = 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 @@ -924,25 +913,10 @@ void wxTopLevelWindowGTK::DoGetClientSize( int *width, int *height ) const *width = 0; if ( height ) *height = 0; - - return; - } - - wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); - - int w, h; - GTKDoGetSize(&w, &h); - if (width) - { - *width = w - 2 * m_miniEdge; - if (*width < 0) - *width = 0; } - if (height) + else { - *height = h - 2 * m_miniEdge - m_miniTitle; - if (*height < 0) - *height = 0; + GTKDoGetSize(width, height); } } @@ -987,35 +961,6 @@ void wxTopLevelWindowGTK::DoSetSizeHints( int minW, int minH, (GtkWindow*)m_widget, NULL, &hints, (GdkWindowHints)hints_mask); } -void wxTopLevelWindowGTK::GtkOnSize() -{ - // avoid recursions - if (m_resizing) return; - m_resizing = true; - - if ( m_wxwindow == NULL ) return; - - ConstrainSize(); - - if (m_mainWidget) - { - int w, h; - GTKDoGetSize(&w, &h); - gtk_pizza_set_size( GTK_PIZZA(m_mainWidget), - m_wxwindow, - 0, 0, w, h); - } - - 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; -} - bool wxTopLevelWindowGTK::IsDecorCacheable() const { return true; @@ -1023,14 +968,6 @@ bool wxTopLevelWindowGTK::IsDecorCacheable() const 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) ) { @@ -1194,8 +1131,7 @@ bool wxTopLevelWindowGTK::SetShape(const wxRegion& region) GdkWindow *window = NULL; if (m_wxwindow) { - window = GTK_PIZZA(m_wxwindow)->bin_window; - do_shape_combine_region(window, region); + do_shape_combine_region(m_wxwindow->window, region); } window = m_widget->window; return do_shape_combine_region(window, region); @@ -1243,10 +1179,8 @@ void wxTopLevelWindowGTK::RequestUserAttention(int flags) 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 @@ -1256,16 +1190,17 @@ void wxTopLevelWindowGTK::SetWindowStyleFlag( long style ) 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); + } + + if ( styleChanges & wxFRAME_NO_TASKBAR ) + { + gtk_window_set_skip_taskbar_hint(GTK_WINDOW(m_widget), + m_windowStyle & wxFRAME_NO_TASKBAR); } -#endif // GTK+ 2.2 } /* Get the X Window between child and the root window. @@ -1341,3 +1276,16 @@ bool wxTopLevelWindowGTK::CanSetTransparent() "Composite", &opcode, &event, &error); #endif } + +void wxTopLevelWindowGTK::OnSysColourChanged(wxSysColourChangedEvent& event) +{ + // We don't know the order in which top-level windows will + // be notified, so we need to clear the system objects + // for each top-level window. + extern void wxClearGtkSystemObjects(); + wxClearGtkSystemObjects(); + + // wxWindowBase::OnSysColourChanged will propagate event + // to children + event.Skip(); +}