From c1e831dab03bd1a48d2aa0f383aa5aaea2b3632b Mon Sep 17 00:00:00 2001
From: Christian Duerr <contact@christianduerr.com>
Date: Fri, 9 Mar 2018 19:45:40 +0100
Subject: Merge branch #1095

Because there was some overlap with branch #1095, these two PRs have
been added together and the config has been restructured to make use of
a `scrolling` section.

The default faux scrolling amount has also been changed to `3` because
this simplifies the code and falls in line with what most other terminal
emulators do.

There should be no additional test failures due to this.
---
 alacritty.yml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'alacritty.yml')

diff --git a/alacritty.yml b/alacritty.yml
index 4dcdbb2b..d11e8a19 100644
--- a/alacritty.yml
+++ b/alacritty.yml
@@ -33,8 +33,24 @@ window:
   # Setting this to false will result in window without borders and title bar.
   decorations: true
 
-# How many lines of scrollback to keep
-scroll_history: 10000
+scrolling:
+  # How many lines of scrollback to keep,
+  # '0' will disable scrolling.
+  history: 10000
+
+  # Number of lines the viewport will move for every line
+  # scrolled when scrollback is enabled (history > 0).
+  multiplier: 1
+
+  # Faux Scrolling
+  #
+  # The `faux_multiplier` setting controls the number
+  # of lines the terminal should scroll when the alternate
+  # screen buffer is active. This is used to allow mouse
+  # scrolling for applications like `man`.
+  #
+  # To disable this completely, set `faux_multiplier` to 0.
+  faux_multiplier: 3
 
 # Display tabs using this many cells (changes require restart)
 tabspaces: 8
@@ -209,22 +225,6 @@ mouse:
   double_click: { threshold: 300 }
   triple_click: { threshold: 300 }
 
-  # Faux Scrollback
-  #
-  # The `faux_scrollback_lines` setting controls the number
-  # of lines the terminal should scroll when the alternate
-  # screen buffer is active. This is used to allow mouse
-  # scrolling for applications like `man`.
-  #
-  # To disable this completely, set `faux_scrollback_lines` to 0.
-  faux_scrollback_lines: 1
-
-  # Normal Scrolling
-  #
-  # Number of lines the viewport will move when scrolling in
-  # the terminal with scrollback enabled (>0).
-  normal_scrolling_lines: 3
-
 selection:
   semantic_escape_chars: ",│`|:\"' ()[]{}<>"
 
-- 
cgit v1.2.3-54-g00ecf