X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f96aa4d9eb296b3dfc468a351ce013bf92fab983..82d3ae4b8fe7132028a132ae15f734f38b09315e:/src/gtk1/slider.cpp?ds=sidebyside

diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index 3c3e199010..f704d40817 100644
--- a/src/gtk1/slider.cpp
+++ b/src/gtk1/slider.cpp
@@ -1,252 +1,338 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        slider.cpp
+// Name:        src/gtk1/slider.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
-#ifdef __GNUG__
-#pragma implementation "slider.h"
-#endif
+#if wxUSE_SLIDER
 
 #include "wx/slider.h"
-#include "wx/utils.h"
 
-//-----------------------------------------------------------------------------
-// data
-//-----------------------------------------------------------------------------
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/math.h"
+#endif
 
-extern bool   g_blockEventsOnDrag;
+#include "wx/gtk1/private.h"
 
 //-----------------------------------------------------------------------------
-// "value_changed"
+// idle system
 //-----------------------------------------------------------------------------
 
-static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
-{ 
-  if (!win->HasVMT()) return;
-  if (g_blockEventsOnDrag) return;
-    
-  float diff = win->m_adjust->value - win->m_oldPos;
-  if (fabs(diff) < 0.2) return;
-  
-  wxEventType command = wxEVT_NULL;
-  
-  float line_step = win->m_adjust->step_increment;
-  float page_step = win->m_adjust->page_increment;
-  
-  if (fabs(diff-line_step) < 0.2) command = wxEVT_SCROLL_LINEDOWN;
-  else if (fabs(diff+line_step) < 0.2) command = wxEVT_SCROLL_LINEUP;
-  else if (fabs(diff-page_step) < 0.2) command = wxEVT_SCROLL_PAGEDOWN;
-  else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
-  else command = wxEVT_SCROLL_THUMBTRACK;
-
-  int value = (int)(win->m_adjust->value+0.5);
-      
-  int orient = wxHORIZONTAL;
-  if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;
-  
-  wxScrollEvent event( command, win->GetId(), value, orient );
-  event.SetEventObject( win );
-  win->ProcessEvent( event );
-  
-  wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
-  cevent.SetEventObject( win );
-  win->ProcessEvent( cevent );
-}
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
 
 //-----------------------------------------------------------------------------
-// wxSlider
+// data
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxSlider,wxControl)
+extern bool g_blockEventsOnDrag;
+
+// ----------------------------------------------------------------------------
+// helper functions
+// ----------------------------------------------------------------------------
 
-wxSlider::wxSlider(void)
+// compare 2 adjustment values up to some (hardcoded) precision
+static inline bool AreSameAdjustValues(double x, double y)
 {
+    return fabs(x - y) < 0.02;
 }
 
-wxSlider::~wxSlider(void)
+// process a scroll event
+static void
+ProcessScrollEvent(wxSlider *win, wxEventType evtType, double dvalue)
 {
+    int orient = win->GetWindowStyleFlag() & wxSL_VERTICAL ? wxVERTICAL
+                                                           : wxHORIZONTAL;
+
+    int value = (int)(dvalue < 0 ? dvalue - 0.5 : dvalue + 0.5);
+    wxScrollEvent event( evtType, win->GetId(), value, orient );
+    event.SetEventObject( win );
+    win->HandleWindowEvent( event );
+
+    if ( evtType != wxEVT_SCROLL_THUMBTRACK )
+    {
+        wxScrollEvent event2(wxEVT_SCROLL_CHANGED, win->GetId(), value, orient);
+        event2.SetEventObject( win );
+        win->HandleWindowEvent( event2 );
+    }
+
+    wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
+    cevent.SetEventObject( win );
+    cevent.SetInt( value );
+    win->HandleWindowEvent( cevent );
 }
 
