Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-23 06:33:59 +08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Making effort to port toplevel.cpp to gtk+3 even though there is compilation error messages

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_GTK3@67930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
John Chain
2011-06-14 07:04:56 +00:00
parent 2c6022d0da
commit 7d303eed64
4 changed files with 1651 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gtk3/toplevel.cpp
+163 -47
View File
@@ -2,7 +2,7 @@
// Name: src/gtk/toplevel.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id: toplevel.cpp 66633 2011-01-07 18:15:21Z PC $
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -72,6 +72,10 @@ static wxTopLevelWindowGTK *g_lastActiveFrame = NULL;
// 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
//-----------------------------------------------------------------------------
@@ -80,12 +84,16 @@ extern "C" {
static void wxgtk_window_set_urgency_hint (GtkWindow *win,
gboolean setting)
{
wxASSERT_MSG( gtk_widget_get_realized(GTK_WIDGET(win)), wxT("wxgtk_window_set_urgency_hint: GdkWindow not realized") );
GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(win));
GdkDisplay *display = gtk_widget_get_display(GTK_WIDGET(win));
GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(win));
wxASSERT_MSG(window, "wxgtk_window_set_urgency_hint: GdkWindow not realized");
XWMHints *wm_hints;
#if GTK_CHECK_VERSION(3,0,0)
GdkDisplay *display = gtk_widget_get_display(GTK_WIDGET(win));
wm_hints = XGetWMHints(gdk_x11_display_get_xdisplay(display), gdk_x11_window_get_xid(window));
#else
wm_hints = XGetWMHints(GDK_WINDOW_XDISPLAY(window), GDK_WINDOW_XWINDOW(window));
#endif
if (!wm_hints)
wm_hints = XAllocWMHints();
@@ -95,7 +103,12 @@ static void wxgtk_window_set_urgency_hint (GtkWindow *win,
else
wm_hints->flags &= ~XUrgencyHint;
#if GTK_CHECK_VERSION(3,0,0)
XSetWMHints(gdk_x11_display_get_xdisplay(display), gdk_x11_window_get_xid(window), wm_hints);
#else
XSetWMHints(GDK_WINDOW_XDISPLAY(window), GDK_WINDOW_XWINDOW(window), wm_hints);
#endif
XFree(wm_hints);
}
@@ -219,8 +232,9 @@ size_allocate(GtkWidget*, GtkAllocation* alloc, wxTopLevelWindowGTK* win)
win->m_oldClientWidth = alloc->width;
win->m_oldClientHeight = alloc->height;
wxSize size(gtk_widget_get_allocated_width(win->m_widget),
gtk_widget_get_allocated_height(win->m_widget));
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;
@@ -317,8 +331,10 @@ gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget),
// GTK's shrinking/growing policy
if ( !(win->m_gdkFunc & GDK_FUNC_RESIZE) )
gtk_window_set_resizable(GTK_WINDOW(win->m_widget), FALSE);
#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED)
else
gtk_window_set_resizable(GTK_WINDOW(win->m_widget), TRUE);
gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
#endif
const wxIconBundle& icons = win->GetIcons();
if (icons.GetIconCount())
@@ -384,6 +400,14 @@ gtk_frame_window_state_callback( GtkWidget* WXUNUSED(widget),
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 event(win->GetId());
event.SetEventObject(win);
win->HandleWindowEvent(event);
}
return false;
}
}
@@ -393,18 +417,35 @@ gtk_frame_window_state_callback( GtkWidget* WXUNUSED(widget),
bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom)
{
static GdkAtom property = gdk_atom_intern("_NET_FRAME_EXTENTS", false);
#if GTK_CHECK_VERSION(3,0,0)
GdkDisplay *display = gdk_window_get_display(window);
Atom xproperty = gdk_x11_atom_to_xatom_for_display(display, property);
#else
Atom xproperty = gdk_x11_atom_to_xatom_for_display(
gdk_drawable_get_display(window), property);
#endif
Atom type;
int format;
gulong nitems, bytes_after;
guchar* data;
#if GTK_CHECK_VERSION(3,0,0)
Status status = XGetWindowProperty(
gdk_x11_display_get_xdisplay(display),
gdk_x11_window_get_xid(window),
xproperty,
0, 4, false, XA_CARDINAL,
&type, &format, &nitems, &bytes_after, &data);
#else
Status status = XGetWindowProperty(
gdk_x11_drawable_get_xdisplay(window),
gdk_x11_drawable_get_xid(window),
xproperty,
0, 4, false, XA_CARDINAL,
&type, &format, &nitems, &bytes_after, &data);
#endif
const bool success = status == Success && data && nitems == 4;
if (success)
{
@@ -431,6 +472,14 @@ static gboolean property_notify_event(
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))
@@ -442,6 +491,24 @@ static gboolean property_notify_event(
}
}
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;
}
}
// ----------------------------------------------------------------------------
// wxTopLevelWindowGTK creation
// ----------------------------------------------------------------------------
@@ -458,6 +525,7 @@ void wxTopLevelWindowGTK::Init()
m_deferShow = true;
m_deferShowAllowed = true;
m_updateDecorSize = true;
m_netFrameExtentsTimerId = 0;
m_urgency_hint = -2;
}
@@ -557,7 +625,7 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
#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);
@@ -565,7 +633,7 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
// 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_widget_set_can_focus(m_mainWidget, false);
gtk_container_add( GTK_CONTAINER(m_widget), m_mainWidget );
// m_wxwindow is the client area
@@ -575,7 +643,7 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
// 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 );
@@ -586,8 +654,10 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
G_CALLBACK (wxgtk_tlw_size_request_callback), this);
PostCreation();
#if !GTK_CHECK_VERSION(3,0,0) && !defined(GTK_DISABLE_DEPRECATED)
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
@@ -706,8 +776,9 @@ bool wxTopLevelWindowGTK::EnableCloseButton( bool enable )
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;
}
@@ -736,7 +807,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long)
}
else
{
GdkWindow *window = m_widget->window;
GdkWindow* window = gtk_widget_get_window(m_widget);
if (show)
{
@@ -755,17 +826,27 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long)
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);
#if GTK_CHECK_VERSION(3,0,0)
gdk_window_get_geometry(window, &client_x, &client_y, &width, &height);
#else
gdk_window_get_geometry(window, &client_x, &client_y, &width, &height, NULL);
#endif
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);
#if GTK_CHECK_VERSION(3,0,0)
wxSetFullScreenStateX11((WXDisplay*)GDK_DISPLAY(),
(WXWindow)GDK_ROOT_WINDOW(),
(WXWindow)gdk_x11_window_get_xid(window),
show, &m_fsSaveFrame, method);
#else
wxSetFullScreenStateX11((WXDisplay*)GDK_DISPLAY(),
(WXWindow)GDK_ROOT_WINDOW(),
(WXWindow)GDK_WINDOW_XWINDOW(window),
show, &m_fsSaveFrame, method);
#endif
}
else // hide
{
@@ -774,10 +855,17 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long)
gdk_window_set_decorations(window, (GdkWMDecoration)m_gdkDecor);
gdk_window_set_functions(window, (GdkWMFunction)m_gdkFunc);
#if GTK_CHECK_VERSION(3,0,0)
wxSetFullScreenStateX11((WXDisplay*)GDK_DISPLAY(),
(WXWindow)GDK_ROOT_WINDOW(),
(WXWindow)gdk_x11_window_get_xid(window),
show, &m_fsSaveFrame, method);
#else
wxSetFullScreenStateX11((WXDisplay*)GDK_DISPLAY(),
(WXWindow)GDK_ROOT_WINDOW(),
(WXWindow)GDK_WINDOW_XWINDOW(window),
show, &m_fsSaveFrame, method);
#endif
SetSize(m_fsSaveFrame.x, m_fsSaveFrame.y,
m_fsSaveFrame.width, m_fsSaveFrame.height);
@@ -802,8 +890,11 @@ void wxTopLevelWindowGTK::Refresh( bool WXUNUSED(eraseBackground), const wxRect
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 )
@@ -813,7 +904,8 @@ bool wxTopLevelWindowGTK::Show( bool show )
bool deferShow = show && !m_isShown && m_deferShow;
if (deferShow)
{
deferShow = m_deferShowAllowed && !GTK_WIDGET_REALIZED(m_widget);
deferShow = gs_requestFrameExtentsStatus != 2 &&
m_deferShowAllowed && !gtk_widget_get_realized(m_widget);
if (deferShow)
{
deferShow = g_signal_handler_find(m_widget,
@@ -833,13 +925,6 @@ bool wxTopLevelWindowGTK::Show( bool show )
// 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;
}
@@ -856,33 +941,61 @@ bool wxTopLevelWindowGTK::Show( bool show )
// 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);
#if GTK_CHECK_VERSION(3,0,0)
xevent.window = gdk_x11_window_get_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);
GdkDisplay *disp = gdk_window_get_display(window);
Display* display = gdk_x11_display_get_xdisplay(disp);
#else
xevent.window = gdk_x11_drawable_get_xid(window);
xevent.message_type = gdk_x11_atom_to_xatom_for_display(
gdk_drawable_get_display(window),
gdk_atom_intern("_NET_REQUEST_FRAME_EXTENTS", false));
xevent.format = 32;
Display* display = gdk_x11_drawable_get_xdisplay(window);
#endif
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;
}
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
@@ -1187,7 +1300,7 @@ void wxTopLevelWindowGTK::SetIcons( const wxIconBundle &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--;)
@@ -1211,10 +1324,8 @@ void wxTopLevelWindowGTK::Maximize(bool maximize)
bool wxTopLevelWindowGTK::IsMaximized() const
{
if(!m_widget->window)
return false;
return gdk_window_get_state(m_widget->window) & GDK_WINDOW_STATE_MAXIMIZED;
GdkWindow* window = gtk_widget_get_window(m_widget);
return window && (gdk_window_get_state(window) & GDK_WINDOW_STATE_MAXIMIZED);
}
void wxTopLevelWindowGTK::Restore()
@@ -1273,7 +1384,9 @@ static bool do_shape_combine_region(GdkWindow* window, const wxRegion& region)
{
if (region.IsEmpty())
{
#if !GTK_CHECK_VERSION(3,0,0)
gdk_window_shape_combine_mask(window, NULL, 0, 0);
#endif
}
else
{
@@ -1290,12 +1403,12 @@ 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 ( gtk_widget_get_realized(m_widget) )
{
if ( m_wxwindow )
do_shape_combine_region(m_wxwindow->window, region);
do_shape_combine_region(gtk_widget_get_window(m_wxwindow), region);
return do_shape_combine_region(m_widget->window, region);
return do_shape_combine_region(gtk_widget_get_window(m_widget), region);
}
else // not realized yet
{
@@ -1329,7 +1442,7 @@ void wxTopLevelWindowGTK::RequestUserAttention(int flags)
m_urgency_hint = -2;
if( GTK_WIDGET_REALIZED(m_widget) && !IsActive() )
if( gtk_widget_get_realized(m_widget) && !IsActive() )
{
new_hint_value = true;
@@ -1397,14 +1510,17 @@ static Window wxGetTopmostWindowX11(Display *dpy, Window 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);
Display* dpy = GDK_WINDOW_XDISPLAY(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));
Window win = wxGetTopmostWindowX11(dpy, GDK_WINDOW_XID(window));
// Using pure Xlib to not have a GTK version check mess due to gtk2.0 not having GdkDisplay
src/gtk3/toplevel.cpp.old
+1475
View File
File diff suppressed because it is too large Load Diff
src/unix/utilsx11.cpp
+11 -2
View File
@@ -50,7 +50,7 @@ static Atom _NET_WM_WINDOW_TYPE_NORMAL = 0;
static Atom _KDE_NET_WM_WINDOW_TYPE_OVERRIDE = 0;
static Atom _WIN_LAYER = 0;
static Atom KWIN_RUNNING = 0;
#ifndef __WXGTK20__
#if !defined(__WXGTK20__) && !defined(__WXGTK30__)
static Atom _NET_SUPPORTING_WM_CHECK = 0;
static Atom _NET_SUPPORTED = 0;
#endif
@@ -266,7 +266,7 @@ static void wxWinHintsSetLayer(Display *display, Window rootWnd,
#ifdef __WXGTK20__
#if defined(__WXGTK20__)
static bool wxQueryWMspecSupport(Display* WXUNUSED(display),
Window WXUNUSED(rootWnd),
Atom (feature))
@@ -274,6 +274,15 @@ static bool wxQueryWMspecSupport(Display* WXUNUSED(display),
GdkAtom gatom = gdk_x11_xatom_to_atom(feature);
return gdk_net_wm_supports(gatom);
}
#elif defined(__WXGTK30__)
static bool wxQueryWMspecSupport(Display* WXUNUSED(display),
Window WXUNUSED(rootWnd),
Atom (feature))
{
GdkAtom gatom = gdk_x11_xatom_to_atom(feature);
//TODO Fix NULL here
return gdk_x11_screen_supports_net_wm_hint(NULL, gatom);
}
#else
static bool wxQueryWMspecSupport(Display *display, Window rootWnd, Atom feature)
{
vim.rc
+2 -1
View File
@@ -1,4 +1,5 @@
set makeprg=make\ -j20\ -C\ ../wx-branch-build
"set makeprg=make\ -j20\ -C\ ../wx-branch-build
set makeprg=make\ -C\ ../wx-branch-build
set tags=./tags
set sw=4
set csprg=gtags-cscope