[Aptitude-svn-commit] r3786 - in branches/aptitude-0.3/aptitude: . src/vscreen

[Daniel Burrows]

Author: dburrows
Date: Tue Aug  9 18:14:49 2005
New Revision: 3786

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vscreen.cc
Log:
Only trap KEY_RESIZE when the result of wget_wch is KEY_CODE_YES.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Aug  9 18:14:49 2005
@@ -1,5 +1,10 @@
 2005-08-09  Daniel Burrows  <dburrows at debian.org>
 
+	* src/vscreen/vscreen.cc:
+
+	  When trapping KEY_RESIZE, check first that we have a
+	  KEY_CODE_YES event.
+
 	* src/ui.cc:
 
 	  If su-to-root fails, load selections from the file that we saved

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vscreen.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vscreen.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vscreen.cc	Tue Aug  9 18:14:49 2005
@@ -506,7 +506,7 @@
 	  toplevel->win.nodelay(true);
 	  status = toplevel->win.get_wch(&wch);
 	  toplevel->win.nodelay(false);
-	} while(wch==(wint_t) KEY_RESIZE);
+	} while(status == KEY_CODE_YES && wch == KEY_RESIZE);
 
       key k(wch, status == KEY_CODE_YES);
 
@@ -591,7 +591,7 @@
 	  vscreen_releaselock();
 	  result=curwidget->get_win().get_wch(&wch);
 	  vscreen_acquirelock();
-	} while(wch==KEY_RESIZE);
+	} while(result == KEY_CODE_YES && wch == KEY_RESIZE);
 
       key k = key(wch, result == KEY_CODE_YES);