mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-03 16:46:18 +00:00 
			
		
		
		
	Merge branch 'obsd-master'
This commit is contained in:
		
							
								
								
									
										2
									
								
								server.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								server.c
									
									
									
									
									
								
							@@ -264,7 +264,7 @@ server_loop(void)
 | 
				
			|||||||
	struct client	*c;
 | 
						struct client	*c;
 | 
				
			||||||
	u_int		 items;
 | 
						u_int		 items;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	current_time = time (NULL);
 | 
						current_time = time(NULL);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	do {
 | 
						do {
 | 
				
			||||||
		items = cmdq_next(NULL);
 | 
							items = cmdq_next(NULL);
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										5
									
								
								tty.c
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								tty.c
									
									
									
									
									
								
							@@ -28,6 +28,7 @@
 | 
				
			|||||||
#include <stdlib.h>
 | 
					#include <stdlib.h>
 | 
				
			||||||
#include <string.h>
 | 
					#include <string.h>
 | 
				
			||||||
#include <termios.h>
 | 
					#include <termios.h>
 | 
				
			||||||
 | 
					#include <time.h>
 | 
				
			||||||
#include <unistd.h>
 | 
					#include <unistd.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "tmux.h"
 | 
					#include "tmux.h"
 | 
				
			||||||
@@ -379,13 +380,13 @@ tty_send_requests(struct tty *tty)
 | 
				
			|||||||
		tty_puts(tty, "\033]11;?\033\\");
 | 
							tty_puts(tty, "\033]11;?\033\\");
 | 
				
			||||||
	} else
 | 
						} else
 | 
				
			||||||
		tty->flags |= TTY_ALL_REQUEST_FLAGS;
 | 
							tty->flags |= TTY_ALL_REQUEST_FLAGS;
 | 
				
			||||||
	tty->last_requests = time (NULL);
 | 
						tty->last_requests = time(NULL);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
tty_repeat_requests(struct tty *tty)
 | 
					tty_repeat_requests(struct tty *tty)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	time_t	t = time (NULL);
 | 
						time_t	t = time(NULL);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (~tty->flags & TTY_STARTED)
 | 
						if (~tty->flags & TTY_STARTED)
 | 
				
			||||||
		return;
 | 
							return;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user