[tk: fixed style, tests and detection of click in horizontal split view]

jonas · Jan 23, 2021 · 4ca443d · 4ca443d
1 parent 7add3dd
commit 4ca443d
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 42 deletions.
diff --git a/src/tig.c b/src/tig.c
@@ -652,16 +652,21 @@ handle_mouse_event(void)
 		return opt_mouse_wheel_cursor ? REQ_MOVE_WHEEL_UP : REQ_SCROLL_WHEEL_UP;
 
 	if (event.bstate & BUTTON1_PRESSED) {
+		/* Translate event.y to the coordinate system of the
+		 * current view, useful in case of horizontal split. */
+		event.y -= getbegy(view->win);
+
 		if (event.y == view->pos.lineno - view->pos.offset) {
-			/* Click is on the same line, perform an "ENTER" */
-			// unless we are in diff as that might move/scroll ...
-			if (view_has_flags(view, VIEW_DIFF_LIKE))
+			/* Click is on the same line, perform an "ENTER"
+			 * unless we are outside of diffstat in diff as
+			 * that might move/scroll ... */
+			if (view_has_flags(view, VIEW_DIFF_LIKE) &&
+			    view->line[view->pos.lineno].type != LINE_DIFF_STAT)
 				return REQ_NONE;
 			return REQ_ENTER;
 
 		} else {
-			int y = getbegy(view->win);
-			unsigned long lineno = (event.y - y) + view->pos.offset;
+			unsigned long lineno = event.y + view->pos.offset;
 
 			select_view_line(view, lineno);
 			update_view_title(view);

diff --git a/src/view.c b/src/view.c
@@ -102,7 +102,8 @@ scroll_view(struct view *view, enum request request)
 {
 	int lines = 1;
 	unsigned long orig_offset, orig_lineno;
-	unsigned long new_offset, new_lineno;
+	int move_lines;
+	int i;
 
 	assert(view_is_displayed(view));
 
@@ -179,19 +180,10 @@ scroll_view(struct view *view, enum request request)
 
 	do_scroll_view(view, lines);
 
-	new_offset = view->pos.offset;
-	new_lineno = view->pos.lineno;
-
-	int move_lines = (new_offset - orig_offset) - (new_lineno - orig_lineno);
+	move_lines = (view->pos.offset - orig_offset) - (view->pos.lineno - orig_lineno);
 
-	int i;
-	if (move_lines < 0) {
-		for(i=0; i<-move_lines; i++)
-			move_view(view, REQ_MOVE_UP);
-	} else if (move_lines > 0) {
-		for(i=0; i<move_lines; i++)
-			move_view(view, REQ_MOVE_DOWN);
-	}
+	for (i = 0; i < ABS(move_lines); i++)
+		move_view(view, move_lines < 0 ? REQ_MOVE_UP : REQ_MOVE_DOWN);
 }
 
 /* Cursor moving */

diff --git a/test/diff/editor-test b/test/diff/editor-test
@@ -290,12 +290,12 @@ EOF
 run_test_cases
 
 assert_equals 'editor.log' <<EOF
-+51 project/Build.scala
-  lazy val deltablue = project("DeltaBlue", defaultSettings).dependsOn(common)
++52 project/Build.scala
+  lazy val richards = project("Richards", defaultSettings).dependsOn(common)
 +2 project/build.sbt
     url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatterns)
-+51 project/Build.scala
-  lazy val deltablue = project("DeltaBlue", defaultSettings).dependsOn(common)
++52 project/Build.scala
+  lazy val richards = project("Richards", defaultSettings).dependsOn(common)
 +2 project/build.sbt
     url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatterns)
 common/benchmark-runner.sh
@@ -310,12 +310,12 @@ tracer/src/main/scala/org/scalajs/benchmark/tracer/Tracer.scala
 **    / __/ __// _ | / /  / _ | __ / // __/  Adam Burmister             **
 **  __\\ \\/ /__/ __ |/ /__/ __ |/_// /_\\ \\    2012, Google, Inc          **
 ** /____/\\___/_/ |_/____/_/ | |__/ /____/    2013, Jonas Fonseca        **
