added an option to disable auto-window-selection and fixed a few options in the makefile

main.cpp

@@ -92,7 +92,8 @@ int main( int argc, char** argv ) {
             case 0: {
                 // If xengine has found a window we're hovering over (or if it changed)
                 // create a rectangle around it so the user knows he/she can click on it.
-                if ( window != xengine->m_hoverXWindow ) {
+                // --but only if the user wants us to
+                if ( window != xengine->m_hoverXWindow && options->m_window ) {
                     // Make sure to delete the old selection rectangle.
                     if ( windowselection ) {
                         xengine->removeRect( windowselection ); // removeRect also dealloc's the rectangle for us.
@@ -185,11 +186,19 @@ int main( int argc, char** argv ) {
                     }
                 }
                 // Otherwise lets grab the window's dimensions and use those (with padding).
-                slop::WindowRectangle t = xengine->m_hoverWindow;
-                x = t.m_x - padding - t.m_border;
-                y = t.m_y - padding - t.m_border;
-                w = t.m_width + t.m_border + padding*2;
-                h = t.m_height + t.m_border + padding*2;
+                // --but only if the user lets us, if the user doesn't just select a single pixel there.
+                if ( options->m_window ) {
+                    slop::WindowRectangle t = xengine->m_hoverWindow;
+                    x = t.m_x - padding - t.m_border;
+                    y = t.m_y - padding - t.m_border;
+                    w = t.m_width + t.m_border + padding*2;
+                    h = t.m_height + t.m_border + padding*2;
+                } else {
+                    x = cx;
+                    y = cy;
+                    w = 1;
+                    h = 1;
+                }
                 printf( "X=%i\n", x );
                 printf( "Y=%i\n", y );
                 printf( "W=%i\n", w );

makefile

@@ -1,5 +1,5 @@
 CC=g++
-CFLAGS=-O2 -g
+CCFLAGS=-O2 -g
 LDFLAGS=-lX11 -lXext
 SOURCES=main.cpp x.cpp options.cpp
 OBJECTS=$(SOURCES:.cpp=.o)
@@ -11,6 +11,9 @@ all: $(SOURCES) $(EXECUTABLE)
 $(EXECUTABLE): $(OBJECTS)
 	$(CC) $(OBJECTS) -o $@ $(LDFLAGS)
 
+$(OBJECTS): %.o: %.cpp
+	$(CC) $(CCFLAGS) -o $@ -c $<
+
 clean:
 	rm -rf $(OBJECTS) $(EXECUTABLE)
 

options.cpp

@@ -12,6 +12,7 @@ slop::Options::Options() {
     m_blue = 0;
     m_gracetime = 0.1;
     m_keyboard = true;
+    m_window = true;
 }
 
 void slop::Options::printHelp() {
@@ -27,6 +28,7 @@ void slop::Options::printHelp() {
     printf( "    -x=STRING, --xdisplay=STRING   set x display (STRING must be hostname:number.screen_number format)\n" );
     printf( "    -c=COLOR, --color=COLOR        set selection rectangle color, COLOR is in format FLOAT,FLOAT,FLOAT\n" );
     printf( "    -g=FLOAT, --gracetime=FLOAT    set the amount of time before slop will check for keyboard cancellations in seconds.\n" );
+    printf( "    -nw, --nowindow                disable automatically selecting a whole window on single-clicks, and instead just select a single pixel.\n" );
     printf( "examples\n" );
     printf( "    slop -b=10 -x=:0 -p=-30 -t=4 -c=0.5,0.5,0.5 -g=.2\n" );
 }
@@ -77,6 +79,8 @@ int slop::Options::parseOptions( int argc, char** argv ) {
             }
         } else if ( matches( arg, "-nkb", "--nokeyboard" ) ) {
             m_keyboard = false;
+        } else if ( matches( arg, "-nw", "--nowindow" ) ) {
+            m_window = false;
         } else if ( matches( arg, "-h", "--help" ) ) {
             printHelp();
             return 2;

options.hpp

@@ -20,6 +20,7 @@ public:
     std::string m_xdisplay;
     float       m_gracetime;
     bool        m_keyboard;
+    bool        m_window;
 private:
     int         parseInt( std::string arg, int* returnInt );
     int         parseFloat( std::string arg, float* returnFloat );