author | zecke <zecke> | 2002-10-20 13:52:13 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-10-20 13:52:13 (UTC) |
commit | 89ed0106d3de43c0f39250524bc80de00f2b596c (patch) (unidiff) | |
tree | 4354cc80f93f1a76caea30c350e4fc3350c32726 | |
parent | 4b27ac49b4027ffd59d2606f1aceea313446aede (diff) | |
download | opie-89ed0106d3de43c0f39250524bc80de00f2b596c.zip opie-89ed0106d3de43c0f39250524bc80de00f2b596c.tar.gz opie-89ed0106d3de43c0f39250524bc80de00f2b596c.tar.bz2 |
Enable setSize SIGNAL/SLOT conenction in session
Add some separators to m_console of mainwindow
-rw-r--r-- | noncore/apps/opie-console/MyPty.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-console/TEmulation.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-console/io_layer.h | 2 | ||||
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 5 | ||||
-rw-r--r-- | noncore/apps/opie-console/session.cpp | 2 |
5 files changed, 9 insertions, 2 deletions
diff --git a/noncore/apps/opie-console/MyPty.cpp b/noncore/apps/opie-console/MyPty.cpp index a2373bf..6b0d6f2 100644 --- a/noncore/apps/opie-console/MyPty.cpp +++ b/noncore/apps/opie-console/MyPty.cpp | |||
@@ -93,16 +93,17 @@ | |||
93 | 93 | ||
94 | /*! | 94 | /*! |
95 | Informs the client program about the | 95 | Informs the client program about the |
96 | actual size of the window. | 96 | actual size of the window. |
97 | */ | 97 | */ |
98 | 98 | ||
99 | void MyPty::setSize(int lines, int columns) | 99 | void MyPty::setSize(int lines, int columns) |
100 | { | 100 | { |
101 | qWarning("setting size"); | ||
101 | struct winsize wsize; | 102 | struct winsize wsize; |
102 | wsize.ws_row = (unsigned short)lines; | 103 | wsize.ws_row = (unsigned short)lines; |
103 | wsize.ws_col = (unsigned short)columns; | 104 | wsize.ws_col = (unsigned short)columns; |
104 | if(m_fd < 0) return; | 105 | if(m_fd < 0) return; |
105 | ioctl(m_fd,TIOCSWINSZ,(char *)&wsize); | 106 | ioctl(m_fd,TIOCSWINSZ,(char *)&wsize); |
106 | } | 107 | } |
107 | 108 | ||
108 | 109 | ||
diff --git a/noncore/apps/opie-console/TEmulation.cpp b/noncore/apps/opie-console/TEmulation.cpp index 6f3ad32..7a0c624 100644 --- a/noncore/apps/opie-console/TEmulation.cpp +++ b/noncore/apps/opie-console/TEmulation.cpp | |||
@@ -202,16 +202,17 @@ void TEmulation::onRcvChar(int c) | |||
202 | /* */ | 202 | /* */ |
203 | /* ------------------------------------------------------------------------- */ | 203 | /* ------------------------------------------------------------------------- */ |
204 | 204 | ||
205 | /*! | 205 | /*! |
206 | */ | 206 | */ |
207 | 207 | ||
208 | void TEmulation::onKeyPress( QKeyEvent* ev ) | 208 | void TEmulation::onKeyPress( QKeyEvent* ev ) |
209 | { | 209 | { |
210 | qWarning("onKeyPress,...."); | ||
210 | if (!connected) return; // someone else gets the keys | 211 | if (!connected) return; // someone else gets the keys |
211 | if (scr->getHistCursor() != scr->getHistLines()); | 212 | if (scr->getHistCursor() != scr->getHistLines()); |
212 | scr->setHistCursor(scr->getHistLines()); | 213 | scr->setHistCursor(scr->getHistLines()); |
213 | if (!ev->text().isEmpty()) | 214 | if (!ev->text().isEmpty()) |
214 | { // A block of text | 215 | { // A block of text |
215 | // Note that the text is proper unicode. | 216 | // Note that the text is proper unicode. |
216 | // We should do a conversion here, but since this | 217 | // We should do a conversion here, but since this |
217 | // routine will never be used, we simply emit plain ascii. | 218 | // routine will never be used, we simply emit plain ascii. |
diff --git a/noncore/apps/opie-console/io_layer.h b/noncore/apps/opie-console/io_layer.h index d5f7eab..97a1e1c 100644 --- a/noncore/apps/opie-console/io_layer.h +++ b/noncore/apps/opie-console/io_layer.h | |||
@@ -115,12 +115,12 @@ public slots: | |||
115 | * closes and reloads the settings | 115 | * closes and reloads the settings |
116 | */ | 116 | */ |
117 | virtual void reload( const Profile& ) = 0; | 117 | virtual void reload( const Profile& ) = 0; |
118 | 118 | ||
119 | /** | 119 | /** |
120 | * set the size | 120 | * set the size |
121 | * needed for pty | 121 | * needed for pty |
122 | */ | 122 | */ |
123 | virtual void setSize(int rows, int cols ); | 123 | virtual void setSize(int lines, int cols ); |
124 | }; | 124 | }; |
125 | 125 | ||
126 | #endif | 126 | #endif |
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp index 0c89620..a7541f0 100644 --- a/noncore/apps/opie-console/mainwindow.cpp +++ b/noncore/apps/opie-console/mainwindow.cpp | |||
@@ -72,17 +72,17 @@ void MainWindow::initUI() { | |||
72 | Resource::loadPixmap( "SettingsIcon" ), | 72 | Resource::loadPixmap( "SettingsIcon" ), |
73 | QString::null, 0, this, 0); | 73 | QString::null, 0, this, 0); |
74 | // m_setProfiles->addTo( m_settings ); | 74 | // m_setProfiles->addTo( m_settings ); |
75 | m_setProfiles->addTo( m_icons ); | 75 | m_setProfiles->addTo( m_icons ); |
76 | m_setProfiles->addTo( m_console ); | 76 | m_setProfiles->addTo( m_console ); |
77 | connect( m_setProfiles, SIGNAL(activated() ), | 77 | connect( m_setProfiles, SIGNAL(activated() ), |
78 | this, SLOT(slotConfigure() ) ); | 78 | this, SLOT(slotConfigure() ) ); |
79 | 79 | ||
80 | 80 | m_console->insertSeparator(); | |
81 | /* | 81 | /* |
82 | * new Action for new sessions | 82 | * new Action for new sessions |
83 | */ | 83 | */ |
84 | QAction* a = new QAction(tr("New Connection"), | 84 | QAction* a = new QAction(tr("New Connection"), |
85 | Resource::loadPixmap( "new" ), | 85 | Resource::loadPixmap( "new" ), |
86 | QString::null, 0, this, 0); | 86 | QString::null, 0, this, 0); |
87 | a->addTo( m_console ); | 87 | a->addTo( m_console ); |
88 | a->addTo( m_icons ); | 88 | a->addTo( m_icons ); |
@@ -102,16 +102,18 @@ void MainWindow::initUI() { | |||
102 | * disconnect action | 102 | * disconnect action |
103 | */ | 103 | */ |
104 | m_disconnect = new QAction(); | 104 | m_disconnect = new QAction(); |
105 | m_disconnect->setText( tr("Disconnect") ); | 105 | m_disconnect->setText( tr("Disconnect") ); |
106 | m_disconnect->addTo( m_console ); | 106 | m_disconnect->addTo( m_console ); |
107 | connect(m_disconnect, SIGNAL(activated() ), | 107 | connect(m_disconnect, SIGNAL(activated() ), |
108 | this, SLOT(slotDisconnect() ) ); | 108 | this, SLOT(slotDisconnect() ) ); |
109 | 109 | ||
110 | m_console->insertSeparator(); | ||
111 | |||
110 | m_transfer = new QAction(); | 112 | m_transfer = new QAction(); |
111 | m_transfer->setText( tr("Transfer file...") ); | 113 | m_transfer->setText( tr("Transfer file...") ); |
112 | m_transfer->addTo( m_console ); | 114 | m_transfer->addTo( m_console ); |
113 | connect(m_transfer, SIGNAL(activated() ), | 115 | connect(m_transfer, SIGNAL(activated() ), |
114 | this, SLOT(slotTransfer() ) ); | 116 | this, SLOT(slotTransfer() ) ); |
115 | 117 | ||
116 | 118 | ||
117 | /* | 119 | /* |
@@ -121,16 +123,17 @@ void MainWindow::initUI() { | |||
121 | 123 | ||
122 | m_fullscreen = new QAction( tr("Full screen"), Resource::loadPixmap( "fullscreen" ) | 124 | m_fullscreen = new QAction( tr("Full screen"), Resource::loadPixmap( "fullscreen" ) |
123 | , QString::null, 0, this, 0); | 125 | , QString::null, 0, this, 0); |
124 | m_fullscreen->addTo( m_console ); | 126 | m_fullscreen->addTo( m_console ); |
125 | m_fullscreen->addTo( m_icons ); | 127 | m_fullscreen->addTo( m_icons ); |
126 | connect( m_fullscreen, SIGNAL( activated() ), | 128 | connect( m_fullscreen, SIGNAL( activated() ), |
127 | this, SLOT( slotFullscreen() ) ); | 129 | this, SLOT( slotFullscreen() ) ); |
128 | 130 | ||
131 | m_console->insertSeparator(); | ||
129 | /* | 132 | /* |
130 | * terminate action | 133 | * terminate action |
131 | */ | 134 | */ |
132 | m_terminate = new QAction(); | 135 | m_terminate = new QAction(); |
133 | m_terminate->setText( tr("Terminate") ); | 136 | m_terminate->setText( tr("Terminate") ); |
134 | m_terminate->addTo( m_console ); | 137 | m_terminate->addTo( m_console ); |
135 | connect(m_terminate, SIGNAL(activated() ), | 138 | connect(m_terminate, SIGNAL(activated() ), |
136 | this, SLOT(slotTerminate() ) ); | 139 | this, SLOT(slotTerminate() ) ); |
diff --git a/noncore/apps/opie-console/session.cpp b/noncore/apps/opie-console/session.cpp index 2ce6872..03d0fcd 100644 --- a/noncore/apps/opie-console/session.cpp +++ b/noncore/apps/opie-console/session.cpp | |||
@@ -50,16 +50,18 @@ WidgetLayer* Session::emulationWidget() { | |||
50 | void Session::connect() { | 50 | void Session::connect() { |
51 | if ( !m_layer || !m_emu ) | 51 | if ( !m_layer || !m_emu ) |
52 | return; | 52 | return; |
53 | 53 | ||
54 | QObject::connect(m_layer, SIGNAL(received(const QByteArray&) ), | 54 | QObject::connect(m_layer, SIGNAL(received(const QByteArray&) ), |
55 | m_emu, SLOT(recv(const QByteArray&) ) ); | 55 | m_emu, SLOT(recv(const QByteArray&) ) ); |
56 | QObject::connect(m_emu, SIGNAL(send(const QByteArray&) ), | 56 | QObject::connect(m_emu, SIGNAL(send(const QByteArray&) ), |
57 | m_layer, SLOT(send(const QByteArray&) ) ); | 57 | m_layer, SLOT(send(const QByteArray&) ) ); |
58 | QObject::connect(m_emu, SIGNAL(changeSize(int, int) ), | ||
59 | m_layer, SLOT(setSize(int, int) ) ); | ||
58 | } | 60 | } |
59 | 61 | ||
60 | void Session::disconnect() { | 62 | void Session::disconnect() { |
61 | 63 | ||
62 | if ( !m_layer || !m_emu ) | 64 | if ( !m_layer || !m_emu ) |
63 | return; | 65 | return; |
64 | 66 | ||
65 | QObject::disconnect(m_layer, SIGNAL(received(const QByteArray&) ), | 67 | QObject::disconnect(m_layer, SIGNAL(received(const QByteArray&) ), |