summaryrefslogtreecommitdiff
authoribotty <ibotty>2002-10-11 18:14:10 (UTC)
committer ibotty <ibotty>2002-10-11 18:14:10 (UTC)
commit35c5d56d076786fd175655e7b2fc4b93cd433a86 (patch) (side-by-side diff)
tree33dd0fd3945621fa8eecfd3bd7cbeef724baf0f9
parent875c59cf65ab1f3cd6c8c47379f51138adad6cd6 (diff)
downloadopie-35c5d56d076786fd175655e7b2fc4b93cd433a86.zip
opie-35c5d56d076786fd175655e7b2fc4b93cd433a86.tar.gz
opie-35c5d56d076786fd175655e7b2fc4b93cd433a86.tar.bz2
added missing line and an extern keyword
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/widget_layer.cpp2
-rw-r--r--noncore/apps/opie-console/widget_layer.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/noncore/apps/opie-console/widget_layer.cpp b/noncore/apps/opie-console/widget_layer.cpp
index 3584d32..c00871f 100644
--- a/noncore/apps/opie-console/widget_layer.cpp
+++ b/noncore/apps/opie-console/widget_layer.cpp
@@ -121,48 +121,50 @@ void WidgetLayer::insertSelection()
{
QString text = QApplication::clipboard()->text();
if ( ! text.isNull() )
{
text.replace( QRegExp( "\n" ), "\r" );
insertText( text );
// selection should be unselected
emit selectionCleared();
}
}
void WidgetLayer::insertText( QString text )
{
// text is inserted as key event
QKeyEvent e( QEvent::KeyPress, 0, -1, 0, text);
emit keyPressed( &e );
}
void WidgetLayer::onClearSelection()
{
emit selectionCleared();
}
void WidgetLayer::setSelection( const QString& text )
{
// why get the clipboard, we have it as instance var...
QObject *m_clipboard = QApplication::clipboard();
// we know, that cliboard changes, when we change clipboard
QObject::disconnect( (QObject*) m_clipboard, SIGNAL( dataChanged() ),
(QObject*) this, SLOT( selectionCleared() ) );
QApplication::clipboard()->setText( text );
QObject::connect( (QObject*) m_clipboard, SIGNAL( dataChanged() ),
(QObject*) this, SLOT( selectionCleared() ) );
}
/////////
// special font characters
/////////
unsigned short vt100_graphics[32] =
{ // 0/8 1/9 2/10 3/11 4/12 5/13 6/14 7/15
0x0020, 0x25C6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
0xF800, 0xF801, 0x2500, 0xF803, 0xF804, 0x251c, 0x2524, 0x2534,
0x252c, 0x2502, 0x2264, 0x2265, 0x03C0, 0x2260, 0x00A3, 0x00b7
+};
+
diff --git a/noncore/apps/opie-console/widget_layer.h b/noncore/apps/opie-console/widget_layer.h
index 2ca0f88..014d507 100644
--- a/noncore/apps/opie-console/widget_layer.h
+++ b/noncore/apps/opie-console/widget_layer.h
@@ -1,85 +1,85 @@
/* -------------------------------------------------------------------------- */
/* */
/* [widget_layer.h] Widget Layer */
/* */
/* -------------------------------------------------------------------------- */
// proposal of a widget Layer in opie-console
//
// fellow devels:
// just mail me (ibotty@web.de), what you additionally need from the main widget
// (or say in chat)
#ifndef WIDGET_LAYER_H
#define WIDGET_LAYER_H
// qt includes
#include <qapplication.h>
#include <qframe.h>
#include <qarray.h>
#include <qtimer.h>
#include <qkeycode.h>
#include <qclipboard.h>
// opie-console includes
#include "session.h"
#include "common.h"
#include "profile.h"
/*
* given a pseudo location ( column, line ),
* returns the actual index, in the QArray<Character>
*/
#define loc(X,Y) ((Y)*m_columns+(X))
-unsigned short vt100_graphics[32];
+extern unsigned short vt100_graphics[32];
class WidgetLayer : public QFrame
{ Q_OBJECT
public:
/**
* constructor
* @param const Profile &config, the configuration for this widget
* @param QWidget *parent, the parent widget
* @param const char *name, the name of the widget, defaults to ""
*/
WidgetLayer( const Profile& config, QWidget *parent=0, const char *name=0 );
/**
* destructor
*/
virtual ~WidgetLayer();
public:
/**
* sets the image
* @param QArray<Character> const newimg, the new image
* @param int lines, lines count of newimg
* @param int columns, columns count of newimg
*/
virtual void setImage( QArray<Character> const newimg, int lines, int colums ) = 0;
/**
* annoy the user
*/
void bell();
/**
* @return int m_lines, the lines count
*/
int lines() { return m_lines; }
/**
* @return int m_columns, the columns count
*/
int columns() { return m_columns; }
/**
* insert current selection (currently this is only the clipboard)
*/
void insertSelection();