fixed wxXmlResource::Load's detection of filenames to be done as early as possible

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

diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp
index 8372fcadb612b174417e5f6890558aada60fba41..834489387b4e11fa2e4ca659c3714d3c79a9d975 100644 (file)
--- a/src/gtk/minifram.cpp
+++ b/src/gtk/minifram.cpp
@@ -15,16 +15,14 @@
 #include "wx/minifram.h"
 
 #ifndef WX_PRECOMP
 #include "wx/minifram.h"
 
 #ifndef WX_PRECOMP

-    #include "wx/dcscreen.h"
+    #include "wx/settings.h"
+    #include "wx/dcclient.h"
+    #include "wx/image.h"

 #endif
 
 #endif
 

-#include "gtk/gtk.h"
-#include "wx/gtk/win_gtk.h"
-#include "wx/gtk/private.h"
+#include "wx/gtk/dcclient.h"

 
 

-#include <gdk/gdk.h>
-#include <gdk/gdkprivate.h>
-#include <gdk/gdkx.h>
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // data
 
 //-----------------------------------------------------------------------------
 // data


@@ -32,53 +30,85 @@
 
 extern bool        g_blockEventsOnDrag;
 extern bool        g_blockEventsOnScroll;
 
 extern bool        g_blockEventsOnDrag;
 extern bool        g_blockEventsOnScroll;

-extern GtkWidget  *wxGetRootWindow();

 
 //-----------------------------------------------------------------------------
 // "expose_event" of m_mainWidget
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "expose_event" of m_mainWidget
 //-----------------------------------------------------------------------------
 

-extern "C" {
-static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxFrame *win )
+// StepColour() it a utility function that simply darkens
+// or lightens a color, based on the specified percentage
+static wxColor StepColour(const wxColor& c, int percent)
+{
+    int r = c.Red(), g = c.Green(), b = c.Blue();
+    return wxColour((unsigned char)wxMin((r*percent)/100,255),
+                    (unsigned char)wxMin((g*percent)/100,255),
+                    (unsigned char)wxMin((b*percent)/100,255));
+}
+
+static wxColor LightContrastColour(const wxColour& c)

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
+    int amount = 120;
+
+    // if the color is especially dark, then
+    // make the contrast even lighter
+    if (c.Red() < 128 && c.Green() < 128 && c.Blue() < 128)
+        amount = 160;

 
 

-    if (!win->m_hasVMT) return;
-    if (gdk_event->count > 0) return;
+    return StepColour(c, amount);
+}

 
 

-    GtkPizza *pizza = GTK_PIZZA(widget);
+extern "C" {
+static gboolean gtk_window_own_expose_callback(GtkWidget* widget, GdkEventExpose* gdk_event, wxMiniFrame* win)
+{
+    if (!win->m_hasVMT || gdk_event->count > 0 ||
+        gdk_event->window != widget->window)
+    {
+        return false;
+    }

 
     gtk_paint_shadow (widget->style,
 
     gtk_paint_shadow (widget->style,

-                      pizza->bin_window,
+                      widget->window,

                       GTK_STATE_NORMAL,
                       GTK_SHADOW_OUT,
                       NULL, NULL, NULL, // FIXME: No clipping?
                       0, 0,
                       win->m_width, win->m_height);
 
                       GTK_STATE_NORMAL,
                       GTK_SHADOW_OUT,
                       NULL, NULL, NULL, // FIXME: No clipping?
                       0, 0,
                       win->m_width, win->m_height);
 

-    if (!win->GetTitle().empty() &&
-        ((win->GetWindowStyle() & wxCAPTION) ||
-         (win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) ||
-         (win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
+    int style = win->GetWindowStyle();
+
+    wxClientDC dc(win);
+
+    wxDCImpl *impl = dc.GetImpl();
+    wxClientDCImpl *gtk_impl = wxDynamicCast( impl, wxClientDCImpl );
+    gtk_impl->m_gdkwindow = widget->window; // Hack alert
+
+    if (style & wxRESIZE_BORDER)
+    {
+        dc.SetBrush( *wxGREY_BRUSH );
+        dc.SetPen( *wxTRANSPARENT_PEN );
+        dc.DrawRectangle( win->m_width - 14, win->m_height-14, 14, 14 );
+    }
+
+    if (win->m_miniTitle && !win->GetTitle().empty())

     {
     {

-        wxClientDC dc(win);

         dc.SetFont( *wxSMALL_FONT );
         dc.SetFont( *wxSMALL_FONT );

-        int height = dc.GetCharHeight();
-
-        GdkGC *gc = gdk_gc_new( pizza->bin_window );
-        gdk_gc_set_foreground( gc, &widget->style->bg[GTK_STATE_SELECTED] );
-        gdk_draw_rectangle( pizza->bin_window, gc, TRUE,
-                            3,
-                            3,
-                            win->m_width - 7,
-                            height+1 );
-        g_object_unref (gc);
-
-        // Hack alert
-        dc.m_window = pizza->bin_window;
+
+        wxBrush brush( LightContrastColour( wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT) ) );
+        dc.SetBrush( brush );
+        dc.SetPen( *wxTRANSPARENT_PEN );
+        dc.DrawRectangle( win->m_miniEdge-1, 
+                          win->m_miniEdge-1, 
+                          win->m_width - (2*(win->m_miniEdge-1)),
+                          15  );
+

         dc.SetTextForeground( *wxWHITE );
         dc.SetTextForeground( *wxWHITE );

-        dc.DrawText( win->GetTitle(), 6, 3 );
+        dc.DrawText( win->GetTitle(), 6, 4 );
+
+        if (style & wxCLOSE_BOX)
+            dc.DrawBitmap( win->m_closeButton, win->m_width-18, 3, true );

     }
     }

+    
+    return false;

 }
 }
 
 }
 }
 


