Enlightenment CVS committal Author : mej Project : eterm Module : Eterm
Dir : eterm/Eterm/src Modified Files: command.c Log Message: Wed May 14 12:42:51 2008 Michael Jennings (mej) Patch from Kim Woelders <[EMAIL PROTECTED]>: There is a race problem with Eterm during startup related to the shell LINES/COLUMNS env vars. If the WM changes the window size (e.g. due to saved settings) before mapping the window, sometimes the shell will set LINES and COLUMNS according to the old/incorrect size and sometimes to the new/correct size, depending on wheter the call to tt_winsize() at command.c line 2322 (by the shell child process) or the tt_resize() (by the Eterm process) due to the ConfigureNotify caused by the resize (or WM ICCCM ConfigureNotify) operation happens first. The call in question was added by Azundris for Escreen. So far Escreen seems to be behaving properly with this patch applied, but all my Eterm windows (Escreen and otherwise) are pre-sized with -g anyway. So I'm going to keep my eye on it for awhile. In case of trouble, change the "#if 0" to "#ifdef ESCREEN" to revert to previous behavior when in Escreen mode. Normal operation should not require the call in question. ---------------------------------------------------------------------- =================================================================== RCS file: /cvs/e/eterm/Eterm/src/command.c,v retrieving revision 1.114 retrieving revision 1.115 diff -u -3 -r1.114 -r1.115 --- command.c 18 Oct 2006 17:36:10 -0000 1.114 +++ command.c 14 May 2008 19:49:22 -0000 1.115 @@ -21,7 +21,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -static const char cvs_ident[] = "$Id: command.c,v 1.114 2006/10/18 17:36:10 mej Exp $"; +static const char cvs_ident[] = "$Id: command.c,v 1.115 2008/05/14 19:49:22 mej Exp $"; /* includes: */ #include "config.h" @@ -2319,7 +2319,11 @@ get_tty(); SET_TTYMODE(0, &tio); - tt_winsize(0); +#if 0 + if (TermWin.screen_mode != NS_MODE_NONE) { + tt_winsize(0); + } +#endif /* become virtual console, fail silently */ if (BITFIELD_IS_SET(vt_options, VT_OPTIONS_CONSOLE)) { ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs