X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8dcea1b45d29593293b99d6beb13c7a4e050d426..932f1ec948f517d2cf739cba5ac564fcac618aa9:/lib/driver/rcconsole.cpp diff --git a/lib/driver/rcconsole.cpp b/lib/driver/rcconsole.cpp index 53ebb6f0..eb5aee3d 100644 --- a/lib/driver/rcconsole.cpp +++ b/lib/driver/rcconsole.cpp @@ -14,9 +14,8 @@ eRCConsoleDriver::eRCConsoleDriver(const char *filename): eRCDriver(eRCInput::ge sn=0; } else { - sn=new eSocketNotifier(eApp, handle, eSocketNotifier::Read); + sn=eSocketNotifier::create(eApp, handle, eSocketNotifier::Read); CONNECT(sn->activated, eRCConsoleDriver::keyPressed); - eRCInput::getInstance()->setFile(handle); } /* set console mode */ @@ -32,8 +31,6 @@ eRCConsoleDriver::~eRCConsoleDriver() tcsetattr(handle,TCSANOW, &ot); if (handle>=0) close(handle); - if (sn) - delete sn; } void eRCConsoleDriver::keyPressed(int) @@ -72,10 +69,9 @@ void eRCConsoleDriver::keyPressed(int) code = -1; else switch(code) { - case 0x7F: // KEY_COMPOSE - case 0x6F: // KEY_DELETE - case 0x6E: // KEY_INSERT - code = -1; + case 0x7E: // mute, einfg, entf + case 0x7F: // backspace + code = -1; default: break; } @@ -90,7 +86,7 @@ void eRCConsoleDriver::keyPressed(int) } } -void eRCConsole::handleCode(int code) +void eRCConsole::handleCode(long code) { input->keyPressed(eRCKey(this, code, eRCKey::flagAscii)); }