-+51 project/Build.scala
-  lazy val deltablue = project("DeltaBlue", defaultSettings).dependsOn(common)
++52 project/Build.scala
+  lazy val richards = project("Richards", defaultSettings).dependsOn(common)
 +2 project/build.sbt
     url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatterns)
-+51 project/Build.scala
-  lazy val deltablue = project("DeltaBlue", defaultSettings).dependsOn(common)
++52 project/Build.scala
+  lazy val richards = project("Richards", defaultSettings).dependsOn(common)
 +2 project/build.sbt
     url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatterns)
 +2 conflict-file

diff --git a/test/diff/submodule-editor-test b/test/diff/submodule-editor-test
@@ -320,12 +320,12 @@ EOF
 run_test_cases
 
 assert_equals 'editor.log' <<EOF
-+51 project/Build.scala
-  lazy val deltablue = project("DeltaBlue", defaultSettings).dependsOn(common)
++52 project/Build.scala
+  lazy val richards = project("Richards", defaultSettings).dependsOn(common)
 +2 project/build.sbt
     url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatterns)
-+51 project/Build.scala
-  lazy val deltablue = project("DeltaBlue", defaultSettings).dependsOn(common)
++52 project/Build.scala
+  lazy val richards = project("Richards", defaultSettings).dependsOn(common)
 +2 project/build.sbt
     url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatterns)
 common/benchmark-runner.sh
@@ -340,12 +340,12 @@ tracer/src/main/scala/org/scalajs/benchmark/tracer/Tracer.scala
 **    / __/ __// _ | / /  / _ | __ / // __/  Adam Burmister             **
 **  __\\ \\/ /__/ __ |/ /__/ __ |/_// /_\\ \\    2012, Google, Inc          **
 ** /____/\\___/_/ |_/____/_/ | |__/ /____/    2013, Jonas Fonseca        **
-+51 project/Build.scala
-  lazy val deltablue = project("DeltaBlue", defaultSettings).dependsOn(common)
++52 project/Build.scala
+  lazy val richards = project("Richards", defaultSettings).dependsOn(common)
 +2 project/build.sbt
     url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatterns)
-+51 project/Build.scala
-  lazy val deltablue = project("DeltaBlue", defaultSettings).dependsOn(common)
++52 project/Build.scala
+  lazy val richards = project("Richards", defaultSettings).dependsOn(common)
 +2 project/build.sbt
     url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatterns)
 +2 conflict-file

diff --git a/test/diff/worktree-editor-test b/test/diff/worktree-editor-test
@@ -315,12 +315,12 @@ EOF
 run_test_cases
 
 assert_equals 'editor.log' <<EOF
-+51 project/Build.scala
-  lazy val deltablue = project("DeltaBlue", defaultSettings).dependsOn(common)
++52 project/Build.scala
+  lazy val richards = project("Richards", defaultSettings).dependsOn(common)
 +2 project/build.sbt
     url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatterns)
-+51 project/Build.scala
-  lazy val deltablue = project("DeltaBlue", defaultSettings).dependsOn(common)
++52 project/Build.scala
+  lazy val richards = project("Richards", defaultSettings).dependsOn(common)
 +2 project/build.sbt
     url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatterns)
 common/benchmark-runner.sh
@@ -335,12 +335,12 @@ tracer/src/main/scala/org/scalajs/benchmark/tracer/Tracer.scala
 **    / __/ __// _ | / /  / _ | __ / // __/  Adam Burmister             **
 **  __\\ \\/ /__/ __ |/ /__/ __ |/_// /_\\ \\    2012, Google, Inc          **
 ** /____/\\___/_/ |_/____/_/ | |__/ /____/    2013, Jonas Fonseca        **
-+51 project/Build.scala
-  lazy val deltablue = project("DeltaBlue", defaultSettings).dependsOn(common)
++52 project/Build.scala
+  lazy val richards = project("Richards", defaultSettings).dependsOn(common)
 +2 project/build.sbt
     url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatterns)
-+51 project/Build.scala
-  lazy val deltablue = project("DeltaBlue", defaultSettings).dependsOn(common)
++52 project/Build.scala
+  lazy val richards = project("Richards", defaultSettings).dependsOn(common)
 +2 project/build.sbt
     url("http://repo.scala-js.org/repo/snapshots/"))(Resolver.ivyStylePatterns)
 +2 conflict-file