Random fixes

This commit is contained in:
Alexander S. Aganichev
2002-10-11 05:54:11 +00:00
parent 293685cd8e
commit e36d8cebd9
4 changed files with 40 additions and 5 deletions

View File

@@ -659,6 +659,11 @@ bool gwinput::handle_key(gkey key) {
case Key_C_Ins: // fall through
#endif
case Key_C_C: clipboard_copy(); break;
#if !defined(__UNIX__) || defined(__USE_NCURSES__)
case Key_C_Del: // fall through
#endif
case Key_C_Y: // fall through
case Key_C_D: clear_field(); break;
default:
if(not handle_other_keys(key))
enter_char(KCodAsc(key));
@@ -671,9 +676,7 @@ bool gwinput::handle_key(gkey key) {
// ------------------------------------------------------------------
gwinput::field::field(gwinput* iform, int idnum, int wrow, int wcol, int field_width, std::string& dest, int dest_size, int cvt, int mode)
: destination(dest)
{
prev = next = NULL;
pos = buf_pos = buf_left_pos = 0;
@@ -779,7 +782,9 @@ void gwinput::field::deactivate() {
void gwinput::field::restore() {
std::string tmp(buf);
strxcpy(buf, destination.c_str(), buf_len+1);
destination = tmp;
convert();
activate();
}

View File

@@ -181,6 +181,9 @@ void gareafile::ReadHPTFile(char* path, char* file, char* origin, int group) {
std::cout << "* Reading " << file << std::endl;
aa.reset();
aa.type = GMB_NONE;
aa.msgbase = fidomsgtype;
aa.groupid = group;
std::string s;
while(ReadHPTLine(fp, &s)) {
@@ -231,6 +234,7 @@ void gareafile::ReadHPTFile(char* path, char* file, char* origin, int group) {
case CRC_LOCALAREA:
case CRC_DUPEAREA:
case CRC_BADAREA:
aa = echoareadefaults;
aa.type = GMB_LOCAL;
break;
case CRC_ECHOAREA:
@@ -240,6 +244,8 @@ void gareafile::ReadHPTFile(char* path, char* file, char* origin, int group) {
case CRC_ECHOAREADEFAULTS:
echoareadefaults.reset();
aa.type = GMB_DEFAULT;
aa.msgbase = fidomsgtype;
aa.groupid = group;
break;
}