ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtperl.xs
(Generate patch)

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.122 by root, Sun Jun 15 14:07:58 2008 UTC vs.
Revision 1.127 by root, Sat May 30 08:51:23 2009 UTC

… …
107 107
108///////////////////////////////////////////////////////////////////////////// 108/////////////////////////////////////////////////////////////////////////////
109 109
110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay") 110#define SvOVERLAY(sv) (overlay *)SvPTR (sv, "urxvt::overlay")
111 111
112class overlay { 112class overlay : overlay_base
113{
113 rxvt_term *THIS; 114 rxvt_term *THIS;
114 AV *overlay_av; 115 AV *overlay_av;
115 int x, y, w, h;
116 int border; 116 int border;
117 text_t **text;
118 rend_t **rend;
119 117
120public: 118public:
121 HV *self; 119 HV *self;
122 120
123 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 121 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
… …
130 128
131 void set (int x, int y, SV *str, SV *rend); 129 void set (int x, int y, SV *str, SV *rend);
132}; 130};
133 131
134overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border) 132overlay::overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border)
135: THIS(THIS), x(x_), y(y_), w(w_), h(h_), border(border == 2), overlay_av (0) 133: THIS(THIS), border(border == 2), overlay_av (0)
136{ 134{
135 x = x_;
136 y = y_;
137 w = w_;
138 h = h_;
139
137 if (w < 0) w = 0; 140 if (w < 0) w = 0;
138 if (h < 0) h = 0; 141 if (h < 0) h = 0;
139 142
140 if (border == 2) 143 if (border == 2)
141 { 144 {
… …
245 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h)); 248 int ov_y = max (0, min (MOD (y, THIS->nrow), THIS->nrow - h));
246 249
247 int ov_w = min (w, THIS->ncol - ov_x); 250 int ov_w = min (w, THIS->ncol - ov_x);
248 int ov_h = min (h, THIS->nrow - ov_y); 251 int ov_h = min (h, THIS->nrow - ov_y);
249 252
253 // hide cursor if it is within the overlay area
254 if (IN_RANGE_EXC (THIS->screen.cur.col - ov_x, 0, ov_w)
255 && IN_RANGE_EXC (THIS->screen.cur.row - ov_y, 0, ov_h))
256 THIS->screen.flags &= ~Screen_VisibleCursor;
257
250 for (int y = ov_h; y--; ) 258 for (int y = ov_h; y--; )
251 { 259 {
252 text_t *t1 = text [y]; 260 text_t *t1 = text [y];
253 rend_t *r1 = rend [y]; 261 rend_t *r1 = rend [y];
254 262
… …
310{ 318{
311 if (perl) 319 if (perl)
312 { 320 {
313 perl_destruct (perl); 321 perl_destruct (perl);
314 perl_free (perl); 322 perl_free (perl);
323 PERL_SYS_TERM ();
315 } 324 }
316} 325}
317 326
318void 327void
319rxvt_perl_interp::init (rxvt_term *term) 328rxvt_perl_interp::init (rxvt_term *term)
… …
323 rxvt_push_locale (""); // perl init destroys current locale 332 rxvt_push_locale (""); // perl init destroys current locale
324 333
325 perl_environ = rxvt_environ; 334 perl_environ = rxvt_environ;
326 swap (perl_environ, environ); 335 swap (perl_environ, environ);
327 336
328 char *argv[] = { 337 char *args[] = {
329 "", 338 "",
330 "-e" 339 "-e"
331 "BEGIN {" 340 "BEGIN {"
332 " urxvt->bootstrap;" 341 " urxvt->bootstrap;"
333 " unshift @INC, '" LIBDIR "';" 342 " unshift @INC, '" LIBDIR "';"
334 "}" 343 "}"
335 "" 344 ""
336 "use urxvt;" 345 "use urxvt;"
337 }; 346 };
347 int argc = sizeof (args) / sizeof (args[0]);
348 char **argv = args;
338 349
350 PERL_SYS_INIT3 (&argc, &argv, &environ);
339 perl = perl_alloc (); 351 perl = perl_alloc ();
340 perl_construct (perl); 352 perl_construct (perl);
341 353
342 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 354 if (perl_parse (perl, xs_init, argc, argv, (char **)NULL)
343 || perl_run (perl)) 355 || perl_run (perl))
344 { 356 {
345 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 357 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
346 358
347 perl_destruct (perl); 359 perl_destruct (perl);
… …
639 static const struct { 651 static const struct {
640 const char *name; 652 const char *name;
641 IV iv; 653 IV iv;
642 } *civ, const_iv[] = { 654 } *civ, const_iv[] = {
643# define const_iv(name) { # name, (IV)name } 655# define const_iv(name) { # name, (IV)name }
656 const_iv (NUM_RESOURCES),
644 const_iv (DEFAULT_RSTYLE), 657 const_iv (DEFAULT_RSTYLE),
645 const_iv (OVERLAY_RSTYLE), 658 const_iv (OVERLAY_RSTYLE),
646 const_iv (RS_Bold), 659 const_iv (RS_Bold),
647 const_iv (RS_Italic), 660 const_iv (RS_Italic),
648 const_iv (RS_Blink), 661 const_iv (RS_Blink),
… …
1042 OUTPUT: 1055 OUTPUT:
1043 RETVAL 1056 RETVAL
1044 1057
1045#define TERM_OFFSET(sym) offsetof (TermWin_t, sym) 1058#define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
1046 1059
1047#define TERM_OFFSET_width TERM_OFFSET(width) 1060#define TERM_OFFSET_width TERM_OFFSET(width)
1048#define TERM_OFFSET_height TERM_OFFSET(height) 1061#define TERM_OFFSET_height TERM_OFFSET(height)
1049#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth) 1062#define TERM_OFFSET_fwidth TERM_OFFSET(fwidth)
1050#define TERM_OFFSET_fheight TERM_OFFSET(fheight) 1063#define TERM_OFFSET_fheight TERM_OFFSET(fheight)
1051#define TERM_OFFSET_fbase TERM_OFFSET(fbase) 1064#define TERM_OFFSET_fbase TERM_OFFSET(fbase)
1052#define TERM_OFFSET_nrow TERM_OFFSET(nrow) 1065#define TERM_OFFSET_nrow TERM_OFFSET(nrow)
1053#define TERM_OFFSET_ncol TERM_OFFSET(ncol) 1066#define TERM_OFFSET_ncol TERM_OFFSET(ncol)
1054#define TERM_OFFSET_focus TERM_OFFSET(focus) 1067#define TERM_OFFSET_focus TERM_OFFSET(focus)
1055#define TERM_OFFSET_mapped TERM_OFFSET(mapped) 1068#define TERM_OFFSET_mapped TERM_OFFSET(mapped)
1056#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth) 1069#define TERM_OFFSET_int_bwidth TERM_OFFSET(int_bwidth)
1057#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth) 1070#define TERM_OFFSET_ext_bwidth TERM_OFFSET(ext_bwidth)
1058#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace) 1071#define TERM_OFFSET_lineSpace TERM_OFFSET(lineSpace)
1072#define TERM_OFFSET_letterSpace TERM_OFFSET(letterSpace)
1059#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines) 1073#define TERM_OFFSET_saveLines TERM_OFFSET(saveLines)
1060#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows) 1074#define TERM_OFFSET_total_rows TERM_OFFSET(total_rows)
1061#define TERM_OFFSET_top_row TERM_OFFSET(top_row) 1075#define TERM_OFFSET_top_row TERM_OFFSET(top_row)
1062 1076
1063int 1077int
1064rxvt_term::width () 1078rxvt_term::width ()
1065 ALIAS: 1079 ALIAS:
1066 width = TERM_OFFSET_width 1080 width = TERM_OFFSET_width
1067 height = TERM_OFFSET_height 1081 height = TERM_OFFSET_height
1068 fwidth = TERM_OFFSET_fwidth 1082 fwidth = TERM_OFFSET_fwidth
1069 fheight = TERM_OFFSET_fheight 1083 fheight = TERM_OFFSET_fheight
1070 fbase = TERM_OFFSET_fbase 1084 fbase = TERM_OFFSET_fbase
1071 nrow = TERM_OFFSET_nrow 1085 nrow = TERM_OFFSET_nrow
1072 ncol = TERM_OFFSET_ncol 1086 ncol = TERM_OFFSET_ncol
1073 focus = TERM_OFFSET_focus 1087 focus = TERM_OFFSET_focus
1074 mapped = TERM_OFFSET_mapped 1088 mapped = TERM_OFFSET_mapped
1075 int_bwidth = TERM_OFFSET_int_bwidth 1089 int_bwidth = TERM_OFFSET_int_bwidth
1076 ext_bwidth = TERM_OFFSET_ext_bwidth 1090 ext_bwidth = TERM_OFFSET_ext_bwidth
1077 lineSpace = TERM_OFFSET_lineSpace 1091 lineSpace = TERM_OFFSET_lineSpace
1092 letterSpace = TERM_OFFSET_letterSpace
1078 saveLines = TERM_OFFSET_saveLines 1093 saveLines = TERM_OFFSET_saveLines
1079 total_rows = TERM_OFFSET_total_rows 1094 total_rows = TERM_OFFSET_total_rows
1080 top_row = TERM_OFFSET_top_row 1095 top_row = TERM_OFFSET_top_row
1081 CODE: 1096 CODE:
1082 RETVAL = *(int *)((char *)THIS + ix); 1097 RETVAL = *(int *)((char *)THIS + ix);
1083 OUTPUT: 1098 OUTPUT:
1084 RETVAL 1099 RETVAL
1085 1100
… …
1096 { 1111 {
1097 case 0: RETVAL = THIS->ModLevel3Mask; break; 1112 case 0: RETVAL = THIS->ModLevel3Mask; break;
1098 case 1: RETVAL = THIS->ModMetaMask; break; 1113 case 1: RETVAL = THIS->ModMetaMask; break;
1099 case 2: RETVAL = THIS->ModNumLockMask; break; 1114 case 2: RETVAL = THIS->ModNumLockMask; break;
1100 case 3: RETVAL = THIS->current_screen; break; 1115 case 3: RETVAL = THIS->current_screen; break;
1116#ifdef CURSOR_BLINK
1101 case 4: RETVAL = THIS->hidden_cursor; break; 1117 case 4: RETVAL = THIS->hidden_cursor; break;
1118#endif
1102 } 1119 }
1103 OUTPUT: 1120 OUTPUT:
1104 RETVAL 1121 RETVAL
1105 1122
1106char * 1123char *
… …
1430# undef reserve 1447# undef reserve
1431 }; 1448 };
1432 1449
1433 rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 1450 rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
1434 1451
1452 if (*name)
1435 do { 1453 {
1454 do {
1436 if (rs-- == rslist) 1455 if (rs-- == rslist)
1437 croak ("no such resource '%s', requested", name); 1456 croak ("no such resource '%s', requested", name);
1438 } while (strcmp (name, rs->name)); 1457 } while (strcmp (name, rs->name));
1439 1458
1440 index += rs->value; 1459 index += rs->value;
1460 }
1461 else
1462 {
1463 --rs;
1464 name = "";
1465 }
1441 1466
1442 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1467 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1443 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1468 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1444 1469
1445 if (GIMME_V != G_VOID) 1470 if (GIMME_V != G_VOID)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines