mirror of
https://github.com/storytold/harfbuzz.git
synced 2026-11-19 05:51:05 +01:00
* [util] Fix Unicode command line arguments on Windows GLib g_option_context_parse() converts argv strings from the system ACP via g_locale_to_utf8(), but Windows cmd deliver arguments encoded in the system codepage (ex: CP1252), which cannot represent most Unicode codepoints. This caused non ascii character to be corrupted For example, for this command, it rendered garbage instead of the emoji: ``` hb-view.exe "C:\Windows\Fonts\seguiemj.ttf" "😋" --output-file=output.png ``` Fix this in all util binaries (hb-ft-raster, hb-info, hb-raster, hb-shape, hb-subset, hb-vector, hb-view) by: 1. Calling g_win32_get_command_line() to obtain correctly UTF-8-encoded arguments from GetCommandLineW(). 2. Parsing with g_option_context_parse_strv() which skips the g_locale_to_utf8() conversion for G_OPTION_ARG_STRING entries. 3. Adding G_OPTION_FLAG_FILENAME to the G_OPTION_REMAINING callback entry in main-font-text.hh, so the callback path also skips the locale conversion in strv_mode (see https://gitlab.gnome.org/GNOME/glib/-/blob/8ef2f3ad402daf9fb94615ddef63ceef978fd76f/glib/goption.c#L1305). * [util] Fix Windows UTF-8 argv parsing On Windows, GLib's option parser treats argv as encoded in the system codepage and converts strings with g_locale_to_utf8(). The utilities need to parse the UTF-8 command line obtained from GetCommandLineW() instead, otherwise non-ASCII arguments can be corrupted before reaching the tool logic. Add a small argv_t wrapper for utility entry points to replace argv with g_win32_get_command_line() on Windows, and use the strv parser there so GLib skips the top-level argv conversion. Mark remaining callback arguments as filenames so GLib also skips callback argument conversion for positional text and font arguments. Testing: meson test -C build Assisted-by: OpenAI Codex * [mingw] Update instructions --------- Co-authored-by: moi15moi <moi15moismokerlolilol@gmail.com>
42 lines
1.5 KiB
C++
42 lines
1.5 KiB
C++
/*
|
|
* Copyright © 2026 Google, Inc.
|
|
*
|
|
* This is part of HarfBuzz, a text shaping library.
|
|
*
|
|
* Permission is hereby granted, without written agreement and without
|
|
* license or royalty fees, to use, copy, modify, and distribute this
|
|
* software and its documentation for any purpose, provided that the
|
|
* above copyright notice and the following two paragraphs appear in
|
|
* all copies of this software.
|
|
*
|
|
* IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
|
|
* DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
|
|
* ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
|
|
* IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
|
* DAMAGE.
|
|
*
|
|
* THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
|
|
* BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
|
* FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
|
|
* ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
|
|
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
|
|
*/
|
|
|
|
#include "batch.hh"
|
|
#include "vector-output.hh"
|
|
#include "font-options.hh"
|
|
#include "main-font-text.hh"
|
|
#include "shape-consumer.hh"
|
|
#include "text-options.hh"
|
|
|
|
const unsigned DEFAULT_FONT_SIZE = FONT_SIZE_UPEM;
|
|
const unsigned SUBPIXEL_BITS = 6;
|
|
|
|
int
|
|
main (int argc, char **argv)
|
|
{
|
|
using main_t = main_font_text_t<shape_consumer_t<vector_output_t>, font_options_t, shape_text_options_t>;
|
|
argv_t args (argc, argv);
|
|
return batch_main<main_t, true> (args.argc, args.argv);
|
|
}
|