@@ -87,24 +117,53 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
+static gboolean
+gtk_window_button_press_callback(GtkWidget* widget, GdkEventButton* gdk_event, wxMiniFrame* win)

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!win->m_hasVMT) return FALSE;
+    if (!win->m_hasVMT || gdk_event->window != widget->window)
+        return false;

     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
 
     if (win->m_isDragging) return TRUE;
 
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
 
     if (win->m_isDragging) return TRUE;
 

-    GtkPizza *pizza = GTK_PIZZA(widget);
-    if (gdk_event->window != pizza->bin_window) return TRUE;
+    int style = win->GetWindowStyle();

 
 

-    wxClientDC dc(win);
-    dc.SetFont( *wxSMALL_FONT );
-    int height = dc.GetCharHeight() + 1;
+    int y = (int)gdk_event->y;
+    int x = (int)gdk_event->x;
+
+    if ((style & wxRESIZE_BORDER) &&
+        (x > win->m_width-14) && (y > win->m_height-14))
+    {
+        GtkWidget *ancestor = gtk_widget_get_toplevel( widget );
+
+        GdkWindow *source = widget->window;
+
+        int org_x = 0;
+        int org_y = 0;
+        gdk_window_get_origin( source, &org_x, &org_y );
+
+        gtk_window_begin_resize_drag (GTK_WINDOW (ancestor),
+                                  GDK_WINDOW_EDGE_SOUTH_EAST,
+                                  1,
+                                  org_x + x,
+                                  org_y + y,
+                                  0);
+
+        return TRUE;
+    }
+
+    if (win->m_miniTitle && (style & wxCLOSE_BOX))
+    {
+        if ((y > 3) && (y < 19) && (x > win->m_width-19) && (x < win->m_width-3))
+        {
+            win->Close();
+            return TRUE;
+        }
+    }

 
 

-    if (gdk_event->y > height) return TRUE;
+    if (y >= win->m_miniEdge + win->m_miniTitle)
+        return true;

 
     gdk_window_raise( win->m_widget->window );
 
 
     gdk_window_raise( win->m_widget->window );
 


@@ -116,12 +175,12 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
                           GDK_POINTER_MOTION_HINT_MASK  |
                           GDK_BUTTON_MOTION_MASK        |
                           GDK_BUTTON1_MOTION_MASK),
                           GDK_POINTER_MOTION_HINT_MASK  |
                           GDK_BUTTON_MOTION_MASK        |
                           GDK_BUTTON1_MOTION_MASK),

