… | |
… | |
31 | #include <cstddef> |
31 | #include <cstddef> |
32 | #include <cstdarg> |
32 | #include <cstdarg> |
33 | |
33 | |
34 | #include "unistd.h" |
34 | #include "unistd.h" |
35 | |
35 | |
36 | #include "iom.h" |
36 | #include "ev_cpp.h" |
37 | #include "rxvt.h" |
37 | #include "rxvt.h" |
38 | #include "keyboard.h" |
38 | #include "keyboard.h" |
39 | #include "rxvtutil.h" |
39 | #include "rxvtutil.h" |
40 | #include "rxvtperl.h" |
40 | #include "rxvtperl.h" |
41 | |
41 | |
… | |
… | |
382 | |
382 | |
383 | // pre-handling of some events |
383 | // pre-handling of some events |
384 | if (htype == HOOK_REFRESH_END) |
384 | if (htype == HOOK_REFRESH_END) |
385 | { |
385 | { |
386 | AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); |
386 | AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); |
387 | |
387 | |
388 | for (int i = 0; i <= AvFILL (av); i++) |
388 | for (int i = 0; i <= AvFILL (av); i++) |
389 | ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); |
389 | ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); |
390 | } |
390 | } |
391 | |
391 | |
392 | swap (perl_environ, environ); |
392 | swap (perl_environ, environ); |
… | |
… | |
591 | |
591 | |
592 | // post-handling of some events |
592 | // post-handling of some events |
593 | if (htype == HOOK_REFRESH_BEGIN) |
593 | if (htype == HOOK_REFRESH_BEGIN) |
594 | { |
594 | { |
595 | AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); |
595 | AV *av = (AV *)SvRV (*hv_fetch ((HV *)SvRV ((SV *)term->perl.self), "_overlay", 8, 0)); |
596 | |
596 | |
597 | for (int i = AvFILL (av); i >= 0; i--) |
597 | for (int i = AvFILL (av); i >= 0; i--) |
598 | ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); |
598 | ((overlay *)SvIV (*av_fetch (av, i, 0)))->swap (); |
599 | } |
599 | } |
600 | else if (htype == HOOK_DESTROY) |
600 | else if (htype == HOOK_DESTROY) |
601 | { |
601 | { |
602 | clearSVptr ((SV *)term->perl.self); |
602 | clearSVptr ((SV *)term->perl.self); |
603 | SvREFCNT_dec ((SV *)term->perl.self); |
603 | SvREFCNT_dec ((SV *)term->perl.self); |
604 | |
604 | |
605 | // don't allow further calls |
605 | // don't allow further calls |
606 | term->perl.self = 0; |
606 | term->perl.self = 0; |
607 | } |
607 | } |
608 | |
608 | |
609 | swap (perl_environ, environ); |
609 | swap (perl_environ, environ); |
… | |
… | |
775 | _exit (int status) |
775 | _exit (int status) |
776 | |
776 | |
777 | NV |
777 | NV |
778 | NOW () |
778 | NOW () |
779 | CODE: |
779 | CODE: |
780 | RETVAL = NOW; |
780 | RETVAL = ev::now (); |
781 | OUTPUT: |
781 | OUTPUT: |
782 | RETVAL |
782 | RETVAL |
783 | |
783 | |
784 | int |
784 | int |
785 | GET_BASEFG (int rend) |
785 | GET_BASEFG (int rend) |
… | |
… | |
857 | for (int i = AvFILL (env) + 1; i--; ) |
857 | for (int i = AvFILL (env) + 1; i--; ) |
858 | envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); |
858 | envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1)))); |
859 | |
859 | |
860 | envv->push_back (0); |
860 | envv->push_back (0); |
861 | |
861 | |
862 | bool success; |
|
|
863 | |
|
|
864 | try |
862 | try |
865 | { |
863 | { |
866 | success = term->init (argv, envv); |
864 | term->init (argv, envv); |
867 | } |
865 | } |
868 | catch (const class rxvt_failure_exception &e) |
866 | catch (const class rxvt_failure_exception &e) |
869 | { |
|
|
870 | success = false; |
|
|
871 | } |
|
|
872 | |
|
|
873 | if (!success) |
|
|
874 | { |
867 | { |
875 | term->destroy (); |
868 | term->destroy (); |
876 | croak ("error while initializing new terminal instance"); |
869 | croak ("error while initializing new terminal instance"); |
877 | } |
870 | } |
878 | |
871 | |
… | |
… | |
1139 | if (*i) |
1132 | if (*i) |
1140 | PUSHs (sv_2mortal (newSVpv (*i, 0))); |
1133 | PUSHs (sv_2mortal (newSVpv (*i, 0))); |
1141 | } |
1134 | } |
1142 | |
1135 | |
1143 | int |
1136 | int |
1144 | rxvt_term::pty_ev_events (int events = EVENT_UNDEF) |
1137 | rxvt_term::pty_ev_events (int events = ev::UNDEF) |
1145 | CODE: |
1138 | CODE: |
1146 | RETVAL = THIS->pty_ev.events; |
1139 | RETVAL = THIS->pty_ev.events; |
1147 | if (events != EVENT_UNDEF) |
1140 | if (events != ev::UNDEF) |
1148 | THIS->pty_ev.set (events); |
1141 | THIS->pty_ev.set (events); |
1149 | OUTPUT: |
1142 | OUTPUT: |
1150 | RETVAL |
1143 | RETVAL |
1151 | |
1144 | |
1152 | int |
1145 | int |
… | |
… | |
1476 | |
1469 | |
1477 | if (set >= 0) |
1470 | if (set >= 0) |
1478 | { |
1471 | { |
1479 | THIS->set_option (optval, set); |
1472 | THIS->set_option (optval, set); |
1480 | |
1473 | |
1481 | if (THIS->check_ev.is_active ()) // avoid doing this before START |
1474 | if (THIS->prepare_ev.is_active ()) // avoid doing this before START |
1482 | switch (optval) |
1475 | switch (optval) |
1483 | { |
1476 | { |
1484 | case Opt_skipBuiltinGlyphs: |
1477 | case Opt_skipBuiltinGlyphs: |
1485 | THIS->set_fonts (); |
1478 | THIS->set_fonts (); |
1486 | THIS->scr_remap_chars (); |
1479 | THIS->scr_remap_chars (); |
… | |
… | |
1672 | Atom *props = XListProperties (THIS->dpy, window, &count); |
1665 | Atom *props = XListProperties (THIS->dpy, window, &count); |
1673 | |
1666 | |
1674 | EXTEND (SP, count); |
1667 | EXTEND (SP, count); |
1675 | while (count--) |
1668 | while (count--) |
1676 | PUSHs (newSVuv ((U32)props [count])); |
1669 | PUSHs (newSVuv ((U32)props [count])); |
1677 | |
1670 | |
1678 | XFree (props); |
1671 | XFree (props); |
1679 | } |
1672 | } |
1680 | |
1673 | |
1681 | void |
1674 | void |
1682 | rxvt_term::XGetWindowProperty (Window window, Atom property) |
1675 | rxvt_term::XGetWindowProperty (Window window, Atom property) |