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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.151 by root, Wed Dec 21 19:50:16 2005 UTC vs.
Revision 1.153 by root, Tue Dec 27 12:23:37 2005 UTC

289 delete keyboard; 289 delete keyboard;
290#endif 290#endif
291} 291}
292 292
293void 293void
294rxvt_term::child_exit ()
295{
296 cmd_pid = 0;
297
298 if (!(options & Opt_hold))
299 destroy ();
300}
301
302void
294rxvt_term::destroy () 303rxvt_term::destroy ()
295{ 304{
296 if (destroy_ev.active) 305 if (destroy_ev.active)
297 return; 306 return;
298 307
522 531
523 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) 532 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
524 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 533 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
525 if (pid == (*t)->cmd_pid) 534 if (pid == (*t)->cmd_pid)
526 { 535 {
527 (*t)->destroy (); 536 (*t)->child_exit ();
528 break; 537 break;
529 } 538 }
530 } 539 }
531 540
532 /* 541 /*
935 return true; 944 return true;
936} 945}
937 946
938void rxvt_term::set_string_property (Atom prop, const char *str, int len) 947void rxvt_term::set_string_property (Atom prop, const char *str, int len)
939{ 948{
940 // TODO: SMART_WINDOW_TITLE
941 XChangeProperty (display->display, parent[0], 949 XChangeProperty (display->display, parent[0],
942 prop, XA_STRING, 8, PropModeReplace, 950 prop, XA_STRING, 8, PropModeReplace,
943 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 951 (const unsigned char *)str, len >= 0 ? len : strlen (str));
944} 952}
945 953
946void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 954void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947{ 955{
948 // TODO: SMART_WINDOW_TITLE
949 wchar_t *ws = rxvt_mbstowcs (str, len); 956 wchar_t *ws = rxvt_mbstowcs (str, len);
950 char *s = rxvt_wcstoutf8 (ws); 957 char *s = rxvt_wcstoutf8 (ws);
951 958
952 XChangeProperty (display->display, parent[0], 959 XChangeProperty (display->display, parent[0],
953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 960 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines