5f2a1d6536
This is the gsoc-2011 project to clean up and backport multibyte support from other nvi forks in a form we can use. USE_WIDECHAR is on unless building for the rescue crunchgen. This should allow editing in the native locale encoding. USE_ICONV depends on make.conf having 'WITH_ICONV=YES' for now. This adds the ability to do things like edit a KOI8-R file while having $LANG set to (say) en_US.UTF-8. iconv is used to transcode the characters for display. Other points: * It uses gencat and catopen/etc instead of homegrown msg catalog stuff. * A lot of stuff has been trimmed out, eg: the perl and tcl bindings which we could never use in base anyway. * It uses ncursesw when in widechar mode. This could be interesting. GSoC info: http://www.google-melange.com/gsoc/proposal/review/google/gsoc2011/zy/1 Repo at: https://github.com/lichray/nvi2 Obtained from: Zhihao Yuan <lichray@gmail.com>
104 lines
2.2 KiB
C
104 lines
2.2 KiB
C
/*-
|
|
* Copyright (c) 1992, 1993, 1994
|
|
* The Regents of the University of California. All rights reserved.
|
|
* Copyright (c) 1992, 1993, 1994, 1995, 1996
|
|
* Keith Bostic. All rights reserved.
|
|
*
|
|
* See the LICENSE file for redistribution information.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#ifndef lint
|
|
static const char sccsid[] = "$Id: v_xchar.c,v 10.10 2001/06/25 15:19:36 skimo Exp $";
|
|
#endif /* not lint */
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/queue.h>
|
|
#include <sys/time.h>
|
|
|
|
#include <bitstring.h>
|
|
#include <limits.h>
|
|
#include <stdio.h>
|
|
|
|
#include "../common/common.h"
|
|
#include "vi.h"
|
|
|
|
/*
|
|
* v_xchar -- [buffer] [count]x
|
|
* Deletes the character(s) on which the cursor sits.
|
|
*
|
|
* PUBLIC: int v_xchar __P((SCR *, VICMD *));
|
|
*/
|
|
int
|
|
v_xchar(SCR *sp, VICMD *vp)
|
|
{
|
|
size_t len;
|
|
int isempty;
|
|
|
|
if (db_eget(sp, vp->m_start.lno, NULL, &len, &isempty)) {
|
|
if (isempty)
|
|
goto nodel;
|
|
return (1);
|
|
}
|
|
if (len == 0) {
|
|
nodel: msgq(sp, M_BERR, "206|No characters to delete");
|
|
return (1);
|
|
}
|
|
|
|
/*
|
|
* Delete from the cursor toward the end of line, w/o moving the
|
|
* cursor.
|
|
*
|
|
* !!!
|
|
* Note, "2x" at EOL isn't the same as "xx" because the left movement
|
|
* of the cursor as part of the 'x' command isn't taken into account.
|
|
* Historically correct.
|
|
*/
|
|
if (F_ISSET(vp, VC_C1SET))
|
|
vp->m_stop.cno += vp->count - 1;
|
|
if (vp->m_stop.cno >= len - 1) {
|
|
vp->m_stop.cno = len - 1;
|
|
vp->m_final.cno = vp->m_start.cno ? vp->m_start.cno - 1 : 0;
|
|
} else
|
|
vp->m_final.cno = vp->m_start.cno;
|
|
|
|
if (cut(sp,
|
|
F_ISSET(vp, VC_BUFFER) ? &vp->buffer : NULL,
|
|
&vp->m_start, &vp->m_stop, 0))
|
|
return (1);
|
|
return (del(sp, &vp->m_start, &vp->m_stop, 0));
|
|
}
|
|
|
|
/*
|
|
* v_Xchar -- [buffer] [count]X
|
|
* Deletes the character(s) immediately before the current cursor
|
|
* position.
|
|
*
|
|
* PUBLIC: int v_Xchar __P((SCR *, VICMD *));
|
|
*/
|
|
int
|
|
v_Xchar(SCR *sp, VICMD *vp)
|
|
{
|
|
u_long cnt;
|
|
|
|
if (vp->m_start.cno == 0) {
|
|
v_sol(sp);
|
|
return (1);
|
|
}
|
|
|
|
cnt = F_ISSET(vp, VC_C1SET) ? vp->count : 1;
|
|
if (cnt >= vp->m_start.cno)
|
|
vp->m_start.cno = 0;
|
|
else
|
|
vp->m_start.cno -= cnt;
|
|
--vp->m_stop.cno;
|
|
vp->m_final.cno = vp->m_start.cno;
|
|
|
|
if (cut(sp,
|
|
F_ISSET(vp, VC_BUFFER) ? &vp->buffer : NULL,
|
|
&vp->m_start, &vp->m_stop, 0))
|
|
return (1);
|
|
return (del(sp, &vp->m_start, &vp->m_stop, 0));
|
|
}
|