Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ターミナルのカーソルの点滅が止まったら復元する #60

Closed
wants to merge 1 commit into from
Closed

ターミナルのカーソルの点滅が止まったら復元する #60

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 34 additions & 44 deletions kernel/terminal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#include "terminal.hpp"

#include <algorithm>
#include <array>
#include <cstring>
#include <limits>
#include <vector>
Expand Down Expand Up @@ -607,39 +605,24 @@ void Terminal::ExecuteLine() {
return;
}

std::vector<uint8_t> insn;

if (first_arg && strcmp(first_arg, "sample") == 0) {
const std::array<uint8_t, 14 * 2> kSample = {
0x00, 0x20,
0xC1, 0x00,
0xA3, 0x03,
0x94, 0x02,
0xA0, 0x00,
0xC2, 0x21,
0xC0, 0x20,
0x00, 0x20,
0xB0, 0x02,
0xC1, 0x00,
0x00, 0x21,
0xC3, 0x20,
0xA4, 0x00,
0xFF, 0xFF,
};
insn.resize(kSample.size());
std::copy(kSample.begin(), kSample.end(), insn.begin());
} else {
uint8_t buf[2];
while (files_[0]->Read(buf, 2) == 2) {
insn.push_back(buf[0]);
insn.push_back(buf[1]);
}
insn.push_back(0xff);
insn.push_back(0xff);
}

const uint8_t insn[14 * 2] = {
0x00, 0x20,
0xC1, 0x00,
0xA3, 0x03,
0x94, 0x02,
0xA0, 0x00,
0xC2, 0x21,
0xC0, 0x20,
0x00, 0x20,
0xB0, 0x02,
0xC1, 0x00,
0x00, 0x21,
0xC3, 0x20,
0xA4, 0x00,
0xFF, 0xFF,
};
PrintToFD(*files_[1], "Sending instructions to ComProc CPU\n");
usb::cdc::driver->SendSerial(&insn[0], insn.size());
usb::cdc::driver->SendSerial(insn, 14 * 2);

PrintToFD(*files_[1], "Receiving exit code from ComProc CPU\n");
uint8_t code = 0;
Expand Down Expand Up @@ -869,8 +852,10 @@ void TaskTerminal(uint64_t task_id, int64_t data) {
task_manager->Finish(terminal->LastExitCode());
}

auto add_blink_timer = [task_id](unsigned long t){
timer_manager->AddTimer(Timer{t + static_cast<int>(kTimerFreq * 0.5),
unsigned long expected_blink_timeout = 0;
auto add_blink_timer = [task_id, &expected_blink_timeout](unsigned long t){
expected_blink_timeout = t + static_cast<int>(kTimerFreq * 0.5);
timer_manager->AddTimer(Timer{expected_blink_timeout,
1, task_id});
};
add_blink_timer(timer_manager->CurrentTick());
Expand All @@ -881,6 +866,9 @@ void TaskTerminal(uint64_t task_id, int64_t data) {
__asm__("cli");
auto msg = task.ReceiveMessage();
if (!msg) {
if (timer_manager->CurrentTick() > expected_blink_timeout) {
add_blink_timer(timer_manager->CurrentTick());
}
task.Sleep();
__asm__("sti");
continue;
Expand All @@ -889,14 +877,16 @@ void TaskTerminal(uint64_t task_id, int64_t data) {

switch (msg->type) {
case Message::kTimerTimeout:
add_blink_timer(msg->arg.timer.timeout);
if (show_window && window_isactive) {
const auto area = terminal->BlinkCursor();
Message msg = MakeLayerMessage(
task_id, terminal->LayerID(), LayerOperation::DrawArea, area);
__asm__("cli");
task_manager->SendMessage(1, msg);
__asm__("sti");
if (msg->arg.timer.timeout == expected_blink_timeout) {
add_blink_timer(msg->arg.timer.timeout);
if (show_window && window_isactive) {
const auto area = terminal->BlinkCursor();
Message msg = MakeLayerMessage(
task_id, terminal->LayerID(), LayerOperation::DrawArea, area);
__asm__("cli");
task_manager->SendMessage(1, msg);
__asm__("sti");
}
}
break;
case Message::kKeyPush:
Expand Down