/////////////////////////////////////////////////////////////////////////////
-// Name: gtk/slider.cpp
+// Name: src/gtk/slider.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#include "wx/slider.h"
-
#if wxUSE_SLIDER
-#include "wx/utils.h"
-#include "wx/math.h"
-#include "wx/gtk/private.h"
+#include "wx/slider.h"
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+ #include "wx/utils.h"
+ #include "wx/math.h"
+#endif
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
// data
// helper functions
// ----------------------------------------------------------------------------
-// compare 2 adjustment values up to some (hardcoded) precision
-static inline bool AreSameAdjustValues(double x, double y)
-{
- return fabs(x - y) < 0.02;
-}
-
-static inline int AdjustValueToInt(double x)
-{
- // we want to round to the nearest integer, i.e. 0.9 is rounded to 1 and
- // -0.9 is rounded to -1
- return (int)(x < 0 ? x - 0.5 : x + 0.5);
-}
-
// process a scroll event
static void
-ProcessScrollEvent(wxSlider *win, wxEventType evtType, double dvalue)
+ProcessScrollEvent(wxSlider *win, wxEventType evtType)
{
const int orient = win->HasFlag(wxSL_VERTICAL) ? wxVERTICAL
: wxHORIZONTAL;
- const int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
+ const int value = win->GetValue();
// if we have any "special" event (i.e. the value changed by a line or a
// page), send this specific event first
{
wxScrollEvent event( evtType, win->GetId(), value, orient );
event.SetEventObject( win );
- win->GetEventHandler()->ProcessEvent( event );
+ win->HandleWindowEvent( event );
}
// but, in any case, except if we're dragging the slider (and so the change
{
wxScrollEvent event(wxEVT_SCROLL_CHANGED, win->GetId(), value, orient);
event.SetEventObject( win );
- win->GetEventHandler()->ProcessEvent( event );
+ win->HandleWindowEvent( event );
}
// and also generate a command event for compatibility
wxCommandEvent event( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
event.SetEventObject( win );
event.SetInt( value );
- win->GetEventHandler()->ProcessEvent( event );
+ win->HandleWindowEvent( event );
+}
+
+static inline wxEventType GtkScrollTypeToWx(int scrollType)
+{
+ wxEventType eventType;
+ switch (scrollType)
+ {
+ case GTK_SCROLL_STEP_BACKWARD:
+ case GTK_SCROLL_STEP_LEFT:
+ case GTK_SCROLL_STEP_UP:
+ eventType = wxEVT_SCROLL_LINEUP;
+ break;
+ case GTK_SCROLL_STEP_DOWN:
+ case GTK_SCROLL_STEP_FORWARD:
+ case GTK_SCROLL_STEP_RIGHT:
+ eventType = wxEVT_SCROLL_LINEDOWN;
+ break;
+ case GTK_SCROLL_PAGE_BACKWARD:
+ case GTK_SCROLL_PAGE_LEFT:
+ case GTK_SCROLL_PAGE_UP:
+ eventType = wxEVT_SCROLL_PAGEUP;
+ break;
+ case GTK_SCROLL_PAGE_DOWN:
+ case GTK_SCROLL_PAGE_FORWARD:
+ case GTK_SCROLL_PAGE_RIGHT:
+ eventType = wxEVT_SCROLL_PAGEDOWN;
+ break;
+ case GTK_SCROLL_START:
+ eventType = wxEVT_SCROLL_TOP;
+ break;
+ case GTK_SCROLL_END:
+ eventType = wxEVT_SCROLL_BOTTOM;
+ break;
+ case GTK_SCROLL_JUMP:
+ eventType = wxEVT_SCROLL_THUMBTRACK;
+ break;
+ default:
+ wxFAIL_MSG(_T("Unknown GtkScrollType"));
+ eventType = wxEVT_NULL;
+ break;
+ }
+ return eventType;
+}
+
+// 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;
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
extern "C" {
-static void gtk_slider_callback( GtkAdjustment *adjust,
- wxSlider *win )
+static void
+gtk_value_changed(GtkRange* range, wxSlider* win)
{
- if (g_isIdle) wxapp_install_idle_handler();
+ GtkAdjustment* adj = gtk_range_get_adjustment (range);
+ const int pos = wxRound(adj->value);
+ const double oldPos = win->m_pos;
+ win->m_pos = adj->value;
- if (!win->m_hasVMT) return;
- if (g_blockEventsOnDrag) return;
+ if (!win->m_hasVMT || g_blockEventsOnDrag)
+ return;
- const double dvalue = adjust->value;
- const double diff = dvalue - win->m_oldPos;
- if ( AreSameAdjustValues(diff, 0) )
+ if (win->m_blockScrollEvent)
+ {
+ win->m_scrollEventType = GTK_SCROLL_NONE;
return;
+ }
- wxEventType evtType;
- if ( win->m_isScrolling )
- evtType = wxEVT_SCROLL_THUMBTRACK;
- // it could seem that UP/DOWN are inversed but this is what wxMSW does
- else if ( AreSameAdjustValues(diff, adjust->step_increment) )
- evtType = wxEVT_SCROLL_LINEDOWN;
- else if ( AreSameAdjustValues(diff, -adjust->step_increment) )
- evtType = wxEVT_SCROLL_LINEUP;
- else if ( AreSameAdjustValues(diff, adjust->page_increment) )
- evtType = wxEVT_SCROLL_PAGEDOWN;
- else if ( AreSameAdjustValues(diff, -adjust->page_increment) )
- evtType = wxEVT_SCROLL_PAGEUP;
- else if ( AreSameAdjustValues(adjust->value, adjust->lower) )
- evtType = wxEVT_SCROLL_TOP;
- else if ( AreSameAdjustValues(adjust->value, adjust->upper) )
- evtType = wxEVT_SCROLL_BOTTOM;
- else
- evtType = wxEVT_NULL; // wxEVT_SCROLL_CHANGED will still be generated
+ wxEventType eventType = wxEVT_NULL;
+ if (win->m_isScrolling)
+ {
+ eventType = wxEVT_SCROLL_THUMBTRACK;
+ }
+ else if (win->m_scrollEventType != GTK_SCROLL_NONE)
+ {
+ // Scroll event from "move-slider" (keyboard)
+ eventType = GtkScrollTypeToWx(win->m_scrollEventType);
+ }
+ else if (win->m_mouseButtonDown)
+ {
+ // Difference from last change event
+ const double diff = adj->value - oldPos;
+ const bool isDown = diff > 0;
+
+ if (IsScrollIncrement(adj->page_increment, diff))
+ {
+ eventType = isDown ? wxEVT_SCROLL_PAGEDOWN : wxEVT_SCROLL_PAGEUP;
+ }
+ else if (wxIsSameDouble(adj->value, 0))
+ {
+ eventType = wxEVT_SCROLL_PAGEUP;
+ }
+ else if (wxIsSameDouble(adj->value, adj->upper))
+ {
+ eventType = wxEVT_SCROLL_PAGEDOWN;
+ }
+ else
+ {
+ // Assume track event
+ eventType = wxEVT_SCROLL_THUMBTRACK;
+ // Remember that we're tracking
+ win->m_isScrolling = true;
+ }
+ }
- ProcessScrollEvent(win, evtType, dvalue);
+ win->m_scrollEventType = GTK_SCROLL_NONE;
- win->m_oldPos = dvalue;
+ // If integral position has changed
+ if (wxRound(oldPos) != pos)
+ {
+ ProcessScrollEvent(win, eventType);
+ win->m_needThumbRelease = eventType == wxEVT_SCROLL_THUMBTRACK;
+ }
+}
}
-static gint gtk_slider_button_press_callback( GtkWidget * /* widget */,
- GdkEventButton * /* gdk_event */,
- wxWindowGTK *win)
+//-----------------------------------------------------------------------------
+// "move_slider" (keyboard event)
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void
+gtk_move_slider(GtkRange*, GtkScrollType scrollType, wxSlider* win)
{
- // indicate that the thumb is being dragged with the mouse
- win->m_isScrolling = true;
+ // Save keyboard scroll type for "value_changed" handler
+ win->m_scrollEventType = scrollType;
+}
+}
+
+//-----------------------------------------------------------------------------
+// "button_press_event"
+//-----------------------------------------------------------------------------
- return FALSE;
+extern "C" {
+static gboolean
+gtk_button_press_event(GtkWidget*, GdkEventButton*, wxSlider* win)
+{
+ win->m_mouseButtonDown = true;
+
+ return false;
+}
}
-static gint gtk_slider_button_release_callback( GtkWidget *scale,
- GdkEventButton * /* gdk_event */,
- wxSlider *win)
+//-----------------------------------------------------------------------------
+// "event_after"
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void
+gtk_event_after(GtkRange* range, GdkEvent* event, wxSlider* win)
{
- // not scrolling any longer
- win->m_isScrolling = false;
+ if (event->type == GDK_BUTTON_RELEASE)
+ {
+ g_signal_handlers_block_by_func(range, (gpointer) gtk_event_after, win);
- ProcessScrollEvent(win, wxEVT_SCROLL_THUMBRELEASE,
- GTK_RANGE(scale)->adjustment->value);
+ if (win->m_needThumbRelease)
+ {
+ win->m_needThumbRelease = false;
+ ProcessScrollEvent(win, wxEVT_SCROLL_THUMBRELEASE);
+ }
+ // Keep slider at an integral position
+ win->m_blockScrollEvent = true;
+ gtk_range_set_value(GTK_RANGE (win->m_widget), win->GetValue());
+ win->m_blockScrollEvent = false;
+ }
+}
+}
- return FALSE;
+//-----------------------------------------------------------------------------
+// "button_release_event"
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static gboolean
+gtk_button_release_event(GtkRange* range, GdkEventButton*, wxSlider* win)
+{
+ win->m_mouseButtonDown = false;
+ if (win->m_isScrolling)
+ {
+ win->m_isScrolling = false;
+ g_signal_handlers_unblock_by_func(range, (gpointer) gtk_event_after, win);
+ }
+ return false;
+}
}
+//-----------------------------------------------------------------------------
+// "format_value"
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static gchar* gtk_format_value(GtkScale*, double value, void*)
+{
+ // Format value as nearest integer
+ return g_strdup_printf("%d", wxRound(value));
+}
}
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
-bool wxSlider::Create(wxWindow *parent, wxWindowID id,
- int value, int minValue, int maxValue,
- const wxPoint& pos, const wxSize& size,
- long style, const wxValidator& validator, const wxString& name )
+wxSlider::wxSlider()
{
- m_acceptsFocus = TRUE;
- m_needParent = TRUE;
+ m_pos = 0;
+ m_scrollEventType = GTK_SCROLL_NONE;
+ m_needThumbRelease = false;
+ m_blockScrollEvent = false;
+}
+
+bool wxSlider::Create(wxWindow *parent,
+ wxWindowID id,
+ int value,
+ int minValue,
+ int maxValue,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxValidator& validator,
+ const wxString& name)
+{
+ m_pos = value;
+ m_scrollEventType = GTK_SCROLL_NONE;
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( wxT("wxSlider creation failed") );
- return FALSE;
+ return false;
}
- m_oldPos = 0.0;
-
if (style & wxSL_VERTICAL)
- m_widget = gtk_vscale_new( (GtkAdjustment *) NULL );
- else
- m_widget = gtk_hscale_new( (GtkAdjustment *) NULL );
-
- if (style & wxSL_LABELS)
- {
- gtk_scale_set_draw_value( GTK_SCALE( m_widget ), TRUE );
- gtk_scale_set_digits( GTK_SCALE( m_widget ), 0 );
-
- /* labels need more space and too small window will
- cause junk to appear on the dialog */
- if (style & wxSL_VERTICAL)
- {
- wxSize sz( size );
- if (sz.x < 35)
- {
- sz.x = 35;
- SetSize( sz );
- }
- }
- else
- {
- wxSize sz( size );
- if (sz.y < 35)
- {
- sz.y = 35;
- SetSize( sz );
- }
- }
- }
+ m_widget = gtk_vscale_new( NULL );
else
- gtk_scale_set_draw_value( GTK_SCALE( m_widget ), FALSE );
+ m_widget = gtk_hscale_new( NULL );
+ g_object_ref(m_widget);
- m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
+ gtk_scale_set_draw_value(GTK_SCALE (m_widget), (style & wxSL_LABELS) != 0);
+ // Keep full precision in position value
+ gtk_scale_set_digits(GTK_SCALE (m_widget), -1);
if (style & wxSL_INVERSE)
gtk_range_set_inverted( GTK_RANGE(m_widget), TRUE );
- GtkEnableEvents();
- g_signal_connect (m_widget, "button_press_event",
- G_CALLBACK (gtk_slider_button_press_callback),
- this);
- g_signal_connect (m_widget, "button_release_event",
- G_CALLBACK (gtk_slider_button_release_callback),
- this);
+ g_signal_connect(m_widget, "button_press_event", G_CALLBACK(gtk_button_press_event), this);
+ g_signal_connect(m_widget, "button_release_event", G_CALLBACK(gtk_button_release_event), this);
+ g_signal_connect(m_widget, "move_slider", G_CALLBACK(gtk_move_slider), this);
+ g_signal_connect(m_widget, "format_value", G_CALLBACK(gtk_format_value), NULL);
+ g_signal_connect(m_widget, "value_changed", G_CALLBACK(gtk_value_changed), this);
+ gulong handler_id = g_signal_connect(m_widget, "event_after", G_CALLBACK(gtk_event_after), this);
+ g_signal_handler_block(m_widget, handler_id);
SetRange( minValue, maxValue );
- SetValue( value );
+
+ // don't call the public SetValue() as it won't do anything unless the
+ // value really changed
+ GTKSetValue( value );
m_parent->DoAddChild( this );
PostCreation(size);
- return TRUE;
+ return true;
}
int wxSlider::GetValue() const
{
- return AdjustValueToInt(m_adjust->value);
+ return wxRound(m_pos);
}
void wxSlider::SetValue( int value )
{
- double fpos = (double)value;
- m_oldPos = fpos;
- if ( AreSameAdjustValues(fpos, m_adjust->value) )
- return;
-
- m_adjust->value = fpos;
-
- GtkDisableEvents();
-
- g_signal_emit_by_name (m_adjust, "value_changed");
+ if (GetValue() != value)
+ GTKSetValue(value);
+}
- GtkEnableEvents();
+void wxSlider::GTKSetValue(int value)
+{
+ m_blockScrollEvent = true;
+ gtk_range_set_value(GTK_RANGE (m_widget), value);
+ m_blockScrollEvent = false;
}
void wxSlider::SetRange( int minValue, int maxValue )
{
- double fmin = (double)minValue;
- double fmax = (double)maxValue;
-
- if ((fabs(fmin-m_adjust->lower) < 0.2) &&
- (fabs(fmax-m_adjust->upper) < 0.2))
- {
- return;
- }
-
- m_adjust->lower = fmin;
- m_adjust->upper = fmax;
- m_adjust->step_increment = 1.0;
- m_adjust->page_increment = ceil((fmax-fmin) / 10.0);
-
- GtkDisableEvents();
-
- g_signal_emit_by_name (m_adjust, "changed");
-
- GtkEnableEvents();
+ m_blockScrollEvent = true;
+ if (minValue == maxValue)
+ maxValue++;
+ gtk_range_set_range(GTK_RANGE (m_widget), minValue, maxValue);
+ gtk_range_set_increments(GTK_RANGE (m_widget), 1, (maxValue - minValue + 9) / 10);
+ m_blockScrollEvent = false;
}
int wxSlider::GetMin() const
{
- return (int)ceil(m_adjust->lower);
+ return int(gtk_range_get_adjustment (GTK_RANGE (m_widget))->lower);
}
int wxSlider::GetMax() const
{
- return (int)ceil(m_adjust->upper);
+ return int(gtk_range_get_adjustment (GTK_RANGE (m_widget))->upper);
}
void wxSlider::SetPageSize( int pageSize )
{
- double fpage = (double)pageSize;
-
- if (fabs(fpage-m_adjust->page_increment) < 0.2) return;
-
- m_adjust->page_increment = fpage;
-
- GtkDisableEvents();
-
- g_signal_emit_by_name (m_adjust, "changed");
-
- GtkEnableEvents();
+ m_blockScrollEvent = true;
+ gtk_range_set_increments(GTK_RANGE (m_widget), GetLineSize(), pageSize);
+ m_blockScrollEvent = false;
}
int wxSlider::GetPageSize() const
{
- return (int)ceil(m_adjust->page_increment);
+ return int(gtk_range_get_adjustment (GTK_RANGE (m_widget))->page_increment);
}
-void wxSlider::SetThumbLength( int len )
+// GTK does not support changing the size of the slider
+void wxSlider::SetThumbLength(int)
{
- double flen = (double)len;
-
- if (fabs(flen-m_adjust->page_size) < 0.2) return;
-
- m_adjust->page_size = flen;
-
- GtkDisableEvents();
-
- g_signal_emit_by_name (m_adjust, "changed");
-
- GtkEnableEvents();
}
int wxSlider::GetThumbLength() const
-{
- return (int)ceil(m_adjust->page_size);
-}
-
-void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
-{
-}
-
-int wxSlider::GetLineSize() const
{
return 0;
}
-bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
+void wxSlider::SetLineSize( int lineSize )
{
- GtkRange *range = GTK_RANGE(m_widget);
- return (range->event_window == window);
+ m_blockScrollEvent = true;
+ gtk_range_set_increments(GTK_RANGE (m_widget), lineSize, GetPageSize());
+ m_blockScrollEvent = false;
}
-void wxSlider::GtkDisableEvents()
+int wxSlider::GetLineSize() const
{
- g_signal_handlers_disconnect_by_func (m_adjust,
- (gpointer) gtk_slider_callback,
- this);
+ return int(gtk_range_get_adjustment (GTK_RANGE (m_widget))->step_increment);
}
-void wxSlider::GtkEnableEvents()
+GdkWindow *wxSlider::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
{
- g_signal_connect (m_adjust, "value_changed",
- G_CALLBACK (gtk_slider_callback), this);
+ return GTK_RANGE(m_widget)->event_window;
}
// static
return GetDefaultAttributesFromGTKWidget(gtk_vscale_new);
}
-#endif
+#endif // wxUSE_SLIDER
projects / wxWidgets.git / blobdiff