No OneTemporary
Actions

Authored By

Unknown

Size

497 KB

Referenced Files

None

Subscribers

None

View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

	diff --git a/.gitignore b/.gitignore
	index a36ebb9..697924b 100644
	--- a/.gitignore
	+++ b/.gitignore
	@@ -1,13 +1,14 @@
	*.user
	win.rc
	Info.plist
	version.c
	_notes
	_release
	.DS_Store
	image/about.psd
	extra/_build_*
	misc/win32tools
	_bin/
	build/
	src/version.h
	+*.autosave
	diff --git a/src/AbstractSettingForm.cpp b/src/AbstractSettingForm.cpp
	index 04537b4..03a597f 100644
	--- a/src/AbstractSettingForm.cpp
	+++ b/src/AbstractSettingForm.cpp
	@@ -1,20 +1,20 @@
	#include "AbstractSettingForm.h"

	AbstractSettingForm::AbstractSettingForm(QWidget *parent)
	: QWidget(parent)
	{
	}

	MainWindow *AbstractSettingForm::mainwindow()
	{
	- SettingsDialog w = qobject_cast<SettingsDialog >(window());
	+ auto w = qobject_cast<SettingsDialog >(window());
	Q_ASSERT(w);
	return w->mainwindow();
	}

	ApplicationSettings *AbstractSettingForm::settings()
	{
	- SettingsDialog w = qobject_cast<SettingsDialog >(window());
	+ auto w = qobject_cast<SettingsDialog >(window());
	Q_ASSERT(w);
	return &w->set;
	}
	diff --git a/src/AvatarLoader.cpp b/src/AvatarLoader.cpp
	index b3c72bb..8ce5483 100644
	--- a/src/AvatarLoader.cpp
	+++ b/src/AvatarLoader.cpp
	@@ -1,182 +1,182 @@
	#include "AvatarLoader.h"
	#include "MemoryReader.h"
	#include "webclient.h"

	#include <QCryptographicHash>
	#include <QDebug>

	namespace {
	const int MAX_CACHE_COUNT = 1000;
	const int ICON_SIZE = 64;
	}

	-typedef std::shared_ptr<WebClient> WebClientPtr;
	+using WebClientPtr = std::shared_ptr<WebClient>;

	struct AvatarLoader::Private {
	QMutex data_mutex;
	QMutex thread_mutex;
	QWaitCondition condition;
	std::map<std::string, std::string> avatar_url_cache;
	std::deque<RequestItem> requested;
	std::deque<RequestItem> completed;
	std::set<std::string> notfound;
	WebContext *webcx = nullptr;
	WebClientPtr web;
	};

	AvatarLoader::AvatarLoader()
	: m(new Private)
	{
	}

	AvatarLoader::~AvatarLoader()
	{
	delete m;
	}

	void AvatarLoader::start(WebContext *webcx)
	{
	m->webcx = webcx;
	QThread::start();
	}

	void AvatarLoader::run()
	{
	m->web = std::make_shared<WebClient>(m->webcx);

	while (1) {
	std::deque<RequestItem> requests;

	if (isInterruptionRequested()) return;

	m->thread_mutex.lock();
	{
	QMutexLocker lock(&m->data_mutex);
	requests = std::move(m->requested);
	}
	if (requests.empty()) {
	m->condition.wait(&m->thread_mutex);
	{
	QMutexLocker lock(&m->data_mutex);
	requests = std::move(m->requested);
	}
	}
	m->thread_mutex.unlock();

	if (isInterruptionRequested()) return;

	for (RequestItem &item : requests) {

	if (isInterruptionRequested()) return;

	if (item.email.empty()) continue;

	if (strchr(item.email.c_str(), '@')) {
	QCryptographicHash hash(QCryptographicHash::Md5);
	hash.addData(item.email.c_str(), item.email.size());
	QByteArray ba = hash.result();
	char tmp[100];
	for (int i = 0; i < ba.size(); i++) {
	sprintf(tmp + i * 2, "%02x", ba.data()[i] & 0xff);
	}
	QString id = tmp;
	QString url = "https://www.gravatar.com/avatar/%1?s=%2";
	url = url.arg(id).arg(ICON_SIZE);
	if (m->web->get(WebClient::URL(url.toStdString())) == 200) {
	if (!m->web->response().content.empty()) {
	MemoryReader reader(m->web->response().content.data(), m->web->response().content.size());
	reader.open(MemoryReader::ReadOnly);
	QImage image;
	image.load(&reader, nullptr);
	int w = image.width();
	int h = image.height();
	if (w > 0 && h > 0) {
	item.icon = QIcon(QPixmap::fromImage(image));
	{
	QMutexLocker lock(&m->data_mutex);
	while (m->completed.size() >= MAX_CACHE_COUNT) {
	m->completed.pop_back();
	}
	m->completed.push_front(item);
	}
	emit updated();
	continue;
	}
	}
	}
	}
	{ // not found
	QMutexLocker lock(&m->data_mutex);
	m->notfound.insert(m->notfound.end(), item.email);
	}
	}
	}
	}

	namespace {
	bool isValidGitHubName(std::string const &name)
	{
	size_t n = name.size();
	if (n < 1 \|\| n > 39) return false;
	char const *begin = name.c_str();
	char const *end = begin + name.size();
	char const *ptr = begin;
	while (ptr < end) {
	int c = (unsigned char)*ptr;
	ptr++;
	if (isalnum(c)) {
	// ok
	} else if (c == '-') {
	if (ptr == begin) return false;
	if (ptr < end && *ptr == '-') return false;
	}
	}
	return true;
	}

	}

	QIcon AvatarLoader::fetch(std::string const &email, bool request)
	{
	RequestItem item;
	item.email = email;
	if (isValidGitHubName(item.email)) {
	QMutexLocker lock(&m->data_mutex);

	auto it = m->notfound.find(item.email);
	if (it == m->notfound.end()) {
	for (size_t i = 0; i < m->completed.size(); i++) {
	if (item.email == m->completed[i].email) {
	item = m->completed[i];
	m->completed.erase(m->completed.begin() + i);
	m->completed.insert(m->completed.begin(), item);
	return item.icon;
	}
	}
	if (request) {
	bool waiting = false;
	for (RequestItem const &r : m->requested) {
	if (item.email == r.email) {
	waiting = true;
	break;
	}
	}
	if (!waiting) {
	m->requested.push_back(item);
	m->condition.wakeOne();
	}
	}
	}
	}
	return QIcon();
	}

	void AvatarLoader::stop()
	{
	requestInterruption();
	if (m->web) m->web->close();
	m->condition.wakeAll();
	wait();
	}


	diff --git a/src/BasicRepositoryDialog.cpp b/src/BasicRepositoryDialog.cpp
	index 76cadcc..537259d 100644
	--- a/src/BasicRepositoryDialog.cpp
	+++ b/src/BasicRepositoryDialog.cpp
	@@ -1,89 +1,89 @@
	#include "BasicRepositoryDialog.h"
	#include "MainWindow.h"
	#include <QTableWidget>
	#include <QHeaderView>

	struct BasicRepositoryDialog::Private {
	MainWindow *mainwindow = nullptr;
	GitPtr git;
	QList<Git::Remote> remotes;
	};

	BasicRepositoryDialog::BasicRepositoryDialog(MainWindow *mainwindow, GitPtr g)
	: QDialog(mainwindow)
	, m(new Private)
	{
	Qt::WindowFlags flags = windowFlags();
	flags &= ~Qt::WindowContextHelpButtonHint;
	setWindowFlags(flags);

	m->mainwindow = mainwindow;
	m->git = g;
	}

	BasicRepositoryDialog::~BasicRepositoryDialog()
	{
	delete m;
	}

	MainWindow *BasicRepositoryDialog::mainwindow()
	{
	return m->mainwindow;
	}

	GitPtr BasicRepositoryDialog::git()
	{
	return m->git;
	}

	QList<Git::Remote> const *BasicRepositoryDialog::remotes() const
	{
	return &m->remotes;
	}

	QString BasicRepositoryDialog::updateRemotesTable(QTableWidget *tablewidget)
	{
	tablewidget->clear();
	m->remotes.clear();
	GitPtr g = git();
	if (g->isValidWorkingCopy()) {
	g->getRemoteURLs(&m->remotes);
	}
	QString url;
	QString alturl;
	int rows = m->remotes.size();
	tablewidget->setColumnCount(3);
	tablewidget->setRowCount(rows);
	auto newQTableWidgetItem = [](QString const &text){
	- QTableWidgetItem *item = new QTableWidgetItem();
	+ auto *item = new QTableWidgetItem;
	item->setSizeHint(QSize(20, 20));
	item->setText(text);
	return item;
	};
	auto SetHeaderItem = [&](int col, QString const &text){
	tablewidget->setHorizontalHeaderItem(col, newQTableWidgetItem(text));
	};
	SetHeaderItem(0, tr("Name"));
	SetHeaderItem(1, tr("Purpose"));
	SetHeaderItem(2, tr("URL"));
	for (int row = 0; row < rows; row++) {
	Git::Remote const &r = m->remotes[row];
	if (r.purpose == "push") {
	url = r.url;
	} else {
	alturl = r.url;
	}
	auto SetItem = [&](int col, QString const &text){
	tablewidget->setItem(row, col, newQTableWidgetItem(text));
	};
	SetItem(0, r.name);
	SetItem(1, r.purpose);
	SetItem(2, r.url);
	}
	tablewidget->horizontalHeader()->setStretchLastSection(true);

	if (url.isEmpty()) {
	url = alturl;
	}
	return url;
	}
	diff --git a/src/BigDiffWindow.cpp b/src/BigDiffWindow.cpp
	index 0fcbfaf..7921743 100644
	--- a/src/BigDiffWindow.cpp
	+++ b/src/BigDiffWindow.cpp
	@@ -1,65 +1,67 @@
	+#include <memory>
	+
	#include "BigDiffWindow.h"
	#include "ui_BigDiffWindow.h"

	struct BigDiffWindow::Private {
	TextEditorEnginePtr text_editor_engine;
	FileDiffWidget::InitParam_ param;
	};

	BigDiffWindow::BigDiffWindow(QWidget *parent)
	: QDialog(parent)
	, ui(new Ui::BigDiffWindow)
	, m(new Private)
	{
	ui->setupUi(this);
	Qt::WindowFlags flags = windowFlags();
	flags &= ~Qt::WindowContextHelpButtonHint;
	flags \|= Qt::WindowMaximizeButtonHint;
	setWindowFlags(flags);

	ui->widget_diff->setMaximizeButtonEnabled(false);

	connect(ui->widget_diff, &FileDiffWidget::textcodecChanged, [&](){ updateDiffView(); });
	}

	BigDiffWindow::~BigDiffWindow()
	{
	delete m;
	delete ui;
	}

	void BigDiffWindow::setTextCodec(QTextCodec *codec)
	{
	- m->text_editor_engine = TextEditorEnginePtr(new TextEditorEngine);
	+ m->text_editor_engine = std::make_shared<TextEditorEngine>();
	ui->widget_diff->setTextCodec(codec);
	}

	void BigDiffWindow::updateDiffView()
	{
	ui->widget_diff->updateDiffView(m->param.diff, m->param.uncommited);
	}

	void BigDiffWindow::init(MainWindow *mw, FileDiffWidget::InitParam_ const &param)
	{
	ui->widget_diff->bind(mw);
	m->param = param;

	switch (m->param.view_style) {
	case FileDiffWidget::ViewStyle::LeftOnly:
	ui->widget_diff->setLeftOnly(m->param.bytes_a, m->param.diff);
	break;
	case FileDiffWidget::ViewStyle::RightOnly:
	ui->widget_diff->setRightOnly(m->param.bytes_b, m->param.diff);
	break;
	case FileDiffWidget::ViewStyle::SideBySideText:
	ui->widget_diff->setSideBySide(m->param.bytes_a, m->param.diff, m->param.uncommited, m->param.workingdir);
	break;
	case FileDiffWidget::ViewStyle::SideBySideImage:
	ui->widget_diff->setSideBySide_(m->param.bytes_a, m->param.bytes_b, m->param.workingdir);
	break;
	}
	}




	diff --git a/src/BlameWindow.cpp b/src/BlameWindow.cpp
	index bf14293..27470f6 100644
	--- a/src/BlameWindow.cpp
	+++ b/src/BlameWindow.cpp
	@@ -1,334 +1,334 @@
	#include "BlameWindow.h"
	#include "ui_BlameWindow.h"
	#include "common/misc.h"
	#include "CommitPropertyDialog.h"
	#include "Git.h"
	#include "MainWindow.h"

	#include <QMenu>
	#include <QToolTip>

	enum {
	CommidIdRole = Qt::UserRole,
	};

	namespace {
	struct CommitInfo {
	QString datetime;
	QString author;
	QString email;
	QString message;
	};
	}

	struct BlameWindow::Private {
	QList<BlameItem> list;
	std::map<QString, CommitInfo> commit_cache;
	};

	BlameWindow::BlameWindow(MainWindow *parent, const QString &filename, const QList<BlameItem> &list)
	: QDialog(parent)
	, ui(new Ui::BlameWindow)
	, m(new Private)
	{
	ui->setupUi(this);
	Qt::WindowFlags flags = windowFlags();
	flags &= ~Qt::WindowContextHelpButtonHint;
	setWindowFlags(flags);

	{
	QString s = "Blame : %1";
	s = s.arg(filename);
	setWindowTitle(s);
	}

	m->list = list;

	int rows = 0;
	for (BlameItem const &item : m->list) {
	if (rows < item.line_number) {
	rows = item.line_number;
	}
	}
	int n = m->list.size();
	if (rows < n) rows = n;

	QStringList cols = {
	"Commit",
	"Time",
	"Line",
	"Text",
	};

	ui->tableWidget->setColumnCount(cols.size());
	ui->tableWidget->setRowCount(rows);

	for (int col = 0; col < cols.size(); col++) {
	- QTableWidgetItem *item = new QTableWidgetItem(cols[col]);
	+ auto *item = new QTableWidgetItem(cols[col]);
	ui->tableWidget->setHorizontalHeaderItem(col, item);
	}

	int row = 0;
	for (BlameItem const &blame: m->list) {
	QString id;
	if (Git::isValidID(blame.commit_id)) {
	id = blame.commit_id.mid(0, 8);
	}

	int col = 0;

	auto NewItem = [](QString const &text){
	return new QTableWidgetItem(text);
	};

	auto SetItem = [&](QTableWidgetItem *item){
	ui->tableWidget->setItem(row, col, item);
	col++;
	};

	QTableWidgetItem *item;

	item = NewItem(id);
	item->setData(CommidIdRole, blame.commit_id);
	SetItem(item);

	item = NewItem(misc::makeDateTimeString(blame.time));
	SetItem(item);

	item = NewItem(QString::number(blame.line_number));
	item->setTextAlignment(Qt::AlignRight);
	SetItem(item);

	item = NewItem(blame.text);
	SetItem(item);

	ui->tableWidget->setRowHeight(row, 24);
	row++;
	}

	ui->tableWidget->resizeColumnsToContents();
	ui->tableWidget->horizontalHeader()->stretchLastSection();

	ui->tableWidget->selectRow(0);
	}

	BlameWindow::~BlameWindow()
	{
	delete m;
	delete ui;
	}

	MainWindow *BlameWindow::mainwindow()
	{
	return qobject_cast<MainWindow *>(parent());
	}

	namespace {

	bool parseBlameHeader(const char ptr, const char end, BlameItem *out)
	{
	*out = BlameItem();

	auto SkipSpace = [&](){
	while (ptr < end && isspace(*ptr & 0xff)) {
	ptr++;
	}
	};

	auto Token = [&](){
	char const *head = ptr;
	while (ptr < end) {
	int c = *ptr & 0xff;
	if (isspace(c)) break;
	ptr++;
	}
	return QString::fromLatin1(head, ptr - head);
	};

	BlameItem item;

	item.commit_id = Token();
	if (item.commit_id.isEmpty()) return false;

	SkipSpace();

	if (ptr < end && *ptr == '(') {
	ptr++;
	} else {
	return false;
	}

	if (ptr + 18 < end && memcmp(ptr, "Not Committed Yet ", 18) == 0) {
	ptr += 18;
	} else {
	item.author = Token();
	SkipSpace();
	}

	if (ptr + 25 < end && ptr[4] == '-' && ptr[7] == '-' && ptr[10] == ' ' && ptr[13] == ':' && ptr[16] == ':') {
	int year = atoi(ptr);
	int month = atoi(ptr + 5);
	int day = atoi(ptr + 8);
	int hour = atoi(ptr + 11);
	int minute = atoi(ptr + 14);
	int second = atoi(ptr + 17);
	item.time = QDateTime(QDate(year, month, day), QTime(hour, minute, second));
	ptr += 25;
	} else {
	return false;
	}

	SkipSpace();
	item.line_number = atoi(ptr);

	*out = item;
	return true;
	}

	QString textWithoutTab(const char ptr, const char end)
	{
	std::vector<char> vec;
	vec.reserve(end - ptr);
	int x = 0;
	while (ptr < end) {
	int c = *ptr & 0xff;
	if (c == '\t') {
	do {
	vec.push_back(' ');
	x++;
	} while (x % 4 != 0);
	} else if (c < ' ') {
	vec.push_back('.');
	x++;
	} else {
	vec.push_back(c);
	x++;
	}
	ptr++;
	}
	if (vec.empty()) return QString();
	return QString::fromUtf8(&vec[0], vec.size());
	}

	} // end namespace

	QList<BlameItem> BlameWindow::parseBlame(const char begin, const char end)
	{
	QList<BlameItem> list;
	char const *ptr = begin;
	while (ptr < end) {
	char const *mid = nullptr;
	char const *eol = ptr;
	while (eol < end) {
	if (!mid && eol + 1 < end && eol[0] == ')' && eol[1] == ' ') {
	mid = eol + 2;
	}
	if (eol == '\r' \|\| eol == '\n') {
	break;
	}
	eol++;
	}
	if (mid) {
	BlameItem t;
	parseBlameHeader(ptr, mid, &t);
	t.text = textWithoutTab(mid, eol);
	list.push_back(t);
	}
	ptr = eol;
	if (ptr < end) {
	if (*ptr == '\r') {
	ptr++;
	if (ptr < end && *ptr == '\n') {
	ptr++;
	}
	} else if (*ptr == '\n') {
	ptr++;
	}
	}
	}
	return list;
	}

	QString BlameWindow::getCommitId(QTableWidgetItem *item) const
	{
	return item ? item->data(CommidIdRole).toString() : QString();
	}

	QString BlameWindow::currentCommitId() const
	{
	QString id;
	int row = ui->tableWidget->currentRow();
	if (row >= 0 && row < m->list.size()) {
	QTableWidgetItem *item = ui->tableWidget->item(row, 0);
	id = getCommitId(item);
	}
	return id;
	}

	void BlameWindow::on_tableWidget_itemDoubleClicked(QTableWidgetItem *)
	{
	QString id = currentCommitId();
	if (Git::isValidID(id)) {
	CommitPropertyDialog dlg(this, mainwindow(), id);
	dlg.showCheckoutButton(false);
	dlg.showJumpButton(true);
	if (dlg.exec() == QDialog::Accepted) {
	close();
	}
	}
	}

	void BlameWindow::on_tableWidget_customContextMenuRequested(const QPoint &pos)
	{
	(void)pos;
	int row = ui->tableWidget->currentRow();
	if (row < 0 \|\| row >= m->list.size()) return;

	Git::CommitItem commit;
	BlameItem blame = m->list[row];
	GitPtr g = mainwindow()->git();
	if (!g->queryCommit(blame.commit_id, &commit)) return;

	QMenu menu;
	QAction *a_property = mainwindow()->addMenuActionProperty(&menu);
	QAction *a = menu.exec(QCursor::pos() + QPoint(8, -8));
	if (a) {
	if (a == a_property) {
	mainwindow()->execCommitPropertyDialog(this, &commit);
	return;
	}
	}
	}

	void BlameWindow::on_tableWidget_currentItemChanged(QTableWidgetItem current, QTableWidgetItem previous)
	{
	(void)current;
	(void)previous;
	QString id = currentCommitId();
	CommitInfo info;
	if (Git::isValidID(id)) {
	auto it = m->commit_cache.find(id);
	if (it != m->commit_cache.end()) {
	info = it->second;
	} else {
	GitPtr g = mainwindow()->git();
	Git::CommitItem commit;
	if (g->queryCommit(id, &commit)) {
	info.datetime = misc::makeDateTimeString(commit.commit_date);
	info.author = commit.author;
	info.email = commit.email;
	info.message = commit.message;
	}
	}
	} else {
	id = QString();
	}
	QString author = info.author;
	if (!info.email.isEmpty()) {
	author = author + " <" + info.email + '>';
	}
	ui->lineEdit_commit_id->setText(id);
	ui->lineEdit_date->setText(info.datetime);
	ui->lineEdit_author->setText(author);
	ui->lineEdit_message->setText(info.message);
	}
	diff --git a/src/CommitExploreWindow.cpp b/src/CommitExploreWindow.cpp
	index 7a79f35..c744100 100644
	--- a/src/CommitExploreWindow.cpp
	+++ b/src/CommitExploreWindow.cpp
	@@ -1,281 +1,281 @@
	#include "CommitExploreWindow.h"
	#include "ui_CommitExploreWindow.h"
	#include "GitObjectManager.h"
	#include "ImageViewWidget.h"
	#include "common/misc.h"
	#include "MainWindow.h"
	#include "main.h"

	#include <QFileIconProvider>
	#include <QMenu>

	#ifdef Q_OS_WIN
	#include "win32/win32.h"
	#endif

	static QTreeWidgetItem *newQTreeWidgetItem()
	{
	- QTreeWidgetItem *item = new QTreeWidgetItem();
	+ auto *item = new QTreeWidgetItem;
	item->setSizeHint(0, QSize(20, 20));
	return item;
	}

	enum {
	ItemTypeRole = Qt::UserRole,
	ObjectIdRole,
	FilePathRole,
	};

	struct CommitExploreWindow::Private {
	MainWindow *mainwindow;
	GitObjectCache *objcache;
	Git::CommitItem const *commit;
	QString root_tree_id;
	GitTreeItemList tree_item_list;
	Git::Object content_object;
	ObjectContent content;
	TextEditorEnginePtr text_editor_engine;
	};

	CommitExploreWindow::CommitExploreWindow(QWidget parent, MainWindow mainwin, GitObjectCache objcache, const Git::CommitItem commit)
	: QDialog(parent)
	, ui(new Ui::CommitExploreWindow)
	, m(new Private)
	{
	ui->setupUi(this);
	Qt::WindowFlags flags = windowFlags();
	flags &= ~Qt::WindowContextHelpButtonHint;
	flags \|= Qt::WindowMaximizeButtonHint;
	setWindowFlags(flags);

	m->mainwindow = mainwin;

	m->objcache = objcache;
	m->commit = commit;

	m->text_editor_engine = TextEditorEnginePtr(new TextEditorEngine);
	ui->widget_fileview->bind(mainwin, nullptr, ui->verticalScrollBar, ui->horizontalScrollBar, mainwin->themeForTextEditor());
	ui->widget_fileview->setDiffMode(m->text_editor_engine, ui->verticalScrollBar, ui->horizontalScrollBar);

	ui->splitter->setSizes({100, 100, 200});

	// set text
	ui->lineEdit_commit_id->setText(commit->commit_id);
	ui->lineEdit_date->setText(misc::makeDateTimeString(commit->commit_date));
	ui->lineEdit_author->setText(commit->author);

	{
	GitCommit c;
	c.parseCommit(objcache, m->commit->commit_id);
	m->root_tree_id = c.tree_id;
	}

	{
	GitCommitTree tree(objcache);
	tree.parseTree(m->root_tree_id);
	}

	{
	QTreeWidgetItem *rootitem = newQTreeWidgetItem();
	rootitem->setText(0, tr("Commit"));
	rootitem->setData(0, ItemTypeRole, (int)GitTreeItem::TREE);
	rootitem->setData(0, ObjectIdRole, m->root_tree_id);
	ui->treeWidget->addTopLevelItem(rootitem);

	loadTree(m->root_tree_id);

	rootitem->setExpanded(true);
	}
	}

	CommitExploreWindow::~CommitExploreWindow()
	{
	delete m;
	delete ui;
	}

	MainWindow *CommitExploreWindow::mainwindow()
	{
	return m->mainwindow;
	}

	void CommitExploreWindow::clearContent()
	{
	m->content = ObjectContent();
	}

	void CommitExploreWindow::expandTreeItem_(QTreeWidgetItem *item)
	{
	if (item->childCount() == 1) {
	if (item->child(0)->text(0).isEmpty()) {
	delete item->takeChild(0);
	}
	}

	if (item->childCount() == 0) {

	QFileIconProvider icons;

	QString path = item->data(0, FilePathRole).toString();

	QString tree_id = item->data(0, ObjectIdRole).toString();
	loadTree(tree_id);

	for (GitTreeItem const &ti : m->tree_item_list) {
	if (ti.type == GitTreeItem::TREE) {
	QTreeWidgetItem *child = newQTreeWidgetItem();
	child->setIcon(0, icons.icon(QFileIconProvider::Folder));
	child->setText(0, ti.name);
	child->setData(0, ItemTypeRole, (int)ti.type);
	child->setData(0, ObjectIdRole, ti.id);
	child->setData(0, FilePathRole, misc::joinWithSlash(path, ti.name));
	QTreeWidgetItem *placeholder = newQTreeWidgetItem();
	child->addChild(placeholder);
	item->addChild(child);
	}
	}
	}
	}

	void CommitExploreWindow::on_treeWidget_itemExpanded(QTreeWidgetItem *item)
	{
	expandTreeItem_(item);
	}

	void CommitExploreWindow::loadTree(QString const &tree_id)
	{
	GitCommitTree tree(m->objcache);
	tree.parseTree(tree_id);

	m->tree_item_list = *tree.treelist();

	std::sort(m->tree_item_list.begin(), m->tree_item_list.end(), [](GitTreeItem const &left, GitTreeItem const &right){
	int l = (left.type == GitTreeItem::TREE) ? 0 : 1;
	int r = (right.type == GitTreeItem::TREE) ? 0 : 1;
	if (l != r) return l < r;
	return left.name.compare(right.name, Qt::CaseInsensitive) < 0;
	});
	}

	void CommitExploreWindow::doTreeItemChanged_(QTreeWidgetItem *current)
	{
	ui->listWidget->clear();

	QString path = current->data(0, FilePathRole).toString();

	QString tree_id = current->data(0, ObjectIdRole).toString();

	loadTree(tree_id);

	QFileIconProvider icons;

	for (GitTreeItem const &ti : m->tree_item_list) {
	QIcon icon;
	if (ti.type == GitTreeItem::TREE) {
	icon = icons.icon(QFileIconProvider::Folder);
	} else {
	#ifdef Q_OS_WIN
	{
	int i = ti.name.lastIndexOf('.');
	if (i > 0) {
	QString ext = ti.name.mid(i + 1);
	icon = winIconFromExtensionLarge(ext);
	}
	}
	#endif
	if (icon.isNull()) {
	icon = icons.icon(QFileIconProvider::File);
	}
	}
	- QListWidgetItem *p = new QListWidgetItem();
	+ auto *p = new QListWidgetItem;
	p->setIcon(icon);
	p->setText(ti.name);
	p->setData(ItemTypeRole, (int)ti.type);
	p->setData(ObjectIdRole, ti.id);
	p->setData(FilePathRole, misc::joinWithSlash(path, ti.name));
	ui->listWidget->addItem(p);
	}
	}

	void CommitExploreWindow::on_treeWidget_currentItemChanged(QTreeWidgetItem current, QTreeWidgetItem /previous/)
	{
	clearContent();
	doTreeItemChanged_(current);
	}

	void CommitExploreWindow::on_listWidget_itemDoubleClicked(QListWidgetItem *item)
	{
	Q_ASSERT(item);

	GitTreeItem::Type type = (GitTreeItem::Type)item->data(ItemTypeRole).toInt();
	if (type == GitTreeItem::TREE) {
	QString tree_id = item->data(ObjectIdRole).toString();
	clearContent();
	QTreeWidgetItem *parent = ui->treeWidget->currentItem();
	expandTreeItem_(parent);
	parent->setExpanded(true);
	int n = parent->childCount();
	for (int i = 0; i < n; i++) {
	QTreeWidgetItem *child = parent->child(i);
	if (child->data(0, ItemTypeRole).toInt() == GitTreeItem::TREE) {
	QString tid = child->data(0, ObjectIdRole).toString();
	if (tid == tree_id) {
	child->setExpanded(true);
	ui->treeWidget->setCurrentItem(child);
	break;
	}
	}
	}
	}
	}

	void CommitExploreWindow::on_listWidget_currentItemChanged(QListWidgetItem current, QListWidgetItem /previous/)
	{
	if (!current) return;

	GitTreeItem::Type type = (GitTreeItem::Type)current->data(ItemTypeRole).toInt();
	if (type == GitTreeItem::BLOB) {
	QString id = current->data(ObjectIdRole).toString();
	m->content_object = m->objcache->catFile(id);
	QString path = current->data(FilePathRole).toString();
	clearContent();
	QString mimetype = mainwindow()->determinFileType(m->content_object.content, true);
	if (misc::isImage(mimetype)) {
	ui->widget_fileview->setImage(mimetype, m->content_object.content, id, path);
	} else {
	ui->widget_fileview->setText(m->content_object.content, mainwindow(), id, path);
	}
	} else {
	clearContent();
	}
	}

	void CommitExploreWindow::on_verticalScrollBar_valueChanged(int)
	{
	ui->widget_fileview->refrectScrollBar();
	}

	void CommitExploreWindow::on_horizontalScrollBar_valueChanged(int)
	{
	ui->widget_fileview->refrectScrollBar();
	}

	void CommitExploreWindow::on_listWidget_customContextMenuRequested(const QPoint &pos)
	{
	(void)pos;
	QListWidgetItem *current = ui->listWidget->currentItem();
	if (!current) return;
	GitTreeItem::Type type = (GitTreeItem::Type)current->data(ItemTypeRole).toInt();
	if (type == GitTreeItem::BLOB) {
	QMenu menu;
	QAction *a_history = menu.addAction("History");
	QAction *a = menu.exec(QCursor::pos() + QPoint(8, -8));
	if (a) {
	if (a == a_history) {
	QString path = current->data(FilePathRole).toString();
	mainwindow()->execFileHistory(path);
	return;
	}
	}
	}
	}
	diff --git a/src/DeleteBranchDialog.cpp b/src/DeleteBranchDialog.cpp
	index 0c53353..d91ae1b 100644
	--- a/src/DeleteBranchDialog.cpp
	+++ b/src/DeleteBranchDialog.cpp
	@@ -1,75 +1,75 @@
	#include "DeleteBranchDialog.h"
	#include "ui_DeleteBranchDialog.h"

	struct DeleteBranchDialog::Private {
	QStringList all_local_branch_names;
	QStringList current_local_branch_names;
	bool remote = false;
	};

	DeleteBranchDialog::DeleteBranchDialog(QWidget *parent, bool remote, const QStringList &all_local_branch_names, QStringList const &current_local_branch_names)
	: QDialog(parent)
	, ui(new Ui::DeleteBranchDialog)
	, m(new Private)
	{
	ui->setupUi(this);
	Qt::WindowFlags flags = windowFlags();
	flags &= ~Qt::WindowContextHelpButtonHint;
	setWindowFlags(flags);

	m->remote = remote;

	if (isRemote()) {
	setWindowTitle(tr("Delete Remote Branch"));
	ui->checkBox_all_branches->setVisible(false);
	}

	m->all_local_branch_names = all_local_branch_names;
	m->current_local_branch_names = current_local_branch_names;

	updateList();
	}

	DeleteBranchDialog::~DeleteBranchDialog()
	{
	delete m;
	delete ui;
	}

	bool DeleteBranchDialog::isRemote() const
	{
	return m->remote;
	}

	void DeleteBranchDialog::updateList()
	{
	bool all = ui->checkBox_all_branches->isChecked();

	ui->listWidget->clear();

	- for (QString const &name : all ? m->all_local_branch_names : m->current_local_branch_names) {
	- QListWidgetItem *item = new QListWidgetItem();
	+ for (QString const &name : (all ? m->all_local_branch_names : m->current_local_branch_names)) {
	+ auto *item = new QListWidgetItem;
	item->setText(name);
	item->setCheckState(Qt::Unchecked);
	ui->listWidget->addItem(item);
	}
	}

	QStringList DeleteBranchDialog::selectedBranchNames() const
	{
	QStringList names;
	int n = ui->listWidget->count();
	for (int row = 0; row < n; row++) {
	QListWidgetItem *item = ui->listWidget->item(row);
	Q_ASSERT(item);
	if (item->checkState() == Qt::Checked) {
	names.push_back(item->text());
	}
	}
	return names;
	}

	void DeleteBranchDialog::on_checkBox_all_branches_toggled(bool /checked/)
	{
	updateList();
	}
	diff --git a/src/FileDiffSliderWidget.cpp b/src/FileDiffSliderWidget.cpp
	index 89dbf60..b3c5192 100644
	--- a/src/FileDiffSliderWidget.cpp
	+++ b/src/FileDiffSliderWidget.cpp
	@@ -1,208 +1,208 @@
	#include "FileDiffSliderWidget.h"
	#include "common/misc.h"
	#include <QPainter>
	#include <QMouseEvent>
	#include <QDebug>
	#include "ApplicationGlobal.h"
	#include "TextEditorTheme.h"

	struct FileDiffSliderWidget::Private {
	bool visible = false;
	int scroll_total = 0;
	int scroll_value = 0;
	int scroll_page_size = 0;
	QPixmap left_pixmap;
	QPixmap right_pixmap;
	int wheel_delta = 0;
	fn_pixmap_maker_t pixmap_maker;
	ThemePtr theme;
	};

	FileDiffSliderWidget::FileDiffSliderWidget(QWidget *parent)
	: QWidget(parent)
	, m(new Private)
	{
	}

	FileDiffSliderWidget::~FileDiffSliderWidget()
	{
	delete m;
	}

	void FileDiffSliderWidget::init(fn_pixmap_maker_t pixmap_maker, ThemePtr theme)
	{
	m->pixmap_maker = pixmap_maker;
	m->theme = theme;
	}

	QPixmap FileDiffSliderWidget::makeDiffPixmap(DiffPane pane, int width, int height)
	{
	if (m->pixmap_maker) {
	return m->pixmap_maker(pane, width, height);
	}
	return QPixmap();
	}

	void FileDiffSliderWidget::updatePixmap()
	{
	m->left_pixmap = makeDiffPixmap(DiffPane::Left, 1, height());
	m->right_pixmap = makeDiffPixmap(DiffPane::Right, 1, height());
	}

	QPixmap FileDiffSliderWidget::makeDiffPixmap(int width, int height, const TextDiffLineList &lines, ThemePtr theme)
	{
	auto MakePixmap = [&](TextDiffLineList const &lines, int w, int h){
	const int scale = 1;
	QPixmap pixmap = QPixmap(w, h * scale);
	pixmap.fill(theme->diff_slider_normal_bg);
	QPainter pr(&pixmap);
	auto Loop = [&](std::function<QColor(TextDiffLine::Type)> getcolor){
	int i = 0;
	while (i < lines.size()) {
	- TextDiffLine::Type type = (TextDiffLine::Type)lines[i].type;
	+ auto type = (TextDiffLine::Type)lines[i].type;
	int j = i + 1;
	if (type != TextDiffLine::Normal) {
	while (j < lines.size()) {
	if (lines[j].type != type) break;
	j++;
	}
	int y = i * pixmap.height() / lines.size();
	int z = j * pixmap.height() / lines.size();
	if (z == y) z = y + 1;
	QColor color = getcolor(type);
	if (color.isValid()) pr.fillRect(0, y, w, z - y, color);
	}
	i = j;
	}
	};
	Loop([&](TextDiffLine::Type t)->QColor{
	switch (t) {
	case TextDiffLine::Unknown: return theme->diff_slider_unknown_bg;
	}
	return QColor();
	});
	Loop([&](TextDiffLine::Type t)->QColor{
	switch (t) {
	case TextDiffLine::Add: return theme->diff_slider_add_bg;
	case TextDiffLine::Del: return theme->diff_slider_del_bg;
	}
	return QColor();
	});
	if (scale == 1) return pixmap;
	return pixmap.scaled(w, h, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
	};
	return MakePixmap(lines, width, height);
	}

	void FileDiffSliderWidget::paintEvent(QPaintEvent *)
	{
	if (!m->visible) return;
	if (m->scroll_total < 1) return;

	if (m->left_pixmap.isNull() \|\| m->right_pixmap.isNull()) {
	updatePixmap();
	}

	QPainter pr(this);
	int w = (width() - 4) / 2;
	{
	int h = height();
	pr.fillRect(w, 0, 4, height(), QColor(240, 240, 240));
	int sw = m->left_pixmap.width();
	int sh = m->left_pixmap.height();
	pr.drawPixmap(0, 0, w, h, m->left_pixmap, 0, 0, sw, sh);
	pr.drawPixmap(w + 4, 0, w, h, m->right_pixmap, 0, 0, sw, sh);
	}

	pr.fillRect(w, 0, 4, height(), palette().color(QPalette::Window));
	if (m->scroll_page_size > 0 && m->scroll_total > 0) {
	int y = m->scroll_value * height() / m->scroll_total;
	int h = m->scroll_page_size * height() / m->scroll_total;
	if (h < 2) h = 2;
	pr.fillRect(w + 1, y, 2, h, m->theme->diff_slider_handle);
	}

	if (hasFocus()) {
	QPainter pr(this);
	misc::drawFrame(&pr, 0, 0, width(), height(), QColor(0, 128, 255, 128));
	}
	}

	void FileDiffSliderWidget::resizeEvent(QResizeEvent *)
	{
	clear(m->visible);
	}

	void FileDiffSliderWidget::internalSetValue(int v)
	{
	int max = m->scroll_total - m->scroll_page_size / 2;
	if (v > max) {
	v = max;
	}
	if (v < 0) {
	v = 0;
	}
	m->scroll_value = v;
	}

	void FileDiffSliderWidget::setValue(int v)
	{
	internalSetValue(v);
	update();
	emit valueChanged(m->scroll_value);
	}

	void FileDiffSliderWidget::scroll_(int pos)
	{
	int v = pos;
	v = v * m->scroll_total / height() - m->scroll_page_size / 2;
	setValue(v);
	}

	void FileDiffSliderWidget::mousePressEvent(QMouseEvent *e)
	{
	if (m->visible && e->button() == Qt::LeftButton) {
	scroll_(e->pos().y());
	}
	}

	void FileDiffSliderWidget::mouseMoveEvent(QMouseEvent *e)
	{
	if (m->visible && (e->buttons() & Qt::LeftButton)) {
	scroll_(e->pos().y());
	}
	}

	void FileDiffSliderWidget::wheelEvent(QWheelEvent *e)
	{
	int pos = 0;
	m->wheel_delta += e->delta();
	while (m->wheel_delta >= 40) {
	m->wheel_delta -= 40;
	pos--;
	}
	while (m->wheel_delta <= -40) {
	m->wheel_delta += 40;
	pos++;
	}
	if (pos != 0) {
	setValue(m->scroll_value + pos);
	}
	}

	void FileDiffSliderWidget::clear(bool v)
	{
	m->left_pixmap = QPixmap();
	m->right_pixmap = QPixmap();
	m->visible = v;
	update();
	}

	void FileDiffSliderWidget::setScrollPos(int total, int value, int size)
	{
	m->scroll_total = total;
	m->scroll_page_size = size;
	internalSetValue(value);
	m->visible = (m->scroll_total > 0) && (m->scroll_page_size > 0);
	update();
	}
	diff --git a/src/FileDiffWidget.cpp b/src/FileDiffWidget.cpp
	index 44806bb..8c35bb8 100644
	--- a/src/FileDiffWidget.cpp
	+++ b/src/FileDiffWidget.cpp
	@@ -1,741 +1,744 @@
	+#include <memory>
	+
	+#include <memory>
	+
	#include "FileDiffWidget.h"
	#include "ui_FileDiffWidget.h"

	#include "BigDiffWindow.h"
	#include "GitDiff.h"
	#include "common/joinpath.h"
	#include "MainWindow.h"
	#include "common/misc.h"

	#include "ApplicationGlobal.h"
	#include "Theme.h"

	#include <QBuffer>
	#include <QDebug>
	#include <QKeyEvent>
	#include <QMenu>
	#include <QPainter>
	#include <QStyle>
	#include <QTextCodec>

	enum {
	DiffIndexRole = Qt::UserRole,
	};

	struct FileDiffWidget::Private {
	MainWindow *mainwindow = nullptr;
	InitParam_ init_param_;
	Git::CommitItemList commit_item_list;
	std::vector<std::string> original_lines;
	TextEditorEnginePtr engine_left;
	TextEditorEnginePtr engine_right;
	TextDiffLineList left_lines;
	TextDiffLineList right_lines;
	int max_line_length = 0;

	int term_cursor_row = 0;
	int term_cursor_col = 0;

	QTextCodec *text_codec = nullptr;
	};

	FileDiffWidget::FileDiffWidget(QWidget *parent)
	: QWidget(parent)
	, ui(new Ui::FileDiffWidget)
	, m(new Private)
	{
	ui->setupUi(this);
	Qt::WindowFlags flags = windowFlags();
	flags &= ~Qt::WindowContextHelpButtonHint;
	setWindowFlags(flags);

	ui->widget_diff_slider->init([&](DiffPane pane, int width, int height){
	return makeDiffPixmap(pane, width, height);
	}, global->theme);

	connect(ui->widget_diff_slider, SIGNAL(valueChanged(int)), this, SLOT(scrollTo(int)));
	connect(ui->widget_diff_left->texteditor(), SIGNAL(moved(int,int,int,int)), this, SLOT(onMoved(int,int,int,int)));
	connect(ui->widget_diff_right->texteditor(), SIGNAL(moved(int,int,int,int)), this, SLOT(onMoved(int,int,int,int)));

	setFocusAcceptable(true);

	int n = style()->pixelMetric(QStyle::PM_ScrollBarExtent);
	ui->toolButton_fullscreen->setFixedSize(n, n);

	setMaximizeButtonEnabled(true);

	- m->engine_left = TextEditorEnginePtr(new TextEditorEngine);
	- m->engine_right = TextEditorEnginePtr(new TextEditorEngine);
	+ m->engine_left = std::make_shared<TextEditorEngine>();
	+ m->engine_right = std::make_shared<TextEditorEngine>();
	ui->widget_diff_left->setDiffMode(m->engine_left, ui->verticalScrollBar, ui->horizontalScrollBar);
	ui->widget_diff_right->setDiffMode(m->engine_right, ui->verticalScrollBar, ui->horizontalScrollBar);

	setViewType(FileViewType::None);
	}

	FileDiffWidget::~FileDiffWidget()
	{
	delete m;
	delete ui;
	}

	void FileDiffWidget::setViewType(FileViewType type)
	{
	ui->widget_diff_left->setViewType(type);
	ui->widget_diff_right->setViewType(type);
	}

	void FileDiffWidget::setMaximizeButtonEnabled(bool f)
	{
	ui->toolButton_fullscreen->setVisible(f);
	ui->toolButton_fullscreen->setEnabled(f);
	}

	FileDiffWidget::ViewStyle FileDiffWidget::viewstyle() const
	{
	return m->init_param_.view_style;
	}



	void FileDiffWidget::bind(MainWindow *mw)
	{
	Q_ASSERT(mw);
	m->mainwindow = mw;
	ui->widget_diff_left->bind(mw, this, ui->verticalScrollBar, ui->horizontalScrollBar, mw->themeForTextEditor());
	ui->widget_diff_right->bind(mw, this, ui->verticalScrollBar, ui->horizontalScrollBar, mw->themeForTextEditor());

	connect(ui->verticalScrollBar, SIGNAL(valueChanged(int)), this, SLOT(onVerticalScrollValueChanged(int)));
	connect(ui->horizontalScrollBar, SIGNAL(valueChanged(int)), this, SLOT(onHorizontalScrollValueChanged(int)));
	}

	MainWindow *FileDiffWidget::mainwindow()
	{
	return m->mainwindow;
	}

	GitPtr FileDiffWidget::git()
	{
	if (!mainwindow()) {
	qDebug() << "Maybe, you forgot to call FileDiffWidget::bind() ?";
	return GitPtr();
	}
	return mainwindow()->git();
	}

	Git::Object FileDiffWidget::cat_file(GitPtr /g/, QString const &id)
	{
	return mainwindow()->cat_file(id);
	}

	int FileDiffWidget::totalTextLines() const
	{
	return m->engine_left->document.lines.size();
	}

	void FileDiffWidget::clearDiffView()
	{
	ui->widget_diff_slider->clear(false);
	}

	int FileDiffWidget::fileviewHeight() const
	{
	return ui->widget_diff_left->height();
	}

	void FileDiffWidget::resetScrollBarValue()
	{
	ui->verticalScrollBar->setValue(0);
	ui->horizontalScrollBar->setValue(0);
	}

	void FileDiffWidget::scrollToBottom()
	{
	QScrollBar *sb = ui->verticalScrollBar;
	sb->setValue(sb->maximum());
	}

	void FileDiffWidget::updateSliderCursor()
	{
	if (viewstyle() == SideBySideText) {
	ui->widget_diff_slider->clear(true);
	}
	}

	void FileDiffWidget::updateControls()
	{
	updateSliderCursor();
	}

	void FileDiffWidget::makeSideBySideDiffData(Git::Diff const &diff, std::vector<std::string> const &original_lines, TextDiffLineList left_lines, TextDiffLineList right_lines)
	{
	left_lines->clear();
	right_lines->clear();

	m->original_lines = original_lines;

	size_t linenum = original_lines.size();

	std::vector<HunkItem> hunks;
	int number = 0;
	for (auto it = diff.hunks.begin(); it != diff.hunks.end(); it++, number++) {
	std::string at = it->at;
	if (strncmp(at.c_str(), "@@ -", 4) == 0) {
	size_t pos = 0;
	size_t len = 0;
	char const *p = at.c_str() + 4;
	auto ParseNumber = [&](){
	size_t v = 0;
	while (isdigit(*p & 0xff)) {
	v = v * 10 + (*p - '0');
	p++;
	}
	return v;
	};
	pos = ParseNumber();
	if (*p == ',') {
	p++;
	len = ParseNumber();
	} else {
	len = 1;
	}
	if (pos > 0) pos--;
	HunkItem item;
	item.hunk_number = number;
	item.pos = pos;
	item.len = len;
	for (std::string const &line : it->lines) {
	item.lines.push_back(line);
	}
	hunks.push_back(item);
	}
	}
	std::sort(hunks.begin(), hunks.end(), [](HunkItem const &l, HunkItem const &r){
	return l.pos + l.len < r.pos + r.len;
	});
	size_t h = hunks.size();
	while (linenum > 0 \|\| h > 0) {
	while (h > 0) {
	int hunk_number = h - 1;
	HunkItem const &hi = hunks[hunk_number];
	if (hi.pos + hi.len < linenum) {
	break;
	}
	std::vector<TextDiffLine> tmp_left;
	std::vector<TextDiffLine> tmp_right;
	int minus = 0;
	int plus = 0;
	auto FlushBlank = [&](){
	while (minus < plus) {
	- tmp_left.push_back(TextDiffLine());
	+ tmp_left.emplace_back();
	minus++;
	}
	while (minus > plus) {
	- tmp_right.push_back(TextDiffLine());
	+ tmp_right.emplace_back();
	plus++;
	}
	minus = plus = 0;
	};
	- for (auto it = hi.lines.begin(); it != hi.lines.end(); it++) {
	- std::string line = *it;
	+ for (auto line : hi.lines) {
	int c = line[0] & 0xff;
	line = line.substr(1);
	if (c == '-') {
	minus++;
	TextDiffLine l(line, TextDiffLine::Del);
	l.hunk_number = hunk_number;
	tmp_left.push_back(l);
	} else if (c == '+') {
	plus++;
	TextDiffLine l(line, TextDiffLine::Add);
	l.hunk_number = hunk_number;
	tmp_right.push_back(l);
	} else {
	FlushBlank();
	TextDiffLine l(line, TextDiffLine::Normal);
	l.hunk_number = hunk_number;
	tmp_left.push_back(l);
	tmp_right.push_back(l);
	}
	}
	FlushBlank();
	auto ComplementNewLine = [](std::vector<TextDiffLine> *lines){
	for (TextDiffLine &line : *lines) {
	int n = line.text.size();
	if (n > 0) {
	int c = line.text[n - 1] & 0xff;
	if (c != '\r' && c != '\n') {
	line.text.push_back('\n');
	}
	}
	}
	};
	ComplementNewLine(&tmp_left);
	ComplementNewLine(&tmp_right);
	for (auto it = tmp_left.rbegin(); it != tmp_left.rend(); it++) {
	TextDiffLine l(*it);
	if (m->text_codec) {
	if (!l.text.isEmpty()) {
	QString s = QString::fromUtf8(l.text.data(), l.text.size());
	l.text = m->text_codec->fromUnicode(s);
	}
	}
	left_lines->push_back(l);
	}
	for (auto it = tmp_right.rbegin(); it != tmp_right.rend(); it++) {
	TextDiffLine l(*it);
	if (m->text_codec) {
	if (!l.text.isEmpty()) {
	QString s = QString::fromUtf8(l.text.data(), l.text.size());
	l.text = m->text_codec->fromUnicode(s);
	}
	}
	right_lines->push_back(l);
	}
	linenum = hi.pos;
	h--;
	}
	if (linenum > 0) {
	linenum--;
	if (linenum < (size_t)original_lines.size()) {
	std::string line = original_lines[linenum];
	left_lines->push_back(TextDiffLine(line, TextDiffLine::Normal));
	right_lines->push_back(TextDiffLine(line, TextDiffLine::Normal));
	}
	}
	}

	std::reverse(left_lines->begin(), left_lines->end());
	std::reverse(right_lines->begin(), right_lines->end());
	}

	void FileDiffWidget::setDiffText(Git::Diff const &diff, TextDiffLineList const &left, TextDiffLineList const &right)
	{
	m->max_line_length = 0;

	enum Pane {
	Left,
	Right,
	};
	auto SetLineNumber = [&](TextDiffLineList const &lines, Pane pane, TextDiffLineList *out){
	out->clear();
	int linenum = 1;
	for (TextDiffLine const &line : lines) {
	TextDiffLine item = line;

	switch (item.type) {
	case TextDiffLine::Normal:
	item.line_number = linenum++;
	break;
	case TextDiffLine::Add:
	if (pane == Pane::Right) {
	item.line_number = linenum++;
	}
	break;
	case TextDiffLine::Del:
	if (pane == Pane::Left) {
	item.line_number = linenum++;
	}
	break;
	default:
	item.line_number = linenum; // 行番号は設定するが、インクリメントはしない
	break;
	}

	out->push_back(item);
	}
	};
	SetLineNumber(left, Pane::Left, &m->left_lines);
	SetLineNumber(right, Pane::Right, &m->right_lines);

	ui->widget_diff_left->setText(&m->left_lines, mainwindow(), diff.blob.a_id, diff.path);
	ui->widget_diff_right->setText(&m->right_lines, mainwindow(), diff.blob.b_id, diff.path);
	refrectScrollBar();
	ui->widget_diff_slider->clear(true);
	}

	FileViewType FileDiffWidget::setupPreviewWidget()
	{
	clearDiffView();

	QString mimetype_l = mainwindow()->determinFileType(m->init_param_.bytes_a, true);
	QString mimetype_r = mainwindow()->determinFileType(m->init_param_.bytes_b, true);

	if (misc::isImage(mimetype_l) \|\| misc::isImage(mimetype_r)) { // image

	ui->verticalScrollBar->setVisible(false);
	ui->horizontalScrollBar->setVisible(false);
	ui->widget_diff_slider->setVisible(false);

	ui->widget_diff_left->setImage(mimetype_l, m->init_param_.bytes_a, m->init_param_.diff.blob.a_id, m->init_param_.diff.path);
	ui->widget_diff_right->setImage(mimetype_r, m->init_param_.bytes_b, m->init_param_.diff.blob.b_id, m->init_param_.diff.path);

	return FileViewType::Image;

	} else { // text

	ui->verticalScrollBar->setVisible(true);
	ui->horizontalScrollBar->setVisible(true);
	ui->widget_diff_slider->setVisible(true);

	setViewType(FileViewType::Text);
	return FileViewType::Text;
	}
	}

	void FileDiffWidget::setSingleFile(QByteArray const &ba, QString const &id, QString const &path)
	{
	m->init_param_ = InitParam_();
	m->init_param_.view_style = FileDiffWidget::ViewStyle::SingleFile;
	m->init_param_.bytes_a = ba;
	m->init_param_.diff.path = path;
	m->init_param_.diff.blob.a_id = id;
	}

	void FileDiffWidget::setOriginalLines_(QByteArray const &ba)
	{
	m->original_lines.clear();
	if (!ba.isEmpty()) {
	char const *begin = ba.data();
	char const *end = begin + ba.size();
	misc::splitLines(begin, end, &m->original_lines, true);
	}
	}

	void FileDiffWidget::setLeftOnly(QByteArray const &ba, Git::Diff const &diff)
	{
	m->init_param_ = InitParam_();
	m->init_param_.view_style = FileDiffWidget::ViewStyle::LeftOnly;
	m->init_param_.bytes_a = ba;
	m->init_param_.diff = diff;

	setOriginalLines_(ba);

	if (setupPreviewWidget() == FileViewType::Text) {

	TextDiffLineList left_lines;
	TextDiffLineList right_lines;

	for (std::string const &line : m->original_lines) {
	left_lines.push_back(TextDiffLine(line, TextDiffLine::Del));
	right_lines.push_back(TextDiffLine());
	}

	setDiffText(diff, left_lines, right_lines);
	}
	}

	void FileDiffWidget::setRightOnly(QByteArray const &ba, Git::Diff const &diff)
	{
	m->init_param_ = InitParam_();
	m->init_param_.view_style = FileDiffWidget::ViewStyle::RightOnly;
	m->init_param_.bytes_b = ba;
	m->init_param_.diff = diff;

	setOriginalLines_(ba);

	if (setupPreviewWidget() == FileViewType::Text) {

	TextDiffLineList left_lines;
	TextDiffLineList right_lines;

	for (std::string const &line : m->original_lines) {
	left_lines.push_back(TextDiffLine());
	right_lines.push_back(TextDiffLine(line, TextDiffLine::Add));
	}

	setDiffText(diff, left_lines, right_lines);
	}
	}

	void FileDiffWidget::setSideBySide(QByteArray const &ba, Git::Diff const &diff, bool uncommited, QString const &workingdir)
	{
	m->init_param_ = InitParam_();
	m->init_param_.view_style = FileDiffWidget::ViewStyle::SideBySideText;
	m->init_param_.bytes_a = ba;
	m->init_param_.diff = diff;
	m->init_param_.uncommited = uncommited;
	m->init_param_.workingdir = workingdir;

	setOriginalLines_(ba);

	if (setupPreviewWidget() == FileViewType::Text) {

	TextDiffLineList left_lines;
	TextDiffLineList right_lines;

	makeSideBySideDiffData(diff, m->original_lines, &left_lines, &right_lines);

	setDiffText(diff, left_lines, right_lines);
	}
	}

	void FileDiffWidget::setSideBySide_(QByteArray const &ba_a, QByteArray const &ba_b, QString const &workingdir)
	{
	m->init_param_ = InitParam_();
	m->init_param_.view_style = FileDiffWidget::ViewStyle::SideBySideImage;
	m->init_param_.bytes_a = ba_a;
	m->init_param_.bytes_b = ba_b;
	m->init_param_.workingdir = workingdir;

	setOriginalLines_(ba_a);

	if (setupPreviewWidget() == FileViewType::Text) {

	TextDiffLineList left_lines;
	TextDiffLineList right_lines;

	makeSideBySideDiffData(m->init_param_.diff, m->original_lines, &left_lines, &right_lines);

	setDiffText(m->init_param_.diff, left_lines, right_lines);
	}
	}

	QString FileDiffWidget::diffObjects(GitPtr g, QString const &a_id, QString const &b_id)
	{
	if (m->text_codec) {
	Git::Object obj_a = mainwindow()->cat_file_(g, a_id);
	Git::Object obj_b = mainwindow()->cat_file_(g, b_id);
	if (obj_b.type == Git::Object::Type::UNKNOWN) {
	obj_b.type = Git::Object::Type::BLOB;
	}
	if (obj_a.type == Git::Object::Type::BLOB && obj_b.type == Git::Object::Type::BLOB) {
	QString path_a = mainwindow()->newTempFilePath();
	QString path_b = mainwindow()->newTempFilePath();
	QFile file_a(path_a);
	QFile file_b(path_b);
	if (file_a.open(QFile::WriteOnly) && file_b.open(QFile::WriteOnly)) {
	file_a.write(m->text_codec->toUnicode(obj_a.content).toUtf8());
	file_b.write(m->text_codec->toUnicode(obj_b.content).toUtf8());
	file_a.close();
	file_b.close();
	QString s = g->diff_file(path_a, path_b);
	file_a.remove();
	file_b.remove();
	return s;
	}
	}
	}
	return GitDiff::diffObjects(g, a_id, b_id);
	}

	bool FileDiffWidget::isValidID_(QString const &id)
	{
	if (id.startsWith(PATH_PREFIX)) {
	return true;
	}
	return Git::isValidID(id);
	}

	void FileDiffWidget::updateDiffView(Git::Diff const &info, bool uncommited)
	{
	GitPtr g = git();
	if (!g) return;
	if (!g->isValidWorkingCopy()) return;

	if (isValidID_(info.blob.a_id) && isValidID_(info.blob.b_id)) {
	Git::Object obj_a = cat_file(g, info.blob.a_id);
	Git::Object obj_b = cat_file(g, info.blob.b_id);
	QString mime_a = mainwindow()->determinFileType(obj_a.content, true);
	QString mime_b = mainwindow()->determinFileType(obj_b.content, true);
	if (misc::isImage(mime_a) && misc::isImage(mime_b)) {
	setSideBySide_(obj_a.content, obj_b.content, g->workingRepositoryDir());
	return;
	}
	}

	{
	Git::Diff diff;
	if (isValidID_(info.blob.a_id) && isValidID_(info.blob.b_id)) {
	std::string text = diffObjects(g, info.blob.a_id, info.blob.b_id).toStdString();
	GitDiff::parseDiff(text, &info, &diff);
	} else {
	diff = info;
	}

	Git::Object obj;
	if (isValidID_(diff.blob.a_id)) { // 左が有効
	obj = cat_file(g, diff.blob.a_id);
	if (isValidID_(diff.blob.b_id)) { // 右が有効
	setSideBySide(obj.content, diff, uncommited, g->workingRepositoryDir()); // 通常のdiff表示
	} else {
	setLeftOnly(obj.content, diff); // 右が無効の時は、削除されたファイル
	}
	} else if (isValidID_(diff.blob.b_id)) { // 左が無効で右が有効の時は、追加されたファイル
	obj = cat_file(g, diff.blob.b_id);
	setRightOnly(obj.content, diff);
	}
	}
	}

	void FileDiffWidget::updateDiffView(QString id_left, QString id_right, QString const &path)
	{
	GitPtr g = git();
	if (!g) return;
	if (!g->isValidWorkingCopy()) return;

	Git::Diff diff;
	diff.path = path;
	diff.blob.a_id = id_left;
	diff.blob.b_id = id_right;
	diff.mode = "0";
	std::string text = diffObjects(g, diff.blob.a_id, diff.blob.b_id).toStdString();
	GitDiff::parseDiff(text, &diff, &diff);

	Git::Object obj = cat_file(g, diff.blob.a_id);
	setSideBySide(obj.content, diff, false, g->workingRepositoryDir());

	ui->widget_diff_slider->clear(false);

	resetScrollBarValue();
	updateControls();

	ui->widget_diff_slider->update();
	}

	void FileDiffWidget::resizeEvent(QResizeEvent *)
	{
	refrectScrollBar();
	}

	void FileDiffWidget::keyPressEvent(QKeyEvent *event)
	{
	if (event->key() == Qt::Key_Escape) {
	event->ignore(); // Escが押されたとき、親ウィジェットに処理させる。（通常、ウィンドウを閉じる、など）
	return;
	}

	if (focusWidget() == ui->widget_diff_left->texteditor()) {
	ui->widget_diff_left->write(event);
	} else if (focusWidget() == ui->widget_diff_right->texteditor()) {
	ui->widget_diff_right->write(event);
	}
	}

	void FileDiffWidget::scrollTo(int value)
	{
	ui->verticalScrollBar->setValue(value);
	}

	void FileDiffWidget::onVerticalScrollValueChanged(int)
	{
	refrectScrollBar();
	}

	void FileDiffWidget::onHorizontalScrollValueChanged(int)
	{
	refrectScrollBar();
	}

	void FileDiffWidget::onDiffWidgetWheelScroll(int lines)
	{
	while (lines > 0) {
	ui->verticalScrollBar->triggerAction(QScrollBar::SliderSingleStepAdd);
	lines--;
	}
	while (lines < 0) {
	ui->verticalScrollBar->triggerAction(QScrollBar::SliderSingleStepSub);
	lines++;
	}
	}

	void FileDiffWidget::onScrollValueChanged2(int value)
	{
	ui->verticalScrollBar->setValue(value);
	}

	void FileDiffWidget::onDiffWidgetResized()
	{
	updateControls();
	}

	void FileDiffWidget::on_toolButton_fullscreen_clicked()
	{
	BigDiffWindow win(mainwindow());
	win.setWindowState(Qt::WindowMaximized);
	win.init(mainwindow(), m->init_param_);
	win.exec();
	}

	void FileDiffWidget::setFocusAcceptable(bool f)
	{
	Qt::FocusPolicy focuspolicy = f ? Qt::StrongFocus : Qt::NoFocus;
	ui->widget_diff_left->setFocusPolicy(focuspolicy);
	ui->widget_diff_right->setFocusPolicy(focuspolicy);
	}

	void FileDiffWidget::onUpdateSliderBar()
	{
	int total = m->engine_left->document.lines.size();
	int value = ui->verticalScrollBar->value();
	int page = ui->verticalScrollBar->pageStep();
	ui->widget_diff_slider->setScrollPos(total, value, page);
	}

	void FileDiffWidget::refrectScrollBar()
	{
	ui->widget_diff_left->refrectScrollBar();
	ui->widget_diff_right->refrectScrollBar();
	onUpdateSliderBar();
	}

	QPixmap FileDiffWidget::makeDiffPixmap(DiffPane pane, int width, int height)
	{
	auto Do = [&](TextDiffLineList const &lines){
	return FileDiffSliderWidget::makeDiffPixmap(width, height, lines, global->theme);
	};
	if (pane == DiffPane::Left) return Do(m->left_lines);
	if (pane == DiffPane::Right) return Do(m->right_lines);
	return QPixmap();
	}

	void FileDiffWidget::onMoved(int cur_row, int cur_col, int scr_row, int scr_col)
	{
	(void)cur_col;
	(void)cur_row;
	ui->widget_diff_left->move(-1, -1, scr_row, scr_col, false);
	ui->widget_diff_right->move(-1, -1, scr_row, scr_col, false);
	refrectScrollBar();
	onUpdateSliderBar();
	}

	void FileDiffWidget::setTextCodec(QTextCodec *codec)
	{
	m->text_codec = codec;
	ui->widget_diff_left->setTextCodec(codec);
	ui->widget_diff_right->setTextCodec(codec);
	emit textcodecChanged();
	}

	void FileDiffWidget::setTextCodec(char const *name)
	{
	QTextCodec *codec = name ? QTextCodec::codecForName(name) : nullptr;
	setTextCodec(codec);
	}

	void FileDiffWidget::on_toolButton_menu_clicked()
	{
	QMenu menu;
	QAction *a_utf8 = menu.addAction("UTF-8");
	QAction *a_sjis = menu.addAction("SJIS (CP932)");
	QAction *a_eucjp = menu.addAction("EUC-JP");
	QAction *a_iso2022jp = menu.addAction("JIS (ISO-2022-JP)");
	QAction *a = menu.exec(QCursor::pos() + QPoint(8, -8));
	if (a) {
	if (a == a_utf8) {
	setTextCodec((char const *)nullptr);
	return;
	}
	if (a == a_sjis) {
	setTextCodec("Shift_JIS");
	return;
	}
	if (a == a_eucjp) {
	setTextCodec("EUC-JP");
	return;
	}
	if (a == a_iso2022jp) {
	setTextCodec("ISO-2022-JP");
	return;
	}
	}
	}
	diff --git a/src/FileHistoryWindow.cpp b/src/FileHistoryWindow.cpp
	index 1a601e2..738631f 100644
	--- a/src/FileHistoryWindow.cpp
	+++ b/src/FileHistoryWindow.cpp
	@@ -1,252 +1,252 @@
	#include "FileHistoryWindow.h"
	#include "MainWindow.h"
	#include "ui_FileHistoryWindow.h"
	#include "common/misc.h"
	#include "GitDiff.h"
	#include "common/joinpath.h"
	#include "FileDiffWidget.h"
	#include "MyTableWidgetDelegate.h"

	#include <QMenu>
	#include <QPainter>
	#include <QStyledItemDelegate>
	#include <QThread>

	struct FileHistoryWindow::Private {
	GitPtr g;
	QString path;
	Git::CommitItemList commit_item_list;
	FileDiffWidget::DiffData diff_data;
	FileDiffWidget::DrawData draw_data;
	};

	FileDiffWidget::DiffData *FileHistoryWindow::diffdata()
	{
	return &m->diff_data;
	}

	const FileDiffWidget::DiffData *FileHistoryWindow::diffdata() const
	{
	return &m->diff_data;
	}

	FileDiffWidget::DrawData *FileHistoryWindow::drawdata()
	{
	return &m->draw_data;
	}

	const FileDiffWidget::DrawData *FileHistoryWindow::drawdata() const
	{
	return &m->draw_data;
	}

	int FileHistoryWindow::totalTextLines() const
	{
	return diffdata()->left->lines.size();
	}

	int FileHistoryWindow::fileviewScrollPos() const
	{
	return drawdata()->v_scroll_pos;
	}

	FileHistoryWindow::FileHistoryWindow(MainWindow *parent)
	: QDialog(parent)
	, ui(new Ui::FileHistoryWindow)
	, m(new Private)
	{
	ui->setupUi(this);
	ui->tableWidget_log->setItemDelegate(new MyTableWidgetDelegate(this));
	Qt::WindowFlags flags = windowFlags();
	flags &= ~Qt::WindowContextHelpButtonHint;
	flags \|= Qt::WindowMaximizeButtonHint;
	setWindowFlags(flags);

	ui->splitter->setSizes({100, 200});

	ui->widget_diff_view->bind(mainwindow());

	connect(ui->widget_diff_view, SIGNAL(moveNextItem()), this, SLOT(onMoveNextItem()));
	connect(ui->widget_diff_view, SIGNAL(movePreviousItem()), this, SLOT(onMovePreviousItem()));
	}

	FileHistoryWindow::~FileHistoryWindow()
	{
	delete m;
	delete ui;
	}

	MainWindow *FileHistoryWindow::mainwindow()
	{
	return qobject_cast<MainWindow *>(parent());
	}

	void FileHistoryWindow::prepare(GitPtr g, const QString &path)
	{
	Q_ASSERT(g);
	Q_ASSERT(g->isValidWorkingCopy());
	this->m->g = g;
	this->m->path = path;

	QString reponame = mainwindow()->currentRepositoryName();
	QString brname = mainwindow()->currentBranch().name;

	QString text = "%1 (%2)";
	text = text.arg(reponame).arg(brname);
	ui->label_repo->setText(text);
	ui->label_path->setText(path);

	{
	OverrideWaitCursor;
	m->commit_item_list = m->g->log_all(m->path, mainwindow()->limitLogCount());
	}

	collectFileHistory();

	updateDiffView();
	}

	void FileHistoryWindow::collectFileHistory()
	{
	QStringList cols = {
	tr("Commit"),
	tr("Date"),
	tr("Author"),
	tr("Description"),
	};
	int n = cols.size();
	ui->tableWidget_log->setColumnCount(n);
	ui->tableWidget_log->setRowCount(0);
	for (int i = 0; i < n; i++) {
	QString const &text = cols[i];
	QTableWidgetItem *item = new QTableWidgetItem(text);
	ui->tableWidget_log->setHorizontalHeaderItem(i, item);
	}

	int count = m->commit_item_list.size();
	ui->tableWidget_log->setRowCount(count);

	for (int row = 0; row < count; row++) {
	Git::CommitItem const &commit = m->commit_item_list[row];
	int col = 0;
	auto AddColumn = [&](QString const &text, QString const &tooltip){
	QTableWidgetItem *item = new QTableWidgetItem(text);
	item->setToolTip(tooltip);
	ui->tableWidget_log->setItem(row, col, item);
	col++;
	};

	QString commit_id = mainwindow()->abbrevCommitID(commit);
	QString datetime = misc::makeDateTimeString(commit.commit_date);
	AddColumn(commit_id, QString());
	AddColumn(datetime, QString());
	AddColumn(commit.author, QString());
	AddColumn(commit.message, commit.message);
	ui->tableWidget_log->setRowHeight(row, 24);
	}

	ui->tableWidget_log->resizeColumnsToContents();
	ui->tableWidget_log->horizontalHeader()->setStretchLastSection(false);
	ui->tableWidget_log->horizontalHeader()->setStretchLastSection(true);

	ui->tableWidget_log->setFocus();
	ui->tableWidget_log->setCurrentCell(0, 0);
	}

	class FindFileIdThread : public QThread {
	private:
	MainWindow *mainwindow;
	GitPtr g;
	QString commit_id;
	QString file;
	public:
	QString result;
	FindFileIdThread(MainWindow *mainwindow, GitPtr g, const QString &commit_id, const QString &file)
	{
	this->mainwindow = mainwindow;
	this->g = g;
	this->commit_id = commit_id;
	this->file = file;
	}

	protected:
	- void run()
	+ void run() override
	{
	result = mainwindow->findFileID(g, commit_id, file);
	}
	};

	void FileHistoryWindow::updateDiffView()
	{
	Q_ASSERT(m->g);
	Q_ASSERT(m->g->isValidWorkingCopy());

	ui->widget_diff_view->clearDiffView();

	int row = ui->tableWidget_log->currentRow();
	if (row >= 0 && row + 1 < (int)m->commit_item_list.size()) {
	Git::CommitItem const &commit_left = m->commit_item_list[row + 1]; // older
	Git::CommitItem const &commit_right = m->commit_item_list[row]; // newer

	FindFileIdThread left_thread(mainwindow(), m->g->dup(), commit_left.commit_id, m->path);
	FindFileIdThread right_thread(mainwindow(), m->g->dup(), commit_right.commit_id, m->path);
	left_thread.start();
	right_thread.start();
	left_thread.wait();
	right_thread.wait();
	QString id_left = left_thread.result;
	QString id_right = right_thread.result;

	ui->widget_diff_view->updateDiffView(id_left, id_right, m->path);
	} else if (row >= 0 && row < (int)m->commit_item_list.size()) {
	Git::CommitItem const &commit = m->commit_item_list[row]; // newer
	QString id = mainwindow()->findFileID(m->g, commit.commit_id, m->path);

	Git::Diff diff(id, m->path, QString());
	ui->widget_diff_view->updateDiffView(diff, false);
	}
	}

	void FileHistoryWindow::on_tableWidget_log_currentItemChanged(QTableWidgetItem * /current/, QTableWidgetItem * /previous/)
	{
	updateDiffView();
	}

	void FileHistoryWindow::onMoveNextItem()
	{
	int row = ui->tableWidget_log->currentRow();
	int count = ui->tableWidget_log->rowCount();
	if (row + 1 < count) {
	ui->tableWidget_log->setCurrentCell(row + 1, 0, QItemSelectionModel::ClearAndSelect);
	}
	}

	void FileHistoryWindow::onMovePreviousItem()
	{
	int row = ui->tableWidget_log->currentRow();
	if (row > 0) {
	ui->tableWidget_log->setCurrentCell(row - 1, 0, QItemSelectionModel::ClearAndSelect);
	}
	}


	void FileHistoryWindow::on_tableWidget_log_customContextMenuRequested(const QPoint &pos)
	{
	(void)pos;
	Git::CommitItem const *commit = nullptr;
	int row = ui->tableWidget_log->currentRow();
	if (row >= 0 && row < (int)m->commit_item_list.size()) {
	commit = &m->commit_item_list[row];
	}
	if (!commit) return;

	QMenu menu;
	QAction *a_property = mainwindow()->addMenuActionProperty(&menu);
	QAction *a = menu.exec(QCursor::pos() + QPoint(8, -8));
	if (a) {
	if (a == a_property) {
	mainwindow()->execCommitPropertyDialog(this, commit);
	return;
	}
	}
	}
	diff --git a/src/FileUtil.cpp b/src/FileUtil.cpp
	index 712b682..f452c42 100644
	--- a/src/FileUtil.cpp
	+++ b/src/FileUtil.cpp
	@@ -1,274 +1,274 @@

	#include "FileUtil.h"
	#include "common/joinpath.h"

	#include <sys/stat.h>

	#ifdef __HAIKU__
	struct stat s;
	#endif

	#ifdef _WIN32
	#include <windows.h>
	#include <direct.h>

	std::string FileUtil::getcwd()
	{
	std::string cwd;
	- char *p = _getcwd(0, 0);
	+ char *p = _getcwd(nullptr, 0);
	cwd = p;
	free(p);
	return cwd;
	}

	bool FileUtil::isdir(std::string const &path)
	{
	DWORD f = GetFileAttributesA(path.c_str());
	return f != INVALID_FILE_ATTRIBUTES && (f & FILE_ATTRIBUTE_DIRECTORY) != 0;
	}

	void FileUtil::mkdir(const std::string &dir, int /perm/)
	{
	- CreateDirectoryA(dir.c_str(), 0);
	+ CreateDirectoryA(dir.c_str(), nullptr);
	}

	void FileUtil::rmdir(const std::string &dir)
	{
	RemoveDirectoryA(dir.c_str());
	}

	bool FileUtil::chdir(const std::string &dir)
	{
	return SetCurrentDirectoryA(dir.c_str()) != 0;
	}

	void FileUtil::rmfile(const std::string &path)
	{
	DeleteFileA(path.c_str());
	}

	void FileUtil::mv(const std::string &src, const std::string &dst)
	{
	MoveFileA(src.c_str(), dst.c_str());
	// DWORD e = GetLastError();
	}

	void FileUtil::getdirents(const std::string &loc, std::vector<DirEnt> *out)
	{
	out->clear();
	std::string filter = loc / ".";
	WIN32_FIND_DATAA fd;
	HANDLE h = FindFirstFileA(filter.c_str(), &fd);
	if (h != INVALID_HANDLE_VALUE) {
	do {
	DirEnt de;
	de.name = fd.cFileName;
	if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
	if (de.name == "." \|\| de.name == "..") {
	continue;
	}
	de.isdir = true;
	}
	out->push_back(de);
	} while (FindNextFileA(h, &fd));
	FindClose(h);
	}
	}

	#else // _WIN32
	#include <unistd.h>
	#include <dirent.h>
	#include <pwd.h>
	#include <sys/types.h>
	#include <sys/stat.h>
	#include <stdio.h>
	#include <fcntl.h>

	std::string FileUtil::getcwd()
	{
	std::string cwd;
	- char *p = ::getcwd(0, 0);
	+ char *p = ::getcwd(nullptr, 0);
	cwd = p;
	free(p);
	return cwd;
	}

	bool FileUtil::isdir(std::string const &path)
	{
	struct stat st;
	if (stat(path.c_str(), &st) == 0) {
	if (st.st_mode & S_IFDIR) {
	return true;
	}
	}
	return false;
	}

	void FileUtil::rmdir(const std::string &dir)
	{
	::rmdir(dir.c_str());
	}

	void FileUtil::rmfile(const std::string &path)
	{
	unlink(path.c_str());
	}

	void FileUtil::mkdir(const std::string &dir, int perm)
	{
	::mkdir(dir.c_str(), perm);
	}

	bool FileUtil::chdir(const std::string &dir)
	{
	return ::chdir(dir.c_str()) == 0;
	}

	void FileUtil::mv(std::string const &src, std::string const &dst)
	{
	rename(src.c_str(), dst.c_str());
	}

	void FileUtil::getdirents(std::string const &loc, std::vector<DirEnt> *out)
	{
	out->clear();
	DIR *dir = opendir(loc.c_str());
	if (dir) {
	while (dirent *d = readdir(dir)) {
	DirEnt de;
	de.name = d->d_name;
	de.isdir = false;
	#ifdef DT_DIR
	if (d->d_type & DT_DIR) {
	#else
	stat(d->d_name, &s);
	if(S_ISDIR(s.st_mode)) {
	#endif
	if (de.name == "." \|\| de.name == "..") {
	continue;
	}
	de.isdir = true;
	}
	out->push_back(de);
	}
	closedir(dir);
	}
	}

	#endif

	void FileUtil::rmtree(const std::string &path)
	{
	std::vector<DirEnt> ents;
	getdirents(path, &ents);
	for (DirEnt const &e : ents) {
	if (e.isdir) {
	rmtree(path / e.name);
	} else {
	rmfile(path / e.name);
	}
	}
	rmdir(path);
	}

	#ifdef _WIN32
	std::string FileUtil::normalize_path_separator(std::string const &s)
	{
	if (!s.empty()) {
	size_t n = s.size();
	std::vector<char> v;
	v.reserve(n);
	for (size_t i = 0; i < n; i++) {
	char c = s[i];
	if (c == '/') {
	c = '\\';
	}
	v.push_back(c);
	}
	char const *p = &v[0];
	return std::string(p, p + n);
	}
	return std::string();
	}
	#else
	std::string FileUtil::normalize_path_separator(std::string const &s)
	{
	return s;
	}
	#endif

	static std::string which(std::string const &name, std::string const &dir)
	{
	std::vector<FileUtil::DirEnt> ents;
	FileUtil::getdirents(dir, &ents);
	for (FileUtil::DirEnt const &ent : ents) {
	if (!ent.isdir) {
	#ifdef _WIN32
	if (stricmp(ent.name.c_str(), name.c_str()) == 0) {
	return FileUtil::normalize_path_separator(dir / ent.name);
	}
	#else
	if (ent.name == name) {
	return dir / ent.name;
	}
	#endif
	}
	}
	return std::string();
	}

	static void split_path(std::string const &path, std::vector<std::string> *out)
	{
	char const *begin = path.c_str();
	char const *end = begin + path.size();
	char const *ptr = begin;
	char const *left = ptr;
	#ifdef _WIN32
	const int sep = ';';
	#else
	const int sep = ':';
	#endif
	while (1) {
	int c = 0;
	if (ptr < end) {
	c = *ptr & 0xff;
	}
	if (c == sep \|\| c == 0) {
	if (left < ptr) {
	out->push_back(std::string(left, ptr));
	}
	if (c == 0) break;
	ptr++;
	left = ptr;
	} else {
	ptr++;
	}
	}
	}

	std::string FileUtil::which(std::string const &name, std::vector<std::string> *out)
	{
	if (out) {
	out->clear();
	}
	char const *p = getenv("PATH");
	if (p) {
	std::vector<std::string> paths;
	split_path(p, &paths);
	for (std::string const &path : paths) {
	std::string t = ::which(name, path);
	if (!t.empty()) {
	if (out) {
	out->push_back(t);
	} else {
	return t;
	}
	}
	}
	}
	if (out && !out->empty()) {
	return out->front();
	}
	return std::string();
	}

	diff --git a/src/FileViewWidget.cpp b/src/FileViewWidget.cpp
	index bb3cee0..375204d 100644
	--- a/src/FileViewWidget.cpp
	+++ b/src/FileViewWidget.cpp
	@@ -1,173 +1,171 @@
	#include "FileViewWidget.h"
	#include <QMenu>
	#include <QPainter>
	#include <QStackedWidget>
	#include <QVBoxLayout>

	#include "common/misc.h"

	FileViewWidget::FileViewWidget(QWidget *parent)
	: QWidget(parent)
	{
	setObjectName(QStringLiteral("FileViewWidget"));
	ui_verticalLayout = new QVBoxLayout(this);
	ui_verticalLayout->setSpacing(0);
	ui_verticalLayout->setObjectName(QStringLiteral("verticalLayout"));
	ui_verticalLayout->setContentsMargins(0, 0, 0, 0);
	ui_stackedWidget = new QStackedWidget(this);
	ui_stackedWidget->setObjectName(QStringLiteral("stackedWidget"));
	ui_page_none = new QWidget();
	ui_page_none->setObjectName(QStringLiteral("page_none"));
	ui_stackedWidget->addWidget(ui_page_none);
	ui_page_text = new X_TextEditorWidget();
	ui_page_text->setObjectName(QStringLiteral("page_text"));
	ui_page_text->setFocusPolicy(Qt::StrongFocus);
	ui_stackedWidget->addWidget(ui_page_text);
	ui_page_image = new X_ImageViewWidget();
	ui_page_image->setObjectName(QStringLiteral("page_image"));
	ui_page_image->setFocusPolicy(Qt::StrongFocus);
	ui_stackedWidget->addWidget(ui_page_image);
	ui_verticalLayout->addWidget(ui_stackedWidget);
	setWindowTitle(QApplication::translate("FileViewWidget", "Form", Q_NULLPTR));
	ui_stackedWidget->setCurrentIndex(1);
	QMetaObject::connectSlotsByName(this);

	ui_page_text->setRenderingMode(TextEditorWidget::DecoratedMode);
	ui_page_text->setTheme(TextEditorTheme::Light());
	ui_page_text->showHeader(false);
	ui_page_text->showFooter(false);
	ui_page_text->setAutoLayout(true);
	ui_page_text->setReadOnly(true);
	ui_page_text->setToggleSelectionAnchorEnabled(false);
	ui_page_text->setFocusFrameVisible(true);

	ui_stackedWidget->setCurrentWidget(ui_page_none);
	}

	-FileViewWidget::~FileViewWidget()
	-{
	-}
	+

	void FileViewWidget::setTextCodec(QTextCodec *codec)
	{
	ui_page_text->setTextCodec(codec);
	}

	void FileViewWidget::bind(MainWindow mw, FileDiffWidget fdw, QScrollBar vsb, QScrollBar hsb, TextEditorThemePtr theme)
	{
	ui_page_text->bindScrollBar(vsb, hsb);
	ui_page_image->bind(mw, fdw, vsb, hsb);
	ui_page_text->setTheme(theme);
	}

	void FileViewWidget::setViewType(FileViewType type)
	{
	view_type = type;
	switch (view_type) {
	case FileViewType::Text:
	ui_stackedWidget->setCurrentWidget(ui_page_text);
	return;
	case FileViewType::Image:
	ui_stackedWidget->setCurrentWidget(ui_page_image);
	return;
	default:
	ui_stackedWidget->setCurrentWidget(ui_page_none);
	return;
	}
	}

	const TextEditorTheme *FileViewWidget::theme() const
	{
	return ui_page_text->theme();
	}

	int FileViewWidget::latin1Width() const
	{
	return ui_page_text->latin1Width();
	}

	int FileViewWidget::lineHeight() const
	{
	return ui_page_text->lineHeight();
	}

	void FileViewWidget::setDiffMode(TextEditorEnginePtr editor_engine, QScrollBar vsb, QScrollBar hsb)
	{
	ui_page_text->setTextEditorEngine(editor_engine);
	return ui_page_text->bindScrollBar(vsb, hsb);
	}

	void FileViewWidget::refrectScrollBar()
	{
	switch (view_type) {
	case FileViewType::Text:
	ui_page_text->refrectScrollBar();
	return;
	case FileViewType::Image:
	ui_page_image->refrectScrollBar();
	return;
	}
	}

	void FileViewWidget::move(int cur_row, int cur_col, int scr_row, int scr_col, bool auto_scroll)
	{
	return ui_page_text->move(cur_row, cur_col, scr_row, scr_col, auto_scroll);
	}

	void FileViewWidget::setImage(QString mimetype, const QByteArray &ba, const QString &object_id, QString const &path)
	{
	setViewType(FileViewType::Image);
	this->source_id = object_id;
	#ifdef APP_GUITAR
	ui_page_image->setImage(mimetype, ba, object_id, path);
	#else
	ui_page_image->setImage(mimetype, ba);
	#endif
	}

	void FileViewWidget::setText(const QList<Document::Line> source, MainWindow mw, const QString &object_id, QString const &object_path)
	{
	setViewType(FileViewType::Text);
	this->source_id = object_id;
	#ifdef APP_GUITAR
	ui_page_text->setDocument(source, mw, object_id, object_path);
	scrollToTop();
	texteditor()->moveCursorOut(); // 現在行を -1 にして、カーソルを非表示にする。
	#else
	ui_page_text->setDocument(source);
	scrollToTop();
	#endif
	}

	void FileViewWidget::setText(QByteArray const &ba, MainWindow *mw, const QString &object_id, QString const &object_path)
	{
	std::vector<std::string> lines;
	char const *begin = ba.data();
	char const *end = begin + ba.size();
	misc::splitLines(begin, end, &lines, true);
	QList<Document::Line> source;
	source.reserve(lines.size());
	int num = 0;
	for (std::string const &line : lines) {
	Document::Line t(line);
	t.line_number = ++num;
	source.push_back(t);
	}
	setText(&source, mw, object_id, object_path);
	}

	void FileViewWidget::scrollToTop()
	{
	ui_page_text->scrollToTop();
	}

	void FileViewWidget::write(QKeyEvent *e)
	{
	ui_page_text->write(e);
	}

	TextEditorWidget *FileViewWidget::texteditor()
	{
	return ui_page_text;
	}

	diff --git a/src/FileViewWidget.h b/src/FileViewWidget.h
	index f454918..2655264 100644
	--- a/src/FileViewWidget.h
	+++ b/src/FileViewWidget.h
	@@ -1,75 +1,77 @@
	#ifndef FILEVIEWWIDGET_H
	#define FILEVIEWWIDGET_H

	#include <QWidget>

	#include "texteditor/TextEditorWidget.h"

	class QScrollBar;
	struct PreEditText;
	class MainWindow;
	class FileDiffWidget;
	class QVBoxLayout;
	class QStackedWidget;

	enum class FileViewType {
	None,
	Text,
	Image,
	};

	#ifdef APP_GUITAR
	#include "MyTextEditorWidget.h"
	#include "MyImageViewWidget.h"
	#else
	#include "ImageViewWidget.h"
	#endif

	class FileViewWidget : public QWidget {
	private:

	#ifdef APP_GUITAR
	using X_TextEditorWidget = MyTextEditorWidget;
	using X_ImageViewWidget = MyImageViewWidget;
	#else
	using X_TextEditorWidget = TextEditorWidget;
	using X_ImageViewWidget = ImageViewWidget;
	#endif

	QVBoxLayout *ui_verticalLayout;
	QStackedWidget *ui_stackedWidget;
	QWidget *ui_page_none;
	X_TextEditorWidget *ui_page_text;
	X_ImageViewWidget *ui_page_image;

	QString source_id;
	FileViewType view_type = FileViewType::None;

	public:
	explicit FileViewWidget(QWidget *parent = 0);
	- ~FileViewWidget();
	+ ~FileViewWidget()
	+ {
	+ }

	void setTextCodec(QTextCodec *codec);

	void setViewType(FileViewType type);

	void setImage(QString mimetype, const QByteArray &ba, QString const &object_id, const QString &path);
	void setText(const QList<Document::Line> source, MainWindow mw, QString const &object_id, const QString &object_path);
	void setText(const QByteArray &ba, MainWindow *mw, const QString &object_id, const QString &object_path);

	void setDiffMode(TextEditorEnginePtr editor_engine, QScrollBar vsb, QScrollBar hsb);

	int latin1Width() const;
	int lineHeight() const;

	TextEditorTheme const *theme() const;
	void scrollToTop();
	void write(QKeyEvent *e);
	void refrectScrollBar();
	void move(int cur_row, int cur_col, int scr_row, int scr_col, bool auto_scroll);

	TextEditorWidget *texteditor();
	void bind(MainWindow mw, FileDiffWidget fdw, QScrollBar vsb, QScrollBar hsb, TextEditorThemePtr theme);
	};

	#endif // FILEVIEWWIDGET_H
	diff --git a/src/Git.cpp b/src/Git.cpp
	index 1ed97e0..b657e4b 100644
	--- a/src/Git.cpp
	+++ b/src/Git.cpp
	@@ -1,1431 +1,1431 @@
	#include "Git.h"
	#include <QDateTime>
	#include <QDebug>
	#include <QDir>
	#include <QDirIterator>
	#include <QProcess>
	#include <QThread>
	#include <QTimer>
	#include <set>
	#include "common/joinpath.h"
	#include "common/misc.h"
	#include "GitObjectManager.h"

	#include "MyProcess.h"

	#define DEBUGLOG 0

	using callback_t = Git::callback_t;

	struct Git::Private {
	QString git_command;
	std::vector<char> result;
	QString error_message;
	int process_exit_code = 0;
	QString working_repo_dir;
	callback_t callback_func = nullptr;
	void *callback_cookie = nullptr;
	};

	Git::Git()
	: m(new Private)
	{
	}

	Git::Git(const Context &cx, QString const &repodir)
	: m(new Private)
	{
	setGitCommand(cx.git_command);
	setWorkingRepositoryDir(repodir);
	}

	Git::~Git()
	{
	delete m;
	}

	void Git::setLogCallback(callback_t func, void *cookie)
	{
	m->callback_func = func;
	m->callback_cookie = cookie;
	}

	void Git::setWorkingRepositoryDir(QString const &repo)
	{
	m->working_repo_dir = repo;
	}

	QString const &Git::workingRepositoryDir() const
	{
	return m->working_repo_dir;
	}

	bool Git::isValidID(const QString &id)
	{
	int zero = 0;
	int n = id.size();
	if (n > 2 && n <= GIT_ID_LENGTH) {
	ushort const *p = id.utf16();
	for (int i = 0; i < n; i++) {
	uchar c = p[i];
	if (c == '0') {
	zero++;
	} else if ((c >= '0' && c <= '9') \|\| (c >= 'a' && c <= 'f')) {
	// ok
	} else {
	return false;
	}
	}
	if (zero == GIT_ID_LENGTH) { // 全部 0 の時は false を返す
	return false;
	}
	return true; // ok
	}
	return false;
	}

	QByteArray Git::toQByteArray() const
	{
	if (m->result.empty()) return QByteArray();
	return QByteArray(&m->result[0], m->result.size());
	}

	QString Git::resultText() const
	{
	return QString::fromUtf8(toQByteArray());
	}
	void Git::setGitCommand(QString const &path)
	{
	m->git_command = path;
	}

	QString Git::gitCommand() const
	{
	Q_ASSERT(m);
	return m->git_command;
	}

	void Git::clearResult()
	{
	m->result.clear();
	m->process_exit_code = 0;
	m->error_message = QString();
	}

	QString Git::errorMessage() const
	{
	return m->error_message;
	}

	int Git::getProcessExitCode() const
	{
	return m->process_exit_code;
	}

	-bool Git::chdirexec(std::function<bool()> fn)
	+bool Git::chdirexec(std::function<bool()> const &fn)
	{
	bool ok = false;
	QDir cwd = QDir::current();
	QString dir = workingRepositoryDir();
	if (isValidWorkingCopy(dir) && QDir::setCurrent(dir)) {

	ok = fn();

	QDir::setCurrent(cwd.path());
	}
	return ok;
	}

	bool Git::git(const QString &arg, bool chdir, bool errout, AbstractPtyProcess *pty)
	{
	QFileInfo info(gitCommand());
	if (!info.isExecutable()) {
	qDebug() << "Invalid git command: " << gitCommand();
	return false;
	}
	#if DEBUGLOG
	qDebug() << "exec: git " << arg;
	QTime timer;
	timer.start();
	#endif
	clearResult();

	auto DoIt = [&](){
	QString cmd = QString("\"%1\" --no-pager ").arg(gitCommand());
	cmd += arg;

	if (m->callback_func) {
	QByteArray ba;
	ba.append("> git ");
	ba.append(arg);
	ba.append('\n');
	m->callback_func(m->callback_cookie, ba.data(), (int)ba.size());
	}

	if (pty) {
	pty->start(cmd);
	m->process_exit_code = 0; // バックグラウンドで実行を継続するけど、とりあえず成功したことにしておく
	} else {
	Process proc;
	proc.start(cmd, false);
	m->process_exit_code = proc.wait();

	if (errout) {
	m->result = proc.errbytes;
	} else {
	m->result = proc.outbytes;
	}
	m->error_message = proc.errstring();
	}

	return m->process_exit_code == 0;
	};

	bool ok = false;

	if (chdir) {
	if (pty) {
	pty->setChangeDir(workingRepositoryDir());
	ok = DoIt();
	} else {
	ok = chdirexec(DoIt);
	}
	} else {
	ok = DoIt();
	}

	#if DEBUGLOG
	qDebug() << timer.elapsed() << "ms";
	#endif

	return ok;
	}

	GitPtr Git::dup() const
	{
	Git *p = new Git();
	p->m->git_command = m->git_command;
	p->m->working_repo_dir = m->working_repo_dir;
	p->m->callback_func = m->callback_func;
	p->m->callback_cookie = m->callback_cookie;
	return GitPtr(p);
	}

	bool Git::isValidWorkingCopy(QString const &dir)
	{
	return QFileInfo(dir).isDir() && QDir(dir / ".git").exists();
	}

	bool Git::isValidWorkingCopy() const
	{
	return isValidWorkingCopy(workingRepositoryDir());
	}

	QString Git::version()
	{
	git("--version", false);
	return resultText().trimmed();
	}

	bool Git::init()
	{
	bool ok = false;
	QDir cwd = QDir::current();
	QString dir = workingRepositoryDir();
	if (QDir::setCurrent(dir)) {
	QString gitdir = dir / ".git";
	if (!QFileInfo(gitdir).isDir()) {
	git("init", false);
	if (QFileInfo(gitdir).isDir()) {
	ok = true;
	}
	}
	QDir::setCurrent(cwd.path());
	}
	return ok;
	}

	QString Git::rev_parse(QString const &name)
	{
	QString cmd = "rev-parse %1";
	cmd = cmd.arg(name);
	if (git(cmd)) {
	return resultText().trimmed();
	}
	return QString();
	}

	QStringList Git::refs()
	{
	QStringList lines;
	{
	QString path = workingRepositoryDir() / ".git/packed-refs";
	QFile file(path);
	if (file.open(QFile::ReadOnly)) {
	while (!file.atEnd()) {
	QByteArray ba = file.readLine();
	QString line = QString::fromLatin1(ba).trimmed();
	if (line.indexOf(" refs/") > 0) {
	lines.push_back(line);
	}
	}
	}
	}
	{
	QString refspath = workingRepositoryDir() / ".git/refs/tags";
	QDirIterator it(refspath);
	while (it.hasNext()) {
	it.next();
	QString path = it.filePath();
	if (QFileInfo(path).isFile()) {
	QString name = it.fileName();
	QFile file(path);
	if (file.open(QFile::ReadOnly)) {
	QByteArray ba = file.readAll();
	QString id = QString::fromLatin1(ba).trimmed();
	if (Git::isValidID(id)) {
	QString line = id + " refs/tags/" + name;
	lines.push_back(line);
	}
	}
	}
	}
	}
	return lines;
	}

	QList<Git::Tag> Git::tags()
	{
	auto MidCmp = [](QString const &line, int i, char const *ptr){
	ushort const *p = line.utf16();
	for (int j = 0; ptr[j]; j++) {
	if (p[i + j] != ptr[j]) return false;
	}
	return true;
	};
	QList<Git::Tag> list;
	QStringList lines = refs();
	for (QString const &line : lines) {
	Tag tag;
	if (line.isEmpty()) continue;
	int i = line.indexOf(' ');
	if (i == GIT_ID_LENGTH) {
	tag.id = line.mid(0, i);
	if (MidCmp(line, i, " refs/tags/")) {
	tag.name = line.mid(i + 11).trimmed();
	if (tag.name.isEmpty()) continue;
	list.push_back(tag);
	}
	}
	}
	return list;
	}

	bool Git::tag(const QString &name, const QString &id)
	{
	QString cmd = "tag \"%1\" %2";
	cmd = cmd.arg(name).arg(id);
	return git(cmd);
	}

	void Git::delete_tag(const QString &name, bool remote)
	{
	QString cmd = "tag --delete \"%1\"";
	cmd = cmd.arg(name);
	git(cmd);

	if (remote) {
	QString cmd = "push --delete origin \"%1\"";
	cmd = cmd.arg(name);
	git(cmd);
	}
	}

	QString Git::diff(QString const &old_id, QString const &new_id)
	{
	QString cmd = "diff --full-index -a %1 %2";
	cmd = cmd.arg(old_id).arg(new_id);
	git(cmd);
	return resultText();
	}

	QString Git::diff_file(QString const &old_path, QString const &new_path)
	{
	QString cmd = "diff --full-index -a -- %1 %2";
	cmd = cmd.arg(old_path).arg(new_path);
	git(cmd);
	return resultText();
	}

	QList<Git::DiffRaw> Git::diff_raw(QString const &old_id, QString const &new_id)
	{
	QList<DiffRaw> list;
	QString cmd = "diff --raw --abbrev=%1 %2 %3";
	cmd = cmd.arg(GIT_ID_LENGTH).arg(old_id).arg(new_id);
	git(cmd);
	QString text = resultText();
	QStringList lines = text.split('\n', QString::SkipEmptyParts);
	for (QString const &line : lines) { // raw format: e.g. ":100644 100644 08bc10d... 18f0501... M src/MainWindow.cpp"
	DiffRaw item;
	int colon = line.indexOf(':');
	int tab = line.indexOf('\t');
	if (colon >= 0 && colon < tab) {
	QStringList header = line.mid(colon + 1, tab - colon - 1).split(' ', QString::SkipEmptyParts); // コロンとタブの間の文字列を空白で分割
	if (header.size() >= 5) {
	QStringList files = line.mid(tab + 1).split('\t', QString::SkipEmptyParts); // タブより後ろはファイルパス
	- if (files.size() > 0) {
	+ if (!files.empty()) {
	for (QString &file : files) {
	file = Git::trimPath(file);
	}
	item.a.id = header[2];
	item.b.id = header[3];
	item.a.mode = header[0];
	item.b.mode = header[1];
	item.state = header[4];
	item.files = files;
	list.push_back(item);
	}
	}
	}
	}
	return list;
	}

	QString Git::diff_to_file(QString const &old_id, QString const &path)
	{
	#if 1
	QString cmd = "diff --full-index -a %1 -- \"%2\"";
	cmd = cmd.arg(old_id).arg(path);
	git(cmd);
	return resultText();
	#else
	return diff_(old_id, new_id);
	#endif
	}

	QString Git::getCurrentBranchName()
	{
	if (isValidWorkingCopy()) {
	git("rev-parse --abbrev-ref HEAD");
	QString s = resultText().trimmed();
	if (!s.isEmpty() && !s.startsWith("fatal:") && s.indexOf(' ') < 0) {
	return s;
	}
	}
	return QString();
	}

	QStringList Git::getUntrackedFiles()
	{
	QStringList files;
	Git::FileStatusList stats = status();
	for (FileStatus const &s : stats) {
	if (s.code() == FileStatusCode::Untracked) {
	files.push_back(s.path1());
	}
	}
	return files;
	}

	void Git::parseAheadBehind(QString const &s, Branch *b)
	{
	ushort const *begin = s.utf16();
	ushort const *end = begin + s.size();
	ushort const *ptr = begin;

	auto NCompare = [](ushort const a, char const b, size_t n){
	for (size_t i = 0; i < n; i++) {
	if (a < (unsigned char)b) return false;
	if (a > (unsigned char)b) return false;
	if (!*a) break;
	a++;
	b++;
	}
	return true;
	};

	auto SkipSpace = [&](){
	while (ptr < end && QChar(*ptr).isSpace()) {
	ptr++;
	}
	};

	auto GetNumber = [&](){
	int n = 0;
	while (ptr < end && QChar(*ptr).isDigit()) {
	n = n * 10 + (*ptr - '0');
	ptr++;
	}
	return n;
	};

	if (*ptr == '[') {
	ptr++;
	ushort const *e = nullptr;
	int n;
	for (n = 0; ptr + n < end; n++) {
	if (ptr[n] == ']') {
	e = ptr + n;
	break;
	}
	}
	if (e) {
	end = e;
	while (1) {
	if (NCompare(ptr, "ahead ", 6)) {
	ptr += 6;
	SkipSpace();
	b->ahead = GetNumber();
	} else if (NCompare(ptr, "behind ", 7)) {
	ptr += 7;
	SkipSpace();
	b->behind = GetNumber();
	} else {
	ushort c = 0;
	if (ptr < end) {
	c = *ptr;
	}
	if (c == 0) break;
	ptr++;
	}
	}
	}
	}
	}

	QList<Git::Branch> Git::branches()
	{
	QList<Branch> branches;
	git(QString("branch -vv -a --abbrev=%1").arg(GIT_ID_LENGTH));
	QString s = resultText();
	#if DEBUGLOG
	qDebug() << s;
	#endif

	QStringList lines = misc::splitLines(s);
	for (QString const &line : lines) {
	if (line.size() > 2) {
	QString name;
	QString text = line.mid(2);
	int pos = 0;
	if (text.startsWith('(')) {
	int i, paren = 1;
	for (i = 1; i < text.size(); i++) {
	if (text[i] == '(') {
	paren++;
	} else if (text[i] == ')') {
	if (paren > 0) {
	paren--;
	if (paren == 0) {
	pos = i;
	break;
	}
	}
	}
	}
	// pos = text.indexOf(')');
	if (pos > 1) {
	name = text.mid(1, pos - 1);
	pos++;
	}
	} else {
	while (pos < text.size() && !QChar::isSpace(text.utf16()[pos])) {
	pos++;
	}
	name = text.mid(0, pos);
	}
	if (!name.isEmpty()) {
	while (pos < text.size() && QChar::isSpace(text.utf16()[pos])) {
	pos++;
	}
	text = text.mid(pos);

	Branch b;

	if (name.startsWith("HEAD detached at ")) {
	b.flags \|= Branch::HeadDetachedAt;
	name = name.mid(17);
	}

	if (name.startsWith("HEAD detached from ")) {
	b.flags \|= Branch::HeadDetachedFrom;
	name = name.mid(19);
	}

	if (name.startsWith("remotes/")) {
	name = name.mid(8);
	int i = name.indexOf('/');
	if (i > 0) {
	b.remote = name.mid(0, i);
	name = name.mid(i + 1);
	}
	}

	b.name = name;

	if (text.startsWith("-> ")) {
	b.id = ">" + text.mid(3);
	} else {
	int i = text.indexOf(' ');
	if (i == GIT_ID_LENGTH) {
	b.id = text.mid(0, GIT_ID_LENGTH);
	}
	while (i < text.size() && QChar::isSpace(text.utf16()[i])) {
	i++;
	}
	text = text.mid(i);
	parseAheadBehind(text, &b);
	}

	if (line.startsWith('*')) {
	b.flags \|= Branch::Current;
	}

	branches.push_back(b);
	}
	}
	}
	for (int i = 0; i < branches.size(); i++) {
	Branch *b = &branches[i];
	if (b->id.startsWith('>')) {
	QString name = b->id.mid(1);
	for (int j = 0; j < branches.size(); j++) {
	if (j != i) {
	if (branches[j].name == name) {
	branches[i].id = branches[j].id;
	break;
	}
	}
	}
	}
	}
	return branches;
	}

	Git::CommitItemList Git::log_all(QString const &id, int maxcount)
	{
	CommitItemList items;
	QString text;

	QString cmd = "log --pretty=format:\"commit:%H#gpg:%G?#key:%GK#parent:%P#author:%an#mail:%ae#date:%ci##%s\" --all -%1 %2";
	cmd = cmd.arg(maxcount).arg(id);
	git(cmd);
	if (getProcessExitCode() == 0) {
	text = resultText().trimmed();
	QStringList lines = misc::splitLines(text);
	for (QString const &line : lines) {
	int i = line.indexOf("##");
	if (i > 0) {
	Git::CommitItem item;
	QString signed_key;
	item.message = line.mid(i + 2);
	QStringList atts = line.mid(0, i).split('#');
	for (QString const &s : atts) {
	int j = s.indexOf(':');
	if (j > 0) {
	QString key = s.mid(0, j);
	QString val = s.mid(j + 1);
	if (key == "commit") {
	item.commit_id = val;
	} else if (key == "gpg") {
	item.signature = *val.utf16();
	} else if (key == "key") {
	signed_key = val;
	} else if (key == "parent") {
	item.parent_ids = val.split(' ', QString::SkipEmptyParts);
	} else if (key == "author") {
	item.author = val;
	} else if (key == "mail") {
	item.email = val;
	} else if (key == "date") {
	item.commit_date = QDateTime::fromString(val, Qt::ISODate).toLocalTime();
	} else if (key == "debug") {
	}
	}
	}
	if (!signed_key.isEmpty()) {
	ushort const *begin = signed_key.utf16();
	int n = signed_key.size();
	for (int i = 0; i + 1 < n; i += 2) {
	ushort c = begin[i];
	ushort d = begin[i + 1];
	- if (c < 0x80 && c < 0x80 && isxdigit(c) && isxdigit(d)) {
	+ if (c < 0x80 && isxdigit(c) && isxdigit(d)) {
	char tmp[3];
	tmp[0] = c;
	tmp[1] = d;
	tmp[2] = 0;
	int v = strtol(tmp, nullptr, 16);
	item.fingerprint.push_back(v);
	} else {
	break;
	}
	}
	}
	items.push_back(item);
	}
	}
	}
	return items;
	}

	Git::CommitItemList Git::log(int maxcount)
	{
	return log_all(QString(), maxcount);
	}

	bool Git::queryCommit(QString const &id, CommitItem *out)
	{
	if (objectType(id) == "commit") {
	out->commit_id = id;
	QByteArray ba;
	if (cat_file(id, &ba)) {
	QStringList lines = misc::splitLines(ba, [](char const *p, size_t n){
	return QString::fromUtf8(p, (int)n);
	});
	- while (lines.size() > 0 && lines[lines.size() - 1].isEmpty()) {
	+ while (!lines.empty() && lines[lines.size() - 1].isEmpty()) {
	lines.pop_back();
	}

	int i;
	for (i = 0; i < lines.size(); i++) {
	QString const &line = lines[i];
	if (line.isEmpty()) {
	i++;
	for (; i < lines.size(); i++) {
	QString const &line = lines[i];
	if (!out->message.isEmpty()) {
	out->message.append('\n');
	}
	out->message.append(line);
	}
	break;
	}
	if (line.startsWith("parent ")) {
	out->parent_ids.push_back(line.mid(7));
	} else if (line.startsWith("author ")) {
	QStringList arr = misc::splitWords(line);
	int n = arr.size();
	if (n > 4) {
	n -= 2;
	out->commit_date = QDateTime::fromTime_t(atol(arr[n].toStdString().c_str()));
	n--;
	out->email = arr[n];
	if (out->email.startsWith('<') && out->email.endsWith('>')) {
	int n = out->email.size();
	out->email = out->email.mid(1, n - 2);
	}
	for (int i = 1; i < n; i++) {
	if (!out->author.isEmpty()) {
	out->author += ' ';
	}
	out->author += arr[i];
	}
	}
	}
	}
	}
	return true;
	}
	return false;
	}

	Git::CloneData Git::preclone(QString const &url, QString const &path)
	{
	CloneData d;
	d.url = url;
	if (path.endsWith('/') \|\| path.endsWith('\\')) {
	auto GitBaseName = [](QString location){
	int i = location.lastIndexOf('/');
	int j = location.lastIndexOf('\\');
	if (i < j) i = j;
	i = i < 0 ? 0 : (i + 1);
	j = location.size();
	if (location.endsWith(".git")) {
	j -= 4;
	}
	if (i < j) {
	location = location.mid(i, j - i);
	}
	return location;
	};
	d.basedir = path;
	d.subdir = GitBaseName(url);
	} else {
	QFileInfo info(path);
	d.basedir = info.dir().path();
	d.subdir = info.fileName();
	}
	return d;
	}

	bool Git::clone(CloneData const &data, AbstractPtyProcess *pty)
	{
	QString clone_to = data.basedir / data.subdir;
	m->working_repo_dir = misc::normalizePathSeparator(clone_to);

	bool ok = false;
	QDir cwd = QDir::current();

	auto DoIt = [&](){
	QString cmd = "clone --progress \"%1\" \"%2\"";
	cmd = cmd.arg(data.url).arg(data.subdir);
	ok = git(cmd, false, true, pty);
	};

	if (pty) {
	pty->setChangeDir(data.basedir);
	DoIt();
	} else {
	if (QDir::setCurrent(data.basedir)) {
	DoIt();
	QDir::setCurrent(cwd.path());
	}
	}

	return ok;
	}

	QString Git::encodeQuotedText(const QString &str)
	{
	std::vector<ushort> vec;
	ushort const *begin = str.utf16();
	ushort const *end = begin + str.size();
	ushort const *ptr = begin;
	vec.push_back('\"');
	while (ptr < end) {
	ushort c = *ptr;
	ptr++;
	if (c == '\"') { // triple quotes
	vec.push_back(c);
	vec.push_back(c);
	vec.push_back(c);
	} else {
	vec.push_back(c);
	}
	}
	vec.push_back('\"');
	return QString::fromUtf16(&vec[0], vec.size());
	}

	bool Git::commit_(QString const &msg, bool amend, bool sign, AbstractPtyProcess *pty)
	{
	QString cmd = "commit";
	if (amend) {
	cmd += " --amend";
	}
	if (sign) {
	cmd += " -S";
	}

	QString text = msg.trimmed();
	if (text.isEmpty()) {
	text = "no message";
	}
	text = encodeQuotedText(text);
	cmd += QString(" -m %1").arg(text);

	return git(cmd, true, false, pty);
	}

	bool Git::commit(QString const &text, bool sign, AbstractPtyProcess *pty)
	{
	return commit_(text, false, sign, pty);
	}

	bool Git::commit_amend_m(const QString &text, bool sign, AbstractPtyProcess *pty)
	{
	return commit_(text, true, sign, pty);
	}

	bool Git::revert(const QString &id)
	{
	QString cmd = "revert %1";
	cmd = cmd.arg(id);
	return git(cmd);
	}

	void Git::push_u(QString const &remote, QString const &branch, AbstractPtyProcess *pty)
	{
	if (remote.indexOf('\"') >= 0 \|\| branch.indexOf('\"') >= 0) {
	return;
	}
	QString cmd = "push -u \"%1\" \"%2\"";
	git(cmd.arg(remote).arg(branch), true, false, pty);
	}

	bool Git::push_(bool tags, AbstractPtyProcess *pty)
	{
	QString cmd = "push";
	if (tags) {
	cmd += " --tags";
	}
	return git(cmd, true, false, pty);
	}

	bool Git::push(bool tags, AbstractPtyProcess *pty)
	{
	return push_(tags, pty);
	}


	Git::FileStatusList Git::status_()
	{
	FileStatusList files;
	if (git("status -s -u --porcelain")) {
	QString text = resultText();
	QStringList lines = misc::splitLines(text);
	for (QString const &line : lines) {
	if (line.size() > 3) {
	FileStatus s(line);
	if (s.code() != FileStatusCode::Unknown) {
	files.push_back(s);
	}
	}
	}
	}
	return files;
	}

	Git::FileStatusList Git::status()
	{
	return status_();
	}

	QString Git::objectType(QString const &id)
	{
	git("cat-file -t " + id);
	return resultText().trimmed();
	}

	QByteArray Git::cat_file_(QString const &id)
	{
	git("cat-file -p " + id);
	return toQByteArray();
	}

	bool Git::cat_file(QString const &id, QByteArray *out)
	{
	if (isValidID(id)) {
	*out = cat_file_(id);
	return true;
	}
	return false;
	}

	void Git::resetFile(const QString &path)
	{
	git("checkout -- " + path);
	}

	void Git::resetAllFiles()
	{
	git("reset --hard HEAD");
	}

	void Git::removeFile(const QString &path)
	{
	git("rm " + path);
	}

	void Git::stage(QString const &path)
	{
	git("add " + path);
	}

	void Git::stage(QStringList const &paths)
	{
	QString cmd = "add";
	for (QString const &path : paths) {
	cmd += ' ';
	cmd += '\"';
	cmd += path;
	cmd += '\"';
	}
	git(cmd);
	}

	void Git::unstage(QString const &path)
	{
	QString cmd = "reset HEAD \"%1\"";
	git(cmd.arg(path));
	}

	void Git::unstage(QStringList const &paths)
	{
	QString cmd = "reset HEAD";
	for (QString const &path : paths) {
	cmd += " \"";
	cmd += path;
	cmd += '\"';
	}
	git(cmd);
	}

	void Git::pull(AbstractPtyProcess *pty)
	{
	git("pull", true, false, pty);
	}

	void Git::fetch(AbstractPtyProcess *pty)
	{
	git("fetch", true, false, pty);
	}

	void Git::rebaseOnto(QString const &newbase, QString const &upstream, QString const &branch, AbstractPtyProcess *pty)
	{
	QString cmd = "rebase --onto \"%1\" \"%2\" \"%3\"";
	cmd = cmd.arg(newbase).arg(upstream).arg(branch);
	git(cmd, true, false, pty);
	}

	QStringList Git::make_branch_list_()
	{
	QStringList list;
	QStringList l = misc::splitLines(resultText());
	for (QString const &s : l) {
	if (s.startsWith("* ")) list.push_back(s.mid(2));
	if (s.startsWith(" ")) list.push_back(s.mid(2));
	}
	return list;
	}

	void Git::createBranch(QString const &name)
	{
	git("branch " + name);
	}

	void Git::checkoutBranch(QString const &name)
	{
	git("checkout " + name);
	}

	void Git::cherrypick(QString const &name)
	{
	git("cherry-pick " + name);
	}

	void Git::mergeBranch(QString const &name)
	{
	git("merge " + name);
	}

	void Git::rebaseBranch(QString const &name)
	{
	git("rebase " + name);
	}

	QStringList Git::getRemotes()
	{
	QStringList ret;
	git("remote");
	QStringList lines = misc::splitLines(resultText());
	for (QString const &line: lines) {
	if (!line.isEmpty()) {
	ret.push_back(line);
	}
	}
	return ret;
	}

	Git::User Git::getUser(Source purpose)
	{
	User user;
	bool global = purpose == Git::Source::Global;
	bool local = purpose == Git::Source::Local;
	QString arg1;
	if (global) arg1 = "--global";
	if (local) arg1 = "--local";
	bool chdir = !global;
	if (git(QString("config %1 user.name").arg(arg1), chdir)) {
	user.name = resultText().trimmed();
	}
	if (git(QString("config %1 user.email").arg(arg1), chdir)) {
	user.email = resultText().trimmed();
	}
	return user;
	}

	void Git::setUser(const User &user, bool global)
	{
	bool chdir = !global;
	git(QString("config %1 user.name %2").arg(global ? "--global" : "").arg(encodeQuotedText(user.name)), chdir);
	git(QString("config %1 user.email %2").arg(global ? "--global" : "").arg(encodeQuotedText(user.email)), chdir);
	}

	bool Git::reset_head1()
	{
	return git("reset HEAD~1");
	}

	bool Git::rm_cached(QString const &file)
	{
	QString cmd = "rm --cached \"%1\"";
	return git(cmd.arg(file));
	}

	void Git::getRemoteURLs(QList<Remote> *out)
	{
	out->clear();
	git("remote -v");
	QStringList lines = misc::splitLines(resultText());
	for (QString const &line : lines) {
	int i = line.indexOf('\t');
	int j = line.indexOf(" (");
	if (i > 0 && i < j) {
	Remote r;
	r.name = line.mid(0, i);
	r.url = line.mid(i + 1, j - i - 1);
	r.purpose = line.mid(j + 1);
	if (r.purpose.startsWith('(') && r.purpose.endsWith(')')) {
	r.purpose = r.purpose.mid(1, r.purpose.size() - 2);
	}
	out->push_back(r);
	}
	}
	}

	void Git::setRemoteURL(QString const &name, QString const &url)
	{
	QString cmd = "remote set-url %1 %2";
	cmd = cmd.arg(encodeQuotedText(name)).arg(encodeQuotedText(url));
	git(cmd);
	}

	void Git::addRemoteURL(QString const &name, QString const &url)
	{
	QString cmd = "remote add \"%1\" \"%2\"";
	cmd = cmd.arg(encodeQuotedText(name)).arg(encodeQuotedText(url));
	git(cmd);
	}

	void Git::removeRemote(QString const &name)
	{
	QString cmd = "remote remove %1";
	cmd = cmd.arg(encodeQuotedText(name));
	git(cmd);
	}

	bool Git::reflog(ReflogItemList *out, int maxcount)
	{
	out->clear();
	QString cmd = "reflog --no-abbrev --raw -n %1";
	cmd = cmd.arg(maxcount);
	if (!git(cmd)) return false;
	QByteArray ba = toQByteArray();
	if (!ba.isEmpty()) {
	ReflogItem item;
	char const *begin = ba.data();
	char const *end = begin + ba.size();
	char const *left = begin;
	char const *ptr = begin;
	while (1) {
	int c = 0;
	if (ptr < end) {
	c = *ptr;
	}
	if (c == '\r' \|\| c == '\n' \|\| c == 0) {
	int d = 0;
	QString line = QString::fromUtf8(left, ptr - left);
	if (left < ptr) {
	d = *left & 0xff;
	}
	if (d == ':') {
	// ex. ":100644 100644 bb603836fb597cca994309a1f0a52251d6b20314 d6b9798854debee375bb419f0f2ed9c8437f1932 M\tsrc/MainWindow.cpp"
	int tab = line.indexOf('\t');
	if (tab > 1) {
	QString tmp = line.mid(1, tab - 1);
	QString path = line.mid(tab + 1);
	QStringList cols = misc::splitWords(tmp);
	if (!path.isEmpty() && cols.size() == 5) {
	ReflogItem::File file;
	file.atts_a = cols[0];
	file.atts_b = cols[1];
	file.id_a = cols[2];
	file.id_b = cols[3];
	file.type = cols[4];
	file.path = path;
	item.files.push_back(file);
	}
	}
	} else {
	bool start = isxdigit(d);
	if (start \|\| c == 0) {
	if (!item.id.isEmpty()) {
	out->push_back(item);
	}
	}
	if (start) {
	// ex. "0a2a8b6b66f48bcbf985d8a2afcd14ff41676c16 HEAD@{188}: commit: comment text"
	item = ReflogItem();
	int i = line.indexOf(": ");
	if (i > 0) {
	int j = line.indexOf(": ", i + 2);
	if (j > 2) {
	item.head = line.mid(0, i);
	item.command = line.mid(i + 2, j - i - 2);
	item.comment= line.mid(j + 2);
	if (item.head.size() > GIT_ID_LENGTH) {
	item.id = item.head.mid(0, GIT_ID_LENGTH);
	item.head = item.head.mid(GIT_ID_LENGTH + 1);
	}
	}
	}
	}
	}
	if (c == 0) break;
	ptr++;
	left = ptr;
	} else {
	ptr++;
	}
	}
	}
	return true;
	}

	// Git::FileStatus

	QString Git::trimPath(QString const &s)
	{
	ushort const *begin = s.utf16();
	ushort const *end = begin + s.size();
	ushort const *left = begin;
	ushort const *right = end;
	while (left < right && QChar(*left).isSpace()) left++;
	while (left < right && QChar(right[-1]).isSpace()) right--;
	if (left + 1 < right && *left == '\"' && right[-1] == '\"') { // if quoted ?
	left++;
	right--;
	QByteArray ba;
	ushort const *ptr = left;
	while (ptr < right) {
	ushort c = *ptr;
	ptr++;
	if (c == '\\') {
	c = 0;
	while (ptr < right && QChar(*ptr).isDigit()) { // decode \oct
	c = c * 8 + (*ptr - '0');
	ptr++;
	}
	}
	ba.push_back(c);
	}
	return QString::fromUtf8(ba);
	}
	if (left == begin && right == end) return s;
	return QString::fromUtf16(left, right - left);
	}

	Git::FileStatusCode Git::FileStatus::parseFileStatusCode(char x, char y)
	{
	if (x == ' ' && (y == 'M' \|\| y == 'D')) return FileStatusCode::NotUpdated;
	if (x == 'M' && (y == 'M' \|\| y == 'D' \|\| y == ' ')) return FileStatusCode::UpdatedInIndex;
	if (x == 'A' && (y == 'M' \|\| y == 'D' \|\| y == ' ')) return FileStatusCode::AddedToIndex;
	if (x == 'D' && (y == 'M' \|\| y == ' ')) return FileStatusCode::DeletedFromIndex;
	if (x == 'R' && (y == 'M' \|\| y == 'D' \|\| y == ' ')) return FileStatusCode::RenamedInIndex;
	if (x == 'C' && (y == 'M' \|\| y == 'D' \|\| y == ' ')) return FileStatusCode::CopiedInIndex;
	if (x == 'C' && (y == 'M' \|\| y == 'D' \|\| y == ' ')) return FileStatusCode::CopiedInIndex;
	if (x == 'D' && y == 'D') return FileStatusCode::Unmerged_BothDeleted;
	if (x == 'A' && y == 'U') return FileStatusCode::Unmerged_AddedByUs;
	if (x == 'U' && y == 'D') return FileStatusCode::Unmerged_DeletedByThem;
	if (x == 'U' && y == 'A') return FileStatusCode::Unmerged_AddedByThem;
	if (x == 'D' && y == 'U') return FileStatusCode::Unmerged_DeletedByUs;
	if (x == 'A' && y == 'A') return FileStatusCode::Unmerged_BothAdded;
	if (x == 'U' && y == 'U') return FileStatusCode::Unmerged_BothModified;
	if (x == '?' && y == '?') return FileStatusCode::Untracked;
	if (x == '!' && y == '!') return FileStatusCode::Ignored;
	return FileStatusCode::Unknown;
	}

	void Git::FileStatus::parse(const QString &text)
	{
	data = Data();
	if (text.size() > 3) {
	ushort const *p = text.utf16();
	if (p[2] == ' ') {
	data.code_x = p[0];
	data.code_y = p[1];

	int i = text.indexOf(" -> ", 3);
	if (i > 3) {
	data.rawpath1 = text.mid(3, i - 3);
	data.rawpath2 = text.mid(i + 4);
	data.path1 = trimPath(data.rawpath1);
	data.path2 = trimPath(data.rawpath2);
	} else {
	data.rawpath1 = text.mid(3);
	data.path1 = trimPath(data.rawpath1);
	data.path2 = QString();
	}

	data.code = parseFileStatusCode(data.code_x, data.code_y);
	}
	}
	}

	QByteArray Git::blame(QString const &path)
	{
	QString cmd = "blame --abbrev=40 \"%1\"";
	cmd = cmd.arg(path);
	if (git(cmd)) {
	return toQByteArray();
	}
	return QByteArray();
	}

	QList<Git::RemoteInfo> Git::ls_remote()
	{
	QList<RemoteInfo> list;
	QString cmd = "ls-remote";
	if (git(cmd)) {
	QStringList lines = misc::splitLines(resultText());
	for (QString const &line : lines) {
	QStringList words = misc::splitWords(line);
	if (words.size() == 2 && isValidID(words[0])) {
	RemoteInfo info;
	info.commit_id = words[0];
	info.name = words[1];
	list.push_back(info);
	}
	}
	}
	return list;
	}

	QString Git::signingKey(Source purpose)
	{
	QString arg1;
	if (purpose == Source::Global) arg1 = "--global";
	if (purpose == Source::Local) arg1 = "--local";
	QString cmd = "config %1 user.signingkey";
	cmd = cmd.arg(arg1);
	bool chdir = purpose != Source::Global;
	if (git(cmd, chdir)) {
	return resultText().trimmed();
	}
	return QString();
	}

	bool Git::setSigningKey(QString const &id, bool global)
	{
	- for (int i = 0; i < id.size(); i++) {
	- if (!QChar(id[i]).isLetterOrNumber()) return false;
	+ for (auto i : id) {
	+ if (!QChar(i).isLetterOrNumber()) return false;
	}

	QString cmd = "config %1 %2 user.signingkey %3";
	cmd = cmd.arg(global ? "--global" : "--local").arg(id.isEmpty() ? "--unset" : "").arg(id);
	return git(cmd, !global);
	}

	Git::SignPolicy Git::signPolicy(Source source)
	{
	QString arg1;
	if (source == Source::Global) arg1 = "--global";
	if (source == Source::Local) arg1 = "--local";
	QString cmd = "config %1 commit.gpgsign";
	cmd = cmd.arg(arg1);
	bool chdir = source != Source::Global;
	if (git(cmd, chdir)) {
	QString t = resultText().trimmed();
	if (t == "false") return SignPolicy::False;
	if (t == "true") return SignPolicy::True;
	}
	return SignPolicy::Unset;
	}

	bool Git::setSignPolicy(Source source, SignPolicy policy)
	{
	QString arg1;
	if (source == Source::Global) arg1 = "--global";
	if (source == Source::Local) arg1 = "--local";
	QString cmd = "config %1 %2 commit.gpgsign %3";
	QString arg2;
	QString arg3;
	if (policy == SignPolicy::False) {
	arg3 = "false";
	} else if (policy == SignPolicy::True) {
	arg3 = "true";
	} else {
	arg2 = "--unset";
	}
	cmd = cmd.arg(arg1).arg(arg2).arg(arg3);
	bool chdir = source != Source::Global;
	return git(cmd, chdir);
	}

	bool Git::configGpgProgram(QString const &path, bool global)
	{
	QString cmd = "config ";
	if (global) {
	cmd += "--global ";
	}
	if (path.isEmpty()) {
	cmd += "--unset ";
	}
	cmd += "gpg.program ";
	if (!path.isEmpty()) {
	cmd += QString("\"%1\"").arg(path);
	}
	return git(cmd, false);
	}

	// Diff

	void Git::Diff::makeForSingleFile(Git::Diff *diff, const QString &id_a, const QString &id_b, const QString &path, QString const &mode)
	{
	diff->diff = QString("diff --git a/%1 b/%2").arg(path).arg(path);
	diff->index = QString("index %1..%2 %3").arg(id_a).arg(id_b).arg(0);
	diff->blob.a_id = id_a;
	diff->blob.b_id = id_b;
	diff->path = path;
	diff->mode = mode;
	diff->type = Git::Diff::Type::Create;
	}

	//

	void parseDiff(std::string const &s, Git::Diff const info, Git::Diff out)
	{
	std::vector<std::string> lines;
	{
	char const *begin = s.c_str();
	char const *end = begin + s.size();
	misc::splitLines(begin, end, &lines, false);
	}


	out->diff = QString("diff --git ") + ("a/" + info->path) + ' ' + ("b/" + info->path);
	out->index = QString("index ") + info->blob.a_id + ".." + info->blob.b_id + ' ' + info->mode;
	out->path = info->path;
	out->blob = info->blob;

	bool atat = false;
	for (std::string const &line : lines) {
	int c = line[0] & 0xff;
	if (c == '@') {
	if (strncmp(line.c_str(), "@@ ", 3) == 0) {
	out->hunks.push_back(Git::Hunk());
	out->hunks.back().at = line;
	atat = true;
	}
	} else {
	if (atat && c == '\\') { // e.g. \ No newline at end of file...
	// ignore this line
	} else {
	if (atat) {
	if (c == ' ' \|\| c == '-' \|\| c == '+') {
	// nop
	} else {
	atat = false;
	}
	}
	if (atat) {
	if (!out->hunks.isEmpty()) {
	out->hunks.back().lines.push_back(line);
	}
	}
	}
	}
	}
	}

	diff --git a/src/Git.h b/src/Git.h
	index 91bff83..2b2d000 100644
	--- a/src/Git.h
	+++ b/src/Git.h
	@@ -1,485 +1,485 @@
	#ifndef GIT_H
	#define GIT_H

	#include "AbstractProcess.h"

	#include <QDateTime>
	#include <QObject>
	#include <functional>

	#include <QDebug>
	#include <QMutex>
	#include <memory>

	#define SINGLE_THREAD 0

	#define GIT_ID_LENGTH (40)

	class Win32PtyProcess;

	enum class LineSide {
	Left,
	Right,
	};

	struct TreeLine {
	int index;
	int depth;
	int color_number = 0;
	bool bend_early = false;
	TreeLine(int index = -1, int depth = -1)
	: index(index)
	, depth(depth)
	{
	}
	};

	struct NamedCommitItem {
	enum class Type {
	None,
	Branch,
	Tag,
	};
	Type type = Type::None;
	QString remote;
	QString name;
	QString id;
	};
	typedef QList<NamedCommitItem> NamedCommitList;


	class Git;
	typedef std::shared_ptr<Git> GitPtr;

	class Git : QObject {
	public:
	class Context {
	public:
	QString git_command;
	};

	struct Object {
	enum class Type {
	UNKNOWN = 0,
	COMMIT = 1,
	TREE = 2,
	BLOB = 3,
	TAG = 4,
	UNDEFINED = 5,
	OFS_DELTA = 6,
	REF_DELTA = 7,
	};
	Type type = Type::UNKNOWN;
	QByteArray content;
	};

	class Hunk {
	public:
	std::string at;
	std::vector<std::string> lines;
	};
	class Diff {
	public:
	enum class Type {
	Unknown,
	Modify,
	Copy,
	Rename,
	Create,
	Delete,
	ChType,
	Unmerged,
	};
	Type type = Type::Unknown;
	QString diff;
	QString index;
	QString path;
	QString mode;
	struct BLOB_AB_ {
	QString a_id;
	QString b_id;
	} blob;
	QList<Hunk> hunks;
	Diff()
	{
	}
	Diff(const QString &id, const QString &path, const QString &mode)
	{
	makeForSingleFile(this, QString(GIT_ID_LENGTH, '0'), id, path, mode);

	}
	private:
	void makeForSingleFile(Git::Diff *diff, const QString &id_a, const QString &id_b, const QString &path, const QString &mode);
	};

	enum class SignatureGrade {
	NoSignature,
	Unknown,
	Good,
	Dubious,
	Missing,
	Bad,
	};

	static SignatureGrade evaluateSignature(char s)
	{
	switch (s) {
	case 'G':
	return SignatureGrade::Good;
	case 'U':
	case 'X':
	case 'Y':
	return SignatureGrade::Dubious;
	case 'B':
	case 'R':
	return SignatureGrade::Bad;
	case 'E':
	return SignatureGrade::Missing;
	case 'N':
	case ' ':
	case 0:
	return SignatureGrade::NoSignature;
	}
	return SignatureGrade::Unknown;
	}

	struct CommitItem {
	QString commit_id;
	QStringList parent_ids;
	QString author;
	QString email;
	QString message;
	QDateTime commit_date;
	std::vector<TreeLine> parent_lines;
	QByteArray fingerprint;
	char signature = 0; // git log format:%G?
	bool has_child = false;
	int marker_depth = -1;
	bool resolved = false;

	};
	typedef std::vector<CommitItem> CommitItemList;

	static bool isUncommited(CommitItem const &item)
	{
	return item.commit_id.isEmpty();
	}

	struct Branch {
	QString name;
	QString id;
	QString remote;
	int ahead = 0;
	int behind = 0;
	enum {
	None,
	Current = 0x0001,
	HeadDetachedAt = 0x0002,
	HeadDetachedFrom = 0x0004,
	};
	int flags = 0;
	operator bool () const
	{
	if (name.isEmpty()) return false;
	if (id.isEmpty()) return false;
	return true;
	}
	bool isCurrent() const
	{
	return flags & Current;
	}
	bool isHeadDetached() const
	{
	return flags & HeadDetachedAt;
	}
	};

	struct Tag {
	QString name;
	QString id;
	};

	enum class FileStatusCode : unsigned int {
	Unknown,
	Ignored,
	Untracked,
	NotUpdated = 0x10000000,
	Staged_ = 0x20000000,
	UpdatedInIndex,
	AddedToIndex,
	DeletedFromIndex,
	RenamedInIndex,
	CopiedInIndex,
	Unmerged_ = 0x40000000,
	Unmerged_BothDeleted,
	Unmerged_AddedByUs,
	Unmerged_DeletedByThem,
	Unmerged_AddedByThem,
	Unmerged_DeletedByUs,
	Unmerged_BothAdded,
	Unmerged_BothModified,
	Tracked_ = 0xf0000000
	};

	class FileStatus {
	public:
	struct Data {
	char code_x = 0;
	char code_y = 0;
	FileStatusCode code = FileStatusCode::Unknown;
	QString rawpath1;
	QString rawpath2;
	QString path1;
	QString path2;
	} data;

	static FileStatusCode parseFileStatusCode(char x, char y);

	bool isStaged() const
	{
	return (int)data.code & (int)FileStatusCode::Staged_;
	}

	bool isUnmerged() const
	{
	return (int)data.code & (int)FileStatusCode::Unmerged_;
	}

	bool isTracked() const
	{
	return (int)data.code & (int)FileStatusCode::Tracked_;
	}

	void parse(QString const &text);

	FileStatus()
	{
	}

	FileStatus(QString const &text)
	{
	parse(text);
	}

	FileStatusCode code() const
	{
	return data.code;
	}

	int code_x() const
	{
	return data.code_x;
	}

	int code_y() const
	{
	return data.code_y;
	}

	bool isDeleted() const
	{
	return code_x() == 'D' \|\| code_y() == 'D';
	}

	QString path1() const
	{
	return data.path1;
	}

	QString path2() const
	{
	return data.path2;
	}

	QString rawpath1() const
	{
	return data.rawpath1;
	}

	QString rawpath2() const
	{
	return data.rawpath2;
	}
	};
	typedef std::vector<FileStatus> FileStatusList;

	static QString trimPath(const QString &s);

	private:
	struct Private;
	Private *m;
	QStringList make_branch_list_();
	QByteArray cat_file_(const QString &id);
	FileStatusList status_();
	bool commit_(const QString &msg, bool amend, bool sign, AbstractPtyProcess *pty);
	bool push_(bool tags, AbstractPtyProcess *pty);
	static void parseAheadBehind(const QString &s, Branch *b);
	Git();
	QString encodeQuotedText(const QString &str);
	QStringList refs();
	public:
	Git(Context const &cx, const QString &repodir);
	Git(Git &&r) = delete;
	virtual ~Git();

	typedef bool (callback_t)(void cookie, char const *ptr, int len);

	void setLogCallback(callback_t func, void *cookie);

	QByteArray toQByteArray() const;
	void setGitCommand(const QString &path);
	QString gitCommand() const;
	void clearResult();
	QString resultText() const;
	- bool chdirexec(std::function<bool ()> fn);
	+ bool chdirexec(std::function<bool ()> const &fn);
	bool git(QString const &arg, bool chdir, bool errout = false, AbstractPtyProcess *pty = nullptr);
	bool git(QString const &arg)
	{
	return git(arg, true);
	}

	void setWorkingRepositoryDir(const QString &repo);
	const QString &workingRepositoryDir() const;

	QString getCurrentBranchName();
	bool isValidWorkingCopy() const;
	QString version();
	bool init();
	QStringList getUntrackedFiles();
	CommitItemList log_all(const QString &id, int maxcount);
	CommitItemList log(int maxcount);
	bool queryCommit(const QString &id, CommitItem *out);

	struct CloneData {
	QString url;
	QString basedir;
	QString subdir;
	};
	static CloneData preclone(QString const &url, QString const &path);
	bool clone(CloneData const &data, AbstractPtyProcess *pty);

	FileStatusList status();
	bool cat_file(const QString &id, QByteArray *out);
	void resetFile(const QString &path);
	void resetAllFiles();

	void removeFile(const QString &path);

	void stage(const QString &path);
	void stage(const QStringList &paths);
	void unstage(const QString &path);
	void unstage(const QStringList &paths);
	void pull(AbstractPtyProcess *pty = 0);

	void fetch(AbstractPtyProcess *pty = 0);

	QList<Branch> branches();

	int getProcessExitCode() const;

	QString diff(QString const &old_id, QString const &new_id);
	QString diff_file(const QString &old_path, const QString &new_path);

	struct DiffRaw {
	struct AB {
	QString id;
	QString mode;
	} a, b;
	QString state;
	QStringList files;
	};

	struct Remote {
	QString name;
	QString url;
	QString purpose;
	};

	QList<DiffRaw> diff_raw(const QString &old_id, const QString &new_id);

	static bool isValidID(QString const &s);

	bool commit(const QString &text, bool sign, AbstractPtyProcess *pty);
	bool commit_amend_m(const QString &text, bool sign, AbstractPtyProcess *pty);
	bool revert(const QString &id);
	bool push(bool tags, AbstractPtyProcess *pty = 0);
	void getRemoteURLs(QList<Remote> *out);
	void createBranch(const QString &name);
	void checkoutBranch(const QString &name);
	void mergeBranch(const QString &name);
	void rebaseBranch(const QString &name);
	static bool isValidWorkingCopy(const QString &dir);
	QString diff_to_file(const QString &old_id, const QString &path);
	QString errorMessage() const;

	GitPtr dup() const;
	QString rev_parse(const QString &name);
	QList<Tag> tags();
	bool tag(const QString &name, QString const &id = QString());
	void delete_tag(const QString &name, bool remote);
	void setRemoteURL(const QString &name, const QString &url);
	void addRemoteURL(QString const &name, QString const &url);
	void removeRemote(QString const &name);
	QStringList getRemotes();

	struct User {
	QString name;
	QString email;
	};
	enum class Source {
	Default,
	Global,
	Local,
	};

	User getUser(Source purpose);
	void setUser(User const&user, bool global);

	bool reset_head1();
	void push_u(const QString &remote, const QString &branch, AbstractPtyProcess *pty);
	QString objectType(const QString &id);
	bool rm_cached(const QString &file);
	void cherrypick(const QString &name);

	struct ReflogItem {
	QString id;
	QString head;
	QString command;
	QString comment;
	struct File {
	QString atts_a;
	QString atts_b;
	QString id_a;
	QString id_b;
	QString type;
	QString path;
	};
	QList<File> files;
	};
	typedef QList<ReflogItem> ReflogItemList;

	bool reflog(ReflogItemList *out, int maxcount = 100);
	QByteArray blame(const QString &path);

	enum SignPolicy {
	Unset,
	False,
	True,
	};
	QString signingKey(Source purpose);
	bool setSigningKey(const QString &id, bool global);
	SignPolicy signPolicy(Source source);
	bool setSignPolicy(Source source, SignPolicy policy);
	bool configGpgProgram(const QString &path, bool global);
	void rebaseOnto(const QString &newbase, const QString &upstream, const QString &branch, AbstractPtyProcess *pty);

	struct RemoteInfo {
	QString commit_id;
	QString name;
	};
	QList<RemoteInfo> ls_remote();
	};

	void parseDiff(std::string const &s, Git::Diff const info, Git::Diff out);

	#endif // GIT_H
	diff --git a/src/GitHubAPI.cpp b/src/GitHubAPI.cpp
	index b03917d..5272ee7 100644
	--- a/src/GitHubAPI.cpp
	+++ b/src/GitHubAPI.cpp
	@@ -1,99 +1,101 @@
	+
	#include "GitHubAPI.h"

	#include "webclient.h"
	#include "common/misc.h"
	#include "charvec.h"
	#include "urlencode.h"
	#include "MemoryReader.h"

	#include <QDebug>
	#include <QJsonArray>
	#include <QJsonDocument>
	#include <QJsonObject>
	+#include <memory>

	using WebClientPtr = GitHubAPI::WebClientPtr;

	struct GitHubRequestThread::Private {
	WebClientPtr web;
	};

	GitHubRequestThread::GitHubRequestThread()
	: m(new Private)
	{
	}

	GitHubRequestThread::~GitHubRequestThread()
	{
	delete m;
	}

	void GitHubRequestThread::start(WebContext *webcx)
	{
	- m->web = WebClientPtr(new WebClient(webcx));
	+ m->web = std::make_shared<WebClient>(webcx);
	QThread::start();
	}

	void GitHubRequestThread::run()
	{
	ok = false;
	if (web()->get(WebClient::URL(url)) == 200) {
	WebClient::Response const &r = web()->response();
	if (!r.content.empty()) {
	text = to_stdstr(r.content);
	ok = true;
	if (callback) {
	ok = callback(text);
	}
	}
	}
	}

	GitHubAPI::WebClientPtr GitHubRequestThread::web()
	{
	return m->web;
	}

	QList<GitHubAPI::SearchResultItem> GitHubAPI::searchRepository(std::string const &q)
	{
	QList<GitHubAPI::SearchResultItem> items;

	GitHubRequestThread th;
	{
	OverrideWaitCursor;
	th.url = "https://api.github.com/search/repositories?q=" + q;
	th.start(webcx);
	while (!th.wait(1)) {
	QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
	}
	}
	if (th.ok) {
	QByteArray ba(th.text.c_str(), th.text.size());
	QJsonDocument doc = QJsonDocument::fromJson(ba);
	QJsonArray a1 = doc.object().value("items").toArray();
	for (QJsonValue const &v1 : a1) {
	QJsonObject o1 = v1.toObject();
	SearchResultItem item;
	auto String = [&](QString const &key){
	return o1.value(key).toString().toStdString();
	};
	item.full_name = String("full_name");
	if (!item.full_name.empty()) {
	item.description = String("description");
	item.html_url = String("html_url");
	item.ssh_url = String("ssh_url");
	item.clone_url = String("clone_url");
	item.score = o1.value("score").toDouble();
	items.push_back(item);
	}
	}
	}

	std::sort(items.begin(), items.end(), [](SearchResultItem const &l, SearchResultItem const &r){
	return l.score > r.score; // 降順
	});

	return items;
	}



	diff --git a/src/GitPack.cpp b/src/GitPack.cpp
	index 8819f28..e052815 100644
	--- a/src/GitPack.cpp
	+++ b/src/GitPack.cpp
	@@ -1,252 +1,252 @@
	#include "GitPack.h"
	#include <zlib.h>
	#include <QDebug>
	#include <QFile>
	#include "GitPackIdxV2.h"

	void GitPack::decodeTree(QByteArray *out)
	{
	if (out && out->size() > 0) {
	QByteArray ba;
	uint8_t const begin = (uint8_t const )out->data();
	uint8_t const *end = begin + out->size();
	uint8_t const *ptr = begin;
	while (ptr < end) {
	int mode = 0;
	while (ptr < end) {
	int c = *ptr & 0xff;
	ptr++;
	if (isdigit(c & 0xff)) {
	mode = mode * 10 + (c - '0');
	} else if (c == ' ') {
	break;
	}
	}
	uint8_t const *left = ptr;
	while (ptr < end && *ptr) {
	ptr++;
	}
	std::string name(left, ptr);
	if (ptr + 20 < end) {
	ptr++;
	char tmp[100];
	sprintf(tmp, "%06u %s ", mode, mode < 100000 ? "tree" : "blob");
	char *p = tmp + 12;
	for (int i = 0; i < 20; i++) {
	sprintf(p, "%02x", ptr[i]);
	p += 2;
	}
	ba.append(tmp, p - tmp);
	ba.append('\t');
	ba.append(name.c_str(), name.size());
	ba.append('\n');
	ptr += 20;
	} else {
	break;
	}
	}
	*out = std::move(ba);
	}

	}

	Git::Object::Type GitPack::stripHeader(QByteArray *out)
	{
	if (out) {
	int n = out->size();
	if (n > 0) {
	char const *p = out->data();
	if (n > 16) n = 16;
	for (int i = 0; i < n; i++) {
	if (p[i] == 0) {
	Git::Object::Type type = Git::Object::Type::UNKNOWN;
	if (strncmp(p, "blob ", 5) == 0) {
	type = Git::Object::Type::BLOB;
	} else if (strncmp(p, "tree ", 5) == 0) {
	type = Git::Object::Type::TREE;
	} else if (strncmp(p, "commit ", 7) == 0) {
	type = Git::Object::Type::COMMIT;
	} else if (strncmp(p, "tag ", 4) == 0) {
	type = Git::Object::Type::TAG;
	}
	if (type != Git::Object::Type::UNKNOWN) {
	*out = out->mid(i + 1);
	}
	return type;
	}
	}
	}
	}
	return Git::Object::Type::UNKNOWN;
	}

	bool GitPack::decompress(QIODevice in, size_t expanded_size, QByteArray out, size_t consumed, uint32_t crc)
	{
	if (consumed) *consumed = 0;
	try {
	int err;
	z_stream d_stream;

	- d_stream.zalloc = (alloc_func)0;
	- d_stream.zfree = (free_func)0;
	- d_stream.opaque = (voidpf)0;
	+ d_stream.zalloc = nullptr;
	+ d_stream.zfree = nullptr;
	+ d_stream.opaque = nullptr;

	- d_stream.next_in = 0;
	+ d_stream.next_in = nullptr;
	d_stream.avail_in = 0;

	err = inflateInit(&d_stream);

	if (err != Z_OK) {
	throw QString("failed: inflateInit");
	}

	while (1) {
	if (expanded_size > 0 && (size_t)out->size() > expanded_size) {
	throw QString("file too large");
	}
	uint8_t src[1024];
	uint8_t tmp[65536];
	if (d_stream.next_in != src && d_stream.avail_in > 0) {
	memmove(src, d_stream.next_in, d_stream.avail_in);
	}
	d_stream.next_in = src;
	if (d_stream.avail_in < sizeof(src)) {
	int n = sizeof(src) - d_stream.avail_in;
	n = in->read((char *)(src + d_stream.avail_in), n);
	if (n >= 0) {
	d_stream.avail_in += n;
	}
	}

	d_stream.next_out = tmp;
	size_t l = expanded_size - out->size();
	if (l > sizeof(tmp)) l = sizeof(tmp);
	d_stream.avail_out = l;
	uLong total = d_stream.total_out;

	err = ::inflate(&d_stream, Z_NO_FLUSH);

	int in_len = (uint8_t *)d_stream.next_in - src;
	if (consumed) *consumed += in_len;

	if (crc) crc = crc32(crc, src, in_len);

	int out_len = d_stream.total_out - total;
	out->append((char const *)tmp, out_len);

	if (err == Z_STREAM_END) {
	break;
	}
	if (err != Z_OK) {
	throw QString("failed: inflate");
	}
	}

	err = inflateEnd(&d_stream);
	if (err != Z_OK) {
	throw QString("failed: inflateEnd");
	}

	return true;
	} catch (QString const &e) {
	qDebug() << e;
	}
	return false;
	}

	bool GitPack::seekPackedObject(QIODevice file, const GitPackIdxItem item, Info *out)
	{
	try {
	Info info;

	auto Read = [&](void *ptr, size_t len){
	const auto l = file->read((char *)ptr, len);
	if (l < 0 \|\| ((size_t)(l)) != len) {
	throw QString("failed to read");
	}
	info.checksum = crc32(info.checksum, (uint8_t const *)ptr, len);
	};

	file->seek(0);

	uint32_t header[3];
	Read(header, sizeof(int32_t) * 3);
	if (memcmp(header, "PACK", 4) != 0) throw QString("invalid pack file");
	uint32_t version = read_uint32_be(header + 1);
	if (version < 2) throw QString("invalid pack file version");
	/int count = /read_uint32_be(header + 2);

	file->seek(item->offset);

	info.checksum = 0;

	// cf. https://github.com/github/git-msysgit/blob/master/builtin/unpack-objects.c
	{
	size_t size = 0;
	char c;
	Read(&c, 1);
	info.type = (Git::Object::Type)((c >> 4) & 7);
	size = c & 0x0f;
	int shift = 4;
	while (c & 0x80) {
	Read(&c, 1);
	size \|= (c & 0x7f) << shift;
	shift += 7;
	}
	info.expanded_size = size;
	}
	if (info.type == Git::Object::Type::OFS_DELTA) {
	uint64_t offset = 0;
	char c;
	Read(&c, 1);
	offset = c & 0x7f;
	while (c & 0x80) {
	Read(&c, 1);
	offset = ((offset + 1) << 7) \| (c & 0x7f);
	}
	info.offset = offset;
	} else if (info.type == Git::Object::Type::REF_DELTA) {
	char bin[20];
	Read(bin, 20);
	char tmp[41];
	for (int i = 0; i < 20; i++) {
	sprintf(tmp + i * 2, "%02x", bin[i] & 0xff);
	}
	info.ref_id = QString::fromLatin1(tmp, GIT_ID_LENGTH);
	}

	*out = info;
	return true;
	} catch (QString const &e) {
	qDebug() << e;
	}
	return false;
	}

	bool GitPack::load(QIODevice file, const GitPackIdxItem item, Object *out)
	{
	*out = Object();
	try {
	seekPackedObject(file, item, out);

	if (decompress(file, out->expanded_size, &out->content, &out->packed_size, &out->checksum)) {
	out->expanded_size = out->expanded_size;
	return true;
	}
	} catch (QString const &e) {
	qDebug() << e;
	}
	return false;
	}

	bool GitPack::load(QString const &packfile, const GitPackIdxItem item, GitPack::Object out)
	{
	QFile file(packfile);
	if (file.open(QFile::ReadOnly)) {
	if (load(&file, item, out)) {
	return true;
	}
	}
	return false;
	}

	diff --git a/src/GitPackIdxV2.cpp b/src/GitPackIdxV2.cpp
	index 5b933cf..aac5401 100644
	--- a/src/GitPackIdxV2.cpp
	+++ b/src/GitPackIdxV2.cpp
	@@ -1,129 +1,129 @@
	#include "GitPackIdxV2.h"
	#include <QCryptographicHash>
	#include <QDebug>
	#include <QFile>

	QString GitPackIdxV2::toString(uint8_t const *p)
	{
	char tmp[41];
	for (int i = 0; i < GIT_ID_LENGTH / 2; i++) {
	sprintf(tmp + i * 2, "%02x", p[i]);
	}
	return QString::fromLatin1(tmp, GIT_ID_LENGTH);
	}

	uint32_t GitPackIdxV2::read_uint32_be(const void *p)
	{
	- uint8_t const q = (uint8_t const )p;
	+ auto const q = (uint8_t const )p;
	return (q[0] << 24) \| (q[1] << 16) \| (q[2] << 8) \| q[3];
	}

	uint32_t GitPackIdxV2::get_fanout(const GitPackIdxV2::header_t *t, int i)
	{
	return read_uint32_be(&t->fanout[i]);
	}

	const uint8_t *GitPackIdxV2::object(int i) const
	{
	return d.objects[i].id;
	}

	uint32_t GitPackIdxV2::offset(int i) const
	{
	return read_uint32_be(&d.offsets[i]);
	}

	uint32_t GitPackIdxV2::checksum(int i) const
	{
	return read_uint32_be(&d.checksums[i]);
	}

	void GitPackIdxV2::clear()
	{
	d = Data();
	}

	bool GitPackIdxV2::parse(QIODevice *in)
	{
	try {
	auto Read = [&](void *ptr, size_t len){
	const auto l = in->read((char *)ptr, len);
	return 0 < l && static_cast<size_t>(l) == len;
	};
	static char const magic[] = "\xff\x74\x4f\x63\x00\x00\x00\x02";
	if (!Read(&d.header, sizeof(d.header))) throw QString("failed to read the idx header");
	if (memcmp(d.header.magic, magic, 8) != 0) throw QString("invalid idx header");
	uint32_t size = get_fanout(&d.header, 255);
	if (size > 1000000) throw QString("number of objects in the idx file is too big");
	size_t size4 = size * sizeof(uint32_t);
	d.objects.resize(size);
	d.checksums.resize(size);
	d.offsets.resize(size);
	if (!Read(&d.objects[0], size * 20)) throw QString("failed to read the objects");
	if (!Read(&d.checksums[0], size4)) throw QString("failed to read the checksums");
	if (!Read(&d.offsets[0], size4)) throw QString("failed to read the offsets");
	if (!Read(&d.trailer, sizeof(d.trailer))) throw QString("failed to read the trailer");

	QCryptographicHash sha1(QCryptographicHash::Sha1);
	sha1.addData((char const *)&d.header, sizeof(d.header));
	sha1.addData((char const )&d.objects[0], size 20);
	sha1.addData((char const *)&d.checksums[0], size4);
	sha1.addData((char const *)&d.offsets[0], size4);
	sha1.addData((char const *)&d.trailer.packfile_checksum, sizeof(d.trailer) - 20);
	QByteArray chksum = sha1.result();
	Q_ASSERT(chksum.size() == 20);
	if (memcmp(chksum.data(), d.trailer.idxfile_checksum, 20) != 0) {
	throw QString("idx checksum is not correct");
	}

	for (size_t i = 0; i < size; i++) {
	GitPackIdxItem item;
	item.id = toString(object(i));
	item.offset = offset(i);
	item.checksum = checksum(i);
	d.item_list.push_back(item);
	}
	for (size_t i = 0; i < size; i++) {
	GitPackIdxItem &item = d.item_list[i];
	if (i + 1 < size) {
	item.packed_size = d.item_list[i + 1].offset - d.item_list[i].offset;
	}
	}

	return true;
	} catch (QString const &e) {
	qDebug() << e;
	}
	return false;
	}

	bool GitPackIdxV2::parse(const QString &idxfile)
	{
	clear();
	QFile file(idxfile);
	if (file.open(QFile::ReadOnly)) {
	if (parse(&file)) {
	return true;
	}
	}
	return false;
	}

	const GitPackIdxItem *GitPackIdxV2::item(const QString &id) const
	{
	- for (int i = 0; i < (int)d.item_list.size(); i++) {
	- if (d.item_list[i].id == id) {
	- return &d.item_list[i];
	+ for (const auto & i : d.item_list) {
	+ if (i.id == id) {
	+ return &i;
	}
	}
	return nullptr;
	}

	const GitPackIdxItem *GitPackIdxV2::item(size_t offset) const
	{
	for (GitPackIdxItem const &item : d.item_list) {
	if (item.offset == offset) return &item;
	}
	return nullptr;
	}

	diff --git a/src/ImageViewWidget.cpp b/src/ImageViewWidget.cpp
	index 32601e2..47ff559 100644
	--- a/src/ImageViewWidget.cpp
	+++ b/src/ImageViewWidget.cpp
	@@ -1,374 +1,376 @@
	+#include <memory>
	+
	#include "ImageViewWidget.h"
	#include "FileDiffSliderWidget.h"
	#include "FileDiffWidget.h"

	#include "MainWindow.h"
	#include "common/misc.h"
	#include "common/joinpath.h"
	#include "Photoshop.h"
	#include "MemoryReader.h"
	#include "charvec.h"

	#include <math.h>
	#include <functional>

	#include <QDebug>
	#include <QFileDialog>
	#include <QMenu>
	#include <QPainter>
	#include <QWheelEvent>
	#include <QSvgRenderer>
	#include <QBuffer>

	-typedef std::shared_ptr<QSvgRenderer> SvgRendererPtr;
	+using SvgRendererPtr = std::shared_ptr<QSvgRenderer>;

	struct ImageViewWidget::Private {
	MainWindow *mainwindow = nullptr;
	FileDiffWidget *filediffwidget = nullptr;
	FileDiffWidget::DrawData *draw_data = nullptr;
	QScrollBar *v_scroll_bar = nullptr;
	QScrollBar *h_scroll_bar = nullptr;
	QString mime_type;

	QPixmap pixmap;
	SvgRendererPtr svg;

	double image_scroll_x = 0;
	double image_scroll_y = 0;
	double image_scale = 1;
	- int scroll_origin_x = 0;
	- int scroll_origin_y = 0;
	+ double scroll_origin_x = 0;
	+ double scroll_origin_y = 0;
	QPoint mouse_press_pos;
	int wheel_delta = 0;
	QPointF interest_pos;
	int top_margin = 1;
	int bottom_margin = 1;
	bool draw_left_border = true;

	#ifndef APP_GUITAR
	QPixmap transparent_pixmap;
	#endif
	};

	ImageViewWidget::ImageViewWidget(QWidget *parent)
	: QWidget(parent)
	, m(new Private)
	{
	#if defined(Q_OS_WIN32)
	setFont(QFont("MS Gothic"));
	#elif defined(Q_OS_LINUX)
	setFont(QFont("Monospace"));
	#elif defined(Q_OS_MAC)
	setFont(QFont("Menlo"));
	#endif

	setContextMenuPolicy(Qt::DefaultContextMenu);
	}

	ImageViewWidget::~ImageViewWidget()
	{
	delete m;
	}

	void ImageViewWidget::bind(MainWindow mainwindow, FileDiffWidget filediffwidget, QScrollBar vsb, QScrollBar hsb)
	{
	m->mainwindow = mainwindow;
	m->filediffwidget = filediffwidget;
	m->v_scroll_bar = vsb;
	m->h_scroll_bar = hsb;
	}

	bool ImageViewWidget::hasFocus() const
	{
	QWidget *w = qApp->focusWidget();
	return w && w != m->filediffwidget && w->isAncestorOf(this);
	}

	void ImageViewWidget::setLeftBorderVisible(bool f)
	{
	m->draw_left_border = f;
	}

	void ImageViewWidget::internalScrollImage(double x, double y)
	{
	m->image_scroll_x = x;
	m->image_scroll_y = y;
	QSizeF sz = imageScrollRange();
	if (m->image_scroll_x < 0) m->image_scroll_x = 0;
	if (m->image_scroll_y < 0) m->image_scroll_y = 0;
	if (m->image_scroll_x > sz.width()) m->image_scroll_x = sz.width();
	if (m->image_scroll_y > sz.height()) m->image_scroll_y = sz.height();
	update();
	}

	void ImageViewWidget::scrollImage(double x, double y)
	{
	internalScrollImage(x, y);

	if (m->h_scroll_bar) {
	m->h_scroll_bar->blockSignals(true);
	- m->h_scroll_bar->setValue(m->image_scroll_x);
	+ m->h_scroll_bar->setValue((int)m->image_scroll_x);
	m->h_scroll_bar->blockSignals(false);
	}
	if (m->v_scroll_bar) {
	m->v_scroll_bar->blockSignals(true);
	- m->v_scroll_bar->setValue(m->image_scroll_y);
	+ m->v_scroll_bar->setValue((int)m->image_scroll_y);
	m->v_scroll_bar->blockSignals(false);
	}
	}

	void ImageViewWidget::refrectScrollBar()
	{
	double e = 0.75;
	double x = m->h_scroll_bar->value();
	double y = m->v_scroll_bar->value();
	if (fabs(x - m->image_scroll_x) < e) x = m->image_scroll_x; // 差が小さいときは値を維持する
	if (fabs(y - m->image_scroll_y) < e) y = m->image_scroll_y;
	internalScrollImage(x, y);
	}

	void ImageViewWidget::clear()
	{
	m->mime_type = QString();
	m->pixmap = QPixmap();
	setMouseTracking(false);
	update();
	}

	QString ImageViewWidget::formatText(Document::Line const &line)
	{
	QByteArray const &ba = line.text;
	if (ba.isEmpty()) return QString();
	std::vector<char> vec;
	vec.reserve(ba.size() + 100);
	char const *begin = ba.data();
	char const *end = begin + ba.size();
	char const *ptr = begin;
	int x = 0;
	while (ptr < end) {
	if (*ptr == '\t') {
	do {
	vec.push_back(' ');
	x++;
	} while ((x % 4) != 0);
	ptr++;
	} else {
	vec.push_back(*ptr);
	ptr++;
	x++;
	}
	}
	return QString::fromUtf8(&vec[0], vec.size());
	}

	QSizeF ImageViewWidget::imageScrollRange() const
	{
	QSize sz = imageSize();
	- int w = sz.width() * m->image_scale;
	- int h = sz.height() * m->image_scale;
	+ int w = int(sz.width() * m->image_scale);
	+ int h = int(sz.height() * m->image_scale);
	return QSize(w, h);
	}

	void ImageViewWidget::setScrollBarRange(QScrollBar h, QScrollBar v)
	{
	h->blockSignals(true);
	v->blockSignals(true);
	QSizeF sz = imageScrollRange();
	- h->setRange(0, sz.width());
	- v->setRange(0, sz.height());
	+ h->setRange(0, (int)sz.width());
	+ v->setRange(0, (int)sz.height());
	h->setPageStep(width());
	v->setPageStep(height());
	h->blockSignals(false);
	v->blockSignals(false);
	}

	void ImageViewWidget::updateScrollBarRange()
	{
	setScrollBarRange(m->h_scroll_bar, m->v_scroll_bar);
	}

	MainWindow *ImageViewWidget::mainwindow()
	{
	return m->mainwindow;
	}

	QBrush ImageViewWidget::getTransparentBackgroundBrush()
	{
	#ifdef APP_GUITAR
	return mainwindow()->getTransparentPixmap();
	#else
	if (m->transparent_pixmap.isNull()) {
	m->transparent_pixmap = QPixmap(":/image/transparent.png");
	}
	return m->transparent_pixmap;
	#endif
	}

	bool ImageViewWidget::isValidImage() const
	{
	return !m->pixmap.isNull() \|\| (m->svg && m->svg->isValid());
	}

	QSize ImageViewWidget::imageSize() const
	{
	if (!m->pixmap.isNull()) return m->pixmap.size();
	if (m->svg && m->svg->isValid()) return m->svg->defaultSize();
	return QSize();
	}

	void ImageViewWidget::paintEvent(QPaintEvent *)
	{
	QPainter pr(this);

	QSize imagesize = imageSize();
	if (imagesize.width() > 0 && imagesize.height() > 0) {
	pr.save();
	if (!m->draw_left_border) {
	pr.setClipRect(1, 0, width() - 1, height());
	}
	double cx = width() / 2.0;
	double cy = height() / 2.0;
	double x = cx - m->image_scroll_x;
	double y = cy - m->image_scroll_y;
	QSizeF sz = imageScrollRange();
	if (sz.width() > 0 && sz.height() > 0) {
	QBrush br = getTransparentBackgroundBrush();
	- pr.setBrushOrigin(x, y);
	- pr.fillRect(x, y, sz.width(), sz.height(), br);
	+ pr.setBrushOrigin((int)x, (int)y);
	+ pr.fillRect((int)x, (int)y, (int)sz.width(), (int)sz.height(), br);
	if (!m->pixmap.isNull()) {
	- pr.drawPixmap(x, y, sz.width(), sz.height(), m->pixmap, 0, 0, imagesize.width(), imagesize.height());
	+ pr.drawPixmap((int)x, (int)y, (int)sz.width(), (int)sz.height(), m->pixmap, 0, 0, imagesize.width(), imagesize.height());
	} else if (m->svg && m->svg->isValid()) {
	m->svg->render(&pr, QRectF(x, y, sz.width(), sz.height()));
	}
	}
	- misc::drawFrame(&pr, x - 1, y - 1, sz.width() + 2, sz.height() + 2, Qt::black);
	+ misc::drawFrame(&pr, (int)x - 1, (int)y - 1, (int)sz.width() + 2, (int)sz.height() + 2, Qt::black);
	pr.restore();
	}

	if (m->draw_left_border) {
	pr.fillRect(0, 0, 1, height(), QColor(160, 160, 160));
	}

	if (hasFocus()) {
	misc::drawFrame(&pr, 0, 0, width(), height(), QColor(0, 128, 255, 128));
	misc::drawFrame(&pr, 1, 1, width() - 2, height() - 2, QColor(0, 128, 255, 64));
	}
	}

	void ImageViewWidget::resizeEvent(QResizeEvent *)
	{
	updateScrollBarRange();
	}

	void ImageViewWidget::setImage(QString mimetype, QByteArray const &ba)
	{
	if (mimetype.isEmpty()) {
	mimetype = "image/x-unknown";
	}

	setMouseTracking(true);

	m->pixmap = QPixmap();
	m->svg = SvgRendererPtr();
	if (!ba.isEmpty()) {
	if (misc::isSVG(mimetype)) {
	- m->svg = SvgRendererPtr(new QSvgRenderer(ba));
	+ m->svg = std::make_shared<QSvgRenderer>(ba);
	} else if (misc::isPSD(mimetype)) {
	if (!ba.isEmpty()) {
	MemoryReader reader(ba.data(), ba.size());
	if (reader.open(QIODevice::ReadOnly)) {
	std::vector<char> jpeg;
	photoshop::readThumbnail(&reader, &jpeg);
	if (!jpeg.empty()) {
	m->pixmap.loadFromData((uchar const *)&jpeg[0], jpeg.size());
	}
	}
	}
	} else {
	m->pixmap.loadFromData(ba);
	}
	}
	QSize sz = imageSize();
	double sx = sz.width();
	double sy = sz.height();
	if (sx > 0 && sy > 0) {
	sx = width() / sx;
	sy = height() / sy;
	m->image_scale = (sx < sy ? sx : sy) * 0.9;
	}
	updateScrollBarRange();

	m->h_scroll_bar->blockSignals(true);
	m->v_scroll_bar->blockSignals(true);
	m->h_scroll_bar->setValue(m->h_scroll_bar->maximum() / 2);
	m->v_scroll_bar->setValue(m->v_scroll_bar->maximum() / 2);
	m->h_scroll_bar->blockSignals(false);
	m->v_scroll_bar->blockSignals(false);
	refrectScrollBar();
	}

	void ImageViewWidget::mousePressEvent(QMouseEvent *e)
	{
	if (e->button() == Qt::LeftButton) {
	QPoint pos = mapFromGlobal(QCursor::pos());
	m->mouse_press_pos = pos;
	m->scroll_origin_x = m->image_scroll_x;
	m->scroll_origin_y = m->image_scroll_y;
	}
	}

	void ImageViewWidget::mouseMoveEvent(QMouseEvent *e)
	{
	if (isValidImage()) {
	QPoint pos = mapFromGlobal(QCursor::pos());
	if ((e->buttons() & Qt::LeftButton) && hasFocus()) {
	int delta_x = pos.x() - m->mouse_press_pos.x();
	int delta_y = pos.y() - m->mouse_press_pos.y();
	scrollImage(m->scroll_origin_x - delta_x, m->scroll_origin_y - delta_y);
	}
	double cx = width() / 2.0;
	double cy = height() / 2.0;
	double x = (pos.x() + 0.5 - cx + m->image_scroll_x) / m->image_scale;
	double y = (pos.y() + 0.5 - cy + m->image_scroll_y) / m->image_scale;
	m->interest_pos = QPointF(x, y);
	m->wheel_delta = 0;
	}
	}

	void ImageViewWidget::setImageScale(double scale)
	{
	if (scale < 1 / 32.0) scale = 1 / 32.0;
	if (scale > 32) scale = 32;
	m->image_scale = scale;
	}

	void ImageViewWidget::wheelEvent(QWheelEvent *e)
	{
	if (isValidImage()) {
	double scale = 1;
	const double mul = 1.189207115; // sqrt(sqrt(2))
	m->wheel_delta += e->delta();
	while (m->wheel_delta >= 120) {
	m->wheel_delta -= 120;
	scale *= mul;
	}
	while (m->wheel_delta <= -120) {
	m->wheel_delta += 120;
	scale /= mul;
	}
	setImageScale(m->image_scale * scale);
	updateScrollBarRange();

	double cx = width() / 2.0;
	double cy = height() / 2.0;
	QPoint pos = mapFromGlobal(QCursor::pos());
	double dx = m->interest_pos.x() * m->image_scale + cx - (pos.x() + 0.5);
	double dy = m->interest_pos.y() * m->image_scale + cy - (pos.y() + 0.5);
	scrollImage(dx, dy);

	update();
	}
	}



	diff --git a/src/LogTableWidget.cpp b/src/LogTableWidget.cpp
	index 23f84d9..1de2feb 100644
	--- a/src/LogTableWidget.cpp
	+++ b/src/LogTableWidget.cpp
	@@ -1,334 +1,334 @@
	#include "LogTableWidget.h"
	#include <QDebug>
	#include <QEvent>
	#include <QPainter>
	#include <QProxyStyle>
	-#include <math.h>
	+#include <cmath>
	#include "MainWindow.h"
	#include <QApplication>
	#include "MyTableWidgetDelegate.h"
	#include "common/misc.h"

	struct LogTableWidget::Private {
	};

	class LogTableWidgetDelegate : public MyTableWidgetDelegate {
	private:
	MainWindow *mainwindow() const
	{
	LogTableWidget w = dynamic_cast<LogTableWidget >(QStyledItemDelegate::parent());
	Q_ASSERT(w);
	return w->mainwindow();
	}

	static QColor labelColor(int kind)
	{
	switch (kind) {
	case MainWindow::Label::Head: return QColor(255, 192, 224); // blue
	case MainWindow::Label::LocalBranch: return QColor(192, 224, 255); // blue
	case MainWindow::Label::RemoteBranch: return QColor(192, 240, 224); // green
	case MainWindow::Label::Tag: return QColor(255, 224, 192); // orange
	}
	return QColor(224, 224, 224); // gray
	}

	static QColor hiliteColor(QColor const &color)
	{
	int r = color.red();
	int g = color.green();
	int b = color.blue();
	r = 255 - (255 - r) / 2;
	g = 255 - (255 - g) / 2;
	b = 255 - (255 - b) / 2;
	return QColor(r, g, b);
	}

	static QColor shadowColor(QColor const &color)
	{
	return QColor(color.red() / 2, color.green() / 2, color.blue() / 2);
	}

	void drawSignatureIcon(QPainter *painter, const QStyleOptionViewItem &opt, const QModelIndex &index) const
	{
	if (!opt.widget->isEnabled()) return;

	Git::CommitItem const *commit = mainwindow()->commitItem(index.row());
	QIcon icon = mainwindow()->verifiedIcon(commit->signature);
	if (!icon.isNull()) {
	QRect r = opt.rect.adjusted(6, 3, 0, -3);
	int h = r.height();
	int w = h;
	int x = r.x() + r.width() - w;
	int y = r.y();
	icon.paint(painter, x, y, w, h);
	}
	}

	void drawAvatar(QPainter *painter, const QStyleOptionViewItem &opt, const QModelIndex &index) const
	{
	if (!opt.widget->isEnabled()) return;

	int row = index.row();
	QIcon icon = mainwindow()->committerIcon(row);
	if (!icon.isNull()) {
	int h = opt.rect.height();
	int w = h;
	int x = opt.rect.x() + opt.rect.width() - w;
	int y = opt.rect.y();

	painter->save();
	painter->setOpacity(0.5); // 半透明で描画
	icon.paint(painter, x, y, w, h);
	painter->restore();
	}
	}

	void drawDescription(QPainter *painter, const QStyleOptionViewItem &opt, const QModelIndex &index) const
	{
	int row = index.row();
	QList<MainWindow::Label> const *labels = mainwindow()->label(row);
	if (labels) {
	painter->save();
	painter->setRenderHint(QPainter::Antialiasing);
	QFontMetrics fm = painter->fontMetrics();
	const int space = 8;
	int x = opt.rect.x() + opt.rect.width() - 3;
	int x1 = x;
	int y0 = opt.rect.y();
	int y1 = y0 + opt.rect.height() - 1;
	int i = labels->size();
	while (i > 0) {
	i--;
	MainWindow::Label const &label = labels->at(i);
	QString text = misc::abbrevBranchName(label.text);
	int w = fm.size(0, text).width() + space * 2;
	int x0 = x1 - w;
	QRect r(x0, y0, x1 - x0, y1 - y0);
	painter->setPen(Qt::NoPen);
	auto DrawRect = [&](int dx, int dy, QColor color){
	painter->setBrush(color);
	- painter->drawRoundedRect(r.adjusted(dx + 3 + 0.5, dy + 3 + 0.5, dx - 3 + 0.5, dy - 3 + 0.5), 3, 3);
	+ painter->drawRoundedRect(r.adjusted(lround(dx + 3), lround(dy + 3), lround(dx - 3), lround(dy - 3)), 3, 3);
	};
	QColor color = labelColor(label.kind);
	QColor hilite = hiliteColor(color);
	QColor shadow = shadowColor(color);
	DrawRect(-1, -1, hilite);
	DrawRect(1, 1, shadow);
	DrawRect(0, 0, color);
	painter->setPen(Qt::black);
	painter->setBrush(Qt::NoBrush);
	qApp->style()->drawItemText(painter, r.adjusted(space, 0, 0, 0), opt.displayAlignment, opt.palette, true, text);
	x1 = x0;
	}
	painter->restore();
	}
	}

	public:
	explicit LogTableWidgetDelegate(QObject *parent = Q_NULLPTR)
	: MyTableWidgetDelegate(parent)
	{
	}
	- void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
	+ void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override
	{
	MyTableWidgetDelegate::paint(painter, option, index);

	// signatureの描画
	if (index.column() == 1) {
	drawSignatureIcon(painter, option, index);
	}

	// avatarの描画
	if (index.column() == 3) {
	drawAvatar(painter, option, index);
	}

	// Descriptionの描画
	if (index.column() == 4) {
	drawDescription(painter, option, index);
	}
	}
	};

	LogTableWidget::LogTableWidget(QWidget *parent)
	: QTableWidget(parent)
	, m(new Private)
	{
	setItemDelegate(new LogTableWidgetDelegate(this));
	}

	LogTableWidget::~LogTableWidget()
	{
	delete m;
	}

	MainWindow *LogTableWidget::mainwindow()
	{
	MainWindow mw = qobject_cast<MainWindow >(window());
	Q_ASSERT(mw);
	return mw;
	}

	void drawBranch(QPainterPath *path, double x0, double y0, double x1, double y1, double r, bool bend_early)
	{
	const double k = 0.55228475;
	if (x0 == x1) {
	path->moveTo(x0, y0);
	path->lineTo(x1, y1);
	} else {
	double ym = bend_early ? (y0 + r) : (y1 - r);
	double h = fabs(y1 - y0);
	double w = fabs(x1 - x0);
	if (r > h / 2) r = h / 2;
	if (r > w / 2) r = w / 2;
	double s = r;
	if (x0 > x1) r = -r;
	if (y0 > y1) s = -s;

	if (0) {
	path->moveTo(x0, y0);
	path->lineTo(x0, ym - s);
	path->cubicTo(x0, ym - s + s * k, x0 + r - r * k, ym, x0 + r, ym);
	path->lineTo(x1 - r, ym);
	path->cubicTo(x1 - r + r * k, ym, x1, ym + s - s * k, x1, ym + s);
	path->lineTo(x1, y1);
	} else {
	if (bend_early) {
	path->moveTo(x0, y0);
	path->cubicTo(x0, ym, x1, ym, x1, ym + ym - y0);
	path->lineTo(x1, y1);
	} else {
	path->moveTo(x0, y0);
	path->lineTo(x0, ym + ym - y1);
	path->cubicTo(x0, ym, x1, ym, x1, y1);
	}
	}
	}
	}

	void LogTableWidget::paintEvent(QPaintEvent *e)
	{
	if (rowCount() < 1) return;

	QTableWidget::paintEvent(e);

	QPainter pr(viewport());
	pr.setRenderHint(QPainter::Antialiasing);
	pr.setBrush(QBrush(QColor(255, 255, 255)));

	Git::CommitItemList const *list = mainwindow()->logs();

	int indent_span = 16;

	auto ItemRect = [&](int row){
	QRect r;
	QTableWidgetItem *p = item(row, 0);
	if (p) {
	r = visualItemRect(p);
	}
	return r;
	};

	int line_width = 2;

	auto ItemPoint = [&](int depth, QRect const &rect){
	int h = rect.height();
	double n = h / 2.0;
	double x = floor(rect.x() + n + depth * indent_span);
	double y = floor(rect.y() + n);
	return QPointF(x, y);
	};

	auto SetPen = [&](QPainter pr, int level, bool /continued*/){
	QColor c = mainwindow()->color(level + 1);
	Qt::PenStyle s = Qt::SolidLine;
	pr->setPen(QPen(c, line_width, s));
	};

	auto DrawLine = [&](size_t index, int itemrow){
	QRect rc1;
	if (index < list->size()) {
	Git::CommitItem const &item1 = list->at(index);
	rc1 = ItemRect(itemrow);
	QPointF pt1 = ItemPoint(item1.marker_depth, rc1);
	double halfheight = rc1.height() / 2.0;
	for (TreeLine const &line : item1.parent_lines) {
	if (line.depth >= 0) {
	QPainterPath *path = nullptr;
	Git::CommitItem const &item2 = list->at(line.index);
	QRect rc2 = ItemRect(line.index);
	if (index + 1 == (size_t)line.index \|\| line.depth == item1.marker_depth \|\| line.depth == item2.marker_depth) {
	QPointF pt2 = ItemPoint(line.depth, rc2);
	if (pt2.y() > 0) {
	path = new QPainterPath();
	drawBranch(path, pt1.x(), pt1.y(), pt2.x(), pt2.y(), halfheight, line.bend_early);
	}
	} else {
	QPointF pt3 = ItemPoint(item2.marker_depth, rc2);
	if (pt3.y() > 0) {
	path = new QPainterPath();
	QRect rc3 = ItemRect(itemrow + 1);
	QPointF pt2 = ItemPoint(line.depth, rc3);
	drawBranch(path, pt1.x(), pt1.y(), pt2.x(), pt2.y(), halfheight, true);
	drawBranch(path, pt2.x(), pt2.y(), pt3.x(), pt3.y(), halfheight, false);
	}
	}
	if (path) {
	SetPen(&pr, line.color_number, false);
	pr.drawPath(*path);
	delete path;
	}
	}
	}
	}
	return rc1.y();
	};

	auto DrawMark = [&](size_t index, int row){
	double x, y;
	y = 0;
	if (index < list->size()) {
	Git::CommitItem const &item = list->at(index);
	QRect rc = ItemRect(row);
	QPointF pt = ItemPoint(item.marker_depth, rc);
	double r = 4;
	x = pt.x() - r;
	y = pt.y() - r;
	SetPen(&pr, item.marker_depth, false);
	if (item.resolved) {
	// ◯
	- pr.drawEllipse(x, y, r * 2, r * 2);
	+ pr.drawEllipse((int)x, (int)y, int(r * 2), int(r * 2));
	} else {
	// ▽
	QPainterPath path;
	path.moveTo(pt.x(), pt.y() + r);
	path.lineTo(pt.x() - r, pt.y() - r);
	path.lineTo(pt.x() + r, pt.y() - r);
	path.lineTo(pt.x(), pt.y() + r);
	pr.drawPath(path);
	}
	}
	return y;
	};

	// draw lines

	pr.setOpacity(0.5);
	pr.setBrush(Qt::NoBrush);

	for (size_t i = 0; i < list->size(); i++) {
	double y = DrawLine(i, i);
	if (y >= height()) break;
	}

	// draw marks

	pr.setOpacity(1);
	pr.setBrush(mainwindow()->color(0));

	for (size_t i = 0; i < list->size(); i++) {
	double y = DrawMark(i, i);
	if (y >= height()) break;
	}
	}

	diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
	index 8a504ab..b9996c0 100644
	--- a/src/MainWindow.cpp
	+++ b/src/MainWindow.cpp
	@@ -1,4923 +1,4914 @@
	#include "AreYouSureYouWantToContinueConnectingDialog.h"
	#include "BlameWindow.h"
	#include "CommitViewWindow.h"
	#include "Git.h"
	#include "LineEditDialog.h"
	#include "MainWindow.h"
	#include "ReflogWindow.h"
	#include "SetGlobalUserDialog.h"
	#include "EditTagsDialog.h"
	#include "WelcomeWizardDialog.h"
	#include "ui_MainWindow.h"
	#include "EditGitIgnoreDialog.h"
	#include "DoYouWantToInitDialog.h"
	#include "RemoteWatcher.h"
	-
	-#ifdef Q_OS_WIN
	-#include "win32/win32.h"
	-#else
	-#include <unistd.h>
	-#endif
	-
	#include "ApplicationGlobal.h"
	#include "AboutDialog.h"
	#include "AvatarLoader.h"
	#include "CheckoutDialog.h"
	#include "CloneDialog.h"
	#include "CommitExploreWindow.h"
	#include "CommitPropertyDialog.h"
	#include "common/joinpath.h"
	#include "common/misc.h"
	#include "ConfigCredentialHelperDialog.h"
	#include "CreateRepositoryDialog.h"
	#include "DeleteBranchDialog.h"
	#include "DeleteTagsDialog.h"
	#include "InputNewTagDialog.h"
	#include "FileHistoryWindow.h"
	#include "FilePropertyDialog.h"
	#include "FileUtil.h"
	#include "Git.h"
	#include "GitDiff.h"
	#include "gunzip.h"
	#include "JumpDialog.h"
	#include "LocalSocketReader.h"
	#include "main.h"
	#include "MemoryReader.h"
	#include "MergeBranchDialog.h"
	#include "MyProcess.h"
	#include "MySettings.h"
	#include "PushDialog.h"
	#include "RepositoryData.h"
	#include "RepositoryPropertyDialog.h"
	#include "SelectCommandDialog.h"
	#include "SetRemoteUrlDialog.h"
	#include "SettingsDialog.h"
	#include "SetUserDialog.h"
	#include "StatusLabel.h"
	#include "Terminal.h"
	#include "TextEditDialog.h"
	#include "CommitDialog.h"
	#include "SelectGpgKeyDialog.h"
	#include "SetGpgSigningDialog.h"
	#include "gpg.h"
	#include "webclient.h"
	-#include <deque>
	-#include <set>
	-#include <stdlib.h>
	-
	+#include "RebaseOntoDialog.h"
	#include <QBuffer>
	#include <QClipboard>
	#include <QDateTime>
	#include <QDebug>
	#include <QDesktopServices>
	#include <QDirIterator>
	#include <QDragEnterEvent>
	#include <QFileDialog>
	#include <QFileIconProvider>
	#include <QKeyEvent>
	#include <QLocalServer>
	#include <QMessageBox>
	#include <QMimeData>
	#include <QPainter>
	#include <QProcess>
	#include <QStandardPaths>
	#include <QThread>
	#include <QTimer>
	-#include <RebaseOntoDialog.h>
	+#include <deque>
	+#include <set>
	+#include <stdlib.h>
	+
	+#ifdef Q_OS_WIN
	+#include "win32/win32.h"
	+#else
	+#include <unistd.h>
	+#endif
	+

	#ifdef Q_OS_MAC
	extern "C" char **environ;
	#endif

	struct GitHubRepositoryInfo {
	QString owner_account_name;
	QString repository_name;
	};

	class AsyncExecGitThread_ : public QThread {
	private:
	GitPtr g;
	std::function<void(GitPtr g)> callback;
	public:
	AsyncExecGitThread_(GitPtr g, std::function<void(GitPtr g)> callback)
	: g(g)
	, callback(callback)
	{
	}
	protected:
	- void run()
	+ void run() override
	{
	callback(g);
	}
	};

	FileDiffWidget::DrawData::DrawData()
	{
	bgcolor_text = QColor(255, 255, 255);
	bgcolor_gray = QColor(224, 224, 224);
	bgcolor_add = QColor(192, 240, 192);
	bgcolor_del = QColor(255, 224, 224);
	bgcolor_add_dark = QColor(64, 192, 64);
	bgcolor_del_dark = QColor(240, 64, 64);
	}

	enum {
	IndexRole = Qt::UserRole,
	FilePathRole,
	DiffIndexRole,
	HunkIndexRole,
	};

	enum {
	GroupItem = -1,
	};

	static inline bool isGroupItem(QTreeWidgetItem *item)
	{
	if (item) {
	int index = item->data(0, IndexRole).toInt();
	if (index == GroupItem) {
	return true;
	}
	}
	return false;
	}

	static inline QString getFilePath(QListWidgetItem *item)
	{
	if (!item) return QString();
	return item->data(FilePathRole).toString();
	}

	static inline int indexOfLog(QListWidgetItem *item)
	{
	if (!item) return -1;
	return item->data(IndexRole).toInt();
	}

	static inline int indexOfDiff(QListWidgetItem *item)
	{
	if (!item) return -1;
	return item->data(DiffIndexRole).toInt();
	}

	static inline int getHunkIndex(QListWidgetItem *item)
	{
	if (!item) return -1;
	return item->data(HunkIndexRole).toInt();
	}

	enum class PtyCondition {
	None,
	Clone,
	Fetch,
	Pull,
	Push,
	};

	enum InteractionMode {
	None,
	Busy,
	};

	struct MainWindow::Private {
	QString starting_dir;
	Git::Context gcx;
	ApplicationSettings appsettings;
	QList<RepositoryItem> repos;
	RepositoryItem current_repo;
	ServerType server_type = ServerType::Standard;
	GitHubRepositoryInfo github;
	QString current_remote;
	Git::Branch current_branch;
	QString head_id;
	struct Diff {
	QList<Git::Diff> result;
	std::shared_ptr<QThread> thread;
	QList<std::shared_ptr<QThread>> garbage;
	} diff;
	std::map<QString, Git::Diff> diff_cache;
	QStringList added;
	Git::CommitItemList logs;
	std::map<int, QList<Label>> label_map;
	bool force_fetch = false;
	bool uncommited_changes = false;
	int update_files_list_counter = 0;
	QTimer interval_10ms_timer;
	QTimer remote_watcher_timer;
	QImage graph_color;
	QStringList remotes;
	std::map<QString, QList<Git::Branch>> branch_map;
	std::map<QString, QList<Git::Tag>> tag_map;
	QString repository_filter_text;
	QPixmap digits;
	QIcon repository_icon;
	QIcon folder_icon;
	QIcon signature_good_icon;
	QIcon signature_dubious_icon;
	QIcon signature_bad_icon;
	unsigned int temp_file_counter = 0;
	GitObjectCache objcache;
	QPixmap transparent_pixmap;
	StatusLabel *status_bar_label;

	- QObject *last_focused_file_list = 0;
	+ QObject *last_focused_file_list = nullptr;

	WebContext webcx;
	AvatarLoader avatar_loader;
	int update_commit_table_counter = 0;

	std::map<QString, GitHubAPI::User> committer_map; // key is email

	PtyProcess pty_process;
	PtyCondition pty_condition = PtyCondition::None;
	bool pty_process_ok = false;

	RepositoryItem temp_repo;

	QListWidgetItem *last_selected_file_item = nullptr;

	InteractionMode interaction_mode = InteractionMode::None;
	bool interaction_canceled = false;

	bool remote_changed = false;

	std::string ssh_passphrase_for;
	std::string ssh_passphrase_secret;

	std::string http_uid;
	std::string http_pwd;

	RemoteWatcher remote_watcher;
	};

	MainWindow::MainWindow(QWidget *parent)
	: QMainWindow(parent)
	, ui(new Ui::MainWindow)
	, m(new Private)
	{
	ui->setupUi(this);

	#ifdef Q_OS_MACX
	ui->action_about->setText("About Guitar...");
	ui->action_edit_settings->setText("Settings...");
	#endif

	m->starting_dir = QDir::current().absolutePath();

	ui->splitter_v->setSizes({100, 400});
	ui->splitter_h->setSizes({200, 100, 200});

	m->status_bar_label = new StatusLabel(this);
	ui->statusBar->addWidget(m->status_bar_label);

	ui->widget_diff_view->bind(this);

	qApp->installEventFilter(this);

	ui->widget_log->setupForLogWidget(ui->verticalScrollBar_log, ui->horizontalScrollBar_log, themeForTextEditor());
	onLogVisibilityChanged();

	SettingsDialog::loadSettings(&m->appsettings);

	initNetworking();

	showFileList(FilesListType::SingleList);

	QFileIconProvider icons;

	m->digits.load(":/image/digits.png");
	m->graph_color = global->theme->graphColorMap();

	m->repository_icon = QIcon(":/image/repository.png");
	m->folder_icon = icons.icon(QFileIconProvider::Folder);

	m->signature_good_icon = QIcon(":/image/signature-good.png");
	m->signature_bad_icon = QIcon(":/image/signature-bad.png");
	m->signature_dubious_icon = QIcon(":/image/signature-dubious.png");

	prepareLogTableWidget();

	#ifdef Q_OS_WIN
	{
	QFont font;

	font = ui->label_repo_name->font();
	font.setFamily("Meiryo");
	ui->label_repo_name->setFont(font);

	font = ui->label_branch_name->font();
	font.setFamily("Meiryo");
	ui->label_branch_name->setFont(font);
	}
	#endif

	connect(this, SIGNAL(signalWriteLog(QByteArray)), this, SLOT(writeLog(QByteArray)));

	connect(ui->dockWidget_log, SIGNAL(visibilityChanged(bool)), this, SLOT(onLogVisibilityChanged()));
	connect(ui->widget_log, SIGNAL(idle()), this, SLOT(onLogIdle()));

	connect(ui->treeWidget_repos, SIGNAL(dropped()), this, SLOT(onRepositoriesTreeDropped()));

	connect((AbstractPtyProcess *)&m->pty_process, SIGNAL(completed()), this, SLOT(onPtyProcessCompleted()));

	// リモート監視
	connect(this, SIGNAL(signalCheckRemoteUpdate()), &m->remote_watcher, SLOT(checkRemoteUpdate()));
	connect(&m->remote_watcher_timer, SIGNAL(timeout()), &m->remote_watcher, SLOT(checkRemoteUpdate()));
	connect(this, &MainWindow::updateButton, [&](){
	doUpdateButton();
	});
	m->remote_watcher.start(this);
	setWatchRemoteInterval(appsettings()->watch_remote_changes_every_mins);

	//

	QString path = getBookmarksFilePath();
	m->repos = RepositoryBookmark::load(path);
	updateRepositoriesList();

	m->webcx.set_keep_alive_enabled(true);
	m->avatar_loader.start(&m->webcx);
	connect(&m->avatar_loader, SIGNAL(updated()), this, SLOT(onAvatarUpdated()));

	m->update_files_list_counter = 0;

	connect(ui->widget_diff_view, &FileDiffWidget::textcodecChanged, [&](){ updateDiffView(); });

	if (!global->start_with_shift_key && appsettings()->remember_and_restore_window_position) {
	Qt::WindowStates state = windowState();
	MySettings settings;

	settings.beginGroup("MainWindow");
	bool maximized = settings.value("Maximized").toBool();
	restoreGeometry(settings.value("Geometry").toByteArray());
	// ui->splitter->restoreState(settings.value("SplitterState").toByteArray());
	settings.endGroup();
	if (maximized) {
	state \|= Qt::WindowMaximized;
	setWindowState(state);
	}
	}

	startTimers();
	}

	MainWindow::~MainWindow()
	{
	stopPtyProcess();

	m->avatar_loader.stop();

	m->remote_watcher.quit();
	m->remote_watcher.wait();

	deleteTempFiles();

	delete m;
	delete ui;
	}

	bool MainWindow::checkGitCommand()
	{
	while (1) {
	if (misc::isExecutable(m->gcx.git_command)) {
	return true;
	}
	if (selectGitCommand(true).isEmpty()) {
	close();
	return false;
	}
	}
	}

	bool MainWindow::checkFileCommand()
	{
	while (1) {
	if (misc::isExecutable(global->file_command)) {
	return true;
	}
	if (selectFileCommand(true).isEmpty()) {
	close();
	return false;
	}
	}
	}

	ApplicationSettings *MainWindow::appsettings()
	{
	return &m->appsettings;
	}

	ApplicationSettings const *MainWindow::appsettings() const
	{
	return &m->appsettings;
	}

	bool MainWindow::execWelcomeWizardDialog()
	{
	WelcomeWizardDialog dlg(this);
	dlg.set_git_command_path(appsettings()->git_command);
	dlg.set_file_command_path(appsettings()->file_command);
	dlg.set_default_working_folder(appsettings()->default_working_dir);
	if (misc::isExecutable(appsettings()->git_command)) {
	m->gcx.git_command = appsettings()->git_command;
	Git g(m->gcx, QString());
	Git::User user = g.getUser(Git::Source::Global);
	dlg.set_user_name(user.name);
	dlg.set_user_email(user.email);
	}
	if (dlg.exec() == QDialog::Accepted) {
	appsettings()->git_command = m->gcx.git_command = dlg.git_command_path();
	appsettings()->file_command = global->file_command = dlg.file_command_path();
	appsettings()->default_working_dir = dlg.default_working_folder();
	SettingsDialog::saveSettings(&m->appsettings);

	if (misc::isExecutable(appsettings()->git_command)) {
	GitPtr g = git();
	Git::User user;
	user.name = dlg.user_name();
	user.email = dlg.user_email();
	g->setUser(user, true);
	}

	return true;
	}
	return false;
	}

	bool MainWindow::shown()
	{
	while (!misc::isExecutable(appsettings()->git_command) \|\| !misc::isExecutable(appsettings()->file_command)) {
	if (!execWelcomeWizardDialog()) {
	return false;
	}
	}

	setGitCommand(appsettings()->git_command, false);
	setFileCommand(appsettings()->file_command, false);

	writeLog(AboutDialog::appVersion() + '\n'); // print application version
	logGitVersion(); // print git command version

	setGpgCommand(appsettings()->gpg_command, false);

	{
	MySettings s;
	s.beginGroup("Remote");
	bool f = s.value("Online", true).toBool();
	s.endGroup();
	setRemoteOnline(f);
	}

	setUnknownRepositoryInfo();

	checkUser();

	return true;
	}

	WebContext *MainWindow::webContext()
	{
	return &m->webcx;
	}

	void MainWindow::startTimers()
	{
	// interval 10ms

	connect(&m->interval_10ms_timer, &QTimer::timeout, [&](){
	const int ms = 10;
	if (m->update_commit_table_counter > 0) {
	if (m->update_commit_table_counter > ms) {
	m->update_commit_table_counter -= ms;
	} else {
	m->update_commit_table_counter = 0;
	ui->tableWidget_log->viewport()->update();
	}
	}
	if (m->update_files_list_counter > 0) {
	if (m->update_files_list_counter > ms) {
	m->update_files_list_counter -= ms;
	} else {
	m->update_files_list_counter = 0;
	updateCurrentFilesList();
	}
	}
	});
	m->interval_10ms_timer.setInterval(10);
	m->interval_10ms_timer.start();

	startTimer(10);
	}

	TextEditorThemePtr MainWindow::themeForTextEditor()
	{
	return global->theme->text_editor_theme;
	}

	void MainWindow::setCurrentLogRow(int row)
	{
	if (row >= 0 && row < ui->tableWidget_log->rowCount()) {
	ui->tableWidget_log->setCurrentCell(row, 2);
	ui->tableWidget_log->setFocus();
	updateStatusBarText();
	}
	}

	bool MainWindow::event(QEvent *event)
	{
	QEvent::Type et = event->type();
	if (et == QEvent::WindowActivate) {
	checkRemoteUpdate();
	} else if (et == QEvent::KeyPress) {
	- QKeyEvent e = dynamic_cast<QKeyEvent >(event);
	+ auto e = dynamic_cast<QKeyEvent >(event);
	Q_ASSERT(e);
	int k = e->key();
	if (k == Qt::Key_Escape) {
	emit onEscapeKeyPressed();
	} else if (k == Qt::Key_Delete) {
	if (qApp->focusWidget() == ui->treeWidget_repos) {
	removeSelectedRepositoryFromBookmark(true);
	return true;
	}
	}
	}
	return QMainWindow::event(event);
	}

	bool MainWindow::eventFilter(QObject watched, QEvent event)
	{
	QEvent::Type et = event->type();

	if (et == QEvent::KeyPress) {
	- QKeyEvent e = dynamic_cast<QKeyEvent >(event);
	+ auto e = dynamic_cast<QKeyEvent >(event);
	Q_ASSERT(e);
	int k = e->key();
	if (k == Qt::Key_Tab) {
	if (centralWidget()->isAncestorOf(qApp->focusWidget())) {
	QList<QWidget *> tabstops;
	tabstops.push_back(ui->treeWidget_repos);
	tabstops.push_back(ui->tableWidget_log);
	if (ui->stackedWidget->currentWidget() == ui->page_files) {
	tabstops.push_back(ui->listWidget_files);
	} else if (ui->stackedWidget->currentWidget() == ui->page_uncommited) {
	tabstops.push_back(ui->listWidget_unstaged);
	tabstops.push_back(ui->toolButton_select_all);
	tabstops.push_back(ui->toolButton_stage);
	tabstops.push_back(ui->toolButton_unstage);
	tabstops.push_back(ui->toolButton_commit);
	tabstops.push_back(ui->listWidget_staged);
	}
	tabstops.push_back(ui->widget_diff_view);
	int n = tabstops.size();
	if (n > 0) {
	QWidget *f = qApp->focusWidget();
	int i;
	for (i = 0; i < n; i++) {
	if (tabstops[i] == f) {
	break;
	}
	}
	if (i < n) {
	if (e->modifiers() & Qt::ShiftModifier) {
	i = (i + n - 1) % n;
	} else {
	i = (i + 1) % n;
	}
	tabstops[i]->setFocus();
	}
	}
	return true;
	}
	}
	if (k == Qt::Key_Escape) {
	if (centralWidget()->isAncestorOf(qApp->focusWidget())) {
	ui->treeWidget_repos->setFocus();
	return true;
	}
	}
	if (e->modifiers() & Qt::ControlModifier) {
	if (k == Qt::Key_Up \|\| k == Qt::Key_Down) {
	int rows = ui->tableWidget_log->rowCount();
	int row = ui->tableWidget_log->currentRow();
	if (k == Qt::Key_Up) {
	if (row > 0) {
	row--;
	}
	} else if (k == Qt::Key_Down) {
	if (row + 1 < rows) {
	row++;
	}
	}
	ui->tableWidget_log->setCurrentCell(row, 0);
	return true;
	}
	}
	if (watched == ui->treeWidget_repos) {
	if (k == Qt::Key_Enter \|\| k == Qt::Key_Return) {
	openSelectedRepository();
	return true;
	}
	if (!(e->modifiers() & Qt::ControlModifier)) {
	if (k >= 0 && k < 128 && QChar((uchar)k).isLetterOrNumber()) {
	appendCharToRepoFilter(k);
	return true;
	}
	if (k == Qt::Key_Backspace) {
	backspaceRepoFilter();
	return true;
	}
	if (k == Qt::Key_Escape) {
	clearRepoFilter();
	return true;
	}
	}
	} else if (watched == ui->tableWidget_log) {
	if (k == Qt::Key_Home) {
	setCurrentLogRow(0);
	return true;
	}
	if (k == Qt::Key_Escape) {
	ui->treeWidget_repos->setFocus();
	return true;
	}
	} else if (watched == ui->listWidget_files \|\| watched == ui->listWidget_unstaged \|\| watched == ui->listWidget_staged) {
	if (k == Qt::Key_Escape) {
	ui->tableWidget_log->setFocus();
	return true;
	}
	}
	} else if (et == QEvent::FocusIn) {
	// ファイルリストがフォーカスを得たとき、diffビューを更新する。（コンテキストメニュー対応）
	if (watched == ui->listWidget_unstaged) {
	m->last_focused_file_list = watched;
	updateStatusBarText();
	updateUnstagedFileCurrentItem();
	return true;
	}
	if (watched == ui->listWidget_staged) {
	m->last_focused_file_list = watched;
	updateStatusBarText();
	updateStagedFileCurrentItem();
	return true;
	}
	if (watched == ui->listWidget_files) {
	m->last_focused_file_list = watched;
	}
	}
	return false;
	}

	void MainWindow::closeEvent(QCloseEvent *event)
	{
	if (appsettings()->remember_and_restore_window_position) {
	setWindowOpacity(0);
	Qt::WindowStates state = windowState();
	bool maximized = (state & Qt::WindowMaximized) != 0;
	if (maximized) {
	state &= ~Qt::WindowMaximized;
	setWindowState(state);
	}
	{
	MySettings settings;

	settings.beginGroup("MainWindow");
	settings.setValue("Maximized", maximized);
	settings.setValue("Geometry", saveGeometry());
	// settings.setValue("SplitterState", ui->splitter->saveState());
	settings.endGroup();
	}
	}
	QMainWindow::closeEvent(event);
	}

	void MainWindow::setStatusBarText(QString const &text)
	{
	m->status_bar_label->setText(text);
	}

	void MainWindow::clearStatusBarText()
	{
	setStatusBarText(QString());
	}

	WebContext *MainWindow::getWebContextPtr()
	{
	return &m->webcx;
	}

	QString MainWindow::getObjectID(QListWidgetItem *item)
	{
	int i = indexOfDiff(item);
	if (i >= 0 && i < m->diff.result.size()) {
	Git::Diff const &diff = m->diff.result[i];
	return diff.blob.a_id;
	}
	return QString();
	}

	void MainWindow::onLogVisibilityChanged()
	{
	ui->action_window_log->setChecked(ui->dockWidget_log->isVisible());
	}

	void MainWindow::writeLog(char const *ptr, int len)
	{
	ui->widget_log->logicalMoveToBottom();
	ui->widget_log->write(ptr, len, false);
	ui->widget_log->setChanged(false);
	m->interaction_canceled = false;
	}

	void MainWindow::writeLog(const QString &str)
	{
	std::string s = str.toStdString();
	writeLog(s.c_str(), s.size());
	}

	void MainWindow::writeLog(QByteArray ba)
	{
	if (!ba.isEmpty()) {
	writeLog(ba.data(), ba.size());
	}
	}

	void MainWindow::emitWriteLog(QByteArray ba)
	{
	emit signalWriteLog(ba);
	}

	bool MainWindow::git_callback(void cookie, char const ptr, int len)
	{
	- MainWindow mw = (MainWindow )cookie;
	+ auto mw = (MainWindow )cookie;
	mw->emitWriteLog(QByteArray(ptr, len));
	return true;
	}

	bool MainWindow::saveRepositoryBookmarks() const
	{
	QString path = getBookmarksFilePath();
	return RepositoryBookmark::save(path, &m->repos);
	}

	void MainWindow::saveRepositoryBookmark(RepositoryItem item)
	{
	if (item.local_dir.isEmpty()) return;

	if (item.name.isEmpty()) {
	item.name = tr("Unnamed");
	}

	bool done = false;
	- for (int i = 0; i < m->repos.size(); i++) {
	- RepositoryItem *p = &m->repos[i];
	+ for (auto &repo : m->repos) {
	+ RepositoryItem *p = &repo;
	if (item.local_dir == p->local_dir) {
	*p = item;
	done = true;
	break;
	}
	}
	if (!done) {
	m->repos.push_back(item);
	}
	saveRepositoryBookmarks();
	updateRepositoriesList();
	}

	void MainWindow::buildRepoTree(QString const &group, QTreeWidgetItem item, QList<RepositoryItem> repos)
	{
	QString name = item->text(0);
	if (isGroupItem(item)) {
	int n = item->childCount();
	for (int i = 0; i < n; i++) {
	QTreeWidgetItem *child = item->child(i);
	QString sub = group / name;
	buildRepoTree(sub, child, repos);
	}
	} else {
	RepositoryItem const *repo = repositoryItem(item);
	if (repo) {
	RepositoryItem newrepo = *repo;
	newrepo.name = name;
	newrepo.group = group;
	item->setData(0, IndexRole, repos->size());
	repos->push_back(newrepo);
	}
	}
	}

	void MainWindow::refrectRepositories()
	{
	QList<RepositoryItem> newrepos;
	int n = ui->treeWidget_repos->topLevelItemCount();
	for (int i = 0; i < n; i++) {
	QTreeWidgetItem *item = ui->treeWidget_repos->topLevelItem(i);
	buildRepoTree(QString(), item, &newrepos);
	}
	m->repos = std::move(newrepos);
	saveRepositoryBookmarks();
	}

	void MainWindow::onRepositoriesTreeDropped()
	{
	refrectRepositories();
	QTreeWidgetItem *item = ui->treeWidget_repos->currentItem();
	if (item) item->setExpanded(true);
	}

	const QPixmap &MainWindow::digitsPixmap() const
	{
	return m->digits;
	}

	int MainWindow::digitWidth() const
	{
	return 5;
	}

	int MainWindow::digitHeight() const
	{
	return 7;
	}

	void MainWindow::drawDigit(QPainter *pr, int x, int y, int n) const
	{
	int w = digitWidth();
	int h = digitHeight();
	pr->drawPixmap(x, y, w, h, m->digits, n * w, 0, w, h);
	}

	QString MainWindow::defaultWorkingDir() const
	{
	return appsettings()->default_working_dir;
	}

	QColor MainWindow::color(unsigned int i)
	{
	unsigned int n = m->graph_color.width();
	if (n > 0) {
	n--;
	if (i > n) i = n;
	QRgb const p = (QRgb const )m->graph_color.scanLine(0);
	return QColor(qRed(p[i]), qGreen(p[i]), qBlue(p[i]));
	}
	return Qt::black;
	}

	bool MainWindow::isThereUncommitedChanges() const
	{
	return m->uncommited_changes;
	}

	Git::CommitItemList const *MainWindow::logs() const
	{
	return &m->logs;
	}

	QString MainWindow::currentWorkingCopyDir() const
	{
	QString workdir = m->current_repo.local_dir;
	if (!workdir.isEmpty()) return workdir;

	QTreeWidgetItem *treeitem = ui->treeWidget_repos->currentItem();
	if (treeitem) {
	RepositoryItem const *repo = repositoryItem(treeitem);
	if (repo) {
	workdir = repo->local_dir;
	return workdir;
	}
	}

	return QString();
	}

	QString MainWindow::currentRepositoryName() const
	{
	return m->current_repo.name;
	}

	QString MainWindow::currentRemoteName() const
	{
	return m->current_remote;
	}

	Git::Branch const &MainWindow::currentBranch() const
	{
	return m->current_branch;
	}

	QString MainWindow::currentBranchName() const
	{
	return currentBranch().name;
	}

	GitPtr MainWindow::git(QString const &dir) const
	{
	const_cast<MainWindow *>(this)->checkGitCommand();

	GitPtr g = std::shared_ptr<Git>(new Git(m->gcx, dir));
	g->setLogCallback(git_callback, (void *)this);
	return g;
	}

	GitPtr MainWindow::git()
	{
	return git(currentWorkingCopyDir());
	}

	bool MainWindow::queryCommit(QString const &id, Git::CommitItem *out)
	{
	*out = Git::CommitItem();
	GitPtr g = git();
	return g->queryCommit(id, out);
	}

	void MainWindow::setLogEnabled(GitPtr g, bool f)
	{
	if (f) {
	g->setLogCallback(git_callback, this);
	} else {
	g->setLogCallback(nullptr, nullptr);
	}
	}

	QString MainWindow::makeRepositoryName(QString const &loc)
	{
	int i = loc.lastIndexOf('/');
	int j = loc.lastIndexOf('\\');
	if (i < j) i = j;
	if (i >= 0) {
	i++;
	j = loc.size();
	if (loc.endsWith(".git")) {
	j -= 4;
	}
	return loc.mid(i, j - i);
	}
	return QString();
	}

	RepositoryItem const MainWindow::findRegisteredRepository(QString workdir) const
	{
	workdir = QDir(workdir).absolutePath();
	workdir->replace('\\', '/');

	if (Git::isValidWorkingCopy(*workdir)) {
	for (RepositoryItem const &item : m->repos) {
	Qt::CaseSensitivity cs = Qt::CaseSensitive;
	#ifdef Q_OS_WIN
	cs = Qt::CaseInsensitive;
	#endif
	if (workdir->compare(item.local_dir, cs) == 0) {
	return &item;
	}
	}
	}
	return nullptr;
	}

	int MainWindow::repositoryIndex_(QTreeWidgetItem const *item) const
	{
	if (item) {
	int i = item->data(0, IndexRole).toInt();
	if (i >= 0 && i < m->repos.size()) {
	return i;
	}
	}
	return -1;
	}

	RepositoryItem const MainWindow::repositoryItem(QTreeWidgetItem const item) const
	{
	int row = repositoryIndex_(item);
	if (row >= 0 && row < m->repos.size()) {
	return &m->repos[row];
	}
	return nullptr;
	}

	static QTreeWidgetItem *newQTreeWidgetItem()
	{
	- QTreeWidgetItem *item = new QTreeWidgetItem();
	+ auto *item = new QTreeWidgetItem;
	item->setSizeHint(0, QSize(20, 20));
	return item;
	}

	QTreeWidgetItem *MainWindow::newQTreeWidgetFolderItem(QString const &name)
	{
	QTreeWidgetItem *item = newQTreeWidgetItem();
	item->setText(0, name);
	item->setData(0, IndexRole, GroupItem);
	item->setIcon(0, m->folder_icon);
	item->setFlags(item->flags() \| Qt::ItemIsEditable);
	return item;
	}

	void MainWindow::updateRepositoriesList()
	{
	QString path = getBookmarksFilePath();

	m->repos = RepositoryBookmark::load(path);

	QString filter = m->repository_filter_text;

	ui->treeWidget_repos->clear();

	std::map<QString, QTreeWidgetItem *> parentmap;

	for (int i = 0; i < m->repos.size(); i++) {
	RepositoryItem const &repo = m->repos[i];
	if (!filter.isEmpty() && repo.name.indexOf(filter, 0, Qt::CaseInsensitive) < 0) {
	continue;
	}
	QTreeWidgetItem *parent = nullptr;
	{
	QString group = repo.group;
	if (group.startsWith('/')) {
	group = group.mid(1);
	}
	auto it = parentmap.find(group);
	if (it != parentmap.end()) {
	parent = it->second;
	}
	if (!parent) {
	QStringList list = group.split('/', QString::SkipEmptyParts);
	if (list.isEmpty()) {
	list.push_back(tr("Default"));
	}
	for (QString const &name : list) {
	if (name.isEmpty()) continue;
	if (!parent) {
	auto it = parentmap.find(name);
	if (it != parentmap.end()) {
	parent = it->second;
	} else {
	parent = newQTreeWidgetFolderItem(name);
	ui->treeWidget_repos->addTopLevelItem(parent);
	}
	} else {
	QTreeWidgetItem *child = newQTreeWidgetFolderItem(name);
	parent->addChild(child);
	parent = child;
	}
	parent->setExpanded(true);
	}
	Q_ASSERT(parent);
	parentmap[group] = parent;
	}
	parent->setData(0, FilePathRole, "");
	}
	QTreeWidgetItem *child = newQTreeWidgetItem();
	child->setText(0, repo.name);
	child->setData(0, IndexRole, i);
	child->setIcon(0, m->repository_icon);
	child->setFlags(child->flags() & ~Qt::ItemIsDropEnabled);
	parent->addChild(child);
	parent->setExpanded(true);
	}
	}

	void MainWindow::showFileList(FilesListType files_list_type)
	{
	switch (files_list_type) {
	case FilesListType::SingleList:
	ui->stackedWidget->setCurrentWidget(ui->page_files);
	break;
	case FilesListType::SideBySide:
	ui->stackedWidget->setCurrentWidget(ui->page_uncommited);
	break;
	}
	}

	void MainWindow::clearFileList()
	{
	showFileList(FilesListType::SingleList);
	ui->listWidget_unstaged->clear();
	ui->listWidget_staged->clear();
	ui->listWidget_files->clear();
	}

	void MainWindow::clearDiffView()
	{
	ui->widget_diff_view->clearDiffView();
	}

	void MainWindow::clearRepositoryInfo()
	{
	m->head_id = QString();
	m->current_branch = Git::Branch();
	m->server_type = ServerType::Standard;
	m->github = GitHubRepositoryInfo();
	ui->label_repo_name->setText(QString());
	ui->label_branch_name->setText(QString());

	}

	void MainWindow::setRepositoryInfo(QString const &reponame, QString const &brname)
	{
	ui->label_repo_name->setText(reponame);
	ui->label_branch_name->setText(brname);
	}

	void MainWindow::setUnknownRepositoryInfo()
	{
	setRepositoryInfo("---", "");

	Git g(m->gcx, QString());
	Git::User user = g.getUser(Git::Source::Global);
	setWindowTitle_(user);
	}

	bool MainWindow::makeDiff(QString id, QList<Git::Diff> *out)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return false;

	Git::FileStatusList list = g->status();
	m->uncommited_changes = !list.empty();

	if (id.isEmpty() && !isThereUncommitedChanges()) {
	id = m->objcache.revParse("HEAD");
	}

	bool uncommited = (id.isEmpty() && isThereUncommitedChanges());

	GitDiff dm(&m->objcache);
	if (uncommited) {
	dm.diff_uncommited(out);
	} else {
	dm.diff(id, out);
	}

	return true; // success
	}

	-void MainWindow::addDiffItems(QList<Git::Diff> const *diff_list, std::function<void(QString const &filename, QString header, int idiff)> add_item)
	+void MainWindow::addDiffItems(QList<Git::Diff> const *diff_list, std::function<void(QString const &filename, QString header, int idiff)> const &add_item)
	{
	for (int idiff = 0; idiff < diff_list->size(); idiff++) {
	Git::Diff const &diff = diff_list->at(idiff);
	QString header;

	switch (diff.type) {
	case Git::Diff::Type::Modify: header = "(chg) "; break;
	case Git::Diff::Type::Copy: header = "(cpy) "; break;
	case Git::Diff::Type::Rename: header = "(ren) "; break;
	case Git::Diff::Type::Create: header = "(add) "; break;
	case Git::Diff::Type::Delete: header = "(del) "; break;
	case Git::Diff::Type::ChType: header = "(chg) "; break;
	case Git::Diff::Type::Unmerged: header = "(unmerged) "; break;
	}

	add_item(diff.path, header, idiff);
	}
	}

	void MainWindow::updateFilesList(QString id, bool wait)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	if (!wait) return;

	clearFileList();

	Git::FileStatusList stats = g->status();
	m->uncommited_changes = !stats.empty();

	FilesListType files_list_type = FilesListType::SingleList;

	bool staged = false;
	auto AddItem = [&](QString const &filename, QString header, int idiff){
	if (header.isEmpty()) {
	header = "(??\?) "; // damn trigraph
	}
	QListWidgetItem *item = new QListWidgetItem(header + filename);
	item->setData(FilePathRole, filename);
	item->setData(DiffIndexRole, idiff);
	item->setData(HunkIndexRole, -1);
	switch (files_list_type) {
	case FilesListType::SingleList:
	ui->listWidget_files->addItem(item);
	break;
	case FilesListType::SideBySide:
	if (staged) {
	ui->listWidget_staged->addItem(item);
	} else {
	ui->listWidget_unstaged->addItem(item);
	}
	break;
	}
	};

	if (id.isEmpty()) {
	bool uncommited = isThereUncommitedChanges();
	if (uncommited) {
	files_list_type = FilesListType::SideBySide;
	}
	if (!makeDiff(uncommited ? QString() : id, &m->diff.result)) {
	return;
	}

	std::map<QString, int> diffmap;

	for (int idiff = 0; idiff < m->diff.result.size(); idiff++) {
	Git::Diff const &diff = m->diff.result[idiff];
	QString filename = diff.path;
	if (!filename.isEmpty()) {
	diffmap[filename] = idiff;
	}
	}

	showFileList(files_list_type);

	for (Git::FileStatus const &s : stats) {
	staged = (s.isStaged() && s.code_y() == ' ');
	int idiff = -1;
	QString header;
	auto it = diffmap.find(s.path1());
	if (it != diffmap.end()) {
	idiff = it->second;
	}
	QString path = s.path1();
	if (s.code() == Git::FileStatusCode::Unknown) {
	qDebug() << "something wrong...";
	} else if (s.code() == Git::FileStatusCode::Untracked) {
	// nop
	} else if (s.isUnmerged()) {
	header += "(unmerged) ";
	} else if (s.code() == Git::FileStatusCode::AddedToIndex) {
	header = "(add) ";
	} else if (s.code_x() == 'D' \|\| s.code_y() == 'D' \|\| s.code() == Git::FileStatusCode::DeletedFromIndex) {
	header = "(del) ";
	} else if (s.code_x() == 'R' \|\| s.code() == Git::FileStatusCode::RenamedInIndex) {
	header = "(ren) ";
	path = s.path2(); // renamed newer path
	} else if (s.code_x() == 'M' \|\| s.code_y() == 'M') {
	header = "(chg) ";
	}
	AddItem(path, header, idiff);
	}
	} else {
	if (!makeDiff(id, &m->diff.result)) {
	return;
	}
	showFileList(files_list_type);
	addDiffItems(&m->diff.result, AddItem);
	}

	for (Git::Diff const &diff : m->diff.result) {
	QString key = GitDiff::makeKey(diff);
	m->diff_cache[key] = diff;
	}
	}

	void MainWindow::updateFilesList(QString id, QList<Git::Diff> diff_list, QListWidget listwidget)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	listwidget->clear();

	auto AddItem = [&](QString const &filename, QString header, int idiff){
	if (header.isEmpty()) {
	header = "(??\?) "; // damn trigraph
	}
	QListWidgetItem *item = new QListWidgetItem(header + filename);
	item->setData(FilePathRole, filename);
	item->setData(DiffIndexRole, idiff);
	item->setData(HunkIndexRole, -1);
	listwidget->addItem(item);
	};

	GitDiff dm(&m->objcache);
	if (!dm.diff(id, diff_list)) return;

	addDiffItems(diff_list, AddItem);
	}

	void MainWindow::updateFilesList(Git::CommitItem const &commit, bool wait)
	{
	QString id;
	if (Git::isUncommited(commit)) {
	// empty id for uncommited changes
	} else {
	id = commit.commit_id;
	}
	updateFilesList(id, wait);
	}

	void MainWindow::updateCurrentFilesList()
	{
	QTableWidgetItem *item = ui->tableWidget_log->item(selectedLogIndex(), 0);
	if (!item) return;
	int row = item->data(IndexRole).toInt();
	int logs = (int)m->logs.size();
	if (row < logs) {
	updateFilesList(m->logs[row], true);
	}
	}

	void MainWindow::setRemoteChanged(bool f)
	{
	m->remote_changed = f;
	updateButton();
	}

	void MainWindow::prepareLogTableWidget()
	{
	QStringList cols = {
	tr("Graph"),
	tr("Commit"),
	tr("Date"),
	tr("Author"),
	tr("Description"),
	};
	int n = cols.size();
	ui->tableWidget_log->setColumnCount(n);
	ui->tableWidget_log->setRowCount(0);
	for (int i = 0; i < n; i++) {
	QString const &text = cols[i];
	- QTableWidgetItem *item = new QTableWidgetItem(text);
	+ auto *item = new QTableWidgetItem(text);
	ui->tableWidget_log->setHorizontalHeaderItem(i, item);
	}

	updateCommitGraph(); // コミットグラフを更新
	}

	void MainWindow::clearAuthentication()
	{
	m->ssh_passphrase_for.clear();
	m->ssh_passphrase_secret.clear();
	m->http_uid.clear();
	m->http_pwd.clear();
	}

	void MainWindow::setCurrentRepository(RepositoryItem const &repo, bool clear_authentication)
	{
	if (clear_authentication) {
	clearAuthentication();
	}
	m->current_repo = repo;
	}

	bool MainWindow::isValidWorkingCopy(GitPtr const &g) const
	{
	return g && g->isValidWorkingCopy();
	}

	void MainWindow::queryRemotes(GitPtr g)
	{
	m->remotes = g->getRemotes();
	std::sort(m->remotes.begin(), m->remotes.end());
	}

	void MainWindow::queryBranches(GitPtr g)
	{
	Q_ASSERT(g);
	m->branch_map.clear();
	QList<Git::Branch> branches = g->branches();
	for (Git::Branch const &b : branches) {
	if (b.isCurrent()) {
	m->current_branch = b;
	}
	m->branch_map[b.id].append(b);
	}
	}

	void MainWindow::updateRemoteInfo()
	{
	queryRemotes(git());

	m->current_remote = QString();
	{
	Git::Branch const &r = currentBranch();
	m->current_remote = r.remote;
	}
	if (m->current_remote.isEmpty()) {
	if (m->remotes.size() == 1) {
	m->current_remote = m->remotes[0];
	}
	}

	ui->lineEdit_remote->setText(m->current_remote);
	}

	QList<Git::Branch> MainWindow::findBranch(QString const &id)
	{
	auto it = m->branch_map.find(id);
	if (it != m->branch_map.end()) {
	return it->second;
	}
	return QList<Git::Branch>();
	}

	QString MainWindow::abbrevCommitID(Git::CommitItem const &commit)
	{
	return commit.commit_id.mid(0, 7);
	}

	QString MainWindow::findFileID(GitPtr /g/, const QString &commit_id, const QString &file)
	{
	return lookupFileID(&m->objcache, commit_id, file);
	}

	bool MainWindow::isGitHub() const
	{
	return m->server_type == ServerType::GitHub;
	}

	void MainWindow::updateCommitTableLater()
	{
	m->update_commit_table_counter = 200;
	}

	void MainWindow::onAvatarUpdated()
	{
	updateCommitTableLater();
	}

	bool MainWindow::isAvatarEnabled() const
	{
	return appsettings()->get_committer_icon;
	}

	Git::CommitItem const *MainWindow::commitItem(int row) const
	{
	if (row >= 0 && row < (int)m->logs.size()) {
	return &m->logs[row];
	}
	return nullptr;
	}

	QIcon MainWindow::verifiedIcon(char s) const
	{
	Git::SignatureGrade g = Git::evaluateSignature(s);
	switch (g) {
	case Git::SignatureGrade::Good:
	return m->signature_good_icon;
	case Git::SignatureGrade::Bad:
	return m->signature_bad_icon;
	case Git::SignatureGrade::Unknown:
	case Git::SignatureGrade::Dubious:
	case Git::SignatureGrade::Missing:
	return m->signature_dubious_icon;
	}
	return QIcon();
	}

	QIcon MainWindow::committerIcon(int row) const
	{
	QIcon icon;
	if (isAvatarEnabled()) {
	if (row >= 0 && row < (int)m->logs.size()) {
	Git::CommitItem const &commit = m->logs[row];
	if (commit.email.indexOf('@') > 0) {
	std::string email = commit.email.toStdString();
	icon = m->avatar_loader.fetch(email, true); // from gavatar
	}
	}
	}
	return icon;
	}

	QList<MainWindow::Label> const *MainWindow::label(int row)
	{
	auto it = m->label_map.find(row);
	if (it != m->label_map.end()) {
	return &it->second;
	}
	return nullptr;
	}

	QString MainWindow::makeCommitInfoText(int row, QList<Label> *label_list)
	{
	QString message_ex;
	Git::CommitItem const *commit = &m->logs[row];
	{ // branch
	if (label_list) {
	if (commit->commit_id == m->head_id) {
	Label label(Label::Head);
	label.text = "HEAD";
	label_list->push_back(label);
	}
	}
	QList<Git::Branch> list = findBranch(commit->commit_id);
	for (Git::Branch const &b : list) {
	if (b.flags & Git::Branch::HeadDetachedAt) continue;
	if (b.flags & Git::Branch::HeadDetachedFrom) continue;
	Label label(Label::LocalBranch);
	label.text = b.name;
	if (!b.remote.isEmpty()) {
	label.kind = Label::RemoteBranch;
	label.text = "remotes" / b.remote / label.text;
	}
	if (b.ahead > 0) {
	label.text += tr(", %1 ahead").arg(b.ahead);
	}
	if (b.behind > 0) {
	label.text += tr(", %1 behind").arg(b.behind);
	}
	message_ex += " {" + label.text + '}';
	if (label_list) label_list->push_back(label);
	}
	}
	{ // tag
	QList<Git::Tag> list = findTag(commit->commit_id);
	for (Git::Tag const &t : list) {
	Label label(Label::Tag);
	label.text = t.name;
	message_ex += QString(" {#%1}").arg(label.text);
	if (label_list) label_list->push_back(label);
	}
	}
	return message_ex;
	}

	void MainWindow::setWindowTitle_(Git::User const &user)
	{
	if (user.name.isEmpty() && user.email.isEmpty()) {
	setWindowTitle(qApp->applicationName());
	} else {
	setWindowTitle(QString("%1 : %2 <%3>")
	.arg(qApp->applicationName())
	.arg(user.name)
	.arg(user.email)
	);
	}
	}

	void MainWindow::updateWindowTitle(GitPtr g)
	{
	if (isValidWorkingCopy(g)) {
	Git::User user = g->getUser(Git::Source::Default);
	setWindowTitle_(user);
	} else {
	setUnknownRepositoryInfo();
	}
	}

	QStringList MainWindow::remotes() const
	{
	return m->remotes;
	}

	int MainWindow::limitLogCount() const
	{
	int n = appsettings()->maximum_number_of_commit_item_acquisitions;
	return (n >= 1 && n <= 100000) ? n : 10000;
	}

	struct TemporaryCommitItem {
	Git::CommitItem const *commit;
	std::vector<TemporaryCommitItem *> children;
	};

	Git::CommitItemList MainWindow::retrieveCommitLog(GitPtr g)
	{
	Git::CommitItemList list = g->log(limitLogCount());

	// 親子関係を調べて、順番が狂っていたら、修正する。

	std::set<QString> set;

	size_t i = 0;
	while (i < list.size()) {
	size_t newpos = -1;
	for (QString const &parent : list[i].parent_ids) {
	auto it = set.find(parent);
	if (it != set.end()) {
	for (size_t j = 0; j < i; j++) {
	if (parent == list[j].commit_id) {
	if (newpos == (size_t)-1 \|\| j < newpos) {
	newpos = j;
	}
	qDebug() << "fix commit order" << parent;
	break;
	}
	}
	}
	}
	set.insert(set.end(), list[i].commit_id);
	if (newpos != (size_t)-1) {
	Git::CommitItem t = list[newpos];
	list.erase(list.begin() + newpos);
	list.insert(list.begin() + i, t);
	}
	i++;
	}

	return list;
	}

	void MainWindow::detectGitServerType(GitPtr g)
	{
	m->server_type = ServerType::Standard;
	m->github = GitHubRepositoryInfo();

	QString push_url;
	QList<Git::Remote> remotes;
	g->getRemoteURLs(&remotes);
	for (Git::Remote const &r : remotes) {
	if (r.purpose == "push") {
	push_url = r.url;
	}
	}

	auto Check = [&](QString const &s){
	int i = push_url.indexOf(s);
	if (i > 0) return i + s.size();
	return 0;
	};

	// check GitHub
	int pos = Check("@github.com:");
	if (pos == 0) {
	pos = Check("://github.com/");
	}
	if (pos > 0) {
	int end = push_url.size();
	{
	QString s = ".git";
	if (push_url.endsWith(s)) {
	end -= s.size();
	}
	}
	QString s = push_url.mid(pos, end - pos);
	int i = s.indexOf('/');
	if (i > 0) {
	QString user = s.mid(0, i);
	QString repo = s.mid(i + 1);
	m->github.owner_account_name = user;
	m->github.repository_name = repo;
	}
	m->server_type = ServerType::GitHub;
	}
	}

	bool MainWindow::fetch(GitPtr g)
	{
	m->pty_condition = PtyCondition::Fetch;
	m->pty_process_ok = true;
	g->fetch(&m->pty_process);
	while (1) {
	if (m->pty_process.wait(1)) break;
	QApplication::processEvents();
	}
	return m->pty_process_ok;
	}

	void MainWindow::clearLog()
	{
	m->logs.clear();
	m->label_map.clear();
	m->uncommited_changes = false;
	ui->tableWidget_log->clearContents();
	ui->tableWidget_log->scrollToTop();
	}

	void MainWindow::openRepository_(GitPtr g)
	{
	m->objcache.setup(g);

	if (isValidWorkingCopy(g)) {

	bool do_fetch = isRemoteOnline() && (m->force_fetch \|\| appsettings()->automatically_fetch_when_opening_the_repository);
	m->force_fetch = false;
	if (do_fetch) {
	if (!fetch(g)) {
	return;
	}
	}

	clearLog();
	clearRepositoryInfo();

	detectGitServerType(g);

	updateFilesList(QString(), true);

	bool canceled = false;
	ui->tableWidget_log->setEnabled(false);

	// ログを取得
	m->logs = retrieveCommitLog(g);
	// ブランチを取得
	queryBranches(g);
	// タグを取得
	m->tag_map.clear();
	QList<Git::Tag> tags = g->tags();
	for (Git::Tag const &tag : tags) {
	Git::Tag t = tag;
	t.id = m->objcache.getCommitIdFromTag(t.id);
	m->tag_map[t.id].push_back(t);
	}

	ui->tableWidget_log->setEnabled(true);
	updateCommitTableLater();
	if (canceled) return;

	QString branch_name;
	if (currentBranch().flags & Git::Branch::HeadDetachedAt) {
	branch_name += QString("(HEAD detached at %1)").arg(currentBranchName());
	}
	if (currentBranch().flags & Git::Branch::HeadDetachedFrom) {
	branch_name += QString("(HEAD detached from %1)").arg(currentBranchName());
	}
	if (branch_name.isEmpty()) {
	branch_name = currentBranchName();
	}

	QString repo_name = currentRepositoryName();
	setRepositoryInfo(repo_name, branch_name);
	} else {
	clearLog();
	clearRepositoryInfo();
	}

	updateRemoteInfo();

	updateWindowTitle(g);

	m->head_id = m->objcache.revParse("HEAD");

	if (isThereUncommitedChanges()) {
	Git::CommitItem item;
	item.parent_ids.push_back(m->current_branch.id);
	item.message = tr("Uncommited changes");
	m->logs.insert(m->logs.begin(), item);
	}

	prepareLogTableWidget();

	int count = m->logs.size();

	ui->tableWidget_log->setRowCount(count);

	int selrow = -1;

	for (int row = 0; row < count; row++) {
	Git::CommitItem const *commit = &m->logs[row];
	{
	- QTableWidgetItem *item = new QTableWidgetItem();
	+ auto *item = new QTableWidgetItem;
	item->setData(IndexRole, row);
	ui->tableWidget_log->setItem(row, 0, item);
	}
	int col = 1; // カラム0はコミットグラフなので、その次から
	auto AddColumn = [&](QString const &text, bool bold, QString const &tooltip){
	- QTableWidgetItem *item = new QTableWidgetItem(text);
	+ auto *item = new QTableWidgetItem(text);
	if (!tooltip.isEmpty()) {
	QString tt = tooltip;
	tt.replace('\n', ' ');
	tt = tt.toHtmlEscaped();
	tt = "<p style='white-space: pre'>" + tt + "</p>";
	item->setToolTip(tt);
	}
	if (bold) {
	QFont font = item->font();
	font.setBold(true);
	item->setFont(font);
	}
	ui->tableWidget_log->setItem(row, col, item);
	col++;
	};
	QString commit_id;
	QString datetime;
	QString author;
	QString message;
	QString message_ex;
	bool isHEAD = commit->commit_id == m->head_id;
	bool bold = false;
	{
	if (Git::isUncommited(*commit)) { // 未コミットの時
	bold = true; // 太字
	selrow = row;
	} else {
	if (isHEAD && !isThereUncommitedChanges()) { // HEADで、未コミットがないとき
	bold = true; // 太字
	selrow = row;
	}
	commit_id = abbrevCommitID(*commit);
	}
	datetime = misc::makeDateTimeString(commit->commit_date);
	author = commit->author;
	message = commit->message;
	message_ex = makeCommitInfoText(row, &m->label_map[row]);
	}
	AddColumn(commit_id, false, QString());
	AddColumn(datetime, false, QString());
	AddColumn(author, false, QString());
	AddColumn(message, bold, message + message_ex);
	ui->tableWidget_log->setRowHeight(row, 24);
	}
	ui->tableWidget_log->resizeColumnsToContents();
	ui->tableWidget_log->horizontalHeader()->setStretchLastSection(false);
	ui->tableWidget_log->horizontalHeader()->setStretchLastSection(true);

	- m->last_focused_file_list = 0;
	+ m->last_focused_file_list = nullptr;

	ui->tableWidget_log->setFocus();
	setCurrentLogRow(0);

	QTableWidgetItem *p = ui->tableWidget_log->item(selrow < 0 ? 0 : selrow, 2);
	ui->tableWidget_log->setCurrentItem(p);

	m->remote_watcher.setCurrent(currentRemoteName(), currentBranchName());

	checkRemoteUpdate();
	doUpdateButton();
	}

	void MainWindow::removeRepositoryFromBookmark(int index, bool ask)
	{
	if (ask) {
	int r = QMessageBox::warning(this, tr("Confirm Remove"), tr("Are you sure you want to remove the repository from bookmarks ?") + '\n' + tr("(Files will NOT be deleted)"), QMessageBox::Ok, QMessageBox::Cancel);
	if (r != QMessageBox::Ok) return;
	}
	if (index >= 0 && index < m->repos.size()) {
	m->repos.erase(m->repos.begin() + index);
	saveRepositoryBookmarks();
	updateRepositoriesList();
	}
	}

	void MainWindow::removeSelectedRepositoryFromBookmark(bool ask)
	{
	int i = indexOfRepository(ui->treeWidget_repos->currentItem());
	removeRepositoryFromBookmark(i, ask);
	}

	void MainWindow::openRepository(bool validate, bool waitcursor)
	{
	if (validate) {
	QString dir = currentWorkingCopyDir();
	if (!QFileInfo(dir).isDir()) {
	int r = QMessageBox::warning(this, tr("Open Repository"), dir + "\n\n" + tr("No such folder") + "\n\n" + tr("Remove from bookmark ?"), QMessageBox::Ok, QMessageBox::Cancel);
	if (r == QMessageBox::Ok) {
	removeSelectedRepositoryFromBookmark(false);
	}
	return;
	}
	if (!Git::isValidWorkingCopy(dir)) {
	QMessageBox::warning(this, tr("Open Repository"), tr("Not a valid git repository") + "\n\n" + dir);
	return;
	}
	}

	if (waitcursor) {
	OverrideWaitCursor;
	openRepository(false, false);
	return;
	}

	GitPtr g = git(); // ポインタの有効性チェックはしない（nullptrでも続行）
	openRepository_(g);
	}

	void MainWindow::reopenRepository(bool log, std::function<void(GitPtr g)> callback)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	OverrideWaitCursor;
	if (log) {
	setLogEnabled(g, true);
	AsyncExecGitThread_ th(g, callback);
	th.start();
	while (1) {
	if (th.wait(1)) break;
	QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
	}
	setLogEnabled(g, false);
	} else {
	callback(g);
	}
	openRepository_(g);
	}

	void MainWindow::doUpdateButton()
	{
	setNetworkingCommandsEnabled(isRemoteOnline());

	Git::Branch b = currentBranch();

	int n;

	ui->toolButton_fetch->setDot(m->remote_changed);

	n = b.ahead > 0 ? b.ahead : -1;
	ui->toolButton_push->setNumber(n);

	n = b.behind > 0 ? b.behind : -1;
	ui->toolButton_pull->setNumber(n);
	}

	void MainWindow::autoOpenRepository(QString dir)
	{
	auto Open = [&](RepositoryItem const &item){
	setCurrentRepository(item, true);
	openRepository(false, true);
	};

	RepositoryItem const *repo = findRegisteredRepository(&dir);
	if (repo) {
	Open(*repo);
	return;
	}

	RepositoryItem newitem;
	GitPtr g = git(dir);
	if (isValidWorkingCopy(g)) {
	ushort const *left = dir.utf16();
	ushort const *right = left + dir.size();
	if (right[-1] == '/' \|\| right[-1] == '\\') {
	right--;
	}
	ushort const *p = right;
	while (left + 1 < p && !(p[-1] == '/' \|\| p[-1] == '\\')) p--;
	if (p < right) {
	newitem.local_dir = dir;
	newitem.name = QString::fromUtf16(p, right - p);
	saveRepositoryBookmark(newitem);
	Open(newitem);
	return;
	}
	} else {
	DoYouWantToInitDialog dlg(this, dir);
	if (dlg.exec() == QDialog::Accepted) {
	createRepository(dir);
	}
	}
	}

	void MainWindow::openSelectedRepository()
	{
	QTreeWidgetItem *treeitem = ui->treeWidget_repos->currentItem();
	RepositoryItem const *item = repositoryItem(treeitem);
	if (item) {
	setCurrentRepository(*item, true);
	openRepository(true);
	}
	}

	QString MainWindow::getBookmarksFilePath() const
	{
	return global->app_config_dir / "bookmarks.xml";
	}



	void MainWindow::commit(bool amend)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	while (1) {
	Git::User user = g->getUser(Git::Source::Default);
	QString sign_id = g->signingKey(Git::Source::Default);
	gpg::Data key;
	{
	QList<gpg::Data> keys;
	gpg::listKeys(global->gpg_command, &keys);
	for (gpg::Data const &k : keys) {
	if (k.id == sign_id) {
	key = k;
	}
	}
	}
	CommitDialog dlg(this, currentRepositoryName(), user, key);
	if (amend) {
	dlg.setText(m->logs[0].message);
	}
	if (dlg.exec() == QDialog::Accepted) {
	QString text = dlg.text();
	if (text.isEmpty()) {
	QMessageBox::warning(this, tr("Commit"), tr("Commit message can not be omitted."));
	continue;
	}
	bool sign = dlg.isSigningEnabled();
	bool ok;
	if (amend) {
	ok = g->commit_amend_m(text, sign, &m->pty_process);
	} else {
	ok = g->commit(text, sign, &m->pty_process);
	}
	if (ok) {
	m->force_fetch = true;
	openRepository(true);
	} else {
	QString err = g->errorMessage().trimmed();
	err += "\n*** ";
	err += tr("Failed to commit");
	err += " ***\n";
	writeLog(err);
	}
	- break;
	- } else {
	- break;
	}
	+ break;
	}
	}

	void MainWindow::commit_amend()
	{
	commit(true);
	}


	void MainWindow::updateStatusBarText()
	{
	QString text;

	QWidget *w = qApp->focusWidget();
	if (w == ui->treeWidget_repos) {
	QTreeWidgetItem *ite = ui->treeWidget_repos->currentItem();
	RepositoryItem const *item = repositoryItem(ite);
	if (item) {
	text = QString("%1 : %2")
	.arg(item->name)
	.arg(misc::normalizePathSeparator(item->local_dir))
	;
	}
	} else if (w == ui->tableWidget_log) {
	QTableWidgetItem *item = ui->tableWidget_log->item(selectedLogIndex(), 0);
	if (item) {
	int row = item->data(IndexRole).toInt();
	if (row < (int)m->logs.size()) {
	Git::CommitItem const &commit = m->logs[row];
	if (Git::isUncommited(commit)) {
	text = tr("Uncommited changes");
	} else {
	QString id = commit.commit_id;
	text = QString("%1 : %2%3")
	.arg(id.mid(0, 7))
	.arg(commit.message)
	.arg(makeCommitInfoText(row, nullptr))
	;
	}
	}
	}
	}

	setStatusBarText(text);
	}

	void MainWindow::execRepositoryPropertyDialog(QString workdir, bool open_repository_menu)
	{
	if (workdir.isEmpty()) {
	workdir = currentWorkingCopyDir();
	}
	QString name;
	RepositoryItem const *repo = findRegisteredRepository(&workdir);
	if (repo) {
	name = repo->name;
	} else {
	QMessageBox::warning(this, tr("Repository Property"), tr("Not a valid git repository") + "\n\n" + workdir);
	return;
	}
	if (name.isEmpty()) {
	name = makeRepositoryName(workdir);
	}
	GitPtr g = git(workdir);
	RepositoryPropertyDialog dlg(this, g, *repo, open_repository_menu);
	dlg.exec();
	if (dlg.isRemoteChanged()) {
	updateRemoteInfo();
	}
	}



	void MainWindow::on_action_commit_triggered()
	{
	commit();
	}

	void MainWindow::on_action_fetch_triggered()
	{
	if (!isRemoteOnline()) return;

	reopenRepository(true, [&](GitPtr g){
	fetch(g);
	});
	}

	void MainWindow::on_action_push_triggered()
	{
	if (!isRemoteOnline()) return;

	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	if (g->getRemotes().isEmpty()) {
	QMessageBox::warning(this, qApp->applicationName(), tr("No remote repository is registered."));
	execRepositoryPropertyDialog(QString(), true);
	return;
	}

	int exitcode = 0;
	QString errormsg;

	reopenRepository(true, [&](GitPtr g){
	g->push(false, &m->pty_process);
	while (1) {
	if (m->pty_process.wait(1)) break;
	QApplication::processEvents();
	}
	exitcode = m->pty_process.getExitCode();
	errormsg = m->pty_process.getMessage();
	});

	if (exitcode == 128) {
	if (errormsg.indexOf("no upstream branch") >= 0) {
	QString brname = currentBranchName();

	QString msg = tr("The current branch %1 has no upstream branch.");
	msg = msg.arg(brname);
	msg += '\n';
	msg += tr("You try push --set-upstream");
	QMessageBox::warning(this, qApp->applicationName(), msg);
	pushSetUpstream(false);
	return;
	}
	if (errormsg.indexOf("Connection refused") >= 0) {
	QMessageBox::critical(this, qApp->applicationName(), tr("Connection refused."));
	return;
	}
	}
	}

	void MainWindow::on_action_pull_triggered()
	{
	if (!isRemoteOnline()) return;

	reopenRepository(true, [&](GitPtr g){
	m->pty_condition = PtyCondition::Pull;
	m->pty_process_ok = true;
	g->pull(&m->pty_process);
	while (1) {
	if (m->pty_process.wait(1)) break;
	QApplication::processEvents();
	}
	});
	}

	void MainWindow::on_toolButton_push_clicked()
	{
	ui->action_push->trigger();
	}

	void MainWindow::on_toolButton_pull_clicked()
	{
	ui->action_pull->trigger();
	}

	void MainWindow::on_treeWidget_repos_currentItemChanged(QTreeWidgetItem * /current/, QTreeWidgetItem * /previous/)
	{
	updateStatusBarText();
	}

	void MainWindow::on_treeWidget_repos_itemDoubleClicked(QTreeWidgetItem * /item/, int /column/)
	{
	openSelectedRepository();
	}

	void MainWindow::execCommitPropertyDialog(QWidget parent, Git::CommitItem const commit)
	{
	CommitPropertyDialog dlg(parent, this, commit);
	dlg.exec();
	}

	QAction MainWindow::addMenuActionProperty(QMenu menu)
	{
	return menu->addAction(tr("&Property"));
	}

	int MainWindow::indexOfRepository(QTreeWidgetItem const *treeitem) const
	{
	if (!treeitem) return -1;
	return treeitem->data(0, IndexRole).toInt();
	}

	void MainWindow::on_treeWidget_repos_customContextMenuRequested(const QPoint &pos)
	{
	QTreeWidgetItem *treeitem = ui->treeWidget_repos->currentItem();
	if (!treeitem) return;

	RepositoryItem const *repo = repositoryItem(treeitem);

	int index = indexOfRepository(treeitem);
	if (isGroupItem(treeitem)) { // group item
	QMenu menu;
	QAction *a_add_new_group = menu.addAction(tr("&Add new group"));
	QAction *a_delete_group = menu.addAction(tr("&Delete group"));
	QAction *a_rename_group = menu.addAction(tr("&Rename group"));
	QPoint pt = ui->treeWidget_repos->mapToGlobal(pos);
	QAction *a = menu.exec(pt + QPoint(8, -8));
	if (a) {
	if (a == a_add_new_group) {
	QTreeWidgetItem *child = newQTreeWidgetFolderItem(tr("New group"));
	treeitem->addChild(child);
	child->setFlags(child->flags() \| Qt::ItemIsEditable);
	ui->treeWidget_repos->setCurrentItem(child);
	return;
	}
	if (a == a_delete_group) {
	QTreeWidgetItem *parent = treeitem->parent();
	if (parent) {
	int i = parent->indexOfChild(treeitem);
	delete parent->takeChild(i);
	} else {
	int i = ui->treeWidget_repos->indexOfTopLevelItem(treeitem);
	delete ui->treeWidget_repos->takeTopLevelItem(i);
	}
	refrectRepositories();
	return;
	}
	if (a == a_rename_group) {
	ui->treeWidget_repos->editItem(treeitem);
	return;
	}
	}
	} else if (repo) { // repository item
	QString open_terminal = tr("Open &terminal");
	QString open_commandprompt = tr("Open command promp&t");
	QMenu menu;
	QAction *a_open = menu.addAction(tr("&Open"));
	menu.addSeparator();
	#ifdef Q_OS_WIN
	QAction *a_open_terminal = menu.addAction(open_commandprompt);
	(void)open_terminal;
	#else
	QAction *a_open_terminal = menu.addAction(open_terminal);
	(void)open_commandprompt;
	#endif
	QAction *a_open_folder = menu.addAction(tr("Open &folder"));
	menu.addSeparator();
	QAction *a_remove = menu.addAction(tr("&Remove"));

	menu.addSeparator();
	QAction *a_properties = addMenuActionProperty(&menu);

	QPoint pt = ui->treeWidget_repos->mapToGlobal(pos);
	QAction *a = menu.exec(pt + QPoint(8, -8));
	if (a) {
	if (a == a_open) {
	openSelectedRepository();
	return;
	}
	if (a == a_open_folder) {
	openExplorer(repo);
	return;
	}
	if (a == a_open_terminal) {
	openTerminal(repo);
	return;
	}
	if (a == a_remove) {
	removeRepositoryFromBookmark(index, true);
	return;
	}
	if (a == a_properties) {
	execRepositoryPropertyDialog(repo->local_dir);
	return;
	}
	}
	}
	}

	void MainWindow::execCommitExploreWindow(QWidget parent, Git::CommitItem const commit)
	{
	CommitExploreWindow win(parent, this, &m->objcache, commit);
	win.exec();
	}

	void MainWindow::on_tableWidget_log_customContextMenuRequested(const QPoint &pos)
	{
	Git::CommitItem const *commit = selectedCommitItem();
	if (commit) {
	bool is_valid_commit_id = Git::isValidID(commit->commit_id);
	int row = selectedLogIndex();

	QMenu menu;

	QAction *a_copy_id_7_letters = menu.addAction(tr("Copy commit id (7 letters)"));
	QAction *a_copy_id_complete = menu.addAction(tr("Copy commit id (completely)"));

	menu.addSeparator();

	QAction *a_checkout = is_valid_commit_id ? menu.addAction(tr("Checkout/Branch...")) : nullptr;

	menu.addSeparator();

	QAction *a_edit_comment = nullptr;
	if (row == 0 && currentBranch().ahead > 0) {
	a_edit_comment = menu.addAction(tr("Edit comment..."));
	}

	QAction *a_merge = is_valid_commit_id ? menu.addAction(tr("Merge")) : nullptr;
	QAction *a_rebase = is_valid_commit_id ? menu.addAction(tr("Rebase")) : nullptr;
	QAction *a_cherrypick = is_valid_commit_id ? menu.addAction(tr("Cherry-pick")) : nullptr;
	QAction *a_edit_tags = is_valid_commit_id ? menu.addAction(tr("Edit tags...")) : nullptr;
	QAction *a_revert = is_valid_commit_id ? menu.addAction(tr("Revert")) : nullptr;

	QAction *a_reset_head = nullptr;
	#if 0 // 下手に使うと危険なので、とりあえず無効にしておく
	if (is_valid_commit_id && commit->commit_id == m->head_id) {
	a_reset_head = menu.addAction(tr("Reset HEAD"));
	}
	#endif

	menu.addSeparator();

	QAction *a_delbranch = is_valid_commit_id ? menu.addAction(tr("Delete branch...")) : nullptr;
	QAction *a_delrembranch = remoteBranches(commit->commit_id).isEmpty() ? nullptr : menu.addAction(tr("Delete remote branch..."));

	menu.addSeparator();

	QAction *a_explore = is_valid_commit_id ? menu.addAction(tr("Explore")) : nullptr;
	QAction *a_properties = addMenuActionProperty(&menu);

	QAction *a = menu.exec(ui->tableWidget_log->viewport()->mapToGlobal(pos) + QPoint(8, -8));
	if (a) {
	if (a == a_copy_id_7_letters) {
	qApp->clipboard()->setText(commit->commit_id.mid(0, 7));
	return;
	}
	if (a == a_copy_id_complete) {
	qApp->clipboard()->setText(commit->commit_id);
	return;
	}
	if (a == a_properties) {
	execCommitPropertyDialog(this, commit);
	return;
	}
	if (a == a_edit_comment) {
	commit_amend();
	return;
	}
	if (a == a_checkout) {
	checkout(this, commit);
	return;
	}
	if (a == a_delbranch) {
	deleteBranch(commit);
	return;
	}
	if (a == a_delrembranch) {
	deleteRemoteBranch(commit);
	return;
	}
	if (a == a_merge) {
	mergeBranch(commit);
	return;
	}
	if (a == a_rebase) {
	rebaseBranch(commit);
	return;
	}
	if (a == a_cherrypick) {
	cherrypick(commit);
	return;
	}
	if (a == a_edit_tags) {
	ui->action_edit_tags->trigger();
	return;
	}
	if (a == a_revert) {
	revertCommit();
	return;
	}
	if (a == a_explore) {
	execCommitExploreWindow(this, commit);
	return;
	}
	if (a == a_reset_head) {
	reopenRepository(false, [](GitPtr g){
	g->reset_head1();
	});
	return;
	}
	}
	}
	}

	void MainWindow::on_listWidget_files_customContextMenuRequested(const QPoint &pos)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	QMenu menu;
	QAction *a_delete = menu.addAction(tr("Delete"));
	QAction *a_untrack = menu.addAction(tr("Untrack"));
	QAction *a_history = menu.addAction(tr("History"));
	QAction *a_blame = menu.addAction(tr("Blame"));
	QAction *a_properties = addMenuActionProperty(&menu);

	QPoint pt = ui->listWidget_files->mapToGlobal(pos) + QPoint(8, -8);
	QAction *a = menu.exec(pt);
	if (a) {
	QListWidgetItem *item = ui->listWidget_files->currentItem();
	if (a == a_delete) {
	if (askAreYouSureYouWantToRun("Delete", tr("Delete selected files."))) {
	for_each_selected_files([&](QString const &path){
	g->removeFile(path);
	g->chdirexec([&](){
	QFile(path).remove();
	return true;
	});
	});
	openRepository(false);
	}
	} else if (a == a_untrack) {
	if (askAreYouSureYouWantToRun("Untrack", tr("rm --cached files"))) {
	for_each_selected_files([&](QString const &path){
	g->rm_cached(path);
	});
	openRepository(false);
	}
	} else if (a == a_history) {
	execFileHistory(item);
	} else if (a == a_blame) {
	blame(item);
	} else if (a == a_properties) {
	execFilePropertyDialog(item);
	}
	}
	}

	void MainWindow::on_listWidget_unstaged_customContextMenuRequested(const QPoint &pos)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	QList<QListWidgetItem *> items = ui->listWidget_unstaged->selectedItems();
	if (!items.isEmpty()) {
	QMenu menu;
	QAction *a_stage = menu.addAction(tr("Stage"));
	QAction *a_reset_file = menu.addAction(tr("Reset"));
	QAction *a_ignore = menu.addAction(tr("Ignore"));
	QAction *a_delete = menu.addAction(tr("Delete"));
	QAction *a_untrack = menu.addAction(tr("Untrack"));
	QAction *a_history = menu.addAction(tr("History"));
	QAction *a_blame = menu.addAction(tr("Blame"));
	QAction *a_properties = addMenuActionProperty(&menu);
	QPoint pt = ui->listWidget_unstaged->mapToGlobal(pos) + QPoint(8, -8);
	QAction *a = menu.exec(pt);
	if (a) {
	QListWidgetItem *item = ui->listWidget_unstaged->currentItem();
	if (a == a_stage) {
	for_each_selected_files([&](QString const &path){
	g->stage(path);
	});
	updateCurrentFilesList();
	return;
	}
	if (a == a_reset_file) {
	QStringList paths;
	for_each_selected_files([&](QString const &path){
	paths.push_back(path);
	});
	resetFile(paths);
	return;
	}
	if (a == a_ignore) {
	QString gitignore_path = currentWorkingCopyDir() / ".gitignore";
	if (items.size() == 1) {
	QString file = getFilePath(items[0]);
	EditGitIgnoreDialog dlg(this, gitignore_path, file);
	if (dlg.exec() == QDialog::Accepted) {
	QString appending = dlg.text();
	if (!appending.isEmpty()) {
	QString text;

	QString path = gitignore_path;
	path.replace('/', QDir::separator());

	{
	QFile file(path);
	if (file.open(QFile::ReadOnly)) {
	text += QString::fromUtf8(file.readAll());
	}
	}

	size_t n = text.size();
	if (n > 0 && text[(int)n - 1] != '\n') {
	text += '\n'; // 最後に改行を追加
	}

	text += appending + '\n';

	{
	QFile file(path);
	if (file.open(QFile::WriteOnly)) {
	file.write(text.toUtf8());
	}
	}
	updateCurrentFilesList();
	return;
	}
	} else {
	return;
	}
	}

	QString append;
	for_each_selected_files([&](QString const &path){
	if (path == ".gitignore") {
	// skip
	} else {
	append += path + '\n';
	}
	});
	if (TextEditDialog::editFile(this, gitignore_path, ".gitignore", append)) {
	updateCurrentFilesList();
	}
	return;
	}
	if (a == a_delete) {
	if (askAreYouSureYouWantToRun("Delete", "Delete selected files.")) {
	for_each_selected_files([&](QString const &path){
	g->removeFile(path);
	g->chdirexec([&](){
	QFile(path).remove();
	return true;
	});
	});
	openRepository(false);
	}
	return;
	}
	if (a == a_untrack) {
	if (askAreYouSureYouWantToRun("Untrack", "rm --cached")) {
	for_each_selected_files([&](QString const &path){
	g->rm_cached(path);
	});
	openRepository(false);
	}
	return;
	}
	if (a == a_history) {
	execFileHistory(item);
	return;
	}
	if (a == a_blame) {
	blame(item);
	return;
	}
	if (a == a_properties) {
	execFilePropertyDialog(item);
	return;
	}
	}
	}
	}

	void MainWindow::on_listWidget_staged_customContextMenuRequested(const QPoint &pos)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	QListWidgetItem *item = ui->listWidget_staged->currentItem();
	if (item) {
	QString path = getFilePath(item);
	QString fullpath = currentWorkingCopyDir() / path;
	if (QFileInfo(fullpath).isFile()) {
	QMenu menu;
	QAction *a_unstage = menu.addAction(tr("Unstage"));
	QAction *a_history = menu.addAction(tr("History"));
	QAction *a_blame = menu.addAction(tr("Blame"));
	QAction *a_properties = addMenuActionProperty(&menu);
	QPoint pt = ui->listWidget_staged->mapToGlobal(pos) + QPoint(8, -8);
	QAction *a = menu.exec(pt);
	if (a) {
	QListWidgetItem *item = ui->listWidget_unstaged->currentItem();
	if (a == a_unstage) {
	g->unstage(path);
	openRepository(false);
	} else if (a == a_history) {
	execFileHistory(item);
	} else if (a == a_blame) {
	blame(item);
	} else if (a == a_properties) {
	execFilePropertyDialog(item);
	}
	}
	}
	}
	}

	bool MainWindow::askAreYouSureYouWantToRun(QString const &title, QString const &command)
	{
	QString message = tr("Are you sure you want to run the following command ?");
	QString text = "%1\n\n%2";
	text = text.arg(message).arg(command);
	return QMessageBox::warning(this, title, text, QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok;
	}

	void MainWindow::resetFile(QStringList const &paths)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	if (paths.isEmpty()) {
	// nop
	} else {
	QString cmd = "git checkout -- \"%1\"";
	cmd = cmd.arg(paths[0]);
	if (askAreYouSureYouWantToRun(tr("Reset a file"), "> " + cmd)) {
	for (QString const &path : paths) {
	g->resetFile(path);
	}
	openRepository(true);
	}
	}
	}

	void MainWindow::revertAllFiles()
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	QString cmd = "git reset --hard HEAD";
	if (askAreYouSureYouWantToRun(tr("Revert all files"), "> " + cmd)) {
	g->resetAllFiles();
	openRepository(true);
	}
	}

	QStringList MainWindow::selectedFiles_(QListWidget *listwidget) const
	{
	QStringList list;
	QList<QListWidgetItem *> items = listwidget->selectedItems();
	for (QListWidgetItem *item : items) {
	QString path = getFilePath(item);
	list.push_back(path);
	}
	return list;

	}

	QStringList MainWindow::selectedFiles() const
	{
	if (m->last_focused_file_list == ui->listWidget_files) return selectedFiles_(ui->listWidget_files);
	if (m->last_focused_file_list == ui->listWidget_staged) return selectedFiles_(ui->listWidget_staged);
	if (m->last_focused_file_list == ui->listWidget_unstaged) return selectedFiles_(ui->listWidget_unstaged);
	return QStringList();
	}

	void MainWindow::for_each_selected_files(std::function<void(QString const&)> fn)
	{
	for (QString path : selectedFiles()) {
	fn(path);
	}
	}

	void MainWindow::execFileHistory(QString const &path)
	{
	if (path.isEmpty()) return;

	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	FileHistoryWindow dlg(this);
	dlg.prepare(g, path);
	dlg.exec();
	}

	void MainWindow::execFileHistory(QListWidgetItem *item)
	{
	if (item) {
	QString path = getFilePath(item);
	if (!path.isEmpty()) {
	execFileHistory(path);
	}
	}
	}

	void MainWindow::addWorkingCopyDir(QString dir, QString name, bool open)
	{
	if (dir.endsWith(".git")) {
	int i = dir.size();
	if (i > 4) {
	ushort c = dir.utf16()[i - 5];
	if (c == '/' \|\| c == '\\') {
	dir = dir.mid(0, i - 5);
	}
	}
	}

	if (!Git::isValidWorkingCopy(dir)) {
	qDebug() << "Invalid working dir: " + dir;
	return;
	}

	if (name.isEmpty()) {
	name = makeRepositoryName(dir);
	}

	RepositoryItem item;
	item.local_dir = dir;
	item.name = name;
	saveRepositoryBookmark(item);

	if (open) {
	setCurrentRepository(item, true);
	GitPtr g = git(item.local_dir);
	openRepository_(g);
	}
	}

	void MainWindow::on_action_open_existing_working_copy_triggered()
	{
	QString dir = defaultWorkingDir();
	dir = QFileDialog::getExistingDirectory(this, tr("Add existing working copy"), dir);
	addWorkingCopyDir(dir, false);
	}

	void MainWindow::on_action_view_refresh_triggered()
	{
	openRepository(true);
	}

	void MainWindow::on_tableWidget_log_currentItemChanged(QTableWidgetItem * /current/, QTableWidgetItem * /previous/)
	{
	clearFileList();

	QTableWidgetItem *item = ui->tableWidget_log->item(selectedLogIndex(), 0);
	if (!item) return;

	int row = item->data(IndexRole).toInt();
	if (row < (int)m->logs.size()) {
	updateStatusBarText();
	m->update_files_list_counter = 200;
	}
	}

	void MainWindow::on_toolButton_stage_clicked()
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	g->stage(selectedFiles());
	updateCurrentFilesList();
	}

	void MainWindow::on_toolButton_unstage_clicked()
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	g->unstage(selectedFiles());
	updateCurrentFilesList();
	}

	void MainWindow::on_toolButton_select_all_clicked()
	{
	if (ui->listWidget_unstaged->count() > 0) {
	ui->listWidget_unstaged->setFocus();
	ui->listWidget_unstaged->selectAll();
	} else if (ui->listWidget_staged->count() > 0) {
	ui->listWidget_staged->setFocus();
	ui->listWidget_staged->selectAll();
	}
	}

	void MainWindow::on_toolButton_commit_clicked()
	{
	ui->action_commit->trigger();
	}

	bool MainWindow::editFile(const QString &path, QString const &title)
	{
	return TextEditDialog::editFile(this, path, title);
	}

	struct Task {
	int index = 0;
	int parent = 0;
	- Task()
	- {
	- }
	+ Task() = default;
	Task(int index, int parent)
	: index(index)
	, parent(parent)
	{
	}
	};

	struct Element {
	int depth = 0;
	std::vector<int> indexes;
	};

	void MainWindow::updateCommitGraph()
	{
	const size_t LogCount = m->logs.size();
	// 樹形図情報を構築する
	if (LogCount > 0) {
	auto LogItem = [&](size_t i)->Git::CommitItem &{ return m->logs[i]; };
	enum { // 有向グラフを構築するあいだ CommitItem::marker_depth をフラグとして使用する
	UNKNOWN = 0,
	KNOWN = 1,
	};
	for (Git::CommitItem &item : m->logs) {
	item.marker_depth = UNKNOWN;
	}
	// コミットハッシュを検索して、親コミットのインデックスを求める
	for (size_t i = 0; i < LogCount; i++) {
	Git::CommitItem *item = &LogItem(i);
	item->parent_lines.clear();
	if (item->parent_ids.empty()) {
	item->resolved = true;
	} else {
	for (int j = 0; j < item->parent_ids.size(); j++) { // 親の数だけループ
	QString const &parent_id = item->parent_ids[j]; // 親のハッシュ値
	for (size_t k = i + 1; k < LogCount; k++) { // 親を探す
	if (LogItem(k).commit_id == parent_id) { // ハッシュ値が一致したらそれが親
	- item->parent_lines.push_back(k); // インデックス値を記憶
	+ item->parent_lines.emplace_back(k); // インデックス値を記憶
	LogItem(k).has_child = true;
	LogItem(k).marker_depth = KNOWN;
	item->resolved = true;
	break;
	}
	}
	}
	}
	}
	std::vector<Element> elements; // 線分リスト
	{ // 線分リストを作成する
	std::deque<Task> tasks; // 未処理タスクリスト
	{
	for (size_t i = 0; i < LogCount; i++) {
	Git::CommitItem *item = &LogItem(i);
	if (item->marker_depth == UNKNOWN) {
	int n = item->parent_lines.size(); // 最初のコミットアイテム
	for (int j = 0; j < n; j++) {
	- tasks.push_back(Task(i, j)); // タスクを追加
	+ tasks.emplace_back(i, j); // タスクを追加
	}
	}
	item->marker_depth = UNKNOWN;
	}
	}
	while (!tasks.empty()) { // タスクが残っているならループ
	Element e;
	Task task;
	{ // 最初のタスクを取り出す
	task = tasks.front();
	tasks.pop_front();
	}
	e.indexes.push_back(task.index); // 先頭のインデックスを追加
	int index = LogItem(task.index).parent_lines[task.parent].index; // 開始インデックス
	while (index > 0 && (size_t)index < LogCount) { // 最後に到達するまでループ
	e.indexes.push_back(index); // インデックスを追加
	int n = LogItem(index).parent_lines.size(); // 親の数
	if (n == 0) break; // 親がないなら終了
	Git::CommitItem *item = &LogItem(index);
	if (item->marker_depth == KNOWN) break; // 既知のアイテムに到達したら終了
	item->marker_depth = KNOWN; // 既知のアイテムにする
	for (int i = 1; i < n; i++) {
	- tasks.push_back(Task(index, i)); // タスク追加
	+ tasks.emplace_back(index, i); // タスク追加
	}
	index = LogItem(index).parent_lines[0].index; // 次の親（親リストの先頭の要素）
	}
	if (e.indexes.size() >= 2) {
	elements.push_back(e);
	}
	}
	}
	// 線情報をクリア
	for (Git::CommitItem &item : m->logs) {
	item.marker_depth = -1;
	item.parent_lines.clear();
	}
	// マークと線の深さを決める
	if (!elements.empty()) {
	{ // 優先順位を調整する
	std::sort(elements.begin(), elements.end(), [](Element const &left, Element const &right){
	int i = 0;
	{ // 長いものを優先して左へ
	int l = left.indexes.back() - left.indexes.front();
	int r = right.indexes.back() - right.indexes.front();
	i = r - l; // 降順
	}
	if (i == 0) {
	// コミットが新しいものを優先して左へ
	int l = left.indexes.front();
	int r = right.indexes.front();
	i = l - r; // 昇順
	}
	return i < 0;
	});
	// 子の無いブランチ（タグ等）が複数連続しているとき、古いコミットを右に寄せる
	{
	for (size_t i = 0; i + 1 < elements.size(); i++) {
	Element *e = &elements[i];
	int index1 = e->indexes.front();
	if (index1 > 0 && !LogItem(index1).has_child) { // 子がない
	// 新しいコミットを探す
	for (size_t j = i + 1; j < elements.size(); j++) { // 現在位置より後ろを探す
	Element *f = &elements[j];
	int index2 = f->indexes.front();
	if (index1 == index2 + 1) { // 一つだけ新しいコミット
	Element t = std::move(*f);
	elements.erase(elements.begin() + j); // 移動元を削除
	elements.insert(elements.begin() + i, std::move(t)); // 現在位置に挿入
	}
	}
	// 古いコミットを探す
	size_t j = 0;
	while (j < i) { // 現在位置より前を探す
	Element *f = &elements[j];
	int index2 = f->indexes.front();
	if (index1 + 1 == index2) { // 一つだけ古いコミット
	Element t = std::move(*f);
	elements.erase(elements.begin() + j); // 移動元を削除
	elements.insert(elements.begin() + i, std::move(t)); // 現在位置の次に挿入
	index1 = index2;
	f = e;
	} else {
	j++;
	}
	}
	}
	}
	}
	}
	{ // 最初の線は深さを0にする
	Element *e = &elements.front();
	for (size_t i = 0; i < e->indexes.size(); i++) {
	int index = e->indexes[i];
	LogItem(index).marker_depth = 0; // マークの深さを設定
	e->depth = 0; // 線の深さを設定
	}
	}
	// 最初以外の線分の深さを決める
	for (size_t i = 1; i < elements.size(); i++) { // 最初以外をループ
	Element *e = &elements[i];
	int depth = 1;
	while (1) { // 失敗したら繰り返し
	for (size_t j = 0; j < i; j++) { // 既に処理済みの線を調べる
	Element const *f = &elements[j]; // 検査対象
	if (e->indexes.size() == 2) { // 二つしかない場合
	int from = e->indexes[0]; // 始点
	int to = e->indexes[1]; // 終点
	if (LogItem(from).has_child) {
	for (size_t k = 0; k + 1 < f->indexes.size(); k++) { // 検査対象の全ての線分を調べる
	int curr = f->indexes[k];
	int next = f->indexes[k + 1];
	if (from > curr && to == next) { // 決定済みの線に直結できるか判定
	e->indexes.back() = from + 1; // 現在の一行下に直結する
	e->depth = elements[j].depth; // 接続先の深さ
	goto DONE; // 決定
	}
	}
	}
	}
	if (depth == f->depth) { // 同じ深さ
	if (e->indexes.back() > f->indexes.front() && e->indexes.front() < f->indexes.back()) { // 重なっている
	goto FAIL; // この深さには線を置けないのでやりなおし
	}
	}
	}
	for (size_t j = 0; j < e->indexes.size(); j++) {
	int index = e->indexes[j];
	Git::CommitItem *item = &LogItem(index);
	if (j == 0 && item->has_child) { // 最初のポイントで子がある場合
	// nop
	} else if ((j > 0 && j + 1 < e->indexes.size()) \|\| item->marker_depth < 0) { // 最初と最後以外、または、未確定の場合
	item->marker_depth = depth; // マークの深さを設定
	}
	}
	e->depth = depth; // 深さを決定
	goto DONE; // 決定
	FAIL:;
	depth++; // 一段深くして再挑戦
	}
	DONE:;
	}
	// 線情報を生成する
	- for (size_t i = 0; i < elements.size(); i++) {
	- Element const &e = elements[i];
	+ for (const auto & e : elements) {
	auto ColorNumber = [&](){ return e.depth; };
	size_t count = e.indexes.size();
	for (size_t j = 0; j + 1 < count; j++) {
	int curr = e.indexes[j];
	int next = e.indexes[j + 1];
	TreeLine line(next, e.depth);
	line.color_number = ColorNumber();
	line.bend_early = (j + 2 < count \|\| !LogItem(next).resolved);
	if (j + 2 == count) {
	if (count > 2 \|\| !LogItem(curr).has_child) { // 直結ではない、または、子がない
	line.depth = LogItem(next).marker_depth; // 合流する先のアイテムの深さと同じにする
	}
	}
	LogItem(curr).parent_lines.push_back(line); // 線を追加
	}
	}
	} else {
	if (LogCount == 1) { // コミットが一つだけ
	LogItem(0).marker_depth = 0;
	}
	}
	}
	}

	QList<Git::Tag> MainWindow::findTag(QString const &id)
	{
	auto it = m->tag_map.find(id);
	if (it != m->tag_map.end()) {
	return it->second;
	}
	return QList<Git::Tag>();
	}

	void MainWindow::on_action_edit_global_gitconfig_triggered()
	{
	QString dir = QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
	QString path = dir / ".gitconfig";
	editFile(path, ".gitconfig");
	}

	void MainWindow::on_action_edit_git_config_triggered()
	{
	QString dir = currentWorkingCopyDir();
	QString path = dir / ".git/config";
	editFile(path, ".git/config");
	}

	void MainWindow::on_action_edit_gitignore_triggered()
	{
	QString dir = currentWorkingCopyDir();
	QString path = dir / ".gitignore";
	if (editFile(path, ".gitignore")) {
	updateCurrentFilesList();
	}
	}

	int MainWindow::selectedLogIndex() const
	{
	int i = ui->tableWidget_log->currentRow();
	if (i >= 0 && i < (int)m->logs.size()) {
	return i;
	}
	return -1;
	}

	Git::CommitItem const *MainWindow::selectedCommitItem() const
	{
	int i = selectedLogIndex();
	return commitItem(i);
	}

	Git::Object MainWindow::cat_file_(GitPtr g, QString const &id)
	{
	if (isValidWorkingCopy(g)) {
	QString path_prefix = PATH_PREFIX;
	if (id.startsWith(path_prefix)) {
	QString path = g->workingRepositoryDir();
	path = path / id.mid(path_prefix.size());
	QFile file(path);
	if (file.open(QFile::ReadOnly)) {
	Git::Object obj;
	obj.content = file.readAll();
	return obj;
	}
	} else if (Git::isValidID(id)) {
	return m->objcache.catFile(id);;
	}
	}
	return Git::Object();
	}

	Git::Object MainWindow::cat_file(QString const &id)
	{
	return cat_file_(git(), id);
	}

	void MainWindow::updateDiffView(QListWidgetItem *item)
	{
	clearDiffView();

	m->last_selected_file_item = item;

	if (!item) return;

	int idiff = indexOfDiff(item);
	if (idiff >= 0 && idiff < m->diff.result.size()) {
	Git::Diff const &diff = m->diff.result[idiff];
	QString key = GitDiff::makeKey(diff);
	auto it = m->diff_cache.find(key);
	if (it != m->diff_cache.end()) {
	int row = ui->tableWidget_log->currentRow();
	bool uncommited = (row >= 0 && row < (int)m->logs.size() && Git::isUncommited(m->logs[row]));
	ui->widget_diff_view->updateDiffView(it->second, uncommited);
	}
	}
	}

	void MainWindow::updateDiffView()
	{
	updateDiffView(m->last_selected_file_item);
	}

	void MainWindow::updateUnstagedFileCurrentItem()
	{
	updateDiffView(ui->listWidget_unstaged->currentItem());
	}

	void MainWindow::updateStagedFileCurrentItem()
	{
	updateDiffView(ui->listWidget_staged->currentItem());
	}

	void MainWindow::on_listWidget_unstaged_currentRowChanged(int /currentRow/)
	{
	updateUnstagedFileCurrentItem();
	}

	void MainWindow::on_listWidget_staged_currentRowChanged(int /currentRow/)
	{
	updateStagedFileCurrentItem();
	}

	void MainWindow::on_listWidget_files_currentRowChanged(int /currentRow/)
	{
	updateDiffView(ui->listWidget_files->currentItem());
	}

	void MainWindow::logGitVersion()
	{
	GitPtr g = git();
	QString s = g->version();
	if (!s.isEmpty()) {
	s += '\n';
	writeLog(s);
	}
	}

	bool MainWindow::checkExecutable(QString const &path)
	{
	if (QFileInfo(path).isExecutable()) {
	return true;
	}
	QString text = "The specified program '%1' is not executable.\n";
	text = text.arg(path);
	writeLog(text);
	return false;
	}

	void MainWindow::internalSetCommand(QString const &path, bool save, QString const &name, QString *out)
	{
	if (!path.isEmpty() && checkExecutable(path)) {
	if (save) {
	MySettings s;
	s.beginGroup("Global");
	s.setValue(name, path);
	s.endGroup();
	}
	*out = path;
	} else {
	*out = QString();
	}
	}

	void MainWindow::setGitCommand(QString const &path, bool save)
	{
	internalSetCommand(path, save, "GitCommand", &m->gcx.git_command);
	}

	void MainWindow::setFileCommand(QString const &path, bool save)
	{
	internalSetCommand(path, save, "FileCommand", &global->file_command);
	}

	void MainWindow::setGpgCommand(QString const &path, bool save)
	{
	internalSetCommand(path, save, "GpgCommand", &global->gpg_command);
	if (!global->gpg_command.isEmpty()) {
	GitPtr g = git();
	g->configGpgProgram(global->gpg_command, true);
	}
	}

	void MainWindow::setWatchRemoteInterval(int mins)
	{
	if (mins > 0) {
	m->remote_watcher_timer.start(mins * 60000);
	} else {
	m->remote_watcher_timer.stop();
	}
	}

	#ifdef Q_OS_WIN
	QString getWin32HttpProxy();
	#endif

	void MainWindow::initNetworking()
	{
	std::string http_proxy;
	std::string https_proxy;
	if (appsettings()->proxy_type == "auto") {
	#ifdef Q_OS_WIN
	http_proxy = misc::makeProxyServerURL(getWin32HttpProxy().toStdString());
	#else
	auto getienv = [](std::string const &name)->char const *{
	char **p = environ;
	while (*p) {
	if (strncasecmp(*p, name.c_str(), name.size()) == 0) {
	char const e = p + name.size();
	if (*e == '=') {
	return e + 1;
	}
	}
	p++;
	}
	return nullptr;
	};
	char const *p;
	p = getienv("http_proxy");
	if (p) {
	http_proxy = misc::makeProxyServerURL(std::string(p));
	}
	p = getienv("https_proxy");
	if (p) {
	https_proxy = misc::makeProxyServerURL(std::string(p));
	}
	#endif
	} else if (appsettings()->proxy_type == "manual") {
	http_proxy = appsettings()->proxy_server.toStdString();
	}
	m->webcx.set_http_proxy(http_proxy);
	m->webcx.set_https_proxy(https_proxy);
	}



	QStringList MainWindow::whichCommand_(QString const &cmdfile1, const QString &cmdfile2)
	{
	QStringList list;

	if (!cmdfile1.isEmpty()){
	std::vector<std::string> vec;
	FileUtil::which(cmdfile1.toStdString(), &vec);
	for (std::string const &s : vec) {
	list.push_back(QString::fromStdString(s));
	}
	}
	if (!cmdfile2.isEmpty()){
	std::vector<std::string> vec;
	FileUtil::which(cmdfile2.toStdString(), &vec);
	for (std::string const &s : vec) {
	list.push_back(QString::fromStdString(s));
	}
	}

	return list;
	}

	QString MainWindow::selectCommand_(QString const &cmdname, QStringList const &cmdfiles, QStringList const &list, QString path, std::function<void(QString const &)> callback)
	{
	QString window_title = tr("Select %1 command");
	window_title = window_title.arg(cmdfiles.front());

	SelectCommandDialog dlg(this, cmdname, cmdfiles, path, list);
	dlg.setWindowTitle(window_title);
	if (dlg.exec() == QDialog::Accepted) {
	path = dlg.selectedFile();
	path = misc::normalizePathSeparator(path);
	QFileInfo info(path);
	if (info.isExecutable()) {
	callback(path);
	return path;
	}
	}
	return QString();
	}

	QString MainWindow::selectCommand_(QString const &cmdname, QString const &cmdfile, QStringList const &list, QString path, std::function<void(QString const &)> callback)
	{
	QStringList cmdfiles;
	cmdfiles.push_back(cmdfile);
	return selectCommand_(cmdname, cmdfiles, list, path, callback);
	}

	#ifdef Q_OS_WIN
	#define GIT_COMMAND "git.exe"
	#define FILE_COMMAND "file.exe"
	#define GPG_COMMAND "gpg.exe"
	#define GPG2_COMMAND "gpg2.exe"
	#else
	#define GIT_COMMAND "git"
	#define FILE_COMMAND "file"
	#define GPG_COMMAND "gpg"
	#define GPG2_COMMAND "gpg2"
	#endif

	QString MainWindow::selectGitCommand(bool save)
	{
	char const *exe = GIT_COMMAND;

	QString path = m->gcx.git_command;

	auto fn = [&](QString const &path){
	setGitCommand(path, save);
	};

	QStringList list = whichCommand_(exe);
	#ifdef Q_OS_WIN
	{
	QStringList newlist;
	QString suffix1 = "\\bin\\" GIT_COMMAND;
	QString suffix2 = "\\cmd\\" GIT_COMMAND;
	for (QString const &s : list) {
	newlist.push_back(s);
	auto DoIt = [&](QString const &suffix){
	if (s.endsWith(suffix)) {
	QString t = s.mid(0, s.size() - suffix.size());
	QString t1 = t + "\\mingw64\\bin\\" GIT_COMMAND;
	if (misc::isExecutable(t1)) newlist.push_back(t1);
	QString t2 = t + "\\mingw\\bin\\" GIT_COMMAND;
	if (misc::isExecutable(t2)) newlist.push_back(t2);
	}
	};
	DoIt(suffix1);
	DoIt(suffix2);
	}
	std::sort(newlist.begin(), newlist.end());
	auto end = std::unique(newlist.begin(), newlist.end());
	list.clear();
	for (auto it = newlist.begin(); it != end; it++) {
	list.push_back(*it);
	}
	}
	#endif
	return selectCommand_("Git", exe, list, path, fn);
	}

	QString MainWindow::selectFileCommand(bool save)
	{
	char const *exe = FILE_COMMAND;

	QString path = global->file_command;

	auto fn = [&](QString const &path){
	setFileCommand(path, save);
	};

	QStringList list = whichCommand_(exe);

	#ifdef Q_OS_WIN
	QString dir = misc::getApplicationDir();
	QString path1 = dir / FILE_COMMAND;
	QString path2;
	int i = dir.lastIndexOf('/');
	int j = dir.lastIndexOf('\\');
	if (i < j) i = j;
	if (i > 0) {
	path2 = dir.mid(0, i) / FILE_COMMAND;
	}
	path1 = misc::normalizePathSeparator(path1);
	path2 = misc::normalizePathSeparator(path2);
	if (misc::isExecutable(path1)) list.push_back(path1);
	if (misc::isExecutable(path2)) list.push_back(path2);
	#endif

	return selectCommand_("File", exe, list, path, fn);
	}

	QString MainWindow::selectGpgCommand(bool save)
	{
	QString path = global->gpg_command;

	auto fn = [&](QString const &path){
	setGpgCommand(path, save);
	};

	QStringList list = whichCommand_(GPG_COMMAND, GPG2_COMMAND);

	QStringList cmdlist;
	cmdlist.push_back(GPG_COMMAND);
	cmdlist.push_back(GPG2_COMMAND);
	return selectCommand_("GPG", cmdlist, list, path, fn);
	}

	void MainWindow::checkUser()
	{
	Git g(m->gcx, QString());
	while (1) {
	Git::User user = g.getUser(Git::Source::Global);
	if (!user.name.isEmpty() && !user.email.isEmpty()) {
	return; // ok
	}
	if (!execSetGlobalUserDialog()) {
	return;
	}
	}
	}

	void MainWindow::dragEnterEvent(QDragEnterEvent *event)
	{
	if (QApplication::modalWindow()) return;

	if (event->mimeData()->hasUrls()) {
	event->acceptProposedAction();
	event->accept();
	}
	}

	void MainWindow::timerEvent(QTimerEvent *)
	{
	bool running = m->pty_process.isRunning();
	if (ui->toolButton_stop_process->isEnabled() != running) {
	ui->toolButton_stop_process->setEnabled(running);
	ui->action_stop_process->setEnabled(running);
	setNetworkingCommandsEnabled(!running);
	}
	if (!running) {
	m->interaction_mode = InteractionMode::None;
	}

	while (1) {
	char tmp[1024];
	int len = m->pty_process.readOutput(tmp, sizeof(tmp));
	if (len < 1) break;
	writeLog(tmp, len);
	}
	}

	void MainWindow::keyPressEvent(QKeyEvent *event)
	{
	if (qApp->focusWidget() == ui->widget_log) {
	int c = event->key();

	auto write_char = [&](char c){
	if (m->pty_process.isRunning()) {
	m->pty_process.writeInput(&c, 1);
	}
	};

	auto write_text = [&](QString const &str){
	std::string s = str.toStdString();
	- for (int i = 0; i < (int)s.size(); i++) {
	- write_char(s[i]);
	+ for (char i : s) {
	+ write_char(i);
	}
	};

	if (c == Qt::Key_Return \|\| c == Qt::Key_Enter) {
	write_char('\n');
	} else {
	QString text = event->text();
	write_text(text);
	}
	}
	}

	bool MainWindow::saveByteArrayAs(QByteArray const &ba, QString const &dstpath)
	{
	QFile file(dstpath);
	if (file.open(QFile::WriteOnly)) {
	file.write(ba);
	file.close();
	return true;
	- } else {
	- QString msg = "Failed to open the file '%1' for write";
	- msg = msg.arg(dstpath);
	- qDebug() << msg;
	}
	+ QString msg = "Failed to open the file '%1' for write";
	+ msg = msg.arg(dstpath);
	+ qDebug() << msg;
	return false;
	}

	bool MainWindow::saveFileAs(QString const &srcpath, QString const &dstpath)
	{
	QFile f(srcpath);
	if (f.open(QFile::ReadOnly)) {
	QByteArray ba = f.readAll();
	if (saveByteArrayAs(ba, dstpath)) {
	return true;
	}
	} else {
	QString msg = "Failed to open the file '%1' for read";
	msg = msg.arg(srcpath);
	qDebug() << msg;
	}
	return false;
	}

	bool MainWindow::saveBlobAs(QString const &id, QString const &dstpath)
	{
	Git::Object obj = cat_file(id);
	if (!obj.content.isEmpty()) {
	if (saveByteArrayAs(obj.content, dstpath)) {
	return true;
	}
	} else {
	QString msg = "Failed to get the content of the object '%1'";
	msg = msg.arg(id);
	qDebug() << msg;
	}
	return false;
	}

	bool MainWindow::saveAs(QString const &id, QString const &dstpath)
	{
	if (id.startsWith(PATH_PREFIX)) {
	return saveFileAs(id.mid(1), dstpath);
	} else {
	return saveBlobAs(id, dstpath);
	}
	}

	QString MainWindow::saveAsTemp(QString const &id)
	{
	QString path = newTempFilePath();
	saveAs(id, path);
	return path;
	}

	void MainWindow::on_action_edit_settings_triggered()
	{
	SettingsDialog dlg(this);
	if (dlg.exec() == QDialog::Accepted) {
	ApplicationSettings const &newsettings = dlg.settings();
	m->appsettings = newsettings;
	setGitCommand(appsettings()->git_command, false);
	setFileCommand(appsettings()->file_command, false);
	setGpgCommand(appsettings()->gpg_command, false);
	setWatchRemoteInterval(appsettings()->watch_remote_changes_every_mins);
	}
	}

	void MainWindow::clone()
	{
	if (!isRemoteOnline()) return;

	QString url;
	QString dir = defaultWorkingDir();
	while (1) {
	CloneDialog dlg(this, url, dir);
	if (dlg.exec() != QDialog::Accepted) {
	return;
	}

	url = dlg.url();
	dir = dlg.dir();

	if (dlg.action() == CloneDialog::Action::Clone) {
	// 既存チェック

	QFileInfo info(dir);
	if (info.isFile()) {
	QString msg = dir + "\n\n" + tr("A file with same name already exists");
	QMessageBox::warning(this, tr("Clone"), msg);
	continue;
	}
	if (info.isDir()) {
	QString msg = dir + "\n\n" + tr("A folder with same name already exists");
	QMessageBox::warning(this, tr("Clone"), msg);
	continue;
	}

	// クローン先ディレクトリを求める

	Git::CloneData clone_data = Git::preclone(url, dir);

	// クローン先ディレクトリの存在チェック

	QString basedir = misc::normalizePathSeparator(clone_data.basedir);
	if (!QFileInfo(basedir).isDir()) {
	int i = basedir.indexOf('/');
	int j = basedir.indexOf('\\');
	if (i < j) i = j;
	if (i < 0) {
	QString msg = basedir + "\n\n" + tr("Invalid folder");
	QMessageBox::warning(this, tr("Clone"), msg);
	continue;
	}

	QString msg = basedir + "\n\n" + tr("No such folder. Create it now ?");
	if (QMessageBox::warning(this, tr("Clone"), msg, QMessageBox::Ok, QMessageBox::Cancel) != QMessageBox::Ok) {
	continue;
	}

	// ディレクトリを作成

	QString base = basedir.mid(0, i + 1);
	QString sub = basedir.mid(i + 1);
	QDir(base).mkpath(sub);
	}

	m->temp_repo.local_dir = dir;
	m->temp_repo.local_dir.replace('\\', '/');
	m->temp_repo.name = makeRepositoryName(dir);

	GitPtr g = git(QString());
	m->pty_condition = PtyCondition::Clone;
	m->pty_process_ok = true;
	g->clone(clone_data, &m->pty_process);

	} else if (dlg.action() == CloneDialog::Action::AddExisting) {
	addWorkingCopyDir(dir, true);
	}

	return; // done
	}
	}

	void MainWindow::onCloneCompleted(bool success)
	{
	if (success) {
	saveRepositoryBookmark(m->temp_repo);
	setCurrentRepository(m->temp_repo, false);
	openRepository(true);
	}
	}

	void MainWindow::onPtyProcessCompleted()
	{
	switch (m->pty_condition) {
	case PtyCondition::Clone:
	onCloneCompleted(m->pty_process_ok);
	break;
	}
	m->pty_condition = PtyCondition::None;
	}

	void MainWindow::on_action_clone_triggered()
	{
	clone();
	}

	void MainWindow::on_action_about_triggered()
	{
	AboutDialog dlg(this);
	dlg.exec();
	}

	void MainWindow::on_toolButton_clone_clicked()
	{
	ui->action_clone->trigger();
	}

	void MainWindow::on_toolButton_fetch_clicked()
	{
	ui->action_fetch->trigger();
	}

	void MainWindow::clearRepoFilter()
	{
	ui->lineEdit_filter->clear();
	}

	void MainWindow::appendCharToRepoFilter(ushort c)
	{
	if (QChar(c).isLetter()) {
	c = QChar(c).toLower().unicode();
	}
	ui->lineEdit_filter->setText(m->repository_filter_text + c);
	}

	void MainWindow::backspaceRepoFilter()
	{
	QString s = m->repository_filter_text;
	int n = s.size();
	if (n > 0) {
	s = s.mid(0, n - 1);
	}
	ui->lineEdit_filter->setText(s);
	}

	void MainWindow::on_lineEdit_filter_textChanged(const QString &text)
	{
	m->repository_filter_text = text;
	updateRepositoriesList();
	}

	void MainWindow::on_toolButton_erase_filter_clicked()
	{
	clearRepoFilter();
	ui->lineEdit_filter->setFocus();
	}

	void MainWindow::deleteTags(QStringList const &tagnames)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	int row = ui->tableWidget_log->currentRow();

	if (!tagnames.isEmpty()) {
	reopenRepository(false, [&](GitPtr g){
	for (QString const &name : tagnames) {
	g->delete_tag(name, true);
	}
	});
	}

	ui->tableWidget_log->selectRow(row);
	}

	void MainWindow::deleteTags(const Git::CommitItem &commit)
	{
	auto it = m->tag_map.find(commit.commit_id);
	if (it != m->tag_map.end()) {
	QStringList names;
	QList<Git::Tag> const &tags = it->second;
	for (Git::Tag const &tag : tags) {
	names.push_back(tag.name);
	}
	deleteTags(names);
	}
	}



	void MainWindow::revertCommit()
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	Git::CommitItem const *commit = selectedCommitItem();
	if (commit) {
	g->revert(commit->commit_id);
	openRepository(false);
	}
	}

	bool MainWindow::addTag(QString const &name)
	{
	if (name.isEmpty()) return false;

	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return false;

	QString commit_id;

	Git::CommitItem const *commit = selectedCommitItem();
	if (commit && !commit->commit_id.isEmpty()) {
	commit_id = commit->commit_id;
	}

	if (!Git::isValidID(commit_id)) return false;

	int row = ui->tableWidget_log->currentRow();

	bool ok = false;
	reopenRepository(false, [&](GitPtr g){
	ok = g->tag(name, commit_id);
	});

	ui->tableWidget_log->selectRow(row);
	return ok;
	}

	void MainWindow::on_action_tag_push_all_triggered()
	{
	reopenRepository(false, [&](GitPtr g){
	g->push(true);
	});
	}

	QString MainWindow::tempfileHeader() const
	{
	QString name = "jp_soramimi_Guitar_%1_";
	return name.arg(QApplication::applicationPid());
	}

	void MainWindow::deleteTempFiles()
	{
	QString dir = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
	QString name = tempfileHeader();
	QDirIterator it(dir, { name + "*" });
	while (it.hasNext()) {
	QString path = it.next();
	QFile::remove(path);
	}
	}

	QString MainWindow::newTempFilePath()
	{
	QString tmpdir = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
	QString path = tmpdir / tempfileHeader() + QString::number(m->temp_file_counter);
	m->temp_file_counter++;
	return path;
	}

	QString MainWindow::determinFileType_(QString const &path, bool mime, std::function<void(QString const &cmd, QByteArray *ba)> callback) const
	{
	const_cast<MainWindow *>(this)->checkFileCommand();
	return misc::determinFileType(global->file_command, path, mime, callback);
	}

	QString MainWindow::determinFileType(QString const &path, bool mime)
	{
	return determinFileType_(path, mime, [](QString const &cmd, QByteArray *ba){
	misc2::runCommand(cmd, ba);
	});
	}

	QString MainWindow::determinFileType(QByteArray in, bool mime)
	{
	if (in.isEmpty()) return QString();

	if (in.size() > 10) {
	if (memcmp(in.data(), "\x1f\x8b\x08", 3) == 0) { // gzip
	QBuffer buf;
	MemoryReader reader(in.data(), in.size());
	reader.open(MemoryReader::ReadOnly);
	buf.open(QBuffer::WriteOnly);
	gunzip z;
	z.set_maximul_size(100000);
	z.decode(&reader, &buf);
	in = buf.buffer();
	}
	}

	// ファイル名を "-" にすると、リダイレクトで標準入力へ流し込める。
	return determinFileType_("-", mime, [&](QString const &cmd, QByteArray *ba){
	int r = misc2::runCommand(cmd, &in, ba);
	if (r != 0) {
	ba->clear();
	}
	});
	}

	void MainWindow::on_tableWidget_log_itemDoubleClicked(QTableWidgetItem *)
	{
	Git::CommitItem const *commit = selectedCommitItem();
	if (commit) {
	execCommitPropertyDialog(this, commit);
	}
	}

	void MainWindow::execFilePropertyDialog(QListWidgetItem *item)
	{
	if (item) {
	QString path = getFilePath(item);
	QString id = getObjectID(item);
	FilePropertyDialog dlg(this);
	dlg.exec(this, path, id);
	}
	}

	void MainWindow::on_listWidget_unstaged_itemDoubleClicked(QListWidgetItem * item)
	{
	execFilePropertyDialog(item);
	}

	void MainWindow::on_listWidget_staged_itemDoubleClicked(QListWidgetItem *item)
	{
	execFilePropertyDialog(item);
	}

	void MainWindow::on_listWidget_files_itemDoubleClicked(QListWidgetItem *item)
	{
	execFilePropertyDialog(item);
	}

	QListWidgetItem *MainWindow::currentFileItem() const
	{
	QListWidget *listwidget = nullptr;
	if (ui->stackedWidget->currentWidget() == ui->page_uncommited) {
	QWidget *w = qApp->focusWidget();
	if (w == ui->listWidget_unstaged) {
	listwidget = ui->listWidget_unstaged;
	} else if (w == ui->listWidget_staged) {
	listwidget = ui->listWidget_staged;
	}
	} else {
	listwidget = ui->listWidget_files;
	}
	if (listwidget) {
	return listwidget->currentItem();
	}
	return nullptr;
	}

	QPixmap MainWindow::getTransparentPixmap()
	{
	if (m->transparent_pixmap.isNull()) {
	m->transparent_pixmap = QPixmap(":/image/transparent.png");
	}
	return m->transparent_pixmap;
	}

	QString MainWindow::getCommitIdFromTag(QString const &tag)
	{
	return m->objcache.getCommitIdFromTag(tag);
	}

	bool MainWindow::isValidRemoteURL(const QString &url)
	{
	if (url.indexOf('\"') >= 0) {
	return false;
	}
	stopPtyProcess();
	GitPtr g = git(QString());
	QString cmd = "ls-remote \"%1\" HEAD";
	bool f = g->git(cmd.arg(url), false, false, &m->pty_process);
	{
	QTime time;
	time.start();
	while (!m->pty_process.wait(10)) {
	if (time.elapsed() > 10000) {
	f = false;
	break;
	}
	QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
	}
	stopPtyProcess();
	}
	QString line = g->resultText().trimmed();
	QString head;
	int i = line.indexOf('\t');
	if (i == GIT_ID_LENGTH) {
	QString id = line.mid(0, i);
	QString name = line.mid(i + 1);
	qDebug() << id << name;
	if (name == "HEAD" && Git::isValidID(id)) {
	head = id;
	}
	}
	if (f) {
	qDebug() << "This is a valid repository.";
	if (head.isEmpty()) {
	qDebug() << "But HEAD not found";
	}
	return true;
	- } else {
	- qDebug() << "It is not a repository.";
	}
	+ qDebug() << "It is not a repository.";
	return false;
	}

	bool MainWindow::testRemoteRepositoryValidity(QString const &url)
	{
	bool ok;
	{
	OverrideWaitCursor;
	ok = isValidRemoteURL(url);
	}

	QString pass = tr("The URL is a valid repository");
	QString fail = tr("Failed to access the URL");

	QString text = "%1\n\n%2";
	text = text.arg(url).arg(ok ? pass : fail);

	QString title = tr("Remote Repository");

	if (ok) {
	QMessageBox::information(this, title, text);
	} else {
	QMessageBox::critical(this, title, text);
	}

	return ok;
	}

	bool MainWindow::execSetGlobalUserDialog()
	{
	SetGlobalUserDialog dlg(this);
	if (dlg.exec() == QDialog::Accepted) {
	GitPtr g = git();
	Git::User user = dlg.user();
	g->setUser(user, true);
	updateWindowTitle(g);
	return true;
	}
	return false;
	}

	void MainWindow::execSetUserDialog(Git::User const &global_user, Git::User const &repo_user, QString const &reponame)
	{
	SetUserDialog dlg(this, global_user, repo_user, reponame);
	if (dlg.exec() == QDialog::Accepted) {
	GitPtr g = git();
	Git::User user = dlg.user();
	if (dlg.isGlobalChecked()) {
	g->setUser(user, true);
	}
	if (dlg.isRepositoryChecked()) {
	g->setUser(user, false);
	}
	updateWindowTitle(g);
	}
	}

	void MainWindow::on_action_set_config_user_triggered()
	{
	Git::User global_user;
	Git::User repo_user;
	GitPtr g = git();
	if (isValidWorkingCopy(g)) {
	repo_user = g->getUser(Git::Source::Local);
	}
	global_user = g->getUser(Git::Source::Global);

	execSetUserDialog(global_user, repo_user, currentRepositoryName());
	}

	void MainWindow::on_action_window_log_triggered(bool checked)
	{
	ui->dockWidget_log->setVisible(checked);
	}

	NamedCommitList MainWindow::namedCommitItems(int flags)
	{
	NamedCommitList items;
	if (flags & Branches) {
	for (auto pair: m->branch_map) {
	QList<Git::Branch> const &list = pair.second;
	for (Git::Branch const &b : list) {
	if (b.isHeadDetached()) continue;
	QString key = b.name;
	if (flags & NamedCommitFlag::Remotes) {
	if (!b.remote.isEmpty()) {
	key = "remotes" / b.remote / key;
	}
	} else {
	if (!b.remote.isEmpty()) continue;
	}
	NamedCommitItem item;
	item.type = NamedCommitItem::Type::Branch;
	item.remote = b.remote;
	item.name = b.name;
	item.id = b.id;
	items.push_back(item);
	}
	}
	}
	if (flags & Tags) {
	for (auto pair: m->tag_map) {
	QList<Git::Tag> const &list = pair.second;
	for (Git::Tag const &t : list) {
	NamedCommitItem item;
	item.type = NamedCommitItem::Type::Tag;
	item.name = t.name;
	item.id = t.id;
	items.push_back(item);
	}
	}
	}
	return items;
	}

	int MainWindow::rowFromCommitId(QString const &id)
	{
	for (size_t i = 0; i < m->logs.size(); i++) {
	Git::CommitItem const &item = m->logs[i];
	if (item.commit_id == id) {
	return (int)i;
	}
	}
	return -1;
	}

	void MainWindow::on_action_repo_jump_triggered()
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	NamedCommitList items = namedCommitItems(Branches \| Tags \| Remotes);
	JumpDialog::sort(&items);
	{
	NamedCommitItem head;
	head.name = "HEAD";
	head.id = m->head_id;
	items.push_front(head);
	}
	JumpDialog dlg(this, items);
	if (dlg.exec() == QDialog::Accepted) {
	JumpDialog::Action action = dlg.action();
	if (action == JumpDialog::Action::BranchsAndTags) {
	QString name = dlg.text();
	QString id = g->rev_parse(name);
	if (g->objectType(id) == "tag") {
	id = m->objcache.getCommitIdFromTag(id);
	}
	int row = rowFromCommitId(id);
	if (row < 0) {
	QMessageBox::warning(this, tr("Jump"), QString("%1\n(%2)\n\n").arg(name).arg(id) + tr("That commmit has not foud or not read yet"));
	} else {
	setCurrentLogRow(row);

	if (dlg.isCheckoutChecked()) {
	NamedCommitItem item;
	for (NamedCommitItem const &t : items) {
	if (t.name == name) {
	item = t;
	break;
	}
	}
	bool ok = false;
	if (item.type == NamedCommitItem::Type::Branch) {
	ok = g->git(QString("checkout \"%1\"").arg(name), true);
	} else if (item.type == NamedCommitItem::Type::Tag) {
	ok = g->git(QString("checkout -b \"%1\" \"%2\"").arg(name).arg(id), true);
	}
	if (ok) {
	openRepository(true);
	}
	}
	}
	} else if (action == JumpDialog::Action::CommitId) {
	QString id = dlg.text();
	jumpToCommit(id);
	}
	}
	}

	void MainWindow::jumpToCommit(QString id)
	{
	GitPtr g = git();
	id = g->rev_parse(id);
	if (!id.isEmpty()) {
	int row = rowFromCommitId(id);
	setCurrentLogRow(row);
	}
	}

	void MainWindow::checkout(QWidget parent, Git::CommitItem const commit)
	{
	if (!commit) return;

	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	QStringList tags;
	QStringList local_branches;
	QStringList remote_branches;
	{
	NamedCommitList named_commits = namedCommitItems(Branches \| Tags \| Remotes);
	JumpDialog::sort(&named_commits);
	for (NamedCommitItem const &item : named_commits) {
	if (item.id == commit->commit_id) {
	QString name = item.name;
	if (item.type == NamedCommitItem::Type::Tag) {
	tags.push_back(name);
	} else if (item.type == NamedCommitItem::Type::Branch) {
	int i = name.lastIndexOf('/');
	if (i < 0 && name == "HEAD") continue;
	if (i > 0 && name.mid(i + 1) == "HEAD") continue;
	if (item.remote.isNull()) {
	local_branches.push_back(name);
	} else {
	remote_branches.push_back(name);
	}
	}
	}
	}
	}

	CheckoutDialog dlg(parent, tags, local_branches, remote_branches);
	if (dlg.exec() == QDialog::Accepted) {
	CheckoutDialog::Operation op = dlg.operation();
	QString name = dlg.branchName();
	QString id = commit->commit_id;
	bool ok = false;
	setLogEnabled(g, true);
	if (op == CheckoutDialog::Operation::HeadDetached) {
	ok = g->git(QString("checkout \"%1\"").arg(id), true);
	} else if (op == CheckoutDialog::Operation::CreateLocalBranch) {
	ok = g->git(QString("checkout -b \"%1\" \"%2\"").arg(name).arg(id), true);
	} else if (op == CheckoutDialog::Operation::ExistingLocalBranch) {
	ok = g->git(QString("checkout \"%1\"").arg(name), true);
	}
	if (ok) {
	openRepository(true);
	}
	}
	}

	void MainWindow::deleteBranch(Git::CommitItem const *commit)
	{
	if (!commit) return;

	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	QStringList all_local_branch_names;
	QStringList current_local_branch_names;
	{
	NamedCommitList named_commits = namedCommitItems(Branches);
	JumpDialog::sort(&named_commits);
	for (NamedCommitItem const &item : named_commits) {
	if (item.name == "HEAD") continue;
	if (item.id == commit->commit_id) {
	current_local_branch_names.push_back(item.name);
	}
	all_local_branch_names.push_back(item.name);
	}
	}

	DeleteBranchDialog dlg(this, false, all_local_branch_names, current_local_branch_names);
	if (dlg.exec() == QDialog::Accepted) {
	setLogEnabled(g, true);
	QStringList names = dlg.selectedBranchNames();
	int count = 0;
	for (QString const &name : names) {
	if (g->git(QString("branch -D \"%1\"").arg(name))) {
	count++;
	} else {
	writeLog(tr("Failed to delete the branch '%1'\n").arg(name));
	}
	}
	if (count > 0) {
	openRepository(true);
	}
	}
	}

	void MainWindow::mergeBranch(Git::CommitItem const *commit)
	{
	if (!commit) return;

	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	g->mergeBranch(commit->commit_id);
	openRepository(true);
	}

	void MainWindow::rebaseBranch(Git::CommitItem const *commit)
	{
	if (!commit) return;

	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	QString text = tr("Are you sure you want to rebase the commit ?");
	text += "\n\n";
	text += "> git rebase " + commit->commit_id;
	int r = QMessageBox::information(this, tr("Rebase"), text, QMessageBox::Ok, QMessageBox::Cancel);
	if (r == QMessageBox::Ok) {
	g->rebaseBranch(commit->commit_id);
	openRepository(true);
	}
	}

	void MainWindow::cherrypick(Git::CommitItem const *commit)
	{
	if (!commit) return;

	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	g->cherrypick(commit->commit_id);
	openRepository(true);
	}

	void MainWindow::checkout()
	{
	checkout(this, selectedCommitItem());
	}

	void MainWindow::deleteBranch()
	{
	deleteBranch(selectedCommitItem());
	}

	void MainWindow::on_action_repo_checkout_triggered()
	{
	checkout();
	}

	void MainWindow::on_action_delete_branch_triggered()
	{
	deleteBranch();
	}

	bool MainWindow::runOnRepositoryDir(std::function<void(QString)> callback, RepositoryItem const *repo)
	{
	if (!repo) {
	repo = &m->current_repo;
	}
	QString dir = repo->local_dir;
	dir.replace('\\', '/');
	if (QFileInfo(dir).isDir()) {
	callback(dir);
	return true;
	}
	QMessageBox::warning(this, qApp->applicationName(), tr("No repository selected"));
	return false;
	}

	#ifdef Q_OS_MAC
	namespace {

	bool isValidDir(QString const &dir)
	{
	if (dir.indexOf('\"') >= 0 \|\| dir.indexOf('\\') >= 0) return false;
	return QFileInfo(dir).isDir();
	}

	}
	#endif

	void MainWindow::openTerminal(RepositoryItem const *repo)
	{
	runOnRepositoryDir([](QString dir){
	#ifdef Q_OS_MAC
	if (!isValidDir(dir)) return;
	QString cmd = "open -n -a /Applications/Utilities/Terminal.app --args \"%1\"";
	cmd = cmd.arg(dir);
	QProcess::execute(cmd);
	#else
	Terminal::open(dir);
	#endif
	}, repo);
	}

	void MainWindow::openExplorer(RepositoryItem const *repo)
	{
	runOnRepositoryDir([](QString dir){
	#ifdef Q_OS_MAC
	if (!isValidDir(dir)) return;
	QString cmd = "open \"%1\"";
	cmd = cmd.arg(dir);
	QProcess::execute(cmd);
	#else
	QDesktopServices::openUrl(dir);
	#endif
	}, repo);
	}

	void MainWindow::on_toolButton_terminal_clicked()
	{
	openTerminal(nullptr);
	}

	void MainWindow::on_toolButton_explorer_clicked()
	{
	openExplorer(nullptr);
	}

	void MainWindow::pushSetUpstream(QString const &remote, QString const &branch)
	{
	if (remote.isEmpty()) return;
	if (branch.isEmpty()) return;

	int exitcode = 0;
	QString errormsg;

	reopenRepository(true, [&](GitPtr g){
	g->push_u(remote, branch, &m->pty_process);
	while (1) {
	if (m->pty_process.wait(1)) break;
	QApplication::processEvents();
	}
	exitcode = m->pty_process.getExitCode();
	errormsg = m->pty_process.getMessage();
	});

	if (exitcode == 128) {
	if (errormsg.indexOf("Connection refused") >= 0) {
	QMessageBox::critical(this, qApp->applicationName(), tr("Connection refused."));
	return;
	}
	}

	updateRemoteInfo();
	}

	bool MainWindow::pushSetUpstream(bool testonly)
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return false;
	QStringList remotes = g->getRemotes();

	QString current_branch = currentBranchName();

	QStringList branches;
	for (Git::Branch const &b : g->branches()) {
	branches.push_back(b.name);
	}

	if (remotes.isEmpty() \|\| branches.isEmpty()) {
	return false;
	}

	if (testonly) {
	return true;
	}

	PushDialog dlg(this, remotes, branches, PushDialog::RemoteBranch(QString(), current_branch));
	if (dlg.exec() == QDialog::Accepted) {
	PushDialog::Action a = dlg.action();
	if (a == PushDialog::PushSimple) {
	ui->action_push->trigger();
	} else if (a == PushDialog::PushSetUpstream) {
	QString remote = dlg.remote();
	QString branch = dlg.branch();
	pushSetUpstream(remote, branch);
	}
	return true;
	}

	return false;
	}

	void MainWindow::on_action_reset_HEAD_1_triggered()
	{
	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	g->reset_head1();
	openRepository(false);
	}

	void MainWindow::createRepository(QString const &dir)
	{
	CreateRepositoryDialog dlg(this, dir);
	if (dlg.exec() == QDialog::Accepted) {
	QString path = dlg.path();
	if (QFileInfo(path).isDir()) {
	if (Git::isValidWorkingCopy(path)) {
	// A valid git repository already exists there.
	} else {
	GitPtr g = git(path);
	if (g->init()) {
	QString name = dlg.name();
	if (!name.isEmpty()) {
	addWorkingCopyDir(path, name, true);
	}
	QString remote_name = dlg.remoteName();
	QString remote_url = dlg.remoteURL();
	if (!remote_name.isEmpty() && !remote_url.isEmpty()) {
	g->addRemoteURL(remote_name, remote_url);
	}
	}
	}
	} else {
	// not dir
	}
	}
	}

	void MainWindow::on_action_create_a_repository_triggered()
	{
	createRepository(QString());
	}

	bool MainWindow::isRemoteOnline() const
	{
	return ui->radioButton_remote_online->isChecked();
	}

	void MainWindow::setNetworkingCommandsEnabled(bool f)
	{
	ui->action_clone->setEnabled(f);

	ui->toolButton_clone->setEnabled(f);

	if (!Git::isValidWorkingCopy(currentWorkingCopyDir())) {
	f = false;
	}

	ui->action_fetch->setEnabled(f);
	ui->action_pull->setEnabled(f);
	ui->action_push->setEnabled(f);

	ui->toolButton_fetch->setEnabled(f);
	ui->toolButton_pull->setEnabled(f);
	ui->toolButton_push->setEnabled(f);
	}

	void MainWindow::setRemoteOnline(bool f)
	{
	QRadioButton *rb = nullptr;
	rb = f ? ui->radioButton_remote_online : ui->radioButton_remote_offline;
	rb->blockSignals(true);
	rb->click();
	rb->blockSignals(false);

	setNetworkingCommandsEnabled(f);

	MySettings s;
	s.beginGroup("Remote");
	s.setValue("Online", f);
	s.endGroup();
	}

	void MainWindow::on_radioButton_remote_online_clicked()
	{
	setRemoteOnline(true);
	}

	void MainWindow::on_radioButton_remote_offline_clicked()
	{
	setRemoteOnline(false);
	}

	void MainWindow::on_verticalScrollBar_log_valueChanged(int)
	{
	ui->widget_log->refrectScrollBar();
	}

	void MainWindow::on_horizontalScrollBar_log_valueChanged(int)
	{
	ui->widget_log->refrectScrollBar();
	}

	void MainWindow::stopPtyProcess()
	{
	m->pty_process.stop();
	QDir::setCurrent(m->starting_dir);
	}

	void MainWindow::abortPtyProcess()
	{
	stopPtyProcess();
	m->pty_process_ok = false;
	m->interaction_canceled = true;
	}

	void MainWindow::on_toolButton_stop_process_clicked()
	{
	abortPtyProcess();
	}

	void MainWindow::on_action_stop_process_triggered()
	{
	abortPtyProcess();
	}

	void MainWindow::on_action_exit_triggered()
	{
	close();
	}

	void MainWindow::on_action_reflog_triggered()
	{
	GitPtr g = git();
	Git::ReflogItemList reflog;
	g->reflog(&reflog);

	ReflogWindow dlg(this, this, reflog);
	dlg.exec();
	}

	void MainWindow::blame(QListWidgetItem *item)
	{
	QList<BlameItem> list;
	QString path = getFilePath(item);
	{
	GitPtr g = git();
	QByteArray ba = g->blame(path);
	if (!ba.isEmpty()) {
	char const *begin = ba.data();
	char const *end = begin + ba.size();
	list = BlameWindow::parseBlame(begin, end);
	}
	}
	if (!list.isEmpty()) {
	qApp->setOverrideCursor(Qt::WaitCursor);
	BlameWindow win(this, path, list);
	qApp->restoreOverrideCursor();
	win.exec();
	}
	}

	void MainWindow::blame()
	{
	blame(currentFileItem());
	}

	void MainWindow::execCommitViewWindow(Git::CommitItem const *commit)
	{
	CommitViewWindow win(this, commit);
	win.exec();
	}

	void MainWindow::on_action_repository_property_triggered()
	{
	execRepositoryPropertyDialog(currentWorkingCopyDir());
	}

	void MainWindow::on_action_set_gpg_signing_triggered()
	{
	GitPtr g = git();
	QString global_key_id = g->signingKey(Git::Source::Global);
	QString repository_key_id;
	if (g->isValidWorkingCopy()) {
	repository_key_id = g->signingKey(Git::Source::Local);
	}
	SetGpgSigningDialog dlg(this, currentRepositoryName(), global_key_id, repository_key_id);
	if (dlg.exec() == QDialog::Accepted) {
	g->setSigningKey(dlg.id(), dlg.isGlobalChecked());
	}
	}

	void MainWindow::execAreYouSureYouWantToContinueConnectingDialog()
	{
	using TheDlg = AreYouSureYouWantToContinueConnectingDialog;

	m->interaction_mode = InteractionMode::Busy;

	QApplication::restoreOverrideCursor();

	TheDlg dlg(this);
	if (dlg.exec() == QDialog::Accepted) {
	TheDlg::Result r = dlg.result();
	if (r == TheDlg::Result::Yes) {
	m->pty_process.writeInput("yes\n", 4);
	} else {
	m->pty_process_ok = false; // abort
	m->pty_process.writeInput("no\n", 3);
	QThread::msleep(300);
	stopPtyProcess();
	}
	} else {
	ui->widget_log->setFocus();
	m->interaction_canceled = true;
	}
	m->interaction_mode = InteractionMode::Busy;
	}

	void MainWindow::onLogIdle()
	{
	if (m->interaction_canceled) return;
	if (m->interaction_mode != InteractionMode::None) return;

	static char const are_you_sure_you_want_to_continue_connecting[] = "Are you sure you want to continue connecting (yes/no)?";
	static char const enter_passphrase[] = "Enter passphrase: ";
	static char const enter_passphrase_for_key[] = "Enter passphrase for key '";
	static char const fatal_authentication_failed_for[] = "fatal: Authentication failed for '";

	std::vector<char> vec;
	ui->widget_log->retrieveLastText(&vec, 100);
	- if (vec.size() > 0) {
	+ if (!vec.empty()) {
	std::string line;
	int n = (int)vec.size();
	int i = n;
	while (i > 0) {
	i--;
	if (i + 1 < n && vec[i] == '\n') {
	i++;
	line.assign(&vec[i], n - i);
	break;
	}
	}
	if (!line.empty()) {
	auto ExecLineEditDialog = [&](QWidget *parent, QString const &title, QString const &prompt, QString const &val, bool password){
	LineEditDialog dlg(parent, title, prompt, val, password);
	if (dlg.exec() == QDialog::Accepted) {
	std::string ret = dlg.text().toStdString();
	std::string str = ret + '\n';
	m->pty_process.writeInput(str.c_str(), str.size());
	return ret;
	- } else {
	- abortPtyProcess();
	}
	+ abortPtyProcess();
	return std::string();
	};

	auto Match = [&](char const *str){
	int n = strlen(str);
	if (strncmp(line.c_str(), str, n) == 0) {
	char const *p = line.c_str() + n;
	while (1) {
	if (!*p) return true;
	if (!isspace((unsigned char)*p)) break;
	p++;
	}
	}
	return false;
	};

	auto StartsWith = [&](char const *str){
	char const *p = line.c_str();
	while (*str) {
	if (p != str) return false;
	str++;
	p++;
	}
	return true;
	};

	if (Match(are_you_sure_you_want_to_continue_connecting)) {
	execAreYouSureYouWantToContinueConnectingDialog();
	return;
	}

	if (line == enter_passphrase) {
	ExecLineEditDialog(this, "Passphrase", QString::fromStdString(line), QString(), true);
	return;
	}

	if (StartsWith(enter_passphrase_for_key)) {
	std::string keyfile;
	{
	int i = strlen(enter_passphrase_for_key);
	char const *p = line.c_str() + i;
	char const *q = strrchr(p, ':');
	if (q && p + 2 < q && q[-1] == '\'') {
	keyfile.assign(p, q - 1);
	}
	}
	if (!keyfile.empty()) {
	if (keyfile == m->ssh_passphrase_for && !m->ssh_passphrase_secret.empty()) {
	std::string text = m->ssh_passphrase_secret + '\n';
	m->pty_process.writeInput(text.c_str(), text.size());
	} else {
	m->ssh_passphrase_for = keyfile;
	std::string s = ExecLineEditDialog(this, "Passphrase for key", QString::fromStdString(line), QString(), true);
	m->ssh_passphrase_secret = s;
	}
	return;
	}
	}

	char const *begin = line.c_str();
	char const *end = line.c_str() + line.size();
	auto Input = [&](QString const &title, bool password, std::string *value){
	std::string header = QString("%1 for '").arg(title).toStdString();
	if (strncmp(begin, header.c_str(), header.size()) == 0) {
	QString msg;
	if (memcmp(end - 2, "':", 2) == 0) {
	msg = QString::fromUtf8(begin, end - begin - 1);
	} else if (memcmp(end - 3, "': ", 3) == 0) {
	msg = QString::fromUtf8(begin, end - begin - 2);
	}
	if (!msg.isEmpty()) {
	std::string s = ExecLineEditDialog(this, title, msg, value ? QString::fromStdString(*value) : QString(), password);
	if (value) *value = s;
	return true;
	}
	}
	return false;
	};
	std::string uid = m->http_uid;
	std::string pwd = m->http_pwd;
	if (Input("Username", false, &uid)) {
	m->http_uid = uid;
	return;
	}
	if (Input("Password", true, &pwd)) {
	m->http_pwd = pwd;
	return;
	}

	if (StartsWith(fatal_authentication_failed_for)) {
	QMessageBox::critical(this, tr("Authentication Failed"), QString::fromStdString(line));
	abortPtyProcess();
	return;
	}
	}
	}
	}

	QList<Git::Tag> MainWindow::queryTagList()
	{
	QList<Git::Tag> list;
	Git::CommitItem const *commit = selectedCommitItem();
	if (commit && Git::isValidID(commit->commit_id)) {
	list = findTag(commit->commit_id);
	}
	return list;
	}

	void MainWindow::on_action_edit_tags_triggered()
	{
	Git::CommitItem const *commit = selectedCommitItem();
	if (commit && Git::isValidID(commit->commit_id)) {
	EditTagsDialog dlg(this, commit);
	dlg.exec();
	}
	}

	void MainWindow::on_action_push_u_triggered()
	{
	pushSetUpstream(false);
	}

	QStringList MainWindow::remoteBranches(QString const &id)
	{
	QStringList list;

	GitPtr g = git();
	if (isValidWorkingCopy(g)) {
	NamedCommitList named_commits = namedCommitItems(Branches \| Remotes);
	JumpDialog::sort(&named_commits);
	for (NamedCommitItem const &item : named_commits) {
	if (item.id == id && !item.remote.isEmpty()) {
	list.push_back(item.remote / item.name);
	}
	}
	}

	return list;
	}

	void MainWindow::deleteRemoteBranch(Git::CommitItem const *commit)
	{
	if (!commit) return;

	GitPtr g = git();
	if (!isValidWorkingCopy(g)) return;

	QStringList remote_branches = remoteBranches(commit->commit_id);
	if (remote_branches.isEmpty()) return;

	DeleteBranchDialog dlg(this, true, QStringList(), remote_branches);
	if (dlg.exec() == QDialog::Accepted) {
	setLogEnabled(g, true);
	QStringList names = dlg.selectedBranchNames();
	for (QString const &name : names) {
	int i = name.indexOf('/');
	if (i > 0) {
	QString remote = name.mid(0, i);
	QString branch = ':' + name.mid(i + 1);
	pushSetUpstream(remote, branch);
	}
	}
	}
	}

	void MainWindow::on_action_delete_remote_branch_triggered()
	{
	deleteRemoteBranch(selectedCommitItem());
	}

	void MainWindow::rebaseOnto()
	{
	struct Commit {
	QStringList parents;
	QStringList children;
	};

	std::map<QString, Commit> commit_map;

	Git::CommitItem const *commit = selectedCommitItem();
	if (commit) {
	for (Git::CommitItem const &item : m->logs) {
	Commit c;
	c.parents = item.parent_ids;
	commit_map[item.commit_id] = c;
	}
	for (Git::CommitItem const &item : m->logs) {
	for (QString const &parent : item.parent_ids) {
	auto it = commit_map.find(parent);
	if (it != commit_map.end()) {
	it->second.children.push_back(item.commit_id);
	}
	}
	}
	QString upstream;
	QString id = m->head_id;
	while (1) {
	auto it = commit_map.find(id);
	if (it == commit_map.end()) break;
	Commit const &c = it->second;
	if (c.parents.size() > 1) goto done;
	if (c.parents.size() != 1) break;
	if (id != m->head_id) {
	if (c.children.size() > 1) goto done;
	if (!findTag(id).isEmpty()) goto done;
	auto it2 = m->branch_map.find(id);
	if (it2 != m->branch_map.end()) {
	QList<Git::Branch> b = it2->second;
	if (!it2->second.empty()) goto done;
	}
	}
	id = c.parents.first();
	continue;
	done:;
	upstream = id;
	break;
	}

	QString newbase = commit->commit_id;
	QString branch = m->head_id;

	RebaseOntoDialog dlg(this);
	if (dlg.exec(newbase, upstream, branch) == QDialog::Accepted) {
	reopenRepository(true, [&](GitPtr g){
	m->pty_condition = PtyCondition::Pull;
	m->pty_process_ok = true;
	g->rebaseOnto(newbase, upstream, branch, &m->pty_process);
	while (1) {
	if (m->pty_process.wait(1)) break;
	QApplication::processEvents();
	}
	});
	}
	}
	}

	void MainWindow::on_action_rebase_onto_triggered()
	{
	rebaseOnto();
	}

	void MainWindow::checkRemoteUpdate()
	{
	if (m->pty_process.isRunning()) return;

	emit signalCheckRemoteUpdate();
	}

	void MainWindow::on_action_test_triggered()
	{
	}

	diff --git a/src/MainWindow.h b/src/MainWindow.h
	index 21029d3..692be79 100644
	--- a/src/MainWindow.h
	+++ b/src/MainWindow.h
	@@ -1,412 +1,412 @@
	#ifndef MAINWINDOW_H
	#define MAINWINDOW_H

	#include <QMainWindow>
	#include "Git.h"
	#include "RepositoryData.h"
	#include <memory>
	#include <functional>
	#include "GitHubAPI.h"
	#include "main.h"
	#include "TextEditorTheme.h"

	namespace Ui {
	class MainWindow;
	}

	class QScrollBar;

	class QListWidget;
	class QListWidgetItem;
	class QTreeWidgetItem;
	class QTableWidgetItem;
	class AboutDialog;

	class MySettings;

	class LocalSocketReader;

	class CommitList;
	class WebContext;

	#define PATH_PREFIX "*"


	class HunkItem {
	public:
	int hunk_number = -1;
	size_t pos, len;
	std::vector<std::string> lines;
	};

	class MainWindow : public QMainWindow {
	Q_OBJECT
	friend class ImageViewWidget;
	friend class FileDiffSliderWidget;
	friend class FileHistoryWindow;
	friend class FileDiffWidget;
	friend class AboutDialog;
	public:
	struct Label {
	enum {
	Head,
	LocalBranch,
	RemoteBranch,
	Tag,
	};
	int kind;
	QString text;
	Label(int kind = LocalBranch)
	: kind(kind)
	{

	}
	};
	private:
	struct Private;
	Private *m;
	public:
	explicit MainWindow(QWidget *parent = 0);
	~MainWindow();

	QPixmap const &digitsPixmap() const;

	QString currentWorkingCopyDir() const;

	static QString makeRepositoryName(QString const &loc);
	const Git::CommitItemList *logs() const;
	QColor color(unsigned int i);
	private:
	Ui::MainWindow *ui;

	enum class FilesListType {
	SingleList,
	SideBySide,
	};

	- void addDiffItems(const QList<Git::Diff> *diff_list, std::function<void (const QString &, QString, int)> AddItem_);
	+ void addDiffItems(const QList<Git::Diff> *diff_list, std::function<void (const QString &, QString, int)> const &AddItem_);
	void updateFilesList(QString id, bool wait);
	void updateFilesList(const Git::CommitItem &commit, bool wait);
	void updateRepositoriesList();
	QString getBookmarksFilePath() const;
	bool saveRepositoryBookmarks() const;

	void openRepository_(GitPtr g);
	void openRepository(bool validate, bool waitcursor = true);
	void reopenRepository(bool log, std::function<void(GitPtr)> callback);

	void openSelectedRepository();
	bool askAreYouSureYouWantToRun(const QString &title, const QString &command);
	void resetFile(const QStringList &path);
	void revertAllFiles();
	void prepareLogTableWidget();
	QStringList selectedFiles_(QListWidget *listwidget) const;
	QStringList selectedFiles() const;
	void for_each_selected_files(std::function<void (const QString &)> fn);
	bool editFile(const QString &path, const QString &title);
	void updateCommitGraph();
	void showFileList(FilesListType files_list_type);

	bool checkGitCommand();
	bool checkFileCommand();
	void checkUser();

	void clearLog();
	void clearFileList();
	void clearDiffView();
	void clearRepositoryInfo();

	int repositoryIndex_(const QTreeWidgetItem *item) const;
	RepositoryItem const repositoryItem(const QTreeWidgetItem item) const;

	bool makeDiff(QString id, QList<Git::Diff> *out);

	void commit(bool amend = false);
	void commit_amend();
	void queryBranches(GitPtr g);
	void updateRemoteInfo();
	QList<Git::Branch> findBranch(const QString &id);
	QList<Git::Tag> findTag(const QString &id);
	int selectedLogIndex() const;
	const Git::CommitItem *selectedCommitItem() const;
	void deleteTags(const Git::CommitItem &commit);
	QTreeWidgetItem *newQTreeWidgetFolderItem(const QString &name);
	void buildRepoTree(const QString &group, QTreeWidgetItem item, QList<RepositoryItem> repos);
	void refrectRepositories();

	bool saveByteArrayAs(const QByteArray &ba, const QString &dstpath);
	bool saveFileAs(const QString &srcpath, const QString &dstpath);
	bool saveBlobAs(const QString &id, const QString &dstpath);
	QString selectCommand_(const QString &cmdname, const QStringList &cmdfile, const QStringList &list, QString path, std::function<void (const QString &)> callback);
	QString selectCommand_(const QString &cmdname, const QString &cmdfile, const QStringList &list, QString path, std::function<void(const QString &)> callback);
	void updateDiffView(QListWidgetItem *item);
	void updateDiffView();
	void updateUnstagedFileCurrentItem();
	void updateStagedFileCurrentItem();
	// void addTag();
	QStringList whichCommand_(const QString &cmdfile1, const QString &cmdfile2 = QString());
	QString getObjectID(QListWidgetItem *item);
	QString determinFileType_(const QString &path, bool mime, std::function<void(QString const &cmd, QByteArray *ba)> callback) const;
	Git::Object cat_file_(GitPtr g, const QString &id);
	Git::Object cat_file(const QString &id);
	void updateStatusBarText();
	void setUnknownRepositoryInfo();
	void setWindowTitle_(const Git::User &user);
	void setRepositoryInfo(const QString &reponame, const QString &brname);
	void updateWindowTitle(GitPtr g);
	void logGitVersion();
	static bool git_callback(void cookie, const char ptr, int len);
	int indexOfRepository(const QTreeWidgetItem *treeitem) const;
	void removeRepositoryFromBookmark(int index, bool ask);

	enum NamedCommitFlag {
	Branches = 0x0001,
	Tags = 0x0002,
	Remotes = 0x0100,
	};
	NamedCommitList namedCommitItems(int flags);

	void deleteBranch(const Git::CommitItem *commit);
	void checkout();
	void clone();
	void deleteBranch();
	Git::CommitItemList retrieveCommitLog(GitPtr g);
	bool runOnRepositoryDir(std::function<void(QString)> callback, const RepositoryItem *repo);
	void openTerminal(const RepositoryItem *repo);
	void openExplorer(const RepositoryItem *repo);
	void pushSetUpstream(const QString &remote, const QString &branch);
	bool pushSetUpstream(bool testonly);
	void clearRepoFilter();
	void appendCharToRepoFilter(ushort c);
	void backspaceRepoFilter();
	void revertCommit();
	int rowFromCommitId(const QString &id);
	void cherrypick(const Git::CommitItem *commit);
	void mergeBranch(const Git::CommitItem *commit);
	void rebaseBranch(const Git::CommitItem *commit);
	void detectGitServerType(GitPtr g);
	void initNetworking();
	void setRemoteOnline(bool f);
	bool isRemoteOnline() const;
	void startTimers();
	void onCloneCompleted(bool success);
	bool fetch(GitPtr g);
	void stopPtyProcess();
	void abortPtyProcess();
	void setNetworkingCommandsEnabled(bool f);
	void execSetUserDialog(const Git::User &global_user, const Git::User &repo_user, const QString &reponame);
	bool execSetGlobalUserDialog();
	void blame(QListWidgetItem *item);
	void blame();
	QListWidgetItem *currentFileItem() const;
	const RepositoryItem findRegisteredRepository(QString workdir) const;
	void execAreYouSureYouWantToContinueConnectingDialog();
	void queryRemotes(GitPtr g);
	void internalSetCommand(const QString &path, bool save, const QString &name, QString *out);
	void deleteRemoteBranch(const Git::CommitItem *commit);
	QStringList remoteBranches(const QString &id);
	void rebaseOnto();
	void createRepository(const QString &dir);
	void checkRemoteUpdate();
	void setWatchRemoteInterval(int mins);
	void emitWriteLog(QByteArray ba);
	protected:
	void dragEnterEvent(QDragEnterEvent *event);
	void timerEvent(QTimerEvent *);
	void keyPressEvent(QKeyEvent *event);
	bool event(QEvent *event);
	bool eventFilter(QObject watched, QEvent event);
	public:

	QString selectGitCommand(bool save);
	QString selectFileCommand(bool save);
	QString selectGpgCommand(bool save);

	int limitLogCount() const;

	void setGitCommand(const QString &path, bool save);
	void setFileCommand(const QString &path, bool save);
	void setGpgCommand(const QString &path, bool save);
	void clearAuthentication();
	void setCurrentRepository(const RepositoryItem &repo, bool clear_authentication);
	bool isThereUncommitedChanges() const;
	QString defaultWorkingDir() const;
	void autoOpenRepository(QString dir);
	void saveRepositoryBookmark(RepositoryItem item);
	void drawDigit(QPainter *pr, int x, int y, int n) const;
	int digitWidth() const;
	int digitHeight() const;
	bool isValidWorkingCopy(const GitPtr &g) const;
	QString tempfileHeader() const;
	void deleteTempFiles();
	QString newTempFilePath();
	bool saveAs(const QString &id, const QString &dstpath);
	QString saveAsTemp(const QString &id);
	QString abbrevCommitID(const Git::CommitItem &commit);
	QString findFileID(GitPtr g, const QString &commit_id, const QString &file);
	QString determinFileType(const QString &path, bool mime);
	QString determinFileType(QByteArray in, bool mime);
	QPixmap getTransparentPixmap();
	QString getCommitIdFromTag(const QString &tag);
	void setStatusBarText(const QString &text);
	void clearStatusBarText();
	QString makeCommitInfoText(int row, QList<Label> *label_list);
	void setLogEnabled(GitPtr g, bool f);
	void addWorkingCopyDir(QString dir, QString name, bool open);
	void addWorkingCopyDir(QString dir, bool open)
	{
	addWorkingCopyDir(dir, QString(), open);
	}
	bool isValidRemoteURL(QString const &url);
	bool testRemoteRepositoryValidity(const QString &url);
	void removeSelectedRepositoryFromBookmark(bool ask);
	void setCurrentLogRow(int row);
	GitPtr git(const QString &dir) const;
	GitPtr git();
	const QList<Label> *label(int row);
	bool isGitHub() const;
	QIcon committerIcon(int row) const;
	void updateCommitTableLater();
	bool isAvatarEnabled() const;
	WebContext *getWebContextPtr();
	bool shown();
	void execFileHistory(QListWidgetItem *item);
	void execFileHistory(const QString &path);
	void execCommitExploreWindow(QWidget parent, const Git::CommitItem commit);
	void execCommitPropertyDialog(QWidget parent, const Git::CommitItem commit);
	void checkout(QWidget parent, const Git::CommitItem commit);
	TextEditorThemePtr themeForTextEditor();
	bool queryCommit(const QString &id, Git::CommitItem *out);
	void jumpToCommit(QString id);
	WebContext *webContext();
	bool execWelcomeWizardDialog();
	void updateFilesList(QString id, QList<Git::Diff> diff_list, QListWidget listwidget);
	void execCommitViewWindow(const Git::CommitItem *commit);
	QAction addMenuActionProperty(QMenu menu);
	void execFilePropertyDialog(QListWidgetItem *item);
	void execRepositoryPropertyDialog(QString workdir, bool open_repository_menu = false);
	QStringList remotes() const;
	QIcon verifiedIcon(char s) const;
	ApplicationSettings *appsettings();
	const ApplicationSettings *appsettings() const;
	const Git::CommitItem *commitItem(int row) const;
	bool checkExecutable(const QString &path);
	void deleteTags(const QStringList &tagnames);
	QList<Git::Tag> queryTagList();
	bool addTag(const QString &name);
	void updateCurrentFilesList();
	void setRemoteChanged(bool f);
	QString currentRepositoryName() const;
	QString currentRemoteName() const;
	Git::Branch const &currentBranch() const;
	QString currentBranchName() const;
	public slots:
	void writeLog(const char *ptr, int len);
	void writeLog(const QString &str);
	void writeLog(QByteArray ba);
	private slots:
	void on_action_clone_triggered();
	void on_action_commit_triggered();
	void on_action_edit_git_config_triggered();
	void on_action_edit_gitignore_triggered();
	void on_action_edit_global_gitconfig_triggered();
	void on_action_edit_settings_triggered();
	void on_action_fetch_triggered();
	void on_action_open_existing_working_copy_triggered();
	void on_action_pull_triggered();
	void on_action_push_triggered();
	void on_action_test_triggered();
	void on_action_view_refresh_triggered();
	void on_action_tag_push_all_triggered();

	void on_treeWidget_repos_currentItemChanged(QTreeWidgetItem current, QTreeWidgetItem previous);
	void on_treeWidget_repos_itemDoubleClicked(QTreeWidgetItem *item, int column);

	void on_tableWidget_log_currentItemChanged(QTableWidgetItem current, QTableWidgetItem previous);

	void on_treeWidget_repos_customContextMenuRequested(const QPoint &pos);
	void on_tableWidget_log_customContextMenuRequested(const QPoint &pos);
	void on_listWidget_files_customContextMenuRequested(const QPoint &pos);
	void on_listWidget_unstaged_customContextMenuRequested(const QPoint &pos);
	void on_listWidget_staged_customContextMenuRequested(const QPoint &pos);

	void on_listWidget_unstaged_currentRowChanged(int currentRow);
	void on_listWidget_staged_currentRowChanged(int currentRow);
	void on_listWidget_files_currentRowChanged(int currentRow);

	void on_toolButton_commit_clicked();
	void on_toolButton_pull_clicked();
	void on_toolButton_push_clicked();
	void on_toolButton_select_all_clicked();
	void on_toolButton_stage_clicked();
	void on_toolButton_unstage_clicked();
	void on_action_about_triggered();
	void on_toolButton_clone_clicked();
	void on_toolButton_fetch_clicked();

	void on_lineEdit_filter_textChanged(const QString &text);
	void on_toolButton_erase_filter_clicked();

	void on_tableWidget_log_itemDoubleClicked(QTableWidgetItem *);
	void on_listWidget_unstaged_itemDoubleClicked(QListWidgetItem *item);
	void on_listWidget_staged_itemDoubleClicked(QListWidgetItem *item);
	void on_listWidget_files_itemDoubleClicked(QListWidgetItem *item);

	void onRepositoriesTreeDropped();
	void on_action_set_config_user_triggered();

	void on_action_window_log_triggered(bool checked);

	void onLogVisibilityChanged();

	void on_action_repo_jump_triggered();
	void on_action_repo_checkout_triggered();
	void on_action_delete_branch_triggered();

	void on_toolButton_terminal_clicked();
	void on_toolButton_explorer_clicked();

	void on_action_reset_HEAD_1_triggered();

	void on_action_create_a_repository_triggered();

	void onAvatarUpdated();
	void on_radioButton_remote_online_clicked();

	void on_radioButton_remote_offline_clicked();
	void on_verticalScrollBar_log_valueChanged(int);
	void on_horizontalScrollBar_log_valueChanged(int);

	void onPtyProcessCompleted();
	void on_toolButton_stop_process_clicked();

	void on_action_stop_process_triggered();

	void on_action_exit_triggered();

	void on_action_reflog_triggered();


	void on_action_repository_property_triggered();
	void on_action_set_gpg_signing_triggered();
	void on_action_edit_tags_triggered();

	void on_action_push_u_triggered();

	void on_action_delete_remote_branch_triggered();

	void on_action_rebase_onto_triggered();

	void doUpdateButton();
	signals:
	void onEscapeKeyPressed();
	void signalCheckRemoteUpdate();
	void updateButton();
	void signalWriteLog(QByteArray ba);
	protected:
	void closeEvent(QCloseEvent *event);
	protected slots:
	void onLogIdle();
	};

	#endif // MAINWINDOW_H
	diff --git a/src/MergeBranchDialog.cpp b/src/MergeBranchDialog.cpp
	index 814e2b4..9d69f8b 100644
	--- a/src/MergeBranchDialog.cpp
	+++ b/src/MergeBranchDialog.cpp
	@@ -1,30 +1,29 @@
	#include "MergeBranchDialog.h"
	#include "ui_MergeBranchDialog.h"

	MergeBranchDialog::MergeBranchDialog(QWidget *parent, const QList<Git::Branch> &branches) :
	QDialog(parent),
	ui(new Ui::MergeBranchDialog)
	{
	ui->setupUi(this);

	QString current_branch;
	- for (int i = 0; i < branches.size(); i++) {
	- Git::Branch const &b = branches[i];
	+ for (const auto & b : branches) {
	if (b.isCurrent()) {
	current_branch = b.name;
	} else if (b.name.indexOf('/') < 0) {
	ui->comboBox_branches->addItem(b.name);
	}
	}
	ui->label_current_branch->setText(current_branch);
	}

	MergeBranchDialog::~MergeBranchDialog()
	{
	delete ui;
	}

	QString MergeBranchDialog::branchName() const
	{
	return ui->comboBox_branches->currentText();
	}
	diff --git a/src/MyImageViewWidget.h b/src/MyImageViewWidget.h
	index a7cc7b6..188a227 100644
	--- a/src/MyImageViewWidget.h
	+++ b/src/MyImageViewWidget.h
	@@ -1,25 +1,23 @@
	#ifndef MYIMAGEVIEWWIDGET_H
	#define MYIMAGEVIEWWIDGET_H

	#include "ImageViewWidget.h"

	// used from FileViewWidget.h

	// ImageViewWidgetクラスは、他のアプリで再利用する想定の設計。
	// MyImageViewWidgetクラスは、Guitar専用にカスタマイズを行っている。

	class MyImageViewWidget : public ImageViewWidget {
	private:
	QString object_id_;
	QString path_;
	protected:
	- void contextMenuEvent(QContextMenuEvent *e);
	+ void contextMenuEvent(QContextMenuEvent *e) override;
	public:
	- MyImageViewWidget(QWidget *parent = 0);
	+ MyImageViewWidget(QWidget *parent = nullptr);

	void setImage(QString mimetype, QByteArray const &ba, QString const &object_id_, QString const &path_);
	-
	-
	};

	#endif // MYIMAGEVIEWWIDGET_H
	diff --git a/src/MyTableWidgetDelegate.cpp b/src/MyTableWidgetDelegate.cpp
	index 8306341..9e4617a 100644
	--- a/src/MyTableWidgetDelegate.cpp
	+++ b/src/MyTableWidgetDelegate.cpp
	@@ -1,36 +1,36 @@
	#include "MyTableWidgetDelegate.h"

	#include <QPainter>
	#include <QTableWidget>
	#include <QApplication>


	MyTableWidgetDelegate::MyTableWidgetDelegate(QObject *parent)
	: QStyledItemDelegate(parent)
	{
	}

	void MyTableWidgetDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
	{
	QStyleOptionViewItem opt = option;

	#ifdef Q_OS_WIN
	// 選択枠を描画
	if (option.showDecorationSelected) {
	QTableWidget const tablewidget = qobject_cast<QTableWidget const >(option.widget);
	Q_ASSERT(tablewidget);
	int w = tablewidget->viewport()->rect().width();
	painter->save();
	QStyleOptionViewItem o = option;
	painter->setClipRect(o.rect);
	o.rect = QRect(1, o.rect.y(), w - 2, o.rect.height());
	- qApp->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &o, painter, 0);
	+ qApp->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &o, painter, nullptr);
	painter->restore();
	}

	opt.state &= ~QStyle::State_Selected; // 行の選択枠は描画しない
	#endif
	opt.state &= ~QStyle::State_HasFocus; // セルのフォーカス枠は描画しない

	QStyledItemDelegate::paint(painter, opt, index); // デフォルトの描画
	}
	diff --git a/src/MyToolButton.cpp b/src/MyToolButton.cpp
	index 86e5dc0..299b80b 100644
	--- a/src/MyToolButton.cpp
	+++ b/src/MyToolButton.cpp
	@@ -1,66 +1,66 @@
	#include "MyToolButton.h"

	#include "MainWindow.h"

	#include <QPainter>

	MyToolButton::MyToolButton(QWidget *parent)
	: QToolButton(parent)
	{
	}

	void MyToolButton::setIndicatorMode(Indicator i)
	{
	indicator = i;
	update();
	}

	void MyToolButton::setDot(bool f)
	{
	indicator = Dot;
	number = f;
	update();
	}

	void MyToolButton::setNumber(int n)
	{
	indicator = Number;
	number = n;
	update();
	}

	void MyToolButton::paintEvent(QPaintEvent *event)
	{
	QToolButton::paintEvent(event);

	- MainWindow mw = qobject_cast<MainWindow >(window());
	+ auto mw = qobject_cast<MainWindow >(window());
	Q_ASSERT(mw);

	if (indicator == Dot && number > 0) {
	QPainter pr(this);
	pr.setRenderHint(QPainter::Antialiasing);
	int z = 10;
	QRect r(width() - z, 0, z, z);
	pr.setPen(Qt::NoPen);
	pr.setBrush(QColor(255, 0, 0));
	pr.drawEllipse(r);
	} else if (indicator == Number && number >= 0) {
	int w = mw->digitWidth();
	int h = mw->digitHeight();
	QPixmap pm;
	{
	char tmp[100];
	int n = sprintf(tmp, "%u", number);

	pm = QPixmap((w + 1) * n + 3, h + 4);
	pm.fill(Qt::red);

	QPainter pr(&pm);
	for (int i = 0; i < n; i++) {
	mw->drawDigit(&pr, 2 + i * (w + 1), 2, tmp[i] - '0');
	}
	}
	QPainter pr(this);
	pr.drawPixmap(width() - pm.width(), 0, pm);
	}
	}
	diff --git a/src/Photoshop.cpp b/src/Photoshop.cpp
	index 236c229..2d2a1bc 100644
	--- a/src/Photoshop.cpp
	+++ b/src/Photoshop.cpp
	@@ -1,113 +1,112 @@
	#include "Photoshop.h"

	#include <stdint.h>
	#include <stdio.h>
	#include <vector>

	namespace {

	inline uint32_t read_uint32_be(void const *p)
	{
	- uint8_t const q = (uint8_t const )p;
	+ auto const q = (uint8_t const )p;
	return (q[0] << 24) \| (q[1] << 16) \| (q[2] << 8) \| q[3];
	}

	inline uint16_t read_uint16_be(void const *p)
	{
	- uint8_t const q = (uint8_t const )p;
	+ auto const q = (uint8_t const )p;
	return (q[0] << 8) \| q[1];
	}

	}

	void photoshop::readThumbnail(QIODevice in, std::vector<char> jpeg)
	{
	jpeg->clear();

	struct FileHeader {
	char sig[4];
	char ver[2];
	char reserved[6];
	char channels[2];
	char height[4];
	char width[4];
	char depth[2];
	char colormode[2];
	};
	FileHeader fh;
	in->read((char *)&fh, sizeof(FileHeader));

	if (memcmp(fh.sig, "8BPS", 4) == 0) {
	char tmp[4];
	uint32_t len;
	in->read(tmp, 4);
	len = read_uint32_be(tmp);
	in->seek(in->pos() + len);
	in->read(tmp, 4);
	len = read_uint32_be(tmp);

	while (1) {
	struct ImageResourceHeader {
	char sig[4];
	char id[2];
	};
	ImageResourceHeader irh;
	in->read((char *)&irh, sizeof(ImageResourceHeader));
	if (memcmp(irh.sig, "8BIM", 4) == 0) {
	std::vector<char> name;
	while (1) {
	char c;
	if (in->read(&c, 1) != 1) break;
	if (c == 0) {
	if ((name.size() & 1) == 0) {
	if (in->read(&c, 1) != 1) break;
	}
	break;
	- } else {
	- name.push_back(c);
	}
	+ name.push_back(c);
	}

	in->read(tmp, 4);
	len = read_uint32_be(tmp);

	qint64 pos = in->pos();

	uint16_t resid = read_uint16_be(irh.id);
	if (resid == 0x0409 \|\| resid == 0x040c) {
	struct ThumbnailResourceHeader {
	uint32_t format;
	uint32_t width;
	uint32_t height;
	uint32_t widthbytes;
	uint32_t totalsize;
	uint32_t size_after_compression;
	uint16_t bits_per_pixel;
	uint16_t num_of_planes;
	};
	ThumbnailResourceHeader trh;
	in->read((char *)&trh, sizeof(ThumbnailResourceHeader));
	if (read_uint32_be(&trh.format) == 1) {
	uint32_t size_after_compression = read_uint32_be(&trh.size_after_compression);
	if (size_after_compression < 1000000) {
	jpeg->resize(size_after_compression);
	char *ptr = &jpeg->at(0);
	if (in->read(ptr, size_after_compression) == size_after_compression) {
	// ok
	} else {
	jpeg->clear();
	}
	}
	}
	break;
	}

	if (len & 1) len++;
	in->seek(pos + len);
	} else {
	break;
	}
	}
	}
	}

	diff --git a/src/ReflogWindow.cpp b/src/ReflogWindow.cpp
	index 220daa8..b75eed8 100644
	--- a/src/ReflogWindow.cpp
	+++ b/src/ReflogWindow.cpp
	@@ -1,126 +1,126 @@
	#include "CommitExploreWindow.h"
	#include "ReflogWindow.h"
	#include "ui_ReflogWindow.h"
	#include "MainWindow.h"
	#include "Git.h"
	#include <QMenu>

	ReflogWindow::ReflogWindow(QWidget parent, MainWindow mainwin, Git::ReflogItemList const &reflog)
	: QDialog(parent)
	, ui(new Ui::ReflogWindow)
	{
	ui->setupUi(this);
	Qt::WindowFlags flags = windowFlags();
	flags &= ~Qt::WindowContextHelpButtonHint;
	flags \|= Qt::WindowMaximizeButtonHint;
	setWindowFlags(flags);

	mainwindow_ = mainwin;
	reflog_ = reflog;

	updateTable(reflog_);
	}

	ReflogWindow::~ReflogWindow()
	{
	delete ui;
	}

	void ReflogWindow::updateTable(Git::ReflogItemList const &reflog)
	{
	QTableWidgetItem *item;
	ui->tableWidget->clear();

	QStringList cols = {
	tr("Commit"),
	tr("Head"),
	tr("Command"),
	tr("Comment"),
	};

	auto newQTableWidgetItem = [](QString const &text){
	- QTableWidgetItem *item = new QTableWidgetItem(text);
	+ auto *item = new QTableWidgetItem(text);
	return item;
	};

	ui->tableWidget->setColumnCount(cols.size());
	ui->tableWidget->setRowCount(reflog.size());

	for (int col = 0; col < cols.size(); col++) {
	item = newQTableWidgetItem(cols[col]);
	ui->tableWidget->setHorizontalHeaderItem(col, item);
	}

	int row = 0;
	for (Git::ReflogItem const &t : reflog) {
	QString text = t.id.mid(0, 7);
	item = newQTableWidgetItem(text);
	ui->tableWidget->setItem(row, 0, item);
	item = newQTableWidgetItem(t.head);
	ui->tableWidget->setItem(row, 1, item);
	QString cmd = t.command;
	int i = cmd.indexOf(' ');
	if (i < 0) i = cmd.size();
	if (i > 10) i = 10;
	cmd = cmd.mid(0, i);
	item = newQTableWidgetItem(cmd);
	ui->tableWidget->setItem(row, 2, item);
	item = newQTableWidgetItem(t.comment);
	ui->tableWidget->setItem(row, 3, item);
	ui->tableWidget->setRowHeight(row, 24);
	row++;
	}

	ui->tableWidget->resizeColumnsToContents();
	ui->tableWidget->horizontalHeader()->setStretchLastSection(true);
	}

	bool ReflogWindow::currentCommit(Git::CommitItem *out)
	{
	bool ok = false;
	*out = Git::CommitItem();
	int row = ui->tableWidget->currentRow();
	if (row >= 0 && row < reflog_.size()) {
	Git::ReflogItem const &logitem = reflog_[row];
	if (mainwindow()->queryCommit(logitem.id, out)) {
	ok = true;
	}
	}
	return ok;
	}

	void ReflogWindow::on_tableWidget_customContextMenuRequested(const QPoint &pos)
	{
	Git::CommitItem commit;
	if (!currentCommit(&commit)) return;

	QMenu menu;
	QAction *a_checkout = menu.addAction(tr("Checkout"));
	QAction *a_explorer = menu.addAction(tr("Explorer"));
	QAction *a_property = mainwindow()->addMenuActionProperty(&menu);
	QAction *a = menu.exec(ui->tableWidget->viewport()->mapToGlobal(pos) + QPoint(8, -8));
	if (a) {
	if (a == a_checkout) {
	mainwindow()->checkout(this, &commit);
	return;
	}
	if (a == a_explorer) {
	mainwindow()->execCommitExploreWindow(this, &commit);
	return;
	}
	if (a == a_property) {
	mainwindow()->execCommitPropertyDialog(this, &commit);
	return;
	}
	}

	}

	void ReflogWindow::on_tableWidget_itemDoubleClicked(QTableWidgetItem *item)
	{
	(void)item;
	Git::CommitItem commit;
	if (!currentCommit(&commit)) return;

	mainwindow()->execCommitPropertyDialog(this, &commit);
	}
	diff --git a/src/RemoteWatcher.cpp b/src/RemoteWatcher.cpp
	index b79cfbc..1e41ad8 100644
	--- a/src/RemoteWatcher.cpp
	+++ b/src/RemoteWatcher.cpp
	@@ -1,51 +1,49 @@
	#include "RemoteWatcher.h"
	#include "common/joinpath.h"
	#include <QFileInfo>

	-RemoteWatcher::RemoteWatcher()
	-{
	-}
	+

	void RemoteWatcher::start(MainWindow *mw)
	{
	mainwindow_ = mw;
	QThread::start();
	moveToThread(this);
	}

	void RemoteWatcher::setCurrent(const QString &remote, const QString &branch)
	{
	remote_ = remote;
	branch_ = branch;
	}

	void RemoteWatcher::checkRemoteUpdate()
	{
	QString dir = mainwindow()->currentWorkingCopyDir();

	QString refs;
	QString local_id;

	if (QFileInfo(dir).isDir()) {
	refs = "refs/remotes" / remote_ / branch_;
	QString head = dir / ".git" / refs;
	QFile file1(head);
	if (file1.open(QFile::ReadOnly)) {
	local_id = file1.readLine().trimmed();
	}
	refs = "refs/heads" / branch_;
	}
	if (local_id.isEmpty()) return;

	QString remote_id;
	GitPtr g = mainwindow()->git();
	auto list = g->ls_remote();
	for (auto item : list) {
	if (item.name == refs) {
	remote_id = item.commit_id;
	break;
	}
	}
	mainwindow()->setRemoteChanged(remote_id != local_id);
	}

	diff --git a/src/RemoteWatcher.h b/src/RemoteWatcher.h
	index 2d5a3af..10631ae 100644
	--- a/src/RemoteWatcher.h
	+++ b/src/RemoteWatcher.h
	@@ -1,26 +1,26 @@
	#ifndef REMOTEWATCHER_H
	#define REMOTEWATCHER_H

	#include <QThread>

	#include "MainWindow.h"

	class RemoteWatcher : public QThread {
	Q_OBJECT
	private:
	MainWindow *mainwindow_ = nullptr;
	QString remote_;
	QString branch_;
	MainWindow *mainwindow()
	{
	return mainwindow_;
	}
	public:
	- RemoteWatcher();
	+ RemoteWatcher() = default;
	void start(MainWindow *mw);
	void setCurrent(QString const &remote, QString const &branch);
	public slots:
	void checkRemoteUpdate();
	};

	#endif // REMOTEWATCHER_H
	diff --git a/src/RepositoryData.cpp b/src/RepositoryData.cpp
	index bd70360..fd3b207 100644
	--- a/src/RepositoryData.cpp
	+++ b/src/RepositoryData.cpp
	@@ -1,106 +1,103 @@
	#include "RepositoryData.h"
	#include <QXmlStreamWriter>
	#include <QXmlStreamReader>
	#include <QFile>
	#include <vector>
	#include <QDebug>

	-RepositoryBookmark::RepositoryBookmark()
	-{

	-}

	bool RepositoryBookmark::save(const QString &path, QList<RepositoryItem> const *items)
	{
	QFile file(path);
	if (file.open(QFile::WriteOnly)) {
	QXmlStreamWriter writer(&file);
	writer.setAutoFormatting(true);
	writer.writeStartDocument();
	writer.writeStartElement("repositories");
	for (RepositoryItem const &item : *items) {
	if (item.name.isEmpty() && item.local_dir.isEmpty()) {
	continue;
	}
	writer.writeStartElement("repository");
	writer.writeAttribute("name", item.name);
	writer.writeAttribute("group", item.group);
	if (!item.local_dir.isEmpty()) {
	QString local = item.local_dir;
	local.replace('\\', '/');
	writer.writeStartElement("local");
	writer.writeCharacters(local);
	writer.writeEndElement(); // local
	}
	writer.writeEndElement(); // repository
	}
	writer.writeEndElement(); // repositories
	writer.writeEndDocument();
	return true;
	}
	return false;
	}

	QList<RepositoryItem> RepositoryBookmark::load(const QString &path)
	{
	QList<RepositoryItem> items;
	QFile file(path);
	if (file.open(QFile::ReadOnly)) {
	enum State {
	STATE_UNKNOWN,
	STATE_ROOT,
	STATE_REPOSITORIES,
	STATE_REPOSITORIES_REPOSITORY,
	STATE_REPOSITORIES_REPOSITORY_LOCAL,
	};
	RepositoryItem item;
	QString text;
	std::vector<State> state_stack;
	QXmlStreamReader reader(&file);
	reader.setNamespaceProcessing(false);
	while (!reader.atEnd()) {
	State state = STATE_UNKNOWN;
	State newstate = STATE_UNKNOWN;
	if (!state_stack.empty()) {
	state = state_stack.back();
	}
	QXmlStreamReader::TokenType tt = reader.readNext();
	switch (tt) {
	case QXmlStreamReader::StartElement:
	if (state_stack.empty()) {
	if (reader.name() == "repositories") {
	newstate = STATE_REPOSITORIES;
	}
	} else {
	QXmlStreamAttributes atts = reader.attributes();
	if (state == STATE_REPOSITORIES && reader.name() == "repository") {
	newstate = STATE_REPOSITORIES_REPOSITORY;
	item = RepositoryItem();
	item.name = atts.value("name").toString();
	item.group = atts.value("group").toString();
	} else if (state == STATE_REPOSITORIES_REPOSITORY && reader.name() == "local") {
	newstate = STATE_REPOSITORIES_REPOSITORY_LOCAL;
	text = QString();
	}
	}
	state_stack.push_back(newstate);
	break;
	case QXmlStreamReader::EndElement:
	if (state == STATE_REPOSITORIES_REPOSITORY_LOCAL) {
	item.local_dir = text;
	item.local_dir.replace('\\', '/');
	} else if (state == STATE_REPOSITORIES_REPOSITORY) {
	items.push_back(item);
	}
	if (!state_stack.empty()) {
	state_stack.pop_back();
	}
	break;
	case QXmlStreamReader::Characters:
	text.append(reader.text());
	break;
	}
	}
	}
	return items;
	}
	diff --git a/src/RepositoryData.h b/src/RepositoryData.h
	index 58a1bef..799f330 100644
	--- a/src/RepositoryData.h
	+++ b/src/RepositoryData.h
	@@ -1,24 +1,24 @@
	#ifndef REPOSITORYDATA_H
	#define REPOSITORYDATA_H

	#include <QList>

	enum class ServerType {
	Standard,
	GitHub,
	};

	struct RepositoryItem {
	QString name;
	QString group;
	QString local_dir;
	};

	class RepositoryBookmark {
	public:
	- RepositoryBookmark();
	+ RepositoryBookmark() = default;
	static bool save(QString const &path, QList<RepositoryItem> const *items);
	static QList<RepositoryItem> load(QString const &path);
	};

	#endif // REPOSITORYDATA_H
	diff --git a/src/SelectCommandDialog.cpp b/src/SelectCommandDialog.cpp
	index 4d2e094..25c5757 100644
	--- a/src/SelectCommandDialog.cpp
	+++ b/src/SelectCommandDialog.cpp
	@@ -1,98 +1,98 @@
	#include "SelectCommandDialog.h"
	#include "ui_SelectCommandDialog.h"
	#include <QFileDialog>

	QStringList uniqueStringList(const QStringList &list)
	{
	QStringList tmp_list = list;
	std::sort(tmp_list.begin(), tmp_list.end());
	auto end = std::unique(tmp_list.begin(), tmp_list.end());
	QStringList ret_list;
	for (auto it = tmp_list.begin(); it != end; it++) {
	ret_list.push_back(*it);
	}
	return ret_list;
	}

	SelectCommandDialog::SelectCommandDialog(QWidget *parent, const QString &cmdname, const QStringList &cmdfiles, const QString &path, const QStringList &list) :
	QDialog(parent),
	ui(new Ui::SelectCommandDialog)
	{
	ui->setupUi(this);
	Qt::WindowFlags flags = windowFlags();
	flags &= ~Qt::WindowContextHelpButtonHint;
	setWindowFlags(flags);

	command_name = cmdname;
	command_files = cmdfiles;

	QString text = tr("Please select the '%1' command you want to use.");
	ui->label->setText(text.arg(cmdfiles.front()));

	this->path = path;

	QStringList list2 = uniqueStringList(list);

	for (QString const &s : list2) {
	if (s.isEmpty()) continue;
	ui->listWidget->addItem(s);
	}

	ui->listWidget->setFocus();
	ui->listWidget->setCurrentRow(0);
	}

	SelectCommandDialog::~SelectCommandDialog()
	{
	delete ui;
	}


	void SelectCommandDialog::on_pushButton_browse_clicked()
	{
	QString dir;
	#ifdef _WIN32
	QString filter;
	for (QString const &cmd : command_files) {
	if (cmd.isEmpty()) continue;
	filter += tr("%1 command (%2);;").arg(command_name).arg(cmd);
	}
	filter += tr("Executable files (*.exe)");
	#else
	QString filter;
	for (QString const &cmd : command_files) {
	if (cmd.isEmpty()) continue;
	filter += tr("%1 command (%2);;").arg(command_name).arg(cmd);
	}
	filter += "All files (*)";
	#endif

	QFileDialog dlg(this);
	dlg.setWindowTitle(tr("%1 command").arg(command_name));
	dlg.setDirectory(dir);
	dlg.setNameFilter(filter);
	dlg.setFilter(QDir::Dirs \| QDir::Executable);
	dlg.setFileMode(QFileDialog::ExistingFile);
	if (dlg.exec() == QDialog::Accepted) {
	QStringList list = dlg.selectedFiles();
	- if (list.size() > 0) {
	+ if (!list.empty()) {
	path = list.first();
	accept();
	}
	}
	}

	void SelectCommandDialog::on_listWidget_currentTextChanged(const QString &currentText)
	{
	path = currentText;
	}

	QString SelectCommandDialog::selectedFile() const
	{
	return path;
	}

	void SelectCommandDialog::on_listWidget_itemDoubleClicked(QListWidgetItem * /item/)
	{
	accept();
	}
	diff --git a/src/SelectGpgKeyDialog.cpp b/src/SelectGpgKeyDialog.cpp
	index 5234027..d9a6628 100644
	--- a/src/SelectGpgKeyDialog.cpp
	+++ b/src/SelectGpgKeyDialog.cpp
	@@ -1,72 +1,72 @@
	#include "SelectGpgKeyDialog.h"
	#include "ui_SelectGpgKeyDialog.h"
	#include "MainWindow.h"

	SelectGpgKeyDialog::SelectGpgKeyDialog(QWidget *parent, const QList<gpg::Data> &keys) :
	QDialog(parent),
	ui(new Ui::SelectGpgKeyDialog)
	{
	ui->setupUi(this);
	keys_ = keys;
	updateTable();
	}

	SelectGpgKeyDialog::~SelectGpgKeyDialog()
	{
	delete ui;
	}

	gpg::Data SelectGpgKeyDialog::key() const
	{
	int row = ui->tableWidget->currentRow();
	if (row >= 0 && row < keys_.size()) {
	return keys_[row];
	}
	return gpg::Data();
	}

	void SelectGpgKeyDialog::updateTable()
	{
	QStringList cols = {
	tr("ID"),
	tr("Name"),
	tr("Mail")
	};
	ui->tableWidget->setColumnCount(cols.size());
	ui->tableWidget->setRowCount(keys_.size());
	for (int col = 0; col < cols.size(); col++) {
	- QTableWidgetItem *item = new QTableWidgetItem();
	+ auto *item = new QTableWidgetItem;
	item->setText(cols[col]);
	ui->tableWidget->setHorizontalHeaderItem(col, item);
	}
	for (int row = 0; row < keys_.size(); row++) {
	gpg::Data const &key = keys_[row];
	QTableWidgetItem *item;
	auto NewItem = [&](){
	- QTableWidgetItem *item = new QTableWidgetItem();
	+ auto *item = new QTableWidgetItem;
	return item;
	};
	int col = 0;
	item = NewItem();
	item->setText(key.id);
	ui->tableWidget->setItem(row, col, item);
	col++;
	item = NewItem();
	item->setText(key.name);
	ui->tableWidget->setItem(row, col, item);
	col++;
	item = NewItem();
	item->setText(key.mail);
	ui->tableWidget->setItem(row, col, item);
	}
	ui->tableWidget->horizontalHeader()->setStretchLastSection(true);
	ui->tableWidget->resizeColumnsToContents();
	}



	void SelectGpgKeyDialog::on_tableWidget_itemDoubleClicked(QTableWidgetItem *item)
	{
	(void)item;
	done(QDialog::Accepted);
	}
	diff --git a/src/SelectItemDialog.cpp b/src/SelectItemDialog.cpp
	index 27a4532..096f8e0 100644
	--- a/src/SelectItemDialog.cpp
	+++ b/src/SelectItemDialog.cpp
	@@ -1,53 +1,53 @@
	#include "SelectItemDialog.h"
	#include "ui_SelectItemDialog.h"

	SelectItemDialog::SelectItemDialog(QWidget *parent) :
	QDialog(parent),
	ui(new Ui::SelectItemDialog)
	{
	ui->setupUi(this);
	Qt::WindowFlags flags = windowFlags();
	flags &= ~Qt::WindowContextHelpButtonHint;
	setWindowFlags(flags);
	}

	SelectItemDialog::~SelectItemDialog()
	{
	delete ui;
	}

	void SelectItemDialog::addItem(const QString &id, const QString &text)
	{
	- QListWidgetItem *item = new QListWidgetItem();
	+ auto *item = new QListWidgetItem;
	item->setText(text);
	item->setData(Qt::UserRole, id);
	ui->listWidget->addItem(item);
	}

	void SelectItemDialog::select(QString const &id)
	{
	int n = ui->listWidget->count();
	for (int i = 0; i < n; i++) {
	QListWidgetItem *p = ui->listWidget->item(i);
	if (p->data(Qt::UserRole).toString() == id) {
	ui->listWidget->setCurrentRow(i);
	return;
	}
	}
	}

	SelectItemDialog::Item SelectItemDialog::item() const
	{
	Item ret;
	QListWidgetItem *p = ui->listWidget->currentItem();
	if (p) {
	ret.id = p->data(Qt::UserRole).toString();
	ret.text = p->text();
	}
	return ret;
	}

	void SelectItemDialog::on_listWidget_itemDoubleClicked(QListWidgetItem *)
	{
	done(Accepted);
	}
	diff --git a/src/Theme.cpp b/src/Theme.cpp
	index f04e7fa..eac0141 100644
	--- a/src/Theme.cpp
	+++ b/src/Theme.cpp
	@@ -1,142 +1,130 @@
	#include "Theme.h"
	#include <QApplication>
	#include <QRgb>
	#include <QProxyStyle>

	// AbstractTheme

	-AbstractTheme::AbstractTheme()
	-{

	-}

	-AbstractTheme::~AbstractTheme()
	-{

	-}

	// StandardTheme

	#include "../darktheme/StandardStyle.h"

	-StandardTheme::StandardTheme()
	-{
	-}
	-
	QStyle *StandardTheme::newStyle()
	{
	return new StandardStyle();
	}

	QImage StandardTheme::graphColorMap()
	{
	QImage image;
	image.load(":/image/graphcolor.png");
	return image;
	}

	QPixmap StandardTheme::resource_clear_png()
	{
	return QPixmap(":/image/clear.png");
	}

	QPixmap StandardTheme::resource_maximize_png()
	{
	return QPixmap(":/image/maximize.png");
	}

	QPixmap StandardTheme::resource_menu_png()
	{
	return QPixmap(":/image/menu.png");
	}

	ThemePtr createStandardTheme()
	{
	AbstractTheme *p = new StandardTheme;
	p->text_editor_theme = TextEditorTheme::Light();

	p->dialog_header_frame_bg = Qt::white;
	p->diff_slider_normal_bg = Qt::white;
	p->diff_slider_unknown_bg = QColor(208, 208, 208);
	p->diff_slider_add_bg = QColor(64, 192, 64);
	p->diff_slider_del_bg = QColor(240, 64, 64);
	p->diff_slider_handle = Qt::black;

	return ThemePtr(p);
	}

	//#ifdef USE_DARK_THEME

	#include "darktheme/DarkStyle.h"

	// DarkTheme

	-DarkTheme::DarkTheme()
	-{
	-}
	+

	QStyle *DarkTheme::newStyle()
	{
	return new DarkStyle();
	}

	QImage DarkTheme::graphColorMap()
	{
	QImage image;
	image.load(":/darktheme/graphcolor.png");
	return image;
	}

	static QImage loadInvertedImage(QString const &path)
	{
	QImage img(path);
	int w = img.width();
	int h = img.height();
	for (int y = 0; y < h; y++) {
	QRgb p = (QRgb )img.scanLine(y);
	for (int x = 0; x < w; x++) {
	int r = qRed(*p);
	int g = qGreen(*p);
	int b = qBlue(*p);
	int a = qAlpha(*p);
	*p = qRgba(255 - r, 255 - g, 255 - b, a);
	p++;
	}
	}
	return img;
	}

	QPixmap DarkTheme::resource_clear_png()
	{
	QImage img = loadInvertedImage(":/image/clear.png");
	return QPixmap::fromImage(img);
	}

	QPixmap DarkTheme::resource_maximize_png()
	{
	QImage img = loadInvertedImage(":/image/maximize.png");
	return QPixmap::fromImage(img);
	}

	QPixmap DarkTheme::resource_menu_png()
	{
	QImage img = loadInvertedImage(":/image/menu.png");
	return QPixmap::fromImage(img);
	}

	ThemePtr createDarkTheme()
	{
	AbstractTheme *p = new DarkTheme;
	p->text_editor_theme = TextEditorTheme::Dark();

	p->dialog_header_frame_bg = QColor(32, 32, 32);
	p->diff_slider_normal_bg = QColor(48, 48, 48);
	p->diff_slider_unknown_bg = QColor(0, 0, 0);
	p->diff_slider_add_bg = QColor(0, 144, 0);
	p->diff_slider_del_bg = QColor(160, 0, 0);
	p->diff_slider_handle = QColor(255, 255, 255);

	return ThemePtr(p);
	}

	//#endif // USE_DAR_THEME
	diff --git a/src/Theme.h b/src/Theme.h
	index c2d60d6..5095c0b 100644
	--- a/src/Theme.h
	+++ b/src/Theme.h
	@@ -1,60 +1,60 @@
	#ifndef THEME_H
	#define THEME_H

	#include <QImage>
	#include <QPalette>
	#include <memory>
	#include "TextEditorTheme.h"

	class QStyle;

	class AbstractTheme {
	public:
	TextEditorThemePtr text_editor_theme;
	QColor dialog_header_frame_bg;
	QColor diff_slider_normal_bg;
	QColor diff_slider_unknown_bg;
	QColor diff_slider_add_bg;
	QColor diff_slider_del_bg;
	QColor diff_slider_handle;

	- AbstractTheme();
	- virtual ~AbstractTheme();
	+ AbstractTheme() = default;
	+ virtual ~AbstractTheme() = default;
	virtual QStyle *newStyle() = 0;
	virtual QImage graphColorMap() = 0;

	virtual QPixmap resource_clear_png() = 0;
	virtual QPixmap resource_maximize_png() = 0;
	virtual QPixmap resource_menu_png() = 0;
	};

	-typedef std::shared_ptr<AbstractTheme> ThemePtr;
	+using ThemePtr = std::shared_ptr<AbstractTheme>;

	class StandardTheme : public AbstractTheme {
	public:
	- StandardTheme();
	- QStyle *newStyle();
	- QImage graphColorMap();
	- QPixmap resource_clear_png();
	- QPixmap resource_maximize_png();
	- QPixmap resource_menu_png();
	+ StandardTheme() = default;
	+ QStyle *newStyle() override;
	+ QImage graphColorMap() override;
	+ QPixmap resource_clear_png() override;
	+ QPixmap resource_maximize_png() override;
	+ QPixmap resource_menu_png() override;
	};
	ThemePtr createStandardTheme();

	// #ifdef USE_DARK_THEME

	class DarkTheme : public AbstractTheme {
	public:
	- DarkTheme();
	- QStyle *newStyle();
	- QImage graphColorMap();
	- QPixmap resource_clear_png();
	- QPixmap resource_maximize_png();
	- QPixmap resource_menu_png();
	+ DarkTheme() = default;
	+ QStyle *newStyle() override;
	+ QImage graphColorMap() override;
	+ QPixmap resource_clear_png() override;
	+ QPixmap resource_maximize_png() override;
	+ QPixmap resource_menu_png() override;
	};
	ThemePtr createDarkTheme();

	// #endif


	#endif // THEME_H
	diff --git a/src/common/joinpath.cpp b/src/common/joinpath.cpp
	index e4b5cc5..9a91e0f 100644
	--- a/src/common/joinpath.cpp
	+++ b/src/common/joinpath.cpp
	@@ -1,67 +1,67 @@
	#include "common/joinpath.h"
	#include <sstream>
	#include <vector>
	-#include <string.h>
	+#include <cstring>

	#ifdef WIN32
	#pragma warning(disable:4996)
	#endif

	template <typename T> static inline void trimquot(T const begin, T const end)
	{
	if (begin + 1 < end && (begin)[0] == '"' && (end)[-1] == '"') {
	(*begin)++;
	(*end)--;
	}
	}

	template <typename T, typename U> void joinpath_(T const left, T const right, U *vec)
	{
	size_t llen = 0;
	size_t rlen = 0;
	if (left) {
	T const *leftend = left + std::char_traits<T>::length(left);
	trimquot(&left, &leftend);
	while (left < leftend && (leftend[-1] == '/' \|\| leftend[-1] == '\\')) {
	leftend--;
	}
	llen = leftend - left;
	}
	if (right) {
	T const *rightend = right + std::char_traits<T>::length(right);
	trimquot(&right, &rightend);
	while (right < rightend && (right[0] == '/' \|\| right[0] == '\\')) {
	right++;
	}
	rlen = rightend - right;
	}
	vec->resize(llen + 1 + rlen);
	if (llen > 0) {
	std::char_traits<T>::copy(&vec->at(0), left, llen);
	}
	vec->at(llen) = '/';
	if (rlen > 0) {
	std::char_traits<T>::copy(&vec->at(llen + 1), right, rlen);
	}
	}

	std::string joinpath(char const left, char const right)
	{
	std::vector<char> vec;
	joinpath_(left, right, &vec);
	return std::string(vec.begin(), vec.end());
	}

	std::string joinpath(std::string const &left, std::string const &right)
	{
	return joinpath(left.c_str(), right.c_str());
	}

	QString qjoinpath(ushort const left, ushort const right)
	{
	std::vector<ushort> vec;
	joinpath_(left, right, &vec);
	if (vec.empty()) return QString();
	return QString::fromUtf16(&vec[0], vec.size());
	}

	diff --git a/src/common/misc.cpp b/src/common/misc.cpp
	index c419815..29540fe 100644
	--- a/src/common/misc.cpp
	+++ b/src/common/misc.cpp
	@@ -1,463 +1,463 @@
	#include "common/misc.h"
	#include <QDebug>
	#include <QFileInfo>
	#include <QPainter>
	#include <QProcess>
	#include <QWidget>
	#include <QContextMenuEvent>
	#include <vector>
	#include "common/joinpath.h"
	#include "misc.h"

	QString misc::getApplicationDir()
	{
	QString path = QApplication::applicationFilePath();
	int i = path.lastIndexOf('\\');
	int j = path.lastIndexOf('/');
	if (i < j) i = j;
	if (i > 0) path = path.mid(0, i);
	return path;
	}

	-QStringList misc::splitLines(QByteArray const &ba, std::function<QString(char const *ptr, size_t len)> tos)
	+QStringList misc::splitLines(QByteArray const &ba, std::function<QString(char const *ptr, size_t len)> const &tos)
	{
	QStringList list;
	char const *begin = ba.data();
	char const *end = begin + ba.size();
	char const *ptr = begin;
	char const *left = ptr;
	while (1) {
	ushort c = 0;
	if (ptr < end) {
	c = *ptr;
	}
	if (c == '\n' \|\| c == '\r' \|\| c == 0) {
	list.push_back(tos(left, ptr - left));
	if (c == 0) break;
	if (c == '\n') {
	ptr++;
	} else if (c == '\r') {
	ptr++;
	if (ptr < end && *ptr == '\n') {
	ptr++;
	}
	}
	left = ptr;
	} else {
	ptr++;
	}
	}
	return list;
	}

	QStringList misc::splitLines(const QString &text)
	{
	QStringList list;
	ushort const *begin = text.utf16();
	ushort const *end = begin + text.size();
	ushort const *ptr = begin;
	ushort const *left = ptr;
	while (1) {
	ushort c = 0;
	if (ptr < end) {
	c = *ptr;
	}
	if (c == '\n' \|\| c == '\r' \|\| c == 0) {
	list.push_back(QString::fromUtf16(left, ptr - left));
	if (c == 0) break;
	if (c == '\n') {
	ptr++;
	} else if (c == '\r') {
	ptr++;
	if (ptr < end && *ptr == '\n') {
	ptr++;
	}
	}
	left = ptr;
	} else {
	ptr++;
	}
	}
	return list;
	}

	void misc::splitLines(char const begin, char const end, std::vector<std::string> *out, bool keep_newline)
	{
	char const *ptr = begin;
	char const *left = ptr;
	while (1) {
	char c = 0;
	if (ptr < end) {
	c = *ptr;
	}
	if (c == '\n' \|\| c == '\r' \|\| c == 0) {
	char const *right = ptr;
	if (c == '\n') {
	ptr++;
	} else if (c == '\r') {
	ptr++;
	if (ptr < end && *ptr == '\n') {
	ptr++;
	}
	}
	if (keep_newline) {
	right = ptr;
	}
	out->push_back(std::string(left, right - left));
	if (c == 0) break;
	left = ptr;
	} else {
	ptr++;
	}
	}
	}

	void misc::splitLines(std::string const &text, std::vector<std::string> *out, bool need_crlf)
	{
	char const *begin = text.c_str();
	char const *end = begin + text.size();
	splitLines(begin, end, out, need_crlf);
	}

	QStringList misc::splitWords(const QString &text)
	{
	QStringList list;
	ushort const *begin = text.utf16();
	ushort const *end = begin + text.size();
	ushort const *ptr = begin;
	ushort const *left = ptr;
	while (1) {
	ushort c = 0;
	if (ptr < end) {
	c = *ptr;
	}
	if (QChar::isSpace(c) \|\| c == 0) {
	if (left < ptr) {
	list.push_back(QString::fromUtf16(left, ptr - left));
	}
	if (c == 0) break;
	ptr++;
	left = ptr;
	} else {
	ptr++;
	}
	}
	return list;
	}

	QString misc::getFileName(QString const &path)
	{
	int i = path.lastIndexOf('/');
	int j = path.lastIndexOf('\\');
	if (i < j) i = j;
	if (i >= 0) {
	return path.mid(i + 1);
	}
	return path;
	}

	QString misc::makeDateTimeString(QDateTime const &dt)
	{
	if (dt.isValid()) {
	#if 0
	char tmp[100];
	sprintf(tmp, "%04u-%02u-%02u %02u:%02u:%02u"
	, dt.date().year()
	, dt.date().month()
	, dt.date().day()
	, dt.time().hour()
	, dt.time().minute()
	, dt.time().second()
	);
	return tmp;
	#elif 0
	QString s = dt.toLocalTime().toString(Qt::DefaultLocaleShortDate);
	return s;
	#else
	QString s = dt.toLocalTime().toString(Qt::ISODate);
	s.replace('T', ' ');
	return s;
	#endif
	}
	return QString();
	}

	bool misc::starts_with(const std::string &str, const std::string &with)
	{
	return strncmp(str.c_str(), with.c_str(), with.size()) == 0;
	}

	std::string misc::mid(const std::string &str, int start, int length)
	{
	int size = (int)str.size();
	if (length < 0) length = size;

	length += start;
	if (start < 0) start = 0;
	if (length < 0) length = 0;
	if (start > size) start = size;
	if (length > size) length = size;
	length -= start;

	return std::string(str.c_str() + start, length);
	}

	#ifdef _WIN32
	QString misc::normalizePathSeparator(QString const &str)
	{
	if (!str.isEmpty()) {
	ushort const *s = str.utf16();
	size_t n = str.size();
	std::vector<ushort> v;
	v.reserve(n);
	for (size_t i = 0; i < n; i++) {
	ushort c = s[i];
	if (c == '/') {
	c = '\\';
	}
	v.push_back(c);
	}
	ushort const *p = &v[0];
	return QString::fromUtf16(p, n);
	}
	return QString();
	}
	#else
	QString misc::normalizePathSeparator(QString const &s)
	{
	return s;
	}
	#endif

	QString misc::joinWithSlash(QString const &left, QString const &right)
	{
	if (!left.isEmpty() && !right.isEmpty()) {
	return joinpath(left, right);
	}
	return !left.isEmpty() ? left : right;
	}

	void misc::setFixedSize(QWidget *w)
	{
	Qt::WindowFlags flags = w->windowFlags();
	flags &= ~Qt::WindowContextHelpButtonHint;
	flags \|= Qt::MSWindowsFixedSizeDialogHint;
	w->setWindowFlags(flags);
	w->setFixedSize(w->size());
	}

	void misc::drawFrame(QPainter *pr, int x, int y, int w, int h, QColor color_topleft, QColor color_bottomright)
	{
	if (w < 3 \|\| h < 3) {
	if (w > 0 && h > 0) {
	pr->fillRect(x, y, w, h, color_topleft);
	}
	} else {
	if (!color_topleft.isValid()) color_topleft = Qt::black;
	if (!color_bottomright.isValid()) color_bottomright = color_topleft;
	pr->fillRect(x, y, w - 1, 1, color_topleft);
	pr->fillRect(x, y + 1, 1, h -1, color_topleft);
	pr->fillRect(x + w - 1, y, 1, h -1, color_bottomright);
	pr->fillRect(x + 1, y + h - 1, w - 1, 1, color_bottomright);
	}
	}

	void misc::dump(uint8_t const *ptr, size_t len)
	{
	if (ptr && len > 0) {
	size_t pos = 0;
	while (pos < len) {
	char tmp[100];
	char *dst = tmp;
	sprintf(dst, "%08llX ", ((unsigned long long)(pos)));
	dst += 9;
	for (int i = 0; i < 16; i++) {
	if (pos + i < len) {
	sprintf(dst, "%02X ", ptr[pos + i] & 0xff);
	} else {
	sprintf(dst, " ");
	}
	dst += 3;
	}
	for (int i = 0; i < 16; i++) {
	int c = ' ';
	if (pos < len) {
	c = ptr[pos] & 0xff;
	if (!isprint(c)) {
	c = '.';
	}
	pos++;
	}
	*dst = c;
	dst++;
	}
	*dst = 0;
	qDebug() << tmp;
	}
	}
	}

	void misc::dump(const QByteArray *in)
	{
	size_t len = 0;
	uint8_t const *ptr = nullptr;
	if (in) {
	len = in->size();
	if (len > 0) {
	ptr = (uint8_t const *)in->data();
	}
	}
	dump(ptr, len);
	}

	bool misc::isText(const QString &mimetype)
	{
	return mimetype.startsWith("text/");
	}

	bool misc::isSVG(const QString &mimetype)
	{
	if (mimetype == "image/svg") return true;
	if (mimetype == "image/svg+xml") return true;
	return false;
	}

	bool misc::isPSD(const QString &mimetype)
	{
	if (mimetype == "image/vnd.adobe.photoshop") return true;
	return false;
	}

	bool misc::isImage(const QString &mimetype)
	{
	#if 0
	if (mimetype == "image/jpeg") return true;
	if (mimetype == "image/jpg") return true;
	if (mimetype == "image/png") return true;
	if (mimetype == "image/gif") return true;
	if (mimetype == "image/bmp") return true;
	if (mimetype == "image/x-ms-bmp") return true;
	if (mimetype == "image/x-icon") return true;
	if (mimetype == "image/tiff") return true;
	if (isSVG(mimetype)) return true;
	if (isPSD(mimetype)) return true;
	return false;
	#else
	return mimetype.startsWith("image/");
	#endif
	}

	QString misc::abbrevBranchName(QString const &name)
	{
	QStringList sl = name.split('/');
	if (sl.size() == 1) return sl[0];
	QString newname;
	for (int i = 0; i < sl.size(); i++) {
	QString s = sl[i];
	if (i + 1 < sl.size()) {
	s = s.mid(0, 1);
	}
	if (i > 0) {
	newname += '/';
	}
	newname += s;
	}
	return newname;
	}

	-QString misc::determinFileType(const QString &filecommand, const QString &path, bool mime, std::function<void (const QString &, QByteArray *)> callback)
	+QString misc::determinFileType(const QString &filecommand, const QString &path, bool mime, std::function<void (const QString &, QByteArray *)> const &callback)
	{ // ファイルタイプを調べる
	if (QFileInfo(filecommand).isExecutable()) {
	- QString file = filecommand;
	+ QString const &file = filecommand;
	QString mgc;
	#ifdef Q_OS_WIN
	int i = file.lastIndexOf('/');
	int j = file.lastIndexOf('\\');
	if (i < j) i = j;
	if (i >= 0) {
	mgc = file.mid(0, i + 1) + "magic.mgc";
	if (QFileInfo(mgc).isReadable()) {
	// ok
	} else {
	mgc = QString();
	}
	}
	#endif
	QString cmd;
	if (mgc.isEmpty()) {
	cmd = "\"%1\"";
	cmd = cmd.arg(file);
	} else {
	cmd = "\"%1\" -m \"%2\"";
	cmd = cmd.arg(file).arg(mgc);
	cmd = cmd.replace('\\', '/');
	}
	if (mime) {
	cmd += " --mime";
	}
	cmd += " --brief ";
	if (path == "-") {
	cmd += path;
	} else {
	cmd += QString("\"%1\"").arg(path);
	}
	cmd = misc::normalizePathSeparator(cmd);

	// run file command

	QByteArray ba;

	callback(cmd, &ba);

	// parse file type

	if (!ba.isEmpty()) {
	QString s = QString::fromUtf8(ba).trimmed();
	QStringList list = s.split(';', QString::SkipEmptyParts);
	if (!list.isEmpty()) {
	QString mimetype = list[0].trimmed();
	return mimetype;
	}
	}

	} else {
	qDebug() << "No executable 'file' command";
	}
	return QString();
	}

	std::string misc::makeProxyServerURL(std::string text)
	{
	if (!text.empty() && !strstr(text.c_str(), "://")) {
	text = "http://" + text;
	if (text[text.size() - 1] != '/') {
	text += '/';
	}
	}
	return text;
	}

	QString misc::makeProxyServerURL(QString text)
	{
	if (!text.isEmpty() && text.indexOf("://") < 0) {
	text = "http://" + text;
	if (text[text.size() - 1] != '/') {
	text += '/';
	}
	}
	return text;
	}

	QPoint misc::contextMenuPos(QWidget w, QContextMenuEvent e)
	{
	if (e && e->reason() == QContextMenuEvent::Mouse) {
	return QCursor::pos() + QPoint(8, -8);
	}
	return w->mapToGlobal(QPoint(4, 4));
	}

	bool misc::isExecutable(const QString &cmd)
	{
	QFileInfo info(cmd);
	return info.isExecutable();
	}
	diff --git a/src/common/misc.h b/src/common/misc.h
	index 00196c5..d8ad3b6 100644
	--- a/src/common/misc.h
	+++ b/src/common/misc.h
	@@ -1,57 +1,57 @@
	#ifndef MISC_H
	#define MISC_H

	#include <QApplication>
	#include <QStringList>
	#include <QDateTime>
	#include <functional>
	#include <vector>
	-#include <stdint.h>
	+#include <cstdint>
	#include <QColor>

	class QContextMenuEvent;

	class misc {
	public:
	static QString getApplicationDir();
	- static QStringList splitLines(const QByteArray &text, std::function<QString(char const *ptr, size_t len)> tos);
	+ static QStringList splitLines(const QByteArray &text, std::function<QString(char const *ptr, size_t len)> const &tos);
	static QStringList splitLines(QString const &text);
	static void splitLines(const char begin, const char end, std::vector<std::string> *out, bool keep_newline);
	static void splitLines(const std::string &text, std::vector<std::string> *out, bool need_crlf);
	static QStringList splitWords(const QString &text);
	static QString getFileName(const QString &path);
	static QString makeDateTimeString(const QDateTime &dt);
	static bool starts_with(std::string const &str, std::string const &with);
	static std::string mid(std::string const &str, int start, int length = -1);
	static QString normalizePathSeparator(const QString &str);
	static QString joinWithSlash(const QString &left, const QString &right);
	static void setFixedSize(QWidget *w);
	static void drawFrame(QPainter *pr, int x, int y, int w, int h, QColor color_topleft, QColor color_bottomright = QColor());
	static void dump(const uint8_t *ptr, size_t len);
	static void dump(QByteArray const *in);
	static bool isText(const QString &mimetype);
	static bool isImage(const QString &mimetype);
	static bool isSVG(const QString &mimetype);
	static bool isPSD(const QString &mimetype);
	static QString abbrevBranchName(const QString &name);
	- static QString determinFileType(const QString &filecommand, const QString &path, bool mime, std::function<void (const QString &, QByteArray *)> callback);
	+ static QString determinFileType(const QString &filecommand, const QString &path, bool mime, std::function<void(const QString &, QByteArray *)> const &callback);
	static std::string makeProxyServerURL(std::string text);
	static QString makeProxyServerURL(QString text);
	static QPoint contextMenuPos(QWidget w, QContextMenuEvent e);
	static bool isExecutable(QString const &cmd);
	};

	class OverrideWaitCursor_ {
	public:
	OverrideWaitCursor_()
	{
	qApp->setOverrideCursor(Qt::WaitCursor);
	}
	~OverrideWaitCursor_()
	{
	qApp->restoreOverrideCursor();
	}
	};
	#define OverrideWaitCursor OverrideWaitCursor_ waitcursor_; (void)waitcursor_;

	#endif // MISC_H
	diff --git a/src/gunzip.cpp b/src/gunzip.cpp
	index b98156d..93f59cd 100644
	--- a/src/gunzip.cpp
	+++ b/src/gunzip.cpp
	@@ -1,228 +1,228 @@
	#include "gunzip.h"
	#include <zlib.h>
	#include <stdint.h>
	#include <QFile>

	void gunzip::set_header_only(bool f)
	{
	header_only = f;
	}

	void gunzip::set_maximul_size(int64_t size)
	{
	maxsize = size;
	}

	bool gunzip::decode(QIODevice input, QIODevice output)
	{
	error = QString();
	try {
	struct Header {
	uint8_t id1;
	uint8_t id2;
	uint8_t cm;
	uint8_t flg;
	uint8_t mtime[4];
	uint8_t xfl;
	uint8_t os;
	};
	enum {
	FTEXT = 0x01,
	FHCRC = 0x02,
	FEXTRA = 0x04,
	FNAME = 0x08,
	FCOMMENT = 0x10,
	};

	unsigned char ibuf[4096];
	bool ok = true;
	int n;

	n = input->read((char *)ibuf, sizeof(Header));
	if (n != 10) {
	throw QString("failed to read the header");
	}

	- Header h = (Header )ibuf;
	+ auto h = (Header )ibuf;

	if (h->id1 == 0x1f && h->id2 == 0x8b && h->cm == 8) {
	// ok
	if (header_only) {
	return true;
	}
	} else {
	throw QString("invalid input format");
	}

	auto ReadText = [&](){
	char c;
	std::vector<uint8_t> vec;
	while (1) {
	if (input->read(&c, 1) != 1) {
	break;
	}
	if (c == 0) break;
	vec.push_back((uint8_t)c);
	}
	std::string str;
	if (!vec.empty()) {
	str.assign((char const *)&vec[0], vec.size());
	}
	return str;
	};

	if (h->flg & FEXTRA) {
	n = input->read((char *)ibuf, 2);
	n = ((uint8_t)ibuf[1] << 8) \| (uint8_t)ibuf[0];
	input->seek(input->pos() + n);
	}
	if (h->flg & FNAME) {
	std::string name = ReadText();
	(void)name;
	}
	if (h->flg & FCOMMENT) {
	std::string comment = ReadText();
	(void)comment;
	}
	if (h->flg & FHCRC) {
	input->read((char *)ibuf, 2);
	}

	z_stream stream;
	uint32_t crc = 0;
	int err;

	- stream.zalloc = (alloc_func)0;
	- stream.zfree = (free_func)0;
	- stream.opaque = (voidpf)0;
	+ stream.zalloc = nullptr;
	+ stream.zfree = nullptr;
	+ stream.opaque = nullptr;

	stream.next_in = ibuf;
	stream.avail_in = 0;

	err = inflateInit2(&stream, -MAX_WBITS);

	if (err != Z_OK) {
	throw QString("inflateInit2 faled");
	}

	if (open) {
	if (!open(output)) {
	ok = false;
	}
	} else {
	if (!output->open(QIODevice::WriteOnly)) {
	ok = false;
	}
	}
	if (!ok) throw QString("failed to open the output device");

	int64_t inpos = input->pos();

	auto Close = [&](){
	if (close) {
	close(output);
	} else {
	output->close();
	}
	inflateEnd(&stream);
	};

	try {
	while (1) {
	if (stream.avail_in == 0) {
	stream.next_in = ibuf;
	}
	if (stream.avail_in < sizeof(ibuf)) {
	stream.next_in = ibuf + stream.avail_in;
	auto len = input->read((char *)stream.next_in, sizeof(ibuf) - stream.avail_in);
	stream.avail_in += len;
	}
	unsigned char obuf[65536];
	stream.next_out = obuf; /* discard the output */
	stream.avail_out = sizeof(obuf);
	if (maxsize != -1 && stream.total_out + stream.avail_out > (unsigned)maxsize && (unsigned)maxsize >= stream.total_out) {
	stream.avail_out = maxsize - stream.total_out;
	}
	uLong total_out = stream.total_out;
	err = ::inflate(&stream, Z_NO_FLUSH);
	int n = stream.total_out - total_out;

	if (write) {
	if (!write(output, (char const *)obuf, n)) {
	ok = false;
	}
	} else {
	int w = output->write((char const *)obuf, n);
	if (w != n) {
	ok = false;
	}
	}
	if (!ok) throw QString("failed to write to the output device");

	crc = crc32(crc, (unsigned char const *)obuf, n);
	if (err == Z_STREAM_END) {
	break;
	}
	if (err != Z_OK) {
	throw QString("inflate failed");
	}
	if (stream.total_out >= (unsigned)maxsize) {
	break;
	}
	}
	} catch (...) {
	Close();
	throw;
	}
	Close();

	input->seek(inpos + stream.total_in);
	n = input->read((char *)ibuf, 8);

	auto ReadU32LE = [](void const *p)->uint32_t{
	- uint8_t const q = (uint8_t const )p;
	+ auto const q = (uint8_t const )p;
	return (q[3] << 24) \| (q[2] << 16) \| (q[1] << 8) \| q[0];
	};

	auto c = ReadU32LE(ibuf);
	auto l = ReadU32LE(ibuf + 4);
	if (c != crc) throw QString("crc incorrect");
	if (l != stream.total_out) throw QString("length incorrect");

	return true;
	} catch (QString const &e) {
	error = e;
	}
	return false;
	}

	bool gunzip::decode(const QString &inpath, const QString &outpath)
	{
	QFile infile(inpath);
	QFile outfile(outpath);
	if (infile.open(QFile::ReadOnly)) {
	if (decode(&infile, &outfile)) {
	return true;
	}
	}
	return false;
	}

	bool gunzip::is_valid_gz_file(QIODevice *input)
	{
	gunzip z;
	z.set_header_only(true);
	return z.decode(input, nullptr);
	}

	bool gunzip::is_valid_gz_file(const QString &inpath)
	{
	QFile infile(inpath);
	if (infile.open(QFile::ReadOnly)) {
	gunzip z;
	if (z.is_valid_gz_file(&infile)) {
	return true;
	}
	}
	return false;
	}
	diff --git a/src/main.cpp b/src/main.cpp
	index 9092a6a..5df87a3 100644
	--- a/src/main.cpp
	+++ b/src/main.cpp
	@@ -1,144 +1,144 @@
	#include "MainWindow.h"
	#include <QApplication>
	#include "ApplicationGlobal.h"
	#include "MySettings.h"
	#include "main.h"
	#include <string>
	#include <QMessageBox>
	#include <QDir>
	#include <QDebug>
	#include <QProxyStyle>
	#include <QTranslator>
	#include "webclient.h"
	#include "win32/win32.h"
	#include "common/misc.h"
	#include "darktheme/DarkStyle.h"

	#include <QStandardPaths>
	#include "common/joinpath.h"

	-ApplicationGlobal *global = 0;
	+ApplicationGlobal *global = nullptr;

	ApplicationSettings ApplicationSettings::defaultSettings()
	{
	ApplicationSettings s;
	s.proxy_server = "http://squid:3128/";
	return s;
	}

	static bool isHighDpiScalingEnabled()
	{
	MySettings s;
	s.beginGroup("UI");
	QVariant v = s.value("EnableHighDpiScaling");
	return v.isNull() \|\| v.toBool();
	}

	int main(int argc, char *argv[])
	{
	putenv((char *)"UNICODEMAP_JP=cp932");

	ApplicationGlobal g;
	global = &g;

	global->organization_name = ORGANIZATION_NAME;
	global->application_name = APPLICATION_NAME;
	global->generic_config_dir = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation);
	global->app_config_dir = global->generic_config_dir / global->organization_name / global->application_name;
	global->config_file_path = joinpath(global->app_config_dir, global->application_name + ".ini");
	if (!QFileInfo(global->app_config_dir).isDir()) {
	QDir().mkpath(global->app_config_dir);
	}

	if (isHighDpiScalingEnabled()){
	#if (QT_VERSION < QT_VERSION_CHECK(5, 6, 0))
	qDebug() << "High DPI scaling is not supported";
	#else
	QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
	#endif
	}

	QApplication a(argc, argv);
	- a.setOrganizationName(global->organization_name);
	- a.setApplicationName(global->application_name);
	+ QApplication::setOrganizationName(global->organization_name);
	+ QApplication::setApplicationName(global->application_name);

	{
	MySettings s;
	s.beginGroup("UI");
	global->language_id = s.value("Language").toString();
	global->theme_id = s.value("Theme").toString();
	if (global->theme_id.compare("dark", Qt::CaseInsensitive) == 0) {
	global->theme = createDarkTheme();
	} else {
	global->theme = createStandardTheme();
	}
	s.endGroup();
	}

	QApplication::setStyle(global->theme->newStyle());

	if (QApplication::queryKeyboardModifiers() & Qt::ShiftModifier) {
	global->start_with_shift_key = true;
	}

	WebClient::initialize();

	bool f_open_here = false;

	QStringList args;

	for (int i = 1; i < argc; i++) {
	std::string arg = argv[i];
	if (arg[0] == '-') {
	if (arg == "--open-here") {
	f_open_here = true;
	}
	} else {
	args.push_back(QString::fromStdString(arg));
	}
	}

	if (global->app_config_dir.isEmpty()) {
	- QMessageBox::warning(0, qApp->applicationName(), "Preparation of data storage folder failed.");
	+ QMessageBox::warning(nullptr, qApp->applicationName(), "Preparation of data storage folder failed.");
	return 1;
	}

	QTranslator translator;
	{
	if (global->language_id.isEmpty() \|\| global->language_id == "en") {
	// thru
	} else {
	#if defined(Q_OS_MACX)
	QString path = "../Resources/Guitar_" + global->language_id;
	#else
	QString path = "Guitar_" + global->language_id;
	#endif
	- translator.load(path, a.applicationDirPath());
	- a.installTranslator(&translator);
	+ translator.load(path, QApplication::applicationDirPath());
	+ QApplication::installTranslator(&translator);
	}
	}

	MainWindow w;
	global->panel_bg_color = w.palette().color(QPalette::Background);
	w.setWindowIcon(QIcon(":/image/guitar.png"));
	w.show();
	w.shown();

	if (f_open_here) {
	QString dir = QDir::current().absolutePath();
	w.autoOpenRepository(dir);
	} else if (args.size() == 1) {
	QString dir = args[0] / QString();
	if (dir.startsWith("./") \|\| dir.startsWith(".\\")) {
	dir = QDir::current().absolutePath() / dir.mid(2);
	}
	QFileInfo fi(dir);
	if (fi.isDir()) {
	dir = fi.absolutePath();
	w.autoOpenRepository(dir);
	}
	}

	- return a.exec();
	+ return QApplication::exec();
	}

	diff --git a/src/texteditor/AbstractCharacterBasedApplication.cpp b/src/texteditor/AbstractCharacterBasedApplication.cpp
	index c12c671..703e705 100644
	--- a/src/texteditor/AbstractCharacterBasedApplication.cpp
	+++ b/src/texteditor/AbstractCharacterBasedApplication.cpp
	@@ -1,2579 +1,2585 @@
	+#include <memory>
	+
	+#include <memory>
	+
	+
	#include "AbstractCharacterBasedApplication.h"
	#include "UnicodeWidth.h"
	#include "unicode.h"

	#include <QApplication>
	#include <QClipboard>
	#include <QDebug>
	#include <QFile>
	#include <QTextCodec>
	-#include "unicode.h"
	+#include <memory>

	using WriteMode = AbstractCharacterBasedApplication::WriteMode;
	using FormattedLine = AbstractCharacterBasedApplication::FormattedLine;

	class EsccapeSequence {
	private:
	int offset = 0;
	unsigned char data[100];
	int color_fg = -1;
	int color_bg = -1;
	public:
	bool isActive() const
	{
	return offset > 0;
	}
	void write(char c)
	{
	if (c == 0x1b) {
	data[0] = c;
	offset = 1;
	return;
	}
	data[offset] = c;
	if (offset > 0) {
	if (c == 'm') {
	if (data[1] == '[' && isdigit(data[2]) && isdigit(data[3])) {
	data[offset] = 0;
	if (data[2] == '3') {
	color_fg = atoi((char const *)data + 3);
	if (color_fg == 9) {
	color_fg = -1;
	}
	}
	if (data[2] == '4') {
	color_bg = atoi((char const *)data + 3);
	if (color_bg == 9) {
	color_bg = -1;
	}
	}
	}
	offset = 0;
	return;
	}
	if (offset + 1 < (int)sizeof(data)) {
	offset++;
	}
	}
	}
	int fg_color_code() const
	{
	return color_fg == 9 ? -1 : color_fg;
	}
	int bg_color_code() const
	{
	return color_bg == 9 ? -1 : color_bg;
	}
	};

	struct AbstractCharacterBasedApplication::Private {
	bool is_changed = false;
	bool is_quit_enabled = false;
	bool is_open_enabled = false;
	bool is_save_enabled = false;
	bool is_toggle_selection_anchor_enabled = true;
	bool is_read_only = false;
	bool is_terminal_mode = false;
	bool is_cursor_visible = true;
	State state = State::Normal;
	int header_line = 1;
	int footer_line = 1;
	int screen_width = 80;
	int screen_height = 24;
	bool auto_layout = false;
	QString recently_used_path;
	bool show_line_number = true;
	int left_margin = AbstractCharacterBasedApplication::LEFT_MARGIN;
	QString dialog_title;
	QString dialog_value;
	std::vector<Character> screen;
	std::vector<uint8_t> line_flags;
	int parsed_row_index = -1;
	int parsed_col_index = -1;
	bool parsed_for_edit = false;
	QByteArray parsed_line;
	std::vector<uint32_t> prepared_current_line;
	QList<Document::CharAttr_> syntax_table;
	bool dialog_mode = false;
	DialogHandler dialog_handler;
	bool is_painting_suppressed = false;
	int valid_line_index = -1;
	int line_margin = 3;
	WriteMode write_mode = WriteMode::Insert;
	QTextCodec *text_codec = nullptr;
	Qt::KeyboardModifiers keyboard_modifiers = Qt::KeyboardModifier::NoModifier;
	bool ctrl_modifier = false;
	bool shift_modifier = false;
	EsccapeSequence escape_sequence;

	bool cursor_moved_by_mouse = false;
	};

	AbstractCharacterBasedApplication::AbstractCharacterBasedApplication()
	: m(new Private)
	{
	}

	AbstractCharacterBasedApplication::~AbstractCharacterBasedApplication()
	{
	delete m;
	}

	void AbstractCharacterBasedApplication::setModifierKeys(Qt::KeyboardModifiers keymod)
	{
	m->keyboard_modifiers = keymod;
	m->ctrl_modifier = m->keyboard_modifiers & Qt::ControlModifier;
	m->shift_modifier = m->keyboard_modifiers & Qt::ShiftModifier;
	}

	void AbstractCharacterBasedApplication::clearShiftModifier()
	{
	m->shift_modifier = false;
	}

	bool AbstractCharacterBasedApplication::isControlModifierPressed() const
	{
	return m->ctrl_modifier;
	}

	bool AbstractCharacterBasedApplication::isShiftModifierPressed() const
	{
	return m->shift_modifier;
	}

	void AbstractCharacterBasedApplication::setTextCodec(QTextCodec *codec)
	{
	m->text_codec = codec;
	clearParsedLine();
	invalidateArea();
	makeBuffer();
	}

	void AbstractCharacterBasedApplication::setAutoLayout(bool f)
	{
	m->auto_layout = f;
	layoutEditor();
	}

	void AbstractCharacterBasedApplication::showHeader(bool f)
	{
	m->header_line = f ? 1 : 0;
	layoutEditor();
	}

	void AbstractCharacterBasedApplication::showFooter(bool f)
	{
	m->footer_line = f ? 1 : 0;
	layoutEditor();
	}

	void AbstractCharacterBasedApplication::showLineNumber(bool show, int left_margin)
	{
	m->show_line_number = show;
	m->left_margin = left_margin;
	}

	void AbstractCharacterBasedApplication::setCursorVisible(bool show)
	{
	m->is_cursor_visible = show;
	}

	bool AbstractCharacterBasedApplication::isCursorVisible()
	{
	return m->is_cursor_visible;
	}

	void AbstractCharacterBasedApplication::retrieveLastText(std::vector<char> *out, int maxlen) const
	{
	const_cast<AbstractCharacterBasedApplication *>(this)->document()->retrieveLastText(out, maxlen);
	}

	bool AbstractCharacterBasedApplication::isChanged() const
	{
	return m->is_changed;
	}

	void AbstractCharacterBasedApplication::setChanged(bool f)
	{
	m->is_changed = f;
	}

	int AbstractCharacterBasedApplication::leftMargin_() const
	{
	return m->left_margin;
	}

	void AbstractCharacterBasedApplication::setRecentlyUsedPath(QString const &path)
	{
	m->recently_used_path = path;
	}

	QString AbstractCharacterBasedApplication::recentlyUsedPath()
	{
	return m->recently_used_path;
	}

	std::vector<AbstractCharacterBasedApplication::Character> *AbstractCharacterBasedApplication::screen()
	{
	return &m->screen;
	}

	const std::vector<AbstractCharacterBasedApplication::Character> *AbstractCharacterBasedApplication::screen() const
	{
	return &m->screen;
	}

	std::vector<uint8_t> *AbstractCharacterBasedApplication::line_flags()
	{
	return &m->line_flags;
	}

	void AbstractCharacterBasedApplication::makeBuffer()
	{
	int w = screenWidth();
	int h = screenHeight();
	int size = w * h;
	m->screen.resize(size);
	std::fill(m->screen.begin(), m->screen.end(), Character());
	m->line_flags.resize(h);
	}

	void AbstractCharacterBasedApplication::layoutEditor()
	{
	makeBuffer();
	editor_cx->viewport_org_x = leftMargin_();
	editor_cx->viewport_org_y = m->header_line;
	editor_cx->viewport_width = screenWidth() - cx()->viewport_org_x;
	editor_cx->viewport_height = screenHeight() - (m->header_line + m->footer_line);
	}

	void AbstractCharacterBasedApplication::initEditor()
	{
	- editor_cx = std::shared_ptr<TextEditorContext>(new TextEditorContext());
	+ editor_cx = std::make_shared<TextEditorContext>();
	layoutEditor();
	}

	bool AbstractCharacterBasedApplication::isLineNumberVisible() const
	{
	return m->show_line_number;
	}

	int AbstractCharacterBasedApplication::charWidth(uint32_t c)
	{
	return UnicodeWidth::width(UnicodeWidth::type(c));
	}

	QList<FormattedLine> AbstractCharacterBasedApplication::formatLine(Document::Line const &line, int tab_span, int anchor_a, int anchor_b) const
	{
	QByteArray ba;
	if (m->text_codec) {
	ba = m->text_codec->toUnicode(line.text).toUtf8();
	} else {
	ba = line.text;
	}

	std::vector<ushort> vec;
	vec.reserve(ba.size() + 100);
	size_t len = ba.size();
	QList<FormattedLine> res;

	int col = 0;
	int col_start = col;

	bool flag_a = false;
	bool flag_b = false;

	auto Color = [&](size_t offset, size_t *next_offset){
	int i = findSyntax(&m->syntax_table, offset);
	if (i < m->syntax_table.size() && m->syntax_table[i].offset <= offset) {
	if (next_offset) {
	if (i + 1 < m->syntax_table.size()) {
	*next_offset = m->syntax_table[i + 1].offset;
	} else {
	*next_offset = -1;
	}
	}
	static int color[] = {
	0x000000,
	0x0000ff,
	0x00ff00,
	0x00ffff,
	0xff0000,
	0xff00ff,
	0xffff00,
	0xffffff,
	};
	i = m->syntax_table[i].color;
	if (i >= 0 && i < 8) {
	return color[i];
	}
	}
	if (next_offset) {
	*next_offset = -1;
	}
	return 0;
	};


	auto Flush = [&](size_t offset, size_t *next_offset){
	if (!vec.empty()) {
	int atts = 0;
	atts \|= Color(offset, next_offset);
	if (anchor_a >= 0 \|\| anchor_b >= 0) {
	if ((anchor_a < 0 \|\| col_start >= anchor_a) && (anchor_b == -1 \|\| col_start < anchor_b)) {
	atts \|= FormattedLine::Selected;
	}
	}
	ushort const *left = &vec[0];
	ushort const *right = left + vec.size();
	while (left < right && (right[-1] == '\r' \|\| right[-1] == '\n')) right--;
	if (left < right) {
	res.push_back(FormattedLine(QString::fromUtf16(left, right - left), atts));
	}
	vec.clear();
	} else {
	*next_offset = -1;
	}
	col_start = col;
	};

	size_t offset = 0;
	size_t next_offset = -1;
	if (len > 0) {
	{
	size_t o = line.byte_offset;
	int i = findSyntax(&m->syntax_table, o);
	if (i < m->syntax_table.size() && m->syntax_table[i].offset <= o) {
	if (i + 1 < m->syntax_table.size()) {
	o = m->syntax_table[i + 1].offset;
	if (o != (size_t)-1) {
	next_offset = o;
	}
	}
	}
	}
	utf8 u8(ba.data(), len);
	u8.to_utf32([&](uint32_t c){
	if (line.byte_offset + u8.offset() == next_offset) {
	Flush(line.byte_offset + offset, &next_offset);
	offset += u8.offset();
	}
	if (c == '\t') {
	do {
	vec.push_back(' ');
	col++;
	} while (col % tab_span != 0);
	} else if (c < ' ') {
	// nop
	} else {
	int cw = charWidth(c);
	if (c < 0xffff) {
	vec.push_back(c);
	} else {
	int a = c >> 16;
	if (a > 0 && a <= 0x20) {
	a--;
	int b = c & 0x03ff;
	a = (a << 6) \| ((c >> 10) & 0x003f);
	a \|= 0xd800;
	b \|= 0xdc00;
	vec.push_back(a);
	vec.push_back(b);
	}
	}
	col += cw;
	}
	if ((anchor_a >= 0 \|\| anchor_b >= 0) && anchor_a != anchor_b) {
	if (!flag_a && col >= anchor_a) {
	Flush(line.byte_offset + offset, &next_offset);
	flag_a = true;
	}
	if (!flag_b && col >= anchor_b) {
	Flush(line.byte_offset + offset, &next_offset);
	flag_b = true;
	}
	}
	return true;
	});
	}
	Flush(line.byte_offset + offset, &next_offset);
	return res;
	}

	void AbstractCharacterBasedApplication::fetchCurrentLine() const
	{
	QByteArray line;
	const int row = cx()->current_row;
	int lines = documentLines();
	if (row >= 0 && row < lines) {
	line = cx()->engine->document.lines[row].text;
	}
	m->parsed_row_index = row;
	m->parsed_line = line;
	}

	void AbstractCharacterBasedApplication::clearParsedLine()
	{
	m->parsed_row_index = -1;
	m->parsed_for_edit = false;
	m->parsed_line.clear();
	}

	int AbstractCharacterBasedApplication::cursorX() const
	{
	return cx()->current_col - cx()->scroll_col_pos;
	}

	int AbstractCharacterBasedApplication::cursorY() const
	{
	return cx()->current_row - cx()->scroll_row_pos;
	}

	int AbstractCharacterBasedApplication::screenWidth() const
	{
	return m->screen_width;
	}

	int AbstractCharacterBasedApplication::screenHeight() const
	{
	return m->screen_height;
	}

	void AbstractCharacterBasedApplication::setScreenSize(int w, int h, bool update_layout)
	{
	m->screen_width = w;
	m->screen_height = h;
	if (update_layout) {
	layoutEditor();
	}
	}

	bool AbstractCharacterBasedApplication::isPaintingSuppressed() const
	{
	return m->is_painting_suppressed;
	}

	void AbstractCharacterBasedApplication::setPaintingSuppressed(bool f)
	{
	m->is_painting_suppressed = f;
	}

	void AbstractCharacterBasedApplication::commitLine(std::vector<uint32_t> const &vec)
	{
	if (isReadOnly()) return;

	QByteArray ba;
	if (!vec.empty()){
	utf32 u32(&vec[0], vec.size());
	u32.to_utf8([&](char c, int pos){
	(void)pos;
	ba.push_back(c);
	return true;
	});
	}
	if (m->parsed_row_index == 0 && engine()->document.lines.empty()) {
	Document::Line newline;
	engine()->document.lines.push_back(newline);
	}
	Document::Line *line = &engine()->document.lines[m->parsed_row_index];
	if (m->parsed_row_index == 0) {
	line->byte_offset = 0;
	line->line_number = (line->type == Document::Line::Unknown) ? 0 : 1;
	}
	line->text = ba;

	if (m->valid_line_index > m->parsed_row_index) {
	m->valid_line_index = m->parsed_row_index;
	}

	int y = m->parsed_row_index - cx()->scroll_row_pos + cx()->viewport_org_y;
	if (y >= 0 && y < (int)m->line_flags.size()) {
	m->line_flags[y] \|= LineChanged;
	}
	}

	void AbstractCharacterBasedApplication::parseLine(std::vector<uint32_t> *vec, int increase_hint, bool force)
	{
	if (force) {
	clearParsedLine();
	}

	if (force \|\| !m->parsed_for_edit) {
	fetchCurrentLine();
	m->parsed_col_index = internalParseLine(vec ? vec : &m->prepared_current_line, increase_hint);
	m->parsed_for_edit = true;
	} else {
	if (vec) {
	*vec = m->prepared_current_line;
	}
	}
	}

	QByteArray AbstractCharacterBasedApplication::parsedLine() const
	{
	return m->parsed_line;
	}

	bool AbstractCharacterBasedApplication::isCurrentLineWritable() const
	{
	if (isReadOnly()) return false;

	int row = cx()->current_row;
	if (row >= 0 && row < cx()->engine->document.lines.size()) {
	if (cx()->engine->document.lines[row].type != Document::Line::Unknown) {
	return true;
	}
	}
	return false;
	}

	int AbstractCharacterBasedApplication::editorViewportWidth() const
	{
	return cx()->viewport_width;
	}

	int AbstractCharacterBasedApplication::editorViewportHeight() const
	{
	return cx()->viewport_height;
	}

	int AbstractCharacterBasedApplication::print(int x, int y, const QString &text, const AbstractCharacterBasedApplication::Option &opt)
	{
	CharAttr attr = opt.char_attr;
	if (opt.char_attr.flags & CharAttr::Selected) {
	attr.index = CharAttr::Invert;
	}
	if (opt.char_attr.flags & CharAttr::CurrentLine) {
	attr.index = CharAttr::Hilite;
	}

	const int screen_w = screenWidth();
	const int screen_h = screenHeight();
	int x_start = 0;
	int y_start = 0;
	int x_limit = screen_w;
	int y_limit = screen_h;
	if (!opt.clip.isNull()) {
	x_start = opt.clip.x();
	y_start = opt.clip.y();
	x_limit = x_start + opt.clip.width();
	y_limit = y_start + opt.clip.height();
	}
	if (y >= y_start && y < y_limit) {
	bool changed = false;
	int x2 = x;
	int y2 = y;
	if (text.isEmpty()) {
	changed = true; // set changed flag if text is empty
	} else {
	for (int i = 0; i < text.size(); i++) {
	ushort c = text.utf16()[i];
	if (c < ' ' \|\| c == 0x7f) continue;
	int cw = charWidth(c);
	if (x2 + cw > x_limit) {
	break;
	}
	for (int j = 0; j < cw; j++) {
	if (x2 >= x_start && x2 < screen_w) {
	int o = y2 * screen_w + x2;
	CharAttr a;
	if (j == 0) {
	a = attr;
	} else {
	c = -1;
	}
	if (c != m->screen[o].c \|\| a != m->screen[o].a) {
	m->screen[o].c = c;
	m->screen[o].a = a;
	changed = true;
	}
	}
	x2++;
	}
	}
	}
	if (changed) {
	m->line_flags[y] \|= LineChanged;
	}
	x = x2;
	}
	return x;
	}

	-void AbstractCharacterBasedApplication::initEngine(std::shared_ptr<TextEditorContext> cx)
	+void AbstractCharacterBasedApplication::initEngine(std::shared_ptr<TextEditorContext> const &cx)
	{
	- cx->engine = TextEditorEnginePtr(new TextEditorEngine);
	+ cx->engine = std::make_shared<TextEditorEngine>();
	}

	TextEditorContext *AbstractCharacterBasedApplication::cx()
	{
	if (dialog_cx) {
	if (!dialog_cx->engine) {
	initEngine(dialog_cx);
	}
	return dialog_cx.get();
	}
	if (!editor_cx->engine) {
	initEngine(editor_cx);
	}
	return editor_cx.get();
	}

	const TextEditorContext *AbstractCharacterBasedApplication::cx() const
	{
	return const_cast<AbstractCharacterBasedApplication *>(this)->cx();
	}

	TextEditorEnginePtr AbstractCharacterBasedApplication::engine()
	{
	Q_ASSERT(cx()->engine);
	return cx()->engine;
	}

	-void AbstractCharacterBasedApplication::setTextEditorEngine(TextEditorEnginePtr e)
	+void AbstractCharacterBasedApplication::setTextEditorEngine(TextEditorEnginePtr const &e)
	{
	cx()->engine = e;
	}

	void AbstractCharacterBasedApplication::setDocument(QList<Document::Line> const *source)
	{
	document()->lines = *source;
	}

	void AbstractCharacterBasedApplication::openFile(const QString &path)
	{
	document()->lines.clear();
	QFile file(path);
	if (file.open(QFile::ReadOnly)) {
	size_t offset = 0;
	QString line;
	unsigned int linenum = 0;
	while (!file.atEnd()) {
	linenum++;
	Document::Line line(file.readLine());
	line.byte_offset = offset;
	line.type = Document::Line::Normal;
	line.line_number = linenum;
	document()->lines.push_back(line);
	offset += line.text.size();
	}
	int n = line.size();
	if (n > 0) {
	ushort const *p = line.utf16();
	ushort c = p[n - 1];
	if (c == '\r' \|\| c == '\n') {
	document()->lines.push_back(Document::Line(QByteArray()));
	}
	}
	m->valid_line_index = (int)document()->lines.size();
	setRecentlyUsedPath(path);
	}
	scrollToTop();
	}

	void AbstractCharacterBasedApplication::saveFile(const QString &path)
	{
	QFile file(path);
	if (file.open(QFile::WriteOnly)) {
	for (Document::Line const &line : document()->lines) {
	file.write(line.text);
	}
	}
	}

	void AbstractCharacterBasedApplication::pressEnter()
	{
	deleteIfSelected();

	if (isDialogMode()) {
	closeDialog(true);
	} else {
	writeNewLine();
	}
	}

	void AbstractCharacterBasedApplication::pressEscape()
	{
	if (isTerminalMode()) {
	m->escape_sequence.write(0x1b);
	return;
	}

	if (isDialogMode()) {
	closeDialog(false);
	return;
	}

	deselect();
	updateVisibility(false, false, false);
	}

	AbstractCharacterBasedApplication::State AbstractCharacterBasedApplication::state() const
	{
	return m->state;
	}

	Document *AbstractCharacterBasedApplication::document()
	{
	return &engine()->document;
	}

	int AbstractCharacterBasedApplication::documentLines() const
	{
	return const_cast<AbstractCharacterBasedApplication *>(this)->document()->lines.size();
	}

	bool AbstractCharacterBasedApplication::isSingleLineMode() const
	{
	return cx()->single_line;
	}

	void AbstractCharacterBasedApplication::setLineMargin(int n)
	{
	m->line_margin = n;
	}

	void AbstractCharacterBasedApplication::ensureCurrentLineVisible()
	{
	int margin = (cx()->viewport_height >= 6 && !isSingleLineMode()) ? m->line_margin : 0;
	int pos = cx()->scroll_row_pos;
	int top = cx()->current_row - margin;
	int bottom = cx()->current_row + 1 - editorViewportHeight() + margin;
	if (pos > top) pos = top;
	if (pos < bottom) pos = bottom;
	if (pos < 0) pos = 0;
	if (cx()->scroll_row_pos != pos) {
	cx()->scroll_row_pos = pos;
	invalidateArea();
	}
	}

	int AbstractCharacterBasedApplication::decideColumnScrollPos() const
	{
	int x = cx()->current_col;
	int w = editorViewportWidth() - RIGHT_MARGIN;
	if (w < 0) w = 0;
	return x > w ? (cx()->current_col - w) : 0;
	}

	int AbstractCharacterBasedApplication::calcVisualWidth(const Document::Line &line) const
	{
	QList<FormattedLine> lines = formatLine(line, cx()->tab_span);
	int x = 0;
	for (FormattedLine const &line : lines) {
	if (line.text.isEmpty()) continue;
	ushort const *ptr = line.text.utf16();
	ushort const *end = ptr + line.text.size();
	while (1) {
	int c = -1;
	if (ptr < end) {
	c = *ptr;
	ptr++;
	}
	if (c == -1 \|\| c == '\r' \|\| c == '\n') {
	break;
	}
	if (c == '\t') {
	x += cx()->tab_span;
	x -= x % cx()->tab_span;
	} else {
	x += charWidth(c);
	}
	}
	}
	return x;
	}



	void AbstractCharacterBasedApplication::clearRect(int x, int y, int w, int h)
	{
	int scr_w = screenWidth();
	int scr_h = screenHeight();
	int y0 = y;
	int y1 = y + h;
	if (y0 < 0) y0 = 0;
	if (y1 > scr_h) y1 = scr_h;
	int x0 = x;
	int x1 = x + w;
	if (x0 < 0) x0 = 0;
	if (x1 > scr_w) x1 = scr_w;
	for (int y = y0; y < y1; y++) {
	for (int x = x0; x < x1; x++) {
	int o = y * scr_w + x;
	m->screen[o] = Character();
	}
	}
	}

	int AbstractCharacterBasedApplication::calcIndexToColumn(const std::vector<uint32_t> &vec, int index) const
	{
	int col = 0;
	for (int i = 0; i < index; i++) {
	uint32_t c = vec.at(i);
	if (c == '\t') {
	col += cx()->tab_span;
	col -= col % cx()->tab_span;
	} else {
	col += charWidth(c);
	}
	}
	return col;
	}

	void AbstractCharacterBasedApplication::savePos()
	{
	TextEditorContext *p = editor_cx.get();
	if (p) {
	p->saved_row = p->current_row;
	p->saved_col = p->current_col;
	p->saved_col_hint = p->current_col_hint;
	}
	}

	void AbstractCharacterBasedApplication::restorePos()
	{
	TextEditorContext *p = editor_cx.get();
	if (p) {
	p->current_row = p->saved_row;
	p->current_col = p->saved_col;
	p->current_col_hint = p->saved_col_hint;
	}
	}

	void AbstractCharacterBasedApplication::setCursorRow(int row, bool auto_scroll, bool by_mouse)
	{
	if (cx()->current_row == row) return;

	if (isShiftModifierPressed()) {
	if (selection_anchor_0.enabled == SelectionAnchor::No) {
	setSelectionAnchor(SelectionAnchor::EnabledEasy, true, auto_scroll);
	selection_anchor_1 = selection_anchor_0;
	}
	} else if (selection_anchor_0.enabled == SelectionAnchor::EnabledEasy) {
	setSelectionAnchor(SelectionAnchor::No, false, auto_scroll);
	}

	cx()->current_row = row;

	if (selection_anchor_0.enabled != SelectionAnchor::No) {
	setSelectionAnchor(selection_anchor_0.enabled, true, auto_scroll);
	}

	m->cursor_moved_by_mouse = by_mouse;

	}

	void AbstractCharacterBasedApplication::setCursorCol(int col, bool auto_scroll, bool by_mouse)
	{
	if (cx()->current_col == col) {
	cx()->current_col_hint = col;
	return;
	}

	if (isShiftModifierPressed()) {
	if (selection_anchor_0.enabled == SelectionAnchor::No) {
	setSelectionAnchor(SelectionAnchor::EnabledEasy, true, auto_scroll);
	selection_anchor_1 = selection_anchor_0;
	}
	} else if (selection_anchor_0.enabled == SelectionAnchor::EnabledEasy) {
	setSelectionAnchor(SelectionAnchor::No, false, auto_scroll);
	}

	cx()->current_col = col;
	cx()->current_col_hint = col;

	if (selection_anchor_0.enabled != SelectionAnchor::No) {
	setSelectionAnchor(selection_anchor_0.enabled, true, auto_scroll);
	}

	m->cursor_moved_by_mouse = by_mouse;
	}

	void AbstractCharacterBasedApplication::setCursorPos(int row, int col)
	{
	setCursorRow(row, false);
	setCursorCol(col, false);
	}

	void AbstractCharacterBasedApplication::setCursorColByIndex(std::vector<uint32_t> const &vec, int col_index)
	{
	int col = calcIndexToColumn(vec, col_index);
	setCursorCol(col);
	}

	int AbstractCharacterBasedApplication::nextTabStop(int x) const
	{
	x += cx()->tab_span;
	x -= x % cx()->tab_span;
	return x;
	}

	void AbstractCharacterBasedApplication::editSelected(EditOperation op, std::vector<uint32_t> *cutbuffer)
	{
	if (isReadOnly() && op == EditOperation::Cut) {
	op = EditOperation::Copy;
	}

	SelectionAnchor a = selection_anchor_0;
	SelectionAnchor b = selection_anchor_1;
	if (!a.enabled) return;
	if (!b.enabled) return;
	if (a == b) return;

	auto UpdateVisibility = [&](){
	updateVisibility(false, false, false);
	};

	if (cutbuffer) {
	cutbuffer->clear();
	}
	std::list<std::vector<uint32_t>> cutlist;

	if (a.row > b.row) {
	std::swap(a, b);
	} else if (a.row == b.row) {
	if (a.col > b.col) {
	std::swap(a, b);
	}
	}

	int curr_row = cx()->current_row;
	int curr_col = cx()->current_col;

	cx()->current_row = b.row;
	cx()->current_col = b.col;

	if (a.row == b.row) {
	std::vector<uint32_t> vec1;
	parseLine(&vec1, 0, true);
	auto begin = vec1.begin() + calcColumnToIndex(a.col);
	auto end = vec1.begin() + calcColumnToIndex(b.col);
	if (cutbuffer) {
	std::vector<uint32_t> cut;
	cut.insert(cut.end(), begin, end);
	cutlist.push_back(std::move(cut));
	}
	if (op == EditOperation::Cut) {
	vec1.erase(begin, end);
	commitLine(vec1);
	UpdateVisibility();
	}
	} else {
	std::vector<uint32_t> vec1;
	parseLine(&vec1, 0, true);
	{
	auto begin = vec1.begin();
	auto end = vec1.begin() + calcColumnToIndex(b.col);
	if (cutbuffer) {
	std::vector<uint32_t> cut;
	cut.insert(cut.end(), begin, end);
	cutlist.push_back(std::move(cut));
	}
	if (op == EditOperation::Cut) {
	vec1.erase(begin, end);
	commitLine(vec1);
	UpdateVisibility();
	}
	}
	int n = b.row - a.row;
	for (int i = 0; i < n; i++) {
	QList<Document::Line> *lines = &cx()->engine->document.lines;
	if (cutbuffer && i > 0) {
	cx()->current_row = b.row - i;
	cx()->current_col = 0;
	std::vector<uint32_t> cut;
	parseLine(&cut, 0, true);
	cutlist.push_back(std::move(cut));
	}
	if (op == EditOperation::Cut) {
	lines->erase(lines->begin() + b.row - i);
	}
	}

	cx()->current_row = a.row;
	cx()->current_col = a.col;
	int index = calcColumnToIndex(a.col);
	std::vector<uint32_t> vec2;
	parseLine(&vec2, 0, true);
	if (cutbuffer) {
	std::vector<uint32_t> cut;
	cut.insert(cut.end(), vec2.begin() + index, vec2.end());
	cutlist.push_back(std::move(cut));
	}

	if (op == EditOperation::Cut) {
	vec2.resize(index);
	vec2.insert(vec2.end(), vec1.begin(), vec1.end());
	commitLine(vec2);
	UpdateVisibility();
	}
	}

	if (cutbuffer) {
	size_t size = 0;
	for (std::vector<uint32_t> const &v : cutlist) {
	size += v.size();
	}
	cutbuffer->reserve(size);
	for (auto it = cutlist.rbegin(); it != cutlist.rend(); it++) {
	std::vector<uint32_t> const &v = *it;
	cutbuffer->insert(cutbuffer->end(), v.begin(), v.end());
	}
	}


	if (op == EditOperation::Cut) {
	deselect();
	setCursorPos(a.row, a.col);
	invalidateArea(a.row - cx()->scroll_row_pos);
	} else {
	cx()->current_row = curr_row;
	cx()->current_col = curr_col;
	invalidateArea(curr_row - cx()->scroll_row_pos);
	}

	clearParsedLine();
	UpdateVisibility();
	}

	void AbstractCharacterBasedApplication::edit_(EditOperation op)
	{
	std::vector<uint32_t> u32buf;
	editSelected(op, &u32buf);
	if (u32buf.empty()) return;

	std::vector<ushort> u16buf;
	u16buf.reserve(1024);
	utf32(&u32buf[0], u32buf.size()).to_utf16([&](uint16_t c){
	u16buf.push_back(c);
	return true;
	});
	if (!u16buf.empty()) {
	QString s = QString::fromUtf16(&u16buf[0], u16buf.size());
	qApp->clipboard()->setText(s);
	}
	}

	bool AbstractCharacterBasedApplication::deleteIfSelected()
	{
	if (selection_anchor_0.enabled && selection_anchor_1.enabled) {
	if (selection_anchor_0 != selection_anchor_1) {
	editSelected(EditOperation::Cut, nullptr);
	return true;
	}
	}
	return false;
	}

	void AbstractCharacterBasedApplication::doDelete()
	{
	if (isReadOnly()) return;
	if (isTerminalMode()) return;

	if (deleteIfSelected()) {
	return;
	}

	parseLine(nullptr, 0, false);
	std::vector<uint32_t> *vec = &m->prepared_current_line;
	int index = m->parsed_col_index;
	int c = -1;
	if (index >= 0 && index < (int)vec->size()) {
	c = (*vec)[index];
	}
	if (c == '\n' \|\| c == '\r' \|\| c == -1) {
	if (index == 0) {
	m->parsed_row_index--;
	}
	invalidateAreaBelowTheCurrentLine();
	if (isSingleLineMode()) {
	// nop
	} else {
	if (c != -1) {
	vec->erase(vec->begin() + index);
	if (c == '\r' && index < (int)vec->size() && (*vec)[index] == '\n') {
	vec->erase(vec->begin() + index);
	}
	}
	if (vec->empty()) {
	clearParsedLine();
	if (cx()->current_row + 1 < (int)cx()->engine->document.lines.size()) {
	cx()->engine->document.lines.erase(cx()->engine->document.lines.begin() + cx()->current_row);
	}
	} else {
	commitLine(*vec);
	setCursorColByIndex(*vec, index);
	if (index == (int)vec->size()) {
	int nextrow = cx()->current_row + 1;
	int lines = documentLines();
	if (nextrow < lines) {
	Document::Line *ba1 = &cx()->engine->document.lines[cx()->current_row];
	Document::Line const &ba2 = cx()->engine->document.lines[nextrow];
	ba1->text.append(ba2.text);
	cx()->engine->document.lines.erase(cx()->engine->document.lines.begin() + nextrow);
	}
	}
	}
	clearParsedLine();
	updateVisibility(true, true, true);
	}
	} else {
	vec->erase(vec->begin() + index);
	commitLine(*vec);
	setCursorColByIndex(*vec, index);
	updateVisibility(true, true, true);
	}
	}

	void AbstractCharacterBasedApplication::doBackspace()
	{
	if (isReadOnly()) return;
	if (isTerminalMode()) return;

	if (deleteIfSelected()) {
	return ;
	}

	if (cx()->current_row > 0 \|\| cx()->current_col > 0) {
	setPaintingSuppressed(true);
	moveCursorLeft();
	doDelete();
	setPaintingSuppressed(false);
	updateVisibility(true, true, true);
	}
	}

	bool AbstractCharacterBasedApplication::isDialogMode()
	{
	return m->dialog_mode;
	}

	-void AbstractCharacterBasedApplication::setDialogOption(QString const &title, QString value, DialogHandler handler)
	+void AbstractCharacterBasedApplication::setDialogOption(QString const &title, QString const &value, DialogHandler handler)
	{
	m->dialog_title = title;
	m->dialog_value = value;
	m->dialog_handler = handler;
	}

	void AbstractCharacterBasedApplication::setDialogMode(bool f)
	{
	if (f) {
	if (!dialog_cx) {
	int y = screenHeight() - 2;
	- dialog_cx = std::shared_ptr<TextEditorContext>(new TextEditorContext);
	- dialog_cx->engine = std::shared_ptr<TextEditorEngine>(new TextEditorEngine);
	+ dialog_cx = std::make_shared<TextEditorContext>();
	+ dialog_cx->engine = std::make_shared<TextEditorEngine>();
	dialog_cx->single_line = true;
	dialog_cx->viewport_org_x = 0;
	dialog_cx->viewport_org_y = y + 1;
	dialog_cx->viewport_width = screenWidth();
	dialog_cx->viewport_height = 1;
	}
	dialog_cx->engine->document.lines.push_back(Document::Line(m->dialog_value.toUtf8()));
	editor_cx->viewport_height = screenHeight() - m->header_line - 2;
	m->dialog_mode = true;
	clearParsedLine();
	moveCursorEnd();
	} else {
	dialog_cx.reset();
	m->dialog_mode = false;
	layoutEditor();
	clearParsedLine();
	updateVisibility(true, true, true);
	}
	}

	void AbstractCharacterBasedApplication::execDialog(QString const &dialog_title, QString dialog_value, DialogHandler handler)
	{
	setDialogOption(dialog_title, dialog_value, handler);
	setDialogMode(true);
	}

	void AbstractCharacterBasedApplication::closeDialog(bool result)
	{
	if (isDialogMode()) {
	deselect();
	QString line;
	if (!dialog_cx->engine->document.lines.empty()) {
	Document::Line const &l = dialog_cx->engine->document.lines.front();
	line = QString::fromUtf8(l.text);
	}
	setDialogMode(false);
	if (m->dialog_handler) {
	m->dialog_handler(result, line);
	}
	return;
	}
	}

	int AbstractCharacterBasedApplication::internalParseLine(std::vector<uint32_t> *vec, int increase_hint) const
	{
	vec->clear();

	int index = -1;
	int col = 0;
	int len = m->parsed_line.size();
	if (len > 0) {
	vec->reserve(len + increase_hint);
	char const *src = m->parsed_line.data();
	utf8 u8(src, len);
	while (1) {
	int n = 0;
	uint32_t c = u8.next();
	if (c == 0) {
	n = 1;
	} else {
	if (c == '\t') {
	int z = nextTabStop(col);
	n = z - col;
	} else {
	n = charWidth(c);
	}
	}
	if (col <= cx()->current_col && col + n > cx()->current_col) {
	index = (int)vec->size();
	}
	if (c == 0) break;
	col += n;
	vec->push_back(c);
	}
	}
	return index;
	}

	int AbstractCharacterBasedApplication::calcColumnToIndex(int column)
	{
	int index = 0;
	if (column > 0) {
	fetchCurrentLine();
	int col = 0;
	int len = m->parsed_line.size();
	if (len > 0) {
	char const *src = m->parsed_line.data();
	utf8 u8(src, len);
	while (1) {
	uint32_t c = u8.next();
	int n = 0;
	if (c == '\r' \|\| c == '\n' \|\| c == 0) {
	break;
	}
	if (c == '\t') {
	int z = nextTabStop(col);
	n = z - col;
	} else {
	n = charWidth(c);
	}
	col += n;
	index++;
	if (col >= column) {
	break;
	}
	}
	}
	}
	return index;
	}

	void AbstractCharacterBasedApplication::invalidateArea(int top_y)
	{
	int y0 = cx()->viewport_org_y;
	int y1 = cx()->viewport_height + y0;
	top_y += y0;
	if (y0 < top_y) y0 = top_y;
	int n = m->line_flags.size();
	if (y0 < 0) y0 = 0;
	if (y1 > n) y1 = n;
	for (int y = y0; y < y1; y++) {
	m->line_flags[y] \|= LineChanged;
	}
	}

	void AbstractCharacterBasedApplication::invalidateAreaBelowTheCurrentLine()
	{
	int y;

	y = m->parsed_row_index;
	if (m->valid_line_index > y) {
	m->valid_line_index = y;
	}

	y = m->parsed_row_index - cx()->scroll_row_pos;
	invalidateArea(y);
	}

	int AbstractCharacterBasedApplication::scrollBottomLimit() const
	{
	return documentLines() - editorViewportHeight() / 2;
	}

	void AbstractCharacterBasedApplication::writeCR()
	{
	deleteIfSelected();

	setCursorCol(0);
	clearParsedLine();
	updateVisibility(true, true, true);
	}

	void AbstractCharacterBasedApplication::moveCursorOut()
	{
	setCursorRow(-1);
	}

	void AbstractCharacterBasedApplication::moveCursorHome()
	{
	fetchCurrentLine();
	QString line = m->parsed_line;
	ushort const *ptr = line.utf16();
	ushort const *end = ptr + line.size();
	int x = 0;
	while (1) {
	int c = -1;
	if (ptr < end) {
	c = *ptr;
	ptr++;
	}
	if (c == ' ') {
	x++;
	} else if (c == '\t') {
	x = nextTabStop(x);
	} else {
	break;
	}
	}
	if (x == cx()->current_col) {
	x = 0;
	}
	setCursorCol(x);
	clearParsedLine();
	updateVisibility(true, true, true);
	}

	void AbstractCharacterBasedApplication::moveCursorEnd()
	{
	fetchCurrentLine();
	QByteArray line = m->parsed_line;
	int col = calcVisualWidth(Document::Line(line));
	setCursorCol(col);
	clearParsedLine();
	updateVisibility(true, true, true);
	}

	void AbstractCharacterBasedApplication::scrollUp()
	{
	if (cx()->scroll_row_pos > 0) {
	cx()->scroll_row_pos--;
	invalidateArea();
	clearParsedLine();
	updateVisibility(false, false, true);
	}
	}

	void AbstractCharacterBasedApplication::scrollDown()
	{
	int limit = scrollBottomLimit();
	if (cx()->scroll_row_pos < limit) {
	cx()->scroll_row_pos++;
	invalidateArea();
	clearParsedLine();
	updateVisibility(false, false, true);
	}
	}

	void AbstractCharacterBasedApplication::moveCursorUp()
	{
	if (isSingleLineMode()) {
	// nop
	} else if (cx()->current_row > 0) {
	setCursorRow(cx()->current_row - 1);
	clearParsedLine();
	updateVisibility(true, false, true);
	}
	}

	void AbstractCharacterBasedApplication::moveCursorDown()
	{
	if (isSingleLineMode()) {
	// nop
	} else if (cx()->current_row + 1 < (int)document()->lines.size()) {
	setCursorRow(cx()->current_row + 1);
	clearParsedLine();
	updateVisibility(true, false, true);
	}
	}

	void AbstractCharacterBasedApplication::scrollToTop()
	{
	if (isSingleLineMode()) return;

	setCursorRow(0);
	setCursorCol(0);
	cx()->scroll_row_pos = 0;
	invalidateArea();
	clearParsedLine();
	updateVisibility(true, false, true);
	}

	void AbstractCharacterBasedApplication::moveCursorLeft()
	{
	if (!isShiftModifierPressed() && selection_anchor_0.enabled && selection_anchor_1.enabled) { // 選択領域があったら
	if (selection_anchor_0 != selection_anchor_1) {
	SelectionAnchor a = std::min(selection_anchor_0, selection_anchor_1);
	deselect();
	setCursorRow(a.row);
	setCursorCol(a.col);
	updateVisibility(true, true, true);
	return;
	}
	}

	if (cx()->current_col == 0) {
	if (isSingleLineMode()) {
	// nop
	} else {
	if (cx()->current_row > 0) {
	setCursorRow(cx()->current_row - 1);
	clearParsedLine();
	moveCursorEnd();
	}
	}
	return;
	}

	int col = 0;
	int newcol = 0;
	int index;
	for (index = 0; index < (int)m->prepared_current_line.size(); index++) {
	ushort c = m->prepared_current_line[index];
	if (c == '\r' \|\| c == '\n') {
	break;
	}
	newcol = col;
	if (c == '\t') {
	col = nextTabStop(col);
	} else {
	col += charWidth(c);
	}
	if (col >= cx()->current_col) {
	break;
	}
	}
	m->parsed_col_index = index;
	setCursorCol(newcol);

	updateVisibility(true, true, true);
	}

	void AbstractCharacterBasedApplication::moveCursorRight()
	{
	if (!isShiftModifierPressed() && selection_anchor_0.enabled && selection_anchor_1.enabled) { // 選択領域があったら
	if (selection_anchor_0 != selection_anchor_1) {
	SelectionAnchor a = std::max(selection_anchor_0, selection_anchor_1);
	deselect();
	setCursorRow(a.row);
	setCursorCol(a.col);
	updateVisibility(true, true, true);
	return;
	}
	}

	int col = 0;
	int i = 0;
	while (1) {
	int c = -1;
	if (i < (int)m->prepared_current_line.size()) {
	c = m->prepared_current_line[i];
	}
	if (c == '\r' \|\| c == '\n' \|\| c == -1) {
	if (!isSingleLineMode()) {
	int nextrow = cx()->current_row + 1;
	int lines = document()->lines.size();
	if (nextrow < lines) {
	setCursorPos(nextrow, 0);
	clearParsedLine();
	updateVisibility(true, true, true);
	return;
	}
	}
	break;
	}
	if (c == '\t') {
	col = nextTabStop(col);
	} else {
	col += charWidth(c);
	}
	if (col > cx()->current_col) {
	break;
	}
	i++;
	}
	if (col != cx()->current_col) {
	setCursorCol(col);
	clearParsedLine();
	updateVisibility(true, true, true);
	}
	}

	void AbstractCharacterBasedApplication::movePageUp()
	{
	if (!isSingleLineMode()) {
	int step = editorViewportHeight();
	setCursorRow(cx()->current_row - step);
	cx()->scroll_row_pos -= step;
	if (cx()->current_row < 0) {
	cx()->current_row = 0;
	}
	if (cx()->scroll_row_pos < 0) {
	cx()->scroll_row_pos = 0;
	}
	invalidateArea();
	clearParsedLine();
	updateVisibility(true, false, true);
	}
	}

	void AbstractCharacterBasedApplication::movePageDown()
	{
	if (!isSingleLineMode()) {
	int limit = documentLines();
	if (limit > 0) {
	limit--;
	int step = editorViewportHeight();
	setCursorRow(cx()->current_row + step);
	cx()->scroll_row_pos += step;
	if (cx()->current_row > limit) {
	cx()->current_row = limit;
	}
	limit = scrollBottomLimit();
	if (cx()->scroll_row_pos > limit) {
	cx()->scroll_row_pos = limit;
	}
	} else {
	setCursorRow(0);
	cx()->scroll_row_pos = 0;
	}
	invalidateArea();
	clearParsedLine();
	updateVisibility(true, false, true);
	}
	}

	void AbstractCharacterBasedApplication::scrollRight()
	{
	if (cx()->scroll_col_pos > 0) {
	cx()->scroll_col_pos--;
	} else {
	cx()->scroll_col_pos = 0;
	}
	invalidateArea();
	clearParsedLine();
	updateVisibility(true, true, true);
	}

	void AbstractCharacterBasedApplication::scrollLeft()
	{
	cx()->scroll_col_pos++;
	invalidateArea();
	clearParsedLine();
	updateVisibility(true, true, true);
	}

	void AbstractCharacterBasedApplication::addNewLineToBottom()
	{
	int row = cx()->engine->document.lines.size();
	if (cx()->current_row >= row) {
	setCursorPos(row, 0);
	cx()->engine->document.lines.push_back(Document::Line(QByteArray()));
	}
	}

	void AbstractCharacterBasedApplication::appendNewLine(std::vector<uint32_t> *vec)
	{
	if (isSingleLineMode()) return;

	vec->push_back('\r');
	vec->push_back('\n');
	}

	void AbstractCharacterBasedApplication::writeNewLine()
	{
	if (isReadOnly()) return;
	if (isSingleLineMode()) return;
	if (!isCurrentLineWritable()) return;

	invalidateAreaBelowTheCurrentLine();

	std::vector<uint32_t> curr_line;
	parseLine(&curr_line, 0, false);
	int index = m->parsed_col_index;
	if (index < 0) {
	addNewLineToBottom();
	index = 0;
	}
	std::vector<uint32_t> next_line;
	// split line
	next_line.insert(next_line.end(), curr_line.begin() + index, curr_line.end());
	// shrink current line
	curr_line.resize(index);
	// append new line code
	appendNewLine(&curr_line);
	// next line index
	cx()->current_row = m->parsed_row_index + 1;
	// commit current line
	commitLine(curr_line);
	// insert next line
	m->parsed_row_index = cx()->current_row;
	engine()->document.lines.insert(engine()->document.lines.begin() + m->parsed_row_index, Document::Line(QByteArray()));
	// commit next line
	commitLine(next_line);

	setCursorColByIndex(next_line, 0);

	clearParsedLine();
	updateVisibility(true, true, true);
	}

	void AbstractCharacterBasedApplication::makeColumnPosList(std::vector<int> *out)
	{
	out->clear();
	std::vector<uint32_t> const *line = &m->prepared_current_line;
	int x = 0;
	while (1) {
	size_t index = out->size();
	out->push_back(x);
	int n;
	int c = -1;
	if (index < line->size()) {
	c = line->at(index);
	}
	if (c == '\r' \|\| c == '\n' \|\| c == -1) {
	break;
	- } else if (c == '\t') {
	+ }
	+ if (c == '\t') {
	int z = nextTabStop(x);
	n = z - x;
	} else {
	n = charWidth(c);
	}
	x += n;
	}
	}

	void AbstractCharacterBasedApplication::updateCursorPos(bool auto_scroll)
	{
	if (!cx()->engine) {
	return;
	}

	parseLine(&m->prepared_current_line, 0, false);

	int index = 0;
	int char_span = 0;
	int col = cx()->current_col_hint;

	{
	std::vector<int> pts;
	makeColumnPosList(&pts);
	if (pts.size() > 1) {
	int newcol = pts.back();
	int newindex = pts.size() - 1;
	for (size_t i = 0; i + 1 < pts.size(); i++) {
	int x = pts[i];
	if (x <= col && col < pts[i + 1]) {
	char_span = pts[i + 1] - pts[i];
	newindex = i;
	newcol = x;
	break;
	}
	}
	index = newindex;
	col = newcol;
	- } else if (pts.size() > 0) {
	+ } else if (!pts.empty()) {
	col = pts.back();
	} else {
	col = 0;
	}
	}

	m->parsed_col_index = index;

	cx()->current_col = col;

	if (char_span < 1) {
	char_span = 1;
	}
	cx()->current_char_span = char_span;

	if (auto_scroll) {
	int pos = decideColumnScrollPos();
	if (cx()->scroll_col_pos != pos) {
	cx()->scroll_col_pos = pos;
	invalidateArea();
	}
	}
	}

	void AbstractCharacterBasedApplication::printInvertedBar(int x, int y, char const *text, int padchar)
	{
	int w = screenWidth();
	int o = w * y;
	for (int i = 0; i < w; i++) {
	m->screen[o + i].c = 0;
	}

	AbstractCharacterBasedApplication::Option opt;
	opt.char_attr = CharAttr::Invert;
	print(x, y, text, opt);

	for (int i = 0; i < w; i++) {
	if (m->screen[o + i].c == 0) {
	m->screen[o + i].c = padchar;
	}
	m->screen[o + i].a = opt.char_attr;
	}
	}

	QString AbstractCharacterBasedApplication::statusLine() const
	{
	QString text = "[%1:%2]";
	text = text.arg(cx()->current_row + 1).arg(cx()->current_col + 1);
	return text;
	}

	int AbstractCharacterBasedApplication::printArea(TextEditorContext const cx, const SelectionAnchor sel_a, const SelectionAnchor *sel_b)
	{
	int end_of_line_y = -1;
	if (cx) {
	int height = cx->viewport_height;
	QRect clip(cx->viewport_org_x, cx->viewport_org_y, cx->viewport_width, height);
	int row = cx->scroll_row_pos;
	for (int i = 0; i < height; i++) {
	if (row < 0) continue;
	int y = cx->viewport_org_y + i;
	if (row < (int)cx->engine->document.lines.size()) {
	if (i < height) {
	int x = cx->viewport_org_x - cx->scroll_col_pos;
	Document::Line const &line = cx->engine->document.lines[row];
	int anchor_a = -1;
	int anchor_b = -1;
	if (sel_a && sel_a->enabled && sel_b && sel_b->enabled) {
	SelectionAnchor a = *sel_a;
	SelectionAnchor b = *sel_b;
	if (a.row > b.row) {
	std::swap(a, b);
	} else if (a.row == b.row) {
	if (a.col > b.col) {
	std::swap(a, b);
	}
	}
	if (row > a.row && row < b.row) {
	anchor_a = 0;
	} else {
	if (row == a.row) {
	anchor_a = a.col;
	}
	if (row == b.row) {
	anchor_b = b.col;
	}
	}
	}
	QList<FormattedLine> lines = formatLine(line, cx->tab_span, anchor_a, anchor_b);
	for (FormattedLine const &line : lines) {
	AbstractCharacterBasedApplication::Option opt;
	if (line.atts & FormattedLine::StyleID) {
	opt.char_attr.color = QColor(line.atts & 0xff, (line.atts >> 8) & 0xff, (line.atts >> 16) & 0xff);
	}
	opt.clip = clip;
	if (line.isSelected()) {
	opt.char_attr.flags \|= CharAttr::Selected;
	}
	x = print(x, y, line.text, opt);
	}
	int end_x = clip.x() + clip.width();
	if (x < end_x) {
	if (x < clip.left()) {
	x = clip.left();
	}
	if (x < end_x) {
	clearRect(x, y, end_x - x, 1);
	}
	}
	}
	} else {
	if (end_of_line_y < 0) {
	end_of_line_y = i;
	}
	clearRect(cx->viewport_org_x, y, cx->viewport_width, 1);
	if (y >= 0 && y < (int)m->line_flags.size()) {
	m->line_flags[y] \|= LineChanged;
	}
	}
	row++;
	}
	}
	return end_of_line_y;
	}

	-void AbstractCharacterBasedApplication::paintLineNumbers(std::function<void(int, QString, Document::Line const *line)> draw)
	+void AbstractCharacterBasedApplication::paintLineNumbers(std::function<void(int, QString, Document::Line const *line)> const &draw)
	{
	auto Line = [&](int index)->Document::Line &{
	return editor_cx->engine->document.lines[index];
	};
	int rightpadding = 2;
	int left_margin = editor_cx->viewport_org_x;
	int num = 1;
	size_t offset = 0;
	for (int i = 0; i < editor_cx->viewport_height; i++) {
	char tmp[100];
	Q_ASSERT(left_margin < (int)sizeof(tmp));
	memset(tmp, ' ', left_margin);
	tmp[left_margin] = 0;
	int row = editor_cx->scroll_row_pos + i;
	Document::Line *line = nullptr;
	if (row < (int)editor_cx->engine->document.lines.size()) {
	if (m->valid_line_index < 0) {
	m->valid_line_index = 0;
	Document::Line *p = &Line(0);
	if (p->type != Document::Line::Unknown) {
	p->byte_offset = offset;
	p->line_number = num;
	offset += p->text.size();
	num++;
	}
	}
	line = &Line(row);
	if (row >= m->valid_line_index) {
	{
	Document::Line const &line = Line(m->valid_line_index);
	offset = line.byte_offset;
	num = line.line_number;
	}
	while (m->valid_line_index <= row) {
	Document::Line const &line = Line(m->valid_line_index);
	if (line.type != Document::Line::Unknown) {
	offset += line.text.size();
	num++;
	}
	m->valid_line_index++;
	if (m->valid_line_index < editor_cx->engine->document.lines.size()) {
	Document::Line *p = &Line(m->valid_line_index);
	p->byte_offset = offset;
	p->line_number = num;
	}
	}
	}
	if (left_margin > 1) {
	unsigned int linenum = -1;
	if (row < m->valid_line_index) {
	#if 1
	linenum = line->line_number;
	#else
	linenum = line->byte_offset;
	#endif
	}
	if (linenum != (unsigned int)-1 && line->type != Document::Line::Unknown) {
	sprintf(tmp, "%*u ", left_margin - rightpadding, linenum);
	}
	}
	}
	int y = editor_cx->viewport_org_y + i;
	draw(y, tmp, line);
	}
	}

	bool AbstractCharacterBasedApplication::isAutoLayout() const
	{
	return m->auto_layout;
	}

	void AbstractCharacterBasedApplication::preparePaintScreen()
	{
	if (m->header_line > 0) {
	char const *line = "Hello, world\xe3\x81\x82\xe3\x81\x84\xe3\x81\x86";
	printInvertedBar(0, 0, line, ' ');
	}

	if (m->show_line_number) {
	Option opt_normal;
	paintLineNumbers([&](int y, QString text, Document::Line const *line){
	(void)line;
	print(0, y, text + '\|', opt_normal);
	});
	}

	SelectionAnchor anchor_a;
	SelectionAnchor anchor_b;

	auto MakeSelectionAnchor = [&](){
	if (selection_anchor_0.enabled != SelectionAnchor::No) {
	anchor_a = selection_anchor_0;
	#if 0
	anchor_b.row = cx()->current_row;
	anchor_b.col = cx()->current_col;
	anchor_b.enabled = selection_anchor_0.enabled;
	#else
	anchor_b = selection_anchor_1;
	#endif
	}
	};

	if (isDialogMode()) {
	printArea(editor_cx.get(), &anchor_a, &anchor_b);

	std::string text = m->dialog_title.toStdString();
	text = ' ' + text + ' ';
	int y = screenHeight() - 2;
	printInvertedBar(3, y, text.c_str(), '-');

	MakeSelectionAnchor();
	printArea(dialog_cx.get(), &anchor_a, &anchor_b);
	} else {
	MakeSelectionAnchor();
	editor_cx->bottom_line_y = printArea(editor_cx.get(), &anchor_a, &anchor_b);

	if (m->footer_line > 0) {
	QString line = statusLine();
	int y = screenHeight() - 1;
	printInvertedBar(0, y, line.toStdString().c_str(), ' ');
	}
	}
	}

	void AbstractCharacterBasedApplication::onQuit()
	{
	if (!m->is_quit_enabled) return;

	if (!isDialogMode()) {
	m->state = State::Exit;
	}
	}

	void AbstractCharacterBasedApplication::onOpenFile()
	{
	if (isReadOnly()) return;
	if (!m->is_open_enabled) return;

	if (!isDialogMode()) {
	execDialog("Open File", recentlyUsedPath(), [&](bool ok, QString const &text){
	if (ok) {
	openFile(text);
	}
	});
	}
	}

	void AbstractCharacterBasedApplication::onSaveFile()
	{
	if (!m->is_save_enabled) return;

	if (!isDialogMode()) {
	execDialog("Save File", recentlyUsedPath(), [&](bool ok, QString const &text){
	if (ok) {
	saveFile(text);
	}
	});
	}
	}

	void AbstractCharacterBasedApplication::setNormalTextEditorMode(bool f)
	{
	m->is_quit_enabled = f;
	m->is_open_enabled = f;
	m->is_save_enabled = f;
	setTerminalMode(!f);
	}

	SelectionAnchor AbstractCharacterBasedApplication::currentAnchor(SelectionAnchor::Enabled enabled)
	{
	SelectionAnchor a;
	a.row = cx()->current_row;
	a.col = cx()->current_col;
	a.enabled = enabled;
	return a;
	}

	void AbstractCharacterBasedApplication::deselect()
	{
	selection_anchor_0.enabled = SelectionAnchor::No;
	selection_anchor_1.enabled = SelectionAnchor::No;
	}

	bool AbstractCharacterBasedApplication::isSelectionAnchorEnabled() const
	{
	return selection_anchor_0.enabled != SelectionAnchor::No;
	}

	void AbstractCharacterBasedApplication::setToggleSelectionAnchorEnabled(bool f)
	{
	m->is_toggle_selection_anchor_enabled = f;
	}

	void AbstractCharacterBasedApplication::setReadOnly(bool f)
	{
	m->is_read_only = f;
	}

	bool AbstractCharacterBasedApplication::isReadOnly() const
	{
	return m->is_read_only && !m->is_terminal_mode;
	}

	void AbstractCharacterBasedApplication::setSelectionAnchor(SelectionAnchor::Enabled enabled, bool update_anchor, bool auto_scroll)
	{
	if (update_anchor) {
	selection_anchor_0 = currentAnchor(enabled);
	} else {
	selection_anchor_0.enabled = enabled;
	}
	clearParsedLine();
	updateVisibility(false, false, auto_scroll);
	}

	void AbstractCharacterBasedApplication::toggleSelectionAnchor()
	{
	if (!m->is_toggle_selection_anchor_enabled) return;

	setSelectionAnchor(isSelectionAnchorEnabled() ? SelectionAnchor::No : SelectionAnchor::EnabledHard, true, true);
	selection_anchor_1 = selection_anchor_0;
	}

	void AbstractCharacterBasedApplication::editPaste()
	{
	if (isReadOnly()) return;
	if (isTerminalMode()) return;

	setPaintingSuppressed(true);

	QString str = qApp->clipboard()->text();
	utf16(str.utf16(), str.size()).to_utf32([&](uint32_t c){
	write(c, false);
	return true;
	});

	setPaintingSuppressed(false);
	updateVisibility(true, true, true);
	}

	void AbstractCharacterBasedApplication::editCopy()
	{
	edit_(EditOperation::Copy);
	}

	void AbstractCharacterBasedApplication::editCut()
	{
	if (isReadOnly()) return;
	if (isTerminalMode()) return;
	edit_(EditOperation::Cut);
	}

	void AbstractCharacterBasedApplication::setWriteMode(WriteMode wm)
	{
	m->write_mode = wm;
	}

	bool AbstractCharacterBasedApplication::isInsertMode() const
	{
	return m->write_mode == WriteMode::Insert && !isTerminalMode();
	}

	bool AbstractCharacterBasedApplication::isOverwriteMode() const
	{
	return m->write_mode == WriteMode::Overwrite \|\| isTerminalMode();
	}

	void AbstractCharacterBasedApplication::setTerminalMode(bool f)
	{
	m->is_terminal_mode = f;
	if (isTerminalMode()) {
	showHeader(false);
	showFooter(false);
	showLineNumber(false, 0);
	setLineMargin(0);
	setWriteMode(WriteMode::Overwrite);
	setReadOnly(true);
	}
	layoutEditor();
	}

	bool AbstractCharacterBasedApplication::isTerminalMode() const
	{
	return m->is_terminal_mode;
	}

	bool AbstractCharacterBasedApplication::isBottom() const
	{
	if (cx()->current_row == m->parsed_row_index) {
	if (m->parsed_col_index == (int)m->prepared_current_line.size()) {
	return true;
	}
	}
	return false;
	}

	void AbstractCharacterBasedApplication::moveToTop()
	{
	if (isSingleLineMode()) return;

	deselect();

	cx()->current_row = 0;
	cx()->current_col = 0;
	cx()->current_col_hint = 0;
	cx()->scroll_row_pos = 0;
	scrollToTop();
	invalidateArea();
	clearParsedLine();
	updateVisibility(true, false, true);
	}

	void AbstractCharacterBasedApplication::logicalMoveToBottom()
	{
	deselect();

	cx()->current_row = documentLines();
	cx()->current_col = 0;
	if (cx()->current_row > 0) {
	cx()->current_row = cx()->current_row - 1;
	clearParsedLine();
	fetchCurrentLine();
	int col = calcVisualWidth(Document::Line(m->parsed_line));
	cx()->current_col = col;
	cx()->current_col_hint = col;
	}
	cx()->scroll_row_pos = scrollBottomLimit();
	}

	void AbstractCharacterBasedApplication::moveToBottom()
	{
	if (isSingleLineMode()) return;

	logicalMoveToBottom();

	invalidateArea();
	clearParsedLine();
	updateVisibility(true, false, true);
	}

	int AbstractCharacterBasedApplication::findSyntax(QList<Document::CharAttr_> const *list, size_t offset)
	{
	int lo = 0;
	int hi = list->size();
	while (lo + 1 < hi) {
	int mid = (lo + hi) / 2;
	Document::CharAttr_ const *a = &list->at(mid);
	if (offset == a->offset) {
	return mid;
	}
	if (offset < a->offset) {
	hi = mid;
	} else {
	lo = mid;
	}
	}
	return lo;
	}

	void AbstractCharacterBasedApplication::insertSyntax(QList<Document::CharAttr_> *list, size_t offset, Document::CharAttr_ const &a)
	{
	int i = findSyntax(list, offset);
	int n = list->size();
	if (i < n) {
	if (list->at(i).offset == offset) {
	(*list)[i] = a;
	} else {
	if (i < n) {
	if (a.offset < list->at(i).offset) {
	if (list->at(i).color == a.color) {
	(*list)[i].offset = offset;
	return;
	}
	}
	}
	if (list->at(i).color == a.color) {
	return;
	}
	if (list->at(i).offset < a.offset) {
	i++;
	}
	list->insert(list->begin() + i, a);
	while (++i < n) {
	(*list)[i].offset++;
	}
	}
	} else {
	list->push_back(a);
	}
	}

	void AbstractCharacterBasedApplication::internalWrite(const ushort begin, const ushort end)
	{
	deleteIfSelected();
	clearShiftModifier();

	if (cx()->engine->document.lines.isEmpty()) {
	Document::Line line;
	line.type = Document::Line::Normal;
	line.line_number = 1;
	cx()->engine->document.lines.push_back(line);
	}

	if (!isCurrentLineWritable()) return;

	int len = end - begin;
	parseLine(nullptr, len, false);
	int index = m->parsed_col_index;
	if (index < 0) {
	addNewLineToBottom();
	index = 0;
	}

	std::vector<uint32_t> *vec = &m->prepared_current_line;

	auto WriteChar = [&](ushort c){
	if (isInsertMode()) {
	vec->insert(vec->begin() + index, c);
	} else if (isOverwriteMode()) {
	if (index < (int)vec->size()) {
	ushort d = vec->at(index);
	if (d == '\n' \|\| d == '\r') {
	vec->insert(vec->begin() + index, c);
	} else {
	vec->at(index) = c;
	}
	} else {
	vec->push_back(c);
	}
	}
	Document::CharAttr_ a;
	a.offset = index;
	a.color = m->escape_sequence.fg_color_code();
	insertSyntax(&m->syntax_table, index, a);
	};

	ushort const *ptr = begin;
	while (ptr < end) {
	ushort c = *ptr;
	ptr++;
	if (c >= 0xd800 && c < 0xdc00) {
	if (ptr < end) {
	ushort d = *ptr;
	if (d >= 0xdc00 && d < 0xe000) {
	ptr++;
	int u = 0x10000 + (c - 0xd800) * 0x400 + (d - 0xdc00);
	WriteChar(u);
	index++;
	}
	}
	} else {
	WriteChar(c);
	index++;
	}
	}
	m->parsed_col_index = index;
	commitLine(*vec);
	setCursorColByIndex(*vec, index);
	updateVisibility(true, true, true);
	}

	void AbstractCharacterBasedApplication::pressLetterWithControl(int c)
	{
	if (c < 0 \|\| c > 0x7f) {
	return;
	}
	if (c < 0x40) {
	c += 0x40;
	}
	c = toupper(c);
	switch (c) {
	case 'A':
	toggleSelectionAnchor();
	break;
	case 'Q':
	onQuit();
	break;
	case 'O':
	onOpenFile();
	break;
	case 'S':
	onSaveFile();
	break;
	case 'X':
	editCut();
	break;
	case 'C':
	editCopy();
	break;
	case 'V':
	editPaste();
	break;
	}
	}

	void AbstractCharacterBasedApplication::write(uint32_t c, bool by_keyboard)
	{
	if (isTerminalMode()) {
	if (c == '\r') {
	setCursorCol(0);
	clearParsedLine();
	updateVisibility(true, true, true);
	return;
	}
	if (m->cursor_moved_by_mouse) {
	moveToBottom();
	}
	if (c == 0x1b \|\| m->escape_sequence.isActive()) {
	m->escape_sequence.write(c);
	return;
	}
	}

	bool ok = !(isTerminalMode() && by_keyboard);

	if (c < 0x20) {
	if (c == 0x08) {
	if (ok) {
	doBackspace();
	}
	} else if (c == 0x09) {
	if (ok) {
	ushort u = c;
	internalWrite(&u, &u + 1);
	}
	} else if (c == 0x0a) {
	if (ok) {
	pressEnter();
	}
	} else if (c == 0x0d) {
	if (ok) {
	writeCR();
	}
	} else if (c == 0x1b) {
	pressEscape();
	} else if (c >= 1 && c <= 26) {
	pressLetterWithControl(c);
	}
	} else if (c == 0x7f) {
	if (ok) {
	doDelete();
	}
	} else if (c < 0x10000) {
	if (ok) {
	ushort u = c;
	internalWrite(&u, &u + 1);
	}
	} else if (c >= 0x10000 && c <= 0x10ffff) {
	if (ok) {
	ushort t[2];
	t[0] = (c - 0x10000) / 0x400 + 0xd800;
	t[1] = (c - 0x10000) % 0x400 + 0xdc00;
	internalWrite(t, t + 2);
	}
	} else {
	switch (c) {
	case EscapeCode::Up:
	if (ok) moveCursorUp();
	break;
	case EscapeCode::Down:
	if (ok) moveCursorDown();
	break;
	case EscapeCode::Right:
	if (ok) moveCursorRight();
	break;
	case EscapeCode::Left:
	if (ok) moveCursorLeft();
	break;
	case EscapeCode::Home:
	if (ok) moveCursorHome();
	break;
	case EscapeCode::End:
	if (ok) moveCursorEnd();
	break;
	case EscapeCode::PageUp:
	if (ok) movePageUp();
	break;
	case EscapeCode::PageDown:
	if (ok) movePageDown();
	break;
	case EscapeCode::Insert:
	clearShiftModifier();
	break;
	case EscapeCode::Delete:
	clearShiftModifier();
	if (ok) doDelete();
	break;
	}
	}
	}

	void AbstractCharacterBasedApplication::write(char const *ptr, int len, bool by_keyboard)
	{
	if (isReadOnly()) return;

	char const *begin = ptr;
	char const *end = begin + (len < 0 ? strlen(ptr) : len);
	char const *left = begin;
	char const *right = begin;
	while (1) {
	int c = -1;
	if (right < end) {
	c = *right & 0xff;
	}
	if (c == '\n' \|\| c == '\r' \|\| c < 0) {
	utf8 src(left, right);
	while (1) {
	int d = src.next();
	if (d == 0) break;
	write(d, by_keyboard);
	}
	if (c < 0) break;
	right++;
	if (c == '\r') {
	c = isInsertMode() ? '\n' : '\r';
	if (right < end && *right == '\n') {
	c = '\n';
	right++;
	}
	write(c, by_keyboard);
	} else if (c == '\n') {
	write('\n', by_keyboard);
	}
	left = right;
	} else {
	right++;
	}
	}
	}

	void AbstractCharacterBasedApplication::write(const std::string &text)
	{
	if (!text.empty()) {
	write(text.c_str(), text.size(), false);
	}
	}

	void AbstractCharacterBasedApplication::write_(const char *ptr, bool by_keyboard)
	{
	write(ptr, -1, by_keyboard);
	}

	void AbstractCharacterBasedApplication::write_(QString text, bool by_keyboard)
	{
	if (isReadOnly()) return;

	if (text.size() == 1) {
	ushort c = text.at(0).unicode();
	write(c, by_keyboard);
	return;
	}
	int len = text.size();
	if (len > 0) {
	ushort const *begin = text.utf16();
	ushort const *end = begin + len;
	ushort const *left = begin;
	ushort const *right = begin;
	while (1) {
	int c = -1;
	if (right < end) {
	c = *right;
	}
	if (c < 0x20) {
	if (left < right) {
	internalWrite(left, right);
	}
	if (c == -1) break;
	right++;
	if (c == '\n' \|\| c == '\r') {
	if (c == '\r') {
	if (right < end && *right == '\n') {
	right++;
	}
	}
	writeNewLine();
	} else {
	write(c, by_keyboard);
	}
	left = right;
	} else {
	right++;
	}
	}
	}
	}



	void AbstractCharacterBasedApplication::write(QKeyEvent *e)
	{
	setModifierKeys(e->modifiers());

	int c = e->key();
	if (c == Qt::Key_Backspace) {
	write(0x08, true);
	} else if (c == Qt::Key_Delete) {
	write(0x7f, true);
	} else if (c == Qt::Key_Up) {
	if (isControlModifierPressed()) {
	scrollUp();
	} else {
	write(EscapeCode::Up, true);
	}
	} else if (c == Qt::Key_Down) {
	if (isControlModifierPressed()) {
	scrollDown();
	} else {
	write(EscapeCode::Down, true);
	}
	} else if (c == Qt::Key_Left) {
	write(EscapeCode::Left, true);
	} else if (c == Qt::Key_Right) {
	write(EscapeCode::Right, true);
	} else if (c == Qt::Key_PageUp) {
	write(EscapeCode::PageUp, true);
	} else if (c == Qt::Key_PageDown) {
	write(EscapeCode::PageDown, true);
	} else if (c == Qt::Key_Home) {
	if (isControlModifierPressed()) {
	moveToTop();
	} else {
	write(EscapeCode::Home, true);
	}
	} else if (c == Qt::Key_End) {
	if (isControlModifierPressed()) {
	moveToBottom();
	} else {
	write(EscapeCode::End, true);
	}
	} else if (c == Qt::Key_Return \|\| c == Qt::Key_Enter) {
	write('\n', true);
	} else if (c == Qt::Key_Escape) {
	write(0x1b, true);
	} else if (isControlModifierPressed()) {
	if (QChar(c).isLetter()) {
	c = QChar(c).toUpper().unicode();
	if (c >= 0x40 && c < 0x60) {
	write(c - 0x40, true);
	}
	}
	} else {
	QString text = e->text();
	write_(text, true);
	}
	}



	void Document::retrieveLastText(std::vector<char> *out, int maxlen) const
	{
	int remain = maxlen;
	int i = lines.size();
	while (i > 0 && remain > 0) {
	i--;
	QByteArray const &data = lines[i].text;
	int n = data.size();
	if (n > remain) {
	n = remain;
	}
	char const *p = data.data() + data.size() - n;
	out->insert(out->begin(), p, p + n);
	remain -= n;
	}
	}
	diff --git a/src/texteditor/AbstractCharacterBasedApplication.h b/src/texteditor/AbstractCharacterBasedApplication.h
	index 8e45e6b..a0747f3 100644
	--- a/src/texteditor/AbstractCharacterBasedApplication.h
	+++ b/src/texteditor/AbstractCharacterBasedApplication.h
	@@ -1,423 +1,421 @@
	#ifndef ABSTRACTCHARACTERBASEDAPPLICATION_H
	#define ABSTRACTCHARACTERBASEDAPPLICATION_H

	#include <QList>
	#include <QRect>
	#include <QString>
	#include <QByteArray>
	#include <memory>
	#include <vector>
	#include <functional>
	#include <QKeyEvent>
	#include <QColor>

	namespace EscapeCode {
	enum EscapeCode {
	Up = 0x1b5b4100,
	Down = 0x1b5b4200,
	Right = 0x1b5b4300,
	Left = 0x1b5b4400,
	Home = 0x1b4f4800,
	End = 0x1b4f4600,
	Insert = 0x1b5b327e,
	Delete = 0x1b5b337e,
	PageUp = 0x1b5b357e,
	PageDown = 0x1b5b367e,
	};
	}

	class Document {
	public:
	struct CharAttr_ {
	size_t offset = 0;
	int color = -1;
	};
	struct Line {
	enum Type {
	Unknown,
	Normal,
	Add,
	Del,
	};
	int type = Unknown;
	int hunk_number = -1;
	int line_number = 0;
	size_t byte_offset = 0;
	QByteArray text;

	- Line()
	- {
	- }
	+ Line() = default;

	explicit Line(QByteArray const &ba)
	: type(Normal)
	, text(ba)
	{
	}

	explicit Line(std::string const &str, Type type = Normal)
	: type(type)
	{
	text.append(str.c_str(), str.size());
	}
	};

	QList<Line> lines;
	void retrieveLastText(std::vector<char> *out, int maxlen) const;
	};

	class TextEditorEngine {
	public:
	Document document;
	TextEditorEngine()
	{
	document.lines.push_back(Document::Line(QByteArray()));
	}
	};

	struct SelectionAnchor {
	enum Enabled {
	No,
	EnabledHard,
	EnabledEasy,
	};

	Enabled enabled = No;
	int row = 0;
	int col = 0;
	int compare(SelectionAnchor const &a) const
	{
	if (enabled && a.enabled) {
	if (row < a.row) return -1;
	if (row > a.row) return 1;
	if (col < a.col) return -1;
	if (col > a.col) return 1;
	} else {
	if (a.enabled) return -1;
	if (enabled) return 1;
	}
	return 0;
	}
	bool operator == (SelectionAnchor const &a) const
	{
	return compare(a) == 0;
	}
	bool operator != (SelectionAnchor const &a) const
	{
	return compare(a) != 0;
	}
	bool operator < (SelectionAnchor const &a) const
	{
	return compare(a) < 0;
	}
	bool operator > (SelectionAnchor const &a) const
	{
	return compare(a) > 0;
	}
	bool operator <= (SelectionAnchor const &a) const
	{
	return compare(a) <= 0;
	}
	bool operator >= (SelectionAnchor const &a) const
	{
	return compare(a) >= 0;
	}
	};

	-typedef std::shared_ptr<TextEditorEngine> TextEditorEnginePtr;
	+using TextEditorEnginePtr = std::shared_ptr<TextEditorEngine>;

	struct TextEditorContext {
	QRect cursor_rect;
	bool single_line = false;
	int current_row = 0;
	int current_col = 0;
	int current_col_hint = 0;
	int saved_row = 0;
	int saved_col = 0;
	int saved_col_hint = 0;
	int current_char_span = 1;
	int scroll_row_pos = 0;
	int scroll_col_pos = 0;
	int viewport_org_x = 0;
	int viewport_org_y = 1;
	int viewport_width = 80;
	int viewport_height = 23;
	int tab_span = 4;
	int bottom_line_y = -1;
	TextEditorEnginePtr engine;
	};

	-typedef std::function<void(bool, QString const &text)> DialogHandler;
	+using DialogHandler = std::function<void (bool, const QString &)>;

	class AbstractCharacterBasedApplication {
	public:
	static const int LEFT_MARGIN = 8;
	static const int RIGHT_MARGIN = 10;

	enum class WriteMode {
	Insert,
	Overwrite,
	};

	enum class State {
	Normal,
	Exit,
	};

	struct CharAttr {
	uint16_t index;
	uint16_t flags = 0;
	QColor color;
	CharAttr(int index = Normal)
	: index(index)
	{
	}
	bool operator == (CharAttr const &r) const
	{
	return index == r.index && color == r.color;
	}
	bool operator != (CharAttr const &r) const
	{
	return !operator == (r);
	}
	enum Index {
	Normal,
	Invert,
	Hilite,
	};
	enum Flag {
	Selected = 0x0001,
	CurrentLine = 0x0002,
	};
	};

	struct Option {
	CharAttr char_attr;
	QRect clip;
	};

	struct Character {
	uint16_t c = 0;
	CharAttr a;
	};

	enum LineFlag {
	LineChanged = 1,
	};

	static int charWidth(uint32_t c);

	class FormattedLine {
	public:
	QString text;
	enum Attr {
	StyleID = 0x00ffffff,
	Selected = 0x01000000,
	};
	uint32_t atts;
	FormattedLine(QString const &text, int atts)
	: text(text)
	, atts(atts)
	{
	}
	bool isSelected() const
	{
	return atts & Selected;
	}
	};

	QList<FormattedLine> formatLine(const Document::Line &line, int tab_span, int anchor_a = -1, int anchor_b = -1) const;
	private:
	struct Private;
	Private *m;
	protected:
	SelectionAnchor selection_anchor_0;
	SelectionAnchor selection_anchor_1;
	protected:

	std::vector<Character> *screen();
	std::vector<Character> const *screen() const;
	std::vector<uint8_t> *line_flags();

	void initEditor();

	void fetchCurrentLine() const;
	void clearParsedLine();

	int cursorX() const;
	int cursorY() const;

	int editorViewportWidth() const;
	int editorViewportHeight() const;

	virtual int print(int x, int y, QString const &text, Option const &opt);

	std::shared_ptr<TextEditorContext> editor_cx;
	std::shared_ptr<TextEditorContext> dialog_cx;

	TextEditorContext *cx();
	TextEditorContext const *cx() const;

	Document *document();
	int documentLines() const;

	bool isSingleLineMode() const;

	void ensureCurrentLineVisible();
	int decideColumnScrollPos() const;

	int calcVisualWidth(Document::Line const &line) const;

	int leftMargin_() const;

	void makeBuffer();
	int printArea(const TextEditorContext cx, SelectionAnchor const sel_a = nullptr, SelectionAnchor const *sel_b = nullptr);

	int calcIndexToColumn(const std::vector<uint32_t> &vec, int index) const;

	virtual void updateVisibility(bool ensure_current_line_visible, bool change_col, bool auto_scroll) = 0;
	void commitLine(const std::vector<uint32_t> &vec);

	void doDelete();
	void doBackspace();

	bool isDialogMode();
	void setDialogMode(bool f);
	void closeDialog(bool result);
	- void setDialogOption(const QString &title, QString value, DialogHandler handler);
	+ void setDialogOption(const QString &title, const QString &value, DialogHandler handler);
	void execDialog(const QString &dialog_title, QString dialog_value, DialogHandler handler);
	void toggleSelectionAnchor();
	private:
	int internalParseLine(std::vector<uint32_t> *vec, int increase_hint) const;
	void internalWrite(const ushort begin, const ushort end);
	void pressLetterWithControl(int c);
	void invalidateAreaBelowTheCurrentLine();
	void onQuit();
	void onOpenFile();
	void onSaveFile();
	void printInvertedBar(int x, int y, const char *text, int padchar);
	SelectionAnchor currentAnchor(SelectionAnchor::Enabled enabled);
	enum class EditOperation {
	Cut,
	Copy,
	};
	void editSelected(EditOperation op, std::vector<uint32_t> *cutbuffer);
	void deselect();
	int calcColumnToIndex(int column);
	void edit_(EditOperation op);
	bool isCurrentLineWritable() const;
	- void initEngine(std::shared_ptr<TextEditorContext> cx);
	+ void initEngine(const std::shared_ptr<TextEditorContext>& cx);
	void writeCR();
	bool deleteIfSelected();
	static int findSyntax(const QList<Document::CharAttr_> *list, size_t offset);
	static void insertSyntax(QList<Document::CharAttr_> *list, size_t offset, const Document::CharAttr_ &a);
	protected:

	void parseLine(std::vector<uint32_t> *vec, int increase_hint, bool force);
	QByteArray parsedLine() const;
	void setCursorRow(int row, bool auto_scroll = true, bool by_mouse = false);
	void setCursorCol(int col, bool auto_scroll = true, bool by_mouse = false);
	void setCursorPos(int row, int col);
	void setCursorColByIndex(const std::vector<uint32_t> &vec, int col_index);
	int nextTabStop(int x) const;
	int scrollBottomLimit() const;
	bool isPaintingSuppressed() const;
	void setPaintingSuppressed(bool f);
	void scrollRight();
	void scrollLeft();

	void addNewLineToBottom();
	void appendNewLine(std::vector<uint32_t> *vec);
	void writeNewLine();
	void updateCursorPos(bool auto_scroll);

	QString statusLine() const;

	void preparePaintScreen();
	void setRecentlyUsedPath(const QString &path);
	QString recentlyUsedPath();
	void clearRect(int x, int y, int w, int h);
	- void paintLineNumbers(std::function<void(int, QString, const Document::Line *)> draw);
	+ void paintLineNumbers(std::function<void(int, QString, Document::Line const *line)> const &draw);
	bool isAutoLayout() const;
	void invalidateArea(int top_y = 0);
	void savePos();
	void restorePos();
	public:
	virtual void layoutEditor();
	void scrollUp();
	void scrollDown();
	void moveCursorOut();
	void moveCursorHome();
	void moveCursorEnd();
	void moveCursorUp();
	void moveCursorDown();
	void moveCursorLeft();
	void moveCursorRight();
	void movePageUp();
	void movePageDown();
	void scrollToTop();

	AbstractCharacterBasedApplication();
	virtual ~AbstractCharacterBasedApplication();
	TextEditorEnginePtr engine();
	int screenWidth() const;
	int screenHeight() const;
	void setScreenSize(int w, int h, bool update_layout);
	- void setTextEditorEngine(TextEditorEnginePtr e);
	+ void setTextEditorEngine(const TextEditorEnginePtr &e);
	void openFile(const QString &path);
	void saveFile(const QString &path);
	void loadExampleFile();
	void pressEnter();
	void pressEscape();
	State state() const;
	bool isLineNumberVisible() const;
	void showLineNumber(bool show, int left_margin = LEFT_MARGIN);
	void showHeader(bool f);
	void showFooter(bool f);
	void setAutoLayout(bool f);
	void setDocument(const QList<Document::Line> *source);
	void setSelectionAnchor(SelectionAnchor::Enabled enabled, bool update_anchor, bool auto_scroll);
	bool isSelectionAnchorEnabled() const;
	void setNormalTextEditorMode(bool f);
	void setToggleSelectionAnchorEnabled(bool f);
	void setReadOnly(bool f);
	bool isReadOnly() const;
	void editPaste();
	void editCopy();
	void editCut();
	void setWriteMode(WriteMode wm);
	bool isInsertMode() const;
	bool isOverwriteMode() const;
	void setTerminalMode(bool f);
	bool isTerminalMode() const;
	void moveToTop();
	void moveToBottom();
	bool isBottom() const;
	void setLineMargin(int n);
	void write(uint32_t c, bool by_keyboard);
	void write(const char *ptr, int len, bool by_keyboard);
	void write(std::string const &text);
	void write(QKeyEvent *e);
	void setTextCodec(QTextCodec *codec);
	void setCursorVisible(bool show);
	bool isCursorVisible();
	void setModifierKeys(Qt::KeyboardModifiers keymod);
	bool isControlModifierPressed() const;
	bool isShiftModifierPressed() const;
	void clearShiftModifier();
	void retrieveLastText(std::vector<char> *out, int maxlen) const;
	bool isChanged() const;
	void setChanged(bool f);
	void logicalMoveToBottom();
	protected:
	void write_(const char *ptr, bool by_keyboard);
	void write_(QString text, bool by_keyboard);
	void makeColumnPosList(std::vector<int> *out);
	};

	class AbstractTextEditorApplication : public AbstractCharacterBasedApplication {

	};


	#endif // ABSTRACTCHARACTERBASEDAPPLICATION_H
	diff --git a/src/texteditor/TextEditorTheme.cpp b/src/texteditor/TextEditorTheme.cpp
	index 3ae99e6..0e2cf21 100644
	--- a/src/texteditor/TextEditorTheme.cpp
	+++ b/src/texteditor/TextEditorTheme.cpp
	@@ -1,37 +1,37 @@
	+
	#include "TextEditorTheme.h"
	+#include <memory>
	+

	-TextEditorTheme::TextEditorTheme()
	-{
	-}

	TextEditorThemePtr TextEditorTheme::Light()
	{
	- TextEditorThemePtr t = TextEditorThemePtr(new TextEditorTheme());
	+ TextEditorThemePtr t = std::make_shared<TextEditorTheme>();
	t->fg_default = QColor(0, 0, 0);
	t->bg_default = QColor(240, 240, 240);
	t->fg_line_number = QColor(96, 96, 96);
	t->bg_line_number = QColor(208, 208, 208);
	t->fg_cursor = QColor(0, 128, 255);
	t->bg_current_line = QColor(192, 192, 192);
	t->bg_current_line_number = QColor(176, 176, 176);
	t->bg_diff_unknown = QColor(208, 208, 208);
	t->bg_diff_add = QColor(192, 240, 192);
	t->bg_diff_del = QColor(240, 208, 208);
	return t;
	}

	TextEditorThemePtr TextEditorTheme::Dark()
	{
	- TextEditorThemePtr t = TextEditorThemePtr(new TextEditorTheme());
	+ TextEditorThemePtr t = std::make_shared<TextEditorTheme>();
	t->fg_default = QColor(255, 255, 255);
	t->bg_default = QColor(48, 48, 48); // t->bg_default = QColor(0, 0, 64);
	t->fg_line_number = QColor(176, 176, 176);
	t->bg_line_number = QColor(64, 64, 64);
	t->fg_cursor = QColor(0, 128, 255);
	t->bg_current_line_number = QColor(96, 96, 96);
	t->bg_diff_unknown = QColor(0, 0, 0);
	t->bg_diff_add = QColor(0, 64, 0);
	t->bg_diff_del = QColor(80, 0, 0);
	return t;
	}

	diff --git a/src/texteditor/TextEditorTheme.h b/src/texteditor/TextEditorTheme.h
	index 769fa54..cdd25b8 100644
	--- a/src/texteditor/TextEditorTheme.h
	+++ b/src/texteditor/TextEditorTheme.h
	@@ -1,70 +1,70 @@
	#ifndef TEXTEDITORTHEME_H
	#define TEXTEDITORTHEME_H

	#include <QColor>
	#include <memory>

	class TextEditorTheme;

	typedef std::shared_ptr<TextEditorTheme> TextEditorThemePtr;

	class TextEditorTheme {
	public:
	QColor fg_default;
	QColor bg_default;
	QColor fg_line_number;
	QColor bg_line_number;
	QColor fg_cursor;
	QColor bg_current;
	QColor bg_current_line;
	QColor bg_current_line_number;
	QColor bg_diff_unknown;
	QColor bg_diff_add;
	QColor bg_diff_del;
	public:
	- TextEditorTheme();
	+ TextEditorTheme() = default;
	QColor fgDefault() const
	{
	return fg_default;
	}
	QColor bgDefault() const
	{
	return bg_default;
	}
	QColor fgLineNumber() const
	{
	return fg_line_number;
	}
	QColor bgLineNumber() const
	{
	return bg_line_number;
	}
	QColor fgCursor() const
	{
	return fg_cursor;
	}
	QColor bgCurrentLine() const
	{
	return bg_current_line;
	}
	QColor bgCurrentLineNumber() const
	{
	return bg_current_line_number;
	}
	QColor bgDiffUnknown() const
	{
	return bg_diff_unknown;
	}
	QColor bgDiffAdd() const
	{
	return bg_diff_add;
	}
	QColor bgDiffDel() const
	{
	return bg_diff_del;
	}
	static TextEditorThemePtr Dark();
	static TextEditorThemePtr Light();
	};

	#endif // TEXTEDITORTHEME_H
	diff --git a/src/texteditor/TextEditorWidget.cpp b/src/texteditor/TextEditorWidget.cpp
	index 7edd7b4..eac4294 100644
	--- a/src/texteditor/TextEditorWidget.cpp
	+++ b/src/texteditor/TextEditorWidget.cpp
	@@ -1,735 +1,735 @@
	#include "TextEditorWidget.h"
	#include "TextEditorWidget.h"

	#include <QDebug>
	#include <QFile>
	#include <QFontDatabase>
	#include <QKeyEvent>
	#include <QPainter>
	#include <QScrollBar>
	#include <QApplication>
	#include <functional>
	#include <QMenu>
	#include <QTextCodec>
	#include <QTimer>

	#include "common/misc.h"
	#include "InputMethodPopup.h"
	#include "unicode.h"

	struct TextEditorWidget::Private {
	TextEditorWidget::RenderingMode rendering_mode = TextEditorWidget::CharacterMode;
	PreEditText preedit;
	QFont text_font;
	InputMethodPopup *ime_popup = nullptr;
	int top_margin = 0;
	int bottom_margin = 0;
	int latin1_width = 0;
	int line_height = 0;
	int ascent = 0;
	int descent = 0;

	QString status_line;
	QScrollBar *scroll_bar_v = nullptr;
	QScrollBar *scroll_bar_h = nullptr;

	TextEditorThemePtr theme;

	int wheel_delta = 0;

	bool is_focus_frame_visible = false;

	unsigned int idle_count = 0;

	std::function<void(void)> custom_context_menu_requested;
	};

	TextEditorWidget::TextEditorWidget(QWidget *parent)
	: QWidget(parent)
	, m(new Private)
	{
	#ifdef Q_OS_WIN
	m->text_font = QFont("MS Gothic", 10);
	#endif
	#ifdef Q_OS_LINUX
	m->text_font = QFont("Monospace", 9);
	#endif
	#ifdef Q_OS_MACX
	m->text_font = QFontDatabase().font("Osaka", "Regular-Mono", 14);
	#endif

	m->top_margin = 0;
	m->bottom_margin = 1;
	QPixmap pm(1, 1);
	QPainter pr(&pm);
	pr.setFont(textFont());
	QFontMetrics fm = pr.fontMetrics();
	m->ascent = fm.ascent();
	m->descent = fm.descent();
	m->latin1_width = fm.width('l');
	m->line_height = m->ascent + m->descent + m->top_margin + m->bottom_margin;
	// qDebug() << latin1Width() << fm.width("\xe3\x80\x93"); // GETA MARK

	initEditor();

	setFont(textFont());

	setAttribute(Qt::WA_InputMethodEnabled);
	#ifdef Q_OS_WIN
	m->ime_popup = new InputMethodPopup();
	m->ime_popup->setFont(font());
	m->ime_popup->setPreEditText(PreEditText());
	#endif

	setContextMenuPolicy(Qt::DefaultContextMenu);

	setRenderingMode(DecoratedMode);

	updateCursorRect(true);

	startTimer(100);
	}

	TextEditorWidget::~TextEditorWidget()
	{
	delete m;
	}

	void TextEditorWidget::setTheme(TextEditorThemePtr theme)
	{
	m->theme = theme;
	}

	TextEditorTheme const *TextEditorWidget::theme() const
	{
	if (!m->theme) {
	const_cast<TextEditorWidget *>(this)->setTheme(TextEditorTheme::Light());
	}
	return m->theme.get();
	}

	void TextEditorWidget::setRenderingMode(RenderingMode mode)
	{
	m->rendering_mode = mode;
	if (m->rendering_mode == DecoratedMode) {
	showLineNumber(false);
	} else {
	showLineNumber(true);
	}
	update();
	}

	TextEditorWidget::RenderingMode TextEditorWidget::renderingMode() const
	{
	return m->rendering_mode;
	}

	void AbstractCharacterBasedApplication::loadExampleFile()
	{
	#ifdef Q_OS_WIN
	QString path = "C:/develop/ore/example.txt";
	#elif defined(Q_OS_MAC)
	QString path = "/Users/soramimi/develop/ore/example.txt";
	#else
	QString path = "/home/soramimi/develop/ore/example.txt";
	#endif
	openFile(path);
	}

	bool TextEditorWidget::event(QEvent *event)
	{
	if (event->type() == QEvent::Polish) {
	clearParsedLine();
	updateVisibility(true, true, true);
	}
	return QWidget::event(event);
	}

	int TextEditorWidget::latin1Width() const
	{
	return m->latin1_width;
	}

	int TextEditorWidget::lineHeight() const
	{
	return m->line_height;
	}

	QPoint TextEditorWidget::mapFromPixel(QPoint const &pt)
	{
	int x = pt.x() / latin1Width();
	int y = pt.y() / lineHeight();
	return QPoint(x, y);
	}

	QPoint TextEditorWidget::mapToPixel(QPoint const &pt)
	{
	int x = pt.x() * latin1Width();
	int y = pt.y() * lineHeight();
	return QPoint(x, y);
	}

	void TextEditorWidget::bindScrollBar(QScrollBar vsb, QScrollBar hsb)
	{
	m->scroll_bar_v = vsb;
	m->scroll_bar_h = hsb;
	}

	void TextEditorWidget::setupForLogWidget(QScrollBar vsb, QScrollBar hsb, TextEditorThemePtr theme)
	{
	bindScrollBar(vsb, hsb);
	setTheme(theme);
	setAutoLayout(true);
	setTerminalMode(true);
	layoutEditor();
	}

	QRect TextEditorWidget::updateCursorRect(bool auto_scroll)
	{
	updateCursorPos(auto_scroll);

	int x = cx()->viewport_org_x + cursorX();
	int y = cx()->viewport_org_y + cursorY();
	x *= latin1Width();
	y *= lineHeight();
	QPoint pt = QPoint(x, y);
	int w = cx()->current_char_span * latin1Width();
	int h = lineHeight();
	cx()->cursor_rect = QRect(pt.x(), pt.y(), w, h);

	QApplication::inputMethod()->update(Qt::ImCursorRectangle);

	return cx()->cursor_rect;
	}

	void TextEditorWidget::internalUpdateScrollBar()
	{
	QScrollBar *sb;

	sb = m->scroll_bar_v;
	if (sb) {
	sb->blockSignals(true);
	sb->setRange(0, document()->lines.size() - cx()->viewport_height / 2);
	sb->setPageStep(editorViewportHeight());
	sb->setValue(cx()->scroll_row_pos);
	sb->blockSignals(false);
	}

	sb = m->scroll_bar_h;
	if (sb) {
	int w = editorViewportWidth();
	sb->blockSignals(true);
	sb->setRange(0, w + 100);
	sb->setPageStep(w);
	sb->setValue(cx()->scroll_col_pos);
	sb->blockSignals(false);
	}

	emit updateScrollBar();
	}

	void TextEditorWidget::internalUpdateVisibility(bool ensure_current_line_visible, bool change_col, bool auto_scroll)
	{
	if (ensure_current_line_visible) {
	ensureCurrentLineVisible();
	}

	updateCursorRect(auto_scroll);

	if (change_col) {
	cx()->current_col_hint = cx()->current_col;
	}

	if (isPaintingSuppressed()) {
	return;
	}

	internalUpdateScrollBar();

	update();
	}

	void TextEditorWidget::updateVisibility(bool ensure_current_line_visible, bool change_col, bool auto_scroll)
	{
	internalUpdateVisibility(ensure_current_line_visible, change_col, auto_scroll);
	emit moved(cx()->current_row, cx()->current_col, cx()->scroll_row_pos, cx()->scroll_col_pos);
	}

	void TextEditorWidget::move(int cur_row, int cur_col, int scr_row, int scr_col, bool auto_scroll)
	{
	if ((cur_row >= 0 && cx()->current_row != cur_row) \|\| (cur_col >= 0 && cx()->current_col != cur_col) \|\| cx()->scroll_row_pos != scr_row \|\| cx()->scroll_col_pos != scr_col) {
	if (cur_row >= 0) cx()->current_row = cur_row;
	if (cur_col >= 0) cx()->current_col = cur_col;
	if (scr_row >= 0) cx()->scroll_row_pos = scr_row;
	if (scr_col >= 0) cx()->scroll_col_pos = scr_col;
	internalUpdateVisibility(false, true, auto_scroll);
	}
	}

	void TextEditorWidget::setPreEditText(const PreEditText &preedit)
	{
	m->preedit = preedit;
	update();
	}

	QFont TextEditorWidget::textFont()
	{
	return m->text_font;
	}

	void TextEditorWidget::drawText(QPainter *painter, int px, int py, QString const &str)
	{
	painter->drawText(px, py + lineHeight() - m->bottom_margin - m->descent, str);
	}

	QColor TextEditorWidget::defaultForegroundColor()
	{
	if (renderingMode() == DecoratedMode) {
	return theme()->fgDefault();
	}
	return Qt::white;
	}

	QColor TextEditorWidget::defaultBackgroundColor()
	{
	if (renderingMode() == DecoratedMode) {
	return theme()->bgDefault();
	}
	return Qt::black;
	}

	QColor TextEditorWidget::colorForIndex(CharAttr const &attr, bool foreground)
	{
	if (foreground && attr.color.isValid()) {
	return attr.color;
	}
	switch (attr.index) {
	case CharAttr::Invert:
	return foreground ? defaultBackgroundColor() : defaultForegroundColor();
	}
	return foreground ? defaultForegroundColor() : Qt::transparent;//defaultBackgroundColor();
	}

	void TextEditorWidget::paintScreen(QPainter *painter)
	{
	int w = screenWidth();
	int h = screenHeight();
	for (int y = 0; y < h; y++) {
	int x = 0;
	while (x < w) {
	std::vector<uint16_t> text;
	text.reserve(w);
	int o = y * w;
	CharAttr charattr;
	Character const *line = &screen()->at(o);
	int n = 0;
	while (x + n < w) {
	uint32_t c = line[x + n].c;
	uint32_t d = 0;
	if (c == 0 \|\| c == 0xffff) break;
	if ((c & 0xfc00) == 0xdc00) {
	// surrogate 2nd
	break;
	}
	uint32_t unicode = c;
	if ((c & 0xfc00) == 0xd800) {
	// surrogate 1st
	if (x + n + 1 < w) {
	uint16_t t = line[x + n + 1].c;
	if ((t & 0xfc00) == 0xdc00) {
	d = t;
	unicode = (((c & 0x03c0) + 0x0040) << 10) \| ((c & 0x003f) << 10) \| (d & 0x03ff);
	} else {
	break;
	}
	} else {
	break;
	}
	}
	int cw = charWidth(unicode);
	if (cw < 1) break;
	if (n == 0) {
	charattr = line[x].a;
	} else if (charattr != line[x + n].a) {
	break;
	}
	if (d == 0) {
	text.push_back(c);
	} else { // surrogate pair
	text.push_back(c);
	text.push_back(d);
	}
	n += cw;
	}
	if (n == 0) {
	n = 1;
	} else if (!text.empty()) {
	QString str = QString::fromUtf16(&text[0], text.size());
	int px = x * latin1Width();
	int py = y * lineHeight();
	painter->setFont(textFont());
	QFontMetrics fm = painter->fontMetrics();
	int w = fm.width(str);
	int h = lineHeight();
	QColor fgcolor = colorForIndex(charattr, true);
	QColor bgcolor = colorForIndex(charattr, false);
	painter->fillRect(px, py, w, h, bgcolor);
	painter->setPen(fgcolor);
	drawText(painter, px, py, str);
	}
	x += n;
	}
	}
	}

	void TextEditorWidget::drawCursor(QPainter *pr)
	{
	int x = cx()->viewport_org_x + cursorX();
	int y = cx()->viewport_org_y + cursorY();
	if (x < cx()->viewport_org_x \|\| x >= cx()->viewport_org_x + cx()->viewport_width) return;
	if (y < cx()->viewport_org_y \|\| y >= cx()->viewport_org_y + cx()->viewport_height) return;
	x *= latin1Width();
	y *= lineHeight();
	int h = lineHeight();
	pr->fillRect(x -1, y, 2, h, theme()->fgCursor());
	pr->fillRect(x - 2, y, 4, 2, theme()->fgCursor());
	pr->fillRect(x - 2, y + h - 2, 4, 2, theme()->fgCursor());
	}

	void TextEditorWidget::drawFocusFrame(QPainter *pr)
	{
	misc::drawFrame(pr, 0, 0, width(), height(), QColor(0, 128, 255, 128));
	misc::drawFrame(pr, 1, 1, width() - 2, height() - 2, QColor(0, 128, 255, 64));
	}

	void TextEditorWidget::paintEvent(QPaintEvent *)
	{
	bool has_focus = hasFocus();

	preparePaintScreen();

	QPainter pr(this);
	pr.fillRect(0, 0, width(), height(), defaultBackgroundColor());

	// diff mode
	if (renderingMode() == DecoratedMode) {
	auto FillRowBackground = [&](int row, QColor const &color){
	int y = editor_cx->viewport_org_y + row - editor_cx->scroll_row_pos;
	y *= lineHeight();
	pr.fillRect(0, y, width(), lineHeight(), color);
	};
	Document const &doc = editor_cx->engine->document;
	for (int i = 0; i < editor_cx->viewport_height; i++) {
	int row = i + editor_cx->scroll_row_pos;
	if (row < doc.lines.size()) {
	if (doc.lines[row].type == Document::Line::Unknown) {
	FillRowBackground(row, theme()->bgDiffUnknown());
	} else if (doc.lines[row].type == Document::Line::Add) {
	FillRowBackground(row, theme()->bgDiffAdd());
	} else if (doc.lines[row].type == Document::Line::Del) {
	FillRowBackground(row, theme()->bgDiffDel());
	}
	}
	}
	}

	auto visualY = [&](TextEditorContext const *context){
	return context->viewport_org_y + editor_cx->current_row - editor_cx->scroll_row_pos;
	};


	if (has_focus) {
	if (isCursorVisible()) {
	// current line
	if (renderingMode() == DecoratedMode) {
	int x = cx()->viewport_org_x * latin1Width();
	int y = visualY(cx()) * lineHeight();
	pr.fillRect(x, y, width() - x, lineHeight(), theme()->bgCurrentLine());
	pr.fillRect(x, y + lineHeight() - 1, width() - x, 1, theme()->fgCursor());
	}
	drawCursor(&pr);
	}
	}

	paintScreen(&pr);

	if (renderingMode() == DecoratedMode) {
	int linenum_width = editor_cx->viewport_org_x * latin1Width();
	auto FillLineNumberBG = [&](int y, int h, QColor color){
	pr.fillRect(0, y, linenum_width - 2, h, color);
	};
	int bottom = editor_cx->bottom_line_y;

	int view_y = editor_cx->viewport_org_y;
	int view_h = editor_cx->viewport_height;
	view_y *= lineHeight();
	view_h *= lineHeight();
	FillLineNumberBG(view_y, view_h, theme()->bgLineNumber());

	paintLineNumbers([&](int y, QString text, Document::Line const *line){
	if (bottom >= 0 && y > bottom) return;
	if (isCursorVisible() && y == visualY(editor_cx.get())) {
	FillLineNumberBG(y * lineHeight(), lineHeight(), theme()->bgCurrentLineNumber());
	}
	pr.setBackground(Qt::transparent);
	pr.setPen(theme()->fgLineNumber());
	drawText(&pr, 0, y * lineHeight(), text);
	if (line) {
	char const *mark = nullptr;
	if (line->type == Document::Line::Add) {
	mark = "+";
	} else if (line->type == Document::Line::Del) {
	mark = "-";
	}
	if (mark) {
	pr.setPen(theme()->fgDefault());
	drawText(&pr, linenum_width - latin1Width() * 3 / 2, y * lineHeight(), mark);
	}
	}
	});

	if (linenum_width > 0) {
	pr.fillRect(0, view_y, 1, view_h, Qt::black);
	}
	pr.fillRect(linenum_width - 2, view_y, 1, view_h, Qt::black);

	if (bottom >= 0) {
	int y = (editor_cx->viewport_org_y + bottom) * lineHeight() + 1;
	pr.fillRect(0, y, width(), 1, Qt::black);
	}
	}

	if (m->is_focus_frame_visible && has_focus) {
	drawFocusFrame(&pr);
	}
	}

	void TextEditorWidget::moveCursorByMouse()
	{
	QPoint mousepos = mapFromGlobal(QCursor::pos());
	int row, col;
	{
	QPoint pos = mapFromPixel(mousepos);
	row = pos.y() + cx()->scroll_row_pos - cx()->viewport_org_y;
	col = pos.x() + cx()->scroll_col_pos - cx()->viewport_org_x;
	}

	// row
	if (!isSingleLineMode()) {
	if (row < 0) {
	row = 0;
	} else {
	int maxrow = cx()->engine->document.lines.size();
	maxrow = maxrow > 0 ? (maxrow - 1) : 0;
	if (row > maxrow) {
	row = maxrow;
	}
	}
	}
	setCursorRow(row, false, true);

	// column
	{
	if (col < 0) {
	col = 0;
	} else {
	int mouse_x = mousepos.x() + (cx()->scroll_col_pos - cx()->viewport_org_x) * m->latin1_width;
	parseLine(nullptr, 0, true);
	std::vector<int> pts;
	makeColumnPosList(&pts);
	int newcol = 0;
	int distance = -1;
	- for (size_t i = 0; i < pts.size(); i++) {
	- int x = pts[i] * m->latin1_width;
	+ for (int pt : pts) {
	+ int x = pt * m->latin1_width;
	int d = abs(x - mouse_x);
	if (distance < 0 \|\| d < distance) {
	distance = d;
	newcol = x;
	}
	}
	col = newcol / m->latin1_width;
	}
	}
	setCursorCol(col, false, true);

	clearParsedLine();
	updateVisibility(false, true, false);
	}

	void TextEditorWidget::mousePressEvent(QMouseEvent *event)
	{
	if (event->button() == Qt::RightButton) return;

	savePos();

	bool shift = (event->modifiers() & Qt::ShiftModifier);
	if (shift) {
	if (isSelectionAnchorEnabled()) {
	setSelectionAnchor(SelectionAnchor::EnabledEasy, false, false);
	} else {
	setSelectionAnchor(SelectionAnchor::EnabledEasy, true, false);
	}
	}

	moveCursorByMouse();

	if (shift) {
	setSelectionAnchor(SelectionAnchor::EnabledEasy, false, false);
	} else {
	setSelectionAnchor(SelectionAnchor::EnabledEasy, true, false);
	}
	selection_anchor_1 = selection_anchor_0;

	if (isTerminalMode()) {
	clearParsedLine();
	restorePos();
	}
	}

	void TextEditorWidget::mouseReleaseEvent(QMouseEvent * /event/)
	{
	}

	void TextEditorWidget::mouseMoveEvent(QMouseEvent * /event/)
	{
	savePos();

	moveCursorByMouse();

	setSelectionAnchor(SelectionAnchor::EnabledEasy, true, false);

	if (isTerminalMode()) {
	clearParsedLine();
	restorePos();
	}
	}

	QVariant TextEditorWidget::inputMethodQuery(Qt::InputMethodQuery q) const
	{
	if (q == Qt::ImCursorRectangle) {
	QRect r = cx()->cursor_rect;
	return r;
	}
	return QWidget::inputMethodQuery(q);
	}

	void TextEditorWidget::inputMethodEvent(QInputMethodEvent *e)
	{
	#ifdef Q_OS_WIN
	PreEditText preedit;
	preedit.text = e->preeditString();
	for (QInputMethodEvent::Attribute const &a : e->attributes()) {
	if (a.type == QInputMethodEvent::TextFormat) {
	QTextFormat f = qvariant_cast<QTextFormat>(a.value);
	if (f.type() == QTextFormat::CharFormat) {
	- preedit.format.push_back(PreEditText::Format(a.start, a.length, f));
	+ preedit.format.emplace_back(a.start, a.length, f);
	} else {
	}
	}
	}
	if (preedit.text.isEmpty()) {
	m->ime_popup->hide();
	} else {
	QPoint pt = mapToGlobal(cx()->cursor_rect.topLeft());
	m->ime_popup->move(pt);
	m->ime_popup->setFont(font());
	m->ime_popup->setPreEditText(preedit);
	m->ime_popup->show();
	}
	#endif
	// qDebug() << e->preeditString() << e->commitString();

	- QString commit_text = e->commitString();
	+ QString const &commit_text = e->commitString();
	if (!commit_text.isEmpty()) {
	write_(commit_text, true);
	}
	}

	void TextEditorWidget::refrectScrollBar()
	{
	int v = m->scroll_bar_v ? m->scroll_bar_v->value() : -1;
	int h = m->scroll_bar_h ? m->scroll_bar_h->value() : -1;
	move(-1, -1, v, h, false);
	}

	void TextEditorWidget::layoutEditor()
	{
	if (isAutoLayout()) {
	int h = height() / lineHeight();
	int w = width() / latin1Width();
	setScreenSize(w, h, false);
	}
	AbstractTextEditorApplication::layoutEditor();
	}

	void TextEditorWidget::resizeEvent(QResizeEvent * /event/)
	{
	if (isAutoLayout()) {
	layoutEditor();
	}
	internalUpdateScrollBar();
	}

	void TextEditorWidget::wheelEvent(QWheelEvent *event)
	{
	int pos = 0;
	m->wheel_delta += event->delta();
	while (m->wheel_delta >= 40) {
	m->wheel_delta -= 40;
	pos--;
	}
	while (m->wheel_delta <= -40) {
	m->wheel_delta += 40;
	pos++;
	}
	if (m->scroll_bar_v) {
	m->scroll_bar_v->setValue(m->scroll_bar_v->value() + pos);
	}
	}

	void TextEditorWidget::setFocusFrameVisible(bool f)
	{
	m->is_focus_frame_visible = f;
	}



	void TextEditorWidget::timerEvent(QTimerEvent *)
	{
	if (!isChanged()) {
	m->idle_count++;
	if (m->idle_count >= 10) {
	m->idle_count = 0;
	emit idle();
	}
	}
	}

	void TextEditorWidget::contextMenuEvent(QContextMenuEvent *event)
	{
	QMenu menu;
	QAction *a_cut = nullptr;
	if (!isReadOnly() && !isTerminalMode()) a_cut = menu.addAction("Cut");
	QAction *a_copy = menu.addAction("Copy");
	QAction *a_paste = nullptr;
	if (!isReadOnly() && !isTerminalMode()) a_paste = menu.addAction("Paste");
	QAction *a = menu.exec(misc::contextMenuPos(this, event));
	if (a) {
	if (a == a_cut) {
	editCut();
	return;
	}
	if (a == a_copy) {
	editCopy();
	return;
	}
	if (a == a_paste) {
	editPaste();
	return;
	}
	}
	}




	diff --git a/src/texteditor/unicode.cpp b/src/texteditor/unicode.cpp
	index acc5c6c..4ee66a9 100644
	--- a/src/texteditor/unicode.cpp
	+++ b/src/texteditor/unicode.cpp
	@@ -1,369 +1,364 @@

	#include "unicode.h"


	namespace unicode_helper_ {

	class reader {
	public:
	- virtual ~reader() {}
	+ virtual ~reader() = default;
	virtual int get() = 0;
	};

	class writer8 {
	public:
	- virtual ~writer8() {}
	+ virtual ~writer8() = default;
	virtual void put(int c) = 0;
	};

	class writer16 {
	public:
	- virtual ~writer16() {}
	+ virtual ~writer16() = default;
	virtual void put(int c) = 0;
	};

	void clear_state(utf8_reader_state_t *s)
	{
	s->a = 0;
	s->b = 0;
	}

	int decode_utf8(utf8_reader_state_t *state, uint8_t c)
	{
	if (c & 0x80) {
	if (c & 0x40) {
	state->a = c;
	if (c & 0x20) {
	if (c & 0x10) {
	if (c & 0x08) {
	if (c & 0x04) {
	state->b = c & 0x01;
	} else {
	state->b = c & 0x03;
	}
	} else {
	state->b = c & 0x07;
	}
	} else {
	state->b = c & 0x0f;
	}
	} else {
	state->b = c & 0x1f;
	}
	return -1;
	} else {
	state->a <<= 1;
	state->b = (state->b << 6) \| (c & 0x3f);
	if ((state->a & 0x40) == 0) {
	return state->b;
	}
	return -1;
	}
	} else {
	state->a = 0;
	state->b = 0;
	return c;
	}
	}

	void encode_utf8(writer8 *writer, uint32_t code)
	{
	if (code < 0x80) {
	writer->put(code);
	} else if (code < 0x800) {
	writer->put((code >> 6) \| 0xc0);
	writer->put((code & 0x3f) \| 0x80);
	} else if (code < 0x10000) {
	writer->put((code >> 12) \| 0xe0);
	writer->put(((code >> 6) & 0x3f) \| 0x80);
	writer->put((code & 0x3f) \| 0x80);
	} else if (code < 0x200000) {
	writer->put((code >> 18) \| 0xf0);
	writer->put(((code >> 12) & 0x3f) \| 0x80);
	writer->put(((code >> 6) & 0x3f) \| 0x80);
	writer->put((code & 0x3f) \| 0x80);
	} else if (code < 0x4000000) {
	writer->put((code >> 24) \| 0xf8);
	writer->put(((code >> 18) & 0x3f) \| 0x80);
	writer->put(((code >> 12) & 0x3f) \| 0x80);
	writer->put(((code >> 6) & 0x3f) \| 0x80);
	writer->put((code & 0x3f) \| 0x80);
	} else {
	writer->put((code >> 30) \| 0xfc);
	writer->put(((code >> 24) & 0x3f) \| 0x80);
	writer->put(((code >> 18) & 0x3f) \| 0x80);
	writer->put(((code >> 12) & 0x3f) \| 0x80);
	writer->put(((code >> 6) & 0x3f) \| 0x80);
	writer->put((code & 0x3f) \| 0x80);
	}
	}

	void encode_utf16(writer16 *writer, uint32_t code)
	{
	if (code >= 0x010000 && code <= 0x10ffff) {
	uint16_t hi = (code - 0x10000) / 0x400 + 0xD800;
	uint16_t lo = (code - 0x10000) % 0x400 + 0xDC00;
	writer->put(hi);
	writer->put(lo);
	return;
	}
	writer->put(code);
	}

	//

	utf8decoder::utf8decoder(const char begin, const char end)
	: begin(begin)
	, end(end)
	, pos(0)
	{
	clear_state(&s);
	}

	uint32_t utf8decoder::next()
	{
	while (begin + pos < end) {
	int c = decode_utf8(&s, (uint8_t)begin[pos]);
	pos++;
	if (c >= 0) return c;
	}
	return 0;
	}

	} // namespace


	//

	utf32::utf32(const uint32_t ptr, const uint32_t end)
	{
	data.ptr = ptr;
	data.end = end;
	}

	utf32::utf32(const uint32_t *ptr)
	{
	data.ptr = ptr;
	for (data.end = ptr; *data.end; data.end++);
	}

	utf32::utf32(const uint32_t *ptr, size_t len)
	{
	data.ptr = ptr;
	data.end = ptr + len;
	}

	uint32_t utf32::next()
	{
	if (data.ptr && data.ptr < data.end) {
	return *data.ptr++;
	}
	return 0;
	}

	//

	utf16::utf16(const uint16_t ptr, const uint16_t end)
	{
	data.ptr = ptr;
	data.end = end;
	}

	utf16::utf16(const uint16_t *ptr)
	{
	data.ptr = ptr;
	for (data.end = ptr; *data.end; data.end++);
	}

	utf16::utf16(const uint16_t *ptr, size_t len)
	{
	data.ptr = ptr;
	data.end = ptr + len;
	}

	uint32_t utf16::next()
	{
	if (data.ptr && data.ptr < data.end) {
	uint32_t code = *data.ptr++;
	if (code >= 0xd800 && code < 0xdc00) {
	if (data.ptr < data.end) {
	uint32_t low = *data.ptr;
	if (low >= 0xdc00 && low < 0xe000) {
	code = 0x10000 + (code - 0xd800) * 0x0400 + (low - 0xdc00);
	data.ptr++;
	}
	}
	}
	return code;
	}
	return 0;
	}

	//

	class utf8encoder::internal_writer : public unicode_helper_::writer8 {
	public:
	char *dst;
	int len;
	public:
	internal_writer(char *p)
	: dst(p)
	, len(0)
	{
	}
	- virtual ~internal_writer()
	- {
	- }
	- virtual void put(int c)
	+ ~internal_writer() override = default;
	+ void put(int c) override
	{
	dst[len++] = c;
	}
	};

	utf8encoder::utf8encoder(abstract_unicode_reader *reader)
	{
	set(reader);
	}

	void utf8encoder::set(abstract_unicode_reader *reader)
	{
	data.reader = reader;
	data.len = 0;
	data.pos = 0;
	}

	bool utf8encoder::next_()
	{
	if (data.pos < data.len) {
	data.c = data.buf[data.pos];
	data.pos++;
	return true;
	}
	data.c = 0;
	return false;
	}

	bool utf8encoder::next()
	{
	if (next_()) {
	return true;
	}
	if (data.reader) {
	uint32_t code = data.reader->next();
	if (code) {
	internal_writer w(data.buf);
	unicode_helper_::encode_utf8(&w, code);
	data.len = w.len;
	data.pos = 0;
	return next_();
	}
	}
	return false;
	}

	char utf8encoder::get()
	{
	if (next()) {
	return data.c;
	}
	return 0;
	}

	int utf8encoder::pos() const
	{
	return data.pos;
	}

	//

	class utf16encoder::internal_writer : public unicode_helper_::writer16 {
	public:
	uint16_t *dst;
	- int len;
	+ int len = 0;
	public:
	internal_writer(uint16_t *p)
	: dst(p)
	- , len(0)
	- {
	- }
	- virtual ~internal_writer()
	{
	}
	- virtual void put(int c)
	+ ~internal_writer() override = default;
	+ void put(int c) override
	{
	dst[len++] = c;
	}
	};

	utf16encoder::utf16encoder(abstract_unicode_reader *reader)
	{
	set(reader);
	}

	void utf16encoder::set(abstract_unicode_reader *reader)
	{
	data.reader = reader;
	data.len = 0;
	data.pos = 0;
	}

	bool utf16encoder::next_()
	{
	if (data.pos < data.len) {
	data.c = data.buf[data.pos];
	data.pos++;
	return true;
	}
	data.c = 0;
	return false;
	}

	bool utf16encoder::next()
	{
	if (next_()) {
	return true;
	}
	if (data.reader) {
	uint32_t code = data.reader->next();
	if (code) {
	internal_writer w(data.buf);
	unicode_helper_::encode_utf16(&w, code);
	data.len = w.len;
	data.pos = 0;
	return next_();
	}
	}
	return false;
	}

	uint16_t utf16encoder::get()
	{
	if (next()) {
	return data.c;
	}
	return 0;
	}

	//

	utf8::utf8(const char ptr, const char end)
	: reader(ptr, end)
	{
	}

	utf8::utf8(const char *ptr)
	: reader(ptr, ptr + strlen(ptr))
	{
	}

	utf8::utf8(const char *ptr, size_t len)
	: reader(ptr, ptr + len)
	{
	}

	uint32_t utf8::next()
	{
	return reader.next();
	}


	diff --git a/src/unix/UnixProcess.cpp b/src/unix/UnixProcess.cpp
	index 286d992..00ae7b1 100644
	--- a/src/unix/UnixProcess.cpp
	+++ b/src/unix/UnixProcess.cpp
	@@ -1,337 +1,337 @@
	#include "UnixProcess.h"
	#include <stdlib.h>
	#include <unistd.h>
	#include <time.h>
	#include <sys/types.h>
	#include <sys/wait.h>
	#include <sys/time.h>
	#include <QDebug>
	#include <QMutex>
	#include <QThread>
	#include <deque>

	class OutputReaderThread : public QThread {
	private:
	int fd;
	QMutex *mutex;
	std::deque<char> *buffer;
	protected:
	- void run()
	+ void run() override
	{
	while (1) {
	char buf[1024];
	int n = read(fd, buf, sizeof(buf));
	if (n < 1) break;
	if (buffer) {
	QMutexLocker lock(mutex);
	buffer->insert(buffer->end(), buf, buf + n);
	}
	}
	}
	public:
	OutputReaderThread(int fd, QMutex mutex, std::deque<char> out)
	: fd(fd)
	, mutex(mutex)
	, buffer(out)
	{

	}
	};

	class UnixProcessThread : public QThread {
	public:
	- QMutex *mutex;
	+ QMutex *mutex = nullptr;
	std::vector<std::string> argvec;
	std::vector<char *> args;
	std::deque<char> inq;
	std::deque<char> outq;
	std::deque<char> errq;
	bool use_input = false;
	int fd_in_read = -1;
	int pid = 0;
	int exit_code = -1;
	bool close_input_later = false;
	protected:
	public:
	void init(QMutex *mutex, bool use_input)
	{
	this->mutex = mutex;
	this->use_input = use_input;
	}
	void reset()
	{
	argvec.clear();
	args.clear();
	inq.clear();
	outq.clear();
	errq.clear();
	use_input = false;
	fd_in_read = -1;
	pid = 0;
	exit_code = -1;
	close_input_later = false;
	}

	protected:
	- void run()
	+ void run() override
	{
	exit_code = -1;
	const int R = 0;
	const int W = 1;
	const int E = 2;
	int stdin_pipe[3] = { -1, -1, -1 };
	int stdout_pipe[3] = { -1, -1, -1 };
	int stderr_pipe[3] = { -1, -1, -1 };

	try {
	int fd_out_write;
	int fd_err_write;
	int pid;

	if (pipe(stdin_pipe) < 0) {
	throw std::string("failed: pipe");
	}

	if (pipe(stdout_pipe) < 0) {
	throw std::string("failed: pipe");
	}

	if (pipe(stderr_pipe) < 0) {
	throw std::string("failed: pipe");
	}

	pid = fork();
	if (pid < 0) {
	throw std::string("failed: fork");
	}

	if (pid == 0) { // child
	putenv(const_cast<char *>("LANG=C"));
	close(stdin_pipe[W]);
	close(stdout_pipe[R]);
	close(stderr_pipe[R]);
	dup2(stdin_pipe[R], R);
	dup2(stdout_pipe[W], W);
	dup2(stderr_pipe[W], E);
	close(stdin_pipe[R]);
	close(stdout_pipe[W]);
	close(stderr_pipe[E]);
	if (execvp(args[0], &args[0]) < 0) {
	close(stdin_pipe[R]);
	close(stdout_pipe[W]);
	close(stderr_pipe[E]);
	fprintf(stderr, "failed: exec\n");
	exit(1);
	}
	}

	close(stdin_pipe[R]);
	close(stdout_pipe[W]);
	close(stderr_pipe[W]);
	fd_in_read = stdin_pipe[W];
	fd_out_write = stdout_pipe[R];
	fd_err_write = stderr_pipe[R];

	//

	if (!use_input) {
	closeInput();
	}

	// WriteThread t0(fd_in_read, mutex, &input, &close_input_later);
	OutputReaderThread t1(fd_out_write, mutex, &outq);
	OutputReaderThread t2(fd_err_write, mutex, &errq);
	// if (use_input) t0.start();
	t1.start();
	t2.start();

	while (1) {
	QThread::currentThread()->msleep(1);
	int status = 0;
	if (waitpid(pid, &status, WNOHANG) == pid) {
	if (WIFEXITED(status)) {
	exit_code = WEXITSTATUS(status);
	break;
	}
	if (WIFSIGNALED(status)) {
	exit_code = -1;
	break;
	}
	}
	{
	QMutexLocker lock(mutex);
	int n = inq.size();
	if (n > 0) {
	while (n > 0) {
	char tmp[1024];
	int l = n;
	if (l > (int)sizeof(tmp)) {
	l = sizeof(tmp);
	}
	std::copy(inq.begin(), inq.begin() + l, tmp);
	inq.erase(inq.begin(), inq.begin() + l);
	if (fd_in_read != -1) {
	int r = write(fd_in_read, tmp, l);
	(void)r;
	}
	n -= l;
	}
	} else if (close_input_later) {
	closeInput();
	}
	}
	}

	// if (use_input) {
	// t0.requestInterruption();
	// t0.wait();
	// }
	t1.wait();
	t2.wait();

	close(fd_out_write);

	} catch (std::string const &e) {
	close(stdin_pipe[R]);
	close(stdin_pipe[W]);
	close(stdout_pipe[R]);
	close(stdout_pipe[W]);
	close(stderr_pipe[R]);
	close(stderr_pipe[W]);
	fprintf(stderr, "%s\n", e.c_str());
	exit(1);
	}
	}
	public:
	void writeInput(const char *ptr, int len)
	{
	QMutexLocker lock(mutex);
	inq.insert(inq.end(), ptr, ptr + len);
	}

	void closeInput()
	{
	if (fd_in_read >= 0) {
	close(fd_in_read);
	fd_in_read = -1;
	}
	}
	};

	struct UnixProcess::Private {
	QMutex mutex;
	UnixProcessThread th;
	};

	UnixProcess::UnixProcess()
	: m(new Private)
	{

	}

	UnixProcess::~UnixProcess()
	{
	delete m;
	}

	void UnixProcess::parseArgs(std::string const &cmd, std::vector<std::string> *out)
	{
	out->clear();
	char const *begin = cmd.c_str();
	char const *end = begin + cmd.size();
	std::vector<char> tmp;
	char const *ptr = begin;
	int quote = 0;
	while (1) {
	int c = 0;
	if (ptr < end) {
	c = *ptr & 0xff;
	}
	if (c == '\"' && ptr + 2 < end && ptr[1] == '\"' && ptr[2] == '\"') {
	tmp.push_back(c);
	ptr += 3;
	} else {
	if (quote != 0 && c != 0) {
	if (c == quote) {
	quote = 0;
	} else {
	tmp.push_back(c);
	}
	} else if (c == '\"') {
	quote = c;
	} else if (isspace(c) \|\| c == 0) {
	if (!tmp.empty()) {
	std::string s(&tmp[0], tmp.size());
	out->push_back(s);
	}
	if (c == 0) break;
	tmp.clear();
	} else {
	tmp.push_back(c);
	}
	ptr++;
	}
	}
	}

	void UnixProcess::start(const QString &command, bool use_input)
	{
	std::string cmd = command.toStdString();
	parseArgs(cmd, &m->th.argvec);
	- if (m->th.argvec.size() > 0) {
	+ if (!m->th.argvec.empty()) {
	for (std::string const &s : m->th.argvec) {
	m->th.args.push_back(const_cast<char *>(s.c_str()));
	}
	m->th.args.push_back(nullptr);

	m->th.init(&m->mutex, use_input);
	m->th.start();
	}
	}

	int UnixProcess::wait()
	{
	m->th.wait();

	outbytes.clear();
	errbytes.clear();
	if (!m->th.outq.empty()) outbytes.insert(outbytes.end(), m->th.outq.begin(), m->th.outq.end());
	if (!m->th.errq.empty()) errbytes.insert(errbytes.end(), m->th.errq.begin(), m->th.errq.end());
	int exit_code = m->th.exit_code;
	m->th.reset();
	return exit_code;
	}

	void UnixProcess::writeInput(const char *ptr, int len)
	{
	m->th.writeInput(ptr, len);
	}

	void UnixProcess::closeInput(bool justnow)
	{
	if (justnow) {
	m->th.closeInput();
	} else {
	m->th.close_input_later = true;
	}
	}

	QString UnixProcess::outstring()
	{
	if (outbytes.empty()) return QString();
	std::vector<char> v;
	v.insert(v.end(), outbytes.begin(), outbytes.end());
	return QString::fromUtf8(&v[0], v.size());
	}

	QString UnixProcess::errstring()
	{
	if (errbytes.empty()) return QString();
	std::vector<char> v;
	v.insert(v.end(), errbytes.begin(), errbytes.end());
	return QString::fromUtf8(&v[0], v.size());
	}




	diff --git a/src/urlencode.cpp b/src/urlencode.cpp
	index 8f0741f..d30b0df 100644
	--- a/src/urlencode.cpp
	+++ b/src/urlencode.cpp
	@@ -1,152 +1,152 @@

	#include "urlencode.h"
	#include "charvec.h"
	#include <stdlib.h>
	#include <stdio.h>
	#include <ctype.h>
	#include <string.h>
	#ifdef WIN32
	#pragma warning(disable:4996)
	#endif


	static void url_encode_(char const ptr, char const end, std::vector<char> *out)
	{
	while (ptr < end) {
	int c = (unsigned char)*ptr;
	ptr++;
	if (isalnum(c) \|\| strchr("_.-~", c)) {
	print(out, c);
	} else if (c == ' ') {
	print(out, '+');
	} else {
	char tmp[10];
	sprintf(tmp, "%%%02X", c);
	print(out, tmp[0]);
	print(out, tmp[1]);
	print(out, tmp[2]);
	}
	}
	}

	std::string url_encode(char const str, char const end)
	{
	if (!str) {
	return std::string();
	}

	std::vector<char> out;
	out.reserve(end - str + 10);

	url_encode_(str, end, &out);

	return to_stdstr(out);
	}

	std::string url_encode(char const *str, size_t len)
	{
	return url_encode(str, str + len);
	}

	std::string url_encode(char const *str)
	{
	return url_encode(str, strlen(str));
	}

	std::string url_encode(std::string const &str)
	{
	char const *begin = str.c_str();
	char const *end = begin + str.size();
	char const *ptr = begin;

	while (ptr < end) {
	int c = (unsigned char)*ptr;
	if (isalnum(c) \|\| strchr("_.-~", c)) {
	// thru
	} else {
	break;
	}
	ptr++;
	}
	if (ptr == end) {
	return str;
	}

	std::vector<char> out;
	out.reserve(str.size() + 10);

	out.insert(out.end(), begin, ptr);
	url_encode_(ptr, end, &out);

	return to_stdstr(out);
	}

	static void url_decode_(char const ptr, char const end, std::vector<char> *out)
	{
	while (ptr < end) {
	int c = (unsigned char)*ptr;
	ptr++;
	if (c == '+') {
	c = ' ';
	} else if (c == '%' && isxdigit((unsigned char)ptr[0]) && isxdigit((unsigned char)ptr[1])) {
	char tmp[3]; // '%XX'
	tmp[0] = ptr[0];
	tmp[1] = ptr[1];
	tmp[2] = 0;
	- c = strtol(tmp, NULL, 16);
	+ c = strtol(tmp, nullptr, 16);
	ptr += 2;
	}
	print(out, c);
	}
	}

	std::string url_decode(char const str, char const end)
	{
	if (!str) {
	return std::string();
	}

	std::vector<char> out;
	out.reserve(end - str + 10);

	url_decode_(str, end, &out);

	return to_stdstr(out);
	}

	std::string url_decode(char const *str, size_t len)
	{
	return url_decode(str, str + len);
	}

	std::string url_decode(char const *str)
	{
	return url_decode(str, strlen(str));
	}

	std::string url_decode(std::string const &str)
	{
	char const *begin = str.c_str();
	char const *end = begin + str.size();
	char const *ptr = begin;

	while (ptr < end) {
	int c = *ptr & 0xff;
	if (c == '+' \|\| c == '%') {
	break;
	}
	ptr++;
	}
	if (ptr == end) {
	return str;
	}


	std::vector<char> out;
	out.reserve(str.size() + 10);

	out.insert(out.end(), begin, ptr);
	url_decode_(ptr, end, &out);

	return to_stdstr(out);
	}
	diff --git a/src/webclient.cpp b/src/webclient.cpp
	index 8ceb0a0..323203d 100644
	--- a/src/webclient.cpp
	+++ b/src/webclient.cpp
	@@ -1,1086 +1,1083 @@

	#include "webclient.h"
	#include <string.h>

	#ifdef _WIN32
	#include <winsock2.h>
	#include <windows.h>
	#pragma comment(lib, "ws2_32.lib")
	#if USE_OPENSSL
	#pragma comment(lib, "libeay32.lib")
	#pragma comment(lib, "ssleay32.lib")
	#endif
	typedef SOCKET socket_t;
	#pragma warning(disable:4996)
	#else
	#include <unistd.h>
	#include <sys/types.h>
	#include <sys/socket.h>
	#include <sys/ioctl.h>
	#include <netinet/in.h>
	#include <net/if.h>
	#include <netdb.h>
	#define closesocket(S) ::close(S)
	typedef int socket_t;
	#define INVALID_SOCKET (-1)
	#define SOCKET_ERROR (-1)
	#define stricmp(A, B) strcasecmp(A, B)
	#define strnicmp(A, B, C) strncasecmp(A, B, C)
	#endif

	#if USE_OPENSSL
	#include <openssl/crypto.h>
	#include <openssl/ssl.h>
	#include <openssl/err.h>
	#include <openssl/evp.h>
	#include <openssl/rand.h>
	#include <openssl/x509.h>
	#else
	typedef void SSL;
	typedef void SSL_CTX;
	#endif

	#include <assert.h>
	#include "charvec.h"

	#define USER_AGENT "Generic Web Client"

	struct WebContext::Private {
	SSL_CTX *ctx;
	bool use_keep_alive = false;
	WebProxy http_proxy;
	WebProxy https_proxy;
	};

	WebClient::URL::URL(std::string const &addr)
	{
	data.full_request = addr;

	char const *str = addr.c_str();
	char const *left;
	char const *right;
	left = str;
	right = strstr(left, "://");
	if (right) {
	data.scheme.assign(str, right - str);
	left = right + 3;
	}
	right = strchr(left, '/');
	if (!right) {
	right = left + strlen(left);
	}
	if (right) {
	char const *p = strchr(left, ':');
	if (p && left < p && p < right) {
	int n = 0;
	char const *q = p + 1;
	while (q < right) {
	if (isdigit(*q & 0xff)) {
	n = n * 10 + (*q - '0');
	} else {
	n = -1;
	break;
	}
	q++;
	}
	data.host.assign(left, p - left);
	if (n > 0 && n < 65536) {
	data.port = n;
	}
	} else {
	data.host.assign(left, right - left);
	}
	data.path = right;
	}
	}

	bool WebClient::URL::isssl() const
	{
	if (scheme() == "https") return true;
	if (scheme() == "http") return false;
	if (port() == 443) return true;
	return false;
	}

	void WebClientHandler::abort(const std::string &message)
	{
	throw WebClient::Error(message);
	}

	struct WebClient::Private {
	std::vector<std::string> request_header;
	Error error;
	Response response;
	WebContext *webcx;
	int crlf_state = 0;
	size_t content_offset = 0;
	std::string last_host_name;
	int last_port = 0;
	bool keep_alive = false;
	socket_t sock = INVALID_SOCKET;
	SSL *ssl = nullptr;
	};

	WebClient::WebClient(WebContext *webcx)
	: m(new Private)
	{
	assert(webcx);
	m->webcx = webcx;
	}

	WebClient::~WebClient()
	{
	close();
	delete m;
	}

	void WebClient::initialize()
	{
	#ifdef _WIN32
	WSADATA wsaData;
	WORD wVersionRequested;
	wVersionRequested = MAKEWORD(1, 1);
	WSAStartup(wVersionRequested, &wsaData);
	atexit(cleanup);
	#endif
	#if USE_OPENSSL
	OpenSSL_add_all_algorithms();
	#endif
	}

	void WebClient::cleanup()
	{
	#if USE_OPENSSL
	ERR_free_strings();
	#endif
	#ifdef _WIN32
	WSACleanup();
	#endif
	}

	void WebClient::reset()
	{
	m->request_header.clear();
	m->error = Error();
	m->response = Response();
	m->crlf_state = 0;
	m->content_offset = 0;
	}

	void WebClient::output_debug_string(char const *str)
	{
	if (0) {
	#ifdef _WIN32
	OutputDebugStringA(str);
	#else
	fwrite(str, 1, strlen(str), stderr);
	#endif
	}
	}

	void WebClient::output_debug_strings(std::vector<std::string> const &vec)
	{
	for (std::string const &s : vec) {
	output_debug_string((s + '\n').c_str());
	}
	}

	WebClient::Error const &WebClient::error() const
	{
	return m->error;
	}

	void WebClient::clear_error()
	{
	m->error = Error();
	}

	int WebClient::get_port(URL const url, char const scheme, char const *protocol)
	{
	int port = url->port();
	if (port < 1 \|\| port > 65535) {
	struct servent *s;
	s = getservbyname(url->scheme().c_str(), protocol);
	if (s) {
	port = ntohs(s->s_port);
	} else {
	s = getservbyname(scheme, protocol);
	if (s) {
	port = ntohs(s->s_port);
	}
	}
	if (port < 1 \|\| port > 65535) {
	port = 80;
	}
	}
	return port;
	}

	static inline std::string to_s(size_t n)
	{
	char tmp[100];
	sprintf(tmp, "%u", (int)n);
	return tmp;
	}

	void WebClient::set_default_header(URL const &url, Post const *post, RequestOption const &opt)
	{
	std::vector<std::string> header;
	auto AddHeader = [&](std::string const &s){
	header.push_back(s);
	};
	AddHeader("Host: " + url.host());
	AddHeader("User-Agent: " USER_AGENT);
	AddHeader("Accept: /");
	if (opt.keep_alive) {
	AddHeader("Connection: keep-alive");
	} else {
	AddHeader("Connection: close");
	}
	if (post) {
	AddHeader("Content-Length: " + to_s(post->data.size()));
	std::string ct = "Content-Type: ";
	if (post->content_type.empty()) {
	ct += "application/octet-stream";
	} else if (post->content_type == CT_MULTIPART_FORM_DATA) {
	ct += post->content_type;
	if (!post->boundary.empty()) {
	ct += "; boundary=";
	ct += post->boundary;
	}
	} else {
	ct += post->content_type;
	}
	AddHeader(ct);
	}
	header.insert(header.end(), m->request_header.begin(), m->request_header.end());
	m->request_header = std::move(header);
	}

	std::string WebClient::make_http_request(URL const &url, Post const post, WebProxy const proxy, bool https)
	{
	std::string str;

	str = post ? "POST " : "GET ";

	if (proxy && !https) {
	str += url.data.full_request;
	str += " HTTP/1.0";
	str += "\r\n";
	} else {
	str += url.path();
	str += " HTTP/1.0";
	str += "\r\n";
	}

	for (std::string const &s: m->request_header) {
	str += s;
	str += "\r\n";
	}

	str += "\r\n";
	return str;
	}

	void WebClient::parse_http_header(char const begin, char const end, std::vector<std::string> *header)
	{
	if (begin < end) {
	char const *left = begin;
	char const *right = left;
	while (1) {
	if (right >= end) {
	break;
	}
	if (right == '\r' \|\| right == '\n') {
	if (left < right) {
	header->push_back(std::string(left, right));
	}
	if (right + 1 < end && *right == '\r' && right[1] == '\n') {
	right++;
	}
	right++;
	if (right == '\r' \|\| right == '\n') {
	if (right + 1 < end && *right == '\r' && right[1] == '\n') {
	right++;
	}
	right++;
	left = right;
	break;
	}
	left = right;
	} else {
	right++;
	}
	}
	}
	}

	void WebClient::parse_http_header(const char begin, const char end, WebClient::Response *out)
	{
	*out = Response();
	parse_http_header(begin, end, &out->header);
	parse_header(&out->header, out);
	}

	static void send_(socket_t s, char const *ptr, int len)
	{
	while (len > 0) {
	int n = send(s, ptr, len, 0);
	if (n < 1 \|\| n > len) {
	throw WebClient::Error("send request failed.");
	}
	ptr += n;
	len -= n;
	}
	}

	void WebClient::on_end_header(std::vector<char> const vec, WebClientHandler handler)
	{
	if (vec->empty()) return;
	char const *begin = &vec->at(0);
	char const *end = begin + vec->size();
	parse_http_header(begin, end, &m->response);
	if (handler) {
	handler->checkHeader(this);
	}
	}

	void WebClient::append(char const ptr, size_t len, std::vector<char> out, WebClientHandler *handler)
	{
	size_t offset = out->size();
	out->insert(out->end(), ptr, ptr + len);

	if (m->crlf_state < 0) {
	// nop
	} else {
	for (size_t i = 0; i < len; i++) {
	int c = ptr[i] & 0xff;
	if (c == '\r') {
	m->crlf_state \|= 1;
	} else if (c == '\n') {
	m->crlf_state \|= 1;
	m->crlf_state++;
	} else {
	m->crlf_state = 0;
	}
	if (m->crlf_state == 4) {
	m->content_offset = offset + i + 1;
	on_end_header(out, handler);
	m->crlf_state = -1;
	break;
	}
	}
	}
	if (handler && m->content_offset > 0) {
	offset = out->size();
	if (offset > m->content_offset) {
	size_t len = offset - m->content_offset;
	char const *ptr = &out->at(m->content_offset);
	handler->checkContent(ptr, len);
	}
	}
	}

	static char stristr(char str1, char const *str2)
	{
	size_t len1 = strlen(str1);
	size_t len2 = strlen(str2);
	for (size_t i = 0; i + len2 <= len1; i++) {
	if (strnicmp(str1 + i, str2, len2) == 0) {
	return str1 + i;
	}
	}
	return nullptr;
	}

	class ResponseHeader {
	public:
	size_t pos = 0;
	std::vector<char> line;
	int content_length = -1;
	bool connection_keep_alive = false;
	bool connection_close = false;
	int lf = 0;
	enum State {
	Header,
	Content,
	};
	State state = Header;
	void put(int c)
	{
	pos++;
	if (state == Header) {
	if (c== '\r' \|\| c == '\n') {
	if (!line.empty()) {
	line.push_back(0);
	char *begin = &line[0];
	char *p = strchr(begin, ':');
	if (p && *p == ':') {
	*p++ = 0;
	auto IS = [&](char const *name){ return stricmp(begin, name) == 0; };
	if (IS("content-length")) {
	- content_length = strtol(p, 0, 10);
	+ content_length = strtol(p, nullptr, 10);
	} else if (IS("connection")) {
	if (stristr(p, "keep-alive")) {
	connection_keep_alive = true;
	} else if (stristr(p, "close")) {
	connection_close = true;
	}
	}
	}
	line.clear();
	}
	if (c== '\r') {
	return;
	}
	if (c == '\n') {
	lf++;
	if (lf == 2) {
	state = Content;
	}
	return;
	}
	}
	lf = 0;
	line.push_back(c);
	}
	}
	};

	void WebClient::receive_(RequestOption const &opt, std::function<int(char , int)> rcv, std::vector<char> out)
	{
	char buf[4096];
	size_t pos = 0;
	ResponseHeader rh;
	while (1) {
	int n;
	if (rh.state == ResponseHeader::Content && rh.content_length >= 0) {
	n = rh.pos + rh.content_length - pos;
	if (n > (int)sizeof(buf)) {
	n = sizeof(buf);
	}
	if (n < 1) break;
	} else {
	n = sizeof(buf);
	}
	n = rcv(buf, n);
	if (n < 1) break;
	if (0) { // debug
	fwrite(buf, 1, n, stderr);
	}
	append(buf, n, out, opt.handler);
	pos += n;
	if (rh.state == ResponseHeader::Header) {
	for (int i = 0; i < n; i++) {
	rh.put(buf[i]);
	if (rh.state == ResponseHeader::Content) {
	m->keep_alive = rh.connection_keep_alive && !rh.connection_close;
	break;
	}
	}
	}
	}
	}

	bool WebClient::http_get(URL const &request_url, Post const post, RequestOption const &opt, std::vector<char> out)
	{
	clear_error();
	out->clear();

	URL server_url;

	WebProxy const *proxy = m->webcx->http_proxy();
	if (proxy) {
	server_url = URL(proxy->server);
	} else {
	server_url = request_url;
	}

	std::string hostname = server_url.host();
	int port = get_port(&server_url, "http", "tcp");

	m->keep_alive = opt.keep_alive && hostname == m->last_host_name && port == m->last_port;
	if (!m->keep_alive) close();

	if (m->sock == INVALID_SOCKET) {
	struct hostent *servhost;
	struct sockaddr_in server;

	servhost = gethostbyname(hostname.c_str());
	if (!servhost) {
	throw Error("gethostbyname failed.");
	}

	memset((char *)&server, 0, sizeof(server));
	server.sin_family = AF_INET;

	memcpy((char *)&server.sin_addr, servhost->h_addr, servhost->h_length);

	server.sin_port = htons(port);

	m->sock = socket(AF_INET, SOCK_STREAM, 0);
	if (m->sock == INVALID_SOCKET) {
	throw Error("socket failed.");
	}

	if (connect(m->sock, (struct sockaddr*) &server, sizeof(server)) == SOCKET_ERROR) {
	throw Error("connect failed.");
	}
	}
	m->last_host_name = hostname;
	m->last_port = port;

	set_default_header(request_url, post, opt);

	std::string request = make_http_request(request_url, post, proxy, false);

	send_(m->sock, request.c_str(), (int)request.size());
	if (post && !post->data.empty()) {
	send_(m->sock, (char const *)&post->data[0], (int)post->data.size());
	}

	m->crlf_state = 0;
	m->content_offset = 0;

	receive_(opt, [&](char *ptr, int len){
	return recv(m->sock, ptr, len, 0);
	}, out);

	if (!m->keep_alive) close();

	return true;
	}

	bool WebClient::https_get(const URL &request_url, Post const post, RequestOption const &opt, std::vector<char> out)
	{
	#if USE_OPENSSL

	if (!m->webcx \|\| !m->webcx->m->ctx) {
	output_debug_string("SSL context is null.\n");
	return false;
	}

	auto sslctx = [&](){ return m->webcx->m->ctx; };

	clear_error();
	out->clear();

	auto get_ssl_error = []()->std::string{
	char tmp[1000];
	unsigned long e = ERR_get_error();
	ERR_error_string_n(e, tmp, sizeof(tmp));
	return tmp;
	};

	URL server_url;

	WebProxy const *proxy = m->webcx->https_proxy();
	if (proxy) {
	server_url = URL(proxy->server);
	} else {
	server_url = request_url;
	}

	std::string hostname = server_url.host();
	int port = get_port(&server_url, "https", "tcp");

	m->keep_alive = opt.keep_alive && hostname == m->last_host_name && port == m->last_port;
	if (!m->keep_alive) close();

	socket_t sock = m->sock;
	SSL *ssl = m->ssl;
	if (sock == INVALID_SOCKET \|\| !ssl) {
	int ret;
	struct hostent *servhost;
	struct sockaddr_in server;

	servhost = gethostbyname(server_url.host().c_str());
	if (!servhost) {
	throw Error("gethostbyname failed.");
	}

	memset((char *)&server, 0, sizeof(server));
	server.sin_family = AF_INET;

	memcpy((char *)&server.sin_addr, servhost->h_addr, servhost->h_length);

	server.sin_port = htons(port);

	if (sock == INVALID_SOCKET) {
	sock = socket(AF_INET, SOCK_STREAM, 0);
	if (sock == INVALID_SOCKET) {
	throw Error("socket failed.");
	}
	if (connect(sock, (struct sockaddr*) &server, sizeof(server)) == SOCKET_ERROR) {
	throw Error("connect failed.");
	}
	}

	if (proxy) { // testing
	char port[10];
	sprintf(port, ":%u", get_port(&request_url, "https", "tcp"));

	std::string str = "CONNECT ";
	str += request_url.data.host;
	str += port;
	str += " HTTP/1.0\r\n\r\n";
	send_(sock, str.c_str(), str.size());
	char tmp[1000];
	int n = recv(sock, tmp, sizeof(tmp), 0);
	int i;
	for (i = 0; i < n; i++) {
	char c = tmp[i];
	if (c < 0x20) break;
	}
	if (i > 0) {
	std::string s(tmp, i);
	s = "proxy: " + s + '\n';
	#ifdef _WIN32
	OutputDebugStringA(s.c_str());
	#else
	fprintf(stderr, "%s", tmp);
	#endif
	}
	}

	ssl = SSL_new(sslctx());
	if (!ssl) {
	throw Error(get_ssl_error());
	}

	SSL_set_options(ssl, SSL_OP_NO_SSLv2);
	SSL_set_options(ssl, SSL_OP_NO_SSLv3);

	ret = SSL_set_fd(ssl, sock);
	if (ret == 0) {
	throw Error(get_ssl_error());
	}

	RAND_poll();
	while (RAND_status() == 0) {
	unsigned short rand_ret = rand() % 65536;
	RAND_seed(&rand_ret, sizeof(rand_ret));
	}

	ret = SSL_connect(ssl);
	if (ret != 1) {
	throw Error(get_ssl_error());
	}

	std::string cipher = SSL_get_cipher(ssl);
	cipher += '\n';
	output_debug_string(cipher.c_str());

	std::string version = SSL_get_cipher_version(ssl);
	version += '\n';
	output_debug_string(version.c_str());

	X509 *x509 = SSL_get_peer_certificate(ssl);
	if (x509) {
	#ifndef OPENSSL_NO_SHA1
	std::string fingerprint;
	for (int i = 0; i < SHA_DIGEST_LENGTH; i++) {
	if (i > 0) {
	fingerprint += ':';
	}
	char tmp[10];
	sprintf(tmp, "%02X", x509->sha1_hash[i]);
	fingerprint += tmp;
	}
	fingerprint += '\n';
	output_debug_string(fingerprint.c_str());
	#endif
	long l = SSL_get_verify_result(ssl);
	if (l == X509_V_OK) {
	// ok
	} else {
	// wrong
	std::string err = X509_verify_cert_error_string(l);
	err += '\n';
	output_debug_string(err.c_str());
	}

	std::vector<std::string> vec;

	auto GETSTRINGS = [](X509_NAME x509name, std::vector<std::string> out){
	out->clear();
	if (x509name) {
	int n = X509_NAME_entry_count(x509name);
	for (int i = 0; i < n; i++) {
	X509_NAME_ENTRY *entry = X509_NAME_get_entry(x509name, i);
	ASN1_STRING *asn1str = X509_NAME_ENTRY_get_data(entry);
	int asn1len = ASN1_STRING_length(asn1str);
	unsigned char *p = ASN1_STRING_data(asn1str);
	std::string str((char const *)p, asn1len);
	out->push_back(str);
	}
	}
	};

	X509_NAME *subject = X509_get_subject_name(x509);
	GETSTRINGS(subject, &vec);
	output_debug_string("--- subject ---\n");
	output_debug_strings(vec);

	X509_NAME *issuer = X509_get_issuer_name(x509);
	GETSTRINGS(issuer, &vec);
	output_debug_string("--- issuer ---\n");
	output_debug_strings(vec);

	ASN1_TIME *not_before = X509_get_notBefore(x509);
	ASN1_TIME *not_after = X509_get_notAfter(x509);
	(void)not_before;
	(void)not_after;

	X509_free(x509);
	} else {
	// wrong
	}
	}
	m->last_host_name = hostname;
	m->last_port = port;

	set_default_header(request_url, post, opt);

	std::string request = make_http_request(request_url, post, proxy, true);

	auto SEND = [&](char const *ptr, int len){
	while (len > 0) {
	int n = SSL_write(ssl, ptr, len);
	if (n < 1 \|\| n > len) {
	throw WebClient::Error(get_ssl_error());
	}
	ptr += n;
	len -= n;
	}
	};

	SEND(request.c_str(), (int)request.size());
	if (post && !post->data.empty()) {
	SEND((char const *)&post->data[0], (int)post->data.size());
	}

	m->crlf_state = 0;
	m->content_offset = 0;

	receive_(opt, [&](char *ptr, int len){
	return SSL_read(ssl, ptr, len);
	}, out);

	m->sock = sock;
	m->ssl = ssl;
	if (!m->keep_alive) close();
	return true;
	#endif
	return false;
	}

	void WebClient::get(URL const &url, Post const post, Response out, WebClientHandler *handler)
	{
	reset();
	try {
	if (!m->webcx->m) {
	throw Error("WebContext is null.");
	}
	RequestOption opt;
	opt.keep_alive = m->webcx->m->use_keep_alive;
	opt.handler = handler;
	std::vector<char> res;
	if (url.isssl()) {
	#if USE_OPENSSL
	https_get(url, post, opt, &res);
	#endif
	} else {
	http_get(url, post, opt, &res);
	}
	if (!res.empty()) {
	char const *begin = &res[0];
	char const *end = begin + res.size();
	char const *ptr = begin + m->content_offset;
	if (ptr < end) {
	out->content.assign(ptr, end);
	}
	}
	return;
	} catch (Error const &e) {
	m->error = e;
	close();
	}
	*out = Response();
	}

	void WebClient::parse_header(std::vector<std::string> const header, WebClient::Response res)
	{
	- if (header->size() > 0) {
	+ if (!header->empty()) {
	std::string const &line = header->at(0);
	char const *begin = line.c_str();
	char const *end = begin + line.size();
	if (line.size() > 5 && strncmp(line.c_str(), "HTTP/", 5) == 0) {
	int state = 0;
	res->version.hi = res->version.lo = res->code = 0;
	char const *ptr = begin + 5;
	while (1) {
	int c = 0;
	if (ptr < end) {
	c = *ptr & 0xff;
	}
	switch (state) {
	case 0:
	if (isdigit(c)) {
	res->version.hi = res->version.hi * 10 + (c - '0');
	} else if (c == '.') {
	state = 1;
	} else {
	state = -1;
	}
	break;
	case 1:
	if (isdigit(c)) {
	res->version.lo = res->version.lo * 10 + (c - '0');
	} else if (isspace(c)) {
	state = 2;
	} else {
	state = -1;
	}
	break;
	case 2:
	if (isspace(c)) {
	if (res->code != 0) {
	state = -1;
	}
	} else if (isdigit(c)) {
	res->code = res->code * 10 + (c - '0');
	} else {
	state = -1;
	}
	break;
	default:
	state = -1;
	break;
	}
	if (c == 0 \|\| state < 0) {
	break;
	}
	ptr++;
	}
	}
	}
	}

	std::string WebClient::header_value(std::vector<std::string> const *header, std::string const &name)
	{
	for (size_t i = 1; i < header->size(); i++) {
	std::string const &line = header->at(i);
	char const *begin = line.c_str();
	char const *end = begin + line.size();
	char const *colon = strchr(begin, ':');
	if (colon) {
	if (strnicmp(begin, name.c_str(), name.size()) == 0) {
	char const *ptr = colon + 1;
	while (ptr < end && isspace(*ptr & 0xff)) ptr++;
	return std::string(ptr, end);
	}
	}
	}
	return std::string();
	}

	std::string WebClient::header_value(std::string const &name) const
	{
	return header_value(&m->response.header, name);
	}

	std::string WebClient::content_type() const
	{
	std::string s = header_value("Content-Type");
	char const *begin = s.c_str();
	char const *end = begin + s.size();
	char const *ptr = begin;
	while (ptr < end) {
	int c = *ptr & 0xff;
	if (c == ';' \|\| c < 0x21) break;
	ptr++;
	}
	if (ptr < end) return std::string(begin, ptr);
	return s;
	}

	size_t WebClient::content_length() const
	{
	return m->response.content.size();
	}

	char const *WebClient::content_data() const
	{
	if (m->response.content.empty()) return "";
	return &m->response.content[0];
	}

	int WebClient::get(URL const &url, WebClientHandler *handler)
	{
	get(url, nullptr, &m->response, handler);
	return m->response.code;
	}

	int WebClient::post(URL const &url, Post const post, WebClientHandler handler)
	{
	get(url, post, &m->response, handler);
	return m->response.code;
	}

	void WebClient::close()
	{
	#if USE_OPENSSL
	if (m->ssl) {
	SSL_shutdown(m->ssl);
	SSL_free(m->ssl);
	m->ssl = nullptr;
	}
	#endif
	if (m->sock != INVALID_SOCKET) {
	shutdown(m->sock, 2); // SD_BOTH or SHUT_RDWR
	closesocket(m->sock);
	m->sock = INVALID_SOCKET;
	}
	}

	void WebClient::add_header(std::string const &text)
	{
	m->request_header.push_back(text);
	}

	WebClient::Response const &WebClient::response() const
	{
	return m->response;
	}

	void WebClient::make_application_www_form_urlencoded(char const begin, char const end, WebClient::Post *out)
	{
	*out = WebClient::Post();
	out->content_type = CT_APPLICATION_X_WWW_FORM_URLENCODED;
	print(&out->data, begin, end - begin);
	}

	void WebClient::make_multipart_form_data(std::vector<Part> const &parts, WebClient::Post *out, std::string const &boundary)
	{
	*out = WebClient::Post();
	out->content_type = CT_MULTIPART_FORM_DATA;
	out->boundary = boundary;

	for (Part const &part : parts) {
	print(&out->data, "--");
	print(&out->data, out->boundary);
	print(&out->data, "\r\n");
	if (!part.content_disposition.type.empty()) {
	ContentDisposition const &cd = part.content_disposition;
	std::string s;
	s = "Content-Disposition: ";
	s += cd.type;
	auto Add = [&s](std::string const &name, std::string const &value){
	if (!value.empty()) {
	s += "; " + name + "=\"";
	s += value;
	s += '\"';
	}
	};
	Add("name", cd.name);
	Add("filename", cd.filename);
	print(&out->data, s);
	print(&out->data, "\r\n");
	}
	if (!part.content_type.empty()) {
	print(&out->data, "Content-Type: " + part.content_type + "\r\n");
	}
	if (!part.content_transfer_encoding.empty()) {
	print(&out->data, "Content-Transfer-Encoding: " + part.content_transfer_encoding + "\r\n");
	}
	print(&out->data, "\r\n");
	print(&out->data, part.data, part.size);
	print(&out->data, "\r\n");
	}

	print(&out->data, "--");
	print(&out->data, out->boundary);
	print(&out->data, "--\r\n");
	}

	void WebClient::make_multipart_form_data(char const data, size_t size, WebClient::Post out, std::string const &boundary)
	{
	Part part;
	part.data = data;
	part.size = size;
	std::vector<Part> parts;
	parts.push_back(part);
	make_multipart_form_data(parts, out, boundary);
	}


	//

	WebContext::WebContext()
	: m(new Private)
	{
	#if USE_OPENSSL
	SSL_load_error_strings();
	SSL_library_init();
	m->ctx = SSL_CTX_new(SSLv23_client_method());
	#endif
	}

	WebContext::~WebContext()
	{
	#if USE_OPENSSL
	SSL_CTX_free(m->ctx);
	#endif
	delete m;
	}

	void WebContext::set_keep_alive_enabled(bool f)
	{
	m->use_keep_alive = f;
	}

	void WebContext::set_http_proxy(const std::string &proxy)
	{
	m->http_proxy = WebProxy();
	m->http_proxy.server = proxy;
	}

	void WebContext::set_https_proxy(const std::string &proxy)
	{
	m->https_proxy = WebProxy();
	m->https_proxy.server = proxy;
	}

	const WebProxy *WebContext::http_proxy() const
	{
	if (!m->http_proxy.empty()) {
	return &m->http_proxy;
	- } else {
	- return nullptr;
	}
	+ return nullptr;
	}

	const WebProxy *WebContext::https_proxy() const
	{
	if (!m->https_proxy.empty()) {
	return &m->https_proxy;
	- } else {
	- if (!m->http_proxy.empty()) {
	- return &m->http_proxy;
	- } else {
	- return nullptr;
	- }
	}
	+ if (!m->http_proxy.empty()) {
	+ return &m->http_proxy;
	+ }
	+ return nullptr;
	}

	bool WebContext::load_cacert(char const *path)
	{
	#if USE_OPENSSL
	- int r = SSL_CTX_load_verify_locations(m->ctx, path, 0);
	+ int r = SSL_CTX_load_verify_locations(m->ctx, path, nullptr);
	return r == 1;
	#else
	return false;
	#endif
	}

	diff --git a/src/win32/Win32Process.cpp b/src/win32/Win32Process.cpp
	index 62b1e72..a5870f9 100644
	--- a/src/win32/Win32Process.cpp
	+++ b/src/win32/Win32Process.cpp
	@@ -1,276 +1,276 @@
	#include <windows.h>
	#include "Win32Process.h"
	#include <QThread>
	#include <QTextCodec>
	#include <deque>
	#include <QDir>
	#include <QDebug>
	#include <QDateTime>
	#include <QMutex>


	class OutputReaderThread : public QThread {
	private:
	HANDLE hRead;
	QMutex *mutex;
	std::deque<char> *buffer;
	protected:
	- void run()
	+ void run() override
	{
	while (1) {
	char buf[256];
	DWORD len = 0;
	if (!ReadFile(hRead, buf, sizeof(buf), &len, nullptr)) break;
	if (len < 1) break;
	if (buffer) {
	QMutexLocker lock(mutex);
	buffer->insert(buffer->end(), buf, buf + len);
	}
	}
	}
	public:
	OutputReaderThread(HANDLE hRead, QMutex mutex, std::deque<char> buffer)
	: hRead(hRead)
	, mutex(mutex)
	, buffer(buffer)
	{
	}
	};

	class Win32ProcessThread : public QThread {
	friend class Win32Process2;
	private:
	public:
	QMutex *mutex = nullptr;
	std::string command;
	DWORD exit_code = -1;
	std::deque<char> inq;
	std::deque<char> outq;
	std::deque<char> errq;
	bool use_input = false;
	HANDLE hInputWrite = INVALID_HANDLE_VALUE;
	bool close_input_later = false;

	void reset()
	{
	mutex = nullptr;
	command.clear();
	exit_code = -1;
	inq.clear();
	outq.clear();
	errq.clear();
	use_input = false;
	hInputWrite = INVALID_HANDLE_VALUE;
	close_input_later = false;
	}

	protected:
	- void run()
	+ void run() override
	{
	try {
	hInputWrite = INVALID_HANDLE_VALUE;
	HANDLE hOutputRead = INVALID_HANDLE_VALUE;
	HANDLE hErrorRead = INVALID_HANDLE_VALUE;

	HANDLE hInputWriteTmp = INVALID_HANDLE_VALUE;
	HANDLE hOutputReadTmp = INVALID_HANDLE_VALUE;
	HANDLE hErrorReadTmp = INVALID_HANDLE_VALUE;
	HANDLE hInputRead = INVALID_HANDLE_VALUE;
	HANDLE hOutputWrite = INVALID_HANDLE_VALUE;
	HANDLE hErrorWrite = INVALID_HANDLE_VALUE;

	SECURITY_ATTRIBUTES sa;

	sa.nLength = sizeof(SECURITY_ATTRIBUTES);
	- sa.lpSecurityDescriptor = 0;
	+ sa.lpSecurityDescriptor = nullptr;
	sa.bInheritHandle = TRUE;

	HANDLE currproc = GetCurrentProcess();

	// パイプを作成
	if (!CreatePipe(&hInputRead, &hInputWriteTmp, &sa, 0))
	throw std::string("Failed to CreatePipe");

	if (!CreatePipe(&hOutputReadTmp, &hOutputWrite, &sa, 0))
	throw std::string("Failed to CreatePipe");

	if (!CreatePipe(&hErrorReadTmp, &hErrorWrite, &sa, 0))
	throw std::string("Failed to CreatePipe");

	// 子プロセスの標準入力
	if (!DuplicateHandle(currproc, hInputWriteTmp, currproc, &hInputWrite, 0, FALSE, DUPLICATE_SAME_ACCESS))
	throw std::string("Failed to DupliateHandle");

	// 子プロセスの標準出力
	if (!DuplicateHandle(currproc, hOutputReadTmp, currproc, &hOutputRead, 0, FALSE, DUPLICATE_SAME_ACCESS))
	throw std::string("Failed to DupliateHandle");

	// 子プロセスのエラー出力
	if (!DuplicateHandle(currproc, hErrorReadTmp, currproc, &hErrorRead, 0, FALSE, DUPLICATE_SAME_ACCESS))
	throw std::string("Failed to DuplicateHandle");

	// 不要なハンドルを閉じる
	CloseHandle(hInputWriteTmp);
	CloseHandle(hOutputReadTmp);
	CloseHandle(hErrorReadTmp);

	// プロセス起動
	PROCESS_INFORMATION pi;
	STARTUPINFOA si;

	ZeroMemory(&si, sizeof(STARTUPINFO));
	si.cb = sizeof(STARTUPINFO);
	si.dwFlags = STARTF_USESTDHANDLES \| STARTF_USESHOWWINDOW;
	si.wShowWindow = SW_HIDE;
	si.hStdInput = hInputRead; // 標準入力ハンドル
	si.hStdOutput = hOutputWrite; // 標準出力ハンドル
	si.hStdError = hErrorWrite; // エラー出力ハンドル

	char tmp = (char )alloca(command.size() + 1);
	strcpy(tmp, command.c_str());
	- if (!CreateProcessA(0, tmp, 0, 0, TRUE, CREATE_NO_WINDOW, 0, 0, &si, &pi)) {
	+ if (!CreateProcessA(nullptr, tmp, nullptr, nullptr, TRUE, CREATE_NO_WINDOW, nullptr, nullptr, &si, &pi)) {
	throw std::string("Failed to CreateProcess");
	}

	// 不要なハンドルを閉じる
	CloseHandle(hInputRead);
	CloseHandle(hOutputWrite);
	CloseHandle(hErrorWrite);

	if (!use_input) {
	closeInput();
	}

	OutputReaderThread t1(hOutputRead, mutex, &outq);
	OutputReaderThread t2(hErrorRead, mutex, &errq);
	t1.start();
	t2.start();

	while (WaitForSingleObject(pi.hProcess, 1) != WAIT_OBJECT_0) {
	QMutexLocker lock(mutex);
	int n = inq.size();
	if (n > 0) {
	while (n > 0) {
	char tmp[1024];
	int l = n;
	if (l > sizeof(tmp)) {
	l = sizeof(tmp);
	}
	std::copy(inq.begin(), inq.begin() + l, tmp);
	inq.erase(inq.begin(), inq.begin() + l);
	if (hInputWrite != INVALID_HANDLE_VALUE) {
	DWORD written;
	WriteFile(hInputWrite, tmp, l, &written, nullptr);
	}
	n -= l;
	}
	} else if (close_input_later) {
	closeInput();
	}
	}

	t1.wait();
	t2.wait();

	CloseHandle(hOutputRead);
	CloseHandle(hErrorRead);

	GetExitCodeProcess(pi.hProcess, &exit_code);

	// 終了
	CloseHandle(pi.hThread);
	CloseHandle(pi.hProcess);
	} catch (std::string const &e) { // 例外
	OutputDebugStringA(e.c_str());
	}
	}
	public:
	void closeInput()
	{
	CloseHandle(hInputWrite);
	hInputWrite = INVALID_HANDLE_VALUE;
	}
	void writeInput(const char *ptr, int len)
	{
	QMutexLocker lock(mutex);
	inq.insert(inq.end(), ptr, ptr + len);
	}
	};

	QString toQString(const std::vector<char> &vec)
	{
	if (vec.empty()) return QString();
	return QString::fromUtf8(&vec[0], vec.size());
	}

	struct Win32Process::Private {
	QMutex mutex;
	Win32ProcessThread th;

	};

	Win32Process::Win32Process()
	: m(new Private)
	{

	}

	Win32Process::~Win32Process()
	{
	delete m;
	}

	void Win32Process::start(QString const &command, bool use_input)
	{
	QTextCodec *sjis = QTextCodec::codecForName("Shift_JIS");
	Q_ASSERT(sjis);

	QByteArray ba = sjis->fromUnicode(command);
	ba.push_back((char)0);
	char const *cmd = ba.data();

	m->th.mutex = &m->mutex;
	m->th.use_input = use_input;
	m->th.command = cmd;
	m->th.start();
	}

	int Win32Process::wait()
	{
	m->th.wait();

	outbytes.clear();
	errbytes.clear();
	outbytes.insert(outbytes.end(), m->th.outq.begin(), m->th.outq.end());
	errbytes.insert(errbytes.end(), m->th.errq.begin(), m->th.errq.end());
	int exit_code = m->th.exit_code;
	m->th.reset();
	return exit_code;
	}

	QString Win32Process::outstring() const
	{
	return toQString(outbytes);
	}

	QString Win32Process::errstring() const
	{
	return toQString(errbytes);
	}

	void Win32Process::writeInput(char const *ptr, int len)
	{
	m->th.writeInput(ptr, len);
	}

	void Win32Process::closeInput(bool justnow)
	{
	if (justnow) {
	m->th.closeInput();
	} else {
	m->th.close_input_later = true;
	}
	}



	diff --git a/src/win32/Win32PtyProcess.cpp b/src/win32/Win32PtyProcess.cpp
	index 908d566..63581b7 100644
	--- a/src/win32/Win32PtyProcess.cpp
	+++ b/src/win32/Win32PtyProcess.cpp
	@@ -1,256 +1,256 @@
	#include <windows.h>
	#include "Win32PtyProcess.h"
	#include <deque>

	#include <winpty.h>

	#include <QDir>
	#include <QMutex>

	namespace {

	class OutputReaderThread : public QThread {
	friend class ::Win32PtyProcess;
	private:
	public:
	HANDLE handle;
	std::deque<char> *output_queue = nullptr;
	std::vector<char> *output_vector = nullptr;
	protected:
	- void run();
	+ void run() override;
	public:
	void start(HANDLE hOutput, std::deque<char> outq, std::vector<char> outv);
	};

	void OutputReaderThread::run()
	{
	char buf[1024];
	while (1) {
	if (isInterruptionRequested()) break;
	DWORD amount = 0;
	BOOL ret = ReadFile(handle, buf, sizeof(buf), &amount, nullptr);
	if (!ret \|\| amount == 0) {
	break;
	}
	output_queue->insert(output_queue->end(), buf, buf + amount);
	output_vector->insert(output_vector->end(), buf, buf + amount);
	}
	}

	void OutputReaderThread::start(HANDLE hOutput, std::deque<char> outq, std::vector<char> outv)
	{
	handle = hOutput;
	output_queue = outq;
	output_vector = outv;
	QThread::start();
	}

	} // namespace

	// Win32PtyProcess

	struct Win32PtyProcess::Private {
	QMutex mutex;
	QString command;
	std::deque<char> output_queue;
	std::vector<char> output_vector;
	OutputReaderThread th_output_reader;
	HANDLE hProcess = INVALID_HANDLE_VALUE;
	HANDLE hOutput = INVALID_HANDLE_VALUE;
	HANDLE hInput = INVALID_HANDLE_VALUE;
	DWORD exit_code = 0;
	};

	Win32PtyProcess::Win32PtyProcess()
	: m(new Private)
	{
	}

	Win32PtyProcess::~Win32PtyProcess()
	{
	delete m;
	}

	bool Win32PtyProcess::isRunning() const
	{
	return QThread::isRunning();
	}

	QString Win32PtyProcess::getProgram(const QString &cmdline)
	{
	ushort const *begin = cmdline.utf16();
	ushort const *end = begin + cmdline.size();
	ushort const *ptr = begin;
	bool quote = 0;
	while (1) {
	ushort c = 0;
	if (ptr < end) {
	c = *ptr;
	}
	if (c == '\"') {
	if (quote) {
	quote = false;
	} else {
	quote = true;
	}
	ptr++;
	} else if (quote && c != 0) {
	ptr++;
	} else if (QChar(c).isSpace() \|\| c == 0) {
	break;
	} else {
	ptr++;
	}
	}
	ushort const *left = begin;
	ushort const *right = ptr;
	if (left + 1 < right) {
	if (left[0] == '\"' && right[-1] == '\"') {
	left++;
	right--;
	}
	}
	return QString::fromUtf16(left, right - left);
	}

	void Win32PtyProcess::run()
	{
	QString program;
	program = getProgram(m->command);

	QDir::setCurrent(change_dir);

	winpty_config_t *agent_cfg = winpty_config_new(WINPTY_FLAG_PLAIN_OUTPUT, nullptr);
	winpty_t *pty = winpty_open(agent_cfg, nullptr);
	winpty_config_free(agent_cfg);

	m->hInput = CreateFileW(winpty_conin_name(pty), GENERIC_WRITE, 0, nullptr, OPEN_EXISTING, 0, nullptr);
	m->hOutput = CreateFileW(winpty_conout_name(pty), GENERIC_READ, 0, nullptr, OPEN_EXISTING, 0, nullptr);
	m->th_output_reader.start(m->hOutput, &m->output_queue, &m->output_vector);

	winpty_spawn_config_t spawn_cfg = winpty_spawn_config_new(WINPTY_SPAWN_FLAG_AUTO_SHUTDOWN, (wchar_t const )program.utf16(), (wchar_t const *)m->command.utf16(), nullptr, nullptr, nullptr);
	BOOL spawnSuccess = winpty_spawn(pty, spawn_cfg, &m->hProcess, nullptr, nullptr, nullptr);

	if (spawnSuccess) {
	while (1) {
	if (isInterruptionRequested()) break;
	GetExitCodeProcess(m->hProcess, &m->exit_code);
	if (m->exit_code == STILL_ACTIVE) {
	// running
	msleep(1);
	} else {
	break;
	}
	}
	}

	// プロセスの出力を確実に取得するため、ここで output reader スレッドの終了を待つ
	m->th_output_reader.wait();

	winpty_free(pty);

	CloseHandle(m->hInput);
	CloseHandle(m->hOutput);
	CloseHandle(m->hProcess);
	m->hInput = INVALID_HANDLE_VALUE;
	m->hOutput = INVALID_HANDLE_VALUE;
	m->hProcess = INVALID_HANDLE_VALUE;

	emit completed();
	}

	int Win32PtyProcess::readOutput(char *dstptr, int maxlen)
	{
	int len = m->output_queue.size();
	if (len > maxlen) {
	len = maxlen;
	}
	if (len > 0) {
	auto begin = m->output_queue.begin();
	std::copy(begin, begin + len, dstptr);
	m->output_queue.erase(begin, begin + len);
	}
	return len;
	}

	void Win32PtyProcess::writeInput(const char *ptr, int len)
	{
	char const *begin = ptr;
	char const *end = begin + len;
	char const *left = begin;
	char const *right = begin;
	while (1) {
	int c = -1;
	if (right < end) {
	c = *right & 0xff;
	}
	if (c == '\r' \|\| c == '\n' \|\| c < 0) {
	if (left < right) {
	DWORD written;
	- WriteFile(m->hInput, left, right - left, &written, 0);
	+ WriteFile(m->hInput, left, right - left, &written, nullptr);
	}
	if (c < 0) break;
	right++;
	if (c == '\r') {
	if (*right == '\n') {
	right++;
	}
	c = '\r';
	} else if (c == '\n') {
	c = '\r';
	} else {
	c = -1;
	}
	if (c >= 0) {
	DWORD written;
	- WriteFile(m->hInput, &c, 1, &written, 0);
	+ WriteFile(m->hInput, &c, 1, &written, nullptr);
	}
	left = right;
	} else {
	right++;
	}
	}
	}

	void Win32PtyProcess::start(const QString &cmdline)
	{
	if (isRunning()) return;
	m->command = cmdline;
	QThread::start();
	}

	bool Win32PtyProcess::wait(unsigned long time)
	{
	return QThread::wait(time) && m->th_output_reader.wait(time);
	}

	void Win32PtyProcess::stop()
	{
	// 標準出力読み出しスレッドを強制終了しないとwinptyプロセスが終了してくれない
	m->th_output_reader.terminate();
	// プロセススレッド停止
	requestInterruption();
	wait();
	}

	const std::vector<char> *Win32PtyProcess::result() const
	{
	return &m->output_vector;
	}

	int Win32PtyProcess::getExitCode() const
	{
	return m->exit_code;
	}

	QString Win32PtyProcess::getMessage() const
	{
	QString s;
	if (!m->output_vector.empty()) {
	s = QString::fromUtf8(&m->output_vector[0], m->output_vector.size());
	}
	return s;
	}



	diff --git a/src/win32/event.cpp b/src/win32/event.cpp
	index 77c67ec..134f316 100644
	--- a/src/win32/event.cpp
	+++ b/src/win32/event.cpp
	@@ -1,71 +1,71 @@

	#ifdef WIN32
	#include <windows.h>
	#else
	#include <pthread.h>
	#include <sys/time.h>
	#endif

	#include "event.h"

	#ifdef WIN32

	Event::Event()
	{
	- _handle = CreateEvent(0, FALSE, FALSE, 0);
	+ _handle = CreateEvent(nullptr, FALSE, FALSE, nullptr);
	}

	Event::~Event()
	{
	CloseHandle(_handle);
	}

	bool Event::wait(int ms)
	{
	if (ms < 0) {
	return WaitForSingleObject(_handle, INFINITE) == WAIT_OBJECT_0;
	} else {
	return WaitForSingleObject(_handle, ms) == WAIT_OBJECT_0;
	}
	}

	void Event::signal()
	{
	SetEvent(_handle);
	}

	#else

	Event::Event()
	{
	pthread_cond_init(&_cond, 0);
	}

	Event::~Event()
	{
	pthread_cond_destroy(&_cond);
	}

	bool Event::wait(int ms)
	{
	if (ms < 0) {
	pthread_cond_wait(&_cond, &_mutex._handle);
	return false;
	} else {
	struct timeval tv;
	struct timespec ts;
	gettimeofday(&tv, 0);
	long long t = (long long)tv.tv_sec * 1000000 + tv.tv_usec;
	t = t * 1000 + ms * 1000000LL;
	ts.tv_sec = t / 1000000000;
	ts.tv_nsec = t % 1000000000;
	return pthread_cond_timedwait(&_cond, &_mutex._handle, &ts) == EINTR;
	}
	}

	void Event::signal()
	{
	pthread_cond_signal(&_cond);
	}

	#endif
	diff --git a/src/win32/thread.cpp b/src/win32/thread.cpp
	index 8d06197..5b1c4e0 100644
	--- a/src/win32/thread.cpp
	+++ b/src/win32/thread.cpp
	@@ -1,80 +1,80 @@
	#include "thread.h"

	#ifdef WIN32
	unsigned int __stdcall Thread::run_(void *arg)
	{
	Thread me = (Thread )arg;
	me->run();
	me->_running = false;
	return 0;
	}
	#else
	void Thread::run_(void arg)
	{
	- Thread me = (Thread )arg;
	+ auto me = (Thread )arg;
	me->run();
	me->_running = false;
	- return 0;
	+ return nullptr;
	}
	#endif

	void Thread::start()
	{
	detach();
	_interrupted = false;
	#ifdef WIN32
	- _thread_handle = (HANDLE)_beginthreadex(0, 0, run_, this, CREATE_SUSPENDED, 0);
	+ _thread_handle = (HANDLE)_beginthreadex(nullptr, 0, run_, this, CREATE_SUSPENDED, nullptr);
	ResumeThread(_thread_handle);
	#else
	- pthread_create(&_thread_handle, NULL, run_, this);
	+ pthread_create(&_thread_handle, nullptr, run_, this);
	#endif
	_running = true;
	}

	void Thread::stop()
	{
	_interrupted = true;
	}

	void Thread::join()
	{
	if (_running) {
	#ifdef WIN32
	WaitForSingleObject(_thread_handle, INFINITE);
	#else
	- pthread_join(_thread_handle, 0);
	+ pthread_join(_thread_handle, nullptr);
	#endif
	_running = false;
	}
	_interrupted = false;
	}

	void Thread::terminate()
	{
	if (_running) {
	#ifdef WIN32
	TerminateThread(_thread_handle, 0);
	#else
	pthread_cancel(_thread_handle);
	#endif
	_running = false;
	}
	_interrupted = false;
	}

	void Thread::detach()
	{
	#ifdef WIN32
	if (_thread_handle) {
	CloseHandle(_thread_handle);
	- _thread_handle = 0;
	+ _thread_handle = nullptr;
	}
	#else
	if (_thread_handle) {
	pthread_detach(_thread_handle);
	- _thread_handle = 0;
	+ _thread_handle = nullptr;
	}
	#endif
	_running = false;
	_interrupted = false;
	}
	diff --git a/src/win32/win32.cpp b/src/win32/win32.cpp
	index 58d7880..0b53983 100644
	--- a/src/win32/win32.cpp
	+++ b/src/win32/win32.cpp
	@@ -1,354 +1,342 @@
	#include <QFileInfo>
	#include <QtGlobal>

	#include "win32.h"
	#include <Windows.h>
	#include <ShlObj.h>

	#include <windows.h>
	#include <shlobj.h>
	#include <shellapi.h>
	#include <commoncontrols.h>
	#include <QtWinExtras/QtWinExtras>


	QString getModuleFileName()
	{
	wchar_t tmp[300];
	- DWORD n = GetModuleFileNameW(0, tmp, 300);
	+ DWORD n = GetModuleFileNameW(nullptr, tmp, 300);
	return QString::fromUtf16((ushort const *)tmp, n);
	}

	-//QString getModuleFileDir()
	-//{
	-// QString path = getModuleFileName();
	-// int i = path.lastIndexOf('\\');
	-// int j = path.lastIndexOf('/');
	-// if (i < j) i = j;
	-// if (i > 0) path = path.mid(0, i);
	-// return path;
	-//}
	-
	QString getAppDataLocation()
	{
	wchar_t tmp[300];
	- if (SHGetSpecialFolderPathW(0, tmp, CSIDL_APPDATA, TRUE)) {
	+ if (SHGetSpecialFolderPathW(nullptr, tmp, CSIDL_APPDATA, TRUE)) {
	return QString::fromUtf16((ushort const *)tmp);
	}
	return QString();
	}


	#include "thread.h"
	#include "event.h"
	#include <deque>
	#define FAILED_(TEXT) throw std::string(TEXT)

	-class ProcessThread : Thread {
	+class ProcessThread : public Thread {
	friend class StreamThread;
	private:
	Event start_event;
	QString command;
	DWORD exit_code = 0;
	HANDLE hOutputRead;
	HANDLE hInputWrite;
	HANDLE hErrorWrite;
	bool isProcessRunning = false;

	class StreamThread : public Thread {
	private:
	ProcessThread *procthread;
	std::deque<char> out;
	Mutex mutex;
	protected:
	- virtual void run()
	+ void run() override
	{
	try {
	// 子プロセスの標準出力を読み出す
	while (1) {
	CHAR tmp[1024];
	DWORD len;
	- if (!ReadFile(procthread->hOutputRead, tmp, sizeof(tmp), &len, 0) \|\| len == 0) {
	+ if (!ReadFile(procthread->hOutputRead, tmp, sizeof(tmp), &len, nullptr) \|\| len == 0) {
	if (GetLastError() == ERROR_BROKEN_PIPE) {
	break; // pipe done - normal exit path.
	}
	FAILED_("ReadFile"); // Something bad happened.
	}
	mutex.lock();
	out.insert(out.end(), tmp, tmp + len);
	mutex.unlock();
	}
	} catch (std::string const &e) { // 例外
	OutputDebugStringA(e.c_str());
	}
	- procthread = 0;
	+ procthread = nullptr;
	}
	public:
	void Prepare(ProcessThread *pt)
	{
	procthread = pt;
	}
	- int ReadOutput(char *ptr, int len)
	+ int ReadOutput(char *ptr, size_t len)
	{
	mutex.lock();
	size_t n = 0;
	if (ptr && len > 0) {
	n = out.size();
	- if (len > len) {
	+ if (n > len) {
	n = len;
	}
	for (size_t i = 0; i < n; i++) {
	*ptr++ = out.front();
	out.pop_front();
	}
	}
	mutex.unlock();
	if (n == 0 && !procthread) return -1;
	return n;
	}
	};
	StreamThread stream;

	protected:

	void CloseOutput()
	{
	if (hOutputRead != INVALID_HANDLE_VALUE) {
	if (!CloseHandle(hOutputRead)) FAILED_("CloseHandle"); // 子プロセスの標準出力を閉じる
	hOutputRead = INVALID_HANDLE_VALUE;
	}
	}

	- virtual void run()
	+ void run() override
	{
	hOutputRead = INVALID_HANDLE_VALUE;
	hInputWrite = INVALID_HANDLE_VALUE;
	hErrorWrite = INVALID_HANDLE_VALUE;

	HANDLE hOutputReadTmp = INVALID_HANDLE_VALUE;
	HANDLE hOutputWrite = INVALID_HANDLE_VALUE;
	HANDLE hInputWriteTmp = INVALID_HANDLE_VALUE;
	HANDLE hInputRead = INVALID_HANDLE_VALUE;

	try {
	SECURITY_ATTRIBUTES sa;

	sa.nLength = sizeof(SECURITY_ATTRIBUTES);
	- sa.lpSecurityDescriptor = 0;
	+ sa.lpSecurityDescriptor = nullptr;
	sa.bInheritHandle = TRUE;

	HANDLE currproc = GetCurrentProcess();

	// パイプを作成
	if (!CreatePipe(&hOutputReadTmp, &hOutputWrite, &sa, 0))
	FAILED_("CreatePipe");

	// 子プロセスのエラー出力
	if (!DuplicateHandle(currproc, hOutputWrite, currproc, &hErrorWrite, 0, TRUE, DUPLICATE_SAME_ACCESS))
	FAILED_("DuplicateHandle");

	// パイプを作成
	if (!CreatePipe(&hInputRead, &hInputWriteTmp, &sa, 0))
	FAILED_("CreatePipe");

	// 子プロセスの標準出力
	if (!DuplicateHandle(currproc, hOutputReadTmp, currproc, &hOutputRead, 0, FALSE, DUPLICATE_SAME_ACCESS))
	FAILED_("DupliateHandle");

	// 子プロセスの標準入力
	if (!DuplicateHandle(currproc, hInputWriteTmp, currproc, &hInputWrite, 0, FALSE, DUPLICATE_SAME_ACCESS))
	FAILED_("DupliateHandle");

	// 不要なハンドルを閉じる
	CloseHandle(hOutputReadTmp);
	CloseHandle(hInputWriteTmp);

	// プロセス起動
	PROCESS_INFORMATION pi;
	STARTUPINFOW si;

	ZeroMemory(&si, sizeof(STARTUPINFO));
	si.cb = sizeof(STARTUPINFO);
	si.dwFlags = STARTF_USESTDHANDLES \| STARTF_USESHOWWINDOW;
	si.wShowWindow = SW_HIDE;
	si.hStdInput = hInputRead; // 標準入力ハンドル
	si.hStdOutput = hOutputWrite; // 標準出力ハンドル
	si.hStdError = hErrorWrite; // エラー出力ハンドル

	std::vector<wchar_t> tmp;
	tmp.resize(command.size() + 1);
	wcscpy(&tmp[0], (wchar_t const *)command.utf16());
	- if (!CreateProcessW(0, &tmp[0], 0, 0, TRUE, CREATE_NO_WINDOW, 0, 0, &si, &pi)) {
	+ if (!CreateProcessW(nullptr, &tmp[0], nullptr, nullptr, TRUE, CREATE_NO_WINDOW, nullptr, nullptr, &si, &pi)) {
	FAILED_("CreateProcess");
	}

	// 不要なハンドルを閉じる
	CloseHandle(hOutputWrite);
	CloseHandle(hInputRead);
	CloseHandle(hErrorWrite);

	stream.start(); // ストリームスレッドを開始
	isProcessRunning = true;
	start_event.signal(); // 開始イベントを発行

	stream.join(); // ストリームスレッドの終了を待つ
	isProcessRunning = false;
	CloseOutput(); // 標準出力を閉じる

	WaitForSingleObject(pi.hProcess, INFINITE); // プロセス終了を待つ
	GetExitCodeProcess(pi.hProcess, &exit_code);

	// 終了
	CloseHandle(pi.hThread);
	CloseHandle(pi.hProcess);
	} catch (std::string const &e) { // 例外
	stream.stop();
	OutputDebugStringA(e.c_str());
	}
	}

	void WaitForStart() // プロセスの開始を待つ
	{
	start_event.wait();
	}

	public:
	- ProcessThread()
	- {
	- }
	+ ProcessThread() = default;

	- ~ProcessThread()
	+ ~ProcessThread() override
	{
	WaitForExit();
	}

	void Start(QString const &cmd, bool input)
	{
	command = cmd;
	exit_code = 0;
	stream.Prepare(this);
	start();
	WaitForStart();
	if (!input) {
	CloseInput();
	}
	}

	void WriteInput(char const *ptr, int len)
	{
	if (ptr && len > 0) {
	DWORD l = 0;
	- WriteFile(hInputWrite, ptr, len, &l, 0);
	+ WriteFile(hInputWrite, ptr, len, &l, nullptr);
	}
	}

	int ReadOutput(char *ptr, int len)
	{
	return stream.ReadOutput(ptr, len);
	}

	void CloseInput()
	{
	if (hInputWrite != INVALID_HANDLE_VALUE) {
	if (!CloseHandle(hInputWrite)) FAILED_("CloseHandle"); // 子プロセスの標準入力を閉じる
	hInputWrite = INVALID_HANDLE_VALUE;
	}
	}

	int WaitForExit()
	{
	CloseInput();
	join();
	return exit_code;
	}

	bool IsRunning()
	{
	return isProcessRunning;
	}
	};

	int winRunCommand(QString const &cmd, QByteArray *out)
	{
	out->clear();
	ProcessThread proc;
	proc.Start(cmd, false);
	while (1) {
	char tmp[1024];
	bool r = proc.IsRunning();
	int n = proc.ReadOutput(tmp, sizeof(tmp));
	if (n > 0) {
	out->append(tmp, n);
	} else if (!r) {
	break;
	}
	Sleep(0);
	}
	return proc.WaitForExit();
	}


	void setEnvironmentVariable(QString const &name, QString const &value)
	{
	SetEnvironmentVariableW((wchar_t const )name.utf16(), (wchar_t const )value.utf16());
	}


	QString getWin32HttpProxy()
	{
	- HKEY hk = 0;
	+ HKEY hk = nullptr;
	auto Close = [&](){
	RegCloseKey(hk);
	};
	try {
	LSTATUS s;
	s = RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", 0, KEY_READ, &hk);
	if (s != ERROR_SUCCESS) throw s;
	char tmp[1000];
	DWORD type = 0;
	DWORD len = sizeof(tmp);
	s = RegQueryValueExA(hk, "ProxyServer", nullptr, &type, (unsigned char *)tmp, &len);
	if (s != ERROR_SUCCESS) throw s;
	while (len > 0 && tmp[len - 1] == 0) {
	len--;
	}
	Close();
	return QString::fromLatin1(tmp, len);
	} catch (LSTATUS s) {
	Close();
	(void)s;
	}
	return QString();
	}




	namespace {
	QIcon iconFromExtension_(QString const &ext, UINT flag)
	{
	QIcon icon;
	QString name = "*." + ext;
	SHFILEINFOW shinfo;
	if (SHGetFileInfoW((wchar_t const *)name.utf16(), 0, &shinfo, sizeof(shinfo), flag \| SHGFI_ICON \| SHGFI_USEFILEATTRIBUTES) != 0) {
	if (shinfo.hIcon) {
	QPixmap pm = QtWin::fromHICON(shinfo.hIcon);
	if (!pm.isNull()) {
	icon = QIcon(pm);
	}
	DestroyIcon(shinfo.hIcon);
	}
	}
	return icon;
	}
	}

	QIcon winIconFromExtensionLarge(QString const &ext)
	{
	return iconFromExtension_(ext, SHGFI_LARGEICON);
	}

	QIcon winIconFromExtensionSmall(QString const &ext)
	{
	return iconFromExtension_(ext, SHGFI_SMALLICON);
	}
	diff --git a/src/win32/win32.h b/src/win32/win32.h
	index 944e4d6..bc55ca8 100644
	--- a/src/win32/win32.h
	+++ b/src/win32/win32.h
	@@ -1,18 +1,17 @@
	#ifndef WIN32_H
	#define WIN32_H
	#include <QtGlobal>

	#include <QIcon>
	#include <QString>

	QString getModuleFileName();
	-//QString getModuleFileDir();
	QString getAppDataLocation();

	int winRunCommand(QString const &cmd, QByteArray *out);
	void setEnvironmentVariable(QString const &name, QString const &value);

	QIcon winIconFromExtensionLarge(QString const &ext);
	QIcon winIconFromExtensionSmall(QString const &ext);

	#endif // WIN32_H

File Metadata

Mime Type: text/x-diff
Expires: Wed, Jun 17, 9:33 PM (1 w, 5 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 71314
Default Alt Text: (497 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions