Skip to content
Snippets Groups Projects
Commit 241a8aaa authored by Bram Moolenaar's avatar Bram Moolenaar
Browse files

updated for version 7.0163

parent 9372a11c
No related branches found
Tags v7.0163
No related merge requests found
Showing with 38 additions and 18004 deletions
*todo.txt* For Vim version 7.0aa. Last change: 2005 Dec 01 *todo.txt* For Vim version 7.0aa. Last change: 2005 Dec 06
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
...@@ -30,27 +30,27 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. ...@@ -30,27 +30,27 @@ be worked on, but only if you sponsor Vim development. See |sponsor|.
*known-bugs* *known-bugs*
-------------------- Known bugs and current work ----------------------- -------------------- Known bugs and current work -----------------------
Go over all changes between 6.3 and 6.4 and make sure they are included in 7.
Using ":read" in an empty buffer in Ex mode, then undo leaves a line behind.
(Servatius Brandt).
'statusline' is drawn over the Omni menu.
Cygwin and Mac OS/X may preserve case for file names but ignore case Cygwin and Mac OS/X may preserve case for file names but ignore case
differences. Use Amiga code? differences. Use Amiga code?
"make unixall": remove split in floppy-size archives.
":helpgrep" sometimes results in wrong text in the error list: ":helpgrep" sometimes results in wrong text in the error list:
"^[.?!]\_[\])'" ]\+" "^[.?!]\_[\])'" ]\+"
Using string that was freed or buffer that is overwritten? Using string that was freed or buffer that is overwritten?
When editing a file "a" that is a symbolic link to "b", while another Vim is
editing "b", there is no warning. Follow symlink to make swap file name?
Patch from Stefano Zacchiroli. Updated by James Vega, Dec 2.
Using pipes for filter commands: provide some way to type a password, keep Using pipes for filter commands: provide some way to type a password, keep
stderr in/out open for this? (Konstanti Rozinov) stderr in/out open for this? (Konstanti Rozinov)
New problem: password is echoed. Put terminal in cooked mode and don't read New problem: password is echoed. Put terminal in cooked mode and don't read
from terminal? from terminal?
Allow the user to handle the situation that a swap file already exists.
Option to define a function to be called? Function would return the character
that the dialog provides. Would make it possible to bring the other Vim to
the foreground and abort the edit. Or hard-code this?
To support mapping <F4> to be used as <F4>{motion}: Add operator that To support mapping <F4> to be used as <F4>{motion}: Add operator that
executes a user defined function. '[ and '] marks are at start and end of executes a user defined function. '[ and '] marks are at start and end of
text. ":map <F4> :set opfunc=MyOp<CR>gy". text. ":map <F4> :set opfunc=MyOp<CR>gy".
...@@ -61,7 +61,7 @@ errors and illegal bytes. Make default to replace bad bytes/characters with ...@@ -61,7 +61,7 @@ errors and illegal bytes. Make default to replace bad bytes/characters with
:e ++enc=xxx ++bad=keep foo.txt :e ++enc=xxx ++bad=keep foo.txt
:e ++enc=xxx ++bad=drop foo.txt :e ++enc=xxx ++bad=drop foo.txt
:e ++enc=xxx ++bad=? foo.txt :e ++enc=xxx ++bad=? foo.txt
(patch 29 November) (patch 6 December)
ml_get error with specific vimrc and lots of plugins. (Tomi Mickelsson) ml_get error with specific vimrc and lots of plugins. (Tomi Mickelsson)
...@@ -69,6 +69,8 @@ Win32: preserve the hidden attribute of the viminfo file. ...@@ -69,6 +69,8 @@ Win32: preserve the hidden attribute of the viminfo file.
Add ":startgreplace" to do "gR", like ":startreplace" does "R". Add ":startgreplace" to do "gR", like ":startreplace" does "R".
Alt-mousekey is currently ignored. Use it for Visual/select block?
When 'delcombine' is set in Select mode before a character with a combining When 'delcombine' is set in Select mode before a character with a combining
char the combining char is deleted when it shouldn't. (Tony Mechelynck, Nov char the combining char is deleted when it shouldn't. (Tony Mechelynck, Nov
27) 27)
...@@ -104,10 +106,6 @@ spelling: ...@@ -104,10 +106,6 @@ spelling:
- Have "zg" and "zw" report the file that was modified. (Marvin Renich) - Have "zg" and "zw" report the file that was modified. (Marvin Renich)
- Add a command like "zg" that selects one of the files 'spellfile'. - Add a command like "zg" that selects one of the files 'spellfile'.
When editing a file "a" that is a symbolic link to "b", while another Vim is
editing "b", there is no warning. Follow symlink to make swap file name?
Patch from Stefano Zacchiroli.
Support saving and restoring session for X windows? It should work to do Support saving and restoring session for X windows? It should work to do
":mksession" and use "-S fname" for the restart command. The ":mksession" and use "-S fname" for the restart command. The
gui_x11_wm_protocol_handler() already takes care of the rest. gui_x11_wm_protocol_handler() already takes care of the rest.
...@@ -132,9 +130,6 @@ Mac unicode patch (Da Woon Jung): ...@@ -132,9 +130,6 @@ Mac unicode patch (Da Woon Jung):
- With 'nopaste' pasting is wrong, with 'paste' Command-V doesn't work. - With 'nopaste' pasting is wrong, with 'paste' Command-V doesn't work.
(Alan Schmitt) (Alan Schmitt)
Mac: drop support for OS 9. Most people are now using OS/X and Vim 6.4 can be
used for others. Will make maintaining the code simpler.
Patch to add a few flags to search(). (Benji Fisher, Nov 29, doc update Dec 1) Patch to add a few flags to search(). (Benji Fisher, Nov 29, doc update Dec 1)
Also add search???() function that returns list with lnum and col. Also add search???() function that returns list with lnum and col.
...@@ -145,6 +140,9 @@ Try out using the free MS compiler and debugger, using Make_mvc.mak. ...@@ -145,6 +140,9 @@ Try out using the free MS compiler and debugger, using Make_mvc.mak.
Win32: Check that installer puts menu items in "all users" dir when possible, Win32: Check that installer puts menu items in "all users" dir when possible,
not administrator dir. not administrator dir.
CTRL-X CTRL-L only completes from loaded buffers. Make it work for unloaded
buffers too?
Autoload: Autoload:
- Add a Vim script in $VIMRUNTIME/tools that takes a file with a list of - Add a Vim script in $VIMRUNTIME/tools that takes a file with a list of
script names and a help file and produces a script that can be sourced to script names and a help file and produces a script that can be sourced to
...@@ -259,6 +257,8 @@ PLANNED FOR VERSION 7.0: ...@@ -259,6 +257,8 @@ PLANNED FOR VERSION 7.0:
Only difficult thing: When going back in time, how to find the previous Only difficult thing: When going back in time, how to find the previous
text state in the tree? text state in the tree?
Show the list of changes in a window to be able to select a version? Show the list of changes in a window to be able to select a version?
Also: See ":e" as a change operation, find the changes and add them to the
undo info. Needed for when an external tool changes the file.
- PERSISTENT UNDO: store undo in a file. - PERSISTENT UNDO: store undo in a file.
Use timestamps, so that a version a certain time ago can be found and info Use timestamps, so that a version a certain time ago can be found and info
before some time/date can be flushed. 'undopersist' gives maximum time to before some time/date can be flushed. 'undopersist' gives maximum time to
...@@ -397,7 +397,7 @@ Win32: In the generated batch files, use $VIMRUNTIME if it's set. Examples by ...@@ -397,7 +397,7 @@ Win32: In the generated batch files, use $VIMRUNTIME if it's set. Examples by
Mathias Michaelis (2004 Sep 6) Mathias Michaelis (2004 Sep 6)
Also place vimtutor.bat in %windir%? Also place vimtutor.bat in %windir%?
Add gui_mch_browsedir() for Motif, KDE and Mac OS/X. Add gui_mch_browsedir() for Motif, Mac OS/X.
Add extra list of file locations. A bit like the quickfix list, but there is Add extra list of file locations. A bit like the quickfix list, but there is
one per window. Can be used with: one per window. Can be used with:
...@@ -612,14 +612,6 @@ GTK+ GUI known bugs: ...@@ -612,14 +612,6 @@ GTK+ GUI known bugs:
when it is longer than 4000 characters. Works OK from gvim to gvim and when it is longer than 4000 characters. Works OK from gvim to gvim and
vim to vim. Pasting through xterm (using the shift key) also works. vim to vim. Pasting through xterm (using the shift key) also works.
It starts working after GTK gvim loses the selection and gains it again. It starts working after GTK gvim loses the selection and gains it again.
7 DND doesn't work with KDE (also with GTK 1).
KDE GUI known bugs:
- There is no active maintenance and "yzis" is supposed to replace it.
- With the default 'guifont' value bold text differs in size from normal
text, causing the display to be messed up.
- Error messages when starting up. The "tip of the day" box is empty.
- Encoding of menu items needs to be converted. (Yasuhiro Matsumoto)
Win32 GUI known bugs: Win32 GUI known bugs:
8 On Windows 98 the unicows library is needed to support functions with UCS2 8 On Windows 98 the unicows library is needed to support functions with UCS2
......
*version7.txt* For Vim version 7.0aa. Last change: 2005 Dec 01 *version7.txt* For Vim version 7.0aa. Last change: 2005 Dec 06
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
...@@ -21,7 +21,6 @@ NEW FEATURES |new-7| ...@@ -21,7 +21,6 @@ NEW FEATURES |new-7|
Vim script enhancements |new-vim-script| Vim script enhancements |new-vim-script|
Spell checking |new-spell| Spell checking |new-spell|
Omni completion |new-omni-completion| Omni completion |new-omni-completion|
KDE support |new-KDE|
MzScheme interface |new-MzScheme| MzScheme interface |new-MzScheme|
Printing multi-byte text |new-print-multi-byte| Printing multi-byte text |new-print-multi-byte|
Translated manual pages |new-manpage-trans| Translated manual pages |new-manpage-trans|
...@@ -67,6 +66,8 @@ results in "a'b". ...@@ -67,6 +66,8 @@ results in "a'b".
When overwriting a file with ":w! fname" there was no warning for when "fname" When overwriting a file with ":w! fname" there was no warning for when "fname"
was being edited by another Vim. Vim now gives an error message |E768|. was being edited by another Vim. Vim now gives an error message |E768|.
The support for Mac OS 9 has been removed.
Minor incompatibilities: Minor incompatibilities:
...@@ -202,13 +203,6 @@ When the 'completeopt' option contains "menu" then matches for Insert mode ...@@ -202,13 +203,6 @@ When the 'completeopt' option contains "menu" then matches for Insert mode
completion are displayed in a popup menu. completion are displayed in a popup menu.
KDE support *new-KDE*
-----------
Kvim is the KDE version of Vim. It uses the Qt toolkit. See |KVim|.
(Thomas Capricelli, Philippe Fremy, Mickael Marchand, Mark Westcott, et al.)
MzScheme interface *new-MzScheme* MzScheme interface *new-MzScheme*
------------------ ------------------
...@@ -503,6 +497,7 @@ New autocommand events: ~ ...@@ -503,6 +497,7 @@ New autocommand events: ~
|ColorScheme| after loading a color scheme |ColorScheme| after loading a color scheme
|QuickFixCmdPre| before :make, :grep et al. (Ciaran McCreesh) |QuickFixCmdPre| before :make, :grep et al. (Ciaran McCreesh)
|QuickFixCmdPost| after :make, :grep et al. (Ciaran McCreesh) |QuickFixCmdPost| after :make, :grep et al. (Ciaran McCreesh)
|SessionLoadPost| after loading a session file. (Yegappan Lakshmanan)
New items in search patterns: ~ New items in search patterns: ~
...@@ -849,6 +844,9 @@ in the FileChangedRO autocommand when checking out the file fails. ...@@ -849,6 +844,9 @@ in the FileChangedRO autocommand when checking out the file fails.
Unix: When open() returns EFBIG give an appropriate message. Unix: When open() returns EFBIG give an appropriate message.
":mksession" sets the SessionLoad variable to notify plugins. A modeline is
added to the session file to set 'filetype' to "vim".
============================================================================== ==============================================================================
COMPILE TIME CHANGES *compile-changes-7* COMPILE TIME CHANGES *compile-changes-7*
......
This diff is collapsed.
runtime/kvim32x32.png

2.41 KiB

runtime/kvim48x48.png

4.46 KiB

runtime/kvim64x64.png

6.88 KiB

" Vim syntax support file " Vim syntax support file
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2005 Dec 01 " Last Change: 2005 Dec 04
" (modified by David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>) " (modified by David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>)
" (XHTML support by Panagiotis Issaris <takis@lumumba.luc.ac.be>) " (XHTML support by Panagiotis Issaris <takis@lumumba.luc.ac.be>)
...@@ -164,6 +164,8 @@ else ...@@ -164,6 +164,8 @@ else
let s:html_encoding = substitute(s:vim_encoding, 'cp', 'windows-', '') let s:html_encoding = substitute(s:vim_encoding, 'cp', 'windows-', '')
elseif s:vim_encoding == 'sjis' elseif s:vim_encoding == 'sjis'
let s:html_encoding = 'Shift_JIS' let s:html_encoding = 'Shift_JIS'
elseif s:vim_encoding == 'big5'
let s:html_encoding = "Big5"
elseif s:vim_encoding == 'euc-cn' elseif s:vim_encoding == 'euc-cn'
let s:html_encoding = 'GB_2312-80' let s:html_encoding = 'GB_2312-80'
elseif s:vim_encoding == 'euc-tw' elseif s:vim_encoding == 'euc-tw'
......
Vim with KDE: kvim
ON THE INTERNET
===============
The homepage is http://www.freehackers.org/kvim/
The core is build around the official vim-6.x releases and patches
KVim CVS is full and does not need extra package. Just download and compile it.
INSTALL :
=========
We now use Vim's configure to configure, compile and install KVim.
Don't forget, that you need to have QT and KDE headers and tools installed, otherwise it won't
work ! (these can commonly be found in kde-devel/qt-devel packages)
Enter the 'src' directory and configure it your way (you need to add at least these flags to the configure command line : --enable-gui=kde --with-qt-dir=$QTDIR ) then make and make install as root.
We added to configure some options for KDE / QT detection, it will for example, find whether you use KDE 2.x or KDE 3.x automatically. For now, QT is _not_ autodetected. I hope to fix this soon.
From KVim 6.1, you can now use a KDE toolbar instead of Vim's Toolbar, to enable it, use the --enable-kde-toolbar configure flag.
=> If it fails : (yes it still can, the configure script i wrote is still experimental and probably not
perfect ;p)
or 'how to make a bug report' :
In some cases, I can imagine it will fail, if this happens then send to marchand@kde.org :
->auto/config.mk (important one)
->your configure command line with your options
->your paths : where KDE is (which version ?), where QT is (version ?), and find where your
libs are (your kdelibs, your QT libs and QT headers)
->the output of 'kde-config --version'
->your OS / Linux Distribution version
->in case of a compilation error : the full error output.
->the compiler used (gcc 2.95, 2.96, 3.1 ...)
->any stuff you think could be usefull to me :)
Thanks for giving KVim a try, we hope you'll enjoy it !
DEVELOPMENT STATE AND KNOWN BUGS:
=================================
Most Vim GUI features are now implemented, only multibyte support is incomplete.
We are working on this and this is our primary goal after KVim 6.1 release.
We hope to get it to work before we include KVim into the core Vim which we want to
do before the end of the year 2002 if possible.
We would be happy to hear from you if you've tried kvim. Tell us
what is missing, what you like and don't like, and what you want.
As people have wished it for a while, Philippe developped a component for Vim.
The component is now fully usable with GVim and KVim and can be found on KDE's CVS
in the kdeextragear-1 module.
SOURCE ACCESS:
==============
Releases and maybe snapshots are/will be found on http://freehackers.org/kvim/
The CVS is CVSROOT=:pserver:anonymous@cvs.tuxfamily.org:/cvsroot/kvim
(with no password)
You'll find there a full vim 6.x package (with runtime files included).
MAILING LIST:
=============
As we released KVim 6.0, we created a public mailing list, for feedback,
user help and development related discussions : "kvim-dev@freenux.org",
to subscribe send a mail to "kvim-dev-subscribe@freenux.org" with
"subscribe" as the subject and just reply to the mail you will receive.
(sorry the admin messages are in french, but the list discussions are in
english)
THANKS :
========
To all the guys on #kde@opn (Neil, Malte and many other) and to all the people who
tried, debugged, compiled and recompiled again KVim to bring now a much more robust KVim
and of course to all of you who send patchs and comments :)
And of course to Vim Authors :)
CURRENT MAINTAINER:
===================
Mickael Marchand <marchand@kde.org>
DEVELOPERS (CVS accounts):
==========
Mickael Marchand <marchand@kde.org> (marchand)
Mark Westcott <mark@houseoffish.org> Qtopia GUI (mark)
Thomas Capricelli <orzel@kde.org> Initial KVim author (orzel)
Philippe Fremy <pfremy@chez.com> Initial KVim author (pfremy)
AUTHORS
=========
Thomas Capricelli <orzel@kde.org> Initial KVim author
Philippe Fremy <pfremy@chez.com> Initial KVim author
CONTRIBUTORS
============
David Spencer Tyree <celer@scrypt.net>
Vince Negri <vince@bulbous.freeserve.co.uk> AntiAliasing support
Kailash Sethuraman (hsaliak, #netbsd@opn) NetBSD configuration/compilation fixes
Some other, see the About KVim dialog box in KVim...
This diff is collapsed.
...@@ -10024,7 +10024,7 @@ f_has(argvars, rettv) ...@@ -10024,7 +10024,7 @@ f_has(argvars, rettv)
"dos16", "dos16",
# endif # endif
#endif #endif
#ifdef MACOS /* TODO: Should we add MACOS_CLASSIC, MACOS_X? (Dany) */ #ifdef MACOS
"mac", "mac",
#endif #endif
#if defined(MACOS_X_UNIX) #if defined(MACOS_X_UNIX)
...@@ -10173,9 +10173,6 @@ f_has(argvars, rettv) ...@@ -10173,9 +10173,6 @@ f_has(argvars, rettv)
"gui_athena", "gui_athena",
# endif # endif
#endif #endif
#ifdef FEAT_GUI_KDE
"gui_kde",
#endif
#ifdef FEAT_GUI_GTK #ifdef FEAT_GUI_GTK
"gui_gtk", "gui_gtk",
# ifdef HAVE_GTK2 # ifdef HAVE_GTK2
......
This diff is collapsed.
This diff is collapsed.
/* vi:set ts=8 sts=0 sw=8:
*
* VIM - Vi IMproved by Bram Moolenaar
*
* Do ":help uganda" in Vim to read copying and usage conditions.
* Do ":help credits" in Vim to see a list of people who contributed.
*/
/*
* Porting to KDE(2) was done by
*
* (C) 2000 by Thomas Capricelli <orzel@freehackers.org>
*
* Please visit http://freehackers.org/kvim for other vim- or
* kde-related coding.
*
* $Id$
*
*/
#ifndef GUI_KDE_WIDGET
#define GUI_KDE_WIDGET
#if 1
#define dbf( format, args... ) { printf( "%s" " : " format "\n" , __FUNCTION__ , ## args ); fflush(stdout); }
#define db() { printf( "%s\n", __FUNCTION__ );fflush(stdout); }
#else
#define dbf(format, args... )
#define db()
#endif
#define UNIX // prevent a warning : a symbol is defined twice in X and Qt
#include <qdialog.h>
#include <qlabel.h>
#include <qsignalmapper.h>
#include <qtimer.h>
#include <qmainwindow.h>
#include <qapplication.h>
#include <qevent.h>
#include <qlineedit.h>
#include <qpainter.h>
#include <qwidget.h>
#include <qpopupmenu.h>
#include <klocale.h>
#include <kapp.h>
#include <kcmdlineargs.h>
#include <kaboutdata.h>
#include <keditcl.h>
#include <kaboutdata.h>
#if (KDE_VERSION>=290)
#include <kmainwindow.h>
#else
#include <ktmainwindow.h>
#endif
#include <kparts/part.h>
#include <kurl.h>
#include "kvim_iface.h"
#undef UNIX // prevent a warning
extern "C" {
#include "vim.h"
}
class QPushButton;
class QDialog;
class QLineEdit;
class QSignalMapper;
class QPaintEvent;
enum BlinkState
{
BLINK_NONE,
BLINK_ON,
BLINK_OFF
};
class VimWidget : public QWidget, virtual public KVim
{
Q_OBJECT
public:
VimWidget(QWidget *parent = 0, const char *name = 0, WFlags f = 0);
virtual void paintEvent(QPaintEvent *);
void draw_string(int x, int y, QString s, int len, int flags);
/** Init the blinking time */
void set_blink_time(long, long, long);
void start_cursor_blinking();
void stop_cursor_blinking();
void wait(long);
#ifdef FEAT_CLIENTSERVER
void serverActivate(WId id);
#endif
#ifdef FEAT_MZSCHEME
void enable_mzscheme_threads();
void disable_mzscheme_threads();
#endif
void flash();
/** DCOP */
void execNormal(QString command);
void execInsert(QString command);
void execRaw(QString command);
void execCmd(QString command);
QString eval(QString expr);
bool wait_done;
BlinkState blink_state;
QPainter *painter;
QPopupMenu *menu;
virtual void setMicroFocusHint(int x, int y, int w, int h, bool text=TRUE, QFont *f = 0)
{
QWidget::setMicroFocusHint(x, y, w, h, text, f);
}
protected:
virtual void keyPressEvent(QKeyEvent *);
virtual void mousePressEvent(QMouseEvent *);
virtual void mouseDoubleClickEvent(QMouseEvent *);
virtual void mouseReleaseEvent(QMouseEvent *);
virtual void mouseMoveEvent(QMouseEvent *);
virtual void focusInEvent(QFocusEvent *);
virtual void focusOutEvent(QFocusEvent *);
virtual void dragEnterEvent(QDragEnterEvent *);
virtual void dropEvent(QDropEvent *);
#ifdef FEAT_XIM
virtual void imStartEvent(QIMEvent *);
virtual void imEndEvent(QIMEvent *);
virtual void imComposeEvent(QIMEvent *);
#endif
#ifdef FEAT_MZSCHEME
virtual void timerEvent(QTimerEvent *);
#endif
/* cursor blinking stuff */
QTimer blink_timer;
long blink_wait_time, blink_on_time, blink_off_time;
/* wait for input */
QTimer wait_timer;
#ifdef FEAT_MZSCHEME
int mzscheme_timer_id;
#endif
public slots:
void blink_cursor();
void wait_timeout();
};
class VimMainWindow : public KMainWindow
{
Q_OBJECT
public:
VimMainWindow(const char *name = 0L, WFlags f = WDestructiveClose);
/** called when the widget closes */
// bool close(bool alsoDelete);
VimWidget *w;
KEdFind *finddlg;
KEdReplace *repldlg;
int have_tearoff;
QTextCodec *codec;
public slots:
void menu_activated(int dx);
void clipboard_selection_update();
void clipboard_data_update();
void slotSearch();
void slotFind();
void slotReplace();
void slotReplaceAll();
void showAboutApplication();
void showAboutKDE();
void showBugReport();
void showTipOfTheDay();
void buffersToolbar();
bool isLocked();
void lock();
void unlock();
protected:
virtual void wheelEvent(QWheelEvent *);
virtual void resizeEvent(QResizeEvent *e);
#if defined(FEAT_SESSION)
void saveGlobalProperties(KConfig *conf);
void readGlobalProperties(KConfig *conf);
#endif
bool queryClose();
bool queryExit();
bool locked;
};
class VimDialog : public QDialog
{
Q_OBJECT
public:
VimDialog(int type, /* type of dialog */
unsigned char *title, /* title of dialog */
unsigned char *message, /* message text */
unsigned char *buttons, /* names of buttons */
int def_but, /* default button */
char_u *textfield); /* input text */
private:
QSignalMapper mapper;
QLineEdit *entry;
char_u *ret;
int butNb;
protected slots:
void done(int);
};
/*
* QScrollBar pool
*/
struct GuiScrollbar;
class SBPool : public QObject
{
Q_OBJECT
public:
SBPool(void);
void create(GuiScrollbar * sb, int orient);
void destroy(GuiScrollbar * sb);
public slots:
void sbUsed(int who);
private:
QSignalMapper mapper;
};
class KVimUtils
{
public:
static QString convertEncodingName(QString);
#if QT_VERSION<300
static bool fromString(QFont*,QString);
static QString toString(QFont*);
#endif
};
extern VimMainWindow *vmw;
extern SBPool *sbpool;
extern QString *argServerName;
#define QSTR(x) \
(has_mbyte ? \
(enc_utf8 ? \
QString::fromUtf8((const char *)x) : \
QString::fromLocal8Bit((const char *)x)) : \
QString((const char *)x))
#endif // GUI_KDE_WIDGET
This diff is collapsed.
/* vi:set ts=8 sts=4 sw=4:
*
* VIM - Vi IMproved by Bram Moolenaar
*
* Do ":help uganda" in Vim to read a list of people who contributed.
* Do ":help credits" in Vim to see a list of people who contributed.
*/
#ifdef environ_os_mac /* or 1 for Carbon, 0 for non-Carbon */
# include <Carbon/Carbon.r>
#else
# include <SysTypes.r>
# include <Types.r>
#endif
#include "version.h"
/* Used as application version */
resource 'vers' (1) {
VIM_VERSION_MAJOR, VIM_VERSION_BUILD_BCD, VIM_VERSION_RELEASE, VIM_VERSION_PATCHLEVEL,
verUS,
VIM_VERSION_MEDIUM,
VIM_VERSION_LONG_DATE $$date " " $$time ")"
};
/* Used as application group version */
resource 'vers' (2) {
VIM_VERSION_MAJOR, VIM_VERSION_BUILD_BCD, VIM_VERSION_RELEASE, VIM_VERSION_PATCHLEVEL,
verUS,
VIM_VERSION_MEDIUM,
VIM_VERSION_LONG
};
/* TODO: Small About box with compile time */
...@@ -621,8 +621,6 @@ static XtIntervalId timer_id = (XtIntervalId)0; ...@@ -621,8 +621,6 @@ static XtIntervalId timer_id = (XtIntervalId)0;
pascal void timer_proc(EventLoopTimerRef, void *); pascal void timer_proc(EventLoopTimerRef, void *);
static EventLoopTimerRef timer_id = NULL; static EventLoopTimerRef timer_id = NULL;
static EventLoopTimerUPP timerUPP; static EventLoopTimerUPP timerUPP;
#elif defined(FEAT_GUI_KDE)
static int timer_id = 0;
#endif #endif
#ifndef FEAT_GUI_W32 /* Win32 console and Unix */ #ifndef FEAT_GUI_W32 /* Win32 console and Unix */
...@@ -664,9 +662,6 @@ timer_proc(XtPointer timed_out, XtIntervalId *interval_id) ...@@ -664,9 +662,6 @@ timer_proc(XtPointer timed_out, XtIntervalId *interval_id)
# elif defined(FEAT_GUI_MAC) # elif defined(FEAT_GUI_MAC)
pascal void pascal void
timer_proc(EventLoopTimerRef theTimer, void *userData) timer_proc(EventLoopTimerRef theTimer, void *userData)
#elif defined(FEAT_GUI_KDE)
void
timer_proc(void)
# endif # endif
{ {
scheme_check_threads(); scheme_check_threads();
...@@ -693,9 +688,6 @@ setup_timer(void) ...@@ -693,9 +688,6 @@ setup_timer(void)
timerUPP = NewEventLoopTimerUPP(timer_proc); timerUPP = NewEventLoopTimerUPP(timer_proc);
InstallEventLoopTimer(GetMainEventLoop(), p_mzq * kEventDurationMillisecond, InstallEventLoopTimer(GetMainEventLoop(), p_mzq * kEventDurationMillisecond,
p_mzq * kEventDurationMillisecond, timerUPP, NULL, &timer_id); p_mzq * kEventDurationMillisecond, timerUPP, NULL, &timer_id);
#elif defined(FEAT_GUI_KDE)
mzscheme_kde_start_timer();
timer_id = 1; /* just signal that timer was started */
# endif # endif
} }
...@@ -711,8 +703,6 @@ remove_timer(void) ...@@ -711,8 +703,6 @@ remove_timer(void)
# elif defined(FEAT_GUI_MAC) # elif defined(FEAT_GUI_MAC)
RemoveEventLoopTimer(timer_id); RemoveEventLoopTimer(timer_id);
DisposeEventLoopTimerUPP(timerUPP); DisposeEventLoopTimerUPP(timerUPP);
#elif defined(FEAT_GUI_KDE)
mzscheme_kde_stop_timer();
# endif # endif
timer_id = 0; timer_id = 0;
} }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment