Use mix now in shader examples, also replaced a bunch of tabs with spaces to make it consistent

CMakeLists.txt

@@ -69,7 +69,7 @@ include_directories(${X11_INCLUDE_DIR}
                     ${OPENGL_INCLUDE_DIR})
 
 target_link_libraries(${LIBRARY_NAME} ${X11_LIBRARIES}
-				      ${CMAKE_THREAD_LIBS_INIT} 
+                                      ${CMAKE_THREAD_LIBS_INIT} 
                                       ${GLM_LIBRARIES}
                                       ${OPENGL_LIBRARIES}
                                       ${GLX_LIBRARY}

shaderexamples/boxzoom.frag

@@ -43,7 +43,8 @@ void main()
         // The desktop texture is upside-down due to X11
         vec2 zoomedUVFlipped = vec2( zoomedUV.x, -zoomedUV.y );
         // Then change the color to the desktop color to draw, then add on our rectangle on top.
-        color = texture2D( desktop, zoomedUVFlipped ) + texture2D( texture, zoomedUV );
+        vec4 rectColor = texture2D( texture, zoomedUV );
+        color = mix( texture2D( desktop, zoomedUVFlipped ), rectColor, rectColor.a );
       }
     // Then check if we're in our border size.
     } else if( uvCoord.x <= mpos.x+boxOffset.x+boxSize.x+borderSize.x &&

shaderexamples/crosshair.frag

@@ -34,7 +34,7 @@ void main()
             vec2 upsideDown = c/magnifyNerf*t*t+b;
 
             vec4 textureColor = texture2D( texture, upsideDown );
-            color = texture2D( desktop, vec2(upsideDown.x, -upsideDown.y) )*(1-textureColor.a) + textureColor;
+            color = mix( texture2D( desktop, vec2(upsideDown.x, -upsideDown.y) ), textureColor, textureColor.a );
         }
     } else if ( dr < circleSize+borderSize ) {
         color = borderColor;

src/framebuffer.cpp

@@ -105,7 +105,7 @@ void slop::Framebuffer::draw(glm::vec2 mouse, float time, glm::vec4 color){
     glActiveTexture(GL_TEXTURE0);
     glBindTexture( GL_TEXTURE_2D, image );
     if ( shader->hasParameter( "desktop" ) ) {
-		shader->setParameter( "desktop", 1 );
+        shader->setParameter( "desktop", 1 );
         glActiveTexture(GL_TEXTURE0 + 1);
         glBindTexture( GL_TEXTURE_2D, desktopImage );
     }

src/mouse.cpp

@@ -66,27 +66,27 @@ slop::Mouse::Mouse(X11* x11, int nodecorations, Window ignoreWindow ) {
 }
 
 slop::Mouse::~Mouse() {
-	XUngrabPointer( x11->display, CurrentTime );
+    XUngrabPointer( x11->display, CurrentTime );
 }
 
 void slop::Mouse::update() {
     XEvent event;
     while ( XCheckTypedEvent( x11->display, ButtonPress, &event ) ) {
 		setButton( event.xbutton.button, 1 );
-	}
+    }
     bool findNewWindow = false;
     while ( XCheckTypedEvent( x11->display, MotionNotify, &event ) ) {
         findNewWindow = true;
-	}
+    }
     if ( findNewWindow ) {
         hoverWindow = findWindow(x11->root);
     }
     while ( XCheckTypedEvent( x11->display, ButtonRelease, &event ) ) {
 		setButton( event.xbutton.button, 0 );
-	}
+    }
     while ( XCheckTypedEvent( x11->display, EnterNotify, &event ) ) {
         hoverWindow = event.xcrossing.window;
-	}
+    }
 }
 
 Window slop::Mouse::findWindow( Window foo ) {

src/mouse.hpp

@@ -40,8 +40,8 @@ private:
     int nodecorations;
     Window ignoreWindow;
 public:
-	Window hoverWindow;
-	void update();
+    Window hoverWindow;
+    void update();
     Mouse( X11* x11, int nodecorations, Window ignoreWindow );
     ~Mouse();
     void setCursor( int cursor );

src/slopstates.cpp

@@ -115,20 +115,20 @@ void slop::SlopStartDrag::update( SlopMemory& memory, double dt ) {
     }
     if ( keyboard ) {
         int arrows[2];
-        arrows[0] = keyboard->getKey(XK_Down)-keyboard->getKey(XK_Up);		
-        arrows[1] = keyboard->getKey(XK_Right)-keyboard->getKey(XK_Left);		
-        if ( arrows[0] || arrows[1] ) {		
-            if ( repeatTimer == 0 || repeatTimer > .4 ) {		
-                startPoint.y += arrows[0]*multiplier;		
-                startPoint.x += arrows[1]*multiplier;		
-            }		
-            if ( repeatTimer > 1 ) {		
-                multiplier += dt*2;		
-            }		
-            repeatTimer += dt;		
-        } else {		
-            repeatTimer = 0;		
-            multiplier = 1;		
+        arrows[0] = keyboard->getKey(XK_Down)-keyboard->getKey(XK_Up);
+        arrows[1] = keyboard->getKey(XK_Right)-keyboard->getKey(XK_Left);
+        if ( arrows[0] || arrows[1] ) {
+            if ( repeatTimer == 0 || repeatTimer > .4 ) {
+                startPoint.y += arrows[0]*multiplier;
+                startPoint.x += arrows[1]*multiplier;
+            }
+            if ( repeatTimer > 1 ) {
+                multiplier += dt*2;
+            }
+            repeatTimer += dt;
+        } else {
+            repeatTimer = 0;
+            multiplier = 1;
         }
     }
 }

src/xshaperectangle.cpp

@@ -55,7 +55,7 @@ void slop::XShapeRectangle::createWindow() {
     if ( createdWindow ) {
         return;
     }
-	XMapWindow( x11->display, window );
+    XMapWindow( x11->display, window );
     createdWindow = true;
 }