6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-08-05 08:26:28 +00:00
Code Issues Projects Releases Wiki Activity

Add cursor, proving things generally to be off by one.

Browse Source
This commit is contained in:
Thomas Harte
2024-12-27 09:20:12 -05:00
parent 863b09c39b
commit 9670d5f4de
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Machines/Commodore/Plus4/Video.hpp
View File

@@ -300,6 +300,9 @@ public:
waiting_attribute_ = current_attribute_;
current_attribute_ = next_attribute_;
waiting_cursor_ = current_cursor_;
current_cursor_ = next_cursor_;
tprintf("s");
}
if(increment_video_counter_) {
@@ -311,6 +314,9 @@ public:
// delay. They'll probably need to come back either way once I observe x_scroll_.
next_attribute_ = shifter_.read<1>();
next_character_ = shifter_.read<0>();
next_cursor_ =
(!cursor_position_ && !character_position_) ||
((character_position_ == cursor_position_) && vertical_sub_active_);
shifter_.advance();
tprintf("+");
@@ -336,8 +342,10 @@ public:
if(state == OutputState::Pixels && pixels_) {
const auto pixel_address = waiting_character_;
const auto pixels =
pager_.read(uint16_t(character_base_ + (pixel_address * 8) + vertical_sub_count_));
const uint8_t flash_mask = waiting_cursor_ && (flash_count_ & 0x10) ? 0xff : 0x00;
const auto pixels = pager_.read(uint16_t(
character_base_ + (pixel_address << 3) + vertical_sub_count_
)) ^ flash_mask;
const auto attribute = waiting_attribute_;
const uint16_t colours[] = { background_[0], colour(attribute) };
@@ -669,6 +677,8 @@ private:
uint8_t waiting_attribute_, waiting_character_;
uint8_t pixel_attribute_, pixel_character_;
bool next_cursor_, current_cursor_, waiting_cursor_;
// List of counter-triggered events.
enum class HorizontalEvent: unsigned int {
Begin40Columns = 0,