Lots of OS/2 updates

[wxWidgets.git] / src / gtk / toplevel.cpp

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index eb820f7f15c7725effb31c30c6cc5d930fee86e1..7b4d04a2dbaf2aaa8cb7604f0ea789738b65bd3d 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -29,6 +29,7 @@
 #include "wx/control.h"
 #include "wx/app.h"
 #include "wx/dcclient.h"
 #include "wx/control.h"
 #include "wx/app.h"
 #include "wx/dcclient.h"

+#include "wx/gtk/private.h"

 
 #include <glib.h>
 #include <gdk/gdk.h>
 
 #include <glib.h>
 #include <gdk/gdk.h>


@@ -40,6 +41,9 @@
 
 #include "wx/unix/utilsx11.h"
 
 
 #include "wx/unix/utilsx11.h"
 

+// XA_CARDINAL
+#include <X11/Xatom.h>
+

 // ----------------------------------------------------------------------------
 // idle system
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // idle system
 // ----------------------------------------------------------------------------


@@ -365,9 +369,9 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     }
 
     if (!name.IsEmpty())
     }
 
     if (!name.IsEmpty())

-        gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() );
+        gtk_window_set_wmclass( GTK_WINDOW(m_widget), wxGTK_CONV( name ), wxGTK_CONV( name ) );

 
 

-    gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() );
+    gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( title ) );

     GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
     GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",


@@ -500,10 +504,64 @@ wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
     }
 }
 
     }
 }
 

+
+// X11 ICCCM values for window layers
+#define  WIN_LAYER_NORMAL      4
+#define  WIN_LAYER_ABOVE_DOCK  10
+
+// X11 window manager property name
+#define  XA_WIN_LAYER          "_WIN_LAYER"
+
+// X11 window manager property name atom
+static Atom gs_XA_WIN_LAYER = 0;
+
+
+static void wx_win_hints_set_layer(GtkWidget *window, int layer)
+{
+#ifndef __WXGTK20__
+    XEvent xev;
+    GdkWindowPrivate *priv;
+    gint prev_error;
+  
+    prev_error = gdk_error_warnings;
+    gdk_error_warnings = 0;
+    priv = (GdkWindowPrivate*)(GTK_WIDGET(window)->window);
+  
+    if (GTK_WIDGET_MAPPED(window))
+    {
+        xev.type = ClientMessage;
+        xev.xclient.type = ClientMessage;
+        xev.xclient.window = priv->xwindow;
+        xev.xclient.message_type = gs_XA_WIN_LAYER;
+        xev.xclient.format = 32;
+        xev.xclient.data.l[0] = (long)layer;
+        xev.xclient.data.l[1] = gdk_time_get();
+      
+        XSendEvent(GDK_DISPLAY(), GDK_ROOT_WINDOW(), False,
+            SubstructureNotifyMask, (XEvent*) &xev);
+    }
+    else
+    {
+        long data[1];
+      
+        data[0] = layer;
+        XChangeProperty(GDK_DISPLAY(), priv->xwindow, gs_XA_WIN_LAYER,
+              XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 1);
+    }
+    gdk_error_warnings = prev_error;
+#endif
+}
+

 bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
 {
     if (show == m_fsIsShowing) return FALSE; // return what?
 
 bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
 {
     if (show == m_fsIsShowing) return FALSE; // return what?
 

+    if (gs_XA_WIN_LAYER == 0)
+    {
+        // Initialose X11 Atom only once
+        gs_XA_WIN_LAYER = XInternAtom( GDK_DISPLAY(), XA_WIN_LAYER, False );
+    }
+

     m_fsIsShowing = show;
 
     if (show)
     m_fsIsShowing = show;
 
     if (show)


@@ -514,32 +572,26 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
         GetPosition( &m_fsSaveFrame.x, &m_fsSaveFrame.y );
         GetSize( &m_fsSaveFrame.width, &m_fsSaveFrame.height );
 
         GetPosition( &m_fsSaveFrame.x, &m_fsSaveFrame.y );
         GetSize( &m_fsSaveFrame.width, &m_fsSaveFrame.height );
 

-        gtk_widget_hide( m_widget );
-        gtk_widget_unrealize( m_widget );
+        int screen_width,screen_height;
+        wxDisplaySize( &screen_width, &screen_height );
+        
+               gint client_x, client_y, root_x, root_y;
+               gint width, height;

 
 

-        m_gdkDecor = (long) GDK_DECOR_BORDER;
-        m_gdkFunc = (long) GDK_FUNC_MOVE;
-
-        int x;
-        int y;
-        wxDisplaySize( &x, &y );
-        SetSize( 0, 0, x, y );
+               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);
+                     
+        wx_win_hints_set_layer( m_widget, WIN_LAYER_ABOVE_DOCK );

 
 

-        gtk_widget_realize( m_widget );
-        gtk_widget_show( m_widget );
+               gdk_window_move_resize (m_widget->window, -client_x, -client_y,
+                                       screen_width + 1, screen_height + 1);

     }
     else
     {
     }
     else
     {

-        gtk_widget_hide( m_widget );
-        gtk_widget_unrealize( m_widget );
-
-        m_gdkFunc = m_fsSaveGdkFunc;
-        m_gdkDecor = m_fsSaveGdkDecor;
-
+        wx_win_hints_set_layer( m_widget, WIN_LAYER_NORMAL );
+        

         SetSize( m_fsSaveFrame.x, m_fsSaveFrame.y, m_fsSaveFrame.width, m_fsSaveFrame.height );
         SetSize( m_fsSaveFrame.x, m_fsSaveFrame.y, m_fsSaveFrame.width, m_fsSaveFrame.height );

-
-        gtk_widget_realize( m_widget );
-        gtk_widget_show( m_widget );

     }
 
     return TRUE;
     }
 
     return TRUE;


@@ -593,16 +645,14 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si
     {
         if (x != -1) m_x = x;
         if (y != -1) m_y = y;
     {
         if (x != -1) m_x = x;
         if (y != -1) m_y = y;

-        if (width != -1) m_width = width;
-        if (height != -1) m_height = height;

     }
     else
     {
         m_x = x;
         m_y = y;
     }
     else
     {
         m_x = x;
         m_y = y;

-        m_width = width;
-        m_height = height;

     }
     }

+    if (width != -1) m_width = width;
+    if (height != -1) m_height = height;

 
 /*
     if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)
 
 /*
     if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH)


@@ -812,7 +862,7 @@ void wxTopLevelWindowGTK::SetTitle( const wxString &title )
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
     m_title = title;
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
     m_title = title;

-    gtk_window_set_title( GTK_WINDOW(m_widget), title.mbc_str() );
+    gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( title ) );

 }
 
 void wxTopLevelWindowGTK::DoSetIcon( const wxIcon &icon )
 }
 
 void wxTopLevelWindowGTK::DoSetIcon( const wxIcon &icon )