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.17 by root, Tue Jan 3 18:11:34 2006 UTC vs.
Revision 1.23 by root, Wed Jan 4 04:42:45 2006 UTC

… …
61//TODO: use magic 61//TODO: use magic
62static SV * 62static SV *
63newSVptr (void *ptr, const char *klass) 63newSVptr (void *ptr, const char *klass)
64{ 64{
65 HV *hv = newHV (); 65 HV *hv = newHV ();
66 hv_store (hv, "_ptr", 4, newSViv ((long)ptr), 0); 66 sv_magic ((SV *)hv, 0, PERL_MAGIC_ext, (char *)ptr, 0);
67 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 67 return sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
68}
69
70static void
71clearSVptr (SV *sv)
72{
73 if (SvROK (sv))
74 sv = SvRV (sv);
75
76 hv_clear ((HV *)sv);
77 sv_unmagic (sv, PERL_MAGIC_ext);
68} 78}
69 79
70static long 80static long
71SvPTR (SV *sv, const char *klass) 81SvPTR (SV *sv, const char *klass)
72{ 82{
73 if (!sv_derived_from (sv, klass)) 83 if (!sv_derived_from (sv, klass))
74 croak ("object of type %s expected", klass); 84 croak ("object of type %s expected", klass);
75 85
76 IV iv = SvIV (*hv_fetch ((HV *)SvRV (sv), "_ptr", 4, 1)); 86 MAGIC *mg = mg_find (SvRV (sv), PERL_MAGIC_ext);
77 87
78 if (!iv) 88 if (!mg)
79 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass); 89 croak ("perl code used %s object, but C++ object is already destroyed, caught", klass);
80 90
81 return (long)iv; 91 return (long)mg->mg_ptr;
82} 92}
83 93
84#define newSVterm(term) SvREFCNT_inc ((SV *)term->self) 94#define newSVterm(term) SvREFCNT_inc ((SV *)term->self)
85#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term") 95#define SvTERM(sv) (rxvt_term *)SvPTR (sv, "urxvt::term")
86 96
… …
185 text_t **text; 195 text_t **text;
186 rend_t **rend; 196 rend_t **rend;
187 197
188 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border); 198 overlay (rxvt_term *THIS, int x_, int y_, int w_, int h_, rend_t rstyle, int border);
189 ~overlay (); 199 ~overlay ();
200
201 void show ();
202 void hide ();
190 203
191 void swap (); 204 void swap ();
192 205
193 void set (int x, int y, SV *str, SV *rend); 206 void set (int x, int y, SV *str, SV *rend);
194}; 207};
… …
240 *tp++ = 0x0020; 253 *tp++ = 0x0020;
241 *rp++ = r; 254 *rp++ = r;
242 } 255 }
243 } 256 }
244 257
258 show ();
245 THIS->want_refresh = 1; 259 THIS->want_refresh = 1;
246} 260}
247 261
248overlay::~overlay () 262overlay::~overlay ()
249{ 263{
264 hide ();
265
250 for (int y = h; y--; ) 266 for (int y = h; y--; )
251 { 267 {
252 delete [] text[y]; 268 delete [] text[y];
253 delete [] rend[y]; 269 delete [] rend[y];
254 } 270 }
255 271
256 delete [] text; 272 delete [] text;
257 delete [] rend; 273 delete [] rend;
258 274
259 THIS->want_refresh = 1; 275 THIS->want_refresh = 1;
276}
277
278void
279overlay::show ()
280{
281 char key[33]; sprintf (key, "%32lx", (long)this);
282
283 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0));
284 hv_store (hv, key, 32, newSViv ((long)this), 0);
285}
286
287void
288overlay::hide ()
289{
290 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0);
291
292 if (ovs)
293 {
294 char key[33]; sprintf (key, "%32lx", (long)this);
295
296 HV *hv = (HV *)SvRV (*ovs);
297 hv_delete (hv, key, 32, G_DISCARD);
298 }
260} 299}
261 300
262void overlay::swap () 301void overlay::swap ()
263{ 302{
264 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w)); 303 int ov_x = max (0, min (MOD (x, THIS->ncol), THIS->ncol - w));
… …
441 if (SvTRUE (ERRSV)) 480 if (SvTRUE (ERRSV))
442 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV)); 481 rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
443 482
444 if (htype == HOOK_DESTROY) 483 if (htype == HOOK_DESTROY)
445 { 484 {
446 // TODO: clear magic
447 hv_clear ((HV *)SvRV ((SV *)term->self)); 485 clearSVptr ((SV *)term->self);
448 SvREFCNT_dec ((SV *)term->self); 486 SvREFCNT_dec ((SV *)term->self);
449 } 487 }
450 488
451 return count; 489 return count;
452 } 490 }
… …
463 501
464PROTOTYPES: ENABLE 502PROTOTYPES: ENABLE
465 503
466BOOT: 504BOOT:
467{ 505{
468# define set_hookname(sym) av_store (hookname, PP_CONCAT(HOOK_, sym), newSVpv (PP_STRINGIFY(sym), 0))
469# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), #name, newSViv (name)); 506# define export_const(name) newCONSTSUB (gv_stashpv ("urxvt", 1), # name, newSViv (name));
470 AV *hookname = get_av ("urxvt::HOOKNAME", 1); 507 AV *hookname = get_av ("urxvt::HOOKNAME", 1);
471 set_hookname (INIT); 508# define def(sym) av_store (hookname, HOOK_ ## sym, newSVpv (# sym, 0));
472 set_hookname (RESET); 509# include "hookinc.h"
473 set_hookname (START); 510# undef def
474 set_hookname (DESTROY);
475 set_hookname (SEL_BEGIN);
476 set_hookname (SEL_EXTEND);
477 set_hookname (SEL_MAKE);
478 set_hookname (SEL_GRAB);
479 set_hookname (FOCUS_IN);
480 set_hookname (FOCUS_OUT);
481 set_hookname (VIEW_CHANGE);
482 set_hookname (SCROLL_BACK);
483 set_hookname (TTY_ACTIVITY);
484 set_hookname (REFRESH_BEGIN);
485 set_hookname (REFRESH_END);
486 set_hookname (KEYBOARD_COMMAND);
487 511
488 export_const (DEFAULT_RSTYLE); 512 export_const (DEFAULT_RSTYLE);
489 export_const (OVERLAY_RSTYLE); 513 export_const (OVERLAY_RSTYLE);
490 export_const (RS_Bold); 514 export_const (RS_Bold);
491 export_const (RS_Italic); 515 export_const (RS_Italic);
… …
666void 690void
667rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0) 691rxvt_term::ROW_t (int row_number, SV *new_text = 0, int start_col = 0)
668 PPCODE: 692 PPCODE:
669{ 693{
670 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 694 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
671 croak ("row_number number of out range"); 695 XSRETURN_EMPTY;
672 696
673 line_t &l = ROW(row_number); 697 line_t &l = ROW(row_number);
674 698
675 if (GIMME_V != G_VOID) 699 if (GIMME_V != G_VOID)
676 { 700 {
… …
713void 737void
714rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0) 738rxvt_term::ROW_r (int row_number, SV *new_rend = 0, int start_col = 0)
715 PPCODE: 739 PPCODE:
716{ 740{
717 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 741 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
718 croak ("row_number number of out range"); 742 XSRETURN_EMPTY;
719 743
720 line_t &l = ROW(row_number); 744 line_t &l = ROW(row_number);
721 745
722 if (GIMME_V != G_VOID) 746 if (GIMME_V != G_VOID)
723 { 747 {
… …
753int 777int
754rxvt_term::ROW_l (int row_number, int new_length = -2) 778rxvt_term::ROW_l (int row_number, int new_length = -2)
755 CODE: 779 CODE:
756{ 780{
757 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow)) 781 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
758 croak ("row_number number of out range"); 782 XSRETURN_EMPTY;
759 783
760 line_t &l = ROW(row_number); 784 line_t &l = ROW(row_number);
761 RETVAL = l.l; 785 RETVAL = l.l < 0 ? THIS->ncol : l.l;
762 786
763 if (new_length >= -1) 787 if (new_length >= -1)
764 l.l = new_length; 788 l.l = new_length;
765} 789}
766 OUTPUT: 790 OUTPUT:
767 RETVAL 791 RETVAL
768 792
793bool
794rxvt_term::ROW_is_longer (int row_number)
795 CODE:
796{
797 if (!IN_RANGE_EXC (row_number, -THIS->nsaved, THIS->nrow))
798 XSRETURN_EMPTY;
799
800 line_t &l = ROW(row_number);
801 RETVAL = l.l < 0;
802}
803 OUTPUT:
804 RETVAL
805
769SV * 806SV *
770rxvt_term::special_encode (SV *str) 807rxvt_term::special_encode (SV *str)
771 CODE: 808 CODE:
772 abort ();//TODO 809 abort ();//TODO
773 810
… …
779void 816void
780rxvt_term::_resource (char *name, int index, SV *newval = 0) 817rxvt_term::_resource (char *name, int index, SV *newval = 0)
781 PPCODE: 818 PPCODE:
782{ 819{
783 struct resval { const char *name; int value; } rslist [] = { 820 struct resval { const char *name; int value; } rslist [] = {
784# define Rs_def(name) { # name, Rs_ ## name }, 821# define def(name) { # name, Rs_ ## name },
785# define Rs_reserve(name,count) 822# define reserve(name,count)
786# include "rsinc.h" 823# include "rsinc.h"
787# undef Rs_def 824# undef def
788# undef Rs_reserve 825# undef reserve
789 }; 826 };
790 827
791 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]); 828 struct resval *rs = rslist + sizeof (rslist) / sizeof (rslist [0]);
792 829
793 do { 830 do {
… …
874rxvt_term::tt_write (SV *octets) 911rxvt_term::tt_write (SV *octets)
875 INIT: 912 INIT:
876 STRLEN len; 913 STRLEN len;
877 char *str = SvPVbyte (octets, len); 914 char *str = SvPVbyte (octets, len);
878 C_ARGS: 915 C_ARGS:
879 (unsigned char *)str, len 916 str, len
880 917
881SV * 918SV *
882rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2) 919rxvt_term::overlay (int x, int y, int w, int h, int rstyle = OVERLAY_RSTYLE, int border = 2)
883 CODE: 920 CODE:
884{ 921{
885 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border); 922 overlay *o = new overlay (THIS, x, y, w, h, rstyle, border);
886 RETVAL = newSVptr ((void *)o, "urxvt::overlay"); 923 RETVAL = newSVptr ((void *)o, "urxvt::overlay");
887 o->self = (HV *)SvRV (RETVAL); 924 o->self = (HV *)SvRV (RETVAL);
888
889 HV *hv = (HV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)THIS->self), "_overlay", 8, 0));
890 char key[33]; sprintf (key, "%32lx", (long)o);
891 hv_store (hv, key, 32, newSViv ((long)o), 0);
892} 925}
893 OUTPUT: 926 OUTPUT:
894 RETVAL 927 RETVAL
895 928
896MODULE = urxvt PACKAGE = urxvt::overlay 929MODULE = urxvt PACKAGE = urxvt::overlay
897 930
898void 931void
899overlay::set (int x, int y, SV *text, SV *rend = 0) 932overlay::set (int x, int y, SV *text, SV *rend = 0)
900 933
901void 934void
935overlay::show ()
936
937void
938overlay::hide ()
939
940void
902overlay::DESTROY () 941overlay::DESTROY ()
903 CODE:
904{
905 SV **ovs = hv_fetch ((HV *)SvRV ((SV *)THIS->THIS->self), "_overlay", 8, 0);
906 if (ovs)
907 {
908 HV *hv = (HV *)SvRV (*ovs);
909 char key[33]; sprintf (key, "%32lx", (long)THIS);
910 hv_delete (hv, key, 32, G_DISCARD);
911 }
912
913 delete THIS;
914}
915 942
916MODULE = urxvt PACKAGE = urxvt::timer 943MODULE = urxvt PACKAGE = urxvt::timer
917 944
918SV * 945SV *
919timer::new () 946timer::new ()

Diff Legend

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