zyedidia/micro
1
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2025-06-18 14:55:38 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix linux bug and improve tabstop functionality

Browse Source
This commit is contained in:
Zachary Yedidia 2016-03-16 19:13:05 -04:00
parent 1ea5261132
commit f49573bf08
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/clipboard.d
View File

@ -20,8 +20,8 @@ class Clipboard {
version(linux) {
import std.exception: collectException;
string[] copyCmd;
string[] pasteCmd;
static string[] copyCmd;
static string[] pasteCmd;
static bool init() {
if (collectException(execute(["xsel", "-h"]))) {

14
src/view.d
View File

@ -67,11 +67,12 @@ class View {
}
int getCharPosition(int lineNum, int visualPosition) {
int numTabs = numOccurences(buf.lines[lineNum].replaceAll(regex("\t"), "\t" ~ emptyString(tabSize-1))[0 .. visualPosition], '\t');
foreach (i; 0 .. numTabs) {
visualPosition -= tabSize-1;
string visualLine = buf.lines[lineNum].replaceAll(regex("\t"), "\t" ~ emptyString(tabSize-1));
if (visualPosition > visualLine.length) {
visualPosition = cast(int) visualLine.length;
}
return visualPosition;
int numTabs = numOccurences(visualLine[0 .. visualPosition], '\t');
return visualPosition - (tabSize-1) * numTabs;
}
void cursorUp() {
@ -135,17 +136,14 @@ class View {
cursorLeft();
} else if (e.key == Key.mouseLeft) {
cursor.y = e.y + topline;
cursor.x = getCharPosition(cursor.y, e.x) - xOffset;
if (cursor.y - topline > height-1) {
cursor.y = height + topline-1;
}
if (cursor.y > buf.lines.length) {
cursor.y = cast(int) buf.lines.length-1;
}
cursor.x = getCharPosition(cursor.y, e.x - xOffset);
cursor.lastX = cursor.x;
if (cursor.x > buf.lines[cursor.y].length) {
cursor.x = cast(int) buf.lines[cursor.y].length;
}
} else if (e.key == Key.ctrlS) {
if (buf.path != "") {
buf.save();