summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/MyPty.cpp4
-rw-r--r--noncore/apps/opie-console/io_bt.cpp12
-rw-r--r--noncore/apps/opie-console/io_bt.h13
-rw-r--r--noncore/apps/opie-console/io_irda.cpp12
-rw-r--r--noncore/apps/opie-console/io_irda.h13
-rw-r--r--noncore/apps/opie-console/io_layer.cpp1
-rw-r--r--noncore/apps/opie-console/io_layer.h4
-rw-r--r--noncore/apps/opie-console/io_modem.cpp11
-rw-r--r--noncore/apps/opie-console/io_modem.h13
-rw-r--r--noncore/apps/opie-console/io_serial.h21
-rw-r--r--noncore/apps/opie-console/opie-console.pro12
11 files changed, 81 insertions, 35 deletions
diff --git a/noncore/apps/opie-console/MyPty.cpp b/noncore/apps/opie-console/MyPty.cpp
index 23d4966..b2f6a74 100644
--- a/noncore/apps/opie-console/MyPty.cpp
+++ b/noncore/apps/opie-console/MyPty.cpp
@@ -207,12 +207,12 @@ int MyPty::openPty()
207 int ptyfd = -1; 207 int ptyfd = -1;
208 208
209#ifdef HAVE_OPENPTY 209#ifdef HAVE_OPENPTY
210 int ttyfd; 210 int ttyfd;
211 if ( openpty(&ptyfd,&ttyfd,ttynam,0,0) ) 211 if ( openpty(&ptyfd,&ttyfd,m_ttynam,0,0) )
212 ptyfd = -1; 212 ptyfd = -1;
213 else 213 else
214 close(ttyfd); // we open the ttynam ourselves. 214 ::close(ttyfd); // we open the ttynam ourselves.
215#else 215#else
216 for (const char* c0 = "pqrstuvwxyzabcde"; ptyfd < 0 && *c0 != 0; c0++) { 216 for (const char* c0 = "pqrstuvwxyzabcde"; ptyfd < 0 && *c0 != 0; c0++) {
217 for (const char* c1 = "0123456789abcdef"; ptyfd < 0 && *c1 != 0; c1++) { 217 for (const char* c1 = "0123456789abcdef"; ptyfd < 0 && *c1 != 0; c1++) {
218 sprintf(m_ptynam,"/dev/pty%c%c",*c0,*c1); 218 sprintf(m_ptynam,"/dev/pty%c%c",*c0,*c1);
diff --git a/noncore/apps/opie-console/io_bt.cpp b/noncore/apps/opie-console/io_bt.cpp
index 8dd8151..37bf797 100644
--- a/noncore/apps/opie-console/io_bt.cpp
+++ b/noncore/apps/opie-console/io_bt.cpp
@@ -77,4 +77,16 @@ QString IOBt::name() const {
77void IOBt::slotExited( OProcess* proc ){ 77void IOBt::slotExited( OProcess* proc ){
78 close(); 78 close();
79 delete proc; 79 delete proc;
80} 80}
81
82QBitArray IOBt::supports() const {
83 return QBitArray( 3 );
84}
85
86bool IOBt::isConnected() {
87 return false;
88}
89
90void IOBt::send(const QByteArray &data) {
91 qDebug( "Please overload me..." );
92}
diff --git a/noncore/apps/opie-console/io_bt.h b/noncore/apps/opie-console/io_bt.h
index 5e9988c..239eefb 100644
--- a/noncore/apps/opie-console/io_bt.h
+++ b/noncore/apps/opie-console/io_bt.h
@@ -24,19 +24,22 @@ public:
24 24
25 IOBt(const Profile &); 25 IOBt(const Profile &);
26 ~IOBt(); 26 ~IOBt();
27 27
28 QString identifier() const; 28 virtual QString identifier() const;
29 QString name() const; 29 virtual QString name() const;
30 virtual QBitArray supports() const;
31 virtual bool isConnected();
30 32
31signals: 33signals:
32 void received(const QByteArray &); 34 void received(const QByteArray &);
33 void error(int, const QString &); 35 void error(int, const QString &);
34 36
35public slots: 37public slots:
36 bool open(); 38 virtual void send( const QByteArray& );
37 void close(); 39 virtual bool open();
38 void reload(const Profile &); 40 virtual void close();
41 virtual void reload(const Profile &);
39 42
40private: 43private:
41 OProcess *m_attach; 44 OProcess *m_attach;
42 QString m_mac; 45 QString m_mac;
diff --git a/noncore/apps/opie-console/io_irda.cpp b/noncore/apps/opie-console/io_irda.cpp
index b3b693f..e360fb4 100644
--- a/noncore/apps/opie-console/io_irda.cpp
+++ b/noncore/apps/opie-console/io_irda.cpp
@@ -62,4 +62,16 @@ QString IOIrda::name() const {
62void IOIrda::slotExited(OProcess* proc ){ 62void IOIrda::slotExited(OProcess* proc ){
63 close(); 63 close();
64 delete proc; 64 delete proc;
65} 65}
66
67QBitArray IOIrda::supports()const {
68 return QBitArray( 3 );
69}
70
71bool IOIrda::isConnected() {
72 return false;
73}
74
75void IOIrda::send(const QByteArray &data) {
76 qDebug( "Please overload me..." );
77}
diff --git a/noncore/apps/opie-console/io_irda.h b/noncore/apps/opie-console/io_irda.h
index 3aee951..14b1ae3 100644
--- a/noncore/apps/opie-console/io_irda.h
+++ b/noncore/apps/opie-console/io_irda.h
@@ -22,19 +22,22 @@ public:
22 22
23 IOIrda(const Profile &); 23 IOIrda(const Profile &);
24 ~IOIrda(); 24 ~IOIrda();
25 25
26 QString identifier() const; 26 virtual QString identifier() const;
27 QString name() const; 27 virtual QString name() const;
28 virtual QBitArray supports() const;
29 virtual bool isConnected();
28 30
29signals: 31signals:
30 void received(const QByteArray &); 32 void received(const QByteArray &);
31 void error(int, const QString &); 33 void error(int, const QString &);
32 34
33public slots: 35public slots:
34 bool open(); 36 virtual void send( const QByteArray& );
35 void close(); 37 virtual bool open();
36 void reload(const Profile &); 38 virtual void close();
39 virtual void reload(const Profile &);
37 40
38private: 41private:
39 OProcess *m_attach; 42 OProcess *m_attach;
40 43
diff --git a/noncore/apps/opie-console/io_layer.cpp b/noncore/apps/opie-console/io_layer.cpp
index 975ee60..52ec828 100644
--- a/noncore/apps/opie-console/io_layer.cpp
+++ b/noncore/apps/opie-console/io_layer.cpp
@@ -19,4 +19,5 @@ void IOLayer::closeRawIO(int) {
19 19
20} 20}
21void IOLayer::setSize(int, int ) { 21void IOLayer::setSize(int, int ) {
22} 22}
23
diff --git a/noncore/apps/opie-console/io_layer.h b/noncore/apps/opie-console/io_layer.h
index ed4478b..4f9bbe4 100644
--- a/noncore/apps/opie-console/io_layer.h
+++ b/noncore/apps/opie-console/io_layer.h
@@ -64,9 +64,9 @@ public:
64 * do any ioctling on it... 64 * do any ioctling on it...
65 * and it'll stop listening to the before opened 65 * and it'll stop listening to the before opened
66 * device 66 * device
67 */ 67 */
68 virtual int rawIO()const; 68 virtual int rawIO() const;
69 69
70 /** 70 /**
71 * will close the rawIO stuff 71 * will close the rawIO stuff
72 * and will listen to it's data again... 72 * and will listen to it's data again...
@@ -76,9 +76,9 @@ public:
76 /** 76 /**
77 * What does the IOLayer support? 77 * What does the IOLayer support?
78 * Bits are related to features 78 * Bits are related to features
79 */ 79 */
80 virtual QBitArray supports()const = 0; 80 virtual QBitArray supports() const = 0;
81 81
82 virtual bool isConnected() = 0; 82 virtual bool isConnected() = 0;
83 83
84signals: 84signals:
diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp
index 896c24f..1ce680a 100644
--- a/noncore/apps/opie-console/io_modem.cpp
+++ b/noncore/apps/opie-console/io_modem.cpp
@@ -92,4 +92,15 @@ void IOModem::slotExited(OProcess* proc ){
92 /* delete it afterwards */ 92 /* delete it afterwards */
93 delete proc; 93 delete proc;
94} 94}
95 95
96QBitArray IOModem::supports()const {
97 return QBitArray( 3 );
98}
99
100bool IOModem::isConnected() {
101 return false;
102}
103
104void IOModem::send(const QByteArray &data) {
105 qDebug( "Please overload me..." );
106}
diff --git a/noncore/apps/opie-console/io_modem.h b/noncore/apps/opie-console/io_modem.h
index 17228bd..2a926df 100644
--- a/noncore/apps/opie-console/io_modem.h
+++ b/noncore/apps/opie-console/io_modem.h
@@ -42,19 +42,22 @@ public:
42 42
43 IOModem(const Profile &); 43 IOModem(const Profile &);
44 ~IOModem(); 44 ~IOModem();
45 45
46 QString identifier() const; 46 virtual QString identifier() const;
47 QString name() const; 47 virtual QString name() const;
48 virtual QBitArray supports() const;
49 virtual bool isConnected();
48 50
49signals: 51signals:
50 void received(const QByteArray &); 52 void received(const QByteArray &);
51 void error(int, const QString &); 53 void error(int, const QString &);
52 54
53public slots: 55public slots:
54 bool open(); 56 virtual void send( const QByteArray& );
55 void close(); 57 virtual bool open();
56 void reload(const Profile &); 58 virtual void close();
59 virtual void reload(const Profile &);
57 60
58private: 61private:
59 62
60 QString m_initString, m_resetString, m_dialPref1, m_dialSuf1, m_dialPref2, 63 QString m_initString, m_resetString, m_dialPref1, m_dialSuf1, m_dialPref2,
diff --git a/noncore/apps/opie-console/io_serial.h b/noncore/apps/opie-console/io_serial.h
index edceac6..20c1ae1 100644
--- a/noncore/apps/opie-console/io_serial.h
+++ b/noncore/apps/opie-console/io_serial.h
@@ -32,23 +32,24 @@ public:
32 32
33 IOSerial(const Profile &); 33 IOSerial(const Profile &);
34 ~IOSerial(); 34 ~IOSerial();
35 35
36 QString identifier() const; 36 virtual QString identifier() const;
37 QString name() const; 37 virtual QString name() const;
38 int rawIO()const; 38 int rawIO() const;
39 void closeRawIO(int fd ); 39 void closeRawIO (int fd );
40 QBitArray supports()const; 40 virtual QBitArray supports() const;
41 bool isConnected(); 41 virtual bool isConnected();
42
42/*signals: 43/*signals:
43 void received(const QByteArray &); 44 void received(const QByteArray &);
44 void error(int, const QString &); 45 void error(int, const QString &);
45*/ 46*/
46public slots: 47public slots:
47 void send(const QByteArray &); 48 virtual void send(const QByteArray &);
48 bool open(); 49 virtual bool open();
49 void close(); 50 virtual void close();
50 void reload(const Profile &); 51 virtual void reload(const Profile &);
51protected: 52protected:
52 int baud(int baud) const; 53 int baud(int baud) const;
53 void internDetach(); 54 void internDetach();
54 void internAttach(); 55 void internAttach();
diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro
index 1bb9f35..5ffa46f 100644
--- a/noncore/apps/opie-console/opie-console.pro
+++ b/noncore/apps/opie-console/opie-console.pro
@@ -1,7 +1,7 @@
1TEMPLATE = app 1TEMPLATE = app
2 TMAKE_CXXFLAGS=-DHAVE_OPENPTY 2 TMAKE_CXXFLAGS+= -DHAVE_OPENPTY
3CONFIG = qt warn_on release 3CONFIG += qt warn_on release
4 #CONFIG = qt debug 4 #CONFIG = qt debug
5DESTDIR = $(OPIEDIR)/bin 5DESTDIR = $(OPIEDIR)/bin
6HEADERS = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \ 6HEADERS = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \
7 file_layer.h filetransfer.h \ 7 file_layer.h filetransfer.h \
@@ -29,11 +29,11 @@ HEADERS = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \
29 script.h \ 29 script.h \
30 dialer.h \ 30 dialer.h \
31 terminalwidget.h \ 31 terminalwidget.h \
32 emulation_handler.h TECommon.h \ 32 emulation_handler.h TECommon.h \
33 TEHistroy.h TEScreen.h TEWidget.h \ 33 TEHistory.h TEScreen.h TEWidget.h \
34 TEmuVt102.h TEmulation.h MyPty.h \ 34 TEmuVt102.h TEmulation.h MyPty.h \
35 consoleconfigwidget.h 35 consoleconfigwidget.h
36 36
37SOURCES = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.cpp \ 37SOURCES = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.cpp \
38 file_layer.cpp filetransfer.cpp \ 38 file_layer.cpp filetransfer.cpp \
39 main.cpp \ 39 main.cpp \
@@ -61,15 +61,15 @@ SOURCES = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.cpp \
61 terminalwidget.cpp \ 61 terminalwidget.cpp \
62 emulation_handler.cpp TEHistory.cpp \ 62 emulation_handler.cpp TEHistory.cpp \
63 TEScreen.cpp TEWidget.cpp \ 63 TEScreen.cpp TEWidget.cpp \
64 TEmuVt102.cpp TEmulation.cpp MyPty.cpp \ 64 TEmuVt102.cpp TEmulation.cpp MyPty.cpp \
65 consoleconfigwidget.cpp 65 consoleconfigwidget.cpp
66 66
67 67
68INTERFACES = configurebase.ui editbase.ui 68INTERFACES = configurebase.ui editbase.ui
69INCLUDEPATH += $(OPIEDIR)/include 69INCLUDEPATH += $(OPIEDIR)/include
70DEPENDPATH += $(OPIEDIR)/include 70DEPENDPATH += $(OPIEDIR)/include
71LIBS += -lqpe -lopie 71LIBS += -lqpe -lopie -lutil
72TARGET = opie-console 72TARGET = opie-console
73 73
74 74
75 75