Apple-2-SW/TwoTerm
1
0
Fork 0
mirror of https://github.com/ksherlock/TwoTerm.git synced 2025-01-03 07:29:28 +00:00
Code Issues Projects Releases Wiki Activity

set TERMINFO_DIRS to bundle/Resources/terminfo.

Browse Source
This commit is contained in:
Kelvin Sherlock 2018-01-31 21:19:05 -05:00
parent e0bc21d663
commit b63b60826d
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
TermWindowController.mm
View File

@ -69,6 +69,21 @@
-(void)initPTY -(void)initPTY
{ {
static std::string username; static std::string username;
static std::string terminfo;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
// getlogin() sometimes returns crap.
username = [NSUserName() UTF8String];
char *cp = getenv("TERMINFO_DIRS");
if (cp && *cp) {
terminfo = cp;
terminfo.push_back(':');
}
NSString *s = [[NSBundle mainBundle] resourcePath];
s = [s stringByAppendingPathComponent: @"terminfo"];
terminfo += [s UTF8String];
});
pid_t pid; pid_t pid;
int fd; int fd;
@ -78,10 +93,6 @@
memset(&term, 0, sizeof(term)); memset(&term, 0, sizeof(term));
//term.c_oflag = OPOST | ONLCR;
//term.c_lflag = ECHO;
//term.c_iflag = ICRNL; // | ICANON | ECHOE | ISIG;
term.c_oflag = TTYDEF_OFLAG; term.c_oflag = TTYDEF_OFLAG;
term.c_lflag = TTYDEF_LFLAG; term.c_lflag = TTYDEF_LFLAG;
term.c_iflag = TTYDEF_IFLAG; term.c_iflag = TTYDEF_IFLAG;
@ -95,11 +106,6 @@
[_emulator initTerm: &term]; [_emulator initTerm: &term];
// getlogin() sometimes returns crap.
if (username.empty()) {
username = [NSUserName() UTF8String];
}
//NSLog(@"%@ %s %s", NSUserName(), getlogin(), getpwent()->pw_name);
pid = forkpty(&fd, NULL, &term, &ws); pid = forkpty(&fd, NULL, &term, &ws);
if (pid < 0) if (pid < 0)
@ -124,8 +130,12 @@
s.append("TERM="); s.append("TERM=");
s.append([_emulator termName]); s.append([_emulator termName]);
s.append(1, (char)0); s.append(1, (char)0);
s.append("TERMINFO_DIRS=");
s.append(terminfo.c_str());
s.append(1, (char)0);
s.append(1, (char)0); s.append(1, (char)0);
for (std::string::size_type index = 0;;) for (std::string::size_type index = 0;;)