mirror of
https://git.freebsd.org/ports.git
synced 2025-07-04 10:59:14 -04:00
b111b35ebf
- use distribution patch - extend pkg-message - protect config file - cleanup staged install - make portlint happier
58 lines
1.5 KiB
C++
58 lines
1.5 KiB
C++
--- spunk/bsdsrc/kbd.cc.orig 1996-12-10 13:41:06 UTC
|
|
+++ spunk/bsdsrc/kbd.cc
|
|
@@ -27,7 +27,7 @@
|
|
#include <sys/time.h>
|
|
#include <sys/ioctl.h>
|
|
#ifdef FREEBSD
|
|
-# include <machine/console.h>
|
|
+# include <sys/kbio.h>
|
|
#endif
|
|
|
|
#include "../machine.h"
|
|
@@ -64,7 +64,7 @@ static CharSet AvailExtKeys;
|
|
|
|
|
|
// An array for mapping extended to virtual keys
|
|
-const VirtualMapSize = 50;
|
|
+const int VirtualMapSize = 50;
|
|
struct { Key EK; Key VK; } VirtualMap [VirtualMapSize];
|
|
static unsigned VirtualMapCount = 0;
|
|
|
|
@@ -192,7 +192,11 @@ static char* KbdGetCap (const char* Cap)
|
|
{
|
|
static char CapBuf [128];
|
|
char* CapPtr = CapBuf;
|
|
+#if __FreeBSD_version <= 500000
|
|
+ return tgetstr ((char *)Cap, &CapPtr);
|
|
+#else
|
|
return tgetstr (Cap, &CapPtr);
|
|
+#endif
|
|
}
|
|
|
|
|
|
@@ -649,10 +653,22 @@ void Keyboard::GetMappedKey (int Wait)
|
|
}
|
|
|
|
// Now read in a new chunk of chars.
|
|
- int Count;
|
|
+ int Count = 0;
|
|
do {
|
|
- Count = read (0, &Buf [BufFill], sizeof (Buf) - BufFill - 1);
|
|
- if (Count == 0) {
|
|
+ // Timeout is 100ms
|
|
+ timeval Timeout;
|
|
+ Timeout.tv_usec = 100000; // 100 ms
|
|
+ Timeout.tv_sec = 0;
|
|
+
|
|
+ // File descriptor is 0 (stdin)
|
|
+ fd_set Desc;
|
|
+ FD_ZERO (&Desc);
|
|
+ FD_SET (STDIN_FILENO, &Desc);
|
|
+
|
|
+ // Check input status
|
|
+ if (select (STDIN_FILENO+1, &Desc, NULL, NULL, &Timeout) > 0) {
|
|
+ Count = read (STDIN_FILENO, &Buf [BufFill], sizeof (Buf) - BufFill - 1);
|
|
+ } else {
|
|
// Timeout waiting for a key, allow some idle processing
|
|
App->Idle ();
|
|
}
|