-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 )
+//-----------------------------------------------------------------------------
+// "value_changed"
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void gtk_slider_callback( GtkAdjustment *adjust,
+                                 SCROLLBAR_CBACK_ARG
+                                 wxSlider *win )
 {
-  m_needParent = TRUE;
-  
-  PreCreation( parent, id, pos, size, style, name );
-  
-  SetValidator( validator );
+    if (g_isIdle) wxapp_install_idle_handler();
 
-  m_oldPos = 0.0;
+    if (!win->m_hasVMT) return;
+    if (g_blockEventsOnDrag) return;
 
-  if (style & wxSL_VERTICAL == wxSL_VERTICAL)
-    m_widget = gtk_hscale_new( (GtkAdjustment *) NULL );
-  else
-    m_widget = gtk_vscale_new( (GtkAdjustment *) NULL );
-    
-  m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
-  
-  gtk_signal_connect (GTK_OBJECT (m_adjust), "value_changed",
-		      (GtkSignalFunc) gtk_slider_callback, (gpointer) this );
-  SetRange( minValue, maxValue );
-  SetValue( value );
-  
-  PostCreation();
-  
-  SetBackgroundColour( parent->GetBackgroundColour() );
+    const double dvalue = adjust->value;
+    const double diff = dvalue - win->m_oldPos;
+    if ( AreSameAdjustValues(diff, 0) )
+        return;
 
-  Show( TRUE );
-    
-  return TRUE;
-}
+    wxEventType evtType;
+    evtType = GtkScrollTypeToWx(GET_SCROLL_TYPE(win->m_widget));
 
-int wxSlider::GetValue(void) const
-{
-  return (int)(m_adjust->value+0.5);
+    ProcessScrollEvent(win, evtType, dvalue);
+
+    win->m_oldPos = dvalue;
 }
 
-void wxSlider::SetValue( int value )
+static gint gtk_slider_button_press_callback( GtkWidget * /* widget */,
+                                              GdkEventButton * /* gdk_event */,
+                                              wxWindowGTK *win)
 {
-  float fpos = (float)value;
-  m_oldPos = fpos;
-  if (fabs(fpos-m_adjust->value) < 0.2) return;
-  m_adjust->value = fpos;
-  
-  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+    // indicate that the thumb is being dragged with the mouse
+    win->m_isScrolling = true;
+
+    return FALSE;
 }
 
-void wxSlider::SetRange( int minValue, int maxValue )
+static gint gtk_slider_button_release_callback( GtkWidget *scale,
+                                                GdkEventButton * /* gdk_event */,
+                                                wxSlider *win)
 {
-  float fmin = (float)minValue;
-  float fmax = (float)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;
+    // not scrolling any longer
+    win->m_isScrolling = false;
 
-  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    ProcessScrollEvent(win, wxEVT_SCROLL_THUMBRELEASE,
+                       GTK_RANGE(scale)->adjustment->value);
+
+    return FALSE;
 }
 
-int wxSlider::GetMin(void) const
-{
-  return (int)(m_adjust->lower+0.5);
 }
 
-int wxSlider::GetMax(void) const
+//-----------------------------------------------------------------------------
+// wxSlider
+//-----------------------------------------------------------------------------
+
+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 )
 {
-  return (int)(m_adjust->upper+0.5);
+    m_acceptsFocus = true;
+    m_needParent = true;
+
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxSlider creation failed") );
+        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 );
+            }
+        }
+    }
+    else
+        gtk_scale_set_draw_value( GTK_SCALE( m_widget ), FALSE );
+
+    m_adjust = gtk_range_get_adjustment( GTK_RANGE(m_widget) );
+
+    GtkEnableEvents();
+    gtk_signal_connect( GTK_OBJECT(m_widget),
+                        "button_press_event",
+                        (GtkSignalFunc)gtk_slider_button_press_callback,
+                        (gpointer) this );
+    gtk_signal_connect( GTK_OBJECT(m_widget),
+                        "button_release_event",
+                        (GtkSignalFunc)gtk_slider_button_release_callback,
+                        (gpointer) this );
+
+    SetRange( minValue, maxValue );
+    SetValue( value );
+
+    m_parent->DoAddChild( this );
+
+    PostCreation(size);
+
+    return true;
 }
 
-void wxSlider::SetPageSize( int pageSize )
+int wxSlider::GetValue() const
 {
-  float fpage = (float)pageSize;
-      
-  if (fabs(fpage-m_adjust->page_increment) < 0.2) return;
-      
-  m_adjust->page_increment = fpage;
-
-  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    return wxRound(m_adjust->value);
 }
 
-int wxSlider::GetPageSize(void) const
+void wxSlider::SetValue( int value )
 {
-  return (int)(m_adjust->page_increment+0.5);
+    double fpos = (double)value;
+    m_oldPos = fpos;
+    if ( AreSameAdjustValues(fpos, m_adjust->value) )
+        return;
+
+    m_adjust->value = fpos;
+
+    GtkDisableEvents();
+
+    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+
+    GtkEnableEvents();
 }
 
