perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reduce public methods in FVTerm

This commit is contained in:
Markus Gans 2016-12-28 16:29:49 +01:00
parent 2c8d58f803
commit 628bec0b29
7 changed files with 625 additions and 614 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2016-12-28 Markus Gans <guru.mail@muenster.de>
* Reduce public methods in FVTerm
2016-12-27 Markus Gans <guru.mail@muenster.de> 2016-12-27 Markus Gans <guru.mail@muenster.de>
* Avoid non-working tab-cursor-movements on Linux terminals * Avoid non-working tab-cursor-movements on Linux terminals
with activated PC or VT100 encoding with activated PC or VT100 encoding

2
src/fdialog.cpp
View File

@ -1007,7 +1007,7 @@ void FDialog::draw()
if ( isMonochron() ) if ( isMonochron() )
setReverse(true); setReverse(true);
clearArea (vwin); clearArea();
drawBorder(); drawBorder();
drawTitleBar(); drawTitleBar();
setCursorPos(2, getHeight() - 1); setCursorPos(2, getHeight() - 1);

2
src/fmenu.cpp
View File

@ -1222,7 +1222,7 @@ void FMenu::draw()
if ( isMonochron() ) if ( isMonochron() )
setReverse(true); setReverse(true);
clearArea (vwin); clearArea();
drawBorder(); drawBorder();
drawItems(); drawItems();
drawShadow(); drawShadow();

2
src/ftooltip.cpp
View File

@ -84,7 +84,7 @@ void FToolTip::draw()
if ( getMaxColor() < 16 ) if ( getMaxColor() < 16 )
setBold(); setBold();
clearArea (vwin); clearArea();
drawBorder(); drawBorder();
for (int i=0; i < int(text_num_lines); i++) for (int i=0; i < int(text_num_lines); i++)

1196
src/fvterm.cpp
View File

File diff suppressed because it is too large Load Diff

32
src/fvterm.h
View File

@ -98,7 +98,6 @@ class FVTerm : public FObject, public FTerm
// Mutators // Mutators
static void setTermXY (register int, register int); static void setTermXY (register int, register int);
static bool clearTerm (int = ' ');
static bool hideCursor (bool); static bool hideCursor (bool);
static bool hideCursor(); static bool hideCursor();
static bool showCursor(); static bool showCursor();
@ -190,6 +189,8 @@ class FVTerm : public FObject, public FTerm
static bool isTransShadow(); static bool isTransShadow();
static bool isInheritBackground(); static bool isInheritBackground();
// Methods
void clearArea (int = ' ');
void createVTerm (const FRect&); void createVTerm (const FRect&);
void createVTerm (int, int); void createVTerm (int, int);
static void resizeVTerm (const FRect&); static void resizeVTerm (const FRect&);
@ -197,10 +198,6 @@ class FVTerm : public FObject, public FTerm
static void putVTerm(); static void putVTerm();
static void updateTerminal (bool); static void updateTerminal (bool);
static void updateTerminal(); static void updateTerminal();
static void updateTerminalLine (uInt);
static bool updateTerminalCursor();
static void processTerminalUpdate();
static bool isInsideTerminal (int, int);
int printf (const wchar_t*, ...); int printf (const wchar_t*, ...);
int printf (const char*, ...) int printf (const char*, ...)
@ -223,16 +220,6 @@ class FVTerm : public FObject, public FTerm
int print (int); int print (int);
int print (term_area*, int); int print (term_area*, int);
FVTerm& print(); FVTerm& print();
static void newFontChanges (char_data*&);
static void charsetChanges (char_data*&);
static void appendCharacter (char_data*&);
static void appendChar (char_data*&);
static void appendAttributes (char_data*&);
static int appendLowerRight (char_data*&);
static void appendOutputBuffer (std::string&);
static void appendOutputBuffer (const char*);
static int appendOutputBuffer (int);
static void flush_out();
protected: protected:
// Enumeration // Enumeration
@ -302,8 +289,10 @@ class FVTerm : public FObject, public FTerm
static char_data getCoveredCharacter (int, int, FVTerm*); static char_data getCoveredCharacter (int, int, FVTerm*);
static char_data getOverlappedCharacter (const FPoint&, FVTerm*); static char_data getOverlappedCharacter (const FPoint&, FVTerm*);
static char_data getOverlappedCharacter (int, int, FVTerm*); static char_data getOverlappedCharacter (int, int, FVTerm*);
static void processTerminalUpdate();
static void startTerminalUpdate(); static void startTerminalUpdate();
static void finishTerminalUpdate(); static void finishTerminalUpdate();
static void flush_out();
// Data Members // Data Members
static term_area* vterm; // virtual terminal static term_area* vterm; // virtual terminal
@ -335,8 +324,21 @@ class FVTerm : public FObject, public FTerm
// Methods // Methods
void init(); void init();
void finish(); void finish();
static bool clearTerm (int = ' ');
static void updateTerminalLine (uInt);
static bool updateTerminalCursor();
static bool isInsideTerminal (int, int);
static void markAsPrinted (uInt, uInt); static void markAsPrinted (uInt, uInt);
static void markAsPrinted (uInt, uInt, uInt); static void markAsPrinted (uInt, uInt, uInt);
static void newFontChanges (char_data*&);
static void charsetChanges (char_data*&);
static void appendCharacter (char_data*&);
static void appendChar (char_data*&);
static void appendAttributes (char_data*&);
static int appendLowerRight (char_data*&);
static void appendOutputBuffer (std::string&);
static void appendOutputBuffer (const char*);
static int appendOutputBuffer (int);
// Data Members // Data Members
static std::queue<int>* output_buffer; static std::queue<int>* output_buffer;

2
test/opti-move.cpp
View File

@ -138,7 +138,7 @@ int main (int argc, char* argv[])
terminal->setTermXY(0,0); terminal->setTermXY(0,0);
terminal->setNormal(); terminal->setNormal();
terminal->clearTerm(); terminal->clearArea();
std::cout << "Terminal: " << terminal->getTermType() << "\r\n"; std::cout << "Terminal: " << terminal->getTermType() << "\r\n";
std::cout << " Columns: 0.." << xmax << "\r\n"; std::cout << " Columns: 0.." << xmax << "\r\n";