From ff555baf3bfa3089c555d8e0964bcb4e7b01714e Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Fri, 11 Sep 2020 00:08:22 +0200 Subject: [PATCH] Fixes a problem with mouse input in Cygwin in non-blocking read mode --- .gitignore | 1 + ChangeLog | 3 + examples/termcap.cpp | 2 + src/.depend | 591 ------------------------------- src/fapplication.cpp | 2 +- src/fstring.cpp | 55 +-- src/ftermcap.cpp | 38 +- src/ftermdetection.cpp | 23 +- src/fvterm.cpp | 15 + src/include/final/fapplication.h | 2 +- src/include/final/fstring.h | 4 - src/include/final/ftermcap.h | 1 + 12 files changed, 66 insertions(+), 671 deletions(-) delete mode 100644 src/.depend diff --git a/.gitignore b/.gitignore index a4813f98..02c34f37 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ Makefile.in /missing /stamp-h1 /test-driver +src/.depend src/.deps/ src/.libs/ examples/.deps/ diff --git a/ChangeLog b/ChangeLog index 52a5c548..4b93c1e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2020-09-11 Markus Gans + * Fixes a problem with mouse input in Cygwin in non-blocking read mode + 2020-09-08 Markus Gans * Speed up the reaction time of the gpm mouse * FListView now correctly adjusts the size of the scrollbar, diff --git a/examples/termcap.cpp b/examples/termcap.cpp index 24fcafed..bbe7f067 100644 --- a/examples/termcap.cpp +++ b/examples/termcap.cpp @@ -256,6 +256,8 @@ void booleans() , finalcut::FTermcap::automatic_right_margin ); tcapBoolean ( "eat_nl_glitch" , finalcut::FTermcap::eat_nl_glitch ); + tcapBoolean ( "has_ansi_escape_sequences" + , finalcut::FTermcap::has_ansi_escape_sequences ); tcapBoolean ( "ansi_default_color" , finalcut::FTermcap::ansi_default_color ); tcapBoolean ( "osc_support" diff --git a/src/.depend b/src/.depend deleted file mode 100644 index 525a743c..00000000 --- a/src/.depend +++ /dev/null @@ -1,591 +0,0 @@ -fapplication.o: fapplication.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fevent.h include/final/flog.h \ - include/final/flogger.h include/final/fmenu.h include/final/fwindow.h \ - include/final/fmenulist.h include/final/fmenuitem.h \ - include/final/fmenubar.h include/final/fmessagebox.h \ - include/final/fdialog.h include/final/fwidgetcolors.h \ - include/final/fmouse.h include/final/fkeyboard.h \ - include/final/fstartoptions.h include/final/fstatusbar.h \ - include/final/ftermdata.h include/final/ftermios.h -fbusyindicator.o: fbusyindicator.cpp include/final/fbusyindicator.h \ - include/final/ftooltip.h include/final/fwindow.h \ - include/final/fwidget.h include/final/fcallback.h \ - include/final/fstring.h include/final/fc.h include/final/ftypes.h \ - include/final/fdata.h include/final/fobject.h include/final/fpoint.h \ - include/final/frect.h include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h -fbutton.o: fbutton.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fcolorpair.h \ - include/final/fevent.h include/final/fbutton.h \ - include/final/fwidgetcolors.h include/final/fstatusbar.h \ - include/final/fwindow.h -fbuttongroup.o: fbuttongroup.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fbuttongroup.h \ - include/final/fscrollview.h include/final/fscrollbar.h \ - include/final/flog.h include/final/fwidgetcolors.h \ - include/final/fcolorpair.h include/final/fevent.h \ - include/final/fstatusbar.h include/final/fwindow.h \ - include/final/ftogglebutton.h -fcallback.o: fcallback.cpp include/final/fcallback.h \ - include/final/fstring.h include/final/fc.h include/final/ftypes.h \ - include/final/fdata.h -fcharmap.o: fcharmap.cpp include/final/fc.h include/final/ftypes.h \ - include/final/fdata.h include/final/fcharmap.h -fcheckbox.o: fcheckbox.cpp include/final/fc.h include/final/ftypes.h \ - include/final/fdata.h include/final/fcheckbox.h \ - include/final/ftogglebutton.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h -fcheckmenuitem.o: fcheckmenuitem.cpp include/final/fc.h \ - include/final/ftypes.h include/final/fdata.h \ - include/final/fcheckmenuitem.h include/final/fmenuitem.h \ - include/final/fwidget.h include/final/fcallback.h \ - include/final/fstring.h include/final/fobject.h include/final/fpoint.h \ - include/final/frect.h include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fmenu.h include/final/fwindow.h \ - include/final/fmenulist.h -fcolorpalette.o: fcolorpalette.cpp include/final/fcolorpalette.h \ - include/final/fstring.h include/final/fc.h include/final/ftypes.h \ - include/final/fdata.h -fcombobox.o: fcombobox.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fcolorpair.h \ - include/final/fcombobox.h include/final/flineedit.h \ - include/final/flistbox.h include/final/fscrollbar.h \ - include/final/flog.h include/final/fwindow.h include/final/fevent.h \ - include/final/flabel.h include/final/fwidgetcolors.h \ - include/final/fmouse.h include/final/fkeyboard.h \ - include/final/fstatusbar.h -fdialog.o: fdialog.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fcombobox.h \ - include/final/flineedit.h include/final/flistbox.h \ - include/final/fscrollbar.h include/final/flog.h \ - include/final/fwindow.h include/final/fdialog.h include/final/fmenu.h \ - include/final/fmenulist.h include/final/fmenuitem.h \ - include/final/fevent.h include/final/fkeyboard.h \ - include/final/fstatusbar.h include/final/ftooltip.h \ - include/final/fwidgetcolors.h -fdialoglistmenu.o: fdialoglistmenu.cpp include/final/fc.h \ - include/final/ftypes.h include/final/fdata.h \ - include/final/fdialoglistmenu.h include/final/fmenu.h \ - include/final/fwindow.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fmenulist.h \ - include/final/fmenuitem.h -fevent.o: fevent.cpp include/final/fevent.h include/final/fc.h \ - include/final/ftypes.h include/final/fdata.h include/final/fpoint.h \ - include/final/fstring.h -ffiledialog.o: ffiledialog.cpp include/final/fevent.h include/final/fc.h \ - include/final/ftypes.h include/final/fdata.h include/final/fpoint.h \ - include/final/fstring.h include/final/fsystem.h \ - include/final/ffiledialog.h include/final/fbutton.h \ - include/final/fwidget.h include/final/fcallback.h \ - include/final/fobject.h include/final/frect.h include/final/fsize.h \ - include/final/fvterm.h include/final/fstringstream.h \ - include/final/fterm.h include/final/fconfig.h \ - include/final/fcolorpalette.h include/final/fwidgetcolors.h \ - include/final/fcheckbox.h include/final/ftogglebutton.h \ - include/final/fdialog.h include/final/fmenu.h include/final/fwindow.h \ - include/final/fmenulist.h include/final/fmenuitem.h \ - include/final/flineedit.h include/final/flistbox.h \ - include/final/fscrollbar.h include/final/fapplication.h \ - include/final/flog.h include/final/fmessagebox.h \ - include/final/fstatusbar.h -fkey_map.o: fkey_map.cpp include/final/fc.h include/final/ftypes.h \ - include/final/fdata.h include/final/fkey_map.h -fkeyboard.o: fkeyboard.cpp include/final/fkeyboard.h \ - include/final/fstring.h include/final/fc.h include/final/ftypes.h \ - include/final/fdata.h include/final/fkey_map.h include/final/fobject.h \ - include/final/fterm.h include/final/fconfig.h \ - include/final/fcolorpalette.h include/final/fsystem.h \ - include/final/ftermios.h include/final/ftermlinux.h \ - include/final/ftermdata.h include/final/frect.h -flabel.o: flabel.cpp include/final/fapplication.h include/final/ftypes.h \ - include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fcolorpair.h \ - include/final/fevent.h include/final/flabel.h \ - include/final/fwidgetcolors.h include/final/flog.h \ - include/final/fstatusbar.h include/final/fwindow.h -flineedit.o: flineedit.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fevent.h include/final/flabel.h \ - include/final/fwidgetcolors.h include/final/flog.h \ - include/final/flineedit.h include/final/fstatusbar.h \ - include/final/fwindow.h -flistbox.o: flistbox.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fcolorpair.h \ - include/final/fevent.h include/final/flistbox.h \ - include/final/fscrollbar.h include/final/flog.h \ - include/final/fstatusbar.h include/final/fwindow.h \ - include/final/fwidgetcolors.h -flistview.o: flistview.cpp include/final/emptyfstring.h \ - include/final/fapplication.h include/final/ftypes.h \ - include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/flog.h \ - include/final/fcolorpair.h include/final/fevent.h \ - include/final/flistview.h include/final/fscrollbar.h \ - include/final/ftermbuffer.h include/final/fstatusbar.h \ - include/final/fwindow.h include/final/fwidgetcolors.h -flog.o: flog.cpp include/final/flog.h include/final/fstring.h \ - include/final/fc.h include/final/ftypes.h include/final/fdata.h -flogger.o: flogger.cpp include/final/flogger.h include/final/flog.h \ - include/final/fstring.h include/final/fc.h include/final/ftypes.h \ - include/final/fdata.h -fmenu.o: fmenu.cpp include/final/fapplication.h include/final/ftypes.h \ - include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fcolorpair.h \ - include/final/fdialog.h include/final/fmenu.h include/final/fwindow.h \ - include/final/fmenulist.h include/final/fmenuitem.h \ - include/final/fevent.h include/final/flog.h include/final/fmenubar.h \ - include/final/fstatusbar.h include/final/fwidgetcolors.h -fmenubar.o: fmenubar.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fevent.h include/final/flog.h \ - include/final/fmenu.h include/final/fwindow.h \ - include/final/fmenulist.h include/final/fmenuitem.h \ - include/final/fmenubar.h include/final/fstatusbar.h \ - include/final/fwidgetcolors.h -fmenuitem.o: fmenuitem.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fdialog.h include/final/fmenu.h \ - include/final/fwindow.h include/final/fmenulist.h \ - include/final/fmenuitem.h include/final/fevent.h include/final/flog.h \ - include/final/fmenubar.h include/final/fstatusbar.h -fmenulist.o: fmenulist.cpp include/final/fc.h include/final/ftypes.h \ - include/final/fdata.h include/final/fmenulist.h \ - include/final/fmenuitem.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h -fmessagebox.o: fmessagebox.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fbutton.h \ - include/final/fwidgetcolors.h include/final/flog.h \ - include/final/fmessagebox.h include/final/fdialog.h \ - include/final/fmenu.h include/final/fwindow.h \ - include/final/fmenulist.h include/final/fmenuitem.h -fmouse.o: fmouse.cpp include/final/fconfig.h include/final/fkeyboard.h \ - include/final/fstring.h include/final/fc.h include/final/ftypes.h \ - include/final/fdata.h include/final/fmouse.h include/final/fpoint.h \ - include/final/fobject.h include/final/fterm.h \ - include/final/fcolorpalette.h include/final/fsystem.h \ - include/final/ftermxterminal.h -fobject.o: fobject.cpp include/final/emptyfstring.h \ - include/final/fapplication.h include/final/ftypes.h \ - include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/flog.h include/final/fevent.h -foptiattr.o: foptiattr.cpp include/final/fc.h include/final/ftypes.h \ - include/final/fdata.h include/final/foptiattr.h \ - include/final/fstring.h include/final/sgr_optimizer.h \ - include/final/fstartoptions.h include/final/ftermcap.h -foptimove.o: foptimove.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/flog.h include/final/foptimove.h \ - include/final/ftermcap.h -fpoint.o: fpoint.cpp include/final/fpoint.h include/final/fstring.h \ - include/final/fc.h include/final/ftypes.h include/final/fdata.h -fprogressbar.o: fprogressbar.cpp include/final/fevent.h \ - include/final/fc.h include/final/ftypes.h include/final/fdata.h \ - include/final/fpoint.h include/final/fstring.h \ - include/final/fcolorpair.h include/final/fprogressbar.h \ - include/final/fwidget.h include/final/fcallback.h \ - include/final/fobject.h include/final/frect.h include/final/fsize.h \ - include/final/fvterm.h include/final/fstringstream.h \ - include/final/fterm.h include/final/fconfig.h \ - include/final/fcolorpalette.h include/final/fsystem.h \ - include/final/fwidgetcolors.h -fradiobutton.o: fradiobutton.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fradiobutton.h \ - include/final/ftogglebutton.h -fradiomenuitem.o: fradiomenuitem.cpp include/final/fc.h \ - include/final/ftypes.h include/final/fdata.h \ - include/final/fradiomenuitem.h include/final/fmenuitem.h \ - include/final/fwidget.h include/final/fcallback.h \ - include/final/fstring.h include/final/fobject.h include/final/fpoint.h \ - include/final/frect.h include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fmenu.h include/final/fwindow.h \ - include/final/fmenulist.h -frect.o: frect.cpp include/final/fpoint.h include/final/fstring.h \ - include/final/fc.h include/final/ftypes.h include/final/fdata.h \ - include/final/frect.h include/final/fsize.h -fscrollbar.o: fscrollbar.cpp include/final/fevent.h include/final/fc.h \ - include/final/ftypes.h include/final/fdata.h include/final/fpoint.h \ - include/final/fstring.h include/final/fscrollbar.h \ - include/final/fapplication.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fobject.h \ - include/final/frect.h include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/flog.h \ - include/final/fwidgetcolors.h -fscrollview.o: fscrollview.cpp include/final/fevent.h include/final/fc.h \ - include/final/ftypes.h include/final/fdata.h include/final/fpoint.h \ - include/final/fstring.h include/final/fscrollview.h \ - include/final/fscrollbar.h include/final/fapplication.h \ - include/final/fwidget.h include/final/fcallback.h \ - include/final/fobject.h include/final/frect.h include/final/fsize.h \ - include/final/fvterm.h include/final/fstringstream.h \ - include/final/fterm.h include/final/fconfig.h \ - include/final/fcolorpalette.h include/final/fsystem.h \ - include/final/flog.h include/final/fwindow.h \ - include/final/fwidgetcolors.h -fsize.o: fsize.cpp include/final/fpoint.h include/final/fstring.h \ - include/final/fc.h include/final/ftypes.h include/final/fdata.h \ - include/final/fsize.h -fspinbox.o: fspinbox.cpp include/final/fcolorpair.h include/final/fc.h \ - include/final/ftypes.h include/final/fdata.h include/final/fstring.h \ - include/final/fevent.h include/final/fpoint.h include/final/flabel.h \ - include/final/fwidget.h include/final/fcallback.h \ - include/final/fobject.h include/final/frect.h include/final/fsize.h \ - include/final/fvterm.h include/final/fstringstream.h \ - include/final/fterm.h include/final/fconfig.h \ - include/final/fcolorpalette.h include/final/fsystem.h \ - include/final/fwidgetcolors.h include/final/flineedit.h \ - include/final/fspinbox.h include/final/fstatusbar.h \ - include/final/fwindow.h -fstartoptions.o: fstartoptions.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/flog.h \ - include/final/fstartoptions.h -fstatusbar.o: fstatusbar.cpp include/final/fevent.h include/final/fc.h \ - include/final/ftypes.h include/final/fdata.h include/final/fpoint.h \ - include/final/fstring.h include/final/fstatusbar.h \ - include/final/fwidget.h include/final/fcallback.h \ - include/final/fobject.h include/final/frect.h include/final/fsize.h \ - include/final/fvterm.h include/final/fstringstream.h \ - include/final/fterm.h include/final/fconfig.h \ - include/final/fcolorpalette.h include/final/fsystem.h \ - include/final/fwindow.h include/final/fwidgetcolors.h -fstring.o: fstring.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/flog.h -fstringstream.o: fstringstream.cpp include/final/fstring.h \ - include/final/fc.h include/final/ftypes.h include/final/fdata.h \ - include/final/fstringstream.h -fswitch.o: fswitch.cpp include/final/fcolorpair.h include/final/fc.h \ - include/final/ftypes.h include/final/fdata.h include/final/fstring.h \ - include/final/fevent.h include/final/fpoint.h include/final/fswitch.h \ - include/final/ftogglebutton.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fobject.h \ - include/final/frect.h include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fwidgetcolors.h -fsystem.o: fsystem.cpp include/final/fsystem.h include/final/ftypes.h \ - include/final/fdata.h -fsystemimpl.o: fsystemimpl.cpp include/final/fsystemimpl.h \ - include/final/fc.h include/final/ftypes.h include/final/fdata.h \ - include/final/fsystem.h -fterm.o: fterm.cpp include/final/fapplication.h include/final/ftypes.h \ - include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fcharmap.h \ - include/final/fkey_map.h include/final/fkeyboard.h \ - include/final/flog.h include/final/fmouse.h include/final/foptiattr.h \ - include/final/sgr_optimizer.h include/final/foptimove.h \ - include/final/fstartoptions.h include/final/fsystemimpl.h \ - include/final/ftermbuffer.h include/final/ftermcap.h \ - include/final/ftermcapquirks.h include/final/ftermdata.h \ - include/final/ftermdebugdata.h include/final/ftermdetection.h \ - include/final/ftermios.h include/final/ftermxterminal.h \ - include/final/ftermlinux.h -fterm_functions.o: fterm_functions.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fcharmap.h include/final/flog.h \ - include/final/ftermbuffer.h -ftermbuffer.o: ftermbuffer.cpp include/final/fc.h include/final/ftypes.h \ - include/final/fdata.h include/final/fcolorpair.h \ - include/final/fstring.h include/final/fstyle.h \ - include/final/ftermbuffer.h include/final/fstringstream.h \ - include/final/fvterm.h include/final/fterm.h include/final/fconfig.h \ - include/final/fcolorpalette.h include/final/fsystem.h -ftermcap.o: ftermcap.cpp include/final/emptyfstring.h \ - include/final/fapplication.h include/final/ftypes.h \ - include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/flog.h include/final/fkey_map.h \ - include/final/ftermdata.h include/final/ftermcap.h \ - include/final/ftermdetection.h -ftermcapquirks.o: ftermcapquirks.cpp include/final/fc.h \ - include/final/ftypes.h include/final/fdata.h include/final/fkey_map.h \ - include/final/fterm.h include/final/fconfig.h \ - include/final/fcolorpalette.h include/final/fstring.h \ - include/final/fsystem.h include/final/ftermcap.h \ - include/final/ftermcapquirks.h include/final/ftermdata.h \ - include/final/frect.h include/final/ftermdetection.h -ftermdebugdata.o: ftermdebugdata.cpp include/final/fc.h \ - include/final/ftypes.h include/final/fdata.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fstring.h include/final/fsystem.h \ - include/final/ftermdata.h include/final/frect.h \ - include/final/ftermdetection.h include/final/ftermdebugdata.h -ftermdetection.o: ftermdetection.cpp include/final/emptyfstring.h \ - include/final/fapplication.h include/final/ftypes.h \ - include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/flog.h include/final/ftermdata.h \ - include/final/ftermdetection.h include/final/ftermios.h -ftermfreebsd.o: ftermfreebsd.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fcharmap.h include/final/flog.h \ - include/final/ftermdata.h include/final/ftermfreebsd.h -ftermios.o: ftermios.cpp include/final/ftermios.h include/final/fstring.h \ - include/final/fc.h include/final/ftypes.h include/final/fdata.h \ - include/final/fterm.h include/final/fconfig.h \ - include/final/fcolorpalette.h include/final/fsystem.h -ftermlinux.o: ftermlinux.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fcharmap.h include/final/flog.h \ - include/final/ftermcap.h include/final/ftermdetection.h \ - include/final/ftermlinux.h include/final/ftermdata.h \ - ../fonts/newfont.h ../fonts/newfont_8x16.h ../fonts/newfont_9x16.h \ - ../fonts/unicodemap.h ../fonts/vgafont.h -ftermopenbsd.o: ftermopenbsd.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/flog.h \ - include/final/ftermopenbsd.h -ftermxterminal.o: ftermxterminal.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/flog.h include/final/ftermcap.h \ - include/final/ftermdetection.h include/final/ftermfreebsd.h \ - include/final/ftermios.h include/final/ftermxterminal.h -ftextview.o: ftextview.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fdialog.h include/final/fmenu.h \ - include/final/fwindow.h include/final/fmenulist.h \ - include/final/fmenuitem.h include/final/fevent.h \ - include/final/fscrollbar.h include/final/flog.h \ - include/final/fstatusbar.h include/final/ftextview.h \ - include/final/fwidgetcolors.h -ftogglebutton.o: ftogglebutton.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fbuttongroup.h \ - include/final/fscrollview.h include/final/fscrollbar.h \ - include/final/flog.h include/final/fwidgetcolors.h \ - include/final/fevent.h include/final/fstatusbar.h \ - include/final/fwindow.h include/final/ftogglebutton.h -ftooltip.o: ftooltip.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/ftooltip.h \ - include/final/fwindow.h include/final/fwidgetcolors.h -fvterm.o: fvterm.cpp include/final/fapplication.h include/final/ftypes.h \ - include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fcharmap.h \ - include/final/fcolorpair.h include/final/fkeyboard.h \ - include/final/flog.h include/final/foptiattr.h \ - include/final/sgr_optimizer.h include/final/foptimove.h \ - include/final/fstyle.h include/final/ftermdata.h \ - include/final/ftermbuffer.h include/final/ftermcap.h \ - include/final/fwindow.h -fwidget.o: fwidget.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fevent.h include/final/flog.h \ - include/final/fmenubar.h include/final/fmenulist.h \ - include/final/fmenuitem.h include/final/fwindow.h \ - include/final/fstartoptions.h include/final/fstatusbar.h \ - include/final/ftermdata.h include/final/fwidgetcolors.h -fwidget_functions.o: fwidget_functions.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fcolorpair.h \ - include/final/fstyle.h include/final/fwidgetcolors.h -fwidgetcolors.o: fwidgetcolors.cpp include/final/fc.h \ - include/final/ftypes.h include/final/fdata.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fstring.h include/final/fsystem.h \ - include/final/fwidgetcolors.h -fwindow.o: fwindow.cpp include/final/fapplication.h \ - include/final/ftypes.h include/final/fdata.h include/final/fwidget.h \ - include/final/fcallback.h include/final/fstring.h include/final/fc.h \ - include/final/fobject.h include/final/fpoint.h include/final/frect.h \ - include/final/fsize.h include/final/fvterm.h \ - include/final/fstringstream.h include/final/fterm.h \ - include/final/fconfig.h include/final/fcolorpalette.h \ - include/final/fsystem.h include/final/fcombobox.h \ - include/final/flineedit.h include/final/flistbox.h \ - include/final/fscrollbar.h include/final/flog.h \ - include/final/fwindow.h include/final/fevent.h include/final/fmenu.h \ - include/final/fmenulist.h include/final/fmenuitem.h \ - include/final/fmenubar.h include/final/fstatusbar.h -sgr_optimizer.o: sgr_optimizer.cpp include/final/fc.h \ - include/final/ftypes.h include/final/fdata.h \ - include/final/sgr_optimizer.h diff --git a/src/fapplication.cpp b/src/fapplication.cpp index 3c42f6b7..ec2b6680 100644 --- a/src/fapplication.cpp +++ b/src/fapplication.cpp @@ -893,7 +893,7 @@ void FApplication::unsetMoveSizeMode() const } //---------------------------------------------------------------------- -void FApplication::closeDropDown() +void FApplication::closeDropDown() const { // Close the open menu diff --git a/src/fstring.cpp b/src/fstring.cpp index fceadec1..0caa249d 100644 --- a/src/fstring.cpp +++ b/src/fstring.cpp @@ -212,35 +212,6 @@ const FString& FString::operator += (const FString& s) return *this; } - -//---------------------------------------------------------------------- -const FString FString::operator + (const FString& s) -{ - FString tmp{string}; - tmp._insert (length, s.length, s.string); - return tmp; -} - -//---------------------------------------------------------------------- -const FString FString::operator + (const wchar_t c) -{ - wchar_t s[2]{}; - s[0] = c; - FString tmp{string}; - tmp._insert (length, 1, s); - return tmp; -} - -//---------------------------------------------------------------------- -const FString FString::operator + (const char c) -{ - wchar_t s[2]{}; - s[0] = wchar_t(c & 0xff); - FString tmp{string}; - tmp._insert (length, 1, s); - return tmp; -} - //---------------------------------------------------------------------- FString& FString::operator << (const FString& s) { @@ -1559,9 +1530,7 @@ inline const wchar_t* FString::_extractToken ( wchar_t* rest[] const FString operator + (const FString& s1, const FString& s2) { FString tmp{s1}; - tmp._insert ( uInt(std::wcslen(s1.wc_str())) - , uInt(std::wcslen(s2.wc_str())) - , s2.wc_str() ); + tmp._insert (tmp.length, s2.length, s2.wc_str()); return tmp; } @@ -1569,7 +1538,7 @@ const FString operator + (const FString& s1, const FString& s2) const FString operator + (const FString& s, const wchar_t c) { FString tmp{s}; - tmp._insert ( uInt(std::wcslen(s.wc_str())), 1, &c); + tmp._insert (tmp.length, 1, &c); return tmp; } @@ -1577,9 +1546,7 @@ const FString operator + (const FString& s, const wchar_t c) const FString operator + (const std::wstring& s1, const FString& s2) { FString tmp{s1}; - tmp._insert ( uInt(std::wcslen(s1.c_str())) - , uInt(std::wcslen(s2.wc_str())) - , s2.wc_str() ); + tmp._insert (tmp.length, s2.length, s2.wc_str()); return tmp; } @@ -1587,9 +1554,7 @@ const FString operator + (const std::wstring& s1, const FString& s2) const FString operator + (const wchar_t s1[], const FString& s2) { FString tmp{s1}; - tmp._insert ( uInt(std::wcslen(s1)) - , uInt(std::wcslen(s2.wc_str())) - , s2.wc_str() ); + tmp._insert (tmp.length, s2.length, s2.wc_str()); return tmp; } @@ -1597,9 +1562,7 @@ const FString operator + (const wchar_t s1[], const FString& s2) const FString operator + (const std::string& s1, const FString& s2) { FString tmp{s1}; - tmp._insert ( tmp.getLength() - , uInt(std::wcslen(s2.wc_str())) - , s2.wc_str() ); + tmp._insert (tmp.length, s2.length, s2.wc_str()); return tmp; } @@ -1607,9 +1570,7 @@ const FString operator + (const std::string& s1, const FString& s2) const FString operator + (const char s1[], const FString& s2) { FString tmp{s1}; - tmp._insert ( tmp.getLength() - , uInt(std::wcslen(s2.wc_str())) - , s2.wc_str() ); + tmp._insert (tmp.length, s2.length, s2.wc_str()); return tmp; } @@ -1617,7 +1578,7 @@ const FString operator + (const char s1[], const FString& s2) const FString operator + (const wchar_t c, const FString& s) { FString tmp{c}; - tmp._insert (1, uInt(std::wcslen(s.wc_str())), s.wc_str()); + tmp._insert (1, s.length, s.wc_str()); return tmp; } @@ -1625,7 +1586,7 @@ const FString operator + (const wchar_t c, const FString& s) const FString operator + (const char c, const FString& s) { FString tmp{c}; - tmp._insert (1, uInt(std::wcslen(s.wc_str())), s.wc_str()); + tmp._insert (1, s.length, s.wc_str()); return tmp; } diff --git a/src/ftermcap.cpp b/src/ftermcap.cpp index 53268d68..8c695bc1 100644 --- a/src/ftermcap.cpp +++ b/src/ftermcap.cpp @@ -37,21 +37,22 @@ namespace finalcut { // static class attributes -bool FTermcap::background_color_erase {false}; -bool FTermcap::can_change_color_palette{false}; -bool FTermcap::automatic_left_margin {false}; -bool FTermcap::automatic_right_margin {false}; -bool FTermcap::eat_nl_glitch {false}; -bool FTermcap::ansi_default_color {false}; -bool FTermcap::osc_support {false}; -bool FTermcap::no_utf8_acs_chars {false}; -int FTermcap::max_color {1}; -int FTermcap::tabstop {8}; -int FTermcap::attr_without_color {0}; -FSystem* FTermcap::fsystem {nullptr}; -FTermData* FTermcap::fterm_data {nullptr}; -FTermDetection* FTermcap::term_detection {nullptr}; -char FTermcap::string_buf[2048] {}; +bool FTermcap::background_color_erase {false}; +bool FTermcap::can_change_color_palette {false}; +bool FTermcap::automatic_left_margin {false}; +bool FTermcap::automatic_right_margin {false}; +bool FTermcap::eat_nl_glitch {false}; +bool FTermcap::has_ansi_escape_sequences{false}; +bool FTermcap::ansi_default_color {false}; +bool FTermcap::osc_support {false}; +bool FTermcap::no_utf8_acs_chars {false}; +int FTermcap::max_color {1}; +int FTermcap::tabstop {8}; +int FTermcap::attr_without_color {0}; +FSystem* FTermcap::fsystem {nullptr}; +FTermData* FTermcap::fterm_data {nullptr}; +FTermDetection* FTermcap::term_detection {nullptr}; +char FTermcap::string_buf[2048] {}; //---------------------------------------------------------------------- // class FTermcap @@ -225,6 +226,11 @@ void FTermcap::termcapStrings() // Read termcap output strings for (std::size_t i{0}; strings[i].tname[0] != 0; i++) strings[i].string = getString(strings[i].tname); + + const auto& ho = TCAP(fc::t_cursor_home); + + if ( std::strncmp(ho, "\033[H", 3) == 0 ) + has_ansi_escape_sequences = true; } //---------------------------------------------------------------------- @@ -255,7 +261,7 @@ FTermcap::tcap_map FTermcap::strings[] = { // .------------- term string // | .-------- Tcap-code -// | | // variable name -> description +// | | // variable name -> description //------------------------------------------------------------------------------ { nullptr, "bl" }, // bell -> audible signal (bell) (P) { nullptr, "ec" }, // erase_chars -> erase #1 characters (P) diff --git a/src/ftermdetection.cpp b/src/ftermdetection.cpp index 914f8c18..5f552054 100644 --- a/src/ftermdetection.cpp +++ b/src/ftermdetection.cpp @@ -30,6 +30,7 @@ #include "final/flog.h" #include "final/fsystem.h" #include "final/fterm.h" +#include "final/ftermcap.h" #include "final/ftermdata.h" #include "final/ftermdetection.h" #include "final/ftermios.h" @@ -50,16 +51,16 @@ namespace finalcut FTermDetection::FTerminalType FTermDetection::terminal_type{}; FTermDetection::colorEnv FTermDetection::color_env{}; FTermDetection::secondaryDA FTermDetection::secondary_da{}; -FTermData* FTermDetection::fterm_data{nullptr}; -FSystem* FTermDetection::fsystem{nullptr}; -char FTermDetection::termtype[256]{}; -char FTermDetection::ttytypename[256]{}; -bool FTermDetection::decscusr_support{}; -bool FTermDetection::terminal_detection{}; -bool FTermDetection::color256{}; -const FString* FTermDetection::answer_back{nullptr}; -const FString* FTermDetection::sec_da{nullptr}; -int FTermDetection::gnome_terminal_id{}; +FTermData* FTermDetection::fterm_data{nullptr}; +FSystem* FTermDetection::fsystem{nullptr}; +char FTermDetection::termtype[256]{}; +char FTermDetection::ttytypename[256]{}; +bool FTermDetection::decscusr_support{}; +bool FTermDetection::terminal_detection{}; +bool FTermDetection::color256{}; +const FString* FTermDetection::answer_back{nullptr}; +const FString* FTermDetection::sec_da{nullptr}; +int FTermDetection::gnome_terminal_id{}; #if DEBUG char FTermDetection::termtype_256color[256]{}; @@ -611,7 +612,7 @@ const char* FTermDetection::parseAnswerbackMsg (const char current_termtype[]) } // cygwin needs a backspace to delete the '♣' char - if ( isCygwinTerminal() ) + if ( isCygwinTerminal() || isWindowsTerminal() ) FTerm::putstring (BS " " BS); #if DEBUG diff --git a/src/fvterm.cpp b/src/fvterm.cpp index bf840c94..0b94b853 100644 --- a/src/fvterm.cpp +++ b/src/fvterm.cpp @@ -20,6 +20,10 @@ * . * ***********************************************************************/ +#if defined(__CYGWIN__) + #include // need for ttyname_r +#endif + #include #include #include @@ -209,6 +213,17 @@ FColor FVTerm::rgb2ColorIndex (uInt8 r, uInt8 g, uInt8 b) const //---------------------------------------------------------------------- void FVTerm::setNonBlockingRead (bool enable) { +#if defined(__CYGWIN__) + // Fixes problem with mouse input + char termfilename[256]{}; + + if ( ttyname_r(1, termfilename, sizeof(termfilename)) ) + termfilename[0] = '\0'; + + if ( std::strncmp(termfilename, "/dev/cons", 9) == 0 ) + return; +#endif + uInt64 blocking_time = (enable) ? 5000 : 100000; // 5 or 100 ms FKeyboard::setReadBlockingTime (blocking_time); } diff --git a/src/include/final/fapplication.h b/src/include/final/fapplication.h index 216a4811..40a49f8b 100644 --- a/src/include/final/fapplication.h +++ b/src/include/final/fapplication.h @@ -174,7 +174,7 @@ class FApplication : public FWidget bool getMouseEvent() const; FWidget*& determineClickedWidget(); void unsetMoveSizeMode() const; - void closeDropDown(); + void closeDropDown() const; void unselectMenubarItems() const; void sendMouseEvent() const; void sendMouseMoveEvent ( const FPoint& diff --git a/src/include/final/fstring.h b/src/include/final/fstring.h index 3021143c..5a89b97b 100644 --- a/src/include/final/fstring.h +++ b/src/include/final/fstring.h @@ -106,10 +106,6 @@ class FString const FString& operator += (const FString&); - const FString operator + (const FString&); - const FString operator + (const wchar_t); - const FString operator + (const char); - FString& operator << (const FString&); FString& operator << (fc::SpecialCharacter); FString& operator << (const wchar_t); diff --git a/src/include/final/ftermcap.h b/src/include/final/ftermcap.h index 45d0bf81..e5b1e9b7 100644 --- a/src/include/final/ftermcap.h +++ b/src/include/final/ftermcap.h @@ -121,6 +121,7 @@ class FTermcap final static bool automatic_left_margin; static bool automatic_right_margin; static bool eat_nl_glitch; + static bool has_ansi_escape_sequences; static bool ansi_default_color; static bool osc_support; static bool no_utf8_acs_chars;