*----------------------------------------------------------------------*
*
* 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));
-}
-
-static SV *
newSVptr (void *ptr, const char *klass)
{
HV *hv = newHV ();
#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
-class overlay {
+class overlay : overlay_base
+{
rxvt_term *THIS;
AV *overlay_av;
- int x, y, w, h;
int border;
- text_t **text;
- rend_t **rend;
public:
HV *self;
};
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), overlay_av (0)
+: 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;
av_push (overlay_av, newSViv ((long)this));
THIS->want_refresh = 1;
+ THIS->refresh_check ();
}
void
overlay_av = 0;
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"
-#include <iom_perl.h>
+#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 (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 ();
}
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;
}
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),
NV
NOW ()
CODE:
- RETVAL = NOW;
+ RETVAL = ev::now ();
OUTPUT:
RETVAL
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");
}
#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
}
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
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)
CODE:
{
wchar_t *wstr = sv2wcs (text);
- int wlen = wcslen (wstr);
int dlen = 0;
// find length
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));
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 ()
+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)
EXTEND (SP, count);
while (count--)
PUSHs (newSVuv ((U32)props [count]));
-
+
XFree (props);
}
}
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;
projects / dana / urxvt.git / blobdiff