Merge branch 'dev' into release

# Conflicts:
#	CMakeLists.txt
#	res/about/version.gmi

Author: skyjake

CMakeLists.txt

@@ -19,13 +19,14 @@
 cmake_minimum_required (VERSION 3.9)
 
 project (Lagrange
-    VERSION 0.4.1
+    VERSION 0.5.0
     DESCRIPTION "Beautiful Gemini Client"
     LANGUAGES C
 )
 set (COPYRIGHT_YEAR 2020)
 
 # Build configuration.
+option (ENABLE_MPG123 "Use mpg123 for decoding MPEG audio" ON)
 option (ENABLE_X11_SWRENDER "Use software rendering under X11" OFF)
 option (ENABLE_KERNING "Enable kerning in font renderer (slower)" ON)
 option (ENABLE_RESOURCE_EMBED "Embed resources inside the executable" OFF)
@@ -47,6 +48,7 @@ else ()
 endif ()
 find_package (PkgConfig REQUIRED)
 pkg_check_modules (SDL2 REQUIRED sdl2)
+pkg_check_modules (MPG123 IMPORTED_TARGET libmpg123)
 
 # Embedded resources are written to a generated source file.
 message (STATUS "Preparing embedded resources...")
@@ -56,23 +58,30 @@ set (EMBED_RESOURCES
     res/about/lagrange.gmi
     res/about/license.gmi
     res/about/version.gmi
-    res/FiraMono-Regular.ttf
-    res/FiraSans-Bold.ttf
-    res/FiraSans-Italic.ttf
-    res/FiraSans-Light.ttf
-    res/FiraSans-Regular.ttf
-    res/KosugiMaru-Regular.ttf
-    res/NotoEmoji-Regular.ttf
-    res/Nunito-ExtraBold.ttf
-    res/Nunito-ExtraLight.ttf
-    res/Nunito-LightItalic.ttf
-    res/Nunito-Regular.ttf
-    res/SourceSansPro-Regular.ttf
-    res/Symbola.ttf
+    res/fonts/EBGaramond-Regular.ttf
+    res/fonts/EBGaramond-Italic.ttf
+    res/fonts/EBGaramond-Bold.ttf
+    res/fonts/FiraMono-Regular.ttf
+    res/fonts/FiraSans-Bold.ttf
+    res/fonts/FiraSans-Italic.ttf
+    res/fonts/FiraSans-Light.ttf
+    res/fonts/FiraSans-Regular.ttf
+    res/fonts/KosugiMaru-Regular.ttf
+    res/fonts/Literata-Regular-opsz=14.ttf
+    res/fonts/Literata-Bold-opsz=36.ttf
+    res/fonts/Literata-ExtraLight-opsz=18.ttf
+    res/fonts/Literata-LightItalic-opsz=10.ttf
+    res/fonts/NotoEmoji-Regular.ttf
+    res/fonts/Nunito-ExtraBold.ttf
+    res/fonts/Nunito-ExtraLight.ttf
+    res/fonts/Nunito-LightItalic.ttf
+    res/fonts/Nunito-Regular.ttf
+    res/fonts/SourceSansPro-Regular.ttf
+    res/fonts/Symbola.ttf
 )
- if (UNIX AND NOT APPLE)
-     list (APPEND EMBED_RESOURCES res/lagrange-64.png)
- endif ()
+if (UNIX AND NOT APPLE)
+    list (APPEND EMBED_RESOURCES res/lagrange-64.png)
+endif ()
 embed_make (${EMBED_RESOURCES})
 
 set (EMB_BIN ${CMAKE_CURRENT_BINARY_DIR}/resources.binary)
@@ -127,6 +136,8 @@ set (SOURCES
     src/ui/metrics.h
     src/ui/paint.c
     src/ui/paint.h
+    src/ui/playerui.c
+    src/ui/playerui.h
     src/ui/scrollwidget.c
     src/ui/scrollwidget.h
     src/ui/sidebarwidget.c
@@ -192,6 +203,10 @@ endif ()
 if (ENABLE_WINDOWPOS_FIX)
     target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_WINDOWPOS_FIX=1)
 endif ()
