aboutsummaryrefslogtreecommitdiff
path: root/server.c
Commit message (Collapse)AuthorAge
...
* | Merge branch 'obsd-master'Thomas Adam2015-11-25
|\| | | | | | | | | | | | | Conflicts: log.c proc.c tmux.c
| * Do lock failures slightly better, return a special value so we don'tnicm2015-11-24
| | | | | | | | unlink the wrong thing.
| * Remove the -I part of show-messages which isn't really that useful; thenicm2015-11-24
| | | | | | | | | | server start time can now be accessed with a new start_time format (use: tmux display -p '#{t:start_time}')
| * Make the log stuff a bit tidier with some helper functions.nicm2015-11-24
| |
* | Merge branch 'obsd-master'Thomas Adam2015-11-23
|\| | | | | | | | | | | Conflicts: server.c tmux.c
| * Add getpw to pledge, makes tmux work in YP environments, discovered bynicm2015-11-22
| | | | | | | | matthieu, ok deraadt
* | Merge branch 'obsd-master'Thomas Adam2015-11-18
|\|
| * Use __unused rather than rolling our own.nicm2015-11-18
| |
* | Merge branch 'obsd-master'Thomas Adam2015-11-15
|\| | | | | | | | | | | Conflicts: server.c tmux.c
| * Accidentally turned off pledge, turn it back on.nicm2015-11-15
| |
* | Merge branch 'obsd-master'Thomas Adam2015-11-14
|\| | | | | | | | | | | Conflicts: server.c tmux.c
| * Push stdout and stderr to clients more aggressively, and add an event tonicm2015-11-14
| | | | | | | | continue if the send fails.
* | Merge branch 'obsd-master'Thomas Adam2015-11-12
|\|
| * Tidy utf8.c a little: build table on first use, and make utf8_width takenicm2015-11-12
| | | | | | | | a u_int rather than splitting and then combining again in utf8_split.
* | Merge branch 'obsd-master'Thomas Adam2015-10-31
|\| | | | | | | | | Conflicts: server.c
| * The output log is only useful once and it means creating a file, so opennicm2015-10-31
| | | | | | | | it once at startup instead of in every call to tty_open.
* | Merge branch 'obsd-master'Thomas Adam2015-10-27
|\| | | | | | | | | | | | | | | | | | | Conflicts: Makefile client.c server-client.c server.c tmux.c tmux.h
| * Move struct options into options.c.nicm2015-10-27
| |
| * Break the common process set up, event loop and imsg dispatch codenicm2015-10-27
| | | | | | | | | | between server and client out into a separate internal API. This will make it easier to add another process.
* | ifdef __OpenBSD__ around pledge().Nicholas Marriott2015-10-25
| |
* | Merge branch 'obsd-master'Thomas Adam2015-10-25
|\| | | | | | | | | Conflicts: cmd-find.c
| * tmux can call pledge() in main with large set and then reduce itnicm2015-10-23
| | | | | | | | | | slightly in the server to "stdio rpath wpath cpath fattr unix recvfd proc exec tty ps".
* | Merge branch 'obsd-master'Thomas Adam2015-10-22
|\|
| * This should not be changed.nicm2015-10-22
| |
* | Merge branch 'obsd-master'Thomas Adam2015-10-22
|\|
| * Rename shutdown to exit.nicm2015-10-22
| |
* | Merge branch 'obsd-master'Thomas Adam2015-10-11
|\|
| * Userspace doesn't need to use SUN_LEN(): connect() and bind() must acceptguenther2015-10-11
| | | | | | | | | | | | sizeof(struct sockaddr_un), so do the simple, portable thing ok beck@ deraadt@
* | Merge branch 'obsd-master'Thomas Adam2015-09-06
|\| | | | | | | | | | | Conflicts: cfg.c tmux.c
| * Move initial conf load into cfg.c.nicm2015-09-01
| |
| * Event base does not need to be global.nicm2015-08-30
| |
* | Merge branch 'obsd-master'Thomas Adam2015-08-30
|\| | | | | | | | | | | Conflicts: Makefile format.c
| * We already loop over the windows in server_client_loop, so don't do itnicm2015-08-29
| | | | | | | | again in server_loop just to check names.
| * Move alerts onto events rather than checking every loop.nicm2015-08-29
| |
* | Merge branch 'obsd-master'Thomas Adam2015-08-28
|\|
| * Remove unused prototypes.nicm2015-08-28
| |
| * Per-session timers for locking, and remove the global one-second timer.nicm2015-08-28
| |
* | Merge branch 'obsd-master'Thomas Adam2015-08-28
|\|
| * Remove the lock-server option which is a bit redundant, it isn't thatnicm2015-08-28
| | | | | | | | different without it.
| * Give clock mode its own timer.nicm2015-08-28
| |
| * Run status update on a per-client timer at status-interval.nicm2015-08-28
| |
| * Move format job cleanup onto its own timer.nicm2015-08-28
| |
* | Merge branch 'obsd-master'Thomas Adam2015-07-20
|\|
| * Add an option (history-file) for a file to save/restore command promptnicm2015-07-20
| | | | | | | | history, from Olof-Joachim Frahm.
* | Merge branch 'obsd-master'Thomas Adam2015-06-07
|\| | | | | | | | | | | | | Conflicts: client.c tmux.1 tmux.c
| * Similarly, for sessions use a callback to free rather than checkingnicm2015-06-05
| | | | | | | | every loop.
| * Instead of putting dead clients on a list and checking it every loop,nicm2015-06-05
| | | | | | | | | | | | | | use event_once to queue a callback to deal with them. Also dead clients with references would never actually be freed because the wrap-up functions (the callback for stdin, or status_prompt_clear) would never be called. So call them in server_client_lost.
* | Merge branch 'obsd-master'Thomas Adam2015-06-04
|\|
| * Add support for a single "marked pane". There is one marked pane in thenicm2015-06-04
| | | | | | | | | | | | | | | | | | server at a time; it may be toggled or cleared with select-pane -m and -M (the border is highlighted). A new target '~' or '{marked}' specifies the marked pane to commands and it is the default target for the swap-pane and join-pane -s flag (this makes them much simpler to use - mark the source pane and then change to the target pane to run swapp or joinp).
* | Merge branch 'obsd-master'Thomas Adam2015-06-01
|\|