… | |
… | |
108 | if (cmd_fd >= 0) |
108 | if (cmd_fd >= 0) |
109 | close (cmd_fd); |
109 | close (cmd_fd); |
110 | |
110 | |
111 | scr_release (); |
111 | scr_release (); |
112 | |
112 | |
|
|
113 | free (env_windowid); |
|
|
114 | free (env_display); |
|
|
115 | free (env_term); |
|
|
116 | free (env_colorfgbg); |
113 | free (locale); |
117 | free (locale); |
114 | free (codeset); |
118 | free (codeset); |
115 | |
119 | |
116 | #ifndef NO_SETOWNER_TTYDEV |
120 | #ifndef NO_SETOWNER_TTYDEV |
117 | privileged_ttydev (RESTORE); |
121 | privileged_ttydev (RESTORE); |
… | |
… | |
124 | |
128 | |
125 | delete PixColors; |
129 | delete PixColors; |
126 | delete TermWin.fontset; |
130 | delete TermWin.fontset; |
127 | |
131 | |
128 | displays.put (display); |
132 | displays.put (display); |
|
|
133 | |
|
|
134 | delete envv; |
|
|
135 | delete argv; |
129 | } |
136 | } |
130 | |
137 | |
131 | void |
138 | void |
132 | rxvt_term::destroy () |
139 | rxvt_term::destroy () |
133 | { |
140 | { |
… | |
… | |
284 | rootwin_ev.start (display, display->root); |
291 | rootwin_ev.start (display, display->root); |
285 | |
292 | |
286 | XMapWindow (display->display, TermWin.vt); |
293 | XMapWindow (display->display, TermWin.vt); |
287 | XMapWindow (display->display, TermWin.parent[0]); |
294 | XMapWindow (display->display, TermWin.parent[0]); |
288 | |
295 | |
289 | init_env (); |
|
|
290 | init_command (cmd_argv); |
296 | init_command (cmd_argv); |
291 | |
297 | |
292 | pty_ev.start (cmd_fd, EVENT_READ); |
298 | pty_ev.start (cmd_fd, EVENT_READ); |
293 | |
299 | |
294 | check_ev.start (); |
300 | check_ev.start (); |
… | |
… | |
873 | #ifdef XPM_BACKGROUND |
879 | #ifdef XPM_BACKGROUND |
874 | xpmb = "default;"; |
880 | xpmb = "default;"; |
875 | #endif |
881 | #endif |
876 | break; |
882 | break; |
877 | } |
883 | } |
|
|
884 | |
878 | sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); |
885 | sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); |
879 | putenv (env_colorfgbg); |
|
|
880 | |
886 | |
881 | #ifndef NO_BRIGHTCOLOR |
887 | #ifndef NO_BRIGHTCOLOR |
882 | colorfgbg = DEFAULT_RSTYLE; |
888 | colorfgbg = DEFAULT_RSTYLE; |
883 | for (i = minCOLOR; i <= maxCOLOR; i++) |
889 | for (i = minCOLOR; i <= maxCOLOR; i++) |
884 | { |
890 | { |