+if (ENABLE_MPG123 AND MPG123_FOUND)
+    target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_MPG123=1)
+    target_link_libraries (app PUBLIC PkgConfig::MPG123)
+endif ()
 target_link_libraries (app PUBLIC the_Foundation::the_Foundation)
 target_link_libraries (app PUBLIC ${SDL2_LDFLAGS})
 if (APPLE)
@@ -229,6 +244,9 @@ endif ()
 # Deployment.
 if (MSYS)
     install (TARGETS app DESTINATION .)
+    if (TARGET PkgConfig::MPG123)
+        install (PROGRAMS ${MPG123_LIBDIR}/../bin/msys-mpg123-0.dll DESTINATION .)
+    endif ()
     if (NOT ENABLE_RESOURCE_EMBED)
         install (FILES ${EMB_BIN} DESTINATION .)
     endif ()
@@ -262,6 +280,8 @@ MimeType=x-scheme-handler/gemini;
          RENAME fi.skyjake.lagrange.png
     )
     if (NOT ENABLE_RESOURCE_EMBED)
+        target_compile_definitions (app PUBLIC
+            LAGRANGE_EMB_BIN="${CMAKE_INSTALL_PREFIX}/share/lagrange/resources.binary")
         install (FILES ${EMB_BIN} DESTINATION share/lagrange)
     endif ()
 endif ()

Embed.cmake

@@ -9,6 +9,7 @@ option (ENABLE_RESOURCE_EMBED "Embed resources inside the executable" OFF)
 function (embed_getname output fn)
     get_filename_component (name ${fn} NAME_WE)
     string (REPLACE "-" "" name ${name})
+    string (REPLACE "=" "" name ${name})
     string (SUBSTRING ${name} 0 1 first)
     string (TOUPPER ${first} first)
     string (SUBSTRING ${name} 1 -1 remainder)

README.md

@@ -14,6 +14,7 @@ Like Gemini, Lagrange has been designed with minimalism in mind. It depends on a
 * Sidebar for page outline, managing bookmarks and identities, and viewing history
 * Multiple tabs
 * Identity management — create and use TLS client certificates
