Merge branch 'unstable' into trackhattrackhat-1.1p2

* unstable:
  cmake: update toolchain file
  shortcuts: fix osx/linux keystrokes persisting
  cmake: fix copy-paste comment
  cmake: add toolchain file for OSX
  cmake: add osx policy to make it shutup
  x-plane: ignore diagnostic
  osx: nix warning
  gitattributes: more text extensions to eol=lf
  cmake: timestamp logic simplify/fix
  cmake: no timestamp for tag builds
  all: update copyright where appropriate
  all: comments only
  cmake: regen before making tarball
  cmake: fix dropbox share invocation
  tracker: initialize newpose
  pt: use previous pose on NaN result from POSIT
  accela: also don't poison ewma state with nans
  cmake: fix tarball invocation
  accela: elide NaN output values
  qfc: elide NaN values
  pt: reformat more
  pt: reformat posit
  pt: refactor auto threshold somewhat
  pt: rename ill-chosen name
  pt: switch min/max point size to reals
  cmake: upload tarball to Dropbox but only if I'm the user
  cmake: add tarball timestamp so it gets rebuilt
  cmake: don't regen version if none changed
  cmake: fix git describe --dirty
  cmake: retab git module
  fix tarball target
  cmake: mark dirty tree
  cmake: regen tarball even if exists
  cmake: generate version.cc
  tracker: check for NaN values
  accela: don't check NaNs in filter, wrong place
  cmake: drop -ffast-math, allow for NaN check
  shortcuts: actually print screen binding works
  shortcuts: alias right modifier keys to left modifier keys
  shortcuts: allow for binding scroll lock and pause/break
  accela: also filter out NaNs on tracking start
  allow for filter immediate center

1 files changed, 67 insertions, 68 deletions

diff --git a/cmake/GetGitRevisionDescription.cmake b/cmake/GetGitRevisionDescription.cmake
index e16d8c37..e4ac79c0 100644
--- a/cmake/GetGitRevisionDescription.cmake
+++ b/cmake/GetGitRevisionDescription.cmake
@@ -31,7 +31,7 @@
 # http://www.boost.org/LICENSE_1_0.txt)
 
 if(__get_git_revision_description)
-	return()
+        return()
 endif()
 set(__get_git_revision_description YES)
 
@@ -40,84 +40,83 @@ set(__get_git_revision_description YES)
 get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
 
 function(get_git_head_revision _refspecvar _hashvar)
-	set(GIT_PARENT_DIR "${CMAKE_SOURCE_DIR}")
-	set(GIT_DIR "${GIT_PARENT_DIR}/.git")
-	while(NOT EXISTS "${GIT_DIR}")	# .git dir not found, search parent directories
-		set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}")
-		get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH)
-		if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT)
-			# We have reached the root directory, we are not in git
-			set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
-			set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
-			return()
-		endif()
-		set(GIT_DIR "${GIT_PARENT_DIR}/.git")
-	endwhile()
-	set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
-	if(NOT EXISTS "${GIT_DATA}")
-		file(MAKE_DIRECTORY "${GIT_DATA}")
-	endif()
+        set(GIT_PARENT_DIR "${CMAKE_SOURCE_DIR}")
+        set(GIT_DIR "${GIT_PARENT_DIR}/.git")
+        while(NOT EXISTS "${GIT_DIR}")  # .git dir not found, search parent directories
+                set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}")
+                get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH)
+                if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT)
+                        # We have reached the root directory, we are not in git
+                        set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
+                        set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
+                        return()
+                endif()
+                set(GIT_DIR "${GIT_PARENT_DIR}/.git")
+        endwhile()
+        set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
+        if(NOT EXISTS "${GIT_DATA}")
+                file(MAKE_DIRECTORY "${GIT_DATA}")
+        endif()
 
-	if(NOT EXISTS "${GIT_DIR}/HEAD")
-		return()
-	endif()
-	set(HEAD_FILE "${GIT_DATA}/HEAD")
-	configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
+        if(NOT EXISTS "${GIT_DIR}/HEAD")
+                return()
+        endif()
+        set(HEAD_FILE "${GIT_DATA}/HEAD")
+        configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
 
-	configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
-		"${GIT_DATA}/grabRef.cmake"
-		@ONLY)
-	include("${GIT_DATA}/grabRef.cmake")
+        configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
+                "${GIT_DATA}/grabRef.cmake"
+                @ONLY)
+        include("${GIT_DATA}/grabRef.cmake")
 
-	set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE)
-	set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE)
+        set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE)
+        set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE)
 endfunction()
 
 function(git_describe _var)
-	if(NOT GIT_FOUND)
-		find_package(Git QUIET)
-	endif()
-	get_git_head_revision(refspec hash)
-	if(NOT GIT_FOUND)
-		set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
-		return()
-	endif()
-	if(NOT hash)
-		set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
-		return()
-	endif()
+        if(NOT GIT_FOUND)
+                find_package(Git QUIET)
+        endif()
+        #get_git_head_revision(refspec hash)
+        if(NOT GIT_FOUND)
+                set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
+                return()
+        endif()
+        #if(NOT hash)
+        #        set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
+        #        return()
+        #endif()
 
-	# TODO sanitize
-	#if((${ARGN}" MATCHES "&&") OR
-	#	(ARGN MATCHES "||") OR
-	#	(ARGN MATCHES "\\;"))
-	#	message("Please report the following error to the project!")
-	#	message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
-	#endif()
+        # TODO sanitize
+        #if((${ARGN}" MATCHES "&&") OR
+        #       (ARGN MATCHES "||") OR
+        #       (ARGN MATCHES "\\;"))
+        #       message("Please report the following error to the project!")
+        #       message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
+        #endif()
 
-	#message(STATUS "Arguments to execute_process: ${ARGN}")
+        #message(STATUS "Arguments to execute_process: ${ARGN}")
 
-	execute_process(COMMAND
-		"${GIT_EXECUTABLE}"
-		describe
-		${hash}
-		${ARGN}
-		WORKING_DIRECTORY
-		"${CMAKE_SOURCE_DIR}"
-		RESULT_VARIABLE
-		res
-		OUTPUT_VARIABLE
-		out
-		ERROR_QUIET
-		OUTPUT_STRIP_TRAILING_WHITESPACE)
-	if(NOT res EQUAL 0)
-		set(out "${out}-${res}-NOTFOUND")
-	endif()
+        execute_process(COMMAND
+                "${GIT_EXECUTABLE}"
+                describe
+                ${ARGN}
+                WORKING_DIRECTORY
+                "${CMAKE_SOURCE_DIR}"
+                RESULT_VARIABLE
+                res
+                OUTPUT_VARIABLE
+                out
+                ERROR_QUIET
+                OUTPUT_STRIP_TRAILING_WHITESPACE)
+        if(NOT res EQUAL 0)
+                set(out "${out}-${res}-NOTFOUND")
+        endif()
 
-	set(${_var} "${out}" PARENT_SCOPE)
+        set(${_var} "${out}" PARENT_SCOPE)
 endfunction()
 
 function(git_get_exact_tag _var)
-	git_describe(out ${ARGN})
-	set(${_var} "${out}" PARENT_SCOPE)
+        git_describe(out ${ARGN})
+        set(${_var} "${out}" PARENT_SCOPE)
 endfunction()