[readline] TUI size computation for mingw32 hosts

[readline] TUI size computation for mingw32 hosts

[Denis PILAT]

[-- Attachment #1: Type: text/plain, Size: 390 bytes --]

Attached is a patch that fix a problem of calculating console window size
when gdb is hosted on windows.

I already fixed this problem in gdb 6.4 version, that was integrated into
readline (cf 
http://sources.redhat.com/ml/gdb-patches/2006-02/msg00245.html)
, but the readline I got from the 6.5 version cancels the modification 
with some new
code that overwrote variables I used.


Denis

[-- Attachment #2: terminal.c.patch --]
[-- Type: text/plain, Size: 641 bytes --]

2006-09-28  Denis Pilat  <denis.pilat@st.com>

	* readline/terminal.c (_rl_get_screen_size): use wr and wc variable to store
	window size.


Index: terminal.c
===================================================================
--- terminal.c	(revision 527)
+++ terminal.c	(working copy)
@@ -226,8 +226,8 @@ _rl_get_screen_size (tty, ignore_env)
       CONSOLE_SCREEN_BUFFER_INFO scr;
       if (GetConsoleScreenBufferInfo (hConOut, &scr))
 	{
-	  _rl_screenwidth = scr.dwSize.X;
-	  _rl_screenheight = scr.srWindow.Bottom - scr.srWindow.Top + 1;
+	  wc = scr.dwSize.X;
+	  wr = scr.srWindow.Bottom - scr.srWindow.Top + 1;
 	}
     }
 #endif

Re: [readline] TUI size computation for mingw32 hosts

[Daniel Jacobowitz]

On Thu, Sep 28, 2006 at 03:13:21PM +0200, Denis PILAT wrote:
> Attached is a patch that fix a problem of calculating console window size
> when gdb is hosted on windows.
> 
> I already fixed this problem in gdb 6.4 version, that was integrated into
> readline (cf 
> http://sources.redhat.com/ml/gdb-patches/2006-02/msg00245.html)
> , but the readline I got from the 6.5 version cancels the modification 
> with some new
> code that overwrote variables I used.

Hi Denis,

This looks fine to me - did you hear back from Chet about it?

> 2006-09-28  Denis Pilat  <denis.pilat@st.com>
> 
> 	* readline/terminal.c (_rl_get_screen_size): use wr and wc variable to store
> 	window size.

-- 
Daniel Jacobowitz
CodeSourcery

Re: [readline] TUI size computation for mingw32 hosts

[Denis PILAT]

Daniel Jacobowitz wrote:

>On Thu, Sep 28, 2006 at 03:13:21PM +0200, Denis PILAT wrote:
>  
>
>>Attached is a patch that fix a problem of calculating console window size
>>when gdb is hosted on windows.
>>
>>I already fixed this problem in gdb 6.4 version, that was integrated into
>>readline (cf 
>>http://sources.redhat.com/ml/gdb-patches/2006-02/msg00245.html)
>>, but the readline I got from the 6.5 version cancels the modification 
>>with some new
>>code that overwrote variables I used.
>>    
>>
>
>Hi Denis,
>
>This looks fine to me - did you hear back from Chet about it?
>
Not yet Daniel

Re: [readline] TUI size computation for mingw32 hosts

[Daniel Jacobowitz]

Hi Chet,

Not sure if you ever saw the attached message.  Could you let me know
if this fix is OK for readline, so that I can update GDB's bundled
copy?  Thanks in advance.

On Thu, Sep 28, 2006 at 03:13:21PM +0200, Denis PILAT wrote:
> Attached is a patch that fix a problem of calculating console window size
> when gdb is hosted on windows.
> 
> I already fixed this problem in gdb 6.4 version, that was integrated into
> readline (cf 
> http://sources.redhat.com/ml/gdb-patches/2006-02/msg00245.html)
> , but the readline I got from the 6.5 version cancels the modification 
> with some new
> code that overwrote variables I used.
> 
> 
> Denis

> 2006-09-28  Denis Pilat  <denis.pilat@st.com>
> 
> 	* readline/terminal.c (_rl_get_screen_size): use wr and wc variable to store
> 	window size.
> 
> 
> Index: terminal.c
> ===================================================================
> --- terminal.c	(revision 527)
> +++ terminal.c	(working copy)
> @@ -226,8 +226,8 @@ _rl_get_screen_size (tty, ignore_env)
>        CONSOLE_SCREEN_BUFFER_INFO scr;
>        if (GetConsoleScreenBufferInfo (hConOut, &scr))
>  	{
> -	  _rl_screenwidth = scr.dwSize.X;
> -	  _rl_screenheight = scr.srWindow.Bottom - scr.srWindow.Top + 1;
> +	  wc = scr.dwSize.X;
> +	  wr = scr.srWindow.Bottom - scr.srWindow.Top + 1;
>  	}
>      }
>  #endif


-- 
Daniel Jacobowitz
CodeSourcery

Re: [readline] TUI size computation for mingw32 hosts

[Chet Ramey]

Daniel Jacobowitz wrote:
> Hi Chet,
> 
> Not sure if you ever saw the attached message.  Could you let me know
> if this fix is OK for readline, so that I can update GDB's bundled
> copy?  Thanks in advance.

I suppose.  The code doesn't look like that anymore, but the patch
looks right.

Chet

-- 
``The lyf so short, the craft so long to lerne.'' - Chaucer
		       Live Strong.  No day but today.
Chet Ramey, ITS, CWRU    chet@case.edu    http://cnswww.cns.cwru.edu/~chet/

Re: [readline] TUI size computation for mingw32 hosts

[Daniel Jacobowitz]

On Fri, Nov 10, 2006 at 03:36:56PM -0500, Chet Ramey wrote:
> Daniel Jacobowitz wrote:
> > Hi Chet,
> > 
> > Not sure if you ever saw the attached message.  Could you let me know
> > if this fix is OK for readline, so that I can update GDB's bundled
> > copy?  Thanks in advance.
> 
> I suppose.  The code doesn't look like that anymore, but the patch
> looks right.

Thanks - as long as the problem's been fixed somehow in readline, I'm
not picky about how we fix it in GDB.  Denis, feel free to commit this.

-- 
Daniel Jacobowitz
CodeSourcery

Re: [readline] TUI size computation for mingw32 hosts

[Denis PILAT]

Daniel Jacobowitz wrote:
> On Fri, Nov 10, 2006 at 03:36:56PM -0500, Chet Ramey wrote:
>   
>> Daniel Jacobowitz wrote:
>>     
>>> Hi Chet,
>>>
>>> Not sure if you ever saw the attached message.  Could you let me know
>>> if this fix is OK for readline, so that I can update GDB's bundled
>>> copy?  Thanks in advance.
>>>       
>> I suppose.  The code doesn't look like that anymore, but the patch
>> looks right.
>>     
>
> Thanks - as long as the problem's been fixed somehow in readline, I'm
> not picky about how we fix it in GDB.  Denis, feel free to commit this.
>
>   
Ok I'll have it commited by Fred Riss who has access right.

Thanks,
Denis

Re: [readline] TUI size computation for mingw32 hosts

[Frederic RISS]

On Fri, 2006-11-10 at 15:40 -0500, Daniel Jacobowitz wrote:
> On Fri, Nov 10, 2006 at 03:36:56PM -0500, Chet Ramey wrote:
> > Daniel Jacobowitz wrote:
> > > Hi Chet,
> > > 
> > > Not sure if you ever saw the attached message.  Could you let me know
> > > if this fix is OK for readline, so that I can update GDB's bundled
> > > copy?  Thanks in advance.
> > 
> > I suppose.  The code doesn't look like that anymore, but the patch
> > looks right.
> 
> Thanks - as long as the problem's been fixed somehow in readline, I'm
> not picky about how we fix it in GDB.  Denis, feel free to commit this.

I just commited it.

Fred.