mirror of https://github.com/tmux/tmux.git
Compare commits
966 Commits
Author | SHA1 | Date |
---|---|---|
Thomas Adam | 4c2eedca5a | |
jsg | ac6c1e9589 | |
Thomas Adam | 0903790b00 | |
jsg | 03de52653e | |
jsg | da06719309 | |
Thomas Adam | fc84097379 | |
Thomas Adam | 4fd725c6e1 | |
nicm | d39dcea30a | |
nicm | bfd65398a9 | |
Thomas Adam | 452d987e0e | |
Thomas Adam | 8ef899f315 | |
nicm | a18d1146aa | |
nicm | 5b5004e5ac | |
Thomas Adam | 6ff8f8fbf9 | |
nicm | c9616700ca | |
nicm | 4c928dce74 | |
nicm | fb37d52dde | |
Thomas Adam | 363d9c401e | |
nicm | 8643ece345 | |
Nicholas Marriott | 9ba433e521 | |
Nicholas Marriott | 3823fa2c57 | |
Thomas Adam | 0a8571b6fe | |
jsg | ea9f416c99 | |
Thomas Adam | 036d8993e6 | |
nicm | e8530c9fee | |
Nicholas Marriott | dd4c0109a9 | |
Thomas Adam | 43530d4397 | |
nicm | 553d4cba79 | |
nicm | c62a9ca16b | |
nicm | 424f13fe13 | |
Thomas Adam | 4bb6da75ba | |
nicm | a28175dbfd | |
Thomas Adam | fc204bb5e5 | |
nicm | 6207a45139 | |
Thomas Adam | 3c3643f580 | |
nicm | 89c1c43ef9 | |
nicm | 2e9d7ebf15 | |
nicm | d8ddeec7db | |
nicm | 6f0254e6a8 | |
Nicholas Marriott | aa17f0e0c1 | |
nicm | 0ae8b681b2 | |
nicm | 6c0067c103 | |
nicm | 5458cb2850 | |
nicm | 0c374868ca | |
Nicholas Marriott | bf5d3f2e26 | |
Nicholas Marriott | d5ef837f63 | |
Thomas Adam | b79e28b2c3 | |
nicm | 8ffd5458ff | |
Thomas Adam | b54e1fc4f7 | |
Nicholas Marriott | bdb6321229 | |
nicm | bd29a48b56 | |
Nicholas Marriott | f3f1c3db58 | |
Nicholas Marriott | 608d113486 | |
Nicholas Marriott | 9ae69c3795 | |
Thomas Adam | 0960862950 | |
Nicholas Marriott | 44ad25b367 | |
nicm | 40b97b1715 | |
nicm | 4bdb855020 | |
Thomas Adam | ea7136fb83 | |
nicm | 428f8a9b28 | |
Nicholas Marriott | 84faada25b | |
Nicholas Marriott | 55d0abad89 | |
Nicholas Marriott | 7d91b4b90b | |
Nicholas Marriott | 66369416fc | |
Thomas Adam | 001e26d0bb | |
claudio | 2e39d698d2 | |
Thomas Adam | e809c2ec35 | |
Nicholas Marriott | 4266d3efc8 | |
nicm | 40a20bc8ae | |
nicm | f7bf7e9671 | |
nicm | 008ecd4592 | |
nicm | 73a2b12088 | |
Nicholas Marriott | 605bf21ff2 | |
nicm | f028445407 | |
Thomas Adam | bdf8e614af | |
nicm | 4dea352dee | |
Thomas Adam | 151875d144 | |
nicm | 88fd1f00b8 | |
nicm | 1a14d6d2e1 | |
Thomas Adam | 381c00a74e | |
nicm | 5aadee6df4 | |
Nicholas Marriott | a5545dbc9f | |
nicm | fdf465925e | |
nicm | 36e1ac6556 | |
nicm | ffa376edf7 | |
Thomas Adam | b777780720 | |
nicm | 347cd0b5f8 | |
Nicholas Marriott | 0ca28b362e | |
Nicholas Marriott | 51b80b985e | |
Nicholas Marriott | 789a98982e | |
Thomas Adam | b202a2f1b5 | |
nicm | 7e79108f8a | |
nicm | f09cde2542 | |
Thomas Adam | 9f9156c030 | |
nicm | d394293ba5 | |
Thomas Adam | c57a09269b | |
nicm | 8191c58737 | |
Thomas Adam | f68d35c529 | |
nicm | c02bc4dbe9 | |
nicm | 4872811ba7 | |
Nicholas Marriott | 1a1290f30b | |
Nicholas Marriott | 7be7ca7195 | |
Thomas Adam | 32197fa52d | |
nicm | 9653a52a6a | |
Thomas Adam | d60c8942ce | |
nicm | c99f9e92e0 | |
Thomas Adam | e26356607e | |
nicm | 43e5e80343 | |
Thomas Adam | 1742138f05 | |
nicm | c767d62329 | |
Thomas Adam | 7ad29b9831 | |
nicm | d209fe9b1e | |
nicm | c5542637d7 | |
Thomas Adam | e7c829fc67 | |
nicm | 579829eef2 | |
Nicholas Marriott | 3aa20f6e75 | |
nicm | f78279bb2e | |
Thomas Adam | a99d7c6314 | |
Thomas Adam | cf1ed67fcc | |
Thomas Adam | 1aec420465 | |
nicm | 16e4b39359 | |
nicm | 9456258ccc | |
nicm | c41d59f232 | |
Nicholas Marriott | d682ef88e6 | |
nicm | c1e6e54e6e | |
Nicholas Marriott | 62f657845e | |
Thomas Adam | a9841a6d1e | |
Thomas Adam | 70ecf17f85 | |
nicm | 71d453f169 | |
Nicholas Marriott | 071849f82f | |
nicm | 52084b2948 | |
Nicholas Marriott | dfbc6b1888 | |
Thomas Adam | e3a8b8434c | |
nicm | 8636848e63 | |
Thomas Adam | 3d93b0c52e | |
nicm | d9942c769e | |
Thomas Adam | 6a45e6c256 | |
nicm | b770a429c6 | |
Thomas Adam | 11e69f6025 | |
nicm | 57837bbf67 | |
Thomas Adam | 4c60afde78 | |
Thomas Adam | ed689cd54e | |
nicm | 7a44984069 | |
nicm | dee72ed41f | |
nicm | 1071ef8fc5 | |
nicm | 2b535bc173 | |
Thomas Adam | b791f00bf1 | |
Thomas Adam | 3e82ad5340 | |
nicm | 7b1030293c | |
nicm | a5fd80bbc3 | |
Thomas Adam | fda3937734 | |
nicm | b13c230749 | |
Thomas Adam | 715f39a53a | |
nicm | 2f74e811f1 | |
Thomas Adam | 828efc7bcf | |
nicm | 84936b832f | |
Thomas Adam | c8494dff7b | |
nicm | 8fcc212e7a | |
Thomas Adam | 0e281530cb | |
nicm | efded95ed7 | |
Thomas Adam | 18870913c5 | |
nicm | 63b7282377 | |
Thomas Adam | 269dab4b3e | |
nicm | 4ece43a029 | |
nicm | 8b3e2eab5a | |
Thomas Adam | e4c4ceb286 | |
nicm | b7e22d00b4 | |
Thomas Adam | 1a11c972ae | |
nicm | 43b841f188 | |
Thomas Adam | f9b0460840 | |
Thomas Adam | 659d876cd5 | |
nicm | ac43186dff | |
nicm | e79fb214f8 | |
Thomas Adam | 9cf58d1a52 | |
nicm | a2a02fd7d7 | |
Thomas Adam | 237ee6f231 | |
nicm | 4e57894e85 | |
Nicholas Marriott | 8c9fbbf4f3 | |
Thomas Adam | 3f3d61bd58 | |
Thomas Adam | 80d4f4afc6 | |
nicm | 2546216019 | |
nicm | ff8882a24f | |
Thomas Adam | ffe2410639 | |
nicm | 9e14c1f88d | |
Thomas Adam | 29a5dfc7c0 | |
nicm | 645bf8b3ab | |
Thomas Adam | f41c536ff3 | |
nicm | bdd05bdbd3 | |
Nicholas Marriott | fe385b180f | |
Thomas Adam | 0eb5d25453 | |
nicm | 1d98394b41 | |
Thomas Adam | 149d9cc851 | |
tb | 204d8f31d7 | |
Thomas Adam | fbe6fe7f55 | |
Nicholas Marriott | 168eab11a7 | |
nicm | 41b318ac7c | |
nicm | bf636d9575 | |
Nicholas Marriott | 39d41d0810 | |
Thomas Adam | 9d8131c190 | |
Nicholas Marriott | 0ff991b25f | |
Nicholas Marriott | 15c70e562c | |
nicm | 8f34504736 | |
nicm | 551e0c36d9 | |
nicm | 48eba4c195 | |
nicm | 9f605178c3 | |
nicm | bcafe51378 | |
nicm | 280fe77edd | |
Nicholas Marriott | b9524f5b72 | |
nicm | a2018b2c3f | |
nicm | c21af7e446 | |
nicm | d73078838d | |
Thomas Adam | 22eb0334c3 | |
nicm | a9ac614691 | |
Thomas Adam | 1d0f68dee9 | |
nicm | ac4bb89d43 | |
Thomas Adam | b55f34029a | |
nicm | 907f58cc3c | |
Thomas Adam | 023b0f76c3 | |
Thomas Adam | ddaeebc213 | |
nicm | 1262e685b8 | |
nicm | 0bd78b42c0 | |
Thomas Adam | 4a0126f7fb | |
nicm | 7acc8d703d | |
Thomas Adam | 77118f3a9f | |
Thomas Adam | e25926d3c4 | |
nicm | 0cb75f1332 | |
nicm | 93b1b78150 | |
Thomas Adam | 493922dc4b | |
nicm | f10854cfc5 | |
nicm | 993e7a937f | |
Thomas Adam | f5af3cfb21 | |
nicm | e7e112fbd0 | |
Thomas Adam | c42087c789 | |
nicm | 3aa458ea63 | |
Thomas Adam | c4a6f403bb | |
nicm | 9789ea3fb4 | |
Thomas Adam | f416ae1c12 | |
nicm | d578cf8d3f | |
Thomas Adam | 789cb91f31 | |
nicm | eb1f8d70a7 | |
Thomas Adam | 42895efac3 | |
nicm | 483cc77c1c | |
Thomas Adam | 9b1ea8b16d | |
nicm | b41892622d | |
Thomas Adam | 9051220243 | |
nicm | c0031f8b85 | |
Thomas Adam | c1a30ed995 | |
nicm | 565de3f54b | |
Thomas Adam | 153ae758c9 | |
Thomas Adam | 5086377f30 | |
nicm | 7c0789d2d2 | |
Nicholas Marriott | 2a32565e0c | |
nicm | 7ced0a03d2 | |
nicm | cb51942669 | |
Nicholas Marriott | 093fb53773 | |
Thomas Adam | 21e00e4635 | |
nicm | 09afc6c8ee | |
nicm | a41a927441 | |
jmc | 3fe01ff09c | |
kn | b5ab4d2c13 | |
nicm | 4d79d463ef | |
nicm | 7cb48fc40b | |
nicm | 8bd17bff49 | |
nicm | 3b3f42053a | |
Nicholas Marriott | 70ff8cfe1e | |
Thomas Adam | 6249a4b866 | |
nicm | 7e497c7f23 | |
Thomas Adam | 1536b7e206 | |
Nicholas Marriott | e46d0632a5 | |
nicm | 20da167377 | |
nicm | fe475bd856 | |
nicm | 079f48e8a6 | |
Thomas Adam | aaa043a20f | |
jmc | 48f41e4a41 | |
Thomas Adam | 6fb80527f3 | |
nicm | f86eba2129 | |
Thomas Adam | 50f4e0fac9 | |
nicm | 77c135349a | |
Thomas Adam | c449512be4 | |
nicm | 17290b9121 | |
nicm | 3be369522b | |
Thomas Adam | dbfbd8a195 | |
nicm | 9614f51560 | |
Thomas Adam | 36896f6dd0 | |
nicm | 2d08235987 | |
nicm | 2291045116 | |
Thomas Adam | 9dd1f442c5 | |
nicm | 8edece2cdb | |
Thomas Adam | d001a94d7b | |
nicm | c2580cfe24 | |
Thomas Adam | dafd6f462f | |
nicm | 2111142cf1 | |
nicm | 0fc961b22e | |
Nicholas Marriott | 5ce34add77 | |
Thomas Adam | 934f357149 | |
nicm | ff2766b024 | |
Thomas Adam | 9ef854f5a9 | |
nicm | a10452be2d | |
nicm | 9cc8e40aa0 | |
Thomas Adam | f49f92737f | |
Nicholas Marriott | 19344ec890 | |
nicm | a2cc601c3d | |
nicm | 9ab1ba36cd | |
nicm | f03c3ca6c3 | |
Nicholas Marriott | 0a0ded3268 | |
Thomas Adam | 6da520c5a1 | |
nicm | 68dc9af9ac | |
Thomas Adam | f7b30ed3d4 | |
nicm | e867528209 | |
Thomas Adam | 038dfb27a8 | |
nicm | 416c27c995 | |
Nicholas Marriott | 19344efa78 | |
Thomas Adam | 9c34aad21c | |
nicm | 7c2dcd7238 | |
nicm | 03149bf7f6 | |
nicm | 497021d0db | |
nicm | cfdc5b62ad | |
Thomas Adam | 9b08e5139b | |
nicm | e139f977b1 | |
Thomas Adam | 9abf5d9fe5 | |
nicm | 273577ba0a | |
Thomas Adam | e15058e60f | |
nicm | de5cd54124 | |
Thomas Adam | c6cf09450a | |
nicm | c6e7568471 | |
Thomas Adam | 7b8ececd8d | |
nicm | 42ba6c1b22 | |
Thomas Adam | 9a2fdf8fd4 | |
Nicholas Marriott | 00812c9053 | |
nicm | 33c59100ae | |
nicm | 36d904011a | |
Thomas Adam | 9d9445a48e | |
nicm | a8da24771c | |
Thomas Adam | ab1d18d00f | |
nicm | ee431d482a | |
Nicholas Marriott | e06c09889c | |
nicm | 86dfbda0e4 | |
Nicholas Marriott | 697cebb4c1 | |
nicm | 3c65475561 | |
Thomas Adam | dc6bc0e95a | |
Thomas Adam | b130e951cc | |
Nicholas Marriott | 9e19f132f2 | |
nicm | 1afe22086f | |
Nicholas Marriott | 8e8b9865d1 | |
nicm | a39827a85c | |
nicm | 9e03df5500 | |
nicm | dd602eaa61 | |
nicm | d0d2c39dec | |
Thomas Adam | 57fec74966 | |
nicm | 9360e0ef32 | |
Nicholas Marriott | f08c019d41 | |
Thomas Adam | c3af8f6b16 | |
Thomas Adam | 01c4919f5f | |
nicm | cdacc12ce3 | |
Thomas Adam | d8c527a5f9 | |
nicm | b22edcf3a5 | |
nicm | 786cff8db9 | |
Thomas Adam | b63afaea61 | |
nicm | 9c89f7c2af | |
Thomas Adam | d46870ede5 | |
nicm | a888ce9963 | |
Thomas Adam | 8ff3091d16 | |
nicm | d9f84854ac | |
Thomas Adam | 89fe2680a9 | |
nicm | 7cee982f90 | |
Nicholas Marriott | 42358cc521 | |
Thomas Adam | 06869ff22f | |
nicm | 616bde08ac | |
Thomas Adam | 6d0828b81c | |
nicm | 42ddf02ffc | |
Thomas Adam | 56390e0a39 | |
nicm | 18a5835aff | |
Nicholas Marriott | 67960dcc9a | |
Nicholas Marriott | 0b355ae811 | |
Nicholas Marriott | 6a9bb2a622 | |
nicm | 988e59cf3e | |
nicm | 30e06e9d85 | |
Thomas Adam | 810daefdd1 | |
nicm | ccc9dc3bb4 | |
Thomas Adam | be2eb57d62 | |
nicm | c07d582e24 | |
Thomas Adam | afb3a5fe71 | |
nicm | 020c403dff | |
Thomas Adam | e77e11ec6b | |
nicm | 3edda3c5e7 | |
Thomas Adam | 1184dc08d4 | |
nicm | 18838fbc87 | |
Nicholas Marriott | be2617036f | |
nicm | 0f6227f46b | |
Thomas Adam | c1ac007576 | |
nicm | 201a8d8e7e | |
Nicholas Marriott | b566cd57bf | |
Nicholas Marriott | 87fe00e8b4 | |
Nicholas Marriott | ced83792b1 | |
Thomas Adam | 42f6d11a6b | |
nicm | 74fb959f6d | |
Thomas Adam | 9daaf01730 | |
nicm | 86a184b288 | |
Thomas Adam | af596c0828 | |
nicm | 58c8ea1209 | |
nicm | 2f2bb82f5f | |
nicm | 6a5d210e55 | |
nicm | 384f0ee269 | |
nicm | 006a529db1 | |
nicm | af1496b300 | |
nicm | 2b60ff588e | |
nicm | cd89000c1d | |
nicm | 20b0b38cf4 | |
nicm | 0a8f356c72 | |
nicm | af611815ea | |
nicm | 4ae2c64657 | |
nicm | cd692b5a68 | |
Nicholas Marriott | bf33e807b6 | |
Nicholas Marriott | cf7e1c94df | |
Nicholas Marriott | 1b28b2b51d | |
Nicholas Marriott | 95baa32383 | |
Nicholas Marriott | ead75c2d51 | |
Nicholas Marriott | 2cad9a6af8 | |
Nicholas Marriott | 3b7dae9a53 | |
Thomas Adam | 5ed64657d8 | |
Nicholas Marriott | c6b51cea92 | |
Nicholas Marriott | 58d1a206c6 | |
Nicholas Marriott | e0c982c5ad | |
nicm | d4423dca19 | |
Nicholas Marriott | 8bcd392ee7 | |
Nicholas Marriott | 3a6d82b7c8 | |
Nicholas Marriott | 0c84a20d2f | |
Nicholas Marriott | 996e54763c | |
Nicholas Marriott | 18105c8ecb | |
Nicholas Marriott | d6306b634e | |
Nicholas Marriott | 6e9a9d265e | |
Nicholas Marriott | 36648f2668 | |
Nicholas Marriott | 7f86cab1d2 | |
Nicholas Marriott | 39b1e96b45 | |
nicm | 1e9c3b3c63 | |
naddy | fc6580574e | |
nicm | 2df7bc14fa | |
nicm | 880abd0ec2 | |
Nicholas Marriott | 1c69a91c25 | |
nicm | 98de5784a0 | |
nicm | d4eda7f9e5 | |
nicm | 89a0046ad3 | |
nicm | 60a0a904e0 | |
nicm | c0508c9321 | |
nicm | fe44b105e4 | |
nicm | ad7113e0db | |
nicm | 23e613fcf5 | |
nicm | 98b92c0525 | |
nicm | 57f331438a | |
nicm | 8aed444201 | |
Nicholas Marriott | f97d784f17 | |
Nicholas Marriott | 759f949654 | |
Nicholas Marriott | f1d8724198 | |
Nicholas Marriott | 367ee79df0 | |
nicm | d5a84de842 | |
nicm | 355ced93cc | |
nicm | bc0bd8213d | |
topcat001 | 141a823ea4 | |
nicm | 42e7959336 | |
nicm | 9947f7416a | |
deraadt | c030d6fe36 | |
nicm | 046530878b | |
nicm | a26ebccd42 | |
nicm | 92a26a8b8c | |
nicm | f74a98cd07 | |
nicm | 4893edd5d6 | |
nicm | 6a0a783c26 | |
Nicholas Marriott | 7f40c5b647 | |
nicm | eabbc80b75 | |
nicm | 190b88fcab | |
nicm | 2adbe3ec16 | |
nicm | 9efa419955 | |
nicm | 921be61930 | |
Thomas Adam | b0ff446727 | |
nicm | 65c0af76fb | |
Thomas Adam | 87b248f3e8 | |
naddy | 2d9f4ca9a1 | |
Thomas Adam | fc82f2525c | |
nicm | ded695504f | |
Thomas Adam | ac16f2c641 | |
Nicholas Marriott | fc7f1e7acb | |
nicm | 207b1bc385 | |
Thomas Adam | d26a4ea463 | |
nicm | 422fcd294a | |
Thomas Adam | b638886716 | |
nicm | 938130bc69 | |
Thomas Adam | 5e491e7947 | |
nicm | 792d13af49 | |
Thomas Adam | 964deae422 | |
nicm | 6a1706a62f | |
nicm | 10d689e735 | |
Thomas Adam | 5d4c3ef762 | |
nicm | e6e737ac0b | |
Thomas Adam | ee3f1d25d5 | |
nicm | bfbe972225 | |
nicm | cf217fa618 | |
Thomas Adam | 25337ac102 | |
nicm | a3d920930b | |
Thomas Adam | 2fb6089e81 | |
nicm | ad9b805983 | |
Nicholas Marriott | 04952f15df | |
nicm | 98cd8e4cad | |
Nicholas Marriott | 9ed1226a66 | |
Nicholas Marriott | afd9b68d10 | |
Nicholas Marriott | 54d2249716 | |
Thomas Adam | 7eff2fe780 | |
nicm | a731b1a916 | |
Thomas Adam | f84f1c0cfe | |
nicm | 7d4224f207 | |
Thomas Adam | bf14bf6259 | |
nicm | f39a71aaad | |
Anindya Mukherjee | cd9a81e242 | |
topcat001 | 047c011a15 | |
Thomas Adam | 649685ff6d | |
Thomas Adam | 2750195709 | |
nicm | 2da096d828 | |
nicm | 2e59ff2db9 | |
Thomas Adam | 60688afe9c | |
deraadt | e8d6d53a7b | |
Thomas Adam | dc0746946e | |
Thomas Adam | 2be5488693 | |
nicm | d54b18ca2b | |
nicm | fa71e9a079 | |
nicm | 0fd01f8873 | |
nicm | a9b880921d | |
Thomas Adam | 88d9a8fc05 | |
nicm | 818b2176ef | |
Thomas Adam | 722f395e61 | |
nicm | 0027ee13a0 | |
Nicholas Marriott | c7c7e875a0 | |
Thomas Adam | 85ef73591d | |
nicm | 5076beb009 | |
nicm | f85208602d | |
Thomas Adam | df681390a6 | |
nicm | 040164555a | |
Thomas Adam | c67abcf818 | |
nicm | 07e2d88c20 | |
Thomas Adam | 784d6a3929 | |
Nicholas Marriott | 53ee4f0334 | |
Thomas Adam | c0598e2515 | |
nicm | 3276f0c184 | |
nicm | 948d2fad0a | |
Thomas Adam | 1fdec20b0d | |
Thomas Adam | 375f6c90b0 | |
Nicholas Marriott | b46abeb34d | |
Nicholas Marriott | 57396b55a2 | |
nicm | c401c91ad9 | |
nicm | 5080acc127 | |
Thomas Adam | a5cf7a9b39 | |
nicm | 97900d0442 | |
Thomas Adam | a4f336a91a | |
nicm | 7e34645fcb | |
Thomas Adam | 1b7afd5129 | |
nicm | 7a4ba6d4a5 | |
nicm | 770d28b8c5 | |
Thomas Adam | 6c0397f497 | |
nicm | a6b361e775 | |
Thomas Adam | 28b6237c62 | |
Nicholas Marriott | e5e4df7a22 | |
nicm | b2b94dcba7 | |
Thomas Adam | 080079c55a | |
nicm | e6e3c75ed7 | |
Thomas Adam | 47923bd5f6 | |
nicm | 9aad945f7e | |
Thomas Adam | 9c82ff1778 | |
nicm | ff64aafeab | |
Thomas Adam | ba9b9367d5 | |
nicm | e4856de8bf | |
Thomas Adam | 70d330a353 | |
nicm | c6149adf55 | |
Thomas Adam | 5c5712be5c | |
Thomas Adam | 8941dbe482 | |
nicm | 9c1633a865 | |
nicm | 1f9aad2bb4 | |
nicm | db3aabcc34 | |
Thomas Adam | 138ffc7cb6 | |
nicm | d721fb2a9f | |
deraadt | 7532a5cf95 | |
deraadt | 71c3234dc7 | |
Nicholas Marriott | ef676e1202 | |
nicm | ecac73f664 | |
nicm | 8fccbbb026 | |
nicm | 333cf6429a | |
nicm | add03dfb8d | |
nicm | b55f0ac6b9 | |
nicm | cb8a0d83fb | |
nicm | 630c592ef8 | |
Nicholas Marriott | 10b3cd17fa | |
kn | 8f1cc0e9fa | |
Thomas Adam | 77fc7ac3be | |
nicm | 57100376cc | |
Thomas Adam | 1fc0d1b74f | |
nicm | 200b6536e1 | |
Thomas Adam | 7d330c19e8 | |
Thomas Adam | 774903f6c4 | |
nicm | 8d2286b769 | |
nicm | 4fe5aa99fb | |
Nicholas Marriott | c76904343a | |
Thomas Adam | 60cacdffea | |
nicm | 4acad43013 | |
nicm | 49d33a4282 | |
nicm | 76f5d3364c | |
Thomas Adam | c77924bb56 | |
nicm | 9695114230 | |
nicm | 5745bd27fd | |
Thomas Adam | 6f46f71d58 | |
nicm | 197a116f5a | |
nicm | eb82ad5216 | |
Thomas Adam | 3934d9b24d | |
nicm | ef46eb91a5 | |
nicm | 0cca695d6e | |
Thomas Adam | 619d934d7b | |
deraadt | 9b4148b12c | |
Thomas Adam | 5071b82c77 | |
nicm | 8235957eaa | |
Thomas Adam | be2413292f | |
nicm | 289ac55ebd | |
nicm | 7bd9cdf6fc | |
Thomas Adam | 1bf2f811ea | |
nicm | acba07629e | |
nicm | 8a9bfd0cdd | |
Thomas Adam | 65bb36d6bd | |
nicm | f26b8c57ff | |
Thomas Adam | 9e986d6a96 | |
nicm | 51ff77d47b | |
nicm | 2c188ee0c5 | |
nicm | cc27a43c40 | |
Thomas Adam | c57df2bb73 | |
nicm | 537302f2c1 | |
Thomas Adam | 264fe7fc2a | |
nicm | add20637f2 | |
Thomas Adam | ee9885a40c | |
nicm | d0ab1a837a | |
Thomas Adam | fb23df679b | |
nicm | 837ca176d1 | |
Thomas Adam | aff2a473ec | |
nicm | b8581ec80e | |
Thomas Adam | af82106fae | |
nicm | 759efe1b33 | |
Thomas Adam | 7ca863c5af | |
jmc | 7800a431ea | |
Thomas Adam | bf0f694f91 | |
kn | 50a77f4417 | |
Thomas Adam | fed7b29c7e | |
nicm | 5f63181ed5 | |
nicm | 9574496333 | |
Thomas Adam | 5374417428 | |
nicm | 5359b76619 | |
Thomas Adam | c8802c776a | |
nicm | da05d05824 | |
Thomas Adam | d8996a1c1d | |
nicm | e06a4e041c | |
Thomas Adam | 479c9563c7 | |
nicm | 9f6164a05c | |
nicm | 9b1fdb291e | |
nicm | 3d5a02bf45 | |
Thomas Adam | bf595a0cb0 | |
nicm | 68c8905859 | |
Thomas Adam | 03f9963f3d | |
nicm | 257e9ba69a | |
Nicholas Marriott | 9c77a5b9f0 | |
Nicholas Marriott | b2482535d0 | |
Nicholas Marriott | 097a792f9d | |
Thomas Adam | 25df71b90d | |
nicm | c4b969ca62 | |
Thomas Adam | 409e121cac | |
nicm | 3c3d371f99 | |
Nicholas Marriott | 8554b80b8b | |
Nicholas Marriott | 3be44313aa | |
Nicholas Marriott | ed280e14c8 | |
Nicholas Marriott | 86d505af46 | |
Nicholas Marriott | 7186ab25c9 | |
Nicholas Marriott | a049ebd6f7 | |
Nicholas Marriott | adb620c4e4 | |
Thomas Adam | 2b9830f0e7 | |
nicm | a19cac5c46 | |
Nicholas Marriott | ddcf5b801a | |
Thomas Adam | b28fffc0f7 | |
nicm | e6b40cb339 | |
nicm | 33ac7a346e | |
Nicholas Marriott | 3b10392bfc | |
Thomas Adam | 3358c9a8f1 | |
nicm | 5cdc1bdd32 | |
Thomas Adam | 31a6e5eff4 | |
nicm | 768fb9080f | |
Thomas Adam | 42b0be4cfd | |
nicm | a0b39dba31 | |
Thomas Adam | 732288c489 | |
nicm | 34312fd6ee | |
Thomas Adam | cf5e1bb80a | |
nicm | 5a4b2fd68c | |
Thomas Adam | d776c9acfc | |
nicm | 329c2c2a91 | |
Nicholas Marriott | d62aee506b | |
Nicholas Marriott | 388f0fe973 | |
Thomas Adam | 609baea95e | |
nicm | daec63e5e6 | |
nicm | fd756a150b | |
Thomas Adam | c6375a0d40 | |
nicm | 24636be42b | |
nicm | f4f8d3b5ed | |
Nicholas Marriott | 6616b42b2c | |
nicm | a3c6057b51 | |
Thomas Adam | c7266ca78d | |
nicm | 03d173cbd8 | |
nicm | c6d6af4903 | |
Nicholas Marriott | 6ac09aa47c | |
nicm | a252fadf8a | |
nicm | 78da5a3756 | |
Thomas Adam | 7fe3588e49 | |
nicm | 841ce74b43 | |
Thomas Adam | 95a374d7d2 | |
nicm | 210e71edf3 | |
nicm | 03b83a5a34 | |
nicm | 1f0c0914c7 | |
nicm | 4a753dbefc | |
nicm | 3ed37a2079 | |
Thomas Adam | 1dec1ca146 | |
Nicholas Marriott | bc71e233d9 | |
nicm | 2e9bafaf14 | |
Thomas Adam | 03054598df | |
nicm | 72d905f32c | |
nicm | c0048d6d20 | |
Thomas Adam | 324f87cf14 | |
nicm | 0084cbef5a | |
nicm | 069f5925af | |
Thomas Adam | 921991c98d | |
nicm | 326d2ef234 | |
nicm | 63b6eec278 | |
nicm | 5241dae87d | |
Thomas Adam | 4d3367e965 | |
nicm | 68cacaec68 | |
nicm | c286fbdcd7 | |
Thomas Adam | 62036121fa | |
nicm | 110ba767e5 | |
nicm | 08e6360f23 | |
nicm | d371764d02 | |
Thomas Adam | b0da0cee4d | |
nicm | d589be6c65 | |
nicm | caa8703a23 | |
nicm | 5f32b7d961 | |
nicm | de94a344f6 | |
nicm | c76b28de24 | |
Thomas Adam | 944fde7c57 | |
nicm | 90dd474c3e | |
nicm | 6cbc83c6a6 | |
nicm | e463e8622d | |
nicm | 01b13de655 | |
Nicholas Marriott | 41822ef782 | |
Nicholas Marriott | 5ed5b11b45 | |
Thomas Adam | 84955e3d62 | |
nicm | f984446d19 | |
Thomas Adam | 0f02fecd95 | |
Nicholas Marriott | 28d26fca35 | |
Nicholas Marriott | 3676779156 | |
nicm | 3177d7b617 | |
Thomas Adam | 551bafc18d | |
nicm | 5413a73ded | |
Thomas Adam | c587ad027f | |
nicm | 82836c7394 | |
Thomas Adam | a8be47f0f4 | |
nicm | 5fdea440ce | |
nicm | 66aaa9e484 | |
nicm | 2b0d798982 | |
Thomas Adam | bacae4b4ad | |
nicm | 4f62aadc93 | |
Thomas Adam | 7869ec87e0 | |
nicm | de9697b456 | |
Thomas Adam | 0dad8dd982 | |
nicm | 41ababdf6c | |
nicm | 1a7eb6ca90 | |
nicm | 158f0e8c41 | |
Nicholas Marriott | f2d4a1f022 | |
Nicholas Marriott | 21ce1e04fe | |
Nicholas Marriott | c1be1b351d | |
Thomas Adam | 22e5fc02c3 | |
nicm | 30786abe0e | |
Thomas Adam | 3f8954b11b | |
nicm | befe7cb1c5 | |
Thomas Adam | 65a539c02e | |
nicm | 4cc6db7281 | |
Thomas Adam | 79f075bf1b | |
Thomas Adam | 54773d23b5 | |
nicm | 7d7d7c9605 | |
nicm | 63aa968642 | |
nicm | 7a0cec5ecf | |
nicm | 2588c3e52e | |
nicm | 92615b534a | |
nicm | 7789639b5d | |
nicm | 614611a8bd | |
Nicholas Marriott | 4c07367bfe | |
nicm | 13a0da205b | |
nicm | 2bb0b9d6c5 | |
nicm | a2b8506917 | |
Thomas Adam | f725f9bc8a | |
Thomas Adam | 94d96c6179 | |
nicm | e2f6f58fe5 | |
nicm | db9195463d | |
nicm | 6feb8f6505 | |
nicm | 9b00472820 | |
Thomas Adam | 9d7b1960c2 | |
nicm | 5d451551b6 | |
Thomas Adam | fada3eb932 | |
nicm | 26773ea9ef | |
nicm | 163908fe8a | |
Thomas Adam | 44ada9cd67 | |
nicm | 7eea3d7ab8 | |
nicm | 01fd4b997e | |
Thomas Adam | e9d49161e0 | |
nicm | 9013600074 | |
Thomas Adam | 7a06b92061 | |
nicm | 338ec859a4 | |
nicm | f6755c6f2c | |
Nicholas Marriott | 705411ea5c | |
Thomas Adam | 9d80ec6cc9 | |
nicm | be5988457f | |
Thomas Adam | 33e332428c | |
nicm | 24cd6851f6 | |
nicm | 19812b2d29 | |
Thomas Adam | 4bccff9556 | |
nicm | ef5602a590 | |
Thomas Adam | acd70ea643 | |
nicm | 950d3c5bbc | |
nicm | 97b5962ab1 | |
Thomas Adam | e3fa6cd96c | |
nicm | 93cc8df692 | |
Thomas Adam | 4b88872c85 | |
Nicholas Marriott | c063831df5 | |
nicm | 42490f4750 | |
Thomas Adam | 63f9f3113c | |
nicm | e37aa45681 | |
Thomas Adam | 7cbf4c9027 | |
nicm | 78ec057916 | |
nicm | f0e02387b2 | |
Thomas Adam | e3ff887d2a | |
Nicholas Marriott | 0ea6cdca90 | |
Nicholas Marriott | d723466df2 | |
nicm | 732c72c98e | |
Thomas Adam | bb4bc8caf4 | |
nicm | 38c5788232 | |
Thomas Adam | 7496e70bd7 | |
nicm | df3fe2aa72 | |
Thomas Adam | c1d5dda62e | |
nicm | 51915b9b0a | |
Thomas Adam | ed575182e3 | |
nicm | 32f2d9d089 | |
nicm | 35c2958ae4 | |
Nicholas Marriott | b1a8c0fe02 | |
Thomas Adam | 3dfb77416f | |
nicm | 1d4296f17f | |
nicm | a83fb8127a | |
nicm | 9f3874e5c7 | |
Nicholas Marriott | 87521214d3 | |
Nicholas Marriott | 6a8d848a3e | |
jmc | 0d0683c28a | |
Nicholas Marriott | 96ad8280b2 | |
Nicholas Marriott | 0490707671 | |
Nicholas Marriott | ac98385e55 | |
Nicholas Marriott | 57aaad2ddb | |
Nicholas Marriott | 3b929f332a | |
Nicholas Marriott | c827f5092d | |
Nicholas Marriott | d8feffd2bf | |
Nicholas Marriott | f48c46a76a | |
Nicholas Marriott | f06ee2b87b | |
Nicholas Marriott | 9b4c05b6b9 | |
Nicholas Marriott | 3b9b823df5 | |
Nicholas Marriott | 8aa34f616f | |
Nicholas Marriott | 5ea6ccbb7f | |
Nicholas Marriott | 434ac8734a | |
Nicholas Marriott | 47af583a50 | |
Nicholas Marriott | aaf87abfb4 | |
Nicholas Marriott | bacb4d1b4d | |
Nicholas Marriott | ad2f7642f2 | |
Nicholas Marriott | 059580e0f7 | |
Nicholas Marriott | cb2943faab | |
Nicholas Marriott | 7c28597e0f | |
Nicholas Marriott | fb52921a86 | |
Nicholas Marriott | ddc67152a5 | |
Nicholas Marriott | 4cf595a402 | |
Nicholas Marriott | 5107e84897 | |
Nicholas Marriott | 736a276cc9 | |
Nicholas Marriott | 825feac9f8 | |
Nicholas Marriott | d8c0069254 | |
Nicholas Marriott | 33d4f854c0 | |
Nicholas Marriott | 9865ad27a5 | |
Nicholas Marriott | 16b497e12b | |
Nicholas Marriott | a25af7d0f3 | |
Nicholas Marriott | a11aa870b3 | |
Nicholas Marriott | 0431d4d639 | |
nicm | d863978464 | |
nicm | 57d5f67552 | |
nicm | bab7a9a085 | |
Nicholas Marriott | 2ab53d30d0 | |
Nicholas Marriott | d25738b61e | |
nicm | a35c897f0f | |
nicm | 1e879ef458 | |
nicm | 43514f4af6 | |
nicm | 8d75542986 | |
nicm | 3a5b576399 | |
nicm | 77b1290698 | |
nicm | 77bd6b9ec3 | |
nicm | 1bbdd2aba2 | |
nicm | 73bf358f6d | |
nicm | f706a7e236 | |
nicm | cfc7c9cf24 | |
nicm | 866117636e | |
nicm | 6c659494f5 | |
nicm | 02a6b39db7 | |
nicm | f02a6c34e0 | |
nicm | f9f97c8145 | |
nicm | 84e22168a5 | |
nicm | b573dbba90 | |
nicm | 0c5cbbbf5c | |
nicm | 9f38a8807c | |
nicm | 64c276c23b | |
nicm | 1ee231956c | |
nicm | 788f56b40a | |
nicm | c46a607dc1 | |
nicm | e5106bfb96 | |
Nicholas Marriott | 747423be67 | |
Nicholas Marriott | 607e6b1c33 | |
Nicholas Marriott | 7a236869ba | |
Nicholas Marriott | 9ea971dc04 | |
Nicholas Marriott | 5f7ff732fa | |
Nicholas Marriott | 83024f57a6 | |
Nicholas Marriott | 01ba6a23f2 | |
Nicholas Marriott | 022d0210c5 | |
Nicholas Marriott | f03b27c72b | |
Nicholas Marriott | 4ca6b42c24 | |
Nicholas Marriott | bde3829131 | |
Nicholas Marriott | d00d682069 | |
Nicholas Marriott | f2951bd4a5 | |
Nicholas Marriott | 8da4573088 | |
Nicholas Marriott | c03b57465b | |
Nicholas Marriott | 40467726e3 | |
Nicholas Marriott | 2e7ec8c0b9 | |
Nicholas Marriott | 32c97a7f2f | |
Nicholas Marriott | e2d01795d2 | |
Nicholas Marriott | 589d3eb48f | |
Nicholas Marriott | cf6034da92 | |
Nicholas Marriott | ce8c56cc97 | |
Nicholas Marriott | 43c292fa91 | |
Nicholas Marriott | cb9a0627f0 | |
Nicholas Marriott | 7a6446ac17 | |
Nicholas Marriott | cd6af4a52e | |
Nicholas Marriott | 8363c6af2e | |
Nicholas Marriott | 6c2bf0e221 | |
Nicholas Marriott | 88575a27e2 | |
Nicholas Marriott | 3a892228f4 | |
Nicholas Marriott | 5fa8e5e13f | |
Nicholas Marriott | 73cf767a35 | |
Nicholas Marriott | b2588eed03 | |
Nicholas Marriott | 9af78c8e69 | |
Nicholas Marriott | dda3bf896b | |
Nicholas Marriott | 98650658a7 | |
Thomas Adam | 6f6b7f8261 | |
Nicholas Marriott | bb6242675a | |
nicm | 33f9b08bbb | |
Thomas Adam | e88d48f804 | |
nicm | dfcc9f8cbc | |
Thomas Adam | 16f1c5f0a1 | |
nicm | bbb3509bc5 | |
Nicholas Marriott | c5c2871d22 | |
Thomas Adam | 90614dfe05 | |
nicm | ff860e5fe4 | |
nicm | 715835510b |
|
@ -29,7 +29,7 @@ uname -sp && tmux -V && echo $TERM
|
|||
|
||||
Also include:
|
||||
|
||||
- Your platform (Linux, OS X, or whatever).
|
||||
- Your platform (Linux, macOS, or whatever).
|
||||
|
||||
- A brief description of the problem with steps to reproduce.
|
||||
|
||||
|
@ -37,7 +37,8 @@ Also include:
|
|||
|
||||
- Your terminal, and `$TERM` inside and outside of tmux.
|
||||
|
||||
- Logs from tmux (see below).
|
||||
- Logs from tmux (see below). Please attach logs to the issue directly rather
|
||||
than using a download site or pastebin. Put in a zip file if necessary.
|
||||
|
||||
- At most one or two screenshots, if helpful.
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ tmux is a terminal multiplexer: it enables a number of terminals to be created,
|
|||
accessed, and controlled from a single screen. tmux may be detached from a
|
||||
screen and continue running in the background, then later reattached.
|
||||
|
||||
This release runs on OpenBSD, FreeBSD, NetBSD, Linux, OS X and Solaris.
|
||||
This release runs on OpenBSD, FreeBSD, NetBSD, Linux, macOS and Solaris.
|
||||
|
||||
## Dependencies
|
||||
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
daysUntilLock: 30
|
||||
skipCreatedBefore: false
|
||||
exemptLabels: []
|
||||
lockLabel: false
|
||||
lockComment: >
|
||||
This thread has been automatically locked since there has not been
|
||||
any recent activity after it was closed. Please open a new issue for
|
||||
related bugs.
|
||||
setLockReason: false
|
||||
#only: issues
|
|
@ -0,0 +1,34 @@
|
|||
name: 'Lock Threads'
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: '0 0 * * *'
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
issues: write
|
||||
pull-requests: write
|
||||
discussions: write
|
||||
|
||||
concurrency:
|
||||
group: lock-threads
|
||||
|
||||
jobs:
|
||||
action:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: dessant/lock-threads@v5
|
||||
with:
|
||||
github-token: ${{ github.token }}
|
||||
issue-inactive-days: '30'
|
||||
issue-comment: >
|
||||
This issue has been automatically locked since there
|
||||
has not been any recent activity after it was closed.
|
||||
pr-inactive-days: '60'
|
||||
pr-comment: >
|
||||
This pull request has been automatically locked since there
|
||||
has not been any recent activity after it was closed.
|
||||
discussion-inactive-days: '60'
|
||||
discussion-comment: >
|
||||
This discussion has been automatically locked since there
|
||||
has not been any recent activity after it was closed.
|
322
CHANGES
322
CHANGES
|
@ -1,3 +1,307 @@
|
|||
CHANGES FROM 3.3a to 3.4
|
||||
|
||||
* Add options keep-last and keep-group to destroy-unattached to keep the last
|
||||
session whether in a group.
|
||||
|
||||
* Don't allow paste-buffer into dead panes.
|
||||
|
||||
* Add -t to source-file.
|
||||
|
||||
* Rewrite combined character handling to be more consistent and to support
|
||||
newer Unicode combined characters.
|
||||
|
||||
* Add basic support for SIXEL if built with --enable-sixel.
|
||||
|
||||
* Add a session, pane and user mouse range types for the status line and add
|
||||
format variables for mouse_status_line and mouse_status_range so they can be
|
||||
associated with different commands in the key bindings.
|
||||
|
||||
* Add flag (-o) to next-prompt/previous-prompt to go to OSC 133 command output.
|
||||
|
||||
* Add options and flags for menu styles (menu-style, menu-border-style) similar
|
||||
to those existing for popups.
|
||||
|
||||
* Add support for marking lines with a shell prompt based on the OSC 133 extension.
|
||||
|
||||
* Check for libterminfo for NetBSD.
|
||||
|
||||
* Add "us" to styles for underscore colour.
|
||||
|
||||
* Add flags (-c and -y) to change the confirm key and default behaviour of
|
||||
confirm-before.
|
||||
|
||||
* Use ncurses' new tparm_s function (added in 6.4-20230424) instead of tparm so
|
||||
it does not object to string arguments in c apabilities it doesn't already
|
||||
know. Also ignore errors from tparm if using previous ncurses versions.
|
||||
|
||||
* Set default lock command to vlock on Linux if present at build time.
|
||||
|
||||
* Discard mouse sequences that have the right form but actually are invalid.
|
||||
|
||||
* Add support for spawning panes in separate cgroups with systemd and a
|
||||
configure flag (--disable-cgroups) to turn off.
|
||||
|
||||
* Add a format (pane_unseen_changes) to show if there are unseen changes while
|
||||
in a mode.
|
||||
|
||||
* Remove old buffer when renaming rather than complaining.
|
||||
|
||||
* Add an L modifier like P, W, S to loop over clients.
|
||||
|
||||
* Add -f to list-clients like the other list commands.
|
||||
|
||||
* Extend display-message to work for control clients.
|
||||
|
||||
* Add a flag to display-menu to select the manu item selected when the menu is
|
||||
open.
|
||||
|
||||
* Have tmux recognise pasted text wrapped in bracket paste sequences, rather
|
||||
than only forwarding them to the program inside.
|
||||
|
||||
* Have client return 1 if process is interrupted to an input pane.
|
||||
|
||||
* Query the client terminal for foreground and background colours and if OSC 10
|
||||
or 11 is received but no colour has been set inside tmux, return the colour
|
||||
from the first attached client.
|
||||
|
||||
* Add send-keys -K to handle keys directly as if typed (so look up in key
|
||||
table).
|
||||
|
||||
* Process escape sequences in show-buffer.
|
||||
|
||||
* Add a -l flag to display-message to disable format expansion.
|
||||
|
||||
* Add paste-buffer-deleted notification and fix name of paste-buffer-changed.
|
||||
|
||||
* Do not attempt to connect to the socket as a client if systemd is active.
|
||||
|
||||
* Add scroll-top and scroll-bottom commands to scroll so cursor is at top or
|
||||
bottom.
|
||||
|
||||
* Add a -T flag to capture-pane to stop at the last used cell instead of the
|
||||
full width. Restore the previous behaviour by making it default to off unless
|
||||
-J is used.
|
||||
|
||||
* Add message-line option to control where message and prompt go.
|
||||
|
||||
* Notification when a paste buffer is deleted.
|
||||
|
||||
* Add a Nobr terminfo(5) capability to tell tmux the terminal does not use bright
|
||||
colours for bold.
|
||||
|
||||
* Change g and G to go to top and bottom in menus.
|
||||
|
||||
* Add a third state "all" to allow-passthrough to work even in invisible panes.
|
||||
|
||||
* Add support for OSC 8 hyperlinks.
|
||||
|
||||
* Store the time lines are scrolled into history and display in copy mode.
|
||||
|
||||
* Add a %config-error reply to control mode for configuration file errors since
|
||||
reporting them in view mode is useless.
|
||||
|
||||
* A new feature flag (ignorefkeys) to ignore terminfo(5) function key
|
||||
definitions for rxvt.
|
||||
|
||||
* Pass through first argument to OSC 52 (which clipboards to set) if the
|
||||
application provides it.
|
||||
|
||||
* Expand arguments to send-keys, capture-pane, split-window, join-pane where it
|
||||
makes sense to do so.
|
||||
|
||||
* Ignore named buffers when choosing a buffer if one is not specified by the user.
|
||||
|
||||
CHANGES FROM 3.3 TO 3.3a
|
||||
|
||||
* Do not crash when run-shell produces output from a config file.
|
||||
|
||||
* Do not unintentionally turn off all mouse mode when button mode is also
|
||||
present.
|
||||
|
||||
CHANGES FROM 3.2a TO 3.3
|
||||
|
||||
* Add an ACL list for users connecting to the tmux socket. Users may be
|
||||
forbidden from attaching, forced to attach read-only, or allowed to attach
|
||||
read-write. A new command, server-access, configures the list. File system
|
||||
permissions must still be configured manually.
|
||||
|
||||
* Emit window-layout-changed on swap-pane.
|
||||
|
||||
* Better error reporting when applying custom layouts.
|
||||
|
||||
* Handle ANSI escape sequences in run-shell output.
|
||||
|
||||
* Add pane_start_path to match start_command.
|
||||
|
||||
* Set PWD so shells have a hint about the real path.
|
||||
|
||||
* Do not allow pipe-pane on dead panes.
|
||||
|
||||
* Do not report mouse positions (incorrectly) above the maximum of 223 in
|
||||
normal mouse mode.
|
||||
|
||||
* Add an option (default off) to control the passthrough escape sequence.
|
||||
|
||||
* Support more mouse buttons when the terminal sends them.
|
||||
|
||||
* Add a window-resized hook which is fired when the window is actually resized
|
||||
which may be later than the client resize.
|
||||
|
||||
* Add next_session_id format with the next session ID.
|
||||
|
||||
* Add formats for client and server UID and user.
|
||||
|
||||
* Add argument to refresh-client -l to forward clipboard to a pane.
|
||||
|
||||
* Add remain-on-exit-format to set text shown when pane is dead.
|
||||
|
||||
* With split-window -f use percentages of window size not pane size.
|
||||
|
||||
* Add an option (fill-character) to set the character used for unused areas of
|
||||
a client.
|
||||
|
||||
* Add an option (scroll-on-clear) to control if tmux scrolls into history on
|
||||
clear.
|
||||
|
||||
* Add a capability for OSC 7 and use it similarly to how the title is set (and
|
||||
controlled by the same set-titles option).
|
||||
|
||||
* Add support for systemd socket activation (where systemd creates the Unix
|
||||
domain socket for tmux rather than tmux creating it). Build with
|
||||
--enable-systemd.
|
||||
|
||||
* Add an option (pane-border-indicators) to select how the active pane is shown
|
||||
on the pane border (colour, arrows or both).
|
||||
|
||||
* Support underscore styles with capture-pane -e.
|
||||
|
||||
* Make pane-border-format a pane option rather than window.
|
||||
|
||||
* Respond to OSC 4 queries
|
||||
|
||||
* Fix g/G keys in modes to do the same thing as copy mode (and vi).
|
||||
|
||||
* Bump the time terminals have to respond to device attributes queries to three
|
||||
seconds.
|
||||
|
||||
* If automatic-rename is off, allow the rename escape sequence to set an empty
|
||||
name.
|
||||
|
||||
* Trim menu item text more intelligently.
|
||||
|
||||
* Add cursor-style and cursor-colour options to set the default cursor style
|
||||
and colour.
|
||||
|
||||
* Accept some useful and non-conflicting emacs keys in vi normal mode at the
|
||||
command prompt.
|
||||
|
||||
* Add a format modifier (c) to force a colour to RGB.
|
||||
|
||||
* Add -s and -S to display-popup to set styles, -b to set lines and -T to set
|
||||
popup title. New popup-border-lines, popup-border-style and popup-style
|
||||
options set the defaults.
|
||||
|
||||
* Add -e flag to set an environment variable for a popup.
|
||||
|
||||
* Make send-keys without arguments send the key it is bound to (if bound to a
|
||||
key).
|
||||
|
||||
* Try to leave terminal cursor at the right position even when tmux is drawing
|
||||
its own cursor or selection (such as at the command prompt and in choose
|
||||
mode) for people using screen readers and similar which can make use of it.
|
||||
|
||||
* Change so that {} is converted to tmux commands immediately when parsed. This
|
||||
means it must contain valid tmux commands. For commands which expand %% and
|
||||
%%%, this now only happens within string arguments. Use of nested aliases
|
||||
inside {} is now forbidden. Processing of commands given in quotes remains
|
||||
the same.
|
||||
|
||||
* Disable evports on SunOS since they are broken.
|
||||
|
||||
* Do not expand the file given with tmux -f so it can contain :s.
|
||||
|
||||
* Bump FORMAT_LOOP_LIMIT and add a log message when hit.
|
||||
|
||||
* Add a terminal feature for the mouse (since FreeBSD termcap does not have kmous).
|
||||
|
||||
* Forbid empty session names.
|
||||
|
||||
* Improve error reporting when the tmux /tmp directory cannot be created or
|
||||
used.
|
||||
|
||||
* Give #() commands a one second grace period where the output is empty before
|
||||
telling the user they aren't doing anything ("not ready").
|
||||
|
||||
* When building, pick default-terminal from the first of tmux-256color, tmux,
|
||||
screen-256color, screen that is available on the build system (--with-TERM
|
||||
can override).
|
||||
|
||||
* Do not close popups on resize, instead adjust them to fit.
|
||||
|
||||
* Add a client-active hook.
|
||||
|
||||
* Make window-linked and window-unlinked window options.
|
||||
|
||||
* Do not configure on macOS without the user making a choice about utf8proc
|
||||
(either --enable-utf8proc or --disable-utf8proc).
|
||||
|
||||
* Do not freeze output in panes when a popup is open, let them continue to
|
||||
redraw.
|
||||
|
||||
* Add pipe variants of the line copy commands.
|
||||
|
||||
* Change copy-line and copy-end-of-line not to cancel and add -and-cancel
|
||||
variants, like the other copy commands.
|
||||
|
||||
* Support the OSC palette-setting sequences in popups.
|
||||
|
||||
* Add a pane-colours array option to specify the defaults palette.
|
||||
|
||||
* Add support for Unicode zero-width joiner.
|
||||
|
||||
* Make newline a style delimiter as well so they can cross multiple lines for
|
||||
readability in configuration files.
|
||||
|
||||
* Change focus to be driven by events rather than scanning panes so the
|
||||
ordering of in and out is consistent.
|
||||
|
||||
* Add display-popup -B to open a popup without a border.
|
||||
|
||||
* Add a menu for popups that can be opened with button three outside the popup
|
||||
or on the left or top border. Resizing now only works on the right and bottom
|
||||
borders or when using Meta. The menu allows a popup to be closed, expanded to
|
||||
the full size of the client, centered in the client or changed into a pane.
|
||||
|
||||
* Make command-prompt and confirm-before block by default (like run-shell). A
|
||||
new -b flags runs them in the background as before. Also set return code for
|
||||
confirm-before.
|
||||
|
||||
* Change cursor style handling so tmux understands which sequences contain
|
||||
blinking and sets the flag appropriately, means that it works whether cnorm
|
||||
disables blinking or not. This now matches xterm's behaviour.
|
||||
|
||||
* More accurate vi(1) word navigation in copy mode and on the status line. This
|
||||
changes the meaning of the word-separators option: setting it to the empty
|
||||
string is equivalent to the previous behavior.
|
||||
|
||||
* Add -F for command-prompt and use it to fix "Rename" on the window menu.
|
||||
|
||||
* Add different command histories for different types of prompts ("command",
|
||||
"search" etc).
|
||||
|
||||
CHANGES FROM 3.2 TO 3.2a
|
||||
|
||||
* Add an "always" value for the "extended-keys" option; if set then tmux will
|
||||
forward extended keys to applications even if they do not request them.
|
||||
|
||||
* Add a "mouse" terminal feature so tmux can enable the mouse on terminals
|
||||
where it is known to be supported even if terminfo(5) says otherwise.
|
||||
|
||||
* Do not expand the filename given to -f so it can contain colons.
|
||||
|
||||
* Fixes for problems with extended keys and modifiers, scroll region,
|
||||
source-file, crosscompiling, format modifiers and other minor issues.
|
||||
|
||||
CHANGES FROM 3.1c TO 3.2
|
||||
|
||||
* Add a flag to disable keys to close a message.
|
||||
|
@ -29,7 +333,7 @@ CHANGES FROM 3.1c TO 3.2
|
|||
* Add a -S flag to new-window to make it select the existing window if one
|
||||
with the given name already exists rather than failing with an error.
|
||||
|
||||
* Addd a format modifier to check if a window or session name exists (N/w or
|
||||
* Add a format modifier to check if a window or session name exists (N/w or
|
||||
N/s).
|
||||
|
||||
* Add compat clock_gettime for older macOS.
|
||||
|
@ -61,7 +365,7 @@ CHANGES FROM 3.1c TO 3.2
|
|||
an option on all panes.
|
||||
|
||||
* Make replacement of ##s consistent when drawing formats, whether followed by
|
||||
[ or not. Add a flag (e) to the q: format modifier to double up #s
|
||||
[ or not. Add a flag (e) to the q: format modifier to double up #s.
|
||||
|
||||
* Add -N flag to display-panes to ignore keys.
|
||||
|
||||
|
@ -105,7 +409,7 @@ CHANGES FROM 3.1c TO 3.2
|
|||
|
||||
* Add a way for control mode clients to subscribe to a format and be notified
|
||||
of changes rather than having to poll.
|
||||
|
||||
|
||||
* Add some formats for search in copy mode (search_present, search_match).
|
||||
|
||||
* Do not wait on shutdown for commands started with run -b.
|
||||
|
@ -229,7 +533,7 @@ CHANGES FROM 3.1c TO 3.2
|
|||
only show windows and C-b . only targets.
|
||||
|
||||
* Change all the style options to string options so they can support formats.
|
||||
Change pane-border-active-style to use this to change the border colour when
|
||||
Change pane-active-border-style to use this to change the border colour when
|
||||
in a mode or with synchronize-panes on. This also implies a few minor changes
|
||||
to existing behaviour:
|
||||
|
||||
|
@ -265,7 +569,7 @@ CHANGES FROM 3.1c TO 3.2
|
|||
|
||||
* Wait until the initial command sequence is done before sending a device
|
||||
attributes request and other bits that prompt a reply from the terminal. This
|
||||
means that stray relies are not left on the terminal if the command has
|
||||
means that stray replies are not left on the terminal if the command has
|
||||
attached and then immediately detached and tmux will not be around to receive
|
||||
them.
|
||||
|
||||
|
@ -280,7 +584,7 @@ CHANGES FROM 3.1c TO 3.2
|
|||
window-renamed
|
||||
window-unlinked
|
||||
|
||||
And these now pane options:
|
||||
And these are now pane options:
|
||||
|
||||
pane-died
|
||||
pane-exited
|
||||
|
@ -355,7 +659,7 @@ CHANGES FROM 3.1c TO 3.2
|
|||
* Add a default binding for button 2 to paste.
|
||||
|
||||
* Add -d flag to run-shell to delay before running the command and allow it to
|
||||
run without a command so it just delays.
|
||||
be used without a command so it just delays.
|
||||
|
||||
* Add C-g to cancel command prompt with vi keys as well as emacs, and q in
|
||||
command mode.
|
||||
|
@ -1111,7 +1415,7 @@ Incompatible Changes
|
|||
|
||||
bind -Tcopy-mode C-r command-prompt -i -p'search up' "send -X search-backward-incremental '%%'"
|
||||
|
||||
There are also some new commmands available with send -X, such as
|
||||
There are also some new commands available with send -X, such as
|
||||
copy-pipe-and-cancel.
|
||||
* set-remain-on-exit has gone -- can be achieved with hooks instead.
|
||||
* Hooks: before hooks have been removed and only a selection of commands now
|
||||
|
@ -3087,7 +3391,7 @@ The list of older changes is below.
|
|||
* (nicm) -n on new-session is now -s, and -n is now the initial window name.
|
||||
This was documented but not implemented :-/.
|
||||
* (nicm) kill-window command, bound to & by default (because it should be hard
|
||||
to hit accidently).
|
||||
to hit accidentally).
|
||||
* (nicm) bell-style option with three choices: "none" completely ignore bell;
|
||||
"any" pass through a bell in any window to current; "current" ignore bells
|
||||
except in current window. This applies only to the bell terminal signal,
|
||||
|
|
25
Makefile.am
25
Makefile.am
|
@ -1,5 +1,3 @@
|
|||
# Makefile.am
|
||||
|
||||
# Obvious program stuff.
|
||||
bin_PROGRAMS = tmux
|
||||
CLEANFILES = tmux.1.mdoc tmux.1.man cmd-parse.c
|
||||
|
@ -13,7 +11,9 @@ dist_EXTRA_tmux_SOURCES = compat/*.[ch]
|
|||
# Preprocessor flags.
|
||||
AM_CPPFLAGS += @XOPEN_DEFINES@ \
|
||||
-DTMUX_VERSION='"@VERSION@"' \
|
||||
-DTMUX_CONF='"$(sysconfdir)/tmux.conf:~/.tmux.conf:$$XDG_CONFIG_HOME/tmux/tmux.conf:~/.config/tmux/tmux.conf"'
|
||||
-DTMUX_CONF='"$(sysconfdir)/tmux.conf:~/.tmux.conf:$$XDG_CONFIG_HOME/tmux/tmux.conf:~/.config/tmux/tmux.conf"' \
|
||||
-DTMUX_LOCK_CMD='"@DEFAULT_LOCK_CMD@"' \
|
||||
-DTMUX_TERM='"@DEFAULT_TERM@"'
|
||||
|
||||
# Additional object files.
|
||||
LDADD = $(LIBOBJS)
|
||||
|
@ -29,6 +29,9 @@ AM_CFLAGS += -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
|
|||
AM_CFLAGS += -Wundef -Wbad-function-cast -Winline -Wcast-align
|
||||
AM_CFLAGS += -Wdeclaration-after-statement -Wno-pointer-sign -Wno-attributes
|
||||
AM_CFLAGS += -Wno-unused-result -Wno-format-y2k
|
||||
if IS_DARWIN
|
||||
AM_CFLAGS += -Wno-deprecated-declarations -Wno-cast-align
|
||||
endif
|
||||
AM_CPPFLAGS += -DDEBUG
|
||||
endif
|
||||
AM_CPPFLAGS += -iquote.
|
||||
|
@ -119,12 +122,14 @@ dist_tmux_SOURCES = \
|
|||
cmd-select-pane.c \
|
||||
cmd-select-window.c \
|
||||
cmd-send-keys.c \
|
||||
cmd-server-access.c \
|
||||
cmd-set-buffer.c \
|
||||
cmd-set-environment.c \
|
||||
cmd-set-option.c \
|
||||
cmd-show-environment.c \
|
||||
cmd-show-messages.c \
|
||||
cmd-show-options.c \
|
||||
cmd-show-prompt-history.c \
|
||||
cmd-source-file.c \
|
||||
cmd-split-window.c \
|
||||
cmd-swap-pane.c \
|
||||
|
@ -144,6 +149,7 @@ dist_tmux_SOURCES = \
|
|||
grid-reader.c \
|
||||
grid-view.c \
|
||||
grid.c \
|
||||
hyperlinks.c \
|
||||
input-keys.c \
|
||||
input.c \
|
||||
job.c \
|
||||
|
@ -167,6 +173,7 @@ dist_tmux_SOURCES = \
|
|||
screen-redraw.c \
|
||||
screen-write.c \
|
||||
screen.c \
|
||||
server-acl.c \
|
||||
server-client.c \
|
||||
server-fn.c \
|
||||
server.c \
|
||||
|
@ -176,11 +183,13 @@ dist_tmux_SOURCES = \
|
|||
style.c \
|
||||
tmux.c \
|
||||
tmux.h \
|
||||
tmux-protocol.h \
|
||||
tty-acs.c \
|
||||
tty-features.c \
|
||||
tty-keys.c \
|
||||
tty-term.c \
|
||||
tty.c \
|
||||
utf8-combined.c \
|
||||
utf8.c \
|
||||
window-buffer.c \
|
||||
window-client.c \
|
||||
|
@ -198,11 +207,21 @@ if NEED_FORKPTY
|
|||
nodist_tmux_SOURCES += compat/forkpty-@PLATFORM@.c
|
||||
endif
|
||||
|
||||
# Add compat file for systemd.
|
||||
if HAVE_SYSTEMD
|
||||
nodist_tmux_SOURCES += compat/systemd.c
|
||||
endif
|
||||
|
||||
# Add compat file for utf8proc.
|
||||
if HAVE_UTF8PROC
|
||||
nodist_tmux_SOURCES += compat/utf8proc.c
|
||||
endif
|
||||
|
||||
# Enable sixel support.
|
||||
if ENABLE_SIXEL
|
||||
dist_tmux_SOURCES += image.c image-sixel.c
|
||||
endif
|
||||
|
||||
if NEED_FUZZING
|
||||
check_PROGRAMS = fuzz/input-fuzzer
|
||||
fuzz_input_fuzzer_LDFLAGS = $(FUZZING_LIBS)
|
||||
|
|
10
README
10
README
|
@ -4,7 +4,7 @@ tmux is a terminal multiplexer: it enables a number of terminals to be created,
|
|||
accessed, and controlled from a single screen. tmux may be detached from a
|
||||
screen and continue running in the background, then later reattached.
|
||||
|
||||
This release runs on OpenBSD, FreeBSD, NetBSD, Linux, OS X and Solaris.
|
||||
This release runs on OpenBSD, FreeBSD, NetBSD, Linux, macOS and Solaris.
|
||||
|
||||
* Dependencies
|
||||
|
||||
|
@ -55,6 +55,14 @@ source tree with:
|
|||
|
||||
A small example configuration is in example_tmux.conf.
|
||||
|
||||
Other documentation is available in the wiki:
|
||||
|
||||
https://github.com/tmux/tmux/wiki
|
||||
|
||||
Also see the tmux FAQ at:
|
||||
|
||||
https://github.com/tmux/tmux/wiki/FAQ
|
||||
|
||||
A bash(1) completion file is at:
|
||||
|
||||
https://github.com/imomaliev/tmux-bash-completion
|
||||
|
|
|
@ -3,7 +3,7 @@ tmuxへようこそ!
|
|||
tmuxはターミナルマルチプレクサーです。複数のターミナルを一つのスクリーン内に作成し、操作することができます。
|
||||
バックグラウンドで処理を実行中に一度スクリーンから離れて後から復帰することも可能です。
|
||||
|
||||
OpenBSD、FreeBSD、NetBSD、Linux、OS X、Solarisで実行できます。
|
||||
OpenBSD、FreeBSD、NetBSD、Linux、macOS、Solarisで実行できます。
|
||||
|
||||
tmuxはlibevent 2.x.に依存します。 下記からダウンロードしてください。
|
||||
|
||||
|
|
2
SYNCING
2
SYNCING
|
@ -89,7 +89,7 @@ of the remote name "obsd-tmux", we can now create the master branch from
|
|||
% git checkout -b obsd-master obsd-tmux/master
|
||||
|
||||
Adding in the fake history points
|
||||
=================================
|
||||
=================================
|
||||
|
||||
To tie both the "master" branch from "tmux" and the "obsd-master"
|
||||
branch from "tmux-openbsd" together, the fake history points added to the
|
||||
|
|
825
arguments.c
825
arguments.c
File diff suppressed because it is too large
Load Diff
53
cfg.c
53
cfg.c
|
@ -51,8 +51,7 @@ cfg_done(__unused struct cmdq_item *item, __unused void *data)
|
|||
return (CMD_RETURN_NORMAL);
|
||||
cfg_finished = 1;
|
||||
|
||||
if (!RB_EMPTY(&sessions))
|
||||
cfg_show_causes(RB_MIN(sessions, &sessions));
|
||||
cfg_show_causes(NULL);
|
||||
|
||||
if (cfg_item != NULL)
|
||||
cmdq_continue(cfg_item);
|
||||
|
@ -67,6 +66,7 @@ start_cfg(void)
|
|||
{
|
||||
struct client *c;
|
||||
u_int i;
|
||||
int flags = 0;
|
||||
|
||||
/*
|
||||
* Configuration files are loaded without a client, so commands are run
|
||||
|
@ -84,19 +84,17 @@ start_cfg(void)
|
|||
cmdq_append(c, cfg_item);
|
||||
}
|
||||
|
||||
for (i = 0; i < cfg_nfiles; i++) {
|
||||
if (cfg_quiet)
|
||||
load_cfg(cfg_files[i], c, NULL, CMD_PARSE_QUIET, NULL);
|
||||
else
|
||||
load_cfg(cfg_files[i], c, NULL, 0, NULL);
|
||||
}
|
||||
if (cfg_quiet)
|
||||
flags = CMD_PARSE_QUIET;
|
||||
for (i = 0; i < cfg_nfiles; i++)
|
||||
load_cfg(cfg_files[i], c, NULL, NULL, flags, NULL);
|
||||
|
||||
cmdq_append(NULL, cmdq_get_callback(cfg_done, NULL));
|
||||
}
|
||||
|
||||
int
|
||||
load_cfg(const char *path, struct client *c, struct cmdq_item *item, int flags,
|
||||
struct cmdq_item **new_item)
|
||||
load_cfg(const char *path, struct client *c, struct cmdq_item *item,
|
||||
struct cmd_find_state *current, int flags, struct cmdq_item **new_item)
|
||||
{
|
||||
FILE *f;
|
||||
struct cmd_parse_input pi;
|
||||
|
@ -124,8 +122,6 @@ load_cfg(const char *path, struct client *c, struct cmdq_item *item, int flags,
|
|||
|
||||
pr = cmd_parse_from_file(f, &pi);
|
||||
fclose(f);
|
||||
if (pr->status == CMD_PARSE_EMPTY)
|
||||
return (0);
|
||||
if (pr->status == CMD_PARSE_ERROR) {
|
||||
cfg_add_cause("%s", pr->error);
|
||||
free(pr->error);
|
||||
|
@ -137,7 +133,7 @@ load_cfg(const char *path, struct client *c, struct cmdq_item *item, int flags,
|
|||
}
|
||||
|
||||
if (item != NULL)
|
||||
state = cmdq_copy_state(cmdq_get_state(item));
|
||||
state = cmdq_copy_state(cmdq_get_state(item), current);
|
||||
else
|
||||
state = cmdq_new_state(NULL, NULL, 0);
|
||||
cmdq_add_format(state, "current_file", "%s", pi.file);
|
||||
|
@ -157,8 +153,8 @@ load_cfg(const char *path, struct client *c, struct cmdq_item *item, int flags,
|
|||
|
||||
int
|
||||
load_cfg_from_buffer(const void *buf, size_t len, const char *path,
|
||||
struct client *c, struct cmdq_item *item, int flags,
|
||||
struct cmdq_item **new_item)
|
||||
struct client *c, struct cmdq_item *item, struct cmd_find_state *current,
|
||||
int flags, struct cmdq_item **new_item)
|
||||
{
|
||||
struct cmd_parse_input pi;
|
||||
struct cmd_parse_result *pr;
|
||||
|
@ -178,8 +174,6 @@ load_cfg_from_buffer(const void *buf, size_t len, const char *path,
|
|||
pi.c = c;
|
||||
|
||||
pr = cmd_parse_from_buffer(buf, len, &pi);
|
||||
if (pr->status == CMD_PARSE_EMPTY)
|
||||
return (0);
|
||||
if (pr->status == CMD_PARSE_ERROR) {
|
||||
cfg_add_cause("%s", pr->error);
|
||||
free(pr->error);
|
||||
|
@ -191,7 +185,7 @@ load_cfg_from_buffer(const void *buf, size_t len, const char *path,
|
|||
}
|
||||
|
||||
if (item != NULL)
|
||||
state = cmdq_copy_state(cmdq_get_state(item));
|
||||
state = cmdq_copy_state(cmdq_get_state(item), current);
|
||||
else
|
||||
state = cmdq_new_state(NULL, NULL, 0);
|
||||
cmdq_add_format(state, "current_file", "%s", pi.file);
|
||||
|
@ -242,11 +236,29 @@ cfg_print_causes(struct cmdq_item *item)
|
|||
void
|
||||
cfg_show_causes(struct session *s)
|
||||
{
|
||||
struct client *c = TAILQ_FIRST(&clients);
|
||||
struct window_pane *wp;
|
||||
struct window_mode_entry *wme;
|
||||
u_int i;
|
||||
|
||||
if (s == NULL || cfg_ncauses == 0)
|
||||
if (cfg_ncauses == 0)
|
||||
return;
|
||||
|
||||
if (c != NULL && (c->flags & CLIENT_CONTROL)) {
|
||||
for (i = 0; i < cfg_ncauses; i++) {
|
||||
control_write(c, "%%config-error %s", cfg_causes[i]);
|
||||
free(cfg_causes[i]);
|
||||
}
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (s == NULL) {
|
||||
if (c != NULL && c->session != NULL)
|
||||
s = c->session;
|
||||
else
|
||||
s = RB_MIN(sessions, &sessions);
|
||||
}
|
||||
if (s == NULL || s->attached == 0) /* wait for an attached session */
|
||||
return;
|
||||
wp = s->curw->window->active;
|
||||
|
||||
|
@ -254,10 +266,11 @@ cfg_show_causes(struct session *s)
|
|||
if (wme == NULL || wme->mode != &window_view_mode)
|
||||
window_pane_set_mode(wp, NULL, &window_view_mode, NULL, NULL);
|
||||
for (i = 0; i < cfg_ncauses; i++) {
|
||||
window_copy_add(wp, "%s", cfg_causes[i]);
|
||||
window_copy_add(wp, 0, "%s", cfg_causes[i]);
|
||||
free(cfg_causes[i]);
|
||||
}
|
||||
|
||||
out:
|
||||
free(cfg_causes);
|
||||
cfg_causes = NULL;
|
||||
cfg_ncauses = 0;
|
||||
|
|
58
client.c
58
client.c
|
@ -243,9 +243,7 @@ client_main(struct event_base *base, int argc, char **argv, uint64_t flags,
|
|||
ssize_t linelen;
|
||||
char *line = NULL, **caps = NULL, *cause;
|
||||
u_int ncaps = 0;
|
||||
|
||||
/* Ignore SIGCHLD now or daemon() in the server will leave a zombie. */
|
||||
signal(SIGCHLD, SIG_IGN);
|
||||
struct args_value *values;
|
||||
|
||||
/* Set up the initial command. */
|
||||
if (shell_command != NULL) {
|
||||
|
@ -258,17 +256,20 @@ client_main(struct event_base *base, int argc, char **argv, uint64_t flags,
|
|||
msg = MSG_COMMAND;
|
||||
|
||||
/*
|
||||
* It sucks parsing the command string twice (in client and
|
||||
* later in server) but it is necessary to get the start server
|
||||
* flag.
|
||||
* It's annoying parsing the command string twice (in client
|
||||
* and later in server) but it is necessary to get the start
|
||||
* server flag.
|
||||
*/
|
||||
pr = cmd_parse_from_arguments(argc, argv, NULL);
|
||||
values = args_from_vector(argc, argv);
|
||||
pr = cmd_parse_from_arguments(values, argc, NULL);
|
||||
if (pr->status == CMD_PARSE_SUCCESS) {
|
||||
if (cmd_list_any_have(pr->cmdlist, CMD_STARTSERVER))
|
||||
flags |= CLIENT_STARTSERVER;
|
||||
cmd_list_free(pr->cmdlist);
|
||||
} else
|
||||
free(pr->error);
|
||||
args_free_values(values, argc);
|
||||
free(values);
|
||||
}
|
||||
|
||||
/* Create client process structure (starts logging). */
|
||||
|
@ -280,6 +281,12 @@ client_main(struct event_base *base, int argc, char **argv, uint64_t flags,
|
|||
log_debug("flags are %#llx", (unsigned long long)client_flags);
|
||||
|
||||
/* Initialize the client socket and start the server. */
|
||||
#ifdef HAVE_SYSTEMD
|
||||
if (systemd_activated()) {
|
||||
/* socket-based activation, do not even try to be a client. */
|
||||
fd = server_start(client_proc, flags, base, 0, NULL);
|
||||
} else
|
||||
#endif
|
||||
fd = client_connect(base, socket_path, client_flags);
|
||||
if (fd == -1) {
|
||||
if (errno == ECONNREFUSED) {
|
||||
|
@ -357,6 +364,7 @@ client_main(struct event_base *base, int argc, char **argv, uint64_t flags,
|
|||
/* Send identify messages. */
|
||||
client_send_identify(ttynam, termname, caps, ncaps, cwd, feat);
|
||||
tty_term_free_list(caps, ncaps);
|
||||
proc_flush_peer(client_peer);
|
||||
|
||||
/* Send first command. */
|
||||
if (msg == MSG_COMMAND) {
|
||||
|
@ -489,20 +497,10 @@ client_send_identify(const char *ttynam, const char *termname, char **caps,
|
|||
static __dead void
|
||||
client_exec(const char *shell, const char *shellcmd)
|
||||
{
|
||||
const char *name, *ptr;
|
||||
char *argv0;
|
||||
char *argv0;
|
||||
|
||||
log_debug("shell %s, command %s", shell, shellcmd);
|
||||
|
||||
ptr = strrchr(shell, '/');
|
||||
if (ptr != NULL && *(ptr + 1) != '\0')
|
||||
name = ptr + 1;
|
||||
else
|
||||
name = shell;
|
||||
if (client_flags & CLIENT_LOGIN)
|
||||
xasprintf(&argv0, "-%s", name);
|
||||
else
|
||||
xasprintf(&argv0, "%s", name);
|
||||
argv0 = shell_argv0(shell, !!(client_flags & CLIENT_LOGIN));
|
||||
setenv("SHELL", shell, 1);
|
||||
|
||||
proc_clear_signals(client_proc, 1);
|
||||
|
@ -522,12 +520,23 @@ client_signal(int sig)
|
|||
{
|
||||
struct sigaction sigact;
|
||||
int status;
|
||||
pid_t pid;
|
||||
|
||||
log_debug("%s: %s", __func__, strsignal(sig));
|
||||
if (sig == SIGCHLD)
|
||||
waitpid(WAIT_ANY, &status, WNOHANG);
|
||||
else if (!client_attached) {
|
||||
if (sig == SIGTERM)
|
||||
if (sig == SIGCHLD) {
|
||||
for (;;) {
|
||||
pid = waitpid(WAIT_ANY, &status, WNOHANG);
|
||||
if (pid == 0)
|
||||
break;
|
||||
if (pid == -1) {
|
||||
if (errno == ECHILD)
|
||||
break;
|
||||
log_debug("waitpid failed: %s",
|
||||
strerror(errno));
|
||||
}
|
||||
}
|
||||
} else if (!client_attached) {
|
||||
if (sig == SIGTERM || sig == SIGHUP)
|
||||
proc_exit(client_proc);
|
||||
} else {
|
||||
switch (sig) {
|
||||
|
@ -689,6 +698,9 @@ client_dispatch_wait(struct imsg *imsg)
|
|||
!(client_flags & CLIENT_CONTROL), client_file_check_cb,
|
||||
NULL);
|
||||
break;
|
||||
case MSG_READ_CANCEL:
|
||||
file_read_cancel(&client_files, imsg);
|
||||
break;
|
||||
case MSG_WRITE_OPEN:
|
||||
file_write_open(&client_files, client_peer, imsg, 1,
|
||||
!(client_flags & CLIENT_CONTROL), client_file_check_cb,
|
||||
|
|
|
@ -37,13 +37,13 @@ const struct cmd_entry cmd_attach_session_entry = {
|
|||
.name = "attach-session",
|
||||
.alias = "attach",
|
||||
|
||||
.args = { "c:dEf:rt:x", 0, 0 },
|
||||
.args = { "c:dEf:rt:x", 0, 0, NULL },
|
||||
.usage = "[-dErx] [-c working-directory] [-f flags] "
|
||||
CMD_TARGET_SESSION_USAGE,
|
||||
|
||||
/* -t is special */
|
||||
|
||||
.flags = CMD_STARTSERVER,
|
||||
.flags = CMD_STARTSERVER|CMD_READONLY,
|
||||
.exec = cmd_attach_session_exec
|
||||
};
|
||||
|
||||
|
@ -69,6 +69,7 @@ cmd_attach_session(struct cmdq_item *item, const char *tflag, int dflag,
|
|||
|
||||
if (c == NULL)
|
||||
return (CMD_RETURN_NORMAL);
|
||||
|
||||
if (server_client_check_nested(c)) {
|
||||
cmdq_error(item, "sessions should be nested with care, "
|
||||
"unset $TMUX to force");
|
||||
|
@ -124,17 +125,9 @@ cmd_attach_session(struct cmdq_item *item, const char *tflag, int dflag,
|
|||
if (!Eflag)
|
||||
environ_update(s->options, c->environ, s->environ);
|
||||
|
||||
c->session = s;
|
||||
server_client_set_session(c, s);
|
||||
if (~cmdq_get_flags(item) & CMDQ_STATE_REPEAT)
|
||||
server_client_set_key_table(c, NULL);
|
||||
tty_update_client_offset(c);
|
||||
status_timer_start(c);
|
||||
notify_client("client-session-changed", c);
|
||||
session_update_activity(s, NULL);
|
||||
gettimeofday(&s->last_attached_time, NULL);
|
||||
server_redraw_client(c);
|
||||
s->curw->flags &= ~WINLINK_ALERTFLAGS;
|
||||
s->curw->window->latest = c;
|
||||
} else {
|
||||
if (server_client_open(c, &cause) != 0) {
|
||||
cmdq_error(item, "open terminal failed: %s", cause);
|
||||
|
@ -156,25 +149,17 @@ cmd_attach_session(struct cmdq_item *item, const char *tflag, int dflag,
|
|||
if (!Eflag)
|
||||
environ_update(s->options, c->environ, s->environ);
|
||||
|
||||
c->session = s;
|
||||
server_client_set_session(c, s);
|
||||
server_client_set_key_table(c, NULL);
|
||||
tty_update_client_offset(c);
|
||||
status_timer_start(c);
|
||||
notify_client("client-session-changed", c);
|
||||
session_update_activity(s, NULL);
|
||||
gettimeofday(&s->last_attached_time, NULL);
|
||||
server_redraw_client(c);
|
||||
s->curw->flags &= ~WINLINK_ALERTFLAGS;
|
||||
s->curw->window->latest = c;
|
||||
|
||||
if (~c->flags & CLIENT_CONTROL)
|
||||
proc_send(c->peer, MSG_READY, -1, NULL, 0);
|
||||
notify_client("client-attached", c);
|
||||
c->flags |= CLIENT_ATTACHED;
|
||||
}
|
||||
recalculate_sizes();
|
||||
alerts_check_session(s);
|
||||
server_update_socket();
|
||||
|
||||
if (cfg_finished)
|
||||
cfg_show_causes(s);
|
||||
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
|
|
@ -27,13 +27,16 @@
|
|||
* Bind a key to a command.
|
||||
*/
|
||||
|
||||
static enum cmd_retval cmd_bind_key_exec(struct cmd *, struct cmdq_item *);
|
||||
static enum args_parse_type cmd_bind_key_args_parse(struct args *, u_int,
|
||||
char **);
|
||||
static enum cmd_retval cmd_bind_key_exec(struct cmd *,
|
||||
struct cmdq_item *);
|
||||
|
||||
const struct cmd_entry cmd_bind_key_entry = {
|
||||
.name = "bind-key",
|
||||
.alias = "bind",
|
||||
|
||||
.args = { "nrN:T:", 1, -1 },
|
||||
.args = { "nrN:T:", 1, -1, cmd_bind_key_args_parse },
|
||||
.usage = "[-nr] [-T key-table] [-N note] key "
|
||||
"[command [arguments]]",
|
||||
|
||||
|
@ -41,6 +44,13 @@ const struct cmd_entry cmd_bind_key_entry = {
|
|||
.exec = cmd_bind_key_exec
|
||||
};
|
||||
|
||||
static enum args_parse_type
|
||||
cmd_bind_key_args_parse(__unused struct args *args, __unused u_int idx,
|
||||
__unused char **cause)
|
||||
{
|
||||
return (ARGS_PARSE_COMMANDS_OR_STRING);
|
||||
}
|
||||
|
||||
static enum cmd_retval
|
||||
cmd_bind_key_exec(struct cmd *self, struct cmdq_item *item)
|
||||
{
|
||||
|
@ -48,12 +58,13 @@ cmd_bind_key_exec(struct cmd *self, struct cmdq_item *item)
|
|||
key_code key;
|
||||
const char *tablename, *note = args_get(args, 'N');
|
||||
struct cmd_parse_result *pr;
|
||||
char **argv = args->argv;
|
||||
int argc = args->argc, repeat;
|
||||
int repeat;
|
||||
struct args_value *value;
|
||||
u_int count = args_count(args);
|
||||
|
||||
key = key_string_lookup_string(argv[0]);
|
||||
key = key_string_lookup_string(args_string(args, 0));
|
||||
if (key == KEYC_NONE || key == KEYC_UNKNOWN) {
|
||||
cmdq_error(item, "unknown key: %s", argv[0]);
|
||||
cmdq_error(item, "unknown key: %s", args_string(args, 0));
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
|
||||
|
@ -65,24 +76,32 @@ cmd_bind_key_exec(struct cmd *self, struct cmdq_item *item)
|
|||
tablename = "prefix";
|
||||
repeat = args_has(args, 'r');
|
||||
|
||||
if (argc != 1) {
|
||||
if (argc == 2)
|
||||
pr = cmd_parse_from_string(argv[1], NULL);
|
||||
else
|
||||
pr = cmd_parse_from_arguments(argc - 1, argv + 1, NULL);
|
||||
switch (pr->status) {
|
||||
case CMD_PARSE_EMPTY:
|
||||
cmdq_error(item, "empty command");
|
||||
return (CMD_RETURN_ERROR);
|
||||
case CMD_PARSE_ERROR:
|
||||
cmdq_error(item, "%s", pr->error);
|
||||
free(pr->error);
|
||||
return (CMD_RETURN_ERROR);
|
||||
case CMD_PARSE_SUCCESS:
|
||||
break;
|
||||
}
|
||||
key_bindings_add(tablename, key, note, repeat, pr->cmdlist);
|
||||
} else
|
||||
if (count == 1) {
|
||||
key_bindings_add(tablename, key, note, repeat, NULL);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
value = args_value(args, 1);
|
||||
if (count == 2 && value->type == ARGS_COMMANDS) {
|
||||
key_bindings_add(tablename, key, note, repeat, value->cmdlist);
|
||||
value->cmdlist->references++;
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
if (count == 2)
|
||||
pr = cmd_parse_from_string(args_string(args, 1), NULL);
|
||||
else {
|
||||
pr = cmd_parse_from_arguments(args_values(args) + 1, count - 1,
|
||||
NULL);
|
||||
}
|
||||
switch (pr->status) {
|
||||
case CMD_PARSE_ERROR:
|
||||
cmdq_error(item, "%s", pr->error);
|
||||
free(pr->error);
|
||||
return (CMD_RETURN_ERROR);
|
||||
case CMD_PARSE_SUCCESS:
|
||||
break;
|
||||
}
|
||||
key_bindings_add(tablename, key, note, repeat, pr->cmdlist);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ const struct cmd_entry cmd_break_pane_entry = {
|
|||
.name = "break-pane",
|
||||
.alias = "breakp",
|
||||
|
||||
.args = { "abdPF:n:s:t:", 0, 0 },
|
||||
.args = { "abdPF:n:s:t:", 0, 0, NULL },
|
||||
.usage = "[-abdP] [-F format] [-n window-name] [-s src-pane] "
|
||||
"[-t dst-window]",
|
||||
|
||||
|
@ -115,6 +115,7 @@ cmd_break_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||
|
||||
layout_init(w, wp);
|
||||
wp->flags |= PANE_CHANGED;
|
||||
colour_palette_from_option(&wp->palette, wp->options);
|
||||
|
||||
if (idx == -1)
|
||||
idx = -1 - options_get_number(dst_s->options, "base-index");
|
||||
|
|
|
@ -39,8 +39,8 @@ const struct cmd_entry cmd_capture_pane_entry = {
|
|||
.name = "capture-pane",
|
||||
.alias = "capturep",
|
||||
|
||||
.args = { "ab:CeE:JNpPqS:t:", 0, 0 },
|
||||
.usage = "[-aCeJNpPq] " CMD_BUFFER_USAGE " [-E end-line] "
|
||||
.args = { "ab:CeE:JNpPqS:Tt:", 0, 0, NULL },
|
||||
.usage = "[-aCeJNpPqT] " CMD_BUFFER_USAGE " [-E end-line] "
|
||||
"[-S start-line] " CMD_TARGET_PANE_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, 0 },
|
||||
|
@ -53,8 +53,8 @@ const struct cmd_entry cmd_clear_history_entry = {
|
|||
.name = "clear-history",
|
||||
.alias = "clearhist",
|
||||
|
||||
.args = { "t:", 0, 0 },
|
||||
.usage = CMD_TARGET_PANE_USAGE,
|
||||
.args = { "Ht:", 0, 0, NULL },
|
||||
.usage = "[-H] " CMD_TARGET_PANE_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, 0 },
|
||||
|
||||
|
@ -110,7 +110,7 @@ cmd_capture_pane_history(struct args *args, struct cmdq_item *item,
|
|||
struct grid *gd;
|
||||
const struct grid_line *gl;
|
||||
struct grid_cell *gc = NULL;
|
||||
int n, with_codes, escape_c0, join_lines, no_trim;
|
||||
int n, join_lines, flags = 0;
|
||||
u_int i, sx, top, bottom, tmp;
|
||||
char *cause, *buf, *line;
|
||||
const char *Sflag, *Eflag;
|
||||
|
@ -133,7 +133,8 @@ cmd_capture_pane_history(struct args *args, struct cmdq_item *item,
|
|||
if (Sflag != NULL && strcmp(Sflag, "-") == 0)
|
||||
top = 0;
|
||||
else {
|
||||
n = args_strtonum(args, 'S', INT_MIN, SHRT_MAX, &cause);
|
||||
n = args_strtonum_and_expand(args, 'S', INT_MIN, SHRT_MAX,
|
||||
item, &cause);
|
||||
if (cause != NULL) {
|
||||
top = gd->hsize;
|
||||
free(cause);
|
||||
|
@ -149,7 +150,8 @@ cmd_capture_pane_history(struct args *args, struct cmdq_item *item,
|
|||
if (Eflag != NULL && strcmp(Eflag, "-") == 0)
|
||||
bottom = gd->hsize + gd->sy - 1;
|
||||
else {
|
||||
n = args_strtonum(args, 'E', INT_MIN, SHRT_MAX, &cause);
|
||||
n = args_strtonum_and_expand(args, 'E', INT_MIN, SHRT_MAX,
|
||||
item, &cause);
|
||||
if (cause != NULL) {
|
||||
bottom = gd->hsize + gd->sy - 1;
|
||||
free(cause);
|
||||
|
@ -167,15 +169,19 @@ cmd_capture_pane_history(struct args *args, struct cmdq_item *item,
|
|||
top = tmp;
|
||||
}
|
||||
|
||||
with_codes = args_has(args, 'e');
|
||||
escape_c0 = args_has(args, 'C');
|
||||
join_lines = args_has(args, 'J');
|
||||
no_trim = args_has(args, 'N');
|
||||
if (args_has(args, 'e'))
|
||||
flags |= GRID_STRING_WITH_SEQUENCES;
|
||||
if (args_has(args, 'C'))
|
||||
flags |= GRID_STRING_ESCAPE_SEQUENCES;
|
||||
if (!join_lines && !args_has(args, 'T'))
|
||||
flags |= GRID_STRING_EMPTY_CELLS;
|
||||
if (!join_lines && !args_has(args, 'N'))
|
||||
flags |= GRID_STRING_TRIM_SPACES;
|
||||
|
||||
buf = NULL;
|
||||
for (i = top; i <= bottom; i++) {
|
||||
line = grid_string_cells(gd, 0, i, sx, &gc, with_codes,
|
||||
escape_c0, !join_lines && !no_trim);
|
||||
line = grid_string_cells(gd, 0, i, sx, &gc, flags, wp->screen);
|
||||
linelen = strlen(line);
|
||||
|
||||
buf = cmd_capture_pane_append(buf, len, line, linelen);
|
||||
|
@ -202,6 +208,8 @@ cmd_capture_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||
if (cmd_get_entry(self) == &cmd_clear_history_entry) {
|
||||
window_pane_reset_mode_all(wp);
|
||||
grid_clear_history(wp->base.grid);
|
||||
if (args_has(args, 'H'))
|
||||
screen_reset_hyperlinks(wp->screen);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
|
|
|
@ -24,13 +24,16 @@
|
|||
* Enter a mode.
|
||||
*/
|
||||
|
||||
static enum cmd_retval cmd_choose_tree_exec(struct cmd *, struct cmdq_item *);
|
||||
static enum args_parse_type cmd_choose_tree_args_parse(struct args *args,
|
||||
u_int idx, char **cause);
|
||||
static enum cmd_retval cmd_choose_tree_exec(struct cmd *,
|
||||
struct cmdq_item *);
|
||||
|
||||
const struct cmd_entry cmd_choose_tree_entry = {
|
||||
.name = "choose-tree",
|
||||
.alias = NULL,
|
||||
|
||||
.args = { "F:f:GK:NO:rst:wZ", 0, 1 },
|
||||
.args = { "F:f:GK:NO:rst:wZ", 0, 1, cmd_choose_tree_args_parse },
|
||||
.usage = "[-GNrswZ] [-F format] [-f filter] [-K key-format] "
|
||||
"[-O sort-order] " CMD_TARGET_PANE_USAGE " [template]",
|
||||
|
||||
|
@ -44,7 +47,7 @@ const struct cmd_entry cmd_choose_client_entry = {
|
|||
.name = "choose-client",
|
||||
.alias = NULL,
|
||||
|
||||
.args = { "F:f:K:NO:rt:Z", 0, 1 },
|
||||
.args = { "F:f:K:NO:rt:Z", 0, 1, cmd_choose_tree_args_parse },
|
||||
.usage = "[-NrZ] [-F format] [-f filter] [-K key-format] "
|
||||
"[-O sort-order] " CMD_TARGET_PANE_USAGE " [template]",
|
||||
|
||||
|
@ -58,7 +61,7 @@ const struct cmd_entry cmd_choose_buffer_entry = {
|
|||
.name = "choose-buffer",
|
||||
.alias = NULL,
|
||||
|
||||
.args = { "F:f:K:NO:rt:Z", 0, 1 },
|
||||
.args = { "F:f:K:NO:rt:Z", 0, 1, cmd_choose_tree_args_parse },
|
||||
.usage = "[-NrZ] [-F format] [-f filter] [-K key-format] "
|
||||
"[-O sort-order] " CMD_TARGET_PANE_USAGE " [template]",
|
||||
|
||||
|
@ -72,7 +75,7 @@ const struct cmd_entry cmd_customize_mode_entry = {
|
|||
.name = "customize-mode",
|
||||
.alias = NULL,
|
||||
|
||||
.args = { "F:f:Nt:Z", 0, 0 },
|
||||
.args = { "F:f:Nt:Z", 0, 0, NULL },
|
||||
.usage = "[-NZ] [-F format] [-f filter] " CMD_TARGET_PANE_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, 0 },
|
||||
|
@ -81,6 +84,13 @@ const struct cmd_entry cmd_customize_mode_entry = {
|
|||
.exec = cmd_choose_tree_exec
|
||||
};
|
||||
|
||||
static enum args_parse_type
|
||||
cmd_choose_tree_args_parse(__unused struct args *args, __unused u_int idx,
|
||||
__unused char **cause)
|
||||
{
|
||||
return (ARGS_PARSE_COMMANDS_OR_STRING);
|
||||
}
|
||||
|
||||
static enum cmd_retval
|
||||
cmd_choose_tree_exec(struct cmd *self, struct cmdq_item *item)
|
||||
{
|
||||
|
@ -90,7 +100,7 @@ cmd_choose_tree_exec(struct cmd *self, struct cmdq_item *item)
|
|||
const struct window_mode *mode;
|
||||
|
||||
if (cmd_get_entry(self) == &cmd_choose_buffer_entry) {
|
||||
if (paste_get_top(NULL) == NULL)
|
||||
if (paste_is_empty())
|
||||
return (CMD_RETURN_NORMAL);
|
||||
mode = &window_buffer_mode;
|
||||
} else if (cmd_get_entry(self) == &cmd_choose_client_entry) {
|
||||
|
|
|
@ -29,8 +29,10 @@
|
|||
* Prompt for command in client.
|
||||
*/
|
||||
|
||||
static enum cmd_retval cmd_command_prompt_exec(struct cmd *,
|
||||
struct cmdq_item *);
|
||||
static enum args_parse_type cmd_command_prompt_args_parse(struct args *,
|
||||
u_int, char **);
|
||||
static enum cmd_retval cmd_command_prompt_exec(struct cmd *,
|
||||
struct cmdq_item *);
|
||||
|
||||
static int cmd_command_prompt_callback(struct client *, void *,
|
||||
const char *, int);
|
||||
|
@ -40,79 +42,112 @@ const struct cmd_entry cmd_command_prompt_entry = {
|
|||
.name = "command-prompt",
|
||||
.alias = NULL,
|
||||
|
||||
.args = { "1kiI:Np:Tt:W", 0, 1 },
|
||||
.usage = "[-1kiNTW] [-I inputs] [-p prompts] " CMD_TARGET_CLIENT_USAGE " "
|
||||
"[template]",
|
||||
.args = { "1bFkiI:Np:t:T:", 0, 1, cmd_command_prompt_args_parse },
|
||||
.usage = "[-1bFkiN] [-I inputs] [-p prompts] " CMD_TARGET_CLIENT_USAGE
|
||||
" [-T type] [template]",
|
||||
|
||||
.flags = CMD_CLIENT_TFLAG,
|
||||
.exec = cmd_command_prompt_exec
|
||||
};
|
||||
|
||||
struct cmd_command_prompt_cdata {
|
||||
int flags;
|
||||
|
||||
char *inputs;
|
||||
char *next_input;
|
||||
|
||||
char *prompts;
|
||||
char *next_prompt;
|
||||
|
||||
char *template;
|
||||
int idx;
|
||||
struct cmd_command_prompt_prompt {
|
||||
char *input;
|
||||
char *prompt;
|
||||
};
|
||||
|
||||
struct cmd_command_prompt_cdata {
|
||||
struct cmdq_item *item;
|
||||
struct args_command_state *state;
|
||||
|
||||
int flags;
|
||||
enum prompt_type prompt_type;
|
||||
|
||||
struct cmd_command_prompt_prompt *prompts;
|
||||
u_int count;
|
||||
u_int current;
|
||||
|
||||
int argc;
|
||||
char **argv;
|
||||
};
|
||||
|
||||
static enum args_parse_type
|
||||
cmd_command_prompt_args_parse(__unused struct args *args, __unused u_int idx,
|
||||
__unused char **cause)
|
||||
{
|
||||
return (ARGS_PARSE_COMMANDS_OR_STRING);
|
||||
}
|
||||
|
||||
static enum cmd_retval
|
||||
cmd_command_prompt_exec(struct cmd *self, struct cmdq_item *item)
|
||||
{
|
||||
struct args *args = cmd_get_args(self);
|
||||
struct client *tc = cmdq_get_target_client(item);
|
||||
struct cmd_find_state *target = cmdq_get_target(item);
|
||||
const char *inputs, *prompts;
|
||||
const char *type, *s, *input;
|
||||
struct cmd_command_prompt_cdata *cdata;
|
||||
char *prompt, *ptr, *input = NULL;
|
||||
size_t n;
|
||||
char *tmp, *prompts, *prompt, *next_prompt;
|
||||
char *inputs = NULL, *next_input;
|
||||
u_int count = args_count(args);
|
||||
int wait = !args_has(args, 'b'), space = 1;
|
||||
|
||||
if (tc->prompt_string != NULL)
|
||||
return (CMD_RETURN_NORMAL);
|
||||
if (args_has(args, 'i'))
|
||||
wait = 0;
|
||||
|
||||
cdata = xcalloc(1, sizeof *cdata);
|
||||
if (wait)
|
||||
cdata->item = item;
|
||||
cdata->state = args_make_commands_prepare(self, item, 0, "%1", wait,
|
||||
args_has(args, 'F'));
|
||||
|
||||
cdata->inputs = NULL;
|
||||
cdata->next_input = NULL;
|
||||
|
||||
cdata->prompts = NULL;
|
||||
cdata->next_prompt = NULL;
|
||||
|
||||
cdata->template = NULL;
|
||||
cdata->idx = 1;
|
||||
|
||||
if (args->argc != 0)
|
||||
cdata->template = xstrdup(args->argv[0]);
|
||||
else
|
||||
cdata->template = xstrdup("%1");
|
||||
|
||||
if ((prompts = args_get(args, 'p')) != NULL)
|
||||
cdata->prompts = xstrdup(prompts);
|
||||
else if (args->argc != 0) {
|
||||
n = strcspn(cdata->template, " ,");
|
||||
xasprintf(&cdata->prompts, "(%.*s) ", (int) n, cdata->template);
|
||||
if ((s = args_get(args, 'p')) == NULL) {
|
||||
if (count != 0) {
|
||||
tmp = args_make_commands_get_command(cdata->state);
|
||||
xasprintf(&prompts, "(%s)", tmp);
|
||||
free(tmp);
|
||||
} else {
|
||||
prompts = xstrdup(":");
|
||||
space = 0;
|
||||
}
|
||||
next_prompt = prompts;
|
||||
} else
|
||||
cdata->prompts = xstrdup(":");
|
||||
|
||||
/* Get first prompt. */
|
||||
cdata->next_prompt = cdata->prompts;
|
||||
ptr = strsep(&cdata->next_prompt, ",");
|
||||
if (prompts == NULL)
|
||||
prompt = xstrdup(ptr);
|
||||
next_prompt = prompts = xstrdup(s);
|
||||
if ((s = args_get(args, 'I')) != NULL)
|
||||
next_input = inputs = xstrdup(s);
|
||||
else
|
||||
xasprintf(&prompt, "%s ", ptr);
|
||||
next_input = NULL;
|
||||
while ((prompt = strsep(&next_prompt, ",")) != NULL) {
|
||||
cdata->prompts = xreallocarray(cdata->prompts, cdata->count + 1,
|
||||
sizeof *cdata->prompts);
|
||||
if (!space)
|
||||
tmp = xstrdup(prompt);
|
||||
else
|
||||
xasprintf(&tmp, "%s ", prompt);
|
||||
cdata->prompts[cdata->count].prompt = tmp;
|
||||
|
||||
/* Get initial prompt input. */
|
||||
if ((inputs = args_get(args, 'I')) != NULL) {
|
||||
cdata->inputs = xstrdup(inputs);
|
||||
cdata->next_input = cdata->inputs;
|
||||
input = strsep(&cdata->next_input, ",");
|
||||
if (next_input != NULL) {
|
||||
input = strsep(&next_input, ",");
|
||||
if (input == NULL)
|
||||
input = "";
|
||||
} else
|
||||
input = "";
|
||||
cdata->prompts[cdata->count].input = xstrdup(input);
|
||||
|
||||
cdata->count++;
|
||||
}
|
||||
free(inputs);
|
||||
free(prompts);
|
||||
|
||||
if ((type = args_get(args, 'T')) != NULL) {
|
||||
cdata->prompt_type = status_prompt_type(type);
|
||||
if (cdata->prompt_type == PROMPT_TYPE_INVALID) {
|
||||
cmdq_error(item, "unknown type: %s", type);
|
||||
cmd_command_prompt_free(cdata);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
} else
|
||||
cdata->prompt_type = PROMPT_TYPE_COMMAND;
|
||||
|
||||
if (args_has(args, '1'))
|
||||
cdata->flags |= PROMPT_SINGLE;
|
||||
|
@ -122,62 +157,71 @@ cmd_command_prompt_exec(struct cmd *self, struct cmdq_item *item)
|
|||
cdata->flags |= PROMPT_INCREMENTAL;
|
||||
else if (args_has(args, 'k'))
|
||||
cdata->flags |= PROMPT_KEY;
|
||||
else if (args_has(args, 'W'))
|
||||
cdata->flags |= PROMPT_WINDOW;
|
||||
else if (args_has(args, 'T'))
|
||||
cdata->flags |= PROMPT_TARGET;
|
||||
status_prompt_set(tc, target, prompt, input,
|
||||
cmd_command_prompt_callback, cmd_command_prompt_free, cdata,
|
||||
cdata->flags);
|
||||
free(prompt);
|
||||
status_prompt_set(tc, target, cdata->prompts[0].prompt,
|
||||
cdata->prompts[0].input, cmd_command_prompt_callback,
|
||||
cmd_command_prompt_free, cdata, cdata->flags, cdata->prompt_type);
|
||||
|
||||
return (CMD_RETURN_NORMAL);
|
||||
if (!wait)
|
||||
return (CMD_RETURN_NORMAL);
|
||||
return (CMD_RETURN_WAIT);
|
||||
}
|
||||
|
||||
static int
|
||||
cmd_command_prompt_callback(struct client *c, void *data, const char *s,
|
||||
int done)
|
||||
{
|
||||
struct cmd_command_prompt_cdata *cdata = data;
|
||||
char *new_template, *prompt, *ptr, *error;
|
||||
char *input = NULL;
|
||||
enum cmd_parse_status status;
|
||||
struct cmd_command_prompt_cdata *cdata = data;
|
||||
char *error;
|
||||
struct cmdq_item *item = cdata->item, *new_item;
|
||||
struct cmd_list *cmdlist;
|
||||
struct cmd_command_prompt_prompt *prompt;
|
||||
int argc = 0;
|
||||
char **argv = NULL;
|
||||
|
||||
if (s == NULL)
|
||||
return (0);
|
||||
if (done && (cdata->flags & PROMPT_INCREMENTAL))
|
||||
return (0);
|
||||
goto out;
|
||||
|
||||
new_template = cmd_template_replace(cdata->template, s, cdata->idx);
|
||||
if (done) {
|
||||
free(cdata->template);
|
||||
cdata->template = new_template;
|
||||
if (cdata->flags & PROMPT_INCREMENTAL)
|
||||
goto out;
|
||||
cmd_append_argv(&cdata->argc, &cdata->argv, s);
|
||||
if (++cdata->current != cdata->count) {
|
||||
prompt = &cdata->prompts[cdata->current];
|
||||
status_prompt_update(c, prompt->prompt, prompt->input);
|
||||
return (1);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Check if there are more prompts; if so, get its respective input
|
||||
* and update the prompt data.
|
||||
*/
|
||||
if (done && (ptr = strsep(&cdata->next_prompt, ",")) != NULL) {
|
||||
xasprintf(&prompt, "%s ", ptr);
|
||||
input = strsep(&cdata->next_input, ",");
|
||||
status_prompt_update(c, prompt, input);
|
||||
argc = cdata->argc;
|
||||
argv = cmd_copy_argv(cdata->argc, cdata->argv);
|
||||
if (!done)
|
||||
cmd_append_argv(&argc, &argv, s);
|
||||
|
||||
free(prompt);
|
||||
cdata->idx++;
|
||||
return (1);
|
||||
if (done) {
|
||||
cmd_free_argv(cdata->argc, cdata->argv);
|
||||
cdata->argc = argc;
|
||||
cdata->argv = cmd_copy_argv(argc, argv);
|
||||
}
|
||||
|
||||
status = cmd_parse_and_append(new_template, NULL, c, NULL, &error);
|
||||
if (status == CMD_PARSE_ERROR) {
|
||||
cmdlist = args_make_commands(cdata->state, argc, argv, &error);
|
||||
if (cmdlist == NULL) {
|
||||
cmdq_append(c, cmdq_get_error(error));
|
||||
free(error);
|
||||
} else if (item == NULL) {
|
||||
new_item = cmdq_get_command(cmdlist, NULL);
|
||||
cmdq_append(c, new_item);
|
||||
} else {
|
||||
new_item = cmdq_get_command(cmdlist, cmdq_get_state(item));
|
||||
cmdq_insert_after(item, new_item);
|
||||
}
|
||||
cmd_free_argv(argc, argv);
|
||||
|
||||
if (!done)
|
||||
free(new_template);
|
||||
if (c->prompt_inputcb != cmd_command_prompt_callback)
|
||||
return (1);
|
||||
|
||||
out:
|
||||
if (item != NULL)
|
||||
cmdq_continue(item);
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
@ -185,9 +229,14 @@ static void
|
|||
cmd_command_prompt_free(void *data)
|
||||
{
|
||||
struct cmd_command_prompt_cdata *cdata = data;
|
||||
u_int i;
|
||||
|
||||
free(cdata->inputs);
|
||||
for (i = 0; i < cdata->count; i++) {
|
||||
free(cdata->prompts[i].prompt);
|
||||
free(cdata->prompts[i].input);
|
||||
}
|
||||
free(cdata->prompts);
|
||||
free(cdata->template);
|
||||
cmd_free_argv(cdata->argc, cdata->argv);
|
||||
args_make_commands_free(cdata->state);
|
||||
free(cdata);
|
||||
}
|
||||
|
|
|
@ -28,8 +28,10 @@
|
|||
* Asks for confirmation before executing a command.
|
||||
*/
|
||||
|
||||
static enum cmd_retval cmd_confirm_before_exec(struct cmd *,
|
||||
struct cmdq_item *);
|
||||
static enum args_parse_type cmd_confirm_before_args_parse(struct args *,
|
||||
u_int, char **);
|
||||
static enum cmd_retval cmd_confirm_before_exec(struct cmd *,
|
||||
struct cmdq_item *);
|
||||
|
||||
static int cmd_confirm_before_callback(struct client *, void *,
|
||||
const char *, int);
|
||||
|
@ -39,17 +41,28 @@ const struct cmd_entry cmd_confirm_before_entry = {
|
|||
.name = "confirm-before",
|
||||
.alias = "confirm",
|
||||
|
||||
.args = { "p:t:", 1, 1 },
|
||||
.usage = "[-p prompt] " CMD_TARGET_CLIENT_USAGE " command",
|
||||
.args = { "bc:p:t:y", 1, 1, cmd_confirm_before_args_parse },
|
||||
.usage = "[-by] [-c confirm_key] [-p prompt] " CMD_TARGET_CLIENT_USAGE
|
||||
" command",
|
||||
|
||||
.flags = CMD_CLIENT_TFLAG,
|
||||
.exec = cmd_confirm_before_exec
|
||||
};
|
||||
|
||||
struct cmd_confirm_before_data {
|
||||
char *cmd;
|
||||
struct cmdq_item *item;
|
||||
struct cmd_list *cmdlist;
|
||||
u_char confirm_key;
|
||||
int default_yes;
|
||||
};
|
||||
|
||||
static enum args_parse_type
|
||||
cmd_confirm_before_args_parse(__unused struct args *args, __unused u_int idx,
|
||||
__unused char **cause)
|
||||
{
|
||||
return (ARGS_PARSE_COMMANDS_OR_STRING);
|
||||
}
|
||||
|
||||
static enum cmd_retval
|
||||
cmd_confirm_before_exec(struct cmd *self, struct cmdq_item *item)
|
||||
{
|
||||
|
@ -57,27 +70,51 @@ cmd_confirm_before_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct cmd_confirm_before_data *cdata;
|
||||
struct client *tc = cmdq_get_target_client(item);
|
||||
struct cmd_find_state *target = cmdq_get_target(item);
|
||||
char *cmd, *copy, *new_prompt, *ptr;
|
||||
const char *prompt;
|
||||
char *new_prompt;
|
||||
const char *confirm_key, *prompt, *cmd;
|
||||
int wait = !args_has(args, 'b');
|
||||
|
||||
cdata = xcalloc(1, sizeof *cdata);
|
||||
cdata->cmdlist = args_make_commands_now(self, item, 0, 1);
|
||||
if (cdata->cmdlist == NULL) {
|
||||
free(cdata);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
|
||||
if (wait)
|
||||
cdata->item = item;
|
||||
|
||||
cdata->default_yes = args_has(args, 'y');
|
||||
if ((confirm_key = args_get(args, 'c')) != NULL) {
|
||||
if (confirm_key[1] == '\0' &&
|
||||
confirm_key[0] > 31 &&
|
||||
confirm_key[0] < 127)
|
||||
cdata->confirm_key = confirm_key[0];
|
||||
else {
|
||||
cmdq_error(item, "invalid confirm key");
|
||||
free(cdata);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
}
|
||||
else
|
||||
cdata->confirm_key = 'y';
|
||||
|
||||
if ((prompt = args_get(args, 'p')) != NULL)
|
||||
xasprintf(&new_prompt, "%s ", prompt);
|
||||
else {
|
||||
ptr = copy = xstrdup(args->argv[0]);
|
||||
cmd = strsep(&ptr, " \t");
|
||||
xasprintf(&new_prompt, "Confirm '%s'? (y/n) ", cmd);
|
||||
free(copy);
|
||||
cmd = cmd_get_entry(cmd_list_first(cdata->cmdlist))->name;
|
||||
xasprintf(&new_prompt, "Confirm '%s'? (%c/n) ", cmd,
|
||||
cdata->confirm_key);
|
||||
}
|
||||
|
||||
cdata = xmalloc(sizeof *cdata);
|
||||
cdata->cmd = xstrdup(args->argv[0]);
|
||||
|
||||
status_prompt_set(tc, target, new_prompt, NULL,
|
||||
cmd_confirm_before_callback, cmd_confirm_before_free, cdata,
|
||||
PROMPT_SINGLE);
|
||||
|
||||
PROMPT_SINGLE, PROMPT_TYPE_COMMAND);
|
||||
free(new_prompt);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
|
||||
if (!wait)
|
||||
return (CMD_RETURN_NORMAL);
|
||||
return (CMD_RETURN_WAIT);
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -85,23 +122,34 @@ cmd_confirm_before_callback(struct client *c, void *data, const char *s,
|
|||
__unused int done)
|
||||
{
|
||||
struct cmd_confirm_before_data *cdata = data;
|
||||
char *error;
|
||||
enum cmd_parse_status status;
|
||||
struct cmdq_item *item = cdata->item, *new_item;
|
||||
int retcode = 1;
|
||||
|
||||
if (c->flags & CLIENT_DEAD)
|
||||
return (0);
|
||||
goto out;
|
||||
|
||||
if (s == NULL || *s == '\0')
|
||||
return (0);
|
||||
if (tolower((u_char)s[0]) != 'y' || s[1] != '\0')
|
||||
return (0);
|
||||
if (s == NULL)
|
||||
goto out;
|
||||
if (s[0] != cdata->confirm_key && (s[0] != '\0' || !cdata->default_yes))
|
||||
goto out;
|
||||
retcode = 0;
|
||||
|
||||
status = cmd_parse_and_append(cdata->cmd, NULL, c, NULL, &error);
|
||||
if (status == CMD_PARSE_ERROR) {
|
||||
cmdq_append(c, cmdq_get_error(error));
|
||||
free(error);
|
||||
if (item == NULL) {
|
||||
new_item = cmdq_get_command(cdata->cmdlist, NULL);
|
||||
cmdq_append(c, new_item);
|
||||
} else {
|
||||
new_item = cmdq_get_command(cdata->cmdlist,
|
||||
cmdq_get_state(item));
|
||||
cmdq_insert_after(item, new_item);
|
||||
}
|
||||
|
||||
out:
|
||||
if (item != NULL) {
|
||||
if (cmdq_get_client(item) != NULL &&
|
||||
cmdq_get_client(item)->session == NULL)
|
||||
cmdq_get_client(item)->retval = retcode;
|
||||
cmdq_continue(item);
|
||||
}
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
@ -110,6 +158,6 @@ cmd_confirm_before_free(void *data)
|
|||
{
|
||||
struct cmd_confirm_before_data *cdata = data;
|
||||
|
||||
free(cdata->cmd);
|
||||
cmd_list_free(cdata->cmdlist);
|
||||
free(cdata);
|
||||
}
|
||||
|
|
|
@ -30,7 +30,7 @@ const struct cmd_entry cmd_copy_mode_entry = {
|
|||
.name = "copy-mode",
|
||||
.alias = NULL,
|
||||
|
||||
.args = { "eHMs:t:uq", 0, 0 },
|
||||
.args = { "eHMs:t:uq", 0, 0, NULL },
|
||||
.usage = "[-eHMuq] [-s src-pane] " CMD_TARGET_PANE_USAGE,
|
||||
|
||||
.source = { 's', CMD_FIND_PANE, 0 },
|
||||
|
@ -44,7 +44,7 @@ const struct cmd_entry cmd_clock_mode_entry = {
|
|||
.name = "clock-mode",
|
||||
.alias = NULL,
|
||||
|
||||
.args = { "t:", 0, 0 },
|
||||
.args = { "t:", 0, 0, NULL },
|
||||
.usage = CMD_TARGET_PANE_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, 0 },
|
||||
|
|
|
@ -33,7 +33,7 @@ const struct cmd_entry cmd_detach_client_entry = {
|
|||
.name = "detach-client",
|
||||
.alias = "detach",
|
||||
|
||||
.args = { "aE:s:t:P", 0, 0 },
|
||||
.args = { "aE:s:t:P", 0, 0, NULL },
|
||||
.usage = "[-aP] [-E shell-command] "
|
||||
"[-s target-session] " CMD_TARGET_CLIENT_USAGE,
|
||||
|
||||
|
@ -47,7 +47,7 @@ const struct cmd_entry cmd_suspend_client_entry = {
|
|||
.name = "suspend-client",
|
||||
.alias = "suspendc",
|
||||
|
||||
.args = { "t:", 0, 0 },
|
||||
.args = { "t:", 0, 0, NULL },
|
||||
.usage = CMD_TARGET_CLIENT_USAGE,
|
||||
|
||||
.flags = CMD_CLIENT_TFLAG,
|
||||
|
|
|
@ -27,17 +27,21 @@
|
|||
* Display a menu on a client.
|
||||
*/
|
||||
|
||||
static enum cmd_retval cmd_display_menu_exec(struct cmd *,
|
||||
struct cmdq_item *);
|
||||
static enum cmd_retval cmd_display_popup_exec(struct cmd *,
|
||||
struct cmdq_item *);
|
||||
static enum args_parse_type cmd_display_menu_args_parse(struct args *,
|
||||
u_int, char **);
|
||||
static enum cmd_retval cmd_display_menu_exec(struct cmd *,
|
||||
struct cmdq_item *);
|
||||
static enum cmd_retval cmd_display_popup_exec(struct cmd *,
|
||||
struct cmdq_item *);
|
||||
|
||||
const struct cmd_entry cmd_display_menu_entry = {
|
||||
.name = "display-menu",
|
||||
.alias = "menu",
|
||||
|
||||
.args = { "c:t:OT:x:y:", 1, -1 },
|
||||
.usage = "[-O] [-c target-client] " CMD_TARGET_PANE_USAGE " [-T title] "
|
||||
.args = { "b:c:C:H:s:S:MOt:T:x:y:", 1, -1, cmd_display_menu_args_parse },
|
||||
.usage = "[-MO] [-b border-lines] [-c target-client] "
|
||||
"[-C starting-choice] [-H selected-style] [-s style] "
|
||||
"[-S border-style] " CMD_TARGET_PANE_USAGE "[-T title] "
|
||||
"[-x position] [-y position] name key command ...",
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, 0 },
|
||||
|
@ -50,10 +54,12 @@ const struct cmd_entry cmd_display_popup_entry = {
|
|||
.name = "display-popup",
|
||||
.alias = "popup",
|
||||
|
||||
.args = { "Cc:d:Eh:t:w:x:y:", 0, -1 },
|
||||
.usage = "[-CE] [-c target-client] [-d start-directory] [-h height] "
|
||||
CMD_TARGET_PANE_USAGE " [-w width] "
|
||||
"[-x position] [-y position] [command]",
|
||||
.args = { "Bb:Cc:d:e:Eh:s:S:t:T:w:x:y:", 0, -1, NULL },
|
||||
.usage = "[-BCE] [-b border-lines] [-c target-client] "
|
||||
"[-d start-directory] [-e environment] [-h height] "
|
||||
"[-s style] [-S border-style] " CMD_TARGET_PANE_USAGE
|
||||
"[-T title] [-w width] [-x position] [-y position] "
|
||||
"[shell-command]",
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, 0 },
|
||||
|
||||
|
@ -61,6 +67,30 @@ const struct cmd_entry cmd_display_popup_entry = {
|
|||
.exec = cmd_display_popup_exec
|
||||
};
|
||||
|
||||
static enum args_parse_type
|
||||
cmd_display_menu_args_parse(struct args *args, u_int idx, __unused char **cause)
|
||||
{
|
||||
u_int i = 0;
|
||||
enum args_parse_type type = ARGS_PARSE_STRING;
|
||||
|
||||
for (;;) {
|
||||
type = ARGS_PARSE_STRING;
|
||||
if (i == idx)
|
||||
break;
|
||||
if (*args_string(args, i++) == '\0')
|
||||
continue;
|
||||
|
||||
type = ARGS_PARSE_STRING;
|
||||
if (i++ == idx)
|
||||
break;
|
||||
|
||||
type = ARGS_PARSE_COMMANDS_OR_STRING;
|
||||
if (i++ == idx)
|
||||
break;
|
||||
}
|
||||
return (type);
|
||||
}
|
||||
|
||||
static int
|
||||
cmd_display_menu_get_position(struct client *tc, struct cmdq_item *item,
|
||||
struct args *args, u_int *px, u_int *py, u_int w, u_int h)
|
||||
|
@ -120,8 +150,6 @@ cmd_display_menu_get_position(struct client *tc, struct cmdq_item *item,
|
|||
if (sr != NULL)
|
||||
break;
|
||||
}
|
||||
if (line == lines)
|
||||
ranges = &tc->status.entries[0].ranges;
|
||||
|
||||
if (sr != NULL) {
|
||||
format_add(ft, "popup_window_status_line_x", "%u",
|
||||
|
@ -174,8 +202,8 @@ cmd_display_menu_get_position(struct client *tc, struct cmdq_item *item,
|
|||
} else
|
||||
format_add(ft, "popup_mouse_centre_y", "%ld", n);
|
||||
n = (long)event->m.y + h;
|
||||
if (n + h >= tty->sy)
|
||||
format_add(ft, "popup_mouse_top", "%u", tty->sy - h);
|
||||
if (n >= tty->sy)
|
||||
format_add(ft, "popup_mouse_top", "%u", tty->sy - 1);
|
||||
else
|
||||
format_add(ft, "popup_mouse_top", "%ld", n);
|
||||
n = event->m.y - h;
|
||||
|
@ -205,7 +233,7 @@ cmd_display_menu_get_position(struct client *tc, struct cmdq_item *item,
|
|||
if (xp == NULL || strcmp(xp, "C") == 0)
|
||||
xp = "#{popup_centre_x}";
|
||||
else if (strcmp(xp, "R") == 0)
|
||||
xp = "#{popup_right}";
|
||||
xp = "#{popup_pane_right}";
|
||||
else if (strcmp(xp, "P") == 0)
|
||||
xp = "#{popup_pane_left}";
|
||||
else if (strcmp(xp, "M") == 0)
|
||||
|
@ -219,7 +247,7 @@ cmd_display_menu_get_position(struct client *tc, struct cmdq_item *item,
|
|||
else if (n < 0)
|
||||
n = 0;
|
||||
*px = n;
|
||||
log_debug("%s: -x: %s = %s = %u", __func__, xp, p, *px);
|
||||
log_debug("%s: -x: %s = %s = %u (-w %u)", __func__, xp, p, *px, w);
|
||||
free(p);
|
||||
|
||||
/* Expand vertical position */
|
||||
|
@ -245,9 +273,10 @@ cmd_display_menu_get_position(struct client *tc, struct cmdq_item *item,
|
|||
else if (n < 0)
|
||||
n = 0;
|
||||
*py = n;
|
||||
log_debug("%s: -y: %s = %s = %u", __func__, yp, p, *py);
|
||||
log_debug("%s: -y: %s = %s = %u (-h %u)", __func__, yp, p, *py, h);
|
||||
free(p);
|
||||
|
||||
format_free(ft);
|
||||
return (1);
|
||||
}
|
||||
|
||||
|
@ -260,42 +289,62 @@ cmd_display_menu_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct client *tc = cmdq_get_target_client(item);
|
||||
struct menu *menu = NULL;
|
||||
struct menu_item menu_item;
|
||||
const char *key;
|
||||
char *title, *name;
|
||||
int flags = 0, i;
|
||||
u_int px, py;
|
||||
const char *key, *name, *value;
|
||||
const char *style = args_get(args, 's');
|
||||
const char *border_style = args_get(args, 'S');
|
||||
const char *selected_style = args_get(args, 'H');
|
||||
enum box_lines lines = BOX_LINES_DEFAULT;
|
||||
char *title, *cause;
|
||||
int flags = 0, starting_choice = 0;
|
||||
u_int px, py, i, count = args_count(args);
|
||||
struct options *o = target->s->curw->window->options;
|
||||
struct options_entry *oe;
|
||||
|
||||
|
||||
if (tc->overlay_draw != NULL)
|
||||
return (CMD_RETURN_NORMAL);
|
||||
|
||||
if (args_has(args, 'C')) {
|
||||
if (strcmp(args_get(args, 'C'), "-") == 0)
|
||||
starting_choice = -1;
|
||||
else {
|
||||
starting_choice = args_strtonum(args, 'C', 0, UINT_MAX,
|
||||
&cause);
|
||||
if (cause != NULL) {
|
||||
cmdq_error(item, "starting choice %s", cause);
|
||||
free(cause);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (args_has(args, 'T'))
|
||||
title = format_single_from_target(item, args_get(args, 'T'));
|
||||
else
|
||||
title = xstrdup("");
|
||||
menu = menu_create(title);
|
||||
free(title);
|
||||
|
||||
for (i = 0; i != args->argc; /* nothing */) {
|
||||
name = args->argv[i++];
|
||||
for (i = 0; i != count; /* nothing */) {
|
||||
name = args_string(args, i++);
|
||||
if (*name == '\0') {
|
||||
menu_add_item(menu, NULL, item, tc, target);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (args->argc - i < 2) {
|
||||
if (count - i < 2) {
|
||||
cmdq_error(item, "not enough arguments");
|
||||
free(title);
|
||||
menu_free(menu);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
key = args->argv[i++];
|
||||
key = args_string(args, i++);
|
||||
|
||||
menu_item.name = name;
|
||||
menu_item.key = key_string_lookup_string(key);
|
||||
menu_item.command = args->argv[i++];
|
||||
menu_item.command = args_string(args, i++);
|
||||
|
||||
menu_add_item(menu, &menu_item, item, tc, target);
|
||||
}
|
||||
free(title);
|
||||
if (menu == NULL) {
|
||||
cmdq_error(item, "invalid menu arguments");
|
||||
return (CMD_RETURN_ERROR);
|
||||
|
@ -310,12 +359,24 @@ cmd_display_menu_exec(struct cmd *self, struct cmdq_item *item)
|
|||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
value = args_get(args, 'b');
|
||||
if (value != NULL) {
|
||||
oe = options_get(o, "menu-border-lines");
|
||||
lines = options_find_choice(options_table_entry(oe), value,
|
||||
&cause);
|
||||
if (lines == -1) {
|
||||
cmdq_error(item, "menu-border-lines %s", cause);
|
||||
free(cause);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
}
|
||||
|
||||
if (args_has(args, 'O'))
|
||||
flags |= MENU_STAYOPEN;
|
||||
if (!event->m.valid)
|
||||
if (!event->m.valid && !args_has(args, 'M'))
|
||||
flags |= MENU_NOMOUSE;
|
||||
if (menu_display(menu, flags, item, px, py, tc, target, NULL,
|
||||
NULL) != 0)
|
||||
if (menu_display(menu, flags, starting_choice, item, px, py, tc, lines,
|
||||
style, selected_style, border_style, target, NULL, NULL) != 0)
|
||||
return (CMD_RETURN_NORMAL);
|
||||
return (CMD_RETURN_WAIT);
|
||||
}
|
||||
|
@ -328,11 +389,17 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct session *s = target->s;
|
||||
struct client *tc = cmdq_get_target_client(item);
|
||||
struct tty *tty = &tc->tty;
|
||||
const char *value, *shell[] = { NULL, NULL };
|
||||
const char *shellcmd = NULL;
|
||||
char *cwd, *cause, **argv = args->argv;
|
||||
int flags = 0, argc = args->argc;
|
||||
u_int px, py, w, h;
|
||||
const char *value, *shell, *shellcmd = NULL;
|
||||
const char *style = args_get(args, 's');
|
||||
const char *border_style = args_get(args, 'S');
|
||||
char *cwd, *cause = NULL, **argv = NULL, *title;
|
||||
int flags = 0, argc = 0;
|
||||
enum box_lines lines = BOX_LINES_DEFAULT;
|
||||
u_int px, py, w, h, count = args_count(args);
|
||||
struct args_value *av;
|
||||
struct environ *env = NULL;
|
||||
struct options *o = s->curw->window->options;
|
||||
struct options_entry *oe;
|
||||
|
||||
if (args_has(args, 'C')) {
|
||||
server_client_clear_overlay(tc);
|
||||
|
@ -361,37 +428,75 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
|
|||
}
|
||||
}
|
||||
|
||||
if (w > tty->sx - 1)
|
||||
w = tty->sx - 1;
|
||||
if (h > tty->sy - 1)
|
||||
h = tty->sy - 1;
|
||||
if (w > tty->sx)
|
||||
w = tty->sx;
|
||||
if (h > tty->sy)
|
||||
h = tty->sy;
|
||||
if (!cmd_display_menu_get_position(tc, item, args, &px, &py, w, h))
|
||||
return (CMD_RETURN_NORMAL);
|
||||
|
||||
value = args_get(args, 'b');
|
||||
if (args_has(args, 'B'))
|
||||
lines = BOX_LINES_NONE;
|
||||
else if (value != NULL) {
|
||||
oe = options_get(o, "popup-border-lines");
|
||||
lines = options_find_choice(options_table_entry(oe), value,
|
||||
&cause);
|
||||
if (cause != NULL) {
|
||||
cmdq_error(item, "popup-border-lines %s", cause);
|
||||
free(cause);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
}
|
||||
|
||||
value = args_get(args, 'd');
|
||||
if (value != NULL)
|
||||
cwd = format_single_from_target(item, value);
|
||||
else
|
||||
cwd = xstrdup(server_client_get_cwd(tc, s));
|
||||
if (argc == 0)
|
||||
if (count == 0)
|
||||
shellcmd = options_get_string(s->options, "default-command");
|
||||
else if (argc == 1)
|
||||
shellcmd = argv[0];
|
||||
if (argc <= 1 && (shellcmd == NULL || *shellcmd == '\0')) {
|
||||
else if (count == 1)
|
||||
shellcmd = args_string(args, 0);
|
||||
if (count <= 1 && (shellcmd == NULL || *shellcmd == '\0')) {
|
||||
shellcmd = NULL;
|
||||
shell[0] = options_get_string(s->options, "default-shell");
|
||||
if (!checkshell(shell[0]))
|
||||
shell[0] = _PATH_BSHELL;
|
||||
argc = 1;
|
||||
argv = (char**)shell;
|
||||
shell = options_get_string(s->options, "default-shell");
|
||||
if (!checkshell(shell))
|
||||
shell = _PATH_BSHELL;
|
||||
cmd_append_argv(&argc, &argv, shell);
|
||||
} else
|
||||
args_to_vector(args, &argc, &argv);
|
||||
|
||||
if (args_has(args, 'e') >= 1) {
|
||||
env = environ_create();
|
||||
av = args_first_value(args, 'e');
|
||||
while (av != NULL) {
|
||||
environ_put(env, av->string, 0);
|
||||
av = args_next_value(av);
|
||||
}
|
||||
}
|
||||
|
||||
if (args_has(args, 'T'))
|
||||
title = format_single_from_target(item, args_get(args, 'T'));
|
||||
else
|
||||
title = xstrdup("");
|
||||
if (args_has(args, 'E') > 1)
|
||||
flags |= POPUP_CLOSEEXITZERO;
|
||||
else if (args_has(args, 'E'))
|
||||
flags |= POPUP_CLOSEEXIT;
|
||||
if (popup_display(flags, item, px, py, w, h, shellcmd, argc, argv, cwd,
|
||||
tc, s, NULL, NULL) != 0)
|
||||
if (popup_display(flags, lines, item, px, py, w, h, env, shellcmd, argc,
|
||||
argv, cwd, title, tc, s, style, border_style, NULL, NULL) != 0) {
|
||||
cmd_free_argv(argc, argv);
|
||||
if (env != NULL)
|
||||
environ_free(env);
|
||||
free(cwd);
|
||||
free(title);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
if (env != NULL)
|
||||
environ_free(env);
|
||||
free(cwd);
|
||||
free(title);
|
||||
cmd_free_argv(argc, argv);
|
||||
return (CMD_RETURN_WAIT);
|
||||
}
|
||||
|
|
|
@ -39,8 +39,8 @@ const struct cmd_entry cmd_display_message_entry = {
|
|||
.name = "display-message",
|
||||
.alias = "display",
|
||||
|
||||
.args = { "acd:INpt:F:v", 0, 1 },
|
||||
.usage = "[-aINpv] [-c target-client] [-d delay] [-F format] "
|
||||
.args = { "ac:d:lINpt:F:v", 0, 1, NULL },
|
||||
.usage = "[-aIlNpv] [-c target-client] [-d delay] [-F format] "
|
||||
CMD_TARGET_PANE_USAGE " [message]",
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL },
|
||||
|
@ -68,22 +68,27 @@ cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct window_pane *wp = target->wp;
|
||||
const char *template;
|
||||
char *msg, *cause;
|
||||
int delay = -1;
|
||||
int delay = -1, flags, Nflag = args_has(args, 'N');
|
||||
struct format_tree *ft;
|
||||
int flags;
|
||||
u_int count = args_count(args);
|
||||
struct evbuffer *evb;
|
||||
|
||||
if (args_has(args, 'I')) {
|
||||
if (wp == NULL)
|
||||
return (CMD_RETURN_NORMAL);
|
||||
if (window_pane_start_input(wp, item, &cause) != 0) {
|
||||
switch (window_pane_start_input(wp, item, &cause)) {
|
||||
case -1:
|
||||
cmdq_error(item, "%s", cause);
|
||||
free(cause);
|
||||
return (CMD_RETURN_ERROR);
|
||||
case 1:
|
||||
return (CMD_RETURN_NORMAL);
|
||||
case 0:
|
||||
return (CMD_RETURN_WAIT);
|
||||
}
|
||||
return (CMD_RETURN_WAIT);
|
||||
}
|
||||
|
||||
if (args_has(args, 'F') && args->argc != 0) {
|
||||
if (args_has(args, 'F') && count != 0) {
|
||||
cmdq_error(item, "only one of -F or argument must be given");
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
|
@ -97,9 +102,10 @@ cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
|
|||
}
|
||||
}
|
||||
|
||||
template = args_get(args, 'F');
|
||||
if (args->argc != 0)
|
||||
template = args->argv[0];
|
||||
if (count != 0)
|
||||
template = args_string(args, 0);
|
||||
else
|
||||
template = args_get(args, 'F');
|
||||
if (template == NULL)
|
||||
template = DISPLAY_MESSAGE_TEMPLATE;
|
||||
|
||||
|
@ -127,15 +133,24 @@ cmd_display_message_exec(struct cmd *self, struct cmdq_item *item)
|
|||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
msg = format_expand_time(ft, template);
|
||||
if (args_has(args, 'l'))
|
||||
msg = xstrdup(template);
|
||||
else
|
||||
msg = format_expand_time(ft, template);
|
||||
|
||||
if (cmdq_get_client(item) == NULL)
|
||||
cmdq_error(item, "%s", msg);
|
||||
else if (args_has(args, 'p'))
|
||||
cmdq_print(item, "%s", msg);
|
||||
else if (tc != NULL) {
|
||||
status_message_set(tc, delay, 0, args_has(args, 'N'), "%s",
|
||||
msg);
|
||||
}
|
||||
else if (tc != NULL && (tc->flags & CLIENT_CONTROL)) {
|
||||
evb = evbuffer_new();
|
||||
if (evb == NULL)
|
||||
fatalx("out of memory");
|
||||
evbuffer_add_printf(evb, "%%message %s", msg);
|
||||
server_client_print(tc, 0, evb);
|
||||
evbuffer_free(evb);
|
||||
} else if (tc != NULL)
|
||||
status_message_set(tc, delay, 0, Nflag, "%s", msg);
|
||||
free(msg);
|
||||
|
||||
format_free(ft);
|
||||
|
|
|
@ -27,14 +27,16 @@
|
|||
* Display panes on a client.
|
||||
*/
|
||||
|
||||
static enum cmd_retval cmd_display_panes_exec(struct cmd *,
|
||||
struct cmdq_item *);
|
||||
static enum args_parse_type cmd_display_panes_args_parse(struct args *,
|
||||
u_int, char **);
|
||||
static enum cmd_retval cmd_display_panes_exec(struct cmd *,
|
||||
struct cmdq_item *);
|
||||
|
||||
const struct cmd_entry cmd_display_panes_entry = {
|
||||
.name = "display-panes",
|
||||
.alias = "displayp",
|
||||
|
||||
.args = { "bd:Nt:", 0, 1 },
|
||||
.args = { "bd:Nt:", 0, 1, cmd_display_panes_args_parse },
|
||||
.usage = "[-bN] [-d duration] " CMD_TARGET_CLIENT_USAGE " [template]",
|
||||
|
||||
.flags = CMD_AFTERHOOK|CMD_CLIENT_TFLAG,
|
||||
|
@ -42,10 +44,17 @@ const struct cmd_entry cmd_display_panes_entry = {
|
|||
};
|
||||
|
||||
struct cmd_display_panes_data {
|
||||
struct cmdq_item *item;
|
||||
char *command;
|
||||
struct cmdq_item *item;
|
||||
struct args_command_state *state;
|
||||
};
|
||||
|
||||
static enum args_parse_type
|
||||
cmd_display_panes_args_parse(__unused struct args *args, __unused u_int idx,
|
||||
__unused char **cause)
|
||||
{
|
||||
return (ARGS_PARSE_COMMANDS_OR_STRING);
|
||||
}
|
||||
|
||||
static void
|
||||
cmd_display_panes_draw_pane(struct screen_redraw_ctx *ctx,
|
||||
struct window_pane *wp)
|
||||
|
@ -135,11 +144,11 @@ cmd_display_panes_draw_pane(struct screen_redraw_ctx *ctx,
|
|||
llen = 0;
|
||||
|
||||
if (sx < len * 6 || sy < 5) {
|
||||
tty_attributes(tty, &fgc, &grid_default_cell, NULL);
|
||||
tty_attributes(tty, &fgc, &grid_default_cell, NULL, NULL);
|
||||
if (sx >= len + llen + 1) {
|
||||
len += llen + 1;
|
||||
tty_cursor(tty, xoff + px - len / 2, yoff + py);
|
||||
tty_putn(tty, buf, len, len);
|
||||
tty_putn(tty, buf, len, len);
|
||||
tty_putn(tty, " ", 1, 1);
|
||||
tty_putn(tty, lbuf, llen, llen);
|
||||
} else {
|
||||
|
@ -152,7 +161,7 @@ cmd_display_panes_draw_pane(struct screen_redraw_ctx *ctx,
|
|||
px -= len * 3;
|
||||
py -= 2;
|
||||
|
||||
tty_attributes(tty, &bgc, &grid_default_cell, NULL);
|
||||
tty_attributes(tty, &bgc, &grid_default_cell, NULL, NULL);
|
||||
for (ptr = buf; *ptr != '\0'; ptr++) {
|
||||
if (*ptr < '0' || *ptr > '9')
|
||||
continue;
|
||||
|
@ -170,7 +179,7 @@ cmd_display_panes_draw_pane(struct screen_redraw_ctx *ctx,
|
|||
|
||||
if (sy <= 6)
|
||||
goto out;
|
||||
tty_attributes(tty, &fgc, &grid_default_cell, NULL);
|
||||
tty_attributes(tty, &fgc, &grid_default_cell, NULL, NULL);
|
||||
if (rlen != 0 && sx >= rlen) {
|
||||
tty_cursor(tty, xoff + sx - rlen, yoff);
|
||||
tty_putn(tty, rbuf, rlen, rlen);
|
||||
|
@ -186,7 +195,8 @@ out:
|
|||
}
|
||||
|
||||
static void
|
||||
cmd_display_panes_draw(struct client *c, struct screen_redraw_ctx *ctx)
|
||||
cmd_display_panes_draw(struct client *c, __unused void *data,
|
||||
struct screen_redraw_ctx *ctx)
|
||||
{
|
||||
struct window *w = c->session->curw->window;
|
||||
struct window_pane *wp;
|
||||
|
@ -200,24 +210,25 @@ cmd_display_panes_draw(struct client *c, struct screen_redraw_ctx *ctx)
|
|||
}
|
||||
|
||||
static void
|
||||
cmd_display_panes_free(struct client *c)
|
||||
cmd_display_panes_free(__unused struct client *c, void *data)
|
||||
{
|
||||
struct cmd_display_panes_data *cdata = c->overlay_data;
|
||||
struct cmd_display_panes_data *cdata = data;
|
||||
|
||||
if (cdata->item != NULL)
|
||||
cmdq_continue(cdata->item);
|
||||
free(cdata->command);
|
||||
args_make_commands_free(cdata->state);
|
||||
free(cdata);
|
||||
}
|
||||
|
||||
static int
|
||||
cmd_display_panes_key(struct client *c, struct key_event *event)
|
||||
cmd_display_panes_key(struct client *c, void *data, struct key_event *event)
|
||||
{
|
||||
struct cmd_display_panes_data *cdata = c->overlay_data;
|
||||
char *cmd, *expanded, *error;
|
||||
struct cmd_display_panes_data *cdata = data;
|
||||
char *expanded, *error;
|
||||
struct cmdq_item *item = cdata->item, *new_item;
|
||||
struct cmd_list *cmdlist;
|
||||
struct window *w = c->session->curw->window;
|
||||
struct window_pane *wp;
|
||||
enum cmd_parse_status status;
|
||||
u_int index;
|
||||
key_code key;
|
||||
|
||||
|
@ -235,18 +246,22 @@ cmd_display_panes_key(struct client *c, struct key_event *event)
|
|||
wp = window_pane_at_index(w, index);
|
||||
if (wp == NULL)
|
||||
return (1);
|
||||
window_unzoom(w);
|
||||
window_unzoom(w, 1);
|
||||
|
||||
xasprintf(&expanded, "%%%u", wp->id);
|
||||
cmd = cmd_template_replace(cdata->command, expanded, 1);
|
||||
|
||||
status = cmd_parse_and_append(cmd, NULL, c, NULL, &error);
|
||||
if (status == CMD_PARSE_ERROR) {
|
||||
cmdlist = args_make_commands(cdata->state, 1, &expanded, &error);
|
||||
if (cmdlist == NULL) {
|
||||
cmdq_append(c, cmdq_get_error(error));
|
||||
free(error);
|
||||
} else if (item == NULL) {
|
||||
new_item = cmdq_get_command(cmdlist, NULL);
|
||||
cmdq_append(c, new_item);
|
||||
} else {
|
||||
new_item = cmdq_get_command(cmdlist, cmdq_get_state(item));
|
||||
cmdq_insert_after(item, new_item);
|
||||
}
|
||||
|
||||
free(cmd);
|
||||
free(expanded);
|
||||
return (1);
|
||||
}
|
||||
|
@ -257,9 +272,10 @@ cmd_display_panes_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct args *args = cmd_get_args(self);
|
||||
struct client *tc = cmdq_get_target_client(item);
|
||||
struct session *s = tc->session;
|
||||
u_int delay;
|
||||
u_int delay;
|
||||
char *cause;
|
||||
struct cmd_display_panes_data *cdata;
|
||||
int wait = !args_has(args, 'b');
|
||||
|
||||
if (tc->overlay_draw != NULL)
|
||||
return (CMD_RETURN_NORMAL);
|
||||
|
@ -274,27 +290,23 @@ cmd_display_panes_exec(struct cmd *self, struct cmdq_item *item)
|
|||
} else
|
||||
delay = options_get_number(s->options, "display-panes-time");
|
||||
|
||||
cdata = xmalloc(sizeof *cdata);
|
||||
if (args->argc != 0)
|
||||
cdata->command = xstrdup(args->argv[0]);
|
||||
else
|
||||
cdata->command = xstrdup("select-pane -t '%%'");
|
||||
if (args_has(args, 'b'))
|
||||
cdata->item = NULL;
|
||||
else
|
||||
cdata = xcalloc(1, sizeof *cdata);
|
||||
if (wait)
|
||||
cdata->item = item;
|
||||
cdata->state = args_make_commands_prepare(self, item, 0,
|
||||
"select-pane -t \"%%%\"", wait, 0);
|
||||
|
||||
if (args_has(args, 'N')) {
|
||||
server_client_set_overlay(tc, delay, NULL, NULL,
|
||||
cmd_display_panes_draw, NULL, cmd_display_panes_free,
|
||||
cmd_display_panes_draw, NULL, cmd_display_panes_free, NULL,
|
||||
cdata);
|
||||
} else {
|
||||
server_client_set_overlay(tc, delay, NULL, NULL,
|
||||
cmd_display_panes_draw, cmd_display_panes_key,
|
||||
cmd_display_panes_free, cdata);
|
||||
cmd_display_panes_free, NULL, cdata);
|
||||
}
|
||||
|
||||
if (args_has(args, 'b'))
|
||||
if (!wait)
|
||||
return (CMD_RETURN_NORMAL);
|
||||
return (CMD_RETURN_WAIT);
|
||||
}
|
||||
|
|
|
@ -32,7 +32,7 @@ const struct cmd_entry cmd_find_window_entry = {
|
|||
.name = "find-window",
|
||||
.alias = "findw",
|
||||
|
||||
.args = { "CiNrt:TZ", 1, 1 },
|
||||
.args = { "CiNrt:TZ", 1, 1, NULL },
|
||||
.usage = "[-CiNrTZ] " CMD_TARGET_PANE_USAGE " match-string",
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, 0 },
|
||||
|
@ -47,14 +47,17 @@ cmd_find_window_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct args *args = cmd_get_args(self), *new_args;
|
||||
struct cmd_find_state *target = cmdq_get_target(item);
|
||||
struct window_pane *wp = target->wp;
|
||||
const char *s = args->argv[0], *suffix = "";
|
||||
char *filter, *argv = { NULL };
|
||||
const char *s = args_string(args, 0), *suffix = "";
|
||||
const char *star = "*";
|
||||
struct args_value *filter;
|
||||
int C, N, T;
|
||||
|
||||
C = args_has(args, 'C');
|
||||
N = args_has(args, 'N');
|
||||
T = args_has(args, 'T');
|
||||
|
||||
if (args_has(args, 'r'))
|
||||
star = "";
|
||||
if (args_has(args, 'r') && args_has(args, 'i'))
|
||||
suffix = "/ri";
|
||||
else if (args_has(args, 'r'))
|
||||
|
@ -65,41 +68,49 @@ cmd_find_window_exec(struct cmd *self, struct cmdq_item *item)
|
|||
if (!C && !N && !T)
|
||||
C = N = T = 1;
|
||||
|
||||
if (C && N && T) {
|
||||
xasprintf(&filter,
|
||||
"#{||:"
|
||||
"#{C%s:%s},#{||:#{m%s:*%s*,#{window_name}},"
|
||||
"#{m%s:*%s*,#{pane_title}}}}",
|
||||
suffix, s, suffix, s, suffix, s);
|
||||
} else if (C && N) {
|
||||
xasprintf(&filter,
|
||||
"#{||:#{C%s:%s},#{m%s:*%s*,#{window_name}}}",
|
||||
suffix, s, suffix, s);
|
||||
} else if (C && T) {
|
||||
xasprintf(&filter,
|
||||
"#{||:#{C%s:%s},#{m%s:*%s*,#{pane_title}}}",
|
||||
suffix, s, suffix, s);
|
||||
} else if (N && T) {
|
||||
xasprintf(&filter,
|
||||
"#{||:#{m%s:*%s*,#{window_name}},"
|
||||
"#{m%s:*%s*,#{pane_title}}}",
|
||||
suffix, s, suffix, s);
|
||||
} else if (C)
|
||||
xasprintf(&filter, "#{C%s:%s}", suffix, s);
|
||||
else if (N)
|
||||
xasprintf(&filter, "#{m%s:*%s*,#{window_name}}", suffix, s);
|
||||
else
|
||||
xasprintf(&filter, "#{m%s:*%s*,#{pane_title}}", suffix, s);
|
||||
filter = xcalloc(1, sizeof *filter);
|
||||
filter->type = ARGS_STRING;
|
||||
|
||||
new_args = args_parse("", 1, &argv);
|
||||
if (C && N && T) {
|
||||
xasprintf(&filter->string,
|
||||
"#{||:"
|
||||
"#{C%s:%s},#{||:#{m%s:%s%s%s,#{window_name}},"
|
||||
"#{m%s:%s%s%s,#{pane_title}}}}",
|
||||
suffix, s, suffix, star, s, star, suffix, star, s, star);
|
||||
} else if (C && N) {
|
||||
xasprintf(&filter->string,
|
||||
"#{||:#{C%s:%s},#{m%s:%s%s%s,#{window_name}}}",
|
||||
suffix, s, suffix, star, s, star);
|
||||
} else if (C && T) {
|
||||
xasprintf(&filter->string,
|
||||
"#{||:#{C%s:%s},#{m%s:%s%s%s,#{pane_title}}}",
|
||||
suffix, s, suffix, star, s, star);
|
||||
} else if (N && T) {
|
||||
xasprintf(&filter->string,
|
||||
"#{||:#{m%s:%s%s%s,#{window_name}},"
|
||||
"#{m%s:%s%s%s,#{pane_title}}}",
|
||||
suffix, star, s, star, suffix, star, s, star);
|
||||
} else if (C) {
|
||||
xasprintf(&filter->string,
|
||||
"#{C%s:%s}",
|
||||
suffix, s);
|
||||
} else if (N) {
|
||||
xasprintf(&filter->string,
|
||||
"#{m%s:%s%s%s,#{window_name}}",
|
||||
suffix, star, s, star);
|
||||
} else {
|
||||
xasprintf(&filter->string,
|
||||
"#{m%s:%s%s%s,#{pane_title}}",
|
||||
suffix, star, s, star);
|
||||
}
|
||||
|
||||
new_args = args_create();
|
||||
if (args_has(args, 'Z'))
|
||||
args_set(new_args, 'Z', NULL);
|
||||
args_set(new_args, 'f', filter);
|
||||
args_set(new_args, 'Z', NULL, 0);
|
||||
args_set(new_args, 'f', filter, 0);
|
||||
|
||||
window_pane_set_mode(wp, NULL, &window_tree_mode, target, new_args);
|
||||
|
||||
args_free(new_args);
|
||||
free(filter);
|
||||
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
|
12
cmd-find.c
12
cmd-find.c
|
@ -582,27 +582,27 @@ cmd_find_get_pane_with_window(struct cmd_find_state *fs, const char *pane)
|
|||
|
||||
/* Try special characters. */
|
||||
if (strcmp(pane, "!") == 0) {
|
||||
fs->wp = fs->w->last;
|
||||
fs->wp = TAILQ_FIRST(&fs->w->last_panes);
|
||||
if (fs->wp == NULL)
|
||||
return (-1);
|
||||
return (0);
|
||||
} else if (strcmp(pane, "{up-of}") == 0) {
|
||||
fs->wp = window_pane_find_up(fs->current->wp);
|
||||
fs->wp = window_pane_find_up(fs->w->active);
|
||||
if (fs->wp == NULL)
|
||||
return (-1);
|
||||
return (0);
|
||||
} else if (strcmp(pane, "{down-of}") == 0) {
|
||||
fs->wp = window_pane_find_down(fs->current->wp);
|
||||
fs->wp = window_pane_find_down(fs->w->active);
|
||||
if (fs->wp == NULL)
|
||||
return (-1);
|
||||
return (0);
|
||||
} else if (strcmp(pane, "{left-of}") == 0) {
|
||||
fs->wp = window_pane_find_left(fs->current->wp);
|
||||
fs->wp = window_pane_find_left(fs->w->active);
|
||||
if (fs->wp == NULL)
|
||||
return (-1);
|
||||
return (0);
|
||||
} else if (strcmp(pane, "{right-of}") == 0) {
|
||||
fs->wp = window_pane_find_right(fs->current->wp);
|
||||
fs->wp = window_pane_find_right(fs->w->active);
|
||||
if (fs->wp == NULL)
|
||||
return (-1);
|
||||
return (0);
|
||||
|
@ -614,7 +614,7 @@ cmd_find_get_pane_with_window(struct cmd_find_state *fs, const char *pane)
|
|||
n = strtonum(pane + 1, 1, INT_MAX, NULL);
|
||||
else
|
||||
n = 1;
|
||||
wp = fs->current->wp;
|
||||
wp = fs->w->active;
|
||||
if (pane[0] == '+')
|
||||
fs->wp = window_pane_next_by_number(fs->w, wp, n);
|
||||
else
|
||||
|
|
168
cmd-if-shell.c
168
cmd-if-shell.c
|
@ -20,6 +20,7 @@
|
|||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
#include <ctype.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
|
@ -29,16 +30,19 @@
|
|||
* Executes a tmux command if a shell command returns true or false.
|
||||
*/
|
||||
|
||||
static enum cmd_retval cmd_if_shell_exec(struct cmd *, struct cmdq_item *);
|
||||
static enum args_parse_type cmd_if_shell_args_parse(struct args *, u_int,
|
||||
char **);
|
||||
static enum cmd_retval cmd_if_shell_exec(struct cmd *,
|
||||
struct cmdq_item *);
|
||||
|
||||
static void cmd_if_shell_callback(struct job *);
|
||||
static void cmd_if_shell_free(void *);
|
||||
static void cmd_if_shell_callback(struct job *);
|
||||
static void cmd_if_shell_free(void *);
|
||||
|
||||
const struct cmd_entry cmd_if_shell_entry = {
|
||||
.name = "if-shell",
|
||||
.alias = "if",
|
||||
|
||||
.args = { "bFt:", 2, 3 },
|
||||
.args = { "bFt:", 2, 3, cmd_if_shell_args_parse },
|
||||
.usage = "[-bF] " CMD_TARGET_PANE_USAGE " shell-command command "
|
||||
"[command]",
|
||||
|
||||
|
@ -49,86 +53,72 @@ const struct cmd_entry cmd_if_shell_entry = {
|
|||
};
|
||||
|
||||
struct cmd_if_shell_data {
|
||||
struct cmd_parse_input input;
|
||||
struct args_command_state *cmd_if;
|
||||
struct args_command_state *cmd_else;
|
||||
|
||||
char *cmd_if;
|
||||
char *cmd_else;
|
||||
|
||||
struct client *client;
|
||||
struct cmdq_item *item;
|
||||
struct client *client;
|
||||
struct cmdq_item *item;
|
||||
};
|
||||
|
||||
static enum args_parse_type
|
||||
cmd_if_shell_args_parse(__unused struct args *args, u_int idx,
|
||||
__unused char **cause)
|
||||
{
|
||||
if (idx == 1 || idx == 2)
|
||||
return (ARGS_PARSE_COMMANDS_OR_STRING);
|
||||
return (ARGS_PARSE_STRING);
|
||||
}
|
||||
|
||||
static enum cmd_retval
|
||||
cmd_if_shell_exec(struct cmd *self, struct cmdq_item *item)
|
||||
{
|
||||
struct args *args = cmd_get_args(self);
|
||||
struct cmd_find_state *target = cmdq_get_target(item);
|
||||
struct cmdq_state *state = cmdq_get_state(item);
|
||||
struct cmd_if_shell_data *cdata;
|
||||
char *shellcmd, *cmd, *error;
|
||||
const char *file;
|
||||
struct cmdq_item *new_item;
|
||||
char *shellcmd;
|
||||
struct client *tc = cmdq_get_target_client(item);
|
||||
struct session *s = target->s;
|
||||
struct cmd_parse_input pi;
|
||||
enum cmd_parse_status status;
|
||||
struct cmd_list *cmdlist;
|
||||
u_int count = args_count(args);
|
||||
int wait = !args_has(args, 'b');
|
||||
|
||||
shellcmd = format_single_from_target(item, args->argv[0]);
|
||||
shellcmd = format_single_from_target(item, args_string(args, 0));
|
||||
if (args_has(args, 'F')) {
|
||||
if (*shellcmd != '0' && *shellcmd != '\0')
|
||||
cmd = args->argv[1];
|
||||
else if (args->argc == 3)
|
||||
cmd = args->argv[2];
|
||||
else
|
||||
cmd = NULL;
|
||||
free(shellcmd);
|
||||
if (cmd == NULL)
|
||||
cmdlist = args_make_commands_now(self, item, 1, 0);
|
||||
else if (count == 3)
|
||||
cmdlist = args_make_commands_now(self, item, 2, 0);
|
||||
else {
|
||||
free(shellcmd);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
|
||||
memset(&pi, 0, sizeof pi);
|
||||
cmd_get_source(self, &pi.file, &pi.line);
|
||||
pi.item = item;
|
||||
pi.c = tc;
|
||||
cmd_find_copy_state(&pi.fs, target);
|
||||
|
||||
status = cmd_parse_and_insert(cmd, &pi, item, state, &error);
|
||||
if (status == CMD_PARSE_ERROR) {
|
||||
cmdq_error(item, "%s", error);
|
||||
free(error);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
free(shellcmd);
|
||||
if (cmdlist == NULL)
|
||||
return (CMD_RETURN_ERROR);
|
||||
new_item = cmdq_get_command(cmdlist, cmdq_get_state(item));
|
||||
cmdq_insert_after(item, new_item);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
cdata = xcalloc(1, sizeof *cdata);
|
||||
|
||||
cdata->cmd_if = xstrdup(args->argv[1]);
|
||||
if (args->argc == 3)
|
||||
cdata->cmd_else = xstrdup(args->argv[2]);
|
||||
else
|
||||
cdata->cmd_else = NULL;
|
||||
cdata->cmd_if = args_make_commands_prepare(self, item, 1, NULL, wait,
|
||||
0);
|
||||
if (count == 3) {
|
||||
cdata->cmd_else = args_make_commands_prepare(self, item, 2,
|
||||
NULL, wait, 0);
|
||||
}
|
||||
|
||||
if (!args_has(args, 'b'))
|
||||
if (wait) {
|
||||
cdata->client = cmdq_get_client(item);
|
||||
else
|
||||
cdata->item = item;
|
||||
} else
|
||||
cdata->client = tc;
|
||||
if (cdata->client != NULL)
|
||||
cdata->client->references++;
|
||||
|
||||
if (!args_has(args, 'b'))
|
||||
cdata->item = item;
|
||||
else
|
||||
cdata->item = NULL;
|
||||
|
||||
memset(&cdata->input, 0, sizeof cdata->input);
|
||||
cmd_get_source(self, &file, &cdata->input.line);
|
||||
if (file != NULL)
|
||||
cdata->input.file = xstrdup(file);
|
||||
cdata->input.c = tc;
|
||||
if (cdata->input.c != NULL)
|
||||
cdata->input.c->references++;
|
||||
cmd_find_copy_state(&cdata->input.fs, target);
|
||||
|
||||
if (job_run(shellcmd, 0, NULL, s,
|
||||
if (job_run(shellcmd, 0, NULL, NULL, s,
|
||||
server_client_get_cwd(cmdq_get_client(item), s), NULL,
|
||||
cmd_if_shell_callback, cmd_if_shell_free, cdata, 0, -1,
|
||||
-1) == NULL) {
|
||||
|
@ -139,7 +129,7 @@ cmd_if_shell_exec(struct cmd *self, struct cmdq_item *item)
|
|||
}
|
||||
free(shellcmd);
|
||||
|
||||
if (args_has(args, 'b'))
|
||||
if (!wait)
|
||||
return (CMD_RETURN_NORMAL);
|
||||
return (CMD_RETURN_WAIT);
|
||||
}
|
||||
|
@ -149,45 +139,34 @@ cmd_if_shell_callback(struct job *job)
|
|||
{
|
||||
struct cmd_if_shell_data *cdata = job_get_data(job);
|
||||
struct client *c = cdata->client;
|
||||
struct cmdq_item *new_item = NULL;
|
||||
struct cmdq_state *new_state = NULL;
|
||||
char *cmd;
|
||||
struct cmdq_item *item = cdata->item, *new_item;
|
||||
struct args_command_state *state;
|
||||
struct cmd_list *cmdlist;
|
||||
char *error;
|
||||
int status;
|
||||
struct cmd_parse_result *pr;
|
||||
|
||||
status = job_get_status(job);
|
||||
if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
|
||||
cmd = cdata->cmd_else;
|
||||
state = cdata->cmd_else;
|
||||
else
|
||||
cmd = cdata->cmd_if;
|
||||
if (cmd == NULL)
|
||||
state = cdata->cmd_if;
|
||||
if (state == NULL)
|
||||
goto out;
|
||||
|
||||
pr = cmd_parse_from_string(cmd, &cdata->input);
|
||||
switch (pr->status) {
|
||||
case CMD_PARSE_EMPTY:
|
||||
break;
|
||||
case CMD_PARSE_ERROR:
|
||||
if (cdata->item != NULL)
|
||||
cmdq_error(cdata->item, "%s", pr->error);
|
||||
free(pr->error);
|
||||
break;
|
||||
case CMD_PARSE_SUCCESS:
|
||||
if (cdata->item == NULL)
|
||||
new_state = cmdq_new_state(NULL, NULL, 0);
|
||||
else
|
||||
new_state = cmdq_get_state(cdata->item);
|
||||
new_item = cmdq_get_command(pr->cmdlist, new_state);
|
||||
if (cdata->item == NULL)
|
||||
cmdq_free_state(new_state);
|
||||
cmd_list_free(pr->cmdlist);
|
||||
break;
|
||||
}
|
||||
if (new_item != NULL) {
|
||||
if (cdata->item == NULL)
|
||||
cmdq_append(c, new_item);
|
||||
else
|
||||
cmdq_insert_after(cdata->item, new_item);
|
||||
cmdlist = args_make_commands(state, 0, NULL, &error);
|
||||
if (cmdlist == NULL) {
|
||||
if (cdata->item == NULL) {
|
||||
*error = toupper((u_char)*error);
|
||||
status_message_set(c, -1, 1, 0, "%s", error);
|
||||
} else
|
||||
cmdq_error(cdata->item, "%s", error);
|
||||
free(error);
|
||||
} else if (item == NULL) {
|
||||
new_item = cmdq_get_command(cmdlist, NULL);
|
||||
cmdq_append(c, new_item);
|
||||
} else {
|
||||
new_item = cmdq_get_command(cmdlist, cmdq_get_state(item));
|
||||
cmdq_insert_after(item, new_item);
|
||||
}
|
||||
|
||||
out:
|
||||
|
@ -203,12 +182,9 @@ cmd_if_shell_free(void *data)
|
|||
if (cdata->client != NULL)
|
||||
server_client_unref(cdata->client);
|
||||
|
||||
free(cdata->cmd_else);
|
||||
free(cdata->cmd_if);
|
||||
|
||||
if (cdata->input.c != NULL)
|
||||
server_client_unref(cdata->input.c);
|
||||
free((void *)cdata->input.file);
|
||||
if (cdata->cmd_else != NULL)
|
||||
args_make_commands_free(cdata->cmd_else);
|
||||
args_make_commands_free(cdata->cmd_if);
|
||||
|
||||
free(cdata);
|
||||
}
|
||||
|
|
|
@ -35,7 +35,7 @@ const struct cmd_entry cmd_join_pane_entry = {
|
|||
.name = "join-pane",
|
||||
.alias = "joinp",
|
||||
|
||||
.args = { "bdfhvp:l:s:t:", 0, 0 },
|
||||
.args = { "bdfhvp:l:s:t:", 0, 0, NULL },
|
||||
.usage = "[-bdfhv] [-l size] " CMD_SRCDST_PANE_USAGE,
|
||||
|
||||
.source = { 's', CMD_FIND_PANE, CMD_FIND_DEFAULT_MARKED },
|
||||
|
@ -49,7 +49,7 @@ const struct cmd_entry cmd_move_pane_entry = {
|
|||
.name = "move-pane",
|
||||
.alias = "movep",
|
||||
|
||||
.args = { "bdfhvp:l:s:t:", 0, 0 },
|
||||
.args = { "bdfhvp:l:s:t:", 0, 0, NULL },
|
||||
.usage = "[-bdfhv] [-l size] " CMD_SRCDST_PANE_USAGE,
|
||||
|
||||
.source = { 's', CMD_FIND_PANE, CMD_FIND_DEFAULT_MARKED },
|
||||
|
@ -71,10 +71,11 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct window *src_w, *dst_w;
|
||||
struct window_pane *src_wp, *dst_wp;
|
||||
char *cause = NULL;
|
||||
int size, percentage, dst_idx;
|
||||
int size, dst_idx;
|
||||
int flags;
|
||||
enum layout_type type;
|
||||
struct layout_cell *lc;
|
||||
u_int curval = 0;
|
||||
|
||||
dst_s = target->s;
|
||||
dst_wl = target->wl;
|
||||
|
@ -97,23 +98,30 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||
if (args_has(args, 'h'))
|
||||
type = LAYOUT_LEFTRIGHT;
|
||||
|
||||
/* If the 'p' flag is dropped then this bit can be moved into 'l'. */
|
||||
if (args_has(args, 'l') || args_has(args, 'p')) {
|
||||
if (args_has(args, 'f')) {
|
||||
if (type == LAYOUT_TOPBOTTOM)
|
||||
curval = dst_w->sy;
|
||||
else
|
||||
curval = dst_w->sx;
|
||||
} else {
|
||||
if (type == LAYOUT_TOPBOTTOM)
|
||||
curval = dst_wp->sy;
|
||||
else
|
||||
curval = dst_wp->sx;
|
||||
}
|
||||
}
|
||||
|
||||
size = -1;
|
||||
if (args_has(args, 'l')) {
|
||||
if (type == LAYOUT_TOPBOTTOM) {
|
||||
size = args_percentage(args, 'l', 0, INT_MAX,
|
||||
dst_wp->sy, &cause);
|
||||
} else {
|
||||
size = args_percentage(args, 'l', 0, INT_MAX,
|
||||
dst_wp->sx, &cause);
|
||||
}
|
||||
size = args_percentage_and_expand(args, 'l', 0, INT_MAX, curval,
|
||||
item, &cause);
|
||||
} else if (args_has(args, 'p')) {
|
||||
percentage = args_strtonum(args, 'p', 0, 100, &cause);
|
||||
if (cause == NULL) {
|
||||
if (type == LAYOUT_TOPBOTTOM)
|
||||
size = (dst_wp->sy * percentage) / 100;
|
||||
else
|
||||
size = (dst_wp->sx * percentage) / 100;
|
||||
}
|
||||
size = args_strtonum_and_expand(args, 'l', 0, 100, item,
|
||||
&cause);
|
||||
if (cause == NULL)
|
||||
size = curval * size / 100;
|
||||
}
|
||||
if (cause != NULL) {
|
||||
cmdq_error(item, "size %s", cause);
|
||||
|
@ -147,6 +155,7 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||
else
|
||||
TAILQ_INSERT_AFTER(&dst_w->panes, dst_wp, src_wp, entry);
|
||||
layout_assign_pane(lc, src_wp, 0);
|
||||
colour_palette_from_option(&src_wp->palette, src_wp->options);
|
||||
|
||||
recalculate_sizes();
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@ const struct cmd_entry cmd_kill_pane_entry = {
|
|||
.name = "kill-pane",
|
||||
.alias = "killp",
|
||||
|
||||
.args = { "at:", 0, 0 },
|
||||
.args = { "at:", 0, 0, NULL },
|
||||
.usage = "[-a] " CMD_TARGET_PANE_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, 0 },
|
||||
|
|
|
@ -33,7 +33,7 @@ const struct cmd_entry cmd_kill_server_entry = {
|
|||
.name = "kill-server",
|
||||
.alias = NULL,
|
||||
|
||||
.args = { "", 0, 0 },
|
||||
.args = { "", 0, 0, NULL },
|
||||
.usage = "",
|
||||
|
||||
.flags = 0,
|
||||
|
@ -44,7 +44,7 @@ const struct cmd_entry cmd_start_server_entry = {
|
|||
.name = "start-server",
|
||||
.alias = "start",
|
||||
|
||||
.args = { "", 0, 0 },
|
||||
.args = { "", 0, 0, NULL },
|
||||
.usage = "",
|
||||
|
||||
.flags = CMD_STARTSERVER,
|
||||
|
|
|
@ -33,7 +33,7 @@ const struct cmd_entry cmd_kill_session_entry = {
|
|||
.name = "kill-session",
|
||||
.alias = NULL,
|
||||
|
||||
.args = { "aCt:", 0, 0 },
|
||||
.args = { "aCt:", 0, 0, NULL },
|
||||
.usage = "[-aC] " CMD_TARGET_SESSION_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_SESSION, 0 },
|
||||
|
|
|
@ -30,7 +30,7 @@ const struct cmd_entry cmd_kill_window_entry = {
|
|||
.name = "kill-window",
|
||||
.alias = "killw",
|
||||
|
||||
.args = { "at:", 0, 0 },
|
||||
.args = { "at:", 0, 0, NULL },
|
||||
.usage = "[-a] " CMD_TARGET_WINDOW_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_WINDOW, 0 },
|
||||
|
@ -43,7 +43,7 @@ const struct cmd_entry cmd_unlink_window_entry = {
|
|||
.name = "unlink-window",
|
||||
.alias = "unlinkw",
|
||||
|
||||
.args = { "kt:", 0, 0 },
|
||||
.args = { "kt:", 0, 0, NULL },
|
||||
.usage = "[-k] " CMD_TARGET_WINDOW_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_WINDOW, 0 },
|
||||
|
|
|
@ -36,7 +36,7 @@ const struct cmd_entry cmd_list_buffers_entry = {
|
|||
.name = "list-buffers",
|
||||
.alias = "lsb",
|
||||
|
||||
.args = { "F:f:", 0, 0 },
|
||||
.args = { "F:f:", 0, 0, NULL },
|
||||
.usage = "[-F format] [-f filter]",
|
||||
|
||||
.flags = CMD_AFTERHOOK,
|
||||
|
|
|
@ -31,6 +31,8 @@
|
|||
#define LIST_CLIENTS_TEMPLATE \
|
||||
"#{client_name}: #{session_name} " \
|
||||
"[#{client_width}x#{client_height} #{client_termname}] " \
|
||||
"#{?#{!=:#{client_uid},#{uid}}," \
|
||||
"[user #{?client_user,#{client_user},#{client_uid},}] ,}" \
|
||||
"#{?client_flags,(,}#{client_flags}#{?client_flags,),}"
|
||||
|
||||
static enum cmd_retval cmd_list_clients_exec(struct cmd *, struct cmdq_item *);
|
||||
|
@ -39,8 +41,8 @@ const struct cmd_entry cmd_list_clients_entry = {
|
|||
.name = "list-clients",
|
||||
.alias = "lsc",
|
||||
|
||||
.args = { "F:t:", 0, 0 },
|
||||
.usage = "[-F format] " CMD_TARGET_SESSION_USAGE,
|
||||
.args = { "F:f:t:", 0, 0, NULL },
|
||||
.usage = "[-F format] [-f filter] " CMD_TARGET_SESSION_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_SESSION, 0 },
|
||||
|
||||
|
@ -56,9 +58,10 @@ cmd_list_clients_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct client *c;
|
||||
struct session *s;
|
||||
struct format_tree *ft;
|
||||
const char *template;
|
||||
const char *template, *filter;
|
||||
u_int idx;
|
||||
char *line;
|
||||
char *line, *expanded;
|
||||
int flag;
|
||||
|
||||
if (args_has(args, 't'))
|
||||
s = target->s;
|
||||
|
@ -67,6 +70,7 @@ cmd_list_clients_exec(struct cmd *self, struct cmdq_item *item)
|
|||
|
||||
if ((template = args_get(args, 'F')) == NULL)
|
||||
template = LIST_CLIENTS_TEMPLATE;
|
||||
filter = args_get(args, 'f');
|
||||
|
||||
idx = 0;
|
||||
TAILQ_FOREACH(c, &clients, entry) {
|
||||
|
@ -77,9 +81,17 @@ cmd_list_clients_exec(struct cmd *self, struct cmdq_item *item)
|
|||
format_add(ft, "line", "%u", idx);
|
||||
format_defaults(ft, c, NULL, NULL, NULL);
|
||||
|
||||
line = format_expand(ft, template);
|
||||
cmdq_print(item, "%s", line);
|
||||
free(line);
|
||||
if (filter != NULL) {
|
||||
expanded = format_expand(ft, filter);
|
||||
flag = format_true(expanded);
|
||||
free(expanded);
|
||||
} else
|
||||
flag = 1;
|
||||
if (flag) {
|
||||
line = format_expand(ft, template);
|
||||
cmdq_print(item, "%s", line);
|
||||
free(line);
|
||||
}
|
||||
|
||||
format_free(ft);
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ const struct cmd_entry cmd_list_keys_entry = {
|
|||
.name = "list-keys",
|
||||
.alias = "lsk",
|
||||
|
||||
.args = { "1aNP:T:", 0, 1 },
|
||||
.args = { "1aNP:T:", 0, 1, NULL },
|
||||
.usage = "[-1aN] [-P prefix-string] [-T key-table] [key]",
|
||||
|
||||
.flags = CMD_STARTSERVER|CMD_AFTERHOOK,
|
||||
|
@ -47,7 +47,7 @@ const struct cmd_entry cmd_list_commands_entry = {
|
|||
.name = "list-commands",
|
||||
.alias = "lscm",
|
||||
|
||||
.args = { "F:", 0, 1 },
|
||||
.args = { "F:", 0, 1, NULL },
|
||||
.usage = "[-F format] [command]",
|
||||
|
||||
.flags = CMD_STARTSERVER|CMD_AFTERHOOK,
|
||||
|
@ -148,9 +148,10 @@ static enum cmd_retval
|
|||
cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item)
|
||||
{
|
||||
struct args *args = cmd_get_args(self);
|
||||
struct client *tc = cmdq_get_target_client(item);
|
||||
struct key_table *table;
|
||||
struct key_binding *bd;
|
||||
const char *tablename, *r;
|
||||
const char *tablename, *r, *keystr;
|
||||
char *key, *cp, *tmp, *start, *empty;
|
||||
key_code prefix, only = KEYC_UNKNOWN;
|
||||
int repeat, width, tablewidth, keywidth, found = 0;
|
||||
|
@ -159,13 +160,13 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item)
|
|||
if (cmd_get_entry(self) == &cmd_list_commands_entry)
|
||||
return (cmd_list_keys_commands(self, item));
|
||||
|
||||
if (args->argc != 0) {
|
||||
only = key_string_lookup_string(args->argv[0]);
|
||||
if ((keystr = args_string(args, 0)) != NULL) {
|
||||
only = key_string_lookup_string(keystr);
|
||||
if (only == KEYC_UNKNOWN) {
|
||||
cmdq_error(item, "invalid key: %s", args->argv[0]);
|
||||
cmdq_error(item, "invalid key: %s", keystr);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
only &= KEYC_MASK_KEY;
|
||||
only &= (KEYC_MASK_KEY|KEYC_MASK_MODIFIERS);
|
||||
}
|
||||
|
||||
tablename = args_get(args, 'T');
|
||||
|
@ -211,7 +212,7 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item)
|
|||
|
||||
repeat = 0;
|
||||
tablewidth = keywidth = 0;
|
||||
table = key_bindings_first_table ();
|
||||
table = key_bindings_first_table();
|
||||
while (table != NULL) {
|
||||
if (tablename != NULL && strcmp(table->name, tablename) != 0) {
|
||||
table = key_bindings_next_table(table);
|
||||
|
@ -244,7 +245,7 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item)
|
|||
tmpsize = 256;
|
||||
tmp = xmalloc(tmpsize);
|
||||
|
||||
table = key_bindings_first_table ();
|
||||
table = key_bindings_first_table();
|
||||
while (table != NULL) {
|
||||
if (tablename != NULL && strcmp(table->name, tablename) != 0) {
|
||||
table = key_bindings_next_table(table);
|
||||
|
@ -296,9 +297,15 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item)
|
|||
strlcat(tmp, cp, tmpsize);
|
||||
free(cp);
|
||||
|
||||
cmdq_print(item, "bind-key %s", tmp);
|
||||
|
||||
if (args_has(args, '1') && tc != NULL) {
|
||||
status_message_set(tc, -1, 1, 0, "bind-key %s",
|
||||
tmp);
|
||||
} else
|
||||
cmdq_print(item, "bind-key %s", tmp);
|
||||
free(key);
|
||||
|
||||
if (args_has(args, '1'))
|
||||
break;
|
||||
bd = key_bindings_next(table, bd);
|
||||
}
|
||||
table = key_bindings_next_table(table);
|
||||
|
@ -308,7 +315,7 @@ cmd_list_keys_exec(struct cmd *self, struct cmdq_item *item)
|
|||
|
||||
out:
|
||||
if (only != KEYC_UNKNOWN && !found) {
|
||||
cmdq_error(item, "unknown key: %s", args->argv[0]);
|
||||
cmdq_error(item, "unknown key: %s", args_string(args, 0));
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
return (CMD_RETURN_NORMAL);
|
||||
|
@ -321,12 +328,9 @@ cmd_list_keys_commands(struct cmd *self, struct cmdq_item *item)
|
|||
const struct cmd_entry **entryp;
|
||||
const struct cmd_entry *entry;
|
||||
struct format_tree *ft;
|
||||
const char *template, *s, *command = NULL;
|
||||
const char *template, *s, *command;
|
||||
char *line;
|
||||
|
||||
if (args->argc != 0)
|
||||
command = args->argv[0];
|
||||
|
||||
if ((template = args_get(args, 'F')) == NULL) {
|
||||
template = "#{command_list_name}"
|
||||
"#{?command_list_alias, (#{command_list_alias}),} "
|
||||
|
@ -336,6 +340,7 @@ cmd_list_keys_commands(struct cmd *self, struct cmdq_item *item)
|
|||
ft = format_create(cmdq_get_client(item), item, FORMAT_NONE, 0);
|
||||
format_defaults(ft, NULL, NULL, NULL, NULL);
|
||||
|
||||
command = args_string(args, 0);
|
||||
for (entryp = cmd_table; *entryp != NULL; entryp++) {
|
||||
entry = *entryp;
|
||||
if (command != NULL &&
|
||||
|
|
|
@ -38,7 +38,7 @@ const struct cmd_entry cmd_list_panes_entry = {
|
|||
.name = "list-panes",
|
||||
.alias = "lsp",
|
||||
|
||||
.args = { "asF:f:t:", 0, 0 },
|
||||
.args = { "asF:f:t:", 0, 0, NULL },
|
||||
.usage = "[-as] [-F format] [-f filter] " CMD_TARGET_WINDOW_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_WINDOW, 0 },
|
||||
|
|
|
@ -42,7 +42,7 @@ const struct cmd_entry cmd_list_sessions_entry = {
|
|||
.name = "list-sessions",
|
||||
.alias = "ls",
|
||||
|
||||
.args = { "F:f:", 0, 0 },
|
||||
.args = { "F:f:", 0, 0, NULL },
|
||||
.usage = "[-F format] [-f filter]",
|
||||
|
||||
.flags = CMD_AFTERHOOK,
|
||||
|
|
|
@ -49,7 +49,7 @@ const struct cmd_entry cmd_list_windows_entry = {
|
|||
.name = "list-windows",
|
||||
.alias = "lsw",
|
||||
|
||||
.args = { "F:f:at:", 0, 0 },
|
||||
.args = { "F:f:at:", 0, 0, NULL },
|
||||
.usage = "[-a] [-F format] [-f filter] " CMD_TARGET_SESSION_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_SESSION, 0 },
|
||||
|
|
|
@ -37,7 +37,7 @@ const struct cmd_entry cmd_load_buffer_entry = {
|
|||
.name = "load-buffer",
|
||||
.alias = "loadb",
|
||||
|
||||
.args = { "b:t:w", 1, 1 },
|
||||
.args = { "b:t:w", 1, 1, NULL },
|
||||
.usage = CMD_BUFFER_USAGE " " CMD_TARGET_CLIENT_USAGE " path",
|
||||
|
||||
.flags = CMD_AFTERHOOK|CMD_CLIENT_TFLAG|CMD_CLIENT_CANFAIL,
|
||||
|
@ -77,7 +77,7 @@ cmd_load_buffer_done(__unused struct client *c, const char *path, int error,
|
|||
} else if (tc != NULL &&
|
||||
tc->session != NULL &&
|
||||
(~tc->flags & CLIENT_DEAD))
|
||||
tty_set_selection(&tc->tty, copy, bsize);
|
||||
tty_set_selection(&tc->tty, "", copy, bsize);
|
||||
if (tc != NULL)
|
||||
server_client_unref(tc);
|
||||
}
|
||||
|
@ -105,7 +105,7 @@ cmd_load_buffer_exec(struct cmd *self, struct cmdq_item *item)
|
|||
cdata->client->references++;
|
||||
}
|
||||
|
||||
path = format_single_from_target(item, args->argv[0]);
|
||||
path = format_single_from_target(item, args_string(args, 0));
|
||||
file_read(cmdq_get_client(item), path, cmd_load_buffer_done, cdata);
|
||||
free(path);
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@ const struct cmd_entry cmd_lock_server_entry = {
|
|||
.name = "lock-server",
|
||||
.alias = "lock",
|
||||
|
||||
.args = { "", 0, 0 },
|
||||
.args = { "", 0, 0, NULL },
|
||||
.usage = "",
|
||||
|
||||
.flags = CMD_AFTERHOOK,
|
||||
|
@ -41,7 +41,7 @@ const struct cmd_entry cmd_lock_session_entry = {
|
|||
.name = "lock-session",
|
||||
.alias = "locks",
|
||||
|
||||
.args = { "t:", 0, 0 },
|
||||
.args = { "t:", 0, 0, NULL },
|
||||
.usage = CMD_TARGET_SESSION_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_SESSION, 0 },
|
||||
|
@ -54,7 +54,7 @@ const struct cmd_entry cmd_lock_client_entry = {
|
|||
.name = "lock-client",
|
||||
.alias = "lockc",
|
||||
|
||||
.args = { "t:", 0, 0 },
|
||||
.args = { "t:", 0, 0, NULL },
|
||||
.usage = CMD_TARGET_CLIENT_USAGE,
|
||||
|
||||
.flags = CMD_AFTERHOOK|CMD_CLIENT_TFLAG,
|
||||
|
|
|
@ -32,7 +32,7 @@ const struct cmd_entry cmd_move_window_entry = {
|
|||
.name = "move-window",
|
||||
.alias = "movew",
|
||||
|
||||
.args = { "abdkrs:t:", 0, 0 },
|
||||
.args = { "abdkrs:t:", 0, 0, NULL },
|
||||
.usage = "[-abdkr] " CMD_SRCDST_WINDOW_USAGE,
|
||||
|
||||
.source = { 's', CMD_FIND_WINDOW, 0 },
|
||||
|
@ -46,7 +46,7 @@ const struct cmd_entry cmd_link_window_entry = {
|
|||
.name = "link-window",
|
||||
.alias = "linkw",
|
||||
|
||||
.args = { "abdks:t:", 0, 0 },
|
||||
.args = { "abdks:t:", 0, 0, NULL },
|
||||
.usage = "[-abdk] " CMD_SRCDST_WINDOW_USAGE,
|
||||
|
||||
.source = { 's', CMD_FIND_WINDOW, 0 },
|
||||
|
|
|
@ -39,10 +39,11 @@ const struct cmd_entry cmd_new_session_entry = {
|
|||
.name = "new-session",
|
||||
.alias = "new",
|
||||
|
||||
.args = { "Ac:dDe:EF:f:n:Ps:t:x:Xy:", 0, -1 },
|
||||
.args = { "Ac:dDe:EF:f:n:Ps:t:x:Xy:", 0, -1, NULL },
|
||||
.usage = "[-AdDEPX] [-c start-directory] [-e environment] [-F format] "
|
||||
"[-f flags] [-n window-name] [-s session-name] "
|
||||
CMD_TARGET_SESSION_USAGE " [-x width] [-y height] [command]",
|
||||
CMD_TARGET_SESSION_USAGE " [-x width] [-y height] "
|
||||
"[shell-command]",
|
||||
|
||||
.target = { 't', CMD_FIND_SESSION, CMD_FIND_CANFAIL },
|
||||
|
||||
|
@ -54,7 +55,7 @@ const struct cmd_entry cmd_has_session_entry = {
|
|||
.name = "has-session",
|
||||
.alias = "has",
|
||||
|
||||
.args = { "t:", 0, 0 },
|
||||
.args = { "t:", 0, 0, NULL },
|
||||
.usage = CMD_TARGET_SESSION_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_SESSION, 0 },
|
||||
|
@ -75,15 +76,15 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct options *oo;
|
||||
struct termios tio, *tiop;
|
||||
struct session_group *sg = NULL;
|
||||
const char *errstr, *template, *group, *tmp, *add;
|
||||
const char *errstr, *template, *group, *tmp;
|
||||
char *cause, *cwd = NULL, *cp, *newname = NULL;
|
||||
char *name, *prefix = NULL;
|
||||
int detached, already_attached, is_control = 0;
|
||||
u_int sx, sy, dsx, dsy;
|
||||
struct spawn_context sc;
|
||||
u_int sx, sy, dsx, dsy, count = args_count(args);
|
||||
struct spawn_context sc = { 0 };
|
||||
enum cmd_retval retval;
|
||||
struct cmd_find_state fs;
|
||||
struct args_value *value;
|
||||
struct args_value *av;
|
||||
|
||||
if (cmd_get_entry(self) == &cmd_has_session_entry) {
|
||||
/*
|
||||
|
@ -93,7 +94,7 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
|
|||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
if (args_has(args, 't') && (args->argc != 0 || args_has(args, 'n'))) {
|
||||
if (args_has(args, 't') && (count != 0 || args_has(args, 'n'))) {
|
||||
cmdq_error(item, "command or window name given with target");
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
|
@ -102,6 +103,11 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
|
|||
if (tmp != NULL) {
|
||||
name = format_single(item, tmp, c, NULL, NULL, NULL);
|
||||
newname = session_check_name(name);
|
||||
if (newname == NULL) {
|
||||
cmdq_error(item, "invalid session: %s", name);
|
||||
free(name);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
free(name);
|
||||
}
|
||||
if (args_has(args, 'A')) {
|
||||
|
@ -134,8 +140,14 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
|
|||
prefix = xstrdup(sg->name);
|
||||
else if (groupwith != NULL)
|
||||
prefix = xstrdup(groupwith->name);
|
||||
else
|
||||
else {
|
||||
prefix = session_check_name(group);
|
||||
if (prefix == NULL) {
|
||||
cmdq_error(item, "invalid session group: %s",
|
||||
group);
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Set -d if no client. */
|
||||
|
@ -258,21 +270,21 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
|
|||
env = environ_create();
|
||||
if (c != NULL && !args_has(args, 'E'))
|
||||
environ_update(global_s_options, c->environ, env);
|
||||
add = args_first_value(args, 'e', &value);
|
||||
while (add != NULL) {
|
||||
environ_put(env, add, 0);
|
||||
add = args_next_value(&value);
|
||||
av = args_first_value(args, 'e');
|
||||
while (av != NULL) {
|
||||
environ_put(env, av->string, 0);
|
||||
av = args_next_value(av);
|
||||
}
|
||||
s = session_create(prefix, newname, cwd, env, oo, tiop);
|
||||
|
||||
/* Spawn the initial window. */
|
||||
memset(&sc, 0, sizeof sc);
|
||||
sc.item = item;
|
||||
sc.s = s;
|
||||
if (!detached)
|
||||
sc.tc = c;
|
||||
|
||||
sc.name = args_get(args, 'n');
|
||||
sc.argc = args->argc;
|
||||
sc.argv = args->argv;
|
||||
args_to_vector(args, &sc.argc, &sc.argv);
|
||||
|
||||
sc.idx = -1;
|
||||
sc.cwd = args_get(args, 'c');
|
||||
|
@ -316,25 +328,10 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
|
|||
proc_send(c->peer, MSG_READY, -1, NULL, 0);
|
||||
} else if (c->session != NULL)
|
||||
c->last_session = c->session;
|
||||
c->session = s;
|
||||
server_client_set_session(c, s);
|
||||
if (~cmdq_get_flags(item) & CMDQ_STATE_REPEAT)
|
||||
server_client_set_key_table(c, NULL);
|
||||
tty_update_client_offset(c);
|
||||
status_timer_start(c);
|
||||
notify_client("client-session-changed", c);
|
||||
session_update_activity(s, NULL);
|
||||
gettimeofday(&s->last_attached_time, NULL);
|
||||
server_redraw_client(c);
|
||||
}
|
||||
recalculate_sizes();
|
||||
server_update_socket();
|
||||
|
||||
/*
|
||||
* If there are still configuration file errors to display, put the new
|
||||
* session's current window into more mode and display them now.
|
||||
*/
|
||||
if (cfg_finished)
|
||||
cfg_show_causes(s);
|
||||
|
||||
/* Print if requested. */
|
||||
if (args_has(args, 'P')) {
|
||||
|
@ -353,12 +350,19 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
|
|||
cmd_find_from_session(&fs, s, 0);
|
||||
cmdq_insert_hook(s, item, &fs, "after-new-session");
|
||||
|
||||
if (cfg_finished)
|
||||
cfg_show_causes(s);
|
||||
|
||||
if (sc.argv != NULL)
|
||||
cmd_free_argv(sc.argc, sc.argv);
|
||||
free(cwd);
|
||||
free(newname);
|
||||
free(prefix);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
|
||||
fail:
|
||||
if (sc.argv != NULL)
|
||||
cmd_free_argv(sc.argc, sc.argv);
|
||||
free(cwd);
|
||||
free(newname);
|
||||
free(prefix);
|
||||
|
|
|
@ -38,9 +38,9 @@ const struct cmd_entry cmd_new_window_entry = {
|
|||
.name = "new-window",
|
||||
.alias = "neww",
|
||||
|
||||
.args = { "abc:de:F:kn:PSt:", 0, -1 },
|
||||
.args = { "abc:de:F:kn:PSt:", 0, -1, NULL },
|
||||
.usage = "[-abdkPS] [-c start-directory] [-e environment] [-F format] "
|
||||
"[-n window-name] " CMD_TARGET_WINDOW_USAGE " [command]",
|
||||
"[-n window-name] " CMD_TARGET_WINDOW_USAGE " [shell-command]",
|
||||
|
||||
.target = { 't', CMD_FIND_WINDOW, CMD_FIND_WINDOW_INDEX },
|
||||
|
||||
|
@ -55,16 +55,15 @@ cmd_new_window_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct client *c = cmdq_get_client(item);
|
||||
struct cmd_find_state *current = cmdq_get_current(item);
|
||||
struct cmd_find_state *target = cmdq_get_target(item);
|
||||
struct spawn_context sc;
|
||||
struct spawn_context sc = { 0 };
|
||||
struct client *tc = cmdq_get_target_client(item);
|
||||
struct session *s = target->s;
|
||||
struct winlink *wl = target->wl;
|
||||
struct winlink *wl = target->wl, *new_wl = NULL;
|
||||
int idx = target->idx, before;
|
||||
struct winlink *new_wl = NULL;
|
||||
char *cause = NULL, *cp;
|
||||
const char *template, *add, *name;
|
||||
char *cause = NULL, *cp, *expanded;
|
||||
const char *template, *name;
|
||||
struct cmd_find_state fs;
|
||||
struct args_value *value;
|
||||
struct args_value *av;
|
||||
|
||||
/*
|
||||
* If -S and -n are given and -t is not and a single window with this
|
||||
|
@ -72,16 +71,19 @@ cmd_new_window_exec(struct cmd *self, struct cmdq_item *item)
|
|||
*/
|
||||
name = args_get(args, 'n');
|
||||
if (args_has(args, 'S') && name != NULL && target->idx == -1) {
|
||||
expanded = format_single(item, name, c, s, NULL, NULL);
|
||||
RB_FOREACH(wl, winlinks, &s->windows) {
|
||||
if (strcmp(wl->window->name, name) != 0)
|
||||
if (strcmp(wl->window->name, expanded) != 0)
|
||||
continue;
|
||||
if (new_wl == NULL) {
|
||||
new_wl = wl;
|
||||
continue;
|
||||
}
|
||||
cmdq_error(item, "multiple windows named %s", name);
|
||||
free(expanded);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
free(expanded);
|
||||
if (new_wl != NULL) {
|
||||
if (args_has(args, 'd'))
|
||||
return (CMD_RETURN_NORMAL);
|
||||
|
@ -94,7 +96,6 @@ cmd_new_window_exec(struct cmd *self, struct cmdq_item *item)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
before = args_has(args, 'b');
|
||||
if (args_has(args, 'a') || before) {
|
||||
idx = winlink_shuffle_up(s, wl, before);
|
||||
|
@ -102,20 +103,18 @@ cmd_new_window_exec(struct cmd *self, struct cmdq_item *item)
|
|||
idx = target->idx;
|
||||
}
|
||||
|
||||
memset(&sc, 0, sizeof sc);
|
||||
sc.item = item;
|
||||
sc.s = s;
|
||||
sc.tc = tc;
|
||||
|
||||
sc.name = args_get(args, 'n');
|
||||
sc.argc = args->argc;
|
||||
sc.argv = args->argv;
|
||||
args_to_vector(args, &sc.argc, &sc.argv);
|
||||
sc.environ = environ_create();
|
||||
|
||||
add = args_first_value(args, 'e', &value);
|
||||
while (add != NULL) {
|
||||
environ_put(sc.environ, add, 0);
|
||||
add = args_next_value(&value);
|
||||
av = args_first_value(args, 'e');
|
||||
while (av != NULL) {
|
||||
environ_put(sc.environ, av->string, 0);
|
||||
av = args_next_value(av);
|
||||
}
|
||||
|
||||
sc.idx = idx;
|
||||
|
@ -130,6 +129,9 @@ cmd_new_window_exec(struct cmd *self, struct cmdq_item *item)
|
|||
if ((new_wl = spawn_window(&sc, &cause)) == NULL) {
|
||||
cmdq_error(item, "create window failed: %s", cause);
|
||||
free(cause);
|
||||
if (sc.argv != NULL)
|
||||
cmd_free_argv(sc.argc, sc.argv);
|
||||
environ_free(sc.environ);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
if (!args_has(args, 'd') || new_wl == s->curw) {
|
||||
|
@ -150,6 +152,8 @@ cmd_new_window_exec(struct cmd *self, struct cmdq_item *item)
|
|||
cmd_find_from_winlink(&fs, new_wl, 0);
|
||||
cmdq_insert_hook(s, item, &fs, "after-new-window");
|
||||
|
||||
if (sc.argv != NULL)
|
||||
cmd_free_argv(sc.argc, sc.argv);
|
||||
environ_free(sc.environ);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
|
577
cmd-parse.y
577
cmd-parse.y
|
@ -42,13 +42,27 @@ struct cmd_parse_scope {
|
|||
TAILQ_ENTRY (cmd_parse_scope) entry;
|
||||
};
|
||||
|
||||
enum cmd_parse_argument_type {
|
||||
CMD_PARSE_STRING,
|
||||
CMD_PARSE_COMMANDS,
|
||||
CMD_PARSE_PARSED_COMMANDS
|
||||
};
|
||||
|
||||
struct cmd_parse_argument {
|
||||
enum cmd_parse_argument_type type;
|
||||
char *string;
|
||||
struct cmd_parse_commands *commands;
|
||||
struct cmd_list *cmdlist;
|
||||
|
||||
TAILQ_ENTRY(cmd_parse_argument) entry;
|
||||
};
|
||||
TAILQ_HEAD(cmd_parse_arguments, cmd_parse_argument);
|
||||
|
||||
struct cmd_parse_command {
|
||||
u_int line;
|
||||
u_int line;
|
||||
struct cmd_parse_arguments arguments;
|
||||
|
||||
int argc;
|
||||
char **argv;
|
||||
|
||||
TAILQ_ENTRY(cmd_parse_command) entry;
|
||||
TAILQ_ENTRY(cmd_parse_command) entry;
|
||||
};
|
||||
TAILQ_HEAD(cmd_parse_commands, cmd_parse_command);
|
||||
|
||||
|
@ -77,8 +91,9 @@ static char *cmd_parse_get_error(const char *, u_int, const char *);
|
|||
static void cmd_parse_free_command(struct cmd_parse_command *);
|
||||
static struct cmd_parse_commands *cmd_parse_new_commands(void);
|
||||
static void cmd_parse_free_commands(struct cmd_parse_commands *);
|
||||
static char *cmd_parse_commands_to_string(struct cmd_parse_commands *);
|
||||
static void cmd_parse_print_commands(struct cmd_parse_input *, u_int,
|
||||
static void cmd_parse_build_commands(struct cmd_parse_commands *,
|
||||
struct cmd_parse_input *, struct cmd_parse_result *);
|
||||
static void cmd_parse_print_commands(struct cmd_parse_input *,
|
||||
struct cmd_list *);
|
||||
|
||||
%}
|
||||
|
@ -86,10 +101,8 @@ static void cmd_parse_print_commands(struct cmd_parse_input *, u_int,
|
|||
%union
|
||||
{
|
||||
char *token;
|
||||
struct {
|
||||
int argc;
|
||||
char **argv;
|
||||
} arguments;
|
||||
struct cmd_parse_arguments *arguments;
|
||||
struct cmd_parse_argument *argument;
|
||||
int flag;
|
||||
struct {
|
||||
int flag;
|
||||
|
@ -107,8 +120,9 @@ static void cmd_parse_print_commands(struct cmd_parse_input *, u_int,
|
|||
%token ENDIF
|
||||
%token <token> FORMAT TOKEN EQUALS
|
||||
|
||||
%type <token> argument expanded format
|
||||
%type <token> expanded format
|
||||
%type <arguments> arguments
|
||||
%type <argument> argument
|
||||
%type <flag> if_open if_elif
|
||||
%type <elif> elif elif1
|
||||
%type <commands> argument_statements statements statement
|
||||
|
@ -360,7 +374,7 @@ commands : command
|
|||
struct cmd_parse_state *ps = &parse_state;
|
||||
|
||||
$$ = cmd_parse_new_commands();
|
||||
if ($1->argc != 0 &&
|
||||
if (!TAILQ_EMPTY(&$1->arguments) &&
|
||||
(ps->scope == NULL || ps->scope->flag))
|
||||
TAILQ_INSERT_TAIL($$, $1, entry);
|
||||
else
|
||||
|
@ -380,7 +394,7 @@ commands : command
|
|||
{
|
||||
struct cmd_parse_state *ps = &parse_state;
|
||||
|
||||
if ($3->argc != 0 &&
|
||||
if (!TAILQ_EMPTY(&$3->arguments) &&
|
||||
(ps->scope == NULL || ps->scope->flag)) {
|
||||
$$ = $1;
|
||||
TAILQ_INSERT_TAIL($$, $3, entry);
|
||||
|
@ -401,27 +415,38 @@ command : assignment
|
|||
|
||||
$$ = xcalloc(1, sizeof *$$);
|
||||
$$->line = ps->input->line;
|
||||
TAILQ_INIT(&$$->arguments);
|
||||
}
|
||||
| optional_assignment TOKEN
|
||||
{
|
||||
struct cmd_parse_state *ps = &parse_state;
|
||||
struct cmd_parse_state *ps = &parse_state;
|
||||
struct cmd_parse_argument *arg;
|
||||
|
||||
$$ = xcalloc(1, sizeof *$$);
|
||||
$$->line = ps->input->line;
|
||||
TAILQ_INIT(&$$->arguments);
|
||||
|
||||
cmd_prepend_argv(&$$->argc, &$$->argv, $2);
|
||||
|
||||
arg = xcalloc(1, sizeof *arg);
|
||||
arg->type = CMD_PARSE_STRING;
|
||||
arg->string = $2;
|
||||
TAILQ_INSERT_HEAD(&$$->arguments, arg, entry);
|
||||
}
|
||||
| optional_assignment TOKEN arguments
|
||||
{
|
||||
struct cmd_parse_state *ps = &parse_state;
|
||||
struct cmd_parse_state *ps = &parse_state;
|
||||
struct cmd_parse_argument *arg;
|
||||
|
||||
$$ = xcalloc(1, sizeof *$$);
|
||||
$$->line = ps->input->line;
|
||||
TAILQ_INIT(&$$->arguments);
|
||||
|
||||
$$->argc = $3.argc;
|
||||
$$->argv = $3.argv;
|
||||
cmd_prepend_argv(&$$->argc, &$$->argv, $2);
|
||||
TAILQ_CONCAT(&$$->arguments, $3, entry);
|
||||
free($3);
|
||||
|
||||
arg = xcalloc(1, sizeof *arg);
|
||||
arg->type = CMD_PARSE_STRING;
|
||||
arg->string = $2;
|
||||
TAILQ_INSERT_HEAD(&$$->arguments, arg, entry);
|
||||
}
|
||||
|
||||
condition1 : if_open commands if_close
|
||||
|
@ -505,30 +530,34 @@ elif1 : if_elif commands
|
|||
|
||||
arguments : argument
|
||||
{
|
||||
$$.argc = 1;
|
||||
$$.argv = xreallocarray(NULL, 1, sizeof *$$.argv);
|
||||
$$ = xcalloc(1, sizeof *$$);
|
||||
TAILQ_INIT($$);
|
||||
|
||||
$$.argv[0] = $1;
|
||||
TAILQ_INSERT_HEAD($$, $1, entry);
|
||||
}
|
||||
| argument arguments
|
||||
{
|
||||
cmd_prepend_argv(&$2.argc, &$2.argv, $1);
|
||||
free($1);
|
||||
TAILQ_INSERT_HEAD($2, $1, entry);
|
||||
$$ = $2;
|
||||
}
|
||||
|
||||
argument : TOKEN
|
||||
{
|
||||
$$ = $1;
|
||||
$$ = xcalloc(1, sizeof *$$);
|
||||
$$->type = CMD_PARSE_STRING;
|
||||
$$->string = $1;
|
||||
}
|
||||
| EQUALS
|
||||
{
|
||||
$$ = $1;
|
||||
$$ = xcalloc(1, sizeof *$$);
|
||||
$$->type = CMD_PARSE_STRING;
|
||||
$$->string = $1;
|
||||
}
|
||||
| '{' argument_statements
|
||||
{
|
||||
$$ = cmd_parse_commands_to_string($2);
|
||||
cmd_parse_free_commands($2);
|
||||
$$ = xcalloc(1, sizeof *$$);
|
||||
$$->type = CMD_PARSE_COMMANDS;
|
||||
$$->commands = $2;
|
||||
}
|
||||
|
||||
argument_statements : statement '}'
|
||||
|
@ -552,30 +581,57 @@ cmd_parse_get_error(const char *file, u_int line, const char *error)
|
|||
if (file == NULL)
|
||||
s = xstrdup(error);
|
||||
else
|
||||
xasprintf (&s, "%s:%u: %s", file, line, error);
|
||||
xasprintf(&s, "%s:%u: %s", file, line, error);
|
||||
return (s);
|
||||
}
|
||||
|
||||
static void
|
||||
cmd_parse_print_commands(struct cmd_parse_input *pi, u_int line,
|
||||
struct cmd_list *cmdlist)
|
||||
cmd_parse_print_commands(struct cmd_parse_input *pi, struct cmd_list *cmdlist)
|
||||
{
|
||||
char *s;
|
||||
|
||||
if (pi->item != NULL && (pi->flags & CMD_PARSE_VERBOSE)) {
|
||||
s = cmd_list_print(cmdlist, 0);
|
||||
if (pi->file != NULL)
|
||||
cmdq_print(pi->item, "%s:%u: %s", pi->file, line, s);
|
||||
else
|
||||
cmdq_print(pi->item, "%u: %s", line, s);
|
||||
free(s);
|
||||
if (pi->item == NULL || (~pi->flags & CMD_PARSE_VERBOSE))
|
||||
return;
|
||||
s = cmd_list_print(cmdlist, 0);
|
||||
if (pi->file != NULL)
|
||||
cmdq_print(pi->item, "%s:%u: %s", pi->file, pi->line, s);
|
||||
else
|
||||
cmdq_print(pi->item, "%u: %s", pi->line, s);
|
||||
free(s);
|
||||
}
|
||||
|
||||
static void
|
||||
cmd_parse_free_argument(struct cmd_parse_argument *arg)
|
||||
{
|
||||
switch (arg->type) {
|
||||
case CMD_PARSE_STRING:
|
||||
free(arg->string);
|
||||
break;
|
||||
case CMD_PARSE_COMMANDS:
|
||||
cmd_parse_free_commands(arg->commands);
|
||||
break;
|
||||
case CMD_PARSE_PARSED_COMMANDS:
|
||||
cmd_list_free(arg->cmdlist);
|
||||
break;
|
||||
}
|
||||
free(arg);
|
||||
}
|
||||
|
||||
static void
|
||||
cmd_parse_free_arguments(struct cmd_parse_arguments *args)
|
||||
{
|
||||
struct cmd_parse_argument *arg, *arg1;
|
||||
|
||||
TAILQ_FOREACH_SAFE(arg, args, entry, arg1) {
|
||||
TAILQ_REMOVE(args, arg, entry);
|
||||
cmd_parse_free_argument(arg);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
cmd_parse_free_command(struct cmd_parse_command *cmd)
|
||||
{
|
||||
cmd_free_argv(cmd->argc, cmd->argv);
|
||||
cmd_parse_free_arguments(&cmd->arguments);
|
||||
free(cmd);
|
||||
}
|
||||
|
||||
|
@ -585,7 +641,7 @@ cmd_parse_new_commands(void)
|
|||
struct cmd_parse_commands *cmds;
|
||||
|
||||
cmds = xmalloc(sizeof *cmds);
|
||||
TAILQ_INIT (cmds);
|
||||
TAILQ_INIT(cmds);
|
||||
return (cmds);
|
||||
}
|
||||
|
||||
|
@ -601,30 +657,6 @@ cmd_parse_free_commands(struct cmd_parse_commands *cmds)
|
|||
free(cmds);
|
||||
}
|
||||
|
||||
static char *
|
||||
cmd_parse_commands_to_string(struct cmd_parse_commands *cmds)
|
||||
{
|
||||
struct cmd_parse_command *cmd;
|
||||
char *string = NULL, *s, *line;
|
||||
|
||||
TAILQ_FOREACH(cmd, cmds, entry) {
|
||||
line = cmd_stringify_argv(cmd->argc, cmd->argv);
|
||||
if (string == NULL)
|
||||
s = line;
|
||||
else {
|
||||
xasprintf(&s, "%s ; %s", s, line);
|
||||
free(line);
|
||||
}
|
||||
|
||||
free(string);
|
||||
string = s;
|
||||
}
|
||||
if (string == NULL)
|
||||
string = xstrdup("");
|
||||
log_debug("%s: %s", __func__, string);
|
||||
return (string);
|
||||
}
|
||||
|
||||
static struct cmd_parse_commands *
|
||||
cmd_parse_run_parser(char **cause)
|
||||
{
|
||||
|
@ -674,72 +706,170 @@ cmd_parse_do_buffer(const char *buf, size_t len, struct cmd_parse_input *pi,
|
|||
return (cmd_parse_run_parser(cause));
|
||||
}
|
||||
|
||||
static struct cmd_parse_result *
|
||||
cmd_parse_build_commands(struct cmd_parse_commands *cmds,
|
||||
struct cmd_parse_input *pi)
|
||||
static void
|
||||
cmd_parse_log_commands(struct cmd_parse_commands *cmds, const char *prefix)
|
||||
{
|
||||
static struct cmd_parse_result pr;
|
||||
struct cmd_parse_commands *cmds2;
|
||||
struct cmd_parse_command *cmd, *cmd2, *next, *next2, *after;
|
||||
u_int line = UINT_MAX;
|
||||
int i;
|
||||
struct cmd_list *cmdlist = NULL, *result;
|
||||
struct cmd_parse_command *cmd;
|
||||
struct cmd_parse_argument *arg;
|
||||
u_int i, j;
|
||||
char *s;
|
||||
|
||||
i = 0;
|
||||
TAILQ_FOREACH(cmd, cmds, entry) {
|
||||
j = 0;
|
||||
TAILQ_FOREACH(arg, &cmd->arguments, entry) {
|
||||
switch (arg->type) {
|
||||
case CMD_PARSE_STRING:
|
||||
log_debug("%s %u:%u: %s", prefix, i, j,
|
||||
arg->string);
|
||||
break;
|
||||
case CMD_PARSE_COMMANDS:
|
||||
xasprintf(&s, "%s %u:%u", prefix, i, j);
|
||||
cmd_parse_log_commands(arg->commands, s);
|
||||
free(s);
|
||||
break;
|
||||
case CMD_PARSE_PARSED_COMMANDS:
|
||||
s = cmd_list_print(arg->cmdlist, 0);
|
||||
log_debug("%s %u:%u: %s", prefix, i, j, s);
|
||||
free(s);
|
||||
break;
|
||||
}
|
||||
j++;
|
||||
}
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
||||
static int
|
||||
cmd_parse_expand_alias(struct cmd_parse_command *cmd,
|
||||
struct cmd_parse_input *pi, struct cmd_parse_result *pr)
|
||||
{
|
||||
struct cmd_parse_argument *arg, *arg1, *first;
|
||||
struct cmd_parse_commands *cmds;
|
||||
struct cmd_parse_command *last;
|
||||
char *alias, *name, *cause;
|
||||
|
||||
if (pi->flags & CMD_PARSE_NOALIAS)
|
||||
return (0);
|
||||
memset(pr, 0, sizeof *pr);
|
||||
|
||||
first = TAILQ_FIRST(&cmd->arguments);
|
||||
if (first == NULL || first->type != CMD_PARSE_STRING) {
|
||||
pr->status = CMD_PARSE_SUCCESS;
|
||||
pr->cmdlist = cmd_list_new();
|
||||
return (1);
|
||||
}
|
||||
name = first->string;
|
||||
|
||||
alias = cmd_get_alias(name);
|
||||
if (alias == NULL)
|
||||
return (0);
|
||||
log_debug("%s: %u alias %s = %s", __func__, pi->line, name, alias);
|
||||
|
||||
cmds = cmd_parse_do_buffer(alias, strlen(alias), pi, &cause);
|
||||
free(alias);
|
||||
if (cmds == NULL) {
|
||||
pr->status = CMD_PARSE_ERROR;
|
||||
pr->error = cause;
|
||||
return (1);
|
||||
}
|
||||
|
||||
last = TAILQ_LAST(cmds, cmd_parse_commands);
|
||||
if (last == NULL) {
|
||||
pr->status = CMD_PARSE_SUCCESS;
|
||||
pr->cmdlist = cmd_list_new();
|
||||
return (1);
|
||||
}
|
||||
|
||||
TAILQ_REMOVE(&cmd->arguments, first, entry);
|
||||
cmd_parse_free_argument(first);
|
||||
|
||||
TAILQ_FOREACH_SAFE(arg, &cmd->arguments, entry, arg1) {
|
||||
TAILQ_REMOVE(&cmd->arguments, arg, entry);
|
||||
TAILQ_INSERT_TAIL(&last->arguments, arg, entry);
|
||||
}
|
||||
cmd_parse_log_commands(cmds, __func__);
|
||||
|
||||
pi->flags |= CMD_PARSE_NOALIAS;
|
||||
cmd_parse_build_commands(cmds, pi, pr);
|
||||
pi->flags &= ~CMD_PARSE_NOALIAS;
|
||||
return (1);
|
||||
}
|
||||
|
||||
static void
|
||||
cmd_parse_build_command(struct cmd_parse_command *cmd,
|
||||
struct cmd_parse_input *pi, struct cmd_parse_result *pr)
|
||||
{
|
||||
struct cmd_parse_argument *arg;
|
||||
struct cmd *add;
|
||||
char *name, *alias, *cause, *s;
|
||||
char *cause;
|
||||
struct args_value *values = NULL;
|
||||
u_int count = 0, idx;
|
||||
|
||||
memset(pr, 0, sizeof *pr);
|
||||
|
||||
if (cmd_parse_expand_alias(cmd, pi, pr))
|
||||
return;
|
||||
|
||||
TAILQ_FOREACH(arg, &cmd->arguments, entry) {
|
||||
values = xrecallocarray(values, count, count + 1,
|
||||
sizeof *values);
|
||||
switch (arg->type) {
|
||||
case CMD_PARSE_STRING:
|
||||
values[count].type = ARGS_STRING;
|
||||
values[count].string = xstrdup(arg->string);
|
||||
break;
|
||||
case CMD_PARSE_COMMANDS:
|
||||
cmd_parse_build_commands(arg->commands, pi, pr);
|
||||
if (pr->status != CMD_PARSE_SUCCESS)
|
||||
goto out;
|
||||
values[count].type = ARGS_COMMANDS;
|
||||
values[count].cmdlist = pr->cmdlist;
|
||||
break;
|
||||
case CMD_PARSE_PARSED_COMMANDS:
|
||||
values[count].type = ARGS_COMMANDS;
|
||||
values[count].cmdlist = arg->cmdlist;
|
||||
values[count].cmdlist->references++;
|
||||
break;
|
||||
}
|
||||
count++;
|
||||
}
|
||||
|
||||
add = cmd_parse(values, count, pi->file, pi->line, &cause);
|
||||
if (add == NULL) {
|
||||
pr->status = CMD_PARSE_ERROR;
|
||||
pr->error = cmd_parse_get_error(pi->file, pi->line, cause);
|
||||
free(cause);
|
||||
goto out;
|
||||
}
|
||||
pr->status = CMD_PARSE_SUCCESS;
|
||||
pr->cmdlist = cmd_list_new();
|
||||
cmd_list_append(pr->cmdlist, add);
|
||||
|
||||
out:
|
||||
for (idx = 0; idx < count; idx++)
|
||||
args_free_value(&values[idx]);
|
||||
free(values);
|
||||
}
|
||||
|
||||
static void
|
||||
cmd_parse_build_commands(struct cmd_parse_commands *cmds,
|
||||
struct cmd_parse_input *pi, struct cmd_parse_result *pr)
|
||||
{
|
||||
struct cmd_parse_command *cmd;
|
||||
u_int line = UINT_MAX;
|
||||
struct cmd_list *current = NULL, *result;
|
||||
char *s;
|
||||
|
||||
memset(pr, 0, sizeof *pr);
|
||||
|
||||
/* Check for an empty list. */
|
||||
if (TAILQ_EMPTY(cmds)) {
|
||||
cmd_parse_free_commands(cmds);
|
||||
pr.status = CMD_PARSE_EMPTY;
|
||||
return (&pr);
|
||||
}
|
||||
|
||||
/*
|
||||
* Walk the commands and expand any aliases. Each alias is parsed
|
||||
* individually to a new command list, any trailing arguments appended
|
||||
* to the last command, and all commands inserted into the original
|
||||
* command list.
|
||||
*/
|
||||
TAILQ_FOREACH_SAFE(cmd, cmds, entry, next) {
|
||||
name = cmd->argv[0];
|
||||
|
||||
alias = cmd_get_alias(name);
|
||||
if (alias == NULL)
|
||||
continue;
|
||||
|
||||
line = cmd->line;
|
||||
log_debug("%s: %u %s = %s", __func__, line, name, alias);
|
||||
|
||||
pi->line = line;
|
||||
cmds2 = cmd_parse_do_buffer(alias, strlen(alias), pi, &cause);
|
||||
free(alias);
|
||||
if (cmds2 == NULL) {
|
||||
pr.status = CMD_PARSE_ERROR;
|
||||
pr.error = cause;
|
||||
goto out;
|
||||
}
|
||||
|
||||
cmd2 = TAILQ_LAST(cmds2, cmd_parse_commands);
|
||||
if (cmd2 == NULL) {
|
||||
TAILQ_REMOVE(cmds, cmd, entry);
|
||||
cmd_parse_free_command(cmd);
|
||||
continue;
|
||||
}
|
||||
for (i = 1; i < cmd->argc; i++)
|
||||
cmd_append_argv(&cmd2->argc, &cmd2->argv, cmd->argv[i]);
|
||||
|
||||
after = cmd;
|
||||
TAILQ_FOREACH_SAFE(cmd2, cmds2, entry, next2) {
|
||||
cmd2->line = line;
|
||||
TAILQ_REMOVE(cmds2, cmd2, entry);
|
||||
TAILQ_INSERT_AFTER(cmds, after, cmd2, entry);
|
||||
after = cmd2;
|
||||
}
|
||||
cmd_parse_free_commands(cmds2);
|
||||
|
||||
TAILQ_REMOVE(cmds, cmd, entry);
|
||||
cmd_parse_free_command(cmd);
|
||||
pr->status = CMD_PARSE_SUCCESS;
|
||||
pr->cmdlist = cmd_list_new();
|
||||
return;
|
||||
}
|
||||
cmd_parse_log_commands(cmds, __func__);
|
||||
|
||||
/*
|
||||
* Parse each command into a command list. Create a new command list
|
||||
|
@ -749,49 +879,39 @@ cmd_parse_build_commands(struct cmd_parse_commands *cmds,
|
|||
*/
|
||||
result = cmd_list_new();
|
||||
TAILQ_FOREACH(cmd, cmds, entry) {
|
||||
name = cmd->argv[0];
|
||||
log_debug("%s: %u %s", __func__, cmd->line, name);
|
||||
cmd_log_argv(cmd->argc, cmd->argv, __func__);
|
||||
|
||||
if (cmdlist == NULL ||
|
||||
((~pi->flags & CMD_PARSE_ONEGROUP) && cmd->line != line)) {
|
||||
if (cmdlist != NULL) {
|
||||
cmd_parse_print_commands(pi, line, cmdlist);
|
||||
cmd_list_move(result, cmdlist);
|
||||
cmd_list_free(cmdlist);
|
||||
if (((~pi->flags & CMD_PARSE_ONEGROUP) && cmd->line != line)) {
|
||||
if (current != NULL) {
|
||||
cmd_parse_print_commands(pi, current);
|
||||
cmd_list_move(result, current);
|
||||
cmd_list_free(current);
|
||||
}
|
||||
cmdlist = cmd_list_new();
|
||||
current = cmd_list_new();
|
||||
}
|
||||
line = cmd->line;
|
||||
if (current == NULL)
|
||||
current = cmd_list_new();
|
||||
line = pi->line = cmd->line;
|
||||
|
||||
add = cmd_parse(cmd->argc, cmd->argv, pi->file, line, &cause);
|
||||
if (add == NULL) {
|
||||
cmd_parse_build_command(cmd, pi, pr);
|
||||
if (pr->status != CMD_PARSE_SUCCESS) {
|
||||
cmd_list_free(result);
|
||||
pr.status = CMD_PARSE_ERROR;
|
||||
pr.error = cmd_parse_get_error(pi->file, line, cause);
|
||||
free(cause);
|
||||
cmd_list_free(cmdlist);
|
||||
goto out;
|
||||
cmd_list_free(current);
|
||||
return;
|
||||
}
|
||||
cmd_list_append(cmdlist, add);
|
||||
cmd_list_append_all(current, pr->cmdlist);
|
||||
cmd_list_free(pr->cmdlist);
|
||||
}
|
||||
if (cmdlist != NULL) {
|
||||
cmd_parse_print_commands(pi, line, cmdlist);
|
||||
cmd_list_move(result, cmdlist);
|
||||
cmd_list_free(cmdlist);
|
||||
if (current != NULL) {
|
||||
cmd_parse_print_commands(pi, current);
|
||||
cmd_list_move(result, current);
|
||||
cmd_list_free(current);
|
||||
}
|
||||
|
||||
s = cmd_list_print(result, 0);
|
||||
log_debug("%s: %s", __func__, s);
|
||||
free(s);
|
||||
|
||||
pr.status = CMD_PARSE_SUCCESS;
|
||||
pr.cmdlist = result;
|
||||
|
||||
out:
|
||||
cmd_parse_free_commands(cmds);
|
||||
|
||||
return (&pr);
|
||||
pr->status = CMD_PARSE_SUCCESS;
|
||||
pr->cmdlist = result;
|
||||
}
|
||||
|
||||
struct cmd_parse_result *
|
||||
|
@ -814,7 +934,10 @@ cmd_parse_from_file(FILE *f, struct cmd_parse_input *pi)
|
|||
pr.error = cause;
|
||||
return (&pr);
|
||||
}
|
||||
return (cmd_parse_build_commands(cmds, pi));
|
||||
cmd_parse_build_commands(cmds, pi, &pr);
|
||||
cmd_parse_free_commands(cmds);
|
||||
return (&pr);
|
||||
|
||||
}
|
||||
|
||||
struct cmd_parse_result *
|
||||
|
@ -845,8 +968,6 @@ cmd_parse_and_insert(const char *s, struct cmd_parse_input *pi,
|
|||
|
||||
pr = cmd_parse_from_string(s, pi);
|
||||
switch (pr->status) {
|
||||
case CMD_PARSE_EMPTY:
|
||||
break;
|
||||
case CMD_PARSE_ERROR:
|
||||
if (error != NULL)
|
||||
*error = pr->error;
|
||||
|
@ -871,8 +992,6 @@ cmd_parse_and_append(const char *s, struct cmd_parse_input *pi,
|
|||
|
||||
pr = cmd_parse_from_string(s, pi);
|
||||
switch (pr->status) {
|
||||
case CMD_PARSE_EMPTY:
|
||||
break;
|
||||
case CMD_PARSE_ERROR:
|
||||
if (error != NULL)
|
||||
*error = pr->error;
|
||||
|
@ -903,9 +1022,8 @@ cmd_parse_from_buffer(const void *buf, size_t len, struct cmd_parse_input *pi)
|
|||
memset(&pr, 0, sizeof pr);
|
||||
|
||||
if (len == 0) {
|
||||
pr.status = CMD_PARSE_EMPTY;
|
||||
pr.cmdlist = NULL;
|
||||
pr.error = NULL;
|
||||
pr.status = CMD_PARSE_SUCCESS;
|
||||
pr.cmdlist = cmd_list_new();
|
||||
return (&pr);
|
||||
}
|
||||
|
||||
|
@ -915,18 +1033,24 @@ cmd_parse_from_buffer(const void *buf, size_t len, struct cmd_parse_input *pi)
|
|||
pr.error = cause;
|
||||
return (&pr);
|
||||
}
|
||||
return (cmd_parse_build_commands(cmds, pi));
|
||||
cmd_parse_build_commands(cmds, pi, &pr);
|
||||
cmd_parse_free_commands(cmds);
|
||||
return (&pr);
|
||||
}
|
||||
|
||||
struct cmd_parse_result *
|
||||
cmd_parse_from_arguments(int argc, char **argv, struct cmd_parse_input *pi)
|
||||
cmd_parse_from_arguments(struct args_value *values, u_int count,
|
||||
struct cmd_parse_input *pi)
|
||||
{
|
||||
struct cmd_parse_input input;
|
||||
struct cmd_parse_commands *cmds;
|
||||
struct cmd_parse_command *cmd;
|
||||
char **copy, **new_argv;
|
||||
size_t size;
|
||||
int i, last, new_argc;
|
||||
static struct cmd_parse_result pr;
|
||||
struct cmd_parse_input input;
|
||||
struct cmd_parse_commands *cmds;
|
||||
struct cmd_parse_command *cmd;
|
||||
struct cmd_parse_argument *arg;
|
||||
u_int i;
|
||||
char *copy;
|
||||
size_t size;
|
||||
int end;
|
||||
|
||||
/*
|
||||
* The commands are already split up into arguments, so just separate
|
||||
|
@ -937,62 +1061,56 @@ cmd_parse_from_arguments(int argc, char **argv, struct cmd_parse_input *pi)
|
|||
memset(&input, 0, sizeof input);
|
||||
pi = &input;
|
||||
}
|
||||
cmd_log_argv(argc, argv, "%s", __func__);
|
||||
memset(&pr, 0, sizeof pr);
|
||||
|
||||
cmds = cmd_parse_new_commands();
|
||||
copy = cmd_copy_argv(argc, argv);
|
||||
|
||||
last = 0;
|
||||
for (i = 0; i < argc; i++) {
|
||||
size = strlen(copy[i]);
|
||||
if (size == 0 || copy[i][size - 1] != ';')
|
||||
continue;
|
||||
copy[i][--size] = '\0';
|
||||
if (size > 0 && copy[i][size - 1] == '\\') {
|
||||
copy[i][size - 1] = ';';
|
||||
continue;
|
||||
}
|
||||
|
||||
new_argc = i - last;
|
||||
new_argv = copy + last;
|
||||
if (size != 0)
|
||||
new_argc++;
|
||||
|
||||
if (new_argc != 0) {
|
||||
cmd_log_argv(new_argc, new_argv, "%s: at %u", __func__,
|
||||
i);
|
||||
cmd = xcalloc(1, sizeof *cmd);
|
||||
cmd->line = pi->line;
|
||||
TAILQ_INIT(&cmd->arguments);
|
||||
|
||||
for (i = 0; i < count; i++) {
|
||||
end = 0;
|
||||
if (values[i].type == ARGS_STRING) {
|
||||
copy = xstrdup(values[i].string);
|
||||
size = strlen(copy);
|
||||
if (size != 0 && copy[size - 1] == ';') {
|
||||
copy[--size] = '\0';
|
||||
if (size > 0 && copy[size - 1] == '\\')
|
||||
copy[size - 1] = ';';
|
||||
else
|
||||
end = 1;
|
||||
}
|
||||
if (!end || size != 0) {
|
||||
arg = xcalloc(1, sizeof *arg);
|
||||
arg->type = CMD_PARSE_STRING;
|
||||
arg->string = copy;
|
||||
TAILQ_INSERT_TAIL(&cmd->arguments, arg, entry);
|
||||
} else
|
||||
free(copy);
|
||||
} else if (values[i].type == ARGS_COMMANDS) {
|
||||
arg = xcalloc(1, sizeof *arg);
|
||||
arg->type = CMD_PARSE_PARSED_COMMANDS;
|
||||
arg->cmdlist = values[i].cmdlist;
|
||||
arg->cmdlist->references++;
|
||||
TAILQ_INSERT_TAIL(&cmd->arguments, arg, entry);
|
||||
} else
|
||||
fatalx("unknown argument type");
|
||||
if (end) {
|
||||
TAILQ_INSERT_TAIL(cmds, cmd, entry);
|
||||
cmd = xcalloc(1, sizeof *cmd);
|
||||
cmd->line = pi->line;
|
||||
|
||||
cmd->argc = new_argc;
|
||||
cmd->argv = cmd_copy_argv(new_argc, new_argv);
|
||||
|
||||
TAILQ_INSERT_TAIL(cmds, cmd, entry);
|
||||
}
|
||||
|
||||
last = i + 1;
|
||||
}
|
||||
if (last != argc) {
|
||||
new_argv = copy + last;
|
||||
new_argc = argc - last;
|
||||
|
||||
if (new_argc != 0) {
|
||||
cmd_log_argv(new_argc, new_argv, "%s: at %u", __func__,
|
||||
last);
|
||||
|
||||
cmd = xcalloc(1, sizeof *cmd);
|
||||
cmd->line = pi->line;
|
||||
|
||||
cmd->argc = new_argc;
|
||||
cmd->argv = cmd_copy_argv(new_argc, new_argv);
|
||||
|
||||
TAILQ_INSERT_TAIL(cmds, cmd, entry);
|
||||
TAILQ_INIT(&cmd->arguments);
|
||||
}
|
||||
}
|
||||
if (!TAILQ_EMPTY(&cmd->arguments))
|
||||
TAILQ_INSERT_TAIL(cmds, cmd, entry);
|
||||
else
|
||||
free(cmd);
|
||||
|
||||
cmd_free_argv(argc, copy);
|
||||
return (cmd_parse_build_commands(cmds, pi));
|
||||
cmd_parse_build_commands(cmds, pi, &pr);
|
||||
cmd_parse_free_commands(cmds);
|
||||
return (&pr);
|
||||
}
|
||||
|
||||
static int printflike(1, 2)
|
||||
|
@ -1309,7 +1427,7 @@ yylex_token_escape(char **buf, size_t *len)
|
|||
if (o3 >= '0' && o3 <= '7') {
|
||||
ch = 64 * (ch - '0') +
|
||||
8 * (o2 - '0') +
|
||||
(o3 - '0');
|
||||
(o3 - '0');
|
||||
yylex_append1(buf, len, ch);
|
||||
return (1);
|
||||
}
|
||||
|
@ -1497,13 +1615,24 @@ yylex_token(int ch)
|
|||
|
||||
for (;;) {
|
||||
/* EOF or \n are always the end of the token. */
|
||||
if (ch == EOF || (state == NONE && ch == '\n'))
|
||||
if (ch == EOF) {
|
||||
log_debug("%s: end at EOF", __func__);
|
||||
break;
|
||||
}
|
||||
if (state == NONE && ch == '\n') {
|
||||
log_debug("%s: end at EOL", __func__);
|
||||
break;
|
||||
}
|
||||
|
||||
/* Whitespace or ; or } ends a token unless inside quotes. */
|
||||
if ((ch == ' ' || ch == '\t' || ch == ';' || ch == '}') &&
|
||||
state == NONE)
|
||||
if (state == NONE && (ch == ' ' || ch == '\t')) {
|
||||
log_debug("%s: end at WS", __func__);
|
||||
break;
|
||||
}
|
||||
if (state == NONE && (ch == ';' || ch == '}')) {
|
||||
log_debug("%s: end at %c", __func__, ch);
|
||||
break;
|
||||
}
|
||||
|
||||
/*
|
||||
* Spaces and comments inside quotes after \n are removed but
|
||||
|
|
|
@ -33,7 +33,7 @@ const struct cmd_entry cmd_paste_buffer_entry = {
|
|||
.name = "paste-buffer",
|
||||
.alias = "pasteb",
|
||||
|
||||
.args = { "db:prs:t:", 0, 0 },
|
||||
.args = { "db:prs:t:", 0, 0, NULL },
|
||||
.usage = "[-dpr] [-s separator] " CMD_BUFFER_USAGE " "
|
||||
CMD_TARGET_PANE_USAGE,
|
||||
|
||||
|
@ -54,6 +54,11 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmdq_item *item)
|
|||
size_t seplen, bufsize;
|
||||
int bracket = args_has(args, 'p');
|
||||
|
||||
if (window_pane_exited(wp)) {
|
||||
cmdq_error(item, "target pane has exited");
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
|
||||
bufname = NULL;
|
||||
if (args_has(args, 'b'))
|
||||
bufname = args_get(args, 'b');
|
||||
|
|
|
@ -43,8 +43,8 @@ const struct cmd_entry cmd_pipe_pane_entry = {
|
|||
.name = "pipe-pane",
|
||||
.alias = "pipep",
|
||||
|
||||
.args = { "IOot:", 0, 1 },
|
||||
.usage = "[-IOo] " CMD_TARGET_PANE_USAGE " [command]",
|
||||
.args = { "IOot:", 0, 1, NULL },
|
||||
.usage = "[-IOo] " CMD_TARGET_PANE_USAGE " [shell-command]",
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, 0 },
|
||||
|
||||
|
@ -67,6 +67,12 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct format_tree *ft;
|
||||
sigset_t set, oldset;
|
||||
|
||||
/* Do nothing if pane is dead. */
|
||||
if (window_pane_exited(wp)) {
|
||||
cmdq_error(item, "target pane has exited");
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
|
||||
/* Destroy the old pipe. */
|
||||
old_fd = wp->pipe_fd;
|
||||
if (wp->pipe_fd != -1) {
|
||||
|
@ -81,7 +87,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||
}
|
||||
|
||||
/* If no pipe command, that is enough. */
|
||||
if (args->argc == 0 || *args->argv[0] == '\0')
|
||||
if (args_count(args) == 0 || *args_string(args, 0) == '\0')
|
||||
return (CMD_RETURN_NORMAL);
|
||||
|
||||
/*
|
||||
|
@ -111,7 +117,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||
/* Expand the command. */
|
||||
ft = format_create(cmdq_get_client(item), item, FORMAT_NONE, 0);
|
||||
format_defaults(ft, tc, s, wl, wp);
|
||||
cmd = format_expand_time(ft, args->argv[0]);
|
||||
cmd = format_expand_time(ft, args_string(args, 0));
|
||||
format_free(ft);
|
||||
|
||||
/* Fork the child. */
|
||||
|
@ -130,7 +136,7 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||
sigprocmask(SIG_SETMASK, &oldset, NULL);
|
||||
close(pipe_fd[0]);
|
||||
|
||||
null_fd = open(_PATH_DEVNULL, O_WRONLY, 0);
|
||||
null_fd = open(_PATH_DEVNULL, O_WRONLY);
|
||||
if (out) {
|
||||
if (dup2(pipe_fd[1], STDIN_FILENO) == -1)
|
||||
_exit(1);
|
||||
|
|
142
cmd-queue.c
142
cmd-queue.c
|
@ -19,9 +19,11 @@
|
|||
#include <sys/types.h>
|
||||
|
||||
#include <ctype.h>
|
||||
#include <pwd.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "tmux.h"
|
||||
|
||||
|
@ -124,7 +126,7 @@ cmdq_new(void)
|
|||
{
|
||||
struct cmdq_list *queue;
|
||||
|
||||
queue = xcalloc (1, sizeof *queue);
|
||||
queue = xcalloc(1, sizeof *queue);
|
||||
TAILQ_INIT (&queue->list);
|
||||
return (queue);
|
||||
}
|
||||
|
@ -234,8 +236,10 @@ cmdq_link_state(struct cmdq_state *state)
|
|||
|
||||
/* Make a copy of a state. */
|
||||
struct cmdq_state *
|
||||
cmdq_copy_state(struct cmdq_state *state)
|
||||
cmdq_copy_state(struct cmdq_state *state, struct cmd_find_state *current)
|
||||
{
|
||||
if (current != NULL)
|
||||
return (cmdq_new_state(current, &state->event, state->flags));
|
||||
return (cmdq_new_state(&state->current, &state->event, state->flags));
|
||||
}
|
||||
|
||||
|
@ -269,6 +273,15 @@ cmdq_add_format(struct cmdq_state *state, const char *key, const char *fmt, ...)
|
|||
free(value);
|
||||
}
|
||||
|
||||
/* Add formats to command queue. */
|
||||
void
|
||||
cmdq_add_formats(struct cmdq_state *state, struct format_tree *ft)
|
||||
{
|
||||
if (state->formats == NULL)
|
||||
state->formats = format_create(NULL, NULL, FORMAT_NONE, 0);
|
||||
format_merge(state->formats, ft);
|
||||
}
|
||||
|
||||
/* Merge formats from item. */
|
||||
void
|
||||
cmdq_merge_formats(struct cmdq_item *item, struct format_tree *ft)
|
||||
|
@ -343,12 +356,12 @@ cmdq_insert_hook(struct session *s, struct cmdq_item *item,
|
|||
struct cmdq_state *state = item->state;
|
||||
struct cmd *cmd = item->cmd;
|
||||
struct args *args = cmd_get_args(cmd);
|
||||
struct args_entry *entryp;
|
||||
struct args_value *valuep;
|
||||
struct args_entry *ae;
|
||||
struct args_value *av;
|
||||
struct options *oo;
|
||||
va_list ap;
|
||||
char *name, tmp[32], flag, *arguments;
|
||||
int i;
|
||||
u_int i;
|
||||
const char *value;
|
||||
struct cmdq_item *new_item;
|
||||
struct cmdq_state *new_state;
|
||||
|
@ -385,11 +398,11 @@ cmdq_insert_hook(struct session *s, struct cmdq_item *item,
|
|||
cmdq_add_format(new_state, "hook_arguments", "%s", arguments);
|
||||
free(arguments);
|
||||
|
||||
for (i = 0; i < args->argc; i++) {
|
||||
for (i = 0; i < args_count(args); i++) {
|
||||
xsnprintf(tmp, sizeof tmp, "hook_argument_%d", i);
|
||||
cmdq_add_format(new_state, tmp, "%s", args->argv[i]);
|
||||
cmdq_add_format(new_state, tmp, "%s", args_string(args, i));
|
||||
}
|
||||
flag = args_first(args, &entryp);
|
||||
flag = args_first(args, &ae);
|
||||
while (flag != 0) {
|
||||
value = args_get(args, flag);
|
||||
if (value == NULL) {
|
||||
|
@ -401,15 +414,15 @@ cmdq_insert_hook(struct session *s, struct cmdq_item *item,
|
|||
}
|
||||
|
||||
i = 0;
|
||||
value = args_first_value(args, flag, &valuep);
|
||||
while (value != NULL) {
|
||||
av = args_first_value(args, flag);
|
||||
while (av != NULL) {
|
||||
xsnprintf(tmp, sizeof tmp, "hook_flag_%c_%d", flag, i);
|
||||
cmdq_add_format(new_state, tmp, "%s", value);
|
||||
cmdq_add_format(new_state, tmp, "%s", av->string);
|
||||
i++;
|
||||
value = args_next_value(&valuep);
|
||||
av = args_next_value(av);
|
||||
}
|
||||
|
||||
flag = args_next(&entryp);
|
||||
flag = args_next(&ae);
|
||||
}
|
||||
|
||||
a = options_array_first(o);
|
||||
|
@ -469,6 +482,13 @@ cmdq_remove_group(struct cmdq_item *item)
|
|||
}
|
||||
}
|
||||
|
||||
/* Empty command callback. */
|
||||
static enum cmd_retval
|
||||
cmdq_empty_command(__unused struct cmdq_item *item, __unused void *data)
|
||||
{
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
/* Get a command for the command queue. */
|
||||
struct cmdq_item *
|
||||
cmdq_get_command(struct cmd_list *cmdlist, struct cmdq_state *state)
|
||||
|
@ -478,12 +498,14 @@ cmdq_get_command(struct cmd_list *cmdlist, struct cmdq_state *state)
|
|||
const struct cmd_entry *entry;
|
||||
int created = 0;
|
||||
|
||||
if ((cmd = cmd_list_first(cmdlist)) == NULL)
|
||||
return (cmdq_get_callback(cmdq_empty_command, NULL));
|
||||
|
||||
if (state == NULL) {
|
||||
state = cmdq_new_state(NULL, NULL, 0);
|
||||
created = 1;
|
||||
}
|
||||
|
||||
cmd = cmd_list_first(cmdlist);
|
||||
while (cmd != NULL) {
|
||||
entry = cmd_get_entry(cmd);
|
||||
|
||||
|
@ -540,17 +562,31 @@ cmdq_add_message(struct cmdq_item *item)
|
|||
{
|
||||
struct client *c = item->client;
|
||||
struct cmdq_state *state = item->state;
|
||||
const char *name, *key;
|
||||
const char *key;
|
||||
char *tmp;
|
||||
uid_t uid;
|
||||
struct passwd *pw;
|
||||
char *user = NULL;
|
||||
|
||||
tmp = cmd_print(item->cmd);
|
||||
if (c != NULL) {
|
||||
name = c->name;
|
||||
uid = proc_get_peer_uid(c->peer);
|
||||
if (uid != (uid_t)-1 && uid != getuid()) {
|
||||
if ((pw = getpwuid(uid)) != NULL)
|
||||
xasprintf(&user, "[%s]", pw->pw_name);
|
||||
else
|
||||
user = xstrdup("[unknown]");
|
||||
} else
|
||||
user = xstrdup("");
|
||||
if (c->session != NULL && state->event.key != KEYC_NONE) {
|
||||
key = key_string_lookup_key(state->event.key, 0);
|
||||
server_add_message("%s key %s: %s", name, key, tmp);
|
||||
} else
|
||||
server_add_message("%s command: %s", name, tmp);
|
||||
server_add_message("%s%s key %s: %s", c->name, user,
|
||||
key, tmp);
|
||||
} else {
|
||||
server_add_message("%s%s command: %s", c->name, user,
|
||||
tmp);
|
||||
}
|
||||
free(user);
|
||||
} else
|
||||
server_add_message("command: %s", tmp);
|
||||
free(tmp);
|
||||
|
@ -628,9 +664,18 @@ cmdq_fire_command(struct cmdq_item *item)
|
|||
|
||||
out:
|
||||
item->client = saved;
|
||||
if (retval == CMD_RETURN_ERROR)
|
||||
if (retval == CMD_RETURN_ERROR) {
|
||||
fsp = NULL;
|
||||
if (cmd_find_valid_state(&item->target))
|
||||
fsp = &item->target;
|
||||
else if (cmd_find_valid_state(&item->state->current))
|
||||
fsp = &item->state->current;
|
||||
else if (cmd_find_from_client(&fs, item->client, 0) == 0)
|
||||
fsp = &fs;
|
||||
cmdq_insert_hook(fsp != NULL ? fsp->s : NULL, item, fsp,
|
||||
"command-error");
|
||||
cmdq_guard(item, "error", flags);
|
||||
else
|
||||
} else
|
||||
cmdq_guard(item, "end", flags);
|
||||
return (retval);
|
||||
}
|
||||
|
@ -769,10 +814,10 @@ cmdq_running(struct client *c)
|
|||
struct cmdq_list *queue = cmdq_get(c);
|
||||
|
||||
if (queue->item == NULL)
|
||||
return (NULL);
|
||||
if (queue->item->flags & CMDQ_WAITING)
|
||||
return (NULL);
|
||||
return (queue->item);
|
||||
return (NULL);
|
||||
if (queue->item->flags & CMDQ_WAITING)
|
||||
return (NULL);
|
||||
return (queue->item);
|
||||
}
|
||||
|
||||
/* Print a guard line. */
|
||||
|
@ -787,45 +832,30 @@ cmdq_guard(struct cmdq_item *item, const char *guard, int flags)
|
|||
control_write(c, "%%%s %ld %u %d", guard, t, number, flags);
|
||||
}
|
||||
|
||||
/* Show message from command. */
|
||||
void
|
||||
cmdq_print_data(struct cmdq_item *item, int parse, struct evbuffer *evb)
|
||||
{
|
||||
server_client_print(item->client, parse, evb);
|
||||
}
|
||||
|
||||
/* Show message from command. */
|
||||
void
|
||||
cmdq_print(struct cmdq_item *item, const char *fmt, ...)
|
||||
{
|
||||
struct client *c = item->client;
|
||||
struct window_pane *wp;
|
||||
struct window_mode_entry *wme;
|
||||
va_list ap;
|
||||
char *tmp, *msg;
|
||||
va_list ap;
|
||||
struct evbuffer *evb;
|
||||
|
||||
evb = evbuffer_new();
|
||||
if (evb == NULL)
|
||||
fatalx("out of memory");
|
||||
|
||||
va_start(ap, fmt);
|
||||
xvasprintf(&msg, fmt, ap);
|
||||
evbuffer_add_vprintf(evb, fmt, ap);
|
||||
va_end(ap);
|
||||
|
||||
log_debug("%s: %s", __func__, msg);
|
||||
|
||||
if (c == NULL)
|
||||
/* nothing */;
|
||||
else if (c->session == NULL || (c->flags & CLIENT_CONTROL)) {
|
||||
if (~c->flags & CLIENT_UTF8) {
|
||||
tmp = msg;
|
||||
msg = utf8_sanitize(tmp);
|
||||
free(tmp);
|
||||
}
|
||||
if (c->flags & CLIENT_CONTROL)
|
||||
control_write(c, "%s", msg);
|
||||
else
|
||||
file_print(c, "%s\n", msg);
|
||||
} else {
|
||||
wp = server_client_get_pane(c);
|
||||
wme = TAILQ_FIRST(&wp->modes);
|
||||
if (wme == NULL || wme->mode != &window_view_mode) {
|
||||
window_pane_set_mode(wp, NULL, &window_view_mode, NULL,
|
||||
NULL);
|
||||
}
|
||||
window_copy_add(wp, "%s", msg);
|
||||
}
|
||||
|
||||
free(msg);
|
||||
cmdq_print_data(item, 0, evb);
|
||||
evbuffer_free(evb);
|
||||
}
|
||||
|
||||
/* Show error from command. */
|
||||
|
|
|
@ -34,7 +34,7 @@ const struct cmd_entry cmd_refresh_client_entry = {
|
|||
.name = "refresh-client",
|
||||
.alias = "refresh",
|
||||
|
||||
.args = { "A:B:cC:Df:F:lLRSt:U", 0, 1 },
|
||||
.args = { "A:B:cC:Df:F:l::LRSt:U", 0, 1, NULL },
|
||||
.usage = "[-cDlLRSU] [-A pane:state] [-B name:what:format] "
|
||||
"[-C XxY] [-f flags] " CMD_TARGET_CLIENT_USAGE " [adjustment]",
|
||||
|
||||
|
@ -77,6 +77,58 @@ out:
|
|||
free(copy);
|
||||
}
|
||||
|
||||
static enum cmd_retval
|
||||
cmd_refresh_client_control_client_size(struct cmd *self, struct cmdq_item *item)
|
||||
{
|
||||
struct args *args = cmd_get_args(self);
|
||||
struct client *tc = cmdq_get_target_client(item);
|
||||
const char *size = args_get(args, 'C');
|
||||
u_int w, x, y;
|
||||
struct client_window *cw;
|
||||
|
||||
if (sscanf(size, "@%u:%ux%u", &w, &x, &y) == 3) {
|
||||
if (x < WINDOW_MINIMUM || x > WINDOW_MAXIMUM ||
|
||||
y < WINDOW_MINIMUM || y > WINDOW_MAXIMUM) {
|
||||
cmdq_error(item, "size too small or too big");
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
log_debug("%s: client %s window @%u: size %ux%u", __func__,
|
||||
tc->name, w, x, y);
|
||||
cw = server_client_add_client_window(tc, w);
|
||||
cw->sx = x;
|
||||
cw->sy = y;
|
||||
tc->flags |= CLIENT_WINDOWSIZECHANGED;
|
||||
recalculate_sizes_now(1);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
if (sscanf(size, "@%u:", &w) == 1) {
|
||||
cw = server_client_get_client_window(tc, w);
|
||||
if (cw != NULL) {
|
||||
log_debug("%s: client %s window @%u: no size", __func__,
|
||||
tc->name, w);
|
||||
cw->sx = 0;
|
||||
cw->sy = 0;
|
||||
recalculate_sizes_now(1);
|
||||
}
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
if (sscanf(size, "%u,%u", &x, &y) != 2 &&
|
||||
sscanf(size, "%ux%u", &x, &y) != 2) {
|
||||
cmdq_error(item, "bad size argument");
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
if (x < WINDOW_MINIMUM || x > WINDOW_MAXIMUM ||
|
||||
y < WINDOW_MINIMUM || y > WINDOW_MAXIMUM) {
|
||||
cmdq_error(item, "size too small or too big");
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
tty_set_size(&tc->tty, x, y, 0, 0);
|
||||
tc->flags |= CLIENT_SIZECHANGED;
|
||||
recalculate_sizes_now(1);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
static void
|
||||
cmd_refresh_client_update_offset(struct client *tc, const char *value)
|
||||
{
|
||||
|
@ -110,6 +162,37 @@ out:
|
|||
free(copy);
|
||||
}
|
||||
|
||||
static enum cmd_retval
|
||||
cmd_refresh_client_clipboard(struct cmd *self, struct cmdq_item *item)
|
||||
{
|
||||
struct args *args = cmd_get_args(self);
|
||||
struct client *tc = cmdq_get_target_client(item);
|
||||
const char *p;
|
||||
u_int i;
|
||||
struct cmd_find_state fs;
|
||||
|
||||
p = args_get(args, 'l');
|
||||
if (p == NULL) {
|
||||
if (tc->flags & CLIENT_CLIPBOARDBUFFER)
|
||||
return (CMD_RETURN_NORMAL);
|
||||
tc->flags |= CLIENT_CLIPBOARDBUFFER;
|
||||
} else {
|
||||
if (cmd_find_target(&fs, item, p, CMD_FIND_PANE, 0) != 0)
|
||||
return (CMD_RETURN_ERROR);
|
||||
for (i = 0; i < tc->clipboard_npanes; i++) {
|
||||
if (tc->clipboard_panes[i] == fs.wp->id)
|
||||
break;
|
||||
}
|
||||
if (i != tc->clipboard_npanes)
|
||||
return (CMD_RETURN_NORMAL);
|
||||
tc->clipboard_panes = xreallocarray(tc->clipboard_panes,
|
||||
tc->clipboard_npanes + 1, sizeof *tc->clipboard_panes);
|
||||
tc->clipboard_panes[tc->clipboard_npanes++] = fs.wp->id;
|
||||
}
|
||||
tty_clipboard_query(&tc->tty);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
static enum cmd_retval
|
||||
cmd_refresh_client_exec(struct cmd *self, struct cmdq_item *item)
|
||||
{
|
||||
|
@ -117,8 +200,8 @@ cmd_refresh_client_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct client *tc = cmdq_get_target_client(item);
|
||||
struct tty *tty = &tc->tty;
|
||||
struct window *w;
|
||||
const char *size, *errstr, *value;
|
||||
u_int x, y, adjust;
|
||||
const char *errstr;
|
||||
u_int adjust;
|
||||
struct args_value *av;
|
||||
|
||||
if (args_has(args, 'c') ||
|
||||
|
@ -127,10 +210,11 @@ cmd_refresh_client_exec(struct cmd *self, struct cmdq_item *item)
|
|||
args_has(args, 'U') ||
|
||||
args_has(args, 'D'))
|
||||
{
|
||||
if (args->argc == 0)
|
||||
if (args_count(args) == 0)
|
||||
adjust = 1;
|
||||
else {
|
||||
adjust = strtonum(args->argv[0], 1, INT_MAX, &errstr);
|
||||
adjust = strtonum(args_string(args, 0), 1, INT_MAX,
|
||||
&errstr);
|
||||
if (errstr != NULL) {
|
||||
cmdq_error(item, "adjustment %s", errstr);
|
||||
return (CMD_RETURN_ERROR);
|
||||
|
@ -171,10 +255,8 @@ cmd_refresh_client_exec(struct cmd *self, struct cmdq_item *item)
|
|||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
if (args_has(args, 'l')) {
|
||||
tty_putcode_ptr2(&tc->tty, TTYC_MS, "", "?");
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
if (args_has(args, 'l'))
|
||||
return (cmd_refresh_client_clipboard(self, item));
|
||||
|
||||
if (args_has(args, 'F')) /* -F is an alias for -f */
|
||||
server_client_set_flags(tc, args_get(args, 'F'));
|
||||
|
@ -184,41 +266,27 @@ cmd_refresh_client_exec(struct cmd *self, struct cmdq_item *item)
|
|||
if (args_has(args, 'A')) {
|
||||
if (~tc->flags & CLIENT_CONTROL)
|
||||
goto not_control_client;
|
||||
value = args_first_value(args, 'A', &av);
|
||||
while (value != NULL) {
|
||||
cmd_refresh_client_update_offset(tc, value);
|
||||
value = args_next_value(&av);
|
||||
av = args_first_value(args, 'A');
|
||||
while (av != NULL) {
|
||||
cmd_refresh_client_update_offset(tc, av->string);
|
||||
av = args_next_value(av);
|
||||
}
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
if (args_has(args, 'B')) {
|
||||
if (~tc->flags & CLIENT_CONTROL)
|
||||
goto not_control_client;
|
||||
value = args_first_value(args, 'B', &av);
|
||||
while (value != NULL) {
|
||||
cmd_refresh_client_update_subscription(tc, value);
|
||||
value = args_next_value(&av);
|
||||
av = args_first_value(args, 'B');
|
||||
while (av != NULL) {
|
||||
cmd_refresh_client_update_subscription(tc, av->string);
|
||||
av = args_next_value(av);
|
||||
}
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
if (args_has(args, 'C')) {
|
||||
if (~tc->flags & CLIENT_CONTROL)
|
||||
goto not_control_client;
|
||||
size = args_get(args, 'C');
|
||||
if (sscanf(size, "%u,%u", &x, &y) != 2 &&
|
||||
sscanf(size, "%ux%u", &x, &y) != 2) {
|
||||
cmdq_error(item, "bad size argument");
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
if (x < WINDOW_MINIMUM || x > WINDOW_MAXIMUM ||
|
||||
y < WINDOW_MINIMUM || y > WINDOW_MAXIMUM) {
|
||||
cmdq_error(item, "size too small or too big");
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
tty_set_size(&tc->tty, x, y, 0, 0);
|
||||
tc->flags |= CLIENT_SIZECHANGED;
|
||||
recalculate_sizes_now(1);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
return (cmd_refresh_client_control_client_size(self, item));
|
||||
}
|
||||
|
||||
if (args_has(args, 'S')) {
|
||||
|
|
|
@ -34,7 +34,7 @@ const struct cmd_entry cmd_rename_session_entry = {
|
|||
.name = "rename-session",
|
||||
.alias = "rename",
|
||||
|
||||
.args = { "t:", 1, 1 },
|
||||
.args = { "t:", 1, 1, NULL },
|
||||
.usage = CMD_TARGET_SESSION_USAGE " new-name",
|
||||
|
||||
.target = { 't', CMD_FIND_SESSION, 0 },
|
||||
|
@ -51,8 +51,13 @@ cmd_rename_session_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct session *s = target->s;
|
||||
char *newname, *tmp;
|
||||
|
||||
tmp = format_single_from_target(item, args->argv[0]);
|
||||
tmp = format_single_from_target(item, args_string(args, 0));
|
||||
newname = session_check_name(tmp);
|
||||
if (newname == NULL) {
|
||||
cmdq_error(item, "invalid session: %s", tmp);
|
||||
free(tmp);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
free(tmp);
|
||||
if (strcmp(newname, s->name) == 0) {
|
||||
free(newname);
|
||||
|
|
|
@ -33,7 +33,7 @@ const struct cmd_entry cmd_rename_window_entry = {
|
|||
.name = "rename-window",
|
||||
.alias = "renamew",
|
||||
|
||||
.args = { "t:", 1, 1 },
|
||||
.args = { "t:", 1, 1, NULL },
|
||||
.usage = CMD_TARGET_WINDOW_USAGE " new-name",
|
||||
|
||||
.target = { 't', CMD_FIND_WINDOW, 0 },
|
||||
|
@ -50,7 +50,7 @@ cmd_rename_window_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct winlink *wl = target->wl;
|
||||
char *newname;
|
||||
|
||||
newname = format_single_from_target(item, args->argv[0]);
|
||||
newname = format_single_from_target(item, args_string(args, 0));
|
||||
window_set_name(wl->window, newname);
|
||||
options_set_number(wl->window->options, "automatic-rename", 0);
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ const struct cmd_entry cmd_resize_pane_entry = {
|
|||
.name = "resize-pane",
|
||||
.alias = "resizep",
|
||||
|
||||
.args = { "DLMRTt:Ux:y:Z", 0, 1 },
|
||||
.args = { "DLMRTt:Ux:y:Z", 0, 1, NULL },
|
||||
.usage = "[-DLMRTUZ] [-x width] [-y height] " CMD_TARGET_PANE_USAGE " "
|
||||
"[adjustment]",
|
||||
|
||||
|
@ -60,7 +60,7 @@ cmd_resize_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||
const char *errstr;
|
||||
char *cause;
|
||||
u_int adjust;
|
||||
int x, y;
|
||||
int x, y, status;
|
||||
struct grid *gd = wp->base.grid;
|
||||
|
||||
if (args_has(args, 'T')) {
|
||||
|
@ -87,7 +87,7 @@ cmd_resize_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||
|
||||
if (args_has(args, 'Z')) {
|
||||
if (w->flags & WINDOW_ZOOMED)
|
||||
window_unzoom(w);
|
||||
window_unzoom(w, 1);
|
||||
else
|
||||
window_zoom(wp);
|
||||
server_redraw_window(w);
|
||||
|
@ -95,10 +95,10 @@ cmd_resize_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||
}
|
||||
server_unzoom_window(w);
|
||||
|
||||
if (args->argc == 0)
|
||||
if (args_count(args) == 0)
|
||||
adjust = 1;
|
||||
else {
|
||||
adjust = strtonum(args->argv[0], 1, INT_MAX, &errstr);
|
||||
adjust = strtonum(args_string(args, 0), 1, INT_MAX, &errstr);
|
||||
if (errstr != NULL) {
|
||||
cmdq_error(item, "adjustment %s", errstr);
|
||||
return (CMD_RETURN_ERROR);
|
||||
|
@ -121,6 +121,17 @@ cmd_resize_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||
free(cause);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
status = options_get_number(w->options, "pane-border-status");
|
||||
switch (status) {
|
||||
case PANE_STATUS_TOP:
|
||||
if (y != INT_MAX && wp->yoff == 1)
|
||||
y++;
|
||||
break;
|
||||
case PANE_STATUS_BOTTOM:
|
||||
if (y != INT_MAX && wp->yoff + wp->sy == w->sy - 1)
|
||||
y++;
|
||||
break;
|
||||
}
|
||||
layout_resize_pane_to(wp, LAYOUT_TOPBOTTOM, y);
|
||||
}
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ const struct cmd_entry cmd_resize_window_entry = {
|
|||
.name = "resize-window",
|
||||
.alias = "resizew",
|
||||
|
||||
.args = { "aADLRt:Ux:y:", 0, 1 },
|
||||
.args = { "aADLRt:Ux:y:", 0, 1, NULL },
|
||||
.usage = "[-aADLRU] [-x width] [-y height] " CMD_TARGET_WINDOW_USAGE " "
|
||||
"[adjustment]",
|
||||
|
||||
|
@ -53,13 +53,12 @@ cmd_resize_window_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct session *s = target->s;
|
||||
const char *errstr;
|
||||
char *cause;
|
||||
u_int adjust, sx, sy;
|
||||
int xpixel = -1, ypixel = -1;
|
||||
u_int adjust, sx, sy, xpixel = 0, ypixel = 0;
|
||||
|
||||
if (args->argc == 0)
|
||||
if (args_count(args) == 0)
|
||||
adjust = 1;
|
||||
else {
|
||||
adjust = strtonum(args->argv[0], 1, INT_MAX, &errstr);
|
||||
adjust = strtonum(args_string(args, 0), 1, INT_MAX, &errstr);
|
||||
if (errstr != NULL) {
|
||||
cmdq_error(item, "adjustment %s", errstr);
|
||||
return (CMD_RETURN_ERROR);
|
||||
|
@ -108,7 +107,9 @@ cmd_resize_window_exec(struct cmd *self, struct cmdq_item *item)
|
|||
}
|
||||
|
||||
options_set_number(w->options, "window-size", WINDOW_SIZE_MANUAL);
|
||||
resize_window(w, sx, sy, xpixel, ypixel);
|
||||
w->manual_sx = sx;
|
||||
w->manual_sy = sy;
|
||||
recalculate_size(w, 1);
|
||||
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
|
|
@ -34,9 +34,9 @@ const struct cmd_entry cmd_respawn_pane_entry = {
|
|||
.name = "respawn-pane",
|
||||
.alias = "respawnp",
|
||||
|
||||
.args = { "c:e:kt:", 0, -1 },
|
||||
.args = { "c:e:kt:", 0, -1, NULL },
|
||||
.usage = "[-k] [-c start-directory] [-e environment] "
|
||||
CMD_TARGET_PANE_USAGE " [command]",
|
||||
CMD_TARGET_PANE_USAGE " [shell-command]",
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, 0 },
|
||||
|
||||
|
@ -49,31 +49,26 @@ cmd_respawn_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||
{
|
||||
struct args *args = cmd_get_args(self);
|
||||
struct cmd_find_state *target = cmdq_get_target(item);
|
||||
struct spawn_context sc;
|
||||
struct spawn_context sc = { 0 };
|
||||
struct session *s = target->s;
|
||||
struct winlink *wl = target->wl;
|
||||
struct window_pane *wp = target->wp;
|
||||
char *cause = NULL;
|
||||
const char *add;
|
||||
struct args_value *value;
|
||||
struct args_value *av;
|
||||
|
||||
memset(&sc, 0, sizeof sc);
|
||||
sc.item = item;
|
||||
sc.s = s;
|
||||
sc.wl = wl;
|
||||
|
||||
sc.wp0 = wp;
|
||||
sc.lc = NULL;
|
||||
|
||||
sc.name = NULL;
|
||||
sc.argc = args->argc;
|
||||
sc.argv = args->argv;
|
||||
args_to_vector(args, &sc.argc, &sc.argv);
|
||||
sc.environ = environ_create();
|
||||
|
||||
add = args_first_value(args, 'e', &value);
|
||||
while (add != NULL) {
|
||||
environ_put(sc.environ, add, 0);
|
||||
add = args_next_value(&value);
|
||||
av = args_first_value(args, 'e');
|
||||
while (av != NULL) {
|
||||
environ_put(sc.environ, av->string, 0);
|
||||
av = args_next_value(av);
|
||||
}
|
||||
|
||||
sc.idx = -1;
|
||||
|
@ -86,6 +81,9 @@ cmd_respawn_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||
if (spawn_pane(&sc, &cause) == NULL) {
|
||||
cmdq_error(item, "respawn pane failed: %s", cause);
|
||||
free(cause);
|
||||
if (sc.argv != NULL)
|
||||
cmd_free_argv(sc.argc, sc.argv);
|
||||
environ_free(sc.environ);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
|
||||
|
@ -93,6 +91,8 @@ cmd_respawn_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||
server_redraw_window_borders(wp->window);
|
||||
server_status_window(wp->window);
|
||||
|
||||
if (sc.argv != NULL)
|
||||
cmd_free_argv(sc.argc, sc.argv);
|
||||
environ_free(sc.environ);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
|
|
@ -34,9 +34,9 @@ const struct cmd_entry cmd_respawn_window_entry = {
|
|||
.name = "respawn-window",
|
||||
.alias = "respawnw",
|
||||
|
||||
.args = { "c:e:kt:", 0, -1 },
|
||||
.args = { "c:e:kt:", 0, -1, NULL },
|
||||
.usage = "[-k] [-c start-directory] [-e environment] "
|
||||
CMD_TARGET_WINDOW_USAGE " [command]",
|
||||
CMD_TARGET_WINDOW_USAGE " [shell-command]",
|
||||
|
||||
.target = { 't', CMD_FIND_WINDOW, 0 },
|
||||
|
||||
|
@ -49,29 +49,25 @@ cmd_respawn_window_exec(struct cmd *self, struct cmdq_item *item)
|
|||
{
|
||||
struct args *args = cmd_get_args(self);
|
||||
struct cmd_find_state *target = cmdq_get_target(item);
|
||||
struct spawn_context sc;
|
||||
struct spawn_context sc = { 0 };
|
||||
struct client *tc = cmdq_get_target_client(item);
|
||||
struct session *s = target->s;
|
||||
struct winlink *wl = target->wl;
|
||||
char *cause = NULL;
|
||||
const char *add;
|
||||
struct args_value *value;
|
||||
struct args_value *av;
|
||||
|
||||
memset(&sc, 0, sizeof sc);
|
||||
sc.item = item;
|
||||
sc.s = s;
|
||||
sc.wl = wl;
|
||||
sc.tc = tc;
|
||||
|
||||
sc.name = NULL;
|
||||
sc.argc = args->argc;
|
||||
sc.argv = args->argv;
|
||||
args_to_vector(args, &sc.argc, &sc.argv);
|
||||
sc.environ = environ_create();
|
||||
|
||||
add = args_first_value(args, 'e', &value);
|
||||
while (add != NULL) {
|
||||
environ_put(sc.environ, add, 0);
|
||||
add = args_next_value(&value);
|
||||
av = args_first_value(args, 'e');
|
||||
while (av != NULL) {
|
||||
environ_put(sc.environ, av->string, 0);
|
||||
av = args_next_value(av);
|
||||
}
|
||||
|
||||
sc.idx = -1;
|
||||
|
@ -84,11 +80,16 @@ cmd_respawn_window_exec(struct cmd *self, struct cmdq_item *item)
|
|||
if (spawn_window(&sc, &cause) == NULL) {
|
||||
cmdq_error(item, "respawn window failed: %s", cause);
|
||||
free(cause);
|
||||
if (sc.argv != NULL)
|
||||
cmd_free_argv(sc.argc, sc.argv);
|
||||
environ_free(sc.environ);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
|
||||
server_redraw_window(wl->window);
|
||||
|
||||
if (sc.argv != NULL)
|
||||
cmd_free_argv(sc.argc, sc.argv);
|
||||
environ_free(sc.environ);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
|
|
@ -31,7 +31,7 @@ const struct cmd_entry cmd_rotate_window_entry = {
|
|||
.name = "rotate-window",
|
||||
.alias = "rotatew",
|
||||
|
||||
.args = { "Dt:UZ", 0, 0 },
|
||||
.args = { "Dt:UZ", 0, 0, NULL },
|
||||
.usage = "[-DUZ] " CMD_TARGET_WINDOW_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_WINDOW, 0 },
|
||||
|
|
127
cmd-run-shell.c
127
cmd-run-shell.c
|
@ -30,7 +30,10 @@
|
|||
* Runs a command without a window.
|
||||
*/
|
||||
|
||||
static enum cmd_retval cmd_run_shell_exec(struct cmd *, struct cmdq_item *);
|
||||
static enum args_parse_type cmd_run_shell_args_parse(struct args *, u_int,
|
||||
char **);
|
||||
static enum cmd_retval cmd_run_shell_exec(struct cmd *,
|
||||
struct cmdq_item *);
|
||||
|
||||
static void cmd_run_shell_timer(int, short, void *);
|
||||
static void cmd_run_shell_callback(struct job *);
|
||||
|
@ -41,8 +44,9 @@ const struct cmd_entry cmd_run_shell_entry = {
|
|||
.name = "run-shell",
|
||||
.alias = "run",
|
||||
|
||||
.args = { "bd:Ct:", 0, 1 },
|
||||
.usage = "[-bC] [-d delay] " CMD_TARGET_PANE_USAGE " [shell-command]",
|
||||
.args = { "bd:Ct:c:", 0, 2, cmd_run_shell_args_parse },
|
||||
.usage = "[-bC] [-c start-directory] [-d delay] " CMD_TARGET_PANE_USAGE
|
||||
" [shell-command]",
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL },
|
||||
|
||||
|
@ -51,18 +55,26 @@ const struct cmd_entry cmd_run_shell_entry = {
|
|||
};
|
||||
|
||||
struct cmd_run_shell_data {
|
||||
struct client *client;
|
||||
char *cmd;
|
||||
int shell;
|
||||
char *cwd;
|
||||
struct cmdq_item *item;
|
||||
struct session *s;
|
||||
int wp_id;
|
||||
struct event timer;
|
||||
int flags;
|
||||
struct cmd_parse_input pi;
|
||||
struct client *client;
|
||||
char *cmd;
|
||||
struct args_command_state *state;
|
||||
char *cwd;
|
||||
struct cmdq_item *item;
|
||||
struct session *s;
|
||||
int wp_id;
|
||||
struct event timer;
|
||||
int flags;
|
||||
};
|
||||
|
||||
static enum args_parse_type
|
||||
cmd_run_shell_args_parse(struct args *args, __unused u_int idx,
|
||||
__unused char **cause)
|
||||
{
|
||||
if (args_has(args, 'C'))
|
||||
return (ARGS_PARSE_COMMANDS_OR_STRING);
|
||||
return (ARGS_PARSE_STRING);
|
||||
}
|
||||
|
||||
static void
|
||||
cmd_run_shell_print(struct job *job, const char *msg)
|
||||
{
|
||||
|
@ -78,9 +90,10 @@ cmd_run_shell_print(struct job *job, const char *msg)
|
|||
cmdq_print(cdata->item, "%s", msg);
|
||||
return;
|
||||
}
|
||||
if (cmd_find_from_nothing(&fs, 0) != 0)
|
||||
return;
|
||||
wp = fs.wp;
|
||||
if (cdata->item != NULL && cdata->client != NULL)
|
||||
wp = server_client_get_pane(cdata->client);
|
||||
if (wp == NULL && cmd_find_from_nothing(&fs, 0) == 0)
|
||||
wp = fs.wp;
|
||||
if (wp == NULL)
|
||||
return;
|
||||
}
|
||||
|
@ -88,7 +101,7 @@ cmd_run_shell_print(struct job *job, const char *msg)
|
|||
wme = TAILQ_FIRST(&wp->modes);
|
||||
if (wme == NULL || wme->mode != &window_view_mode)
|
||||
window_pane_set_mode(wp, NULL, &window_view_mode, NULL, NULL);
|
||||
window_copy_add(wp, "%s", msg);
|
||||
window_copy_add(wp, 1, "%s", msg);
|
||||
}
|
||||
|
||||
static enum cmd_retval
|
||||
|
@ -97,10 +110,11 @@ cmd_run_shell_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct args *args = cmd_get_args(self);
|
||||
struct cmd_find_state *target = cmdq_get_target(item);
|
||||
struct cmd_run_shell_data *cdata;
|
||||
struct client *c = cmdq_get_client(item);
|
||||
struct client *tc = cmdq_get_target_client(item);
|
||||
struct session *s = target->s;
|
||||
struct window_pane *wp = target->wp;
|
||||
const char *delay;
|
||||
const char *delay, *cmd;
|
||||
double d;
|
||||
struct timeval tv;
|
||||
char *end;
|
||||
|
@ -112,21 +126,17 @@ cmd_run_shell_exec(struct cmd *self, struct cmdq_item *item)
|
|||
cmdq_error(item, "invalid delay time: %s", delay);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
} else if (args->argc == 0)
|
||||
} else if (args_count(args) == 0)
|
||||
return (CMD_RETURN_NORMAL);
|
||||
|
||||
cdata = xcalloc(1, sizeof *cdata);
|
||||
if (args->argc != 0)
|
||||
cdata->cmd = format_single_from_target(item, args->argv[0]);
|
||||
|
||||
cdata->shell = !args_has(args, 'C');
|
||||
if (!cdata->shell) {
|
||||
memset(&cdata->pi, 0, sizeof cdata->pi);
|
||||
cmd_get_source(self, &cdata->pi.file, &cdata->pi.line);
|
||||
if (wait)
|
||||
cdata->pi.item = item;
|
||||
cdata->pi.c = tc;
|
||||
cmd_find_copy_state(&cdata->pi.fs, target);
|
||||
if (!args_has(args, 'C')) {
|
||||
cmd = args_string(args, 0);
|
||||
if (cmd != NULL)
|
||||
cdata->cmd = format_single_from_target(item, cmd);
|
||||
} else {
|
||||
cdata->state = args_make_commands_prepare(self, item, 0, NULL,
|
||||
wait, 1);
|
||||
}
|
||||
|
||||
if (args_has(args, 't') && wp != NULL)
|
||||
|
@ -135,7 +145,7 @@ cmd_run_shell_exec(struct cmd *self, struct cmdq_item *item)
|
|||
cdata->wp_id = -1;
|
||||
|
||||
if (wait) {
|
||||
cdata->client = cmdq_get_client(item);
|
||||
cdata->client = c;
|
||||
cdata->item = item;
|
||||
} else {
|
||||
cdata->client = tc;
|
||||
|
@ -143,8 +153,10 @@ cmd_run_shell_exec(struct cmd *self, struct cmdq_item *item)
|
|||
}
|
||||
if (cdata->client != NULL)
|
||||
cdata->client->references++;
|
||||
|
||||
cdata->cwd = xstrdup(server_client_get_cwd(cmdq_get_client(item), s));
|
||||
if (args_has(args, 'c'))
|
||||
cdata->cwd = xstrdup(args_get(args, 'c'));
|
||||
else
|
||||
cdata->cwd = xstrdup(server_client_get_cwd(c, s));
|
||||
|
||||
cdata->s = s;
|
||||
if (s != NULL)
|
||||
|
@ -170,34 +182,38 @@ cmd_run_shell_timer(__unused int fd, __unused short events, void* arg)
|
|||
struct cmd_run_shell_data *cdata = arg;
|
||||
struct client *c = cdata->client;
|
||||
const char *cmd = cdata->cmd;
|
||||
struct cmdq_item *item = cdata->item, *new_item;
|
||||
struct cmd_list *cmdlist;
|
||||
char *error;
|
||||
struct cmdq_item *item = cdata->item;
|
||||
enum cmd_parse_status status;
|
||||
|
||||
if (cmd != NULL && cdata->shell) {
|
||||
if (job_run(cmd, 0, NULL, cdata->s, cdata->cwd, NULL,
|
||||
if (cdata->state == NULL) {
|
||||
if (cmd == NULL) {
|
||||
if (cdata->item != NULL)
|
||||
cmdq_continue(cdata->item);
|
||||
cmd_run_shell_free(cdata);
|
||||
return;
|
||||
}
|
||||
if (job_run(cmd, 0, NULL, NULL, cdata->s, cdata->cwd, NULL,
|
||||
cmd_run_shell_callback, cmd_run_shell_free, cdata,
|
||||
cdata->flags, -1, -1) == NULL)
|
||||
cmd_run_shell_free(cdata);
|
||||
return;
|
||||
}
|
||||
|
||||
if (cmd != NULL) {
|
||||
if (item != NULL) {
|
||||
status = cmd_parse_and_insert(cmd, &cdata->pi, item,
|
||||
cmdq_get_state(item), &error);
|
||||
} else {
|
||||
status = cmd_parse_and_append(cmd, &cdata->pi, c, NULL,
|
||||
&error);
|
||||
}
|
||||
if (status == CMD_PARSE_ERROR) {
|
||||
if (cdata->item == NULL) {
|
||||
*error = toupper((u_char)*error);
|
||||
status_message_set(c, -1, 1, 0, "%s", error);
|
||||
} else
|
||||
cmdq_error(cdata->item, "%s", error);
|
||||
free(error);
|
||||
}
|
||||
cmdlist = args_make_commands(cdata->state, 0, NULL, &error);
|
||||
if (cmdlist == NULL) {
|
||||
if (cdata->item == NULL) {
|
||||
*error = toupper((u_char)*error);
|
||||
status_message_set(c, -1, 1, 0, "%s", error);
|
||||
} else
|
||||
cmdq_error(cdata->item, "%s", error);
|
||||
free(error);
|
||||
} else if (item == NULL) {
|
||||
new_item = cmdq_get_command(cmdlist, NULL);
|
||||
cmdq_append(c, new_item);
|
||||
} else {
|
||||
new_item = cmdq_get_command(cmdlist, cmdq_get_state(item));
|
||||
cmdq_insert_after(item, new_item);
|
||||
}
|
||||
|
||||
if (cdata->item != NULL)
|
||||
|
@ -216,7 +232,8 @@ cmd_run_shell_callback(struct job *job)
|
|||
int retcode, status;
|
||||
|
||||
do {
|
||||
if ((line = evbuffer_readline(event->input)) != NULL) {
|
||||
line = evbuffer_readln(event->input, NULL, EVBUFFER_EOL_LF);
|
||||
if (line != NULL) {
|
||||
cmd_run_shell_print(job, line);
|
||||
free(line);
|
||||
}
|
||||
|
@ -265,6 +282,8 @@ cmd_run_shell_free(void *data)
|
|||
session_remove_ref(cdata->s, __func__);
|
||||
if (cdata->client != NULL)
|
||||
server_client_unref(cdata->client);
|
||||
if (cdata->state != NULL)
|
||||
args_make_commands_free(cdata->state);
|
||||
free(cdata->cwd);
|
||||
free(cdata->cmd);
|
||||
free(cdata);
|
||||
|
|
|
@ -37,7 +37,7 @@ const struct cmd_entry cmd_save_buffer_entry = {
|
|||
.name = "save-buffer",
|
||||
.alias = "saveb",
|
||||
|
||||
.args = { "ab:", 1, 1 },
|
||||
.args = { "ab:", 1, 1, NULL },
|
||||
.usage = "[-a] " CMD_BUFFER_USAGE " path",
|
||||
|
||||
.flags = CMD_AFTERHOOK,
|
||||
|
@ -48,7 +48,7 @@ const struct cmd_entry cmd_show_buffer_entry = {
|
|||
.name = "show-buffer",
|
||||
.alias = "showb",
|
||||
|
||||
.args = { "b:", 0, 0 },
|
||||
.args = { "b:", 0, 0, NULL },
|
||||
.usage = CMD_BUFFER_USAGE,
|
||||
|
||||
.flags = CMD_AFTERHOOK,
|
||||
|
@ -78,7 +78,8 @@ cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item)
|
|||
int flags;
|
||||
const char *bufname = args_get(args, 'b'), *bufdata;
|
||||
size_t bufsize;
|
||||
char *path, *tmp;
|
||||
char *path;
|
||||
struct evbuffer *evb;
|
||||
|
||||
if (bufname == NULL) {
|
||||
if ((pb = paste_get_top(NULL)) == NULL) {
|
||||
|
@ -96,15 +97,17 @@ cmd_save_buffer_exec(struct cmd *self, struct cmdq_item *item)
|
|||
|
||||
if (cmd_get_entry(self) == &cmd_show_buffer_entry) {
|
||||
if (c->session != NULL || (c->flags & CLIENT_CONTROL)) {
|
||||
utf8_stravisx(&tmp, bufdata, bufsize,
|
||||
VIS_OCTAL|VIS_CSTYLE|VIS_TAB);
|
||||
cmdq_print(item, "%s", tmp);
|
||||
free(tmp);
|
||||
evb = evbuffer_new();
|
||||
if (evb == NULL)
|
||||
fatalx("out of memory");
|
||||
evbuffer_add(evb, bufdata, bufsize);
|
||||
cmdq_print_data(item, 1, evb);
|
||||
evbuffer_free(evb);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
path = xstrdup("-");
|
||||
} else
|
||||
path = format_single_from_target(item, args->argv[0]);
|
||||
path = format_single_from_target(item, args_string(args, 0));
|
||||
if (args_has(args, 'a'))
|
||||
flags = O_APPEND;
|
||||
else
|
||||
|
|
|
@ -33,7 +33,7 @@ const struct cmd_entry cmd_select_layout_entry = {
|
|||
.name = "select-layout",
|
||||
.alias = "selectl",
|
||||
|
||||
.args = { "Enopt:", 0, 1 },
|
||||
.args = { "Enopt:", 0, 1, NULL },
|
||||
.usage = "[-Enop] " CMD_TARGET_PANE_USAGE " [layout-name]",
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, 0 },
|
||||
|
@ -46,7 +46,7 @@ const struct cmd_entry cmd_next_layout_entry = {
|
|||
.name = "next-layout",
|
||||
.alias = "nextl",
|
||||
|
||||
.args = { "t:", 0, 0 },
|
||||
.args = { "t:", 0, 0, NULL },
|
||||
.usage = CMD_TARGET_WINDOW_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_WINDOW, 0 },
|
||||
|
@ -59,7 +59,7 @@ const struct cmd_entry cmd_previous_layout_entry = {
|
|||
.name = "previous-layout",
|
||||
.alias = "prevl",
|
||||
|
||||
.args = { "t:", 0, 0 },
|
||||
.args = { "t:", 0, 0, NULL },
|
||||
.usage = CMD_TARGET_WINDOW_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_WINDOW, 0 },
|
||||
|
@ -77,7 +77,7 @@ cmd_select_layout_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct window *w = wl->window;
|
||||
struct window_pane *wp = target->wp;
|
||||
const char *layoutname;
|
||||
char *oldlayout;
|
||||
char *oldlayout, *cause;
|
||||
int next, previous, layout;
|
||||
|
||||
server_unzoom_window(w);
|
||||
|
@ -105,27 +105,28 @@ cmd_select_layout_exec(struct cmd *self, struct cmdq_item *item)
|
|||
goto changed;
|
||||
}
|
||||
|
||||
if (args_count(args) != 0)
|
||||
layoutname = args_string(args, 0);
|
||||
else if (args_has(args, 'o'))
|
||||
layoutname = oldlayout;
|
||||
else
|
||||
layoutname = NULL;
|
||||
|
||||
if (!args_has(args, 'o')) {
|
||||
if (args->argc == 0)
|
||||
if (layoutname == NULL)
|
||||
layout = w->lastlayout;
|
||||
else
|
||||
layout = layout_set_lookup(args->argv[0]);
|
||||
layout = layout_set_lookup(layoutname);
|
||||
if (layout != -1) {
|
||||
layout_set_select(w, layout);
|
||||
goto changed;
|
||||
}
|
||||
}
|
||||
|
||||
if (args->argc != 0)
|
||||
layoutname = args->argv[0];
|
||||
else if (args_has(args, 'o'))
|
||||
layoutname = oldlayout;
|
||||
else
|
||||
layoutname = NULL;
|
||||
|
||||
if (layoutname != NULL) {
|
||||
if (layout_parse(w, layoutname) == -1) {
|
||||
cmdq_error(item, "can't set layout: %s", layoutname);
|
||||
if (layout_parse(w, layoutname, &cause) == -1) {
|
||||
cmdq_error(item, "%s: %s", cause, layoutname);
|
||||
free(cause);
|
||||
goto error;
|
||||
}
|
||||
goto changed;
|
||||
|
|
|
@ -33,7 +33,7 @@ const struct cmd_entry cmd_select_pane_entry = {
|
|||
.name = "select-pane",
|
||||
.alias = "selectp",
|
||||
|
||||
.args = { "DdegLlMmP:RT:t:UZ", 0, 0 }, /* -P and -g deprecated */
|
||||
.args = { "DdegLlMmP:RT:t:UZ", 0, 0, NULL }, /* -P and -g deprecated */
|
||||
.usage = "[-DdeLlMmRUZ] [-T title] " CMD_TARGET_PANE_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, 0 },
|
||||
|
@ -46,7 +46,7 @@ const struct cmd_entry cmd_last_pane_entry = {
|
|||
.name = "last-pane",
|
||||
.alias = "lastp",
|
||||
|
||||
.args = { "det:Z", 0, 0 },
|
||||
.args = { "det:Z", 0, 0, NULL },
|
||||
.usage = "[-deZ] " CMD_TARGET_WINDOW_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_WINDOW, 0 },
|
||||
|
@ -98,7 +98,11 @@ cmd_select_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct options_entry *o;
|
||||
|
||||
if (entry == &cmd_last_pane_entry || args_has(args, 'l')) {
|
||||
lastwp = w->last;
|
||||
/*
|
||||
* Check for no last pane found in case the other pane was
|
||||
* spawned without being visited (for example split-window -d).
|
||||
*/
|
||||
lastwp = TAILQ_FIRST(&w->last_panes);
|
||||
if (lastwp == NULL && window_count_panes(w) == 2) {
|
||||
lastwp = TAILQ_PREV(w->active, window_panes, entry);
|
||||
if (lastwp == NULL)
|
||||
|
@ -145,10 +149,12 @@ cmd_select_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||
markedwp = marked_pane.wp;
|
||||
|
||||
if (lastwp != NULL) {
|
||||
lastwp->flags |= (PANE_REDRAW|PANE_STYLECHANGED);
|
||||
server_redraw_window_borders(lastwp->window);
|
||||
server_status_window(lastwp->window);
|
||||
}
|
||||
if (markedwp != NULL) {
|
||||
markedwp->flags |= (PANE_REDRAW|PANE_STYLECHANGED);
|
||||
server_redraw_window_borders(markedwp->window);
|
||||
server_status_window(markedwp->window);
|
||||
}
|
||||
|
|
|
@ -33,7 +33,7 @@ const struct cmd_entry cmd_select_window_entry = {
|
|||
.name = "select-window",
|
||||
.alias = "selectw",
|
||||
|
||||
.args = { "lnpTt:", 0, 0 },
|
||||
.args = { "lnpTt:", 0, 0, NULL },
|
||||
.usage = "[-lnpT] " CMD_TARGET_WINDOW_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_WINDOW, 0 },
|
||||
|
@ -46,7 +46,7 @@ const struct cmd_entry cmd_next_window_entry = {
|
|||
.name = "next-window",
|
||||
.alias = "next",
|
||||
|
||||
.args = { "at:", 0, 0 },
|
||||
.args = { "at:", 0, 0, NULL },
|
||||
.usage = "[-a] " CMD_TARGET_SESSION_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_SESSION, 0 },
|
||||
|
@ -59,7 +59,7 @@ const struct cmd_entry cmd_previous_window_entry = {
|
|||
.name = "previous-window",
|
||||
.alias = "prev",
|
||||
|
||||
.args = { "at:", 0, 0 },
|
||||
.args = { "at:", 0, 0, NULL },
|
||||
.usage = "[-a] " CMD_TARGET_SESSION_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_SESSION, 0 },
|
||||
|
@ -72,7 +72,7 @@ const struct cmd_entry cmd_last_window_entry = {
|
|||
.name = "last-window",
|
||||
.alias = "last",
|
||||
|
||||
.args = { "t:", 0, 0 },
|
||||
.args = { "t:", 0, 0, NULL },
|
||||
.usage = CMD_TARGET_SESSION_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_SESSION, 0 },
|
||||
|
|
|
@ -33,13 +33,13 @@ const struct cmd_entry cmd_send_keys_entry = {
|
|||
.name = "send-keys",
|
||||
.alias = "send",
|
||||
|
||||
.args = { "FHlMN:Rt:X", 0, -1 },
|
||||
.usage = "[-FHlMRX] [-N repeat-count] " CMD_TARGET_PANE_USAGE
|
||||
" key ...",
|
||||
.args = { "c:FHKlMN:Rt:X", 0, -1, NULL },
|
||||
.usage = "[-FHKlMRX] [-c target-client] [-N repeat-count] "
|
||||
CMD_TARGET_PANE_USAGE " key ...",
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, 0 },
|
||||
|
||||
.flags = CMD_AFTERHOOK,
|
||||
.flags = CMD_AFTERHOOK|CMD_CLIENT_CFLAG|CMD_CLIENT_CANFAIL,
|
||||
.exec = cmd_send_keys_exec
|
||||
};
|
||||
|
||||
|
@ -47,7 +47,7 @@ const struct cmd_entry cmd_send_prefix_entry = {
|
|||
.name = "send-prefix",
|
||||
.alias = NULL,
|
||||
|
||||
.args = { "2t:", 0, 0 },
|
||||
.args = { "2t:", 0, 0, NULL },
|
||||
.usage = "[-2] " CMD_TARGET_PANE_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, 0 },
|
||||
|
@ -58,7 +58,7 @@ const struct cmd_entry cmd_send_prefix_entry = {
|
|||
|
||||
static struct cmdq_item *
|
||||
cmd_send_keys_inject_key(struct cmdq_item *item, struct cmdq_item *after,
|
||||
key_code key)
|
||||
struct args *args, key_code key)
|
||||
{
|
||||
struct cmd_find_state *target = cmdq_get_target(item);
|
||||
struct client *tc = cmdq_get_target_client(item);
|
||||
|
@ -66,8 +66,20 @@ cmd_send_keys_inject_key(struct cmdq_item *item, struct cmdq_item *after,
|
|||
struct winlink *wl = target->wl;
|
||||
struct window_pane *wp = target->wp;
|
||||
struct window_mode_entry *wme;
|
||||
struct key_table *table;
|
||||
struct key_table *table = NULL;
|
||||
struct key_binding *bd;
|
||||
struct key_event *event;
|
||||
|
||||
if (args_has(args, 'K')) {
|
||||
if (tc == NULL)
|
||||
return (item);
|
||||
event = xmalloc(sizeof *event);
|
||||
event->key = key|KEYC_SENT;
|
||||
memset(&event->m, 0, sizeof event->m);
|
||||
if (server_client_handle_key(tc, event) == 0)
|
||||
free(event);
|
||||
return (item);
|
||||
}
|
||||
|
||||
wme = TAILQ_FIRST(&wp->modes);
|
||||
if (wme == NULL || wme->mode->key_table == NULL) {
|
||||
|
@ -90,7 +102,7 @@ static struct cmdq_item *
|
|||
cmd_send_keys_inject_string(struct cmdq_item *item, struct cmdq_item *after,
|
||||
struct args *args, int i)
|
||||
{
|
||||
const char *s = args->argv[i];
|
||||
const char *s = args_string(args, i);
|
||||
struct utf8_data *ud, *loop;
|
||||
utf8_char uc;
|
||||
key_code key;
|
||||
|
@ -102,14 +114,16 @@ cmd_send_keys_inject_string(struct cmdq_item *item, struct cmdq_item *after,
|
|||
n = strtol(s, &endptr, 16);
|
||||
if (*s =='\0' || n < 0 || n > 0xff || *endptr != '\0')
|
||||
return (item);
|
||||
return (cmd_send_keys_inject_key(item, after, KEYC_LITERAL|n));
|
||||
return (cmd_send_keys_inject_key(item, after, args,
|
||||
KEYC_LITERAL|n));
|
||||
}
|
||||
|
||||
literal = args_has(args, 'l');
|
||||
if (!literal) {
|
||||
key = key_string_lookup_string(s);
|
||||
if (key != KEYC_NONE && key != KEYC_UNKNOWN) {
|
||||
after = cmd_send_keys_inject_key(item, after, key);
|
||||
after = cmd_send_keys_inject_key(item, after, args,
|
||||
key);
|
||||
if (after != NULL)
|
||||
return (after);
|
||||
}
|
||||
|
@ -125,7 +139,8 @@ cmd_send_keys_inject_string(struct cmdq_item *item, struct cmdq_item *after,
|
|||
continue;
|
||||
key = uc;
|
||||
}
|
||||
after = cmd_send_keys_inject_key(item, after, key);
|
||||
after = cmd_send_keys_inject_key(item, after, args,
|
||||
key);
|
||||
}
|
||||
free(ud);
|
||||
}
|
||||
|
@ -145,19 +160,20 @@ cmd_send_keys_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct mouse_event *m = &event->m;
|
||||
struct window_mode_entry *wme = TAILQ_FIRST(&wp->modes);
|
||||
struct cmdq_item *after = item;
|
||||
int i;
|
||||
key_code key;
|
||||
u_int np = 1;
|
||||
u_int i, np = 1;
|
||||
u_int count = args_count(args);
|
||||
char *cause = NULL;
|
||||
|
||||
if (args_has(args, 'N')) {
|
||||
np = args_strtonum(args, 'N', 1, UINT_MAX, &cause);
|
||||
np = args_strtonum_and_expand(args, 'N', 1, UINT_MAX, item,
|
||||
&cause);
|
||||
if (cause != NULL) {
|
||||
cmdq_error(item, "repeat count %s", cause);
|
||||
free(cause);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
if (wme != NULL && (args_has(args, 'X') || args->argc == 0)) {
|
||||
if (wme != NULL && (args_has(args, 'X') || count == 0)) {
|
||||
if (wme->mode->command == NULL) {
|
||||
cmdq_error(item, "not in a mode");
|
||||
return (CMD_RETURN_ERROR);
|
||||
|
@ -192,17 +208,26 @@ cmd_send_keys_exec(struct cmd *self, struct cmdq_item *item)
|
|||
key = options_get_number(s->options, "prefix2");
|
||||
else
|
||||
key = options_get_number(s->options, "prefix");
|
||||
cmd_send_keys_inject_key(item, item, key);
|
||||
cmd_send_keys_inject_key(item, item, args, key);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
if (args_has(args, 'R')) {
|
||||
window_pane_reset_palette(wp);
|
||||
colour_palette_clear(&wp->palette);
|
||||
input_reset(wp->ictx, 1);
|
||||
wp->flags |= (PANE_STYLECHANGED|PANE_REDRAW);
|
||||
}
|
||||
|
||||
if (count == 0) {
|
||||
if (args_has(args, 'N') || args_has(args, 'R'))
|
||||
return (CMD_RETURN_NORMAL);
|
||||
for (; np != 0; np--)
|
||||
cmd_send_keys_inject_key(item, NULL, args, event->key);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
for (; np != 0; np--) {
|
||||
for (i = 0; i < args->argc; i++) {
|
||||
for (i = 0; i < count; i++) {
|
||||
after = cmd_send_keys_inject_string(item, after, args,
|
||||
i);
|
||||
}
|
||||
|
|
|
@ -0,0 +1,147 @@
|
|||
/* $OpenBSD$ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2021 Dallas Lyons <dallasdlyons@gmail.com>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
|
||||
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
|
||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <pwd.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "tmux.h"
|
||||
|
||||
/*
|
||||
* Controls access to session.
|
||||
*/
|
||||
|
||||
static enum cmd_retval cmd_server_access_exec(struct cmd *, struct cmdq_item *);
|
||||
|
||||
const struct cmd_entry cmd_server_access_entry = {
|
||||
.name = "server-access",
|
||||
.alias = NULL,
|
||||
|
||||
.args = { "adlrw", 0, 1, NULL },
|
||||
.usage = "[-adlrw] " CMD_TARGET_PANE_USAGE " [user]",
|
||||
|
||||
.flags = CMD_CLIENT_CANFAIL,
|
||||
.exec = cmd_server_access_exec
|
||||
};
|
||||
|
||||
static enum cmd_retval
|
||||
cmd_server_access_deny(struct cmdq_item *item, struct passwd *pw)
|
||||
{
|
||||
struct client *loop;
|
||||
struct server_acl_user *user;
|
||||
uid_t uid;
|
||||
|
||||
if ((user = server_acl_user_find(pw->pw_uid)) == NULL) {
|
||||
cmdq_error(item, "user %s not found", pw->pw_name);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
TAILQ_FOREACH(loop, &clients, entry) {
|
||||
uid = proc_get_peer_uid(loop->peer);
|
||||
if (uid == server_acl_get_uid(user)) {
|
||||
loop->exit_message = xstrdup("access not allowed");
|
||||
loop->flags |= CLIENT_EXIT;
|
||||
}
|
||||
}
|
||||
server_acl_user_deny(pw->pw_uid);
|
||||
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
static enum cmd_retval
|
||||
cmd_server_access_exec(struct cmd *self, struct cmdq_item *item)
|
||||
{
|
||||
|
||||
struct args *args = cmd_get_args(self);
|
||||
struct client *c = cmdq_get_target_client(item);
|
||||
char *name;
|
||||
struct passwd *pw = NULL;
|
||||
|
||||
if (args_has(args, 'l')) {
|
||||
server_acl_display(item);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
if (args_count(args) == 0) {
|
||||
cmdq_error(item, "missing user argument");
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
|
||||
name = format_single(item, args_string(args, 0), c, NULL, NULL, NULL);
|
||||
if (*name != '\0')
|
||||
pw = getpwnam(name);
|
||||
if (pw == NULL) {
|
||||
cmdq_error(item, "unknown user: %s", name);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
free(name);
|
||||
|
||||
if (pw->pw_uid == 0 || pw->pw_uid == getuid()) {
|
||||
cmdq_error(item, "%s owns the server, can't change access",
|
||||
pw->pw_name);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
|
||||
if (args_has(args, 'a') && args_has(args, 'd')) {
|
||||
cmdq_error(item, "-a and -d cannot be used together");
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
if (args_has(args, 'w') && args_has(args, 'r')) {
|
||||
cmdq_error(item, "-r and -w cannot be used together");
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
|
||||
if (args_has(args, 'd'))
|
||||
return (cmd_server_access_deny(item, pw));
|
||||
if (args_has(args, 'a')) {
|
||||
if (server_acl_user_find(pw->pw_uid) != NULL) {
|
||||
cmdq_error(item, "user %s is already added",
|
||||
pw->pw_name);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
server_acl_user_allow(pw->pw_uid);
|
||||
/* Do not return - allow -r or -w with -a. */
|
||||
} else if (args_has(args, 'r') || args_has(args, 'w')) {
|
||||
/* -r or -w implies -a if user does not exist. */
|
||||
if (server_acl_user_find(pw->pw_uid) == NULL)
|
||||
server_acl_user_allow(pw->pw_uid);
|
||||
}
|
||||
|
||||
if (args_has(args, 'w')) {
|
||||
if (server_acl_user_find(pw->pw_uid) == NULL) {
|
||||
cmdq_error(item, "user %s not found", pw->pw_name);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
server_acl_user_allow_write(pw->pw_uid);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
if (args_has(args, 'r')) {
|
||||
if (server_acl_user_find(pw->pw_uid) == NULL) {
|
||||
cmdq_error(item, "user %s not found", pw->pw_name);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
server_acl_user_deny_write(pw->pw_uid);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
|
@ -33,7 +33,7 @@ const struct cmd_entry cmd_set_buffer_entry = {
|
|||
.name = "set-buffer",
|
||||
.alias = "setb",
|
||||
|
||||
.args = { "ab:t:n:w", 0, 1 },
|
||||
.args = { "ab:t:n:w", 0, 1, NULL },
|
||||
.usage = "[-aw] " CMD_BUFFER_USAGE " [-n new-buffer-name] "
|
||||
CMD_TARGET_CLIENT_USAGE " data",
|
||||
|
||||
|
@ -45,7 +45,7 @@ const struct cmd_entry cmd_delete_buffer_entry = {
|
|||
.name = "delete-buffer",
|
||||
.alias = "deleteb",
|
||||
|
||||
.args = { "b:", 0, 0 },
|
||||
.args = { "b:", 0, 0, NULL },
|
||||
.usage = CMD_BUFFER_USAGE,
|
||||
|
||||
.flags = CMD_AFTERHOOK,
|
||||
|
@ -69,8 +69,13 @@ cmd_set_buffer_exec(struct cmd *self, struct cmdq_item *item)
|
|||
pb = paste_get_name(bufname);
|
||||
|
||||
if (cmd_get_entry(self) == &cmd_delete_buffer_entry) {
|
||||
if (pb == NULL)
|
||||
if (pb == NULL) {
|
||||
if (bufname != NULL) {
|
||||
cmdq_error(item, "unknown buffer: %s", bufname);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
pb = paste_get_top(&bufname);
|
||||
}
|
||||
if (pb == NULL) {
|
||||
cmdq_error(item, "no buffer");
|
||||
return (CMD_RETURN_ERROR);
|
||||
|
@ -80,8 +85,13 @@ cmd_set_buffer_exec(struct cmd *self, struct cmdq_item *item)
|
|||
}
|
||||
|
||||
if (args_has(args, 'n')) {
|
||||
if (pb == NULL)
|
||||
if (pb == NULL) {
|
||||
if (bufname != NULL) {
|
||||
cmdq_error(item, "unknown buffer: %s", bufname);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
pb = paste_get_top(&bufname);
|
||||
}
|
||||
if (pb == NULL) {
|
||||
cmdq_error(item, "no buffer");
|
||||
return (CMD_RETURN_ERROR);
|
||||
|
@ -94,11 +104,11 @@ cmd_set_buffer_exec(struct cmd *self, struct cmdq_item *item)
|
|||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
if (args->argc != 1) {
|
||||
if (args_count(args) != 1) {
|
||||
cmdq_error(item, "no data specified");
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
if ((newsize = strlen(args->argv[0])) == 0)
|
||||
if ((newsize = strlen(args_string(args, 0))) == 0)
|
||||
return (CMD_RETURN_NORMAL);
|
||||
|
||||
bufsize = 0;
|
||||
|
@ -111,7 +121,7 @@ cmd_set_buffer_exec(struct cmd *self, struct cmdq_item *item)
|
|||
}
|
||||
|
||||
bufdata = xrealloc(bufdata, bufsize + newsize);
|
||||
memcpy(bufdata + bufsize, args->argv[0], newsize);
|
||||
memcpy(bufdata + bufsize, args_string(args, 0), newsize);
|
||||
bufsize += newsize;
|
||||
|
||||
if (paste_set(bufdata, bufsize, bufname, &cause) != 0) {
|
||||
|
@ -121,7 +131,7 @@ cmd_set_buffer_exec(struct cmd *self, struct cmdq_item *item)
|
|||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
if (args_has(args, 'w') && tc != NULL)
|
||||
tty_set_selection(&tc->tty, bufdata, bufsize);
|
||||
tty_set_selection(&tc->tty, "", bufdata, bufsize);
|
||||
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ const struct cmd_entry cmd_set_environment_entry = {
|
|||
.name = "set-environment",
|
||||
.alias = "setenv",
|
||||
|
||||
.args = { "Fhgrt:u", 1, 2 },
|
||||
.args = { "Fhgrt:u", 1, 2, NULL },
|
||||
.usage = "[-Fhgru] " CMD_TARGET_SESSION_USAGE " name [value]",
|
||||
|
||||
.target = { 't', CMD_FIND_SESSION, CMD_FIND_CANFAIL },
|
||||
|
@ -49,11 +49,11 @@ cmd_set_environment_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct args *args = cmd_get_args(self);
|
||||
struct cmd_find_state *target = cmdq_get_target(item);
|
||||
struct environ *env;
|
||||
const char *name, *value, *tflag;
|
||||
char *expand = NULL;
|
||||
const char *name = args_string(args, 0), *value;
|
||||
const char *tflag;
|
||||
char *expanded = NULL;
|
||||
enum cmd_retval retval = CMD_RETURN_NORMAL;
|
||||
|
||||
name = args->argv[0];
|
||||
if (*name == '\0') {
|
||||
cmdq_error(item, "empty variable name");
|
||||
return (CMD_RETURN_ERROR);
|
||||
|
@ -63,13 +63,14 @@ cmd_set_environment_exec(struct cmd *self, struct cmdq_item *item)
|
|||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
|
||||
if (args->argc < 2)
|
||||
if (args_count(args) < 2)
|
||||
value = NULL;
|
||||
else if (args_has(args, 'F'))
|
||||
value = expand = format_single_from_target(item, args->argv[1]);
|
||||
else
|
||||
value = args->argv[1];
|
||||
|
||||
value = args_string(args, 1);
|
||||
if (value != NULL && args_has(args, 'F')) {
|
||||
expanded = format_single_from_target(item, value);
|
||||
value = expanded;
|
||||
}
|
||||
if (args_has(args, 'g'))
|
||||
env = global_environ;
|
||||
else {
|
||||
|
@ -113,6 +114,6 @@ cmd_set_environment_exec(struct cmd *self, struct cmdq_item *item)
|
|||
}
|
||||
|
||||
out:
|
||||
free(expand);
|
||||
free(expanded);
|
||||
return (retval);
|
||||
}
|
||||
|
|
|
@ -27,13 +27,16 @@
|
|||
* Set an option.
|
||||
*/
|
||||
|
||||
static enum cmd_retval cmd_set_option_exec(struct cmd *, struct cmdq_item *);
|
||||
static enum args_parse_type cmd_set_option_args_parse(struct args *,
|
||||
u_int, char **);
|
||||
static enum cmd_retval cmd_set_option_exec(struct cmd *,
|
||||
struct cmdq_item *);
|
||||
|
||||
const struct cmd_entry cmd_set_option_entry = {
|
||||
.name = "set-option",
|
||||
.alias = "set",
|
||||
|
||||
.args = { "aFgopqst:uUw", 1, 2 },
|
||||
.args = { "aFgopqst:uUw", 1, 2, cmd_set_option_args_parse },
|
||||
.usage = "[-aFgopqsuUw] " CMD_TARGET_PANE_USAGE " option [value]",
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL },
|
||||
|
@ -46,7 +49,7 @@ const struct cmd_entry cmd_set_window_option_entry = {
|
|||
.name = "set-window-option",
|
||||
.alias = "setw",
|
||||
|
||||
.args = { "aFgoqt:u", 1, 2 },
|
||||
.args = { "aFgoqt:u", 1, 2, cmd_set_option_args_parse },
|
||||
.usage = "[-aFgoqu] " CMD_TARGET_WINDOW_USAGE " option [value]",
|
||||
|
||||
.target = { 't', CMD_FIND_WINDOW, CMD_FIND_CANFAIL },
|
||||
|
@ -59,7 +62,7 @@ const struct cmd_entry cmd_set_hook_entry = {
|
|||
.name = "set-hook",
|
||||
.alias = NULL,
|
||||
|
||||
.args = { "agpRt:uw", 1, 2 },
|
||||
.args = { "agpRt:uw", 1, 2, cmd_set_option_args_parse },
|
||||
.usage = "[-agpRuw] " CMD_TARGET_PANE_USAGE " hook [command]",
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL },
|
||||
|
@ -68,6 +71,15 @@ const struct cmd_entry cmd_set_hook_entry = {
|
|||
.exec = cmd_set_option_exec
|
||||
};
|
||||
|
||||
static enum args_parse_type
|
||||
cmd_set_option_args_parse(__unused struct args *args, u_int idx,
|
||||
__unused char **cause)
|
||||
{
|
||||
if (idx == 1)
|
||||
return (ARGS_PARSE_COMMANDS_OR_STRING);
|
||||
return (ARGS_PARSE_STRING);
|
||||
}
|
||||
|
||||
static enum cmd_retval
|
||||
cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
|
||||
{
|
||||
|
@ -77,14 +89,16 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct window_pane *loop;
|
||||
struct options *oo;
|
||||
struct options_entry *parent, *o, *po;
|
||||
char *name, *argument, *value = NULL, *cause;
|
||||
char *name, *argument, *expanded = NULL;
|
||||
char *cause;
|
||||
const char *value;
|
||||
int window, idx, already, error, ambiguous;
|
||||
int scope;
|
||||
|
||||
window = (cmd_get_entry(self) == &cmd_set_window_option_entry);
|
||||
|
||||
/* Expand argument. */
|
||||
argument = format_single_from_target(item, args->argv[0]);
|
||||
argument = format_single_from_target(item, args_string(args, 0));
|
||||
|
||||
/* If set-hook -R, fire the hook straight away. */
|
||||
if (cmd_get_entry(self) == &cmd_set_hook_entry && args_has(args, 'R')) {
|
||||
|
@ -104,12 +118,14 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
|
|||
cmdq_error(item, "invalid option: %s", argument);
|
||||
goto fail;
|
||||
}
|
||||
if (args->argc < 2)
|
||||
if (args_count(args) < 2)
|
||||
value = NULL;
|
||||
else if (args_has(args, 'F'))
|
||||
value = format_single_from_target(item, args->argv[1]);
|
||||
else
|
||||
value = xstrdup(args->argv[1]);
|
||||
value = args_string(args, 1);
|
||||
if (value != NULL && args_has(args, 'F')) {
|
||||
expanded = format_single_from_target(item, value);
|
||||
value = expanded;
|
||||
}
|
||||
|
||||
/* Get the scope and table for the option .*/
|
||||
scope = options_scope_from_name(args, window, name, target, &oo,
|
||||
|
@ -211,13 +227,13 @@ cmd_set_option_exec(struct cmd *self, struct cmdq_item *item)
|
|||
|
||||
out:
|
||||
free(argument);
|
||||
free(value);
|
||||
free(expanded);
|
||||
free(name);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
|
||||
fail:
|
||||
free(argument);
|
||||
free(value);
|
||||
free(expanded);
|
||||
free(name);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
|
|
|
@ -38,7 +38,7 @@ const struct cmd_entry cmd_show_environment_entry = {
|
|||
.name = "show-environment",
|
||||
.alias = "showenv",
|
||||
|
||||
.args = { "hgst:", 0, 1 },
|
||||
.args = { "hgst:", 0, 1, NULL },
|
||||
.usage = "[-hgs] " CMD_TARGET_SESSION_USAGE " [name]",
|
||||
|
||||
.target = { 't', CMD_FIND_SESSION, CMD_FIND_CANFAIL },
|
||||
|
@ -101,7 +101,7 @@ cmd_show_environment_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct cmd_find_state *target = cmdq_get_target(item);
|
||||
struct environ *env;
|
||||
struct environ_entry *envent;
|
||||
const char *tflag;
|
||||
const char *tflag, *name = args_string(args, 0);
|
||||
|
||||
if ((tflag = args_get(args, 't')) != NULL) {
|
||||
if (target->s == NULL) {
|
||||
|
@ -124,10 +124,10 @@ cmd_show_environment_exec(struct cmd *self, struct cmdq_item *item)
|
|||
env = target->s->environ;
|
||||
}
|
||||
|
||||
if (args->argc != 0) {
|
||||
envent = environ_find(env, args->argv[0]);
|
||||
if (name != NULL) {
|
||||
envent = environ_find(env, name);
|
||||
if (envent == NULL) {
|
||||
cmdq_error(item, "unknown variable: %s", args->argv[0]);
|
||||
cmdq_error(item, "unknown variable: %s", name);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
cmd_show_environment_print(self, item, envent);
|
||||
|
|
|
@ -38,7 +38,7 @@ const struct cmd_entry cmd_show_messages_entry = {
|
|||
.name = "show-messages",
|
||||
.alias = "showmsgs",
|
||||
|
||||
.args = { "JTt:", 0, 0 },
|
||||
.args = { "JTt:", 0, 0, NULL },
|
||||
.usage = "[-JT] " CMD_TARGET_CLIENT_USAGE,
|
||||
|
||||
.flags = CMD_AFTERHOOK|CMD_CLIENT_TFLAG,
|
||||
|
|
|
@ -38,7 +38,7 @@ const struct cmd_entry cmd_show_options_entry = {
|
|||
.name = "show-options",
|
||||
.alias = "show",
|
||||
|
||||
.args = { "AgHpqst:vw", 0, 1 },
|
||||
.args = { "AgHpqst:vw", 0, 1, NULL },
|
||||
.usage = "[-AgHpqsvw] " CMD_TARGET_PANE_USAGE " [option]",
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL },
|
||||
|
@ -51,7 +51,7 @@ const struct cmd_entry cmd_show_window_options_entry = {
|
|||
.name = "show-window-options",
|
||||
.alias = "showw",
|
||||
|
||||
.args = { "gvt:", 0, 1 },
|
||||
.args = { "gvt:", 0, 1, NULL },
|
||||
.usage = "[-gv] " CMD_TARGET_WINDOW_USAGE " [option]",
|
||||
|
||||
.target = { 't', CMD_FIND_WINDOW, CMD_FIND_CANFAIL },
|
||||
|
@ -64,7 +64,7 @@ const struct cmd_entry cmd_show_hooks_entry = {
|
|||
.name = "show-hooks",
|
||||
.alias = NULL,
|
||||
|
||||
.args = { "gpt:w", 0, 1 },
|
||||
.args = { "gpt:w", 0, 1, NULL },
|
||||
.usage = "[-gpw] " CMD_TARGET_PANE_USAGE,
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL },
|
||||
|
@ -85,7 +85,7 @@ cmd_show_options_exec(struct cmd *self, struct cmdq_item *item)
|
|||
|
||||
window = (cmd_get_entry(self) == &cmd_show_window_options_entry);
|
||||
|
||||
if (args->argc == 0) {
|
||||
if (args_count(args) == 0) {
|
||||
scope = options_scope_from_flags(args, window, target, &oo,
|
||||
&cause);
|
||||
if (scope == OPTIONS_TABLE_NONE) {
|
||||
|
@ -97,12 +97,12 @@ cmd_show_options_exec(struct cmd *self, struct cmdq_item *item)
|
|||
}
|
||||
return (cmd_show_options_all(self, item, scope, oo));
|
||||
}
|
||||
argument = format_single_from_target(item, args->argv[0]);
|
||||
argument = format_single_from_target(item, args_string(args, 0));
|
||||
|
||||
name = options_match(argument, &idx, &ambiguous);
|
||||
if (name == NULL) {
|
||||
if (args_has(args, 'q'))
|
||||
goto fail;
|
||||
goto out;
|
||||
if (ambiguous)
|
||||
cmdq_error(item, "ambiguous option: %s", argument);
|
||||
else
|
||||
|
@ -113,7 +113,7 @@ cmd_show_options_exec(struct cmd *self, struct cmdq_item *item)
|
|||
&cause);
|
||||
if (scope == OPTIONS_TABLE_NONE) {
|
||||
if (args_has(args, 'q'))
|
||||
goto fail;
|
||||
goto out;
|
||||
cmdq_error(item, "%s", cause);
|
||||
free(cause);
|
||||
goto fail;
|
||||
|
@ -126,7 +126,14 @@ cmd_show_options_exec(struct cmd *self, struct cmdq_item *item)
|
|||
parent = 0;
|
||||
if (o != NULL)
|
||||
cmd_show_options_print(self, item, o, idx, parent);
|
||||
else if (*name == '@') {
|
||||
if (args_has(args, 'q'))
|
||||
goto out;
|
||||
cmdq_error(item, "invalid option: %s", argument);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
out:
|
||||
free(name);
|
||||
free(argument);
|
||||
return (CMD_RETURN_NORMAL);
|
||||
|
|
|
@ -0,0 +1,108 @@
|
|||
/* $OpenBSD$ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2021 Anindya Mukherjee <anindya49@hotmail.com>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
|
||||
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
|
||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "tmux.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
/*
|
||||
* Show or clear prompt history.
|
||||
*/
|
||||
|
||||
static enum cmd_retval cmd_show_prompt_history_exec(struct cmd *,
|
||||
struct cmdq_item *);
|
||||
|
||||
const struct cmd_entry cmd_show_prompt_history_entry = {
|
||||
.name = "show-prompt-history",
|
||||
.alias = "showphist",
|
||||
|
||||
.args = { "T:", 0, 0, NULL },
|
||||
.usage = "[-T type]",
|
||||
|
||||
.flags = CMD_AFTERHOOK,
|
||||
.exec = cmd_show_prompt_history_exec
|
||||
};
|
||||
|
||||
const struct cmd_entry cmd_clear_prompt_history_entry = {
|
||||
.name = "clear-prompt-history",
|
||||
.alias = "clearphist",
|
||||
|
||||
.args = { "T:", 0, 0, NULL },
|
||||
.usage = "[-T type]",
|
||||
|
||||
.flags = CMD_AFTERHOOK,
|
||||
.exec = cmd_show_prompt_history_exec
|
||||
};
|
||||
|
||||
static enum cmd_retval
|
||||
cmd_show_prompt_history_exec(struct cmd *self, struct cmdq_item *item)
|
||||
{
|
||||
struct args *args = cmd_get_args(self);
|
||||
const char *typestr = args_get(args, 'T');
|
||||
enum prompt_type type;
|
||||
u_int tidx, hidx;
|
||||
|
||||
if (cmd_get_entry(self) == &cmd_clear_prompt_history_entry) {
|
||||
if (typestr == NULL) {
|
||||
for (tidx = 0; tidx < PROMPT_NTYPES; tidx++) {
|
||||
free(status_prompt_hlist[tidx]);
|
||||
status_prompt_hlist[tidx] = NULL;
|
||||
status_prompt_hsize[tidx] = 0;
|
||||
}
|
||||
} else {
|
||||
type = status_prompt_type(typestr);
|
||||
if (type == PROMPT_TYPE_INVALID) {
|
||||
cmdq_error(item, "invalid type: %s", typestr);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
free(status_prompt_hlist[type]);
|
||||
status_prompt_hlist[type] = NULL;
|
||||
status_prompt_hsize[type] = 0;
|
||||
}
|
||||
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
if (typestr == NULL) {
|
||||
for (tidx = 0; tidx < PROMPT_NTYPES; tidx++) {
|
||||
cmdq_print(item, "History for %s:\n",
|
||||
status_prompt_type_string(tidx));
|
||||
for (hidx = 0; hidx < status_prompt_hsize[tidx];
|
||||
hidx++) {
|
||||
cmdq_print(item, "%d: %s", hidx + 1,
|
||||
status_prompt_hlist[tidx][hidx]);
|
||||
}
|
||||
cmdq_print(item, "%s", "");
|
||||
}
|
||||
} else {
|
||||
type = status_prompt_type(typestr);
|
||||
if (type == PROMPT_TYPE_INVALID) {
|
||||
cmdq_error(item, "invalid type: %s", typestr);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
cmdq_print(item, "History for %s:\n",
|
||||
status_prompt_type_string(type));
|
||||
for (hidx = 0; hidx < status_prompt_hsize[type]; hidx++) {
|
||||
cmdq_print(item, "%d: %s", hidx + 1,
|
||||
status_prompt_hlist[type][hidx]);
|
||||
}
|
||||
cmdq_print(item, "%s", "");
|
||||
}
|
||||
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
|
@ -35,8 +35,10 @@ const struct cmd_entry cmd_source_file_entry = {
|
|||
.name = "source-file",
|
||||
.alias = "source",
|
||||
|
||||
.args = { "Fnqv", 1, -1 },
|
||||
.usage = "[-Fnqv] path ...",
|
||||
.args = { "t:Fnqv", 1, -1, NULL },
|
||||
.usage = "[-Fnqv] " CMD_TARGET_PANE_USAGE " path ...",
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, CMD_FIND_CANFAIL },
|
||||
|
||||
.flags = 0,
|
||||
.exec = cmd_source_file_exec
|
||||
|
@ -65,14 +67,19 @@ static void
|
|||
cmd_source_file_complete(struct client *c, struct cmd_source_file_data *cdata)
|
||||
{
|
||||
struct cmdq_item *new_item;
|
||||
u_int i;
|
||||
|
||||
if (cfg_finished) {
|
||||
if (cdata->retval == CMD_RETURN_ERROR && c->session == NULL)
|
||||
if (cdata->retval == CMD_RETURN_ERROR &&
|
||||
c != NULL &&
|
||||
c->session == NULL)
|
||||
c->retval = 1;
|
||||
new_item = cmdq_get_callback(cmd_source_file_complete_cb, NULL);
|
||||
cmdq_insert_after(cdata->after, new_item);
|
||||
}
|
||||
|
||||
for (i = 0; i < cdata->nfiles; i++)
|
||||
free(cdata->files[i]);
|
||||
free(cdata->files);
|
||||
free(cdata);
|
||||
}
|
||||
|
@ -87,6 +94,7 @@ cmd_source_file_done(struct client *c, const char *path, int error,
|
|||
size_t bsize = EVBUFFER_LENGTH(buffer);
|
||||
u_int n;
|
||||
struct cmdq_item *new_item;
|
||||
struct cmd_find_state *target = cmdq_get_target(item);
|
||||
|
||||
if (!closed)
|
||||
return;
|
||||
|
@ -95,7 +103,7 @@ cmd_source_file_done(struct client *c, const char *path, int error,
|
|||
cmdq_error(item, "%s: %s", path, strerror(error));
|
||||
else if (bsize != 0) {
|
||||
if (load_cfg_from_buffer(bdata, bsize, path, c, cdata->after,
|
||||
cdata->flags, &new_item) < 0)
|
||||
target, cdata->flags, &new_item) < 0)
|
||||
cdata->retval = CMD_RETURN_ERROR;
|
||||
else if (new_item != NULL)
|
||||
cdata->after = new_item;
|
||||
|
@ -126,11 +134,11 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct cmd_source_file_data *cdata;
|
||||
struct client *c = cmdq_get_client(item);
|
||||
enum cmd_retval retval = CMD_RETURN_NORMAL;
|
||||
char *pattern, *cwd, *expand = NULL;
|
||||
char *pattern, *cwd, *expanded = NULL;
|
||||
const char *path, *error;
|
||||
glob_t g;
|
||||
int i, result;
|
||||
u_int j;
|
||||
int result;
|
||||
u_int i, j;
|
||||
|
||||
cdata = xcalloc(1, sizeof *cdata);
|
||||
cdata->item = item;
|
||||
|
@ -144,13 +152,13 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
|
|||
|
||||
utf8_stravis(&cwd, server_client_get_cwd(c, NULL), VIS_GLOB);
|
||||
|
||||
for (i = 0; i < args->argc; i++) {
|
||||
for (i = 0; i < args_count(args); i++) {
|
||||
path = args_string(args, i);
|
||||
if (args_has(args, 'F')) {
|
||||
free(expand);
|
||||
expand = format_single_from_target(item, args->argv[i]);
|
||||
path = expand;
|
||||
} else
|
||||
path = args->argv[i];
|
||||
free(expanded);
|
||||
expanded = format_single_from_target(item, path);
|
||||
path = expanded;
|
||||
}
|
||||
if (strcmp(path, "-") == 0) {
|
||||
cmd_source_file_add(cdata, "-");
|
||||
continue;
|
||||
|
@ -174,15 +182,17 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
|
|||
cmdq_error(item, "%s: %s", path, error);
|
||||
retval = CMD_RETURN_ERROR;
|
||||
}
|
||||
globfree(&g);
|
||||
free(pattern);
|
||||
continue;
|
||||
}
|
||||
free(expand);
|
||||
free(pattern);
|
||||
|
||||
for (j = 0; j < g.gl_pathc; j++)
|
||||
cmd_source_file_add(cdata, g.gl_pathv[j]);
|
||||
globfree(&g);
|
||||
}
|
||||
free(expanded);
|
||||
|
||||
cdata->after = item;
|
||||
cdata->retval = retval;
|
||||
|
|
|
@ -39,9 +39,10 @@ const struct cmd_entry cmd_split_window_entry = {
|
|||
.name = "split-window",
|
||||
.alias = "splitw",
|
||||
|
||||
.args = { "bc:de:fF:hIl:p:Pt:vZ", 0, -1 },
|
||||
.args = { "bc:de:fF:hIl:p:Pt:vZ", 0, -1, NULL },
|
||||
.usage = "[-bdefhIPvZ] [-c start-directory] [-e environment] "
|
||||
"[-F format] [-l size] " CMD_TARGET_PANE_USAGE " [command]",
|
||||
"[-F format] [-l size] " CMD_TARGET_PANE_USAGE
|
||||
"[shell-command]",
|
||||
|
||||
.target = { 't', CMD_FIND_PANE, 0 },
|
||||
|
||||
|
@ -55,70 +56,65 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
|
|||
struct args *args = cmd_get_args(self);
|
||||
struct cmd_find_state *current = cmdq_get_current(item);
|
||||
struct cmd_find_state *target = cmdq_get_target(item);
|
||||
struct spawn_context sc;
|
||||
struct spawn_context sc = { 0 };
|
||||
struct client *tc = cmdq_get_target_client(item);
|
||||
struct session *s = target->s;
|
||||
struct winlink *wl = target->wl;
|
||||
struct window *w = wl->window;
|
||||
struct window_pane *wp = target->wp, *new_wp;
|
||||
enum layout_type type;
|
||||
struct layout_cell *lc;
|
||||
struct cmd_find_state fs;
|
||||
int size, percentage, flags, input;
|
||||
const char *template, *add, *errstr, *p;
|
||||
char *cause, *cp, *copy;
|
||||
size_t plen;
|
||||
struct args_value *value;
|
||||
int size, flags, input;
|
||||
const char *template;
|
||||
char *cause = NULL, *cp;
|
||||
struct args_value *av;
|
||||
u_int count = args_count(args), curval = 0;
|
||||
|
||||
type = LAYOUT_TOPBOTTOM;
|
||||
if (args_has(args, 'h'))
|
||||
type = LAYOUT_LEFTRIGHT;
|
||||
else
|
||||
type = LAYOUT_TOPBOTTOM;
|
||||
if ((p = args_get(args, 'l')) != NULL) {
|
||||
plen = strlen(p);
|
||||
if (p[plen - 1] == '%') {
|
||||
copy = xstrdup(p);
|
||||
copy[plen - 1] = '\0';
|
||||
percentage = strtonum(copy, 0, INT_MAX, &errstr);
|
||||
free(copy);
|
||||
if (errstr != NULL) {
|
||||
cmdq_error(item, "percentage %s", errstr);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
|
||||
/* If the 'p' flag is dropped then this bit can be moved into 'l'. */
|
||||
if (args_has(args, 'l') || args_has(args, 'p')) {
|
||||
if (args_has(args, 'f')) {
|
||||
if (type == LAYOUT_TOPBOTTOM)
|
||||
size = (wp->sy * percentage) / 100;
|
||||
curval = w->sy;
|
||||
else
|
||||
size = (wp->sx * percentage) / 100;
|
||||
curval = w->sx;
|
||||
} else {
|
||||
size = args_strtonum(args, 'l', 0, INT_MAX, &cause);
|
||||
if (cause != NULL) {
|
||||
cmdq_error(item, "lines %s", cause);
|
||||
free(cause);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
if (type == LAYOUT_TOPBOTTOM)
|
||||
curval = wp->sy;
|
||||
else
|
||||
curval = wp->sx;
|
||||
}
|
||||
}
|
||||
|
||||
size = -1;
|
||||
if (args_has(args, 'l')) {
|
||||
size = args_percentage_and_expand(args, 'l', 0, INT_MAX, curval,
|
||||
item, &cause);
|
||||
} else if (args_has(args, 'p')) {
|
||||
percentage = args_strtonum(args, 'p', 0, INT_MAX, &cause);
|
||||
if (cause != NULL) {
|
||||
cmdq_error(item, "create pane failed: -p %s", cause);
|
||||
free(cause);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
if (type == LAYOUT_TOPBOTTOM)
|
||||
size = (wp->sy * percentage) / 100;
|
||||
else
|
||||
size = (wp->sx * percentage) / 100;
|
||||
} else
|
||||
size = -1;
|
||||
size = args_strtonum_and_expand(args, 'p', 0, 100, item,
|
||||
&cause);
|
||||
if (cause == NULL)
|
||||
size = curval * size / 100;
|
||||
}
|
||||
if (cause != NULL) {
|
||||
cmdq_error(item, "size %s", cause);
|
||||
free(cause);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
|
||||
window_push_zoom(wp->window, 1, args_has(args, 'Z'));
|
||||
input = (args_has(args, 'I') && args->argc == 0);
|
||||
input = (args_has(args, 'I') && count == 0);
|
||||
|
||||
flags = 0;
|
||||
if (args_has(args, 'b'))
|
||||
flags |= SPAWN_BEFORE;
|
||||
if (args_has(args, 'f'))
|
||||
flags |= SPAWN_FULLSIZE;
|
||||
if (input || (args->argc == 1 && *args->argv[0] == '\0'))
|
||||
if (input || (count == 1 && *args_string(args, 0) == '\0'))
|
||||
flags |= SPAWN_EMPTY;
|
||||
|
||||
lc = layout_split_pane(wp, type, size, flags);
|
||||
|
@ -127,7 +123,6 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
|
|||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
|
||||
memset(&sc, 0, sizeof sc);
|
||||
sc.item = item;
|
||||
sc.s = s;
|
||||
sc.wl = wl;
|
||||
|
@ -135,15 +130,13 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
|
|||
sc.wp0 = wp;
|
||||
sc.lc = lc;
|
||||
|
||||
sc.name = NULL;
|
||||
sc.argc = args->argc;
|
||||
sc.argv = args->argv;
|
||||
args_to_vector(args, &sc.argc, &sc.argv);
|
||||
sc.environ = environ_create();
|
||||
|
||||
add = args_first_value(args, 'e', &value);
|
||||
while (add != NULL) {
|
||||
environ_put(sc.environ, add, 0);
|
||||
add = args_next_value(&value);
|
||||
av = args_first_value(args, 'e');
|
||||
while (av != NULL) {
|
||||
environ_put(sc.environ, av->string, 0);
|
||||
av = args_next_value(av);
|
||||
}
|
||||
|
||||
sc.idx = -1;
|
||||
|
@ -158,15 +151,27 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
|
|||
if ((new_wp = spawn_pane(&sc, &cause)) == NULL) {
|
||||
cmdq_error(item, "create pane failed: %s", cause);
|
||||
free(cause);
|
||||
if (sc.argv != NULL)
|
||||
cmd_free_argv(sc.argc, sc.argv);
|
||||
environ_free(sc.environ);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
if (input && window_pane_start_input(new_wp, item, &cause) != 0) {
|
||||
server_client_remove_pane(new_wp);
|
||||
layout_close_pane(new_wp);
|
||||
window_remove_pane(wp->window, new_wp);
|
||||
cmdq_error(item, "%s", cause);
|
||||
free(cause);
|
||||
return (CMD_RETURN_ERROR);
|
||||
if (input) {
|
||||
switch (window_pane_start_input(new_wp, item, &cause)) {
|
||||
case -1:
|
||||
server_client_remove_pane(new_wp);
|
||||
layout_close_pane(new_wp);
|
||||
window_remove_pane(wp->window, new_wp);
|
||||
cmdq_error(item, "%s", cause);
|
||||
free(cause);
|
||||
if (sc.argv != NULL)
|
||||
cmd_free_argv(sc.argc, sc.argv);
|
||||
environ_free(sc.environ);
|
||||
return (CMD_RETURN_ERROR);
|
||||
case 1:
|
||||
input = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!args_has(args, 'd'))
|
||||
cmd_find_from_winlink_pane(current, wl, new_wp, 0);
|
||||
|
@ -185,6 +190,8 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
|
|||
cmd_find_from_winlink_pane(&fs, wl, new_wp, 0);
|
||||
cmdq_insert_hook(s, item, &fs, "after-split-window");
|
||||
|
||||
if (sc.argv != NULL)
|
||||
cmd_free_argv(sc.argc, sc.argv);
|
||||
environ_free(sc.environ);
|
||||
if (input)
|
||||
return (CMD_RETURN_WAIT);
|
||||
|
|
|
@ -32,7 +32,7 @@ const struct cmd_entry cmd_swap_pane_entry = {
|
|||
.name = "swap-pane",
|
||||
.alias = "swapp",
|
||||
|
||||
.args = { "dDs:t:UZ", 0, 0 },
|
||||
.args = { "dDs:t:UZ", 0, 0, NULL },
|
||||
.usage = "[-dDUZ] " CMD_SRCDST_PANE_USAGE,
|
||||
|
||||
.source = { 's', CMD_FIND_PANE, CMD_FIND_DEFAULT_MARKED },
|
||||
|
@ -128,13 +128,16 @@ cmd_swap_pane_exec(struct cmd *self, struct cmdq_item *item)
|
|||
window_set_active_pane(dst_w, src_wp, 1);
|
||||
}
|
||||
if (src_w != dst_w) {
|
||||
if (src_w->last == src_wp)
|
||||
src_w->last = NULL;
|
||||
if (dst_w->last == dst_wp)
|
||||
dst_w->last = NULL;
|
||||
window_pane_stack_remove(&src_w->last_panes, src_wp);
|
||||
window_pane_stack_remove(&dst_w->last_panes, dst_wp);
|
||||
colour_palette_from_option(&src_wp->palette, src_wp->options);
|
||||
colour_palette_from_option(&dst_wp->palette, dst_wp->options);
|
||||
}
|
||||
server_redraw_window(src_w);
|
||||
server_redraw_window(dst_w);
|
||||
notify_window("window-layout-changed", src_w);
|
||||
if (src_w != dst_w)
|
||||
notify_window("window-layout-changed", dst_w);
|
||||
|
||||
out:
|
||||
if (window_pop_zoom(src_w))
|
||||
|
|
|
@ -32,7 +32,7 @@ const struct cmd_entry cmd_swap_window_entry = {
|
|||
.name = "swap-window",
|
||||
.alias = "swapw",
|
||||
|
||||
.args = { "ds:t:", 0, 0 },
|
||||
.args = { "ds:t:", 0, 0, NULL },
|
||||
.usage = "[-d] " CMD_SRCDST_WINDOW_USAGE,
|
||||
|
||||
.source = { 's', CMD_FIND_WINDOW, CMD_FIND_DEFAULT_MARKED },
|
||||
|
|
|
@ -34,7 +34,7 @@ const struct cmd_entry cmd_switch_client_entry = {
|
|||
.name = "switch-client",
|
||||
.alias = "switchc",
|
||||
|
||||
.args = { "lc:EFnpt:rT:Z", 0, 0 },
|
||||
.args = { "lc:EFnpt:rT:Z", 0, 0, NULL },
|
||||
.usage = "[-ElnprZ] [-c target-client] [-t target-session] "
|
||||
"[-T key-table]",
|
||||
|
||||
|
@ -134,23 +134,9 @@ cmd_switch_client_exec(struct cmd *self, struct cmdq_item *item)
|
|||
if (!args_has(args, 'E'))
|
||||
environ_update(s->options, tc->environ, s->environ);
|
||||
|
||||
if (tc->session != NULL && tc->session != s)
|
||||
tc->last_session = tc->session;
|
||||
tc->session = s;
|
||||
server_client_set_session(tc, s);
|
||||
if (~cmdq_get_flags(item) & CMDQ_STATE_REPEAT)
|
||||
server_client_set_key_table(tc, NULL);
|
||||
tty_update_client_offset(tc);
|
||||
status_timer_start(tc);
|
||||
notify_client("client-session-changed", tc);
|
||||
session_update_activity(s, NULL);
|
||||
gettimeofday(&s->last_attached_time, NULL);
|
||||
|
||||
server_check_unattached();
|
||||
server_redraw_client(tc);
|
||||
s->curw->flags &= ~WINLINK_ALERTFLAGS;
|
||||
s->curw->window->latest = tc;
|
||||
recalculate_sizes();
|
||||
alerts_check_session(s);
|
||||
|
||||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
|
|
@ -32,7 +32,7 @@ const struct cmd_entry cmd_unbind_key_entry = {
|
|||
.name = "unbind-key",
|
||||
.alias = "unbind",
|
||||
|
||||
.args = { "anqT:", 0, 1 },
|
||||
.args = { "anqT:", 0, 1, NULL },
|
||||
.usage = "[-anq] [-T key-table] key",
|
||||
|
||||
.flags = CMD_AFTERHOOK,
|
||||
|
@ -44,11 +44,11 @@ cmd_unbind_key_exec(struct cmd *self, struct cmdq_item *item)
|
|||
{
|
||||
struct args *args = cmd_get_args(self);
|
||||
key_code key;
|
||||
const char *tablename;
|
||||
const char *tablename, *keystr = args_string(args, 0);
|
||||
int quiet = args_has(args, 'q');
|
||||
|
||||
if (args_has(args, 'a')) {
|
||||
if (args->argc != 0) {
|
||||
if (keystr != NULL) {
|
||||
if (!quiet)
|
||||
cmdq_error(item, "key given with -a");
|
||||
return (CMD_RETURN_ERROR);
|
||||
|
@ -73,16 +73,16 @@ cmd_unbind_key_exec(struct cmd *self, struct cmdq_item *item)
|
|||
return (CMD_RETURN_NORMAL);
|
||||
}
|
||||
|
||||
if (args->argc != 1) {
|
||||
if (keystr == NULL) {
|
||||
if (!quiet)
|
||||
cmdq_error(item, "missing key");
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
|
||||
key = key_string_lookup_string(args->argv[0]);
|
||||
key = key_string_lookup_string(keystr);
|
||||
if (key == KEYC_NONE || key == KEYC_UNKNOWN) {
|
||||
if (!quiet)
|
||||
cmdq_error(item, "unknown key: %s", args->argv[0]);
|
||||
cmdq_error(item, "unknown key: %s", keystr);
|
||||
return (CMD_RETURN_ERROR);
|
||||
}
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ const struct cmd_entry cmd_wait_for_entry = {
|
|||
.name = "wait-for",
|
||||
.alias = "wait",
|
||||
|
||||
.args = { "LSU", 1, 1 },
|
||||
.args = { "LSU", 1, 1, NULL },
|
||||
.usage = "[-L|-S|-U] channel",
|
||||
|
||||
.flags = 0,
|
||||
|
@ -121,11 +121,11 @@ static enum cmd_retval
|
|||
cmd_wait_for_exec(struct cmd *self, struct cmdq_item *item)
|
||||
{
|
||||
struct args *args = cmd_get_args(self);
|
||||
const char *name = args->argv[0];
|
||||
struct wait_channel *wc, wc0;
|
||||
const char *name = args_string(args, 0);
|
||||
struct wait_channel *wc, find;
|
||||
|
||||
wc0.name = name;
|
||||
wc = RB_FIND(wait_channels, &wait_channels, &wc0);
|
||||
find.name = name;
|
||||
wc = RB_FIND(wait_channels, &wait_channels, &find);
|
||||
|
||||
if (args_has(args, 'S'))
|
||||
return (cmd_wait_for_signal(item, name, wc));
|
||||
|
|
131
cmd.c
131
cmd.c
|
@ -35,6 +35,7 @@ extern const struct cmd_entry cmd_choose_buffer_entry;
|
|||
extern const struct cmd_entry cmd_choose_client_entry;
|
||||
extern const struct cmd_entry cmd_choose_tree_entry;
|
||||
extern const struct cmd_entry cmd_clear_history_entry;
|
||||
extern const struct cmd_entry cmd_clear_prompt_history_entry;
|
||||
extern const struct cmd_entry cmd_clock_mode_entry;
|
||||
extern const struct cmd_entry cmd_command_prompt_entry;
|
||||
extern const struct cmd_entry cmd_confirm_before_entry;
|
||||
|
@ -46,7 +47,6 @@ extern const struct cmd_entry cmd_display_menu_entry;
|
|||
extern const struct cmd_entry cmd_display_message_entry;
|
||||
extern const struct cmd_entry cmd_display_popup_entry;
|
||||
extern const struct cmd_entry cmd_display_panes_entry;
|
||||
extern const struct cmd_entry cmd_down_pane_entry;
|
||||
extern const struct cmd_entry cmd_find_window_entry;
|
||||
extern const struct cmd_entry cmd_has_session_entry;
|
||||
extern const struct cmd_entry cmd_if_shell_entry;
|
||||
|
@ -94,6 +94,7 @@ extern const struct cmd_entry cmd_select_pane_entry;
|
|||
extern const struct cmd_entry cmd_select_window_entry;
|
||||
extern const struct cmd_entry cmd_send_keys_entry;
|
||||
extern const struct cmd_entry cmd_send_prefix_entry;
|
||||
extern const struct cmd_entry cmd_server_access_entry;
|
||||
extern const struct cmd_entry cmd_set_buffer_entry;
|
||||
extern const struct cmd_entry cmd_set_environment_entry;
|
||||
extern const struct cmd_entry cmd_set_hook_entry;
|
||||
|
@ -104,6 +105,7 @@ extern const struct cmd_entry cmd_show_environment_entry;
|
|||
extern const struct cmd_entry cmd_show_hooks_entry;
|
||||
extern const struct cmd_entry cmd_show_messages_entry;
|
||||
extern const struct cmd_entry cmd_show_options_entry;
|
||||
extern const struct cmd_entry cmd_show_prompt_history_entry;
|
||||
extern const struct cmd_entry cmd_show_window_options_entry;
|
||||
extern const struct cmd_entry cmd_source_file_entry;
|
||||
extern const struct cmd_entry cmd_split_window_entry;
|
||||
|
@ -114,7 +116,6 @@ extern const struct cmd_entry cmd_swap_window_entry;
|
|||
extern const struct cmd_entry cmd_switch_client_entry;
|
||||
extern const struct cmd_entry cmd_unbind_key_entry;
|
||||
extern const struct cmd_entry cmd_unlink_window_entry;
|
||||
extern const struct cmd_entry cmd_up_pane_entry;
|
||||
extern const struct cmd_entry cmd_wait_for_entry;
|
||||
|
||||
const struct cmd_entry *cmd_table[] = {
|
||||
|
@ -126,6 +127,7 @@ const struct cmd_entry *cmd_table[] = {
|
|||
&cmd_choose_client_entry,
|
||||
&cmd_choose_tree_entry,
|
||||
&cmd_clear_history_entry,
|
||||
&cmd_clear_prompt_history_entry,
|
||||
&cmd_clock_mode_entry,
|
||||
&cmd_command_prompt_entry,
|
||||
&cmd_confirm_before_entry,
|
||||
|
@ -184,6 +186,7 @@ const struct cmd_entry *cmd_table[] = {
|
|||
&cmd_select_window_entry,
|
||||
&cmd_send_keys_entry,
|
||||
&cmd_send_prefix_entry,
|
||||
&cmd_server_access_entry,
|
||||
&cmd_set_buffer_entry,
|
||||
&cmd_set_environment_entry,
|
||||
&cmd_set_hook_entry,
|
||||
|
@ -194,6 +197,7 @@ const struct cmd_entry *cmd_table[] = {
|
|||
&cmd_show_hooks_entry,
|
||||
&cmd_show_messages_entry,
|
||||
&cmd_show_options_entry,
|
||||
&cmd_show_prompt_history_entry,
|
||||
&cmd_show_window_options_entry,
|
||||
&cmd_source_file_entry,
|
||||
&cmd_split_window_entry,
|
||||
|
@ -217,10 +221,6 @@ struct cmd {
|
|||
char *file;
|
||||
u_int line;
|
||||
|
||||
char *alias;
|
||||
int argc;
|
||||
char **argv;
|
||||
|
||||
TAILQ_ENTRY(cmd) qentry;
|
||||
};
|
||||
TAILQ_HEAD(cmds, cmd);
|
||||
|
@ -247,7 +247,7 @@ cmd_log_argv(int argc, char **argv, const char *fmt, ...)
|
|||
|
||||
/* Prepend to an argument vector. */
|
||||
void
|
||||
cmd_prepend_argv(int *argc, char ***argv, char *arg)
|
||||
cmd_prepend_argv(int *argc, char ***argv, const char *arg)
|
||||
{
|
||||
char **new_argv;
|
||||
int i;
|
||||
|
@ -264,7 +264,7 @@ cmd_prepend_argv(int *argc, char ***argv, char *arg)
|
|||
|
||||
/* Append to an argument vector. */
|
||||
void
|
||||
cmd_append_argv(int *argc, char ***argv, char *arg)
|
||||
cmd_append_argv(int *argc, char ***argv, const char *arg)
|
||||
{
|
||||
*argv = xreallocarray(*argv, (*argc) + 1, sizeof **argv);
|
||||
(*argv)[(*argc)++] = xstrdup(arg);
|
||||
|
@ -495,31 +495,32 @@ ambiguous:
|
|||
|
||||
/* Parse a single command from an argument vector. */
|
||||
struct cmd *
|
||||
cmd_parse(int argc, char **argv, const char *file, u_int line, char **cause)
|
||||
cmd_parse(struct args_value *values, u_int count, const char *file, u_int line,
|
||||
char **cause)
|
||||
{
|
||||
const struct cmd_entry *entry;
|
||||
const char *name;
|
||||
struct cmd *cmd;
|
||||
struct args *args;
|
||||
char *error = NULL;
|
||||
|
||||
if (argc == 0) {
|
||||
if (count == 0 || values[0].type != ARGS_STRING) {
|
||||
xasprintf(cause, "no command");
|
||||
return (NULL);
|
||||
}
|
||||
name = argv[0];
|
||||
|
||||
entry = cmd_find(name, cause);
|
||||
entry = cmd_find(values[0].string, cause);
|
||||
if (entry == NULL)
|
||||
return (NULL);
|
||||
cmd_log_argv(argc, argv, "%s: %s", __func__, entry->name);
|
||||
|
||||
args = args_parse(entry->args.template, argc, argv);
|
||||
if (args == NULL)
|
||||
goto usage;
|
||||
if (entry->args.lower != -1 && args->argc < entry->args.lower)
|
||||
goto usage;
|
||||
if (entry->args.upper != -1 && args->argc > entry->args.upper)
|
||||
goto usage;
|
||||
args = args_parse(&entry->args, values, count, &error);
|
||||
if (args == NULL && error == NULL) {
|
||||
xasprintf(cause, "usage: %s %s", entry->name, entry->usage);
|
||||
return (NULL);
|
||||
}
|
||||
if (args == NULL) {
|
||||
xasprintf(cause, "command %s: %s", entry->name, error);
|
||||
free(error);
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
cmd = xcalloc(1, sizeof *cmd);
|
||||
cmd->entry = entry;
|
||||
|
@ -529,32 +530,36 @@ cmd_parse(int argc, char **argv, const char *file, u_int line, char **cause)
|
|||
cmd->file = xstrdup(file);
|
||||
cmd->line = line;
|
||||
|
||||
cmd->alias = NULL;
|
||||
cmd->argc = argc;
|
||||
cmd->argv = cmd_copy_argv(argc, argv);
|
||||
|
||||
return (cmd);
|
||||
|
||||
usage:
|
||||
if (args != NULL)
|
||||
args_free(args);
|
||||
xasprintf(cause, "usage: %s %s", entry->name, entry->usage);
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
/* Free a command. */
|
||||
void
|
||||
cmd_free(struct cmd *cmd)
|
||||
{
|
||||
free(cmd->alias);
|
||||
cmd_free_argv(cmd->argc, cmd->argv);
|
||||
|
||||
free(cmd->file);
|
||||
|
||||
args_free(cmd->args);
|
||||
free(cmd);
|
||||
}
|
||||
|
||||
/* Copy a command. */
|
||||
struct cmd *
|
||||
cmd_copy(struct cmd *cmd, int argc, char **argv)
|
||||
{
|
||||
struct cmd *new_cmd;
|
||||
|
||||
new_cmd = xcalloc(1, sizeof *new_cmd);
|
||||
new_cmd->entry = cmd->entry;
|
||||
new_cmd->args = args_copy(cmd->args, argc, argv);
|
||||
|
||||
if (cmd->file != NULL)
|
||||
new_cmd->file = xstrdup(cmd->file);
|
||||
new_cmd->line = cmd->line;
|
||||
|
||||
return (new_cmd);
|
||||
}
|
||||
|
||||
/* Get a command as a string. */
|
||||
char *
|
||||
cmd_print(struct cmd *cmd)
|
||||
|
@ -593,7 +598,18 @@ cmd_list_append(struct cmd_list *cmdlist, struct cmd *cmd)
|
|||
TAILQ_INSERT_TAIL(cmdlist->list, cmd, qentry);
|
||||
}
|
||||
|
||||
/* Move all commands from one command list to another */
|
||||
/* Append all commands from one list to another. */
|
||||
void
|
||||
cmd_list_append_all(struct cmd_list *cmdlist, struct cmd_list *from)
|
||||
{
|
||||
struct cmd *cmd;
|
||||
|
||||
TAILQ_FOREACH(cmd, from->list, qentry)
|
||||
cmd->group = cmdlist->group;
|
||||
TAILQ_CONCAT(cmdlist->list, from->list, qentry);
|
||||
}
|
||||
|
||||
/* Move all commands from one command list to another. */
|
||||
void
|
||||
cmd_list_move(struct cmd_list *cmdlist, struct cmd_list *from)
|
||||
{
|
||||
|
@ -618,6 +634,37 @@ cmd_list_free(struct cmd_list *cmdlist)
|
|||
free(cmdlist);
|
||||
}
|
||||
|
||||
/* Copy a command list, expanding %s in arguments. */
|
||||
struct cmd_list *
|
||||
cmd_list_copy(struct cmd_list *cmdlist, int argc, char **argv)
|
||||
{
|
||||
struct cmd *cmd;
|
||||
struct cmd_list *new_cmdlist;
|
||||
struct cmd *new_cmd;
|
||||
u_int group = cmdlist->group;
|
||||
char *s;
|
||||
|
||||
s = cmd_list_print(cmdlist, 0);
|
||||
log_debug("%s: %s", __func__, s);
|
||||
free(s);
|
||||
|
||||
new_cmdlist = cmd_list_new();
|
||||
TAILQ_FOREACH(cmd, cmdlist->list, qentry) {
|
||||
if (cmd->group != group) {
|
||||
new_cmdlist->group = cmd_list_next_group++;
|
||||
group = cmd->group;
|
||||
}
|
||||
new_cmd = cmd_copy(cmd, argc, argv);
|
||||
cmd_list_append(new_cmdlist, new_cmd);
|
||||
}
|
||||
|
||||
s = cmd_list_print(new_cmdlist, 0);
|
||||
log_debug("%s: %s", __func__, s);
|
||||
free(s);
|
||||
|
||||
return (new_cmdlist);
|
||||
}
|
||||
|
||||
/* Get a command list as a string. */
|
||||
char *
|
||||
cmd_list_print(struct cmd_list *cmdlist, int escaped)
|
||||
|
@ -763,10 +810,14 @@ cmd_mouse_pane(struct mouse_event *m, struct session **sp,
|
|||
|
||||
if ((wl = cmd_mouse_window(m, sp)) == NULL)
|
||||
return (NULL);
|
||||
if ((wp = window_pane_find_by_id(m->wp)) == NULL)
|
||||
return (NULL);
|
||||
if (!window_has_pane(wl->window, wp))
|
||||
return (NULL);
|
||||
if (m->wp == -1)
|
||||
wp = wl->window->active;
|
||||
else {
|
||||
if ((wp = window_pane_find_by_id(m->wp)) == NULL)
|
||||
return (NULL);
|
||||
if (!window_has_pane(wl->window, wp))
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
if (wlp != NULL)
|
||||
*wlp = wl;
|
||||
|
|
169
colour.c
169
colour.c
|
@ -105,6 +105,21 @@ colour_split_rgb(int c, u_char *r, u_char *g, u_char *b)
|
|||
*b = c & 0xff;
|
||||
}
|
||||
|
||||
/* Force colour to RGB if not already. */
|
||||
int
|
||||
colour_force_rgb(int c)
|
||||
{
|
||||
if (c & COLOUR_FLAG_RGB)
|
||||
return (c);
|
||||
if (c & COLOUR_FLAG_256)
|
||||
return (colour_256toRGB(c));
|
||||
if (c >= 0 && c <= 7)
|
||||
return (colour_256toRGB(c));
|
||||
if (c >= 90 && c <= 97)
|
||||
return (colour_256toRGB(8 + c - 90));
|
||||
return (-1);
|
||||
}
|
||||
|
||||
/* Convert colour to a string. */
|
||||
const char *
|
||||
colour_tostring(int c)
|
||||
|
@ -113,7 +128,7 @@ colour_tostring(int c)
|
|||
u_char r, g, b;
|
||||
|
||||
if (c == -1)
|
||||
return ("invalid");
|
||||
return ("none");
|
||||
|
||||
if (c & COLOUR_FLAG_RGB) {
|
||||
colour_split_rgb(c, &r, &g, &b);
|
||||
|
@ -944,3 +959,155 @@ colour_byname(const char *name)
|
|||
}
|
||||
return (-1);
|
||||
}
|
||||
|
||||
/* Parse colour from an X11 string. */
|
||||
int
|
||||
colour_parseX11(const char *p)
|
||||
{
|
||||
double c, m, y, k = 0;
|
||||
u_int r, g, b;
|
||||
size_t len = strlen(p);
|
||||
int colour = -1;
|
||||
char *copy;
|
||||
|
||||
if ((len == 12 && sscanf(p, "rgb:%02x/%02x/%02x", &r, &g, &b) == 3) ||
|
||||
(len == 7 && sscanf(p, "#%02x%02x%02x", &r, &g, &b) == 3) ||
|
||||
sscanf(p, "%d,%d,%d", &r, &g, &b) == 3)
|
||||
colour = colour_join_rgb(r, g, b);
|
||||
else if ((len == 18 &&
|
||||
sscanf(p, "rgb:%04x/%04x/%04x", &r, &g, &b) == 3) ||
|
||||
(len == 13 && sscanf(p, "#%04x%04x%04x", &r, &g, &b) == 3))
|
||||
colour = colour_join_rgb(r >> 8, g >> 8, b >> 8);
|
||||
else if ((sscanf(p, "cmyk:%lf/%lf/%lf/%lf", &c, &m, &y, &k) == 4 ||
|
||||
sscanf(p, "cmy:%lf/%lf/%lf", &c, &m, &y) == 3) &&
|
||||
c >= 0 && c <= 1 && m >= 0 && m <= 1 &&
|
||||
y >= 0 && y <= 1 && k >= 0 && k <= 1) {
|
||||
colour = colour_join_rgb(
|
||||
(1 - c) * (1 - k) * 255,
|
||||
(1 - m) * (1 - k) * 255,
|
||||
(1 - y) * (1 - k) * 255);
|
||||
} else {
|
||||
while (len != 0 && *p == ' ') {
|
||||
p++;
|
||||
len--;
|
||||
}
|
||||
while (len != 0 && p[len - 1] == ' ')
|
||||
len--;
|
||||
copy = xstrndup(p, len);
|
||||
colour = colour_byname(copy);
|
||||
free(copy);
|
||||
}
|
||||
log_debug("%s: %s = %s", __func__, p, colour_tostring(colour));
|
||||
return (colour);
|
||||
}
|
||||
|
||||
/* Initialize palette. */
|
||||
void
|
||||
colour_palette_init(struct colour_palette *p)
|
||||
{
|
||||
p->fg = 8;
|
||||
p->bg = 8;
|
||||
p->palette = NULL;
|
||||
p->default_palette = NULL;
|
||||
}
|
||||
|
||||
/* Clear palette. */
|
||||
void
|
||||
colour_palette_clear(struct colour_palette *p)
|
||||
{
|
||||
if (p != NULL) {
|
||||
p->fg = 8;
|
||||
p->bg = 8;
|
||||
free(p->palette);
|
||||
p->palette = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
/* Free a palette. */
|
||||
void
|
||||
colour_palette_free(struct colour_palette *p)
|
||||
{
|
||||
if (p != NULL) {
|
||||
free(p->palette);
|
||||
p->palette = NULL;
|
||||
free(p->default_palette);
|
||||
p->default_palette = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
/* Get a colour from a palette. */
|
||||
int
|
||||
colour_palette_get(struct colour_palette *p, int c)
|
||||
{
|
||||
if (p == NULL)
|
||||
return (-1);
|
||||
|
||||
if (c >= 90 && c <= 97)
|
||||
c = 8 + c - 90;
|
||||
else if (c & COLOUR_FLAG_256)
|
||||
c &= ~COLOUR_FLAG_256;
|
||||
else if (c >= 8)
|
||||
return (-1);
|
||||
|
||||
if (p->palette != NULL && p->palette[c] != -1)
|
||||
return (p->palette[c]);
|
||||
if (p->default_palette != NULL && p->default_palette[c] != -1)
|
||||
return (p->default_palette[c]);
|
||||
return (-1);
|
||||
}
|
||||
|
||||
/* Set a colour in a palette. */
|
||||
int
|
||||
colour_palette_set(struct colour_palette *p, int n, int c)
|
||||
{
|
||||
u_int i;
|
||||
|
||||
if (p == NULL || n > 255)
|
||||
return (0);
|
||||
|
||||
if (c == -1 && p->palette == NULL)
|
||||
return (0);
|
||||
|
||||
if (c != -1 && p->palette == NULL) {
|
||||
if (p->palette == NULL)
|
||||
p->palette = xcalloc(256, sizeof *p->palette);
|
||||
for (i = 0; i < 256; i++)
|
||||
p->palette[i] = -1;
|
||||
}
|
||||
p->palette[n] = c;
|
||||
return (1);
|
||||
}
|
||||
|
||||
/* Build palette defaults from an option. */
|
||||
void
|
||||
colour_palette_from_option(struct colour_palette *p, struct options *oo)
|
||||
{
|
||||
struct options_entry *o;
|
||||
struct options_array_item *a;
|
||||
u_int i, n;
|
||||
int c;
|
||||
|
||||
if (p == NULL)
|
||||
return;
|
||||
|
||||
o = options_get(oo, "pane-colours");
|
||||
if ((a = options_array_first(o)) == NULL) {
|
||||
if (p->default_palette != NULL) {
|
||||
free(p->default_palette);
|
||||
p->default_palette = NULL;
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (p->default_palette == NULL)
|
||||
p->default_palette = xcalloc(256, sizeof *p->default_palette);
|
||||
for (i = 0; i < 256; i++)
|
||||
p->default_palette[i] = -1;
|
||||
while (a != NULL) {
|
||||
n = options_array_item_index(a);
|
||||
if (n < 256) {
|
||||
c = options_array_item_value(a)->number;
|
||||
p->default_palette[n] = c;
|
||||
}
|
||||
a = options_array_next(a);
|
||||
}
|
||||
}
|
||||
|
|
29
compat.h
29
compat.h
|
@ -289,6 +289,11 @@ void explicit_bzero(void *, size_t);
|
|||
int getdtablecount(void);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_GETDTABLESIZE
|
||||
/* getdtablesize.c */
|
||||
int getdtablesize(void);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_CLOSEFROM
|
||||
/* closefrom.c */
|
||||
void closefrom(int);
|
||||
|
@ -334,6 +339,23 @@ char *strndup(const char *, size_t);
|
|||
void *memmem(const void *, size_t, const void *, size_t);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_HTONLL
|
||||
/* htonll.c */
|
||||
#undef htonll
|
||||
uint64_t htonll(uint64_t);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_NTOHLL
|
||||
/* ntohll.c */
|
||||
#undef ntohll
|
||||
uint64_t ntohll(uint64_t);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_GETPEEREID
|
||||
/* getpeereid.c */
|
||||
int getpeereid(int, uid_t *, gid_t *);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_DAEMON
|
||||
/* daemon.c */
|
||||
int daemon(int, int);
|
||||
|
@ -416,6 +438,13 @@ void *reallocarray(void *, size_t, size_t);
|
|||
void *recallocarray(void *, size_t, size_t, size_t);
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SYSTEMD
|
||||
/* systemd.c */
|
||||
int systemd_activated(void);
|
||||
int systemd_create_socket(int, char **);
|
||||
int systemd_move_pid_to_new_cgroup(pid_t, char **);
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_UTF8PROC
|
||||
/* utf8proc.c */
|
||||
int utf8proc_wcwidth(wchar_t);
|
||||
|
|
|
@ -0,0 +1,57 @@
|
|||
/*
|
||||
* Copyright (c) 2022 Nicholas Marriott <nicholas.marriott@gmail.com>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
|
||||
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
|
||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#ifdef HAVE_UCRED_H
|
||||
#include <ucred.h>
|
||||
#endif
|
||||
|
||||
#include "compat.h"
|
||||
|
||||
int
|
||||
getpeereid(int s, uid_t *uid, gid_t *gid)
|
||||
{
|
||||
#ifdef HAVE_SO_PEERCRED
|
||||
struct ucred uc;
|
||||
int len = sizeof uc;
|
||||
|
||||
if (getsockopt(s, SOL_SOCKET, SO_PEERCRED, &uc, &len) == -1)
|
||||
return (-1);
|
||||
*uid = uc.uid;
|
||||
*gid = uc.gid;
|
||||
return (0);
|
||||
#elif defined(HAVE_GETPEERUCRED)
|
||||
ucred_t *ucred = NULL;
|
||||
|
||||
if (getpeerucred(s, &ucred) == -1)
|
||||
return (-1);
|
||||
if ((*uid = ucred_geteuid(ucred)) == -1)
|
||||
return (-1);
|
||||
if ((*gid = ucred_getrgid(ucred)) == -1)
|
||||
return (-1);
|
||||
ucred_free(ucred);
|
||||
return (0);
|
||||
#else
|
||||
*uid = geteuid();
|
||||
*gid = getegid();
|
||||
return (0);
|
||||
#endif
|
||||
}
|
|
@ -0,0 +1,31 @@
|
|||
/*
|
||||
* Copyright (c) 2024 Nicholas Marriott <nicholas.marriott@gmail.com>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
|
||||
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
|
||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <arpa/inet.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include "compat.h"
|
||||
|
||||
uint64_t
|
||||
htonll(uint64_t v)
|
||||
{
|
||||
uint32_t b;
|
||||
uint32_t t;
|
||||
|
||||
b = htonl (v & 0xffffffff);
|
||||
t = htonl (v >> 32);
|
||||
return ((uint64_t)b << 32 | t);
|
||||
}
|
|
@ -1,6 +1,7 @@
|
|||
/* $OpenBSD: imsg-buffer.c,v 1.12 2019/01/20 02:50:03 bcook Exp $ */
|
||||
/* $OpenBSD: imsg-buffer.c,v 1.18 2023/12/12 15:47:41 claudio Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2023 Claudio Jeker <claudio@openbsd.org>
|
||||
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
|
@ -19,9 +20,11 @@
|
|||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/uio.h>
|
||||
#include <arpa/inet.h>
|
||||
|
||||
#include <limits.h>
|
||||
#include <errno.h>
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
@ -29,18 +32,36 @@
|
|||
#include "compat.h"
|
||||
#include "imsg.h"
|
||||
|
||||
#undef htobe16
|
||||
#define htobe16 htons
|
||||
#undef htobe32
|
||||
#define htobe32 htonl
|
||||
#undef htobe64
|
||||
#define htobe64 htonll
|
||||
#undef be16toh
|
||||
#define be16toh ntohs
|
||||
#undef be32toh
|
||||
#define be32toh ntohl
|
||||
#undef be64toh
|
||||
#define be64toh ntohll
|
||||
|
||||
static int ibuf_realloc(struct ibuf *, size_t);
|
||||
static void ibuf_enqueue(struct msgbuf *, struct ibuf *);
|
||||
static void ibuf_dequeue(struct msgbuf *, struct ibuf *);
|
||||
static void msgbuf_drain(struct msgbuf *, size_t);
|
||||
|
||||
struct ibuf *
|
||||
ibuf_open(size_t len)
|
||||
{
|
||||
struct ibuf *buf;
|
||||
|
||||
if (len == 0) {
|
||||
errno = EINVAL;
|
||||
return (NULL);
|
||||
}
|
||||
if ((buf = calloc(1, sizeof(struct ibuf))) == NULL)
|
||||
return (NULL);
|
||||
if ((buf->buf = malloc(len)) == NULL) {
|
||||
if ((buf->buf = calloc(len, 1)) == NULL) {
|
||||
free(buf);
|
||||
return (NULL);
|
||||
}
|
||||
|
@ -55,14 +76,22 @@ ibuf_dynamic(size_t len, size_t max)
|
|||
{
|
||||
struct ibuf *buf;
|
||||
|
||||
if (max < len)
|
||||
if (max == 0 || max < len) {
|
||||
errno = EINVAL;
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
if ((buf = ibuf_open(len)) == NULL)
|
||||
if ((buf = calloc(1, sizeof(struct ibuf))) == NULL)
|
||||
return (NULL);
|
||||
|
||||
if (max > 0)
|
||||
buf->max = max;
|
||||
if (len > 0) {
|
||||
if ((buf->buf = calloc(len, 1)) == NULL) {
|
||||
free(buf);
|
||||
return (NULL);
|
||||
}
|
||||
}
|
||||
buf->size = len;
|
||||
buf->max = max;
|
||||
buf->fd = -1;
|
||||
|
||||
return (buf);
|
||||
}
|
||||
|
@ -73,7 +102,7 @@ ibuf_realloc(struct ibuf *buf, size_t len)
|
|||
unsigned char *b;
|
||||
|
||||
/* on static buffers max is eq size and so the following fails */
|
||||
if (buf->wpos + len > buf->max) {
|
||||
if (len > SIZE_MAX - buf->wpos || buf->wpos + len > buf->max) {
|
||||
errno = ERANGE;
|
||||
return (-1);
|
||||
}
|
||||
|
@ -87,23 +116,16 @@ ibuf_realloc(struct ibuf *buf, size_t len)
|
|||
return (0);
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_add(struct ibuf *buf, const void *data, size_t len)
|
||||
{
|
||||
if (buf->wpos + len > buf->size)
|
||||
if (ibuf_realloc(buf, len) == -1)
|
||||
return (-1);
|
||||
|
||||
memcpy(buf->buf + buf->wpos, data, len);
|
||||
buf->wpos += len;
|
||||
return (0);
|
||||
}
|
||||
|
||||
void *
|
||||
ibuf_reserve(struct ibuf *buf, size_t len)
|
||||
{
|
||||
void *b;
|
||||
|
||||
if (len > SIZE_MAX - buf->wpos || buf->max == 0) {
|
||||
errno = ERANGE;
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
if (buf->wpos + len > buf->size)
|
||||
if (ibuf_realloc(buf, len) == -1)
|
||||
return (NULL);
|
||||
|
@ -113,34 +135,416 @@ ibuf_reserve(struct ibuf *buf, size_t len)
|
|||
return (b);
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_add(struct ibuf *buf, const void *data, size_t len)
|
||||
{
|
||||
void *b;
|
||||
|
||||
if ((b = ibuf_reserve(buf, len)) == NULL)
|
||||
return (-1);
|
||||
|
||||
memcpy(b, data, len);
|
||||
return (0);
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_add_ibuf(struct ibuf *buf, const struct ibuf *from)
|
||||
{
|
||||
return ibuf_add(buf, ibuf_data(from), ibuf_size(from));
|
||||
}
|
||||
|
||||
/* remove after tree is converted */
|
||||
int
|
||||
ibuf_add_buf(struct ibuf *buf, const struct ibuf *from)
|
||||
{
|
||||
return ibuf_add_ibuf(buf, from);
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_add_n8(struct ibuf *buf, uint64_t value)
|
||||
{
|
||||
uint8_t v;
|
||||
|
||||
if (value > UINT8_MAX) {
|
||||
errno = EINVAL;
|
||||
return (-1);
|
||||
}
|
||||
v = value;
|
||||
return ibuf_add(buf, &v, sizeof(v));
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_add_n16(struct ibuf *buf, uint64_t value)
|
||||
{
|
||||
uint16_t v;
|
||||
|
||||
if (value > UINT16_MAX) {
|
||||
errno = EINVAL;
|
||||
return (-1);
|
||||
}
|
||||
v = htobe16(value);
|
||||
return ibuf_add(buf, &v, sizeof(v));
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_add_n32(struct ibuf *buf, uint64_t value)
|
||||
{
|
||||
uint32_t v;
|
||||
|
||||
if (value > UINT32_MAX) {
|
||||
errno = EINVAL;
|
||||
return (-1);
|
||||
}
|
||||
v = htobe32(value);
|
||||
return ibuf_add(buf, &v, sizeof(v));
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_add_n64(struct ibuf *buf, uint64_t value)
|
||||
{
|
||||
value = htobe64(value);
|
||||
return ibuf_add(buf, &value, sizeof(value));
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_add_h16(struct ibuf *buf, uint64_t value)
|
||||
{
|
||||
uint16_t v;
|
||||
|
||||
if (value > UINT16_MAX) {
|
||||
errno = EINVAL;
|
||||
return (-1);
|
||||
}
|
||||
v = value;
|
||||
return ibuf_add(buf, &v, sizeof(v));
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_add_h32(struct ibuf *buf, uint64_t value)
|
||||
{
|
||||
uint32_t v;
|
||||
|
||||
if (value > UINT32_MAX) {
|
||||
errno = EINVAL;
|
||||
return (-1);
|
||||
}
|
||||
v = value;
|
||||
return ibuf_add(buf, &v, sizeof(v));
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_add_h64(struct ibuf *buf, uint64_t value)
|
||||
{
|
||||
return ibuf_add(buf, &value, sizeof(value));
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_add_zero(struct ibuf *buf, size_t len)
|
||||
{
|
||||
void *b;
|
||||
|
||||
if ((b = ibuf_reserve(buf, len)) == NULL)
|
||||
return (-1);
|
||||
memset(b, 0, len);
|
||||
return (0);
|
||||
}
|
||||
|
||||
void *
|
||||
ibuf_seek(struct ibuf *buf, size_t pos, size_t len)
|
||||
{
|
||||
/* only allowed to seek in already written parts */
|
||||
if (pos + len > buf->wpos)
|
||||
/* only allow seeking between rpos and wpos */
|
||||
if (ibuf_size(buf) < pos || SIZE_MAX - pos < len ||
|
||||
ibuf_size(buf) < pos + len) {
|
||||
errno = ERANGE;
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
return (buf->buf + pos);
|
||||
return (buf->buf + buf->rpos + pos);
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_set(struct ibuf *buf, size_t pos, const void *data, size_t len)
|
||||
{
|
||||
void *b;
|
||||
|
||||
if ((b = ibuf_seek(buf, pos, len)) == NULL)
|
||||
return (-1);
|
||||
|
||||
memcpy(b, data, len);
|
||||
return (0);
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_set_n8(struct ibuf *buf, size_t pos, uint64_t value)
|
||||
{
|
||||
uint8_t v;
|
||||
|
||||
if (value > UINT8_MAX) {
|
||||
errno = EINVAL;
|
||||
return (-1);
|
||||
}
|
||||
v = value;
|
||||
return (ibuf_set(buf, pos, &v, sizeof(v)));
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_set_n16(struct ibuf *buf, size_t pos, uint64_t value)
|
||||
{
|
||||
uint16_t v;
|
||||
|
||||
if (value > UINT16_MAX) {
|
||||
errno = EINVAL;
|
||||
return (-1);
|
||||
}
|
||||
v = htobe16(value);
|
||||
return (ibuf_set(buf, pos, &v, sizeof(v)));
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_set_n32(struct ibuf *buf, size_t pos, uint64_t value)
|
||||
{
|
||||
uint32_t v;
|
||||
|
||||
if (value > UINT32_MAX) {
|
||||
errno = EINVAL;
|
||||
return (-1);
|
||||
}
|
||||
v = htobe32(value);
|
||||
return (ibuf_set(buf, pos, &v, sizeof(v)));
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_set_n64(struct ibuf *buf, size_t pos, uint64_t value)
|
||||
{
|
||||
value = htobe64(value);
|
||||
return (ibuf_set(buf, pos, &value, sizeof(value)));
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_set_h16(struct ibuf *buf, size_t pos, uint64_t value)
|
||||
{
|
||||
uint16_t v;
|
||||
|
||||
if (value > UINT16_MAX) {
|
||||
errno = EINVAL;
|
||||
return (-1);
|
||||
}
|
||||
v = value;
|
||||
return (ibuf_set(buf, pos, &v, sizeof(v)));
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_set_h32(struct ibuf *buf, size_t pos, uint64_t value)
|
||||
{
|
||||
uint32_t v;
|
||||
|
||||
if (value > UINT32_MAX) {
|
||||
errno = EINVAL;
|
||||
return (-1);
|
||||
}
|
||||
v = value;
|
||||
return (ibuf_set(buf, pos, &v, sizeof(v)));
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_set_h64(struct ibuf *buf, size_t pos, uint64_t value)
|
||||
{
|
||||
return (ibuf_set(buf, pos, &value, sizeof(value)));
|
||||
}
|
||||
|
||||
void *
|
||||
ibuf_data(const struct ibuf *buf)
|
||||
{
|
||||
return (buf->buf + buf->rpos);
|
||||
}
|
||||
|
||||
size_t
|
||||
ibuf_size(struct ibuf *buf)
|
||||
ibuf_size(const struct ibuf *buf)
|
||||
{
|
||||
return (buf->wpos);
|
||||
return (buf->wpos - buf->rpos);
|
||||
}
|
||||
|
||||
size_t
|
||||
ibuf_left(struct ibuf *buf)
|
||||
ibuf_left(const struct ibuf *buf)
|
||||
{
|
||||
if (buf->max == 0)
|
||||
return (0);
|
||||
return (buf->max - buf->wpos);
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_truncate(struct ibuf *buf, size_t len)
|
||||
{
|
||||
if (ibuf_size(buf) >= len) {
|
||||
buf->wpos = buf->rpos + len;
|
||||
return (0);
|
||||
}
|
||||
if (buf->max == 0) {
|
||||
/* only allow to truncate down */
|
||||
errno = ERANGE;
|
||||
return (-1);
|
||||
}
|
||||
return ibuf_add_zero(buf, len - ibuf_size(buf));
|
||||
}
|
||||
|
||||
void
|
||||
ibuf_rewind(struct ibuf *buf)
|
||||
{
|
||||
buf->rpos = 0;
|
||||
}
|
||||
|
||||
void
|
||||
ibuf_close(struct msgbuf *msgbuf, struct ibuf *buf)
|
||||
{
|
||||
ibuf_enqueue(msgbuf, buf);
|
||||
}
|
||||
|
||||
void
|
||||
ibuf_from_buffer(struct ibuf *buf, void *data, size_t len)
|
||||
{
|
||||
memset(buf, 0, sizeof(*buf));
|
||||
buf->buf = data;
|
||||
buf->size = buf->wpos = len;
|
||||
buf->fd = -1;
|
||||
}
|
||||
|
||||
void
|
||||
ibuf_from_ibuf(struct ibuf *buf, const struct ibuf *from)
|
||||
{
|
||||
ibuf_from_buffer(buf, ibuf_data(from), ibuf_size(from));
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_get(struct ibuf *buf, void *data, size_t len)
|
||||
{
|
||||
if (ibuf_size(buf) < len) {
|
||||
errno = EBADMSG;
|
||||
return (-1);
|
||||
}
|
||||
|
||||
memcpy(data, ibuf_data(buf), len);
|
||||
buf->rpos += len;
|
||||
return (0);
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_get_ibuf(struct ibuf *buf, size_t len, struct ibuf *new)
|
||||
{
|
||||
if (ibuf_size(buf) < len) {
|
||||
errno = EBADMSG;
|
||||
return (-1);
|
||||
}
|
||||
|
||||
ibuf_from_buffer(new, ibuf_data(buf), len);
|
||||
buf->rpos += len;
|
||||
return (0);
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_get_n8(struct ibuf *buf, uint8_t *value)
|
||||
{
|
||||
return ibuf_get(buf, value, sizeof(*value));
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_get_n16(struct ibuf *buf, uint16_t *value)
|
||||
{
|
||||
int rv;
|
||||
|
||||
rv = ibuf_get(buf, value, sizeof(*value));
|
||||
*value = be16toh(*value);
|
||||
return (rv);
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_get_n32(struct ibuf *buf, uint32_t *value)
|
||||
{
|
||||
int rv;
|
||||
|
||||
rv = ibuf_get(buf, value, sizeof(*value));
|
||||
*value = be32toh(*value);
|
||||
return (rv);
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_get_n64(struct ibuf *buf, uint64_t *value)
|
||||
{
|
||||
int rv;
|
||||
|
||||
rv = ibuf_get(buf, value, sizeof(*value));
|
||||
*value = be64toh(*value);
|
||||
return (rv);
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_get_h16(struct ibuf *buf, uint16_t *value)
|
||||
{
|
||||
return ibuf_get(buf, value, sizeof(*value));
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_get_h32(struct ibuf *buf, uint32_t *value)
|
||||
{
|
||||
return ibuf_get(buf, value, sizeof(*value));
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_get_h64(struct ibuf *buf, uint64_t *value)
|
||||
{
|
||||
return ibuf_get(buf, value, sizeof(*value));
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_skip(struct ibuf *buf, size_t len)
|
||||
{
|
||||
if (ibuf_size(buf) < len) {
|
||||
errno = EBADMSG;
|
||||
return (-1);
|
||||
}
|
||||
|
||||
buf->rpos += len;
|
||||
return (0);
|
||||
}
|
||||
|
||||
void
|
||||
ibuf_free(struct ibuf *buf)
|
||||
{
|
||||
if (buf == NULL)
|
||||
return;
|
||||
if (buf->max == 0) /* if buf lives on the stack */
|
||||
abort(); /* abort before causing more harm */
|
||||
if (buf->fd != -1)
|
||||
close(buf->fd);
|
||||
freezero(buf->buf, buf->size);
|
||||
free(buf);
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_fd_avail(struct ibuf *buf)
|
||||
{
|
||||
return (buf->fd != -1);
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_fd_get(struct ibuf *buf)
|
||||
{
|
||||
int fd;
|
||||
|
||||
fd = buf->fd;
|
||||
buf->fd = -1;
|
||||
return (fd);
|
||||
}
|
||||
|
||||
void
|
||||
ibuf_fd_set(struct ibuf *buf, int fd)
|
||||
{
|
||||
if (buf->max == 0) /* if buf lives on the stack */
|
||||
abort(); /* abort before causing more harm */
|
||||
if (buf->fd != -1)
|
||||
close(buf->fd);
|
||||
buf->fd = fd;
|
||||
}
|
||||
|
||||
int
|
||||
ibuf_write(struct msgbuf *msgbuf)
|
||||
{
|
||||
|
@ -153,8 +557,8 @@ ibuf_write(struct msgbuf *msgbuf)
|
|||
TAILQ_FOREACH(buf, &msgbuf->bufs, entry) {
|
||||
if (i >= IOV_MAX)
|
||||
break;
|
||||
iov[i].iov_base = buf->buf + buf->rpos;
|
||||
iov[i].iov_len = buf->wpos - buf->rpos;
|
||||
iov[i].iov_base = ibuf_data(buf);
|
||||
iov[i].iov_len = ibuf_size(buf);
|
||||
i++;
|
||||
}
|
||||
|
||||
|
@ -177,15 +581,6 @@ again:
|
|||
return (1);
|
||||
}
|
||||
|
||||
void
|
||||
ibuf_free(struct ibuf *buf)
|
||||
{
|
||||
if (buf == NULL)
|
||||
return;
|
||||
freezero(buf->buf, buf->size);
|
||||
free(buf);
|
||||
}
|
||||
|
||||
void
|
||||
msgbuf_init(struct msgbuf *msgbuf)
|
||||
{
|
||||
|
@ -194,7 +589,7 @@ msgbuf_init(struct msgbuf *msgbuf)
|
|||
TAILQ_INIT(&msgbuf->bufs);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
msgbuf_drain(struct msgbuf *msgbuf, size_t n)
|
||||
{
|
||||
struct ibuf *buf, *next;
|
||||
|
@ -202,8 +597,8 @@ msgbuf_drain(struct msgbuf *msgbuf, size_t n)
|
|||
for (buf = TAILQ_FIRST(&msgbuf->bufs); buf != NULL && n > 0;
|
||||
buf = next) {
|
||||
next = TAILQ_NEXT(buf, entry);
|
||||
if (buf->rpos + n >= buf->wpos) {
|
||||
n -= buf->wpos - buf->rpos;
|
||||
if (n >= ibuf_size(buf)) {
|
||||
n -= ibuf_size(buf);
|
||||
ibuf_dequeue(msgbuf, buf);
|
||||
} else {
|
||||
buf->rpos += n;
|
||||
|
@ -225,7 +620,7 @@ int
|
|||
msgbuf_write(struct msgbuf *msgbuf)
|
||||
{
|
||||
struct iovec iov[IOV_MAX];
|
||||
struct ibuf *buf;
|
||||
struct ibuf *buf, *buf0 = NULL;
|
||||
unsigned int i = 0;
|
||||
ssize_t n;
|
||||
struct msghdr msg;
|
||||
|
@ -241,24 +636,26 @@ msgbuf_write(struct msgbuf *msgbuf)
|
|||
TAILQ_FOREACH(buf, &msgbuf->bufs, entry) {
|
||||
if (i >= IOV_MAX)
|
||||
break;
|
||||
iov[i].iov_base = buf->buf + buf->rpos;
|
||||
iov[i].iov_len = buf->wpos - buf->rpos;
|
||||
if (i > 0 && buf->fd != -1)
|
||||
break;
|
||||
iov[i].iov_base = ibuf_data(buf);
|
||||
iov[i].iov_len = ibuf_size(buf);
|
||||
i++;
|
||||
if (buf->fd != -1)
|
||||
break;
|
||||
buf0 = buf;
|
||||
}
|
||||
|
||||
msg.msg_iov = iov;
|
||||
msg.msg_iovlen = i;
|
||||
|
||||
if (buf != NULL && buf->fd != -1) {
|
||||
if (buf0 != NULL) {
|
||||
msg.msg_control = (caddr_t)&cmsgbuf.buf;
|
||||
msg.msg_controllen = sizeof(cmsgbuf.buf);
|
||||
cmsg = CMSG_FIRSTHDR(&msg);
|
||||
cmsg->cmsg_len = CMSG_LEN(sizeof(int));
|
||||
cmsg->cmsg_level = SOL_SOCKET;
|
||||
cmsg->cmsg_type = SCM_RIGHTS;
|
||||
*(int *)CMSG_DATA(cmsg) = buf->fd;
|
||||
*(int *)CMSG_DATA(cmsg) = buf0->fd;
|
||||
}
|
||||
|
||||
again:
|
||||
|
@ -279,9 +676,9 @@ again:
|
|||
* assumption: fd got sent if sendmsg sent anything
|
||||
* this works because fds are passed one at a time
|
||||
*/
|
||||
if (buf != NULL && buf->fd != -1) {
|
||||
close(buf->fd);
|
||||
buf->fd = -1;
|
||||
if (buf0 != NULL) {
|
||||
close(buf0->fd);
|
||||
buf0->fd = -1;
|
||||
}
|
||||
|
||||
msgbuf_drain(msgbuf, n);
|
||||
|
@ -289,9 +686,17 @@ again:
|
|||
return (1);
|
||||
}
|
||||
|
||||
uint32_t
|
||||
msgbuf_queuelen(struct msgbuf *msgbuf)
|
||||
{
|
||||
return (msgbuf->queued);
|
||||
}
|
||||
|
||||
static void
|
||||
ibuf_enqueue(struct msgbuf *msgbuf, struct ibuf *buf)
|
||||
{
|
||||
if (buf->max == 0) /* if buf lives on the stack */
|
||||
abort(); /* abort before causing more harm */
|
||||
TAILQ_INSERT_TAIL(&msgbuf->bufs, buf, entry);
|
||||
msgbuf->queued++;
|
||||
}
|
||||
|
@ -300,10 +705,6 @@ static void
|
|||
ibuf_dequeue(struct msgbuf *msgbuf, struct ibuf *buf)
|
||||
{
|
||||
TAILQ_REMOVE(&msgbuf->bufs, buf, entry);
|
||||
|
||||
if (buf->fd != -1)
|
||||
close(buf->fd);
|
||||
|
||||
msgbuf->queued--;
|
||||
ibuf_free(buf);
|
||||
}
|
||||
|
|
286
compat/imsg.c
286
compat/imsg.c
|
@ -1,6 +1,7 @@
|
|||
/* $OpenBSD: imsg.c,v 1.16 2017/12/14 09:27:44 kettenis Exp $ */
|
||||
/* $OpenBSD: imsg.c,v 1.23 2023/12/12 15:47:41 claudio Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2023 Claudio Jeker <claudio@openbsd.org>
|
||||
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
|
@ -28,23 +29,28 @@
|
|||
#include "compat.h"
|
||||
#include "imsg.h"
|
||||
|
||||
struct imsg_fd {
|
||||
TAILQ_ENTRY(imsg_fd) entry;
|
||||
int fd;
|
||||
};
|
||||
|
||||
int imsg_fd_overhead = 0;
|
||||
|
||||
static int imsg_get_fd(struct imsgbuf *);
|
||||
static int imsg_dequeue_fd(struct imsgbuf *);
|
||||
|
||||
void
|
||||
imsg_init(struct imsgbuf *ibuf, int fd)
|
||||
imsg_init(struct imsgbuf *imsgbuf, int fd)
|
||||
{
|
||||
msgbuf_init(&ibuf->w);
|
||||
memset(&ibuf->r, 0, sizeof(ibuf->r));
|
||||
ibuf->fd = fd;
|
||||
ibuf->w.fd = fd;
|
||||
ibuf->pid = getpid();
|
||||
TAILQ_INIT(&ibuf->fds);
|
||||
msgbuf_init(&imsgbuf->w);
|
||||
memset(&imsgbuf->r, 0, sizeof(imsgbuf->r));
|
||||
imsgbuf->fd = fd;
|
||||
imsgbuf->w.fd = fd;
|
||||
imsgbuf->pid = getpid();
|
||||
TAILQ_INIT(&imsgbuf->fds);
|
||||
}
|
||||
|
||||
ssize_t
|
||||
imsg_read(struct imsgbuf *ibuf)
|
||||
imsg_read(struct imsgbuf *imsgbuf)
|
||||
{
|
||||
struct msghdr msg;
|
||||
struct cmsghdr *cmsg;
|
||||
|
@ -60,8 +66,8 @@ imsg_read(struct imsgbuf *ibuf)
|
|||
memset(&msg, 0, sizeof(msg));
|
||||
memset(&cmsgbuf, 0, sizeof(cmsgbuf));
|
||||
|
||||
iov.iov_base = ibuf->r.buf + ibuf->r.wpos;
|
||||
iov.iov_len = sizeof(ibuf->r.buf) - ibuf->r.wpos;
|
||||
iov.iov_base = imsgbuf->r.buf + imsgbuf->r.wpos;
|
||||
iov.iov_len = sizeof(imsgbuf->r.buf) - imsgbuf->r.wpos;
|
||||
msg.msg_iov = &iov;
|
||||
msg.msg_iovlen = 1;
|
||||
msg.msg_control = &cmsgbuf.buf;
|
||||
|
@ -79,13 +85,13 @@ again:
|
|||
return (-1);
|
||||
}
|
||||
|
||||
if ((n = recvmsg(ibuf->fd, &msg, 0)) == -1) {
|
||||
if ((n = recvmsg(imsgbuf->fd, &msg, 0)) == -1) {
|
||||
if (errno == EINTR)
|
||||
goto again;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
ibuf->r.wpos += n;
|
||||
imsgbuf->r.wpos += n;
|
||||
|
||||
for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL;
|
||||
cmsg = CMSG_NXTHDR(&msg, cmsg)) {
|
||||
|
@ -105,7 +111,7 @@ again:
|
|||
fd = ((int *)CMSG_DATA(cmsg))[i];
|
||||
if (ifd != NULL) {
|
||||
ifd->fd = fd;
|
||||
TAILQ_INSERT_TAIL(&ibuf->fds, ifd,
|
||||
TAILQ_INSERT_TAIL(&imsgbuf->fds, ifd,
|
||||
entry);
|
||||
ifd = NULL;
|
||||
} else
|
||||
|
@ -121,94 +127,235 @@ fail:
|
|||
}
|
||||
|
||||
ssize_t
|
||||
imsg_get(struct imsgbuf *ibuf, struct imsg *imsg)
|
||||
imsg_get(struct imsgbuf *imsgbuf, struct imsg *imsg)
|
||||
{
|
||||
struct imsg m;
|
||||
size_t av, left, datalen;
|
||||
|
||||
av = ibuf->r.wpos;
|
||||
av = imsgbuf->r.wpos;
|
||||
|
||||
if (IMSG_HEADER_SIZE > av)
|
||||
return (0);
|
||||
|
||||
memcpy(&imsg->hdr, ibuf->r.buf, sizeof(imsg->hdr));
|
||||
if (imsg->hdr.len < IMSG_HEADER_SIZE ||
|
||||
imsg->hdr.len > MAX_IMSGSIZE) {
|
||||
memcpy(&m.hdr, imsgbuf->r.buf, sizeof(m.hdr));
|
||||
if (m.hdr.len < IMSG_HEADER_SIZE ||
|
||||
m.hdr.len > MAX_IMSGSIZE) {
|
||||
errno = ERANGE;
|
||||
return (-1);
|
||||
}
|
||||
if (imsg->hdr.len > av)
|
||||
if (m.hdr.len > av)
|
||||
return (0);
|
||||
datalen = imsg->hdr.len - IMSG_HEADER_SIZE;
|
||||
ibuf->r.rptr = ibuf->r.buf + IMSG_HEADER_SIZE;
|
||||
if (datalen == 0)
|
||||
imsg->data = NULL;
|
||||
else if ((imsg->data = malloc(datalen)) == NULL)
|
||||
return (-1);
|
||||
|
||||
if (imsg->hdr.flags & IMSGF_HASFD)
|
||||
imsg->fd = imsg_get_fd(ibuf);
|
||||
else
|
||||
imsg->fd = -1;
|
||||
m.fd = -1;
|
||||
m.buf = NULL;
|
||||
m.data = NULL;
|
||||
|
||||
memcpy(imsg->data, ibuf->r.rptr, datalen);
|
||||
datalen = m.hdr.len - IMSG_HEADER_SIZE;
|
||||
imsgbuf->r.rptr = imsgbuf->r.buf + IMSG_HEADER_SIZE;
|
||||
if (datalen != 0) {
|
||||
if ((m.buf = ibuf_open(datalen)) == NULL)
|
||||
return (-1);
|
||||
if (ibuf_add(m.buf, imsgbuf->r.rptr, datalen) == -1) {
|
||||
/* this should never fail */
|
||||
ibuf_free(m.buf);
|
||||
return (-1);
|
||||
}
|
||||
m.data = ibuf_data(m.buf);
|
||||
}
|
||||
|
||||
if (imsg->hdr.len < av) {
|
||||
left = av - imsg->hdr.len;
|
||||
memmove(&ibuf->r.buf, ibuf->r.buf + imsg->hdr.len, left);
|
||||
ibuf->r.wpos = left;
|
||||
if (m.hdr.flags & IMSGF_HASFD)
|
||||
m.fd = imsg_dequeue_fd(imsgbuf);
|
||||
|
||||
if (m.hdr.len < av) {
|
||||
left = av - m.hdr.len;
|
||||
memmove(&imsgbuf->r.buf, imsgbuf->r.buf + m.hdr.len, left);
|
||||
imsgbuf->r.wpos = left;
|
||||
} else
|
||||
ibuf->r.wpos = 0;
|
||||
imsgbuf->r.wpos = 0;
|
||||
|
||||
*imsg = m;
|
||||
return (datalen + IMSG_HEADER_SIZE);
|
||||
}
|
||||
|
||||
int
|
||||
imsg_compose(struct imsgbuf *ibuf, uint32_t type, uint32_t peerid, pid_t pid,
|
||||
int fd, const void *data, uint16_t datalen)
|
||||
imsg_get_ibuf(struct imsg *imsg, struct ibuf *ibuf)
|
||||
{
|
||||
if (imsg->buf == NULL) {
|
||||
errno = EBADMSG;
|
||||
return (-1);
|
||||
}
|
||||
return ibuf_get_ibuf(imsg->buf, ibuf_size(imsg->buf), ibuf);
|
||||
}
|
||||
|
||||
int
|
||||
imsg_get_data(struct imsg *imsg, void *data, size_t len)
|
||||
{
|
||||
if (len == 0) {
|
||||
errno = EINVAL;
|
||||
return (-1);
|
||||
}
|
||||
if (imsg->buf == NULL || ibuf_size(imsg->buf) != len) {
|
||||
errno = EBADMSG;
|
||||
return (-1);
|
||||
}
|
||||
return ibuf_get(imsg->buf, data, len);
|
||||
}
|
||||
|
||||
int
|
||||
imsg_get_fd(struct imsg *imsg)
|
||||
{
|
||||
int fd = imsg->fd;
|
||||
|
||||
imsg->fd = -1;
|
||||
return fd;
|
||||
}
|
||||
|
||||
uint32_t
|
||||
imsg_get_id(struct imsg *imsg)
|
||||
{
|
||||
return (imsg->hdr.peerid);
|
||||
}
|
||||
|
||||
size_t
|
||||
imsg_get_len(struct imsg *imsg)
|
||||
{
|
||||
if (imsg->buf == NULL)
|
||||
return 0;
|
||||
return ibuf_size(imsg->buf);
|
||||
}
|
||||
|
||||
pid_t
|
||||
imsg_get_pid(struct imsg *imsg)
|
||||
{
|
||||
return (imsg->hdr.pid);
|
||||
}
|
||||
|
||||
uint32_t
|
||||
imsg_get_type(struct imsg *imsg)
|
||||
{
|
||||
return (imsg->hdr.type);
|
||||
}
|
||||
|
||||
int
|
||||
imsg_compose(struct imsgbuf *imsgbuf, uint32_t type, uint32_t id, pid_t pid,
|
||||
int fd, const void *data, size_t datalen)
|
||||
{
|
||||
struct ibuf *wbuf;
|
||||
|
||||
if ((wbuf = imsg_create(ibuf, type, peerid, pid, datalen)) == NULL)
|
||||
if ((wbuf = imsg_create(imsgbuf, type, id, pid, datalen)) == NULL)
|
||||
return (-1);
|
||||
|
||||
if (imsg_add(wbuf, data, datalen) == -1)
|
||||
return (-1);
|
||||
|
||||
wbuf->fd = fd;
|
||||
|
||||
imsg_close(ibuf, wbuf);
|
||||
ibuf_fd_set(wbuf, fd);
|
||||
imsg_close(imsgbuf, wbuf);
|
||||
|
||||
return (1);
|
||||
}
|
||||
|
||||
int
|
||||
imsg_composev(struct imsgbuf *ibuf, uint32_t type, uint32_t peerid, pid_t pid,
|
||||
imsg_composev(struct imsgbuf *imsgbuf, uint32_t type, uint32_t id, pid_t pid,
|
||||
int fd, const struct iovec *iov, int iovcnt)
|
||||
{
|
||||
struct ibuf *wbuf;
|
||||
int i, datalen = 0;
|
||||
int i;
|
||||
size_t datalen = 0;
|
||||
|
||||
for (i = 0; i < iovcnt; i++)
|
||||
datalen += iov[i].iov_len;
|
||||
|
||||
if ((wbuf = imsg_create(ibuf, type, peerid, pid, datalen)) == NULL)
|
||||
if ((wbuf = imsg_create(imsgbuf, type, id, pid, datalen)) == NULL)
|
||||
return (-1);
|
||||
|
||||
for (i = 0; i < iovcnt; i++)
|
||||
if (imsg_add(wbuf, iov[i].iov_base, iov[i].iov_len) == -1)
|
||||
return (-1);
|
||||
|
||||
wbuf->fd = fd;
|
||||
|
||||
imsg_close(ibuf, wbuf);
|
||||
ibuf_fd_set(wbuf, fd);
|
||||
imsg_close(imsgbuf, wbuf);
|
||||
|
||||
return (1);
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
/*
|
||||
* Enqueue imsg with payload from ibuf buf. fd passing is not possible
|
||||
* with this function.
|
||||
*/
|
||||
int
|
||||
imsg_compose_ibuf(struct imsgbuf *imsgbuf, uint32_t type, uint32_t id,
|
||||
pid_t pid, struct ibuf *buf)
|
||||
{
|
||||
struct ibuf *hdrbuf = NULL;
|
||||
struct imsg_hdr hdr;
|
||||
int save_errno;
|
||||
|
||||
if (ibuf_size(buf) + IMSG_HEADER_SIZE > MAX_IMSGSIZE) {
|
||||
errno = ERANGE;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
hdr.type = type;
|
||||
hdr.len = ibuf_size(buf) + IMSG_HEADER_SIZE;
|
||||
hdr.flags = 0;
|
||||
hdr.peerid = id;
|
||||
if ((hdr.pid = pid) == 0)
|
||||
hdr.pid = imsgbuf->pid;
|
||||
|
||||
if ((hdrbuf = ibuf_open(IMSG_HEADER_SIZE)) == NULL)
|
||||
goto fail;
|
||||
if (imsg_add(hdrbuf, &hdr, sizeof(hdr)) == -1)
|
||||
goto fail;
|
||||
|
||||
ibuf_close(&imsgbuf->w, hdrbuf);
|
||||
ibuf_close(&imsgbuf->w, buf);
|
||||
return (1);
|
||||
|
||||
fail:
|
||||
save_errno = errno;
|
||||
ibuf_free(buf);
|
||||
ibuf_free(hdrbuf);
|
||||
errno = save_errno;
|
||||
return (-1);
|
||||
}
|
||||
|
||||
/*
|
||||
* Forward imsg to another channel. Any attached fd is closed.
|
||||
*/
|
||||
int
|
||||
imsg_forward(struct imsgbuf *imsgbuf, struct imsg *msg)
|
||||
{
|
||||
struct ibuf *wbuf;
|
||||
size_t len = 0;
|
||||
|
||||
if (msg->fd != -1) {
|
||||
close(msg->fd);
|
||||
msg->fd = -1;
|
||||
}
|
||||
|
||||
if (msg->buf != NULL) {
|
||||
ibuf_rewind(msg->buf);
|
||||
len = ibuf_size(msg->buf);
|
||||
}
|
||||
|
||||
if ((wbuf = imsg_create(imsgbuf, msg->hdr.type, msg->hdr.peerid,
|
||||
msg->hdr.pid, len)) == NULL)
|
||||
return (-1);
|
||||
|
||||
if (msg->buf != NULL) {
|
||||
if (ibuf_add_buf(wbuf, msg->buf) == -1) {
|
||||
ibuf_free(wbuf);
|
||||
return (-1);
|
||||
}
|
||||
}
|
||||
|
||||
imsg_close(imsgbuf, wbuf);
|
||||
return (1);
|
||||
}
|
||||
|
||||
struct ibuf *
|
||||
imsg_create(struct imsgbuf *ibuf, uint32_t type, uint32_t peerid, pid_t pid,
|
||||
uint16_t datalen)
|
||||
imsg_create(struct imsgbuf *imsgbuf, uint32_t type, uint32_t id, pid_t pid,
|
||||
size_t datalen)
|
||||
{
|
||||
struct ibuf *wbuf;
|
||||
struct imsg_hdr hdr;
|
||||
|
@ -221,9 +368,9 @@ imsg_create(struct imsgbuf *ibuf, uint32_t type, uint32_t peerid, pid_t pid,
|
|||
|
||||
hdr.type = type;
|
||||
hdr.flags = 0;
|
||||
hdr.peerid = peerid;
|
||||
hdr.peerid = id;
|
||||
if ((hdr.pid = pid) == 0)
|
||||
hdr.pid = ibuf->pid;
|
||||
hdr.pid = imsgbuf->pid;
|
||||
if ((wbuf = ibuf_dynamic(datalen, MAX_IMSGSIZE)) == NULL) {
|
||||
return (NULL);
|
||||
}
|
||||
|
@ -234,7 +381,7 @@ imsg_create(struct imsgbuf *ibuf, uint32_t type, uint32_t peerid, pid_t pid,
|
|||
}
|
||||
|
||||
int
|
||||
imsg_add(struct ibuf *msg, const void *data, uint16_t datalen)
|
||||
imsg_add(struct ibuf *msg, const void *data, size_t datalen)
|
||||
{
|
||||
if (datalen)
|
||||
if (ibuf_add(msg, data, datalen) == -1) {
|
||||
|
@ -245,58 +392,57 @@ imsg_add(struct ibuf *msg, const void *data, uint16_t datalen)
|
|||
}
|
||||
|
||||
void
|
||||
imsg_close(struct imsgbuf *ibuf, struct ibuf *msg)
|
||||
imsg_close(struct imsgbuf *imsgbuf, struct ibuf *msg)
|
||||
{
|
||||
struct imsg_hdr *hdr;
|
||||
|
||||
hdr = (struct imsg_hdr *)msg->buf;
|
||||
|
||||
hdr->flags &= ~IMSGF_HASFD;
|
||||
if (msg->fd != -1)
|
||||
if (ibuf_fd_avail(msg))
|
||||
hdr->flags |= IMSGF_HASFD;
|
||||
hdr->len = ibuf_size(msg);
|
||||
|
||||
hdr->len = (uint16_t)msg->wpos;
|
||||
|
||||
ibuf_close(&ibuf->w, msg);
|
||||
ibuf_close(&imsgbuf->w, msg);
|
||||
}
|
||||
|
||||
void
|
||||
imsg_free(struct imsg *imsg)
|
||||
{
|
||||
freezero(imsg->data, imsg->hdr.len - IMSG_HEADER_SIZE);
|
||||
ibuf_free(imsg->buf);
|
||||
}
|
||||
|
||||
static int
|
||||
imsg_get_fd(struct imsgbuf *ibuf)
|
||||
imsg_dequeue_fd(struct imsgbuf *imsgbuf)
|
||||
{
|
||||
int fd;
|
||||
struct imsg_fd *ifd;
|
||||
|
||||
if ((ifd = TAILQ_FIRST(&ibuf->fds)) == NULL)
|
||||
if ((ifd = TAILQ_FIRST(&imsgbuf->fds)) == NULL)
|
||||
return (-1);
|
||||
|
||||
fd = ifd->fd;
|
||||
TAILQ_REMOVE(&ibuf->fds, ifd, entry);
|
||||
TAILQ_REMOVE(&imsgbuf->fds, ifd, entry);
|
||||
free(ifd);
|
||||
|
||||
return (fd);
|
||||
}
|
||||
|
||||
int
|
||||
imsg_flush(struct imsgbuf *ibuf)
|
||||
imsg_flush(struct imsgbuf *imsgbuf)
|
||||
{
|
||||
while (ibuf->w.queued)
|
||||
if (msgbuf_write(&ibuf->w) <= 0)
|
||||
while (imsgbuf->w.queued)
|
||||
if (msgbuf_write(&imsgbuf->w) <= 0)
|
||||
return (-1);
|
||||
return (0);
|
||||
}
|
||||
|
||||
void
|
||||
imsg_clear(struct imsgbuf *ibuf)
|
||||
imsg_clear(struct imsgbuf *imsgbuf)
|
||||
{
|
||||
int fd;
|
||||
|
||||
msgbuf_clear(&ibuf->w);
|
||||
while ((fd = imsg_get_fd(ibuf)) != -1)
|
||||
msgbuf_clear(&imsgbuf->w);
|
||||
while ((fd = imsg_dequeue_fd(imsgbuf)) != -1)
|
||||
close(fd);
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
/* $OpenBSD: imsg.h,v 1.5 2019/01/20 02:50:03 bcook Exp $ */
|
||||
/* $OpenBSD: imsg.h,v 1.8 2023/12/12 15:47:41 claudio Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2023 Claudio Jeker <claudio@openbsd.org>
|
||||
* Copyright (c) 2006, 2007 Pierre-Yves Ritschard <pyr@openbsd.org>
|
||||
* Copyright (c) 2006, 2007, 2008 Reyk Floeter <reyk@openbsd.org>
|
||||
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
|
||||
|
@ -21,7 +22,7 @@
|
|||
#ifndef _IMSG_H_
|
||||
#define _IMSG_H_
|
||||
|
||||
#include <stdint.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#define IBUF_READ_SIZE 65535
|
||||
#define IMSG_HEADER_SIZE sizeof(struct imsg_hdr)
|
||||
|
@ -49,11 +50,7 @@ struct ibuf_read {
|
|||
size_t wpos;
|
||||
};
|
||||
|
||||
struct imsg_fd {
|
||||
TAILQ_ENTRY(imsg_fd) entry;
|
||||
int fd;
|
||||
};
|
||||
|
||||
struct imsg_fd;
|
||||
struct imsgbuf {
|
||||
TAILQ_HEAD(, imsg_fd) fds;
|
||||
struct ibuf_read r;
|
||||
|
@ -76,35 +73,83 @@ struct imsg {
|
|||
struct imsg_hdr hdr;
|
||||
int fd;
|
||||
void *data;
|
||||
struct ibuf *buf;
|
||||
};
|
||||
|
||||
struct iovec;
|
||||
|
||||
/* buffer.c */
|
||||
/* imsg-buffer.c */
|
||||
struct ibuf *ibuf_open(size_t);
|
||||
struct ibuf *ibuf_dynamic(size_t, size_t);
|
||||
int ibuf_add(struct ibuf *, const void *, size_t);
|
||||
int ibuf_add_buf(struct ibuf *, const struct ibuf *);
|
||||
int ibuf_add_ibuf(struct ibuf *, const struct ibuf *);
|
||||
int ibuf_add_zero(struct ibuf *, size_t);
|
||||
int ibuf_add_n8(struct ibuf *, uint64_t);
|
||||
int ibuf_add_n16(struct ibuf *, uint64_t);
|
||||
int ibuf_add_n32(struct ibuf *, uint64_t);
|
||||
int ibuf_add_n64(struct ibuf *, uint64_t);
|
||||
int ibuf_add_h16(struct ibuf *, uint64_t);
|
||||
int ibuf_add_h32(struct ibuf *, uint64_t);
|
||||
int ibuf_add_h64(struct ibuf *, uint64_t);
|
||||
void *ibuf_reserve(struct ibuf *, size_t);
|
||||
void *ibuf_seek(struct ibuf *, size_t, size_t);
|
||||
size_t ibuf_size(struct ibuf *);
|
||||
size_t ibuf_left(struct ibuf *);
|
||||
int ibuf_set(struct ibuf *, size_t, const void *, size_t);
|
||||
int ibuf_set_n8(struct ibuf *, size_t, uint64_t);
|
||||
int ibuf_set_n16(struct ibuf *, size_t, uint64_t);
|
||||
int ibuf_set_n32(struct ibuf *, size_t, uint64_t);
|
||||
int ibuf_set_n64(struct ibuf *, size_t, uint64_t);
|
||||
int ibuf_set_h16(struct ibuf *, size_t, uint64_t);
|
||||
int ibuf_set_h32(struct ibuf *, size_t, uint64_t);
|
||||
int ibuf_set_h64(struct ibuf *, size_t, uint64_t);
|
||||
void *ibuf_data(const struct ibuf *);
|
||||
size_t ibuf_size(const struct ibuf *);
|
||||
size_t ibuf_left(const struct ibuf *);
|
||||
int ibuf_truncate(struct ibuf *, size_t);
|
||||
void ibuf_rewind(struct ibuf *);
|
||||
void ibuf_close(struct msgbuf *, struct ibuf *);
|
||||
int ibuf_write(struct msgbuf *);
|
||||
void ibuf_from_buffer(struct ibuf *, void *, size_t);
|
||||
void ibuf_from_ibuf(struct ibuf *, const struct ibuf *);
|
||||
int ibuf_get(struct ibuf *, void *, size_t);
|
||||
int ibuf_get_ibuf(struct ibuf *, size_t, struct ibuf *);
|
||||
int ibuf_get_n8(struct ibuf *, uint8_t *);
|
||||
int ibuf_get_n16(struct ibuf *, uint16_t *);
|
||||
int ibuf_get_n32(struct ibuf *, uint32_t *);
|
||||
int ibuf_get_n64(struct ibuf *, uint64_t *);
|
||||
int ibuf_get_h16(struct ibuf *, uint16_t *);
|
||||
int ibuf_get_h32(struct ibuf *, uint32_t *);
|
||||
int ibuf_get_h64(struct ibuf *, uint64_t *);
|
||||
int ibuf_skip(struct ibuf *, size_t);
|
||||
void ibuf_free(struct ibuf *);
|
||||
int ibuf_fd_avail(struct ibuf *);
|
||||
int ibuf_fd_get(struct ibuf *);
|
||||
void ibuf_fd_set(struct ibuf *, int);
|
||||
int ibuf_write(struct msgbuf *);
|
||||
void msgbuf_init(struct msgbuf *);
|
||||
void msgbuf_clear(struct msgbuf *);
|
||||
uint32_t msgbuf_queuelen(struct msgbuf *);
|
||||
int msgbuf_write(struct msgbuf *);
|
||||
void msgbuf_drain(struct msgbuf *, size_t);
|
||||
|
||||
/* imsg.c */
|
||||
void imsg_init(struct imsgbuf *, int);
|
||||
ssize_t imsg_read(struct imsgbuf *);
|
||||
ssize_t imsg_get(struct imsgbuf *, struct imsg *);
|
||||
int imsg_get_ibuf(struct imsg *, struct ibuf *);
|
||||
int imsg_get_data(struct imsg *, void *, size_t);
|
||||
int imsg_get_fd(struct imsg *);
|
||||
uint32_t imsg_get_id(struct imsg *);
|
||||
size_t imsg_get_len(struct imsg *);
|
||||
pid_t imsg_get_pid(struct imsg *);
|
||||
uint32_t imsg_get_type(struct imsg *);
|
||||
int imsg_forward(struct imsgbuf *, struct imsg *);
|
||||
int imsg_compose(struct imsgbuf *, uint32_t, uint32_t, pid_t, int,
|
||||
const void *, uint16_t);
|
||||
const void *, size_t);
|
||||
int imsg_composev(struct imsgbuf *, uint32_t, uint32_t, pid_t, int,
|
||||
const struct iovec *, int);
|
||||
struct ibuf *imsg_create(struct imsgbuf *, uint32_t, uint32_t, pid_t, uint16_t);
|
||||
int imsg_add(struct ibuf *, const void *, uint16_t);
|
||||
int imsg_compose_ibuf(struct imsgbuf *, uint32_t, uint32_t, pid_t,
|
||||
struct ibuf *);
|
||||
struct ibuf *imsg_create(struct imsgbuf *, uint32_t, uint32_t, pid_t, size_t);
|
||||
int imsg_add(struct ibuf *, const void *, size_t);
|
||||
void imsg_close(struct imsgbuf *, struct ibuf *);
|
||||
void imsg_free(struct imsg *);
|
||||
int imsg_flush(struct imsgbuf *);
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
/*
|
||||
* Copyright (c) 2024 Nicholas Marriott <nicholas.marriott@gmail.com>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
|
||||
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
|
||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <arpa/inet.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include "compat.h"
|
||||
|
||||
uint64_t
|
||||
ntohll(uint64_t v)
|
||||
{
|
||||
uint32_t b;
|
||||
uint32_t t;
|
||||
|
||||
b = ntohl (v & 0xffffffff);
|
||||
t = ntohl (v >> 32);
|
||||
return ((uint64_t)b << 32 | t);
|
||||
}
|
|
@ -17,6 +17,7 @@
|
|||
#include <sys/types.h>
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "compat.h"
|
||||
|
|
|
@ -0,0 +1,228 @@
|
|||
/* $OpenBSD$ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2022 Nicholas Marriott <nicholas.marriott@gmail.com>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
|
||||
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
|
||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/un.h>
|
||||
|
||||
#include <systemd/sd-bus.h>
|
||||
#include <systemd/sd-daemon.h>
|
||||
#include <systemd/sd-login.h>
|
||||
#include <systemd/sd-id128.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "tmux.h"
|
||||
|
||||
int
|
||||
systemd_activated(void)
|
||||
{
|
||||
return (sd_listen_fds(0) >= 1);
|
||||
}
|
||||
|
||||
int
|
||||
systemd_create_socket(int flags, char **cause)
|
||||
{
|
||||
int fds;
|
||||
int fd;
|
||||
struct sockaddr_un sa;
|
||||
socklen_t addrlen = sizeof sa;
|
||||
|
||||
fds = sd_listen_fds(0);
|
||||
if (fds > 1) { /* too many file descriptors */
|
||||
errno = E2BIG;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if (fds == 1) { /* socket-activated */
|
||||
fd = SD_LISTEN_FDS_START;
|
||||
if (!sd_is_socket_unix(fd, SOCK_STREAM, 1, NULL, 0)) {
|
||||
errno = EPFNOSUPPORT;
|
||||
goto fail;
|
||||
}
|
||||
if (getsockname(fd, (struct sockaddr *)&sa, &addrlen) == -1)
|
||||
goto fail;
|
||||
socket_path = xstrdup(sa.sun_path);
|
||||
return (fd);
|
||||
}
|
||||
|
||||
return (server_create_socket(flags, cause));
|
||||
|
||||
fail:
|
||||
if (cause != NULL)
|
||||
xasprintf(cause, "systemd socket error (%s)", strerror(errno));
|
||||
return (-1);
|
||||
}
|
||||
|
||||
int
|
||||
systemd_move_pid_to_new_cgroup(pid_t pid, char **cause)
|
||||
{
|
||||
sd_bus_error error = SD_BUS_ERROR_NULL;
|
||||
sd_bus_message *m = NULL, *reply = NULL;
|
||||
sd_bus *bus = NULL;
|
||||
char *name, *desc, *slice;
|
||||
sd_id128_t uuid;
|
||||
int r;
|
||||
pid_t parent_pid;
|
||||
|
||||
/* Connect to the session bus. */
|
||||
r = sd_bus_default_user(&bus);
|
||||
if (r < 0) {
|
||||
xasprintf(cause, "failed to connect to session bus: %s",
|
||||
strerror(-r));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
/* Start building the method call. */
|
||||
r = sd_bus_message_new_method_call(bus, &m,
|
||||
"org.freedesktop.systemd1",
|
||||
"/org/freedesktop/systemd1",
|
||||
"org.freedesktop.systemd1.Manager",
|
||||
"StartTransientUnit");
|
||||
if (r < 0) {
|
||||
xasprintf(cause, "failed to create bus message: %s",
|
||||
strerror(-r));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
/* Generate a unique name for the new scope, to avoid collisions. */
|
||||
r = sd_id128_randomize(&uuid);
|
||||
if (r < 0) {
|
||||
xasprintf(cause, "failed to generate uuid: %s", strerror(-r));
|
||||
goto finish;
|
||||
}
|
||||
xasprintf(&name, "tmux-spawn-" SD_ID128_UUID_FORMAT_STR ".scope",
|
||||
SD_ID128_FORMAT_VAL(uuid));
|
||||
r = sd_bus_message_append(m, "s", name);
|
||||
free(name);
|
||||
if (r < 0) {
|
||||
xasprintf(cause, "failed to append to bus message: %s",
|
||||
strerror(-r));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
/* Mode: fail if there's a queued unit with the same name. */
|
||||
r = sd_bus_message_append(m, "s", "fail");
|
||||
if (r < 0) {
|
||||
xasprintf(cause, "failed to append to bus message: %s",
|
||||
strerror(-r));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
/* Start properties array. */
|
||||
r = sd_bus_message_open_container(m, 'a', "(sv)");
|
||||
if (r < 0) {
|
||||
xasprintf(cause, "failed to start properties array: %s",
|
||||
strerror(-r));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
parent_pid = getpid();
|
||||
xasprintf(&desc, "tmux child pane %ld launched by process %ld",
|
||||
(long)pid, (long)parent_pid);
|
||||
r = sd_bus_message_append(m, "(sv)", "Description", "s", desc);
|
||||
free(desc);
|
||||
if (r < 0) {
|
||||
xasprintf(cause, "failed to append to properties: %s",
|
||||
strerror(-r));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
/*
|
||||
* Make sure that the session shells are terminated with SIGHUP since
|
||||
* bash and friends tend to ignore SIGTERM.
|
||||
*/
|
||||
r = sd_bus_message_append(m, "(sv)", "SendSIGHUP", "b", 1);
|
||||
if (r < 0) {
|
||||
xasprintf(cause, "failed to append to properties: %s",
|
||||
strerror(-r));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
/*
|
||||
* Inherit the slice from the parent process, or default to
|
||||
* "app-tmux.slice" if that fails.
|
||||
*/
|
||||
r = sd_pid_get_user_slice(parent_pid, &slice);
|
||||
if (r < 0) {
|
||||
slice = xstrdup("app-tmux.slice");
|
||||
}
|
||||
r = sd_bus_message_append(m, "(sv)", "Slice", "s", slice);
|
||||
free(slice);
|
||||
if (r < 0) {
|
||||
xasprintf(cause, "failed to append to properties: %s",
|
||||
strerror(-r));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
/* PIDs to add to the scope: length - 1 array of uint32_t. */
|
||||
r = sd_bus_message_append(m, "(sv)", "PIDs", "au", 1, pid);
|
||||
if (r < 0) {
|
||||
xasprintf(cause, "failed to append to properties: %s",
|
||||
strerror(-r));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
/* Clean up the scope even if it fails. */
|
||||
r = sd_bus_message_append(m, "(sv)", "CollectMode", "s",
|
||||
"inactive-or-failed");
|
||||
if (r < 0) {
|
||||
xasprintf(cause, "failed to append to properties: %s",
|
||||
strerror(-r));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
/* End properties array. */
|
||||
r = sd_bus_message_close_container(m);
|
||||
if (r < 0) {
|
||||
xasprintf(cause, "failed to end properties array: %s",
|
||||
strerror(-r));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
/* aux is currently unused and should be passed an empty array. */
|
||||
r = sd_bus_message_append(m, "a(sa(sv))", 0);
|
||||
if (r < 0) {
|
||||
xasprintf(cause, "failed to append to bus message: %s",
|
||||
strerror(-r));
|
||||
goto finish;
|
||||
}
|
||||
|
||||
/* Call the method with a timeout of 1 second = 1e6 us. */
|
||||
r = sd_bus_call(bus, m, 1000000, &error, &reply);
|
||||
if (r < 0) {
|
||||
if (error.message != NULL) {
|
||||
/* We have a specific error message from sd-bus. */
|
||||
xasprintf(cause, "StartTransientUnit call failed: %s",
|
||||
error.message);
|
||||
} else {
|
||||
xasprintf(cause, "StartTransientUnit call failed: %s",
|
||||
strerror(-r));
|
||||
}
|
||||
goto finish;
|
||||
}
|
||||
|
||||
finish:
|
||||
sd_bus_error_free(&error);
|
||||
sd_bus_message_unref(m);
|
||||
sd_bus_message_unref(reply);
|
||||
sd_bus_unref(bus);
|
||||
|
||||
return (r);
|
||||
}
|
271
configure.ac
271
configure.ac
|
@ -1,6 +1,6 @@
|
|||
# configure.ac
|
||||
|
||||
AC_INIT([tmux], 3.2)
|
||||
AC_INIT([tmux], next-3.5)
|
||||
AC_PREREQ([2.60])
|
||||
|
||||
AC_CONFIG_AUX_DIR(etc)
|
||||
|
@ -24,27 +24,27 @@ SAVED_LDFLAGS="$LDFLAGS"
|
|||
# Is this oss-fuzz build?
|
||||
AC_ARG_ENABLE(
|
||||
fuzzing,
|
||||
AC_HELP_STRING(--enable-fuzzing, build fuzzers)
|
||||
AS_HELP_STRING(--enable-fuzzing, build fuzzers)
|
||||
)
|
||||
AC_ARG_VAR(
|
||||
FUZZING_LIBS,
|
||||
AC_HELP_STRING(libraries to link fuzzing targets with)
|
||||
AS_HELP_STRING(libraries to link fuzzing targets with)
|
||||
)
|
||||
|
||||
# Set up convenient fuzzing defaults before initializing compiler.
|
||||
if test "x$enable_fuzzing" = xyes; then
|
||||
AC_DEFINE(NEED_FUZZING)
|
||||
test "x$CC" == x && CC=clang
|
||||
test "x$FUZZING_LIBS" == x && \
|
||||
test "x$CC" = x && CC=clang
|
||||
test "x$FUZZING_LIBS" = x && \
|
||||
FUZZING_LIBS="-fsanitize=fuzzer"
|
||||
test "x$SAVED_CFLAGS" == x && \
|
||||
test "x$SAVED_CFLAGS" = x && \
|
||||
AM_CFLAGS="-g -fsanitize=fuzzer-no-link,address"
|
||||
fi
|
||||
|
||||
# Set up the compiler in two different ways and say yes we may want to install.
|
||||
AC_PROG_CC
|
||||
AM_PROG_CC_C_O
|
||||
AC_PROG_CC_C99
|
||||
m4_version_prereq(2.70, [AC_PROG_CC], [AC_PROG_CC_C99])
|
||||
AC_PROG_CPP
|
||||
AC_PROG_EGREP
|
||||
AC_PROG_INSTALL
|
||||
|
@ -59,21 +59,41 @@ test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
|
|||
case "x$VERSION" in xnext*) enable_debug=yes;; esac
|
||||
AC_ARG_ENABLE(
|
||||
debug,
|
||||
AC_HELP_STRING(--enable-debug, enable debug build flags),
|
||||
AS_HELP_STRING(--enable-debug, enable debug build flags),
|
||||
)
|
||||
AM_CONDITIONAL(IS_DEBUG, test "x$enable_debug" = xyes)
|
||||
|
||||
# Is this a static build?
|
||||
AC_ARG_ENABLE(
|
||||
static,
|
||||
AC_HELP_STRING(--enable-static, create a static build)
|
||||
AS_HELP_STRING(--enable-static, create a static build)
|
||||
)
|
||||
if test "x$enable_static" = xyes; then
|
||||
case "$host_os" in
|
||||
*darwin*)
|
||||
AC_MSG_ERROR([static linking is not supported on macOS])
|
||||
;;
|
||||
esac
|
||||
test "x$PKG_CONFIG" != x && PKG_CONFIG="$PKG_CONFIG --static"
|
||||
AM_LDFLAGS="-static $AM_LDFLAGS"
|
||||
LDFLAGS="$AM_LDFLAGS $SAVED_LDFLAGS"
|
||||
fi
|
||||
|
||||
# Allow default TERM to be set.
|
||||
AC_ARG_WITH(
|
||||
TERM,
|
||||
AS_HELP_STRING(--with-TERM, set default TERM),
|
||||
[DEFAULT_TERM=$withval],
|
||||
[DEFAULT_TERM=]
|
||||
)
|
||||
case "x$DEFAULT_TERM" in
|
||||
xscreen*|xtmux*|x)
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR("unsuitable TERM (must be screen* or tmux*)")
|
||||
;;
|
||||
esac
|
||||
|
||||
# Do we need fuzzers?
|
||||
AM_CONDITIONAL(NEED_FUZZING, test "x$enable_fuzzing" = xyes)
|
||||
|
||||
|
@ -108,6 +128,7 @@ AC_CHECK_HEADERS([ \
|
|||
sys/dir.h \
|
||||
sys/ndir.h \
|
||||
sys/tree.h \
|
||||
ucred.h \
|
||||
util.h \
|
||||
])
|
||||
|
||||
|
@ -126,6 +147,7 @@ AC_CHECK_FUNCS([ \
|
|||
flock \
|
||||
prctl \
|
||||
proc_pidinfo \
|
||||
getpeerucred \
|
||||
sysconf
|
||||
])
|
||||
|
||||
|
@ -140,9 +162,12 @@ AC_REPLACE_FUNCS([ \
|
|||
freezero \
|
||||
getdtablecount \
|
||||
getdtablesize \
|
||||
getpeereid \
|
||||
getline \
|
||||
getprogname \
|
||||
htonll \
|
||||
memmem \
|
||||
ntohll \
|
||||
setenv \
|
||||
setproctitle \
|
||||
strcasestr \
|
||||
|
@ -150,10 +175,20 @@ AC_REPLACE_FUNCS([ \
|
|||
strlcpy \
|
||||
strndup \
|
||||
strsep \
|
||||
strtonum \
|
||||
])
|
||||
AC_FUNC_STRNLEN
|
||||
|
||||
# Check if strtonum works.
|
||||
AC_MSG_CHECKING([for working strtonum])
|
||||
AC_RUN_IFELSE([AC_LANG_PROGRAM(
|
||||
[#include <stdlib.h>],
|
||||
[return (strtonum("0", 0, 1, NULL) == 0 ? 0 : 1);]
|
||||
)],
|
||||
[AC_DEFINE(HAVE_STRTONUM) AC_MSG_RESULT(yes)],
|
||||
[AC_LIBOBJ(strtonum) AC_MSG_RESULT(no)],
|
||||
[AC_LIBOBJ(strtonum) AC_MSG_RESULT(no)]
|
||||
)
|
||||
|
||||
# Clang sanitizers wrap reallocarray even if it isn't available on the target
|
||||
# system. When compiled it always returns NULL and crashes the program. To
|
||||
# detect this we need a more complicated test.
|
||||
|
@ -163,6 +198,7 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM(
|
|||
[return (reallocarray(NULL, 1, 1) == NULL);]
|
||||
)],
|
||||
AC_MSG_RESULT(yes),
|
||||
[AC_LIBOBJ(reallocarray) AC_MSG_RESULT([no])],
|
||||
[AC_LIBOBJ(reallocarray) AC_MSG_RESULT([no])]
|
||||
)
|
||||
AC_MSG_CHECKING([for working recallocarray])
|
||||
|
@ -171,6 +207,7 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM(
|
|||
[return (recallocarray(NULL, 1, 1, 1) == NULL);]
|
||||
)],
|
||||
AC_MSG_RESULT(yes),
|
||||
[AC_LIBOBJ(recallocarray) AC_MSG_RESULT([no])],
|
||||
[AC_LIBOBJ(recallocarray) AC_MSG_RESULT([no])]
|
||||
)
|
||||
|
||||
|
@ -232,6 +269,12 @@ if test "x$found_libevent" = xno; then
|
|||
AC_MSG_ERROR("libevent not found")
|
||||
fi
|
||||
|
||||
# Look for yacc.
|
||||
AC_CHECK_PROG(found_yacc, $YACC, yes, no)
|
||||
if test "x$found_yacc" = xno; then
|
||||
AC_MSG_ERROR("yacc not found")
|
||||
fi
|
||||
|
||||
# Look for ncurses or curses. Try pkg-config first then directly for the
|
||||
# library.
|
||||
PKG_CHECK_MODULES(
|
||||
|
@ -274,7 +317,7 @@ fi
|
|||
if test "x$found_ncurses" = xno; then
|
||||
AC_SEARCH_LIBS(
|
||||
setupterm,
|
||||
[tinfo ncurses ncursesw],
|
||||
[tinfo terminfo ncurses ncursesw],
|
||||
found_ncurses=yes,
|
||||
found_ncurses=no
|
||||
)
|
||||
|
@ -287,6 +330,7 @@ if test "x$found_ncurses" = xno; then
|
|||
fi
|
||||
fi
|
||||
if test "x$found_ncurses" = xyes; then
|
||||
CPPFLAGS="$CPPFLAGS -DHAVE_NCURSES_H"
|
||||
AC_DEFINE(HAVE_NCURSES_H)
|
||||
else
|
||||
AC_CHECK_LIB(
|
||||
|
@ -302,16 +346,21 @@ else
|
|||
)
|
||||
if test "x$found_curses" = xyes; then
|
||||
LIBS="$LIBS -lcurses"
|
||||
CPPFLAGS="$CPPFLAGS -DHAVE_CURSES_H"
|
||||
AC_DEFINE(HAVE_CURSES_H)
|
||||
else
|
||||
AC_MSG_ERROR("curses not found")
|
||||
fi
|
||||
fi
|
||||
AC_CHECK_FUNCS([ \
|
||||
tiparm \
|
||||
tiparm_s \
|
||||
])
|
||||
|
||||
# Look for utempter.
|
||||
AC_ARG_ENABLE(
|
||||
utempter,
|
||||
AC_HELP_STRING(--enable-utempter, use utempter if it is installed)
|
||||
AS_HELP_STRING(--enable-utempter, use utempter if it is installed)
|
||||
)
|
||||
if test "x$enable_utempter" = xyes; then
|
||||
AC_CHECK_HEADER(utempter.h, enable_utempter=yes, enable_utempter=no)
|
||||
|
@ -333,9 +382,18 @@ fi
|
|||
# Look for utf8proc.
|
||||
AC_ARG_ENABLE(
|
||||
utf8proc,
|
||||
AC_HELP_STRING(--enable-utf8proc, use utf8proc if it is installed)
|
||||
AS_HELP_STRING(--enable-utf8proc, use utf8proc if it is installed)
|
||||
)
|
||||
if test "x$enable_utf8proc" = xyes; then
|
||||
PKG_CHECK_MODULES(
|
||||
LIBUTF8PROC,
|
||||
libutf8proc,
|
||||
[
|
||||
AM_CPPFLAGS="$LIBUTF8PROC_CFLAGS $AM_CPPFLAGS"
|
||||
CPPFLAGS="$LIBUTF8PROC_CFLAGS $SAVED_CPPFLAGS"
|
||||
LIBS="$LIBUTF8PROC_LIBS $LIBS"
|
||||
]
|
||||
)
|
||||
AC_CHECK_HEADER(utf8proc.h, enable_utf8proc=yes, enable_utf8proc=no)
|
||||
if test "x$enable_utf8proc" = xyes; then
|
||||
AC_SEARCH_LIBS(
|
||||
|
@ -353,15 +411,67 @@ if test "x$enable_utf8proc" = xyes; then
|
|||
fi
|
||||
AM_CONDITIONAL(HAVE_UTF8PROC, [test "x$enable_utf8proc" = xyes])
|
||||
|
||||
# Check for systemd support.
|
||||
AC_ARG_ENABLE(
|
||||
systemd,
|
||||
AS_HELP_STRING(--enable-systemd, enable systemd integration)
|
||||
)
|
||||
if test x"$enable_systemd" = xyes; then
|
||||
PKG_CHECK_MODULES(
|
||||
SYSTEMD,
|
||||
libsystemd,
|
||||
[
|
||||
AM_CPPFLAGS="$SYSTEMD_CFLAGS $AM_CPPFLAGS"
|
||||
CPPFLAGS="$AM_CPPFLAGS $SAVED_CPPFLAGS"
|
||||
LIBS="$SYSTEMD_LIBS $LIBS"
|
||||
found_systemd=yes
|
||||
],
|
||||
found_systemd=no
|
||||
)
|
||||
if test "x$found_systemd" = xyes; then
|
||||
AC_DEFINE(HAVE_SYSTEMD)
|
||||
else
|
||||
AC_MSG_ERROR("systemd not found")
|
||||
fi
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_SYSTEMD, [test "x$found_systemd" = xyes])
|
||||
AC_ARG_ENABLE(
|
||||
cgroups,
|
||||
AS_HELP_STRING(--disable-cgroups, disable adding panes to new cgroups with systemd)
|
||||
)
|
||||
if test "x$enable_cgroups" = x; then
|
||||
# Default to the same as $enable_systemd.
|
||||
enable_cgroups=$enable_systemd
|
||||
fi
|
||||
if test "x$enable_cgroups" = xyes; then
|
||||
if test "x$found_systemd" = xyes; then
|
||||
AC_DEFINE(ENABLE_CGROUPS)
|
||||
else
|
||||
AC_MSG_ERROR("cgroups requires systemd to be enabled")
|
||||
fi
|
||||
fi
|
||||
|
||||
# Enable sixel support.
|
||||
AC_ARG_ENABLE(
|
||||
sixel,
|
||||
AS_HELP_STRING(--enable-sixel, enable sixel images)
|
||||
)
|
||||
if test "x$enable_sixel" = xyes; then
|
||||
AC_DEFINE(ENABLE_SIXEL)
|
||||
fi
|
||||
AM_CONDITIONAL(ENABLE_SIXEL, [test "x$enable_sixel" = xyes])
|
||||
|
||||
# Check for b64_ntop. If we have b64_ntop, we assume b64_pton as well.
|
||||
AC_MSG_CHECKING(for b64_ntop)
|
||||
AC_TRY_LINK(
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM(
|
||||
[
|
||||
#include <sys/types.h>
|
||||
#include <netinet/in.h>
|
||||
#include <resolv.h>
|
||||
],
|
||||
[b64_ntop(NULL, 0, NULL, 0);],
|
||||
[
|
||||
b64_ntop(NULL, 0, NULL, 0);
|
||||
])],
|
||||
found_b64_ntop=yes,
|
||||
found_b64_ntop=no
|
||||
)
|
||||
|
@ -370,13 +480,15 @@ OLD_LIBS="$LIBS"
|
|||
if test "x$found_b64_ntop" = xno; then
|
||||
AC_MSG_CHECKING(for b64_ntop with -lresolv)
|
||||
LIBS="$OLD_LIBS -lresolv"
|
||||
AC_TRY_LINK(
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM(
|
||||
[
|
||||
#include <sys/types.h>
|
||||
#include <netinet/in.h>
|
||||
#include <resolv.h>
|
||||
],
|
||||
[b64_ntop(NULL, 0, NULL, 0);],
|
||||
[
|
||||
b64_ntop(NULL, 0, NULL, 0);
|
||||
])],
|
||||
found_b64_ntop=yes,
|
||||
found_b64_ntop=no
|
||||
)
|
||||
|
@ -385,13 +497,15 @@ fi
|
|||
if test "x$found_b64_ntop" = xno; then
|
||||
AC_MSG_CHECKING(for b64_ntop with -lnetwork)
|
||||
LIBS="$OLD_LIBS -lnetwork"
|
||||
AC_TRY_LINK(
|
||||
AC_LINK_IFELSE([AC_LANG_PROGRAM(
|
||||
[
|
||||
#include <sys/types.h>
|
||||
#include <netinet/in.h>
|
||||
#include <resolv.h>
|
||||
],
|
||||
[b64_ntop(NULL, 0, NULL, 0);],
|
||||
[
|
||||
b64_ntop(NULL, 0, NULL, 0);
|
||||
])],
|
||||
found_b64_ntop=yes,
|
||||
found_b64_ntop=no
|
||||
)
|
||||
|
@ -588,7 +702,7 @@ AC_CHECK_DECL(
|
|||
)
|
||||
AC_CHECK_DECL(
|
||||
TAILQ_PREV,
|
||||
found_queue_h=yes,
|
||||
,
|
||||
found_queue_h=no,
|
||||
[#include <sys/queue.h>]
|
||||
)
|
||||
|
@ -644,6 +758,14 @@ AC_CHECK_DECL(
|
|||
[#include <sys/prctl.h>]
|
||||
)
|
||||
|
||||
# Look for setsockopt(SO_PEERCRED).
|
||||
AC_CHECK_DECL(
|
||||
SO_PEERCRED,
|
||||
AC_DEFINE(HAVE_SO_PEERCRED),
|
||||
,
|
||||
[#include <sys/socket.h>]
|
||||
)
|
||||
|
||||
# Look for fcntl(F_CLOSEM).
|
||||
AC_CHECK_DECL(
|
||||
F_CLOSEM,
|
||||
|
@ -661,6 +783,74 @@ else
|
|||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
|
||||
# Try to figure out what the best value for TERM might be.
|
||||
if test "x$DEFAULT_TERM" = x; then
|
||||
DEFAULT_TERM=screen
|
||||
AC_MSG_CHECKING(TERM)
|
||||
AC_RUN_IFELSE([AC_LANG_SOURCE(
|
||||
[
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#if defined(HAVE_CURSES_H)
|
||||
#include <curses.h>
|
||||
#elif defined(HAVE_NCURSES_H)
|
||||
#include <ncurses.h>
|
||||
#endif
|
||||
#include <term.h>
|
||||
int main(void) {
|
||||
if (setupterm("screen-256color", -1, NULL) != OK)
|
||||
exit(1);
|
||||
exit(0);
|
||||
}
|
||||
])],
|
||||
[DEFAULT_TERM=screen-256color],
|
||||
,
|
||||
[DEFAULT_TERM=screen]
|
||||
)
|
||||
AC_RUN_IFELSE([AC_LANG_SOURCE(
|
||||
[
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#if defined(HAVE_CURSES_H)
|
||||
#include <curses.h>
|
||||
#elif defined(HAVE_NCURSES_H)
|
||||
#include <ncurses.h>
|
||||
#endif
|
||||
#include <term.h>
|
||||
int main(void) {
|
||||
if (setupterm("tmux", -1, NULL) != OK)
|
||||
exit(1);
|
||||
exit(0);
|
||||
}
|
||||
])],
|
||||
[DEFAULT_TERM=tmux],
|
||||
,
|
||||
[DEFAULT_TERM=screen]
|
||||
)
|
||||
AC_RUN_IFELSE([AC_LANG_SOURCE(
|
||||
[
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#if defined(HAVE_CURSES_H)
|
||||
#include <curses.h>
|
||||
#elif defined(HAVE_NCURSES_H)
|
||||
#include <ncurses.h>
|
||||
#endif
|
||||
#include <term.h>
|
||||
int main(void) {
|
||||
if (setupterm("tmux-256color", -1, NULL) != OK)
|
||||
exit(1);
|
||||
exit(0);
|
||||
}
|
||||
])],
|
||||
[DEFAULT_TERM=tmux-256color],
|
||||
,
|
||||
[DEFAULT_TERM=screen]
|
||||
)
|
||||
AC_MSG_RESULT($DEFAULT_TERM)
|
||||
fi
|
||||
AC_SUBST(DEFAULT_TERM)
|
||||
|
||||
# Man page defaults to mdoc.
|
||||
MANFORMAT=mdoc
|
||||
AC_SUBST(MANFORMAT)
|
||||
|
@ -676,19 +866,32 @@ case "$host_os" in
|
|||
AC_MSG_RESULT(darwin)
|
||||
PLATFORM=darwin
|
||||
#
|
||||
# OS X uses __dead2 instead of __dead, like FreeBSD. But it
|
||||
# defines __dead away so it needs to be removed before we can
|
||||
# replace it.
|
||||
# macOS uses __dead2 instead of __dead, like FreeBSD. But it defines
|
||||
# __dead away so it needs to be removed before we can replace it.
|
||||
#
|
||||
AC_DEFINE(BROKEN___DEAD)
|
||||
#
|
||||
# OS X CMSG_FIRSTHDR is broken, so redefine it with a working
|
||||
# one. daemon works but has some stupid side effects, so use
|
||||
# our internal version which has a workaround.
|
||||
# macOS CMSG_FIRSTHDR is broken, so redefine it with a working one.
|
||||
# daemon works but has some stupid side effects, so use our internal
|
||||
# version which has a workaround.
|
||||
#
|
||||
AC_DEFINE(BROKEN_CMSG_FIRSTHDR)
|
||||
AC_LIBOBJ(daemon)
|
||||
AC_LIBOBJ(daemon-darwin)
|
||||
#
|
||||
# macOS wcwidth(3) is bad, so complain and suggest using utf8proc
|
||||
# instead.
|
||||
#
|
||||
if test "x$enable_utf8proc" = x; then
|
||||
AC_MSG_NOTICE([])
|
||||
AC_MSG_NOTICE([ macOS library support for Unicode is very poor,])
|
||||
AC_MSG_NOTICE([ particularly for complex codepoints like emojis;])
|
||||
AC_MSG_NOTICE([ to use these correctly, configuring with])
|
||||
AC_MSG_NOTICE([ --enable-utf8proc is recommended. To build])
|
||||
AC_MSG_NOTICE([ without anyway, use --disable-utf8proc])
|
||||
AC_MSG_NOTICE([])
|
||||
AC_MSG_ERROR([must give --enable-utf8proc or --disable-utf8proc])
|
||||
fi
|
||||
;;
|
||||
*dragonfly*)
|
||||
AC_MSG_RESULT(dragonfly)
|
||||
|
@ -758,6 +961,19 @@ AM_CONDITIONAL(IS_HPUX, test "x$PLATFORM" = xhpux)
|
|||
AM_CONDITIONAL(IS_HAIKU, test "x$PLATFORM" = xhaiku)
|
||||
AM_CONDITIONAL(IS_UNKNOWN, test "x$PLATFORM" = xunknown)
|
||||
|
||||
# Set the default lock command
|
||||
DEFAULT_LOCK_CMD="lock -np"
|
||||
AC_MSG_CHECKING(lock-command)
|
||||
if test "x$PLATFORM" = xlinux; then
|
||||
AC_CHECK_PROG(found_vlock, vlock, yes, no)
|
||||
if test "x$found_vlock" = xyes; then
|
||||
DEFAULT_LOCK_CMD="vlock"
|
||||
fi
|
||||
fi
|
||||
AC_MSG_RESULT($DEFAULT_LOCK_CMD)
|
||||
AC_SUBST(DEFAULT_LOCK_CMD)
|
||||
|
||||
|
||||
# Save our CFLAGS/CPPFLAGS/LDFLAGS for the Makefile and restore the old user
|
||||
# variables.
|
||||
AC_SUBST(AM_CPPFLAGS)
|
||||
|
@ -768,4 +984,5 @@ AC_SUBST(AM_LDFLAGS)
|
|||
LDFLAGS="$SAVED_LDFLAGS"
|
||||
|
||||
# autoconf should create a Makefile.
|
||||
AC_OUTPUT(Makefile)
|
||||
AC_CONFIG_FILES(Makefile)
|
||||
AC_OUTPUT
|
||||
|
|
|
@ -234,3 +234,29 @@ control_notify_session_window_changed(struct session *s)
|
|||
s->curw->window->id);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
control_notify_paste_buffer_changed(const char *name)
|
||||
{
|
||||
struct client *c;
|
||||
|
||||
TAILQ_FOREACH(c, &clients, entry) {
|
||||
if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
|
||||
continue;
|
||||
|
||||
control_write(c, "%%paste-buffer-changed %s", name);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
control_notify_paste_buffer_deleted(const char *name)
|
||||
{
|
||||
struct client *c;
|
||||
|
||||
TAILQ_FOREACH(c, &clients, entry) {
|
||||
if (!CONTROL_SHOULD_NOTIFY_CLIENT(c))
|
||||
continue;
|
||||
|
||||
control_write(c, "%%paste-buffer-deleted %s", name);
|
||||
}
|
||||
}
|
||||
|
|
18
control.c
18
control.c
|
@ -385,7 +385,7 @@ control_pause_pane(struct client *c, struct window_pane *wp)
|
|||
}
|
||||
|
||||
/* Write a line. */
|
||||
static void
|
||||
static void printflike(2, 0)
|
||||
control_vwrite(struct client *c, const char *fmt, va_list ap)
|
||||
{
|
||||
struct control_state *cs = c->control_state;
|
||||
|
@ -664,7 +664,7 @@ control_write_pending(struct client *c, struct control_pane *cp, size_t limit)
|
|||
uint64_t age, t = get_timer();
|
||||
|
||||
wp = control_window_pane(c, cp->pane);
|
||||
if (wp == NULL) {
|
||||
if (wp == NULL || wp->fd == -1) {
|
||||
TAILQ_FOREACH_SAFE(cb, &cp->blocks, entry, cb1) {
|
||||
TAILQ_REMOVE(&cp->blocks, cb, entry);
|
||||
control_free_block(cs, cb);
|
||||
|
@ -775,13 +775,16 @@ control_start(struct client *c)
|
|||
|
||||
cs->read_event = bufferevent_new(c->fd, control_read_callback,
|
||||
control_write_callback, control_error_callback, c);
|
||||
bufferevent_enable(cs->read_event, EV_READ);
|
||||
if (cs->read_event == NULL)
|
||||
fatalx("out of memory");
|
||||
|
||||
if (c->flags & CLIENT_CONTROLCONTROL)
|
||||
cs->write_event = cs->read_event;
|
||||
else {
|
||||
cs->write_event = bufferevent_new(c->out_fd, NULL,
|
||||
control_write_callback, control_error_callback, c);
|
||||
if (cs->write_event == NULL)
|
||||
fatalx("out of memory");
|
||||
}
|
||||
bufferevent_setwatermark(cs->write_event, EV_WRITE, CONTROL_BUFFER_LOW,
|
||||
0);
|
||||
|
@ -792,6 +795,13 @@ control_start(struct client *c)
|
|||
}
|
||||
}
|
||||
|
||||
/* Control client ready. */
|
||||
void
|
||||
control_ready(struct client *c)
|
||||
{
|
||||
bufferevent_enable(c->control_state->read_event, EV_READ);
|
||||
}
|
||||
|
||||
/* Discard all output for a client. */
|
||||
void
|
||||
control_discard(struct client *c)
|
||||
|
@ -864,7 +874,7 @@ control_check_subs_pane(struct client *c, struct control_sub *csub)
|
|||
struct control_sub_pane *csp, find;
|
||||
|
||||
wp = window_pane_find_by_id(csub->id);
|
||||
if (wp == NULL)
|
||||
if (wp == NULL || wp->fd == -1)
|
||||
return;
|
||||
w = wp->window;
|
||||
|
||||
|
|
15
environ.c
15
environ.c
|
@ -182,9 +182,11 @@ void
|
|||
environ_update(struct options *oo, struct environ *src, struct environ *dst)
|
||||
{
|
||||
struct environ_entry *envent;
|
||||
struct environ_entry *envent1;
|
||||
struct options_entry *o;
|
||||
struct options_array_item *a;
|
||||
union options_value *ov;
|
||||
int found;
|
||||
|
||||
o = options_get(oo, "update-environment");
|
||||
if (o == NULL)
|
||||
|
@ -192,14 +194,15 @@ environ_update(struct options *oo, struct environ *src, struct environ *dst)
|
|||
a = options_array_first(o);
|
||||
while (a != NULL) {
|
||||
ov = options_array_item_value(a);
|
||||
RB_FOREACH(envent, environ, src) {
|
||||
if (fnmatch(ov->string, envent->name, 0) == 0)
|
||||
break;
|
||||
found = 0;
|
||||
RB_FOREACH_SAFE(envent, environ, src, envent1) {
|
||||
if (fnmatch(ov->string, envent->name, 0) == 0) {
|
||||
environ_set(dst, envent->name, 0, "%s", envent->value);
|
||||
found = 1;
|
||||
}
|
||||
}
|
||||
if (envent == NULL)
|
||||
if (!found)
|
||||
environ_clear(dst, ov->string);
|
||||
else
|
||||
environ_set(dst, envent->name, 0, "%s", envent->value);
|
||||
a = options_array_next(a);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -61,7 +61,7 @@ bind y set synchronize-panes\; display 'synchronize-panes #{?synchronize-panes,o
|
|||
# should be started with "tmux attach" rather than "tmux new"
|
||||
new -d -s0 -nirssi 'exec irssi'
|
||||
set -t0:0 monitor-activity on
|
||||
set -t0:0 aggressive-resize on
|
||||
set -t0:0 aggressive-resize on
|
||||
neww -d -ntodo 'exec emacs ~/TODO'
|
||||
setw -t0:1 aggressive-resize on
|
||||
neww -d -nmutt 'exec mutt'
|
||||
|
|
64
file.c
64
file.c
|
@ -149,7 +149,8 @@ file_fire_done_cb(__unused int fd, __unused short events, void *arg)
|
|||
struct client_file *cf = arg;
|
||||
struct client *c = cf->c;
|
||||
|
||||
if (cf->cb != NULL && (c == NULL || (~c->flags & CLIENT_DEAD)))
|
||||
if (cf->cb != NULL &&
|
||||
(cf->closed || c == NULL || (~c->flags & CLIENT_DEAD)))
|
||||
cf->cb(c, cf->path, cf->error, 1, cf->buffer, cf->data);
|
||||
file_free(cf);
|
||||
}
|
||||
|
@ -173,9 +174,9 @@ file_fire_read(struct client_file *cf)
|
|||
int
|
||||
file_can_print(struct client *c)
|
||||
{
|
||||
if (c == NULL)
|
||||
return (0);
|
||||
if (c->session != NULL && (~c->flags & CLIENT_CONTROL))
|
||||
if (c == NULL ||
|
||||
(c->flags & CLIENT_ATTACHED) ||
|
||||
(c->flags & CLIENT_CONTROL))
|
||||
return (0);
|
||||
return (1);
|
||||
}
|
||||
|
@ -352,7 +353,7 @@ done:
|
|||
}
|
||||
|
||||
/* Read a file. */
|
||||
void
|
||||
struct client_file *
|
||||
file_read(struct client *c, const char *path, client_file_cb cb, void *cbdata)
|
||||
{
|
||||
struct client_file *cf;
|
||||
|
@ -420,10 +421,27 @@ skip:
|
|||
goto done;
|
||||
}
|
||||
free(msg);
|
||||
return;
|
||||
return cf;
|
||||
|
||||
done:
|
||||
file_fire_done(cf);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Cancel a file read. */
|
||||
void
|
||||
file_cancel(struct client_file *cf)
|
||||
{
|
||||
struct msg_read_cancel msg;
|
||||
|
||||
log_debug("read cancel file %d", cf->stream);
|
||||
|
||||
if (cf->closed)
|
||||
return;
|
||||
cf->closed = 1;
|
||||
|
||||
msg.stream = cf->stream;
|
||||
proc_send(cf->peer, MSG_READ_CANCEL, -1, &msg, sizeof msg);
|
||||
}
|
||||
|
||||
/* Push event, fired if there is more writing to be done. */
|
||||
|
@ -503,14 +521,14 @@ file_write_error_callback(__unused struct bufferevent *bev, __unused short what,
|
|||
|
||||
log_debug("write error file %d", cf->stream);
|
||||
|
||||
if (cf->cb != NULL)
|
||||
cf->cb(NULL, NULL, 0, -1, NULL, cf->data);
|
||||
|
||||
bufferevent_free(cf->event);
|
||||
cf->event = NULL;
|
||||
|
||||
close(cf->fd);
|
||||
cf->fd = -1;
|
||||
|
||||
if (cf->cb != NULL)
|
||||
cf->cb(NULL, NULL, 0, -1, NULL, cf->data);
|
||||
}
|
||||
|
||||
/* Client file write callback. */
|
||||
|
@ -555,7 +573,7 @@ file_write_open(struct client_files *files, struct tmuxpeer *peer,
|
|||
log_debug("open write file %d %s", msg->stream, path);
|
||||
|
||||
find.stream = msg->stream;
|
||||
if ((cf = RB_FIND(client_files, files, &find)) != NULL) {
|
||||
if (RB_FIND(client_files, files, &find) != NULL) {
|
||||
error = EBADF;
|
||||
goto reply;
|
||||
}
|
||||
|
@ -585,6 +603,8 @@ file_write_open(struct client_files *files, struct tmuxpeer *peer,
|
|||
|
||||
cf->event = bufferevent_new(cf->fd, NULL, file_write_callback,
|
||||
file_write_error_callback, cf);
|
||||
if (cf->event == NULL)
|
||||
fatalx("out of memory");
|
||||
bufferevent_enable(cf->event, EV_WRITE);
|
||||
goto reply;
|
||||
|
||||
|
@ -714,7 +734,7 @@ file_read_open(struct client_files *files, struct tmuxpeer *peer,
|
|||
log_debug("open read file %d %s", msg->stream, path);
|
||||
|
||||
find.stream = msg->stream;
|
||||
if ((cf = RB_FIND(client_files, files, &find)) != NULL) {
|
||||
if (RB_FIND(client_files, files, &find) != NULL) {
|
||||
error = EBADF;
|
||||
goto reply;
|
||||
}
|
||||
|
@ -744,6 +764,8 @@ file_read_open(struct client_files *files, struct tmuxpeer *peer,
|
|||
|
||||
cf->event = bufferevent_new(cf->fd, file_read_callback, NULL,
|
||||
file_read_error_callback, cf);
|
||||
if (cf->event == NULL)
|
||||
fatalx("out of memory");
|
||||
bufferevent_enable(cf->event, EV_READ);
|
||||
return;
|
||||
|
||||
|
@ -753,6 +775,24 @@ reply:
|
|||
proc_send(peer, MSG_READ_DONE, -1, &reply, sizeof reply);
|
||||
}
|
||||
|
||||
/* Handle a read cancel message (client). */
|
||||
void
|
||||
file_read_cancel(struct client_files *files, struct imsg *imsg)
|
||||
{
|
||||
struct msg_read_cancel *msg = imsg->data;
|
||||
size_t msglen = imsg->hdr.len - IMSG_HEADER_SIZE;
|
||||
struct client_file find, *cf;
|
||||
|
||||
if (msglen != sizeof *msg)
|
||||
fatalx("bad MSG_READ_CANCEL size");
|
||||
find.stream = msg->stream;
|
||||
if ((cf = RB_FIND(client_files, files, &find)) == NULL)
|
||||
fatalx("unknown stream number");
|
||||
log_debug("cancel file %d", cf->stream);
|
||||
|
||||
file_read_error_callback(NULL, 0, cf);
|
||||
}
|
||||
|
||||
/* Handle a write ready message (server). */
|
||||
void
|
||||
file_write_ready(struct client_files *files, struct imsg *imsg)
|
||||
|
@ -790,7 +830,7 @@ file_read_data(struct client_files *files, struct imsg *imsg)
|
|||
return;
|
||||
|
||||
log_debug("file %d read %zu bytes", cf->stream, bsize);
|
||||
if (cf->error == 0) {
|
||||
if (cf->error == 0 && !cf->closed) {
|
||||
if (evbuffer_add(cf->buffer, bdata, bsize) != 0) {
|
||||
cf->error = ENOMEM;
|
||||
file_fire_done(cf);
|
||||
|
|
258
format-draw.c
258
format-draw.c
|
@ -33,6 +33,7 @@ struct format_range {
|
|||
|
||||
enum style_range_type type;
|
||||
u_int argument;
|
||||
char string[16];
|
||||
|
||||
TAILQ_ENTRY(format_range) entry;
|
||||
};
|
||||
|
@ -44,9 +45,18 @@ format_is_type(struct format_range *fr, struct style *sy)
|
|||
{
|
||||
if (fr->type != sy->range_type)
|
||||
return (0);
|
||||
if (fr->type == STYLE_RANGE_WINDOW &&
|
||||
fr->argument != sy->range_argument)
|
||||
return (0);
|
||||
switch (fr->type) {
|
||||
case STYLE_RANGE_NONE:
|
||||
case STYLE_RANGE_LEFT:
|
||||
case STYLE_RANGE_RIGHT:
|
||||
return (1);
|
||||
case STYLE_RANGE_PANE:
|
||||
case STYLE_RANGE_WINDOW:
|
||||
case STYLE_RANGE_SESSION:
|
||||
return (fr->argument == sy->range_argument);
|
||||
case STYLE_RANGE_USER:
|
||||
return (strcmp(fr->string, sy->range_string) == 0);
|
||||
}
|
||||
return (1);
|
||||
}
|
||||
|
||||
|
@ -632,6 +642,36 @@ format_draw_absolute_centre(struct screen_write_ctx *octx, u_int available,
|
|||
width_after);
|
||||
}
|
||||
|
||||
/* Get width and count of any leading #s. */
|
||||
static const char *
|
||||
format_leading_hashes(const char *cp, u_int *n, u_int *width)
|
||||
{
|
||||
for (*n = 0; cp[*n] == '#'; (*n)++)
|
||||
/* nothing */;
|
||||
if (*n == 0) {
|
||||
*width = 0;
|
||||
return (cp);
|
||||
}
|
||||
if (cp[*n] != '[') {
|
||||
if ((*n % 2) == 0)
|
||||
*width = (*n / 2);
|
||||
else
|
||||
*width = (*n / 2) + 1;
|
||||
return (cp + *n);
|
||||
}
|
||||
*width = (*n / 2);
|
||||
if ((*n % 2) == 0) {
|
||||
/*
|
||||
* An even number of #s means that all #s are escaped, so not a
|
||||
* style. The caller should not skip this. Return pointing to
|
||||
* the [.
|
||||
*/
|
||||
return (cp + *n);
|
||||
}
|
||||
/* This is a style, so return pointing to the #. */
|
||||
return (cp + *n - 1);
|
||||
}
|
||||
|
||||
/* Draw multiple characters. */
|
||||
static void
|
||||
format_draw_many(struct screen_write_ctx *ctx, struct style *sy, char ch,
|
||||
|
@ -647,7 +687,8 @@ format_draw_many(struct screen_write_ctx *ctx, struct style *sy, char ch,
|
|||
/* Draw a format to a screen. */
|
||||
void
|
||||
format_draw(struct screen_write_ctx *octx, const struct grid_cell *base,
|
||||
u_int available, const char *expanded, struct style_ranges *srs)
|
||||
u_int available, const char *expanded, struct style_ranges *srs,
|
||||
int default_colours)
|
||||
{
|
||||
enum { LEFT,
|
||||
CENTRE,
|
||||
|
@ -789,6 +830,10 @@ format_draw(struct screen_write_ctx *octx, const struct grid_cell *base,
|
|||
log_debug("%s: style '%s' -> '%s'", __func__, tmp,
|
||||
style_tostring(&sy));
|
||||
free(tmp);
|
||||
if (default_colours) {
|
||||
sy.gc.bg = base->bg;
|
||||
sy.gc.fg = base->fg;
|
||||
}
|
||||
|
||||
/* If this style has a fill colour, store it for later. */
|
||||
if (sy.fill != 8)
|
||||
|
@ -907,6 +952,8 @@ format_draw(struct screen_write_ctx *octx, const struct grid_cell *base,
|
|||
|
||||
fr->type = sy.range_type;
|
||||
fr->argument = sy.range_argument;
|
||||
strlcpy(fr->string, sy.range_string,
|
||||
sizeof fr->string);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -978,13 +1025,39 @@ format_draw(struct screen_write_ctx *octx, const struct grid_cell *base,
|
|||
sr = xcalloc(1, sizeof *sr);
|
||||
sr->type = fr->type;
|
||||
sr->argument = fr->argument;
|
||||
strlcpy(sr->string, fr->string, sizeof sr->string);
|
||||
sr->start = fr->start;
|
||||
sr->end = fr->end;
|
||||
TAILQ_INSERT_TAIL(srs, sr, entry);
|
||||
|
||||
log_debug("%s: range %d|%u at %u-%u", __func__, sr->type,
|
||||
sr->argument, sr->start, sr->end);
|
||||
|
||||
switch (sr->type) {
|
||||
case STYLE_RANGE_NONE:
|
||||
break;
|
||||
case STYLE_RANGE_LEFT:
|
||||
log_debug("%s: range left at %u-%u", __func__,
|
||||
sr->start, sr->end);
|
||||
break;
|
||||
case STYLE_RANGE_RIGHT:
|
||||
log_debug("%s: range right at %u-%u", __func__,
|
||||
sr->start, sr->end);
|
||||
break;
|
||||
case STYLE_RANGE_PANE:
|
||||
log_debug("%s: range pane|%%%u at %u-%u", __func__,
|
||||
sr->argument, sr->start, sr->end);
|
||||
break;
|
||||
case STYLE_RANGE_WINDOW:
|
||||
log_debug("%s: range window|%u at %u-%u", __func__,
|
||||
sr->argument, sr->start, sr->end);
|
||||
break;
|
||||
case STYLE_RANGE_SESSION:
|
||||
log_debug("%s: range session|$%u at %u-%u", __func__,
|
||||
sr->argument, sr->start, sr->end);
|
||||
break;
|
||||
case STYLE_RANGE_USER:
|
||||
log_debug("%s: range user|%u at %u-%u", __func__,
|
||||
sr->argument, sr->start, sr->end);
|
||||
break;
|
||||
}
|
||||
format_free_range(&frs, fr);
|
||||
}
|
||||
|
||||
|
@ -1002,37 +1075,22 @@ u_int
|
|||
format_width(const char *expanded)
|
||||
{
|
||||
const char *cp, *end;
|
||||
u_int n, width = 0;
|
||||
u_int n, leading_width, width = 0;
|
||||
struct utf8_data ud;
|
||||
enum utf8_state more;
|
||||
|
||||
cp = expanded;
|
||||
while (*cp != '\0') {
|
||||
if (*cp == '#') {
|
||||
for (n = 1; cp[n] == '#'; n++)
|
||||
/* nothing */;
|
||||
if (cp[n] != '[') {
|
||||
width += n;
|
||||
cp += n;
|
||||
continue;
|
||||
end = format_leading_hashes(cp, &n, &leading_width);
|
||||
width += leading_width;
|
||||
cp = end;
|
||||
if (*cp == '#') {
|
||||
end = format_skip(cp + 2, "]");
|
||||
if (end == NULL)
|
||||
return (0);
|
||||
cp = end + 1;
|
||||
}
|
||||
width += (n / 2); /* one for each ## */
|
||||
|
||||
if ((n % 2) == 0) {
|
||||
/*
|
||||
* An even number of #s means that all #s are
|
||||
* escaped, so not a style.
|
||||
*/
|
||||
width++; /* one for the [ */
|
||||
cp += (n + 1);
|
||||
continue;
|
||||
}
|
||||
cp += (n - 1); /* point to the [ */
|
||||
|
||||
end = format_skip(cp + 2, "]");
|
||||
if (end == NULL)
|
||||
return (0);
|
||||
cp = end + 1;
|
||||
} else if ((more = utf8_open(&ud, *cp)) == UTF8_MORE) {
|
||||
while (*++cp != '\0' && more == UTF8_MORE)
|
||||
more = utf8_append(&ud, *cp);
|
||||
|
@ -1059,53 +1117,36 @@ format_trim_left(const char *expanded, u_int limit)
|
|||
{
|
||||
char *copy, *out;
|
||||
const char *cp = expanded, *end;
|
||||
u_int even, n, width = 0;
|
||||
u_int n, width = 0, leading_width;
|
||||
struct utf8_data ud;
|
||||
enum utf8_state more;
|
||||
|
||||
out = copy = xcalloc(1, strlen(expanded) + 1);
|
||||
out = copy = xcalloc(2, strlen(expanded) + 1);
|
||||
while (*cp != '\0') {
|
||||
if (width >= limit)
|
||||
break;
|
||||
if (*cp == '#') {
|
||||
for (end = cp + 1; *end == '#'; end++)
|
||||
/* nothing */;
|
||||
n = end - cp;
|
||||
if (*end != '[') {
|
||||
if (n > limit - width)
|
||||
n = limit - width;
|
||||
memcpy(out, cp, n);
|
||||
out += n;
|
||||
width += n;
|
||||
cp = end;
|
||||
continue;
|
||||
}
|
||||
even = ((n % 2) == 0);
|
||||
|
||||
n /= 2;
|
||||
if (n > limit - width)
|
||||
n = limit - width;
|
||||
width += n;
|
||||
n *= 2;
|
||||
memcpy(out, cp, n);
|
||||
out += n;
|
||||
|
||||
if (even) {
|
||||
if (width + 1 <= limit) {
|
||||
*out++ = '[';
|
||||
width++;
|
||||
end = format_leading_hashes(cp, &n, &leading_width);
|
||||
if (leading_width > limit - width)
|
||||
leading_width = limit - width;
|
||||
if (leading_width != 0) {
|
||||
if (n == 1)
|
||||
*out++ = '#';
|
||||
else {
|
||||
memset(out, '#', 2 * leading_width);
|
||||
out += 2 * leading_width;
|
||||
}
|
||||
cp = end + 1;
|
||||
continue;
|
||||
width += leading_width;
|
||||
}
|
||||
cp = end;
|
||||
if (*cp == '#') {
|
||||
end = format_skip(cp + 2, "]");
|
||||
if (end == NULL)
|
||||
break;
|
||||
memcpy(out, cp, end + 1 - cp);
|
||||
out += (end + 1 - cp);
|
||||
cp = end + 1;
|
||||
}
|
||||
cp = end - 1;
|
||||
|
||||
end = format_skip(cp + 2, "]");
|
||||
if (end == NULL)
|
||||
break;
|
||||
memcpy(out, cp, end + 1 - cp);
|
||||
out += (end + 1 - cp);
|
||||
cp = end + 1;
|
||||
} else if ((more = utf8_open(&ud, *cp)) == UTF8_MORE) {
|
||||
while (*++cp != '\0' && more == UTF8_MORE)
|
||||
more = utf8_append(&ud, *cp);
|
||||
|
@ -1137,7 +1178,8 @@ format_trim_right(const char *expanded, u_int limit)
|
|||
{
|
||||
char *copy, *out;
|
||||
const char *cp = expanded, *end;
|
||||
u_int width = 0, total_width, skip, old_n, even, n;
|
||||
u_int width = 0, total_width, skip, n;
|
||||
u_int leading_width, copy_width;
|
||||
struct utf8_data ud;
|
||||
enum utf8_state more;
|
||||
|
||||
|
@ -1146,67 +1188,35 @@ format_trim_right(const char *expanded, u_int limit)
|
|||
return (xstrdup(expanded));
|
||||
skip = total_width - limit;
|
||||
|
||||
out = copy = xcalloc(1, strlen(expanded) + 1);
|
||||
out = copy = xcalloc(2, strlen(expanded) + 1);
|
||||
while (*cp != '\0') {
|
||||
if (*cp == '#') {
|
||||
for (end = cp + 1; *end == '#'; end++)
|
||||
/* nothing */;
|
||||
old_n = n = end - cp;
|
||||
if (*end != '[') {
|
||||
if (width <= skip) {
|
||||
if (skip - width >= n)
|
||||
n = 0;
|
||||
else
|
||||
n -= (skip - width);
|
||||
}
|
||||
if (n != 0) {
|
||||
memcpy(out, cp, n);
|
||||
out += n;
|
||||
}
|
||||
|
||||
/*
|
||||
* The width always increases by the full
|
||||
* amount even if we can't copy anything yet.
|
||||
*/
|
||||
width += old_n;
|
||||
cp = end;
|
||||
continue;
|
||||
}
|
||||
even = ((n % 2) == 0);
|
||||
|
||||
n /= 2;
|
||||
end = format_leading_hashes(cp, &n, &leading_width);
|
||||
copy_width = leading_width;
|
||||
if (width <= skip) {
|
||||
if (skip - width >= n)
|
||||
n = 0;
|
||||
if (skip - width >= copy_width)
|
||||
copy_width = 0;
|
||||
else
|
||||
n -= (skip - width);
|
||||
copy_width -= (skip - width);
|
||||
}
|
||||
if (n != 0) {
|
||||
/*
|
||||
* Copy the full amount because it hasn't been
|
||||
* escaped yet.
|
||||
*/
|
||||
memcpy(out, cp, old_n);
|
||||
out += old_n;
|
||||
if (copy_width != 0) {
|
||||
if (n == 1)
|
||||
*out++ = '#';
|
||||
else {
|
||||
memset(out, '#', 2 * copy_width);
|
||||
out += 2 * copy_width;
|
||||
}
|
||||
}
|
||||
cp += old_n;
|
||||
width += (old_n / 2) - even;
|
||||
|
||||
if (even) {
|
||||
if (width > skip)
|
||||
*out++ = '[';
|
||||
width++;
|
||||
continue;
|
||||
width += leading_width;
|
||||
cp = end;
|
||||
if (*cp == '#') {
|
||||
end = format_skip(cp + 2, "]");
|
||||
if (end == NULL)
|
||||
break;
|
||||
memcpy(out, cp, end + 1 - cp);
|
||||
out += (end + 1 - cp);
|
||||
cp = end + 1;
|
||||
}
|
||||
cp = end - 1;
|
||||
|
||||
end = format_skip(cp + 2, "]");
|
||||
if (end == NULL) {
|
||||
break;
|
||||
}
|
||||
memcpy(out, cp, end + 1 - cp);
|
||||
out += (end + 1 - cp);
|
||||
cp = end + 1;
|
||||
} else if ((more = utf8_open(&ud, *cp)) == UTF8_MORE) {
|
||||
while (*++cp != '\0' && more == UTF8_MORE)
|
||||
more = utf8_append(&ud, *cp);
|
||||
|
|
503
format.c
503
format.c
|
@ -24,6 +24,7 @@
|
|||
#include <fnmatch.h>
|
||||
#include <libgen.h>
|
||||
#include <math.h>
|
||||
#include <pwd.h>
|
||||
#include <regex.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
|
@ -101,9 +102,11 @@ format_job_cmp(struct format_job *fj1, struct format_job *fj2)
|
|||
#define FORMAT_WINDOW_NAME 0x4000
|
||||
#define FORMAT_SESSION_NAME 0x8000
|
||||
#define FORMAT_CHARACTER 0x10000
|
||||
#define FORMAT_COLOUR 0x20000
|
||||
#define FORMAT_CLIENTS 0x40000
|
||||
|
||||
/* Limit on recursion. */
|
||||
#define FORMAT_LOOP_LIMIT 10
|
||||
#define FORMAT_LOOP_LIMIT 100
|
||||
|
||||
/* Format expand flags. */
|
||||
#define FORMAT_EXPAND_TIME 0x1
|
||||
|
@ -371,9 +374,6 @@ format_job_get(struct format_expand_state *es, const char *cmd)
|
|||
fj->client = ft->client;
|
||||
fj->tag = ft->tag;
|
||||
fj->cmd = xstrdup(cmd);
|
||||
fj->expanded = NULL;
|
||||
|
||||
xasprintf(&fj->out, "<'%s' not ready>", fj->cmd);
|
||||
|
||||
RB_INSERT(format_job_tree, jobs, fj);
|
||||
}
|
||||
|
@ -393,7 +393,7 @@ format_job_get(struct format_expand_state *es, const char *cmd)
|
|||
if (force && fj->job != NULL)
|
||||
job_free(fj->job);
|
||||
if (force || (fj->job == NULL && fj->last != t)) {
|
||||
fj->job = job_run(expanded, 0, NULL, NULL,
|
||||
fj->job = job_run(expanded, 0, NULL, NULL, NULL,
|
||||
server_client_get_cwd(ft->client, NULL), format_job_update,
|
||||
format_job_complete, NULL, fj, JOB_NOWAIT, -1, -1);
|
||||
if (fj->job == NULL) {
|
||||
|
@ -402,11 +402,14 @@ format_job_get(struct format_expand_state *es, const char *cmd)
|
|||
}
|
||||
fj->last = t;
|
||||
fj->updated = 0;
|
||||
}
|
||||
} else if (fj->job != NULL && (t - fj->last) > 1 && fj->out == NULL)
|
||||
xasprintf(&fj->out, "<'%s' not ready>", fj->cmd);
|
||||
free(expanded);
|
||||
|
||||
if (ft->flags & FORMAT_STATUS)
|
||||
fj->status = 1;
|
||||
if (fj->out == NULL)
|
||||
return (xstrdup(""));
|
||||
return (format_expand1(&next, fj->out));
|
||||
}
|
||||
|
||||
|
@ -799,6 +802,20 @@ format_cb_start_command(struct format_tree *ft)
|
|||
return (cmd_stringify_argv(wp->argc, wp->argv));
|
||||
}
|
||||
|
||||
/* Callback for pane_start_path. */
|
||||
static void *
|
||||
format_cb_start_path(struct format_tree *ft)
|
||||
{
|
||||
struct window_pane *wp = ft->wp;
|
||||
|
||||
if (wp == NULL)
|
||||
return (NULL);
|
||||
|
||||
if (wp->cwd == NULL)
|
||||
return (xstrdup(""));
|
||||
return (xstrdup(wp->cwd));
|
||||
}
|
||||
|
||||
/* Callback for pane_current_command. */
|
||||
static void *
|
||||
format_cb_current_command(struct format_tree *ft)
|
||||
|
@ -929,6 +946,9 @@ format_cb_pane_fg(struct format_tree *ft)
|
|||
struct window_pane *wp = ft->wp;
|
||||
struct grid_cell gc;
|
||||
|
||||
if (wp == NULL)
|
||||
return (NULL);
|
||||
|
||||
tty_default_colours(&gc, wp);
|
||||
return (xstrdup(colour_tostring(gc.fg)));
|
||||
}
|
||||
|
@ -940,6 +960,9 @@ format_cb_pane_bg(struct format_tree *ft)
|
|||
struct window_pane *wp = ft->wp;
|
||||
struct grid_cell gc;
|
||||
|
||||
if (wp == NULL)
|
||||
return (NULL);
|
||||
|
||||
tty_default_colours(&gc, wp);
|
||||
return (xstrdup(colour_tostring(gc.bg)));
|
||||
}
|
||||
|
@ -1103,7 +1126,6 @@ format_cb_mouse_word(struct format_tree *ft)
|
|||
struct window_pane *wp;
|
||||
struct grid *gd;
|
||||
u_int x, y;
|
||||
char *s;
|
||||
|
||||
if (!ft->m.valid)
|
||||
return (NULL);
|
||||
|
@ -1116,13 +1138,32 @@ format_cb_mouse_word(struct format_tree *ft)
|
|||
if (!TAILQ_EMPTY(&wp->modes)) {
|
||||
if (TAILQ_FIRST(&wp->modes)->mode == &window_copy_mode ||
|
||||
TAILQ_FIRST(&wp->modes)->mode == &window_view_mode)
|
||||
return (s = window_copy_get_word(wp, x, y));
|
||||
return (window_copy_get_word(wp, x, y));
|
||||
return (NULL);
|
||||
}
|
||||
gd = wp->base.grid;
|
||||
return (format_grid_word(gd, x, gd->hsize + y));
|
||||
}
|
||||
|
||||
/* Callback for mouse_hyperlink. */
|
||||
static void *
|
||||
format_cb_mouse_hyperlink(struct format_tree *ft)
|
||||
{
|
||||
struct window_pane *wp;
|
||||
struct grid *gd;
|
||||
u_int x, y;
|
||||
|
||||
if (!ft->m.valid)
|
||||
return (NULL);
|
||||
wp = cmd_mouse_pane(&ft->m, NULL, NULL);
|
||||
if (wp == NULL)
|
||||
return (NULL);
|
||||
if (cmd_mouse_at(wp, &ft->m, &x, &y, 0) != 0)
|
||||
return (NULL);
|
||||
gd = wp->base.grid;
|
||||
return (format_grid_hyperlink(gd, x, gd->hsize + y, wp->screen));
|
||||
}
|
||||
|
||||
/* Callback for mouse_line. */
|
||||
static void *
|
||||
format_cb_mouse_line(struct format_tree *ft)
|
||||
|
@ -1149,6 +1190,72 @@ format_cb_mouse_line(struct format_tree *ft)
|
|||
return (format_grid_line(gd, gd->hsize + y));
|
||||
}
|
||||
|
||||
/* Callback for mouse_status_line. */
|
||||
static void *
|
||||
format_cb_mouse_status_line(struct format_tree *ft)
|
||||
{
|
||||
char *value;
|
||||
u_int y;
|
||||
|
||||
if (!ft->m.valid)
|
||||
return (NULL);
|
||||
if (ft->c == NULL || (~ft->c->tty.flags & TTY_STARTED))
|
||||
return (NULL);
|
||||
|
||||
if (ft->m.statusat == 0 && ft->m.y < ft->m.statuslines) {
|
||||
y = ft->m.y;
|
||||
} else if (ft->m.statusat > 0 && ft->m.y >= (u_int)ft->m.statusat) {
|
||||
y = ft->m.y - ft->m.statusat;
|
||||
} else
|
||||
return (NULL);
|
||||
xasprintf(&value, "%u", y);
|
||||
return (value);
|
||||
|
||||
}
|
||||
|
||||
/* Callback for mouse_status_range. */
|
||||
static void *
|
||||
format_cb_mouse_status_range(struct format_tree *ft)
|
||||
{
|
||||
struct style_range *sr;
|
||||
u_int x, y;
|
||||
|
||||
if (!ft->m.valid)
|
||||
return (NULL);
|
||||
if (ft->c == NULL || (~ft->c->tty.flags & TTY_STARTED))
|
||||
return (NULL);
|
||||
|
||||
if (ft->m.statusat == 0 && ft->m.y < ft->m.statuslines) {
|
||||
x = ft->m.x;
|
||||
y = ft->m.y;
|
||||
} else if (ft->m.statusat > 0 && ft->m.y >= (u_int)ft->m.statusat) {
|
||||
x = ft->m.x;
|
||||
y = ft->m.y - ft->m.statusat;
|
||||
} else
|
||||
return (NULL);
|
||||
|
||||
sr = status_get_range(ft->c, x, y);
|
||||
if (sr == NULL)
|
||||
return (NULL);
|
||||
switch (sr->type) {
|
||||
case STYLE_RANGE_NONE:
|
||||
return (NULL);
|
||||
case STYLE_RANGE_LEFT:
|
||||
return (xstrdup("left"));
|
||||
case STYLE_RANGE_RIGHT:
|
||||
return (xstrdup("right"));
|
||||
case STYLE_RANGE_PANE:
|
||||
return (xstrdup("pane"));
|
||||
case STYLE_RANGE_WINDOW:
|
||||
return (xstrdup("window"));
|
||||
case STYLE_RANGE_SESSION:
|
||||
return (xstrdup("session"));
|
||||
case STYLE_RANGE_USER:
|
||||
return (xstrdup(sr->string));
|
||||
}
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
/* Callback for alternate_on. */
|
||||
static void *
|
||||
format_cb_alternate_on(struct format_tree *ft)
|
||||
|
@ -1380,6 +1487,35 @@ format_cb_client_tty(struct format_tree *ft)
|
|||
return (NULL);
|
||||
}
|
||||
|
||||
/* Callback for client_uid. */
|
||||
static void *
|
||||
format_cb_client_uid(struct format_tree *ft)
|
||||
{
|
||||
uid_t uid;
|
||||
|
||||
if (ft->c != NULL) {
|
||||
uid = proc_get_peer_uid(ft->c->peer);
|
||||
if (uid != (uid_t)-1)
|
||||
return (format_printf("%ld", (long)uid));
|
||||
}
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
/* Callback for client_user. */
|
||||
static void *
|
||||
format_cb_client_user(struct format_tree *ft)
|
||||
{
|
||||
uid_t uid;
|
||||
struct passwd *pw;
|
||||
|
||||
if (ft->c != NULL) {
|
||||
uid = proc_get_peer_uid(ft->c->peer);
|
||||
if (uid != (uid_t)-1 && (pw = getpwuid(uid)) != NULL)
|
||||
return (xstrdup(pw->pw_name));
|
||||
}
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
/* Callback for client_utf8. */
|
||||
static void *
|
||||
format_cb_client_utf8(struct format_tree *ft)
|
||||
|
@ -1608,11 +1744,16 @@ format_cb_mouse_x(struct format_tree *ft)
|
|||
struct window_pane *wp;
|
||||
u_int x, y;
|
||||
|
||||
if (ft->m.valid) {
|
||||
wp = cmd_mouse_pane(&ft->m, NULL, NULL);
|
||||
if (wp != NULL && cmd_mouse_at(wp, &ft->m, &x, &y, 0) == 0)
|
||||
return (format_printf("%u", x));
|
||||
if (!ft->m.valid)
|
||||
return (NULL);
|
||||
wp = cmd_mouse_pane(&ft->m, NULL, NULL);
|
||||
if (wp != NULL && cmd_mouse_at(wp, &ft->m, &x, &y, 0) == 0)
|
||||
return (format_printf("%u", x));
|
||||
if (ft->c != NULL && (ft->c->tty.flags & TTY_STARTED)) {
|
||||
if (ft->m.statusat == 0 && ft->m.y < ft->m.statuslines)
|
||||
return (format_printf("%u", ft->m.x));
|
||||
if (ft->m.statusat > 0 && ft->m.y >= (u_int)ft->m.statusat)
|
||||
return (format_printf("%u", ft->m.x));
|
||||
}
|
||||
return (NULL);
|
||||
}
|
||||
|
@ -1624,15 +1765,27 @@ format_cb_mouse_y(struct format_tree *ft)
|
|||
struct window_pane *wp;
|
||||
u_int x, y;
|
||||
|
||||
if (ft->m.valid) {
|
||||
wp = cmd_mouse_pane(&ft->m, NULL, NULL);
|
||||
if (wp != NULL && cmd_mouse_at(wp, &ft->m, &x, &y, 0) == 0)
|
||||
return (format_printf("%u", y));
|
||||
if (!ft->m.valid)
|
||||
return (NULL);
|
||||
wp = cmd_mouse_pane(&ft->m, NULL, NULL);
|
||||
if (wp != NULL && cmd_mouse_at(wp, &ft->m, &x, &y, 0) == 0)
|
||||
return (format_printf("%u", y));
|
||||
if (ft->c != NULL && (ft->c->tty.flags & TTY_STARTED)) {
|
||||
if (ft->m.statusat == 0 && ft->m.y < ft->m.statuslines)
|
||||
return (format_printf("%u", ft->m.y));
|
||||
if (ft->m.statusat > 0 && ft->m.y >= (u_int)ft->m.statusat)
|
||||
return (format_printf("%u", ft->m.y - ft->m.statusat));
|
||||
}
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
/* Callback for next_session_id. */
|
||||
static void *
|
||||
format_cb_next_session_id(__unused struct format_tree *ft)
|
||||
{
|
||||
return (format_printf("$%u", next_session_id));
|
||||
}
|
||||
|
||||
/* Callback for origin_flag. */
|
||||
static void *
|
||||
format_cb_origin_flag(struct format_tree *ft)
|
||||
|
@ -1702,6 +1855,23 @@ format_cb_pane_dead(struct format_tree *ft)
|
|||
return (NULL);
|
||||
}
|
||||
|
||||
/* Callback for pane_dead_signal. */
|
||||
static void *
|
||||
format_cb_pane_dead_signal(struct format_tree *ft)
|
||||
{
|
||||
struct window_pane *wp = ft->wp;
|
||||
const char *name;
|
||||
|
||||
if (wp != NULL) {
|
||||
if ((wp->flags & PANE_STATUSREADY) && WIFSIGNALED(wp->status)) {
|
||||
name = sig2name(WTERMSIG(wp->status));
|
||||
return (format_printf("%s", name));
|
||||
}
|
||||
return (NULL);
|
||||
}
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
/* Callback for pane_dead_status. */
|
||||
static void *
|
||||
format_cb_pane_dead_status(struct format_tree *ft)
|
||||
|
@ -1716,6 +1886,20 @@ format_cb_pane_dead_status(struct format_tree *ft)
|
|||
return (NULL);
|
||||
}
|
||||
|
||||
/* Callback for pane_dead_time. */
|
||||
static void *
|
||||
format_cb_pane_dead_time(struct format_tree *ft)
|
||||
{
|
||||
struct window_pane *wp = ft->wp;
|
||||
|
||||
if (wp != NULL) {
|
||||
if (wp->flags & PANE_STATUSDRAWN)
|
||||
return (&wp->dead_time);
|
||||
return (NULL);
|
||||
}
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
/* Callback for pane_format. */
|
||||
static void *
|
||||
format_cb_pane_format(struct format_tree *ft)
|
||||
|
@ -1766,12 +1950,24 @@ format_cb_pane_input_off(struct format_tree *ft)
|
|||
return (NULL);
|
||||
}
|
||||
|
||||
/* Callback for pane_unseen_changes. */
|
||||
static void *
|
||||
format_cb_pane_unseen_changes(struct format_tree *ft)
|
||||
{
|
||||
if (ft->wp != NULL) {
|
||||
if (ft->wp->flags & PANE_UNSEENCHANGES)
|
||||
return (xstrdup("1"));
|
||||
return (xstrdup("0"));
|
||||
}
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
/* Callback for pane_last. */
|
||||
static void *
|
||||
format_cb_pane_last(struct format_tree *ft)
|
||||
{
|
||||
if (ft->wp != NULL) {
|
||||
if (ft->wp == ft->wp->window->last)
|
||||
if (ft->wp == TAILQ_FIRST(&ft->wp->window->last_panes))
|
||||
return (xstrdup("1"));
|
||||
return (xstrdup("0"));
|
||||
}
|
||||
|
@ -1946,6 +2142,18 @@ format_cb_scroll_region_upper(struct format_tree *ft)
|
|||
return (NULL);
|
||||
}
|
||||
|
||||
/* Callback for server_sessions. */
|
||||
static void *
|
||||
format_cb_server_sessions(__unused struct format_tree *ft)
|
||||
{
|
||||
struct session *s;
|
||||
u_int n = 0;
|
||||
|
||||
RB_FOREACH(s, sessions, &sessions)
|
||||
n++;
|
||||
return (format_printf("%u", n));
|
||||
}
|
||||
|
||||
/* Callback for session_attached. */
|
||||
static void *
|
||||
format_cb_session_attached(struct format_tree *ft)
|
||||
|
@ -2079,7 +2287,7 @@ static void *
|
|||
format_cb_session_windows(struct format_tree *ft)
|
||||
{
|
||||
if (ft->s != NULL)
|
||||
return (format_printf ("%u", winlink_count(&ft->s->windows)));
|
||||
return (format_printf("%u", winlink_count(&ft->s->windows)));
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
|
@ -2497,6 +2705,24 @@ format_cb_tree_mode_format(__unused struct format_tree *ft)
|
|||
return (xstrdup(window_tree_mode.default_format));
|
||||
}
|
||||
|
||||
/* Callback for uid. */
|
||||
static void *
|
||||
format_cb_uid(__unused struct format_tree *ft)
|
||||
{
|
||||
return (format_printf("%ld", (long)getuid()));
|
||||
}
|
||||
|
||||
/* Callback for user. */
|
||||
static void *
|
||||
format_cb_user(__unused struct format_tree *ft)
|
||||
{
|
||||
struct passwd *pw;
|
||||
|
||||
if ((pw = getpwuid(getuid())) != NULL)
|
||||
return (xstrdup(pw->pw_name));
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
/* Format table type. */
|
||||
enum format_table_type {
|
||||
FORMAT_TABLE_STRING,
|
||||
|
@ -2603,6 +2829,12 @@ static const struct format_table_entry format_table[] = {
|
|||
{ "client_tty", FORMAT_TABLE_STRING,
|
||||
format_cb_client_tty
|
||||
},
|
||||
{ "client_uid", FORMAT_TABLE_STRING,
|
||||
format_cb_client_uid
|
||||
},
|
||||
{ "client_user", FORMAT_TABLE_STRING,
|
||||
format_cb_client_user
|
||||
},
|
||||
{ "client_utf8", FORMAT_TABLE_STRING,
|
||||
format_cb_client_utf8
|
||||
},
|
||||
|
@ -2666,6 +2898,9 @@ static const struct format_table_entry format_table[] = {
|
|||
{ "mouse_button_flag", FORMAT_TABLE_STRING,
|
||||
format_cb_mouse_button_flag
|
||||
},
|
||||
{ "mouse_hyperlink", FORMAT_TABLE_STRING,
|
||||
format_cb_mouse_hyperlink
|
||||
},
|
||||
{ "mouse_line", FORMAT_TABLE_STRING,
|
||||
format_cb_mouse_line
|
||||
},
|
||||
|
@ -2678,6 +2913,12 @@ static const struct format_table_entry format_table[] = {
|
|||
{ "mouse_standard_flag", FORMAT_TABLE_STRING,
|
||||
format_cb_mouse_standard_flag
|
||||
},
|
||||
{ "mouse_status_line", FORMAT_TABLE_STRING,
|
||||
format_cb_mouse_status_line
|
||||
},
|
||||
{ "mouse_status_range", FORMAT_TABLE_STRING,
|
||||
format_cb_mouse_status_range
|
||||
},
|
||||
{ "mouse_utf8_flag", FORMAT_TABLE_STRING,
|
||||
format_cb_mouse_utf8_flag
|
||||
},
|
||||
|
@ -2690,6 +2931,9 @@ static const struct format_table_entry format_table[] = {
|
|||
{ "mouse_y", FORMAT_TABLE_STRING,
|
||||
format_cb_mouse_y
|
||||
},
|
||||
{ "next_session_id", FORMAT_TABLE_STRING,
|
||||
format_cb_next_session_id
|
||||
},
|
||||
{ "origin_flag", FORMAT_TABLE_STRING,
|
||||
format_cb_origin_flag
|
||||
},
|
||||
|
@ -2723,9 +2967,15 @@ static const struct format_table_entry format_table[] = {
|
|||
{ "pane_dead", FORMAT_TABLE_STRING,
|
||||
format_cb_pane_dead
|
||||
},
|
||||
{ "pane_dead_signal", FORMAT_TABLE_STRING,
|
||||
format_cb_pane_dead_signal
|
||||
},
|
||||
{ "pane_dead_status", FORMAT_TABLE_STRING,
|
||||
format_cb_pane_dead_status
|
||||
},
|
||||
{ "pane_dead_time", FORMAT_TABLE_TIME,
|
||||
format_cb_pane_dead_time
|
||||
},
|
||||
{ "pane_fg", FORMAT_TABLE_STRING,
|
||||
format_cb_pane_fg
|
||||
},
|
||||
|
@ -2780,6 +3030,9 @@ static const struct format_table_entry format_table[] = {
|
|||
{ "pane_start_command", FORMAT_TABLE_STRING,
|
||||
format_cb_start_command
|
||||
},
|
||||
{ "pane_start_path", FORMAT_TABLE_STRING,
|
||||
format_cb_start_path
|
||||
},
|
||||
{ "pane_synchronized", FORMAT_TABLE_STRING,
|
||||
format_cb_pane_synchronized
|
||||
},
|
||||
|
@ -2795,6 +3048,9 @@ static const struct format_table_entry format_table[] = {
|
|||
{ "pane_tty", FORMAT_TABLE_STRING,
|
||||
format_cb_pane_tty
|
||||
},
|
||||
{ "pane_unseen_changes", FORMAT_TABLE_STRING,
|
||||
format_cb_pane_unseen_changes
|
||||
},
|
||||
{ "pane_width", FORMAT_TABLE_STRING,
|
||||
format_cb_pane_width
|
||||
},
|
||||
|
@ -2807,6 +3063,9 @@ static const struct format_table_entry format_table[] = {
|
|||
{ "scroll_region_upper", FORMAT_TABLE_STRING,
|
||||
format_cb_scroll_region_upper
|
||||
},
|
||||
{ "server_sessions", FORMAT_TABLE_STRING,
|
||||
format_cb_server_sessions
|
||||
},
|
||||
{ "session_activity", FORMAT_TABLE_TIME,
|
||||
format_cb_session_activity
|
||||
},
|
||||
|
@ -2879,6 +3138,12 @@ static const struct format_table_entry format_table[] = {
|
|||
{ "tree_mode_format", FORMAT_TABLE_STRING,
|
||||
format_cb_tree_mode_format
|
||||
},
|
||||
{ "uid", FORMAT_TABLE_STRING,
|
||||
format_cb_uid
|
||||
},
|
||||
{ "user", FORMAT_TABLE_STRING,
|
||||
format_cb_user
|
||||
},
|
||||
{ "version", FORMAT_TABLE_STRING,
|
||||
format_cb_version
|
||||
},
|
||||
|
@ -3079,6 +3344,22 @@ format_free(struct format_tree *ft)
|
|||
free(ft);
|
||||
}
|
||||
|
||||
/* Log each format. */
|
||||
static void
|
||||
format_log_debug_cb(const char *key, const char *value, void *arg)
|
||||
{
|
||||
const char *prefix = arg;
|
||||
|
||||
log_debug("%s: %s=%s", prefix, key, value);
|
||||
}
|
||||
|
||||
/* Log a format tree. */
|
||||
void
|
||||
format_log_debug(struct format_tree *ft, const char *prefix)
|
||||
{
|
||||
format_each(ft, format_log_debug_cb, (void *)prefix);
|
||||
}
|
||||
|
||||
/* Walk each format. */
|
||||
void
|
||||
format_each(struct format_tree *ft, void (*cb)(const char *, const char *,
|
||||
|
@ -3230,12 +3511,12 @@ format_quote_style(const char *s)
|
|||
}
|
||||
|
||||
/* Make a prettier time. */
|
||||
static char *
|
||||
format_pretty_time(time_t t)
|
||||
char *
|
||||
format_pretty_time(time_t t, int seconds)
|
||||
{
|
||||
struct tm now_tm, tm;
|
||||
time_t now, age;
|
||||
char s[6];
|
||||
char s[9];
|
||||
|
||||
time(&now);
|
||||
if (now < t)
|
||||
|
@ -3247,7 +3528,10 @@ format_pretty_time(time_t t)
|
|||
|
||||
/* Last 24 hours. */
|
||||
if (age < 24 * 3600) {
|
||||
strftime(s, sizeof s, "%H:%M", &tm);
|
||||
if (seconds)
|
||||
strftime(s, sizeof s, "%H:%M:%S", &tm);
|
||||
else
|
||||
strftime(s, sizeof s, "%H:%M", &tm);
|
||||
return (xstrdup(s));
|
||||
}
|
||||
|
||||
|
@ -3305,7 +3589,7 @@ format_find(struct format_tree *ft, const char *key, int modifiers,
|
|||
fte = format_table_get(key);
|
||||
if (fte != NULL) {
|
||||
value = fte->cb(ft);
|
||||
if (fte->type == FORMAT_TABLE_TIME)
|
||||
if (fte->type == FORMAT_TABLE_TIME && value != NULL)
|
||||
t = ((struct timeval *)value)->tv_sec;
|
||||
else
|
||||
found = value;
|
||||
|
@ -3352,7 +3636,7 @@ found:
|
|||
if (t == 0)
|
||||
return (NULL);
|
||||
if (modifiers & FORMAT_PRETTY)
|
||||
found = format_pretty_time(t);
|
||||
found = format_pretty_time(t, 0);
|
||||
else {
|
||||
if (time_format != NULL) {
|
||||
localtime_r(&t, &tm);
|
||||
|
@ -3382,18 +3666,43 @@ found:
|
|||
}
|
||||
if (modifiers & FORMAT_QUOTE_SHELL) {
|
||||
saved = found;
|
||||
found = xstrdup(format_quote_shell(saved));
|
||||
found = format_quote_shell(saved);
|
||||
free(saved);
|
||||
}
|
||||
if (modifiers & FORMAT_QUOTE_STYLE) {
|
||||
saved = found;
|
||||
found = xstrdup(format_quote_style(saved));
|
||||
found = format_quote_style(saved);
|
||||
free(saved);
|
||||
}
|
||||
return (found);
|
||||
}
|
||||
|
||||
/* Remove escaped characters from string. */
|
||||
/* Unescape escaped characters. */
|
||||
static char *
|
||||
format_unescape(const char *s)
|
||||
{
|
||||
char *out, *cp;
|
||||
int brackets = 0;
|
||||
|
||||
cp = out = xmalloc(strlen(s) + 1);
|
||||
for (; *s != '\0'; s++) {
|
||||
if (*s == '#' && s[1] == '{')
|
||||
brackets++;
|
||||
if (brackets == 0 &&
|
||||
*s == '#' &&
|
||||
strchr(",#{}:", s[1]) != NULL) {
|
||||
*cp++ = *++s;
|
||||
continue;
|
||||
}
|
||||
if (*s == '}')
|
||||
brackets--;
|
||||
*cp++ = *s;
|
||||
}
|
||||
*cp = '\0';
|
||||
return (out);
|
||||
}
|
||||
|
||||
/* Remove escaped characters. */
|
||||
static char *
|
||||
format_strip(const char *s)
|
||||
{
|
||||
|
@ -3426,7 +3735,9 @@ format_skip(const char *s, const char *end)
|
|||
for (; *s != '\0'; s++) {
|
||||
if (*s == '#' && s[1] == '{')
|
||||
brackets++;
|
||||
if (*s == '#' && strchr(",#{}:", s[1]) != NULL) {
|
||||
if (*s == '#' &&
|
||||
s[1] != '\0' &&
|
||||
strchr(",#{}:", s[1]) != NULL) {
|
||||
s++;
|
||||
continue;
|
||||
}
|
||||
|
@ -3523,7 +3834,7 @@ format_build_modifiers(struct format_expand_state *es, const char **s,
|
|||
|
||||
/*
|
||||
* Modifiers are a ; separated list of the forms:
|
||||
* l,m,C,a,b,d,n,t,w,q,E,T,S,W,P,<,>
|
||||
* l,m,C,a,b,c,d,n,t,w,q,E,T,S,W,P,<,>
|
||||
* =a
|
||||
* =/a
|
||||
* =/a/
|
||||
|
@ -3540,7 +3851,7 @@ format_build_modifiers(struct format_expand_state *es, const char **s,
|
|||
cp++;
|
||||
|
||||
/* Check single character modifiers with no arguments. */
|
||||
if (strchr("labdnwETSWP<>", cp[0]) != NULL &&
|
||||
if (strchr("labcdnwETSWPL<>", cp[0]) != NULL &&
|
||||
format_is_end(cp[1])) {
|
||||
format_add_modifier(&list, count, cp, 1, NULL, 0);
|
||||
cp++;
|
||||
|
@ -3575,7 +3886,7 @@ format_build_modifiers(struct format_expand_state *es, const char **s,
|
|||
argc = 0;
|
||||
|
||||
/* Single argument with no wrapper character. */
|
||||
if (!ispunct(cp[1]) || cp[1] == '-') {
|
||||
if (!ispunct((u_char)cp[1]) || cp[1] == '-') {
|
||||
end = format_skip(cp + 1, ":;");
|
||||
if (end == NULL)
|
||||
break;
|
||||
|
@ -3604,7 +3915,7 @@ format_build_modifiers(struct format_expand_state *es, const char **s,
|
|||
break;
|
||||
cp++;
|
||||
|
||||
argv = xreallocarray (argv, argc + 1, sizeof *argv);
|
||||
argv = xreallocarray(argv, argc + 1, sizeof *argv);
|
||||
value = xstrndup(cp, end - cp);
|
||||
argv[argc++] = format_expand1(es, value);
|
||||
free(value);
|
||||
|
@ -3868,6 +4179,40 @@ format_loop_panes(struct format_expand_state *es, const char *fmt)
|
|||
return (value);
|
||||
}
|
||||
|
||||
/* Loop over clients. */
|
||||
static char *
|
||||
format_loop_clients(struct format_expand_state *es, const char *fmt)
|
||||
{
|
||||
struct format_tree *ft = es->ft;
|
||||
struct client *c;
|
||||
struct cmdq_item *item = ft->item;
|
||||
struct format_tree *nft;
|
||||
struct format_expand_state next;
|
||||
char *expanded, *value;
|
||||
size_t valuelen;
|
||||
|
||||
value = xcalloc(1, 1);
|
||||
valuelen = 1;
|
||||
|
||||
TAILQ_FOREACH(c, &clients, entry) {
|
||||
format_log(es, "client loop: %s", c->name);
|
||||
nft = format_create(c, item, 0, ft->flags);
|
||||
format_defaults(nft, c, ft->s, ft->wl, ft->wp);
|
||||
format_copy_state(&next, es, 0);
|
||||
next.ft = nft;
|
||||
expanded = format_expand1(&next, fmt);
|
||||
format_free(nft);
|
||||
|
||||
valuelen += strlen(expanded);
|
||||
value = xrealloc(value, valuelen);
|
||||
|
||||
strlcat(value, expanded, valuelen);
|
||||
free(expanded);
|
||||
}
|
||||
|
||||
return (value);
|
||||
}
|
||||
|
||||
static char *
|
||||
format_replace_expression(struct format_modifier *mexp,
|
||||
struct format_expand_state *es, const char *copy)
|
||||
|
@ -3991,7 +4336,7 @@ format_replace_expression(struct format_modifier *mexp,
|
|||
result = (mleft < mright);
|
||||
break;
|
||||
case LESS_THAN_EQUAL:
|
||||
result = (mleft > mright);
|
||||
result = (mleft <= mright);
|
||||
break;
|
||||
}
|
||||
if (use_fp)
|
||||
|
@ -4020,10 +4365,10 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
|
|||
const char *errstr, *copy, *cp, *marker = NULL;
|
||||
const char *time_format = NULL;
|
||||
char *copy0, *condition, *found, *new;
|
||||
char *value, *left, *right, c;
|
||||
char *value, *left, *right;
|
||||
size_t valuelen;
|
||||
int modifiers = 0, limit = 0, width = 0;
|
||||
int j;
|
||||
int j, c;
|
||||
struct format_modifier *list, *cmp = NULL, *search = NULL;
|
||||
struct format_modifier **sub = NULL, *mexp = NULL, *fm;
|
||||
u_int i, count, nsub = 0;
|
||||
|
@ -4056,8 +4401,7 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
|
|||
case 's':
|
||||
if (fm->argc < 2)
|
||||
break;
|
||||
sub = xreallocarray (sub, nsub + 1,
|
||||
sizeof *sub);
|
||||
sub = xreallocarray(sub, nsub + 1, sizeof *sub);
|
||||
sub[nsub++] = fm;
|
||||
break;
|
||||
case '=':
|
||||
|
@ -4095,6 +4439,9 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
|
|||
case 'b':
|
||||
modifiers |= FORMAT_BASENAME;
|
||||
break;
|
||||
case 'c':
|
||||
modifiers |= FORMAT_COLOUR;
|
||||
break;
|
||||
case 'd':
|
||||
modifiers |= FORMAT_DIRNAME;
|
||||
break;
|
||||
|
@ -4140,6 +4487,9 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
|
|||
case 'P':
|
||||
modifiers |= FORMAT_PANES;
|
||||
break;
|
||||
case 'L':
|
||||
modifiers |= FORMAT_CLIENTS;
|
||||
break;
|
||||
}
|
||||
} else if (fm->size == 2) {
|
||||
if (strcmp(fm->modifier, "||") == 0 ||
|
||||
|
@ -4154,7 +4504,8 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
|
|||
|
||||
/* Is this a literal string? */
|
||||
if (modifiers & FORMAT_LITERAL) {
|
||||
value = xstrdup(copy);
|
||||
format_log(es, "literal string is '%s'", copy);
|
||||
value = format_unescape(copy);
|
||||
goto done;
|
||||
}
|
||||
|
||||
|
@ -4166,7 +4517,19 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
|
|||
value = xstrdup("");
|
||||
else
|
||||
xasprintf(&value, "%c", c);
|
||||
free (new);
|
||||
free(new);
|
||||
goto done;
|
||||
}
|
||||
|
||||
/* Is this a colour? */
|
||||
if (modifiers & FORMAT_COLOUR) {
|
||||
new = format_expand1(es, copy);
|
||||
c = colour_fromstring(new);
|
||||
if (c == -1 || (c = colour_force_rgb(c)) == -1)
|
||||
value = xstrdup("");
|
||||
else
|
||||
xasprintf(&value, "%06x", c & 0xffffff);
|
||||
free(new);
|
||||
goto done;
|
||||
}
|
||||
|
||||
|
@ -4183,6 +4546,10 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
|
|||
value = format_loop_panes(es, copy);
|
||||
if (value == NULL)
|
||||
goto fail;
|
||||
} else if (modifiers & FORMAT_CLIENTS) {
|
||||
value = format_loop_clients(es, copy);
|
||||
if (value == NULL)
|
||||
goto fail;
|
||||
} else if (modifiers & FORMAT_WINDOW_NAME) {
|
||||
value = format_window_name(es, copy);
|
||||
if (value == NULL)
|
||||
|
@ -4199,7 +4566,7 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
|
|||
value = xstrdup("0");
|
||||
} else {
|
||||
format_log(es, "search '%s' pane %%%u", new, wp->id);
|
||||
value = format_search(fm, wp, new);
|
||||
value = format_search(search, wp, new);
|
||||
}
|
||||
free(new);
|
||||
} else if (cmp != NULL) {
|
||||
|
@ -4278,15 +4645,14 @@ format_replace(struct format_expand_state *es, const char *key, size_t keylen,
|
|||
if (strcmp(found, condition) == 0) {
|
||||
free(found);
|
||||
found = xstrdup("");
|
||||
format_log(es, "condition '%s' found: %s",
|
||||
condition, found);
|
||||
} else {
|
||||
format_log(es,
|
||||
"condition '%s' not found; assuming false",
|
||||
condition);
|
||||
}
|
||||
} else
|
||||
format_log(es, "condition '%s' found", condition);
|
||||
} else {
|
||||
format_log(es, "condition '%s' found: %s", condition,
|
||||
found);
|
||||
}
|
||||
|
||||
if (format_choose(es, cp + 1, &left, &right, 0) != 0) {
|
||||
format_log(es, "condition '%s' syntax error: %s",
|
||||
|
@ -4433,7 +4799,7 @@ format_expand1(struct format_expand_state *es, const char *fmt)
|
|||
{
|
||||
struct format_tree *ft = es->ft;
|
||||
char *buf, *out, *name;
|
||||
const char *ptr, *s;
|
||||
const char *ptr, *s, *style_end = NULL;
|
||||
size_t off, len, n, outlen;
|
||||
int ch, brackets;
|
||||
char expanded[8192];
|
||||
|
@ -4441,8 +4807,10 @@ format_expand1(struct format_expand_state *es, const char *fmt)
|
|||
if (fmt == NULL || *fmt == '\0')
|
||||
return (xstrdup(""));
|
||||
|
||||
if (es->loop == FORMAT_LOOP_LIMIT)
|
||||
if (es->loop == FORMAT_LOOP_LIMIT) {
|
||||
format_log(es, "reached loop limit (%u)", FORMAT_LOOP_LIMIT);
|
||||
return (xstrdup(""));
|
||||
}
|
||||
es->loop++;
|
||||
|
||||
format_log(es, "expanding format: %s", fmt);
|
||||
|
@ -4526,18 +4894,20 @@ format_expand1(struct format_expand_state *es, const char *fmt)
|
|||
break;
|
||||
fmt += n + 1;
|
||||
continue;
|
||||
case '[':
|
||||
case '#':
|
||||
/*
|
||||
* If ##[ (with two or more #s), then it is a style and
|
||||
* can be left for format_draw to handle.
|
||||
*/
|
||||
ptr = fmt;
|
||||
n = 2;
|
||||
ptr = fmt - (ch == '[');
|
||||
n = 2 - (ch == '[');
|
||||
while (*ptr == '#') {
|
||||
ptr++;
|
||||
n++;
|
||||
}
|
||||
if (*ptr == '[') {
|
||||
style_end = format_skip(fmt - 2, "]");
|
||||
format_log(es, "found #*%zu[", n);
|
||||
while (len - off < n + 2) {
|
||||
buf = xreallocarray(buf, 2, len);
|
||||
|
@ -4560,10 +4930,12 @@ format_expand1(struct format_expand_state *es, const char *fmt)
|
|||
continue;
|
||||
default:
|
||||
s = NULL;
|
||||
if (ch >= 'A' && ch <= 'Z')
|
||||
s = format_upper[ch - 'A'];
|
||||
else if (ch >= 'a' && ch <= 'z')
|
||||
s = format_lower[ch - 'a'];
|
||||
if (fmt > style_end) { /* skip inside #[] */
|
||||
if (ch >= 'A' && ch <= 'Z')
|
||||
s = format_upper[ch - 'A'];
|
||||
else if (ch >= 'a' && ch <= 'z')
|
||||
s = format_lower[ch - 'a'];
|
||||
}
|
||||
if (s == NULL) {
|
||||
while (len - off < 3) {
|
||||
buf = xreallocarray(buf, 2, len);
|
||||
|
@ -4729,7 +5101,7 @@ format_defaults(struct format_tree *ft, struct client *c, struct session *s,
|
|||
if (wp != NULL)
|
||||
format_defaults_pane(ft, wp);
|
||||
|
||||
pb = paste_get_top (NULL);
|
||||
pb = paste_get_top(NULL);
|
||||
if (pb != NULL)
|
||||
format_defaults_paste_buffer(ft, pb);
|
||||
}
|
||||
|
@ -4807,7 +5179,8 @@ format_grid_word(struct grid *gd, u_int x, u_int y)
|
|||
grid_get_cell(gd, x, y, &gc);
|
||||
if (gc.flags & GRID_FLAG_PADDING)
|
||||
break;
|
||||
if (utf8_cstrhas(ws, &gc.data)) {
|
||||
if (utf8_cstrhas(ws, &gc.data) ||
|
||||
(gc.data.size == 1 && *gc.data.data == ' ')) {
|
||||
found = 1;
|
||||
break;
|
||||
}
|
||||
|
@ -4844,7 +5217,8 @@ format_grid_word(struct grid *gd, u_int x, u_int y)
|
|||
grid_get_cell(gd, x, y, &gc);
|
||||
if (gc.flags & GRID_FLAG_PADDING)
|
||||
break;
|
||||
if (utf8_cstrhas(ws, &gc.data))
|
||||
if (utf8_cstrhas(ws, &gc.data) ||
|
||||
(gc.data.size == 1 && *gc.data.data == ' '))
|
||||
break;
|
||||
|
||||
ud = xreallocarray(ud, size + 2, sizeof *ud);
|
||||
|
@ -4883,3 +5257,20 @@ format_grid_line(struct grid *gd, u_int y)
|
|||
}
|
||||
return (s);
|
||||
}
|
||||
|
||||
/* Return hyperlink at given coordinates. Caller frees. */
|
||||
char *
|
||||
format_grid_hyperlink(struct grid *gd, u_int x, u_int y, struct screen* s)
|
||||
{
|
||||
const char *uri;
|
||||
struct grid_cell gc;
|
||||
|
||||
grid_get_cell(gd, x, y, &gc);
|
||||
if (gc.flags & GRID_FLAG_PADDING)
|
||||
return (NULL);
|
||||
if (s->hyperlinks == NULL || gc.link == 0)
|
||||
return (NULL);
|
||||
if (!hyperlinks_get(s->hyperlinks, gc.link, &uri, NULL, NULL))
|
||||
return (NULL);
|
||||
return (xstrdup(uri));
|
||||
}
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
|
||||
#include <stddef.h>
|
||||
#include <assert.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#include "tmux.h"
|
||||
|
||||
|
@ -26,7 +27,7 @@
|
|||
struct event_base *libevent;
|
||||
|
||||
int
|
||||
LLVMFuzzerTestOneInput(const unsigned char *data, size_t size)
|
||||
LLVMFuzzerTestOneInput(const u_char *data, size_t size)
|
||||
{
|
||||
struct bufferevent *vpty[2];
|
||||
struct window *w;
|
||||
|
@ -43,10 +44,15 @@ LLVMFuzzerTestOneInput(const unsigned char *data, size_t size)
|
|||
w = window_create(PANE_WIDTH, PANE_HEIGHT, 0, 0);
|
||||
wp = window_add_pane(w, NULL, 0, 0);
|
||||
bufferevent_pair_new(libevent, BEV_OPT_CLOSE_ON_FREE, vpty);
|
||||
wp->ictx = input_init(wp, vpty[0]);
|
||||
wp->ictx = input_init(wp, vpty[0], NULL);
|
||||
window_add_ref(w, __func__);
|
||||
|
||||
input_parse_buffer(wp, (u_char*) data, size);
|
||||
wp->fd = open("/dev/null", O_WRONLY);
|
||||
if (wp->fd == -1)
|
||||
errx(1, "open(\"/dev/null\") failed");
|
||||
wp->event = bufferevent_new(wp->fd, NULL, NULL, NULL, NULL);
|
||||
|
||||
input_parse_buffer(wp, (u_char *)data, size);
|
||||
while (cmdq_next(NULL) != 0)
|
||||
;
|
||||
error = event_base_loop(libevent, EVLOOP_NONBLOCK);
|
||||
|
@ -84,6 +90,7 @@ LLVMFuzzerInitialize(__unused int *argc, __unused char ***argv)
|
|||
options_set_number(global_w_options, "monitor-bell", 0);
|
||||
options_set_number(global_w_options, "allow-rename", 1);
|
||||
options_set_number(global_options, "set-clipboard", 2);
|
||||
socket_path = xstrdup("dummy");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
174
grid-reader.c
174
grid-reader.c
|
@ -153,6 +153,29 @@ grid_reader_cursor_end_of_line(struct grid_reader *gr, int wrap, int all)
|
|||
gr->cx = grid_reader_line_length(gr);
|
||||
}
|
||||
|
||||
/* Handle line wrapping while moving the cursor. */
|
||||
static int
|
||||
grid_reader_handle_wrap(struct grid_reader *gr, u_int *xx, u_int *yy)
|
||||
{
|
||||
/*
|
||||
* Make sure the cursor lies within the grid reader's bounding area,
|
||||
* wrapping to the next line as necessary. Return zero if the cursor
|
||||
* would wrap past the bottom of the grid.
|
||||
*/
|
||||
while (gr->cx > *xx) {
|
||||
if (gr->cy == *yy)
|
||||
return (0);
|
||||
grid_reader_cursor_start_of_line(gr, 0);
|
||||
grid_reader_cursor_down(gr);
|
||||
|
||||
if (grid_get_line(gr->gd, gr->cy)->flags & GRID_LINE_WRAPPED)
|
||||
*xx = gr->gd->sx - 1;
|
||||
else
|
||||
*xx = grid_reader_line_length(gr);
|
||||
}
|
||||
return (1);
|
||||
}
|
||||
|
||||
/* Check if character under cursor is in set. */
|
||||
int
|
||||
grid_reader_in_set(struct grid_reader *gr, const char *set)
|
||||
|
@ -170,7 +193,6 @@ void
|
|||
grid_reader_cursor_next_word(struct grid_reader *gr, const char *separators)
|
||||
{
|
||||
u_int xx, yy;
|
||||
int expected = 0;
|
||||
|
||||
/* Do not break up wrapped words. */
|
||||
if (grid_get_line(gr->gd, gr->cy)->flags & GRID_LINE_WRAPPED)
|
||||
|
@ -180,33 +202,35 @@ grid_reader_cursor_next_word(struct grid_reader *gr, const char *separators)
|
|||
yy = gr->gd->hsize + gr->gd->sy - 1;
|
||||
|
||||
/*
|
||||
* If we started inside a word, skip over word characters. Then skip
|
||||
* over separators till the next word.
|
||||
* When navigating via spaces (for example with next-space) separators
|
||||
* should be empty.
|
||||
*
|
||||
* expected is initially set to 0 for the former and then 1 for the
|
||||
* latter. It is finally set to 0 when the beginning of the next word is
|
||||
* found.
|
||||
* If we started on a separator that is not whitespace, skip over
|
||||
* subsequent separators that are not whitespace. Otherwise, if we
|
||||
* started on a non-whitespace character, skip over subsequent
|
||||
* characters that are neither whitespace nor separators. Then, skip
|
||||
* over whitespace (if any) until the next non-whitespace character.
|
||||
*/
|
||||
do {
|
||||
while (gr->cx > xx ||
|
||||
grid_reader_in_set(gr, separators) == expected) {
|
||||
/* Move down if we are past the end of the line. */
|
||||
if (gr->cx > xx) {
|
||||
if (gr->cy == yy)
|
||||
return;
|
||||
grid_reader_cursor_start_of_line(gr, 0);
|
||||
grid_reader_cursor_down(gr);
|
||||
|
||||
if (grid_get_line(gr->gd, gr->cy)->flags &
|
||||
GRID_LINE_WRAPPED)
|
||||
xx = gr->gd->sx - 1;
|
||||
else
|
||||
xx = grid_reader_line_length(gr);
|
||||
} else
|
||||
if (!grid_reader_handle_wrap(gr, &xx, &yy))
|
||||
return;
|
||||
if (!grid_reader_in_set(gr, WHITESPACE)) {
|
||||
if (grid_reader_in_set(gr, separators)) {
|
||||
do
|
||||
gr->cx++;
|
||||
while (grid_reader_handle_wrap(gr, &xx, &yy) &&
|
||||
grid_reader_in_set(gr, separators) &&
|
||||
!grid_reader_in_set(gr, WHITESPACE));
|
||||
} else {
|
||||
do
|
||||
gr->cx++;
|
||||
while (grid_reader_handle_wrap(gr, &xx, &yy) &&
|
||||
!(grid_reader_in_set(gr, separators) ||
|
||||
grid_reader_in_set(gr, WHITESPACE)));
|
||||
}
|
||||
expected = !expected;
|
||||
} while (expected == 1);
|
||||
}
|
||||
while (grid_reader_handle_wrap(gr, &xx, &yy) &&
|
||||
grid_reader_in_set(gr, WHITESPACE))
|
||||
gr->cx++;
|
||||
}
|
||||
|
||||
/* Move cursor to the end of the next word. */
|
||||
|
@ -214,7 +238,6 @@ void
|
|||
grid_reader_cursor_next_word_end(struct grid_reader *gr, const char *separators)
|
||||
{
|
||||
u_int xx, yy;
|
||||
int expected = 1;
|
||||
|
||||
/* Do not break up wrapped words. */
|
||||
if (grid_get_line(gr->gd, gr->cy)->flags & GRID_LINE_WRAPPED)
|
||||
|
@ -224,49 +247,54 @@ grid_reader_cursor_next_word_end(struct grid_reader *gr, const char *separators)
|
|||
yy = gr->gd->hsize + gr->gd->sy - 1;
|
||||
|
||||
/*
|
||||
* If we started on a separator, skip over separators. Then skip over
|
||||
* word characters till the next separator.
|
||||
* When navigating via spaces (for example with next-space), separators
|
||||
* should be empty in both modes.
|
||||
*
|
||||
* expected is initially set to 1 for the former and then 1 for the
|
||||
* latter. It is finally set to 1 when the end of the next word is
|
||||
* found.
|
||||
* If we started on a whitespace, move until reaching the first
|
||||
* non-whitespace character. If that character is a separator, treat
|
||||
* subsequent separators as a word, and continue moving until the first
|
||||
* non-separator. Otherwise, continue moving until the first separator
|
||||
* or whitespace.
|
||||
*/
|
||||
do {
|
||||
while (gr->cx > xx ||
|
||||
grid_reader_in_set(gr, separators) == expected) {
|
||||
/* Move down if we are past the end of the line. */
|
||||
if (gr->cx > xx) {
|
||||
if (gr->cy == yy)
|
||||
return;
|
||||
grid_reader_cursor_start_of_line(gr, 0);
|
||||
grid_reader_cursor_down(gr);
|
||||
|
||||
if (grid_get_line(gr->gd, gr->cy)->flags &
|
||||
GRID_LINE_WRAPPED)
|
||||
xx = gr->gd->sx - 1;
|
||||
else
|
||||
xx = grid_reader_line_length(gr);
|
||||
} else
|
||||
while (grid_reader_handle_wrap(gr, &xx, &yy)) {
|
||||
if (grid_reader_in_set(gr, WHITESPACE))
|
||||
gr->cx++;
|
||||
else if (grid_reader_in_set(gr, separators)) {
|
||||
do
|
||||
gr->cx++;
|
||||
while (grid_reader_handle_wrap(gr, &xx, &yy) &&
|
||||
grid_reader_in_set(gr, separators) &&
|
||||
!grid_reader_in_set(gr, WHITESPACE));
|
||||
return;
|
||||
} else {
|
||||
do
|
||||
gr->cx++;
|
||||
while (grid_reader_handle_wrap(gr, &xx, &yy) &&
|
||||
!(grid_reader_in_set(gr, WHITESPACE) ||
|
||||
grid_reader_in_set(gr, separators)));
|
||||
return;
|
||||
}
|
||||
expected = !expected;
|
||||
} while (expected == 0);
|
||||
}
|
||||
}
|
||||
|
||||
/* Move to the previous place where a word begins. */
|
||||
void
|
||||
grid_reader_cursor_previous_word(struct grid_reader *gr, const char *separators,
|
||||
int already)
|
||||
int already, int stop_at_eol)
|
||||
{
|
||||
int oldx, oldy, r;
|
||||
int oldx, oldy, at_eol, word_is_letters;
|
||||
|
||||
/* Move back to the previous word character. */
|
||||
if (already || grid_reader_in_set(gr, separators)) {
|
||||
if (already || grid_reader_in_set(gr, WHITESPACE)) {
|
||||
for (;;) {
|
||||
if (gr->cx > 0) {
|
||||
gr->cx--;
|
||||
if (!grid_reader_in_set(gr, separators))
|
||||
if (!grid_reader_in_set(gr, WHITESPACE)) {
|
||||
word_is_letters =
|
||||
!grid_reader_in_set(gr, separators);
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
if (gr->cy == 0)
|
||||
return;
|
||||
|
@ -274,17 +302,21 @@ grid_reader_cursor_previous_word(struct grid_reader *gr, const char *separators,
|
|||
grid_reader_cursor_end_of_line(gr, 0, 0);
|
||||
|
||||
/* Stop if separator at EOL. */
|
||||
if (gr->cx > 0) {
|
||||
if (stop_at_eol && gr->cx > 0) {
|
||||
oldx = gr->cx;
|
||||
gr->cx--;
|
||||
r = grid_reader_in_set(gr, separators);
|
||||
at_eol = grid_reader_in_set(gr,
|
||||
WHITESPACE);
|
||||
gr->cx = oldx;
|
||||
if (r)
|
||||
if (at_eol) {
|
||||
word_is_letters = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else
|
||||
word_is_letters = !grid_reader_in_set(gr, separators);
|
||||
|
||||
/* Move back to the beginning of this word. */
|
||||
do {
|
||||
|
@ -292,15 +324,16 @@ grid_reader_cursor_previous_word(struct grid_reader *gr, const char *separators,
|
|||
oldy = gr->cy;
|
||||
if (gr->cx == 0) {
|
||||
if (gr->cy == 0 ||
|
||||
~grid_get_line(gr->gd, gr->cy - 1)->flags &
|
||||
GRID_LINE_WRAPPED)
|
||||
(~grid_get_line(gr->gd, gr->cy - 1)->flags &
|
||||
GRID_LINE_WRAPPED))
|
||||
break;
|
||||
grid_reader_cursor_up(gr);
|
||||
grid_reader_cursor_end_of_line(gr, 0, 1);
|
||||
}
|
||||
if (gr->cx > 0)
|
||||
gr->cx--;
|
||||
} while (!grid_reader_in_set(gr, separators));
|
||||
} while (!grid_reader_in_set(gr, WHITESPACE) &&
|
||||
word_is_letters != grid_reader_in_set(gr, separators));
|
||||
gr->cx = oldx;
|
||||
gr->cy = oldy;
|
||||
}
|
||||
|
@ -324,17 +357,17 @@ grid_reader_cursor_jump(struct grid_reader *gr, const struct utf8_data *jc)
|
|||
memcmp(gc.data.data, jc->data, gc.data.size) == 0) {
|
||||
gr->cx = px;
|
||||
gr->cy = py;
|
||||
return 1;
|
||||
return (1);
|
||||
}
|
||||
px++;
|
||||
}
|
||||
|
||||
if (py == yy ||
|
||||
!(grid_get_line(gr->gd, py)->flags & GRID_LINE_WRAPPED))
|
||||
return 0;
|
||||
return (0);
|
||||
px = 0;
|
||||
}
|
||||
return 0;
|
||||
return (0);
|
||||
}
|
||||
|
||||
/* Jump back to character. */
|
||||
|
@ -354,16 +387,16 @@ grid_reader_cursor_jump_back(struct grid_reader *gr, const struct utf8_data *jc)
|
|||
memcmp(gc.data.data, jc->data, gc.data.size) == 0) {
|
||||
gr->cx = px - 1;
|
||||
gr->cy = py - 1;
|
||||
return 1;
|
||||
return (1);
|
||||
}
|
||||
}
|
||||
|
||||
if (py == 1 ||
|
||||
!(grid_get_line(gr->gd, py - 2)->flags & GRID_LINE_WRAPPED))
|
||||
return 0;
|
||||
return (0);
|
||||
xx = grid_line_length(gr->gd, py - 2);
|
||||
}
|
||||
return 0;
|
||||
return (0);
|
||||
}
|
||||
|
||||
/* Jump back to the first non-blank character of the line. */
|
||||
|
@ -371,19 +404,26 @@ void
|
|||
grid_reader_cursor_back_to_indentation(struct grid_reader *gr)
|
||||
{
|
||||
struct grid_cell gc;
|
||||
u_int px, py, xx, yy;
|
||||
u_int px, py, xx, yy, oldx, oldy;
|
||||
|
||||
yy = gr->gd->hsize + gr->gd->sy - 1;
|
||||
oldx = gr->cx;
|
||||
oldy = gr->cy;
|
||||
grid_reader_cursor_start_of_line(gr, 1);
|
||||
|
||||
for (py = gr->cy; py <= yy; py++) {
|
||||
xx = grid_line_length(gr->gd, py);
|
||||
for (px = 0; px < xx; px++) {
|
||||
grid_get_cell(gr->gd, px, py, &gc);
|
||||
if (gc.data.size != 1 || *gc.data.data != ' ')
|
||||
break;
|
||||
if (gc.data.size != 1 || *gc.data.data != ' ') {
|
||||
gr->cx = px;
|
||||
gr->cy = py;
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (~grid_get_line(gr->gd, py)->flags & GRID_LINE_WRAPPED)
|
||||
break;
|
||||
}
|
||||
gr->cx = oldx;
|
||||
gr->cy = oldy;
|
||||
}
|
||||
|
|
|
@ -231,5 +231,5 @@ grid_view_string_cells(struct grid *gd, u_int px, u_int py, u_int nx)
|
|||
px = grid_view_x(gd, px);
|
||||
py = grid_view_y(gd, py);
|
||||
|
||||
return (grid_string_cells(gd, px, py, nx, NULL, 0, 0, 0));
|
||||
return (grid_string_cells(gd, px, py, nx, NULL, 0, NULL));
|
||||
}
|
||||
|
|
214
grid.c
214
grid.c
|
@ -37,7 +37,7 @@
|
|||
|
||||
/* Default grid cell data. */
|
||||
const struct grid_cell grid_default_cell = {
|
||||
{ { ' ' }, 0, 1, 1 }, 0, 0, 8, 8, 0
|
||||
{ { ' ' }, 0, 1, 1 }, 0, 0, 8, 8, 8, 0
|
||||
};
|
||||
|
||||
/*
|
||||
|
@ -45,15 +45,15 @@ const struct grid_cell grid_default_cell = {
|
|||
* appears in the grid - because of this, they are always extended cells.
|
||||
*/
|
||||
static const struct grid_cell grid_padding_cell = {
|
||||
{ { '!' }, 0, 0, 0 }, 0, GRID_FLAG_PADDING, 8, 8, 0
|
||||
{ { '!' }, 0, 0, 0 }, 0, GRID_FLAG_PADDING, 8, 8, 8, 0
|
||||
};
|
||||
|
||||
/* Cleared grid cell data. */
|
||||
static const struct grid_cell grid_cleared_cell = {
|
||||
{ { ' ' }, 0, 1, 1 }, 0, GRID_FLAG_CLEARED, 8, 8, 0
|
||||
{ { ' ' }, 0, 1, 1 }, 0, GRID_FLAG_CLEARED, 8, 8, 8, 0
|
||||
};
|
||||
static const struct grid_cell_entry grid_cleared_entry = {
|
||||
GRID_FLAG_CLEARED, { .data = { 0, 8, 8, ' ' } }
|
||||
{ .data = { 0, 8, 8, ' ' } }, GRID_FLAG_CLEARED
|
||||
};
|
||||
|
||||
/* Store cell in entry. */
|
||||
|
@ -90,6 +90,8 @@ grid_need_extended_cell(const struct grid_cell_entry *gce,
|
|||
return (1);
|
||||
if (gc->us != 0) /* only supports 256 or RGB */
|
||||
return (1);
|
||||
if (gc->link != 0)
|
||||
return (1);
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
@ -131,6 +133,7 @@ grid_extended_cell(struct grid_line *gl, struct grid_cell_entry *gce,
|
|||
gee->fg = gc->fg;
|
||||
gee->bg = gc->bg;
|
||||
gee->us = gc->us;
|
||||
gee->link = gc->link;
|
||||
return (gee);
|
||||
}
|
||||
|
||||
|
@ -231,6 +234,8 @@ grid_cells_look_equal(const struct grid_cell *gc1, const struct grid_cell *gc2)
|
|||
return (0);
|
||||
if (gc1->attr != gc2->attr || gc1->flags != gc2->flags)
|
||||
return (0);
|
||||
if (gc1->link != gc2->link)
|
||||
return (0);
|
||||
return (1);
|
||||
}
|
||||
|
||||
|
@ -399,6 +404,7 @@ grid_scroll_history(struct grid *gd, u_int bg)
|
|||
|
||||
gd->hscrolled++;
|
||||
grid_compact_line(&gd->linedata[gd->hsize]);
|
||||
gd->linedata[gd->hsize].time = current_time;
|
||||
gd->hsize++;
|
||||
}
|
||||
|
||||
|
@ -438,6 +444,7 @@ grid_scroll_history_region(struct grid *gd, u_int upper, u_int lower, u_int bg)
|
|||
|
||||
/* Move the line into the history. */
|
||||
memcpy(gl_history, gl_upper, sizeof *gl_history);
|
||||
gl_history->time = current_time;
|
||||
|
||||
/* Then move the region up and clear the bottom line. */
|
||||
memmove(gl_upper, gl_upper + 1, (lower - upper) * sizeof *gl_upper);
|
||||
|
@ -507,6 +514,7 @@ grid_get_cell1(struct grid_line *gl, u_int px, struct grid_cell *gc)
|
|||
gc->fg = gee->fg;
|
||||
gc->bg = gee->bg;
|
||||
gc->us = gee->us;
|
||||
gc->link = gee->link;
|
||||
utf8_to_data(gee->data, &gc->data);
|
||||
}
|
||||
return;
|
||||
|
@ -520,8 +528,9 @@ grid_get_cell1(struct grid_line *gl, u_int px, struct grid_cell *gc)
|
|||
gc->bg = gce->data.bg;
|
||||
if (gce->flags & GRID_FLAG_BG256)
|
||||
gc->bg |= COLOUR_FLAG_256;
|
||||
gc->us = 0;
|
||||
gc->us = 8;
|
||||
utf8_set(&gc->data, gce->data.data);
|
||||
gc->link = 0;
|
||||
}
|
||||
|
||||
/* Get cell for reading. */
|
||||
|
@ -826,20 +835,104 @@ grid_string_cells_bg(const struct grid_cell *gc, int *values)
|
|||
return (n);
|
||||
}
|
||||
|
||||
/* Get underscore colour sequence. */
|
||||
static size_t
|
||||
grid_string_cells_us(const struct grid_cell *gc, int *values)
|
||||
{
|
||||
size_t n;
|
||||
u_char r, g, b;
|
||||
|
||||
n = 0;
|
||||
if (gc->us & COLOUR_FLAG_256) {
|
||||
values[n++] = 58;
|
||||
values[n++] = 5;
|
||||
values[n++] = gc->us & 0xff;
|
||||
} else if (gc->us & COLOUR_FLAG_RGB) {
|
||||
values[n++] = 58;
|
||||
values[n++] = 2;
|
||||
colour_split_rgb(gc->us, &r, &g, &b);
|
||||
values[n++] = r;
|
||||
values[n++] = g;
|
||||
values[n++] = b;
|
||||
}
|
||||
return (n);
|
||||
}
|
||||
|
||||
/* Add on SGR code. */
|
||||
static void
|
||||
grid_string_cells_add_code(char *buf, size_t len, u_int n, int *s, int *newc,
|
||||
int *oldc, size_t nnewc, size_t noldc, int flags)
|
||||
{
|
||||
u_int i;
|
||||
char tmp[64];
|
||||
int reset = (n != 0 && s[0] == 0);
|
||||
|
||||
if (nnewc == 0)
|
||||
return; /* no code to add */
|
||||
if (!reset &&
|
||||
nnewc == noldc &&
|
||||
memcmp(newc, oldc, nnewc * sizeof newc[0]) == 0)
|
||||
return; /* no reset and colour unchanged */
|
||||
if (reset && (newc[0] == 49 || newc[0] == 39))
|
||||
return; /* reset and colour default */
|
||||
|
||||
if (flags & GRID_STRING_ESCAPE_SEQUENCES)
|
||||
strlcat(buf, "\\033[", len);
|
||||
else
|
||||
strlcat(buf, "\033[", len);
|
||||
for (i = 0; i < nnewc; i++) {
|
||||
if (i + 1 < nnewc)
|
||||
xsnprintf(tmp, sizeof tmp, "%d;", newc[i]);
|
||||
else
|
||||
xsnprintf(tmp, sizeof tmp, "%d", newc[i]);
|
||||
strlcat(buf, tmp, len);
|
||||
}
|
||||
strlcat(buf, "m", len);
|
||||
}
|
||||
|
||||
static int
|
||||
grid_string_cells_add_hyperlink(char *buf, size_t len, const char *id,
|
||||
const char *uri, int flags)
|
||||
{
|
||||
char *tmp;
|
||||
|
||||
if (strlen(uri) + strlen(id) + 17 >= len)
|
||||
return (0);
|
||||
|
||||
if (flags & GRID_STRING_ESCAPE_SEQUENCES)
|
||||
strlcat(buf, "\\033]8;", len);
|
||||
else
|
||||
strlcat(buf, "\033]8;", len);
|
||||
if (*id != '\0') {
|
||||
xasprintf(&tmp, "id=%s;", id);
|
||||
strlcat(buf, tmp, len);
|
||||
free(tmp);
|
||||
} else
|
||||
strlcat(buf, ";", len);
|
||||
strlcat(buf, uri, len);
|
||||
if (flags & GRID_STRING_ESCAPE_SEQUENCES)
|
||||
strlcat(buf, "\\033\\\\", len);
|
||||
else
|
||||
strlcat(buf, "\033\\", len);
|
||||
return (1);
|
||||
}
|
||||
|
||||
/*
|
||||
* Returns ANSI code to set particular attributes (colour, bold and so on)
|
||||
* given a current state.
|
||||
*/
|
||||
static void
|
||||
grid_string_cells_code(const struct grid_cell *lastgc,
|
||||
const struct grid_cell *gc, char *buf, size_t len, int escape_c0)
|
||||
const struct grid_cell *gc, char *buf, size_t len, int flags,
|
||||
struct screen *sc, int *has_link)
|
||||
{
|
||||
int oldc[64], newc[64], s[128];
|
||||
size_t noldc, nnewc, n, i;
|
||||
u_int attr = gc->attr, lastattr = lastgc->attr;
|
||||
char tmp[64];
|
||||
int oldc[64], newc[64], s[128];
|
||||
size_t noldc, nnewc, n, i;
|
||||
u_int attr = gc->attr, lastattr = lastgc->attr;
|
||||
char tmp[64];
|
||||
const char *uri, *id;
|
||||
|
||||
struct {
|
||||
static const struct {
|
||||
u_int mask;
|
||||
u_int code;
|
||||
} attrs[] = {
|
||||
|
@ -861,7 +954,9 @@ grid_string_cells_code(const struct grid_cell *lastgc,
|
|||
|
||||
/* If any attribute is removed, begin with 0. */
|
||||
for (i = 0; i < nitems(attrs); i++) {
|
||||
if (!(attr & attrs[i].mask) && (lastattr & attrs[i].mask)) {
|
||||
if (((~attr & attrs[i].mask) &&
|
||||
(lastattr & attrs[i].mask)) ||
|
||||
(lastgc->us != 8 && gc->us == 8)) {
|
||||
s[n++] = 0;
|
||||
lastattr &= GRID_ATTR_CHARSET;
|
||||
break;
|
||||
|
@ -876,7 +971,7 @@ grid_string_cells_code(const struct grid_cell *lastgc,
|
|||
/* Write the attributes. */
|
||||
*buf = '\0';
|
||||
if (n > 0) {
|
||||
if (escape_c0)
|
||||
if (flags & GRID_STRING_ESCAPE_SEQUENCES)
|
||||
strlcat(buf, "\\033[", len);
|
||||
else
|
||||
strlcat(buf, "\033[", len);
|
||||
|
@ -897,69 +992,60 @@ grid_string_cells_code(const struct grid_cell *lastgc,
|
|||
/* If the foreground colour changed, write its parameters. */
|
||||
nnewc = grid_string_cells_fg(gc, newc);
|
||||
noldc = grid_string_cells_fg(lastgc, oldc);
|
||||
if (nnewc != noldc ||
|
||||
memcmp(newc, oldc, nnewc * sizeof newc[0]) != 0 ||
|
||||
(n != 0 && s[0] == 0)) {
|
||||
if (escape_c0)
|
||||
strlcat(buf, "\\033[", len);
|
||||
else
|
||||
strlcat(buf, "\033[", len);
|
||||
for (i = 0; i < nnewc; i++) {
|
||||
if (i + 1 < nnewc)
|
||||
xsnprintf(tmp, sizeof tmp, "%d;", newc[i]);
|
||||
else
|
||||
xsnprintf(tmp, sizeof tmp, "%d", newc[i]);
|
||||
strlcat(buf, tmp, len);
|
||||
}
|
||||
strlcat(buf, "m", len);
|
||||
}
|
||||
grid_string_cells_add_code(buf, len, n, s, newc, oldc, nnewc, noldc,
|
||||
flags);
|
||||
|
||||
/* If the background colour changed, append its parameters. */
|
||||
nnewc = grid_string_cells_bg(gc, newc);
|
||||
noldc = grid_string_cells_bg(lastgc, oldc);
|
||||
if (nnewc != noldc ||
|
||||
memcmp(newc, oldc, nnewc * sizeof newc[0]) != 0 ||
|
||||
(n != 0 && s[0] == 0)) {
|
||||
if (escape_c0)
|
||||
strlcat(buf, "\\033[", len);
|
||||
else
|
||||
strlcat(buf, "\033[", len);
|
||||
for (i = 0; i < nnewc; i++) {
|
||||
if (i + 1 < nnewc)
|
||||
xsnprintf(tmp, sizeof tmp, "%d;", newc[i]);
|
||||
else
|
||||
xsnprintf(tmp, sizeof tmp, "%d", newc[i]);
|
||||
strlcat(buf, tmp, len);
|
||||
}
|
||||
strlcat(buf, "m", len);
|
||||
}
|
||||
grid_string_cells_add_code(buf, len, n, s, newc, oldc, nnewc, noldc,
|
||||
flags);
|
||||
|
||||
/* If the underscore colour changed, append its parameters. */
|
||||
nnewc = grid_string_cells_us(gc, newc);
|
||||
noldc = grid_string_cells_us(lastgc, oldc);
|
||||
grid_string_cells_add_code(buf, len, n, s, newc, oldc, nnewc, noldc,
|
||||
flags);
|
||||
|
||||
/* Append shift in/shift out if needed. */
|
||||
if ((attr & GRID_ATTR_CHARSET) && !(lastattr & GRID_ATTR_CHARSET)) {
|
||||
if (escape_c0)
|
||||
if (flags & GRID_STRING_ESCAPE_SEQUENCES)
|
||||
strlcat(buf, "\\016", len); /* SO */
|
||||
else
|
||||
strlcat(buf, "\016", len); /* SO */
|
||||
}
|
||||
if (!(attr & GRID_ATTR_CHARSET) && (lastattr & GRID_ATTR_CHARSET)) {
|
||||
if (escape_c0)
|
||||
if (flags & GRID_STRING_ESCAPE_SEQUENCES)
|
||||
strlcat(buf, "\\017", len); /* SI */
|
||||
else
|
||||
strlcat(buf, "\017", len); /* SI */
|
||||
}
|
||||
|
||||
/* Add hyperlink if changed. */
|
||||
if (sc != NULL && sc->hyperlinks != NULL && lastgc->link != gc->link) {
|
||||
if (hyperlinks_get(sc->hyperlinks, gc->link, &uri, &id, NULL)) {
|
||||
*has_link = grid_string_cells_add_hyperlink(buf, len,
|
||||
id, uri, flags);
|
||||
} else if (*has_link) {
|
||||
grid_string_cells_add_hyperlink(buf, len, "", "",
|
||||
flags);
|
||||
*has_link = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Convert cells into a string. */
|
||||
char *
|
||||
grid_string_cells(struct grid *gd, u_int px, u_int py, u_int nx,
|
||||
struct grid_cell **lastgc, int with_codes, int escape_c0, int trim)
|
||||
struct grid_cell **lastgc, int flags, struct screen *s)
|
||||
{
|
||||
struct grid_cell gc;
|
||||
static struct grid_cell lastgc1;
|
||||
const char *data;
|
||||
char *buf, code[128];
|
||||
char *buf, code[8192];
|
||||
size_t len, off, size, codelen;
|
||||
u_int xx;
|
||||
u_int xx, end;
|
||||
int has_link = 0;
|
||||
const struct grid_line *gl;
|
||||
|
||||
if (lastgc != NULL && *lastgc == NULL) {
|
||||
|
@ -972,16 +1058,20 @@ grid_string_cells(struct grid *gd, u_int px, u_int py, u_int nx,
|
|||
off = 0;
|
||||
|
||||
gl = grid_peek_line(gd, py);
|
||||
if (flags & GRID_STRING_EMPTY_CELLS)
|
||||
end = gl->cellsize;
|
||||
else
|
||||
end = gl->cellused;
|
||||
for (xx = px; xx < px + nx; xx++) {
|
||||
if (gl == NULL || xx >= gl->cellsize)
|
||||
if (gl == NULL || xx >= end)
|
||||
break;
|
||||
grid_get_cell(gd, xx, py, &gc);
|
||||
if (gc.flags & GRID_FLAG_PADDING)
|
||||
continue;
|
||||
|
||||
if (with_codes) {
|
||||
if (flags & GRID_STRING_WITH_SEQUENCES) {
|
||||
grid_string_cells_code(*lastgc, &gc, code, sizeof code,
|
||||
escape_c0);
|
||||
flags, s, &has_link);
|
||||
codelen = strlen(code);
|
||||
memcpy(*lastgc, &gc, sizeof **lastgc);
|
||||
} else
|
||||
|
@ -989,7 +1079,9 @@ grid_string_cells(struct grid *gd, u_int px, u_int py, u_int nx,
|
|||
|
||||
data = gc.data.data;
|
||||
size = gc.data.size;
|
||||
if (escape_c0 && size == 1 && *data == '\\') {
|
||||
if ((flags & GRID_STRING_ESCAPE_SEQUENCES) &&
|
||||
size == 1 &&
|
||||
*data == '\\') {
|
||||
data = "\\\\";
|
||||
size = 2;
|
||||
}
|
||||
|
@ -1007,7 +1099,19 @@ grid_string_cells(struct grid *gd, u_int px, u_int py, u_int nx,
|
|||
off += size;
|
||||
}
|
||||
|
||||
if (trim) {
|
||||
if (has_link) {
|
||||
grid_string_cells_add_hyperlink(code, sizeof code, "", "",
|
||||
flags);
|
||||
codelen = strlen(code);
|
||||
while (len < off + size + codelen + 1) {
|
||||
buf = xreallocarray(buf, 2, len);
|
||||
len *= 2;
|
||||
}
|
||||
memcpy(buf + off, code, codelen);
|
||||
off += codelen;
|
||||
}
|
||||
|
||||
if (flags & GRID_STRING_TRIM_SPACES) {
|
||||
while (off > 0 && buf[off - 1] == ' ')
|
||||
off--;
|
||||
}
|
||||
|
|
|
@ -0,0 +1,227 @@
|
|||
/* $OpenBSD$ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2021 Will <author@will.party>
|
||||
* Copyright (c) 2022 Jeff Chiang <pobomp@gmail.com>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
|
||||
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
|
||||
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "tmux.h"
|
||||
|
||||
/*
|
||||
* OSC 8 hyperlinks, described at:
|
||||
*
|
||||
* https://gist.github.com/egmontkob/eb114294efbcd5adb1944c9f3cb5feda
|
||||
*
|
||||
* Each hyperlink and ID combination is assigned a number ("inner" in this
|
||||
* file) which is stored in an extended grid cell and maps into a tree here.
|
||||
*
|
||||
* Each URI has one inner number and one external ID (which tmux uses to send
|
||||
* the hyperlink to the terminal) and one internal ID (which is received from
|
||||
* the sending application inside tmux).
|
||||
*
|
||||
* Anonymous hyperlinks are each unique and are not reused even if they have
|
||||
* the same URI (terminals will not want to tie them together).
|
||||
*/
|
||||
|
||||
#define MAX_HYPERLINKS 5000
|
||||
|
||||
static long long hyperlinks_next_external_id = 1;
|
||||
static u_int global_hyperlinks_count;
|
||||
|
||||
struct hyperlinks_uri {
|
||||
struct hyperlinks *tree;
|
||||
|
||||
u_int inner;
|
||||
const char *internal_id;
|
||||
const char *external_id;
|
||||
const char *uri;
|
||||
|
||||
TAILQ_ENTRY(hyperlinks_uri) list_entry;
|
||||
RB_ENTRY(hyperlinks_uri) by_inner_entry;
|
||||
RB_ENTRY(hyperlinks_uri) by_uri_entry; /* by internal ID and URI */
|
||||
};
|
||||
RB_HEAD(hyperlinks_by_uri_tree, hyperlinks_uri);
|
||||
RB_HEAD(hyperlinks_by_inner_tree, hyperlinks_uri);
|
||||
|
||||
TAILQ_HEAD(hyperlinks_list, hyperlinks_uri);
|
||||
static struct hyperlinks_list global_hyperlinks =
|
||||
TAILQ_HEAD_INITIALIZER(global_hyperlinks);
|
||||
|
||||
struct hyperlinks {
|
||||
u_int next_inner;
|
||||
struct hyperlinks_by_inner_tree by_inner;
|
||||
struct hyperlinks_by_uri_tree by_uri;
|
||||
};
|
||||
|
||||
static int
|
||||
hyperlinks_by_uri_cmp(struct hyperlinks_uri *left, struct hyperlinks_uri *right)
|
||||
{
|
||||
int r;
|
||||
|
||||
if (*left->internal_id == '\0' || *right->internal_id == '\0') {
|
||||
/*
|
||||
* If both URIs are anonymous, use the inner for comparison so
|
||||
* that they do not match even if the URI is the same - each
|
||||
* anonymous URI should be unique.
|
||||
*/
|
||||
if (*left->internal_id != '\0')
|
||||
return (-1);
|
||||
if (*right->internal_id != '\0')
|
||||
return (1);
|
||||
return (left->inner - right->inner);
|
||||
}
|
||||
|
||||
r = strcmp(left->internal_id, right->internal_id);
|
||||
if (r != 0)
|
||||
return (r);
|
||||
return (strcmp(left->uri, right->uri));
|
||||
}
|
||||
RB_PROTOTYPE_STATIC(hyperlinks_by_uri_tree, hyperlinks_uri, by_uri_entry,
|
||||
hyperlinks_by_uri_cmp);
|
||||
RB_GENERATE_STATIC(hyperlinks_by_uri_tree, hyperlinks_uri, by_uri_entry,
|
||||
hyperlinks_by_uri_cmp);
|
||||
|
||||
static int
|
||||
hyperlinks_by_inner_cmp(struct hyperlinks_uri *left,
|
||||
struct hyperlinks_uri *right)
|
||||
{
|
||||
return (left->inner - right->inner);
|
||||
}
|
||||
RB_PROTOTYPE_STATIC(hyperlinks_by_inner_tree, hyperlinks_uri, by_inner_entry,
|
||||
hyperlinks_by_inner_cmp);
|
||||
RB_GENERATE_STATIC(hyperlinks_by_inner_tree, hyperlinks_uri, by_inner_entry,
|
||||
hyperlinks_by_inner_cmp);
|
||||
|
||||
/* Remove a hyperlink. */
|
||||
static void
|
||||
hyperlinks_remove(struct hyperlinks_uri *hlu)
|
||||
{
|
||||
struct hyperlinks *hl = hlu->tree;
|
||||
|
||||
TAILQ_REMOVE(&global_hyperlinks, hlu, list_entry);
|
||||
global_hyperlinks_count--;
|
||||
|
||||
RB_REMOVE(hyperlinks_by_inner_tree, &hl->by_inner, hlu);
|
||||
RB_REMOVE(hyperlinks_by_uri_tree, &hl->by_uri, hlu);
|
||||
|
||||
free((void *)hlu->internal_id);
|
||||
free((void *)hlu->external_id);
|
||||
free((void *)hlu->uri);
|
||||
free(hlu);
|
||||
}
|
||||
|
||||
/* Store a new hyperlink or return if it already exists. */
|
||||
u_int
|
||||
hyperlinks_put(struct hyperlinks *hl, const char *uri_in,
|
||||
const char *internal_id_in)
|
||||
{
|
||||
struct hyperlinks_uri find, *hlu;
|
||||
char *uri, *internal_id, *external_id;
|
||||
|
||||
/*
|
||||
* Anonymous URI are stored with an empty internal ID and the tree
|
||||
* comparator will make sure they never match each other (so each
|
||||
* anonymous URI is unique).
|
||||
*/
|
||||
if (internal_id_in == NULL)
|
||||
internal_id_in = "";
|
||||
|
||||
utf8_stravis(&uri, uri_in, VIS_OCTAL|VIS_CSTYLE);
|
||||
utf8_stravis(&internal_id, internal_id_in, VIS_OCTAL|VIS_CSTYLE);
|
||||
|
||||
if (*internal_id_in != '\0') {
|
||||
find.uri = uri;
|
||||
find.internal_id = internal_id;
|
||||
|
||||
hlu = RB_FIND(hyperlinks_by_uri_tree, &hl->by_uri, &find);
|
||||
if (hlu != NULL) {
|
||||
free (uri);
|
||||
free (internal_id);
|
||||
return (hlu->inner);
|
||||
}
|
||||
}
|
||||
xasprintf(&external_id, "tmux%llX", hyperlinks_next_external_id++);
|
||||
|
||||
hlu = xcalloc(1, sizeof *hlu);
|
||||
hlu->inner = hl->next_inner++;
|
||||
hlu->internal_id = internal_id;
|
||||
hlu->external_id = external_id;
|
||||
hlu->uri = uri;
|
||||
hlu->tree = hl;
|
||||
RB_INSERT(hyperlinks_by_uri_tree, &hl->by_uri, hlu);
|
||||
RB_INSERT(hyperlinks_by_inner_tree, &hl->by_inner, hlu);
|
||||
|
||||
TAILQ_INSERT_TAIL(&global_hyperlinks, hlu, list_entry);
|
||||
if (++global_hyperlinks_count == MAX_HYPERLINKS)
|
||||
hyperlinks_remove(TAILQ_FIRST(&global_hyperlinks));
|
||||
|
||||
return (hlu->inner);
|
||||
}
|
||||
|
||||
/* Get hyperlink by inner number. */
|
||||
int
|
||||
hyperlinks_get(struct hyperlinks *hl, u_int inner, const char **uri_out,
|
||||
const char **internal_id_out, const char **external_id_out)
|
||||
{
|
||||
struct hyperlinks_uri find, *hlu;
|
||||
|
||||
find.inner = inner;
|
||||
|
||||
hlu = RB_FIND(hyperlinks_by_inner_tree, &hl->by_inner, &find);
|
||||
if (hlu == NULL)
|
||||
return (0);
|
||||
if (internal_id_out != NULL)
|
||||
*internal_id_out = hlu->internal_id;
|
||||
if (external_id_out != NULL)
|
||||
*external_id_out = hlu->external_id;
|
||||
*uri_out = hlu->uri;
|
||||
return (1);
|
||||
}
|
||||
|
||||
/* Initialize hyperlink set. */
|
||||
struct hyperlinks *
|
||||
hyperlinks_init(void)
|
||||
{
|
||||
struct hyperlinks *hl;
|
||||
|
||||
hl = xcalloc(1, sizeof *hl);
|
||||
hl->next_inner = 1;
|
||||
RB_INIT(&hl->by_uri);
|
||||
RB_INIT(&hl->by_inner);
|
||||
return (hl);
|
||||
}
|
||||
|
||||
/* Free all hyperlinks but not the set itself. */
|
||||
void
|
||||
hyperlinks_reset(struct hyperlinks *hl)
|
||||
{
|
||||
struct hyperlinks_uri *hlu, *hlu1;
|
||||
|
||||
RB_FOREACH_SAFE(hlu, hyperlinks_by_inner_tree, &hl->by_inner, hlu1)
|
||||
hyperlinks_remove(hlu);
|
||||
}
|
||||
|
||||
/* Free hyperlink set. */
|
||||
void
|
||||
hyperlinks_free(struct hyperlinks *hl)
|
||||
{
|
||||
hyperlinks_reset(hl);
|
||||
free(hl);
|
||||
}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue