update readme

loading save state was slow so now theres a temporary lookup table

.github/workflows/ci.yml

@@ -8,24 +8,24 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        buildtype: [Debug, RelWithDebInfo]
+        buildtype: [Debug, RelWithDebInfo, MinSizeRel]
     steps:
       - uses: actions/checkout@v1
         with:
           submodules: true
 
       - name: Fetch CMake
-        uses: lukka/get-cmake@latest
+        uses: lukka/get-cmake@v3.21.2
 
       - name: Fetch dependencies
-        uses: lukka/run-vcpkg@main
+        uses: lukka/run-vcpkg@v7
         with:
           vcpkgArguments: gtkmm nlohmann-json zlib sqlite3 glibmm openssl ixwebsocket curl
           vcpkgDirectory: ${{ github.workspace }}/ci/vcpkg/
           vcpkgTriplet: x64-windows
 
       - name: Build
-        uses: lukka/run-cmake@main
+        uses: lukka/run-cmake@v3
         with:
           useVcpkgToolchainFile: true
           vcpkgTriplet: x64-windows
@@ -41,8 +41,9 @@ jobs:
           del /f /s /q "${{ runner.workspace }}\build\.ninja_log"
           del /f /s /q "${{ runner.workspace }}\build\abaddon.ilk"
           del /f /s /q "${{ runner.workspace }}\build\CMakeCache.txt"
-          xcopy /E /I "${{ github.workspace }}\css" "${{ runner.workspace }}\build\css"
-          xcopy /E /I "${{ github.workspace }}\res" "${{ runner.workspace }}\build\res"
+          xcopy /E /I "${{ github.workspace }}\res\css" "${{ runner.workspace }}\build\css"
+          xcopy /E /I "${{ github.workspace }}\res\res" "${{ runner.workspace }}\build\res"
+          xcopy /E /I "${{ github.workspace }}\res\fonts" "${{ runner.workspace }}\build\fonts"
           mkdir "${{ runner.workspace }}\build\share"
           xcopy /E /I "${{ github.workspace }}\ci\gtk-for-windows\gtk-nsis-pack\share\glib-2.0" "${{ runner.workspace }}\build\share\glib-2.0"
           copy "${{ github.workspace }}\ci\vcpkg\installed\x64-windows\tools\glib\gspawn-win64-helper.exe" "${{ runner.workspace }}\build\gspawn-win64-helper.exe"
@@ -65,7 +66,7 @@ jobs:
           submodules: true
 
       - name: Fetch CMake
-        uses: lukka/get-cmake@latest
+        uses: lukka/get-cmake@v3.21.2
 
       - name: Fetch dependencies
         run: |
@@ -73,7 +74,7 @@ jobs:
           brew install nlohmann-json
 
       - name: Build
-        uses: lukka/run-cmake@main
+        uses: lukka/run-cmake@v3
         with:
           buildDirectory: ${{ runner.workspace }}/build
           cmakeBuildType: ${{ matrix.buildtype }}
@@ -82,8 +83,8 @@ jobs:
         run: |
           mkdir "${{ runner.workspace }}/artifactdir"
           cp "${{runner.workspace}}/build/abaddon" "${{ runner.workspace }}/artifactdir/abaddon"
-          cp -r "${{ github.workspace }}/css" "${{ runner.workspace }}/artifactdir/css"
-          cp -r "${{ github.workspace }}/res" "${{ runner.workspace }}/artifactdir/res"
+          cp -r "${{ github.workspace }}/res/css" "${{ runner.workspace }}/artifactdir/css"
+          cp -r "${{ github.workspace }}/res/res" "${{ runner.workspace }}/artifactdir/res"
 
       - name: Upload build
         uses: actions/upload-artifact@v2
@@ -103,7 +104,7 @@ jobs:
           submodules: true
 
       - name: Fetch CMake
-        uses: lukka/get-cmake@latest
+        uses: lukka/get-cmake@v3.21.2
 
       - name: Fetch dependencies
         run: |
@@ -122,7 +123,7 @@ jobs:
           sudo apt-get install libcurl4-gnutls-dev
 
       - name: Build
-        uses: lukka/run-cmake@main
+        uses: lukka/run-cmake@v3
         env:
           CC: gcc-9
           CXX: g++-9
@@ -135,8 +136,8 @@ jobs:
         run: |
           mkdir "${{ runner.workspace }}/artifactdir"
           cp "${{runner.workspace}}/build/abaddon" "${{ runner.workspace }}/artifactdir/abaddon"
-          cp -r "${{ github.workspace }}/css" "${{ runner.workspace }}/artifactdir/css"
-          cp -r "${{ github.workspace }}/res" "${{ runner.workspace }}/artifactdir/res"
+          cp -r "${{ github.workspace }}/res/css" "${{ runner.workspace }}/artifactdir/css"
+          cp -r "${{ github.workspace }}/res/res" "${{ runner.workspace }}/artifactdir/res"
 
       - name: Upload build
         uses: actions/upload-artifact@v2

.gitignore

@@ -354,3 +354,5 @@ testdata/
 
 build/
 out/
+
+fonts/fonts.conf

.gitmodules

@@ -1,15 +1,12 @@
 [submodule "vcpkg"]
 	path = ci/vcpkg
 	url = https://github.com/microsoft/vcpkg/
-[submodule "thirdparty/simpleini"]
-	path = thirdparty/simpleini
-	url = https://github.com/brofield/simpleini
-[submodule "thirdparty/IXWebSocket"]
-	path = thirdparty/IXWebSocket
-	url = https://github.com/machinezone/ixwebsocket
 [submodule "ci/vcpkg"]
 	path = ci/vcpkg
 	url = https://github.com/microsoft/vcpkg
 [submodule "ci/gtk-for-windows"]
 	path = ci/gtk-for-windows
 	url = https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer
+[submodule "subprojects/ixwebsocket"]
+	path = subprojects/ixwebsocket
+	url = https://github.com/machinezone/ixwebsocket

CMakeLists.txt

@@ -2,27 +2,26 @@ cmake_minimum_required(VERSION 3.16)
 
 project(abaddon)
 
+set(ABADDON_RESOURCE_DIR "/usr/share/abaddon" CACHE PATH "Fallback directory for resources on Linux")
+
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
 
-set(USE_TLS TRUE)
-set(USE_OPEN_SSL TRUE)
-
 find_package(nlohmann_json REQUIRED)
 find_package(CURL)
 find_package(ZLIB REQUIRED)
 find_package(SQLite3 REQUIRED)
 find_package(gtkmm REQUIRED)
 
-find_path(IXWEBSOCKET_INCLUDE_DIRS ixwebsocket/IXWebSocket.h)
-find_library(IXWEBSOCKET_LIBRARY ixwebsocket)
-if (NOT IXWEBSOCKET_LIBRARY)
-	add_subdirectory(thirdparty/IXWebSocket)
+set(USE_TLS TRUE)
+set(USE_OPEN_SSL TRUE)
+find_package(IXWebSocket QUIET)
+if (NOT IXWebSocket_FOUND)
+	message("ixwebsocket was not found and will be included as a submodule")
+	add_subdirectory(subprojects/ixwebsocket)
 	include_directories(IXWEBSOCKET_INCLUDE_DIRS)
 endif()
 
-include_directories(thirdparty/simpleini)
-
 if(MINGW OR WIN32)
 	link_libraries(ws2_32)
 endif()
@@ -30,27 +29,22 @@ endif()
 if(WIN32)
 	add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
 	add_compile_definitions(NOMINMAX)
+
+	find_package(Fontconfig REQUIRED)
+	link_libraries(${Fontconfig_LIBRARIES})
 endif()
 