-                      (GdkWindow *) NULL,
-                      (GdkCursor *) NULL,
+                      NULL,
+                      NULL,

                       (unsigned int) GDK_CURRENT_TIME );
 
                       (unsigned int) GDK_CURRENT_TIME );
 

-    win->m_diffX = (int)gdk_event->x;
-    win->m_diffY = (int)gdk_event->y;
+    win->m_diffX = x;
+    win->m_diffY = y;

     win->m_oldX = 0;
     win->m_oldY = 0;
 
     win->m_oldX = 0;
     win->m_oldY = 0;
 


@@ -136,14 +195,13 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxMiniFrame *win )
+static gboolean
+gtk_window_button_release_callback(GtkWidget* widget, GdkEventButton* gdk_event, wxMiniFrame* win)

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!win->m_hasVMT) return FALSE;
+    if (!win->m_hasVMT || gdk_event->window != widget->window)
+        return false;

     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;

-

     if (!win->m_isDragging) return TRUE;
 
     win->m_isDragging = false;
     if (!win->m_isDragging) return TRUE;
 
     win->m_isDragging = false;


@@ -166,20 +224,39 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// "motion_notify_event" of m_mainWidget
+// "leave_notify_event" of m_mainWidget

 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win )
+static gboolean
+gtk_window_leave_callback(GtkWidget *widget,
+                          GdkEventCrossing* gdk_event,
+                          wxMiniFrame *win)

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     if (!win->m_hasVMT) return FALSE;
     if (!win->m_hasVMT) return FALSE;

+    if (g_blockEventsOnDrag) return FALSE;
+    if (gdk_event->window != widget->window)
+        return false;
+
+    gdk_window_set_cursor( widget->window, NULL );
+
+    return FALSE;
+}
+}
+
+//-----------------------------------------------------------------------------
+// "motion_notify_event" of m_mainWidget
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static gboolean
+gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxMiniFrame *win )
+{
+    if (!win->m_hasVMT || gdk_event->window != widget->window)
+        return false;

     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
 
     if (g_blockEventsOnDrag) return TRUE;
     if (g_blockEventsOnScroll) return TRUE;
 

-    if (!win->m_isDragging) return TRUE;
-

     if (gdk_event->is_hint)
     {
        int x = 0;
     if (gdk_event->is_hint)
     {
        int x = 0;


@@ -191,12 +268,26 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion
        gdk_event->state = state;
     }
 
        gdk_event->state = state;
     }
 

-    win->m_oldX = (int)gdk_event->x - win->m_diffX;
-    win->m_oldY = (int)gdk_event->y - win->m_diffY;
+    int style = win->GetWindowStyle();

 
     int x = (int)gdk_event->x;
     int y = (int)gdk_event->y;
 
     int x = (int)gdk_event->x;
     int y = (int)gdk_event->y;

-    
+
+    if (!win->m_isDragging)
+    {
+        if (style & wxRESIZE_BORDER)
+        {
+            if ((x > win->m_width-14) && (y > win->m_height-14))
+               gdk_window_set_cursor( widget->window, gdk_cursor_new( GDK_BOTTOM_RIGHT_CORNER ) );
+            else
+               gdk_window_set_cursor( widget->window, NULL );
+        }
+        return TRUE;
+    }
+
+    win->m_oldX = x - win->m_diffX;
+    win->m_oldY = y - win->m_diffY;
+

     int org_x = 0;
     int org_y = 0;
     gdk_window_get_origin( widget->window, &org_x, &org_y );
     int org_x = 0;
     int org_y = 0;
     gdk_window_get_origin( widget->window, &org_x, &org_y );


@@ -206,40 +297,19 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion
     win->m_y = y;
     gtk_window_move( GTK_WINDOW(win->m_widget), x, y );
 
     win->m_y = y;
     gtk_window_move( GTK_WINDOW(win->m_widget), x, y );
 

-

     return TRUE;
 }
 }
 
     return TRUE;
 }
 }
 

-//-----------------------------------------------------------------------------
-// "clicked" of X system button
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxMiniFrame *mf )
-{
-    if (g_isIdle) wxapp_install_idle_handler();
-
-    mf->Close();
-}
-}
-

 //-----------------------------------------------------------------------------
 // wxMiniFrame
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxMiniFrame
 //-----------------------------------------------------------------------------
 

