X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/848332140be2d53aea32d0702f4c0e06c149d24b..582f07c2532e6e2d7d1ccb235354548e9bada9bf:/src/gtk/window.cpp diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index b54d7239f1..e9ba04cdfe 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/window.cpp +// Name: src/gtk/window.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -15,19 +15,28 @@ #endif #include "wx/window.h" -#include "wx/dcclient.h" -#include "wx/frame.h" -#include "wx/app.h" -#include "wx/layout.h" -#include "wx/utils.h" -#include "wx/dialog.h" -#include "wx/msgdlg.h" -#include "wx/module.h" -#include "wx/combobox.h" -#if wxUSE_TOOLBAR_NATIVE -#include "wx/toolbar.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/frame.h" + #include "wx/dcclient.h" + #include "wx/menu.h" + #include "wx/dialog.h" + #include "wx/settings.h" + #include "wx/msgdlg.h" + #include "wx/textctrl.h" + #include "wx/toolbar.h" + #include "wx/combobox.h" + #include "wx/layout.h" + #include "wx/statusbr.h" + #include "wx/math.h" #endif +#include "wx/module.h" + #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" #endif @@ -40,23 +49,12 @@ #include "wx/caret.h" #endif // wxUSE_CARET -#if wxUSE_TEXTCTRL - #include "wx/textctrl.h" -#endif - -#include "wx/menu.h" -#include "wx/statusbr.h" -#include "wx/intl.h" -#include "wx/settings.h" -#include "wx/log.h" #include "wx/fontutil.h" -#include "wx/stattext.h" #ifdef __WXDEBUG__ #include "wx/thread.h" #endif -#include "wx/math.h" #include // FIXME: Due to a hack we use GtkCombo in here, which is deprecated since gtk2.3.0 @@ -217,7 +215,6 @@ extern GtkContainerClass *pizza_parent_class; // data //----------------------------------------------------------------------------- -extern wxList wxPendingDelete; extern bool g_blockEventsOnDrag; extern bool g_blockEventsOnScroll; extern wxCursor g_globalCursor; @@ -270,7 +267,7 @@ gdk_window_warp_pointer (GdkWindow *window, gint y) { if (!window) - window = GDK_ROOT_PARENT(); + window = gdk_get_default_root_window(); if (!GDK_WINDOW_DESTROYED(window)) { @@ -310,6 +307,35 @@ wxWindow *wxFindFocusedChild(wxWindowGTK *win) return (wxWindow *)NULL; } +static void GetScrollbarWidth(GtkWidget* widget, int& w, int& h) +{ + GtkScrolledWindow* scroll_window = GTK_SCROLLED_WINDOW(widget); + GtkScrolledWindowClass* scroll_class = GTK_SCROLLED_WINDOW_CLASS(GTK_OBJECT_GET_CLASS(scroll_window)); + GtkRequisition scroll_req; + + w = 0; + if (scroll_window->vscrollbar_visible) + { + scroll_req.width = 2; + scroll_req.height = 2; + (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(scroll_window->vscrollbar) )->size_request ) + (scroll_window->vscrollbar, &scroll_req ); + w = scroll_req.width + + scroll_class->scrollbar_spacing; + } + + h = 0; + if (scroll_window->hscrollbar_visible) + { + scroll_req.width = 2; + scroll_req.height = 2; + (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(scroll_window->hscrollbar) )->size_request ) + (scroll_window->hscrollbar, &scroll_req ); + h = scroll_req.height + + scroll_class->scrollbar_spacing; + } +} + static void draw_frame( GtkWidget *widget, wxWindowGTK *win ) { // wxUniversal widgets draw the borders and scrollbars themselves @@ -322,33 +348,7 @@ static void draw_frame( GtkWidget *widget, wxWindowGTK *win ) if (win->m_hasScrolling) { - GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(widget); - - GtkRequisition vscroll_req; - vscroll_req.width = 2; - vscroll_req.height = 2; - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(scroll_window->vscrollbar) )->size_request ) - (scroll_window->vscrollbar, &vscroll_req ); - - GtkRequisition hscroll_req; - hscroll_req.width = 2; - hscroll_req.height = 2; - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(scroll_window->hscrollbar) )->size_request ) - (scroll_window->hscrollbar, &hscroll_req ); - - GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT_GET_CLASS(widget) ); - - if (scroll_window->vscrollbar_visible) - { - dw += vscroll_req.width; - dw += scroll_class->scrollbar_spacing; - } - - if (scroll_window->hscrollbar_visible) - { - dh += hscroll_req.height; - dh += scroll_class->scrollbar_spacing; - } + GetScrollbarWidth(widget, dw, dh); } int dx = 0; @@ -391,7 +391,7 @@ static void draw_frame( GtkWidget *widget, wxWindowGTK *win ) gdk_draw_rectangle( widget->window, gc, FALSE, dx, dy, widget->allocation.width-dw-1, widget->allocation.height-dh-1 ); - gdk_gc_unref( gc ); + g_object_unref (gc); return; } #endif // __WXUNIVERSAL__ @@ -531,6 +531,18 @@ gtk_window_expose_callback( GtkWidget *widget, // "key_press_event" from any window //----------------------------------------------------------------------------- +// These are used when transforming Ctrl-alpha to ascii values 1-26 +inline bool wxIsLowerChar(int code) +{ + return (code >= 'a' && code <= 'z' ); +} + +inline bool wxIsUpperChar(int code) +{ + return (code >= 'A' && code <= 'Z' ); +} + + // set WXTRACE to this to see the key event codes on the console #define TRACE_KEYS _T("keyevent") @@ -652,11 +664,11 @@ static long wxTranslateKeySymToWXKey(KeySym keysym, bool isChar) break; case GDK_Prior: // == GDK_Page_Up - key_code = WXK_PRIOR; + key_code = WXK_PAGEUP; break; case GDK_Next: // == GDK_Page_Down - key_code = WXK_NEXT; + key_code = WXK_PAGEDOWN; break; case GDK_End: @@ -735,11 +747,11 @@ static long wxTranslateKeySymToWXKey(KeySym keysym, bool isChar) break; case GDK_KP_Prior: // == GDK_KP_Page_Up - key_code = isChar ? WXK_PRIOR : WXK_NUMPAD_PRIOR; + key_code = isChar ? WXK_PAGEUP : WXK_NUMPAD_PAGEUP; break; case GDK_KP_Next: // == GDK_KP_Page_Down - key_code = isChar ? WXK_NEXT : WXK_NUMPAD_NEXT; + key_code = isChar ? WXK_PAGEDOWN : WXK_NUMPAD_PAGEDOWN; break; case GDK_KP_End: @@ -967,7 +979,7 @@ struct wxGtkIMData } ~wxGtkIMData() { - g_object_unref(context); + g_object_unref (context); } }; @@ -1082,9 +1094,13 @@ gtk_window_key_press_callback( GtkWidget *widget, // To conform to the docs we need to translate Ctrl-alpha // characters to values in the range 1-26. - if (event.ControlDown() && key_code >= 'a' && key_code <= 'z' ) + if ( event.ControlDown() && + ( wxIsLowerChar(key_code) || wxIsUpperChar(key_code) )) { - event.m_keyCode = key_code - 'a' + 1; + if ( wxIsLowerChar(key_code) ) + event.m_keyCode = key_code - 'a' + 1; + if ( wxIsUpperChar(key_code) ) + event.m_keyCode = key_code - 'A' + 1; #if wxUSE_UNICODE event.m_uniChar = event.m_keyCode; #endif @@ -1199,13 +1215,8 @@ gtk_wxwindow_commit_cb (GtkIMContext *context, window, window->m_imData->lastKeyEvent); } -#if wxUSE_UNICODE - const wxWCharBuffer data = wxConvUTF8.cMB2WC( (char*)str ); -#else - const wxWCharBuffer wdata = wxConvUTF8.cMB2WC( (char*)str ); - const wxCharBuffer data = wxConvLocal.cWC2MB( wdata ); -#endif // wxUSE_UNICODE - if( !(const wxChar*)data ) + const wxWxCharBuffer data(wxGTK_CONV_BACK(str)); + if( !data ) return; bool ret = false; @@ -1228,8 +1239,14 @@ gtk_wxwindow_commit_cb (GtkIMContext *context, // To conform to the docs we need to translate Ctrl-alpha // characters to values in the range 1-26. - if (event.ControlDown() && *pstr >= 'a' && *pstr <= 'z' ) + if ( event.ControlDown() && + ( wxIsLowerChar(*pstr) || wxIsUpperChar(*pstr) )) { + if ( wxIsLowerChar(*pstr) ) + event.m_keyCode = *pstr - 'a' + 1; + if ( wxIsUpperChar(*pstr) ) + event.m_keyCode = *pstr - 'A' + 1; + event.m_keyCode = *pstr - 'a' + 1; #if wxUSE_UNICODE event.m_uniChar = event.m_keyCode; @@ -1590,6 +1607,10 @@ gtk_window_button_press_callback( GtkWidget *widget, if ( !g_captureWindow ) win = FindWindowForMouseEvent(win, event.m_x, event.m_y); + // reset the event object and id in case win changed. + event.SetEventObject( win ); + event.SetId( win->GetId() ); + if (win->GetEventHandler()->ProcessEvent( event )) { g_signal_stop_emission_by_name (widget, "button_press_event"); @@ -1670,6 +1691,10 @@ gtk_window_button_release_callback( GtkWidget *widget, if ( !g_captureWindow ) win = FindWindowForMouseEvent(win, event.m_x, event.m_y); + // reset the event object and id in case win changed. + event.SetEventObject( win ); + event.SetId( win->GetId() ); + if (win->GetEventHandler()->ProcessEvent( event )) { g_signal_stop_emission_by_name (widget, "button_release_event"); @@ -1745,6 +1770,10 @@ gtk_window_motion_notify_callback( GtkWidget *widget, else // no capture { win = FindWindowForMouseEvent(win, event.m_x, event.m_y); + + // reset the event object and id in case win changed. + event.SetEventObject( win ); + event.SetId( win->GetId() ); } if ( !g_captureWindow ) @@ -1755,7 +1784,7 @@ gtk_window_motion_notify_callback( GtkWidget *widget, // Rewrite cursor handling here (away from idle). } } - + if (win->GetEventHandler()->ProcessEvent( event )) { g_signal_stop_emission_by_name (widget, "motion_notify_event"); @@ -1767,29 +1796,25 @@ gtk_window_motion_notify_callback( GtkWidget *widget, } //----------------------------------------------------------------------------- -// "mouse_wheel_event" +// "scroll_event", (mouse wheel event) //----------------------------------------------------------------------------- extern "C" { static gboolean -gtk_window_wheel_callback (GtkWidget * widget, - GdkEventScroll * gdk_event, - wxWindowGTK * win) +window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win) { DEBUG_MAIN_THREAD if (g_isIdle) wxapp_install_idle_handler(); - wxEventType event_type = wxEVT_NULL; - if (gdk_event->direction == GDK_SCROLL_UP) - event_type = wxEVT_MOUSEWHEEL; - else if (gdk_event->direction == GDK_SCROLL_DOWN) - event_type = wxEVT_MOUSEWHEEL; - else - return FALSE; + if (gdk_event->direction != GDK_SCROLL_UP && + gdk_event->direction != GDK_SCROLL_DOWN) + { + return false; + } - wxMouseEvent event( event_type ); + wxMouseEvent event(wxEVT_MOUSEWHEEL); // Can't use InitMouse macro because scroll events don't have button event.SetTimestamp( gdk_event->time ); event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK); @@ -1814,13 +1839,7 @@ gtk_window_wheel_callback (GtkWidget * widget, event.SetId( win->GetId() ); event.SetTimestamp( gdk_event->time ); - if (win->GetEventHandler()->ProcessEvent( event )) - { - g_signal_stop_emission_by_name (widget, "scroll_event"); - return TRUE; - } - - return FALSE; + return win->GetEventHandler()->ProcessEvent(event); } } @@ -2024,7 +2043,7 @@ gtk_window_enter_callback( GtkWidget *widget, // Rewrite cursor handling here (away from idle). } } - + if (win->GetEventHandler()->ProcessEvent( event )) { g_signal_stop_emission_by_name (widget, "enter_notify_event"); @@ -2091,92 +2110,66 @@ gtk_window_leave_callback( GtkWidget *widget, } //----------------------------------------------------------------------------- -// "value_changed" from m_vAdjust +// "value_changed" from scrollbar //----------------------------------------------------------------------------- extern "C" { -static void gtk_window_vscroll_callback( GtkAdjustment *adjust, - wxWindowGTK *win ) +static void +gtk_scrollbar_value_changed(GtkRange* range, wxWindow* win) { - DEBUG_MAIN_THREAD - - if (g_isIdle) - wxapp_install_idle_handler(); - - if (g_blockEventsOnDrag) return; - - if (!win->m_hasVMT) return; - - float diff = adjust->value - win->m_oldVerticalPos; - if (fabs(diff) < 0.2) return; - - win->m_oldVerticalPos = adjust->value; - - wxEventType command = GtkScrollWinTypeToWx(GTK_SCROLL_JUMP); - - int value = (int)(adjust->value+0.5); - - wxScrollWinEvent event( command, value, wxVERTICAL ); - event.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event ); + wxEventType eventType = win->GetScrollEventType(range); + if (eventType != wxEVT_NULL) + { + // Convert scroll event type to scrollwin event type + eventType += wxEVT_SCROLLWIN_TOP - wxEVT_SCROLL_TOP; + const int orient = range == win->m_scrollBar[0] ? wxHORIZONTAL : wxVERTICAL; + const int i = orient == wxVERTICAL; + wxScrollWinEvent event(eventType, win->GetScrollPos(orient), orient); + event.SetEventObject(win); + win->m_blockValueChanged[i] = true; + win->GetEventHandler()->ProcessEvent(event); + win->m_blockValueChanged[i] = false; + } } } //----------------------------------------------------------------------------- -// "value_changed" from m_hAdjust +// "button_press_event" from scrollbar //----------------------------------------------------------------------------- extern "C" { -static void gtk_window_hscroll_callback( GtkAdjustment *adjust, - wxWindowGTK *win ) +static gboolean +gtk_scrollbar_button_press_event(GtkRange*, GdkEventButton*, wxWindow* win) { DEBUG_MAIN_THREAD if (g_isIdle) wxapp_install_idle_handler(); - if (g_blockEventsOnDrag) return; - if (!win->m_hasVMT) return; - - float diff = adjust->value - win->m_oldHorizontalPos; - if (fabs(diff) < 0.2) return; - - wxEventType command = GtkScrollWinTypeToWx(GTK_SCROLL_JUMP); - - win->m_oldHorizontalPos = adjust->value; - - int value = (int)(adjust->value+0.5); + g_blockEventsOnScroll = true; + win->m_mouseButtonDown = true; - wxScrollWinEvent event( command, value, wxHORIZONTAL ); - event.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event ); + return false; } } //----------------------------------------------------------------------------- -// "button_press_event" from scrollbar +// "event_after" from scrollbar //----------------------------------------------------------------------------- extern "C" { -static gboolean -gtk_scrollbar_button_press_callback( GtkWidget *widget, - GdkEventButton *gdk_event, - wxWindowGTK *win) +static void +gtk_scrollbar_event_after(GtkRange* range, GdkEvent* event, wxWindow* win) { - DEBUG_MAIN_THREAD - - if (g_isIdle) - wxapp_install_idle_handler(); - - - g_blockEventsOnScroll = true; - -// FIXME: there is no 'slider' field in GTK+ 2.0 any more -#if 0 - win->m_isScrolling = (gdk_event->window == widget->slider); -#endif + if (event->type == GDK_BUTTON_RELEASE) + { + g_signal_handlers_block_by_func(range, (void*)gtk_scrollbar_event_after, win); - return FALSE; + const int orient = range == win->m_scrollBar[0] ? wxHORIZONTAL : wxVERTICAL; + wxScrollWinEvent event(wxEVT_SCROLLWIN_THUMBRELEASE, win->GetScrollPos(orient), orient); + event.SetEventObject(win); + win->GetEventHandler()->ProcessEvent(event); + } } } @@ -2186,45 +2179,23 @@ gtk_scrollbar_button_press_callback( GtkWidget *widget, extern "C" { static gboolean -gtk_scrollbar_button_release_callback( GtkRange *widget, - GdkEventButton *WXUNUSED(gdk_event), - wxWindowGTK *win) +gtk_scrollbar_button_release_event(GtkRange* range, GdkEventButton*, wxWindow* win) { DEBUG_MAIN_THREAD -// don't test here as we can release the mouse while being over -// a different window than the slider -// -// if (gdk_event->window != widget->slider) return FALSE; - g_blockEventsOnScroll = false; - + win->m_mouseButtonDown = false; + // If thumb tracking if (win->m_isScrolling) { - wxEventType command = wxEVT_SCROLLWIN_THUMBRELEASE; - int value = -1; - int dir = -1; - - GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(win->m_widget); - if (widget == GTK_RANGE(scrolledWindow->hscrollbar)) - { - value = (int)(win->m_hAdjust->value+0.5); - dir = wxHORIZONTAL; - } - if (widget == GTK_RANGE(scrolledWindow->vscrollbar)) - { - value = (int)(win->m_vAdjust->value+0.5); - dir = wxVERTICAL; - } - - wxScrollWinEvent event( command, value, dir ); - event.SetEventObject( win ); - win->GetEventHandler()->ProcessEvent( event ); + win->m_isScrolling = false; + // Hook up handler to send thumb release event after this emission is finished. + // To allow setting scroll position from event handler, sending event must + // be deferred until after the GtkRange handler for this signal has run + g_signal_handlers_unblock_by_func(range, (void*)gtk_scrollbar_event_after, win); } - win->m_isScrolling = false; - - return FALSE; + return false; } } @@ -2281,8 +2252,6 @@ void gtk_window_size_callback( GtkWidget *WXUNUSED(widget), if (g_isIdle) wxapp_install_idle_handler(); - if (!win->m_hasScrolling) return; - int client_width = 0; int client_height = 0; win->GetClientSize( &client_width, &client_height ); @@ -2327,7 +2296,7 @@ void gtk_wxwindow_size_callback( GtkWidget* WXUNUSED_UNLESS_XIM(widget), { gint width, height; - gdk_window_get_size (widget->window, &width, &height); + gdk_drawable_get_size (widget->window, &width, &height); win->m_icattr->preedit_area.width = width; win->m_icattr->preedit_area.height = height; gdk_ic_set_attr (win->m_ic, win->m_icattr, GDK_IC_PREEDIT_AREA); @@ -2398,7 +2367,7 @@ gtk_wxwindow_realized_callback( GtkWidget * WXUNUSED_UNLESS_XIM(widget), break; } - gdk_window_get_size (widget->window, &width, &height); + gdk_drawable_get_size (widget->window, &width, &height); attrmask |= GDK_IC_PREEDIT_POSITION_REQ; attr->spot_location.x = 0; @@ -2525,11 +2494,16 @@ void wxWindowGTK::Init() m_hasScrolling = false; m_isScrolling = false; + m_mouseButtonDown = false; + m_blockScrollEvent = false; + + m_scrollBar[0] = + m_scrollBar[1] = NULL; + m_scrollPos[0] = + m_scrollPos[1] = 0; + m_blockValueChanged[0] = + m_blockValueChanged[1] = false; - m_hAdjust = (GtkAdjustment*) NULL; - m_vAdjust = (GtkAdjustment*) NULL; - m_oldHorizontalPos = - m_oldVerticalPos = 0.0; m_oldClientWidth = m_oldClientHeight = 0; @@ -2593,8 +2567,8 @@ bool wxWindowGTK::Create( wxWindow *parent, gtk_scrolled_window_set_policy( scrolledWindow, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); - m_hAdjust = gtk_range_get_adjustment( GTK_RANGE(scrolledWindow->hscrollbar) ); - m_vAdjust = gtk_range_get_adjustment( GTK_RANGE(scrolledWindow->vscrollbar) ); + m_scrollBar[0] = GTK_RANGE(scrolledWindow->hscrollbar); + m_scrollBar[1] = GTK_RANGE(scrolledWindow->vscrollbar); m_wxwindow = gtk_pizza_new(); @@ -2624,42 +2598,31 @@ bool wxWindowGTK::Create( wxWindow *parent, GTK_WIDGET_SET_FLAGS( m_wxwindow, GTK_CAN_FOCUS ); m_acceptsFocus = true; - // I _really_ don't want scrollbars in the beginning - m_vAdjust->lower = 0.0; - m_vAdjust->upper = 1.0; - m_vAdjust->value = 0.0; - m_vAdjust->step_increment = 1.0; - m_vAdjust->page_increment = 1.0; - m_vAdjust->page_size = 5.0; - g_signal_emit_by_name (m_vAdjust, "changed"); - m_hAdjust->lower = 0.0; - m_hAdjust->upper = 1.0; - m_hAdjust->value = 0.0; - m_hAdjust->step_increment = 1.0; - m_hAdjust->page_increment = 1.0; - m_hAdjust->page_size = 5.0; - g_signal_emit_by_name (m_hAdjust, "changed"); - // these handlers block mouse events to any window during scrolling such as // motion events and prevent GTK and wxWidgets from fighting over where the // slider should be - g_signal_connect (scrolledWindow->vscrollbar, "button_press_event", - G_CALLBACK (gtk_scrollbar_button_press_callback), this); - g_signal_connect (scrolledWindow->hscrollbar, "button_press_event", - G_CALLBACK (gtk_scrollbar_button_press_callback), this); - g_signal_connect (scrolledWindow->vscrollbar, "button_release_event", - G_CALLBACK (gtk_scrollbar_button_release_callback), this); - g_signal_connect (scrolledWindow->hscrollbar, "button_release_event", - G_CALLBACK (gtk_scrollbar_button_release_callback), this); - - // these handlers get notified when screen updates are required either when - // scrolling or when the window size (and therefore scrollbar configuration) - // has changed - - g_signal_connect (m_hAdjust, "value_changed", - G_CALLBACK (gtk_window_hscroll_callback), this); - g_signal_connect (m_vAdjust, "value_changed", - G_CALLBACK (gtk_window_vscroll_callback), this); + g_signal_connect(m_scrollBar[0], "button_press_event", + G_CALLBACK(gtk_scrollbar_button_press_event), this); + g_signal_connect(m_scrollBar[1], "button_press_event", + G_CALLBACK(gtk_scrollbar_button_press_event), this); + g_signal_connect(m_scrollBar[0], "button_release_event", + G_CALLBACK(gtk_scrollbar_button_release_event), this); + g_signal_connect(m_scrollBar[1], "button_release_event", + G_CALLBACK(gtk_scrollbar_button_release_event), this); + gulong handler_id; + handler_id = g_signal_connect( + m_scrollBar[0], "event_after", G_CALLBACK(gtk_scrollbar_event_after), this); + g_signal_handler_block(m_scrollBar[0], handler_id); + handler_id = g_signal_connect( + m_scrollBar[1], "event_after", G_CALLBACK(gtk_scrollbar_event_after), this); + g_signal_handler_block(m_scrollBar[1], handler_id); + + // these handlers get notified when scrollbar slider moves + + g_signal_connect(m_scrollBar[0], "value_changed", + G_CALLBACK(gtk_scrollbar_value_changed), this); + g_signal_connect(m_scrollBar[1], "value_changed", + G_CALLBACK(gtk_scrollbar_value_changed), this); gtk_widget_show( m_wxwindow ); @@ -2831,6 +2794,15 @@ void wxWindowGTK::PostCreation() G_CALLBACK (wxgtk_combo_size_request_callback), this); } +#ifdef GTK_IS_FILE_CHOOSER_BUTTON + else if (GTK_IS_FILE_CHOOSER_BUTTON(m_widget)) + { + // If we connect to the "size_request" signal of a GtkFileChooserButton + // then that control won't be sized properly when placed inside sizers + // (this can be tested removing this elseif and running XRC or WIDGETS samples) + // FIXME: what should be done here ? + } +#endif else { // This is needed if we want to add our windows into native @@ -2865,7 +2837,7 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget ) g_signal_connect (widget, "motion_notify_event", G_CALLBACK (gtk_window_motion_notify_callback), this); g_signal_connect (widget, "scroll_event", - G_CALLBACK (gtk_window_wheel_callback), this); + G_CALLBACK (window_scroll_event), this); g_signal_connect (widget, "popup_menu", G_CALLBACK (wxgtk_window_popup_menu_callback), this); g_signal_connect (widget, "enter_notify_event", @@ -2943,7 +2915,7 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags if (GTK_WIDGET_VISIBLE (widget)) gtk_widget_queue_resize (widget); } - else + else #endif if (m_parent->m_wxwindow == NULL) // i.e. wxNotebook { @@ -3090,135 +3062,76 @@ void wxWindowGTK::DoSetClientSize( int width, int height ) { wxCHECK_RET( (m_widget != NULL), wxT("invalid window") ); - if (!m_wxwindow) - { - SetSize( width, height ); - } - else + if (m_wxwindow) { int dw = 0; int dh = 0; + if (m_hasScrolling) + { + GetScrollbarWidth(m_widget, dw, dh); + } + #ifndef __WXUNIVERSAL__ if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER)) { - /* when using GTK 1.2 we set the shadow border size to 2 */ + // shadow border size is 2 dw += 2 * 2; dh += 2 * 2; } if (HasFlag(wxSIMPLE_BORDER)) { - /* when using GTK 1.2 we set the simple border size to 1 */ + // simple border size is 1 dw += 1 * 2; dh += 1 * 2; } #endif // __WXUNIVERSAL__ - if (m_hasScrolling) - { - GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget); - - GtkRequisition vscroll_req; - vscroll_req.width = 2; - vscroll_req.height = 2; - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(scroll_window->vscrollbar) )->size_request ) - (scroll_window->vscrollbar, &vscroll_req ); - - GtkRequisition hscroll_req; - hscroll_req.width = 2; - hscroll_req.height = 2; - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(scroll_window->hscrollbar) )->size_request ) - (scroll_window->hscrollbar, &hscroll_req ); - - GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT_GET_CLASS(m_widget) ); - - if (scroll_window->vscrollbar_visible) - { - dw += vscroll_req.width; - dw += scroll_class->scrollbar_spacing; - } - - if (scroll_window->hscrollbar_visible) - { - dh += hscroll_req.height; - dh += scroll_class->scrollbar_spacing; - } - } - - SetSize( width+dw, height+dh ); + width += dw; + height += dh; } + + SetSize(width, height); } void wxWindowGTK::DoGetClientSize( int *width, int *height ) const { wxCHECK_RET( (m_widget != NULL), wxT("invalid window") ); - if (!m_wxwindow) - { - if (width) (*width) = m_width; - if (height) (*height) = m_height; - } - else + int w = m_width; + int h = m_height; + + if (m_wxwindow) { int dw = 0; int dh = 0; + if (m_hasScrolling) + { + GetScrollbarWidth(m_widget, dw, dh); + } + #ifndef __WXUNIVERSAL__ if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER)) { - /* when using GTK 1.2 we set the shadow border size to 2 */ + // shadow border size is 2 dw += 2 * 2; dh += 2 * 2; } if (HasFlag(wxSIMPLE_BORDER)) { - /* when using GTK 1.2 we set the simple border size to 1 */ + // simple border size is 1 dw += 1 * 2; dh += 1 * 2; } #endif // __WXUNIVERSAL__ - if (m_hasScrolling) - { - GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget); - - GtkRequisition vscroll_req; - vscroll_req.width = 2; - vscroll_req.height = 2; - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(scroll_window->vscrollbar) )->size_request ) - (scroll_window->vscrollbar, &vscroll_req ); - - GtkRequisition hscroll_req; - hscroll_req.width = 2; - hscroll_req.height = 2; - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(scroll_window->hscrollbar) )->size_request ) - (scroll_window->hscrollbar, &hscroll_req ); - - GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT_GET_CLASS(m_widget) ); - - if (scroll_window->vscrollbar_visible) - { - dw += vscroll_req.width; - dw += scroll_class->scrollbar_spacing; - } - - if (scroll_window->hscrollbar_visible) - { - dh += hscroll_req.height; - dh += scroll_class->scrollbar_spacing; - } - } - - if (width) (*width) = m_width - dw; - if (height) (*height) = m_height - dh; + w -= dw; + h -= dh; } -/* - printf( "GetClientSize, name %s ", GetName().c_str() ); - if (width) printf( " width = %d", (*width) ); - if (height) printf( " height = %d", (*height) ); - printf( "\n" ); -*/ + if (width) *width = w; + if (height) *height = h; } void wxWindowGTK::DoGetPosition( int *x, int *y ) const @@ -3378,7 +3291,7 @@ int wxWindowGTK::GetCharHeight() const PangoRectangle rect; pango_layout_line_get_extents(line, NULL, &rect); - g_object_unref( G_OBJECT( layout ) ); + g_object_unref (layout); return (int) PANGO_PIXELS(rect.height); } @@ -3406,7 +3319,7 @@ int wxWindowGTK::GetCharWidth() const PangoRectangle rect; pango_layout_line_get_extents(line, NULL, &rect); - g_object_unref( G_OBJECT( layout ) ); + g_object_unref (layout); return (int) PANGO_PIXELS(rect.width); } @@ -3444,14 +3357,9 @@ void wxWindowGTK::GetTextExtent( const wxString& string, PangoLayout *layout = pango_layout_new(context); pango_layout_set_font_description(layout, desc); { -#if wxUSE_UNICODE - const wxCharBuffer data = wxConvUTF8.cWC2MB( string ); - pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data )); -#else - const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string ); - const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata ); - pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data )); -#endif + const wxCharBuffer data = wxGTK_CONV( string ); + if ( data ) + pango_layout_set_text(layout, data, strlen(data)); } PangoRectangle rect; @@ -3468,7 +3376,7 @@ void wxWindowGTK::GetTextExtent( const wxString& string, } if (externalLeading) (*externalLeading) = 0; // ?? - g_object_unref( G_OBJECT( layout ) ); + g_object_unref (layout); } void wxWindowGTK::SetFocus() @@ -3606,44 +3514,62 @@ void wxWindowGTK::DoMoveInTabOrder(wxWindow *win, MoveKind move) wxapp_install_idle_handler(); } +bool wxWindowGTK::GTKWidgetNeedsMnemonic() const +{ + // none needed by default + return false; +} + +void wxWindowGTK::GTKWidgetDoSetMnemonic(GtkWidget* WXUNUSED(w)) +{ + // nothing to do by default since none is needed +} + void wxWindowGTK::RealizeTabOrder() { if (m_wxwindow) { if ( !m_children.empty() ) { -#if wxUSE_STATTEXT // we don't only construct the correct focus chain but also use - // this opportunity to update the mnemonic widgets for all labels - // - // it would be nice to extract this code from here and put it in - // stattext.cpp to reduce dependencies but there is no really easy - // way to do it unfortunately - wxStaticText *lastLabel = NULL; -#endif // wxUSE_STATTEXT + // this opportunity to update the mnemonic widgets for the widgets + // that need them GList *chain = NULL; + wxWindowGTK* mnemonicWindow = NULL; for ( wxWindowList::const_iterator i = m_children.begin(); i != m_children.end(); ++i ) { wxWindowGTK *win = *i; -#if wxUSE_STATTEXT - if ( lastLabel ) + + if ( mnemonicWindow ) { if ( win->AcceptsFocusFromKeyboard() ) { - GtkLabel *l = GTK_LABEL(lastLabel->m_widget); - gtk_label_set_mnemonic_widget(l, win->m_widget); - lastLabel = NULL; + // wxComboBox et al. needs to focus on on a different + // widget than m_widget, so if the main widget isn't + // focusable try the connect widget + GtkWidget* w = win->m_widget; + if ( !GTK_WIDGET_CAN_FOCUS(w) ) + { + w = win->GetConnectWidget(); + if ( !GTK_WIDGET_CAN_FOCUS(w) ) + w = NULL; + } + + if ( w ) + { + mnemonicWindow->GTKWidgetDoSetMnemonic(w); + mnemonicWindow = NULL; + } } } - else // check if this one is a label + else if ( win->GTKWidgetNeedsMnemonic() ) { - lastLabel = wxDynamicCast(win, wxStaticText); + mnemonicWindow = win; } -#endif // wxUSE_STATTEXT chain = g_list_prepend(chain, win->m_widget); } @@ -3721,38 +3647,32 @@ void wxWindowGTK::WarpPointer( int x, int y ) gdk_window_warp_pointer( window, x, y ); } -static bool wxScrollAdjust(GtkAdjustment* adj, double change) +bool wxWindowGTK::ScrollLines(int lines) { - double value_start = adj->value; - double value = value_start + change; - double upper = adj->upper - adj->page_size; - if (value > upper) + bool changed = false; + GtkRange* range = m_scrollBar[1]; + if (range != NULL) { - value = upper; + GtkAdjustment* adj = range->adjustment; + const int pos = int(adj->value + 0.5); + gtk_range_set_value(range, pos + lines); + changed = pos != int(adj->value + 0.5); } - // Lower bound will be checked by gtk_adjustment_set_value - gtk_adjustment_set_value(adj, value); - return adj->value != value_start; -} - -bool wxWindowGTK::ScrollLines(int lines) -{ - return - m_vAdjust != NULL && - wxScrollAdjust(m_vAdjust, lines * m_vAdjust->step_increment); + return changed; } bool wxWindowGTK::ScrollPages(int pages) { - return - m_vAdjust != NULL && - wxScrollAdjust(m_vAdjust, pages * m_vAdjust->page_increment); -} - -void wxWindowGTK::SetVScrollAdjustment(GtkAdjustment* adj) -{ - wxASSERT(m_vAdjust == NULL); - m_vAdjust = adj; + bool changed = false; + GtkRange* range = m_scrollBar[1]; + if (range != NULL) + { + GtkAdjustment* adj = range->adjustment; + const int pos = int(adj->value + 0.5); + gtk_range_set_value(range, pos + pages * adj->page_size); + changed = pos != int(adj->value + 0.5); + } + return changed; } void wxWindowGTK::Refresh( bool eraseBackground, const wxRect *rect ) @@ -3880,6 +3800,14 @@ void wxWindowGTK::GtkSendPaintEvents() m_updateRegion.Clear(); } +void wxWindowGTK::SetDoubleBuffered( bool on ) +{ + wxCHECK_RET( (m_widget != NULL), wxT("invalid window") ); + + if ( m_wxwindow ) + gtk_widget_set_double_buffered( m_wxwindow, on ); +} + void wxWindowGTK::ClearBackground() { wxCHECK_RET( m_widget != NULL, wxT("invalid window") ); @@ -3969,7 +3897,7 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle) if ( m_foregroundColour.Ok() ) { - GdkColor *fg = m_foregroundColour.GetColor(); + const GdkColor *fg = m_foregroundColour.GetColor(); style->fg[GTK_STATE_NORMAL] = *fg; style->color_flags[GTK_STATE_NORMAL] = GTK_RC_FG; @@ -3983,7 +3911,7 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle) if ( m_backgroundColour.Ok() ) { - GdkColor *bg = m_backgroundColour.GetColor(); + const GdkColor *bg = m_backgroundColour.GetColor(); style->bg[GTK_STATE_NORMAL] = *bg; style->base[GTK_STATE_NORMAL] = *bg; @@ -4128,7 +4056,7 @@ void wxWindowGTK::DoCaptureMouse() wxCHECK_RET( window, _T("CaptureMouse() failed") ); - wxCursor* cursor = & m_cursor; + const wxCursor* cursor = &m_cursor; if (!cursor->Ok()) cursor = wxSTANDARD_CURSOR; @@ -4176,80 +4104,47 @@ bool wxWindowGTK::IsRetained() const return false; } +void wxWindowGTK::BlockScrollEvent() +{ + wxASSERT(!m_blockScrollEvent); + m_blockScrollEvent = true; +} + +void wxWindowGTK::UnblockScrollEvent() +{ + wxASSERT(m_blockScrollEvent); + m_blockScrollEvent = false; +} + void wxWindowGTK::SetScrollbar( int orient, int pos, int thumbVisible, - int range, bool refresh ) + int range, bool ) { wxCHECK_RET( m_widget != NULL, wxT("invalid window") ); - wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") ); - m_hasScrolling = true; - - if (orient == wxHORIZONTAL) + if (range > 0) { - float fpos = (float)pos; - float frange = (float)range; - float fthumb = (float)thumbVisible; - if (fpos > frange-fthumb) fpos = frange-fthumb; - if (fpos < 0.0) fpos = 0.0; - - if ((fabs(frange-m_hAdjust->upper) < 0.2) && - (fabs(fthumb-m_hAdjust->page_size) < 0.2)) - { - SetScrollPos( orient, pos, refresh ); - return; - } - - m_oldHorizontalPos = fpos; - - m_hAdjust->lower = 0.0; - m_hAdjust->upper = frange; - m_hAdjust->value = fpos; - m_hAdjust->step_increment = 1.0; - m_hAdjust->page_increment = (float)(wxMax(fthumb,0)); - m_hAdjust->page_size = fthumb; + m_hasScrolling = true; } else { - float fpos = (float)pos; - float frange = (float)range; - float fthumb = (float)thumbVisible; - if (fpos > frange-fthumb) fpos = frange-fthumb; - if (fpos < 0.0) fpos = 0.0; - - if ((fabs(frange-m_vAdjust->upper) < 0.2) && - (fabs(fthumb-m_vAdjust->page_size) < 0.2)) - { - SetScrollPos( orient, pos, refresh ); - return; - } - - m_oldVerticalPos = fpos; - - m_vAdjust->lower = 0.0; - m_vAdjust->upper = frange; - m_vAdjust->value = fpos; - m_vAdjust->step_increment = 1.0; - m_vAdjust->page_increment = (float)(wxMax(fthumb,0)); - m_vAdjust->page_size = fthumb; + // GtkRange requires upper > lower + range = + thumbVisible = 1; } - if (orient == wxHORIZONTAL) - g_signal_emit_by_name (m_hAdjust, "changed"); - else - g_signal_emit_by_name (m_vAdjust, "changed"); -} - -void wxWindowGTK::GtkUpdateScrollbar(int orient) -{ - GtkAdjustment *adj = orient == wxHORIZONTAL ? m_hAdjust : m_vAdjust; - gpointer fn = orient == wxHORIZONTAL - ? (gpointer) gtk_window_hscroll_callback - : (gpointer) gtk_window_vscroll_callback; - - g_signal_handlers_disconnect_by_func (adj, fn, this); - g_signal_emit_by_name (adj, "value_changed"); - g_signal_connect (adj, "value_changed", G_CALLBACK (fn), this); + if (pos > range - thumbVisible) + pos = range - thumbVisible; + if (pos < 0) + pos = 0; + const int i = orient == wxVERTICAL; + GtkAdjustment* adj = m_scrollBar[i]->adjustment; + adj->step_increment = 1; + adj->page_increment = + adj->page_size = thumbVisible; + adj->upper = range; + SetScrollPos(orient, pos); + gtk_adjustment_changed(adj); } void wxWindowGTK::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) ) @@ -4257,58 +4152,107 @@ void wxWindowGTK::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) ) wxCHECK_RET( m_widget != NULL, wxT("invalid window") ); wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") ); - GtkAdjustment *adj = orient == wxHORIZONTAL ? m_hAdjust : m_vAdjust; - - float fpos = (float)pos; - if (fpos > adj->upper - adj->page_size) - fpos = adj->upper - adj->page_size; - if (fpos < 0.0) - fpos = 0.0; - *(orient == wxHORIZONTAL ? &m_oldHorizontalPos : &m_oldVerticalPos) = fpos; - - if (fabs(fpos-adj->value) < 0.2) - return; - adj->value = fpos; - - if ( m_wxwindow->window ) + // This check is more than an optimization. Without it, the slider + // will not move smoothly while tracking when using wxScrollHelper. + if (GetScrollPos(orient) != pos) { + const int i = orient == wxVERTICAL; + GtkAdjustment* adj = m_scrollBar[i]->adjustment; + const int max = int(adj->upper - adj->page_size); + if (pos > max) + pos = max; + if (pos < 0) + pos = 0; + m_scrollPos[i] = + adj->value = pos; + // If a "value_changed" signal emission is not already in progress + if (!m_blockValueChanged[i]) + { + gtk_adjustment_value_changed(adj); + } } } int wxWindowGTK::GetScrollThumb( int orient ) const { wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid window") ); - wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") ); - if (orient == wxHORIZONTAL) - return (int)(m_hAdjust->page_size+0.5); - else - return (int)(m_vAdjust->page_size+0.5); + const int i = orient == wxVERTICAL; + return int(m_scrollBar[i]->adjustment->page_size); } int wxWindowGTK::GetScrollPos( int orient ) const { wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid window") ); - wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") ); - if (orient == wxHORIZONTAL) - return (int)(m_hAdjust->value+0.5); - else - return (int)(m_vAdjust->value+0.5); + const int i = orient == wxVERTICAL; + return int(m_scrollBar[i]->adjustment->value + 0.5); } int wxWindowGTK::GetScrollRange( int orient ) const { wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid window") ); - wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") ); - if (orient == wxHORIZONTAL) - return (int)(m_hAdjust->upper+0.5); - else - return (int)(m_vAdjust->upper+0.5); + const int i = orient == wxVERTICAL; + return int(m_scrollBar[i]->adjustment->upper); +} + +// Determine if increment is the same as +/-x, allowing for some small +// difference due to possible inexactness in floating point arithmetic +static inline bool IsScrollIncrement(double increment, double x) +{ + wxASSERT(increment > 0); + const double tolerance = 1.0 / 1024; + return fabs(increment - fabs(x)) < tolerance; +} + +wxEventType wxWindowGTK::GetScrollEventType(GtkRange* range) +{ + DEBUG_MAIN_THREAD + + if (g_isIdle) + wxapp_install_idle_handler(); + + wxASSERT(range == m_scrollBar[0] || range == m_scrollBar[1]); + + const int barIndex = range == m_scrollBar[1]; + GtkAdjustment* adj = range->adjustment; + const int value = int(adj->value + 0.5); + // save previous position + const double oldPos = m_scrollPos[barIndex]; + // update current position + m_scrollPos[barIndex] = adj->value; + // If event should be ignored, or integral position has not changed + if (!m_hasVMT || g_blockEventsOnDrag || value == int(oldPos + 0.5)) + { + return wxEVT_NULL; + } + + wxEventType eventType = wxEVT_SCROLL_THUMBTRACK; + if (!m_isScrolling) + { + // Difference from last change event + const double diff = adj->value - oldPos; + const bool isDown = diff > 0; + + if (IsScrollIncrement(adj->step_increment, diff)) + { + eventType = isDown ? wxEVT_SCROLL_LINEDOWN : wxEVT_SCROLL_LINEUP; + } + else if (IsScrollIncrement(adj->page_increment, diff)) + { + eventType = isDown ? wxEVT_SCROLL_PAGEDOWN : wxEVT_SCROLL_PAGEUP; + } + else if (m_mouseButtonDown) + { + // Assume track event + m_isScrolling = true; + } + } + return eventType; } void wxWindowGTK::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) ) @@ -4327,6 +4271,29 @@ void wxWindowGTK::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) ) m_clipPaintRegion = false; } +void wxWindowGTK::GtkScrolledWindowSetBorder(GtkWidget* w, int wxstyle) +{ + //RN: Note that static controls usually have no border on gtk, so maybe + //it makes sense to treat that as simply no border at the wx level + //as well... + if (!(wxstyle & wxNO_BORDER) && !(wxstyle & wxBORDER_STATIC)) + { + GtkShadowType gtkstyle; + + if(wxstyle & wxBORDER_RAISED) + gtkstyle = GTK_SHADOW_OUT; + else if (wxstyle & wxBORDER_SUNKEN) + gtkstyle = GTK_SHADOW_IN; + else if (wxstyle & wxBORDER_DOUBLE) + gtkstyle = GTK_SHADOW_ETCHED_IN; + else //default + gtkstyle = GTK_SHADOW_IN; + + gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW(w), + gtkstyle ); + } +} + void wxWindowGTK::SetWindowStyleFlag( long style ) { // Updates the internal variable. NB: Now m_windowStyle bits carry the _new_ style values already @@ -4401,7 +4368,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxWinModule, wxModule) bool wxWinModule::OnInit() { - // g_eraseGC = gdk_gc_new( GDK_ROOT_PARENT() ); + // g_eraseGC = gdk_gc_new( gdk_get_default_root_window() ); // gdk_gc_set_fill( g_eraseGC, GDK_SOLID ); return true; @@ -4410,6 +4377,5 @@ bool wxWinModule::OnInit() void wxWinModule::OnExit() { if (g_eraseGC) - gdk_gc_unref( g_eraseGC ); + g_object_unref (g_eraseGC); } -