Patch for cursor positioning

[Dave McKenzie <davemck@xxxxxxxxxx>]

Jay 'Eraserhead' Felice wrote:

> Also in CVS on the development version is the patch that Dave McKenzie

> submitted for the
> cursor positioning issues when the AS/400 sends multiple WTDs.  Dave -

> please make sure
> that the modifications I made were what you intended - I had to guess
> since the patch you
> sent wasn't a diff with context and I had made some changes.  I'm
pretty
> sure I got it
> right, tho.
>
> Confirm those changes and I'll apply them for 0.16.0.


Sorry -- I'll make it a point to send context diff's in future.

The changes to cursesterm.c and session.c are good, but it appears you
missed
display.c and wtd.c.  (At least if I'm looking at the right version -- I
just
did a 'cvs checkout' without specifying a version).

Here's a (context!) diff for them:

--Dave



Index: src/display.c
===================================================================
RCS file: /tn5250/tn5250/src/display.c,v
retrieving revision 1.36
diff -c -r1.36 display.c
*** src/display.c 2000/06/08 17:45:34 1.36
--- src/display.c 2000/10/30 23:01:32
***************
*** 529,537 ****
   *****/
  void tn5250_display_set_cursor_home(Tn5250Display * This)
  {
!    if (This->pending_insert)
        tn5250_dbuffer_goto_ic(This->display_buffers);
!    else {
        int y = 0, x = 0;
        Tn5250Field *iter = This->display_buffers->field_list;
        if (iter != NULL) {
--- 529,538 ----
   *****/
  void tn5250_display_set_cursor_home(Tn5250Display * This)
  {
!   if (This->pending_insert) {
        tn5250_dbuffer_goto_ic(This->display_buffers);
!       This->pending_insert = 0;
!   } else {
        int y = 0, x = 0;
        Tn5250Field *iter = This->display_buffers->field_list;
        if (iter != NULL) {
***************
*** 870,875 ****
--- 871,878 ----
   *****/
  void tn5250_display_do_key(Tn5250Display *This, int key)
  {
+    int pre_FER_clear = 0;
+
     TN5250_LOG (("@key %d\n", key));

     /* FIXME: Translate from terminal key via keyboard map to 5250 key.
*/
***************
*** 897,903 ****
        case K_TAB:
        case K_BACKTAB:
        case K_RESET:
!   tn5250_display_indicator_clear (This, TN5250_DISPLAY_IND_FER);
    break;

        default:
--- 900,906 ----
        case K_TAB:
        case K_BACKTAB:
        case K_RESET:
!   pre_FER_clear = 1;
    break;

        default:
***************
*** 1020,1025 ****
--- 1023,1031 ----
        } else {
    TN5250_LOG (("HandleKey: Weird key ignored: %d\n", key));
        }
+    }
+    if (pre_FER_clear) {
+   tn5250_display_indicator_clear (This, TN5250_DISPLAY_IND_FER);
     }
  }

Index: src/wtd.c
===================================================================
RCS file: /tn5250/tn5250/src/wtd.c,v
retrieving revision 1.10
diff -c -r1.10 wtd.c
*** src/wtd.c 2000/06/08 17:45:35 1.10
--- src/wtd.c 2000/10/30 23:01:33
***************
*** 146,151 ****
--- 146,154 ----

     TN5250_LOG (("wtd_context_convert entered.\n"));

+    tn5250_wtd_context_putc (This, ESC);
+    tn5250_wtd_context_putc (This, CMD_RESTORE_SCREEN);
+
     /* Since we don't know the unit's prior state, we clear the unit.
*/
     tn5250_wtd_context_putc (This, ESC);
     if (tn5250_dbuffer_width (This->dst) != 80) {


+---
| 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
+---