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

install fix with final/ftermdata.h

This commit is contained in:
Markus Gans 2018-11-20 21:11:04 +01:00
parent 801147161d
commit 167b7c97bc
39 changed files with 130 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/calculator.cpp
View File

@ -416,7 +416,6 @@ void Calc::zero (lDouble&)
input += '0';
else
input = '0';
}
//----------------------------------------------------------------------
@ -830,6 +829,7 @@ void Calc::tangent (lDouble& x)
if ( arcus_mode )
x = std::atan(x) * 180.0L / PI;
else
{
// Test if (x / 180) != 0 and x / 90 == 0
if ( std::fabs(std::fmod(x, 180.0L)) > LDBL_EPSILON
&& std::fabs(std::fmod(x, 90.0L)) < LDBL_EPSILON )
@ -839,6 +839,7 @@ void Calc::tangent (lDouble& x)
else
x = std::tan(x * PI / 180.0L);
}
}
if ( errno == EDOM )
error = true;

9
examples/checklist.cpp
View File

@ -131,7 +131,8 @@ void CheckList::populate()
{
const finalcut::FStringList line (&list[i][0], &list[i][0] + 2);
finalcut::FObject::FObjectIterator iter = listView.insert (line);
finalcut::FListViewItem* item = static_cast<finalcut::FListViewItem*>(*iter);
finalcut::FListViewItem* item = \
static_cast<finalcut::FListViewItem*>(*iter);
item->setCheckable(true);
}
}
@ -167,10 +168,12 @@ void CheckList::cb_showList (finalcut::FWidget*, data_ptr)
while ( iter != listView.endOfList() )
{
const finalcut::FListViewItem* item = static_cast<finalcut::FListViewItem*>(*iter);
const finalcut::FListViewItem* item = \
static_cast<finalcut::FListViewItem*>(*iter);
if ( item->isChecked() )
shopping_list << wchar_t(finalcut::fc::Bullet) << ' ' << item->getText(1) << '\n';
shopping_list << wchar_t(finalcut::fc::Bullet) << ' '
<< item->getText(1) << '\n';
++iter;
}

1
examples/choice.cpp
View File

@ -20,6 +20,7 @@
* <http://www.gnu.org/licenses/>. *
***********************************************************************/
#include <vector>
#include <final/final.h>

2
examples/listbox.cpp
View File

@ -35,7 +35,7 @@ static finalcut::FString* temp_str = 0;
// Function prototypes
void doubleToItem ( finalcut::FListBoxItem&
, finalcut::FWidget::data_ptr container
, int index) ;
, int index);
finalcut::FString& doubleToString (std::list<double>::const_iterator iter);
finalcut::FString& mapToString ( std::map<finalcut::FString
, finalcut::FString>::const_iterator iter );

9
examples/mouse.cpp
View File

