improved library-ness

CMakeLists.txt

@@ -52,7 +52,7 @@ if ( SLOP_LEGACY_MODE )
     # Install targets
     install( TARGETS ${EXECUTABLE_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" )
     install( TARGETS ${LIBRARY_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" )
-    install( FILES ${CMAKE_SOURCE_DIR}/src/xslop.hpp DESTINATION "${CMAKE_INSTALL_PREFIX}/include" )
+    install( FILES ${CMAKE_SOURCE_DIR}/src/slop.hpp DESTINATION "${CMAKE_INSTALL_PREFIX}/include" )
 else()
     add_library(${LIBRARY_NAME} SHARED  src/mouse.cpp
                                         src/keyboard.cpp
@@ -87,5 +87,5 @@ else()
     # Install targets
     install( TARGETS ${EXECUTABLE_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" )
     install( TARGETS ${LIBRARY_NAME} DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" )
-    install( FILES ${CMAKE_SOURCE_DIR}/src/glslop.hpp DESTINATION "${CMAKE_INSTALL_PREFIX}/include" )
+    install( FILES ${CMAKE_SOURCE_DIR}/src/slop.hpp DESTINATION "${CMAKE_INSTALL_PREFIX}/include" )
 endif()

src/glslop.cpp

@@ -1,4 +1,15 @@
-#include "glslop.hpp"
+#include "slop.hpp"
+
+#include "slopstates.hpp"
+#include "mouse.hpp"
+#include "resource.hpp"
+#include "keyboard.hpp"
+
+#include "window.hpp"
+#include "shader.hpp"
+#include "framebuffer.hpp"
+#include "rectangle.hpp"
+
 
 X11* x11;
 Mouse* mouse;
@@ -28,47 +39,6 @@ SlopSelection::SlopSelection( float x, float y, float w, float h, Window id ) {
     this->id = id;
 }
 
-SlopMemory::SlopMemory( SlopOptions* options ) {
-    running = true;
-    state = (SlopState*)new SlopStart();
-    nextState = NULL;
-    tolerance = options->tolerance;
-    nodecorations = options->nodecorations;
-    rectangle = new Rectangle(glm::vec2(0,0), glm::vec2(0,0), options->borderSize, options->padding, glm::vec4( options->r, options->g, options->b, options->a ), options->highlight);
-    selectedWindow = x11->root;
-    state->onEnter( *this );
-}
-
-SlopMemory::~SlopMemory() {
-    delete state;
-    if ( nextState ) {
-        delete nextState;
-    }
-    delete rectangle;
-}
-
-void SlopMemory::update( double dt ) {
-    state->update( *this, dt );
-    if ( nextState ) {
-        state->onExit( *this );
-        delete state;
-        state = nextState;
-        state->onEnter( *this );
-        nextState = NULL;
-    }
-}
-
-void SlopMemory::setState( SlopState* state ) {
-    if ( nextState ) {
-        delete nextState;
-    }
-    nextState = state;
-}
-
-void SlopMemory::draw( glm::mat4& matrix ) {
-    state->draw( *this, matrix );
-}
-
 SlopSelection SlopSelect( SlopOptions* options, bool* cancelled ) {
     bool deleteOptions = false;
     if ( !options ) {

src/main.cpp

@@ -20,11 +20,7 @@
 
 #include <iostream>
 #include <sstream>
-#ifdef SLOP_LEGACY_MODE
-#include "xslop.hpp"
-#else
-#include "glslop.hpp"
-#endif
+#include "slop.hpp"
 #include "options.hpp"
 
 SlopOptions* getOptions( Options& options ) {
@@ -34,6 +30,7 @@ SlopOptions* getOptions( Options& options ) {
     options.getFloat("tolerance", 't', foo->tolerance);
     glm::vec4 color = glm::vec4( foo->r, foo->g, foo->b, foo->a );
     options.getColor("color", 'c', color);
+    options.getBool("nokeyboard", 'k', foo->nokeyboard);
     options.getString( "xdisplay", 'x', foo->xdisplay );
 #ifndef SLOP_LEGACY_MODE
     options.getString( "shader", 's', foo->shader );

src/glslop.hpp → src/slop.hpp

@@ -23,17 +23,6 @@
 
 #include <string>
 
-#include "window.hpp"
-#include "shader.hpp"
-#include "framebuffer.hpp"
-#include "rectangle.hpp"
-#include "slopstates.hpp"
-#include "keyboard.hpp"
-#include "mouse.hpp"
-#include "resource.hpp"
-
-class SlopState;
-
 class SlopOptions {
 public:
     SlopOptions();
@@ -41,6 +30,7 @@ public:
     float padding;
     float tolerance;
     bool highlight;
+    bool nokeyboard;
     bool nodecorations;
     std::string shader;
     float r;
@@ -52,29 +42,13 @@ public:
 
 class SlopSelection {
 public:
-    SlopSelection( float x, float y, float w, float h, Window id );
+    SlopSelection( float x, float y, float w, float h, int id );
     float x;
     float y;
     float w;
     float h;
-    Window id;
-};
-
-class SlopMemory {
-private:
-    SlopState* state;
-    SlopState* nextState;
-public:
-    SlopMemory( SlopOptions* options );
-    ~SlopMemory();
-    Window selectedWindow;
-    bool running;
-    float tolerance;
-    bool nodecorations;
-    Rectangle* rectangle;
-    void setState( SlopState* state );
-    void update( double dt );
-    void draw( glm::mat4& matrix );
+// This is an X11 Window ID
+    int id;
 };
 
 SlopSelection SlopSelect( SlopOptions* options = NULL, bool* cancelled = NULL );

src/slopstates.cpp

@@ -1,5 +1,47 @@
 #include "slopstates.hpp"
 
+SlopMemory::SlopMemory( SlopOptions* options ) {
+    running = true;
+    state = (SlopState*)new SlopStart();
+    nextState = NULL;
+    tolerance = options->tolerance;
+    nodecorations = options->nodecorations;
+    rectangle = new Rectangle(glm::vec2(0,0), glm::vec2(0,0), options->borderSize, options->padding, glm::vec4( options->r, options->g, options->b, options->a ), options->highlight);
+    selectedWindow = x11->root;
+    state->onEnter( *this );
+}
+
+SlopMemory::~SlopMemory() {
+    delete state;
+    if ( nextState ) {
+        delete nextState;
+    }
+    delete rectangle;
+}
+
+void SlopMemory::update( double dt ) {
+    state->update( *this, dt );
+    if ( nextState ) {
+        state->onExit( *this );
+        delete state;
+        state = nextState;
+        state->onEnter( *this );
+        nextState = NULL;
+    }
+}
+
+void SlopMemory::setState( SlopState* state ) {
+    if ( nextState ) {
+        delete nextState;
+    }
+    nextState = state;
+}
+
+void SlopMemory::draw( glm::mat4& matrix ) {
+    state->draw( *this, matrix );
+}
+
+
 SlopState::~SlopState() {
 }
 void SlopState::onEnter( SlopMemory& memory ) {

src/slopstates.hpp

@@ -23,12 +23,11 @@
 
 #include "mouse.hpp"
 #include "windowhelper.hpp"
+#include "slop.hpp"
 
 #ifdef SLOP_LEGACY_MODE
-#include "xslop.hpp"
 #include "xshaperectangle.hpp"
 #else
-#include "glslop.hpp"
 #include "rectangle.hpp"
 #endif
 
@@ -68,4 +67,22 @@ public:
     virtual void onEnter( SlopMemory& memory );
 };
 
+class SlopMemory {
+private:
+    SlopState* state;
+    SlopState* nextState;
+public:
+    SlopMemory( SlopOptions* options );
+    ~SlopMemory();
+    Window selectedWindow;
+    bool running;
+    float tolerance;
+    bool nodecorations;
+    Rectangle* rectangle;
+    void setState( SlopState* state );
+    void update( double dt );
+    void draw( glm::mat4& matrix );
+};
+
+
 #endif // N_SLOPSTATES_H_

src/xslop.cpp

@@ -1,4 +1,12 @@
-#include "xslop.hpp"
+#include "slop.hpp"
+
+#include "slopstates.hpp"
+#include "mouse.hpp"
+#include "resource.hpp"
+#include "keyboard.hpp"
+#include <chrono>
+#include <thread>
+#include "xshaperectangle.hpp"
 
 X11* x11;
 Mouse* mouse;
@@ -19,7 +27,7 @@ SlopOptions::SlopOptions() {
     a = 1;
 }
 
-SlopSelection::SlopSelection( float x, float y, float w, float h, Window id ) {
+SlopSelection::SlopSelection( float x, float y, float w, float h, int id ) {
     this->x = x;
     this->y = y;
     this->w = w;
@@ -27,47 +35,6 @@ SlopSelection::SlopSelection( float x, float y, float w, float h, Window id ) {
     this->id = id;
 }
 
-SlopMemory::SlopMemory( SlopOptions* options ) {
-    running = true;
-    state = (SlopState*)new SlopStart();
-    nextState = NULL;
-    tolerance = options->tolerance;
-    nodecorations = options->nodecorations;
-    rectangle = new Rectangle(glm::vec2(0,0), glm::vec2(0,0), options->borderSize, options->padding, glm::vec4( options->r, options->g, options->b, options->a ), options->highlight);
-    selectedWindow = x11->root;
-    state->onEnter( *this );
-}
-
-SlopMemory::~SlopMemory() {
-    delete state;
-    if ( nextState ) {
-        delete nextState;
-    }
-    delete rectangle;
-}
-
-void SlopMemory::update( double dt ) {
-    state->update( *this, dt );
-    if ( nextState ) {
-        state->onExit( *this );
-        delete state;
-        state = nextState;
-        state->onEnter( *this );
-        nextState = NULL;
-    }
-}
-
-void SlopMemory::setState( SlopState* state ) {
-    if ( nextState ) {
-        delete nextState;
-    }
-    nextState = state;
-}
-
-void SlopMemory::draw( glm::mat4& matrix ) {
-    state->draw( *this, matrix );
-}
-
 SlopSelection SlopSelect( SlopOptions* options, bool* cancelled ) {
     bool deleteOptions = false;
     if ( !options ) {

src/xslop.hpp

@@ -1,80 +0,0 @@
-/* slop.hpp: exposes a selection interface
- *
- * Copyright (C) 2014: Dalton Nell, Slop Contributors (https://github.com/naelstrof/slop/graphs/contributors).
- *
- * This file is part of Slop.
- *
- * Slop is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Slop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Slop.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef N_SLOP_H_
-#define N_SLOP_H_
-
-#include <string>
-#include <chrono>
-#include <thread>
-
-#include "xshaperectangle.hpp"
-#include "slopstates.hpp"
-#include "keyboard.hpp"
-#include "mouse.hpp"
-#include "resource.hpp"
-
-class SlopState;
-
-class SlopOptions {
-public:
-    SlopOptions();
-    float borderSize;
-    float padding;
-    float tolerance;
-    bool highlight;
-    bool nodecorations;
-    float r;
-    float g;
-    float b;
-    float a;
-    std::string xdisplay;
-};
-
-class SlopSelection {
-public:
-    SlopSelection( float x, float y, float w, float h, Window id );
-    float x;
-    float y;
-    float w;
-    float h;
-    Window id;
-};
-
-class SlopMemory {
-private:
-    SlopState* state;
-    SlopState* nextState;
-public:
-    SlopMemory( SlopOptions* options );
-    ~SlopMemory();
-    Window selectedWindow;
-    bool running;
-    float tolerance;
-    bool nodecorations;
-    Rectangle* rectangle;
-    void setState( SlopState* state );
-    void update( double dt );
-    void draw( glm::mat4& matrix );
-};
-
-SlopSelection SlopSelect( SlopOptions* options = NULL, bool* cancelled = NULL );
-
-#endif // N_SLOP_H_