-file(GLOB ABADDON_SOURCES
-	"*.h"
-	"*.hpp"
-	"*.cpp"
-	"discord/*.hpp"
-	"discord/*.cpp"
-	"components/*.hpp"
-	"components/*.cpp"
-	"windows/*.hpp"
-	"windows/*.cpp"
-	"windows/guildsettings/*.hpp"
-	"windows/guildsettings/*.cpp"
-	"windows/profile/*.hpp"
-	"windows/profile/*.cpp"
-	"dialogs/*.hpp"
-	"dialogs/*.cpp"
+configure_file(${PROJECT_SOURCE_DIR}/src/config.h.in ${PROJECT_BINARY_DIR}/config.h)
+
+file(GLOB_RECURSE ABADDON_SOURCES
+	"src/*.h"
+	"src/*.hpp"
+	"src/*.cpp"
 )
 
 add_executable(abaddon ${ABADDON_SOURCES})
+target_include_directories(abaddon PUBLIC ${PROJECT_SOURCE_DIR}/src)
+target_include_directories(abaddon PUBLIC ${PROJECT_BINARY_DIR})
 target_include_directories(abaddon PUBLIC ${GTKMM_INCLUDE_DIRS})
 target_include_directories(abaddon PUBLIC ${ZLIB_INCLUDE_DIRS})
 target_include_directories(abaddon PUBLIC ${SQLite3_INCLUDE_DIRS})
@@ -62,8 +56,8 @@ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR
 	target_link_libraries(abaddon stdc++fs)
 endif()
 
-if (IXWEBSOCKET_LIBRARY)
-	target_link_libraries(abaddon ${IXWEBSOCKET_LIBRARY})
+if (IXWebSocket_LIBRARIES)
+	target_link_libraries(abaddon ${IXWebSocket_LIBRARIES})
 	find_library(MBEDTLS_X509_LIBRARY mbedx509)
 	find_library(MBEDTLS_TLS_LIBRARY mbedtls)
 	find_library(MBEDTLS_CRYPTO_LIBRARY mbedcrypto)

README.md

@@ -4,12 +4,15 @@ Alternative Discord client made in C++ with GTK
 
 <img src="/.readme/s3.png">
 
+<a href="https://discord.gg/wkCU3vuzG5"><img src="https://discord.com/api/guilds/858156817711890443/widget.png?style=shield"></a>
+
 Current features:
 * Not Electron
 * Handles most types of chat messages including embeds, images, and replies
 * Completely styleable/customizable with CSS (if you have a system GTK theme it won't really use it though)
-* Identifies to gateway as the web client unlike other clients so less likely to be falsely flagged as spam<sup>1</sup>
+* Identifies to Discord as the web client unlike other clients so less likely to be falsely flagged as spam<sup>1</sup>
 * Set status
+* Unread and mention indicators
 * Start new DMs and group DMs
 * View user profiles (notes, mutual servers, mutual friends)
 * Kick, ban, and unban members
@@ -18,15 +21,19 @@ Current features:
 * Manage emojis
 * View audit log
 * Emojis<sup>2</sup>
+* Thread support<sup>3</sup>
 * Animated avatars, server icons, emojis (can be turned off)
   
-1 - Other third-party clients send the IDENTIFY message that bots use which makes Discord more likely to think you are selfbotting or spamming. However, Discord still loves to ban people's accounts for no good reason, even users of the official clients. If you want to be really careful avoid joining servers really fast or cold DMing people.  
-2 - Getting emojis to function properly on GTK is still something I've yet to figure out ([#5](../../issues/5)). Unicode emojis are manually searched for and replaced in several places as opposed to allowing GTK to figure it out since GTK's way of doing it doesn't work very well.  
+1 - Abaddon tries its best to make Discord think it's a legitimate web client. Some of the things done to do this include: using a browser user agent, sending the same IDENTIFY message that the official web client does, using API v9 endpoints in all cases, and not using endpoints the web client does not normally use. There are still a few smaller inconsistencies, however. For example the web client sends lots of telemetry via the `/science` endpoint (uBlock origin stops this) as well as in the headers of all requests. **In any case,** you should use an official client for joining servers, sending new DMs, or managing your friends list if you are afraid of being caught in Discord's spam filters (unlikely).
+
+2 - Unicode emojis are substituted manually as opposed to rendered by GTK on non-Windows platforms. This can be changed with the `stock_emojis` setting as shown at the bottom of this README. A CBDT-based font using Twemoji is provided to allow GTK to render emojis natively on Windows.
+
+3 - There are some inconsistencies with thread state that might be encountered in some more uncommon cases, but they are the result of fundamental issues with Discord's thread implementation.
   
 ### Building manually (recommended if not on Windows):
 #### Windows:
 1. `git clone https://github.com/uowuo/abaddon && cd abaddon`
-2. `vcpkg install gtkmm:x64-windows nlohmann-json:x64-windows ixwebsocket:x64-windows zlib:x64-windows simpleini:x64-windows sqlite3:x64-windows openssl:x64-windows curl:x64-windows`
+2. `vcpkg install gtkmm:x64-windows nlohmann-json:x64-windows ixwebsocket:x64-windows zlib:x64-windows sqlite3:x64-windows openssl:x64-windows curl:x64-windows`
 3. `mkdir build && cd build`
 4. `cmake -G"Visual Studio 16 2019" -A x64 -DCMAKE_TOOLCHAIN_FILE=c:\path\to\vcpkg\scripts\buildsystems\vcpkg.cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DVCPKG_TARGET_TRIPLET=x64-windows ..`
 5. Build with Visual Studio  
@@ -47,12 +54,21 @@ Or, do steps 1 and 2, and open CMakeLists.txt in Visual Studio if `vcpkg integra
 4. `cmake ..`
 5. `make`
 
-### Downloads (from CI):
+### Downloads:
+
+Latest release version: https://github.com/uowuo/abaddon/releases/latest
+
+**CI:**
+
 - Windows: [here](https://nightly.link/uowuo/abaddon/workflows/ci/master/build-windows-RelWithDebInfo.zip)
 - MacOS: [here](https://nightly.link/uowuo/abaddon/workflows/ci/master/build-macos-RelWithDebInfo.zip) unsigned, unpackaged, requires gtkmm3 (e.g. from homebrew)
 - Linux: [here](https://nightly.link/uowuo/abaddon/workflows/ci/master/build-linux-MinSizeRel.zip) unpackaged (for now), requires gtkmm3. built on Ubuntu 18.04 + gcc9  
 
-⚠️ Make sure you start from the directory where `css` and `res` are or else stuff will be broken
+⚠️ If you use Windows, make sure to start from the directory containing `css` and `res`
+
+On Linux, `css` and `res` can also be loaded from `~/.local/share/abaddon` or `/usr/share/abaddon`
+
+`abaddon.ini` will also be automatically used if located at `~/.config/abaddon/abaddon.ini` and there is no `abaddon.ini` in the working directory
 
 #### Dependencies:  
 * [gtkmm](https://www.gtkmm.org/en/)
@@ -60,12 +76,10 @@ Or, do steps 1 and 2, and open CMakeLists.txt in Visual Studio if `vcpkg integra
 * [IXWebSocket](https://github.com/machinezone/IXWebSocket)
 * [libcurl](https://curl.se/)
 * [zlib](https://zlib.net/)
-* [simpleini](https://github.com/brofield/simpleini)
 * [SQLite3](https://www.sqlite.org/index.html)
 
 ### TODO:
 * Voice support
-* Unread indicators
 * User activities
 * Nicknames
 * More server management stuff
@@ -78,12 +92,6 @@ Or, do steps 1 and 2, and open CMakeLists.txt in Visual Studio if `vcpkg integra
 .app-popup - Additional class for `.app-window`s when the window is not the main window  
   
 .channel-list - Container of the channel list  
-.channel-row - All rows within the channel container  
-.channel-row-channel - Only rows containing a channel  
-.channel-row-category - Only rows containing a category  
-.channel-row-guild - Only rows containing a guild  
-.channel-row-label - All labels within the channel container  
-.nsfw - Applied to channel row labels and their container for NSFW channels  
   
 .messages - Container of user messages  
 .message-container - The container which holds a user's messages  
@@ -169,25 +177,44 @@ Used in profile popup:
   
 ### Settings
 Settings are configured (for now) by editing abaddon.ini  
+The format is similar to the standard Windows ini format **except**:  
+* `#` is used to begin comments as opposed to `;`
+* Section and key names are case-sensitive
+
 You should edit these while the client is closed even though there's an option to reload while running  
 This listing is organized by section.  
 For example, memory_db would be set by adding `memory_db = true` under the line `[discord]`
 
 #### discord
+* gateway (string) - override url for Discord gateway. must be json format and use zlib stream compression
+* api_base (string) - override base url for Discord API
 * memory_db (true or false, default false) - if true, Discord data will be kept in memory as opposed to on disk
 * token (string) - Discord token used to login, this can be set from the menu
 * prefetch (true or false, default false) - if true, new messages will cause the avatar and image attachments to be automatically downloaded
 
 #### http
 * user_agent (string) - sets the user-agent to use in HTTP requests to the Discord API (not including media/images)
-* concurrent (int, default 10) - how many images can be concurrently retrieved
+* concurrent (int, default 20) - how many images can be concurrently retrieved
 
 #### gui
 * member_list_discriminator (true or false, default true) - show user discriminators in the member list
-* emojis (true or false, default true) - resolve unicode and custom emojis to images. this needs to be false to allow GTK to render emojis by itself
+* stock_emojis (true or false, default true) - allow abaddon to substitute unicode emojis with images from emojis.bin, must be false to allow GTK to render emojis itself
+* custom_emojis (true or false, default true) - download and use custom Discord emojis
 * css (string) - path to the main CSS file
 * animations (true or false, default true) - use animated images where available (e.g. server icons, emojis, avatars). false means static images will be used
+* animated_guild_hover_only (true or false, default true) - only animate guild icons when the guild is being hovered over
 * owner_crown (true or false, default true) - show a crown next to the owner
+* unreads (true or false, default true) - show unread indicators and mention badges
 
-#### misc
+#### style
 * linkcolor (string) - color to use for links in messages
+* expandercolor (string) - color to use for the expander in the channel list
+* nsfwchannelcolor (string) - color to use for NSFW channels in the channel list
+* channelcolor (string) - color to use for SFW channels in the channel list
+* mentionbadgecolor (string) - background color for mention badges
+* mentionbadgetextcolor (string) - color to use for number displayed on mention badges
+
+### Environment variables
+
+* ABADDON_NO_FC (Windows only) - don't use custom font config
+* ABADDON_CONFIG - change path of configuration file to use. relative to cwd or can be absolute

cmake/FindHarfBuzz.cmake

@@ -31,7 +31,6 @@ set(HARFBUZZ_INCLUDE_DIRS ${HARFBUZZ_INCLUDE_DIR};${HARFBUZZ_CONFIG_INCLUDE_DIRS
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(HarfBuzz
-                                  FOUND_VAR HARFBUZZ_FOUND
                                   REQUIRED_VARS
                                     HARFBUZZ_LIBRARY
                                     HARFBUZZ_INCLUDE_DIR

cmake/FindIXWebSocket.cmake

@@ -0,0 +1,30 @@
+set(IXWebSocket_LIBRARY_NAME ixwebsocket)
+
+find_path(IXWebSocket_INCLUDE_DIR
+          NAMES ixwebsocket/IXWebSocket.h
+          HINTS /usr/include
+                /usr/local/include
+                /opt/local/include
+          PATH_SUFFIXES ${IXWebSocket_LIBRARY_NAME})
+
+
+find_library(IXWebSocket_LIBRARY
+             NAMES ${IXWebSocket_LIBRARY_NAME}
+             PATH_SUFFIXES ${IXWebSocket_LIBRARY_NAME}
+                           ${IXWebSocket_LIBRARY_NAME}/include)
+
+include(FindPackageHandleStandardArgs)
+
+find_package_handle_standard_args(IXWebSocket
+                                  REQUIRED_VARS
+                                    IXWebSocket_LIBRARY
+                                    IXWebSocket_INCLUDE_DIR)
+
+
+mark_as_advanced(IXWebSocket_LIBRARY IXWebSocket_INCLUDE_DIR)
+
+if (IXWebSocket_FOUND)
+    find_package(OpenSSL QUIET)
+    set(IXWebSocket_INCLUDE_DIRS "${IXWebSocket_INCLUDE_DIR};${OPENSSL_INCLUDE_DIR}")
+    set(IXWebSocket_LIBRARIES "${IXWebSocket_LIBRARY};${OPENSSL_LIBRARIES}")
+endif()

cmake/Findatk.cmake

@@ -31,7 +31,6 @@ set(ATK_INCLUDE_DIRS ${ATK_INCLUDE_DIR};${ATK_CONFIG_INCLUDE_DIRS})
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(atk
-                                  FOUND_VAR ATK_FOUND
                                   REQUIRED_VARS
                                     ATK_LIBRARY
                                     ATK_INCLUDE_DIR

cmake/Findatkmm.cmake

@@ -42,7 +42,6 @@ set(ATKMM_INCLUDE_DIRS ${ATKMM_INCLUDE_DIR};${ATKMM_CONFIG_INCLUDE_DIR};${ATK_IN
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(atkmm
-                                  FOUND_VAR ATKMM_FOUND
                                   REQUIRED_VARS
                                     ATKMM_LIBRARY
                                     ATKMM_INCLUDE_DIRS

cmake/Findcairo.cmake

@@ -31,7 +31,6 @@ set(CAIRO_INCLUDE_DIRS ${CAIRO_INCLUDE_DIR};${CAIRO_CONFIG_INCLUDE_DIRS})
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(cairo
-                                  FOUND_VAR CAIRO_FOUND
                                   REQUIRED_VARS
                                     CAIRO_LIBRARY
                                     CAIRO_INCLUDE_DIR

cmake/Findcairomm.cmake

@@ -45,7 +45,6 @@ set(CAIROMM_INCLUDE_DIRS ${CAIROMM_INCLUDE_DIR};${CAIROMM_CONFIG_INCLUDE_DIRS};$
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(cairomm
-                                  FOUND_VAR CAIROMM_FOUND
                                   REQUIRED_VARS
                                     CAIROMM_LIBRARY
                                     CAIROMM_INCLUDE_DIR

cmake/Findgdkmm.cmake

@@ -40,7 +40,6 @@ set(GDKMM_INCLUDE_DIRS ${GDKMM_INCLUDE_DIR};${GDKMM_CONFIG_INCLUDE_DIRS};${GDKMM
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(gdkmm
-                                  FOUND_VAR GDKMM_FOUND
                                   REQUIRED_VARS
                                     GDKMM_LIBRARY
                                     GDKMM_INCLUDE_DIRS

cmake/Findgdkpixbuf.cmake

@@ -33,7 +33,6 @@ set(GDKPIXBUF_INCLUDE_DIRS ${GDKPIXBUF_INCLUDE_DIR};${GDKPIXBUF_CONFIG_INCLUDE_D
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(gdkpixbuf
-                                  FOUND_VAR GDKPIXBUF_FOUND
                                   REQUIRED_VARS
                                     GDKPIXBUF_LIBRARY
                                     GDKPIXBUF_INCLUDE_DIR

cmake/Findglib.cmake

@@ -50,7 +50,6 @@ endif()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(glib
-                                  FOUND_VAR GLIB_FOUND
                                   REQUIRED_VARS
                                     GLIB_LIBRARIES
                                     GLIB_INCLUDE_DIRS

cmake/Findglibmm.cmake

@@ -60,7 +60,6 @@ set(GLIBMM_INCLUDE_DIRS	${GLIBMM_INCLUDE_DIR};${GLIBMM_CONFIG_INCLUDE_DIR};${GIO
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(glibmm
-                                  FOUND_VAR GLIBMM_FOUND
                                   REQUIRED_VARS
                                     GLIBMM_LIBRARY
                                     GLIBMM_INCLUDE_DIR

cmake/Findgtk.cmake

@@ -47,7 +47,6 @@ set(GTK_INCLUDE_DIRS ${GTK_INCLUDE_DIR};${GDK_CONFIG_INCLUDE_DIR};${GDKPIXBUF_IN
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(gtk
-                                  FOUND_VAR GTK_FOUND
                                   REQUIRED_VARS
                                     GTK_LIBRARY
                                     GTK_INCLUDE_DIR

cmake/Findgtkmm.cmake

@@ -51,7 +51,6 @@ set(GTKMM_INCLUDE_DIRS  ${GTKMM_INCLUDE_DIR};${GTKMM_CONFIG_INCLUDE_DIR};${GDKMM
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(gtkmm
-                                  FOUND_VAR GTKMM_FOUND
                                   REQUIRED_VARS
                                     GTKMM_LIB
                                     GTKMM_INCLUDE_DIRS

cmake/Findixwebsocket.cmake

@@ -1,17 +0,0 @@
-find_path(IXWEBSOCKET_INCLUDE_DIR
-		  NAMES ixwebsocket/IXWebSocket.h)
-
-find_library(IXWEBSOCKET_LIBRARY
-		     NAMES ixwebsocket
-		     HINTS ${IXWEBSOCKET_LIBRARY_ROOT})
-
-set(IXWEBSOCKET_LIBRARIES    ${IXWEBSOCKET_LIBRARY})
-set(IXWEBSOCKET_INCLUDE_DIRS ${IXWEBSOCKET_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(ixwebsocket
-                                  FOUND_VAR IXWEBSOCKET_FOUND
-                                  REQUIRED_VARS
-                                    IXWEBSOCKET_LIBRARY
-                                    IXWEBSOCKET_INCLUDE_DIR
-                                  VERSION_VAR IXWEBSOCKET_VERSION)

cmake/Findnlohmann_json.cmake

@@ -22,7 +22,6 @@ set(NLOHMANN_JSON_LIBRARIES    "")
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(nlohmann_json
-                                  FOUND_VAR NLOHMANN_JSON_FOUND
                                   REQUIRED_VARS
                                     NLOHMANN_JSON_INCLUDE_DIR
                                   VERSION_VAR NLOHMANN_JSON_VERSION)

cmake/Findpango.cmake

@@ -1,4 +1,6 @@
 set(PANGO_LIBRARY_NAME pango-1.0)
+set(PANGOCAIRO_LIBRARY_NAME pangocairo-1.0)
+set(PANGOFT2_LIBRARY_NAME pangoft2-1.0)
 
 find_package(HarfBuzz)
 find_package(cairo)
@@ -42,12 +44,31 @@ find_library(PANGO_LIBRARY
              PATH_SUFFIXES ${PANGO_LIBRARY_NAME}
                            ${PANGO_LIBRARY_NAME}/include)
 
-set(PANGO_LIBRARIES    ${PANGO_LIBRARY};${HARFBUZZ_LIBRARIES};${CAIRO_LIBRARIES};${FREETYPE_LIBRARIES})
+find_library(PANGOCAIRO_LIBRARY
+             NAMES ${PANGOCAIRO_LIBRARY_NAME}
+                   pangocairo
+             HINTS ${PANGO_LIBRARY_HINTS}
+                   /usr/lib
+                   /usr/local/lib
+                   /opt/local/lib
+             PATH_SUFFIXES ${PANGO_LIBRARY_NAME}
+                           ${PANGO_LIBRARY_NAME}/include)
+
+find_library(PANGOFT2_LIBRARY
+             NAMES ${PANGOFT2_LIBRARY_NAME}
+                   pangoft2
+             HINTS ${PANGO_LIBRARY_HINTS}
+                   /usr/lib
+                   /usr/local/lib
+                   /opt/local/lib
+             PATH_SUFFIXES ${PANGO_LIBRARY_NAME}
+                           ${PANGO_LIBRARY_NAME}/include)
+
+set(PANGO_LIBRARIES    ${PANGO_LIBRARY};${HARFBUZZ_LIBRARIES};${CAIRO_LIBRARIES};${FREETYPE_LIBRARIES};${PANGOCAIRO_LIBRARY};${PANGOFT2_LIBRARY})
 set(PANGO_INCLUDE_DIRS ${PANGO_INCLUDE_DIR};${PANGO_CONFIG_INCLUDE_DIRS};${HARFBUZZ_INCLUDE_DIR};${CAIRO_INCLUDE_DIRS};${FREETYPE_INCLUDE_DIRS})
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(pango
-                                  FOUND_VAR PANGO_FOUND
                                   REQUIRED_VARS
                                     PANGO_LIBRARY
                                     PANGO_INCLUDE_DIR

cmake/Findpangomm.cmake

@@ -56,7 +56,6 @@ set(PANGOMM_INCLUDE_DIRS ${PANGOMM_INCLUDE_DIR};${PANGOMM_CONFIG_INCLUDE_DIR};${
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(pangomm
-                                  FOUND_VAR PANGOMM_FOUND
                                   REQUIRED_VARS
                                     PANGOMM_LIBRARY
                                     PANGOMM_INCLUDE_DIRS

cmake/Findsigc++.cmake

@@ -32,7 +32,6 @@ set(SIGC++_INCLUDE_DIRS ${SIGC++_INCLUDE_DIR};${SIGC++_CONFIG_INCLUDE_DIR})
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(sigc++
-                                  FOUND_VAR SIGC++_FOUND
                                   REQUIRED_VARS
                                     SIGC++_INCLUDE_DIR
                                     SIGC++_LIBRARY

components/channels.cpp

@@ -1,779 +0,0 @@
-#include "channels.hpp"
-#include <algorithm>
-#include <map>
-#include <unordered_map>
-#include "../abaddon.hpp"
-#include "../imgmanager.hpp"
-#include "../util.hpp"
-#include "statusindicator.hpp"
-
-void ChannelListRow::Collapse() {}
-
-void ChannelListRow::Expand() {}
-
-void ChannelListRow::MakeReadOnly(Gtk::TextView *tv) {
-    tv->set_can_focus(false);
-    tv->set_editable(false);
-    tv->signal_realize().connect([tv]() {
-        auto window = tv->get_window(Gtk::TEXT_WINDOW_TEXT);
-        auto display = window->get_display();
-        auto cursor = Gdk::Cursor::create(display, "default"); // textview uses "text" which looks out of place
-        window->set_cursor(cursor);
-    });
-    // stupid hack to prevent selection
-    auto buf = tv->get_buffer();
-    buf->property_has_selection().signal_changed().connect([tv, buf]() {
-        Gtk::TextBuffer::iterator a, b;
-        buf->get_bounds(a, b);
-        buf->select_range(a, a);
-    });
-}
-
-ChannelListRowDMHeader::ChannelListRowDMHeader() {
-    m_ev = Gtk::manage(new Gtk::EventBox);
-    m_box = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL));
-    m_lbl = Gtk::manage(new Gtk::Label);
-
-    get_style_context()->add_class("channel-row");
-    m_lbl->get_style_context()->add_class("channel-row-label");
-
-    m_lbl->set_use_markup(true);
-    m_lbl->set_markup("<b>Direct Messages</b>");
-    m_box->set_halign(Gtk::ALIGN_START);
-    m_box->pack_start(*m_lbl);
-
-    m_ev->add(*m_box);
-    add(*m_ev);
-    show_all_children();
-}
-
-ChannelListRowDMChannel::ChannelListRowDMChannel(const ChannelData *data) {
-    ID = data->ID;
-    m_ev = Gtk::manage(new Gtk::EventBox);
-    m_box = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL));
-    m_lbl = Gtk::manage(new Gtk::TextView);
-    MakeReadOnly(m_lbl);
-
-    AddWidgetMenuHandler(m_ev, m_menu);
-    AddWidgetMenuHandler(m_lbl, m_menu);
-
-    m_menu_copy_id = Gtk::manage(new Gtk::MenuItem("_Copy ID", true));
-    m_menu_copy_id->signal_activate().connect([this] {
-        Gtk::Clipboard::get()->set_text(std::to_string(ID));
-    });
-
-    if (data->Type == ChannelType::GROUP_DM)
-        m_menu_close = Gtk::manage(new Gtk::MenuItem("_Leave DM", true));
-    else
-        m_menu_close = Gtk::manage(new Gtk::MenuItem("_Close DM", true));
-    m_menu_close->signal_activate().connect([this] {
-        Abaddon::Get().GetDiscordClient().CloseDM(ID);
-    });
-
-    m_menu.append(*m_menu_copy_id);
-    m_menu.append(*m_menu_close);
-    m_menu.show_all();
-
-    get_style_context()->add_class("channel-row");
-    m_lbl->get_style_context()->add_class("channel-row-label");
-
-    std::optional<UserData> top_recipient; // potentially nullopt in group dm
-    const auto recipients = data->GetDMRecipients();
-    if (recipients.size() > 0)
-        top_recipient = recipients[0];
-
-    if (data->Type == ChannelType::DM) {
-        m_status = Gtk::manage(new StatusIndicator(top_recipient->ID));
-        m_status->set_margin_start(5);
-
-        m_icon = Gtk::manage(new Gtk::Image(Abaddon::Get().GetImageManager().GetPlaceholder(24)));
-        auto cb = [this](const Glib::RefPtr<Gdk::Pixbuf> &pb) {
-            m_icon->property_pixbuf() = pb->scale_simple(24, 24, Gdk::INTERP_BILINEAR);
-        };
-        Abaddon::Get().GetImageManager().LoadFromURL(top_recipient->GetAvatarURL("png", "16"), sigc::track_obj(cb, *this));
-    }
-
-    auto buf = m_lbl->get_buffer();
-    if (data->Type == ChannelType::DM)
-        buf->set_text(top_recipient->Username);
-    else if (data->Type == ChannelType::GROUP_DM)
-        buf->set_text(std::to_string(recipients.size()) + " users");
-
-    static bool show_emojis = Abaddon::Get().GetSettings().GetShowEmojis();
-    if (show_emojis)
-        Abaddon::Get().GetEmojis().ReplaceEmojis(buf, ChannelEmojiSize);
-
-    m_box->set_halign(Gtk::ALIGN_START);
-    if (m_icon != nullptr)
-        m_box->pack_start(*m_icon);
-    if (m_status != nullptr)
-        m_box->pack_start(*m_status);
-    m_box->pack_start(*m_lbl);
-    m_ev->add(*m_box);
-    add(*m_ev);
-    show_all_children();
-}
-
-ChannelListRowGuild::ChannelListRowGuild(const GuildData *data) {
-    ID = data->ID;
-    m_ev = Gtk::manage(new Gtk::EventBox);
-    m_box = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL));
-    m_lbl = Gtk::manage(new Gtk::TextView);
-    MakeReadOnly(m_lbl);
-
-    AddWidgetMenuHandler(m_ev, m_menu);
-    AddWidgetMenuHandler(m_lbl, m_menu);
-
-    m_menu_copyid = Gtk::manage(new Gtk::MenuItem("_Copy ID", true));
-    m_menu_copyid->signal_activate().connect([this]() {
-        m_signal_copy_id.emit();
-    });
-    m_menu.append(*m_menu_copyid);
-
-    m_menu_leave = Gtk::manage(new Gtk::MenuItem("_Leave Guild", true));
-    m_menu_leave->signal_activate().connect([this]() {
-        m_signal_leave.emit();
-    });
-    m_menu.append(*m_menu_leave);
-
-    m_menu_settings = Gtk::manage(new Gtk::MenuItem("Guild _Settings", true));
-    m_menu_settings->signal_activate().connect([this]() {
-        m_signal_settings.emit();
-    });
-    m_menu.append(*m_menu_settings);
-
-    m_menu.show_all();
-
-    const auto show_animations = Abaddon::Get().GetSettings().GetShowAnimations();
-    auto &img = Abaddon::Get().GetImageManager();
-    if (data->HasIcon()) {
-        if (data->HasAnimatedIcon() && show_animations) {
-            m_icon = Gtk::manage(new Gtk::Image(img.GetPlaceholder(24)));
-            auto cb = [this](const Glib::RefPtr<Gdk::PixbufAnimation> &pb) {
-                m_icon->property_pixbuf_animation() = pb;
-            };
-            img.LoadAnimationFromURL(data->GetIconURL("gif", "32"), 24, 24, sigc::track_obj(cb, *this));
-        } else {
-            m_icon = Gtk::manage(new Gtk::Image(img.GetPlaceholder(24)));
-            auto cb = [this](const Glib::RefPtr<Gdk::Pixbuf> &pb) {
-                m_icon->property_pixbuf() = pb->scale_simple(24, 24, Gdk::INTERP_BILINEAR);
-            };
-            img.LoadFromURL(data->GetIconURL("png", "32"), sigc::track_obj(cb, *this));
-        }
-    } else {
-        m_icon = Gtk::manage(new Gtk::Image(Abaddon::Get().GetImageManager().GetPlaceholder(24)));
-    }
-
-    get_style_context()->add_class("channel-row");
-    get_style_context()->add_class("channel-row-guild");
-    m_lbl->get_style_context()->add_class("channel-row-label");
-
-    auto buf = m_lbl->get_buffer();
-    Gtk::TextBuffer::iterator start, end;
-    buf->get_bounds(start, end);
-    buf->insert_markup(start, "<b>" + Glib::Markup::escape_text(data->Name) + "</b>");
-    static bool show_emojis = Abaddon::Get().GetSettings().GetShowEmojis();
-    if (show_emojis)
-        Abaddon::Get().GetEmojis().ReplaceEmojis(buf, ChannelEmojiSize);
-    m_box->set_halign(Gtk::ALIGN_START);
-    m_box->pack_start(*m_icon);
-    m_box->pack_start(*m_lbl);
-    m_ev->add(*m_box);
-    add(*m_ev);
-    show_all_children();
-}
-
-ChannelListRowGuild::type_signal_copy_id ChannelListRowGuild::signal_copy_id() {
-    return m_signal_copy_id;
-}
-
-ChannelListRowGuild::type_signal_leave ChannelListRowGuild::signal_leave() {
-    return m_signal_leave;
-}
-
-ChannelListRowGuild::type_signal_settings ChannelListRowGuild::signal_settings() {
-    return m_signal_settings;
-}
-
-ChannelListRowCategory::ChannelListRowCategory(const ChannelData *data) {
-    ID = data->ID;
-    m_ev = Gtk::manage(new Gtk::EventBox);
-    m_box = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL));
-    m_lbl = Gtk::manage(new Gtk::TextView);
-    MakeReadOnly(m_lbl);
-    m_arrow = Gtk::manage(new Gtk::Arrow(Gtk::ARROW_DOWN, Gtk::SHADOW_NONE));
-
-    m_menu_copyid = Gtk::manage(new Gtk::MenuItem("_Copy ID", true));
-    m_menu_copyid->signal_activate().connect([this]() {
-        m_signal_copy_id.emit();
-    });
-    m_menu.append(*m_menu_copyid);
-
-    m_menu.show_all();
-
-    AddWidgetMenuHandler(m_ev, m_menu);
-    AddWidgetMenuHandler(m_lbl, m_menu);
-
-    get_style_context()->add_class("channel-row");
-    get_style_context()->add_class("channel-row-category");
-    m_lbl->get_style_context()->add_class("channel-row-label");
-
-    auto buf = m_lbl->get_buffer();
-    buf->set_text(*data->Name);
-    static bool show_emojis = Abaddon::Get().GetSettings().GetShowEmojis();
-    if (show_emojis)
-        Abaddon::Get().GetEmojis().ReplaceEmojis(buf, ChannelEmojiSize);
-    m_box->set_halign(Gtk::ALIGN_START);
-    m_box->pack_start(*m_arrow);
-    m_box->pack_start(*m_lbl);
-    m_ev->add(*m_box);
-    add(*m_ev);
-    show_all_children();
-}
-
-void ChannelListRowCategory::Collapse() {
-    m_arrow->set(Gtk::ARROW_RIGHT, Gtk::SHADOW_NONE);
-}
-
-void ChannelListRowCategory::Expand() {
-    m_arrow->set(IsUserCollapsed ? Gtk::ARROW_RIGHT : Gtk::ARROW_DOWN, Gtk::SHADOW_NONE);
-}
-
-ChannelListRowCategory::type_signal_copy_id ChannelListRowCategory::signal_copy_id() {
-    return m_signal_copy_id;
-}
-
-ChannelListRowChannel::ChannelListRowChannel(const ChannelData *data) {
-    ID = data->ID;
-    m_ev = Gtk::manage(new Gtk::EventBox);
-    m_box = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL));
-    m_lbl = Gtk::manage(new Gtk::TextView);
-    MakeReadOnly(m_lbl);
-
-    m_menu_copyid = Gtk::manage(new Gtk::MenuItem("_Copy ID", true));
-    m_menu_copyid->signal_activate().connect([this]() {
-        m_signal_copy_id.emit();
-    });
-    m_menu.append(*m_menu_copyid);
-
-    m_menu.show_all();
-
-    AddWidgetMenuHandler(m_ev, m_menu);
-    AddWidgetMenuHandler(m_lbl, m_menu);
-
-    get_style_context()->add_class("channel-row");
-    get_style_context()->add_class("channel-row-channel");
-    m_lbl->get_style_context()->add_class("channel-row-label");
-
-    auto buf = m_lbl->get_buffer();
-    if (data->IsNSFW.has_value() && *data->IsNSFW) {
-        get_style_context()->add_class("nsfw");
-        m_lbl->get_style_context()->add_class("nsfw");
-    }
-    buf->set_text("#" + *data->Name);
-    static bool show_emojis = Abaddon::Get().GetSettings().GetShowEmojis();
-    if (show_emojis)
-        Abaddon::Get().GetEmojis().ReplaceEmojis(buf, ChannelEmojiSize);
-    m_box->set_halign(Gtk::ALIGN_START);
-    m_box->pack_start(*m_lbl);
-    m_ev->add(*m_box);
-    add(*m_ev);
-    show_all_children();
-}
-
-ChannelListRowChannel::type_signal_copy_id ChannelListRowChannel::signal_copy_id() {
-    return m_signal_copy_id;
-}
-
-ChannelList::ChannelList() {
-    m_main = Gtk::manage(new Gtk::ScrolledWindow);
-    m_list = Gtk::manage(new Gtk::ListBox);
-
-    m_list->get_style_context()->add_class("channel-list");
-
-    m_list->set_activate_on_single_click(true);
-    m_list->signal_row_activated().connect(sigc::mem_fun(*this, &ChannelList::on_row_activated));
-
-    m_main->add(*m_list);
-    m_main->show_all();
-
-    // maybe will regret doing it this way
-    auto &discord = Abaddon::Get().GetDiscordClient();
-    auto cb = [this, &discord](const Message &message) {
-        const auto channel = discord.GetChannel(message.ChannelID);
-        if (!channel.has_value()) return;
-        if (channel->Type == ChannelType::DM || channel->Type == ChannelType::GROUP_DM)
-            CheckBumpDM(message.ChannelID);
-    };
-    discord.signal_message_create().connect(sigc::track_obj(cb, *this));
-}
-
-Gtk::Widget *ChannelList::GetRoot() const {
-    return m_main;
-}
-
-void ChannelList::UpdateNewGuild(Snowflake id) {
-    auto sort = Abaddon::Get().GetDiscordClient().GetUserSortedGuilds();
-    if (sort.size() == 1) {
-        UpdateListing();
-        return;
-    }
-
-    const auto insert_at = [this, id](int listpos) {
-        InsertGuildAt(id, listpos);
-    };
-
-    auto it = std::find(sort.begin(), sort.end(), id);
-    if (it == sort.end()) return;
-    // if the new guild pos is at the end use -1
-    if (it + 1 == sort.end()) {
-        insert_at(-1);
-        return;
-    }
-    // find the position of the guild below it into the listbox
-    auto below_id = *(it + 1);
-    auto below_it = m_id_to_row.find(below_id);
-    if (below_it == m_id_to_row.end()) {
-        UpdateListing();
-        return;
-    }
-    auto below_pos = below_it->second->get_index();
-    // stick it just above
-    insert_at(below_pos - 1);
-}
-
-void ChannelList::UpdateRemoveGuild(Snowflake id) {
-    auto it = m_guild_id_to_row.find(id);
-    if (it == m_guild_id_to_row.end()) return;
-    auto row = dynamic_cast<ChannelListRow *>(it->second);
-    if (row == nullptr) return;
-    DeleteRow(row);
-}
-
-void ChannelList::UpdateRemoveChannel(Snowflake id) {
-    auto it = m_id_to_row.find(id);
-    if (it == m_id_to_row.end()) return;
-    auto row = dynamic_cast<ChannelListRow *>(it->second);
-    if (row == nullptr) return;
-    DeleteRow(row);
-}
-
-// this is total shit
-void ChannelList::UpdateChannelCategory(Snowflake id) {
-    const auto data = Abaddon::Get().GetDiscordClient().GetChannel(id);
-    const auto guild = Abaddon::Get().GetDiscordClient().GetGuild(*data->GuildID);
-    auto git = m_guild_id_to_row.find(*data->GuildID);
-    if (git == m_guild_id_to_row.end()) return;
-    auto *guild_row = git->second;
-    if (!data.has_value() || !guild.has_value()) return;
-    auto it = m_id_to_row.find(id);
-    if (it == m_id_to_row.end()) return;
-    auto row = dynamic_cast<ChannelListRowCategory *>(it->second);
-    if (row == nullptr) return;
-    const bool old_collapsed = row->IsUserCollapsed;
-    const bool visible = row->is_visible();
-    std::map<int, Snowflake> child_rows;
-    for (auto child : row->Children) {
-        child_rows[child->get_index()] = child->ID;
-    }
-    guild_row->Children.erase(row);
-    DeleteRow(row);
-
-    int pos = guild_row->get_index();
-    const auto sorted = guild->GetSortedChannels(id);
-    const auto sorted_it = std::find(sorted.begin(), sorted.end(), id);
-    if (sorted_it == sorted.end()) return;
-    if (std::next(sorted_it) == sorted.end()) {
-        const auto x = m_id_to_row.find(*std::prev(sorted_it));
-        if (x != m_id_to_row.end())
-            pos = x->second->get_index() + 1;
-    } else {
-        const auto x = m_id_to_row.find(*std::next(sorted_it));
-        if (x != m_id_to_row.end())
-            pos = x->second->get_index();
-    }
-
-    auto *new_row = Gtk::manage(new ChannelListRowCategory(&*data));
-    new_row->IsUserCollapsed = old_collapsed;
-    if (visible)
-        new_row->show();
-    m_id_to_row[id] = new_row;
-    new_row->signal_copy_id().connect(sigc::bind(sigc::mem_fun(*this, &ChannelList::OnMenuCopyID), new_row->ID));
-    new_row->Parent = guild_row;
-    guild_row->Children.insert(new_row);
-    m_list->insert(*new_row, pos);
-    int i = 1;
-    for (const auto &[idx, child_id] : child_rows) {
-        const auto channel = Abaddon::Get().GetDiscordClient().GetChannel(child_id);
-        if (channel.has_value()) {
-            auto *new_child = Gtk::manage(new ChannelListRowChannel(&*channel));
-            new_row->Children.insert(new_child);
-            new_child->Parent = new_row;
-            new_child->signal_copy_id().connect(sigc::bind(sigc::mem_fun(*this, &ChannelList::OnMenuCopyID), new_child->ID));
-            m_id_to_row[child_id] = new_child;
-            if (visible && !new_row->IsUserCollapsed)
-                new_child->show();
-            m_list->insert(*new_child, pos + i++);
-        }
-    }
-}
-
-// so is this
-void ChannelList::UpdateChannel(Snowflake id) {
-    const auto data = Abaddon::Get().GetDiscordClient().GetChannel(id);
-    const auto guild = Abaddon::Get().GetDiscordClient().GetGuild(*data->GuildID);
-    const auto *guild_row = m_guild_id_to_row.at(*data->GuildID);
-    if (data->Type == ChannelType::GUILD_CATEGORY) {
-        UpdateChannelCategory(id);
-        return;
-    }
-
-    auto it = m_id_to_row.find(id);
-    if (it == m_id_to_row.end()) return; // stuff like voice doesnt have a row yet
-    auto row = dynamic_cast<ChannelListRowChannel *>(it->second);
-    const bool old_collapsed = row->IsUserCollapsed;
-    const bool old_visible = row->is_visible();
-    DeleteRow(row);
-
-    int pos = guild_row->get_index() + 1; // fallback
-    const auto sorted = guild->GetSortedChannels();
-    const auto sorted_it = std::find(sorted.begin(), sorted.end(), id);
-    if (sorted_it + 1 == sorted.end()) {
-        const auto x = m_id_to_row.find(*std::prev(sorted_it));
-        if (x != m_id_to_row.end())
-            pos = x->second->get_index() + 1;
-    } else {
-        const auto x = m_id_to_row.find(*std::next(sorted_it));
-        if (x != m_id_to_row.end())
-            pos = x->second->get_index();
-    }
-
-    auto *new_row = Gtk::manage(new ChannelListRowChannel(&*data));
-    new_row->IsUserCollapsed = old_collapsed;
-    m_id_to_row[id] = new_row;
-    if (data->ParentID.has_value()) {
-        new_row->Parent = m_id_to_row.at(*data->ParentID);
-    } else {
-        new_row->Parent = m_guild_id_to_row.at(*data->GuildID);
-    }
-    new_row->Parent->Children.insert(new_row);
-    if (new_row->Parent->is_visible() && !new_row->Parent->IsUserCollapsed)
-        new_row->show();
-    new_row->signal_copy_id().connect(sigc::bind(sigc::mem_fun(*this, &ChannelList::OnMenuCopyID), new_row->ID));
-    m_list->insert(*new_row, pos);
-}
-
-void ChannelList::UpdateCreateDMChannel(Snowflake id) {
-    const auto chan = Abaddon::Get().GetDiscordClient().GetChannel(id);
-    auto *dm_row = Gtk::manage(new ChannelListRowDMChannel(&*chan));
-    dm_row->IsUserCollapsed = false;
-    m_list->insert(*dm_row, m_dm_header_row->get_index() + 1);
-    m_dm_header_row->Children.insert(dm_row);
-    m_id_to_row[id] = dm_row;
-    if (!m_dm_header_row->IsUserCollapsed)
-        dm_row->show();
-}
-
-void ChannelList::UpdateCreateChannel(Snowflake id) {
-    const auto &discord = Abaddon::Get().GetDiscordClient();
-    const auto data = discord.GetChannel(id);
-    if (data->Type == ChannelType::DM || data->Type == ChannelType::GROUP_DM) {
-        UpdateCreateDMChannel(id);
-        return;
-    }
-    const auto guild = discord.GetGuild(*data->GuildID);
-    auto *guild_row = m_guild_id_to_row.at(*data->GuildID);
-
-    int pos = guild_row->get_index() + 1;
-    const auto sorted = guild->GetSortedChannels();
-    const auto sorted_it = std::find(sorted.begin(), sorted.end(), id);
-    if (sorted_it + 1 == sorted.end()) {
-        const auto x = m_id_to_row.find(*std::prev(sorted_it));
-        if (x != m_id_to_row.end())
-            pos = x->second->get_index() + 1;
-    } else {
-        const auto x = m_id_to_row.find(*std::next(sorted_it));
-        if (x != m_id_to_row.end())
-            pos = x->second->get_index();
-    }
-
-    ChannelListRow *row;
-    if (data->Type == ChannelType::GUILD_TEXT || data->Type == ChannelType::GUILD_NEWS) {
-        auto *tmp = Gtk::manage(new ChannelListRowChannel(&*data));
-        tmp->signal_copy_id().connect(sigc::bind(sigc::mem_fun(*this, &ChannelList::OnMenuCopyID), tmp->ID));
-        row = tmp;
-    } else if (data->Type == ChannelType::GUILD_CATEGORY) {
-        auto *tmp = Gtk::manage(new ChannelListRowCategory(&*data));
-        tmp->signal_copy_id().connect(sigc::bind(sigc::mem_fun(*this, &ChannelList::OnMenuCopyID), tmp->ID));
-        row = tmp;
-    } else
-        return;
-    row->IsUserCollapsed = false;
-    if (!guild_row->IsUserCollapsed)
-        row->show();
-    row->Parent = guild_row;
-    guild_row->Children.insert(row);
-    m_id_to_row[id] = row;
-    m_list->insert(*row, pos);
-}
-
-void ChannelList::UpdateGuild(Snowflake id) {
-    // the only thing changed is the row containing the guild item so just recreate it
-    const auto data = Abaddon::Get().GetDiscordClient().GetGuild(id);
-    if (!data.has_value()) return;
-    auto it = m_guild_id_to_row.find(id);
-    if (it == m_guild_id_to_row.end()) return;
-    auto *row = dynamic_cast<ChannelListRowGuild *>(it->second);
-    const auto children = row->Children;
-    const auto index = row->get_index();
-    const bool old_collapsed = row->IsUserCollapsed;
-    const bool old_gindex = row->GuildIndex;
-    delete row;
-    auto *new_row = Gtk::manage(new ChannelListRowGuild(&*data));
-    new_row->IsUserCollapsed = old_collapsed;
-    new_row->GuildIndex = old_gindex;
-    m_guild_id_to_row[new_row->ID] = new_row;
-    new_row->signal_leave().connect(sigc::bind(sigc::mem_fun(*this, &ChannelList::OnGuildMenuLeave), new_row->ID));
-    new_row->signal_copy_id().connect(sigc::bind(sigc::mem_fun(*this, &ChannelList::OnMenuCopyID), new_row->ID));
-    new_row->signal_settings().connect(sigc::bind(sigc::mem_fun(*this, &ChannelList::OnGuildMenuSettings), new_row->ID));
-    new_row->Children = children;
-    for (auto child : children)
-        child->Parent = new_row;
-    new_row->show_all();
-    m_list->insert(*new_row, index);
-}
-
-void ChannelList::SetActiveChannel(Snowflake id) {
-    auto it = m_id_to_row.find(id);
-    if (it == m_id_to_row.end()) return;
-    m_list->select_row(*it->second);
-}
-
-void ChannelList::CollapseRow(ChannelListRow *row) {
-    row->Collapse();
-    for (auto child : row->Children) {
-        child->hide();
-        CollapseRow(child);
-    }
-}
-
-void ChannelList::ExpandRow(ChannelListRow *row) {
-    row->Expand();
-    row->show();
-    if (!row->IsUserCollapsed)
-        for (auto child : row->Children)
-            ExpandRow(child);
-}
-
-void ChannelList::DeleteRow(ChannelListRow *row) {
-    for (auto child : row->Children)
-        DeleteRow(child);
-    if (row->Parent != nullptr)
-        row->Parent->Children.erase(row);
-    else
-        printf("row has no parent!\n");
-    if (dynamic_cast<ChannelListRowGuild *>(row) != nullptr)
-        m_guild_id_to_row.erase(row->ID);
-    else
-        m_id_to_row.erase(row->ID);
-    delete row;
-}
-
-void ChannelList::on_row_activated(Gtk::ListBoxRow *tmprow) {
-    auto row = dynamic_cast<ChannelListRow *>(tmprow);
-    if (row == nullptr) return;
-    bool new_collapsed = !row->IsUserCollapsed;
-    row->IsUserCollapsed = new_collapsed;
-
-    // kinda ugly
-    if (dynamic_cast<ChannelListRowChannel *>(row) != nullptr || dynamic_cast<ChannelListRowDMChannel *>(row) != nullptr)
-        m_signal_action_channel_item_select.emit(row->ID);
-
-    if (new_collapsed)
-        CollapseRow(row);
-    else
-        ExpandRow(row);
-}
-
-void ChannelList::InsertGuildAt(Snowflake id, int pos) {
-    const auto insert_and_adjust = [&](Gtk::Widget &widget) {
-        m_list->insert(widget, pos);
-        if (pos != -1) pos++;
-    };
-
-    const auto &discord = Abaddon::Get().GetDiscordClient();
-    const auto guild_data = discord.GetGuild(id);
-    if (!guild_data.has_value()) return;
-
-    std::map<int, ChannelData> orphan_channels;
-    std::unordered_map<Snowflake, std::vector<ChannelData>> cat_to_channels;
-    if (guild_data->Channels.has_value())
-        for (const auto &dc : *guild_data->Channels) {
-            const auto channel = discord.GetChannel(dc.ID);
-            if (!channel.has_value()) continue;
-            if (channel->Type != ChannelType::GUILD_TEXT && channel->Type != ChannelType::GUILD_NEWS) continue;
-
-            if (channel->ParentID.has_value())
-                cat_to_channels[*channel->ParentID].push_back(*channel);
-            else
-                orphan_channels[*channel->Position] = *channel;
-        }
-
-    auto *guild_row = Gtk::manage(new ChannelListRowGuild(&*guild_data));
-    guild_row->show_all();
-    guild_row->IsUserCollapsed = true;
-    guild_row->GuildIndex = m_guild_count++;
-    insert_and_adjust(*guild_row);
-    m_guild_id_to_row[guild_row->ID] = guild_row;
-    guild_row->signal_leave().connect(sigc::bind(sigc::mem_fun(*this, &ChannelList::OnGuildMenuLeave), guild_row->ID));
-    guild_row->signal_copy_id().connect(sigc::bind(sigc::mem_fun(*this, &ChannelList::OnMenuCopyID), guild_row->ID));
-    guild_row->signal_settings().connect(sigc::bind(sigc::mem_fun(*this, &ChannelList::OnGuildMenuSettings), guild_row->ID));
-
-    // add channels with no parent category
-    for (const auto &[pos, channel] : orphan_channels) {
-        auto *chan_row = Gtk::manage(new ChannelListRowChannel(&channel));
-        chan_row->IsUserCollapsed = false;
-        chan_row->signal_copy_id().connect(sigc::bind(sigc::mem_fun(*this, &ChannelList::OnMenuCopyID), chan_row->ID));
-        insert_and_adjust(*chan_row);
-        guild_row->Children.insert(chan_row);
-        chan_row->Parent = guild_row;
-        m_id_to_row[chan_row->ID] = chan_row;
-    }
-
-    // categories
-    std::map<int, std::vector<ChannelData>> sorted_categories;
-    if (guild_data->Channels.has_value())
-        for (const auto &dc : *guild_data->Channels) {
-            const auto channel = discord.GetChannel(dc.ID);
-            if (!channel.has_value()) continue;
-            if (channel->Type == ChannelType::GUILD_CATEGORY)
-                sorted_categories[*channel->Position].push_back(*channel);
-        }
-
-    for (auto &[pos, catvec] : sorted_categories) {
-        std::sort(catvec.begin(), catvec.end(), [](const ChannelData &a, const ChannelData &b) { return a.ID < b.ID; });
-        for (const auto cat : catvec) {
-            auto *cat_row = Gtk::manage(new ChannelListRowCategory(&cat));
-            cat_row->IsUserCollapsed = false;
-            cat_row->signal_copy_id().connect(sigc::bind(sigc::mem_fun(*this, &ChannelList::OnMenuCopyID), cat_row->ID));
-            insert_and_adjust(*cat_row);
-            guild_row->Children.insert(cat_row);
-            cat_row->Parent = guild_row;
-            m_id_to_row[cat_row->ID] = cat_row;
-
-            // child channels
-            if (cat_to_channels.find(cat.ID) == cat_to_channels.end()) continue;
-            std::map<int, ChannelData> sorted_channels;
-
-            for (const auto channel : cat_to_channels.at(cat.ID))
-                sorted_channels[*channel.Position] = channel;
-
-            for (const auto &[pos, channel] : sorted_channels) {
-                auto *chan_row = Gtk::manage(new ChannelListRowChannel(&channel));
-                chan_row->IsUserCollapsed = false;
-                chan_row->signal_copy_id().connect(sigc::bind(sigc::mem_fun(*this, &ChannelList::OnMenuCopyID), chan_row->ID));
-                insert_and_adjust(*chan_row);
-                cat_row->Children.insert(chan_row);
-                chan_row->Parent = cat_row;
-                m_id_to_row[chan_row->ID] = chan_row;
-            }
-        }
-    }
-}
-
-void ChannelList::AddPrivateChannels() {
-    const auto &discord = Abaddon::Get().GetDiscordClient();
-    auto dms_ = discord.GetPrivateChannels();
-    std::vector<ChannelData> dms;
-    for (const auto &x : dms_) {
-        const auto chan = discord.GetChannel(x);
-        dms.push_back(*chan);
-    }
-    std::sort(dms.begin(), dms.end(), [&](const ChannelData &a, const ChannelData &b) -> bool {
-        return a.LastMessageID > b.LastMessageID;
-    });
-
-    m_dm_header_row = Gtk::manage(new ChannelListRowDMHeader);
-    m_dm_header_row->show_all();
-    m_dm_header_row->IsUserCollapsed = true;
-    m_list->add(*m_dm_header_row);
-
-    for (const auto &dm : dms) {
-        auto *dm_row = Gtk::manage(new ChannelListRowDMChannel(&dm));
-        dm_row->Parent = m_dm_header_row;
-        m_id_to_row[dm.ID] = dm_row;
-        dm_row->IsUserCollapsed = false;
-        m_list->add(*dm_row);
-        m_dm_header_row->Children.insert(dm_row);
-    }
-}
-
-void ChannelList::UpdateListing() {
-    std::unordered_set<Snowflake> guilds = Abaddon::Get().GetDiscordClient().GetGuilds();
-
-    auto children = m_list->get_children();
-    auto it = children.begin();
-
-    while (it != children.end()) {
-        delete *it;
-        it++;
-    }
-
-    m_id_to_row.clear();
-
-    m_guild_count = 0;
-
-    AddPrivateChannels();
-
-    auto sorted_guilds = Abaddon::Get().GetDiscordClient().GetUserSortedGuilds();
-    for (auto gid : sorted_guilds) {
-        InsertGuildAt(gid, -1);
-    }
-}
-
-void ChannelList::OnMenuCopyID(Snowflake id) {
-    Gtk::Clipboard::get()->set_text(std::to_string(id));
-}
-
-void ChannelList::OnGuildMenuLeave(Snowflake id) {
-    m_signal_action_guild_leave.emit(id);
-}
-
-void ChannelList::OnGuildMenuSettings(Snowflake id) {
-    m_signal_action_guild_settings.emit(id);
-}
-
-void ChannelList::CheckBumpDM(Snowflake channel_id) {
-    auto it = m_id_to_row.find(channel_id);
-    if (it == m_id_to_row.end()) return;
-    auto *row = it->second;
-    const auto index = row->get_index();
-    if (index == 1) return; // 1 is top of dm list
-    const bool selected = row->is_selected();
-    row->Parent->Children.erase(row);
-    delete row;
-    const auto chan = Abaddon::Get().GetDiscordClient().GetChannel(channel_id);
-    auto *dm_row = Gtk::manage(new ChannelListRowDMChannel(&*chan));
-    dm_row->Parent = m_dm_header_row;
-    m_dm_header_row->Children.insert(dm_row);
-    m_id_to_row[channel_id] = dm_row;
-    dm_row->IsUserCollapsed = false;
-    m_list->insert(*dm_row, 1);
-    m_dm_header_row->Children.insert(dm_row);
-    if (selected)
-        m_list->select_row(*dm_row);
-    if (m_dm_header_row->is_visible() && !m_dm_header_row->IsUserCollapsed)
-        dm_row->show();
-}
-
-ChannelList::type_signal_action_channel_item_select ChannelList::signal_action_channel_item_select() {
-    return m_signal_action_channel_item_select;
-}
-
-ChannelList::type_signal_action_guild_leave ChannelList::signal_action_guild_leave() {
-    return m_signal_action_guild_leave;
-}
-
-ChannelList::type_signal_action_guild_settings ChannelList::signal_action_guild_settings() {
-    return m_signal_action_guild_settings;
-}

components/channels.hpp

@@ -1,191 +0,0 @@
-#pragma once
-#include <gtkmm.h>
-#include <string>
-#include <queue>
-#include <mutex>
-#include <unordered_set>
-#include <unordered_map>
-#include <sigc++/sigc++.h>
-#include "../discord/discord.hpp"
-
-static const constexpr int ChannelEmojiSize = 16;
-
-class ChannelListRow : public Gtk::ListBoxRow {
-public:
-    bool IsUserCollapsed;
-    Snowflake ID;
-    std::unordered_set<ChannelListRow *> Children;
-    ChannelListRow *Parent = nullptr;
-
-    virtual void Collapse();
-    virtual void Expand();
-
-    static void MakeReadOnly(Gtk::TextView *tv);
-};
-
-class ChannelListRowDMHeader : public ChannelListRow {
-public:
-    ChannelListRowDMHeader();
-
-protected:
-    Gtk::EventBox *m_ev;
-    Gtk::Box *m_box;
-    Gtk::Label *m_lbl;
-};
-
-class StatusIndicator;
-class ChannelListRowDMChannel : public ChannelListRow {
-public:
-    ChannelListRowDMChannel(const ChannelData *data);
-
-protected:
-    Gtk::EventBox *m_ev;
-    Gtk::Box *m_box;
-    StatusIndicator *m_status = nullptr;
-    Gtk::TextView *m_lbl;
-    Gtk::Image *m_icon = nullptr;
-
-    Gtk::Menu m_menu;
-    Gtk::MenuItem *m_menu_close; // leave if group
-    Gtk::MenuItem *m_menu_copy_id;
-};
-
-class ChannelListRowGuild : public ChannelListRow {
-public:
-    ChannelListRowGuild(const GuildData *data);
-
-    int GuildIndex;
-
-protected:
-    Gtk::EventBox *m_ev;
-    Gtk::Box *m_box;
-    Gtk::TextView *m_lbl;
-    Gtk::Image *m_icon;
-
-    Gtk::Menu m_menu;
-    Gtk::MenuItem *m_menu_copyid;
-    Gtk::MenuItem *m_menu_leave;
-    Gtk::MenuItem *m_menu_settings;
-
-private:
-    typedef sigc::signal<void> type_signal_copy_id;
-    typedef sigc::signal<void> type_signal_leave;
-    typedef sigc::signal<void> type_signal_settings;
-
-    type_signal_copy_id m_signal_copy_id;
-    type_signal_leave m_signal_leave;
-    type_signal_settings m_signal_settings;
-
-public:
-    type_signal_copy_id signal_copy_id();
-    type_signal_leave signal_leave();
-    type_signal_settings signal_settings();
-};
-
-class ChannelListRowCategory : public ChannelListRow {
-public:
-    ChannelListRowCategory(const ChannelData *data);
-
-    virtual void Collapse();
-    virtual void Expand();
-
-protected:
-    Gtk::EventBox *m_ev;
-    Gtk::Box *m_box;
-    Gtk::TextView *m_lbl;
-    Gtk::Arrow *m_arrow;
-
-    Gtk::Menu m_menu;
-    Gtk::MenuItem *m_menu_copyid;
-
-private:
-    typedef sigc::signal<void> type_signal_copy_id;
-
-    type_signal_copy_id m_signal_copy_id;
-
-public:
-    type_signal_copy_id signal_copy_id();
-};
-
-class ChannelListRowChannel : public ChannelListRow {
-public:
-    ChannelListRowChannel(const ChannelData *data);
-
-protected:
-    Gtk::EventBox *m_ev;
-    Gtk::Box *m_box;
-    Gtk::TextView *m_lbl;
-
-    Gtk::Menu m_menu;
-    Gtk::MenuItem *m_menu_copyid;
-
-private:
-    typedef sigc::signal<void> type_signal_copy_id;
-
-    type_signal_copy_id m_signal_copy_id;
-
-public:
-    type_signal_copy_id signal_copy_id();
-};
-
-class ChannelList {
-public:
-    ChannelList();
-    Gtk::Widget *GetRoot() const;
-    void UpdateListing();
-    void UpdateNewGuild(Snowflake id);
-    void UpdateRemoveGuild(Snowflake id);
-    void UpdateRemoveChannel(Snowflake id);
-    void UpdateChannel(Snowflake id);
-    void UpdateCreateDMChannel(Snowflake id);
-    void UpdateCreateChannel(Snowflake id);
-    void UpdateGuild(Snowflake id);
-
-    void SetActiveChannel(Snowflake id);
-
-protected:
-    Gtk::ListBox *m_list;
-    Gtk::ScrolledWindow *m_main;
-
-    ChannelListRowDMHeader *m_dm_header_row = nullptr;
-
-    void CollapseRow(ChannelListRow *row);
-    void ExpandRow(ChannelListRow *row);
-    void DeleteRow(ChannelListRow *row);
-
-    void UpdateChannelCategory(Snowflake id);
-
-    void on_row_activated(Gtk::ListBoxRow *row);
-
-    int m_guild_count;
-    void OnMenuCopyID(Snowflake id);
-    void OnGuildMenuLeave(Snowflake id);
-    void OnGuildMenuSettings(Snowflake id);
-
-    Gtk::Menu m_channel_menu;
-    Gtk::MenuItem *m_channel_menu_copyid;
-
-    // i would use one map but in really old guilds there can be a channel w/ same id as the guild so this hacky shit has to do
-    std::unordered_map<Snowflake, ChannelListRow *> m_guild_id_to_row;
-    std::unordered_map<Snowflake, ChannelListRow *> m_id_to_row;
-
-    void InsertGuildAt(Snowflake id, int pos);
-
-    void AddPrivateChannels();
-
-    void CheckBumpDM(Snowflake channel_id);
-
-public:
-    typedef sigc::signal<void, Snowflake> type_signal_action_channel_item_select;
-    typedef sigc::signal<void, Snowflake> type_signal_action_guild_leave;
-    typedef sigc::signal<void, Snowflake> type_signal_action_guild_settings;
-
-    type_signal_action_channel_item_select signal_action_channel_item_select();
-    type_signal_action_guild_leave signal_action_guild_leave();
-    type_signal_action_guild_settings signal_action_guild_settings();
-
-protected:
-    type_signal_action_channel_item_select m_signal_action_channel_item_select;
-    type_signal_action_guild_leave m_signal_action_guild_leave;
-    type_signal_action_guild_settings m_signal_action_guild_settings;
-};

components/chatwindow.cpp

@@ -1,411 +0,0 @@
-#include "chatwindow.hpp"
-#include "chatmessage.hpp"
-#include "../abaddon.hpp"
-#include "chatinputindicator.hpp"
-#include "ratelimitindicator.hpp"
-#include "chatinput.hpp"
-
-constexpr static uint64_t SnowflakeSplitDifference = 600;
-
-ChatWindow::ChatWindow() {
-    Abaddon::Get().GetDiscordClient().signal_message_send_fail().connect(sigc::mem_fun(*this, &ChatWindow::OnMessageSendFail));
-
-    m_main = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
-    m_list = Gtk::manage(new Gtk::ListBox);
-    m_scroll = Gtk::manage(new Gtk::ScrolledWindow);
-    m_input = Gtk::manage(new ChatInput);
-    m_input_indicator = Gtk::manage(new ChatInputIndicator);
-    m_rate_limit_indicator = Gtk::manage(new RateLimitIndicator);
-    m_meta = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL));
-
-    m_rate_limit_indicator->set_margin_end(5);
-    m_rate_limit_indicator->set_hexpand(true);
-    m_rate_limit_indicator->set_halign(Gtk::ALIGN_END);
-    m_rate_limit_indicator->set_valign(Gtk::ALIGN_END);
-    m_rate_limit_indicator->show();
-
-    m_input_indicator->set_halign(Gtk::ALIGN_START);
-    m_input_indicator->set_valign(Gtk::ALIGN_END);
-    m_input_indicator->show();
-
-    m_main->get_style_context()->add_class("messages");
-    m_list->get_style_context()->add_class("messages");
-
-    m_main->set_hexpand(true);
-    m_main->set_vexpand(true);
-
-    m_scroll->signal_edge_reached().connect(sigc::mem_fun(*this, &ChatWindow::OnScrollEdgeOvershot));
-
-    auto v = m_scroll->get_vadjustment();
-    v->signal_value_changed().connect([this, v] {
-        m_should_scroll_to_bottom = v->get_upper() - v->get_page_size() <= v->get_value();
-    });
-
-    m_scroll->set_can_focus(false);
-    m_scroll->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS);
-    m_scroll->show();
-
-    m_list->signal_size_allocate().connect([this](Gtk::Allocation &) {
-        if (m_should_scroll_to_bottom)
-            ScrollToBottom();
-    });
-
-    m_list->set_selection_mode(Gtk::SELECTION_NONE);
-    m_list->set_hexpand(true);
-    m_list->set_vexpand(true);
-    m_list->set_focus_hadjustment(m_scroll->get_hadjustment());
-    m_list->set_focus_vadjustment(m_scroll->get_vadjustment());
-    m_list->show();
-
-    m_input->signal_submit().connect(sigc::mem_fun(*this, &ChatWindow::OnInputSubmit));
-    m_input->signal_escape().connect([this]() {
-        if (m_is_replying)
-            StopReplying();
-    });
-    m_input->signal_key_press_event().connect(sigc::mem_fun(*this, &ChatWindow::OnKeyPressEvent), false);
-    m_input->show();
-
-    m_completer.SetBuffer(m_input->GetBuffer());
-    m_completer.SetGetChannelID([this]() -> auto {
-        return m_active_channel;
-    });
-
-    m_completer.SetGetRecentAuthors([this]() -> auto {
-        const auto &discord = Abaddon::Get().GetDiscordClient();
-        std::vector<Snowflake> ret;
-
-        std::map<Snowflake, Gtk::Widget *> ordered(m_id_to_widget.begin(), m_id_to_widget.end());
-
-        for (auto it = ordered.crbegin(); it != ordered.crend(); it++) {
-            const auto *widget = dynamic_cast<ChatMessageItemContainer *>(it->second);
-            if (widget == nullptr) continue;
-            const auto msg = discord.GetMessage(widget->ID);
-            if (!msg.has_value()) continue;
-            if (std::find(ret.begin(), ret.end(), msg->Author.ID) == ret.end())
-                ret.push_back(msg->Author.ID);
-        }
-
-        const auto chan = discord.GetChannel(m_active_channel);
-        if (chan->GuildID.has_value()) {
-            const auto others = discord.GetUsersInGuild(*chan->GuildID);
-            for (const auto id : others)
-                if (std::find(ret.begin(), ret.end(), id) == ret.end())
-                    ret.push_back(id);
-        }
-
-        return ret;
-    });
-
-    m_completer.show();
-
-    m_meta->set_hexpand(true);
-    m_meta->set_halign(Gtk::ALIGN_FILL);
-    m_meta->show();
-
-    m_meta->add(*m_input_indicator);
-    m_meta->add(*m_rate_limit_indicator);
-    m_scroll->add(*m_list);
-    m_main->add(*m_scroll);
-    m_main->add(m_completer);
-    m_main->add(*m_input);
-    m_main->add(*m_meta);
-    m_main->show();
-}
-
-Gtk::Widget *ChatWindow::GetRoot() const {
-    return m_main;
-}
-
-void ChatWindow::Clear() {
-    SetMessages(std::set<Snowflake>());
-}
-
-void ChatWindow::SetMessages(const std::set<Snowflake> &msgs) {
-    // empty the listbox
-    auto children = m_list->get_children();
-    auto it = children.begin();
-    while (it != children.end()) {
-        delete *it;
-        it++;
-    }
-
-    m_num_rows = 0;
-    m_num_messages = 0;
-    m_id_to_widget.clear();
-
-    for (const auto &id : msgs) {
-        ProcessNewMessage(id, false);
-    }
-}
-
-void ChatWindow::SetActiveChannel(Snowflake id) {
-    m_active_channel = id;
-    m_input_indicator->SetActiveChannel(id);
-    m_rate_limit_indicator->SetActiveChannel(id);
-    if (m_is_replying)
-        StopReplying();
-}
-
-void ChatWindow::AddNewMessage(Snowflake id) {
-    ProcessNewMessage(id, false);
-}
-
-void ChatWindow::DeleteMessage(Snowflake id) {
-    auto widget = m_id_to_widget.find(id);
-    if (widget == m_id_to_widget.end()) return;
-
-    auto *x = dynamic_cast<ChatMessageItemContainer *>(widget->second);
-    if (x != nullptr)
-        x->UpdateAttributes();
-}
-
-void ChatWindow::UpdateMessage(Snowflake id) {
-    auto widget = m_id_to_widget.find(id);
-    if (widget == m_id_to_widget.end()) return;
-
-    auto *x = dynamic_cast<ChatMessageItemContainer *>(widget->second);
-    if (x != nullptr) {
-        x->UpdateContent();
-        x->UpdateAttributes();
-    }
-}
-
-void ChatWindow::AddNewHistory(const std::vector<Snowflake> &id) {
-    std::set<Snowflake> ids(id.begin(), id.end());
-    for (auto it = ids.rbegin(); it != ids.rend(); it++)
-        ProcessNewMessage(*it, true);
-}
-
-void ChatWindow::InsertChatInput(std::string text) {
-    m_input->InsertText(text);
-}
-
-Snowflake ChatWindow::GetOldestListedMessage() {
-    return m_id_to_widget.begin()->first;
-}
-
-void ChatWindow::UpdateReactions(Snowflake id) {
-    auto it = m_id_to_widget.find(id);
-    if (it == m_id_to_widget.end()) return;
-    auto *widget = dynamic_cast<ChatMessageItemContainer *>(it->second);
-    if (widget == nullptr) return;
-    widget->UpdateReactions();
-}
-
-Snowflake ChatWindow::GetActiveChannel() const {
-    return m_active_channel;
-}
-
-bool ChatWindow::OnInputSubmit(const Glib::ustring &text) {
-    if (!m_rate_limit_indicator->CanSpeak())
-        return false;
-
-    if (m_active_channel.IsValid())
-        m_signal_action_chat_submit.emit(text, m_active_channel, m_replying_to); // m_replying_to is checked for invalid in the handler
-    if (m_is_replying)
-        StopReplying();
-
-    return true;
-}
-
-bool ChatWindow::OnKeyPressEvent(GdkEventKey *e) {
-    if (m_completer.ProcessKeyPress(e))
-        return true;
-
-    if (m_input->ProcessKeyPress(e))
-        return true;
-
-    return false;
-}
-
-ChatMessageItemContainer *ChatWindow::CreateMessageComponent(Snowflake id) {
-    auto *container = ChatMessageItemContainer::FromMessage(id);
-    return container;
-}
-
-void ChatWindow::RemoveMessageAndHeader(Gtk::Widget *widget) {
-    ChatMessageHeader *header = dynamic_cast<ChatMessageHeader *>(widget->get_ancestor(Gtk::ListBoxRow::get_type()));
-    if (header != nullptr) {
-        if (header->GetChildContent().size() == 1) {
-            m_num_rows--;
-            delete header;
-        } else
-            delete widget;
-    } else
-        delete widget;
-    m_num_messages--;
-}
-
-constexpr static int MaxMessagesForCull = 50; // this has to be 50 cuz that magic number is used in a couple other places and i dont feel like replacing them
-void ChatWindow::ProcessNewMessage(Snowflake id, bool prepend) {
-    const auto &client = Abaddon::Get().GetDiscordClient();
-    if (!client.IsStarted()) return; // e.g. load channel and then dc
-    const auto data = client.GetMessage(id);
-    if (!data.has_value()) return;
-
-    if (!data->IsPending && data->Nonce.has_value() && data->Author.ID == client.GetUserData().ID) {
-        for (auto [id, widget] : m_id_to_widget) {
-            if (dynamic_cast<ChatMessageItemContainer *>(widget)->Nonce == *data->Nonce) {
-                RemoveMessageAndHeader(widget);
-                m_id_to_widget.erase(id);
-                break;
-            }
-        }
-    }
-
-    ChatMessageHeader *last_row = nullptr;
-    bool should_attach = false;
-    if (m_num_rows > 0) {
-        if (prepend)
-            last_row = dynamic_cast<ChatMessageHeader *>(m_list->get_row_at_index(0));
-        else
-            last_row = dynamic_cast<ChatMessageHeader *>(m_list->get_row_at_index(m_num_rows - 1));
-
-        if (last_row != nullptr) {
-            const uint64_t diff = std::max(id, last_row->NewestID) - std::min(id, last_row->NewestID);
-            if (last_row->UserID == data->Author.ID && (prepend || (diff < SnowflakeSplitDifference * Snowflake::SecondsInterval)))
-                should_attach = true;
-        }
-    }
-
-    m_num_messages++;
-
-    if (m_should_scroll_to_bottom && !prepend)
-        while (m_num_messages > MaxMessagesForCull) {
-            auto first_it = m_id_to_widget.begin();
-            RemoveMessageAndHeader(first_it->second);
-            m_id_to_widget.erase(first_it);
-        }
-
-    ChatMessageHeader *header;
-    if (should_attach) {
-        header = last_row;
-    } else {
-        const auto guild_id = *client.GetChannel(m_active_channel)->GuildID;
-        const auto user_id = data->Author.ID;
-        const auto user = client.GetUser(user_id);
-        if (!user.has_value()) return;
-
-        header = Gtk::manage(new ChatMessageHeader(&*data));
-        header->signal_action_insert_mention().connect([this, user_id]() {
-            m_signal_action_insert_mention.emit(user_id);
-        });
-
-        header->signal_action_open_user_menu().connect([this, user_id, guild_id](const GdkEvent *event) {
-            m_signal_action_open_user_menu.emit(event, user_id, guild_id);
-        });
-
-        m_num_rows++;
-    }
-
-    auto *content = CreateMessageComponent(id);
-    if (content != nullptr) {
-        header->AddContent(content, prepend);
-        m_id_to_widget[id] = content;
-
-        if (!data->IsPending) {
-            content->signal_action_delete().connect([this, id] {
-                m_signal_action_message_delete.emit(m_active_channel, id);
-            });
-            content->signal_action_edit().connect([this, id] {
-                m_signal_action_message_edit.emit(m_active_channel, id);
-            });
-            content->signal_action_reaction_add().connect([this, id](const Glib::ustring &param) {
-                m_signal_action_reaction_add.emit(id, param);
-            });
-            content->signal_action_reaction_remove().connect([this, id](const Glib::ustring &param) {
-                m_signal_action_reaction_remove.emit(id, param);
-            });
-            content->signal_action_channel_click().connect([this](const Snowflake &id) {
-                m_signal_action_channel_click.emit(id);
-            });
-            content->signal_action_reply_to().connect(sigc::mem_fun(*this, &ChatWindow::StartReplying));
-        }
-    }
-
-    header->set_margin_left(5);
-    header->show_all();
-
-    if (!should_attach) {
-        if (prepend)
-            m_list->prepend(*header);
-        else
-            m_list->add(*header);
-    }
-}
-
-void ChatWindow::StartReplying(Snowflake message_id) {
-    const auto &discord = Abaddon::Get().GetDiscordClient();
-    const auto message = *discord.GetMessage(message_id);
-    const auto author = discord.GetUser(message.Author.ID);
-    m_replying_to = message_id;
-    m_is_replying = true;
-    m_input->grab_focus();
-    m_input->get_style_context()->add_class("replying");
-    if (author.has_value())
-        m_input_indicator->SetCustomMarkup("Replying to " + author->GetEscapedBoldString<false>());
-    else
-        m_input_indicator->SetCustomMarkup("Replying...");
-}
-
-void ChatWindow::StopReplying() {
-    m_is_replying = false;
-    m_replying_to = Snowflake::Invalid;
-    m_input->get_style_context()->remove_class("replying");
-    m_input_indicator->ClearCustom();
-}
-
-void ChatWindow::OnScrollEdgeOvershot(Gtk::PositionType pos) {
-    if (pos == Gtk::POS_TOP)
-        m_signal_action_chat_load_history.emit(m_active_channel);
-}
-
-void ChatWindow::ScrollToBottom() {
-    auto x = m_scroll->get_vadjustment();
-    x->set_value(x->get_upper());
-}
-
-void ChatWindow::OnMessageSendFail(const std::string &nonce, float retry_after) {
-    for (auto [id, widget] : m_id_to_widget) {
-        if (auto *container = dynamic_cast<ChatMessageItemContainer *>(widget); container->Nonce == nonce) {
-            container->SetFailed();
-            break;
-        }
-    }
-}
-
-ChatWindow::type_signal_action_message_delete ChatWindow::signal_action_message_delete() {
-    return m_signal_action_message_delete;
-}
-
-ChatWindow::type_signal_action_message_edit ChatWindow::signal_action_message_edit() {
-    return m_signal_action_message_edit;
-}
-
-ChatWindow::type_signal_action_chat_submit ChatWindow::signal_action_chat_submit() {
-    return m_signal_action_chat_submit;
-}
-
-ChatWindow::type_signal_action_chat_load_history ChatWindow::signal_action_chat_load_history() {
-    return m_signal_action_chat_load_history;
-}
-
-ChatWindow::type_signal_action_channel_click ChatWindow::signal_action_channel_click() {
-    return m_signal_action_channel_click;
-}
-
-ChatWindow::type_signal_action_insert_mention ChatWindow::signal_action_insert_mention() {
-    return m_signal_action_insert_mention;
-}
-
-ChatWindow::type_signal_action_open_user_menu ChatWindow::signal_action_open_user_menu() {
-    return m_signal_action_open_user_menu;
-}
-
-ChatWindow::type_signal_action_reaction_add ChatWindow::signal_action_reaction_add() {
-    return m_signal_action_reaction_add;
-}
-
-ChatWindow::type_signal_action_reaction_remove ChatWindow::signal_action_reaction_remove() {
-    return m_signal_action_reaction_remove;
-}

components/inotifyswitched.hpp

@@ -1,8 +0,0 @@
-#pragma once
-
-// for things that are used in stackswitchers to be able to be told when they're switched to
-
-class INotifySwitched {
-public:
-    virtual void on_switched_to() {};
-};

discord/channel.hpp

@@ -1,50 +0,0 @@
-#pragma once
-#include "snowflake.hpp"
-#include "json.hpp"
-#include "user.hpp"
-#include "permissions.hpp"
-#include <string>
-#include <vector>
-
-enum class ChannelType : int {
-    GUILD_TEXT = 0,
-    DM = 1,
-    GUILD_VOICE = 2,
-    GROUP_DM = 3,
-    GUILD_CATEGORY = 4,
-    GUILD_NEWS = 5,
-    GUILD_STORE = 6,
-    /* 7 and 8 were used for LFG */
-    /* 9 and 10 were used for threads */
-    PUBLIC_THREAD = 11,
-    PRIVATE_THREAD = 12,
-    GUILD_STAGE_VOICE = 13,
-};
-
-struct ChannelData {
-    Snowflake ID;
-    ChannelType Type;
-    std::optional<Snowflake> GuildID;
-    std::optional<int> Position;
-    std::optional<std::vector<PermissionOverwrite>> PermissionOverwrites; // shouldnt be accessed
-    std::optional<std::string> Name;                                      // null for dm's
-    std::optional<std::string> Topic;                                     // null
-    std::optional<bool> IsNSFW;
-    std::optional<Snowflake> LastMessageID; // null
-    std::optional<int> Bitrate;
-    std::optional<int> UserLimit;
-    std::optional<int> RateLimitPerUser;
-    std::optional<std::vector<UserData>> Recipients; // only access id
-    std::optional<std::vector<Snowflake>> RecipientIDs;
-    std::optional<std::string> Icon; // null
-    std::optional<Snowflake> OwnerID;
-    std::optional<Snowflake> ApplicationID;
-    std::optional<Snowflake> ParentID;           // null
-    std::optional<std::string> LastPinTimestamp; // null
-
-    friend void from_json(const nlohmann::json &j, ChannelData &m);
-    void update_from_json(const nlohmann::json &j);
-
-    std::optional<PermissionOverwrite> GetOverwrite(Snowflake id) const;
-    std::vector<UserData> GetDMRecipients() const;
-};

discord/store.hpp

@@ -1,160 +0,0 @@
-#pragma once
-#include "../util.hpp"
-#include "objects.hpp"
-#include <unordered_map>
-#include <unordered_set>
-#include <mutex>
-#include <filesystem>
-#include <sqlite3.h>
-
-#ifdef GetMessage // fuck you windows.h
-    #undef GetMessage
-#endif
-
-class Store {
-public:
-    Store(bool mem_store = false);
-    ~Store();
-
-    bool IsValid() const;
-
-    void SetUser(Snowflake id, const UserData &user);
-    void SetChannel(Snowflake id, const ChannelData &chan);
-    void SetGuild(Snowflake id, const GuildData &guild);
-    void SetRole(Snowflake id, const RoleData &role);
-    void SetMessage(Snowflake id, const Message &message);
-    void SetGuildMember(Snowflake guild_id, Snowflake user_id, const GuildMember &data);
-    void SetPermissionOverwrite(Snowflake channel_id, Snowflake id, const PermissionOverwrite &perm);
-    void SetEmoji(Snowflake id, const EmojiData &emoji);
-    void SetBan(Snowflake guild_id, Snowflake user_id, const BanData &ban);
-
-    // slap const on everything even tho its not *really* const
-
-    std::optional<ChannelData> GetChannel(Snowflake id) const;
-    std::optional<EmojiData> GetEmoji(Snowflake id) const;
-    std::optional<GuildData> GetGuild(Snowflake id) const;
-    std::optional<GuildMember> GetGuildMember(Snowflake guild_id, Snowflake user_id) const;
-    std::optional<Message> GetMessage(Snowflake id) const;
-    std::optional<PermissionOverwrite> GetPermissionOverwrite(Snowflake channel_id, Snowflake id) const;
-    std::optional<RoleData> GetRole(Snowflake id) const;
-    std::optional<UserData> GetUser(Snowflake id) const;
-    std::optional<BanData> GetBan(Snowflake guild_id, Snowflake user_id) const;
-    std::vector<BanData> GetBans(Snowflake guild_id) const;
-
-    void ClearGuild(Snowflake id);
-    void ClearChannel(Snowflake id);
-    void ClearBan(Snowflake guild_id, Snowflake user_id);
-
-    using users_type = std::unordered_map<Snowflake, UserData>;
-    using channels_type = std::unordered_map<Snowflake, ChannelData>;
-    using guilds_type = std::unordered_map<Snowflake, GuildData>;
-    using roles_type = std::unordered_map<Snowflake, RoleData>;
-    using messages_type = std::unordered_map<Snowflake, Message>;
-    using members_type = std::unordered_map<Snowflake, std::unordered_map<Snowflake, GuildMember>>;                       // [guild][user]
-    using permission_overwrites_type = std::unordered_map<Snowflake, std::unordered_map<Snowflake, PermissionOverwrite>>; // [channel][user/role]
-    using emojis_type = std::unordered_map<Snowflake, EmojiData>;
-
-    const std::unordered_set<Snowflake> &GetChannels() const;
-    const std::unordered_set<Snowflake> &GetGuilds() const;
-
-    void ClearAll();
-
-    void BeginTransaction();
-    void EndTransaction();
-
-private:
-    void SetMessageInteractionPair(Snowflake message_id, const MessageInteractionData &interaction);
-
-    std::unordered_set<Snowflake> m_channels;
-    std::unordered_set<Snowflake> m_guilds;
-
-    bool CreateTables();
-    bool CreateStatements();
-    void Cleanup();
-
-    template<typename T>
-    void Bind(sqlite3_stmt *stmt, int index, const std::optional<T> &opt) const;
-
-    template<typename T>
-    typename std::enable_if<std::is_enum<T>::value, void>::type
-    Bind(sqlite3_stmt *stmt, int index, T val) const;
-
-    void Bind(sqlite3_stmt *stmt, int index, int num) const;
-    void Bind(sqlite3_stmt *stmt, int index, uint64_t num) const;
-    void Bind(sqlite3_stmt *stmt, int index, const std::string &str) const;
-    void Bind(sqlite3_stmt *stmt, int index, bool val) const;
-    void Bind(sqlite3_stmt *stmt, int index, std::nullptr_t) const;
-    bool RunInsert(sqlite3_stmt *stmt);
-    bool FetchOne(sqlite3_stmt *stmt) const;
-
-    template<typename T>
-    void Get(sqlite3_stmt *stmt, int index, std::optional<T> &out) const;
-
-    template<typename T>
-    typename std::enable_if<std::is_enum<T>::value, void>::type
-    Get(sqlite3_stmt *stmt, int index, T &out) const;
-
-    void Get(sqlite3_stmt *stmt, int index, int &out) const;
-    void Get(sqlite3_stmt *stmt, int index, uint64_t &out) const;
-    void Get(sqlite3_stmt *stmt, int index, std::string &out) const;
-    void Get(sqlite3_stmt *stmt, int index, bool &out) const;
-    void Get(sqlite3_stmt *stmt, int index, Snowflake &out) const;
-    bool IsNull(sqlite3_stmt *stmt, int index) const;
-    void Reset(sqlite3_stmt *stmt) const;
-
-    std::filesystem::path m_db_path;
-    mutable sqlite3 *m_db;
-    mutable int m_db_err;
-    mutable sqlite3_stmt *m_set_user_stmt;
-    mutable sqlite3_stmt *m_get_user_stmt;
-    mutable sqlite3_stmt *m_set_perm_stmt;
-    mutable sqlite3_stmt *m_get_perm_stmt;
-    mutable sqlite3_stmt *m_set_msg_stmt;
-    mutable sqlite3_stmt *m_get_msg_stmt;
-    mutable sqlite3_stmt *m_set_role_stmt;
-    mutable sqlite3_stmt *m_get_role_stmt;
-    mutable sqlite3_stmt *m_set_emote_stmt;
-    mutable sqlite3_stmt *m_get_emote_stmt;
-    mutable sqlite3_stmt *m_set_member_stmt;
-    mutable sqlite3_stmt *m_get_member_stmt;
-    mutable sqlite3_stmt *m_set_guild_stmt;
-    mutable sqlite3_stmt *m_get_guild_stmt;
-    mutable sqlite3_stmt *m_set_chan_stmt;
-    mutable sqlite3_stmt *m_get_chan_stmt;
-    mutable sqlite3_stmt *m_set_ban_stmt;
-    mutable sqlite3_stmt *m_get_ban_stmt;
-    mutable sqlite3_stmt *m_clear_ban_stmt;
-    mutable sqlite3_stmt *m_get_bans_stmt;
-    mutable sqlite3_stmt *m_set_msg_interaction_stmt;
-};
-
-template<typename T>
-inline void Store::Bind(sqlite3_stmt *stmt, int index, const std::optional<T> &opt) const {
-    if (opt.has_value())
-        Bind(stmt, index, *opt);
-    else
-        sqlite3_bind_null(stmt, index);
-}
-
-template<typename T>
-inline typename std::enable_if<std::is_enum<T>::value, void>::type
-Store::Bind(sqlite3_stmt *stmt, int index, T val) const {
-    Bind(stmt, index, static_cast<typename std::underlying_type<T>::type>(val));
-}
-
-template<typename T>
-inline void Store::Get(sqlite3_stmt *stmt, int index, std::optional<T> &out) const {
-    if (sqlite3_column_type(stmt, index) == SQLITE_NULL)
-        out = std::nullopt;
-    else {
-        T v;
-        Get(stmt, index, v);
-        out = std::optional<T>(v);
-    }
-}
-
-template<typename T>
-inline typename std::enable_if<std::is_enum<T>::value, void>::type
-Store::Get(sqlite3_stmt *stmt, int index, T &out) const {
-    out = static_cast<T>(sqlite3_column_int(stmt, index));
-}

res/css/application-low-priority.css

@@ -0,0 +1,89 @@
+/*
+application wide stuff
+has to be separate to allow main.css to override certain things
+*/
+
+.app-window label:not(:disabled) {
+    color: @text_color;
+}
+
+.app-window entry {
+    background: @secondary_color;
+    color: @text_color;
+    border: 1px solid #1c2e40;
+}
+
+.app-window button {
+    background: @secondary_color;
+    color: @text_color;
+    text-shadow: none;
+    box-shadow: none;
+}
+
+.app-window button:checked {
+    border-top: 0px;
+    border-left: 0px;
+    border-right: 0px;
+    border-bottom: 3px solid #39a2ed;
+    color: #ffffff;
+}
+
+.app-window button:not(:checked) {
+    border: 3px #0000ff;
+}
+
+.app-window.background {
+    background: @background_color;
+}
+
+.app-window treeview {
+    color: @text_color;
+}
+
+.app-window treeview:not(:selected) {
+    background: @secondary_color;
+}
+
+.app-popup list {
+    background: @secondary_color;
+}
+
+.app-window paned separator {
+    background: @background_color;
+}
+
+.app-window scrollbar {
+    background: @background_color;
+    border-left: 1px solid transparent;
+}
+
+.app-window menubar, menu {
+    background: @background_color;
+    color: #cccccc;
+}
+
+.app-window textview text {
+    caret-color: #ababab;
+}
+
+.app-window check,
+.app-window radio {
+    background-clip: padding-box;
+    background: @secondary_color;
+    border-color: #070707;
+    box-shadow: 0 1px rgba(0, 0, 0, 0);
+    color: #dddddd;
+}
+
+.app-window check:checked,
+.app-window radio:checked {
+    background-clip: border-box;
+    background: #0b4285;
+    border-color: #092444;
+    box-shadow: 0 1px rgba(0, 0, 0, 0);
+    color: #dddddd;
+}
+
+.app-window colorswatch {
+    box-shadow: 0 1px rgba(0, 0, 0, 0);
+}

res/css/main.css

@@ -57,14 +57,8 @@
     padding: 15px;
 }
 
-.message-container + .message-container {
-    margin-top: 10px;
-}
-
 .message-container-extra {
     color: #78909c;
-    margin-left: -5px;
-    margin-right: -5px;
 }
 
 .message-container-timestamp {
@@ -72,7 +66,8 @@
 }
 
 .message-text {
-    padding-top: 5px;
+    /* this isnt stricly necessary but it fixes emoji clipping */
+    padding-bottom: 5px;
 }
 
 .message-text:not(.failed) text, .message-reply {
@@ -141,6 +136,26 @@
     margin: 5px;
 }
 
+.message-component {
+    margin: 5px;
+}
+
+.message-component.primary {
+    background: #5865F2;
+}
+
+.message-component.secondary, .message-component.link {
+    background: #4F545C;
+}
+
+.message-component.success {
+    background: #43B581;
+}
+
+.message-component.danger {
+    background: #F04747;
+}
+
 .reaction-box {
     padding: 2px 5px 2px 5px;
     margin: 0px 0px 0px 0px;
@@ -176,62 +191,6 @@
     color: @text_color;
 }
 
-.app-window label:not(:disabled) {
-    color: @text_color;
-}
-
-.app-window entry {
-    background: @secondary_color;
-    color: @text_color;
-    border: 1px solid #1c2e40;
-}
-
-.app-window button {
-    background: @secondary_color;
-    color: @text_color;
-    text-shadow: none;
-    box-shadow: none;
-}
-
-.app-window button:checked {
-    border-top: 0px;
-    border-left: 0px;
-    border-right: 0px;
-    border-bottom: 3px solid #39a2ed;
-    color: #ffffff;
-}
-
-.app-window button:not(:checked) {
-    border: 3px #0000ff;
-}
-
-.app-window.background {
-    background: @background_color;
-}
-
-.app-window treeview {
-    color: @text_color;
-    background: @secondary_color;
-}
-
-.app-popup list {
-    background: @secondary_color;
-}
-
-.app-window paned separator {
-    background: @background_color;
-}
-
-.app-window scrollbar {
-    background: @background_color;
-    border-left: 1px solid transparent;
-}
-
-.app-window menubar, menu {
-    background: @background_color;
-    color: #cccccc;
-}
-
 .status-indicator.dnd {
     color: #982929;
 }
@@ -303,37 +262,10 @@
     padding-left: 5px;
 }
 
-.app-window textview text {
-    caret-color: #ababab;
-}
-
 .guild-members-pane-info {
     padding: 10px;
 }
 
-
-.app-window check,
-.app-window radio {
-    background-clip: padding-box;
-    background: @secondary_color;
-    border-color: #070707;
-    box-shadow: 0 1px rgba(0, 0, 0, 0);
-    color: #dddddd;
-}
-
-.app-window check:checked,
-.app-window radio:checked {
-    background-clip: border-box;
-    background: #0b4285;
-    border-color: #092444;
-    box-shadow: 0 1px rgba(0, 0, 0, 0);
-    color: #dddddd;
-}
-
-.app-window colorswatch {
-    box-shadow: 0 1px rgba(0, 0, 0, 0);
-}
-
 .drag-hover-top {
     background: linear-gradient(to bottom, rgba(255, 66, 66, 0.65) 0%, rgba(0, 0, 0, 0) 35%);
 }
@@ -341,3 +273,12 @@
 .drag-hover-bottom {
     background: linear-gradient(to bottom, rgba(0, 0, 0, 0) 65%, rgba(255, 66, 66, 0.65) 100%);
 }
+
+.friends-list list {
+    background: @background_color;
+    padding-left: 10px;
+}
+
+.friends-list-row-bot {
+    color: #ff0000;
+}

res/fonts/conf.d/10-autohint.conf

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--  Use the Autohinter --> 
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="autohint" mode="append"><bool>true</bool></edit>
+  </match>
+</fontconfig>

res/fonts/conf.d/10-hinting-full.conf

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="hintstyle" mode="append"><const>hintfull</const></edit>
+  </match>
+</fontconfig>

res/fonts/conf.d/10-hinting-medium.conf

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="hintstyle" mode="append"><const>hintmedium</const></edit>
+  </match>
+</fontconfig>

res/fonts/conf.d/10-hinting-none.conf

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="hintstyle" mode="append"><const>hintnone</const></edit>
+  </match>
+</fontconfig>

res/fonts/conf.d/10-hinting-slight.conf

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="hintstyle" mode="append"><const>hintslight</const></edit>
+  </match>
+</fontconfig>

res/fonts/conf.d/10-no-sub-pixel.conf

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--  Disable sub-pixel rendering --> 
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="rgba" mode="append"><const>none</const></edit>
+  </match>
+</fontconfig>

res/fonts/conf.d/10-scale-bitmap-fonts.conf

@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<!--
+  If font is bitmap, calculate scale factor.
+  Note that color bitmap fonts have scalable=true, while
+  non-color ones have scalable=false.  Both groups have outline=false.
+  -->
+<match target="font">
+  <test name="outline" compare="eq">
+    <bool>false</bool>
+  </test>
+  <edit name="pixelsizefixupfactor" mode="assign">
+    <double>0.15</double>
+  </edit>
+</match>
+<!--
+  For non-scalable bitmap fonts (ie. non-color), skip
+  minor scaling if hinting is enabled.
+  -->
+<match target="font">
+  <test name="outline" compare="eq">
+    <bool>false</bool>
+  </test>
+  <test name="scalable" compare="eq">
+    <bool>false</bool>
+  </test>
+  <test name="hinting" compare="eq">
+    <bool>true</bool>
+  </test>
+  <edit name="scalingnotneeded" mode="assign">
+    <and>
+      <less>
+        <name>pixelsizefixupfactor</name>
+        <double>1.2</double>
+      </less>
+      <more>
+        <name>pixelsizefixupfactor</name>
+        <double>0.8</double>
+      </more>
+    </and>
+  </edit>
+</match>
+<match target="font">
+  <test name="scalingnotneeded" compare="eq">
+    <bool>true</bool>
+  </test>
+  <edit name="pixelsizefixupfactor" mode="assign">
+    <double>1.0</double>
+  </edit>
+</match>
+<!--
+  If we *are* going to scale, go ahead and do it.
+  -->
+<match target="font">
+  <test name="outline" compare="eq">
+    <bool>false</bool>
+  </test>
+  <test name="pixelsizefixupfactor" compare="not_eq">
+    <double>1.0</double>
+  </test>
+  <edit name="matrix" mode="assign">
+    <times>
+      <name>matrix</name>
+      <matrix>
+        <name>pixelsizefixupfactor</name> <double>0</double>
+        <double>0</double> <name>pixelsizefixupfactor</name>
+       </matrix>
+    </times>
+  </edit>
+  <edit name="size" mode="assign">
+    <divide>
+      <name>size</name>
+      <name>pixelsizefixupfactor</name>
+    </divide>
+  </edit>
+</match>
+
+</fontconfig>

res/fonts/conf.d/10-sub-pixel-bgr.conf

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="rgba" mode="append"><const>bgr</const></edit>
+  </match>
+</fontconfig>

res/fonts/conf.d/10-sub-pixel-rgb.conf

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="rgba" mode="append"><const>rgb</const></edit>
+  </match>
+</fontconfig>

res/fonts/conf.d/10-sub-pixel-vbgr.conf

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="rgba" mode="append"><const>vbgr</const></edit>
+  </match>
+</fontconfig>

res/fonts/conf.d/10-sub-pixel-vrgb.conf

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--  Enable sub-pixel rendering --> 
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="rgba" mode="append"><const>vrgb</const></edit>
+  </match>
+</fontconfig>

res/fonts/conf.d/10-unhinted.conf

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--  Disable hinting --> 
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit name="hinting" mode="append"><bool>false</bool></edit>
+  </match>
+</fontconfig>

res/fonts/conf.d/11-lcdfilter-default.conf

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--  Use lcddefault as default for LCD filter -->
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit mode="append" name="lcdfilter">
+      <const>lcddefault</const>
+    </edit>
+  </match>
+</fontconfig>

res/fonts/conf.d/11-lcdfilter-legacy.conf

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--  Use lcdlegacy as default for LCD filter -->
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit mode="append" name="lcdfilter">
+      <const>lcdlegacy</const>
+    </edit>
+  </match>
+</fontconfig>

res/fonts/conf.d/11-lcdfilter-light.conf

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--  Use lcdlight as default for LCD filter -->
+  <match target="pattern">
+    <!--
+      This configuration is available on the major desktop environments.
+      We shouldn't overwrite it with "assign" unconditionally.
+      Most clients may picks up the first value only. so using "append"
+      may simply works to avoid it.
+    -->
+    <edit mode="append" name="lcdfilter">
+      <const>lcdlight</const>
+    </edit>
+  </match>
+</fontconfig>

res/fonts/conf.d/20-unhint-small-vera.conf

@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- 
+	The Bitstream Vera fonts have GASP entries suggesting that hinting be
+	disabled below 8 ppem, but FreeType ignores those, preferring to use
+	the data found in the instructed hints.  The initial Vera release
+	didn't include the right instructions in the 'prep' table. Fix this
+	by disabling hinting manually at smaller sizes (< 8ppem)
+ -->
+
+	<match target="font">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>Bitstream Vera Sans</string>
+		</test>
+		<test name="pixelsize" compare="less">
+			<double>7.5</double>
+		</test>
+		<edit name="hinting">
+			<bool>false</bool>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>Bitstream Vera Serif</string>
+		</test>
+		<test name="pixelsize" compare="less">
+			<double>7.5</double>
+		</test>
+		<edit name="hinting">
+			<bool>false</bool>
+		</edit>
+	</match>
+
+	<match target="font">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>Bitstream Vera Sans Mono</string>
+		</test>
+		<test name="pixelsize" compare="less">
+			<double>7.5</double>
+		</test>
+		<edit name="hinting">
+			<bool>false</bool>
+		</edit>
+	</match>
+
+</fontconfig>

res/fonts/conf.d/25-unhint-nonlatin.conf

@@ -0,0 +1,128 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<!-- We can't hint CJK fonts well, so turn off hinting for CJK fonts. -->
+
+	<match target="font">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>Kochi Mincho</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>Kochi Gothic</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>Sazanami Mincho</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>Sazanami Gothic</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>Baekmuk Batang</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>Baekmuk Dotum</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>Baekmuk Gulim</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>Baekmuk Headline</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>AR PL Mingti2L Big5</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>AR PL ShanHeiSun Uni</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>AR PL KaitiM Big5</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>AR PL ZenKai Uni</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>AR PL SungtiL GB</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>AR PL KaitiM GB</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+	<match target="font">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>ZYSong18030</string>
+		</test>
+		<edit name="hinting" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+
+</fontconfig>

res/fonts/conf.d/30-metric-aliases.conf

@@ -0,0 +1,652 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+<!--
+
+Alias similar/metric-compatible families from various sources:
+
+PostScript fonts:       URW fonts:           GUST fonts:        Windows fonts:
+======================  ==================  =================  ==================
+Helvetica               Nimbus Sans         TeX Gyre Heros
+Helvetica Narrow        Nimbus Sans Narrow  TeX Gyre Heros Cn
+Times                   Nimbus Roman        TeX Gyre Termes
+Courier                 Nimbus Mono PS      TeX Gyre Cursor
+ITC Avant Garde Gothic  URW Gothic          TeX Gyre Adventor
+ITC Bookman             URW Bookman         TeX Gyre Bonum     Bookman Old Style
+ITC Zapf Chancery       Z003                TeX Gyre Chorus
+Palatino                P052                TeX Gyre Pagella   Palatino Linotype
+New Century Schoolbook  C059                TeX Gyre Schola    Century Schoolbook
+
+Microsoft fonts:  Liberation fonts:       Google CrOS core fonts:  StarOffice fonts:  AMT fonts:
+================  ======================  =======================  =================  ==============
+Arial             Liberation Sans         Arimo                    Albany             Albany AMT
+Arial Narrow      Liberation Sans Narrow
+Times New Roman   Liberation Serif        Tinos                    Thorndale          Thorndale AMT
+Courier New       Liberation Mono         Cousine                  Cumberland         Cumberland AMT
+Cambria                                   Caladea
+Calibri                                   Carlito
+Symbol                                    SymbolNeu
+
+Microsoft fonts:  Other fonts:
+================  ============
+Georgia           Gelasio
+
+We want for each of them to fallback to any of these available,
+but in an order preferring similar designs first.  We do this in three steps:
+
+1) Alias each specific to its generic family.
+   e.g. Liberation Sans to Arial
+
+2) Weak alias each generic to the other generic of its family.
+   e.g. Arial to Helvetica
+
+3) Alias each generic to its specifics.
+   e.g. Arial to Liberation Sans, Arimo, Albany, and Albany AMT
+
+-->
+
+<!-- Map specifics to generics -->
+
+	<!-- PostScript -->
+	<alias binding="same">
+	  <family>Nimbus Sans L</family>
+	  <default>
+	  <family>Helvetica</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Nimbus Sans</family>
+	  <default>
+	  <family>Helvetica</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Heros</family>
+	  <default>
+	  <family>Helvetica</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Nimbus Sans Narrow</family>
+	  <default>
+	  <family>Helvetica Narrow</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Heros Cn</family>
+	  <default>
+	  <family>Helvetica Narrow</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Nimbus Roman No9 L</family>
+	  <default>
+	  <family>Times</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Nimbus Roman</family>
+	  <default>
+	  <family>Times</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Termes</family>
+	  <default>
+	  <family>Times</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Nimbus Mono L</family>
+	  <default>
+	  <family>Courier</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Nimbus Mono</family>
+	  <default>
+	  <family>Courier</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Nimbus Mono PS</family>
+	  <default>
+	  <family>Courier</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Cursor</family>
+	  <default>
+	  <family>Courier</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Avant Garde</family>
+	  <default>
+	  <family>ITC Avant Garde Gothic</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>URW Gothic L</family>
+	  <default>
+	  <family>ITC Avant Garde Gothic</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>URW Gothic</family>
+	  <default>
+	  <family>ITC Avant Garde Gothic</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Adventor</family>
+	  <default>
+	  <family>ITC Avant Garde Gothic</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Bookman</family>
+	  <default>
+	  <family>ITC Bookman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>URW Bookman L</family>
+	  <default>
+	  <family>ITC Bookman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Bookman URW</family>
+	  <default>
+	  <family>ITC Bookman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>URW Bookman</family>
+	  <default>
+	  <family>ITC Bookman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Bonum</family>
+	  <default>
+	  <family>ITC Bookman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Bookman Old Style</family>
+	  <default>
+	  <family>ITC Bookman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Zapf Chancery</family>
+	  <default>
+	  <family>ITC Zapf Chancery</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>URW Chancery L</family>
+	  <default>
+	  <family>ITC Zapf Chancery</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Chancery URW</family>
+	  <default>
+	  <family>ITC Zapf Chancery</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Z003</family>
+	  <default>
+	  <family>ITC Zapf Chancery</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Chorus</family>
+	  <default>
+	  <family>ITC Zapf Chancery</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>URW Palladio L</family>
+	  <default>
+	  <family>Palatino</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Palladio URW</family>
+	  <default>
+	  <family>Palatino</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>P052</family>
+	  <default>
+	  <family>Palatino</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Pagella</family>
+	  <default>
+	  <family>Palatino</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Palatino Linotype</family>
+	  <default>
+	  <family>Palatino</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Century Schoolbook L</family>
+	  <default>
+	  <family>New Century Schoolbook</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Century SchoolBook URW</family>
+	  <default>
+	  <family>New Century Schoolbook</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>C059</family>
+	  <default>
+	  <family>New Century Schoolbook</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>TeX Gyre Schola</family>
+	  <default>
+	  <family>New Century Schoolbook</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Century Schoolbook</family>
+	  <default>
+	  <family>New Century Schoolbook</family>
+	  </default>
+	</alias>
+
+
+	<!-- Microsoft -->
+	<alias binding="same">
+	  <family>Arimo</family>
+	  <default>
+	    <family>Arial</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Liberation Sans</family>
+	  <default>
+	  <family>Arial</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Liberation Sans Narrow</family>
+	  <default>
+	    <family>Arial Narrow</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Albany</family>
+	  <default>
+	  <family>Arial</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Albany AMT</family>
+	  <default>
+	  <family>Arial</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Tinos</family>
+	  <default>
+	    <family>Times New Roman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Liberation Serif</family>
+	  <default>
+	  <family>Times New Roman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Thorndale</family>
+	  <default>
+	  <family>Times New Roman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Thorndale AMT</family>
+	  <default>
+	  <family>Times New Roman</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Cousine</family>
+	  <default>
+	    <family>Courier New</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Liberation Mono</family>
+	  <default>
+	  <family>Courier New</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Cumberland</family>
+	  <default>
+	  <family>Courier New</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Cumberland AMT</family>
+	  <default>
+	  <family>Courier New</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Gelasio</family>
+	  <default>
+	  <family>Georgia</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Caladea</family>
+	  <default>
+	  <family>Cambria</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>Carlito</family>
+	  <default>
+	  <family>Calibri</family>
+	  </default>
+	</alias>
+
+	<alias binding="same">
+	  <family>SymbolNeu</family>
+	  <default>
+	  <family>Symbol</family>
+	  </default>
+  </alias>
+
+<!-- Accept the other group as fallback -->
+
+	<!-- PostScript -->
+	<alias>
+	  <family>Helvetica</family>
+	  <default>
+	  <family>Arial</family>
+	  </default>
+	</alias>
+
+	<alias>
+	  <family>Helvetica Narrow</family>
+	  <default>
+	  <family>Arial Narrow</family>
+	  </default>
+	</alias>
+
+	<alias>
+	  <family>Times</family>
+	  <default>
+	  <family>Times New Roman</family>
+	  </default>
+	</alias>
+
+	<alias>
+	  <family>Courier</family>
+	  <default>
+	  <family>Courier New</family>
+	  </default>
+	</alias>
+
+
+	<!-- Microsoft -->
+	<alias>
+	  <family>Arial</family>
+	  <default>
+	  <family>Helvetica</family>
+	  </default>
+	</alias>
+
+	<alias>
+	  <family>Arial Narrow</family>
+	  <default>
+	  <family>Helvetica Narrow</family>
+	  </default>
+	</alias>
+
+	<alias>
+	  <family>Times New Roman</family>
+	  <default>
+	  <family>Times</family>
+	  </default>
+	</alias>
+
+	<alias>
+	  <family>Courier New</family>
+	  <default>
+	  <family>Courier</family>
+	  </default>
+	</alias>
+
+
+
+<!-- Map generics to specifics -->
+
+	<!-- PostScript -->
+	<alias binding="same">
+	  <family>Helvetica</family>
+	  <accept>
+	  <family>TeX Gyre Heros</family>
+	  <family>Nimbus Sans</family>
+	  <family>Nimbus Sans L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Helvetica Narrow</family>
+	  <accept>
+	  <family>TeX Gyre Heros Cn</family>
+	  <family>Nimbus Sans Narrow</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Times</family>
+	  <accept>
+	  <family>TeX Gyre Termes</family>
+	  <family>Nimbus Roman</family>
+	  <family>Nimbus Roman No9 L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Courier</family>
+	  <accept>
+	  <family>TeX Gyre Cursor</family>
+	  <family>Nimbus Mono PS</family>
+	  <family>Nimbus Mono</family>
+	  <family>Nimbus Mono L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>ITC Avant Garde Gothic</family>
+	  <accept>
+	  <family>TeX Gyre Adventor</family>
+	  <family>URW Gothic</family>
+	  <family>URW Gothic L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>ITC Bookman</family>
+	  <accept>
+	  <family>Bookman Old Style</family>
+	  <family>TeX Gyre Bonum</family>
+	  <family>URW Bookman</family>
+	  <family>Bookman URW</family>
+	  <family>URW Bookman L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>ITC Zapf Chancery</family>
+	  <accept>
+	  <family>TeX Gyre Chorus</family>
+	  <family>Z003</family>
+	  <family>Chancery URW</family>
+	  <family>URW Chancery L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Palatino</family>
+	  <accept>
+	  <family>Palatino Linotype</family>
+	  <family>TeX Gyre Pagella</family>
+	  <family>P052</family>
+	  <family>Palladio URW</family>
+	  <family>URW Palladio L</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>New Century Schoolbook</family>
+	  <accept>
+	  <family>Century Schoolbook</family>
+	  <family>TeX Gyre Schola</family>
+	  <family>C059</family>
+	  <family>Century SchoolBook URW</family>
+	  <family>Century Schoolbook L</family>
+	  </accept>
+	</alias>
+
+	<!-- Microsoft -->
+	<alias binding="same">
+	  <family>Arial</family>
+	  <accept>
+	    <family>Arimo</family>
+	    <family>Liberation Sans</family>
+	    <family>Albany</family>
+	    <family>Albany AMT</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Arial Narrow</family>
+	  <accept>
+	    <family>Liberation Sans Narrow</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Times New Roman</family>
+	  <accept>
+	    <family>Tinos</family>
+	    <family>Liberation Serif</family>
+	    <family>Thorndale</family>
+	    <family>Thorndale AMT</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Courier New</family>
+	  <accept>
+	    <family>Cousine</family>
+	    <family>Liberation Mono</family>
+	    <family>Cumberland</family>
+	    <family>Cumberland AMT</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Georgia</family>
+	  <accept>
+	    <family>Gelasio</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Cambria</family>
+	  <accept>
+	    <family>Caladea</family>
+	  </accept>
+	</alias>
+
+	<alias binding="same">
+	  <family>Calibri</family>
+	  <accept>
+	    <family>Carlito</family>
+	  </accept>
+  </alias>
+
+	<alias binding="same">
+	  <family>Symbol</family>
+	  <accept>
+	    <family>SymbolNeu</family>
+	  </accept>
+  </alias>
+
+</fontconfig>

res/fonts/conf.d/30-urw-aliases.conf

@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--
+  URW provides metric and shape compatible fonts for some Adobe families.
+  Most of these are handled in 30-metric-aliases.conf.
+  -->
+	<alias binding="same">
+	  <family>Zapf Dingbats</family>
+	  <accept>
+	    <family>D050000L</family>
+	    <family>Dingbats</family>
+	  </accept>
+	</alias>
+	<alias binding="same">
+	  <family>ITC Zapf Dingbats</family>
+	  <accept>
+	    <family>D050000L</family>
+	    <family>Dingbats</family>
+	  </accept>
+	</alias>
+	<match target="pattern">
+	  <test name="family" compare="eq" ignore-blanks="true">
+	    <string>Symbol</string>
+	  </test>
+	  <edit name="family" mode="append" binding="same">
+	    <string>Standard Symbols PS</string>
+	  </edit>
+	  <edit name="family" mode="append" binding="same">
+	    <string>Standard Symbols L</string>
+	  </edit>
+	</match>
+</fontconfig>

res/fonts/conf.d/40-nonlatin.conf

@@ -0,0 +1,231 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--
+  Mark common families with their generics so we'll get
+  something reasonable
+-->
+
+<!--
+  Serif faces
+ -->
+	<alias>
+		<family>Nazli</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Lotoos</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Mitra</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Ferdosi</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Badr</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Zar</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Titr</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Jadid</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Kochi Mincho</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>AR PL SungtiL GB</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>AR PL Mingti2L Big5</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>ＭＳ 明朝</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>NanumMyeongjo</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>UnBatang</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Baekmuk Batang</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>MgOpen Canonica</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Sazanami Mincho</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>AR PL ZenKai Uni</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>ZYSong18030</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>FreeSerif</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>SimSun</family>
+		<default><family>serif</family></default>
+	</alias>
+<!--
+  Sans-serif faces
+ -->
+	<alias>
+		<family>Arshia</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Elham</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Farnaz</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Nasim</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Sina</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Roya</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Koodak</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Terafik</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Kochi Gothic</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>AR PL KaitiM GB</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>AR PL KaitiM Big5</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>ＭＳ ゴシック</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>NanumGothic</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>UnDotum</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Baekmuk Dotum</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>MgOpen Modata</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Sazanami Gothic</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>AR PL ShanHeiSun Uni</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>ZYSong18030</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>FreeSans</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+<!--
+  Monospace faces
+ -->
+	<alias>
+		<family>NSimSun</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
+		<family>ZYSong18030</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
+		<family>NanumGothicCoding</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
+		<family>FreeMono</family>
+		<default><family>monospace</family></default>
+	</alias>
+
+<!--
+  Fantasy faces
+ -->
+	<alias>
+		<family>Homa</family>
+		<default><family>fantasy</family></default>
+	</alias>
+	<alias>
+		<family>Kamran</family>
+		<default><family>fantasy</family></default>
+	</alias>
+	<alias>
+		<family>Fantezi</family>
+		<default><family>fantasy</family></default>
+	</alias>
+	<alias>
+		<family>Tabassom</family>
+		<default><family>fantasy</family></default>
+	</alias>
+
+<!--
+  Cursive faces
+ -->
+	<alias>
+		<family>IranNastaliq</family>
+		<default><family>cursive</family></default>
+	</alias>
+	<alias>
+		<family>Nafees Nastaleeq</family>
+		<default><family>cursive</family></default>
+	</alias>
+
+</fontconfig>

res/fonts/conf.d/45-latin.conf

@@ -0,0 +1,273 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--
+  Mark common families with their generics so we'll get
+  something reasonable
+-->
+
+<!--
+  Serif faces
+ -->
+	<alias>
+		<family>Bitstream Vera Serif</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Cambria</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Constantia</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>DejaVu Serif</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Elephant</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Garamond</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Georgia</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Liberation Serif</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Luxi Serif</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>MS Serif</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Nimbus Roman No9 L</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Nimbus Roman</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Palatino Linotype</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Thorndale AMT</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Thorndale</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Times New Roman</family>
+		<default><family>serif</family></default>
+	</alias>
+	<alias>
+		<family>Times</family>
+		<default><family>serif</family></default>
+	</alias>
+<!--
+  Sans-serif faces
+ -->
+	<alias>
+		<family>Albany AMT</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Albany</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Arial Unicode MS</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Arial</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Bitstream Vera Sans</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Britannic</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Calibri</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Candara</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Century Gothic</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Corbel</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>DejaVu Sans</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Helvetica</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Haettenschweiler</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Liberation Sans</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>MS Sans Serif</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Nimbus Sans L</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Nimbus Sans</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Luxi Sans</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Tahoma</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Trebuchet MS</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Twentieth Century</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+	<alias>
+		<family>Verdana</family>
+		<default><family>sans-serif</family></default>
+	</alias>
+<!--
+  Monospace faces
+ -->
+	<alias>
+		<family>Andale Mono</family>
+		<default><family>monospace</family></default>
+	</alias>
+ 	<alias>
+		<family>Bitstream Vera Sans Mono</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
+		<family>Consolas</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
+		<family>Courier New</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
+		<family>Courier</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
+		<family>Cumberland AMT</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
+		<family>Cumberland</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
+		<family>DejaVu Sans Mono</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
+		<family>Fixedsys</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
+		<family>Inconsolata</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
+		<family>Liberation Mono</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
+		<family>Luxi Mono</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
+		<family>Nimbus Mono L</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
+		<family>Nimbus Mono</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
+		<family>Nimbus Mono PS</family>
+		<default><family>monospace</family></default>
+	</alias>
+	<alias>
+		<family>Terminal</family>
+		<default><family>monospace</family></default>
+	</alias>
+<!--
+  Fantasy faces
+ -->
+	<alias>
+		<family>Bauhaus Std</family>
+		<default><family>fantasy</family></default>
+	</alias>
+	<alias>
+		<family>Cooper Std</family>
+		<default><family>fantasy</family></default>
+	</alias>
+	<alias>
+		<family>Copperplate Gothic Std</family>
+		<default><family>fantasy</family></default>
+	</alias>
+	<alias>
+		<family>Impact</family>
+		<default><family>fantasy</family></default>
+	</alias>
+<!--
+  Cursive faces
+  -->
+	<alias>
+		<family>Comic Sans MS</family>
+		<default><family>cursive</family></default>
+	</alias>
+	<alias>
+		<family>ITC Zapf Chancery Std</family>
+		<default><family>cursive</family></default>
+	</alias>
+	<alias>
+		<family>Zapfino</family>
+		<default><family>cursive</family></default>
+	</alias>
+
+</fontconfig>

res/fonts/conf.d/49-sansserif.conf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!--
+  If the font still has no generic name, add sans-serif
+ -->
+	<match target="pattern">
+		<test qual="all" name="family" compare="not_eq">
+			<string>sans-serif</string>
+		</test>
+		<test qual="all" name="family" compare="not_eq">
+			<string>serif</string>
+		</test>
+		<test qual="all" name="family" compare="not_eq">
+			<string>monospace</string>
+		</test>
+		<edit name="family" mode="append_last">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+</fontconfig>

res/fonts/conf.d/50-user.conf

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+	<!--
+	    Load per-user customization files where stored on XDG Base Directory
+	    specification compliant places. it should be usually:
+	      $HOME/.config/fontconfig/conf.d
+	      $HOME/.config/fontconfig/fonts.conf
+	-->
+	<include ignore_missing="yes" prefix="xdg">fontconfig/conf.d</include>
+	<include ignore_missing="yes" prefix="xdg">fontconfig/fonts.conf</include>
+	<!-- the following elements will be removed in the future -->
+	<include ignore_missing="yes" deprecated="yes">~/.fonts.conf.d</include>
+	<include ignore_missing="yes" deprecated="yes">~/.fonts.conf</include>
+</fontconfig>

res/fonts/conf.d/51-local.conf

@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+	<!-- Load local system customization file -->
+	<include ignore_missing="yes">local.conf</include>
+</fontconfig>

res/fonts/conf.d/55-emoji-prepend.conf

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <match>
+    <edit name="family" mode="prepend" binding="weak">
+      <string>Twitter Color Emoji</string>
+    </edit>
+  </match>
+</fontconfig>

res/fonts/conf.d/60-latin.conf

@@ -0,0 +1,74 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+	<alias>
+		<family>serif</family>
+		<prefer>
+			<family>Bitstream Vera Serif</family>
+			<family>DejaVu Serif</family>
+			<family>Times New Roman</family>
+			<family>Thorndale AMT</family>
+			<family>Luxi Serif</family>
+			<family>Nimbus Roman No9 L</family>
+			<family>Nimbus Roman</family>
+			<family>Times</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>sans-serif</family>
+		<prefer>
+			<family>Bitstream Vera Sans</family>
+			<family>DejaVu Sans</family>
+			<family>Verdana</family>
+			<family>Arial</family>
+			<family>Albany AMT</family>
+			<family>Luxi Sans</family>
+			<family>Nimbus Sans L</family>
+			<family>Nimbus Sans</family>
+			<family>Helvetica</family>
+			<family>Lucida Sans Unicode</family>
+			<family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
+			<family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
+		</prefer>
+	</alias>
+	<alias>
+		<family>monospace</family>
+		<prefer>
+			<family>Bitstream Vera Sans Mono</family>
+			<family>DejaVu Sans Mono</family>
+			<family>Inconsolata</family>
+			<family>Andale Mono</family>
+			<family>Courier New</family>
+			<family>Cumberland AMT</family>
+			<family>Luxi Mono</family>
+			<family>Nimbus Mono L</family>
+			<family>Nimbus Mono</family>
+			<family>Nimbus Mono PS</family>
+			<family>Courier</family>
+		</prefer>
+	</alias>
+<!--
+  Fantasy faces
+ -->
+ 	<alias>
+		<family>fantasy</family>
+		<prefer>
+			<family>Impact</family>
+			<family>Copperplate Gothic Std</family>
+			<family>Cooper Std</family>
+			<family>Bauhaus Std</family>
+		</prefer>
+	</alias>
+<!--
+  Cursive faces
+  -->
+	<alias>
+		<family>cursive</family>
+		<prefer>
+			<family>ITC Zapf Chancery Std</family>
+			<family>Zapfino</family>
+			<family>Comic Sans MS</family>
+		</prefer>
+	</alias>
+
+</fontconfig>

res/fonts/conf.d/65-fonts-persian.conf

@@ -0,0 +1,419 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!--
+  fonts-persian.conf
+  To configure Persian fonts from The FarsiWeb Project.
+
+  Copyright (C) 2005  Sharif FarsiWeb, Inc. <license@farsiweb.info>
+
+  Permission to use, copy, modify, distribute, and sell this software and its
+  documentation for any purpose is hereby granted without fee, provided that
+  the above copyright notice appear in all copies and that both that
+  copyright notice and this permission notice appear in supporting
+  documentation, and that the name of Sharif FarsiWeb, Inc. not be used in
+  advertising or publicity pertaining to distribution of the software without
+  specific, written prior permission.  Sharif FarsiWeb, Inc. makes no
+  representations about the suitability of this software for any purpose.  It
+  is provided "as is" without express or implied warranty.
+
+  SHARIF FARSIWEB, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+  EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  PERFORMANCE OF THIS SOFTWARE.
+
+  ChangeLog:
+    2005-04-03  Behdad Esfahbod:  Initial revision.
+    2005-10-09  Behdad Esfahbod:  Turned off back-slant and Tahoma sections.
+    2005-11-30  Behdad Esfahbod:  Set Titr susbtitution size to 24 points.
+    2008	Behdad Esfahbod:  Cleanup.  Add fantasy and cursive.
+  -->
+<fontconfig>
+
+
+<!-- Deprecated fonts are discouraged -->
+
+	<!-- Nesf[2] is officially deprecated and has problematic tables -->
+	<alias binding="same">
+	  <family>Nesf</family>
+	  <accept><family>Nesf2</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Nesf2</family>
+	  <accept><family>Persian_sansserif_default</family></accept>
+	</alias>
+
+<!-- Name changes and spelling variant aliases -->
+
+	<alias binding="same">
+	  <family>Nazanin</family>
+	  <accept><family>Nazli</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Lotus</family>
+	  <accept><family>Lotoos</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Yaqut</family>
+	  <accept><family>Yaghoot</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Yaghut</family>
+	  <accept><family>Yaghoot</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Traffic</family>
+	  <accept><family>Terafik</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Ferdowsi</family>
+	  <accept><family>Ferdosi</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Fantezy</family>
+	  <accept><family>Fantezi</family></accept>
+	</alias>
+
+
+<!-- Classify fonts. -->
+
+	<!-- Persian_title class -->
+	<alias binding="same">
+	  <family>Jadid</family>
+	  <accept><family>Persian_title</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Titr</family>
+	  <accept><family>Persian_title</family></accept>
+	</alias>
+
+	<!-- Persian_fantasy class -->
+	<alias binding="same">
+	  <family>Kamran</family>
+	  <accept>
+	  <family>Persian_fantasy</family>
+	  <family>Homa</family>
+	  </accept>
+	</alias>
+	<alias binding="same">
+	  <family>Homa</family>
+	  <accept>
+	  <family>Persian_fantasy</family>
+	  <family>Kamran</family>
+	  </accept>
+	</alias>
+	<alias binding="same">
+	  <family>Fantezi</family>
+	  <accept><family>Persian_fantasy</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Tabassom</family>
+	  <accept><family>Persian_fantasy</family></accept>
+	</alias>
+
+	<!-- Persian_square class -->
+	<alias binding="same">
+	  <family>Arshia</family>
+	  <accept><family>Persian_square</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Nasim</family>
+	  <accept><family>Persian_square</family></accept>
+	</alias>
+	<alias binding="same">
+	  <family>Elham</family>
+	  <accept>
+	  <family>Persian_square</family>
+	  <family>Farnaz</family>
+	  </accept>
+	</alias>
+	<alias binding="same">
+	  <family>Farnaz</family>
+	  <accept>
+	  <family>Persian_square</family>
+	  <family>Elham</family>
+	  </accept>
+	</alias>
+	<alias binding="same">
+	  <family>Sina</family>
+	  <accept><family>Persian_square</family></accept>
+	</alias>
+
+<!-- Font ordering per class -->
+
+	<!-- Persian_title class -->
+	<alias binding="same">
+	  <family>Persian_title</family>
+	  <accept>
+	  <family>Titr</family>
+	  <family>Jadid</family>
+	  <family>Persian_serif</family>
+	  </accept>
+	</alias>
+
+	<!-- Persian_fantasy class -->
+	<alias binding="same">
+	  <family>Persian_fantasy</family>
+	  <accept>
+	  <family>Homa</family>
+	  <family>Kamran</family>
+	  <family>Fantezi</family>
+	  <family>Tabassom</family>
+	  <family>Persian_square</family>
+	  </accept>
+	</alias>
+
+	<!-- Persian_square class -->
+	<alias binding="same">
+	  <family>Persian_square</family>
+	  <accept>
+	  <family>Arshia</family>
+	  <family>Elham</family>
+	  <family>Farnaz</family>
+	  <family>Nasim</family>
+	  <family>Sina</family>
+	  <family>Persian_serif</family>
+	  </accept>
+	</alias>
+
+<!-- Register the fonts that we actually do have -->
+
+	<match target="scan">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>Elham</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="scan">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>Homa</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="scan">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>Koodak</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="scan">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>Nazli</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="scan">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>Roya</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="scan">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>Terafik</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+	<match target="scan">
+		<test name="family" compare="eq" ignore-blanks="true">
+			<string>Titr</string>
+		</test>
+		<edit name="foundry">
+			<string>farsiweb</string>
+		</edit>
+	</match>
+
+
+<!-- Our fonts should oblique to the other side (TURNED-OFF) -->
+
+	<match target="font">
+		<test name="foundry">
+			<!--string>farsiweb</string-->
+			<string>TURNED-OFF</string>
+		</test>
+		<test name="foundry">
+			<string>farsiweb</string>
+		</test>
+		<!-- check to see if the font is roman -->
+		<test name="slant">
+			<const>roman</const>
+		</test>
+		<!-- check to see if the pattern requested non-roman -->
+		<test target="pattern" name="slant" compare="not_eq">
+			<const>roman</const>
+		</test>
+		<!-- multiply the matrix to slant the font -->
+		<edit name="matrix" mode="assign">
+			<times>
+				<name>matrix</name>
+				<matrix><double>1</double><double>-0.2</double>
+					<double>0</double><double>1</double>
+				</matrix>
+			</times>
+		</edit>
+		<!-- pretend the font is oblique now -->
+		<edit name="slant" mode="assign">
+			<const>oblique</const>
+		</edit>
+	</match>
+
+
+<!--
+  We can't hint our fonts well, so turn off hinting.
+  Moreover, the bitmaps we have designed (well, they
+  have designed), suck, so disable them too.
+  -->
+
+	<match target="font">
+		<test name="foundry">
+			<string>farsiweb</string>
+		</test>
+		<edit name="autohint">
+			<bool>false</bool>
+		</edit>
+		<edit name="hinting">
+			<bool>false</bool>
+		</edit>
+ 		<edit name="embeddedbitmap">
+ 			<bool>false</bool>
+ 		</edit>
+	</match>
+
+
+<!-- Alias our fonts to common families -->
+
+	<!-- Persian serif fonts -->
+	<alias>
+		<family>serif</family>
+		<accept>
+			<family>Nazli</family>
+			<family>Lotoos</family>
+			<family>Mitra</family>
+			<family>Ferdosi</family>
+			<family>Badr</family>
+			<family>Zar</family>
+		</accept>
+	</alias>
+
+	<!-- Persian sans-serif fonts -->
+	<alias>
+		<family>sans-serif</family>
+		<accept>
+			<family>Roya</family>
+			<family>Koodak</family>
+			<family>Terafik</family>
+		</accept>
+	</alias>
+
+	<!-- Persian monospace fonts -->
+	<alias>
+		<family>monospace</family>
+		<accept>
+			<!-- Not really monospace -->
+			<family>Terafik</family>
+		</accept>
+	</alias>
+
+	<!-- Persian fantasy fonts -->
+	<alias>
+		<family>fantasy</family>
+		<accept>
+			<family>Homa</family>
+			<family>Kamran</family>
+			<family>Fantezi</family>
+			<family>Tabassom</family>
+		</accept>
+	</alias>
+
+	<!-- Persian (and Urdu) Nastaliq/cursive fonts -->
+	<alias>
+		<family>cursive</family>
+		<accept>
+			<family>IranNastaliq</family>
+			<family>Nafees Nastaleeq</family>
+		</accept>
+	</alias>
+
+<!-- Use Titr in titles -->
+
+	<!-- Both serif... -->
+	<match>
+		<test name="family">
+			<string>serif</string>
+		</test>
+		<test name="weight" compare="more_eq">
+			<int>200</int>
+		</test>
+		<test name="size" compare="more_eq">
+			<double>24</double>
+		</test>
+		<edit name="family" mode="prepend">
+			<string>Titr</string>
+		</edit>
+	</match>
+
+	<!-- and sans-serif. -->
+	<match>
+		<test name="family">
+			<string>sans-serif</string>
+		</test>
+		<test name="weight" compare="more_eq">
+			<int>200</int>
+		</test>
+		<test name="size" compare="more_eq">
+			<double>24</double>
+		</test>
+		<edit name="family" mode="prepend">
+			<string>Titr</string>
+		</edit>
+	</match>
+
+	<!-- and more. -->
+	<match>
+		<test name="family">
+			<string>Persian_sansserif_default</string>
+		</test>
+		<test name="weight" compare="more_eq">
+			<int>200</int>
+		</test>
+		<test name="size" compare="more_eq">
+			<double>24</double>
+		</test>
+		<edit name="family" mode="prepend" binding="same">
+			<string>Titr</string>
+		</edit>
+	</match>
+
+
+<!-- Default substituted for deprecated sans-serif fonts -->
+
+	<match>
+		<test name="family">
+			<string>Persian_sansserif_default</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>Roya</string>
+		</edit>
+	</match>
+
+</fontconfig>

res/fonts/conf.d/65-khmer.conf

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+	<alias>
+		<family>serif</family>
+		<prefer>
+			<family>Khmer OS"</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>sans-serif</family>
+		<prefer>
+			<family>Khmer OS"</family>
+		</prefer>
+	</alias>
+</fontconfig>

res/fonts/conf.d/65-nonlatin.conf

@@ -0,0 +1,196 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+	<alias>
+		<family>serif</family>
+		<prefer>
+			<family>Artsounk</family> <!-- armenian -->
+			<family>BPG UTF8 M</family> <!-- georgian -->
+			<family>Kinnari</family> <!-- thai -->
+			<family>Norasi</family> <!-- thai -->
+			<family>Frank Ruehl</family> <!-- hebrew -->
+			<family>Dror</family>  <!-- hebrew -->
+			<family>JG LaoTimes</family>  <!-- lao -->
+			<family>Saysettha Unicode</family>  <!-- lao -->
+			<family>Pigiarniq</family> <!-- canadian syllabics -->
+			<family>B Davat</family> <!-- arabic (fa) -->
+			<family>B Compset</family>  <!-- arabic (fa) -->
+			<family>Kacst-Qr</family> <!-- arabic (ar) -->
+			<family>Urdu Nastaliq Unicode</family> <!-- arabic (ur) -->
+			<family>Raghindi</family> <!-- devanagari -->
+			<family>Mukti Narrow</family> <!-- bengali -->
+			<family>malayalam</family> <!-- malayalam -->
+			<family>Sampige</family> <!-- kannada -->
+			<family>padmaa</family> <!-- gujarati -->
+			<family>Hapax Berbère</family> <!-- tifinagh -->
+			<family>MS Mincho</family> <!-- han (ja) -->
+			<family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
+			<family>PMingLiu</family> <!-- han (zh-tw) -->
+			<family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
+			<family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
+			<family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
+			<family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
+			<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
+			<family>HanyiSong</family> <!-- han (zh-cn,zh-tw) -->
+			<family>MgOpen Canonica</family>
+			<family>Sazanami Mincho</family>
+			<family>IPAMonaMincho</family>
+			<family>IPAMincho</family>
+			<family>Kochi Mincho</family>
+			<family>AR PL SungtiL GB</family>
+			<family>AR PL Mingti2L Big5</family>
+ 			<family>AR PL Zenkai Uni</family>
+			<family>ＭＳ 明朝</family>
+ 			<family>ZYSong18030</family>
+			<family>NanumMyeongjo</family> <!-- hangul (ko) -->
+			<family>UnBatang</family> <!-- hangul (ko) -->
+			<family>Baekmuk Batang</family> <!-- hangul (ko) -->
+ 			<family>KacstQura</family>
+ 			<family>Frank Ruehl CLM</family>
+			<family>Lohit Bengali</family>
+ 			<family>Lohit Gujarati</family>
+ 			<family>Lohit Hindi</family>
+			<family>Lohit Marathi</family>
+			<family>Lohit Maithili</family>
+			<family>Lohit Kashmiri</family>
+			<family>Lohit Konkani</family>
+			<family>Lohit Nepali</family>
+			<family>Lohit Sindhi</family>
+ 			<family>Lohit Punjabi</family>
+ 			<family>Lohit Tamil</family>
+			<family>Meera</family>
+			<family>Lohit Malayalam</family>
+ 			<family>Lohit Kannada</family>
+ 			<family>Lohit Telugu</family>
+ 			<family>Lohit Oriya</family>
+ 			<family>LKLUG</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>sans-serif</family>
+		<prefer>
+			<family>Nachlieli</family> <!-- hebrew -->
+			<family>Lucida Sans Unicode</family>
+			<family>Yudit Unicode</family>
+			<family>Kerkis</family> <!-- greek -->
+			<family>ArmNet Helvetica</family> <!-- armenian -->
+			<family>Artsounk</family> <!-- armenian -->
+			<family>BPG UTF8 M</family> <!-- georgian -->
+			<family>Waree</family> <!-- thai -->
+			<family>Loma</family> <!-- thai -->
+			<family>Garuda</family> <!-- thai -->
+			<family>Umpush</family> <!-- thai -->
+			<family>Saysettha Unicode</family> <!-- lao? -->
+			<family>JG Lao Old Arial</family> <!-- lao -->
+			<family>GF Zemen Unicode</family> <!-- ethiopic -->
+			<family>Pigiarniq</family> <!-- canadian syllabics -->
+			<family>B Davat</family> <!-- arabic (fa) -->
+			<family>B Compset</family> <!-- arabic (fa) -->
+			<family>Kacst-Qr</family> <!-- arabic (ar) -->
+			<family>Urdu Nastaliq Unicode</family> <!-- arabic (ur) -->
+			<family>Raghindi</family> <!-- devanagari -->
+			<family>Mukti Narrow</family> <!-- bengali -->
+			<family>malayalam</family> <!-- malayalam -->
+			<family>Sampige</family> <!-- kannada -->
+			<family>padmaa</family> <!-- gujarati -->
+			<family>Hapax Berbère</family> <!-- tifinagh -->
+			<family>MS Gothic</family> <!-- han (ja) -->
+			<family>UmePlus P Gothic</family> <!-- han (ja) -->
+			<!-- chinese fonts are actually serifed -->
+			<family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
+			<family>PMingLiu</family> <!-- han (zh-tw) -->
+			<family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
+			<family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
+			<family>AR PL ShanHeiSun Uni</family> <!--han (ja,zh-cn,zh-tw) -->
+			<family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
+			<family>MgOpen Modata</family>
+			<family>VL Gothic</family>
+			<family>IPAMonaGothic</family>
+			<family>IPAGothic</family>
+			<family>Sazanami Gothic</family>
+			<family>Kochi Gothic</family>
+			<family>AR PL KaitiM GB</family>
+			<family>AR PL KaitiM Big5</family>
+ 			<family>AR PL ShanHeiSun Uni</family>
+ 			<family>AR PL SungtiL GB</family>
+ 			<family>AR PL Mingti2L Big5</family>
+			<family>ＭＳ ゴシック</family>
+			<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
+			<family>TSCu_Paranar</family> <!-- tamil -->
+			<family>NanumGothic</family> <!-- hangul (ko) -->
+			<family>UnDotum</family> <!-- hangul (ko) -->
+			<family>Baekmuk Dotum</family> <!-- hangul (ko) -->
+ 			<family>Baekmuk Gulim</family> <!-- hangul (ko) -->
+ 			<family>KacstQura</family>
+			<family>Lohit Bengali</family>
+ 			<family>Lohit Gujarati</family>
+ 			<family>Lohit Hindi</family>
+			<family>Lohit Marathi</family>
+			<family>Lohit Maithili</family>
+			<family>Lohit Kashmiri</family>
+			<family>Lohit Konkani</family>
+			<family>Lohit Nepali</family>
+			<family>Lohit Sindhi</family>
+ 			<family>Lohit Punjabi</family>
+ 			<family>Lohit Tamil</family>
+			<family>Meera</family>
+ 			<family>Lohit Malayalam</family>
+ 			<family>Lohit Kannada</family>
+ 			<family>Lohit Telugu</family>
+ 			<family>Lohit Oriya</family>
+ 			<family>LKLUG</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>monospace</family>
+		<prefer>
+			<family>Miriam Mono</family> <!-- hebrew -->
+			<family>VL Gothic</family>
+			<family>IPAMonaGothic</family>
+			<family>IPAGothic</family>
+			<family>Sazanami Gothic</family>
+			<family>Kochi Gothic</family>
+			<family>AR PL KaitiM GB</family>
+			<family>MS Gothic</family> <!-- han (ja) -->
+			<family>UmePlus Gothic</family> <!-- han (ja) -->
+			<family>NSimSun</family> <!-- han (zh-cn,zh-tw) -->
+			<family>MingLiu</family> <!-- han (zh-tw) -->
+			<family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
+			<family>AR PL New Sung Mono</family> <!-- han (zh-cn,zh-tw) -->
+			<family>HanyiSong</family> <!-- han (zh-cn) -->
+			<family>AR PL SungtiL GB</family>
+			<family>AR PL Mingti2L Big5</family>
+			<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
+			<family>NanumGothicCoding</family> <!-- hangul (ko) -->
+			<family>NanumGothic</family> <!-- hangul (ko) -->
+			<family>UnDotum</family> <!-- hangul (ko) -->
+			<family>Baekmuk Dotum</family> <!-- hangul (ko) -->
+			<family>Baekmuk Gulim</family> <!-- hangul (ko) -->
+			<family>TlwgTypo</family> <!-- thai -->
+			<family>TlwgTypist</family> <!-- thai -->
+			<family>TlwgTypewriter</family> <!-- thai -->
+			<family>TlwgMono</family> <!-- thai -->
+			<family>Hasida</family> <!-- hebrew -->
+			<family>Mitra Mono</family> <!-- bengali -->
+			<family>GF Zemen Unicode</family> <!-- ethiopic -->
+			<family>Hapax Berbère</family> <!-- tifinagh -->
+			<family>Lohit Bengali</family>
+			<family>Lohit Gujarati</family>
+			<family>Lohit Hindi</family>
+			<family>Lohit Marathi</family>
+			<family>Lohit Maithili</family>
+			<family>Lohit Kashmiri</family>
+			<family>Lohit Konkani</family>
+			<family>Lohit Nepali</family>
+			<family>Lohit Sindhi</family>
+			<family>Lohit Punjabi</family>
+			<family>Lohit Tamil</family>
+			<family>Meera</family>
+			<family>Lohit Malayalam</family>
+			<family>Lohit Kannada</family>
+			<family>Lohit Telugu</family>
+			<family>Lohit Oriya</family>
+			<family>LKLUG</family>
+		</prefer>
+	</alias>
+</fontconfig>

res/fonts/conf.d/69-unifont.conf

@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+	<alias>
+		<family>serif</family>
+		<prefer>
+			<family>FreeSerif</family>
+			<family>Code2000</family>
+			<family>Code2001</family> <!-- plane1 and beyond -->
+		</prefer>
+	</alias>
+	<alias>
+		<family>sans-serif</family>
+		<prefer>
+			<family>FreeSans</family>
+			<family>Arial Unicode MS</family>
+			<family>Arial Unicode</family>
+			<family>Code2000</family> <!-- almost everything; serif actually -->
+			<family>Code2001</family> <!-- plane1 and beyond -->
+		</prefer>
+	</alias>
+	<alias>
+		<family>monospace</family>
+		<prefer>
+			<family>FreeMono</family>
+		</prefer>
+	</alias>
+</fontconfig>

res/fonts/conf.d/70-yes-bitmaps.conf

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- Accept bitmap fonts -->
+ <selectfont>
+  <acceptfont>
+   <pattern>
+     <patelt name="scalable"><bool>false</bool></patelt>
+   </pattern>
+  </acceptfont>
+ </selectfont>
+</fontconfig>

res/fonts/conf.d/80-delicious.conf

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- Fix-ups for Delicious family -->
+
+<!-- Delicious 'heavy' variant says its Medium weight -->
+<match target="scan">
+	<test name="family" compare="eq" ignore-blanks="true">
+		<string>Delicious</string>
+	</test>
+	<test name="style">
+		<string>Heavy</string>
+	</test>
+	<edit name="weight">
+		<const>heavy</const>
+	</edit>
+</match>
+
+</fontconfig>

res/fonts/conf.d/90-synthetic.conf

@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- 
+ Artificial oblique for fonts without an italic or oblique version
+ -->
+ 
+	<match target="font">
+		<!-- check to see if the font is roman -->
+		<test name="slant">
+			<const>roman</const>
+		</test>
+		<!-- check to see if the pattern requested non-roman -->
+		<test target="pattern" name="slant" compare="not_eq">
+			<const>roman</const>
+		</test>
+		<!-- multiply the matrix to slant the font -->
+		<edit name="matrix" mode="assign">
+			<times>
+				<name>matrix</name>
+				<matrix><double>1</double><double>0.2</double>
+					<double>0</double><double>1</double>
+				</matrix>
+			</times>
+		</edit>
+		<!-- pretend the font is oblique now -->
+		<edit name="slant" mode="assign">
+			<const>oblique</const>
+		</edit>
+		<!-- and disable embedded bitmaps for artificial oblique -->
+		<edit name="embeddedbitmap" mode="assign">
+			<bool>false</bool>
+		</edit>
+	</match>
+
+<!--
+ Synthetic emboldening for fonts that do not have bold face available
+ -->
+
+	<match target="font">
+		<!-- check to see if the font is just regular -->
+		<test name="weight" compare="less_eq">
+			<const>medium</const>
+		</test>
+		<!-- check to see if the pattern requests bold -->
+		<test target="pattern" name="weight" compare="more">
+			<const>medium</const>
+		</test>
+		<!--
+		  set the embolden flag
+		  needed for applications using cairo, e.g. gucharmap, gedit, ...
+		-->
+		<edit name="embolden" mode="assign">
+			<bool>true</bool>
+		</edit>
+		<!--
+		 set weight to bold
+		 needed for applications using Xft directly, e.g. Firefox, ...
+		-->
+		<edit name="weight" mode="assign">
+			<const>bold</const>
+		</edit>
+	</match>
+</fontconfig>

res/fonts/fonts.template.conf

@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/fonts.conf file to configure system font access -->
+<fontconfig>
+
+<!--
+	DO NOT EDIT THIS FILE.
+	IT WILL BE REPLACED WHEN FONTCONFIG IS UPDATED.
+	LOCAL CHANGES BELONG IN 'local.conf'.
+
+	The intent of this standard configuration file is to be adequate for
+	most environments.  If you have a reasonably normal environment and
+	have found problems with this configuration, they are probably
+	things that others will also want fixed.  Please submit any
+	problems to the fontconfig bugzilla system located at fontconfig.org
+
+	Note that the normal 'make install' procedure for fontconfig is to
+	replace any existing fonts.conf file with the new version.  Place
+	any local customizations in local.conf which this file references.
+
+	Keith Packard
+-->
+
+<!-- Font directory list -->
+
+	<dir>WINDOWSFONTDIR</dir>
+
+	<dir prefix="xdg">fonts</dir>
+	<!-- the following element will be removed in the future -->
+	<dir>~/.fonts</dir>
+
+<!--
+  Accept deprecated 'mono' alias, replacing it with 'monospace'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>mono</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>monospace</string>
+		</edit>
+	</match>
+
+<!--
+  Accept alternate 'sans serif' spelling, replacing it with 'sans-serif'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans serif</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+
+<!--
+  Accept deprecated 'sans' alias, replacing it with 'sans-serif'
+-->
+	<match target="pattern">
+		<test qual="any" name="family">
+			<string>sans</string>
+		</test>
+		<edit name="family" mode="assign" binding="same">
+			<string>sans-serif</string>
+		</edit>
+	</match>
+
+<!--
+  Load local system customization file
+-->
+<!--(CONFD)-->
+
+<!-- Font cache directory list -->
+
+	<cachedir>LOCAL_APPDATA_FONTCONFIG_CACHE</cachedir>
+	<cachedir prefix="xdg">fontconfig</cachedir>
+	<!-- the following element will be removed in the future -->
+	<cachedir>~/.fontconfig</cachedir>
+
+	<config>
+<!--
+  Rescan configuration every 30 seconds when FcFontSetList is called
+ -->
+		<rescan>
+			<int>30</int>
+		</rescan>
+	</config>
+
+</fontconfig>

settings.cpp

@@ -1,83 +0,0 @@
-#include "settings.hpp"
-#include <filesystem>
-#include <fstream>
-
-SettingsManager::SettingsManager(std::string filename)
-    : m_filename(filename) {
-    if (!std::filesystem::exists(filename)) {
-        std::fstream fs;
-        fs.open(filename, std::ios::out);
-        fs.close();
-    }
-
-    auto rc = m_ini.LoadFile(filename.c_str());
-    m_ok = rc == SI_OK;
-}
-
-void SettingsManager::Reload() {
-    m_ok = m_ini.LoadFile(m_filename.c_str()) == SI_OK;
-}
-
-std::string SettingsManager::GetSettingString(const std::string &section, const std::string &key, std::string fallback) const {
-    return m_ini.GetValue(section.c_str(), key.c_str(), fallback.c_str());
-}
-
-int SettingsManager::GetSettingInt(const std::string &section, const std::string &key, int fallback) const {
-    return std::stoul(GetSettingString(section, key, std::to_string(fallback)));
-}
-
-bool SettingsManager::GetSettingBool(const std::string &section, const std::string &key, bool fallback) const {
-    return GetSettingString(section, key, fallback ? "true" : "false") != "false";
-}
-
-bool SettingsManager::IsValid() const {
-    return m_ok;
-}
-
-void SettingsManager::Close() {
-    m_ini.SaveFile(m_filename.c_str());
-}
-
-bool SettingsManager::GetUseMemoryDB() const {
-    return GetSettingBool("discord", "memory_db", false);
-}
-
-std::string SettingsManager::GetUserAgent() const {
-    return GetSettingString("http", "user_agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Safari/537.36");
-}
-
-std::string SettingsManager::GetDiscordToken() const {
-    return GetSettingString("discord", "token");
-}
-
-bool SettingsManager::GetShowMemberListDiscriminators() const {
-    return GetSettingBool("gui", "member_list_discriminator", true);
-}
-
-bool SettingsManager::GetShowEmojis() const {
-    return GetSettingBool("gui", "emojis", true);
-}
-
-std::string SettingsManager::GetLinkColor() const {
-    return GetSettingString("misc", "linkcolor", "rgba(40, 200, 180, 255)");
-}
-
-int SettingsManager::GetCacheHTTPConcurrency() const {
-    return GetSettingInt("http", "concurrent", 20);
-}
-
-bool SettingsManager::GetPrefetch() const {
-    return GetSettingBool("discord", "prefetch", false);
-}
-
-std::string SettingsManager::GetMainCSS() const {
-    return GetSettingString("gui", "css", "./css/main.css");
-}
-
-bool SettingsManager::GetShowAnimations() const {
-    return GetSettingBool("gui", "animations", true);
-}
-
-bool SettingsManager::GetShowOwnerCrown() const {
-    return GetSettingBool("gui", "owner_crown", true);
-}