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

All include files were moved to a separate director

This commit is contained in:
Markus Gans 2017-09-17 21:32:46 +02:00
parent ab26baa47c
commit 28f3de0971
127 changed files with 578 additions and 561 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
.gitignore vendored
View File

@ -21,27 +21,27 @@ libtool
/autom4te.cache
src/.deps/
src/.libs/
test/.deps/
test/.libs/
test/calculator
test/dialog
test/string-operations
test/opti-move
test/termcap
test/hello
test/watch
test/menu
test/scrollview
test/windows
test/term-attributes
test/transparent
test/input-dialog
test/choice
test/listbox
test/listview
test/treeview
test/mandelbrot
test/keyboard
test/mouse
test/timer
test/ui
examples/.deps/
examples/.libs/
examples/calculator
examples/dialog
examples/string-operations
examples/opti-move
examples/termcap
examples/hello
examples/watch
examples/menu
examples/scrollview
examples/windows
examples/term-attributes
examples/transparent
examples/input-dialog
examples/choice
examples/listbox
examples/listview
examples/treeview
examples/mandelbrot
examples/keyboard
examples/mouse
examples/timer
examples/ui

1
ChangeLog
View File

@ -1,6 +1,7 @@
2017-09-17 Markus Gans <guru.mail@muenster.de>
* FObject has received the iterator child access methods
begin() and end()
* All include files were moved to a separate directory
2017-09-15 Markus Gans <guru.mail@muenster.de>
* Fix byte access in data type char_data

2
Makefile.am
View File

@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src doc test
SUBDIRS = src doc examples
docdir = ${datadir}/doc/${PACKAGE}
doc_DATA = AUTHORS COPYING ChangeLog

2
Makefile.in
View File

@ -352,7 +352,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src doc test
SUBDIRS = src doc examples
doc_DATA = AUTHORS COPYING ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive

10
configure vendored
View File

@ -2351,7 +2351,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_config_headers="$ac_config_headers config.h"
ac_config_commands="$ac_config_commands src/fconfig.h"
ac_config_commands="$ac_config_commands include/final/fconfig.h"
am__api_version='1.14'
@ -16978,7 +16978,7 @@ SO_VERSION="3:0:3"
ac_config_files="$ac_config_files Makefile src/Makefile src/fonts/Makefile doc/Makefile test/Makefile"
ac_config_files="$ac_config_files Makefile src/Makefile src/fonts/Makefile doc/Makefile examples/Makefile"
# use GPM (General Purpose Mouse)
@ -18191,14 +18191,14 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"src/fconfig.h") CONFIG_COMMANDS="$CONFIG_COMMANDS src/fconfig.h" ;;
"include/final/fconfig.h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/final/fconfig.h" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/fonts/Makefile") CONFIG_FILES="$CONFIG_FILES src/fonts/Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
"examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
@ -18794,7 +18794,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
case $ac_file$ac_mode in
"src/fconfig.h":C) ac_prefix_conf_OUT=`echo src/fconfig.h`
"include/final/fconfig.h":C) ac_prefix_conf_OUT=`echo include/final/fconfig.h`
ac_prefix_conf_DEF=`echo _$ac_prefix_conf_OUT | sed -e "y:abcdefghijklmnopqrstuvwxyz:ABCDEFGHIJKLMNOPQRSTUVWXYZ:" -e "s/[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g"`
ac_prefix_conf_PKG=`echo F`
ac_prefix_conf_LOW=`echo _$ac_prefix_conf_PKG | sed -e "y:ABCDEFGHIJKLMNOPQRSTUVWXYZ-:abcdefghijklmnopqrstuvwxyz_:"`

4
configure.ac
View File