-void wxSlider::SetThumbLength( int len )
+void wxSlider::SetRange( int minValue, int maxValue )
 {
-  float flen = (float)len;
-      
-  if (fabs(flen-m_adjust->page_size) < 0.2) return;
-      
-  m_adjust->page_size = flen;
+    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);
 
-  gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    GtkDisableEvents();
+
+    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+
+    GtkEnableEvents();
 }
 
-int wxSlider::GetThumbLength(void) const
+int wxSlider::GetMin() const
 {
-  return (int)(m_adjust->page_size+0.5);
+    return (int)ceil(m_adjust->lower);
 }
 
-void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
+int wxSlider::GetMax() const
 {
+    return (int)ceil(m_adjust->upper);
 }
 
-int wxSlider::GetLineSize(void) const
+void wxSlider::SetPageSize( int pageSize )
 {
-  return 0;
-}
+    double fpage = (double)pageSize;
 
-// not supported in wxGTK (and GTK)
+    if (fabs(fpage-m_adjust->page_increment) < 0.2) return;
 
-void wxSlider::GetSize( int *x, int *y ) const
-{
-  wxWindow::GetSize( x, y );
-}
+    m_adjust->page_increment = fpage;
 
-void wxSlider::SetSize( int x, int y, int width, int height, int sizeFlags )
-{
-  wxWindow::SetSize( x, y, width, height, sizeFlags );
-}
+    GtkDisableEvents();
 
-void wxSlider::GetPosition( int *x, int *y ) const
-{
-  wxWindow::GetPosition( x, y );
+    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+
+    GtkEnableEvents();
 }
 
-void wxSlider::SetTick( int WXUNUSED(tickPos) )
+int wxSlider::GetPageSize() const
 {
+    return (int)ceil(m_adjust->page_increment);
 }
 
-void wxSlider::SetTickFreq( int WXUNUSED(n), int WXUNUSED(pos) )
+void wxSlider::SetThumbLength( int len )
 {
+    double flen = (double)len;
+
+    if (fabs(flen-m_adjust->page_size) < 0.2) return;
+
+    m_adjust->page_size = flen;
+
+    GtkDisableEvents();
+
+    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+
+    GtkEnableEvents();
 }
 
-int wxSlider::GetTickFreq(void) const
+int wxSlider::GetThumbLength() const
 {
-  return 0;
+    return (int)ceil(m_adjust->page_size);
 }
 
-void wxSlider::ClearTicks(void)
+void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
 {
 }
 
-void wxSlider::SetSelection( int WXUNUSED(minPos), int WXUNUSED(maxPos) )
+int wxSlider::GetLineSize() const
 {
+    return 0;
 }
 
-int wxSlider::GetSelEnd(void) const
+bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
 {
-  return 0;
+    GtkRange *range = GTK_RANGE(m_widget);
+    return ( (window == GTK_WIDGET(range)->window)
+                || (window == range->trough)
+                || (window == range->slider)
+                || (window == range->step_forw)
+                || (window == range->step_back) );
 }
 
-int wxSlider::GetSelStart(void) const
+void wxSlider::GtkDisableEvents()
 {
-  return 0;
+    gtk_signal_disconnect_by_func( GTK_OBJECT(m_adjust),
+                        GTK_SIGNAL_FUNC(gtk_slider_callback),
+                        (gpointer) this );
 }
 
-void wxSlider::ClearSel(void)
+void wxSlider::GtkEnableEvents()
 {
+    gtk_signal_connect( GTK_OBJECT (m_adjust),
+                        "value_changed",
+                        GTK_SIGNAL_FUNC(gtk_slider_callback),
+                        (gpointer) this );
 }
 
-bool wxSlider::IsOwnGtkWindow( GdkWindow *window )
+// static
+wxVisualAttributes
+wxSlider::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-  GtkRange *range = GTK_RANGE(m_widget);
-  return ( (window == GTK_WIDGET(range)->window) ||
-           (window == range->trough) ||
-	   (window == range->slider) ||
-	   (window == range->step_forw) ||
-	   (window == range->step_back) );
+    return GetDefaultAttributesFromGTKWidget(gtk_vscale_new);
 }
 
-
+#endif // wxUSE_SLIDER