Remove has_focus from Session and use the one in Terminal. Active vs passive

cursor now behaves correctly.

git-svn-id: svn://svn.tartarus.org/sgt/putty@2232 cda61777-01e9-0310-a592-d414129be87e

diff --git a/mac/mac.h b/mac/mac.h
index 1c1c64e..a63645d 100644 (file)
--- a/mac/mac.h
+++ b/mac/mac.h
@@ -45,7 +45,6 @@ typedef struct {
     Terminal *term;
     /* Display state */
     int font_width, font_height;
-    int has_focus;
     /* Line discipline */
     void *ldisc;
     /* Backend */

diff --git a/mac/macterm.c b/mac/macterm.c
index 73ce742..51e732f 100644 (file)
--- a/mac/macterm.c
+++ b/mac/macterm.c
@@ -1,4 +1,4 @@
-/* $Id: macterm.c,v 1.3 2002/11/19 23:59:27 ben Exp $ */
+/* $Id: macterm.c,v 1.4 2002/11/20 00:11:05 ben Exp $ */
 /*
  * Copyright (c) 1999 Simon Tatham
  * Copyright (c) 1999, 2002 Ben Harris
@@ -729,7 +729,7 @@ void mac_activateterm(WindowPtr window, Boolean active) {
     Session *s;
 
     s = (Session *)GetWRefCon(window);
-    s->has_focus = active;
+    s->term->has_focus = active;
     term_update(s->term);
     if (active)
        ShowControl(s->scrollbar);