From b7d4ecdb4968988b666e2aee2a12901bf54290da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Strohh=C3=A4cker?= Date: Wed, 1 Apr 2009 18:30:41 +0000 Subject: [PATCH] display auto-loaded dos keyboard layout information in console window Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3336 --- src/dos/dos_keyboard_layout.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/dos/dos_keyboard_layout.cpp b/src/dos/dos_keyboard_layout.cpp index af61708a..1d828870 100644 --- a/src/dos/dos_keyboard_layout.cpp +++ b/src/dos/dos_keyboard_layout.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: dos_keyboard_layout.cpp,v 1.20 2009-03-25 21:12:23 c2woody Exp $ */ +/* $Id: dos_keyboard_layout.cpp,v 1.21 2009-04-01 18:30:41 c2woody Exp $ */ #include "dosbox.h" #include "bios.h" @@ -83,6 +83,7 @@ public: Bitu switch_keyboard_layout(const char* new_layout, keyboard_layout* &created_layout); void switch_foreign_layout(); const char* get_layout_name(); + const char* main_language_code(); private: @@ -1017,6 +1018,13 @@ const char* keyboard_layout::get_layout_name() { return NULL; } +const char* keyboard_layout::main_language_code() { + if (language_codes) { + return language_codes[0]; + } + return NULL; +} + static keyboard_layout* loaded_layout=NULL; @@ -1244,10 +1252,18 @@ public: loaded_layout->read_codepage_file("auto", req_codepage); } +/* if (strncmp(layoutname,"auto",4) && strncmp(layoutname,"none",4)) { + LOG_MSG("Loading DOS keyboard layout %s ...",layoutname); + } */ if (loaded_layout->read_keyboard_file(layoutname, dos.loaded_codepage)) { if (strncmp(layoutname,"auto",4)) { LOG_MSG("Error loading keyboard layout %s",layoutname); } + } else { + const char* lcode = loaded_layout->main_language_code(); + if (lcode) { + LOG_MSG("DOS keyboard layout loaded with main language code %s for layout %s",lcode,layoutname); + } } }