Bump version to 2.2

Author: complexlogic

CHANGELOG

@@ -1,5 +1,9 @@
-Unreleased
+v2.2 (2024-11-24)
 - Make application timeout configurable
+- Add WrapEntries feature
+- Various fixes, optimizations, and code quality improvements
+- Windows: Improve logic relating to handling of launched applications (focus issues, etc.)
+- Linux: Don't set SDL_VIDEODRIVER environment variable
 
 v2.1 (2023-1-7)
 - Added OnLaunch 'Quit' mode

CMakeLists.txt

@@ -2,7 +2,7 @@
 cmake_minimum_required(VERSION 3.18)
 project("Flex Launcher" 
   LANGUAGES C
-  VERSION 2.1
+  VERSION 2.2
   DESCRIPTION "Customizable HTPC Application Launcher"
   HOMEPAGE_URL "https://github.com/complexlogic/flex-launcher"
 )

README.md

@@ -55,19 +55,19 @@ Binary packages are available on the [release page](https://github.com/complexlo
 #### APT-based x86-64 Distributions (Debian, Ubuntu, etc.)
 This package is compatible with Debian Bullseye and later, Ubuntu 21.04 and later.
 ```bash
-wget https://github.com/complexlogic/flex-launcher/releases/download/v2.1/flex-launcher_2.1_amd64.deb
-sudo apt install ./flex-launcher_2.1_amd64.deb
+wget https://github.com/complexlogic/flex-launcher/releases/download/v2.2/flex-launcher_2.2_amd64.deb
+sudo apt install ./flex-launcher_2.2_amd64.deb
 ```
 #### Pacman-based x86-64 Distributions (Arch, Manjaro, etc.)
 ```bash
-wget https://github.com/complexlogic/flex-launcher/releases/download/v2.1/flex-launcher-2.1-1-x86_64.pkg.tar.zst
-sudo pacman -U flex-launcher-2.1-1-x86_64.pkg.tar.zst
+wget https://github.com/complexlogic/flex-launcher/releases/download/v2.2/flex-launcher-2.2-1-x86_64.pkg.tar.zst
+sudo pacman -U flex-launcher-2.2-1-x86_64.pkg.tar.zst
 ```
 #### Raspberry Pi
 This package is compatible with Raspbian Bullseye and later, 64 bit only.
 ```bash
-wget https://github.com/complexlogic/flex-launcher/releases/download/v2.1/flex-launcher_2.1_arm64.deb
-sudo apt install ./flex-launcher_2.1_arm64.deb
+wget https://github.com/complexlogic/flex-launcher/releases/download/v2.2/flex-launcher_2.2_arm64.deb
+sudo apt install ./flex-launcher_2.2_arm64.deb
 ```
 #### Copying Assets to Home Directory
 The Linux packages install a default config file and assets to `/usr/share/flex-launcher`. It is strongly recommended to *not* edit this config file directly, as it will be overwritten if you upgrade to a later version of Flex Launcher. Instead, copy these files to your home directory and edit it there.

docs/_config.yml

@@ -3,7 +3,7 @@ description: A customizable HTPC application launcher and front-end interface
 url: "" # the base hostname & protocol for your site, e.g. http://example.com
 github_username: complexlogic
 repository: complexlogic/flex-launcher
-launcher_version: 2.1
+launcher_version: 2.2
 
 # Build settings
 remote_theme: pages-themes/[email protected]

docs/configuration.md

@@ -24,7 +24,7 @@ title: Configuration
 
 ## Overview
 Flex Launcher uses an [INI file](https://en.wikipedia.org/wiki/INI_file) to configure settings and menus. The INI file consists of sections enclosed in square brackets, and in each section there are entries which consist of a key and a value. Example:
-```INI
+```ini
 [Section]
 Key1=value
 Key2=value
@@ -72,6 +72,11 @@ Default: true
 ##### FPSLimit
 When `VSync` is set to false, this setting defines the maximum number of frames per second that Flex Launcher will render. The minimum is 10, and the maximum is the same as the refresh rate of your monitor.
 
+##### ApplicationTimeout
+Defines the time in seconds that the launcher will wait for an application to launch. If the launcher does not lose the window focus before the timeout occurs, it assumes there was an error with the launched application.
+
+Default: 15
+
 ##### OnLaunch
 Defines the action that Flex Launcher will take upon the launch of an application. Possible values: "None", "Blank", and "Quit"
 - None: Flex Launcher will maintain its window while waiting for the launched application to initialize.
@@ -80,6 +85,11 @@ Defines the action that Flex Launcher will take upon the launch of an applicatio
 
 Default: Blank
 
+##### WrapEntries
+Defines whether the highlight will wrap to the other side of the screen after reaching its leftmost or rightmost position. This setting is a boolean "true" or "false".
+
+Default: false
+
 ##### ResetOnBack
 Defines whether Flex Launcher will remember the previous entry position when going back to a previous menu. If set to true, the highlight will be reset to the first entry in the menu when going back. This setting is a boolean "true" or "false".
 
@@ -350,7 +360,7 @@ Default: 100%
 At least one menu must be defined in the configuration file, and the title must match the `DefaultMenu` setting value. The title of a menu is its section name. Any title may be used that is not reserved for another section, such as "Settings", "Gamepad", etc. The entries of the menu are implemented as key=value pairs. The name of the key will be ignored by the program, and is therefore arbtrary. However, it is recommended to pick something intutitive such as Entry1, Entry2, Entry3, etc. The entry information is contained in the value.
 
 Each entry value contains 3 parts of information in order: the title, the icon image path, and the command to run when the button is clicked. These are delimited by semicolons:
-```
+```ini
 Entry=title;icon_path;command
 ```
 The command is typically one of the following:
@@ -361,7 +371,7 @@ The command is typically one of the following:
 5. The path to an executable script, in the case that you want to perform multiple actions upon program launch.
 
  A simple example menu titled `Media` is shown below:
-```
+```ini
 [Media]
 Entry1=Kodi;C:\Pictures\Icons\kodi.png;"C:\Program Shortcuts\kodi.lnk"
 Entry2=Netflix;C:\Pictures\Icons\netflix.png;"C:\Program Shortcuts\netflix.lnk"
@@ -528,13 +538,13 @@ Default: true
 
 ## Hotkeys
 Flex Launcher supports configurable hotkeys, which executes a command when a specified key is pressed. Each hotkey consists of a key=value pair, where the key is an arbitrary name, and the value contains the SDL keycode of the hotkey and the command to run when it is pressed, delimited by a semicolon:
-```
+```ini
 Hotkey=keycode;command
 ```
 The keycode is a HEX prefixed with the # character. There are two ways to find a keycode for a given key. The first is to use the [lookup table provided by SDL](https://wiki.libsdl.org/SDLKeycodeLookup). The name of each key is in the right column of the table, and the corresponding HEX keycode is in the center column. The second is to run Flex Launcher in debug mode, press the key, then check the log. For each keystroke, the name of the key will be printed and the HEX value will be in parenthesis next to it.
 
 Any key can be set as a hotkey, except keys that are reserved for the default controls: the left and right arrow keys, enter/return, and backspace. Hotkeys may be used to "speed dial" your favorite applications, or to add controls via [special commands](#special-commands). As an example configuration below, the first hotkey is mapped to F1 and will launch Kodi when it is pressed, and the second hotkey is mapped to F12 and will cause Flex Launcher to quit when it is pressed:
-```
+```ini
 [Hotkeys]
 Hotkey1=#4000003A;"C:\Program Shortcuts\kodi.lnk"
 Hotkey2=#40000045;:quit
@@ -546,7 +556,7 @@ The exit hotkey feature allows a user to quit the running application using a bu
 Only the function keys F1-F24 may be used as an exit hotkey, with the exception of F12 which is forbidden by Windows. Pressing an exit hotkey is functionally equivalent to using the Alt+F4 keyboard shortcut on the active window; it is not a forceful method, so the application is able to close cleanly. However, the application could also choose to ignore it, display a confirmation dialog, or not respond if it's hung.
 
 The following example maps F10 as an exit hotkey:
-```
+```ini
 Hotkey=#40000043;:exit
 ```
 Linux users that desire similar functionality should check the documentation of their desktop environment and/or window manager. Most support global hotkeys that can be configured to close the active window.

docs/setup.md

@@ -26,7 +26,7 @@ Any icon that is not the same resolution as the `IconSize` setting in your confi
 inkscape --export-width=<width> --export-type=png /path/to/file.svg
 ```
 You can easily write a script to rasterize all SVGs in a directory to PNG at a given resolution. Here is an example in Python:
-```Python
+```python
 import glob
 import subprocess
 WIDTH=300 # Width of the PNG in pixels
@@ -55,12 +55,12 @@ My recommended web browser for HTPC use is Chrome/Chromium. This browser has man
 There is currently no desktop application for YouTube. However, there is a TV-friendly web interface located at [youtube.com/tv](https://www.youtube.com/tv) that is intended for use by Smart TVs . Google recently blocked access to this interface for desktop web browsers, but the block can be easily circumvented by spoofing the user-agent string of a Smart TV. A list of valid Smart TV user-agent strings is easily found online by search engine. The following example menu entries will launch an app-like YouTube experience in a browser:
 
 **Windows:**
-```
+```ini
 Entry=YouTube;C:\icons\youtube.png;"C:\Program Files\Google\Chrome\Application\chrome.exe" --start-fullscreen --user-agent="Mozilla/5.0 (Linux; Tizen 2.3; SmartHub; SMART-TV; SmartTV; U; Maple2012) AppleWebKit/538.1+ (KHTML, like Gecko) TV Safari/538.1+" youtube.com/tv
 ```
 
 **Linux:**
-```
+```ini
 Entry=YouTube;/path/to/icons/youtube.png;chromium --start-fullscreen --user-agent="Mozilla/5.0 (Linux; Tizen 2.3; SmartHub; SMART-TV; SmartTV; U; Maple2012) AppleWebKit/538.1+ (KHTML, like Gecko) TV Safari/538.1+" youtube.com/tv
 ```
 
@@ -75,12 +75,12 @@ The one caveat to this method is that the exit button in the menu doesn't work.
 Steam users may desire to launch their most frequently played games directly from Flex Launcher to avoid having to navigate through the Steam client UI first. Valve provides a [protocol](https://developer.valvesoftware.com/wiki/Steam_browser_protocol) to directly launch games, among other actions. To do so, pass `steam://run/<id>` as an argument to Steam, where `<id>` is replaced by the id of the game you want to watch. You can find the id of a game by searching [steamdb](https://steamdb.info/). For example, the id of Portal 2 is 620. You would structure your menu entry to launch Portal 2 like so:
 
 **Windows:**
-```
+```ini
 Entry=Portal 2;C:\icons\portal_2.png;"C:\Program Files (x86)\Steam\steam.exe" steam://run/620
 ```
 
 **Linux:**
-```
+```ini
 Entry=Portal 2;/path/to/icons/portal_2.png;steam steam://run/620
 ```
 

docs/setup_windows.md

@@ -45,7 +45,7 @@ Reboot your HTPC for the change to take effect.
 It may be desirable to use the desktop interface occasionally, e.g. during maintenance or installation of new software. You can get your desktop back by running `explorer.exe`. This can be accomplished in a few ways.
 
 Using the `QuitCmd` setting in your config file, you can automatically restore your desktop after you quit Flex Launcher:
-```INI
+```ini
 [General]
 ...
 QuitCmd=:fork explorer.exe