Commit Graph

  • ecde339f59 Merge branch 'obsd-master' Thomas Adam 2020-03-30 10:01:27 +01:00
  • c713b65b9e Do not check flags after the popup struct has been freed. nicm 2020-03-30 07:42:44 +00:00
  • 586cafff0f Do not check flags after the popup struct has been freed. nicm 2020-03-30 07:42:44 +00:00
  • 5aa9e425b4 Merge branch 'obsd-master' Thomas Adam 2020-03-28 16:01:24 +00:00
  • 374f5ea60c Merge branch 'obsd-master' Thomas Adam 2020-03-28 14:01:28 +00:00
  • 88ca500546 Merge branch 'obsd-master' Thomas Adam 2020-03-28 10:01:27 +00:00
  • 6d0376a679 Change default position for menu and popup to centre rather than top left. nicm 2020-03-28 09:55:30 +00:00
  • 852a2f2e1f Make two -E only close popup automatically if the command exited with 0. nicm 2020-03-28 09:51:12 +00:00
  • 8036d0f834 Change default position for menu and popup to centre rather than top left. nicm 2020-03-28 09:55:30 +00:00
  • 593fddf84b Make two -E only close popup automatically if the command exited with 0. nicm 2020-03-28 09:51:12 +00:00
  • 4346098e97 Fix how popup height is calculated to take embedded newlines into account. nicm 2020-03-28 09:39:44 +00:00
  • e0b17e796b Add formats for top paste buffer by default. Also a tmux.1 fix from jmc. nicm 2020-03-28 09:39:27 +00:00
  • f986539e3c Merge branch 'master' of github.com:tmux/tmux Thomas Adam 2020-03-26 11:12:18 +00:00
  • 8a57d14f4b Merge branch 'obsd-master' Thomas Adam 2020-03-26 11:11:37 +00:00
  • 75a93207d4 Update capture-pane test, from Johannes Altmanninger. Nicholas Marriott 2020-03-21 13:51:42 +00:00
  • 55b14cdc6a Add support for overlay popup boxes to show text or output temporarily above the normal layout. These work similarly to menus and are created with the display-popup command. nicm 2020-03-24 08:09:43 +00:00
  • 8a838b0372 Add support for overlay popup boxes to show text or output temporarily above the normal layout. These work similarly to menus and are created with the display-popup command. nicm 2020-03-24 08:09:43 +00:00
  • f652d777a6 Merge branch 'obsd-master' Thomas Adam 2020-03-21 16:01:25 +00:00
  • 5123bb7db4 Merge branch 'obsd-master' Thomas Adam 2020-03-21 14:01:27 +00:00
  • edca27ae45 AIX colours are always stored as 90-97, not 100-107. From Johannes Altmanninger. nicm 2020-03-21 13:51:30 +00:00
  • af6ae35900 Set end position correctly, GitHub issue 2129 from Anindya Mukherjee. nicm 2020-03-21 13:19:56 +00:00
  • 8828b958f0 Break code to convert an argument as a percentage into a common function. nicm 2020-03-21 13:16:15 +00:00
  • 5aeab5ab40 Preserve exit status from run-shell and pass to the client. nicm 2020-03-21 13:15:38 +00:00
  • c6d4baa4e5 Merge branch 'obsd-master' Thomas Adam 2020-03-20 22:01:26 +00:00
  • 9a55f65702 Fix select-word when not on a word, from Anindya Mukherjee. nicm 2020-03-20 20:12:39 +00:00
  • e4efd59fe0 Merge branch 'obsd-master' Thomas Adam 2020-03-20 20:01:34 +00:00
  • 1a4e64ba69 Apply same menu items to view mode like copy mode. nicm 2020-03-20 18:35:53 +00:00
  • 7c25f22074 Similarly, disable zoom if only one pane. nicm 2020-03-20 18:22:37 +00:00
  • b66501df0c Put swap down back in the right place. nicm 2020-03-20 18:20:58 +00:00
  • 4d6805284b Disable swap entries if nothing to swap with. nicm 2020-03-20 18:19:22 +00:00
  • 68cf61aa46 Still want the per-mode menus outside copy mode. nicm 2020-03-20 18:11:56 +00:00
  • 005cd48620 Oops, typo in key binding. nicm 2020-03-20 18:05:22 +00:00
  • 9894e50c42 Merge branch 'obsd-master' Thomas Adam 2020-03-20 18:01:25 +00:00
  • 06c3079d66 Make the mouse_word and mouse_line formats work in copy mode and enable the default pane menu in copy mode. nicm 2020-03-20 17:59:39 +00:00
  • 7bbca49395 Fix positioning of menu in choose modes and a couple of keys in tree mode. nicm 2020-03-20 17:26:14 +00:00
  • 5b71943f89 Merge branch 'obsd-master' Thomas Adam 2020-03-20 14:01:26 +00:00
  • a3ff5a9e25 select_word_end needs to forward no_reset flag or select-word selects too much. nicm 2020-03-20 13:12:04 +00:00
  • 159e648ccb Merge branch 'obsd-master' Thomas Adam 2020-03-20 08:01:26 +00:00
  • c3e96cce4e Another fix to make other-end forget the selection mode, from Anindya Mukherjee. nicm 2020-03-20 06:09:19 +00:00
  • 35c4897d8f Merge branch 'obsd-master' Thomas Adam 2020-03-19 16:01:29 +00:00
  • 74ed17d41b Little bit of tidying. nicm 2020-03-19 14:23:58 +00:00
  • c15396459b No util.h. Nicholas Marriott 2020-03-19 14:06:37 +00:00
  • de34436d4c Change input path so it doesn't require a pane. nicm 2020-03-19 14:03:48 +00:00
  • 17e4f2394a Merge branch 'obsd-master' Thomas Adam 2020-03-19 14:01:31 +00:00
  • ce61bf931b Do not set the history flag if there is no history. nicm 2020-03-19 13:46:10 +00:00
  • e8273a993e Add a flag to run a background process in a pty as well, not used for anything yet. nicm 2020-03-19 13:43:18 +00:00
  • 581ed718e7 Add C position for terminal centre with display-menu -x and -y. nicm 2020-03-19 13:32:49 +00:00
  • 2cd8ea7680 Various fixes to copying with select-word and select-line, including making it consistent with keys and with the mouse, and using other-end. From Anindya Mukherjee. nicm 2020-03-19 13:28:52 +00:00
  • 7595b22e72 Merge branch 'obsd-master' Thomas Adam 2020-03-18 10:01:26 +00:00
  • 7b0e688a96 Break position calculation into a helper function. nicm 2020-03-18 09:13:49 +00:00
  • af4b62d10b 3.1-rc3. Nicholas Marriott 2020-03-18 07:55:33 +00:00
  • 0c06409c9d getopt is not required to set optarg to NULL when there is no argument and some do not, so set it explicitly each time. nicm 2020-03-17 16:02:38 +00:00
  • 18cfd9befa Merge branch 'obsd-master' Thomas Adam 2020-03-17 18:01:27 +00:00
  • 76f373ab35 Merge branch '3.1-rc' Nicholas Marriott 2020-03-17 16:17:09 +00:00
  • 617136c234 Turn off mouse mode 1003 as well as the rest when exiting. nicm 2020-03-16 09:18:47 +00:00
  • f16085a362 Fix C-Space key string. nicm 2020-03-15 20:35:52 +00:00
  • 4ffbebedce Terminate the output buffer for control mode output - it is now used as a string. GitHub issue 2114. nicm 2020-03-16 09:12:44 +00:00
  • c0d74661b7 Do not attempt to close a NULL pane when failing to create a new one. nicm 2020-03-16 18:08:39 +00:00
  • b21a9b1c4e getopt varies too much between platforms, and we already use compat/getopt.c for Linux so just use it everywhere. Nicholas Marriott 2020-03-17 16:06:30 +00:00
  • 80f20b8e4e getopt varies too much between platforms, and we already use compat/getopt.c for Linux so just use it everywhere. Nicholas Marriott 2020-03-17 16:06:30 +00:00
  • bd0342b0a7 getopt is not required to set optarg to NULL when there is no argument and some do not, so set it explicitly each time. nicm 2020-03-17 16:02:38 +00:00
  • 5717633cf5 Merge branch 'obsd-master' Thomas Adam 2020-03-17 14:01:25 +00:00
  • 1ddc128860 Do not return early if no bits changed because may still need to change the style. nicm 2020-03-17 12:20:12 +00:00
  • 0610f66fa9 Merge branch 'obsd-master' Thomas Adam 2020-03-17 12:01:28 +00:00
  • 115bb33257 Ignore default-shell (and use /bin/sh) if it invalid not just if it is tmux itself, also refuse to set the option to something invalid in the first place. GitHub issue 2120. nicm 2020-03-17 11:10:12 +00:00
  • 71eb965dd9 Merge branch 'obsd-master' Thomas Adam 2020-03-16 20:01:24 +00:00
  • fb396286ff Do not attempt to close a NULL pane when failing to create a new one. nicm 2020-03-16 18:08:39 +00:00
  • c18a46cf56 Merge branch 'obsd-master' Thomas Adam 2020-03-16 16:01:26 +00:00
  • 62c646ac32 Add couple of CHANGES tweaks. Nicholas Marriott 2020-03-16 15:13:35 +00:00
  • 372841f70a Add to CHANGES. Nicholas Marriott 2020-03-16 15:12:16 +00:00
  • 69eff51538 Add. Nicholas Marriott 2020-03-16 15:11:34 +00:00
  • 7021757c9d Adjust selection correctly when scrolling, from Anindya Mukherjee. nicm 2020-03-16 14:17:56 +00:00
  • cae2dfc95a Merge branch 'obsd-master' Thomas Adam 2020-03-16 12:01:26 +00:00
  • 37b7a29cca VTE treats each mouse mode bit as independent, so turning off 1000 doesn't also turn off 1001, so don't rely on that behaviour. GitHub issue 2116. nicm 2020-03-16 10:49:06 +00:00
  • 45be93f604 Merge branch 'obsd-master' Thomas Adam 2020-03-16 10:01:27 +00:00
  • 7cae4e8e89 Turn off mouse mode 1003 as well as the rest when exiting. nicm 2020-03-16 09:18:47 +00:00
  • 7815b30c7d Terminate the output buffer for control mode output - it is now used as a string. GitHub issue 2114. nicm 2020-03-16 09:12:44 +00:00
  • 9abeff7f0b FIx type for %u, from Thomas Adam. nicm 2020-03-16 08:23:24 +00:00
  • f584fe1b00 Merge branch 'obsd-master' Thomas Adam 2020-03-16 08:01:27 +00:00
  • d162ff48f3 Send mouse down event immediately rather than waiting for double click to finish which would now mean it was out of order. Reported by Mark Kelly. nicm 2020-03-16 06:12:42 +00:00
  • 55aeaffb1a Merge branch 'obsd-master' Thomas Adam 2020-03-15 22:01:27 +00:00
  • 882d0b785d Reset selection flag when clearing or stopping selection, from Mark Kelly. nicm 2020-03-15 20:44:19 +00:00
  • fa3871b1be Fix C-Space key string. nicm 2020-03-15 20:35:52 +00:00
  • c859748210 Merge branch 'obsd-master' Thomas Adam 2020-03-13 08:01:24 +00:00
  • fa36e9bc88 Do not add a reference to the session if no session is present. nicm 2020-03-13 06:19:33 +00:00
  • c91a0948e3 Merge branch 'obsd-master' Thomas Adam 2020-03-12 16:01:28 +00:00
  • 6385bd1e08 Merge branch 'obsd-master' Thomas Adam 2020-03-12 14:01:29 +00:00
  • 6571dd50f8 Tidy up the default mouse key bindings and: nicm 2020-03-12 13:48:32 +00:00
  • 516f6099fc Add a -d flag to run-shell to wait for delay before running the command, also allow run-shell to accept no command to just delay. nicm 2020-03-12 13:25:45 +00:00
  • 7863445e5d Add a copy-mode -H flag to hide the position marker in the top right. nicm 2020-03-12 13:19:20 +00:00
  • f7bc753442 Change how double and triple clicks works so that one or the other is fired - a double click is no longer triggered on the way to a triple click. nicm 2020-03-12 13:16:16 +00:00
  • 5625c62044 Merge branch 'obsd-master' Thomas Adam 2020-03-12 12:01:25 +00:00
  • 1a2e66f345 Merge branch 'obsd-master' Thomas Adam 2020-03-12 10:01:25 +00:00
  • b8b48e2e37 Add C-g to cancel command prompt with vi(1) keys as well as emacs, and q in command mode. nicm 2020-03-12 09:49:43 +00:00
  • 2a5702a936 When the server socket is given by the user with -S, create it with umask 177 instead of 117 because it may not be in a safe directory like the default directory in /tmp. The user can chmod it more open after it is created if they want. nicm 2020-03-12 09:26:34 +00:00
  • 39dc809751 Merge branch 'obsd-master' Thomas Adam 2020-03-11 20:01:26 +00:00
  • 4eba98313c Start a new selection if outside the existing selection after a word has been selected. From Anindya Mukherjee. nicm 2020-03-11 18:46:42 +00:00
  • e4898de98d Only need one lm. Nicholas Marriott 2020-03-11 18:41:14 +00:00
  • 256f7e8f38 Merge branch 'master' of github.com:tmux/tmux Thomas Adam 2020-03-11 17:24:42 +00:00
  • e512a3642a Merge branch 'obsd-master' Thomas Adam 2020-03-11 17:23:38 +00:00