cinera.c: Fix stack-use-after-return segfault

The ClashResolver, or a memory_book variable therein, triggered a stack-use-after-return segfault. Fixed by initialising the ClashResolver in main() and passing it to InitClashResolver() by pointer, rather than initialising it in InitClashResolver().
cinera.c: Fix colouring of topic dots
2024-03-12 13:03:08 +00:00 · 2024-02-21 20:52:34 +00:00 · 2024-01-30 15:41:30 +00:00 · 2023-03-25 01:51:40 +00:00 · 2023-03-25 01:31:13 +00:00 · 2023-03-25 00:04:34 +00:00
12 changed files with 6536 additions and 3765 deletions
--- a/README.md
+++ b/README.md
@ -5,23 +5,26 @@ deployment
 ### Install the dependencies
-1. flex (for hmmlib)
+1. curl
 2. curl (for cinera)
-### Download, and prepare the parser
+### Download, and copy the parser into place
-1. `git clone git@gitssh.handmade.network:Annotation-Pushers/Annotation-System.git`
+1. `git clone https://git.handmade.network/Annotation-Pushers/Annotation-System.git`
-2. `cd Annotation-System/hmmlib`
+2. `cd Annotation-System/cinera`
-3. `make`
+3. `cp ../hmmlib2/hmmlib.h .`
 4. `cp hmml.a hmmlib.h ../cinera/`
 5. `cd ../cinera/`
-Note: For each parser update, remember to make and copy it into place.
+Note: For each parser update, remember to copy it into place.
 ### Build
 1. `$SHELL cinera.c`
 ### Configure
    cinera -h
 This documents the configuration file format and default settings.
 ### Configure the server
 If you enforce a strict Content Security Policy and X-Frame-Options in your