@ -372,7 +372,7 @@ MouseDraw::MouseDraw (finalcut::FWidget* parent)
brush.setPos (1, 12);
finalcut::FPoint no_shadow(0,0);
finalcut::FPoint no_shadow(0, 0);
finalcut::FRect scroll_geometry(0, 0, 1, 1);
createArea (scroll_geometry, no_shadow, canvas);
}
@ -382,12 +382,13 @@ MouseDraw::~MouseDraw()
{ }
//----------------------------------------------------------------------
void MouseDraw::setGeometry (int x, int y, std::size_t w, std::size_t h, bool adjust)
void MouseDraw::setGeometry ( int x, int y
, std::size_t w, std::size_t h
, bool adjust )
{
int old_w, old_h;
finalcut::FDialog::setGeometry (x, y, w, h, adjust);
finalcut::FPoint no_shadow(0,0);
finalcut::FPoint no_shadow(0, 0);
finalcut::FRect scroll_geometry (0, 0, w - 11, h - 3);
old_w = canvas->width;
old_h = canvas->height;

2
examples/opti-move.cpp
View File

@ -157,7 +157,7 @@ int main (int argc, char* argv[])
finalcut::FString line(std::size_t(xmax) + 1, '-');
// Place the cursor in the upper left corner
TermApp.setTermXY(0,0);
TermApp.setTermXY(0, 0);
// Reset all terminal attributes
TermApp.setNormal();
// Clear the screen

3
examples/scrollview.cpp
View File

@ -84,7 +84,8 @@ Scrollview::Scrollview (finalcut::FWidget* parent)
// Sets the navigation button geometry
go_east.setGeometry (1, 1, 5, 1);
go_south.setGeometry (int(getScrollWidth()) - 5, 1, 5, 1);
go_west.setGeometry (int(getScrollWidth()) - 5, int(getScrollHeight()) - 2, 5, 1);
go_west.setGeometry ( int(getScrollWidth()) - 5
, int(getScrollHeight()) - 2, 5, 1);
go_north.setGeometry (1, int(getScrollHeight()) - 2, 5, 1);
// Add scroll function callbacks to the buttons

3
examples/string-operations.cpp
View File

@ -512,7 +512,8 @@ void convertToNumberExample()
try
{
const double double_num = finalcut::FString("2.7182818284590452353").toDouble();
const double double_num = \
finalcut::FString("2.7182818284590452353").toDouble();
std::ios_base::fmtflags save_flags = std::cout.flags();
std::cout << " toDouble: " << std::setprecision(11)
<< double_num << std::endl;

8
examples/term-attributes.cpp
View File

@ -169,8 +169,10 @@ void AttribDlg::adjustSize()
y = 1;
setGeometry(x, y, 69, 21, false);
next_button.setGeometry(int(getWidth()) - 13, int(getHeight()) - 4, 10, 1, false);
back_button.setGeometry(int(getWidth()) - 25, int(getHeight()) - 4, 10, 1, false);
next_button.setGeometry ( int(getWidth()) - 13, int(getHeight()) - 4
, 10, 1, false );
back_button.setGeometry ( int(getWidth()) - 25, int(getHeight()) - 4
, 10, 1, false );
finalcut::FDialog::adjustSize();
}
@ -258,7 +260,7 @@ void AttribDemo::printAltCharset()
if ( ! isMonochron() )
setColor (wc.label_fg, wc.label_bg);
setPrintPos (1,1);
setPrintPos (1, 1);
print("alternate charset: ");
if ( parent->bgcolor == finalcut::fc::Default )

2
examples/timer.cpp
View File

@ -59,7 +59,7 @@ Timer::Timer (finalcut::FWidget* parent)
//----------------------------------------------------------------------
void Timer::draw()
{
setPrintPos (1,1);
setPrintPos (1, 1);
print() << "---------------\n"
<< "Press Q to quit\n"
<< "---------------\n";

1
src/Makefile.am
View File

@ -119,6 +119,7 @@ finalcutinclude_HEADERS = \
include/final/ftermdetection.h \
include/final/ftermios.h \
include/final/fterm.h \
include/final/ftermdata.h \
include/final/fvterm.h \
include/final/ftextview.h \
include/final/ftogglebutton.h \

1
src/Makefile.clang
View File

@ -45,6 +45,7 @@ INCLUDE_HEADERS = \
fkeyboard.h \
ftermcap.h \
fterm.h \
ftermdata.h \
ftermios.h \
ftermdetection.h \
ftermcapquirks.h \

1
src/Makefile.gcc
View File

@ -45,6 +45,7 @@ INCLUDE_HEADERS = \
fkeyboard.h \
ftermcap.h \
fterm.h \
ftermdata.h \
ftermios.h \
ftermdetection.h \
ftermcapquirks.h \

4
src/fbutton.cpp
View File

@ -217,12 +217,12 @@ bool FButton::setShadow (bool on)
&& getEncoding() != fc::ASCII )
{
flags.shadow = true;
setShadowSize(1,1);
setShadowSize(1, 1);
}
else
{
flags.shadow = false;
setShadowSize(0,0);
setShadowSize(0, 0);
}
return flags.shadow;

2
src/fcheckbox.cpp
View File

@ -72,7 +72,7 @@ void FCheckBox::drawCheckButton()
if ( ! isVisible() )
return;
setPrintPos (1,1);
setPrintPos (1, 1);
setColor();
if ( isMonochron() )

2
src/fcheckmenuitem.cpp
View File

@ -75,7 +75,7 @@ void FCheckMenuItem::processToggle()
//----------------------------------------------------------------------
void FCheckMenuItem::processClicked()
{
checked = not checked;
checked = ! checked;
processToggle();
emitCallback("clicked");
}

8
src/fdialog.cpp
View File

@ -528,7 +528,7 @@ void FDialog::onMouseDown (FMouseEvent* ev)
&& ms.mouse_y == 1 )
titlebar_click_pos.setPoint (ev->getTermX(), ev->getTermY());
else
titlebar_click_pos.setPoint (0,0);
titlebar_click_pos.setPoint (0, 0);
// Click on titlebar menu button
if ( ms.mouse_x < 4 && ms.mouse_y == 1 )
@ -1578,7 +1578,7 @@ void FDialog::resizeMouseDown (mouseStates& ms)
drawBorder();
}
else
resize_click_pos.setPoint (0,0);
resize_click_pos.setPoint (0, 0);
}
//----------------------------------------------------------------------
@ -1622,7 +1622,7 @@ void FDialog::resizeMouseUpMove (mouseStates& ms, bool mouse_up)
if ( mouse_up )
{
// Reset the border color
resize_click_pos.setPoint (0,0);
resize_click_pos.setPoint (0, 0);
// redraw() is required to draw the standard (black) border
// and client objects with ignorePadding() option.
@ -1639,7 +1639,7 @@ void FDialog::cancelMouseResize()
if ( resize_click_pos.isNull() )
return;
resize_click_pos.setPoint (0,0);
resize_click_pos.setPoint (0, 0);
drawBorder();
updateTerminal();
}

