Extract ttyresize() out of cresize()
This way we can call cresize() to set the terminal size before creating a tty or spawning a process, which will start with the correct size. Signed-off-by: Christoph Lohmann <20h@r-36.net>
This commit is contained in:
		
							parent
							
								
									82335583eb
								
							
						
					
					
						commit
						6e70bb97d4
					
				
							
								
								
									
										8
									
								
								st.c
								
								
								
								
							
							
						
						
									
										8
									
								
								st.c
								
								
								
								
							| 
						 | 
					@ -1441,8 +1441,6 @@ ttynew(void)
 | 
				
			||||||
	if (openpty(&m, &s, NULL, NULL, &w) < 0)
 | 
						if (openpty(&m, &s, NULL, NULL, &w) < 0)
 | 
				
			||||||
		die("openpty failed: %s\n", strerror(errno));
 | 
							die("openpty failed: %s\n", strerror(errno));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	ttyresize();
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	switch (pid = fork()) {
 | 
						switch (pid = fork()) {
 | 
				
			||||||
	case -1:
 | 
						case -1:
 | 
				
			||||||
		die("fork failed\n");
 | 
							die("fork failed\n");
 | 
				
			||||||
| 
						 | 
					@ -3427,6 +3425,7 @@ xzoomabs(const Arg *arg)
 | 
				
			||||||
	xunloadfonts();
 | 
						xunloadfonts();
 | 
				
			||||||
	xloadfonts(usedfont, arg->f);
 | 
						xloadfonts(usedfont, arg->f);
 | 
				
			||||||
	cresize(0, 0);
 | 
						cresize(0, 0);
 | 
				
			||||||
 | 
						ttyresize();
 | 
				
			||||||
	redraw();
 | 
						redraw();
 | 
				
			||||||
	xhints();
 | 
						xhints();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -4210,7 +4209,6 @@ cresize(int width, int height)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	tresize(col, row);
 | 
						tresize(col, row);
 | 
				
			||||||
	xresize(col, row);
 | 
						xresize(col, row);
 | 
				
			||||||
	ttyresize();
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
| 
						 | 
					@ -4220,6 +4218,7 @@ resize(XEvent *e)
 | 
				
			||||||
		return;
 | 
							return;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	cresize(e->xconfigure.width, e->xconfigure.height);
 | 
						cresize(e->xconfigure.width, e->xconfigure.height);
 | 
				
			||||||
 | 
						ttyresize();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
| 
						 | 
					@ -4248,8 +4247,9 @@ run(void)
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	} while (ev.type != MapNotify);
 | 
						} while (ev.type != MapNotify);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	ttynew();
 | 
					 | 
				
			||||||
	cresize(w, h);
 | 
						cresize(w, h);
 | 
				
			||||||
 | 
						ttynew();
 | 
				
			||||||
 | 
						ttyresize();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	clock_gettime(CLOCK_MONOTONIC, &last);
 | 
						clock_gettime(CLOCK_MONOTONIC, &last);
 | 
				
			||||||
	lastblink = last;
 | 
						lastblink = last;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue