perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move_buf <-> move_ptr

This commit is contained in:
Markus Gans 2018-09-18 03:37:44 +02:00
parent fec12f5d64
commit f3bc5b35f4
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/foptimove.cpp
View File

@ -1122,7 +1122,7 @@ void FOptiMove::moveByMethod ( int method
if ( F_carriage_return.cap ) if ( F_carriage_return.cap )
{ {
std::strncpy (move_ptr, F_carriage_return.cap, BUF_SIZE); std::strncpy (move_ptr, F_carriage_return.cap, BUF_SIZE);
move_buf[BUF_SIZE - 1] ='\0'; move_ptr[BUF_SIZE - 1] ='\0';
move_ptr += F_carriage_return.length; move_ptr += F_carriage_return.length;
relativeMove (move_ptr, 0, yold, xnew, ynew); relativeMove (move_ptr, 0, yold, xnew, ynew);
} }
@ -1130,14 +1130,14 @@ void FOptiMove::moveByMethod ( int method
case 3: case 3:
std::strncpy (move_ptr, F_cursor_home.cap, BUF_SIZE); std::strncpy (move_ptr, F_cursor_home.cap, BUF_SIZE);
move_buf[BUF_SIZE - 1] ='\0'; move_ptr[BUF_SIZE - 1] ='\0';
move_ptr += F_cursor_home.length; move_ptr += F_cursor_home.length;
relativeMove (move_ptr, 0, 0, xnew, ynew); relativeMove (move_ptr, 0, 0, xnew, ynew);
break; break;
case 4: case 4:
std::strncpy (move_ptr, F_cursor_to_ll.cap, BUF_SIZE); std::strncpy (move_ptr, F_cursor_to_ll.cap, BUF_SIZE);
move_buf[BUF_SIZE - 1] ='\0'; move_ptr[BUF_SIZE - 1] ='\0';
move_ptr += F_cursor_to_ll.length; move_ptr += F_cursor_to_ll.length;
relativeMove (move_ptr, 0, screen_height - 1, xnew, ynew); relativeMove (move_ptr, 0, screen_height - 1, xnew, ynew);
break; break;
@ -1153,7 +1153,7 @@ void FOptiMove::moveByMethod ( int method
std::strncat ( move_ptr std::strncat ( move_ptr
, F_cursor_left.cap , F_cursor_left.cap
, BUF_SIZE - std::strlen(move_ptr) ); , BUF_SIZE - std::strlen(move_ptr) );
move_buf[BUF_SIZE - 1] ='\0'; move_ptr[BUF_SIZE - 1] ='\0';
move_ptr += std::strlen(move_buf); move_ptr += std::strlen(move_buf);
relativeMove (move_ptr, screen_width - 1, yold - 1, xnew, ynew); relativeMove (move_ptr, screen_width - 1, yold - 1, xnew, ynew);
break; break;

40
src/test/ftermdetection-test.cpp
View File

@ -532,7 +532,7 @@ void FTermDetectionTest::ansiTest()
// Start the terminal simulation // Start the terminal simulation
terminalSimulation (ansi); terminalSimulation (ansi);
if ( waitpid(pid, 0, 0) != pid ) if ( waitpid(pid, 0, WUNTRACED) != pid )
std::cerr << "waitpid error" << std::endl; std::cerr << "waitpid error" << std::endl;
} }
} }
@ -591,7 +591,7 @@ void FTermDetectionTest::xtermTest()
// Start the terminal simulation // Start the terminal simulation
terminalSimulation (xterm); terminalSimulation (xterm);
if ( waitpid(pid, 0, 0) != pid ) if ( waitpid(pid, 0, WUNTRACED) != pid )
std::cerr << "waitpid error" << std::endl; std::cerr << "waitpid error" << std::endl;
} }
} }
@ -650,7 +650,7 @@ void FTermDetectionTest::rxvtTest()
// Start the terminal simulation // Start the terminal simulation
terminalSimulation (rxvt); terminalSimulation (rxvt);
if ( waitpid(pid, 0, 0) != pid ) if ( waitpid(pid, 0, WUNTRACED) != pid )
std::cerr << "waitpid error" << std::endl; std::cerr << "waitpid error" << std::endl;
} }
} }
@ -709,7 +709,7 @@ void FTermDetectionTest::urxvtTest()
// Start the terminal simulation // Start the terminal simulation
terminalSimulation (urxvt); terminalSimulation (urxvt);
if ( waitpid(pid, 0, 0) != pid ) if ( waitpid(pid, 0, WUNTRACED) != pid )
std::cerr << "waitpid error" << std::endl; std::cerr << "waitpid error" << std::endl;
} }
} }
@ -769,7 +769,7 @@ void FTermDetectionTest::mltermTest()
// Start the terminal simulation // Start the terminal simulation
terminalSimulation (mlterm); terminalSimulation (mlterm);
if ( waitpid(pid, 0, 0) != pid ) if ( waitpid(pid, 0, WUNTRACED) != pid )
std::cerr << "waitpid error" << std::endl; std::cerr << "waitpid error" << std::endl;
} }
} }
@ -829,7 +829,7 @@ void FTermDetectionTest::puttyTest()
// Start the terminal simulation // Start the terminal simulation
terminalSimulation (putty); terminalSimulation (putty);
if ( waitpid(pid, 0, 0) != pid ) if ( waitpid(pid, 0, WUNTRACED) != pid )
std::cerr << "waitpid error" << std::endl; std::cerr << "waitpid error" << std::endl;
} }
} }
@ -888,7 +888,7 @@ void FTermDetectionTest::kdeKonsoleTest()
// Start the terminal simulation // Start the terminal simulation
terminalSimulation (kde_konsole); terminalSimulation (kde_konsole);
if ( waitpid(pid, 0, 0) != pid ) if ( waitpid(pid, 0, WUNTRACED) != pid )
std::cerr << "waitpid error" << std::endl; std::cerr << "waitpid error" << std::endl;
} }
} }
@ -948,7 +948,7 @@ void FTermDetectionTest::gnomeTerminalTest()
// Start the terminal simulation // Start the terminal simulation
terminalSimulation (gnome_terminal); terminalSimulation (gnome_terminal);
if ( waitpid(pid, 0, 0) != pid ) if ( waitpid(pid, 0, WUNTRACED) != pid )
std::cerr << "waitpid error" << std::endl; std::cerr << "waitpid error" << std::endl;
} }
} }
@ -1015,7 +1015,7 @@ void FTermDetectionTest::ktermTest()
// Start the terminal simulation // Start the terminal simulation
terminalSimulation (kterm); terminalSimulation (kterm);
if ( waitpid(pid, 0, 0) != pid ) if ( waitpid(pid, 0, WUNTRACED) != pid )
std::cerr << "waitpid error" << std::endl; std::cerr << "waitpid error" << std::endl;
} }
} }
@ -1075,7 +1075,7 @@ void FTermDetectionTest::teraTermTest()
// Start the terminal simulation // Start the terminal simulation
terminalSimulation (tera_term); terminalSimulation (tera_term);
if ( waitpid(pid, 0, 0) != pid ) if ( waitpid(pid, 0, WUNTRACED) != pid )
std::cerr << "waitpid error" << std::endl; std::cerr << "waitpid error" << std::endl;
} }
} }
@ -1135,7 +1135,7 @@ void FTermDetectionTest::cygwinTest()
// Start the terminal simulation // Start the terminal simulation
terminalSimulation (cygwin); terminalSimulation (cygwin);
if ( waitpid(pid, 0, 0) != pid ) if ( waitpid(pid, 0, WUNTRACED) != pid )
std::cerr << "waitpid error" << std::endl; std::cerr << "waitpid error" << std::endl;
} }
} }
@ -1195,7 +1195,7 @@ void FTermDetectionTest::minttyTest()
// Start the terminal simulation // Start the terminal simulation
terminalSimulation (mintty); terminalSimulation (mintty);
if ( waitpid(pid, 0, 0) != pid ) if ( waitpid(pid, 0, WUNTRACED) != pid )
std::cerr << "waitpid error" << std::endl; std::cerr << "waitpid error" << std::endl;
} }
} }
@ -1262,7 +1262,7 @@ void FTermDetectionTest::linuxTest()
// Start the terminal simulation // Start the terminal simulation
terminalSimulation (linux_con); terminalSimulation (linux_con);
if ( waitpid(pid, 0, 0) != pid ) if ( waitpid(pid, 0, WUNTRACED) != pid )
std::cerr << "waitpid error" << std::endl; std::cerr << "waitpid error" << std::endl;
} }
} }
@ -1332,7 +1332,7 @@ void FTermDetectionTest::freebsdTest()
// Start the terminal simulation // Start the terminal simulation
terminalSimulation (freebsd_con); terminalSimulation (freebsd_con);
if ( waitpid(pid, 0, 0) != pid ) if ( waitpid(pid, 0, WUNTRACED) != pid )
std::cerr << "waitpid error" << std::endl; std::cerr << "waitpid error" << std::endl;
} }
} }
@ -1400,7 +1400,7 @@ void FTermDetectionTest::netbsdTest()
// Start the terminal simulation // Start the terminal simulation
terminalSimulation (netbsd_con); terminalSimulation (netbsd_con);
if ( waitpid(pid, 0, 0) != pid ) if ( waitpid(pid, 0, WUNTRACED) != pid )
std::cerr << "waitpid error" << std::endl; std::cerr << "waitpid error" << std::endl;
} }
} }
@ -1468,7 +1468,7 @@ void FTermDetectionTest::openbsdTest()
// Start the terminal simulation // Start the terminal simulation
terminalSimulation (openbsd_con); terminalSimulation (openbsd_con);
if ( waitpid(pid, 0, 0) != pid ) if ( waitpid(pid, 0, WUNTRACED) != pid )
std::cerr << "waitpid error" << std::endl; std::cerr << "waitpid error" << std::endl;
} }
} }
@ -1534,7 +1534,7 @@ void FTermDetectionTest::sunTest()
// Start the terminal simulation // Start the terminal simulation
terminalSimulation (sun_con); terminalSimulation (sun_con);
if ( waitpid(pid, 0, 0) != pid ) if ( waitpid(pid, 0, WUNTRACED) != pid )
std::cerr << "waitpid error" << std::endl; std::cerr << "waitpid error" << std::endl;
} }
} }
@ -1594,7 +1594,7 @@ void FTermDetectionTest::screenTest()
// Start the terminal simulation // Start the terminal simulation
terminalSimulation (screen); terminalSimulation (screen);
if ( waitpid(pid, 0, 0) != pid ) if ( waitpid(pid, 0, WUNTRACED) != pid )
std::cerr << "waitpid error" << std::endl; std::cerr << "waitpid error" << std::endl;
} }
} }
@ -1655,7 +1655,7 @@ void FTermDetectionTest::tmuxTest()
// Start the terminal simulation // Start the terminal simulation
terminalSimulation (tmux); terminalSimulation (tmux);
if ( waitpid(pid, 0, 0) != pid ) if ( waitpid(pid, 0, WUNTRACED) != pid )
std::cerr << "waitpid error" << std::endl; std::cerr << "waitpid error" << std::endl;
} }
} }
@ -1738,7 +1738,7 @@ void FTermDetectionTest::ttytypeTest()
// Start the terminal simulation // Start the terminal simulation
terminalSimulation (ansi); terminalSimulation (ansi);
if ( waitpid(pid, 0, 0) != pid ) if ( waitpid(pid, 0, WUNTRACED) != pid )
std::cerr << "waitpid error" << std::endl; std::cerr << "waitpid error" << std::endl;
} }