2
src/ffiledialog.cpp
View File

@ -912,7 +912,7 @@ void FFileDialog::cb_processOpen (FWidget*, data_ptr)
//----------------------------------------------------------------------
void FFileDialog::cb_processShowHidden (FWidget*, data_ptr)
{
setShowHiddenFiles(not show_hidden);
setShowHiddenFiles(! show_hidden);
}
} // namespace finalcut

11
src/fkeyboard.cpp
View File

@ -234,10 +234,9 @@ inline int FKeyboard::getTermcapKey()
if ( ! key_map )
return -1;
fc::fkeymap* keymap = reinterpret_cast<fc::fkeymap*>(key_map);
for (int i = 0; keymap[i].tname[0] != 0; i++)
for (int i = 0; key_map[i].tname[0] != 0; i++)
{
char* k = keymap[i].string;
char* k = key_map[i].string;
std::size_t len = ( k ) ? std::strlen(k) : 0;
if ( k && std::strncmp(k, fifo_buf, len) == 0 ) // found
@ -486,17 +485,17 @@ int FKeyboard::parseKeyString()
{
int keycode = getMouseProtocolKey();
if ( keycode > 0 )
if ( keycode != -1 )
return keycode;
keycode = getTermcapKey();
if ( keycode > 0 )
if ( keycode != -1 )
return keycode;
keycode = getMetaKey();
if ( keycode > 0 )
if ( keycode != -1 )
return keycode;
if ( ! isKeypressTimeout() )

9
src/flineedit.cpp
View File

@ -240,12 +240,12 @@ bool FLineEdit::setShadow (bool on)
&& getEncoding() != fc::ASCII )
{
flags.shadow = true;
setShadowSize(1,1);
setShadowSize(1, 1);
}
else
{
flags.shadow = false;
setShadowSize(0,0);
setShadowSize(0, 0);
}
return flags.shadow;
@ -645,7 +645,8 @@ void FLineEdit::adjustLabel()
break;
case label_left:
label->setGeometry(getX() - int(label_length) - 1, getY(), label_length, 1);
label->setGeometry(getX() - int(label_length) - 1, getY()
, label_length, 1);
break;
}
}
@ -853,7 +854,7 @@ inline void FLineEdit::keyBackspace()
//----------------------------------------------------------------------
inline void FLineEdit::keyInsert()
{
insert_mode = not insert_mode;
insert_mode = ! insert_mode;
if ( insert_mode )
setInsertCursor();

4
src/flistbox.cpp
View File

@ -1564,7 +1564,7 @@ void FListBox::nextListItem (int distance)
//----------------------------------------------------------------------
void FListBox::scrollToX (int val)
{
static const std::size_t padding_space = 2; // 1 leading space + 1 trailing space
static const std::size_t padding_space = 2; // 1 leading + 1 trailing space
std::size_t xoffset_end = max_line_width - getClientWidth() + padding_space;
if ( xoffset == val )
@ -1621,7 +1621,7 @@ void FListBox::scrollLeft (int distance)
//----------------------------------------------------------------------
void FListBox::scrollRight (int distance)
{
static const std::size_t padding_space = 2; // 1 leading space + 1 trailing space
static const std::size_t padding_space = 2; // 1 leading + 1 trailing space
std::size_t xoffset_end = max_line_width - getClientWidth() + padding_space;
xoffset += distance;

2
src/fmenubar.cpp
View File

@ -519,7 +519,7 @@ void FMenuBar::drawItems()
if ( item_list.empty() )
return;
setPrintPos (1,1);
setPrintPos (1, 1);
if ( isMonochron() )
setReverse(true);

6
src/fmouse.cpp
View File

@ -47,8 +47,8 @@ FMouse::FMouse()
, max_width(80)
, max_height(25)
, time_mousepressed()
, zero_point(0,0) // zero point (x=0, y=0)
, mouse(0,0) // mouse click position
, zero_point(0, 0) // zero point (x=0, y=0)
, mouse(0, 0) // mouse click position
, new_mouse_position()
{
time_mousepressed.tv_sec = 0;
@ -1200,7 +1200,7 @@ void FMouseUrxvt::setButtonState (int btn, struct timeval* time)
FMouseControl::FMouseControl()
: mouse_protocol()
, iter()
, zero_point(0,0)
, zero_point(0, 0)
, use_gpm_mouse(false)
, use_xterm_mouse(false)
{

10
src/fprogressbar.cpp
View File

@ -68,7 +68,9 @@ void FProgressbar::setPercentage (std::size_t percentage_value)
}
//----------------------------------------------------------------------
void FProgressbar::setGeometry (int x, int y, std::size_t w, std::size_t h, bool adjust)
void FProgressbar::setGeometry ( int x, int y
, std::size_t w, std::size_t h
, bool adjust )
{
// Set the progress bar geometry
@ -84,12 +86,12 @@ bool FProgressbar::setShadow (bool on)
&& getEncoding() != fc::ASCII )
{
flags.shadow = true;
setShadowSize(1,1);
setShadowSize(1, 1);
}
else
{
flags.shadow = false;
setShadowSize(0,0);
setShadowSize(0, 0);
}
return on;
@ -193,7 +195,7 @@ void FProgressbar::drawBar()
{
std::size_t i = 0;
double length;
setPrintPos (1,1);
setPrintPos (1, 1);
setColor ( wc.progressbar_bg
, wc.progressbar_fg );

2
src/fradiobutton.cpp
View File

@ -73,7 +73,7 @@ void FRadioButton::drawRadioButton()
if ( ! isVisible() )
return;
setPrintPos (1,1);
setPrintPos (1, 1);
setColor();
if ( isMonochron() )

10
src/fscrollbar.cpp
View File

@ -174,7 +174,9 @@ void FScrollbar::setOrientation (int o)
}
//----------------------------------------------------------------------
void FScrollbar::setGeometry (int x, int y, std::size_t w, std::size_t h, bool adjust)
void FScrollbar::setGeometry ( int x, int y
, std::size_t w, std::size_t h
, bool adjust )
{
// Set the scrollbar geometry
@ -419,11 +421,13 @@ void FScrollbar::onMouseDown (FMouseEvent* ev)
if ( bar_orientation == fc::vertical )
slider_click_stop_pos = mouse_y - 2;
else
{
if ( isNewFont() )
slider_click_stop_pos = mouse_x - 3;
else
slider_click_stop_pos = mouse_x - 2;
}
}
else
slider_click_stop_pos = -1;
@ -605,7 +609,7 @@ void FScrollbar::drawButtons()
if ( isNewFont() )
{
setPrintPos (1,1);
setPrintPos (1, 1);
if ( bar_orientation == fc::vertical )
{
@ -626,7 +630,7 @@ void FScrollbar::drawButtons()
}
else
{
setPrintPos (1,1);
setPrintPos (1, 1);
if ( isMonochron() )
setReverse(true);

10
src/fscrollview.cpp
View File

@ -72,7 +72,7 @@ void FScrollView::setScrollWidth (std::size_t width)
if ( viewport )
{
FPoint no_shadow(0,0);
FPoint no_shadow(0, 0);
scroll_geometry.setWidth (width);
resizeArea (scroll_geometry, no_shadow, viewport);
@ -100,7 +100,7 @@ void FScrollView::setScrollHeight (std::size_t height)
if ( viewport )
{
FPoint no_shadow(0,0);
FPoint no_shadow(0, 0);
scroll_geometry.setHeight (height);
resizeArea (scroll_geometry, no_shadow, viewport);
addPreprocessingHandler
@ -133,7 +133,7 @@ void FScrollView::setScrollSize (std::size_t width, std::size_t height)
if ( viewport )
{
FPoint no_shadow(0,0);
FPoint no_shadow(0, 0);
scroll_geometry.setSize (width, height);
resizeArea (scroll_geometry, no_shadow, viewport);
addPreprocessingHandler
@ -548,7 +548,7 @@ void FScrollView::onChildFocusIn (FFocusEvent*)
widget_geometry = focus_widget->getGeometryWithShadow();
vp_geometry = viewport_geometry;
vp_geometry.move(1,1);
vp_geometry.move(1, 1);
if ( ! vp_geometry.contains(widget_geometry) )
{
@ -749,7 +749,7 @@ void FScrollView::init (FWidget* parent)
setBottomPadding (1 - (yoffset_end - getScrollY()));
setRightPadding (1 - (xoffset_end - getScrollX()) + nf_offset);
FPoint no_shadow(0,0);
FPoint no_shadow(0, 0);
std::size_t w = getViewportWidth();
std::size_t h = getViewportHeight();

11
src/ftermcap.cpp
View File

@ -20,6 +20,9 @@
* <http://www.gnu.org/licenses/>. *
***********************************************************************/
#include <algorithm>
#include <vector>
#include "final/ftermcap.h"
namespace finalcut
@ -336,10 +339,10 @@ void FTermcap::termcapKeysVt100 (char*& buffer)
//----------------------------------------------------------------------
FTermcap::tcap_map FTermcap::tcap[] =
{
// .------------- term string
// | .-------- Tcap-code
// | | // variable name -> description
//-----------------------------------------------------------------------------
// .------------- term string
// | .-------- Tcap-code
// | | // variable name -> description
//------------------------------------------------------------------------------
{ 0, "bl" }, // bell -> audible signal (bell) (P)
{ 0, "ec" }, // erase_chars -> erase #1 characters (P)
{ 0, "cl" }, // clear_screen -> clear screen and home cursor (P*)

2
src/ftermios.cpp
View File

@ -20,6 +20,8 @@
* <http://www.gnu.org/licenses/>. *
***********************************************************************/
#include <map>
#include "final/ftermios.h"
#include "final/fterm.h"

12
src/ftogglebutton.cpp
View File

@ -88,7 +88,9 @@ FToggleButton::~FToggleButton() // destructor
// public methods of FToggleButton
//----------------------------------------------------------------------
void FToggleButton::setGeometry (int x, int y, std::size_t w, std::size_t h, bool adjust)
void FToggleButton::setGeometry ( int x, int y
, std::size_t w, std::size_t h
, bool adjust )
{
// Set the toggle button geometry
@ -286,7 +288,7 @@ void FToggleButton::onMouseUp (FMouseEvent* ev)
}
else
{
checked = not checked;
checked = ! checked;
processToggle();
}
@ -332,7 +334,7 @@ void FToggleButton::onAccel (FAccelEvent* ev)
}
else
{
checked = not checked;
checked = ! checked;
processToggle();
}
@ -550,7 +552,7 @@ void FToggleButton::onKeyPress (FKeyEvent* ev)
}
else
{
checked = not checked;
checked = ! checked;
processToggle();
}
processClick();
@ -674,7 +676,7 @@ void FToggleButton::drawText ( wchar_t LabelText[]
}
if ( isMonochron() )
setReverse(false);;
setReverse(false);
}
} // namespace finalcut

12
src/fvterm.cpp
View File

@ -98,7 +98,7 @@ FPoint FVTerm::getPrintCursor()
return FPoint ( win->offset_left + win->cursor_x
, win->offset_top + win->cursor_y );
return FPoint(0,0);
return FPoint(0, 0);
}
//----------------------------------------------------------------------
@ -184,7 +184,7 @@ void FVTerm::clearArea (int fillchar)
void FVTerm::createVTerm (const FRect& r)
{
// initialize virtual terminal
const FPoint shadow(0,0);
const FPoint shadow(0, 0);
createArea (r, shadow, vterm);
}
@ -198,7 +198,7 @@ void FVTerm::createVTerm (int width, int height)
//----------------------------------------------------------------------
void FVTerm::resizeVTerm (const FRect& r)
{
const FPoint shadow(0,0);
const FPoint shadow(0, 0);
resizeArea (r, shadow, vterm);
}
@ -2014,7 +2014,7 @@ void FVTerm::init (bool disable_alt_screen)
createVTerm (term_geometry);
// Create virtual desktop area
FPoint shadow_size(0,0);
FPoint shadow_size(0, 0);
createArea (term_geometry, shadow_size, vdesktop);
vdesktop->visible = true;
active_area = vdesktop;
@ -2191,7 +2191,7 @@ bool FVTerm::clearTerm (int fillchar)
if ( cl ) // Clear screen
{
appendOutputBuffer (cl);
term_pos->setPoint(0,0);
term_pos->setPoint(0, 0);
}
else if ( cd ) // Clear to end of screen
{
@ -2209,7 +2209,7 @@ bool FVTerm::clearTerm (int fillchar)
appendOutputBuffer (cb);
}
setTermXY (0,0);
setTermXY (0, 0);
}
flush_out();

8
src/fwindow.cpp
View File

@ -184,9 +184,9 @@ bool FWindow::setTransparentShadow (bool on)
flags.shadow = flags.trans_shadow = on;
if ( on )
setShadowSize (2,1);
setShadowSize (2, 1);
else
setShadowSize (0,0);
setShadowSize (0, 0);
return on;
}
@ -201,13 +201,13 @@ bool FWindow::setShadow (bool on)
{
flags.shadow = true;
flags.trans_shadow = false;
setShadowSize (1,1);
setShadowSize (1, 1);
}
else
{
flags.shadow = false;
flags.trans_shadow = false;
setShadowSize (0,0);
setShadowSize (0, 0);
}
return on;

2
src/include/final/fbutton.h
View File

@ -69,7 +69,7 @@ class FButton : public FWidget
public:
// Constructors
explicit FButton (FWidget* = 0);
FButton (const FString&, FWidget* = 0);
explicit FButton (const FString&, FWidget* = 0);
// Destructor
virtual ~FButton();

2
src/include/final/fdialog.h
View File

@ -88,7 +88,7 @@ class FDialog : public FWindow
// Constructors
explicit FDialog (FWidget* = 0);
FDialog (const FString&, FWidget* = 0);
explicit FDialog (const FString&, FWidget* = 0);
// Destructor
virtual ~FDialog();

17
src/include/final/ftermdebugdata.h
View File

@ -46,6 +46,12 @@ namespace finalcut
class FTermDebugData
{
public:
// Constructors
FTermDebugData();
// Destructor
~FTermDebugData();
// Accessors
const FString& getAnswerbackString();
const FString& getSecDAString();
@ -64,6 +70,17 @@ class FTermDebugData
FTermData* data;
};
// FTermDebugData inline functions
//----------------------------------------------------------------------
inline FTermDebugData::FTermDebugData()
: term_detection(0)
, data(0)
{ }
//----------------------------------------------------------------------
inline FTermDebugData::~FTermDebugData()
{ }
//----------------------------------------------------------------------
inline void FTermDebugData::setFTermDetection (FTermDetection* obj)
{ term_detection = obj; }

2
src/include/final/ftooltip.h
View File

@ -76,7 +76,7 @@ class FToolTip : public FWindow
public:
// Constructor
explicit FToolTip (FWidget* = 0);
FToolTip (const FString&, FWidget* = 0);
explicit FToolTip (const FString&, FWidget* = 0);
// Destructor
virtual ~FToolTip ();

1
src/include/final/fwidget.h
View File

@ -95,6 +95,7 @@
#error "Only <final/final.h> can be included directly."
#endif
#include <utility>
#include <vector>
#include "final/fvterm.h"