Merge branch 'master' into v22docs

.all-contributorsrc

@@ -6,7 +6,7 @@
   "files": [
     "README.md"
   ],
-  "imageSize": 90,
+  "imageSize": 80,
   "commit": false,
   "commitConvention": "none",
   "contributors": [
@@ -373,6 +373,43 @@
       "contributions": [
         "ideas"
       ]
+    },
+    {
+      "login": "kevinhwang91",
+      "name": "kevinhwang91",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/17562139?v=4",
+      "profile": "https://github.com/kevinhwang91",
+      "contributions": [
+        "ideas",
+        "bug"
+      ]
+    },
+    {
+      "login": "jboverfelt",
+      "name": "Justin Overfelt",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/936126?v=4",
+      "profile": "https://jbo.io",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "loudsong",
+      "name": "Anthony",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/1447613?v=4",
+      "profile": "https://github.com/loudsong",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "basondole",
+      "name": "basondole",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/50369643?v=4",
+      "profile": "https://github.com/basondole",
+      "contributions": [
+        "bug"
+      ]
     }
   ],
   "contributorsPerLine": 7

CHANGELOG.md

@@ -21,10 +21,19 @@
 - Map keys to other key sequences using a vim-style map command e.g. `map <f1> ZZ`. Use vim-syntax to express
   keystrokes - alphanumeric characters, and angle brackets for compound keys (`<C-s>`, `<A-\>`, `<esc>`,
   `<space>`, `<enter>`)
