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

Timestamp:

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

Author:

bird

Message:

applied OS/2 patches (manually).

File:

• trunk/texinfo/info/session.c (modified) (13 diffs)

trunk/texinfo/info/session.c

@@ -24 +24 @@
 #include "search.h"
 #include <sys/ioctl.h>
+
+#ifdef __EMX__
+#  include <stdlib.h>
+#  include "pc.h"
+#endif /* __EMX__ */
 
 #if defined (HAVE_SYS_TIME_H)
@@ -1994 +1999 @@
    prefer the one forward.  The return is in newly-allocated memory,
    since the caller frees it.
-   
+
    This is called from info_menu_or_ref_item with XREF_LIST being all
    the xrefs in the node, and POS being point.  The ui function that
@@ -2009 +2014 @@
   int nearest = -1;
   long best_delta = -1;
-  
+
   for (this_xref = 0; xref_list[this_xref]; this_xref++)
     {
@@ -2019 +2024 @@
           break;
         }
-      
+
       /* See how far POS is from this xref.  Take into account the
          `*Note' that begins the xref, since as far as the user is
@@ -2025 +2030 @@
       delta = MIN (labs (pos - (xref->start - strlen (INFO_XREF_LABEL))),
                    labs (pos - xref->end));
-      
+
       /* It's the <= instead of < that makes us choose the forward xref
          of POS if two are equidistant.  Of course, because of all the
@@ -2036 +2041 @@
         }
     }
-  
+
   /* Maybe there was no list to search through.  */
   if (nearest < 0)
     return NULL;
-  
+
   /* Ok, we have a nearest xref, make a list of it.  */
   {
@@ -3299 +3304 @@
 
 #if !defined (DEFAULT_INFO_PRINT_COMMAND)
+# ifndef __EMX__
 #  define DEFAULT_INFO_PRINT_COMMAND "lpr"
+# else
+#  define DEFAULT_INFO_PRINT_COMMAND "expand --tabs=4 >>InfoLog.tmp"
+# endif /* __EMX__ */
 #endif /* !DEFAULT_INFO_PRINT_COMMAND */
 
@@ -4114 +4123 @@
             break;
           }
-      
+
 
       if (search_result == 0)
@@ -4575 +4584 @@
           !info_input_pending_p ())
         {
-#if defined (FD_SET)
+#if defined (FD_SET) && !defined (__EMX__)
           struct timeval timer;
           fd_set readfds;
@@ -4924 +4933 @@
   space_avail = info_input_buffer_space_available ();
 
+#ifdef __EMX__
+  if ( is_xfree86 == XFREE86_NO )
+    {
+      while (chars_avail < space_avail && (tty = pc_getc(0)) != -1)
+        input[chars_avail++] = tty;
+    }
+  else
+    {
+#endif /* __EMX__ */
   /* If we can just find out how many characters there are to read, do so. */
 #if defined (FIONREAD)
@@ -4976 +4994 @@
 #  endif /* O_NDELAY */
 #endif /* !FIONREAD */
+#ifdef __EMX__
+    }
+#endif /* __EMX__ */
 
   while (i < chars_avail)
@@ -5002 +5023 @@
       unsigned char c;
       int tty = fileno (info_input_stream);
+
+#ifdef __EMX__
+      if (is_xfree86 == XFREE86_NO)
+        keystroke = pc_getc(1);
+      else
+      {
+#endif /* __EMX__ */
 
       /* Using stream I/O causes FIONREAD etc to fail to work
@@ -5046 +5074 @@
             }
         }
+#ifdef __EMX__
+      }
+#endif /* __EMX__ */
     }