From 51105e7db21e27ad0636cb705a4cfbd3bd42dbbb Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Tue, 8 Sep 2020 23:22:52 +0200 Subject: [PATCH] Speed up the reaction time of the gpm mouse --- ChangeLog | 5 + configure.ac | 2 +- examples/rotozoomer.cpp | 2 +- src/.depend | 591 +++++++++++++++++++++++++++++++ src/fapplication.cpp | 18 +- src/fbusyindicator.cpp | 2 +- src/fkeyboard.cpp | 6 +- src/flistview.cpp | 5 +- src/fmouse.cpp | 10 +- src/fvterm.cpp | 2 +- src/fwindow.cpp | 2 +- src/include/final/fapplication.h | 2 +- src/include/final/fwindow.h | 2 +- test/conemu.h | 2 +- 14 files changed, 625 insertions(+), 26 deletions(-) create mode 100644 src/.depend diff --git a/ChangeLog b/ChangeLog index b7b887ac..52a5c548 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2020-09-08 Markus Gans + * Speed up the reaction time of the gpm mouse + * FListView now correctly adjusts the size of the scrollbar, + when expanding and collapsing by double-clicking + 2020-08-30 Markus Gans * Adding Windows Terminal detection diff --git a/configure.ac b/configure.ac index 2eb274dc..00d13fd6 100644 --- a/configure.ac +++ b/configure.ac @@ -91,7 +91,7 @@ AC_ARG_WITH([gpm], if test "x$with_gpm" != "xno" then AC_CHECK_LIB([gpm], - [main], + [Gpm_Open], [AC_DEFINE([HAVE_LIBGPM], 1, [Define to 1 if GPM mouse is enabled]) LIBS="$LIBS -lgpm"]) fi diff --git a/examples/rotozoomer.cpp b/examples/rotozoomer.cpp index a25a9f5b..270c3346 100644 --- a/examples/rotozoomer.cpp +++ b/examples/rotozoomer.cpp @@ -190,7 +190,7 @@ void RotoZoomer::generateReport() dimension_str << getDesktopWidth() << "x" << getDesktopHeight(); int elapsed_ms = int(duration_cast(end - start).count()); - time_str << double(elapsed_ms) / 1000 << "ms"; + time_str << double(elapsed_ms) / 1000 << "s"; fps_str << double(loops) * 1000.0 / double(elapsed_ms); rep << finalcut::FString{55, '-'} << "\n" diff --git a/src/.depend b/src/.depend new file mode 100644 index 00000000..525a743c --- /dev/null +++ b/src/.depend @@ -0,0 +1,591 @@ +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 12a85c71..3c42f6b7 100644 --- a/src/fapplication.cpp +++ b/src/fapplication.cpp @@ -63,7 +63,7 @@ FMouseControl* FApplication::mouse {nullptr}; // mouse control int FApplication::loop_level {0}; // event loop level int FApplication::quit_code {EXIT_SUCCESS}; bool FApplication::quit_now {false}; -uInt64 FApplication::next_event_wait {20000}; // preset to 20 ms +uInt64 FApplication::next_event_wait {5000}; // preset to 5 ms /200 Hz struct timeval FApplication::time_last_event{}; //---------------------------------------------------------------------- @@ -333,7 +333,7 @@ void FApplication::closeConfirmationDialog (FWidget* w, FCloseEvent* ev) void FApplication::processExternalUserEvent() { // This method can be overloaded and replaced by own code - std::this_thread::sleep_for(std::chrono::milliseconds(10)); + std::this_thread::sleep_for(std::chrono::milliseconds(5)); } @@ -905,7 +905,7 @@ void FApplication::closeDropDown() } //---------------------------------------------------------------------- -void FApplication::unselectMenubarItems() +void FApplication::unselectMenubarItems() const { // Unselect the menu bar items @@ -1248,8 +1248,9 @@ void FApplication::processLogger() const bool FApplication::processNextEvent() { uInt num_events{0}; + bool is_timeout = isNextEventTimeout(); - if ( isNextEventTimeout() ) + if ( is_timeout ) { FObject::getCurrentTime (&time_last_event); processKeyboardEvent(); @@ -1263,8 +1264,13 @@ bool FApplication::processNextEvent() processExternalUserEvent(); - sendQueuedEvents(); - num_events += processTimerEvent(); + if ( is_timeout ) + { + sendQueuedEvents(); + num_events += processTimerEvent(); + uInt64 wait{next_event_wait / 2}; + std::this_thread::sleep_for(std::chrono::microseconds(wait)); + } return ( num_events > 0 ); } diff --git a/src/fbusyindicator.cpp b/src/fbusyindicator.cpp index 370c5975..63f24e66 100644 --- a/src/fbusyindicator.cpp +++ b/src/fbusyindicator.cpp @@ -47,6 +47,7 @@ FBusyIndicator::~FBusyIndicator() // destructor void FBusyIndicator::start() { running = true; + createIndicatorText(); show(); updateTerminal(); flush(); @@ -69,7 +70,6 @@ void FBusyIndicator::stop() void FBusyIndicator::init() { FToolTip::hide(); - createIndicatorText(); } //---------------------------------------------------------------------- diff --git a/src/fkeyboard.cpp b/src/fkeyboard.cpp index 049f9907..d7ea5801 100644 --- a/src/fkeyboard.cpp +++ b/src/fkeyboard.cpp @@ -42,9 +42,9 @@ namespace finalcut { // static class attributes -uInt64 FKeyboard::read_blocking_time{100000}; // preset to 100 ms -uInt64 FKeyboard::key_timeout{100000}; // preset to 100 ms -uInt64 FKeyboard::interval_timeout{75000}; // preset to 75 ms +uInt64 FKeyboard::read_blocking_time{100000}; // preset to 100 ms / 10 Hz +uInt64 FKeyboard::key_timeout{100000}; // preset to 100 ms / 10 Hz +uInt64 FKeyboard::interval_timeout{75000}; // preset to 75 ms / 13.3 Hz struct timeval FKeyboard::time_keypressed{}; struct timeval FKeyboard::time_last_request{}; diff --git a/src/flistview.cpp b/src/flistview.cpp index 4434ca6d..77fb518d 100644 --- a/src/flistview.cpp +++ b/src/flistview.cpp @@ -1284,12 +1284,11 @@ void FListView::onMouseDoubleClick (FMouseEvent* ev) const int mouse_x = ev->getX(); const int mouse_y = ev->getY(); - const std::size_t element_count = getCount(); if ( mouse_x > 1 && mouse_x < int(getWidth()) && mouse_y > 1 && mouse_y < int(getHeight()) ) { - if ( first_visible_line.getPosition() + mouse_y - 1 > int(element_count) ) + if ( first_visible_line.getPosition() + mouse_y - 1 > int(getCount()) ) return; if ( itemlist.empty() ) @@ -1304,7 +1303,7 @@ void FListView::onMouseDoubleClick (FMouseEvent* ev) else item->expand(); - adjustScrollbars (element_count); + adjustScrollbars (getCount()); // after expand or collapse if ( isShown() ) draw(); diff --git a/src/fmouse.cpp b/src/fmouse.cpp index e3b85a65..f6a01da3 100644 --- a/src/fmouse.cpp +++ b/src/fmouse.cpp @@ -316,10 +316,10 @@ void FMouseGPM::processEvent (struct timeval*) if ( Gpm_GetEvent(&gpm_ev) == 1 ) { Gpm_FitEvent (&gpm_ev); + GPM_DRAWPOINTER(&gpm_ev); if ( ! hasSignificantEvents() ) { - GPM_DRAWPOINTER(&gpm_ev); has_gpm_mouse_data = false; clearEvent(); return; @@ -343,7 +343,6 @@ void FMouseGPM::processEvent (struct timeval*) case GPM_UP: interpretKeyUp(); - default: break; } @@ -356,7 +355,6 @@ void FMouseGPM::processEvent (struct timeval*) else setPending(false); - GPM_DRAWPOINTER(&gpm_ev); has_gpm_mouse_data = false; setEvent(); return; @@ -379,9 +377,9 @@ bool FMouseGPM::gpmMouse (bool enable) if ( enable ) { Gpm_Connect conn; - conn.eventMask = uInt16(~0); // Get all including wheel event - conn.defaultMask = GPM_MOVE; - conn.maxMod = uInt16(~0); + conn.eventMask = GPM_MOVE | GPM_DRAG | GPM_DOWN | GPM_UP; + conn.defaultMask = 0; + conn.maxMod = 0; conn.minMod = 0; Gpm_Open(&conn, 0); diff --git a/src/fvterm.cpp b/src/fvterm.cpp index 413ab2ce..bf840c94 100644 --- a/src/fvterm.cpp +++ b/src/fvterm.cpp @@ -209,7 +209,7 @@ FColor FVTerm::rgb2ColorIndex (uInt8 r, uInt8 g, uInt8 b) const //---------------------------------------------------------------------- void FVTerm::setNonBlockingRead (bool enable) { - uInt64 blocking_time = (enable) ? 0 : 100000; // 0 or 100 ms + uInt64 blocking_time = (enable) ? 5000 : 100000; // 5 or 100 ms FKeyboard::setReadBlockingTime (blocking_time); } diff --git a/src/fwindow.cpp b/src/fwindow.cpp index 739def9d..d8d6c8cf 100644 --- a/src/fwindow.cpp +++ b/src/fwindow.cpp @@ -874,7 +874,7 @@ void FWindow::processAlwaysOnTop() // non-member functions //---------------------------------------------------------------------- -void closeDropDown (FWidget* widget, const FPoint& mouse_position) +void closeDropDown (const FWidget* widget, const FPoint& mouse_position) { // Close the pop down windows diff --git a/src/include/final/fapplication.h b/src/include/final/fapplication.h index f6706974..216a4811 100644 --- a/src/include/final/fapplication.h +++ b/src/include/final/fapplication.h @@ -175,7 +175,7 @@ class FApplication : public FWidget FWidget*& determineClickedWidget(); void unsetMoveSizeMode() const; void closeDropDown(); - void unselectMenubarItems(); + void unselectMenubarItems() const; void sendMouseEvent() const; void sendMouseMoveEvent ( const FPoint& , const FPoint& diff --git a/src/include/final/fwindow.h b/src/include/final/fwindow.h index 27347886..274b5c5d 100644 --- a/src/include/final/fwindow.h +++ b/src/include/final/fwindow.h @@ -176,7 +176,7 @@ class FWindow : public FWidget // non-member function forward declarations //---------------------------------------------------------------------- -void closeDropDown (FWidget*, const FPoint&); +void closeDropDown (const FWidget*, const FPoint&); // FWindow inline functions diff --git a/test/conemu.h b/test/conemu.h index 0daf1719..25529b1d 100644 --- a/test/conemu.h +++ b/test/conemu.h @@ -639,7 +639,7 @@ inline const char* ConEmu::getAnswerback (console con) 0, // GNOME Terminal 0, // VTE Terminal >= 0.53.0 C_STR("PuTTY"), // PuTTY - C_STR("\005"), // Windows Terminal + 0, // Windows Terminal 0, // Tera Term 0, // Cygwin 0, // Mintty