+* Audio playback: MP3, Ogg Vorbis, WAV
 * And more! Open `about:help` in the app, or see [help.gmi](https://git.skyjake.fi/skyjake/lagrange/raw/branch/release/res/about/help.gmi)
 
 ## Downloads
@@ -25,11 +26,12 @@ Prebuilt binaries for Windows and macOS can be found in [Releases][rel].
 This is how to build Lagrange in a Unix-like environment. The required tools are a C11 compiler (e.g., Clang or GCC), CMake and `pkg-config`.
 
 1. Download and extract a source tarball from [Releases][rel]. Alternatively, you may also clone the repository and its submodules: `git clone --recursive --branch release https://git.skyjake.fi/skyjake/lagrange`
-2. Check that you have the dependencies installed: CMake, SDL 2, OpenSSL 1.1.1, libpcre, zlib, libunistring. For example, on macOS this would do the trick (using Homebrew): ```brew install cmake sdl2 [email protected] pcre libunistring``` Or on Ubuntu: ```sudo apt install cmake libsdl2-dev libssl-dev libpcre3-dev zlib1g-dev libunistring-dev```
-3. Create a build directory.
-4. In your empty build directory, run CMake: ```cmake {path_of_lagrange_sources} -DCMAKE_BUILD_TYPE=Release```
-5. Build it: ```cmake --build .```
-6. Now you can run `lagrange`, `lagrange.exe`, or `Lagrange.app`.
+2. Check that you have the required dependencies installed: CMake, SDL 2, OpenSSL 1.1.1, libpcre, zlib, libunistring. For example, on macOS this would do the trick (using Homebrew): ```brew install cmake sdl2 [email protected] pcre libunistring``` Or on Ubuntu: ```sudo apt install cmake libsdl2-dev libssl-dev libpcre3-dev zlib1g-dev libunistring-dev```
+3. Optionally, install the mpg123 decoder library for MPEG audio support. For example, the macOS Homebrew package is `mpg123` and on Ubuntu it is `libmpg123-dev`.
+4. Create a build directory.
+5. In your empty build directory, run CMake: ```cmake {path_of_lagrange_sources} -DCMAKE_BUILD_TYPE=Release```
+6. Build it: ```cmake --build .```
+7. Now you can run `lagrange`, `lagrange.exe`, or `Lagrange.app`.
 
 ### Installing to a directory
 

lagrange_about.png

@@ -28,6 +28,7 @@ Like Gemini, Lagrange has been designed with minimalism in mind. It depends on a
 * Select and copy text with the mouse
 * Find text on the page
 * Open image links inline on the same page
+* Audio playback: MP3, Ogg Vorbis, WAV
 * Open links via keyboard shortcuts
 * Instant back/forward navigation
 * Smooth scrolling
@@ -118,7 +119,7 @@ The sidebar can be toggled via menus or by pressing ${SHIFT+}${CTRL+}L. It has f
 * Bookmarks: List of bookmarks that you've created. These appear first in search results for quick and easy access.
 * History: Chronological list of visited URLs. This is not a full history of all the URLs you've accessed over time — only unique URLs are shown at the latest access time.
 * Identities: TLS client certificates.
-* Outline: List of the headings in the currently open tab. Useful when reading longer documents. 
+* Outline: List of the headings in the currently open tab. Useful when reading longer documents.
 
 ${CTRL+}1 through ${CTRL+}4 switch between the sidebar tabs, or hide the sidebar if the current tab's key is pressed.
 

res/SymbolaSubset.ttf

@@ -29,6 +29,12 @@ SDL 2.0 and newer are available under the zlib license:
 >
 > 3. This notice may not be removed or altered from any source distribution.
 
+## mpg123
+
+mpg123 is a fast console MPEG audio player and decoder library. It is licensed under LGPL 2.1. Lagrange uses the libmpg123 decoder library when playing back MPEG audio.
+=> https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html GNU LGPL version 2.1
+=> https://mpg123.org/ mpg123
+
 ## the_Foundation
 
 the_Foundation is an opinionated C11 library by Jaakko Keränen. It is under the BSD 2-clause license. Note that the rest of the libraries in this section are used by the_Foundation, and not directly by Lagrange.
@@ -88,13 +94,15 @@ SSLeay license:
 ## GNU libunistring
 
 The libunistring library is covered by the GNU Lesser General Public License (LGPL):
-=> https://www.gnu.org/software/libunistring/manual/libunistring.html#GNU-LGPL GNU LGPL License
+=> https://www.gnu.org/software/libunistring/manual/libunistring.html#GNU-LGPL GNU LGPL
 
 ## Fonts
 
 This application uses fonts licensed under the Open Font License.
 
+=> https://fonts.google.com/specimen/EB+Garamond#license  EB Garamond
 => https://github.com/mozilla/Fira/blob/master/LICENSE  Fira Sans, Fira Mono
+=> https://github.com/googlefonts/literata/blob/master/OFL.txt  Literata
 => https://github.com/googlefonts/nunito/blob/master/OFL.txt  Nunito
 => https://github.com/adobe-fonts/source-sans-pro/blob/release/LICENSE.md  Source Sans Pro
 

res/about/help.gmi

@@ -6,6 +6,19 @@
 ```
 # Release notes
 
+## 0.5
+* Added MP3 support in the audio player (using mpg123).
+=> https://mpg123.org/ mpg123: MPEG audio player and decoder library
+* Added volume control in the audio player.
+* Metadata in Vorbis and MP3 audio content (title, artist, etc.) is shown in the audio player menu.
+* Added new serif fonts: EB Garamond and Literata.
+* Allow configuring separate fonts for headings and body text for better visual distinction.
+* Preferences dialog remembers the previously open tab.
+* Paste from clipboard on middle mouse button click.
+* Open links in new tab with middle mouse button.
+* Fixed failure to find resources when launching via PATH.
+* Fixed color saturation setting not affecting the default color theme.
+
 ## 0.4.1
 * Set keyboard focus to URL input field after opening a new tab.
 * Pause other audio players when a new one is started. One can still choose to have multiple audio players playing simultaneously by unpausing them again.

res/about/license.gmi

@@ -0,0 +1,93 @@
+Copyright 2017 The EB Garamond Project Authors (https://github.com/octaviopardo/EBGaramond12)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

res/about/version.gmi

@@ -0,0 +1,93 @@
+Copyright 2017 The Literata Project Authors (https://github.com/googlefonts/literata)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.