*----------------------------------------------------------------------*
*
* All portions of code are copyright by their respective author/s.
- * Copyright (c) 2005-200
6 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2005-200
8 Marc Lehmann <pcg@goof.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
#include "unistd.h"
-#include "iom.h"
+#include "ev_cpp.h"
#include "rxvt.h"
#include "keyboard.h"
#include "rxvtutil.h"
#include "perlxsi.c"
-#ifdef HAVE_SCROLLBARS
-# define GRAB_CURSOR THIS->leftptr_cursor
-#else
-# define GRAB_CURSOR None
-#endif
+#define GRAB_CURSOR THIS->scrollBar.leftptr_cursor
#undef LINENO
#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
#undef ROW
#define ROW(n) THIS->row_buf [LINENO (n)]
-typedef int CHAINED UNUSED;
-
/////////////////////////////////////////////////////////////////////////////
static wchar_t *
}
static SV *
-new_ref (HV *hv, const char *klass)
-{
- return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
-}
-
-//TODO: use magic
-static SV *
newSVptr (void *ptr, const char *klass)
{
HV *hv = newHV ();
return (long)mg->mg_ptr;
}
-#define newSVterm(term) SvREFCNT_inc ((SV *)term->perl.self)
-#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
-
-/////////////////////////////////////////////////////////////////////////////
-
-#define SvWATCHER(sv) (perl_watcher *)SvPTR (sv, "urxvt::watcher")
-
-struct perl_watcher
-{
- SV *cbsv;
- HV *self;
-
- perl_watcher ()
- : cbsv (0)
- {
- }
-
- ~perl_watcher ()
- {
- SvREFCNT_dec (cbsv);
- }
-
- void cb (SV *cb)
- {
- SvREFCNT_dec (cbsv);
- cbsv = newSVsv (cb);
- }
-
- void invoke (const char *type, SV *self, int arg = -1);
-};
-
-void
-perl_watcher::invoke (const char *type, SV *self, int arg)
-{
- dSP;
-
- ENTER;
- SAVETMPS;
-
- PUSHMARK (SP);
-
- XPUSHs (sv_2mortal (self));
-
- if (arg >= 0)
- XPUSHs (sv_2mortal (newSViv (arg)));
-
- PUTBACK;
- call_sv (cbsv, G_VOID | G_EVAL | G_DISCARD);
- SPAGAIN;
-
- PUTBACK;
- FREETMPS;
- LEAVE;
-
- if (SvTRUE (ERRSV))
- rxvt_warn ("%s callback evaluation error: %s", type, SvPV_nolen (ERRSV));
-}
-
-#define newSVtimer(timer) new_ref (timer->self, "urxvt::timer")
-#define SvTIMER(sv) (timer *)(perl_watcher *)SvPTR (sv, "urxvt::timer")
-
-struct timer : perl_watcher, time_watcher
-{
- tstamp interval;
-
- timer ()
- : time_watcher (this, &timer::execute)
- {
- }
-
- void execute (time_watcher &w)
- {
- if (interval)
- start (at + interval);
-
- invoke ("urxvt::timer", newSVtimer (this));
- }
-};
-
-#define newSViow(iow) new_ref (iow->self, "urxvt::iow")
-#define SvIOW(sv) (iow *)(perl_watcher *)SvPTR (sv, "urxvt::iow")
-
-struct iow : perl_watcher, io_watcher
-{
- iow ()
- : io_watcher (this, &iow::execute)
- {
- }
-
- void execute (io_watcher &w, short revents)
- {
- invoke ("urxvt::iow", newSViow (this), revents);
- }
-};
-
-#define newSViw(iw) new_ref (iw->self, "urxvt::iw")
-#define SvIW(sv) (iw *)(perl_watcher *)SvPTR (sv, "urxvt::iw")
-
-struct iw : perl_watcher, idle_watcher
-{
- iw ()
- : idle_watcher (this, &iw::execute)
- {
- }
-
- void execute (idle_watcher &w)
- {
- invoke ("urxvt::iw", newSViw (this));
- }
-};
-
-#define newSVpw(pw) new_ref (pw->self, "urxvt::pw")
-#define SvPW(sv) (pw *)(perl_watcher *)SvPTR (sv, "urxvt::pw")
-
-struct pw : perl_watcher, child_watcher
-{
- pw ()
- : child_watcher (this, &pw::execute)
- {
- }
-
- void execute (child_watcher &w, int status)
- {
- invoke ("urxvt::pw", newSVpw (this), status);
- }
-};
+#define newSVterm(term) SvREFCNT_inc ((SV *)(term)->perl.self)
+#define SvTERM(sv) (rxvt_term *)SvPTR ((sv), "urxvt::term")
/////////////////////////////////////////////////////////////////////////////
#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
-struct overlay {
- HV *self;
- bool visible;
+class overlay : overlay_base
+{
rxvt_term *THIS;
- int x, y, w, h;
+ AV *overlay_av;
int border;
- text_t **text;
- rend_t **rend;
+
+public:
+ HV *self;
overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
~overlay ();
};
overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
-: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), visible(false)
+: THIS(THIS), border(border == 2), overlay_av (0)
{
+ x = x_;
+ y = y_;
+ w = w_;
+ h = h_;
+
+ if (w < 0) w = 0;
+ if (h < 0) h = 0;
+
if (border == 2)
{
w += 2;
}
show ();
- THIS->want_refresh = 1;
}
overlay::~overlay ()
delete [] text;
delete [] rend;
-
- THIS->want_refresh = 1;
}
void
overlay::show ()
{
- if (visible)
+ if (overlay_av)
return;
- visible = true;
+ overlay_av = (AV *)SvREFCNT_inc (SvRV (
+ *hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0)
+ ));
+ av_push (overlay_av, newSViv ((long)this));
- AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
- av_push (av, newSViv ((long)this));
+ THIS->want_refresh = 1;
+ THIS->refresh_check ();
}
void
overlay::hide ()
{
- if (!visible)
+ if (!overlay_av)
return;
- visible = false;
+ int i;
- AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->perl.self), "_overlay", 8, 0));
+ for (i = AvFILL (overlay_av); i >= 0; i--)
+ if (SvIV (*av_fetch (overlay_av, i, 1)) == (long)this)
+ break;
- int i;
+ for (; i < AvFILL (overlay_av); i++)
+ av_store (overlay_av, i, SvREFCNT_inc (*av_fetch (overlay_av, i + 1, 0)));
- for (i = AvFILL (av); i >= 0; i--)
- if (SvIV (*av_fetch (av, i, 1)) == (long)this)
- {
- av_delete (av, i, G_DISCARD);
- break;
- }
+ av_pop (overlay_av);
- for (; i < AvFILL (av); i++)
- av_store (av, i, SvREFCNT_inc (*av_fetch (av, i + 1, 0)));
+ SvREFCNT_dec (overlay_av);
+ overlay_av = 0;
- av_pop (av);
+ THIS->want_refresh = 1;
+ THIS->refresh_check ();
}
void overlay::swap ()
int ov_w = min (w, THIS->ncol - ov_x);
int ov_h = min (h, THIS->nrow - ov_y);
+ // hide cursor if it is within the overlay area
+ if (IN_RANGE_EXC (THIS->screen.cur.col - ov_x, 0, ov_w)
+ && IN_RANGE_EXC (THIS->screen.cur.row - ov_y, 0, ov_h))
+ THIS->screen.flags &= ~Screen_VisibleCursor;
+
for (int y = ov_h; y--; )
{
text_t *t1 = text [y];
}
THIS->want_refresh = 1;
+ THIS->refresh_check ();
}
+/////////////////////////////////////////////////////////////////////////////
+
+#define IOM_CLASS "urxvt"
+#define IOM_WARN rxvt_warn
+#include "iom_perl.h"
/////////////////////////////////////////////////////////////////////////////
{
perl_destruct (perl);
perl_free (perl);
+ PERL_SYS_TERM ();
}
}
perl_environ = rxvt_environ;
swap (perl_environ, environ);
- char *argv[] = {
+ char *args[] = {
"",
"-e"
"BEGIN {"
""
"use urxvt;"
};
+ int argc = sizeof (args) / sizeof (args[0]);
+ char **argv = args;
+ PERL_SYS_INIT3 (&argc, &argv, &environ);
perl = perl_alloc ();
perl_construct (perl);
- if (perl_parse (perl, xs_init, 2, argv, (char **)NULL)
+ if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
|| perl_run (perl))
{
rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
{
if (THIS->perl.grabtime)
{
- XUngrabKeyboard (THIS->display->display, THIS->perl.grabtime);
- XUngrabPointer (THIS->display->display, THIS->perl.grabtime);
+ XUngrabKeyboard (THIS->dpy, THIS->perl.grabtime);
+ XUngrabPointer (THIS->dpy, THIS->perl.grabtime);
THIS->perl.grabtime = 0;
}
}
if (htype == HOOK_REFRESH_END)
{
AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
-
+
for (int i = 0; i <= AvFILL (av); i++)
((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
}
case DT_STR_LEN:
{
char *str = va_arg (ap, char *);
- int len = va_arg (ap, int);
+ int len = va_arg (ap, int);
XPUSHs (sv_2mortal (newSVpvn (str, len)));
}
case DT_WCS_LEN:
{
wchar_t *wstr = va_arg (ap, wchar_t *);
- int wlen = va_arg (ap, int);
+ int wlen = va_arg (ap, int);
XPUSHs (sv_2mortal (wcs2sv (wstr, wlen)));
}
break;
+ case DT_LCS_LEN:
+ {
+ long *lstr = va_arg (ap, long *);
+ int llen = va_arg (ap, int);
+
+ XPUSHs (sv_2mortal (newSVpvn ((char *)lstr, llen * sizeof (long))));
+ }
+ break;
+
case DT_XEVENT:
{
XEvent *xe = va_arg (ap, XEvent *);
HV *hv = newHV ();
-# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
-# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
-# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
-# undef set
+# define set(name, sv) hv_store (hv, # name, sizeof (# name) - 1, sv, 0)
+# define setiv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSViv (val), 0)
+# define setuv(name, val) hv_store (hv, # name, sizeof (# name) - 1, newSVuv (val), 0)
+# undef set
setiv (type, xe->type);
setiv (send_event, xe->xany.send_event);
if (htype == HOOK_REFRESH_BEGIN)
{
AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0));
-
+
for (int i = AvFILL (av); i >= 0; i--)
((overlay *)SvIV (*av_fetch (av, i, 0)))->swap ();
}
{
clearSVptr ((SV *)term->perl.self);
SvREFCNT_dec ((SV *)term->perl.self);
+
+ // don't allow further calls
+ term->perl.self = 0;
}
swap (perl_environ, environ);
# undef def
HV *stash = gv_stashpv ("urxvt", 1);
- struct {
+ static const struct {
const char *name;
IV iv;
} *civ, const_iv[] = {
# define const_iv(name) { # name, (IV)name }
+ const_iv (NUM_RESOURCES),
const_iv (DEFAULT_RSTYLE),
const_iv (OVERLAY_RSTYLE),
const_iv (RS_Bold),
const_iv (Button5Mask),
const_iv (AnyModifier),
- const_iv (EVENT_NONE),
- const_iv (EVENT_READ),
- const_iv (EVENT_WRITE),
+ const_iv (NoSymbol),
+ const_iv (GrabModeSync),
+ const_iv (GrabModeAsync),
const_iv (NoEventMask),
const_iv (KeyPressMask),
const_iv (ColormapNotify),
const_iv (ClientMessage),
const_iv (MappingNotify),
+# if ENABLE_XIM_ONTHESPOT
+ const_iv (XIMReverse),
+ const_iv (XIMUnderline),
+ const_iv (XIMHighlight),
+ const_iv (XIMPrimary),
+ const_iv (XIMSecondary),
+ const_iv (XIMTertiary),
+ const_iv (XIMVisibleToForward),
+ const_iv (XIMVisibleToBackword),
+ const_iv (XIMVisibleToCenter),
+# if 0
+ const_iv (XIMForwardChar),
+ const_iv (XIMBackwardChar),
+ const_iv (XIMForwardWord),
+ const_iv (XIMBackwardWord),
+ const_iv (XIMCaretUp),
+ const_iv (XIMCaretDown),
+ const_iv (XIMNextLine),
+ const_iv (XIMPreviousLine),
+ const_iv (XIMLineStart),
+ const_iv (XIMLineEnd),
+ const_iv (XIMAbsolutePosition),
+ const_iv (XIMDontChange),
+# endif
+# endif
};
- for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]);
- civ-- > const_iv; )
+ for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
}
NV
NOW ()
CODE:
- RETVAL = NOW;
+ RETVAL = ev::now ();
OUTPUT:
RETVAL
int
SET_FGCOLOR (int rend, int new_color)
CODE:
- RETVAL = SET_FGCOLOR (rend, new_color);
+ RETVAL = SET_FGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
OUTPUT:
RETVAL
int
SET_BGCOLOR (int rend, int new_color)
CODE:
- RETVAL = SET_BGCOLOR (rend, new_color);
+ RETVAL = SET_BGCOLOR (rend, clamp (new_color, 0, TOTAL_COLORS - 1));
OUTPUT:
RETVAL
int
GET_CUSTOM (int rend)
CODE:
- RETVAL = (rend && RS_customMask) >> RS_customShift;
+ RETVAL = (rend & RS_customMask) >> RS_customShift;
OUTPUT:
RETVAL
OUTPUT:
RETVAL
+void
+termlist ()
+ PPCODE:
+{
+ EXTEND (SP, rxvt_term::termlist.size ());
+
+ for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
+ if ((*t)->perl.self)
+ PUSHs (sv_2mortal (newSVterm (*t)));
+}
+
MODULE = urxvt PACKAGE = urxvt::term
SV *
-_new (...)
+_new (AV *env, AV *arg)
CODE:
{
- if (items < 1 || !SvROK (ST (0)) || SvTYPE (SvRV (ST (0))) != SVt_PVAV)
- croak ("first argument to urxvt::term->_new must be arrayref");
-
rxvt_term *term = new rxvt_term;
stringvec *argv = new stringvec;
stringvec *envv = new stringvec;
- for (int i = 1; i < items; i++)
- argv->push_back (strdup (SvPVbyte_nolen (ST (i))));
+ for (int i = 0; i <= AvFILL (arg); i++)
+ argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
- AV *env = (AV *)SvRV (ST (0));
for (int i = AvFILL (env) + 1; i--; )
envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
envv->push_back (0);
- bool success;
-
try
{
- success = term->init (argv, envv);
+ term->init (argv, envv);
}
catch (const class rxvt_failure_exception &e)
{
- success = false;
- }
-
- if (!success)
- {
term->destroy ();
croak ("error while initializing new terminal instance");
}
CODE:
THIS->perl.should_invoke [htype] += inc;
+int
+rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
+ CODE:
+ RETVAL = XGrabButton (THIS->dpy, button, modifiers, window, 1,
+ ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
+ GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
+ OUTPUT: RETVAL
+
+int
+rxvt_term::ungrab_button (int button, U32 modifiers, Window window = THIS->vt)
+ CODE:
+ RETVAL = XUngrabButton (THIS->dpy, button, modifiers, window);
+ OUTPUT: RETVAL
+
void
-rxvt_term::grab_button (int button, U32 modifiers)
+rxvt_term::XGrabKey (int keycode, U32 modifiers, Window window = THIS->vt, \
+ int owner_events = 1, int pointer_mode = GrabModeAsync, int keyboard_mode = GrabModeAsync)
CODE:
- XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
- ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
- GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
+ XGrabKey (THIS->dpy, keycode, modifiers, window, owner_events, pointer_mode, keyboard_mode);
+
+void
+rxvt_term::XUngrabKey (int keycode, U32 modifiers, Window window = THIS->vt)
+ CODE:
+ XUngrabKey (THIS->dpy, keycode, modifiers, window);
+
+void
+rxvt_term::XUngrabKeyboard (Time eventtime)
+ CODE:
+ XUngrabKeyboard (THIS->dpy, eventtime);
bool
rxvt_term::grab (Time eventtime, int sync = 0)
THIS->perl.grabtime = 0;
- if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
+ if (!XGrabPointer (THIS->dpy, THIS->vt, 0,
ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
mode, mode, None, GRAB_CURSOR, eventtime))
- if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
+ if (!XGrabKeyboard (THIS->dpy, THIS->vt, 0, mode, mode, eventtime))
THIS->perl.grabtime = eventtime;
else
- XUngrabPointer (THIS->display->display, eventtime);
+ XUngrabPointer (THIS->dpy, eventtime);
RETVAL = !!THIS->perl.grabtime;
}
void
rxvt_term::allow_events_async ()
CODE:
- XAllowEvents (THIS->display->display, AsyncBoth, THIS->perl.grabtime);
+ XAllowEvents (THIS->dpy, AsyncBoth, THIS->perl.grabtime);
void
rxvt_term::allow_events_sync ()
CODE:
- XAllowEvents (THIS->display->display, SyncBoth, THIS->perl.grabtime);
+ XAllowEvents (THIS->dpy, SyncBoth, THIS->perl.grabtime);
void
rxvt_term::allow_events_replay ()
CODE:
- XAllowEvents (THIS->display->display, ReplayPointer, THIS->perl.grabtime);
- XAllowEvents (THIS->display->display, ReplayKeyboard, THIS->perl.grabtime);
+ XAllowEvents (THIS->dpy, ReplayPointer, THIS->perl.grabtime);
+ XAllowEvents (THIS->dpy, ReplayKeyboard, THIS->perl.grabtime);
void
rxvt_term::ungrab ()
ungrab (THIS);
int
+rxvt_term::XStringToKeysym (char *string)
+ CODE:
+ RETVAL = XStringToKeysym (string);
+ OUTPUT: RETVAL
+
+char *
+rxvt_term::XKeysymToString (int sym)
+ CODE:
+ RETVAL = XKeysymToString (sym);
+ OUTPUT: RETVAL
+
+int
+rxvt_term::XKeysymToKeycode (int sym)
+ CODE:
+ RETVAL = XKeysymToKeycode (THIS->dpy, sym);
+ OUTPUT: RETVAL
+
+int
+rxvt_term::XKeycodeToKeysym (int code, int index)
+ CODE:
+ RETVAL = XKeycodeToKeysym (THIS->dpy, code, index);
+ OUTPUT: RETVAL
+
+int
rxvt_term::strwidth (SV *str)
CODE:
{
wchar_t *wstr = sv2wcs (str);
rxvt_push_locale (THIS->locale);
- RETVAL = wcswidth (wstr, wcslen (wstr));
+ RETVAL = 0;
+ for (wchar_t *wc = wstr; *wc; wc++)
+ {
+ int w = WCWIDTH (*wc);
+
+ if (w)
+ RETVAL += max (w, 1);
+ }
rxvt_pop_locale ();
free (wstr);
OUTPUT:
RETVAL
+char *
+rxvt_term::locale ()
+ CODE:
+ RETVAL = THIS->locale;
+ OUTPUT:
+ RETVAL
+
#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
-#define TERM_OFFSET_width TERM_OFFSET(width)
-#define TERM_OFFSET_height TERM_OFFSET(height)
-#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
-#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
-#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
-#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
-#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
-#define TERM_OFFSET_focus TERM_OFFSET(focus)
-#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
-#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
-#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
-#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
-#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
-#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
-#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
+#define TERM_OFFSET_width TERM_OFFSET(width)
+#define TERM_OFFSET_height TERM_OFFSET(height)
+#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
+#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
+#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
+#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
+#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
+#define TERM_OFFSET_focus TERM_OFFSET(focus)
+#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
+#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
+#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
+#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
+#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
+#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
+#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
+#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
int
rxvt_term::width ()
ALIAS:
- width = TERM_OFFSET_width
- height = TERM_OFFSET_height
- fwidth = TERM_OFFSET_fwidth
- fheight = TERM_OFFSET_fheight
- fbase = TERM_OFFSET_fbase
- nrow = TERM_OFFSET_nrow
- ncol = TERM_OFFSET_ncol
- focus = TERM_OFFSET_focus
- mapped = TERM_OFFSET_mapped
- int_bwidth = TERM_OFFSET_int_bwidth
- ext_bwidth = TERM_OFFSET_ext_bwidth
- lineSpace = TERM_OFFSET_lineSpace
- saveLines = TERM_OFFSET_saveLines
- total_rows = TERM_OFFSET_total_rows
- top_row = TERM_OFFSET_top_row
+ width = TERM_OFFSET_width
+ height = TERM_OFFSET_height
+ fwidth = TERM_OFFSET_fwidth
+ fheight = TERM_OFFSET_fheight
+ fbase = TERM_OFFSET_fbase
+ nrow = TERM_OFFSET_nrow
+ ncol = TERM_OFFSET_ncol
+ focus = TERM_OFFSET_focus
+ mapped = TERM_OFFSET_mapped
+ int_bwidth = TERM_OFFSET_int_bwidth
+ ext_bwidth = TERM_OFFSET_ext_bwidth
+ lineSpace = TERM_OFFSET_lineSpace
+ letterSpace = TERM_OFFSET_letterSpace
+ saveLines = TERM_OFFSET_saveLines
+ total_rows = TERM_OFFSET_total_rows
+ top_row = TERM_OFFSET_top_row
CODE:
RETVAL = *(int *)((char *)THIS + ix);
OUTPUT:
case 1: RETVAL = THIS->ModMetaMask; break;
case 2: RETVAL = THIS->ModNumLockMask; break;
case 3: RETVAL = THIS->current_screen; break;
+#ifdef CURSOR_BLINK
case 4: RETVAL = THIS->hidden_cursor; break;
+#endif
}
OUTPUT:
RETVAL
RETVAL
SV *
-rxvt_term::_env ()
- CODE:
+rxvt_term::envv ()
+ ALIAS:
+ argv = 1
+ PPCODE:
{
- if (THIS->envv)
- {
- AV *av = newAV ();
+ stringvec *vec = ix ? THIS->argv : THIS->envv;
- for (char **i = THIS->envv->begin (); i != THIS->envv->end (); ++i)
- if (*i)
- av_push (av, newSVpv (*i, 0));
+ EXTEND (SP, vec->size ());
- RETVAL = newRV_noinc ((SV *)av);
- }
- else
- RETVAL = &PL_sv_undef;
+ for (char **i = vec->begin (); i != vec->end (); ++i)
+ if (*i)
+ PUSHs (sv_2mortal (newSVpv (*i, 0)));
}
- OUTPUT:
- RETVAL
int
-rxvt_term::pty_ev_events (int events = EVENT_UNDEF)
+rxvt_term::pty_ev_events (int events = ev::UNDEF)
CODE:
RETVAL = THIS->pty_ev.events;
- if (events != EVENT_UNDEF)
+ if (events != ev::UNDEF)
THIS->pty_ev.set (events);
OUTPUT:
RETVAL
+int
+rxvt_term::pty_fd ()
+ CODE:
+ RETVAL = THIS->pty->pty;
+ OUTPUT:
+ RETVAL
+
Window
rxvt_term::parent ()
CODE:
rxvt_term::focus_out ()
void
+rxvt_term::key_press (unsigned int state, unsigned int keycode, Time time = CurrentTime)
+ ALIAS:
+ key_release = 1
+ CODE:
+{
+ XKeyEvent xkey;
+
+ memset (&xkey, 0, sizeof (xkey));
+
+ xkey.time = time;
+ xkey.state = state;
+ xkey.keycode = keycode;
+
+ xkey.type = ix ? KeyRelease : KeyPress;
+ xkey.display = THIS->dpy;
+ xkey.window = THIS->vt;
+ xkey.root = THIS->display->root;
+ xkey.subwindow = THIS->vt;
+
+ if (ix)
+ THIS->key_release (xkey);
+ else
+ THIS->key_press (xkey);
+}
+
+void
rxvt_term::want_refresh ()
CODE:
THIS->want_refresh = 1;
+ THIS->refresh_check ();
void
rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0, int start_ofs = 0, int max_len = MAX_COLS)
if (GIMME_V != G_VOID)
{
- wchar_t *wstr = new wchar_t [THIS->ncol];
+ wchar_t *wstr = rxvt_temp_buf<wchar_t> (THIS->ncol);
for (int col = 0; col < THIS->ncol; col++)
wstr [col] = l.t [col];
XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol)));
-
- delete [] wstr;
}
if (new_text)
{
wchar_t *wstr = sv2wcs (string);
int wlen = wcslen (wstr);
- wchar_t *rstr = new wchar_t [wlen]; // cannot become longer
+ wchar_t *rstr = rxvt_temp_buf<wchar_t> (wlen * 2); // cannot become longer
rxvt_push_locale (THIS->locale);
wchar_t *r = rstr;
for (wchar_t *s = wstr; *s; s++)
- if (wcwidth (*s) == 0)
- {
- if (r == rstr)
- croak ("leading combining character unencodable");
+ {
+ int w = WCWIDTH (*s);
+
+ if (w == 0)
+ {
+ if (r == rstr)
+ croak ("leading combining character unencodable");
- unicode_t n = rxvt_compose (r[-1], *s);
- if (n == NOCHAR)
- n = rxvt_composite.compose (r[-1], *s);
+ unicode_t n = rxvt_compose (r[-1], *s);
+ if (n == NOCHAR)
+ n = rxvt_composite.compose (r[-1], *s);
- r[-1] = n;
- }
+ r[-1] = n;
+ }
#if !UNICODE_3
- else if (*s >= 0x10000)
- *r++ = rxvt_composite.compose (*s);
+ else if (*s >= 0x10000)
+ *r++ = rxvt_composite.compose (*s);
#endif
- else
- *r++ = *s;
+ else
+ *r++ = *s;
+
+ // the *2 above only allows wcwidth <= 2
+ if (w > 1)
+ *r++ = NOCHAR;
+ }
rxvt_pop_locale ();
RETVAL = wcs2sv (rstr, r - rstr);
-
- delete [] rstr;
}
OUTPUT:
RETVAL
CODE:
{
wchar_t *wstr = sv2wcs (text);
- int wlen = wcslen (wstr);
int dlen = 0;
// find length
else
dlen++;
- wchar_t *rstr = new wchar_t [dlen];
+ wchar_t *rstr = rxvt_temp_buf<wchar_t> (dlen);
// decode
wchar_t *r = rstr;
*r++ = *s;
RETVAL = wcs2sv (rstr, r - rstr);
-
- delete [] rstr;
}
OUTPUT:
RETVAL
rxvt_term::_resource (char *name, int index, SV *newval = 0)
PPCODE:
{
- struct resval { const char *name; int value; } rslist [] = {
+ static const struct resval { const char *name; int value; } *rs, rslist [] = {
# define def(name) { # name, Rs_ ## name },
# define reserve(name,count)
# include "rsinc.h"
# undef reserve
};
- struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
+ rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
- do {
- if (rs-- == rslist)
- croak ("no such resource '%s', requested", name);
- } while (strcmp (name, rs->name));
+ if (*name)
+ {
+ do {
+ if (rs-- == rslist)
+ croak ("no such resource '%s', requested", name);
+ } while (strcmp (name, rs->name));
- index += rs->value;
+ index += rs->value;
+ }
+ else
+ {
+ --rs;
+ name = "";
+ }
if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
rxvt_term::x_resource (const char *name)
bool
-rxvt_term::option (U32 optval, int set = -1)
+rxvt_term::option (U8 optval, int set = -1)
CODE:
{
- RETVAL = THIS->options & optval;
+ RETVAL = THIS->option (optval);
if (set >= 0)
{
- if (set)
- THIS->options |= optval;
- else
- THIS->options &= ~optval;
+ THIS->set_option (optval, set);
- if (THIS->check_ev.is_active ()) // avoid doing this before START
+ if (THIS->env_colorfgbg [0]) // avoid doing this before START
switch (optval)
{
case Opt_skipBuiltinGlyphs:
THIS->scr_remap_chars ();
THIS->scr_touch (true);
THIS->want_refresh = 1;
+ THIS->refresh_check ();
break;
case Opt_cursorUnderline:
THIS->want_refresh = 1;
+ THIS->refresh_check ();
break;
# case Opt_scrollBar_floating:
PUSHs (sv_2mortal (newSViv (rc.col)));
}
- if (items == 3)
+ if (items >= 3)
{
rc.row = SvIV (ST (1));
rc.col = SvIV (ST (2));
- if (ix == 2 && rc.col == 0)
+ if (ix == 2)
{
- rc.row--;
- rc.col = THIS->ncol;
+ if (rc.col == 0)
+ {
+ // col == 0 means end of previous line
+ rc.row--;
+ rc.col = THIS->ncol;
+ }
+ else if (IN_RANGE_EXC (rc.row, THIS->top_row, THIS->nrow)
+ && rc.col > ROW(rc.row).l)
+ {
+ // col >= length means while line and add newline
+ rc.col = THIS->ncol;
+ }
}
clamp_it (rc.col, 0, THIS->ncol);
clamp_it (rc.row, THIS->top_row, THIS->nrow - 1);
if (ix)
- THIS->want_refresh = 1;
+ {
+ THIS->selection.screen = THIS->current_screen;
+
+ THIS->want_refresh = 1;
+ THIS->refresh_check ();
+ }
}
}
-char
-rxvt_term::cur_charset ()
+int
+rxvt_term::selection_screen (int screen = -1)
CODE:
- RETVAL = THIS->charsets [THIS->screen.charset];
- OUTPUT:
+ RETVAL = THIS->selection.screen;
+ if (screen >= 0)
+ THIS->selection.screen = screen;
+ OUTPUT:
RETVAL
-#void
-#rxvt_term::selection_clear ()
+void
+rxvt_term::selection_clear (bool clipboard = false)
+
+void
+rxvt_term::clipboard_copy (Time eventtime)
void
rxvt_term::selection_make (Time eventtime, bool rect = false)
THIS->selection_make (eventtime);
int
-rxvt_term::selection_grab (Time eventtime)
+rxvt_term::selection_grab (Time eventtime, bool clipboard = false)
void
rxvt_term::selection (SV *newtext = 0)
}
}
+char
+rxvt_term::cur_charset ()
+ CODE:
+ RETVAL = THIS->charsets [THIS->screen.charset];
+ OUTPUT:
+ RETVAL
+
void
rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, U32 rstyle1 = RS_RVid, U32 rstyle2 = RS_RVid | RS_Uline)
PPCODE:
{
int count;
- Atom *props = XListProperties (THIS->display->display, window, &count);
+ Atom *props = XListProperties (THIS->dpy, window, &count);
EXTEND (SP, count);
while (count--)
PUSHs (newSVuv ((U32)props [count]));
-
+
XFree (props);
}
unsigned long bytes_after;
unsigned char *prop;
- XGetWindowProperty (THIS->display->display, window, property,
+ XGetWindowProperty (THIS->dpy, window, property,
0, 1<<24, 0, AnyPropertyType,
&type, &format, &nitems, &bytes_after, &prop);
}
void
-rxvt_term::XChangeWindowProperty (Window window, Atom property, Atom type, int format, SV *data)
+rxvt_term::XChangeProperty (Window window, Atom property, Atom type, int format, SV *data)
CODE:
{
STRLEN len;
: format == 32 ? sizeof (long)
: 1;
- XChangeProperty (THIS->display->display, window, property,
+ XChangeProperty (THIS->dpy, window, property,
type, format, PropModeReplace,
(unsigned char *)data_, len / elemsize);
- XSync (THIS->display->display, 0);
}
Atom
XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
- C_ARGS: term->display->display, atom_name, only_if_exists
+ C_ARGS: term->dpy, atom_name, only_if_exists
char *
XGetAtomName (rxvt_term *term, Atom atom)
- C_ARGS: term->display->display, atom
+ C_ARGS: term->dpy, atom
CLEANUP:
XFree (RETVAL);
void
XDeleteProperty (rxvt_term *term, Window window, Atom property)
- C_ARGS: term->display->display, window, property
+ C_ARGS: term->dpy, window, property
Window
rxvt_term::DefaultRootWindow ()
Window
XCreateSimpleWindow (rxvt_term *term, Window parent, int x, int y, unsigned int width, unsigned int height)
- C_ARGS: term->display->display, (Window)parent,
+ C_ARGS: term->dpy, (Window)parent,
x, y, width, height, 0,
term->pix_colors_focused[Color_border],
term->pix_colors_focused[Color_border]
void
XReparentWindow (rxvt_term *term, Window window, Window parent, int x = 0, int y = 0)
- C_ARGS: term->display->display, window, parent, x, y
+ C_ARGS: term->dpy, window, parent, x, y
void
XMapWindow (rxvt_term *term, Window window)
- C_ARGS: term->display->display, window
+ C_ARGS: term->dpy, window
void
XUnmapWindow (rxvt_term *term, Window window)
- C_ARGS: term->display->display, window
+ C_ARGS: term->dpy, window
void
XMoveResizeWindow (rxvt_term *term, Window window, int x, int y, unsigned int width, unsigned int height)
- C_ARGS: term->display->display, window, x, y, width, height
+ C_ARGS: term->dpy, window, x, y, width, height
void
rxvt_term::XChangeInput (Window window, U32 add_events, U32 del_events = 0)
CODE:
{
XWindowAttributes attr;
- XGetWindowAttributes (THIS->display->display, window, &attr);
- XSelectInput (THIS->display->display, window, attr.your_event_mask | add_events & ~del_events);
+ XGetWindowAttributes (THIS->dpy, window, &attr);
+ XSelectInput (THIS->dpy, window, attr.your_event_mask | add_events & ~del_events);
}
void
int dx, dy;
Window child;
- if (XTranslateCoordinates (THIS->display->display, src, dst, x, y, &dx, &dy, &child))
+ if (XTranslateCoordinates (THIS->dpy, src, dst, x, y, &dx, &dy, &child))
{
EXTEND (SP, 3);
PUSHs (newSViv (dx));
void
overlay::DESTROY ()
-#############################################################################
-# urxvt::watcher
-#############################################################################
-
-MODULE = urxvt PACKAGE = urxvt::watcher
-
-CHAINED
-perl_watcher::cb (SV *cb)
- CODE:
- THIS->cb (cb);
- OUTPUT:
- RETVAL
-
-#############################################################################
-# urxvt::timer
-#############################################################################
-
-MODULE = urxvt PACKAGE = urxvt::timer
-
-SV *
-timer::new ()
- CODE:
- timer *w = new timer;
- w->start (NOW);
- RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::timer");
- w->self = (HV *)SvRV (RETVAL);
- OUTPUT:
- RETVAL
-
-NV
-timer::at ()
- CODE:
- RETVAL = THIS->at;
- OUTPUT:
- RETVAL
-
-CHAINED
-timer::interval (NV interval)
- CODE:
- THIS->interval = interval;
- OUTPUT:
- RETVAL
-
-CHAINED
-timer::set (NV tstamp)
- CODE:
- THIS->set (tstamp);
- OUTPUT:
- RETVAL
-
-CHAINED
-timer::start (NV tstamp = THIS->at)
- CODE:
- THIS->start (tstamp);
- OUTPUT:
- RETVAL
-
-CHAINED
-timer::after (NV delay)
- CODE:
- THIS->start (NOW + delay);
- OUTPUT:
- RETVAL
-
-CHAINED
-timer::stop ()
- CODE:
- THIS->stop ();
- OUTPUT:
- RETVAL
-
-void
-timer::DESTROY ()
-
-#############################################################################
-# urxvt::iow
-#############################################################################
-
-MODULE = urxvt PACKAGE = urxvt::iow
-
-SV *
-iow::new ()
- CODE:
- iow *w = new iow;
- RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iow");
- w->self = (HV *)SvRV (RETVAL);
- OUTPUT:
- RETVAL
-
-CHAINED
-iow::fd (int fd)
- CODE:
- THIS->fd = fd;
- OUTPUT:
- RETVAL
-
-CHAINED
-iow::events (short events)
- CODE:
- THIS->events = events;
- OUTPUT:
- RETVAL
-
-CHAINED
-iow::start ()
- CODE:
- THIS->start ();
- OUTPUT:
- RETVAL
-
-CHAINED
-iow::stop ()
- CODE:
- THIS->stop ();
- OUTPUT:
- RETVAL
-
-void
-iow::DESTROY ()
-
-#############################################################################
-# urxvt::iw
-#############################################################################
-
-MODULE = urxvt PACKAGE = urxvt::iw
-
-SV *
-iw::new ()
- CODE:
- iw *w = new iw;
- RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::iw");
- w->self = (HV *)SvRV (RETVAL);
- OUTPUT:
- RETVAL
-
-CHAINED
-iw::start ()
- CODE:
- THIS->start ();
- OUTPUT:
- RETVAL
-
-CHAINED
-iw::stop ()
- CODE:
- THIS->stop ();
- OUTPUT:
- RETVAL
-
-void
-iw::DESTROY ()
-
-#############################################################################
-# urxvt::pw
-#############################################################################
-
-MODULE = urxvt PACKAGE = urxvt::pw
-
-SV *
-pw::new ()
- CODE:
- pw *w = new pw;
- RETVAL = newSVptr ((void *)(perl_watcher *)w, "urxvt::pw");
- w->self = (HV *)SvRV (RETVAL);
- OUTPUT:
- RETVAL
-
-CHAINED
-pw::start (int pid)
- CODE:
- THIS->start (pid);
- OUTPUT:
- RETVAL
-
-CHAINED
-pw::stop ()
- CODE:
- THIS->stop ();
- OUTPUT:
- RETVAL
-
-void
-pw::DESTROY ()
-
+INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
projects / dana / urxvt.git / blobdiff