-static const char *cross_xpm[] = {
-/* columns rows colors chars-per-pixel */
-"5 5 2 1",
-"# c Gray0",
-"  c None",
-/* pixels */
-"#   #",
-" # # ",
-"  #  ",
-" # # ",
-"#   #",
-};
+static unsigned char close_bits[]={
+    0xff, 0xff, 0xff, 0xff, 0x07, 0xf0, 0xfb, 0xef, 0xdb, 0xed, 0x8b, 0xe8,
+    0x1b, 0xec, 0x3b, 0xee, 0x1b, 0xec, 0x8b, 0xe8, 0xdb, 0xed, 0xfb, 0xef,
+    0x07, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+

 
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame,wxFrame)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame,wxFrame)
 


@@ -247,12 +317,14 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {

-    style = style | wxCAPTION;
-
-    if ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT))
-        m_miniTitle = 13;
-
-    m_miniEdge = 3;
+    m_miniTitle = 0;
+    if (style & wxCAPTION)
+        m_miniTitle = 16;
+
+    if (style & wxRESIZE_BORDER)
+        m_miniEdge = 4;
+    else
+        m_miniEdge = 3;

     m_isDragging = false;
     m_oldX = -1;
     m_oldY = -1;
     m_isDragging = false;
     m_oldX = -1;
     m_oldY = -1;


@@ -261,66 +333,98 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
 
     wxFrame::Create( parent, id, title, pos, size, style, name );
 
 
     wxFrame::Create( parent, id, title, pos, size, style, name );
 

+    // Use a GtkEventBox for the title and borders. Using m_widget for this
+    // almost works, except that setting the resize cursor has no effect.
+    GtkWidget* eventbox = gtk_event_box_new();
+    gtk_widget_add_events(eventbox,
+        GDK_POINTER_MOTION_MASK |
+        GDK_POINTER_MOTION_HINT_MASK);
+    gtk_widget_show(eventbox);
+    // Use a GtkAlignment to position m_mainWidget inside the decorations
+    GtkWidget* alignment = gtk_alignment_new(0, 0, 1, 1);
+    gtk_alignment_set_padding(GTK_ALIGNMENT(alignment),
+        m_miniTitle + m_miniEdge, m_miniEdge, m_miniEdge, m_miniEdge);
+    gtk_widget_show(alignment);
+    // The GtkEventBox and GtkAlignment go between m_widget and m_mainWidget
+    gtk_widget_reparent(m_mainWidget, alignment);
+    gtk_container_add(GTK_CONTAINER(eventbox), alignment);
+    gtk_container_add(GTK_CONTAINER(m_widget), eventbox);
+
+    m_gdkDecor = 0;
+    m_gdkFunc = 0;
+    if (style & wxRESIZE_BORDER)
+       m_gdkFunc = GDK_FUNC_RESIZE;
+    gtk_window_set_default_size(GTK_WINDOW(m_widget), m_width, m_height);
+    m_decorSize.Set(0, 0);
+    m_deferShow = false;
+
+    // don't allow sizing smaller than decorations
+    GdkGeometry geom;
+    geom.min_width  = 2 * m_miniEdge;
+    geom.min_height = 2 * m_miniEdge + m_miniTitle;
+    gtk_window_set_geometry_hints(GTK_WINDOW(m_widget), NULL, &geom, GDK_HINT_MIN_SIZE);
+

     if (m_parent && (GTK_IS_WINDOW(m_parent->m_widget)))
     {
         gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) );
     }
 
     if (m_parent && (GTK_IS_WINDOW(m_parent->m_widget)))
     {
         gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) );
     }
 

