Fix tabs in xi term (mostly) #85
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Currently, we require the user to configure their terminal tab width to four columns wide. One way we can get around this is to expand tabs into spaces. Xi-core can do this for us -- there's actually a 'translate_tabs_to_spaces' config option, which is enabled by default. In order for it to work, though, we have to indicate to xi-core when we receive a tab via the "insert_tab" BufferEvent, so this changeset does so. For consistency, we also send "insert_newline" on newlines.
If the terminal tab settings don't match our concept of tab locations, funny things can happen when we try to position the cursor on a line with tabs. We can work around this a couple of ways: (1) We can expand tabs into spaces. Xi-core does this by default for most file types (Makefiles are a notable exception). Spaces obviously aren't affected by the terminal tabstop settings, so we avoid the problem entirely. (2) Alternatively, we can allow the user to specify the tab size. Rather than assuming tabs are 4 columns wide, we'll assume that the user's preferences.xiconfig and terminal settings match up. Views will now store a tab_size setting from the last ConfigChanged event they received, and this setting will be used to position the cursor. Note that we'll still have problems if the terminal and xi-term tab settings don't agree, but hopefully this will reduce their occurrence somewhat.
ktomsic
force-pushed
the
fix-tabs-in-xi-term
branch
from
d6a17d2
to
bee78f8
Compare
wendivoid
approved these changes
Oct 27, 2018
|
No worries. Thanks for taking the time to review + merge it! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note: this PR depends on work in xi-frontend/xrl#18
Xi-term doesn't position the cursor properly when its tab width differs from the terminal tab width (#80). We can work around this in two ways:
(1) Allow the translate_tabs_to_spaces option (when enabled) to avoid the problem entirely (translate tabs into spaces = no tabs = no problems) and
(2) Allow the user to change the tab width in their preferences.xiconfig file. This still requires a correct setting, but it at least gives the user the option to change xi-term to work with their terminal rather than the other way around.