(VALBITS, GCTYPEBITS): Deleted; default is better.

[bpt/emacs.git] / src / term.c

diff --git a/src/term.c b/src/term.c
index 9f786d5..ae0032b 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -54,13 +54,12 @@ int line_ins_del_ok;                /* Terminal can insert and delete lines */
 int char_ins_del_ok;           /* Terminal can insert and delete chars */
 int scroll_region_ok;          /* Terminal supports setting the
                                   scroll window */
+int scroll_region_cost;                /* Cost of setting a scroll window,
+                                  measured in characters */
 int memory_below_frame;                /* Terminal remembers lines
                                   scrolled off bottom */
 int fast_clear_end_of_line;    /* Terminal has a `ce' string */
 
-int dont_calculate_costs;      /* Nonzero means don't bother computing */
-                               /* various cost tables; we won't use them.  */
-
 /* Nonzero means no need to redraw the entire frame on resuming
    a suspended Emacs.  This is useful on terminals with multiple pages,
    where one page is used for Emacs and another for all else. */
@@ -290,6 +289,18 @@ char *tparam ();
 
 extern char *tgetstr ();
 \f
+
+#ifdef WINDOWSNT
+/* We aren't X windows, but we aren't termcap either.  This makes me
+   uncertain as to what value to use for frame.output_method.  For
+   this file, we'll define FRAME_TERMCAP_P to be zero so that our
+   output hooks get called instead of the termcap functions.  Probably
+   the best long-term solution is to define an output_windows_nt...  */
+
+#undef FRAME_TERMCAP_P
+#define FRAME_TERMCAP_P(_f_) 0
+#endif /* WINDOWSNT */
+
 ring_bell ()
 {
   if (! FRAME_TERMCAP_P (selected_frame))
@@ -1075,19 +1086,20 @@ extern do_line_insertion_deletion_costs ();
 calculate_costs (frame)
      FRAME_PTR frame;
 {
-  register char *f = TS_set_scroll_region ?
-                       TS_set_scroll_region
-                    : TS_set_scroll_region_1;
+  register char *f = (TS_set_scroll_region
+                     ? TS_set_scroll_region
+                     : TS_set_scroll_region_1);
 
-  if (dont_calculate_costs)
-    return;
+  FRAME_COST_BAUD_RATE (frame) = baud_rate;
 
+  scroll_region_cost = string_cost (f);
 #ifdef HAVE_X_WINDOWS
   if (FRAME_X_P (frame))
     {
       do_line_insertion_deletion_costs (frame, 0, ".5*", 0, ".5*",
                                        0, 0,
                                        x_screen_planes (frame));
+      scroll_region_cost = 0;
       return;
     }
 #endif
@@ -1374,8 +1386,42 @@ term_init (terminal_type)
   register char *p;
   int status;
 
+#ifdef WINDOWSNT
+  initialize_win_nt_display ();
+
+  Wcm_clear ();
+
+  area = (char *) malloc (2044);
+
+  if (area == 0)
+    abort ();
+
+  FrameRows = FRAME_HEIGHT (selected_frame);
+  FrameCols = FRAME_WIDTH (selected_frame);
+  specified_window = FRAME_HEIGHT (selected_frame);
+
+  delete_in_insert_mode = 1;
+
+  UseTabs = 0;
+  scroll_region_ok = 0;
+
+  /* Seems to insert lines when it's not supposed to, messing
+     up the display.  In doing a trace, it didn't seem to be
+     called much, so I don't think we're losing anything by
+     turning it off.  */
+
+  line_ins_del_ok = 0;
+  char_ins_del_ok = 1;
+
+  baud_rate = 19200;
+
+  FRAME_CAN_HAVE_SCROLL_BARS (selected_frame) = 0;
+  FRAME_HAS_VERTICAL_SCROLL_BARS (selected_frame) = 0;
+
+  return;
+#endif /* WINDOWSNT */
+
   Wcm_clear ();
-  dont_calculate_costs = 0;
 
   status = tgetent (buffer, terminal_type);
   if (status < 0)
@@ -1481,6 +1527,11 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.\n",
   if (FRAME_HEIGHT (selected_frame) <= 0)
     FRAME_HEIGHT (selected_frame) = tgetnum ("li");
 
+  if (FRAME_HEIGHT (selected_frame) < 3
+      || FRAME_WIDTH (selected_frame) < 3)
+    fatal ("Screen size %dx%d is too small.\n",
+          FRAME_HEIGHT (selected_frame), FRAME_WIDTH (selected_frame));
+
   min_padding_speed = tgetnum ("pb");
   TN_standout_width = tgetnum ("sg");
   TabWidth = tgetnum ("tw");