@ -38,56 +41,24 @@ and [Hardening your HTTP response headers](https://scotthelme.co.uk/hardening-yo
 ### Run
-#### Single Edition operation
+    cinera -c /path/to/config.conf
    cinera test.hmml
 This simply generates an HTML file (and updates `cinera_topics.css` if needed)
 from `test.hmml` and outputs to `out.html` (configurable with -o).
 #### Project Edition operation
    cinera -p ProjectID
 Setting the ProjectID with the `-p` flag triggers Project Edition. In this
 edition _Cinera_ monitors the Project Input Directory for new, edited and
 deleted .hmml files, and generates one table of contents / search page and a
 player page each for valid sets of annotations (or removes them, if needed).
 By default all directories - input and output - are set to the current working
 directory. Typical operation will involve setting these flags:
    -d Project Input Directory, the directory where the .hmml files reside
    -r Asset Root Directory, path shallower than or equal to the CSS, Images and
       JS directories
    -R Asset Root URL, corresponding to the Root Directory
    -c CSS Directory, relative to Root
    -i Images Directory, relative to Root
    -j JS Directory, relative to Root
    -b Output Base Directory, location of the table of contents / search page
    -B Output Base URL, corresponding to the Output Base Directory
    -t Template Directory
    -x Search Template Location, relative to Template Directory
    -y Player Template Location, relative to Template Directory
 #### Templates
-*Search Template*
+*(Global) Search Template*
 - `<!-- __CINERA_INCLUDES__ -->` _to put inside your own `<head></head>`_
 - `<!-- __CINERA_SEARCH__ -->` _the table of contents and search functionality_
 *Player Template*
 - `<!-- __CINERA_INCLUDES__ -->` _to put inside your own `<head></head>`_
 - `<!-- __CINERA_MENUS__ -->`
 - `<!-- __CINERA_PLAYER__ -->`
 - `<!-- __CINERA_SCRIPT__ -->` _must come after `<!-- __CINERA_MENUS__ -->` and `<!-- __CINERA_PLAYER__ -->`_
 *Optional tags available for use in your Player Template*
 - `<!-- __CINERA_TITLE__ -->`
 - `<!-- __CINERA_VIDEO_ID__ -->`
 - `<!-- __CINERA_VOD_PLATFORM__ -->`
-*Other tags available for use in either template*
+*Other tags available for use in any template*
 - Asset tags:
   - `<!-- __CINERA_ASSET__ path.ext -->`
       General purpose tag that outputs the URL of the specified asset
@ -96,28 +67,50 @@ directory. Typical operation will involve setting these flags:
       General purpose tag that outputs the URL of the specified asset
       relative to the Images Directory (-i)
   - `<!-- __CINERA_CSS__ path.ext -->`
-       Convenience tag that outputs a <link rel="stylesheet"...> node
+       Convenience tag that outputs a `<link rel="stylesheet"...>` node
       for the specified asset relative to the CSS Directory (-c), for
-       use inside your <head> block
+       use inside your `<head>` block
   - `<!-- __CINERA_JS__ path.ext -->`
-       Convenience tag that outputs a <script type="text/javascript"...>
+       Convenience tag that outputs a `<script type="text/javascript"...>`
       node for the specified asset relative to the JS Directory (-j),
-       for use wherever a <script> node is valid
+       for use wherever a `<script>` node is valid
 The path.ext in these tags supports parent directories to locate the
 asset file relative to its specified type directory (generic, CSS, image
 or JS), including the "../" directory, and paths containing spaces must
 be surrounded with double-quotes (\-escapable if the quoted path itself
 contains double-quotes).
-All these asset tags additionally perform revving, appending a query
+All these asset tags additionally perform versioning, appending a query string
-string (-Q) and the file's checksum to the URL. Changes to a file
+(-Q) and the file's checksum to the URL. Changes to a file trigger a rehash and
-trigger a rehash and edit of all HTML pages citing this asset.
+edit of all HTML pages citing this asset.
 - Navigation / Menu tags:
    - `<!-- __CINERA_NAV__ -->`
        This menu will contain only the current project, its siblings and
        subprojects of both the aforementioned
    - `<!-- __CINERA_GLOBAL_NAV__ -->`
        This menu will contain every project in the configuration
 These navigation tags additionally take one parameter, e.g.
 `<!-- __CINERA_NAV__ horizontal -->`:
    - `dropdown`
        A dropdown menu, that opens on hover
    - `horizontal`
        More-or-less the same as `dropdown`, but always open
    - `plain`
        A straightforward `<ul>` for you to style how you like
 - `<!-- __CINERA_PROJECT__ -->`
    The project's `html_title` if configured, otherwise its `title`
 - `<!-- __CINERA_PROJECT_PLAIN__ -->`
    The project's `title`
 - `<!-- __CINERA_PROJECT_ID__ -->`
 - `<!-- __CINERA_PROJECT_LINEAGE__ -->`
    The IDs of all projects from the root to the current project, separated
    by a spaced-slash
 - `<!-- __CINERA_SEARCH_URL__ -->`
 - `<!-- __CINERA_THEME__ -->`
- `<!-- __CINERA_URL__ -->` _Only really usable if BaseURL is set (-B)_
+- `<!-- __CINERA_URL__ -->`
 - `<!-- __CINERA_CUSTOM0__ -->`
 - `<!-- __CINERA_CUSTOM1__ -->`
 - `<!-- __CINERA_CUSTOM2__ -->`
@ -135,106 +128,15 @@ invalid, _Cinera_ will tell you what's wrong.
 #### Arguments
-    Usage: ./cinera [option(s)] filename(s)
+    Usage: ./cinera [option(s)]
    Options:
-        Paths: (advisedly universal, but may be set per-(sub)project as required)
+        -c <config file path>
-            -r <assets root directory>
+            Set the main config file path
-                Override default assets root directory (".")
+            Defaults to: $XDG_CONFIG_HOME/cinera/cinera.conf
-            -R <assets root URL>
+        -0
-                Override default assets root URL ("")
+            Dry-run mode. Parse and print the config, but do not modify the
-                IMPORTANT: -r and -R must correspond to the same location
+            filesystem
                UNSUPPORTED: If you move files from RootDir, the RootURL should
                correspond to the resulting location
                -c <CSS directory path>
                    Override default CSS directory (""), relative to root
                -i <images directory path>
                    Override default images directory (""), relative to root
                -j <JS directory path>
                    Override default JS directory (""), relative to root
                -Q <revved resources query string>
                    Override default query string ("r")
                    To disable revved resources, set an empty string with -Q ""
        Project Settings:
            -p <project ID>
                Set the project ID, triggering PROJECT EDITION
            -m <default medium>
                Override default default medium ("programming")
                Known project defaults:
                    bitwise:        programming
                    book:           research
                    coad:           research
                    reader:         research
                    riscy:          programming
                    risc:           speech
                    chat:           speech
                    code:           programming
                    intro-to-c:     programming
                    misc:           admin
                    ray:            programming
                    hmdshow:        speech
                    lecture:        speech
                    stream:         programming
                    special:        programming
                    obbg:           programming
                    sysadmin:       admin
            -s <style>
                Set the style / theme, corresponding to a cinera__*.css file
                This is equal to the "project" field in the HMML files by default
        Project Input Paths
            -d <annotations directory>
                Override default annotations directory (".")
            -t <templates directory>
                Override default templates directory (".")
                -x <search template location>
                    Set search template file path, either absolute or relative to
                    template directory, and enable integration
                -y <player template location>
                    Set player template file path, either absolute or relative
                    to template directory, and enable integration
        Project Output Paths
            -b <base output directory>
                Override project's default base output directory (".")
            -B <base URL>
                Override default base URL ("")
                NOTE: This must be set, if -n or -a are to be used
                -n <search location>
                    Override default search location (""), relative to base
                -a <player location>
                    Override default player location (""), relative to base
                NOTE: The PlayerURLPrefix is currently hardcoded in cinera.c but
                      will be configurable in the full configuration system
        Single Edition Output Path
            -o <output location>
                Override default output player location ("out.html")
        -1
            Open search result links in the same browser tab
                NOTE: Ideal for a guide embedded in an iframe
        -f
            Force integration with an incomplete template
        -g
            Ignore video privacy status
                NOTE: For use with projects whose videos are known to all be public,
                to save us having to check their privacy status
        -q
            Quit after syncing with annotation files in project input directory
            UNSUPPORTED: This is likely to be removed in the future
        -w
            Force quote cache rebuild (memory aid: "wget")
        -l <n>
            Override default log level (0), where n is from 0 (terse) to 7 (verbose)
        -u <seconds>
            Override default update interval (4)
        -e
            Display (examine) database and exit
        -v
--- a/cinera/cinera.c
+++ b/cinera/cinera.c
--- a/cinera/cinera.css
+++ b/cinera/cinera.css
@ -506,15 +506,16 @@ ul.cineraNavPlain li.current > a {
 .cineraMenus > .cineraHelp,
 .cineraHelp {
    cursor: pointer;
    box-sizing: content-box;
    border: 1px solid;
    border-radius: 4px;
-    height: 6px;
+    height: .5rem;
    width: .5rem;
    padding: 4px;
    width: 6px;
    margin: 2px;
    font-size: .75rem;
    font-weight: bold;
-    line-height: 6px;
+    line-height: .5rem;
    text-align: center;
    z-index: 64;
 }
@ -539,6 +540,16 @@ ul.cineraNavPlain li.current > a {
    display: block;
 }
 .cineraHelp .help_container .help_custom_index {
    background-color: #159 !important;
 }
 .cineraHelp .help_container h2 .help_title_key {
    padding: .2em;
    border: 1px solid;
    border-radius: 4px;
 }
 .cineraHelp .help_container .help_key {
    box-sizing: content-box;
    font-family: Inconsolata;
@ -613,12 +624,11 @@ ul.cineraNavPlain li.current > a {
 .cineraMenus > .menu .credits_container {
    border: 1px solid;
    border-top: none;
-    display: none;
+    z-index: -1; /* NOTE(matt): Using "display: none" to hide them proved problematic for scrolling non-visible menus */
    overflow-y: auto;
    position: absolute;
    right: 0;
    top: 100%;
    z-index: 8;
 }
 .cineraMenus > .menu .refs,
@ -638,7 +648,7 @@ ul.cineraNavPlain li.current > a {
 }
 .cineraMenus > .menu .visible {
-    display: block;
+    z-index: 8;
 }
 .cineraMenus > .menu > .refs .ref {
@ -736,6 +746,11 @@ ul.cineraNavPlain li.current > a {
    margin-right: 4px;
 }
 .cineraMenus > .menu > .filter_container .filter_header {
    position: sticky;
    top: 0;
 }
 .cineraMenus > .menu > .filter_container .filter_mode,
 .cineraMenus > .menu > .link_container #cineraLinkMode {
    cursor: pointer;
@ -755,11 +770,13 @@ ul.cineraNavPlain li.current > a {
    text-align: center;
 }
 .cineraMenus > .menu > .filter_container .filter_header .filter_titles,
 .cineraMenus > .menu > .filter_container .filters {
    display: flex;
    flex-flow: row nowrap;
 }
 .cineraMenus > .menu > .filter_container .filter_header .filter_titles > *,
 .cineraMenus > .menu > .filter_container .filters > * {
    width: 50%;
    flex-grow: 1;
@ -968,6 +985,7 @@ ul.cineraNavPlain li.current > a {
 .cineraMenus > .menu > .filter_container .filter_content .category,
 .cineraPlayerContainer .markers_container > .markers .marker .cineraContent .cineraCategories .category {
    box-sizing: content-box;
    border-radius: 50%;
    height: 5px;
    width: 5px;
--- a/cinera/cinera_config.c
+++ b/cinera/cinera_config.c
--- a/cinera/cinera_player_post.js
+++ b/cinera/cinera_player_post.js
@ -1,40 +1,5 @@
 var cinera = document.querySelector(".cinera");
 var baseURL = location.hash ? (location.toString().substr(0, location.toString().length - location.hash.length)) : location;
 var originalTextContent = {
    TitleQuotes: null,
    TitleReferences: null,
    TitleCredits: null,
    EpisodePrev: null,
    EpisodeNext: null,
 };
 var menuState = [];
 var titleBar = cinera.querySelector(".cineraMenus");
 var quotesMenu = null;
 var referencesMenu = null;
 var filterMenu = null;
 var viewsMenu = null;
 var linkMenu = null;
 var creditsMenu = null;
 var sourceMenus = null;
 var helpButton = null;
 var helpDocumentation = null;
 // NOTE(matt):  One set of markers per page. There is code to support multiple, which we may want to extend everywhere
 var MarkersContainer = cinera.querySelector(".markers_container");
 var views = {
    REGULAR: 0,
    THEATRE: 1,
    SUPERTHEATRE: 2,
 };
 var devices = {
    DESKTOP: 0,
    MOBILE: 1,
 };
 var CineraProps = {
    C: null,
    V: views.REGULAR,
@ -57,275 +22,19 @@ var CineraProps = {
 };
 CineraProps.O = GetRealOrientation(orientations.LANDSCAPE_LEFT, CineraProps.IsMobile);
 if(titleBar)
 {
    quotesMenu = titleBar.querySelector(".quotes_container");
    if(quotesMenu)
    {
        originalTextContent.TitleQuotes = quotesMenu.previousElementSibling.textContent;
        menuState.push(quotesMenu);
        var quoteItems = quotesMenu.querySelectorAll(".ref");
        if(quoteItems)
        {
            for(var i = 0; i < quoteItems.length; ++i)
            {
                quoteItems[i].addEventListener("mouseenter", function(ev) {
                    mouseOverQuotes(this);
                })
            };
        }
        var quoteTimecodes = quotesMenu.querySelectorAll(".refs .ref .ref_indices .timecode");
        for (var i = 0; i < quoteTimecodes.length; ++i) {
            quoteTimecodes[i].addEventListener("click", function(ev) {
                if (player) {
                    var time = ev.currentTarget.getAttribute("data-timestamp");
                    mouseSkipToTimecode(player, time, ev);
                }
            });
        }
        var lastFocusedQuote = null;
    }
    referencesMenu = titleBar.querySelector(".references_container");
    if(referencesMenu)
    {
        originalTextContent.TitleReferences = referencesMenu.previousElementSibling.textContent;
        menuState.push(referencesMenu);
        var referenceItems = referencesMenu.querySelectorAll(".ref");
        if(referenceItems)
        {
            for(var i = 0; i < referenceItems.length; ++i)
            {
                referenceItems[i].addEventListener("mouseenter", function(ev) {
                    mouseOverReferences(this);
                })
            };
            var lastFocusedReference = null;
            var lastFocusedIdentifier = null;
        }
        var refTimecodes = referencesMenu.querySelectorAll(".refs .ref .ref_indices .timecode");
        for (var i = 0; i < refTimecodes.length; ++i) {
            refTimecodes[i].addEventListener("click", function(ev) {
                if (player) {
                    var time = ev.currentTarget.getAttribute("data-timestamp");
                    mouseSkipToTimecode(player, time, ev);
                }
            });
        }
    }
    if(referencesMenu || quotesMenu)
    {
        var refSources = titleBar.querySelectorAll(".refs .ref"); // This is for both quotes and refs
        for (var i = 0; i < refSources.length; ++i) {
            refSources[i].addEventListener("click", function(ev) {
                if (player) {
                    player.pause();
                }
            });
        }
    }
    filterMenu = titleBar.querySelector(".filter_container");
    if(filterMenu)
    {
        menuState.push(filterMenu);
        var lastFocusedCategory = null;
        var lastFocusedTopic = null;
        var lastFocusedMedium = null;
        var filter = filterMenu.parentNode;
        var filterModeElement = filter.querySelector(".filter_mode");
        filterModeElement.addEventListener("click", function(ev) {
            ev.stopPropagation();
            toggleFilterMode();
        });
        var filterMode = filterModeElement.classList[1];
        var filterItems = filter.querySelectorAll(".filter_content");
        var filterInitState = new Object();
        var filterState = new Object();
        for(var i = 0; i < filterItems.length; ++i)
        {
            filterItems[i].addEventListener("mouseenter", function(ev) {
                navigateFilter(this);
            })
            filterItems[i].addEventListener("click", function(ev) {
                ev.stopPropagation();
                filterItemToggle(this);
            });
            var filterItemName = filterItems[i].classList.item(1);
            if(filterItems[i].parentNode.classList.contains("filter_topics"))
            {
                filterInitState[filterItemName] = { "type" : "topic", "off": (filterItems[i].classList.item(2) == "off") };
                filterState[filterItemName] = { "type" : "topic", "off": (filterItems[i].classList.item(2) == "off") };
            }
            else
            {
                filterInitState[filterItemName] = { "type" : "medium", "off": (filterItems[i].classList.item(2) == "off") };
                filterState[filterItemName] = { "type" : "medium", "off": (filterItems[i].classList.item(2) == "off") };
            }
        }
    }
    viewsMenu = titleBar.querySelector(".views");
    if(viewsMenu && !CineraProps.IsMobile)
    {
        menuState.push(viewsMenu);
        var viewsContainer = viewsMenu.querySelector(".views_container");
        viewsMenu.addEventListener("mouseenter", function(ev) {
            handleMouseOverViewsMenu();
        });
        viewsMenu.addEventListener("mouseleave", function(ev) {
            viewsContainer.style.display = "none";
        });
        var viewItems = viewsMenu.querySelectorAll(".view");
        for(var i = 0; i < viewItems.length; ++i)
        {
            viewItems[i].addEventListener("click", function(ev) {
                switch(this.getAttribute("data-id"))
                {
                    case "regular":
                    case "theatre":
                        {
                            toggleTheatreMode();
                        } break;
                    case "super":
                        {
                            toggleSuperTheatreMode();
                        } break;
                }
            });
        }
    }
    linkMenu = titleBar.querySelector(".link_container");
    linkTimestamp = true;
    if(linkMenu)
    {
        menuState.push(linkMenu);
        var linkMode = linkMenu.querySelector("#cineraLinkMode");
        var link = linkMenu.querySelector("#cineraLink");
        linkMode.addEventListener("click", function(ev) {
            ev.stopPropagation();
            toggleLinkMode(linkMode, link);
        });
        link.addEventListener("click", function(ev) {
            CopyToClipboard(link);
            toggleMenuVisibility(linkMenu);
        });
    }
    creditsMenu = titleBar.querySelector(".credits_container");
    if(creditsMenu)
    {
        originalTextContent.TitleCredits = creditsMenu.previousElementSibling.textContent;
        menuState.push(creditsMenu);
        var lastFocusedCreditItem = null;
        var creditItems = creditsMenu.querySelectorAll(".person, .support");
        for(var i = 0; i < creditItems.length; ++i)
        {
            creditItems[i].addEventListener("mouseenter", function(ev) {
                if(this != lastFocusedCreditItem)
                {
                    lastFocusedCreditItem.classList.remove("focused");
                    unfocusSprite(lastFocusedCreditItem);
                    if(lastFocusedCreditItem.classList.contains("support"))
                    {
                        setSpriteLightness(lastFocusedCreditItem.firstChild);
                    }
                    lastFocusedCreditItem = this;
                    focusedElement = lastFocusedCreditItem;
                    focusedElement.classList.add("focused");
                    focusSprite(focusedElement);
                    if(focusedElement.classList.contains("support"))
                    {
                        setSpriteLightness(focusedElement.firstChild);
                    }
                }
            });
            if(creditItems[i].tagName == "A")
            {
                creditItems[i].addEventListener("click", function(ev) {
                    if(player)
                    {
                        player.pause();
                    }
                });
            }
        }
    }
    sourceMenus = titleBar.querySelectorAll(".menu");
    helpButton = titleBar.querySelector(".cineraHelp");
    helpDocumentation = helpButton.querySelector(".help_container");
    BindHelp(helpButton, helpDocumentation);
 }
 var focusedElement = null;
 var focusedIdentifier = null;
 var playerContainer = cinera.querySelector(".cineraPlayerContainer")
 var prevEpisode = playerContainer.querySelector(".episodeMarker.prev");
 if(prevEpisode) { originalTextContent.EpisodePrev = prevEpisode.firstChild.textContent; }
 var nextEpisode = playerContainer.querySelector(".episodeMarker.next");
 if(nextEpisode) { originalTextContent.EpisodeNext = nextEpisode.firstChild.textContent; }
 var testMarkers = playerContainer.querySelectorAll(".marker");
 // NOTE(matt):  All the originalTextContent values must be set by this point, because the player's construction may need them
 var MobileCineraContentRuleSelector = ".cinera.mobile .cineraPlayerContainer .markers_container > .markers .marker .cineraContent";
 var MobileCineraContentRule = GetOrSetRule(MobileCineraContentRuleSelector);
 var MenuContainerRuleSelector = ".cineraMenus > .menu .quotes_container, .cineraMenus > .menu .references_container, .cineraMenus > .menu .filter_container, .cineraMenus > .menu .views_container, .cineraMenus > .menu .link_container, .cineraMenus > .menu .credits_container";
 var MenuContainerRule = GetOrSetRule(MenuContainerRuleSelector);
-if(CineraProps.IsMobile)
+var cinera = document.querySelector(".cinera");
-{
+var player = new Player(cinera, onRefChanged);
    InitMobileStyle();
 }
 else
 {
    var MenuMaxHeight = cinera.offsetHeight - titleBar.offsetHeight - 4;
    MenuContainerRule.style.maxHeight = MenuMaxHeight + "px";
 }
 var player = new Player(playerContainer, onRefChanged);
 if(CineraProps.IsMobile)
 {
    ConnectMobileControls(player);
 }
 var cineraViewStorageItem = "cineraView";
 if(viewsMenu && localStorage.getItem(cineraViewStorageItem))
 {
    toggleTheatreMode();
 }
 InitScrollEventListener(cinera);
 function
 DelayedUpdateSize()
 {
    player.updateSize();
 }
 window.addEventListener("resize", function() {
    if(CineraProps.IsMobile)
    {
-        setTimeout(DelayedUpdateSize, 512);
+        setTimeout(DelayedUpdateSize, 512, player);
    }
    else
    {
@ -333,10 +42,10 @@ window.addEventListener("resize", function() {
    }
 });
-window.onorientationchange = function() {
+screen.orientation.onchange = function() {
    if(CineraProps.IsMobile)
    {
-        setTimeout(DelayedUpdateSize, 512);
+        setTimeout(DelayedUpdateSize, 512, player);
    }
    else
    {
@ -351,43 +60,17 @@ document.addEventListener("keydown", function(ev) {
        key = "capitalSpace";
    }
-    if(!ev.getModifierState("Control") && handleKey(key) == true && focusedElement)
+    if(!ev.getModifierState("Control") && player.handleKey(key) == true && player.MenusFocused.Item)
    {
        ev.preventDefault();
    }
 });
-for(var i = 0; i < sourceMenus.length; ++i)
+document.addEventListener("fullscreenchange", function() {
    if(!document.fullscreenElement && CineraProps.V == views.SUPERTHEATRE)
    {
-    sourceMenus[i].addEventListener("mouseenter", function(ev) {
+        CineraProps.V = views.THEATRE;
-        handleMenuTogglerInteraction(this, ev.type);
+        localStorage.setItem(player.cineraViewStorageItem, views.THEATRE);
-    })
+        player.updateSize();
    sourceMenus[i].addEventListener("mouseleave", function(ev) {
        handleMenuTogglerInteraction(this, ev.type);
    })
    sourceMenus[i].addEventListener("click", function(ev) {
        handleMenuTogglerInteraction(this, ev.type);
    })
 };
 var colouredItems = playerContainer.querySelectorAll(".author, .member, .project");
 for(i = 0; i < colouredItems.length; ++i)
 {
    setTextLightness(colouredItems[i]);
 }
 var topicDots = cinera.querySelectorAll(".category");
 for(var i = 0; i < topicDots.length; ++i)
 {
    setDotLightness(topicDots[i]);
 }
 var lastTimestampStorageItem = "cineraTimecode_" + window.location.pathname;
 var lastTimestamp;
 if(location.hash) {
    player.setTimeThenPlay(location.hash.startsWith('#') ? location.hash.substr(1) : location.hash);
 }
 else if(lastTimestamp = localStorage.getItem(lastTimestampStorageItem))
 {
    player.setTimeThenPlay(lastTimestamp);
    }
 });
--- a/cinera/cinera_player_pre.js
+++ b/cinera/cinera_player_pre.js
--- a/cinera/cinera_pre.js
+++ b/cinera/cinera_pre.js
@ -13,6 +13,9 @@ DeriveReliableWindowDimensions()
        Y: null,
    };
    var ScrollPosX = window.scrollX;
    var ScrollPosY = window.scrollY;
    var DisplaySettings = [];
    for(var i = 0; i < document.body.children.length; ++i)
    {
@ -40,6 +43,9 @@ DeriveReliableWindowDimensions()
        Child.style.display = DisplaySettings.shift();
    }
    ScrollTriggeredInternally = true;
    window.scroll(ScrollPosX, ScrollPosY);
    return Result;
 }
@ -76,7 +82,7 @@ function IsVisible(Element, WindowDim) {
 function
 GetRealOrientation(PreferredLandscape, IsMobile)
 {
-    var Result = window.orientation;
+    var Result = screen.orientation.angle;
    var WindowDim = GetWindowDim(IsMobile);
    if(WindowDim.Y > WindowDim.X)
    {
@ -185,6 +191,12 @@ function enableSprite(Element)
 }
 function disableSprite(Element)
 {
    if(Element.classList.contains("focused"))
    {
        focusSprite(Element);
    }
    else
    {
        if(Element.classList.contains("cineraSprite"))
        {
@ -196,6 +208,7 @@ function disableSprite(Element)
            disableSprite(Element.children[i]);
        }
    }
 }
 function unfocusSprite(Element)
 {
@ -310,6 +323,7 @@ function IsInRangeEx(Min, N, Max)
 }
 /* Auto-scrolling */
 var ScrollTriggeredInternally = false;
 var LastScrollYPos = 0;
 var ScrollTicking = false;
 var ScrollerFunction;
@ -376,7 +390,11 @@ function
 InitScrollEventListener(Element, IsMobile, StickyObscuringElement)
 {
    window.addEventListener('scroll', function() {
-        if(ScrollCondition == undefined || ScrollCondition == true)
+        if(ScrollTriggeredInternally)
        {
            ScrollTriggeredInternally = false;
        }
        else if(ScrollCondition == undefined || ScrollCondition == true)
        {
            LastScrollYPos = window.scrollY;
@ -503,17 +521,29 @@ IsOverflowed(Element)
    return Element.scrollHeight > Element.clientHeight || Element.scrollWidth > Element.clientWidth;
 }
 function
 SetHelpUnfocused(Button)
 {
    Button.firstElementChild.innerText = "¿";
    Button.firstElementChild.title = "Keypresses will not pass through to Cinera because focus is currently elsewhere.\n\nTo regain focus, please press Tab / Shift-Tab (multiple times) or click somewhere related to Cinera other than the video, e.g. this button";
 }
 function
 SetHelpFocused(Button)
 {
    Button.firstElementChild.innerText = "?";
    Button.firstElementChild.title = ""
 }
 function
 BindHelp(Button, DocumentationContainer)
 {
    window.addEventListener("blur", function(){
-        Button.firstElementChild.innerText = "¿";
+        SetHelpUnfocused(Button);
        Button.firstElementChild.title = "Keypresses will not pass through to Cinera because focus is currently elsewhere.\n\nTo regain focus, please press Tab / Shift-Tab (multiple times) or click somewhere related to Cinera other than the video, e.g. this button";
    });
    window.addEventListener("focus", function(){
-        Button.firstElementChild.innerText = "?";
+        SetHelpFocused(Button);
        Button.firstElementChild.title = ""
    });
    Button.addEventListener("click", function() {
@ -521,45 +551,16 @@ BindHelp(Button, DocumentationContainer)
    })
 }
 function RGBtoHSL(colour)
 {
 	var rgb = colour.slice(4, -1).split(", ");
    var red = rgb[0];
    var green = rgb[1];
    var blue = rgb[2];
    var min = Math.min(red, green, blue);
    var max = Math.max(red, green, blue);
    var chroma = max - min;
    var hue = 0;
    if(max == red)
    {
        hue = ((green - blue) / chroma) % 6;
    }
    else if(max == green)
    {
        hue = ((blue - red) / chroma) + 2;
    }
    else if(max == blue)
    {
        hue = ((red - green) / chroma) + 4;
    }
    var saturation = chroma / 255 * 100;
    hue = (hue * 60) < 0 ? 360 + (hue * 60) : (hue * 60);
    return [hue, saturation]
 }
 function getBackgroundColourRGB(element) {
    var Colour = getComputedStyle(element).getPropertyValue("background-color");
    var depth = 0;
-    while((Colour == "transparent" || Colour == "rgba(0, 0, 0, 0)") && depth <= 4)
+    while((Colour == "transparent" || Colour == "rgba(0, 0, 0, 0)") && element.parentElement && depth <= 4)
    {
-        element = element.parentNode;
+        element = element.parentElement;
        Colour = getComputedStyle(element).getPropertyValue("background-color");
        ++depth;
    }
-	var Staging = Colour.slice(4, -1).split(", ");
+	var Staging = Colour.slice(Colour.indexOf("(") + 1, -1).split(", ");
    var Result = {
        R: parseInt(Staging[0]),
        G: parseInt(Staging[1]),
@ -580,6 +581,8 @@ function setTextLightness(textElement)
 {
    var textHue = textElement.getAttribute("data-hue");
    var textSaturation = textElement.getAttribute("data-saturation");
    if(textHue && textSaturation)
    {
        if(getBackgroundBrightness(textElement.parentNode) < 127)
        {
            textElement.style.color = ("hsl(" + textHue + ", " + textSaturation + ", 76%)");
@ -589,19 +592,23 @@ function setTextLightness(textElement)
            textElement.style.color = ("hsl(" + textHue + ", " + textSaturation + ", 24%)");
        }
    }
 }
 function setDotLightness(topicDot)
 {
-    var Hue = RGBtoHSL(getComputedStyle(topicDot).getPropertyValue("background-color"))[0];
+    var dotHue = topicDot.getAttribute("data-hue");
-    var Saturation = RGBtoHSL(getComputedStyle(topicDot).getPropertyValue("background-color"))[1];
+    var dotSaturation = topicDot.getAttribute("data-saturation");
    if(dotHue && dotSaturation)
    {
        if(getBackgroundBrightness(topicDot.parentNode) < 127)
        {
-        topicDot.style.backgroundColor = ("hsl(" + Hue + ", " + Saturation + "%, 76%)");
+            topicDot.style.backgroundColor = ("hsl(" + dotHue + ", " + dotSaturation + ", 76%)");
-        topicDot.style.borderColor = ("hsl(" + Hue + ", " + Saturation + "%, 76%)");
+            topicDot.style.borderColor = ("hsl(" + dotHue + ", " + dotSaturation + ", 76%)");
        }
        else
        {
-        topicDot.style.backgroundColor = ("hsl(" + Hue + ", " + Saturation + "%, 47%)");
+            topicDot.style.backgroundColor = ("hsl(" + dotHue + ", " + dotSaturation + ", 47%)");
-        topicDot.style.borderColor = ("hsl(" + Hue + ", " + Saturation + "%, 47%)");
+            topicDot.style.borderColor = ("hsl(" + dotHue + ", " + dotSaturation + ", 47%)");
        }
    }
 }
--- a/cinera/cinera_search_pre.js
+++ b/cinera/cinera_search_pre.js
@ -213,11 +213,11 @@ function prepareToParseIndexFile(project)
                mode = "markers";
                episode.markers = [];
            } else if (mode == "markers") {
-                var match = line.match(/"(\d+)": "(.+)"/);
+                var match = line.match(/"(\d+.\d+)": "(.+)"/);
                if (match == null) {
                    console.log(name, line);
                } else {
-                    var totalTime = parseInt(line.slice(1));
+                    var totalTime = parseFloat(line.slice(1));
                    var marker = {
                        totalTime: totalTime,
                        prettyTime: markerTime(totalTime),
@ -292,7 +292,7 @@ function markerTime(totalTime) {
    var markTime = "(";
    var hours = Math.floor(totalTime / 60 / 60);
    var minutes = Math.floor(totalTime / 60) % 60;
-    var seconds = totalTime % 60;
+    var seconds = Math.floor(totalTime) % 60;
    if (hours > 0) {
        markTime += padTimeComponent(hours) + ":";
    }
@ -460,7 +460,7 @@ function runSearch(refresh) {
        Search.ResultsSummary.style.display = "none";
    }
-    var totalTime = Math.floor(totalSeconds/60/60) + "h " + Math.floor(totalSeconds/60)%60 + "m " + totalSeconds%60 + "s ";
+    var totalTime = Math.floor(totalSeconds/60/60) + "h " + Math.floor(totalSeconds/60)%60 + "m " + Math.floor(totalSeconds)%60 + "s ";
    Search.ResultsSummary.textContent = "Found: " + numEpisodes + " episodes, " + numMarkers + " markers, " + totalTime + "total.";
 }
@ -3817,6 +3817,8 @@ PseudoPushButton(Button)
 function
 ResizeFunction()
 {
    var OriginalScrollX = scrollX;
    var OriginalScrollY = scrollY;
    CineraProps.Orientation = GetRealOrientation(orientations.LANDSCAPE_LEFT, CineraProps.IsMobile);
    if(CineraProps.IsMobile)
    {
@ -3841,7 +3843,7 @@ ResizeFunction()
            PickListView();
            // TODO(matt):  Inform user that we've switched to the list view
        }
-        ScrollToWithOffset(Nav.Nexus, 0);
+        scroll(OriginalScrollX, OriginalScrollY);
    }
    UpdateButtons();
 }
@ -3864,7 +3866,7 @@ InitResizeEventListener()
 function
 InitOrientationChangeListener()
 {
-    window.onorientationchange = function()
+    screen.orientation.onchange = function()
    {
        if(CineraProps.IsMobile)
        {
--- a/cinera/cinera_sprite_donorbox.png
+++ b/cinera/cinera_sprite_donorbox.png
--- a/cinera/cinera_sprite_github.png
+++ b/cinera/cinera_sprite_github.png
--- a/cinera/cinera_sprite_kofi.png
+++ b/cinera/cinera_sprite_kofi.png
--- a/hmmlib2/hmmlib.h
+++ b/hmmlib2/hmmlib.h
@ -24,6 +24,8 @@ typedef struct {
    char* output;
    char* template;
    char* medium;
    char* number;
    char* cc_lang;
    HMML_Credit* credits;
    size_t credit_count;
@ -74,7 +76,7 @@ typedef struct {
 typedef struct {
    int line;
-    int h, m, s;
+    int h, m, s, ms;
    char* text;
    char* author;
@ -469,7 +471,7 @@ next_attr:
 static void _hmml_parse_timecode(struct _hmml_parser* p, HMML_Timestamp* ts)
 {
-    unsigned int h = 0, m = 0, s = 0;
+    unsigned int h = 0, m = 0, s = 0, ms = 0;
    int offset = 0;
    int count = sscanf(p->cursor, "[%u:%u%n", &m, &s, &offset);
@ -483,7 +485,7 @@ static void _hmml_parse_timecode(struct _hmml_parser* p, HMML_Timestamp* ts)
    if(c == ':') {
        unsigned int tmp;
        offset = 0;
-        if(sscanf(p->cursor, ":%u]%n", &tmp, &offset) != 1 || offset == 0) {
+        if(sscanf(p->cursor, ":%u%n", &tmp, &offset) != 1 || offset == 0) {
            _hmml_err(p, "Unable to parse 3-part timecode");
        }
@ -492,6 +494,27 @@ static void _hmml_parse_timecode(struct _hmml_parser* p, HMML_Timestamp* ts)
        s = tmp;
        p->cursor += offset;
        c = *p->cursor;
    }
    if(c == '.') {
        unsigned int tmp;
        offset = 0;
        int non_number_chars = 2;
        int digits_in_100 = 3;
        int max_chars_to_parse = non_number_chars + digits_in_100;
        if(sscanf(p->cursor, ".%u]%n", &tmp, &offset) != 1 || offset == 0 || offset > max_chars_to_parse) {
            _hmml_err(p, "Unable to parse %u.5-part timecode", h ? 3 : 2);
        }
        for(int i = offset - non_number_chars; i < digits_in_100; ++i) {
            tmp *= 10;
        }
        ms = tmp;
        p->cursor += offset;
    } else if(c != ']') {
        _hmml_err(p, "Unable to parse timecode");
@ -499,6 +522,10 @@ static void _hmml_parse_timecode(struct _hmml_parser* p, HMML_Timestamp* ts)
        ++p->cursor;
    }
    if(ms >= 1000) {
        _hmml_err(p, "Milliseconds cannot exceed 999");
    }
    if(s >= 60) {
        _hmml_err(p, "Seconds cannot exceed 59");
    }
@ -510,6 +537,7 @@ static void _hmml_parse_timecode(struct _hmml_parser* p, HMML_Timestamp* ts)
    ts->h = h;
    ts->m = m;
    ts->s = s;
    ts->ms = ms;
 }
 static void _hmml_store_marker(struct _hmml_parser* p, HMML_Timestamp* ts, char** out, char* text_mem, size_t text_mem_size)
@ -734,7 +762,9 @@ static void _hmml_parse_video(struct _hmml_parser* p)
        { HSTR("id")             , &p->out.metadata.id },
        { HSTR("template")       , &p->out.metadata.template },
        { HSTR("medium")         , &p->out.metadata.medium },
        { HSTR("number")         , &p->out.metadata.number },
        { HSTR("output")         , &p->out.metadata.output },
        { HSTR("cc_lang")        , &p->out.metadata.cc_lang },
    };
    for(;;) {
@ -820,7 +850,7 @@ void hmml_free(HMML_Output* out)
 }
 const struct HMML_Version hmml_version = {
-    2, 0, 12
+    2, 0, 15
 };
 #undef HSTX
Author	SHA1	Message	Date
Matt Mascarenhas	14dafa4abe	cinera.c: Fix stack-use-after-return segfault The ClashResolver, or a memory_book variable therein, triggered a stack-use-after-return segfault. Fixed by initialising the ClashResolver in main() and passing it to InitClashResolver() by pointer, rather than initialising it in InitClashResolver().	2024-03-12 13:03:08 +00:00
Matt Mascarenhas	213bb2f882	cinera.c: Fix colouring of topic dots The colour computed for topic dots and put into cinera_topics.css in HSL format has its lightness value modified depending on whether it's on a dark or light background. Web browsers do not tell us an element's computed colour in HSL format, but in RGB, so we would need to convert it from RGB to HSL when setting the lightness. Previously, this conversion was busted, calculating too small a value for the saturation. This commit obviates the need for any RGB→HSL conversion by writing the hue and saturation values as attributes to the elements, which the function responsible for setting the lightness may use directly.	2024-02-21 20:52:34 +00:00
Matt Mascarenhas	77aec74483	cinera_player_post.js: Fix fullscreen handling It is possible to bring our player out of fullscreen mode without using the provided views menu or keyboard shortcut, e.g. by pressing Escape. Doing so leaves our state in the SUPERTHEATRE view, which omits SUPERtheatre mode itself from the views menu. This commit fixes this by switching our state to the THEATRE view. Thanks to Aske Bisgaard Vammen for the report.	2024-01-30 15:41:30 +00:00
Matt Mascarenhas	6852d06e04	cinera_player_pre.js: Unset focused menu When hiding any menu, set this.MenusFocused.MenuID = menu_id.UNSET, to let hovering over the markers focus them after hiding the link menu.	2023-03-25 01:51:40 +00:00
Matt Mascarenhas	52d6d989f8	cinera_player_pre.js: Fix scoping of "this"	2023-03-25 01:31:13 +00:00
Matt Mascarenhas	df93674bf7	cinera: Increase precision to milliseconds This commit simply adds millisecond precision of timecodes. It includes small changes to hmmlib.h, cinera.c and the frontend JS files.	2023-03-25 00:04:34 +00:00
Matt Mascarenhas	026585e50b	cinera: Fix mobile scrolling and centring This commit fixes spurious scrolling in DeriveReliableWindowDimensions() on mobile. It also fixes centring of Vimeo videos on mobile. In addition, it replaces some deprecated JavaScript: • window.orientation → screen.orientation.type • window.onorientationchange → screen.orientation.onchange	2023-03-21 19:34:24 +00:00
Matt Mascarenhas	9d5f0f9146	cinera_player_pre.js: Fix scoping of "this"	2023-03-18 01:54:42 +00:00
Matt Mascarenhas	a7694d4c3b	cinera: Improve keyboard controls and scrolling This commit adds keyboard navigation of the indices, documented in the "Help" text box. It also improves scrolling of menus to follow progress through the video, with the ability to centre the scrolling around a range of references. Finally in this UI work, it enables the keyboard and mouse to work more cooperatively. Other changes: • Added a "Clear" so the player's initial sizing happens invisibly. • Fixed getBackgroundColourRGB() to handle both rgb() and rgba(). • Deduplicated code, including spurious querySelectorAll() calls. • Moved global variables into the Player object.	2023-03-18 01:27:05 +00:00
Matt Mascarenhas	c9bf96c7aa	cinera_player_pre.js: Improve sizing and scrolling This commit fixes the sizing of the player's menus to not protrude below the player. It also adds scrolling of the references menu to the first menu item cited in the newly-current timestamp, and fixes scrolling of the markers container when switching to a timestamp after the user has scrolled the container away from its default position.	2023-02-20 20:29:16 +00:00
Matt Mascarenhas	44a5008aa7	cinera: Resolve output location clashes This commit adds support for tracking and resolving clashes of output locations. Previously open-ended clash dependency chains could passively resolve across multiple Cinera invocations (undesirable, but possible); whereas closed-loop dependency chains could not resolve without the user manually resolving them by moving one clash to a temporary location (not acceptable). This new support handles such clashes in one fell swoop. Other smaller changes in this commit: • Change message_control to use memory_book • Fix deletion of old .index files when reorganising projects • Fix deletion of moved entries when subdividing projects	2023-02-10 23:12:21 +00:00
Matt Mascarenhas	6576a91d11	cinera: Support message deduplication This commit adds support for deduplication of messages emitted by PrintEdit(). It's a first pass, only supporting single-line messages and ones no larger than 512 bytes. It also fixes StringContains() to skip strings shorter than the search substring, and emits a more sensible error on empty "output" value.	2023-01-13 20:31:44 +00:00
Matt Mascarenhas	1280142d45	cinera.c: Clean up string copy functions This commit replaces ClearCopyStringNoFormat() with ClearCopyStringNoFormatOrTerminate(). All calls to that function passed an implicitly 0-terminated string as the destination, meaning that we don't need to 0-terminate them and, in not doing, we free up a byte to store data. It also deduplicates code as CopyBytes(), and does a little bounds checking before actually trying to copy.	2023-01-13 12:01:26 +00:00
Matt Mascarenhas	6b09247cd2	cinera.c: Enable default closed captions This commit adds support for configurably enabling closed captions by default. Set the "default_cc_lang" in a config file, or "cc_lang" in the [video] node of an .hmml file. Once set, videos which contain captions for this langage will be initialised with these captions enabled. New config setting: default_cc_lang New [video] node field: cc_lang	2023-01-11 19:24:41 +00:00
Matt Mascarenhas	554f7393ff	cinera_search_pre.js: Fix scrolling bug This commit fixes ResizeFunction() to scroll back to the original Y position, rather than the nexus (i.e. the grid or list), after resizing the grid as a result of the window having been resized.	2023-01-10 12:39:06 +00:00
Matt Mascarenhas	e8ed2f0143	cinera.c: Fix buffer overflow copying "output" This is a hotfix made just to allow using a max-length "output" value. Next commit should fix buffer overflows for all copies to implicitly null-terminated destinations.	2022-12-15 20:23:30 +00:00
Matt Mascarenhas	ac4b155e73	cinera.c: Add Donorbox as default support platform	2022-12-06 18:22:06 +00:00
Matt Mascarenhas	0f15957cb5	cinera.c: Abbreviate names better This commit makes the auto-derivation of name abbreviations code handle quoted nicknames and lower-cased surname prefixes (e.g. du Pré). It also upstreams the abbreviation to config parse time, and introduces config fields in the person scope to allow overwriting the auto-derived ones. Bug fixes: • Fix null pointer dereference in InsertProjectIntoDB(), due to a rogue WriteFromByteToPointer() call left in when removing the _TopLevel() database modification functions in v0.10.14 • Fix config file locking by closing all config files on detecting a config file change, even if we had no prior working config • Increase IncludesSearch buffer size from 2 to 4KB New config fields in the person scope: • abbrev_initial • abbrev_given_or_nickname • abbrev_dotted_initial_and_surname	2022-11-25 21:12:59 +00:00
Matt Mascarenhas	68d1469212	cinera.c: Add Ko-fi as a default support platform	2022-10-13 20:21:48 +01:00
Matt Mascarenhas	f321a6b6bf	Update README.md	2022-09-23 18:39:01 +01:00
Matt Mascarenhas	6ea5cb6d22	Update README.md	2022-09-23 17:47:12 +01:00
Matt Mascarenhas	0825cbb5ff	Update README.md	2022-09-23 17:42:18 +01:00
Matt Mascarenhas	6e9c7edd1d	Update README.md	2022-09-23 17:39:07 +01:00
Matt Mascarenhas	b8f143e350	cinera: Add database structure specification This commit aims to generalise database structures such that any block may be traversed without the need for specific functions for each type. Concretely, it replaces functions like SkipAsset() and SkipProject() with a generic SkipHeaderedSectionRecursively(). The change also paves the way for the plethora of new block types due in CINERA_DB_VERSION 6.	2022-09-19 17:22:19 +01:00
Matt Mascarenhas	f60cf3087f	cinera: Lock database and config files This commit aims to help Cinera instances coordinate themselves by throwing an error upon being instructed to use a database or config file currently in use by another instance.	2022-09-16 16:10:19 +01:00
Matt Mascarenhas	1cf703e346	cinera: Fully handle auto-numbering • Renumber affected entries when inserting / deleting an entry of an auto-numbered project • Prohibit an entry from sharing an "output" with another entry • Prohibit an entry's "output" from containing a slash • Fix entry HTML deletion to use OutputLocation, not BaseFilename	2022-08-30 19:15:44 +01:00
Matt Mascarenhas	26e304f62c	cinera: Add IRC unfurl tags and GitHub sponsors New config field: instance_title	2022-08-23 22:36:20 +01:00
Matt Mascarenhas	8dffa513cc	cinera: Add tag __CINERA_PROJECT_LINEAGE _	2022-08-21 19:15:10 +01:00
Matt Mascarenhas	e17c3aa78c	cinera.c: Handle overlong "output" attribute	2022-08-03 22:56:24 +01:00
Matt Mascarenhas	84a35b9ece	cinera: Add numbering and fix sizes New config options: numbering_filename_prefix (string) Defaults to $project numbering_method auto filename_derived (default) hmml_specified numbering_start (number) May be used to 0-index the set numbering_unit (renamed from "unit") numbering_zero_pad (boolean) This commit also fixes the size of the "?" help button and category dots when the wider site uses box-sizing: border-box	2022-08-01 20:58:55 +01:00
Matt Mascarenhas	ef9937e95b	hmmlib.h: Add "number" parameter to [video] node	2022-08-01 20:33:38 +01:00
Matt Mascarenhas	652d8f186f	Revert "Introduce threading and clean some code" This reverts commit `f7a6df994f`.	2022-07-21 20:04:50 +01:00
Matt Mascarenhas	91c33c580b	cinera.c: Add a break to a switch case	2022-07-21 19:50:18 +01:00
Matt Mascarenhas	f7a6df994f	Introduce threading and clean some code This is an unversioned interim commit with unfinalised code. The threading code establishes job queues. The code cleanup removes various _TopLevel functions pertaining to database operations.	2022-05-20 17:32:28 +01:00