0.16.1 retro patch for cursor positioning bug

This is a patch for the 0.16.1 tarball from the CVS site to fix the
problem Sean Porterfield had in 0.17.1 with cursor positioning in a
window.

--Dave

===========================================================================

diff -ur tn5250-0.16.1.old/ChangeLog tn5250-0.16.1/ChangeLog
--- tn5250-0.16.1.old/ChangeLog Tue Dec 19 18:44:09 2000
+++ tn5250-0.16.1/ChangeLog Sun Dec 31 13:04:29 2000
@@ -1,3 +1,7 @@
+2000-12-31 Dave McKenzie <davemck@galois.com>
+- Another cursor bug: in a window, cursor was positioned at row 1, col
1
+  of window instead of at first input field.
+
 2000-12-19 Jay 'Eraserhead' Felice <jfelice@cronosys.com>
 - Okay, really applied second patch from Dave McKenzie *sigh*
 - Applied patch from Carey Evans to fix option parsing in xt5250.
diff -ur tn5250-0.16.1.old/src/session.c tn5250-0.16.1/src/session.c
--- tn5250-0.16.1.old/src/session.c Tue Dec 19 17:35:58 2000
+++ tn5250-0.16.1/src/session.c Sun Dec 31 13:05:56 2000
@@ -1249,6 +1249,7 @@
    TN5250_LOG (("StartOfHeader: entered.\n"));

    tn5250_dbuffer_clear_table(tn5250_display_dbuffer(This->display));
+   tn5250_display_clear_pending_insert(This->display);
    tn5250_display_indicator_set(This->display,
TN5250_DISPLAY_IND_X_SYSTEM);

    n = tn5250_record_get_byte (This->record);
diff -ur tn5250-0.16.1.old/src/wtd.c tn5250-0.16.1/src/wtd.c
--- tn5250-0.16.1.old/src/wtd.c Wed Dec  6 11:39:25 2000
+++ tn5250-0.16.1/src/wtd.c Sun Dec 31 13:06:04 2000
@@ -165,15 +165,6 @@
    tn5250_wtd_context_putc (This, 0x00); /* CC1 */
    tn5250_wtd_context_putc (This, 0x00); /* CC2 */

-   /*
-    Set the insert-cursor address.  This is necessary to ensure that
-    we return to same field we were in before the save_screen.
-   */
-
-   tn5250_wtd_context_putc (This, IC);
-   tn5250_wtd_context_putc (This, This->y);
-   tn5250_wtd_context_putc (This, This->x);
-
    /* If we have header data, start with a SOH order. */
    if (This->dst->header_length != 0) {
       int i;
@@ -182,6 +173,14 @@
       for (i = 0; i < This->dst->header_length; i++)
   tn5250_wtd_context_putc (This, This->dst->header_data[i]);
    }
+   /*
+    Set the insert-cursor address.  This is necessary to ensure that
+    we return to same field we were in before the save_screen.
+   */
+
+   tn5250_wtd_context_putc (This, IC);
+   tn5250_wtd_context_putc (This, This->y);
+   tn5250_wtd_context_putc (This, This->x);


    for (This->y = 0; This->y < tn5250_dbuffer_height(This->dst);

===========================================================================



+---
| This is the LINUX5250 Mailing List!
| To submit a new message, send your mail to LINUX5250@midrange.com.
| To subscribe to this list send email to LINUX5250-SUB@midrange.com.
| To unsubscribe from this list send email to LINUX5250-UNSUB@midrange.com.
| Questions should be directed to the list owner/operator: david@midrange.com
+---