Merge branch 'dev'

.gitignore

@@ -0,0 +1,3 @@
+/build
+/InputScope.egg-info
+__pycache__

CHANGELOG.md

@@ -1,6 +1,26 @@
 CHANGELOG
 =========
 
+1.6, 2022-07-13
+---------------
+- take display index into account when discarding close mouse move events
+- add missing Numpad-Delete key (issue #14)
+- add more OEM keys (issue #14)
+- add support for user-configured keys
+- add support for larger fonts in statistics
+- add unique count to keyboard pages (issue #21)
+- add program version to database info box in statistics (issue #21)
+- register key being held down as one keypress (issue #15)
+- fix potential error on unplugging monitor (issue #12)
+- fix registering Ctrl-NUM combos (issue #14)
+- fix error on closing program with Ctrl-C in Linux (issue #16)
+- fix running listener from main application in Linux (issue #17)
+- fix tray icon menu error in Linux (issue #18)
+- fix running application with pythonw.exe in Py3 W7
+- always save basic config directives to config file
+- rearrange source code in src-layout
+
+
 1.5, 2022-01-22
 ---------------
 - add named sessions functionality

MANIFEST.in

@@ -1,2 +1,2 @@
-recursive-include inputscope *.py *.tpl *.db *.ini *.css *.ico *.js *.svg
-include LICENSE.md README.md requirements.txt
+recursive-include src *.py *.tpl *.db *.ini *.css *.ico *.js *.svg
+include CHANGELOG.md LICENSE.md README.md requirements.txt

README.md

@@ -25,6 +25,15 @@ Keypresses are logged as physical keys, ignoring Unicode mappings.
 Note: keyboard logging can interfere with remote control desktop, 
 UI automation scripts, and sticky keys.
 
+Non-standard keys can be added in configuration file, as:
+```javascript
+CustomKeys = {numeric key code: "text label for key"}
+```
+e.g.
+```javascript
+CustomKeys = {21: "IME Han/Yeong", 25: "IME Hanja"}
+```
+
 Data is kept in an SQLite database.
 
 The local web page is viewable at http://localhost:8099/,
@@ -49,7 +58,7 @@ Three components in source code form:
 
 Listener and web-UI components can be run separately.
 
-In source code form, data and configuration is kept under inputscope/var.
+In source code form, data and configuration is kept under `inputscope/var`.
 
 The pip installation will add commands `inputscope`, `inputscope-listener` 
 and `inputscope-webui` to path.
@@ -61,8 +70,12 @@ Dependencies
 * Python 2.7 or Python 3.5+
 * bottle
 * pynput
+* pywin32 (optional, for toggling "Start with Windows")
 * wxPython (optional)
 
+If wxPython is not available, InputScope will not have its tray program,
+and will not recognize multi-monitor setups in mouse statistics.
+
 
 Attribution
 -----------

inputscope.spec

@@ -7,7 +7,7 @@ Pyinstaller-provided names and variables: Analysis, EXE, PYZ, SPEC, TOC.
 
 @author    Erki Suurjaak
 @created   13.04.2015
-@modified  22.01.2022
+@modified  28.02.2022
 """
 import os
 import struct
@@ -18,10 +18,10 @@ DO_DEBUGVER = False
 DO_64BIT    = (struct.calcsize("P") * 8 == 64)
 
 BUILDPATH = os.path.dirname(os.path.abspath(SPEC))
-APPPATH   = os.path.join(BUILDPATH, NAME)
 ROOTPATH  = BUILDPATH
+APPPATH   = os.path.join(ROOTPATH, "src")
 os.chdir(ROOTPATH)
-sys.path.append(ROOTPATH)
+sys.path.insert(0, APPPATH)
 
 from inputscope import conf
 
@@ -64,7 +64,7 @@ a = Analysis(
     [entrypoint], excludes=MODULE_EXCLUDES, hiddenimports=MODULE_INCLUDES
 )
 a.datas -= [(n, None, "DATA") for n in DATA_EXCLUDES] # entry=(name, path, typecode)
-a.datas += [(os.path.join(*x), os.path.join(APPPATH, *x), "DATA")
+a.datas += [(os.path.join(*x), os.path.join(APPPATH, NAME, *x), "DATA")
             for x in APP_INCLUDES]
 a.binaries -= [(n, None, None) for n in BINARY_EXCLUDES]
 a.pure = TOC([(n, p, c) for (n, p, c) in a.pure if not any(
@@ -83,7 +83,7 @@ exe = EXE(
     strip=False, # EXE and all shared libraries run through cygwin's strip, tends to render Win32 DLLs unusable
     upx=True, # Using Ultimate Packer for eXecutables
     console=DO_DEBUGVER, # Use the Windows subsystem executable instead of the console one
-    icon=os.path.join(APPPATH, "static", "icon.ico"),
+    icon=os.path.join(APPPATH, NAME, "static", "icon.ico"),
 )
 
 try: os.remove(entrypoint)