@ -6,7 +6,7 @@
AC_INIT([finalcut], [0.3.0])
AC_CONFIG_HEADER([config.h])
AX_PREFIX_CONFIG_H([src/fconfig.h], [F])
AX_PREFIX_CONFIG_H([include/final/fconfig.h], [F])
AC_CONFIG_SRCDIR([src/fobject.cpp])
AM_INIT_AUTOMAKE
AC_PROG_CC
@ -54,7 +54,7 @@ AC_SUBST([LIBTOOL_DEPS])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_FILES([Makefile src/Makefile src/fonts/Makefile doc/Makefile test/Makefile])
AC_CONFIG_FILES([Makefile src/Makefile src/fonts/Makefile doc/Makefile examples/Makefile])
# use GPM (General Purpose Mouse)
AC_ARG_WITH([gpm],

8
debian/libfinal-examples.install vendored
View File

@ -1,4 +1,4 @@
test/.libs/* usr/lib/finalcut/examples
test/*.cpp usr/lib/finalcut/examples
test/Makefile.clang usr/lib/finalcut/examples
test/Makefile.gcc usr/lib/finalcut/examples
examples/.libs/* usr/lib/finalcut/examples
examples/*.cpp usr/lib/finalcut/examples
examples/Makefile.clang usr/lib/finalcut/examples
examples/Makefile.gcc usr/lib/finalcut/examples

2
examples/Makefile.am
View File

@ -3,7 +3,7 @@
#----------------------------------------------------------------------
AM_LDFLAGS = -L$(top_builddir)/src/.libs -lfinal
AM_CPPFLAGS = -Wall -Werror -I$(top_srcdir)/src
AM_CPPFLAGS = -I$(top_srcdir)/include -Wall -Werror
noinst_PROGRAMS = \
hello \

2
examples/Makefile.clang
View File

@ -12,7 +12,7 @@ OBJS = $(SRCS:%.cpp=%)
CCXFLAGS = $(OPTIMIZE) $(PROFILE) $(DEBUG)
MAKEFILE = -f Makefile.clang
LDFLAGS = -L../src -lfinal
INCLUDES = -I../src -I/usr/include/final/
INCLUDES = -I../include -I/usr/include/final
RM = rm -f
ifdef DEBUG

2
examples/Makefile.gcc
View File

@ -12,7 +12,7 @@ OBJS = $(SRCS:%.cpp=%)
CCXFLAGS = $(OPTIMIZE) $(PROFILE) $(DEBUG)
MAKEFILE = -f Makefile.gcc
LDFLAGS = -L../src -lfinal
INCLUDES = -I../src -I/usr/include/final/
INCLUDES = -I../include -I/usr/include/final
RM = rm -f
ifdef DEBUG

8
examples/Makefile.in
View File

@ -90,7 +90,7 @@ noinst_PROGRAMS = hello$(EXEEXT) dialog$(EXEEXT) input-dialog$(EXEEXT) \
transparent$(EXEEXT) keyboard$(EXEEXT) mouse$(EXEEXT) \
timer$(EXEEXT) scrollview$(EXEEXT) windows$(EXEEXT) \
menu$(EXEEXT) ui$(EXEEXT)
subdir = test
subdir = examples
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -374,7 +374,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_LDFLAGS = -L$(top_builddir)/src/.libs -lfinal
AM_CPPFLAGS = -Wall -Werror -I$(top_srcdir)/src
AM_CPPFLAGS = -I../include -I$(top_srcdir)/src -Wall -Werror
hello_SOURCES = hello.cpp
dialog_SOURCES = dialog.cpp
input_dialog_SOURCES = input-dialog.cpp
@ -410,9 +410,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu test/Makefile
$(AUTOMAKE) --gnu examples/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \

10
examples/calculator.cpp
View File

@ -11,9 +11,9 @@
#include <map>
#include <stack>
#include "fapplication.h"
#include "fdialog.h"
#include "fmessagebox.h"
#include <final/fapplication.h>
#include <final/fdialog.h>
#include <final/fmessagebox.h>
const lDouble PI = 3.141592653589793238L;
@ -255,7 +255,7 @@ Calc::Calc (FWidget* parent)
else
{
int x, y, n;
(key <= Three) ? n = 0 : n = 1;
( key <= Three ) ? n = 0 : n = 1;
x = (key + n) % 5 * 7 + 2;
y = (key + n) / 5 * 2 + 3;
btn->setGeometry(x, y, 5, 1);
@ -564,7 +564,7 @@ void Calc::onClose (FCloseEvent* ev)
FMessageBox::Yes,
FMessageBox::No );
(ret == FMessageBox::Yes) ? ev->accept() : ev->ignore();
( ret == FMessageBox::Yes ) ? ev->accept() : ev->ignore();
}
//----------------------------------------------------------------------

12
examples/choice.cpp
View File

@ -1,11 +1,11 @@
// File: os-choice.cpp
#include "fapplication.h"
#include "fbutton.h"
#include "fbuttongroup.h"
#include "fdialog.h"
#include "fradiobutton.h"
#include "ftooltip.h"
#include <final/fapplication.h>
#include <final/fbutton.h>
#include <final/fbuttongroup.h>
#include <final/fdialog.h>
#include <final/fradiobutton.h>
#include <final/ftooltip.h>
// function prototypes
void cb_quit (FWidget*, FWidget::data_ptr);

8
examples/dialog.cpp
View File

@ -1,9 +1,9 @@
// File: dialog.cpp
#include "fapplication.h"
#include "fbutton.h"
#include "fdialog.h"
#include "flabel.h"
#include <final/fapplication.h>
#include <final/fbutton.h>
#include <final/fdialog.h>
#include <final/flabel.h>
// function prototype
void cb_quit (FWidget*, FWidget::data_ptr);

4
examples/hello.cpp
View File

@ -1,7 +1,7 @@
// File: hello.cpp
#include "fapplication.h"
#include "fmessagebox.h"
#include <final/fapplication.h>
#include <final/fmessagebox.h>
int main (int argc, char* argv[])

14
examples/input-dialog.cpp
View File

@ -1,12 +1,12 @@
// File: input-dialog.cpp
#include "fapplication.h"
#include "fbutton.h"
#include "fbuttongroup.h"
#include "fcheckbox.h"
#include "fdialog.h"
#include "flineedit.h"
#include "fradiobutton.h"
#include <final/fapplication.h>
#include <final/fbutton.h>
#include <final/fbuttongroup.h>
#include <final/fcheckbox.h>
#include <final/fdialog.h>
#include <final/flineedit.h>
#include <final/fradiobutton.h>
// function prototypes
void cb_quit (FWidget*, FWidget::data_ptr);

2
examples/keyboard.cpp
View File

@ -1,6 +1,6 @@
// File: keyboard.cpp
#include "final.h"
#include <final/final.h>
//----------------------------------------------------------------------
// class keyboard

8
examples/listbox.cpp
View File

@ -5,10 +5,10 @@
#include <map>
#include <fstream>
#include "fapplication.h"
#include "fdialog.h"
#include "flistbox.h"
#include "fmessagebox.h"
#include <final/fapplication.h>
#include <final/fdialog.h>
#include <final/flistbox.h>
#include <final/fmessagebox.h>
// Global application object

8
examples/listview.cpp
View File

@ -5,10 +5,10 @@
#include <string>
#include <vector>
#include "fapplication.h"
#include "fdialog.h"
#include "flistview.h"
#include "fmessagebox.h"
#include <final/fapplication.h>
#include <final/fdialog.h>
#include <final/flistview.h>
#include <final/fmessagebox.h>
//----------------------------------------------------------------------

6
examples/mandelbrot.cpp
View File

@ -1,8 +1,8 @@
// File: mandelbrot.cpp
#include "fapplication.h"
#include "fdialog.h"
#include "fmessagebox.h"
#include <final/fapplication.h>
#include <final/fdialog.h>
#include <final/fmessagebox.h>
//----------------------------------------------------------------------
// class Mandelbrot

18
examples/menu.cpp
View File

@ -1,14 +1,14 @@
// File: menu.cpp
#include "fapplication.h"
#include "fcheckmenuitem.h"
#include "fdialog.h"
#include "flabel.h"
#include "fmenubar.h"
#include "fmenu.h"
#include "fmessagebox.h"
#include "fradiomenuitem.h"
#include "fstatusbar.h"
#include <final/fapplication.h>
#include <final/fcheckmenuitem.h>
#include <final/fdialog.h>
#include <final/flabel.h>
#include <final/fmenubar.h>
#include <final/fmenu.h>
#include <final/fmessagebox.h>
#include <final/fradiomenuitem.h>
#include <final/fstatusbar.h>
//----------------------------------------------------------------------

8
examples/mouse.cpp
View File

@ -1,9 +1,9 @@
// File: mouse.cpp
#include "fapplication.h"
#include "fdialog.h"
#include "flabel.h"
#include "fmessagebox.h"
#include <final/fapplication.h>
#include <final/fdialog.h>
#include <final/flabel.h>
#include <final/fmessagebox.h>
//----------------------------------------------------------------------

4
examples/opti-move.cpp
View File

@ -3,8 +3,8 @@
#include <iomanip>
#include <string>
#include "fapplication.h"
#include "fvterm.h"
#include <final/fapplication.h>
#include <final/fvterm.h>
// global FVTerm object

12
examples/scrollview.cpp
View File

@ -1,11 +1,11 @@
// File: scrollview.cpp
#include "fapplication.h"
#include "fbutton.h"
#include "fdialog.h"
#include "flabel.h"
#include "fmessagebox.h"
#include "fscrollview.h"
#include <final/fapplication.h>
#include <final/fbutton.h>
#include <final/fdialog.h>
#include <final/flabel.h>
#include <final/fmessagebox.h>
#include <final/fscrollview.h>
//----------------------------------------------------------------------
// class scrollview

2
examples/string-operations.cpp
View File

@ -9,7 +9,7 @@
#include <string>
#include <vector>
#include "fstring.h"
#include <final/fstring.h>
int main (int, char**)

8
examples/term-attributes.cpp
View File

@ -1,9 +1,9 @@
// File: term-attributes.cpp
#include "fapplication.h"
#include "fbutton.h"
#include "fdialog.h"
#include "fmessagebox.h"
#include <final/fapplication.h>
#include <final/fbutton.h>
#include <final/fdialog.h>
#include <final/fmessagebox.h>
//----------------------------------------------------------------------
// class AttribDlg

6
examples/termcap.cpp
View File

@ -4,9 +4,9 @@
#include <iostream>
#include <string>
#include "fapplication.h"
#include "ftermcap.h"
#include "fvterm.h"
#include <final/fapplication.h>
#include <final/ftermcap.h>
#include <final/fvterm.h>
// global FVTerm object

2
examples/timer.cpp
View File

@ -1,6 +1,6 @@
// File: timer.cpp
#include "final.h"
#include <final/final.h>
//----------------------------------------------------------------------
// class timer

12
examples/transparent.cpp
View File

@ -1,11 +1,11 @@
// File: transparent.cpp
#include "fapplication.h"
#include "fdialog.h"
#include "flabel.h"
#include "fmessagebox.h"
#include "fstatusbar.h"
#include "fstring.h"
#include <final/fapplication.h>
#include <final/fdialog.h>
#include <final/flabel.h>
#include <final/fmessagebox.h>
#include <final/fstatusbar.h>
#include <final/fstring.h>
//----------------------------------------------------------------------

12
examples/treeview.cpp
View File

@ -5,10 +5,10 @@
#include <string>
#include <vector>
#include "fapplication.h"
#include "fdialog.h"
#include "flistview.h"
#include "fmessagebox.h"
#include <final/fapplication.h>
#include <final/fdialog.h>
#include <final/flistview.h>
#include <final/fmessagebox.h>
//----------------------------------------------------------------------
@ -87,6 +87,10 @@ Treeview::Treeview (FWidget* parent)
//FObjectIterator iter_africa = listView->insert (egypt_line);
listView->insert (egypt_line, iter_africa);
FListViewItem* item_africa = static_cast<FListViewItem*>(*iter_africa);
FObjectIterator iter_egypt = item_africa->begin();
FListViewItem* item_egypt = static_cast<FListViewItem*>(*iter_egypt);
item_egypt = item_egypt;
// Quit button
FButton* Quit = new FButton (this);

2
examples/ui.cpp
View File

@ -4,7 +4,7 @@
#include <iostream>
#include <string>
#include "final.h"
#include <final/final.h>
//----------------------------------------------------------------------

10
examples/watch.cpp
View File

@ -2,11 +2,11 @@
#include <ctime>
#include "fapplication.h"
#include "flabel.h"
#include "fdialog.h"
#include "fmessagebox.h"
#include "fswitch.h"
#include <final/fapplication.h>
#include <final/flabel.h>
#include <final/fdialog.h>
#include <final/fmessagebox.h>
#include <final/fswitch.h>
//----------------------------------------------------------------------
// class watch

26
examples/windows.cpp
View File

@ -2,15 +2,15 @@
#include <vector>
#include "fapplication.h"
#include "fdialog.h"
#include "fdialoglistmenu.h"
#include "flabel.h"
#include "fmenubar.h"
#include "fmenu.h"
#include "fmessagebox.h"
#include "fstatusbar.h"
#include "fstring.h"
#include <final/fapplication.h>
#include <final/fdialog.h>
#include <final/fdialoglistmenu.h>
#include <final/flabel.h>
#include <final/fmenubar.h>
#include <final/fmenu.h>
#include <final/fmessagebox.h>
#include <final/fstatusbar.h>
#include <final/fstring.h>
//----------------------------------------------------------------------
// class smallWindow
@ -361,8 +361,8 @@ void Window::adjustSize()
h = getRootWidget()->getHeight();
X = int(1 + (w - 40) / 2);
Y = int(1 + (h - 22) / 2);
dx = (w > 80) ? (w - 80) / 2 : 0;
dy = (h > 24) ? (h - 24) / 2 : 0;
dx = ( w > 80 ) ? (w - 80) / 2 : 0;
dy = ( h > 24 ) ? (h - 24) / 2 : 0;
if ( Y < 2)
Y = 2;
@ -412,8 +412,8 @@ void Window::cb_createWindows (FWidget*, data_ptr)
iter = first = windows.begin();
w = getRootWidget()->getWidth();
h = getRootWidget()->getHeight();
dx = (w > 80) ? (w - 80) / 2 : 0;
dy = (h > 24) ? (h - 24) / 2 : 0;
dx = ( w > 80 ) ? (w - 80) / 2 : 0;
dy = ( h > 24 ) ? (h - 24) / 2 : 0;
while ( iter != windows.end() )
{

6
include/final/fapplication.h
View File

@ -41,9 +41,9 @@
#include <string>
#include <utility>
#include "fevent.h"
#include "fwidget.h"
#include "fwindow.h"
#include "final/fevent.h"
#include "final/fwidget.h"
#include "final/fwindow.h"
//----------------------------------------------------------------------

2
include/final/fbutton.h
View File

@ -28,7 +28,7 @@
#ifndef FBUTTON_H
#define FBUTTON_H
#include "fwidget.h"
#include "final/fwidget.h"
//----------------------------------------------------------------------

2
include/final/fbuttongroup.h
View File

@ -28,7 +28,7 @@
#ifndef FBUTTONGROUP_H
#define FBUTTONGROUP_H
#include "fscrollview.h"
#include "final/fscrollview.h"
// class forward declaration

2
include/final/fc.h
View File

@ -11,7 +11,7 @@
#ifndef FC_H
#define FC_H
#include "fstring.h"
#include "final/fstring.h"
// ascii sequences
#define ESC "\033" // Escape

2
include/final/fcheckbox.h
View File

@ -33,7 +33,7 @@
#ifndef FCHECKBOX_H
#define FCHECKBOX_H
#include "ftogglebutton.h"
#include "final/ftogglebutton.h"
//----------------------------------------------------------------------

2
include/final/fcheckmenuitem.h
View File

@ -33,7 +33,7 @@
#ifndef FCHECKMENUITEM_H
#define FCHECKMENUITEM_H
#include "fmenuitem.h"
#include "final/fmenuitem.h"
//----------------------------------------------------------------------

12
include/final/fconfig.h
View File

@ -1,7 +1,7 @@
#ifndef _SRC_FCONFIG_H
#define _SRC_FCONFIG_H 1
/* src/fconfig.h. Generated automatically at end of configure. */
#ifndef _INCLUDE_FINAL_FCONFIG_H
#define _INCLUDE_FINAL_FCONFIG_H 1
/* include/final/fconfig.h. Generated automatically at end of configure. */
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
@ -171,6 +171,6 @@
#ifndef F_VERSION
#define F_VERSION "0.3.0"
#endif
/* once: _SRC_FCONFIG_H */
/* once: _INCLUDE_FINAL_FCONFIG_H */
#endif

8
include/final/fdialog.h
View File

@ -33,10 +33,10 @@
#ifndef FDIALOG_H
#define FDIALOG_H
#include "fmenu.h"
#include "fmenuitem.h"
#include "ftooltip.h"
#include "fwindow.h"
#include "final/fmenu.h"
#include "final/fmenuitem.h"
#include "final/ftooltip.h"
#include "final/fwindow.h"
//----------------------------------------------------------------------

2
include/final/fdialoglistmenu.h
View File

@ -40,7 +40,7 @@
#ifndef FDIALOGLISTMENU_H
#define FDIALOGLISTMENU_H
#include "fmenu.h"
#include "final/fmenu.h"
//----------------------------------------------------------------------

4
include/final/fevent.h
View File

@ -53,8 +53,8 @@
#ifndef FEVENT_H
#define FEVENT_H
#include "fc.h"
#include "fpoint.h"
#include "final/fc.h"
#include "final/fpoint.h"
//----------------------------------------------------------------------

16
include/final/ffiledialog.h
View File

@ -48,14 +48,14 @@
#include <string>
#include <vector>
#include "fbutton.h"
#include "fcheckbox.h"
#include "fdialog.h"
#include "flineedit.h"
#include "flistbox.h"
#include "fmessagebox.h"
#include "fstatusbar.h"
#include "fterm.h"
#include "final/fbutton.h"
#include "final/fcheckbox.h"
#include "final/fdialog.h"
#include "final/flineedit.h"
#include "final/flistbox.h"
#include "final/fmessagebox.h"
#include "final/fstatusbar.h"
#include "final/fterm.h"
//----------------------------------------------------------------------

3
include/final/flabel.h
View File

@ -29,7 +29,8 @@
#define FLABEL_H
#include <vector>
#include "fwidget.h"
#include "final/fwidget.h"
//----------------------------------------------------------------------

4
include/final/flineedit.h
View File

@ -28,8 +28,8 @@
#ifndef FLINEEDIT_H
#define FLINEEDIT_H
#include "fwidget.h"
#include "flabel.h"
#include "final/fwidget.h"
#include "final/flabel.h"
//----------------------------------------------------------------------

6
include/final/flistbox.h
View File

@ -32,9 +32,9 @@
#include <vector>
#include "fscrollbar.h"
#include "fstring.h"
#include "fwidget.h"
#include "final/fscrollbar.h"
#include "final/fstring.h"
#include "final/fwidget.h"
//----------------------------------------------------------------------

10
include/final/flistview.h
View File

@ -32,10 +32,10 @@
#include <vector>
#include "fscrollbar.h"
#include "fstring.h"
#include "ftermbuffer.h"
#include "fwidget.h"
#include "final/fscrollbar.h"
#include "final/fstring.h"
#include "final/ftermbuffer.h"
#include "final/fwidget.h"
// class forward declaration
class FListView;
@ -288,7 +288,7 @@ inline FListViewItem* FListView::getCurrentItem()
//----------------------------------------------------------------------
inline bool FListView::setTreeView (bool on)
{ return tree_view = (on) ? true : false; }
{ return tree_view = ( on ) ? true : false; }
//----------------------------------------------------------------------
inline bool FListView::setTreeView()

8
include/final/fmenu.h
View File

@ -35,10 +35,10 @@
#ifndef FMENU_H
#define FMENU_H
#include "fwindow.h"
#include "fmenubar.h"
#include "fmenulist.h"
#include "fmenuitem.h"
#include "final/fwindow.h"
#include "final/fmenubar.h"
#include "final/fmenulist.h"
#include "final/fmenuitem.h"
//----------------------------------------------------------------------

6
include/final/fmenubar.h
View File

@ -35,9 +35,9 @@
#ifndef FMENUBAR_H
#define FMENUBAR_H
#include "fmenu.h"
#include "fmenulist.h"
#include "fwindow.h"
#include "final/fmenu.h"
#include "final/fmenulist.h"
#include "final/fwindow.h"
//----------------------------------------------------------------------

2
include/final/fmenuitem.h
View File

@ -32,7 +32,7 @@
#ifndef FMENUITEM_H
#define FMENUITEM_H
#include "fwidget.h"
#include "final/fwidget.h"
// class forward declaration
class FDialog;

8
include/final/fmenulist.h
View File

@ -21,8 +21,8 @@
#include <vector>
#include "fmenuitem.h"
#include "fwidget.h"
#include "final/fmenuitem.h"
#include "final/fwidget.h"
//----------------------------------------------------------------------
@ -89,7 +89,7 @@ inline uInt FMenuList::getCount() const
//----------------------------------------------------------------------
inline FMenuItem* FMenuList::getItem (int index) const
{ return (index > 0) ? item_list[uInt(index - 1)] : 0; }
{ return ( index > 0 ) ? item_list[uInt(index - 1)] : 0; }
//----------------------------------------------------------------------
inline FMenuItem* FMenuList::getSelectedItem() const
@ -109,7 +109,7 @@ inline void FMenuList::setSelectedItem (FMenuItem* menuitem)
//----------------------------------------------------------------------
inline bool FMenuList::isSelected(int index) const
{ return (index > 0) ? item_list[uInt(index - 1)]->isSelected() : false; }
{ return ( index > 0 ) ? item_list[uInt(index - 1)]->isSelected() : false; }
//----------------------------------------------------------------------
inline bool FMenuList::hasSelectedItem() const

6
include/final/fmessagebox.h
View File

@ -40,9 +40,9 @@
#include <cstring>
#include "fbutton.h"
#include "fdialog.h"
#include "fterm.h"
#include "final/fbutton.h"
#include "final/fdialog.h"
#include "final/fterm.h"
//----------------------------------------------------------------------

6
include/final/fobject.h
View File

@ -18,9 +18,9 @@
#include <list>
#include <vector>
#include "fc.h"
#include "fevent.h"
#include "ftypes.h"
#include "final/fc.h"
#include "final/fevent.h"
#include "final/ftypes.h"
//----------------------------------------------------------------------

2
include/final/foptiattr.h
View File

@ -16,7 +16,7 @@
#include <algorithm> // need for std::swap
#include "fc.h"
#include "final/fc.h"
//----------------------------------------------------------------------

2
include/final/fprogressbar.h
View File

@ -28,7 +28,7 @@
#ifndef FPROGRESSBAR_H
#define FPROGRESSBAR_H
#include "fwidget.h"
#include "final/fwidget.h"
//----------------------------------------------------------------------

2
include/final/fradiobutton.h
View File

@ -33,7 +33,7 @@
#ifndef FRADIOBUTTON_H
#define FRADIOBUTTON_H
#include "ftogglebutton.h"
#include "final/ftogglebutton.h"
//----------------------------------------------------------------------

2
include/final/fradiomenuitem.h
View File

@ -33,7 +33,7 @@
#ifndef FRADIOMENUITEM_H
#define FRADIOMENUITEM_H
#include "fmenuitem.h"
#include "final/fmenuitem.h"
//----------------------------------------------------------------------

2
include/final/frect.h
View File

@ -12,7 +12,7 @@
#define FRECT_H
#include <algorithm>
#include "fpoint.h"
#include "final/fpoint.h"
//----------------------------------------------------------------------

2
include/final/fscrollbar.h
View File

@ -28,7 +28,7 @@
#ifndef FSCROLLBAR_H
#define FSCROLLBAR_H
#include "fwidget.h"
#include "final/fwidget.h"
//----------------------------------------------------------------------

4
include/final/fscrollview.h
View File

@ -29,8 +29,8 @@
#ifndef FSCROLLVIEW_H
#define FSCROLLVIEW_H
#include "fscrollbar.h"
#include "fwidget.h"
#include "final/fscrollbar.h"
#include "final/fwidget.h"
//----------------------------------------------------------------------

2
include/final/fstatusbar.h
View File

@ -38,7 +38,7 @@
#include <vector>
#include "fwindow.h"
#include "final/fwindow.h"
// class forward declaration

6
include/final/fstring.h
View File

@ -31,7 +31,7 @@
#include <string>
#include <vector>
#include "ftypes.h"
#include "final/ftypes.h"
//----------------------------------------------------------------------
@ -331,11 +331,11 @@ class FString
// FString inline functions
//----------------------------------------------------------------------
inline bool FString::isNull() const
{ return ( ! string ); }
{ return ! string; }
//----------------------------------------------------------------------
inline bool FString::isEmpty() const
{ return (! string ) || (! *string); }
{ return ( ! string ) || ( ! *string ); }
//----------------------------------------------------------------------
inline uInt FString::getLength() const

2
include/final/fswitch.h
View File

@ -33,7 +33,7 @@
#ifndef FSWITCH_H
#define FSWITCH_H
#include "ftogglebutton.h"
#include "final/ftogglebutton.h"
//----------------------------------------------------------------------

2
include/final/ftcap_map.h
View File

@ -3,7 +3,7 @@
#ifndef FTCAPMAP_H
#define FTCAPMAP_H
#include "ftermcap.h"
#include "final/ftermcap.h"
static FTermcap::tcap_map term_caps[] =
{

24
include/final/fterm.h
View File

@ -27,7 +27,7 @@
#ifndef FTERM_H
#define FTERM_H
#include <fconfig.h>
#include "final/fconfig.h"
#ifdef F_HAVE_LIBGPM
#include <gpm.h>
@ -67,14 +67,14 @@
#include <queue>
#include <string>
#include "fc.h"
#include "fobject.h"
#include "foptiattr.h"
#include "foptimove.h"
#include "fpoint.h"
#include "frect.h"
#include "fstring.h"
#include "ftermcap.h"
#include "final/fc.h"
#include "final/fobject.h"
#include "final/foptiattr.h"
#include "final/foptimove.h"
#include "final/fpoint.h"
#include "final/frect.h"
#include "final/fstring.h"
#include "final/ftermcap.h"
#ifdef F_HAVE_LIBGPM
@ -511,11 +511,11 @@ inline int FTerm::getMaxColor()
#if DEBUG
//----------------------------------------------------------------------
inline const FString& FTerm::getAnswerbackString()
{ return (answer_back) ? *answer_back : *fc::empty_string; }
{ return ( answer_back ) ? *answer_back : *fc::empty_string; }
//----------------------------------------------------------------------
inline const FString& FTerm::getSecDAString()
{ return (sec_da) ? *sec_da : *fc::empty_string; }
{ return ( sec_da ) ? *sec_da : *fc::empty_string; }
#endif
//----------------------------------------------------------------------
@ -620,7 +620,7 @@ inline bool FTerm::isUTF8_linux_terminal()
//----------------------------------------------------------------------
inline bool FTerm::setCursorOptimisation (bool on)
{ return cursor_optimisation = (on) ? true : false; }
{ return cursor_optimisation = ( on ) ? true : false; }
//----------------------------------------------------------------------
inline void FTerm::setXTermDefaultColors (bool on)

4
include/final/ftermbuffer.h
View File

@ -16,8 +16,8 @@
#include <string>
#include <vector>
#include "fvterm.h"
#include "fstring.h"
#include "final/fvterm.h"
#include "final/fstring.h"
//----------------------------------------------------------------------

10
include/final/ftextview.h
View File

@ -30,11 +30,11 @@
#include <vector>
#include "fapplication.h"
#include "fscrollbar.h"
#include "fstatusbar.h"
#include "fstring.h"
#include "fwidget.h"
#include "final/fapplication.h"
#include "final/fscrollbar.h"
#include "final/fstatusbar.h"
#include "final/fstring.h"
#include "final/fwidget.h"
//----------------------------------------------------------------------

2
include/final/ftogglebutton.h
View File

@ -28,7 +28,7 @@
#ifndef FTOGGLEBUTTON_H
#define FTOGGLEBUTTON_H
#include "fwidget.h"
#include "final/fwidget.h"
// class forward declaration

2
include/final/ftooltip.h
View File

@ -35,7 +35,7 @@
#include <vector>
#include "fwindow.h"
#include "final/fwindow.h"
//----------------------------------------------------------------------

3
include/final/fvterm.h
View File

@ -26,9 +26,10 @@
#ifndef FVTERM_H
#define FVTERM_H
#include "fterm.h"
#include <sstream> // std::stringstream
#include "final/fterm.h"
// Preprocessing handler macro
#define F_PREPROC_HANDLER(i,h) \
reinterpret_cast<FVTerm*>((i)) \

4
include/final/fwidget.h
View File

@ -73,7 +73,7 @@
#include <vector>
#include "fvterm.h"
#include "final/fvterm.h"
// Callback macros
@ -697,7 +697,7 @@ inline bool FWidget::setDisable()
//----------------------------------------------------------------------
inline bool FWidget::setVisibleCursor (bool on)
{ return visible_cursor = (on) ? true : ((hideable) ? false : true); }
{ return visible_cursor = ( on ) ? true : (( hideable ) ? false : true); }
//----------------------------------------------------------------------
inline bool FWidget::setVisibleCursor()

2
include/final/fwindow.h
View File

@ -36,7 +36,7 @@
#ifndef FWINDOW_H
#define FWINDOW_H
#include "fwidget.h"
#include "final/fwidget.h"
//----------------------------------------------------------------------

2
scripts/cppcheck.sh
View File

@ -4,6 +4,6 @@ if [ $# -gt 0 ]
then
eval cppcheck --enable=all "$@"
else
eval cppcheck --enable=all ../src/ ../test/
eval cppcheck --enable=all ../include/final/ ../src/ ../examples/
fi

6
scripts/cpuprofile.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash
LD_LIBRARY_PATH=../src/.libs/ LD_PRELOAD="/usr/lib64/libprofiler.so.0" CPUPROFILE=../test/.libs/ui.prof ../test/.libs/ui
pprof --gv ../test/.libs/ui ../test/.libs/ui.prof
rm -f ../test/.libs/ui.prof
LD_LIBRARY_PATH=../src/.libs/ LD_PRELOAD="/usr/lib64/libprofiler.so.0" CPUPROFILE=../examples/.libs/ui.prof ../examples/.libs/ui
pprof --gv ../examples/.libs/ui ../examples/.libs/ui.prof
rm -f ../examples/.libs/ui.prof

2
scripts/disassemble.sh
View File

@ -1,3 +1,3 @@
#!/bin/sh
hte ../test/.libs/ui
hte ../examples/.libs/ui

2
scripts/kcachegrind.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash
LD_LIBRARY_PATH=../src/.libs/ valgrind --tool=callgrind -v ../test/.libs/ui 2>/dev/null
LD_LIBRARY_PATH=../src/.libs/ valgrind --tool=callgrind -v ../examples/.libs/ui 2>/dev/null
kcachegrind
rm -f callgrind.out.*

2
scripts/library_calls.sh
View File

@ -4,7 +4,7 @@
PROG="ui"
LD_LIBRARY_PATH=../src/.libs/ ltrace -o ./$PROG.ltrace ../test/.libs/$PROG
LD_LIBRARY_PATH=../src/.libs/ ltrace -o ./$PROG.ltrace ../examples/.libs/$PROG
less ./$PROG.ltrace
rm -f ./$PROG.ltrace ./gmon.out

2
scripts/profile.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
DIR="$PWD"
cd ../test/.libs/ || exit
cd ../examples/.libs/ || exit
LD_LIBRARY_PATH=../../src/.libs/ ./ui
gprof ./ui >./profile.txt
rm ./gmon.out

3
scripts/remove_eol_spaces.sh
View File

@ -1,7 +1,8 @@
#!/bin/bash
find ../src/ \
../test/ \
../include/final/ \
../examples/ \
-regextype posix-egrep \
-regex ".*\.(cpp|h)$" \
-exec sed -i 's/ *$//' "{}" \;

2
scripts/syscall_statistic.sh
View File

@ -1,3 +1,3 @@
#!/bin/sh
strace -c ../test/.libs/ui
strace -c ../examples/.libs/ui

2
scripts/valgrind.sh
View File

@ -4,7 +4,7 @@
if [ -z "$1" ]
then
PROG="../test/.libs/ui"
PROG="../examples/.libs/ui"
else
PROG="$1"
fi

2
scripts/xterm-latin1.sh
View File

@ -1,3 +1,3 @@
#!/bin/sh
luit -encoding POSIX ../test/ui
luit -encoding POSIX ../examples/ui

95
src/Makefile.am
View File

@ -4,7 +4,7 @@
SUBDIRS = fonts
AM_CPPFLAGS = -Wall -Werror
AM_CPPFLAGS = -I../include -Wall -Werror
lib_LTLIBRARIES = libfinal.la
@ -54,52 +54,53 @@ libfinal_la_LDFLAGS = -version-info @SO_VERSION@
finalcutincludedir = $(includedir)/final
finalcutinclude_HEADERS = \
fapplication.h \
fbutton.h \
fbuttongroup.h \
fcharmap.h \
fcheckbox.h \
fconfig.h \
fswitch.h \
fdialog.h \
fc.h \
fevent.h \
ffiledialog.h \
final.h \
fkey_map.h \
flabel.h \
flineedit.h \
flistbox.h \
flistview.h \
fmenu.h \
fdialoglistmenu.h \
fmenubar.h \
fmenuitem.h \
fradiomenuitem.h \
fcheckmenuitem.h \
fmenulist.h \
fmessagebox.h \
ftooltip.h \
fobject.h \
fpoint.h \
foptiattr.h \
foptimove.h \
ftermbuffer.h \
fprogressbar.h \
fradiobutton.h \
frect.h \
fscrollbar.h \
fscrollview.h \
fstatusbar.h \
fstring.h \
ftcap_map.h \
ftermcap.h \
fterm.h \
fvterm.h \
ftextview.h \
ftogglebutton.h \
fwidget.h \
fwindow.h
../include/final/fapplication.h \
../include/final/fbutton.h \
../include/final/fbuttongroup.h \
../include/final/fcharmap.h \
../include/final/fcheckbox.h \
../include/final/fconfig.h \
../include/final/fswitch.h \
../include/final/fdialog.h \
../include/final/fc.h \
../include/final/ftypes.h \
../include/final/fevent.h \
../include/final/ffiledialog.h \
../include/final/final.h \
../include/final/fkey_map.h \
../include/final/flabel.h \
../include/final/flineedit.h \
../include/final/flistbox.h \
../include/final/flistview.h \
../include/final/fmenu.h \
../include/final/fdialoglistmenu.h \
../include/final/fmenubar.h \
../include/final/fmenuitem.h \
../include/final/fradiomenuitem.h \
../include/final/fcheckmenuitem.h \
../include/final/fmenulist.h \
../include/final/fmessagebox.h \
../include/final/ftooltip.h \
../include/final/fobject.h \
../include/final/fpoint.h \
../include/final/foptiattr.h \
../include/final/foptimove.h \
../include/final/ftermbuffer.h \
../include/final/fprogressbar.h \
../include/final/fradiobutton.h \
../include/final/frect.h \
../include/final/fscrollbar.h \
../include/final/fscrollview.h \
../include/final/fstatusbar.h \
../include/final/fstring.h \
../include/final/ftcap_map.h \
../include/final/ftermcap.h \
../include/final/fterm.h \
../include/final/fvterm.h \
../include/final/ftextview.h \
../include/final/ftogglebutton.h \
../include/final/fwidget.h \
../include/final/fwindow.h
#uninstall:
# rm -R -f $(includedir)/final

17
src/Makefile.clang
View File

@ -5,8 +5,9 @@
# This is where make install will install the library
VERSION = "0.3.0"
MAJOR := $(shell echo ${VERSION} | cut -d. -f1)
LIBDIR = /usr/local/lib64
INCLUDEDIR = /usr/local/include/final
LIBDIR = /usr/local/lib
INCLUDEDIR1 = ../include/final
INCLUDEDIR2 = /usr/local/include/final
INCLUDE_HEADERS = \
fapplication.h \
fbuttongroup.h \
@ -53,7 +54,7 @@ CXX = clang++
CCXFLAGS = $(OPTIMIZE) $(PROFILE) $(DEBUG) $(VER) $(GPM) -march=x86-64 -frtti -fexceptions
MAKEFILE = -f Makefile.clang
LDFLAGS = $(TERMCAP) -lgpm
INCLUDES = -I./
INCLUDES = -I../include
GPM = -D F_HAVE_LIBGPM
VER = -D F_VERSION=$(VERSION)
RM = rm -f
@ -133,19 +134,19 @@ install: $(LIB)
ln -s -f $(LIB).$(VERSION) $(LIBDIR)/libfinal.so.$(MAJOR)
ln -s -f $(LIB).$(MAJOR) $(LIBDIR)/libfinal.so
ldconfig
mkdir -p $(INCLUDEDIR)
mkdir -p $(INCLUDEDIR2)
@list='$(INCLUDE_HEADERS)'; for h in $$list; \
do \
install -m 644 $$h $(INCLUDEDIR)/$$h; \
install -m 644 $(INCLUDEDIR1)/$$h $(INCLUDEDIR2)/$$h; \
done
uninstall: $(INCLUDE_HEADERS)
uninstall: $(OBJS)
$(RM) $(LIBDIR)/$(LIB).$(VERSION) $(LIBDIR)/libfinal.so.$(MAJOR) $(LIBDIR)/libfinal.so
@list='$(INCLUDE_HEADERS)'; for h in $$list; \
do \
$(RM) $(INCLUDEDIR)/$$h; \
$(RM) $(INCLUDEDIR2)/$$h; \
done
rmdir $(INCLUDEDIR)
rmdir $(INCLUDEDIR2)
.PHONY: clean dep
clean:

17
src/Makefile.gcc
View File

@ -5,8 +5,9 @@
# This is where make install will install the library
VERSION = "0.3.0"
MAJOR := $(shell echo ${VERSION} | cut -d. -f1)
LIBDIR = /usr/local/lib64
INCLUDEDIR = /usr/local/include/final
LIBDIR = /usr/local/lib
INCLUDEDIR1 = ../include/final
INCLUDEDIR2 = /usr/local/include/final
INCLUDE_HEADERS = \
fapplication.h \
fbuttongroup.h \
@ -53,7 +54,7 @@ CXX = g++
CCXFLAGS = $(OPTIMIZE) $(PROFILE) $(DEBUG) $(VER) $(GPM) -march=x86-64 -frtti -fexceptions
MAKEFILE = -f Makefile.gcc
LDFLAGS = $(TERMCAP) -lgpm
INCLUDES = -I./
INCLUDES = -I../include
GPM = -D F_HAVE_LIBGPM
VER = -D F_VERSION=$(VERSION)
RM = rm -f
@ -133,19 +134,19 @@ install: $(LIB)
ln -s -f $(LIB).$(VERSION) $(LIBDIR)/libfinal.so.$(MAJOR)
ln -s -f $(LIB).$(MAJOR) $(LIBDIR)/libfinal.so
ldconfig
mkdir -p $(INCLUDEDIR)
mkdir -p $(INCLUDEDIR2)
@list='$(INCLUDE_HEADERS)'; for h in $$list; \
do \
install -m 644 $$h $(INCLUDEDIR)/$$h; \
install -m 644 $(INCLUDEDIR1)/$$h $(INCLUDEDIR2)/$$h; \
done
uninstall: $(INCLUDE_HEADERS)
uninstall: $(OBJS)
$(RM) $(LIBDIR)/$(LIB).$(VERSION) $(LIBDIR)/libfinal.so.$(MAJOR) $(LIBDIR)/libfinal.so
@list='$(INCLUDE_HEADERS)'; for h in $$list; \
do \
$(RM) $(INCLUDEDIR)/$$h; \
$(RM) $(INCLUDEDIR2)/$$h; \
done
rmdir $(INCLUDEDIR)
rmdir $(INCLUDEDIR2)
.PHONY: clean dep
clean:

95
src/Makefile.in
View File

@ -373,7 +373,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = fonts
AM_CPPFLAGS = -Wall -Werror
AM_CPPFLAGS = -I../include -Wall -Werror
lib_LTLIBRARIES = libfinal.la
libfinal_la_SOURCES = \
fstring.cpp \
@ -419,52 +419,53 @@ libfinal_la_SOURCES = \
libfinal_la_LDFLAGS = -version-info @SO_VERSION@
finalcutincludedir = $(includedir)/final
finalcutinclude_HEADERS = \
fapplication.h \
fbutton.h \
fbuttongroup.h \
fcharmap.h \
fcheckbox.h \
fconfig.h \
fswitch.h \
fdialog.h \
fc.h \
fevent.h \
ffiledialog.h \
final.h \
fkey_map.h \
flabel.h \
flineedit.h \
flistbox.h \
flistview.h \
fmenu.h \
fdialoglistmenu.h \
fmenubar.h \
fmenuitem.h \
fradiomenuitem.h \
fcheckmenuitem.h \
fmenulist.h \
fmessagebox.h \
ftooltip.h \
fobject.h \
fpoint.h \
foptiattr.h \
foptimove.h \
ftermbuffer.h \
fprogressbar.h \
fradiobutton.h \
frect.h \
fscrollbar.h \
fscrollview.h \
fstatusbar.h \
fstring.h \
ftcap_map.h \
ftermcap.h \
fterm.h \
fvterm.h \
ftextview.h \
ftogglebutton.h \
fwidget.h \
fwindow.h
../include/final/fapplication.h \
../include/final/fbutton.h \
../include/final/fbuttongroup.h \
../include/final/fcharmap.h \
../include/final/fcheckbox.h \
../include/final/fconfig.h \
../include/final/fswitch.h \
../include/final/fdialog.h \
../include/final/fc.h \
../include/final/ftypes.h \
../include/final/fevent.h \
../include/final/ffiledialog.h \
../include/final/final.h \
../include/final/fkey_map.h \
../include/final/flabel.h \
../include/final/flineedit.h \
../include/final/flistbox.h \
../include/final/flistview.h \
../include/final/fmenu.h \
../include/final/fdialoglistmenu.h \
../include/final/fmenubar.h \
../include/final/fmenuitem.h \
../include/final/fradiomenuitem.h \
../include/final/fcheckmenuitem.h \
../include/final/fmenulist.h \
../include/final/fmessagebox.h \
../include/final/ftooltip.h \
../include/final/fobject.h \
../include/final/fpoint.h \
../include/final/foptiattr.h \
../include/final/foptimove.h \
../include/final/ftermbuffer.h \
../include/final/fprogressbar.h \
../include/final/fradiobutton.h \
../include/final/frect.h \
../include/final/fscrollbar.h \
../include/final/fscrollview.h \
../include/final/fstatusbar.h \
../include/final/fstring.h \
../include/final/ftcap_map.h \
../include/final/ftermcap.h \
../include/final/fterm.h \
../include/final/fvterm.h \
../include/final/ftextview.h \
../include/final/ftogglebutton.h \
../include/final/fwidget.h \
../include/final/fwindow.h
all: all-recursive

16
src/fapplication.cpp
View File

@ -3,10 +3,10 @@
#include <string>
#include "fapplication.h"
#include "fmenu.h"
#include "fstatusbar.h"
#include "fwindow.h"
#include "final/fapplication.h"
#include "final/fmenu.h"
#include "final/fstatusbar.h"
#include "final/fwindow.h"
// global application object
static FApplication* rootObj = 0;
@ -418,7 +418,7 @@ void FApplication::cmd_options ()
int FApplication::gpmEvent (bool clear)
{
register int result;
register int max = (gpm_fd > stdin_no) ? gpm_fd : stdin_no;
register int max = ( gpm_fd > stdin_no ) ? gpm_fd : stdin_no;
fd_set ifds;
struct timeval tv;
@ -463,7 +463,7 @@ inline bool FApplication::KeyPressed()
if ( FD_ISSET(stdin_no, &ifds) )
FD_CLR (stdin_no, &ifds);
return (result > 0);
return ( result > 0 );
}
//----------------------------------------------------------------------
@ -1673,7 +1673,7 @@ void FApplication::processMouseEvent()
{
// determine the widget at the current click position
FWidget* child = childWidgetAt (window, mouse_position);
clicked_widget = (child != 0) ? child : window;
clicked_widget = ( child != 0 ) ? child : window;
}
// unset the move/size mode
@ -1996,5 +1996,5 @@ bool FApplication::processNextEvent()
sendQueuedEvents();
num_events += processTimerEvent();
return (num_events > 0);
return ( num_events > 0 );
}

6
src/fbutton.cpp
View File

@ -1,9 +1,9 @@
// File: fbutton.cpp
// Provides: class FButton
#include "fapplication.h"
#include "fbutton.h"
#include "fstatusbar.h"
#include "final/fapplication.h"
#include "final/fbutton.h"
#include "final/fstatusbar.h"
//----------------------------------------------------------------------

8
src/fbuttongroup.cpp
View File

@ -1,10 +1,10 @@
// File: fbuttongroup.cpp
// Provides: class FButtonGroup
#include "fapplication.h"
#include "fbuttongroup.h"
#include "fstatusbar.h"
#include "ftogglebutton.h"
#include "final/fapplication.h"
#include "final/fbuttongroup.h"
#include "final/fstatusbar.h"
#include "final/ftogglebutton.h"
//----------------------------------------------------------------------

2
src/fcheckbox.cpp
View File

@ -1,7 +1,7 @@
// File: fcheckbox.cpp
// Provides: class FCheckBox
#include "fcheckbox.h"
#include "final/fcheckbox.h"
//----------------------------------------------------------------------

4
src/fcheckmenuitem.cpp
View File

@ -1,8 +1,8 @@
// File: fcheckmenuitem.cpp
// Provides: class FCheckMenuItem
#include "fcheckmenuitem.h"
#include "fmenu.h"
#include "final/fcheckmenuitem.h"
#include "final/fmenu.h"
//----------------------------------------------------------------------
// class FCheckMenuItem

6
src/fdialog.cpp
View File

@ -1,9 +1,9 @@
// File: fdialog.cpp
// Provides: class FDialog
#include "fapplication.h"
#include "fdialog.h"
#include "fstatusbar.h"
#include "final/fapplication.h"
#include "final/fdialog.h"
#include "final/fstatusbar.h"
//----------------------------------------------------------------------

2
src/fdialoglistmenu.cpp
View File

@ -2,7 +2,7 @@
// Provides: class FDialogListMenu
#include "fdialoglistmenu.h"
#include "final/fdialoglistmenu.h"
//----------------------------------------------------------------------
// class FDialogListMenu

6
src/fevent.cpp
View File

@ -3,7 +3,7 @@
#include <cstdio>
#include "fevent.h"
#include "final/fevent.h"
//----------------------------------------------------------------------
@ -185,13 +185,13 @@ FFocusEvent::~FFocusEvent() // destructor
//----------------------------------------------------------------------
bool FFocusEvent::gotFocus() const
{
return (type() == fc::FocusIn_Event);
return ( type() == fc::FocusIn_Event );
}
//----------------------------------------------------------------------
bool FFocusEvent::lostFocus() const
{
return (type() == fc::FocusOut_Event);
return ( type() == fc::FocusOut_Event );
}
//----------------------------------------------------------------------

2
src/ffiledialog.cpp
View File

@ -3,7 +3,7 @@
#include <vector>
#include "ffiledialog.h"
#include "final/ffiledialog.h"
// non-member functions

6
src/flabel.cpp
View File

@ -1,9 +1,9 @@
// File: flabel.cpp
// Provides: class FLabel
#include "fapplication.h"
#include "flabel.h"
#include "fstatusbar.h"
#include "final/fapplication.h"
#include "final/flabel.h"
#include "final/fstatusbar.h"
//----------------------------------------------------------------------

6
src/flineedit.cpp
View File

@ -1,9 +1,9 @@
// File: flineedit.cpp
// Provides: class FLineEdit
#include "fapplication.h"
#include "flineedit.h"
#include "fstatusbar.h"
#include "final/fapplication.h"
#include "final/flineedit.h"
#include "final/fstatusbar.h"
//----------------------------------------------------------------------

8
src/flistbox.cpp
View File

@ -4,10 +4,10 @@
#include <algorithm>
#include "fapplication.h"
#include "flistbox.h"
#include "fscrollbar.h"
#include "fstatusbar.h"
#include "final/fapplication.h"
#include "final/flistbox.h"
#include "final/fscrollbar.h"
#include "final/fstatusbar.h"
//----------------------------------------------------------------------

12
src/flistview.cpp
View File

@ -4,11 +4,11 @@
#include <vector>
#include "fapplication.h"
#include "flistview.h"
#include "fscrollbar.h"
#include "fstatusbar.h"
#include "ftermbuffer.h"
#include "final/fapplication.h"
#include "final/flistview.h"
#include "final/fscrollbar.h"
#include "final/fstatusbar.h"
#include "final/ftermbuffer.h"
//----------------------------------------------------------------------
// class FListViewItem
@ -1396,7 +1396,7 @@ void FListView::drawListLine ( const FListViewItem* item
uInt i;
for (i = 0; i < len; i++)
print (element_str[i]);
*this << element_str[i];
for (; i < uInt(getWidth() - nf_offset - 2); i++)
print (' ');

Some files were not shown because too many files have changed in this diff Show More