mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Change default position for menu and popup to centre rather than top left.
This commit is contained in:
		@@ -73,12 +73,10 @@ cmd_display_menu_get_position(struct client *c, struct cmdq_item *item,
 | 
				
			|||||||
	u_int			 ox, oy, sx, sy;
 | 
						u_int			 ox, oy, sx, sy;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	xp = args_get(args, 'x');
 | 
						xp = args_get(args, 'x');
 | 
				
			||||||
	if (xp == NULL)
 | 
						if (xp == NULL || strcmp(xp, "C") == 0)
 | 
				
			||||||
		*px = 0;
 | 
							*px = (c->tty.sx - 1) / 2 - w / 2;
 | 
				
			||||||
	else if (strcmp(xp, "R") == 0)
 | 
						else if (strcmp(xp, "R") == 0)
 | 
				
			||||||
		*px = c->tty.sx - 1;
 | 
							*px = c->tty.sx - 1;
 | 
				
			||||||
	else if (strcmp(xp, "C") == 0)
 | 
					 | 
				
			||||||
		*px = (c->tty.sx - 1) / 2 - w / 2;
 | 
					 | 
				
			||||||
	else if (strcmp(xp, "P") == 0) {
 | 
						else if (strcmp(xp, "P") == 0) {
 | 
				
			||||||
		tty_window_offset(&c->tty, &ox, &oy, &sx, &sy);
 | 
							tty_window_offset(&c->tty, &ox, &oy, &sx, &sy);
 | 
				
			||||||
		if (wp->xoff >= ox)
 | 
							if (wp->xoff >= ox)
 | 
				
			||||||
@@ -111,9 +109,7 @@ cmd_display_menu_get_position(struct client *c, struct cmdq_item *item,
 | 
				
			|||||||
		*px = c->tty.sx - w;
 | 
							*px = c->tty.sx - w;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	yp = args_get(args, 'y');
 | 
						yp = args_get(args, 'y');
 | 
				
			||||||
	if (yp == NULL)
 | 
						if (yp == NULL || strcmp(yp, "C") == 0)
 | 
				
			||||||
		*py = 0;
 | 
					 | 
				
			||||||
	else if (strcmp(yp, "C") == 0)
 | 
					 | 
				
			||||||
		*py = (c->tty.sy - 1) / 2 + h / 2;
 | 
							*py = (c->tty.sy - 1) / 2 + h / 2;
 | 
				
			||||||
	else if (strcmp(yp, "P") == 0) {
 | 
						else if (strcmp(yp, "P") == 0) {
 | 
				
			||||||
		tty_window_offset(&c->tty, &ox, &oy, &sx, &sy);
 | 
							tty_window_offset(&c->tty, &ox, &oy, &sx, &sy);
 | 
				
			||||||
@@ -280,7 +276,9 @@ cmd_display_popup_exec(struct cmd *self, struct cmdq_item *item)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	if (args_has(args, 'K'))
 | 
						if (args_has(args, 'K'))
 | 
				
			||||||
		flags |= POPUP_WRITEKEYS;
 | 
							flags |= POPUP_WRITEKEYS;
 | 
				
			||||||
	if (args_has(args, 'E'))
 | 
						if (args_has(args, 'E') > 1)
 | 
				
			||||||
 | 
							flags |= POPUP_CLOSEEXITZERO;
 | 
				
			||||||
 | 
						else if (args_has(args, 'E'))
 | 
				
			||||||
		flags |= POPUP_CLOSEEXIT;
 | 
							flags |= POPUP_CLOSEEXIT;
 | 
				
			||||||
	if (popup_display(flags, item, px, py, w, h, nlines, lines, shellcmd,
 | 
						if (popup_display(flags, item, px, py, w, h, nlines, lines, shellcmd,
 | 
				
			||||||
	    cmd, cwd, c, fs) != 0)
 | 
						    cmd, cwd, c, fs) != 0)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user