mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Add an optionally-compiled diagnostic console on Windows.
This commit is contained in:
parent
6c7ccbd9e7
commit
3feb864691
@ -58,11 +58,17 @@
|
|||||||
#include "guile-mappings.h"
|
#include "guile-mappings.h"
|
||||||
#ifdef __MINGW32__
|
#ifdef __MINGW32__
|
||||||
#include <Windows.h>
|
#include <Windows.h>
|
||||||
|
#include <fcntl.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* This static indicates the debugging module that this .o belongs to. */
|
/* This static indicates the debugging module that this .o belongs to. */
|
||||||
static QofLogModule log_module = GNC_MOD_GUI;
|
static QofLogModule log_module = GNC_MOD_GUI;
|
||||||
|
|
||||||
|
/* Change the following to have a console window attached to GnuCash
|
||||||
|
* for displaying stdout and stderr on Windows.
|
||||||
|
*/
|
||||||
|
#define __MSWIN_CONSOLE__ 0
|
||||||
|
|
||||||
#ifdef HAVE_GETTEXT
|
#ifdef HAVE_GETTEXT
|
||||||
# include <libintl.h>
|
# include <libintl.h>
|
||||||
# include <locale.h>
|
# include <locale.h>
|
||||||
@ -809,6 +815,53 @@ set_win32_thread_locale()
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* Creates a console window on MSWindows to display stdout and stderr
|
||||||
|
* when __MSWIN_CONSOLE__ is defined at the top of the file.
|
||||||
|
*
|
||||||
|
* Useful for displaying the diagnostics printed before logging is
|
||||||
|
* started and if logging is redirected with --logto=stderr.
|
||||||
|
*/
|
||||||
|
static void
|
||||||
|
redirect_stdout (void)
|
||||||
|
{
|
||||||
|
#ifdef __MINGW32__ && __MSWIN_CONSOLE__
|
||||||
|
static const WORD MAX_CONSOLE_LINES = 500;
|
||||||
|
int hConHandle;
|
||||||
|
long lStdHandle;
|
||||||
|
CONSOLE_SCREEN_BUFFER_INFO coninfo;
|
||||||
|
FILE *fp;
|
||||||
|
|
||||||
|
// allocate a console for this app
|
||||||
|
AllocConsole();
|
||||||
|
|
||||||
|
// set the screen buffer to be big enough to let us scroll text
|
||||||
|
GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &coninfo);
|
||||||
|
coninfo.dwSize.Y = MAX_CONSOLE_LINES;
|
||||||
|
SetConsoleScreenBufferSize(GetStdHandle(STD_OUTPUT_HANDLE), coninfo.dwSize);
|
||||||
|
|
||||||
|
// redirect unbuffered STDOUT to the console
|
||||||
|
lStdHandle = (long)GetStdHandle(STD_OUTPUT_HANDLE);
|
||||||
|
hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
|
||||||
|
fp = _fdopen( hConHandle, "w" );
|
||||||
|
*stdout = *fp;
|
||||||
|
setvbuf( stdout, NULL, _IONBF, 0 );
|
||||||
|
|
||||||
|
// redirect unbuffered STDIN to the console
|
||||||
|
lStdHandle = (long)GetStdHandle(STD_INPUT_HANDLE);
|
||||||
|
hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
|
||||||
|
fp = _fdopen( hConHandle, "r" );
|
||||||
|
*stdin = *fp;
|
||||||
|
setvbuf( stdin, NULL, _IONBF, 0 );
|
||||||
|
|
||||||
|
// redirect unbuffered STDERR to the console
|
||||||
|
lStdHandle = (long)GetStdHandle(STD_ERROR_HANDLE);
|
||||||
|
hConHandle = _open_osfhandle(lStdHandle, _O_TEXT);
|
||||||
|
fp = _fdopen( hConHandle, "w" );
|
||||||
|
*stderr = *fp;
|
||||||
|
setvbuf( stderr, NULL, _IONBF, 0 );
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
main(int argc, char ** argv)
|
main(int argc, char ** argv)
|
||||||
{
|
{
|
||||||
@ -825,6 +878,7 @@ main(int argc, char ** argv)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
redirect_stdout ();
|
||||||
|
|
||||||
/* This should be called before gettext is initialized
|
/* This should be called before gettext is initialized
|
||||||
* The user may have configured a different language via
|
* The user may have configured a different language via
|
||||||
@ -846,7 +900,8 @@ main(int argc, char ** argv)
|
|||||||
g_setenv ("LC_ALL", "C", TRUE);
|
g_setenv ("LC_ALL", "C", TRUE);
|
||||||
setlocale (LC_ALL, "C");
|
setlocale (LC_ALL, "C");
|
||||||
}
|
}
|
||||||
#endif
|
else
|
||||||
|
printf ("Locale set to %s\n", sys_locale);
|
||||||
#ifdef HAVE_GETTEXT
|
#ifdef HAVE_GETTEXT
|
||||||
{
|
{
|
||||||
gchar *localedir = gnc_path_get_localedir();
|
gchar *localedir = gnc_path_get_localedir();
|
||||||
|
Loading…
Reference in New Issue
Block a user