diff --git a/Makefile b/Makefile index a04edeb3..c1d6d1b7 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ TARUSER := --owner=root --group=root --owner=mintty --group=cygwin arch_files := Makefile COPYING LICENSE* INSTALL VERSION arch_files += src/Makefile src/*.c src/*.h src/*.rc src/*.mft -arch_files += src/combined.t src/rgb.t src/mk* +arch_files += src/combined.t src/bidiclasses.t src/rgb.t src/mk* arch_files += cygwin/*.cygport cygwin/README* cygwin/setup.hint arch_files += docs/*.1 docs/*.html icon/* arch_files += wiki/* diff --git a/docs/mintty.1.html b/docs/mintty.1.html index c9d8e847..fb6ee952 100644 --- a/docs/mintty.1.html +++ b/docs/mintty.1.html @@ -1,5 +1,5 @@ - + @@ -90,21 +90,21 @@

OPTIONS -c, --config FILENAME

Read settings from the -specified configuration file, in addition to -/etc/minttyrc and ~/.minttyrc. Configuration -changes are saved to the last file thus specified and not -read-only at the time of loading.

+specified configuration file, in addition to the default +config files. Configuration changes are saved to the last +file thus specified and not read-only at the time of +loading.

-C, --loadconfig FILENAME

Read settings from the -specified configuration file, in addition to -/etc/minttyrc and ~/.minttyrc. The file is not -taken into account for saving configuration changes. This is -useful to mix-in partial configuration variants, -particularly colour schemes. However, -o -ThemeFile=FILENAME may be preferable.

+specified configuration file, in addition to the default +config files. The file is not taken into account for saving +configuration changes. This is useful to mix-in partial +configuration variants, particularly colour schemes. +However, -o ThemeFile=FILENAME may be +preferable.

-e, --exec PROGRAM [ARG ...]

@@ -359,9 +359,9 @@

USAGE selected text is automatically copied to the clipboard. This can be disabled on the Mouse page of the options dialog. Selected text can also be copied manually using -either the Copy menu command, the Ctrl+Ins -keyboard shortcut, or the middle mouse button combined with -Shift.

+either the Copy menu command, the Ctrl+Ins or +Ctrl+C keyboard shortcuts, or the middle mouse button +combined with Shift.

The selected region is copied as "rich text" as well as normal @@ -376,11 +376,11 @@

USAGE

The clipboard contents can be pasted using either the Paste menu -command, the Shift+Ins keyboard shortcut, or the -middle mouse button. Not only text but also files and -directories can be pasted, whereby the latter are inserted -as Cygwin file names. Shell quoting is added to file names -that contain spaces or special characters.

+command, the Shift+Ins or Ctrl+V keyboard +shortcuts, or the middle mouse button. Not only text but +also files and directories can be pasted, whereby the latter +are inserted as Cygwin file names. Shell quoting is added to +file names that contain spaces or special characters.

Drag & drop
@@ -392,11 +392,13 @@

USAGE files, directories and URLs
Files, directories, URLs and web addresses beginning with "www." can be opened either by holding Ctrl -while left-clicking on them, or by selecting them and +while left-clicking on them (or double-clicking, if and as +enabled by option OpeningClicks), or by selecting them and choosing the Open command from the context menu. -Please note that opening a file or directory with a relative -path only works correctly if the path refers to the current -working directory of the process invoked by mintty.

+Please note that a relative file or directory path is +interpreted as relative to the current working directory of +the terminal foreground process if that can be +determined.

Font zoom
@@ -638,6 +640,7 @@

USAGE set of shortcuts for clipboard and window commands using Ctrl+Shift+letter combinations is available. These can be enabled on the Keys pane of the options dialog.
+– Ctrl+Shift+A: Select all
Ctrl+Shift+C: Copy
Ctrl+Shift+V: Paste
Ctrl+Shift+N: New
@@ -673,20 +676,23 @@

CONFIGURATION

In configuration files, settings are stored as NAME=VALUE pairs, with one per line. By -default, they are read from /etc/minttyrc and -~/.minttyrc. Additional configuration files can be -specified using the -c/--config or +default, they are read from any file of +/etc/minttyrc, $APPDATA/mintty/config, +~/.config/mintty/config, ~/.minttyrc, in this +order. Additional configuration files can be specified using +the -c/--config or -C/--loadconfig command line options. These -are read in order, with settings in later files overriding -those in earlier ones. Configuration changes are saved to -the last writable file specified with --c/--config, or ~/.minttyrc if none is -given. Individual settings can also be specified on the -command line using the -o/--option.

+are read in order after the default config files, with +settings in later files overriding those in earlier ones. +Configuration changes are saved to the last writable file +read by default or specified with -c/--config, +or ~/.minttyrc if none is given. Individual settings +can also be specified on the command line using the +-o/--option.

Note: -Many string values in the minttyrc files, especially -those referring to file names or Windows items, are +Many string values in the config files, especially those +referring to file names or Windows items, are Unicode-enabled, meaning they are expected to be UTF-8-encoded in the configuration file independently of the encoding the terminal runs in; as a fallback, if the @@ -722,12 +728,12 @@

CONFIGURATION

Clicking on one of the buttons here opens the colour selection dialog.
-In the settings (.minttyrc or command-line options), colours -are represented as comma-separated RGB triples with decimal -8-bit values ranging from 0 to 255. X-style hexadecimal -colour specifications such as #RRGGBB, rgb:RR/GG/BB or -rgb:RRRR/GGGG/BBBB can be used as well. Also X11 color names -are supported.
+In the settings (config file or command-line options), +colours are represented as comma-separated RGB triples with +decimal 8-bit values ranging from 0 to 255. X-style +hexadecimal colour specifications such as #RRGGBB, +rgb:RR/GG/BB or rgb:RRRR/GGGG/BBBB can be used as well. Also +X11 color names are supported.
Foreground (ForegroundColour=191,191,191)
Background (BackgroundColour=0,0,0)
@@ -735,7 +741,7 @@

CONFIGURATION

Theme (ThemeFile=): The popup offers theme files as -stored in the resource directory $HOME/.mintty/themes for +stored in the resource directory ~/.mintty/themes for selection as a colour scheme. The option can also be set to a filename (like D:/.../solarized-light.minttyrc).

@@ -1075,12 +1081,6 @@

CONFIGURATION Extend, a left click with Shift pressed pastes the clipboard instead of extending the selection.

-

Mouse zooming -(ZoomMouse=yes)

- -

Enabling font zooming with -Ctrl+mouse-wheel/middle-mouse-click.

-

Default click target (ClicksTargetApp=yes)

@@ -1264,8 +1264,8 @@

CONFIGURATION

Wave (BellFile=): The popup offers wave files as stored in the -resource directory $HOME/.mintty/sounds for selection. The -option can also be set to a filename (like +resource directory ~/.mintty/sounds for selection. +The option can also be set to a filename (like D:/.../soundfile.wav). This setting overrides the Bell system sound except No Beep.
Play: The button plays the selected sound for @@ -1409,8 +1409,8 @@

CONFIGURATION settings
The following settings appear neither in the options dialog nor as command line options, which means they can only be -set in config files or using the --option command -line option.
+set in config files or using the --option or +-o command line option.
Application ID
(AppID=)

Windows 7 and above use the @@ -1630,8 +1630,31 @@

CONFIGURATION

Together with a hold option that keeps the terminal open after its child process terminated, this option prefixes the window title with its -string, for example -o ExitTitle="TERMINATED: " or -(in minttyrc) ExitTitle=TERMINATED: .

+string, for example -o ExitTitle="TERMINATED: +".

+ +

Configure document opening +by mouse click (OpeningClicks=1)

+ +

Enabling opening files, +directories or URLs with mouse clicking, in addition to the +context menu. Values 1, 2, or 3 require Ctrl+mouse-click, +double-click, or triple-click, respectively, to invoke the +document opening. Value 0 disables click-opening.

+ +

Control key and shortcut +Shift exchange (CtrlExchangeShift=no)

+ +

Exchange the range of Control +characters with the range of Ctrl+Shift shortcuts, so that +for example Ctrl+V will paste and Ctrl+Shift+V will enter a +Control+V character.

+ +

Mouse zooming +(ZoomMouse=yes)

+ +

Enabling font zooming with +Ctrl+mouse-wheel/middle-mouse-click.

Disable Shift-coupled implicit font zooming (ZoomFontWithWindow=yes)

@@ -1679,7 +1702,7 @@

LIMITATIONS

The majority of xterm’s many control sequences is implemented, but quite a few are missing. Significant omissions should be -reported as bugs.

+reported to the issue tracker.

SEE ALSO @@ -1696,13 +1719,12 @@

LICENSE

Copyright (C) -2013 Andy Koppe (C) 2015 Thomas Wolff

+2013 Andy Koppe (C) 2016 Thomas Wolff

Mintty is released under the terms of the the GNU General Public -License version 3 or later. See -http://gnu.org/licenses/gpl/html for the license -text.

+License version 3. See +http://gnu.org/licenses/gpl for the license text.

There is NO WARRANTY, to the extent permitted by law.

@@ -1716,7 +1738,10 @@

CONTACT bugs or suggest enhancements via the issue tracker at https://github.com/mintty/mintty/issues. Questions can be sent to the Cygwin mailing list at -cygwin@cygwin.com.

+cygwin@cygwin.com, to the Mintty discussion issue +https://github.com/mintty/mintty/issues/500, or to +the Gitter chat (experimental) +https://gitter.im/mintty/mintty.