Use default member initializers and defaulted default constructors

[libs/gui.git] / source / input / control.h

diff --git a/source/input/control.h b/source/input/control.h
index f7146b47f4502345d8d00a01988fb4b36cc78f3c..dcf7bf341047e71249440ba6114738cce367af96 100644 (file)
--- a/source/input/control.h
+++ b/source/input/control.h
@@ -1,19 +1,14 @@
-/* $Id$
-
-This file is part of libmspgbase
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#ifndef MSP_GBASE_CONTROL_H_
-#define MSP_GBASE_CONTROL_H_
+#ifndef MSP_INPUT_CONTROL_H_
+#define MSP_INPUT_CONTROL_H_
 
+#include <string>
 #include <sigc++/signal.h>
 #include <sigc++/trackable.h>
 
 namespace Msp {
 namespace Input {
 
+class BinaryControl;
 class Device;
 
 enum ControlSrcType
@@ -30,11 +25,11 @@ different types of controls in a uniform way.
 */
 struct ControlSource
 {
-       Device *dev;
-       ControlSrcType type;
-       unsigned index;
+       Device *dev = 0;
+       ControlSrcType type = NONE;
+       unsigned index = 0;
 
-       ControlSource();
+       ControlSource() = default;
        ControlSource(Device &, ControlSrcType, unsigned);
        std::string str() const;
 };
@@ -47,6 +42,11 @@ A control uses either a button or half of an axis (positive or negative) as its
 source.  How the source values are interpreted depends on the exact type of the
 control.  Controls also support interactive binding by capturing a button press
 or axis motion.
+
+A BinaryControl can be used as an activator, requiring that control to be
+active for any events to be processed.  This can be used to implement shifted
+controls (when used on a BinaryControl) or click-and-drag functionality (when
+used on a SmoothControl).
 */
 class Control: public sigc::trackable
 {
@@ -55,29 +55,42 @@ public:
 
 protected:
        ControlSource src;
-       Device *capture_dev;
+       Device *capture_dev = 0;
+       BinaryControl *activator = 0;
+       float origin = 0.0f;
+       bool rising_edge = false;
+       bool falling_edge = false;
 
-       Control();
+       Control() = default;
        Control(const ControlSource &);
        Control(Device &, ControlSrcType, unsigned);
-       Control(const Control &);
 public:
-       Control &operator=(const Control &);
-       virtual ~Control() { }
+       virtual ~Control();
 
        void capture(Device &);
        void cancel_capture();
+       void set_source(Device &, ControlSrcType, unsigned);
+       void set_source(const ControlSource &);
        const ControlSource &get_source() const { return src; }
+       void set_activator(BinaryControl *);
+       BinaryControl *get_activator() const { return activator; }
+       bool has_rising_edge() const { return rising_edge; }
+       bool has_falling_edge() const { return falling_edge; }
+       void reset_edges();
 protected:
-       virtual void on_press() =0;
-       virtual void on_release() =0;
-       virtual void on_motion(float, float) =0;
+       virtual void on_press() = 0;
+       virtual void on_release() = 0;
+       virtual void on_motion(float, float) = 0;
 
 private:
        void connect_signals();
        void button_press(unsigned);
        void button_release(unsigned);
        void axis_motion(unsigned, float, float);
+       void deactivate();
+
+       Control(const Control &);
+       Control &operator=(const Control &);
 };
 
 } // namespace Input