-
-
Notifications
You must be signed in to change notification settings - Fork 62
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
# Conflicts: # CMakeLists.txt # res/about/version.gmi # src/feeds.c # src/gmutil.c # src/gmutil.h # src/ui/sidebarwidget.c # src/ui/text.c
- Loading branch information
Showing
48 changed files
with
1,241 additions
and
319 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,8 +2,6 @@ | |
|
|
||
| **Copyright 2020 Jaakko Keränen ([email protected])** | ||
|
|
||
| All rights reserved. | ||
|
|
||
| Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: | ||
|
|
||
| * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,20 +42,32 @@ This is how to build Lagrange in a POSIX-compatible environment. The required to | |
|
|
||
| ### Installing to a directory | ||
|
|
||
| To install to "/dest/path": | ||
| Set `CMAKE_INSTALL_PREFIX` to install to a directory of your choosing. | ||
|
|
||
| 1. `cmake {path_of_lagrange_sources} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/dest/path` | ||
| 2. `cmake --build . --target install` | ||
|
|
||
| This will also install an XDG .desktop file for launching the app. | ||
|
|
||
| ### Build options | ||
|
|
||
| | CMake Option | Description | | ||
| | ------------ | ----------- | | ||
| | `ENABLE_BINCAT_SH` | Merge resource files (fonts, etc.) together using a Bash shell script. By default this is **OFF**, so _res/bincat.c_ is compiled as a native executable for this purpose. However, when cross-compiling, native binaries built during the CMake run may be targeted for the wrong architecture. Set this to **ON** if you are having problems with bincat while running CMake. | | ||
| | `ENABLE_IDLE_SLEEP` | Sleep in the main thread instead of waiting for events. On some platforms, `SDL_WaitEvent()` may have a relatively high CPU usage. Setting this to **ON** polls for events periodically but otherwise keeps the main thread sleeping, reducing CPU usage. The drawback is that there is a slightly increased latency reacting to new events after idle mode ends. | | ||
| | `ENABLE_KERNING` | Use kerning information in the fonts to adjust glyph placement. Setting this **ON** improves text appearance in subtle ways but slows down text rendering. It may be a good idea to set this to **OFF** when running on a slow CPU. | | ||
| | `ENABLE_MPG123` | Use the mpg123 library for decoding MPEG audio files. | | ||
| | `ENABLE_RESOURCE_EMBED` | Embed all resource files into the Lagrange executable instead of keeping them in a separate file that gets loaded at launch. Setting this **ON** makes it much slower to run CMake and to compile Lagrange. | | ||
| | `ENABLE_WINDOWPOS_FIX` | Set correct window position after the window has already been shown. This may be necessary on some platforms to prevent the window from being restored to the wrong position. | | ||
| | `ENABLE_X11_SWRENDER` | Default to software rendering when running under X11. By default Lagrange attempts to use the GPU for rendering the user interface. You can also use the `--sw` option at launch to force software rendering. | | ||
|
|
||
| ### Compiling on macOS | ||
|
|
||
| When using OpenSSL 1.1.1 from Homebrew, you must add its pkgconfig path to your `PKG_CONFIG_PATH` environment variable, for example: | ||
|
|
||
| export PKG_CONFIG_PATH=/usr/local/Cellar/[email protected]/1.1.1h/lib/pkgconfig | ||
| export PKG_CONFIG_PATH=/opt/homebrew/Cellar/[email protected]/1.1.1i/lib/pkgconfig | ||
|
|
||
| Also, SDL's trackpad scrolling behavior on macOS is not optimal for regular GUI apps because it emulates a physical mouse wheel. This may change in a future release of SDL, but at least in 2.0.12 a [small patch](https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/sdl2-macos-mouse-scrolling.diff) is required to allow momentum scrolling to come through as single-pixel mouse wheel events. Note that SDL comes with an Xcode project; use the "Shared Library" target and check that you are doing a Release build. | ||
| Also, SDL's trackpad scrolling behavior on macOS is not optimal for regular GUI apps because it emulates a physical mouse wheel. This may change in a future release of SDL, but at least in 2.0.14 (and earlier) a [small patch](https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/sdl2-macos-mouse-scrolling.diff) is required to allow momentum scrolling to come through as single-pixel mouse wheel events. Note that SDL comes with an Xcode project; use the "Shared Library" target and check that you are doing a Release build. | ||
|
|
||
| ### Compiling on Windows | ||
|
|
||
|
|
||
Submodule the_Foundation
updated
from 5faf8d to 8977c8
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| #!/bin/bash | ||
| # Binary Resource Concatenator | ||
| # Copyright: 2021 Jaakko Keränen <[email protected]> | ||
| # License: BSD 2-Clause | ||
|
|
||
| OUTPUT=-- | ||
| SIZES="" | ||
| for fn in $*; do | ||
| if [ "$OUTPUT" = "--" ]; then | ||
| OUTPUT=$fn | ||
| rm -f ${OUTPUT} | ||
| else | ||
| vals=(`/bin/ls -l $fn`) | ||
| if [ "$SIZES" = "" ]; then | ||
| SIZES=${vals[4]} | ||
| else | ||
| SIZES=$SIZES\;${vals[4]} | ||
| fi | ||
| cat ${fn} >> ${OUTPUT} | ||
| fi | ||
| done | ||
| echo $SIZES |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- Copyright 2021 Jaakko Keränen <[email protected]> --> | ||
| <component type="desktop-application"> | ||
| <id>fi.skyjake.Lagrange</id> | ||
| <metadata_license>CC0-1.0</metadata_license> | ||
| <project_license>BSD-2-Clause</project_license> | ||
| <name>Lagrange</name> | ||
| <summary>A Beautiful Gemini Client</summary> | ||
| <description> | ||
| <p> | ||
| Lagrange is a desktop GUI client for browsing Geminispace. | ||
| It offers modern conveniences familiar from web browsers, | ||
| such as smooth scrolling, inline image viewing, multiple | ||
| tabs, visual themes, Unicode fonts, bookmarks, history, and | ||
| page outlines. | ||
| </p> | ||
| <p> | ||
| Like the Gemini protocol, Lagrange has been designed with | ||
| minimalism in mind. It depends on a small number of essential | ||
| libraries. It is written in C and uses SDL for | ||
| hardware-accelerated graphics. OpenSSL is used for secure | ||
| communications. | ||
| </p> | ||
| </description> | ||
| <content_rating type="oars-1.1" /> | ||
|
|
||
| <launchable type="desktop-id">fi.skyjake.Lagrange.desktop</launchable> | ||
|
|
||
| <screenshots> | ||
| <screenshot type="default"> | ||
| <image>https://gmi.skyjake.fi/lagrange/flathub_screenshot.jpg</image> | ||
| </screenshot> | ||
| </screenshots> | ||
|
|
||
| <url type="homepage">https://gmi.skyjake.fi/lagrange</url> | ||
| <url type="bugtracker">https://github.com/skyjake/lagrange/issues</url> | ||
| <url type="contact">https://skyjake.fi/@jk</url> | ||
|
|
||
| <developer_name>Jaakko Keränen</developer_name> | ||
|
|
||
| <provides> | ||
| <binary>lagrange</binary> | ||
| </provides> | ||
|
|
||
| <update_contact>[email protected]</update_contact> | ||
|
|
||
| <releases> | ||
| <release version="1.1" date="2021-01-28"> | ||
| <description> | ||
| <p> | ||
| This version adds new features to enhance user experience | ||
| and fixes incorrect behavior. | ||
| </p> | ||
| <ul> | ||
| <li>Import existing X.509 client certificates via the UI.</li> | ||
| <li>Setting for maximum cache size.</li> | ||
| <li>Option to show full URL when hovering mouse over a link.</li> | ||
| <li>Support for Finger links.</li> | ||
| <li>More keybindings: e.g., opening and closing tabs.</li> | ||
| <li>Visual UI improvements.</li> | ||
| <li>Fix for history timestamps that were shifting on every launch.</li> | ||
| </ul> | ||
| </description> | ||
| <url>https://github.com/skyjake/lagrange/releases/tag/v1.1.0</url> | ||
| </release> | ||
| <release version="1.0.3" date="2021-01-12"> | ||
| <description> | ||
| <p>This release contains bug fixes and performance improvements.</p> | ||
| <p>Version 1.0 is the first stable release of Lagrange.</p> | ||
| </description> | ||
| <url>https://github.com/skyjake/lagrange/releases/tag/v1.0.3</url> | ||
| </release> | ||
| </releases> | ||
| </component> |
Binary file not shown.
Oops, something went wrong.