lyx_mirror/src/frontends/qt4/GuiCommandBuffer.cpp

357 lines
8.1 KiB
C++
Raw Normal View History

/**
* \file GuiCommandBuffer.cpp
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author Lars
* \author Asger and Jürgen
* \author John Levon
*
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "GuiCommandBuffer.h"
#include "GuiApplication.h"
#include "GuiCommandEdit.h"
#include "GuiView.h"
#include "qt_helpers.h"
#include "BufferView.h"
#include "Cursor.h"
#include "LyX.h"
#include "LyXAction.h"
#include "FuncRequest.h"
#include "Session.h"
#include "support/lyxalgo.h"
#include "support/lstrings.h"
#include <QHBoxLayout>
#include <QKeyEvent>
#include <QListWidget>
#include <QMouseEvent>
#include <QPixmap>
#include <QPushButton>
#include <QToolTip>
#include <QVBoxLayout>
using namespace std;
using namespace lyx::support;
namespace lyx {
namespace frontend {
namespace {
class QTempListBox : public QListWidget {
public:
QTempListBox() {
//setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setWindowModality(Qt::WindowModal);
setWindowFlags(Qt::Popup);
setAttribute(Qt::WA_DeleteOnClose);
}
protected:
bool event(QEvent * ev) {
if (ev->type() == QEvent::MouseButtonPress) {
QMouseEvent * me = static_cast<QMouseEvent *>(ev);
if (me->x() < 0 || me->y() < 0
|| me->x() > width() || me->y() > height())
hide();
return true;
}
return QListWidget::event(ev);
}
void keyPressEvent(QKeyEvent * ev) {
if (ev->key() == Qt::Key_Escape) {
hide();
return;
} else if (ev->key() == Qt::Key_Return || ev->key() == Qt::Key_Space) {
// emit signal
itemClicked(currentItem());
} else
QListWidget::keyPressEvent(ev);
}
};
Bulk cleanup/fix incorrect annotation at the end of namespaces. This commit does a bulk fix of incorrect annotations (comments) at the end of namespaces. The commit was generated by initially running clang-format, and then from the diff of the result extracting the hunks corresponding to fixes of namespace comments. The changes being applied and all the results have been manually reviewed. The source code successfully builds on macOS. Further details on the steps below, in case they're of interest to someone else in the future. 1. Checkout a fresh and up to date version of src/ git pull && git checkout -- src && git status src 2. Ensure there's a suitable .clang-format in place, i.e. with options to fix the comment at the end of namespaces, including: FixNamespaceComments: true SpacesBeforeTrailingComments: 1 and that clang-format is >= 5.0.0, by doing e.g.: clang-format -dump-config | grep Comments: clang-format --version 3. Apply clang-format to the source: clang-format -i $(find src -name "*.cpp" -or -name "*.h") 4. Create and filter out hunks related to fixing the namespace git diff -U0 src > tmp.patch grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace.patch 5. Filter out hunks corresponding to simple fixes into to a separate patch: pcregrep -M -e '^diff[^\n]+\nindex[^\n]+\n--- [^\n]+\n\+\+\+ [^\n]+\n' \ -e '^@@ -[0-9]+ \+[0-9]+ @@[^\n]*\n-\}[^\n]*\n\+\}[^\n]*\n' \ fix_namespace.patch > fix_namespace_simple.patch 6. Manually review the simple patch and then apply it, after first restoring the source. git checkout -- src patch -p1 < fix_namespace_simple.path 7. Manually review the (simple) changes and then stage the changes git diff src git add src 8. Again apply clang-format and filter out hunks related to any remaining fixes to the namespace, this time filter with more context. There will be fewer hunks as all the simple cases have already been handled: clang-format -i $(find src -name "*.cpp" -or -name "*.h") git diff src > tmp.patch grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace2.patch 9. Manually review/edit the resulting patch file to remove hunks for files which need to be dealt with manually, noting the file names and line numbers. Then restore files to as before applying clang-format and apply the patch: git checkout src patch -p1 < fix_namespace2.patch 10. Manually fix the files noted in the previous step. Stage files, review changes and commit.
2017-07-23 11:11:54 +00:00
} // namespace
GuiCommandBuffer::GuiCommandBuffer(GuiView * view)
: view_(view)
{
transform(lyxaction.func_begin(), lyxaction.func_end(),
back_inserter(commands_), firster());
QPixmap qpup = getPixmap("images/", "up", "svgz,png");
QPixmap qpdown = getPixmap("images/", "down", "svgz,png");
QVBoxLayout * top = new QVBoxLayout(this);
QHBoxLayout * layout = new QHBoxLayout(0);
edit_ = new GuiCommandEdit(this);
edit_->setMinimumSize(edit_->sizeHint());
edit_->setFocusPolicy(Qt::ClickFocus);
int height = max(24, 2 * (edit_->sizeHint().height() / 2));
QSize button_size = QSize(height, height);
QSize icon_size = button_size - QSize(4, 4);
upPB = new QPushButton(qpup, "", this);
upPB->setToolTip(qt_("List of previous commands"));
upPB->setMaximumSize(button_size);
upPB->setIconSize(icon_size);
downPB = new QPushButton(qpdown, "", this);
downPB->setToolTip(qt_("Next command"));
downPB->setMaximumSize(button_size);
downPB->setIconSize(icon_size);
downPB->setEnabled(false);
connect(downPB, SIGNAL(clicked()), this, SLOT(down()));
connect(upPB, SIGNAL(pressed()), this, SLOT(listHistoryUp()));
connect(edit_, SIGNAL(returnPressed()), this, SLOT(dispatch()));
connect(edit_, SIGNAL(tabPressed()), this, SLOT(complete()));
connect(edit_, SIGNAL(upPressed()), this, SLOT(up()));
connect(edit_, SIGNAL(downPressed()), this, SLOT(down()));
connect(edit_, SIGNAL(escapePressed()), this, SLOT(hideParent()));
layout->addWidget(upPB, 0);
layout->addWidget(downPB, 0);
layout->addWidget(edit_, 10);
layout->setMargin(0);
top->addLayout(layout);
top->setMargin(0);
setFocusProxy(edit_);
2017-07-03 17:53:14 +00:00
LastCommandsSection::LastCommands last_commands
= theSession().lastCommands().getcommands();
2017-07-03 17:53:14 +00:00
LastCommandsSection::LastCommands::const_iterator it
= last_commands.begin();
2017-07-03 17:53:14 +00:00
LastCommandsSection::LastCommands::const_iterator end
= last_commands.end();
upPB->setEnabled(it != end);
for(; it != end; ++it)
history_.push_back(*it);
history_pos_ = history_.end();
}
void GuiCommandBuffer::dispatch()
{
std::string const cmd = fromqstr(edit_->text());
if (!cmd.empty())
theSession().lastCommands().add(cmd);
DispatchResult const & dr = dispatch(cmd);
if (!dr.error()) {
view_->setFocus();
edit_->setText(QString());
edit_->clearFocus();
// If the toolbar was "auto", it is not needed anymore
view_->resetCommandExecute();
}
}
void GuiCommandBuffer::listHistoryUp()
{
if (history_.size()==1) {
edit_->setText(toqstr(history_.back()));
upPB->setEnabled(false);
return;
}
QPoint const & pos = upPB->mapToGlobal(QPoint(0, 0));
showList(history_, pos, true);
}
void GuiCommandBuffer::complete()
{
string const input = fromqstr(edit_->text());
string new_input;
vector<string> const & comp = completions(input, new_input);
if (comp.empty()) {
if (new_input != input)
edit_->setText(toqstr(new_input));
return;
}
edit_->setText(toqstr(new_input));
QPoint const & pos = edit_->mapToGlobal(QPoint(0, 0));
showList(comp, pos);
}
void GuiCommandBuffer::showList(vector<string> const & list,
QPoint const & pos, bool reversed) const
{
QTempListBox * listBox = new QTempListBox;
// For some reason the scrollview's contents are larger
// than the number of actual items...
vector<string>::const_iterator cit = list.begin();
vector<string>::const_iterator end = list.end();
for (; cit != end; ++cit) {
if (reversed)
listBox->insertItem(0, toqstr(*cit));
else
listBox->addItem(toqstr(*cit));
}
listBox->resize(listBox->sizeHint());
int const y = max(0, pos.y() - listBox->height());
listBox->move(pos.x(), y);
connect(listBox, SIGNAL(itemClicked(QListWidgetItem *)),
this, SLOT(itemSelected(QListWidgetItem *)));
connect(listBox, SIGNAL(itemActivated(QListWidgetItem *)),
this, SLOT(itemSelected(QListWidgetItem *)));
listBox->show();
listBox->setFocus();
}
void GuiCommandBuffer::itemSelected(QListWidgetItem * item)
{
QWidget const * widget = static_cast<QWidget const *>(sender());
const_cast<QWidget *>(widget)->hide();
edit_->setText(item->text()+ ' ');
edit_->activateWindow();
edit_->setFocus();
}
void GuiCommandBuffer::up()
{
string const h = historyUp();
if (!h.empty())
edit_->setText(toqstr(h));
upPB->setEnabled(history_pos_ != history_.begin());
downPB->setEnabled(history_pos_ != history_.end());
}
void GuiCommandBuffer::down()
{
string const h = historyDown();
if (!h.empty())
edit_->setText(toqstr(h));
downPB->setEnabled(!history_.empty()
&& history_pos_ != history_.end() - 1);
upPB->setEnabled(history_pos_ != history_.begin());
}
2017-07-03 17:53:14 +00:00
void GuiCommandBuffer::hideParent()
{
view_->setFocus();
view_->resetCommandExecute();
edit_->setText(QString());
edit_->clearFocus();
}
namespace {
class prefix_p {
public:
string p;
prefix_p(string const & s) : p(s) {}
bool operator()(string const & s) const { return prefixIs(s, p); }
};
Bulk cleanup/fix incorrect annotation at the end of namespaces. This commit does a bulk fix of incorrect annotations (comments) at the end of namespaces. The commit was generated by initially running clang-format, and then from the diff of the result extracting the hunks corresponding to fixes of namespace comments. The changes being applied and all the results have been manually reviewed. The source code successfully builds on macOS. Further details on the steps below, in case they're of interest to someone else in the future. 1. Checkout a fresh and up to date version of src/ git pull && git checkout -- src && git status src 2. Ensure there's a suitable .clang-format in place, i.e. with options to fix the comment at the end of namespaces, including: FixNamespaceComments: true SpacesBeforeTrailingComments: 1 and that clang-format is >= 5.0.0, by doing e.g.: clang-format -dump-config | grep Comments: clang-format --version 3. Apply clang-format to the source: clang-format -i $(find src -name "*.cpp" -or -name "*.h") 4. Create and filter out hunks related to fixing the namespace git diff -U0 src > tmp.patch grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace.patch 5. Filter out hunks corresponding to simple fixes into to a separate patch: pcregrep -M -e '^diff[^\n]+\nindex[^\n]+\n--- [^\n]+\n\+\+\+ [^\n]+\n' \ -e '^@@ -[0-9]+ \+[0-9]+ @@[^\n]*\n-\}[^\n]*\n\+\}[^\n]*\n' \ fix_namespace.patch > fix_namespace_simple.patch 6. Manually review the simple patch and then apply it, after first restoring the source. git checkout -- src patch -p1 < fix_namespace_simple.path 7. Manually review the (simple) changes and then stage the changes git diff src git add src 8. Again apply clang-format and filter out hunks related to any remaining fixes to the namespace, this time filter with more context. There will be fewer hunks as all the simple cases have already been handled: clang-format -i $(find src -name "*.cpp" -or -name "*.h") git diff src > tmp.patch grepdiff '^} // namespace' --output-matching=hunk tmp.patch > fix_namespace2.patch 9. Manually review/edit the resulting patch file to remove hunks for files which need to be dealt with manually, noting the file names and line numbers. Then restore files to as before applying clang-format and apply the patch: git checkout src patch -p1 < fix_namespace2.patch 10. Manually fix the files noted in the previous step. Stage files, review changes and commit.
2017-07-23 11:11:54 +00:00
} // namespace
string const GuiCommandBuffer::historyUp()
{
if (history_pos_ == history_.begin())
return string();
return *(--history_pos_);
}
string const GuiCommandBuffer::historyDown()
{
if (history_pos_ == history_.end())
return string();
if (history_pos_ + 1 == history_.end())
return string();
return *(++history_pos_);
}
vector<string> const
GuiCommandBuffer::completions(string const & prefix, string & new_prefix)
{
vector<string> comp;
lyx::copy_if(commands_.begin(), commands_.end(),
back_inserter(comp), prefix_p(prefix));
if (comp.empty()) {
new_prefix = prefix;
return comp;
}
if (comp.size() == 1) {
new_prefix = comp[0];
return vector<string>();
}
// find maximal available prefix
string const tmp = comp[0];
string test = prefix;
if (tmp.length() > test.length())
test += tmp[test.length()];
while (test.length() < tmp.length()) {
vector<string> vtmp;
lyx::copy_if(comp.begin(), comp.end(),
back_inserter(vtmp), prefix_p(test));
if (vtmp.size() != comp.size()) {
test.erase(test.length() - 1);
break;
}
test += tmp[test.length()];
}
new_prefix = test;
return comp;
}
DispatchResult const & GuiCommandBuffer::dispatch(string const & str)
{
if (str.empty()) {
static DispatchResult empty_dr;
return empty_dr;
}
history_.push_back(trim(str));
history_pos_ = history_.end();
upPB->setEnabled(history_pos_ != history_.begin());
downPB->setEnabled(history_pos_ != history_.end());
FuncRequest func = lyxaction.lookupFunc(str);
func.setOrigin(FuncRequest::COMMANDBUFFER);
return lyx::dispatch(func);
}
} // namespace frontend
} // namespace lyx
#include "moc_GuiCommandBuffer.cpp"