Change some internal names

stahta01 · Sep 17, 2023 · c8f1910 · c8f1910
1 parent 6ece4c2
commit c8f1910
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git a/include/tvision/hardware.h b/include/tvision/hardware.h
@@ -91,7 +91,7 @@ class THardwareInfo
     static BOOL getKeyEvent( TEvent& event ) noexcept;
     static void clearPendingEvent() noexcept;
     static void waitForEvent( int timeoutMs ) noexcept;
-    static void stopEventWait() noexcept;
+    static void interruptEventWait() noexcept;
     static BOOL setClipboardText( TStringView text ) noexcept;
     static BOOL requestClipboardText( void (&accept)( TStringView ) ) noexcept;
 

diff --git a/include/tvision/internal/codepage.h b/include/tvision/internal/codepage.h
@@ -20,7 +20,7 @@ class CpTranslator
 
     static void init() noexcept;
 
-    static uint32_t toUtf8Int(unsigned char c) noexcept
+    static uint32_t toPackedUtf8(unsigned char c) noexcept
     {
         uint32_t asInt;
         memcpy(&asInt, (*currentToUtf8)[c], sizeof(asInt));

diff --git a/include/tvision/internal/events.h b/include/tvision/internal/events.h
@@ -169,7 +169,7 @@ class EventWaiter
 
     bool getEvent(TEvent &ev) noexcept;
     void waitForEvent(int ms) noexcept;
-    void stopEventWait() noexcept;
+    void interruptEventWait() noexcept;
 };
 
 } // namespace tvision

diff --git a/include/tvision/internal/platform.h b/include/tvision/internal/platform.h
@@ -113,7 +113,7 @@ class Platform
 
     bool getEvent(TEvent &ev) noexcept;
     void waitForEvent(int ms) noexcept { checkConsole(); waiter.waitForEvent(ms); }
-    void stopEventWait() noexcept { waiter.stopEventWait(); }
+    void interruptEventWait() noexcept { waiter.interruptEventWait(); }
 
     int getButtonCount() noexcept
         { return console.lock([] (auto *c) { return c->input.getButtonCount(); }); }

diff --git a/include/tvision/system.h b/include/tvision/system.h
@@ -404,7 +404,7 @@ class TDisplay
         smFont8x8   = 0x0100,
         smColor256  = 0x0200,
         smColorHigh = 0x0400,
-        smChanged   = 0x1000
+        smUpdate    = 0x8000,
         };
 
     static void clearScreen( uchar, uchar ) noexcept;

diff --git a/source/platform/buffdisp.cpp b/source/platform/buffdisp.cpp
@@ -204,7 +204,7 @@ inline void DisplayBuffer::validateCell(TScreenCell &cell) const noexcept
             ch[0] = ' ';
         else if (c < ' ' || 0x7F <= c)
             // Translate from codepage as fallback.
-            ch.moveInt(CpTranslator::toUtf8Int(c));
+            ch.moveInt(CpTranslator::toPackedUtf8(c));
     }
 }
 

diff --git a/source/platform/events.cpp b/source/platform/events.cpp
@@ -273,7 +273,7 @@ void EventWaiter::waitForEvent(int ms) noexcept
     }
 }
 
-void EventWaiter::stopEventWait() noexcept
+void EventWaiter::interruptEventWait() noexcept
 {
     if (wakeUp)
         wakeUp->signal();

diff --git a/source/platform/hardware.cpp b/source/platform/hardware.cpp
@@ -117,9 +117,9 @@ void THardwareInfo::waitForEvent( int timeoutMs ) noexcept
     }
 }
 
-void THardwareInfo::stopEventWait() noexcept
+void THardwareInfo::interruptEventWait() noexcept
 {
-    platf->stopEventWait();
+    platf->interruptEventWait();
 }
 
 BOOL THardwareInfo::setClipboardText( TStringView text ) noexcept

diff --git a/source/platform/ttext.cpp b/source/platform/ttext.cpp
@@ -312,7 +312,7 @@ TText::Lw TText::drawOneImpl( TSpan<TScreenCell> cells, size_t i,
                 if (text[j] == '\0')
                     cells[i]._ch.moveChar(' ');
                 else if (text[j] < ' ' || '\x7F' <= text[j])
-                    cells[i]._ch.moveInt(CpTranslator::toUtf8Int(text[j]));
+                    cells[i]._ch.moveInt(CpTranslator::toPackedUtf8(text[j]));
                 else
                     cells[i]._ch.moveChar(text[j]);
                 return {1, 1};

diff --git a/source/tvision/hardwrvr.cpp b/source/tvision/hardwrvr.cpp
@@ -398,7 +398,7 @@ void THardwareInfo::waitForEvent( int timeoutMs )
         WaitForSingleObject( consoleHandle[cnInput], timeoutMs < 0 ? INFINITE : timeoutMs );
 }
 
-void THardwareInfo::stopEventWait()
+void THardwareInfo::interruptEventWait()
 {
 }
 

diff --git a/source/tvision/tevent.cpp b/source/tvision/tevent.cpp
@@ -475,6 +475,6 @@ void TEvent::waitForEvent(int timeoutMs) noexcept
 void TEvent::putNothing() noexcept
 {
 #if defined( __FLAT__ )
-    THardwareInfo::stopEventWait();
+    THardwareInfo::interruptEventWait();
 #endif
 }
diff --git a/source/tvision/tprogram.cpp b/source/tvision/tprogram.cpp
@@ -159,7 +159,7 @@ void TProgram::getEvent(TEvent& event)
         }
     if( event.what == evCommand && event.message.command == cmScreenChanged )
         {
-        setScreenMode( TDisplay::smChanged );
+        setScreenMode( TDisplay::smUpdate );
         clearEvent(event);
         }
 }

diff --git a/source/tvision/tscreen.cpp b/source/tvision/tscreen.cpp
@@ -324,7 +324,7 @@ void TScreen::flushScreen() noexcept
 
 void TScreen::setVideoMode( ushort mode ) noexcept
 {
-    if ( mode != smChanged )
+    if ( mode != smUpdate )
         setCrtMode( fixCrtMode( mode ) );
 #ifdef __FLAT__
     else
-Original file line number
+Diff line change
@@ Expand Up / @@ -398,7 +398,7 @@ void THardwareInfo::waitForEvent( int timeoutMs ) @@
             WaitForSingleObject( consoleHandle[cnInput], timeoutMs < 0 ? INFINITE : timeoutMs );
     }
-    void THardwareInfo::stopEventWait()
+    void THardwareInfo::interruptEventWait()
     {
     }
@@ Expand Down @@