+- Added support for themes. See this
+  [example](https://raw.githubusercontent.com/gcla/termshark/master/assets/themes/dracula-256.toml). Themes
+  are loaded from `~/.config/termshark/themes/` or from a small cache built-in
+  to termshark. A new minibuffer command `theme` can be used to change theme;
+  `no-theme` turns off theming.
 
 ### Changed
 
 - Fixed a race condition that allowed an invalid Wireshark display filter to be applied.
+- Fixed race conditions that resulted in spurious warnings about a failure to kill tshark processes
+- If auto-scroll is enabled, and you navigate to a different packet in the packet list view during a live
+  capture, auto-scroll is resumed if you hit 'G' or the `end` key.
+- Fixed a problem preventing the correct operation of piped input to termshark on freebsd.
 
 ## [2.1.1] - 2020-02-02
 ### Added

assets/themes/base16-256.toml

@@ -0,0 +1,104 @@
+
+unused = "#79e11a"
+
+[base16]
+  black = "Color00"
+  base01 = "Color12"
+  base02 = "Color13"
+  base03 = "Color08"
+  base04 = "Color14"
+  base05 = "Color07"
+  base06 = "Color15"
+  white = "Color0f"
+  red = "Color09"
+  orange  = "Color10"
+  yellow = "Color0b"
+  green = "Color0a"
+  cyan = "Color0e"
+  blue = "Color04"
+  purple = "Color05"
+  brown = "Color11"
+
+[dark]
+  button = ["base16.black","base16.base04"]
+  button-focus = ["base16.white","base16.purple"]
+  button-selected = ["base16.white","base16.base04"]
+  cmdline = ["base16.black","base16.yellow"]
+  cmdline-button = ["base16.yellow","base16.black"]
+  cmdline-border = ["base16.black","base16.yellow"]
+  copy-mode = ["base16.black","base16.yellow"]
+  copy-mode-alt = ["base16.yellow","base16.black"]
+  copy-mode-label = ["base16.white","base16.red"]
+  current-capture = ["base16.white","themes.unused"]
+  dialog = ["base16.black","base16.yellow"]
+  dialog-button = ["base16.yellow","base16.black"]
+  default = ["base16.white","base16.black"]
+  filter-intermediate = ["base16.black","base16.orange"]
+  filter-invalid = ["base16.black","base16.red"]
+  filter-menu = ["base16.white","base16.black"]
+  filter-valid = ["base16.black","base16.green"]
+  hex-byte-selected = ["base16.white","base16.purple"]
+  hex-byte-unselected = ["base16.white","base16.black"]
+  hex-field-selected = ["base16.black","base16.cyan"]
+  hex-field-unselected = ["base16.black","base16.white"]
+  hex-interval-selected = ["base16.white","base16.base03"]
+  hex-interval-unselected = ["base16.white","base16.base02"]
+  hex-layer-selected = ["base16.white","base16.base03"]
+  hex-layer-unselected = ["base16.white","base16.base02"]
+  packet-list-cell-focus = ["base16.white","base16.purple"]
+  packet-list-cell-selected = ["base16.white","base16.base03"]
+  packet-list-row-focus = ["base16.white","base16.cyan"]
+  packet-list-row-selected = ["base16.white","base16.base02"]
+  packet-struct-focus = ["base16.white","base16.cyan"]
+  packet-struct-selected = ["base16.black","base16.base03"]
+  progress-complete = ["base16.white","base16.purple"]
+  progress-default = ["base16.white","base16.black"]
+  progress-spinner = ["base16.yellow","base16.purple"]
+  spinner = ["base16.yellow","base16.black"]
+  stream-client = ["base16.black","base16.red"]
+  stream-match = ["base16.black","base16.yellow"]
+  stream-search = ["base16.black","base16.white"]
+  stream-server = ["base16.cyan","base16.blue"]
+  title = ["base16.red","unused"]
+
+[light]
+  button = ["base16.black","base16.white"]
+  button-focus = ["base16.black","base16.purple"]
+  button-selected = ["base16.black","base16.base04"]
+  cmdline = ["base16.black","base16.yellow"]
+  cmdline-button = ["base16.yellow","base16.black"]
+  cmdline-border = ["base16.black","base16.yellow"]
+  copy-mode = ["base16.white","base16.yellow"]
+  copy-mode-alt = ["base16.yellow","base16.white"]
+  copy-mode-label = ["base16.black","base16.red"]
+  current-capture = ["base16.black","unused"]
+  dialog = ["base16.black","base16.yellow"]
+  dialog-button = ["base16.yellow","base16.black"]
+  default = ["base16.black","base16.white"]
+  filter-intermediate = ["base16.black","base16.orange"]
+  filter-invalid = ["base16.black","base16.red"]
+  filter-menu = ["base16.black","base16.white"]
+  filter-valid = ["base16.black","base16.green"]
+  hex-byte-selected = ["base16.white","base16.purple"]
+  hex-byte-unselected = ["base16.black","base16.white"]
+  hex-field-selected = ["base16.black","base16.cyan"]
+  hex-field-unselected = ["base16.black","base16.base03"]
+  hex-interval-selected = ["base16.white","base16.base03"]
+  hex-interval-unselected = ["base16.black","base16.base05"]
+  hex-layer-selected = ["base16.white","base16.base03"]
+  hex-layer-unselected = ["base16.black","base16.base05"]
+  packet-list-cell-focus = ["base16.white","base16.purple"]
+  packet-list-cell-selected = ["base16.black","base16.base04"]
+  packet-list-row-focus = ["base16.white","base16.cyan"]
+  packet-list-row-selected = ["base16.black","base16.base05"]
+  packet-struct-focus = ["base16.white","base16.cyan"]
+  packet-struct-selected = ["base16.black","base16.base05"]
+  progress-complete = ["base16.white","base16.purple"]
+  progress-default = ["base16.white","base16.black"]
+  progress-spinner = ["base16.yellow","base16.black"]
+  spinner = ["base16.yellow","base16.white"]
+  stream-client = ["base16.white","base16.red"]
+  stream-match = ["base16.white","base16.yellow"]
+  stream-search = ["base16.white","base16.black"]
+  stream-server = ["base16.cyan","base16.blue"]
+  title = ["base16.red","unused"]

assets/themes/default-16.toml

@@ -0,0 +1,100 @@
+
+unused = "Color00"
+
+[default]
+  black = "Color00"
+  gray1 = "Color08"
+  gray2 = "Color08"
+  gray3 = "Color08"
+  gray4 = "Color08"
+  white = "Color0f"
+  red = "Color09"
+  yellow = "Color0b"
+  green = "Color0a"
+  cyan  = "Color0e"
+  blue = "Color04"
+  purple = "Color05"
+
+[dark]
+  button = ["default.black","default.gray1"]
+  button-focus = ["default.white","default.purple"]
+  button-selected = ["default.white","default.black"]
+  cmdline = ["default.black","default.yellow"]
+  cmdline-button = ["default.yellow","default.black"]
+  cmdline-border = ["default.black","default.yellow"]
+  copy-mode = ["default.black","default.yellow"]
+  copy-mode-alt = ["default.yellow","default.black"]
+  copy-mode-label = ["default.white","default.red"]
+  current-capture = ["default.white","themes.unused"]
+  dialog = ["default.black","default.yellow"]
+  dialog-button = ["default.yellow","default.black"]
+  default = ["default.white","default.black"]
+  filter-intermediate = ["default.black","default.yellow"]
+  filter-invalid = ["default.black","default.red"]
+  filter-menu = ["default.white","default.black"]
+  filter-valid = ["default.black","default.green"]
+  hex-byte-selected = ["default.black","default.purple"]
+  hex-byte-unselected = ["default.white","default.black"]
+  hex-field-selected = ["default.black","default.cyan"]
+  hex-field-unselected = ["default.black","default.white"]
+  hex-interval-selected = ["default.white","default.gray2"]
+  hex-interval-unselected = ["default.white","default.gray1"]
+  hex-layer-selected = ["default.white","default.gray2"]
+  hex-layer-unselected = ["default.white","default.gray1"]
+  packet-list-cell-focus = ["default.black","default.purple"]
+  packet-list-cell-selected = ["default.white","default.gray2"]
+  packet-list-row-focus = ["default.gray2","default.cyan"]
+  packet-list-row-selected = ["default.white","default.gray1"]
+  packet-struct-focus = ["default.black","default.cyan"]
+  packet-struct-selected = ["default.black","default.gray2"]
+  progress-complete = ["default.white","default.purple"]
+  progress-default = ["default.white","default.black"]
+  progress-spinner = ["default.yellow","default.purple"]
+  spinner = ["default.yellow","default.black"]
+  stream-client = ["default.black","default.red"]
+  stream-match = ["default.black","default.yellow"]
+  stream-search = ["default.black","default.white"]
+  stream-server = ["default.cyan","default.blue"]
+  title = ["default.red","unused"]
+
+[light]
+  button = ["default.white","default.gray3"]
+  button-focus = ["default.black","default.purple"]
+  button-selected = ["default.black","default.gray3"]
+  cmdline = ["default.black","default.yellow"]
+  cmdline-button = ["default.yellow","default.black"]
+  cmdline-border = ["default.black","default.yellow"]
+  copy-mode = ["default.white","default.yellow"]
+  copy-mode-alt = ["default.yellow","default.white"]
+  copy-mode-label = ["default.black","default.red"]
+  current-capture = ["default.black","unused"]
+  dialog = ["default.black","default.yellow"]
+  dialog-button = ["default.yellow","default.black"]
+  default = ["default.black","default.white"]
+  filter-intermediate = ["default.black","default.yellow"]
+  filter-invalid = ["default.black","default.red"]
+  filter-menu = ["default.black","default.white"]
+  filter-valid = ["default.black","default.green"]
+  hex-byte-selected = ["default.black","default.purple"]
+  hex-byte-unselected = ["default.black","default.white"]
+  hex-field-selected = ["default.black","default.cyan"]
+  hex-field-unselected = ["default.black","default.gray2"]
+  hex-interval-selected = ["default.white","default.gray2"]
+  hex-interval-unselected = ["default.black","default.gray4"]
+  hex-layer-selected = ["default.white","default.gray2"]
+  hex-layer-unselected = ["default.black","default.gray4"]
+  packet-list-cell-focus = ["default.black","default.purple"]
+  packet-list-cell-selected = ["default.black","default.gray3"]
+  packet-list-row-focus = ["default.black","default.cyan"]
+  packet-list-row-selected = ["default.black","default.gray4"]
+  packet-struct-focus = ["default.black","default.cyan"]
+  packet-struct-selected = ["default.black","default.gray4"]
+  progress-complete = ["default.white","default.purple"]
+  progress-default = ["default.white","default.black"]
+  progress-spinner = ["default.yellow","default.black"]
+  spinner = ["default.yellow","default.white"]
+  stream-client = ["default.white","default.red"]
+  stream-match = ["default.white","default.yellow"]
+  stream-search = ["default.white","default.black"]
+  stream-server = ["default.cyan","default.blue"]
+  title = ["default.red","unused"]

assets/themes/default-256.toml

@@ -0,0 +1,103 @@
+
+unused = "#79e11a"
+
+[default]
+  black = "#000000"
+  gray02 = "#464752"
+  gray03 = "#565761"
+  gray04 = "#969692"
+  gray05 = "#ccccc7"
+  white = "#ffffff"
+  red = "#ff0000"
+  orange = "#ffa42c"
+  yellow = "#ffff00"
+  green = "#5fff00"
+  cyan = "#0087ff"
+  blue = "#0000ff"
+  brightblue = "#0084fb"
+  purple = "#800080"
+  magenta = "#8b008b"
+
+[dark]
+  button = ["default.black","default.gray04"]
+  button-focus = ["default.white","default.magenta"]
+  button-selected = ["default.white","default.gray04"]
+  cmdline = ["default.black","default.yellow"]
+  cmdline-button = ["default.yellow","default.black"]
+  cmdline-border = ["default.black","default.yellow"]
+  copy-mode = ["default.black","default.yellow"]
+  copy-mode-alt = ["default.yellow","default.black"]
+  copy-mode-label = ["default.white","default.red"]
+  current-capture = ["default.white","themes.unused"]
+  dialog = ["default.black","default.yellow"]
+  dialog-button = ["default.yellow","default.black"]
+  default = ["default.white","default.black"]
+  filter-intermediate = ["default.black","default.orange"]
+  filter-invalid = ["default.black","default.red"]
+  filter-menu = ["default.white","default.black"]
+  filter-valid = ["default.black","default.green"]
+  hex-byte-selected = ["default.white","default.purple"]
+  hex-byte-unselected = ["default.white","default.black"]
+  hex-field-selected = ["default.black","default.cyan"]
+  hex-field-unselected = ["default.black","default.white"]
+  hex-interval-selected = ["default.white","default.gray03"]
+  hex-interval-unselected = ["default.white","default.gray02"]
+  hex-layer-selected = ["default.white","default.gray03"]
+  hex-layer-unselected = ["default.white","default.gray02"]
+  packet-list-cell-focus = ["default.white","default.purple"]
+  packet-list-cell-selected = ["default.white","default.gray03"]
+  packet-list-row-focus = ["default.white","default.brightblue"]
+  packet-list-row-selected = ["default.white","default.gray02"]
+  packet-struct-focus = ["default.white","default.brightblue"]
+  packet-struct-selected = ["default.black","default.gray03"]
+  progress-complete = ["default.white","default.purple"]
+  progress-default = ["default.white","default.black"]
+  progress-spinner = ["default.yellow","default.purple"]
+  spinner = ["default.yellow","default.black"]
+  stream-client = ["default.black","default.red"]
+  stream-match = ["default.black","default.yellow"]
+  stream-search = ["default.black","default.white"]
+  stream-server = ["default.cyan","default.blue"]
+  title = ["default.red","unused"]
+
+[light]
+  button = ["default.black","default.white"]
+  button-focus = ["default.black","default.purple"]
+  button-selected = ["default.black","default.gray04"]
+  cmdline = ["default.black","default.yellow"]
+  cmdline-button = ["default.yellow","default.black"]
+  cmdline-border = ["default.black","default.yellow"]
+  copy-mode = ["default.white","default.yellow"]
+  copy-mode-alt = ["default.yellow","default.white"]
+  copy-mode-label = ["default.black","default.red"]
+  current-capture = ["default.black","unused"]
+  dialog = ["default.black","default.yellow"]
+  dialog-button = ["default.yellow","default.black"]
+  default = ["default.black","default.white"]
+  filter-intermediate = ["default.black","default.orange"]
+  filter-invalid = ["default.black","default.red"]
+  filter-menu = ["default.black","default.white"]
+  filter-valid = ["default.black","default.green"]
+  hex-byte-selected = ["default.white","default.purple"]
+  hex-byte-unselected = ["default.black","default.white"]
+  hex-field-selected = ["default.black","default.cyan"]
+  hex-field-unselected = ["default.black","default.gray03"]
+  hex-interval-selected = ["default.white","default.gray03"]
+  hex-interval-unselected = ["default.black","default.gray05"]
+  hex-layer-selected = ["default.white","default.gray03"]
+  hex-layer-unselected = ["default.black","default.gray05"]
+  packet-list-cell-focus = ["default.white","default.purple"]
+  packet-list-cell-selected = ["default.black","default.gray04"]
+  packet-list-row-focus = ["default.white","default.brightblue"]
+  packet-list-row-selected = ["default.black","default.gray05"]
+  packet-struct-focus = ["default.white","default.brightblue"]
+  packet-struct-selected = ["default.black","default.grayisrune && 05"]
+  progress-complete = ["default.white","default.purple"]
+  progress-default = ["default.white","default.black"]
+  progress-spinner = ["default.yellow","default.black"]
+  spinner = ["default.yellow","default.white"]
+  stream-client = ["default.white","default.red"]
+  stream-match = ["default.white","default.yellow"]
+  stream-search = ["default.white","default.black"]
+  stream-server = ["default.cyan","default.blue"]
+  title = ["default.red","unused"]