From: Jason Rumney <jasonr@gnu.org>
Date: Tue, 4 Sep 2007 23:14:37 +0000 (+0000)
Subject: (init_tty) [WINDOWSNT]: Add hooks that are not accessible
X-Git-Tag: emacs-pretest-23.0.90~11111
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a0236551109c1601b7bf0e9198c374427921a6dc;p=emacs.git

(init_tty) [WINDOWSNT]: Add hooks that are not accessible
in w32console.c.  Set up input.  Remove XXX comments that have been
confirmed as correct.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 0a5885d516c..2533d5f0c6c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2007-09-04  Jason Rumney  <jasonr@gnu.org>
 
+	* term.c (init_tty) [WINDOWSNT]: Add hooks that are not accessible
+	in w32console.c.  Set up input.  Remove XXX comments that have been
+	confirmed as correct.
+
 	* s/ms-w32.h (MULTI_KBOARD): Define.
 
 	* w32console.c (one_and_only_w32cons): Remove.
diff --git a/src/term.c b/src/term.c
index 9d659edaa5f..d8bf5647e2d 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3273,6 +3273,9 @@ init_tty (char *name, char *terminal_type, int must_succeed)
 
 #ifdef WINDOWSNT
   initialize_w32_display (terminal);
+  /* The following two are inaccessible from w32console.c.  */
+  terminal->delete_frame_hook = &delete_tty_output;
+  terminal->delete_terminal_hook = &delete_tty;
 
   /* XXX Can this be non-null?  */
   if (name)
@@ -3282,23 +3285,21 @@ init_tty (char *name, char *terminal_type, int must_succeed)
     }
   tty->type = xstrdup (terminal_type);  
 
-  /* XXX not sure if this line is correct. If it is not set then we
-     crash in update_display_1. */
   tty->output = stdout;
-  
-  Wcm_clear (tty);
+  tty->input = stdin;
+  add_keyboard_wait_descriptor (0);
 
-  area = (char *) xmalloc (2044); /* XXX this seems unused. */
+  Wcm_clear (tty);
 
   {
     struct frame *f = XFRAME (selected_frame);
 
-    FrameRows (tty) = FRAME_LINES (f); /* XXX */
-    FrameCols (tty) = FRAME_COLS (f);  /* XXX */
-    tty->specified_window = FRAME_LINES (f); /* XXX */
+    FrameRows (tty) = FRAME_LINES (f);
+    FrameCols (tty) = FRAME_COLS (f);
+    tty->specified_window = FRAME_LINES (f);
 
-    FRAME_CAN_HAVE_SCROLL_BARS (f) = 0; /* XXX */
-    FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none; /* XXX */
+    FRAME_CAN_HAVE_SCROLL_BARS (f) = 0;
+    FRAME_VERTICAL_SCROLL_BAR_TYPE (f) = vertical_scroll_bar_none;
   }
   tty->delete_in_insert_mode = 1;