Rearrange the Lumina source tree quite a bit:

Now the utilites are arranged by category (core, core-utils, desktop-utils), so all the -utils may be excluded by a package system (or turned into separate packages) as needed.

1 files changed, 0 insertions, 229 deletions

diff --git a/desktop-utilities/lumina-terminal/TtyProcess.cpp b/desktop-utilities/lumina-terminal/TtyProcess.cpp
deleted file mode 100644
index c5844255..00000000
--- a/desktop-utilities/lumina-terminal/TtyProcess.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-#include "TtyProcess.h"
-
-#include <QDir>
-#include <QProcessEnvironment>
-
-TTYProcess::TTYProcess(QObject *parent) : QObject(parent){
-  childProc = 0;
-  sn = 0;
-  ttyfd = 0;
-}
-
-TTYProcess::~TTYProcess(){
-  closeTTY(); //make sure everything is closed properly
-}
-		
-// === PUBLIC ===
-bool TTYProcess::startTTY(QString prog, QStringList args, QString workdir){
-  if(workdir=="~"){ workdir = QDir::homePath(); }
-  QDir::setCurrent(workdir);
-  QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-  setenv("TERM","vt100",1); //VT100 emulation support
-  unsetenv("TERMCAP");
-  /*setenv("TERMCAP","mvterm|vv100|mvterm emulator with ANSI colors:\
-	:pa#64:Co#8:AF=\E[3%dm:AB=\E[4%dm:op=\E[100m:tc=vt102:",1); //see /etc/termcap as well*/
-  QStringList filter = env.keys().filter("XTERM");
-  for(int i=0; i<filter.length(); i++){ unsetenv(filter[i].toLocal8Bit().data()); }
-  //if(env.contains("TERM")){ unsetenv("TERM"); }
-  //else if(env.contains
-  //Turn the program/arguments into C-compatible arrays
-  char cprog[prog.length()]; strcpy(cprog, prog.toLocal8Bit().data());
-  char *cargs[args.length()+2];
-  QByteArray nullarray;
-  for(int i=0; i<args.length()+2; i++){
-    // First arg needs to be the program
-    if ( i == 0 ) {
-      cargs[i] = new char[ prog.toLocal8Bit().size()+1];
-      strcpy( cargs[i], prog.toLocal8Bit().data() );
-    } else if(i<args.length()){
-      cargs[i] = new char[ args[i].toLocal8Bit().size()+1];
-      strcpy( cargs[i], args[i].toLocal8Bit().data() );
-    }else{
-      cargs[i] = NULL;
-    }
-  }
-  qDebug() << "PTY Start:" << prog;
-  //Launch the process attached to a new PTY
-  int FD = 0;
-  pid_t tmp = LaunchProcess(FD, cprog, cargs);
-  qDebug() << " - PID:" << tmp;
-  qDebug() << " - FD:" << FD;
-  if(tmp<0){ return false; } //error
-  else{
-    childProc = tmp;
-    //Load the file for close notifications
-      //TO-DO
-    //Watch the socket for activity
-    sn= new QSocketNotifier(FD, QSocketNotifier::Read);
-	sn->setEnabled(true);
-	connect(sn, SIGNAL(activated(int)), this, SLOT(checkStatus(int)) );
-    ttyfd = FD;
-    qDebug() << " - PTY:" << ptsname(FD);
-    return true;
-  }
-}
-
-void TTYProcess::closeTTY(){
-  int junk;
-  if(0==waitpid(childProc, &junk, WNOHANG)){
-    kill(childProc, SIGKILL);	
-  }
-  if(ttyfd!=0 && sn!=0){
-    sn->setEnabled(false);
-    ::close(ttyfd);
-    ttyfd = 0;
-    emit processClosed();
-  }
-}
-
-void TTYProcess::writeTTY(QByteArray output){
-  //qDebug() << "Write:" << output;
-  ::write(ttyfd, output.data(), output.size());
-}
-
-QByteArray TTYProcess::readTTY(){
-  QByteArray BA;
-  //qDebug() << "Read TTY";
-  if(sn==0){ return BA; } //not setup yet
-  char buffer[64];
-  ssize_t rtot = read(sn->socket(),&buffer,64);
-  //buffer[rtot]='\0';
-  BA = QByteArray(buffer, rtot);
-  //qDebug() << " - Got Data:" << BA;
-  if(!fragBA.isEmpty()){
-    //Have a leftover fragment, include this too
-    BA = BA.prepend(fragBA);
-    fragBA.clear();
-  }
-  bool bad = true;
-  BA = CleanANSI(BA, bad);
-  if(bad){ 
-    //incomplete fragent - read some more first
-    fragBA = BA; 
-    return readTTY();
-  }else{
-    //qDebug() << "Read Data:" << BA;
-    return BA;
-  }
-}
-
-void TTYProcess::setTerminalSize(QSize chars, QSize pixels){
-  if(ttyfd==0){ return; }
-  
-  struct winsize c_sz;
-    c_sz.ws_row = chars.height();
-    c_sz.ws_col = chars.width();
-    c_sz.ws_xpixel = pixels.width();
-    c_sz.ws_ypixel = pixels.height();
-  if( ioctl(ttyfd, TIOCSWINSZ, &ws) ){
-    qDebug() << "Error settings terminal size";
-  }else{
-    //qDebug() <<"Set Terminal Size:" << pixels << chars;
-  }
-}
-
-bool TTYProcess::isOpen(){
-  return (ttyfd!=0);
-}
-
-QByteArray TTYProcess::CleanANSI(QByteArray raw, bool &incomplete){
-  incomplete = true;
-  //qDebug() << "Clean ANSI Data:" << raw;
-  //IN_LINE TERMINAL COLOR CODES (ANSI Escape Codes) "\x1B[<colorcode>m"
-  //  - Just remove them for now
-	
-  //Special XTERM encoding (legacy support)
-  int index = raw.indexOf("\x1B]");
-  while(index>=0){
-    //The end character of this sequence is the Bell command ("\x07")
-    int end = raw.indexOf("\x07");
-    if(end<0){ return raw; } //incomplete raw array
-    raw = raw.remove(index, end-index+1);
-    index = raw.indexOf("\x1B]");
-  }
-
-  // GENERIC ANSI CODES ((Make sure the output is not cut off in the middle of a code)
-  index = raw.indexOf("\x1B");
-  while(index>=0){
-    //CURSOR MOVEMENT
-    int end = 0;
-    for(int i=1; i<raw.size() && end==0; i++){
-      if(raw.size() < index+i){ return raw; }//cut off - go back for more data
-      //qDebug() << "Check Char:" << raw.at(index+i);
-      if( QChar(raw.at(index+i)).isLetter() ){
-        end = i; //found the end of the control code
-      }
-    }
-    index = raw.indexOf("\x1B",index+1); //now find the next one
-  }
-  
-  // SYSTEM BELL
-  index = raw.indexOf("\x07");
-  while(index>=0){ 
-    //qDebug() << "Remove Bell:" << index;
-    raw = raw.remove(index,1); 
-    index = raw.indexOf("\x07");
-  }
-
-  incomplete = false;
-  return raw;
-}
-
-// === PRIVATE ===
-pid_t TTYProcess::LaunchProcess(int& fd, char *prog, char **child_args){
-  //Returns: -1 for errors, positive value (file descriptor) for the master side of the TTY to watch	
-
-  //First open/setup a new pseudo-terminal file/device on the system (master side)
-  fd = posix_openpt(O_RDWR | O_NOCTTY); //open read/write
-  if(fd<0){ return -1; } //could not create pseudo-terminal
-  int rc = grantpt(fd); //set permissions
-  if(rc!=0){ return -1; }
-  rc = unlockpt(fd); //unlock file (ready for use)
-  if(rc!=0){ return -1; }	
-  //Now fork, return the Master device and setup the child
-  pid_t PID = fork();
-  if(PID==0){
-    //SLAVE/child
-    int fds = ::open(ptsname(fd), O_RDWR | O_NOCTTY); //open slave side read/write
-    ::close(fd); //close the master side from the slave thread
-	  
-    //Adjust the slave side mode to RAW
-    struct termios TSET;
-    rc = tcgetattr(fds, &TSET); //read the current settings
-    cfmakesane(&TSET); //set the RAW mode on the settings ( cfmakeraw(&TSET); )
-    tcsetattr(fds, TCSANOW, &TSET); //apply the changed settings
-
-    //Change the controlling terminal in child thread to the slave PTY
-    ::close(0); //close current terminal standard input
-    ::close(1); //close current terminal standard output
-    ::close(2); //close current terminal standard error
-    dup(fds); // Set slave PTY as standard input (0);
-    dup(fds); // Set slave PTY as standard output (1);
-    dup(fds); // Set slave PTY as standard error (2);
-	  
-    setsid();  //Make current process new session leader (so we can set controlling terminal)
-    ioctl(0,TIOCSCTTY, 1); //Set the controlling terminal to the slave PTY
-	  
-    //Execute the designated program
-    rc = execvp(prog, child_args);
-    ::close(fds); //no need to keep original file descriptor open any more
-    exit(rc);
-  }
-  //MASTER thread (or error)
-  return PID;
-}
-
-// === PRIVATE SLOTS ===
-void TTYProcess::checkStatus(int sock){
-  //This is run when the socket gets activated
-  if(sock!=ttyfd){
-	  
-  }
-  //Make sure the child PID is still active
-  int junk;
-  if(0!=waitpid(childProc, &junk, WNOHANG)){
-    this->closeTTY(); //clean up everything else
-  }else{
-    emit readyRead();
-  }
-}