-    if ((style & wxSYSTEM_MENU) &&
-        ((style & wxCAPTION) || (style & wxTINY_CAPTION_HORIZ) || (style & wxTINY_CAPTION_VERT)))
+    if (m_miniTitle && (style & wxCLOSE_BOX))

     {
     {

-        GdkBitmap *mask = (GdkBitmap*) NULL;
-        GdkPixmap *pixmap = gdk_pixmap_create_from_xpm_d
-                            (
-                                wxGetRootWindow()->window,
-                                &mask,
-                                NULL,
-                                (char **)cross_xpm
-                            );
-
-        GtkWidget *pw = gtk_pixmap_new( pixmap, mask );
-        g_object_unref (mask);
-        g_object_unref (pixmap);
-        gtk_widget_show( pw );
-
-        GtkWidget *close_button = gtk_button_new();
-#ifdef __WXGTK24__
-        if (!gtk_check_version(2,4,0))
-            gtk_button_set_focus_on_click( GTK_BUTTON(close_button), FALSE );
-#endif
-        gtk_container_add( GTK_CONTAINER(close_button), pw );
-
-        gtk_pizza_put( GTK_PIZZA(m_mainWidget),
-                         close_button,
-                         size.x-16, 4, 11, 11 );
-
-        gtk_widget_show( close_button );
-
-        g_signal_connect (close_button, "clicked",
-                          G_CALLBACK (gtk_button_clicked_callback),
-                          this);
+        wxImage img = wxBitmap((const char*)close_bits, 16, 16).ConvertToImage();
+        img.Replace(0,0,0,123,123,123);
+        img.SetMaskColour(123,123,123);
+        m_closeButton = wxBitmap( img );

     }
 
     /* these are called when the borders are drawn */
     }
 
     /* these are called when the borders are drawn */

-    g_signal_connect (m_mainWidget, "expose_event",
+    g_signal_connect_after(eventbox, "expose_event",

                       G_CALLBACK (gtk_window_own_expose_callback), this );
 
     /* these are required for dragging the mini frame around */
                       G_CALLBACK (gtk_window_own_expose_callback), this );
 
     /* these are required for dragging the mini frame around */

-    g_signal_connect (m_mainWidget, "button_press_event",
+    g_signal_connect (eventbox, "button_press_event",

                       G_CALLBACK (gtk_window_button_press_callback), this);
                       G_CALLBACK (gtk_window_button_press_callback), this);

-    g_signal_connect (m_mainWidget, "button_release_event",
+    g_signal_connect (eventbox, "button_release_event",

                       G_CALLBACK (gtk_window_button_release_callback), this);
                       G_CALLBACK (gtk_window_button_release_callback), this);

-    g_signal_connect (m_mainWidget, "motion_notify_event",
+    g_signal_connect (eventbox, "motion_notify_event",

                       G_CALLBACK (gtk_window_motion_notify_callback), this);
                       G_CALLBACK (gtk_window_motion_notify_callback), this);

-
+    g_signal_connect (eventbox, "leave_notify_event",
+                      G_CALLBACK (gtk_window_leave_callback), this);

     return true;
 }
 
     return true;
 }
 

+void wxMiniFrame::DoGetClientSize(int* width, int* height) const
+{
+    wxFrame::DoGetClientSize(width, height);
+    if (width)
+    {
+        *width -= 2 * m_miniEdge;
+        if (*width < 0) *width = 0;
+    }
+    if (height)
+    {
+        *height -= m_miniTitle + 2 * m_miniEdge;
+        if (*height < 0) *height = 0;
+    }
+}
+
+// Keep min size at least as large as decorations
+void wxMiniFrame::DoSetSizeHints(int minW, int minH, int maxW, int maxH, int incW, int incH)
+{
+    const int w = 2 * m_miniEdge;
+    const int h = 2 * m_miniEdge + m_miniTitle;
+    if (minW < w) minW = w;
+    if (minH < h) minH = h;
+    wxFrame::DoSetSizeHints(minW, minH, maxW, maxH, incW, incH);
+}
+

 void wxMiniFrame::SetTitle( const wxString &title )
 {
     wxFrame::SetTitle( title );
 
 void wxMiniFrame::SetTitle( const wxString &title )
 {
     wxFrame::SetTitle( title );
 

-    gdk_window_invalidate_rect( GTK_PIZZA(m_mainWidget)->bin_window, NULL, true );
+    GtkWidget* widget = GTK_BIN(m_widget)->child;
+    if (widget->window)
+        gdk_window_invalidate_rect(widget->window, NULL, false);

 }
 
 #endif // wxUSE_MINIFRAME
 }
 
 #endif // wxUSE_MINIFRAME