diff options
-rw-r--r-- | configure.in | 1 | ||||
-rw-r--r-- | kde2/Makefile.am | 2 | ||||
-rw-r--r-- | kde2/klipsi/.cvsignore | 8 | ||||
-rw-r--r-- | kde2/klipsi/Makefile.am | 39 | ||||
-rw-r--r-- | kde2/klipsi/hi16-app-klipsi.png | bin | 0 -> 650 bytes | |||
-rw-r--r-- | kde2/klipsi/hi22-app-klipsi.png | bin | 0 -> 1072 bytes | |||
-rw-r--r-- | kde2/klipsi/klipsi.desktop | 9 | ||||
-rw-r--r-- | kde2/klipsi/main.cpp | 69 | ||||
-rw-r--r-- | kde2/klipsi/toplevel.cpp | 420 | ||||
-rw-r--r-- | kde2/klipsi/toplevel.h | 94 | ||||
-rw-r--r-- | kde2/po/Makefile.am | 2 | ||||
-rw-r--r-- | kde2/po/de/klipsi.po | 36 | ||||
-rw-r--r-- | kde2/po/klipsi.pot | 35 |
13 files changed, 713 insertions, 2 deletions
diff --git a/configure.in b/configure.in index f1567fa..942d07c 100644 --- a/configure.in +++ b/configure.in @@ -298,6 +298,7 @@ AC_OUTPUT( kde2/kioslave/Makefile kde2/plugins/Makefile kde2/kpsion/Makefile + kde2/klipsi/Makefile kde2/po/Makefile kde2/po/de/Makefile kde2/mime/Makefile diff --git a/kde2/Makefile.am b/kde2/Makefile.am index 72ccb9d..fa6f47e 100644 --- a/kde2/Makefile.am +++ b/kde2/Makefile.am @@ -1,7 +1,7 @@ # $Id$ # -SUBDIRS = kioslave plugins mime kpsion po doc +SUBDIRS = kioslave plugins mime kpsion klipsi po doc POFILES = # diff --git a/kde2/klipsi/.cvsignore b/kde2/klipsi/.cvsignore new file mode 100644 index 0000000..e0d2999 --- /dev/null +++ b/kde2/klipsi/.cvsignore @@ -0,0 +1,8 @@ +Makefile.in +Makefile +.xvpics +.libs +.deps +*.lo +*.moc.cpp +klipsi diff --git a/kde2/klipsi/Makefile.am b/kde2/klipsi/Makefile.am new file mode 100644 index 0000000..aec1940 --- /dev/null +++ b/kde2/klipsi/Makefile.am @@ -0,0 +1,39 @@ +libdir=$(kde_libraries) + +bindir=$(kde_bindir) + +maintainer-clean-local: + rm -f Makefile.in + +METASOURCES = AUTO + +KDE_ICON = AUTO + +INCLUDES = $(all_includes) -I$(top_srcdir)/lib + +DISTCLEANFILES = $(klipsi_METASOURCES) ./.deps/* ./.deps/.P + +bin_PROGRAMS = klipsi +lib_LTLIBRARIES = klipsi.la + +CLEANFILES = dummy.cpp + +klipsi_la_LIBADD = -L$(top_srcdir)/lib/.libs -lplp $(LIB_KDEUI) +klipsi_la_SOURCES = main.cpp toplevel.cpp +klipsi_la_LDFLAGS = $(all_libraries) -module -avoid-version + +klipsi_LDADD = klipsi.la +klipsi_SOURCES = dummy.cpp +klipsi_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + +applnkdir = $(kde_appsdir)/Utilities +applnk_DATA = klipsi.desktop + +noinst_HEADERS = toplevel.h + +messages: + $(XGETTEXT) -C -ki18n -kI18N_NOOP -ktranslate -kaliasLocale *.cpp *.h && mv messages.po ../po/klipsi.pot + +dummy.cpp: + : > dummy.cpp diff --git a/kde2/klipsi/hi16-app-klipsi.png b/kde2/klipsi/hi16-app-klipsi.png Binary files differnew file mode 100644 index 0000000..d9dda38 --- /dev/null +++ b/kde2/klipsi/hi16-app-klipsi.png diff --git a/kde2/klipsi/hi22-app-klipsi.png b/kde2/klipsi/hi22-app-klipsi.png Binary files differnew file mode 100644 index 0000000..3dc95c9 --- /dev/null +++ b/kde2/klipsi/hi22-app-klipsi.png diff --git a/kde2/klipsi/klipsi.desktop b/kde2/klipsi/klipsi.desktop new file mode 100644 index 0000000..dd942c7 --- /dev/null +++ b/kde2/klipsi/klipsi.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Psion Clipboard Utility +Name[de]=Auschneiden/Einfügen: Psion +Exec=klipsi +Icon=klipsi +Type=Application +DocPath=klipsi/index.html +Terminal=0 +X-KDE-autostart-after=panel diff --git a/kde2/klipsi/main.cpp b/kde2/klipsi/main.cpp new file mode 100644 index 0000000..7ab2414 --- /dev/null +++ b/kde2/klipsi/main.cpp @@ -0,0 +1,69 @@ +/*-*-c++-*- + * $Id$ + * + * This file is part of plptools. + * + * Copyright (C) 1999-2001 Fritz Elfert <felfert@to.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +#include "toplevel.h" + +#include <stdio.h> +#include <stdlib.h> + +#include <klocale.h> +#include <kcmdlineargs.h> +#include <kwin.h> +#include <kaboutdata.h> +#include <kuniqueapp.h> + +int main(int argc, char *argv[]) +{ + KAboutData about("klipsi", I18N_NOOP("Klipsi"), VERSION, + I18N_NOOP("Psion remote clipboard utility"), + KAboutData::License_GPL, + "(c) 2001, Fritz Elfert", + "http://plptools.sourceforge.net", + "plptools-developers@sourceforge.net"); + + about.addAuthor("Fritz Elfert", I18N_NOOP("Original Developer/Maintainer"), + "felfert@users.sourceforge.net", + "http://plptools.sourceforge.net"); + + KCmdLineArgs::init(argc, argv, &about); + KUniqueApplication::addCmdLineOptions(); + + if (!KUniqueApplication::start()) { + fprintf(stderr, "%s is already running!\n", about.appName()); + exit(0); + } + KUniqueApplication app; + app.disableSessionManagement(); + + TopLevel *toplevel = new TopLevel(); + + KWin::setSystemTrayWindowFor(toplevel->winId(), 0); + toplevel->setGeometry(-100, -100, 42, 42 ); + toplevel->show(); + + return app.exec(); +} +/* + * Local variables: + * c-basic-offset: 4 + * End: + */ diff --git a/kde2/klipsi/toplevel.cpp b/kde2/klipsi/toplevel.cpp new file mode 100644 index 0000000..7419995 --- /dev/null +++ b/kde2/klipsi/toplevel.cpp @@ -0,0 +1,420 @@ +/*-*-c++-*- + * $Id$ + * + * This file is part of plptools. + * + * Copyright (C) 1999-2001 Fritz Elfert <felfert@to.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +#include "toplevel.h" + +#include <qclipboard.h> +#include <qmenudata.h> +#include <qpainter.h> +#include <qtimer.h> + +#include <kaction.h> +#include <kapp.h> +#include <klocale.h> +#include <kwin.h> +#include <kiconloader.h> +#include <kdebug.h> + + +#define QUIT_ITEM 50 +#define CLIPFILE "C:/System/Data/Clpboard.cbd" + +TopLevel::TopLevel() + : KMainWindow(0) +{ + clip = kapp->clipboard(); + menu = new KPopupMenu(0, "main_menu"); + timer = new QTimer(); + + rfsvSocket = 0; + rclipSocket = 0; + rf = 0; + rc = 0; + rff = 0; + inSend = false; + inSetting = false; + mustListen = true; + lastClipData = ""; + + menu->insertTitle(kapp->miniIcon(), i18n("Klipsi - Psion Clipboard")); + menu->insertSeparator(); + menu->insertItem(SmallIcon("exit"), i18n("&Quit"), QUIT_ITEM); + + connect(menu, SIGNAL(activated(int)), this, SLOT(slotMenuSelected(int))); + connect(clip, SIGNAL(dataChanged()), this, SLOT(slotClipboardChanged())); + connect(timer, SIGNAL(timeout()), this, SLOT(slotTimer())); + + icon = KGlobal::iconLoader()->loadIcon("klipsi", KIcon::Toolbar); + resize(icon.size()); + setBackgroundMode(X11ParentRelative); + + int interval = checkConnection() ? 500 : 5000; + timer->start(interval, true); +} + +TopLevel::~TopLevel() +{ + if (rf) + delete(rf); + if (rc) + delete(rc); + if (rff) + delete rff; + + delete timer; + delete menu; +} + +void TopLevel:: +mousePressEvent(QMouseEvent *e) +{ + if ( e->button() == LeftButton || e->button() == RightButton ) + showPopupMenu(menu); +} + +void TopLevel:: +paintEvent(QPaintEvent *) +{ + QPainter p(this); + int x = (width() - icon.width()) / 2; + int y = (height() - icon.height()) / 2; + if ( x < 0 ) x = 0; + if ( y < 0 ) y = 0; + p.drawPixmap(x , y, icon); + p.end(); +} + +void TopLevel:: +slotTimer() +{ + Enum<rfsv::errs> res; + + if (inSend) { + timer->start(500, true); + return; + } + + if (!checkConnection()) { + timer->start(5000, true); + return; + } + + if (mustListen) { + res = rc->sendListen(); + if (res != rfsv::E_PSI_GEN_NONE) + cerr << "sendListen: " << res << endl; + else + mustListen = false; + } + + if ((res = rc->checkNotify()) != rfsv::E_PSI_GEN_NONE) { + if (res != rfsv::E_PSI_FILE_EOF) { + cerr << "checkNotify: " << res << endl; + timer->start(5000, true); + return; + } + } else { + getClipData(); + mustListen = true; + } + timer->start(500, true); +} + +void TopLevel:: +slotClipboardChanged() +{ + if (mustListen || inSetting) + return; + + Enum<rfsv::errs> res; + + QString clipData = clip->text(); + if (clipData.isEmpty() || (clipData == lastClipData)) + return; + + if (!checkConnection()) + return; + + lastClipData = clipData; + + inSend = true; + mustListen = true; + char *p = strdup(clipData.latin1()); + ascii2PsiText(p, clipData.length()); + putClipData(p); + free(p); + res = rc->notify(); + inSend = false; + + if (res != rfsv::E_PSI_GEN_NONE) + cerr << "notify: " << res << endl; +} + +void TopLevel:: +slotMenuSelected(int id) +{ + switch (id) { + case QUIT_ITEM: + kapp->quit(); + break; + } +} + + +void TopLevel:: +showPopupMenu(QPopupMenu *menu) +{ + ASSERT( menu != 0L ); + + // Update menu geometry + menu->move(-1000,-1000); + menu->show(); + menu->hide(); + + QPoint g = QCursor::pos(); + if ( menu->height() < g.y() ) + menu->popup(QPoint( g.x(), g.y() - menu->height())); + else + menu->popup(QPoint(g.x(), g.y())); +} + +void TopLevel:: +psiText2ascii(char *buf, int len) { + char *p; + + for (p = buf; len; len--, p++) + switch (*p) { + case 6: + case 7: + *p = '\n'; + break; + case 8: + *p = '\f'; + break; + case 10: + *p = '\t'; + break; + case 11: + case 12: + *p = '-'; + break; + case 15: + case 16: + *p = ' '; + break; + } +} + +void TopLevel:: +ascii2PsiText(char *buf, int len) { + char *p; + + for (p = buf; len; len--, p++) + switch (*p) { + case '\n': + *p = 6; + break; + case '\f': + *p = 8; + break; + case '-': + *p = 11; + break; + } +} + +void TopLevel:: +putClipData(char *data) { + Enum<rfsv::errs> res; + u_int32_t fh; + u_int32_t l; + const unsigned char *p; + bufferStore b; + + res = rf->freplacefile(0x200, CLIPFILE, fh); + if (res == rfsv::E_PSI_GEN_NONE) { + while ((res = rc->checkNotify()) != rfsv::E_PSI_GEN_NONE) { + if (res != rfsv::E_PSI_FILE_EOF) { + cerr << "waitN: " << res << endl; + rf->fclose(fh); + return; + } + } + + // Base Header + b.addDWord(0x10000037); // @00 UID 0 + b.addDWord(0x1000003b); // @04 UID 1 + b.addDWord(0); // @08 UID 3 + b.addDWord(0x4739d53b); // @0c Checksum the above + + // Section Table + b.addDWord(0x00000014); // @10 Offset of Section Table + b.addByte(2); // @14 Section Table, length in DWords + b.addDWord(0x10000033); // @15 Section Type (ASCII) + b.addDWord(0x0000001d); // @19 Section Offset + + // Data + b.addDWord(strlen(data)); // @1e Section (String) length + b.addStringT(data); // @22 Data + + p = (const unsigned char *)b.getString(0); + rf->fwrite(fh, p, 0x22 + strlen(data), l); + rf->fclose(fh); + rf->fsetattr(CLIPFILE, 0x20, 0x07); + } else + cerr << "replaceFile:" << res << endl; +} + +void TopLevel:: +getClipData() { + Enum<rfsv::errs> res; + PlpDirent de; + u_int32_t fh; + QString clipData; + + res = rf->fgeteattr(CLIPFILE, de); + if (res == rfsv::E_PSI_GEN_NONE) { + if (de.getAttr() & rfsv::PSI_A_ARCHIVE) { + u_int32_t len = de.getSize(); + char *buf = (char *)malloc(len); + + if (!buf) { + cerr << "Out of memory in getClipData" << endl; + return; + } + res = rf->fopen(rf->opMode(rfsv::PSI_O_RDONLY | rfsv::PSI_O_SHARE), + CLIPFILE, fh); + if (res == rfsv::E_PSI_GEN_NONE) { + u_int32_t tmp; + res = rf->fread(fh, (unsigned char *)buf, len, tmp); + rf->fclose(fh); + + if ((res == rfsv::E_PSI_GEN_NONE) && (tmp == len)) { + char *p = buf; + int lcount; + u_int32_t *ti = (u_int32_t*)buf; + + // Check base header + if (*ti++ != 0x10000037) { + free(buf); + return; + } + if (*ti++ != 0x1000003b) { + free(buf); + return; + } + if (*ti++ != 0) { + free(buf); + return; + } + if (*ti++ != 0x4739d53b) { + free(buf); + return; + } + + // Start of section table + p = buf + *ti; + // Length of section table (in DWords) + lcount = *p++; + + u_int32_t *td = (u_int32_t*)p; + while (lcount > 0) { + if (*td++ == 0x10000033) { + // An ASCII section + p = buf + *td; + len = *((u_int32_t*)p); + p += 4; + psiText2ascii(p, len); + clipData += (char *)p; + } + td++; + lcount -= 2; + } + } + + } else + cerr << "fopen: " << res << endl; + free(buf); + } + } else + cerr << "fgetattr: " << res << endl; + + if (!clipData.isEmpty()) { + inSetting = true; + clip->setText(clipData); + inSetting = false; + } +} + +bool TopLevel:: +checkConnection() { + if (rf && rc) + return true; + + Enum<rfsv::errs> res; + int sockNum = DPORT; + + struct servent *se = getservbyname("psion", "tcp"); + endservent(); + if (se != 0L) + sockNum = ntohs(se->s_port); + + if (!rfsvSocket) { + rfsvSocket = new ppsocket(); + if (!rfsvSocket->connect(NULL, sockNum)) { + cerr << "rclip: could not connect to ncpd" << endl; + delete rfsvSocket; + rfsvSocket = 0; + return false; + } + } + + if (!rclipSocket) { + rclipSocket = new ppsocket(); + if (!rclipSocket->connect(NULL, sockNum)) { + cerr << "rclip: could not connect to ncpd" << endl; + delete rclipSocket; + rclipSocket = 0; + return false; + } + } + + if (!rff) + rff = new rfsvfactory(rfsvSocket); + + if (!rf) + rf = rff->create(true); + + if (rf) { + if (!rc) + rc = new rclip(rclipSocket); + if (rc->initClipbd() == rfsv::E_PSI_GEN_NONE) + return true; + } + return false; +} + +/* + * Local variables: + * c-basic-offset: 4 + * End: + */ diff --git a/kde2/klipsi/toplevel.h b/kde2/klipsi/toplevel.h new file mode 100644 index 0000000..4fbd275 --- /dev/null +++ b/kde2/klipsi/toplevel.h @@ -0,0 +1,94 @@ +/*-*-c++-*- + * $Id$ + * + * This file is part of plptools. + * + * Copyright (C) 1999 Philip Proudman <philip.proudman@btinternet.com> + * Copyright (C) 1999-2001 Fritz Elfert <felfert@to.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +#ifndef _TOPLEVEL_H_ +#define _TOPLEVEL_H_ + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + +#include <kapp.h> +#include <kmainwindow.h> +#include <kpopupmenu.h> +#include <qpixmap.h> +#include <qtimer.h> + +#include <rfsv.h> +#include <rfsvfactory.h> +#include <rclip.h> +#include <ppsocket.h> + +class QClipboard; + +class TopLevel : public KMainWindow +{ + Q_OBJECT + +public: + TopLevel(); + ~TopLevel(); + +protected: + void paintEvent(QPaintEvent *); + void mousePressEvent(QMouseEvent *); + +protected slots: + void showPopupMenu( QPopupMenu * ); + +private slots: + void slotClipboardChanged(); + void slotTimer(); + void slotMenuSelected(int); + +private: + void psiText2ascii(char *, int); + void ascii2PsiText(char *, int); + void putClipData(char *); + void getClipData(); + bool checkConnection(); + + QClipboard *clip; + KPopupMenu *menu; + QTimer *timer; + + ppsocket *rfsvSocket; + ppsocket *rclipSocket; + rfsv *rf; + rclip *rc; + rfsvfactory *rff; + + QString lastClipData; + QPixmap icon; + bool inSend; + bool inSetting; + bool mustListen; +}; + +#endif + +/* + * Local variables: + * c-basic-offset: 4 + * End: + */ diff --git a/kde2/po/Makefile.am b/kde2/po/Makefile.am index 3a70068..668c948 100644 --- a/kde2/po/Makefile.am +++ b/kde2/po/Makefile.am @@ -4,7 +4,7 @@ maintainer-clean-local: SUBDIRS = de -APPS = kpsion libplpprops +APPS = kpsion libplpprops klipsi merge: @apps='$(APPS)'; \ diff --git a/kde2/po/de/klipsi.po b/kde2/po/de/klipsi.po new file mode 100644 index 0000000..fee655d --- /dev/null +++ b/kde2/po/de/klipsi.po @@ -0,0 +1,36 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2001 Free Software Foundation, Inc. +# Fritz Elfert <felfert@to.com>, 2001. +# +msgid "" +msgstr "" +"Project-Id-Version: plptools 0.10\n" +"POT-Creation-Date: 2001-05-24 02:01+0200\n" +"PO-Revision-Date: 2001-05-24 02:11CET\n" +"Last-Translator: Fritz Elfert <felfert@to.com>\n" +"Language-Team: Deutsch <de@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 0.8\n" + +#: main.cpp:36 +msgid "Klipsi" +msgstr "Klipsi" + +#: main.cpp:37 +msgid "Psion remote clipboard utility" +msgstr "Psion Zwischenablage" + +#: main.cpp:43 +msgid "Original Developer/Maintainer" +msgstr "Original Entwickler/Betreuer" + +#: toplevel.cpp:58 +msgid "Klipsi - Psion Clipboard" +msgstr "Klipsi - Psion Zwischenablage" + +#: toplevel.cpp:60 +msgid "&Quit" +msgstr "B&eenden" + diff --git a/kde2/po/klipsi.pot b/kde2/po/klipsi.pot new file mode 100644 index 0000000..27e1640 --- /dev/null +++ b/kde2/po/klipsi.pot @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Free Software Foundation, Inc. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2001-05-24 02:01+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8-bit\n" + +#: main.cpp:36 +msgid "Klipsi" +msgstr "" + +#: main.cpp:37 +msgid "Psion remote clipboard utility" +msgstr "" + +#: main.cpp:43 +msgid "Original Developer/Maintainer" +msgstr "" + +#: toplevel.cpp:58 +msgid "Klipsi - Psion Clipboard" +msgstr "" + +#: toplevel.cpp:60 +msgid "&Quit" +msgstr "" |