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, 11 insertions, 0 deletions

diff --git a/opentrack/win32-shortcuts.cpp b/opentrack/win32-shortcuts.cpp
index bd51ae88..96232631 100644
--- a/opentrack/win32-shortcuts.cpp
+++ b/opentrack/win32-shortcuts.cpp
@@ -1,3 +1,11 @@
+/* Copyright (c) 2015, Stanislaw Halik <sthalik@misaki.pl>
+
+ * Permission to use, copy, modify, and/or distribute this
+ * software for any purpose with or without fee is hereby granted,
+ * provided that the above copyright notice and this permission
+ * notice appear in all copies.
+ */
+
 #if defined(_WIN32)
 #   ifndef DIRECTINPUT_VERSION
 #       define DIRECTINPUT_VERSION 0x800
@@ -109,6 +117,9 @@ QList<win_key> windows_key_sequences =
        win_key(DIK_RETURN, Qt::Key::Key_Return),
        win_key(DIK_INSERT, Qt::Key::Key_Insert),
        win_key(DIK_SPACE, Qt::Key::Key_Space),
+       win_key(DIK_SYSRQ, Qt::Key::Key_Print),
+       win_key(DIK_SCROLL, Qt::Key::Key_ScrollLock),
+       win_key(DIK_PAUSE, Qt::Key::Key_Pause),
     });
 
 bool win_key::to_qt(const Key& k, QKeySequence& qt_, Qt::KeyboardModifiers &mods)