Changeset 2619 for trunk/texinfo/info/terminal.c

Timestamp:

Mar 12, 2006, 6:02:46 PM (19 years ago)

Author:

bird

Message:

applied OS/2 patches (manually).

File:

• trunk/texinfo/info/terminal.c (modified) (8 diffs)

trunk/texinfo/info/terminal.c

@@ -24 +24 @@
 #include "terminal.h"
 #include "termdep.h"
+#ifdef __EMX__
+#  include <stdlib.h>
+#  include "pc.h"
+#endif /* __EMX__ */
 
 #include <sys/types.h>
@@ -135 +139 @@
   if (term_keypad_on)
       send_to_terminal (term_keypad_on);
-  
+
   if (!term_begin_use || !*term_begin_use)
     return;
 
 #ifdef SIGWINCH
-  sigsave = signal (SIGWINCH, SIG_IGN); 
+  sigsave = signal (SIGWINCH, SIG_IGN);
 #endif
 
@@ -166 +170 @@
   if (term_keypad_off)
       send_to_terminal (term_keypad_off);
-  
+
   if (!term_end_use || !*term_end_use)
     return;
@@ -460 +464 @@
       screenwidth = screenheight = 0;
 
+#ifdef __EMX__
+      {
+        int s[2];
+        _scrsize (s);
+        screenwidth = s[0];
+        screenheight = s[1];
+        if (getenv ("WINDOWID"))
+          {
+             FILE *fd = popen ("scrsize","rt");
+             if (fd)
+               {
+                 fscanf (fd, "%i %i", &screenwidth, &screenheight);
+                 pclose (fd);
+               }
+          }
+      }
+#endif /* __EMX__ */
+
 #if defined (TIOCGWINSZ)
       {
@@ -705 +727 @@
 
   tty = fileno (stdin);
+
+#ifdef __EMX__
+  if (is_xfree86 == XFREE86_NO)
+    pc_init ();
+  else
+  {
+#endif /* __EMX__ */
 
 #if defined (HAVE_TERMIOS_H)
@@ -827 +856 @@
   ioctl (tty, TIOCSETN, &ttybuff);
 #endif /* !HAVE_TERMIOS_H && !HAVE_TERMIO_H */
+#ifdef __EMX__
+  }
+#endif /* __EMX__ */
 }
 
@@ -843 +875 @@
 
   tty = fileno (stdin);
+
+#ifdef __EMX__
+  if ( is_xfree86 == XFREE86_NO )
+    pc_exit ();
+  else
+  {
+#endif /* __EMX__ */
 
 #if defined (HAVE_TERMIOS_H)
@@ -868 +907 @@
 #  endif /* !HAVE_TERMIO_H */
 #endif /* !HAVE_TERMIOS_H */
+#ifdef __EMX__
+  }
+#endif /* __EMX__ */
   terminal_end_using_terminal ();
 }