christoph/lecture-operating-system-development
1
Fork 0
Code Activity

update vorgabe04

Browse Source
This commit is contained in:
churl
2022-06-05 15:25:52 +02:00
parent 24535f8ff7
commit 2ae21b274a
5 changed files with 64 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
c_os/devices/Keyboard.cc
View File

@ -73,16 +73,18 @@ bool Keyboard::key_decoded() {
gather.shift(false);
break;
case 56:
if (prefix == prefix1)
if (prefix == prefix1) {
gather.alt_right(false);
else
} else {
gather.alt_left(false);
}
break;
case 29:
if (prefix == prefix1)
if (prefix == prefix1) {
gather.ctrl_right(false);
else
} else {
gather.ctrl_left(false);
}
break;
}
@ -108,16 +110,18 @@ bool Keyboard::key_decoded() {
gather.shift(true);
break;
case 56:
if (prefix == prefix1)
if (prefix == prefix1) {
gather.alt_right(true);
else
} else {
gather.alt_left(true);
}
break;
case 29:
if (prefix == prefix1)
if (prefix == prefix1) {
gather.ctrl_right(true);
else
} else {
gather.ctrl_left(true);
}
break;
case 58:
gather.caps_lock(!gather.caps_lock());
@ -153,10 +157,7 @@ bool Keyboard::key_decoded() {
// Also ist es jetzt abgehandelt.
prefix = 0;
if (done)
return true; // Tastaturabfrage abgeschlossen
else
return false;
return done;
}
/*****************************************************************************
@ -333,9 +334,8 @@ void Keyboard::plugin() {
void scroll_mode(Key key);
void Keyboard::trigger() {
// TODO: Get data from PS/2 Mouse if necessary
Key key = this->key_hit();
this->lastkey = key.ascii();
// NOTE: My keyboard has no delete key...
if (key.ctrl_left() && key.alt_left() && (char)key == 'r') {
@ -343,8 +343,6 @@ void Keyboard::trigger() {
} else if ((char)key == 'k' || (char)key == 'j') {
scroll_mode(key);
}
// TODO: Keyboard insert mode
}
// TODO: Where to place this?