Move fonts into the root directory
This commit is contained in:
Markus Gans
parent
d821631d87
commit
19c8dd50a9
|
|
@ -1,3 +1,6 @@
|
|||
2017-11-02 Markus Gans <guru.mail@muenster.de>
|
||||
* Move fonts into the root directory
|
||||
|
||||
2017-10-30 Markus Gans <guru.mail@muenster.de>
|
||||
* Fix scrollview functionality with new inheritance structure
|
||||
* Add a standardized close confirmation dialog
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = foreign
|
|||
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
SUBDIRS = src doc examples
|
||||
SUBDIRS = src fonts doc examples
|
||||
|
||||
docdir = ${datadir}/doc/${PACKAGE}
|
||||
doc_DATA = AUTHORS COPYING ChangeLog
|
||||
|
|
|
|||
|
|
@ -352,7 +352,7 @@ top_builddir = @top_builddir@
|
|||
top_srcdir = @top_srcdir@
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
SUBDIRS = src doc examples
|
||||
SUBDIRS = src fonts doc examples
|
||||
doc_DATA = AUTHORS COPYING ChangeLog
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
     [](https://codedocs.xyz/gansm/finalcut/hierarchy.html)
|
||||
|
||||
### Installation
|
||||
```
|
||||
```bash
|
||||
> git clone git://github.com/gansm/finalcut.git
|
||||
> cd finalcut
|
||||
> ./configure --prefix=/usr
|
||||
|
|
|
|||
|
|
@ -16978,7 +16978,7 @@ SO_VERSION="3:0:3"
|
|||
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files Makefile src/Makefile src/fonts/Makefile doc/Makefile examples/Makefile"
|
||||
ac_config_files="$ac_config_files Makefile src/Makefile fonts/Makefile doc/Makefile examples/Makefile"
|
||||
|
||||
|
||||
# use GPM (General Purpose Mouse)
|
||||
|
|
@ -18196,7 +18196,7 @@ do
|
|||
"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" ;;
|
||||
"fonts/Makefile") CONFIG_FILES="$CONFIG_FILES fonts/Makefile" ;;
|
||||
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
|
||||
"examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ AC_SUBST([LIBTOOL_DEPS])
|
|||
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
AC_CONFIG_FILES([Makefile src/Makefile src/fonts/Makefile doc/Makefile examples/Makefile])
|
||||
AC_CONFIG_FILES([Makefile src/Makefile fonts/Makefile doc/Makefile examples/Makefile])
|
||||
|
||||
# use GPM (General Purpose Mouse)
|
||||
AC_ARG_WITH([gpm],
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ Formatting
|
|||
* A new line should begin after 72 (max. 80) characters
|
||||
* Use 2 spaces indent. Do not use tabs!
|
||||
* Leave a space after the keywords if, switch, while, do, for, and return
|
||||
* Use one blank line before and afte a for, if, switch,
|
||||
* Use one blank line before and after a for, if, switch,
|
||||
while, do..while code block
|
||||
* In parameter lists, leave a space after each comma
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
Recommended settings for the xterm terminal emulator
|
||||
----------------------------------------------------
|
||||
|
||||
The final cut can only support all xterm features if the following
|
||||
settings in the ~/.Xresources (or ~/.Xdefaults) resource file
|
||||
are defined:
|
||||
|
||||
XTerm*termName: xterm-256color
|
||||
|
||||
*VT100.allowTcapOps: true
|
||||
*VT100.allowWindowOps: true
|
||||
*VT100.allowTitleOps: true
|
||||
*VT100.allowFontOps: true
|
||||
*VT100.metaSendsEscape: true
|
||||
|
||||
! Mouse cursor settings
|
||||
XTerm*pointerShape: left_ptr
|
||||
XTerm*pointerColor: #000000
|
||||
XTerm*pointerColorBackground: #eeeeee
|
||||
|
||||
|
|
@ -271,6 +271,9 @@ class MyDialog : public FDialog
|
|||
MyDialog& operator = (const MyDialog&);
|
||||
|
||||
// Method
|
||||
void initMenu();
|
||||
void initStatusBar();
|
||||
void initWidgets();
|
||||
void adjustSize();
|
||||
|
||||
// Event handlers
|
||||
|
|
@ -307,10 +310,22 @@ MyDialog::MyDialog (FWidget* parent)
|
|||
, myList()
|
||||
, clipboard()
|
||||
{
|
||||
// menu bar
|
||||
initMenu(); // Initialize the program menu
|
||||
initStatusBar(); // Initialize the status bar
|
||||
initWidgets(); // Initialize the dialog widgets
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
MyDialog::~MyDialog() // destructor
|
||||
{ }
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
void MyDialog::initMenu()
|
||||
{
|
||||
// Menu bar
|
||||
FMenuBar* Menubar = new FMenuBar (this);
|
||||
|
||||
// menu bar items
|
||||
// Menu bar items
|
||||
FMenu* File = new FMenu ("&File", Menubar);
|
||||
File->setStatusbarMessage ("File management commands");
|
||||
FMenu* Edit = new FMenu ("&Edit", Menubar);
|
||||
|
|
@ -441,7 +456,42 @@ MyDialog::MyDialog (FWidget* parent)
|
|||
F_METHOD_CALLBACK (this, &MyDialog::cb_view),
|
||||
static_cast<FWidget::data_ptr>(File3)
|
||||
);
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
void MyDialog::initStatusBar()
|
||||
{
|
||||
// Statusbar at the bottom
|
||||
FStatusBar* statusbar = new FStatusBar (this);
|
||||
|
||||
// Statusbar keys
|
||||
FStatusKey* key_F1 = new FStatusKey (fc::Fkey_f1, "About", statusbar);
|
||||
FStatusKey* key_F2 = new FStatusKey (fc::Fkey_f2, "View", statusbar);
|
||||
FStatusKey* key_F3 = new FStatusKey (fc::Fkey_f3, "Quit", statusbar);
|
||||
|
||||
// Add some function callbacks
|
||||
key_F1->addCallback
|
||||
(
|
||||
"activate",
|
||||
F_METHOD_CALLBACK (this, &MyDialog::cb_about)
|
||||
);
|
||||
|
||||
key_F2->addCallback
|
||||
(
|
||||
"activate",
|
||||
F_METHOD_CALLBACK (this, &MyDialog::cb_view)
|
||||
);
|
||||
|
||||
key_F3->addCallback
|
||||
(
|
||||
"activate",
|
||||
F_METHOD_CALLBACK (this, &FApplication::cb_exitApp)
|
||||
);
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
void MyDialog::initWidgets()
|
||||
{
|
||||
// Buttons
|
||||
FButton* MyButton1 = new FButton (this);
|
||||
MyButton1->setGeometry(3, 3, 5, 1);
|
||||
|
|
@ -553,13 +603,6 @@ MyDialog::MyDialog (FWidget* parent)
|
|||
sum_count->setGeometry(29, 5, 5, 3);
|
||||
*sum_count << myList->getCount();
|
||||
|
||||
// Statusbar at the bottom
|
||||
FStatusBar* statusbar = new FStatusBar (this);
|
||||
// Statusbar keys
|
||||
FStatusKey* key_F1 = new FStatusKey (fc::Fkey_f1, "About", statusbar);
|
||||
FStatusKey* key_F2 = new FStatusKey (fc::Fkey_f2, "View", statusbar);
|
||||
FStatusKey* key_F3 = new FStatusKey (fc::Fkey_f3, "Quit", statusbar);
|
||||
|
||||
// Add some function callbacks
|
||||
MyButton1->addCallback
|
||||
(
|
||||
|
|
@ -624,30 +667,8 @@ MyDialog::MyDialog (FWidget* parent)
|
|||
F_METHOD_CALLBACK (this, &MyDialog::cb_updateNumber),
|
||||
static_cast<FWidget::data_ptr>(tagged_count)
|
||||
);
|
||||
|
||||
key_F1->addCallback
|
||||
(
|
||||
"activate",
|
||||
F_METHOD_CALLBACK (this, &MyDialog::cb_about)
|
||||
);
|
||||
|
||||
key_F2->addCallback
|
||||
(
|
||||
"activate",
|
||||
F_METHOD_CALLBACK (this, &MyDialog::cb_view)
|
||||
);
|
||||
|
||||
key_F3->addCallback
|
||||
(
|
||||
"activate",
|
||||
F_METHOD_CALLBACK (this, &FApplication::cb_exitApp)
|
||||
);
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
MyDialog::~MyDialog() // destructor
|
||||
{ }
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
void MyDialog::adjustSize()
|
||||
{
|
||||
|
|
@ -916,7 +937,7 @@ void MyDialog::cb_setInput (FWidget* widget, data_ptr data)
|
|||
|
||||
int main (int argc, char* argv[])
|
||||
{
|
||||
FString ver = F_VERSION; // library version
|
||||
FString ver = F_VERSION; // Library version
|
||||
FString title = "The FINAL CUT " + ver + " (C) 2017 by Markus Gans";
|
||||
|
||||
// Create the application object app
|
||||
|
|
@ -924,8 +945,13 @@ int main (int argc, char* argv[])
|
|||
app.setXTermDefaultColors(true);
|
||||
app.setXTermTitle (title);
|
||||
|
||||
// Force vt100 encoding
|
||||
//app.setEncoding("VT100");
|
||||
|
||||
// Sets the terminal size to 94×30
|
||||
//app.setTermSize(94,30);
|
||||
|
||||
// Enable the final cut graphical font
|
||||
//app.setNewFont();
|
||||
|
||||
// Create main dialog object d
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ PRE_UNINSTALL = :
|
|||
POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = src/fonts
|
||||
subdir = fonts
|
||||
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prefix_config_h.m4 \
|
||||
|
|
@ -263,9 +263,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
|||
exit 1;; \
|
||||
esac; \
|
||||
done; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/fonts/Makefile'; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu fonts/Makefile'; \
|
||||
$(am__cd) $(top_srcdir) && \
|
||||
$(AUTOMAKE) --gnu src/fonts/Makefile
|
||||
$(AUTOMAKE) --gnu fonts/Makefile
|
||||
.PRECIOUS: Makefile
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
@case '$?' in \
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
### How can I use the new graphical font under the Linux text console?
|
||||
|
||||
Simply start your program with the parameter `--newfont`.
|
||||
|
||||
### How can I use the new graphical font under X11?
|
||||
|
||||
The use of the new graphical font under X11 is only possible with
|
||||
the terminal emulators
|
||||
[xterm](http://invisible-island.net/xterm/xterm.html)
|
||||
or
|
||||
[urxvt](http://software.schmorp.de/pkg/rxvt-unicode.html),
|
||||
because only these terminal emulators can change the font by
|
||||
using an escape sequence. For an xterm, the "[Allow Font Ops](doc/xterm.txt)"
|
||||
option must be set.
|
||||
|
||||
#### Install the gzip compressed X11 pcf bitmap font 8x16graph.pcf.gz on your xserver:
|
||||
|
||||
1. Create as user root the font directory<br />
|
||||
`mkdir /usr/share/fonts/X11/misc/finalcut/`
|
||||
|
||||
2. Copy the files 8x16graph.pcf.gz, fonts.dir and fonts.alias
|
||||
into the just created directory<br />
|
||||
`cp 8x16graph.pcf.gz fonts.dir fonts.alias /usr/share/fonts/X11/misc/finalcut/`
|
||||
|
||||
3. Add the new dir to X font path<br />
|
||||
`xset fp+ /usr/share/fonts/X11/misc/finalcut/`<br />
|
||||
*(You can insert this command into the ~/.xinitrc to make the font path permanently usable)*
|
||||
|
||||
4. Check if the font is available to the xserver<br />
|
||||
`xlsfonts | grep 8x16graph`
|
||||
|
||||
5. Start your program with the parameter `--newfont`<br />
|
||||
`ui --newfont`
|
||||
|
||||
|
|
@ -86,34 +86,35 @@ class FListViewItem : public FObject
|
|||
FListViewItem& operator = (const FListViewItem&);
|
||||
|
||||
// Accessors
|
||||
const char* getClassName() const;
|
||||
uInt getColumnCount() const;
|
||||
FString getText (int) const;
|
||||
uInt getDepth() const;
|
||||
const char* getClassName() const;
|
||||
uInt getColumnCount() const;
|
||||
FString getText (int) const;
|
||||
uInt getDepth() const;
|
||||
|
||||
// Mutator
|
||||
void setText (int, const FString&);
|
||||
void setText (int, const FString&);
|
||||
|
||||
|
||||
// Inquiry
|
||||
bool isExpand() const;
|
||||
bool isExpand() const;
|
||||
|
||||
// Methods
|
||||
FObjectIterator insert (FListViewItem*);
|
||||
FObjectIterator insert (FListViewItem*, FObjectIterator);
|
||||
void expand();
|
||||
void collapse();
|
||||
FObjectIterator insert (FListViewItem*);
|
||||
FObjectIterator insert (FListViewItem*, FObjectIterator);
|
||||
void expand();
|
||||
void collapse();
|
||||
|
||||
private:
|
||||
// Inquiry
|
||||
bool isExpandable() const;
|
||||
bool isExpandable() const;
|
||||
|
||||
// Methods
|
||||
FObjectIterator appendItem (FListViewItem*);
|
||||
void replaceControlCodes();
|
||||
int getVisibleLines();
|
||||
void resetVisibleLineCounter();
|
||||
FObjectIterator appendItem (FListViewItem*);
|
||||
void replaceControlCodes();
|
||||
int getVisibleLines();
|
||||
void resetVisibleLineCounter();
|
||||
|
||||
// Data Member
|
||||
// Data Members
|
||||
FStringList column_list;
|
||||
FWidget::data_ptr data_pointer;
|
||||
int visible_lines;
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
# Makefile.am - The Final Cut library
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
SUBDIRS = fonts
|
||||
|
||||
AM_CPPFLAGS = -I../include -Wall -Werror -DCOMPILE_FINAL_CUT
|
||||
|
||||
lib_LTLIBRARIES = libfinal.la
|
||||
|
|
|
|||
191
src/Makefile.in
191
src/Makefile.in
|
|
@ -182,28 +182,12 @@ am__v_CXXLD_0 = @echo " CXXLD " $@;
|
|||
am__v_CXXLD_1 =
|
||||
SOURCES = $(libfinal_la_SOURCES)
|
||||
DIST_SOURCES = $(libfinal_la_SOURCES)
|
||||
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
|
||||
ctags-recursive dvi-recursive html-recursive info-recursive \
|
||||
install-data-recursive install-dvi-recursive \
|
||||
install-exec-recursive install-html-recursive \
|
||||
install-info-recursive install-pdf-recursive \
|
||||
install-ps-recursive install-recursive installcheck-recursive \
|
||||
installdirs-recursive pdf-recursive ps-recursive \
|
||||
tags-recursive uninstall-recursive
|
||||
am__can_run_installinfo = \
|
||||
case $$AM_UPDATE_INFO_DIR in \
|
||||
n|no|NO) false;; \
|
||||
*) (install-info --version) >/dev/null 2>&1;; \
|
||||
esac
|
||||
HEADERS = $(finalcutinclude_HEADERS)
|
||||
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
|
||||
distclean-recursive maintainer-clean-recursive
|
||||
am__recursive_targets = \
|
||||
$(RECURSIVE_TARGETS) \
|
||||
$(RECURSIVE_CLEAN_TARGETS) \
|
||||
$(am__extra_recursive_targets)
|
||||
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
|
||||
distdir
|
||||
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
|
||||
# Read a list of newline-separated strings from the standard input,
|
||||
# and print each of them once, without duplicates. Input order is
|
||||
|
|
@ -223,33 +207,7 @@ am__define_uniq_tagged_files = \
|
|||
done | $(am__uniquify_input)`
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DIST_SUBDIRS = $(SUBDIRS)
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
am__relativize = \
|
||||
dir0=`pwd`; \
|
||||
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
|
||||
sed_rest='s,^[^/]*/*,,'; \
|
||||
sed_last='s,^.*/\([^/]*\)$$,\1,'; \
|
||||
sed_butlast='s,/*[^/]*$$,,'; \
|
||||
while test -n "$$dir1"; do \
|
||||
first=`echo "$$dir1" | sed -e "$$sed_first"`; \
|
||||
if test "$$first" != "."; then \
|
||||
if test "$$first" = ".."; then \
|
||||
dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
|
||||
dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
|
||||
else \
|
||||
first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
|
||||
if test "$$first2" = "$$first"; then \
|
||||
dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
|
||||
else \
|
||||
dir2="../$$dir2"; \
|
||||
fi; \
|
||||
dir0="$$dir0"/"$$first"; \
|
||||
fi; \
|
||||
fi; \
|
||||
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
|
||||
done; \
|
||||
reldir="$$dir2"
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
|
|
@ -372,7 +330,6 @@ target_alias = @target_alias@
|
|||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
SUBDIRS = fonts
|
||||
AM_CPPFLAGS = -I../include -Wall -Werror -DCOMPILE_FINAL_CUT
|
||||
lib_LTLIBRARIES = libfinal.la
|
||||
libfinal_la_SOURCES = \
|
||||
|
|
@ -467,7 +424,7 @@ finalcutinclude_HEADERS = \
|
|||
../include/final/fwidget.h \
|
||||
../include/final/fwindow.h
|
||||
|
||||
all: all-recursive
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .cpp .lo .o .obj
|
||||
|
|
@ -634,61 +591,14 @@ uninstall-finalcutincludeHEADERS:
|
|||
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
||||
dir='$(DESTDIR)$(finalcutincludedir)'; $(am__uninstall_files_from_dir)
|
||||
|
||||
# This directory's subdirectories are mostly independent; you can cd
|
||||
# into them and run 'make' without going through this Makefile.
|
||||
# To change the values of 'make' variables: instead of editing Makefiles,
|
||||
# (1) if the variable is set in 'config.status', edit 'config.status'
|
||||
# (which will cause the Makefiles to be regenerated when you run 'make');
|
||||
# (2) otherwise, pass the desired values on the 'make' command line.
|
||||
$(am__recursive_targets):
|
||||
@fail=; \
|
||||
if $(am__make_keepgoing); then \
|
||||
failcom='fail=yes'; \
|
||||
else \
|
||||
failcom='exit 1'; \
|
||||
fi; \
|
||||
dot_seen=no; \
|
||||
target=`echo $@ | sed s/-recursive//`; \
|
||||
case "$@" in \
|
||||
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
|
||||
*) list='$(SUBDIRS)' ;; \
|
||||
esac; \
|
||||
for subdir in $$list; do \
|
||||
echo "Making $$target in $$subdir"; \
|
||||
if test "$$subdir" = "."; then \
|
||||
dot_seen=yes; \
|
||||
local_target="$$target-am"; \
|
||||
else \
|
||||
local_target="$$target"; \
|
||||
fi; \
|
||||
($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|
||||
|| eval $$failcom; \
|
||||
done; \
|
||||
if test "$$dot_seen" = "no"; then \
|
||||
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
|
||||
fi; test -z "$$fail"
|
||||
|
||||
ID: $(am__tagged_files)
|
||||
$(am__define_uniq_tagged_files); mkid -fID $$unique
|
||||
tags: tags-recursive
|
||||
tags: tags-am
|
||||
TAGS: tags
|
||||
|
||||
tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
|
||||
set x; \
|
||||
here=`pwd`; \
|
||||
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
|
||||
include_option=--etags-include; \
|
||||
empty_fix=.; \
|
||||
else \
|
||||
include_option=--include; \
|
||||
empty_fix=; \
|
||||
fi; \
|
||||
list='$(SUBDIRS)'; for subdir in $$list; do \
|
||||
if test "$$subdir" = .; then :; else \
|
||||
test ! -f $$subdir/TAGS || \
|
||||
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
|
||||
fi; \
|
||||
done; \
|
||||
$(am__define_uniq_tagged_files); \
|
||||
shift; \
|
||||
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
|
||||
|
|
@ -701,7 +611,7 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
|
|||
$$unique; \
|
||||
fi; \
|
||||
fi
|
||||
ctags: ctags-recursive
|
||||
ctags: ctags-am
|
||||
|
||||
CTAGS: ctags
|
||||
ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
|
||||
|
|
@ -714,7 +624,7 @@ GTAGS:
|
|||
here=`$(am__cd) $(top_builddir) && pwd` \
|
||||
&& $(am__cd) $(top_srcdir) \
|
||||
&& gtags -i $(GTAGS_ARGS) "$$here"
|
||||
cscopelist: cscopelist-recursive
|
||||
cscopelist: cscopelist-am
|
||||
|
||||
cscopelist-am: $(am__tagged_files)
|
||||
list='$(am__tagged_files)'; \
|
||||
|
|
@ -763,48 +673,22 @@ distdir: $(DISTFILES)
|
|||
|| exit 1; \
|
||||
fi; \
|
||||
done
|
||||
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
|
||||
if test "$$subdir" = .; then :; else \
|
||||
$(am__make_dryrun) \
|
||||
|| test -d "$(distdir)/$$subdir" \
|
||||
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|
||||
|| exit 1; \
|
||||
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
|
||||
$(am__relativize); \
|
||||
new_distdir=$$reldir; \
|
||||
dir1=$$subdir; dir2="$(top_distdir)"; \
|
||||
$(am__relativize); \
|
||||
new_top_distdir=$$reldir; \
|
||||
echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
|
||||
echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
|
||||
($(am__cd) $$subdir && \
|
||||
$(MAKE) $(AM_MAKEFLAGS) \
|
||||
top_distdir="$$new_top_distdir" \
|
||||
distdir="$$new_distdir" \
|
||||
am__remove_distdir=: \
|
||||
am__skip_length_check=: \
|
||||
am__skip_mode_fix=: \
|
||||
distdir) \
|
||||
|| exit 1; \
|
||||
fi; \
|
||||
done
|
||||
check-am: all-am
|
||||
check: check-recursive
|
||||
check: check-am
|
||||
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
|
||||
installdirs: installdirs-recursive
|
||||
installdirs-am:
|
||||
installdirs:
|
||||
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(finalcutincludedir)"; do \
|
||||
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
||||
done
|
||||
install: install-recursive
|
||||
install-exec: install-exec-recursive
|
||||
install-data: install-data-recursive
|
||||
uninstall: uninstall-recursive
|
||||
install: install-am
|
||||
install-exec: install-exec-am
|
||||
install-data: install-data-am
|
||||
uninstall: uninstall-am
|
||||
|
||||
install-am: all-am
|
||||
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
|
||||
|
||||
installcheck: installcheck-recursive
|
||||
installcheck: installcheck-am
|
||||
install-strip:
|
||||
if test -z '$(STRIP)'; then \
|
||||
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||||
|
|
@ -826,92 +710,91 @@ distclean-generic:
|
|||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
clean: clean-recursive
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
|
||||
mostlyclean-am
|
||||
|
||||
distclean: distclean-recursive
|
||||
distclean: distclean-am
|
||||
-rm -rf ./$(DEPDIR)
|
||||
-rm -f Makefile
|
||||
distclean-am: clean-am distclean-compile distclean-generic \
|
||||
distclean-tags
|
||||
|
||||
dvi: dvi-recursive
|
||||
dvi: dvi-am
|
||||
|
||||
dvi-am:
|
||||
|
||||
html: html-recursive
|
||||
html: html-am
|
||||
|
||||
html-am:
|
||||
|
||||
info: info-recursive
|
||||
info: info-am
|
||||
|
||||
info-am:
|
||||
|
||||
install-data-am: install-finalcutincludeHEADERS
|
||||
|
||||
install-dvi: install-dvi-recursive
|
||||
install-dvi: install-dvi-am
|
||||
|
||||
install-dvi-am:
|
||||
|
||||
install-exec-am: install-libLTLIBRARIES
|
||||
|
||||
install-html: install-html-recursive
|
||||
install-html: install-html-am
|
||||
|
||||
install-html-am:
|
||||
|
||||
install-info: install-info-recursive
|
||||
install-info: install-info-am
|
||||
|
||||
install-info-am:
|
||||
|
||||
install-man:
|
||||
|
||||
install-pdf: install-pdf-recursive
|
||||
install-pdf: install-pdf-am
|
||||
|
||||
install-pdf-am:
|
||||
|
||||
install-ps: install-ps-recursive
|
||||
install-ps: install-ps-am
|
||||
|
||||
install-ps-am:
|
||||
|
||||
installcheck-am:
|
||||
|
||||
maintainer-clean: maintainer-clean-recursive
|
||||
maintainer-clean: maintainer-clean-am
|
||||
-rm -rf ./$(DEPDIR)
|
||||
-rm -f Makefile
|
||||
maintainer-clean-am: distclean-am maintainer-clean-generic
|
||||
|
||||
mostlyclean: mostlyclean-recursive
|
||||
mostlyclean: mostlyclean-am
|
||||
|
||||
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
|
||||
mostlyclean-libtool
|
||||
|
||||
pdf: pdf-recursive
|
||||
pdf: pdf-am
|
||||
|
||||
pdf-am:
|
||||
|
||||
ps: ps-recursive
|
||||
ps: ps-am
|
||||
|
||||
ps-am:
|
||||
|
||||
uninstall-am: uninstall-finalcutincludeHEADERS \
|
||||
uninstall-libLTLIBRARIES
|
||||
|
||||
.MAKE: $(am__recursive_targets) install-am install-strip
|
||||
.MAKE: install-am install-strip
|
||||
|
||||
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
|
||||
check-am clean clean-generic clean-libLTLIBRARIES \
|
||||
clean-libtool cscopelist-am ctags ctags-am distclean \
|
||||
distclean-compile distclean-generic distclean-libtool \
|
||||
distclean-tags distdir dvi dvi-am html html-am info info-am \
|
||||
install install-am install-data install-data-am install-dvi \
|
||||
install-dvi-am install-exec install-exec-am \
|
||||
install-finalcutincludeHEADERS install-html install-html-am \
|
||||
install-info install-info-am install-libLTLIBRARIES \
|
||||
install-man install-pdf install-pdf-am install-ps \
|
||||
install-ps-am install-strip installcheck installcheck-am \
|
||||
installdirs installdirs-am maintainer-clean \
|
||||
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
|
||||
clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
|
||||
ctags-am distclean distclean-compile distclean-generic \
|
||||
distclean-libtool distclean-tags distdir dvi dvi-am html \
|
||||
html-am info info-am install install-am install-data \
|
||||
install-data-am install-dvi install-dvi-am install-exec \
|
||||
install-exec-am install-finalcutincludeHEADERS install-html \
|
||||
install-html-am install-info install-info-am \
|
||||
install-libLTLIBRARIES install-man install-pdf install-pdf-am \
|
||||
install-ps install-ps-am install-strip installcheck \
|
||||
installcheck-am installdirs maintainer-clean \
|
||||
maintainer-clean-generic mostlyclean mostlyclean-compile \
|
||||
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
||||
tags tags-am uninstall uninstall-am \
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
#include "final/fstatusbar.h"
|
||||
#include "final/ftermbuffer.h"
|
||||
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// class FListViewItem
|
||||
//----------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -1733,7 +1733,6 @@ bool FString::operator > (const char c) const
|
|||
//----------------------------------------------------------------------
|
||||
const FString& FString::insert (const FString& s, uInt pos)
|
||||
{
|
||||
// assert (pos <= length);
|
||||
if ( pos >= length )
|
||||
throw std::out_of_range("");
|
||||
|
||||
|
|
@ -1744,7 +1743,6 @@ const FString& FString::insert (const FString& s, uInt pos)
|
|||
//----------------------------------------------------------------------
|
||||
const FString& FString::insert (const wchar_t* s, uInt pos)
|
||||
{
|
||||
// assert (pos <= length);
|
||||
if ( pos >= length )
|
||||
throw std::out_of_range("");
|
||||
|
||||
|
|
|
|||
|
|
@ -30,9 +30,9 @@
|
|||
#include "final/ftcap_map.h"
|
||||
|
||||
#if defined(__linux__)
|
||||
#include "fonts/newfont.h"
|
||||
#include "fonts/unicodemap.h"
|
||||
#include "fonts/vgafont.h"
|
||||
#include "../fonts/newfont.h"
|
||||
#include "../fonts/unicodemap.h"
|
||||
#include "../fonts/vgafont.h"
|
||||
#endif
|
||||
|
||||
// global FTerm object
|
||||
|
|
@ -1010,11 +1010,6 @@ const FString FTerm::getXTermColorName (int color)
|
|||
|
||||
fd_set ifds;
|
||||
struct timeval tv;
|
||||
int c = color;
|
||||
int digits = 0;
|
||||
|
||||
while ( c /= 10 )
|
||||
digits++;
|
||||
|
||||
char temp[512] = {};
|
||||
putstringf (OSC "4;%d;?" BEL, color); // get color
|
||||
|
|
|
|||
|
|
@ -1504,10 +1504,8 @@ void FWidget::clearShadow()
|
|||
if ( isMonochron() )
|
||||
return;
|
||||
|
||||
int x1 = 1
|
||||
, x2 = getWidth()
|
||||
, y1 = 1
|
||||
, y2 = getHeight();
|
||||
int w = getWidth()
|
||||
, h = getHeight();
|
||||
|
||||
if ( isWindowWidget() )
|
||||
{
|
||||
|
|
@ -1517,18 +1515,18 @@ void FWidget::clearShadow()
|
|||
else if ( FWidget* p = getParentWidget() )
|
||||
setColor (wc.shadow_fg, p->getBackgroundColor());
|
||||
|
||||
if ( x2 <= offset.getX2() )
|
||||
if ( w <= offset.getX2() )
|
||||
{
|
||||
for (int i = 0; i < getHeight(); i++)
|
||||
for (int i = 1; i <= getHeight(); i++)
|
||||
{
|
||||
setPrintPos (x2 + 1, y1 + i);
|
||||
setPrintPos (w + 1, i);
|
||||
print (' '); // clear █
|
||||
}
|
||||
}
|
||||
|
||||
if ( y2 <= offset.getY2() )
|
||||
if ( h <= offset.getY2() )
|
||||
{
|
||||
setPrintPos (x1 + 1, y2 + 1);
|
||||
setPrintPos (2, h + 1);
|
||||
|
||||
for (int i = 1; i <= getWidth(); i++)
|
||||
print (' '); // clear ▀
|
||||
|
|
|
|||
Loading…
Reference in New Issue