… | |
… | |
5 | * All portions of code are copyright by their respective author/s. |
5 | * All portions of code are copyright by their respective author/s. |
6 | * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> |
6 | * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> |
7 | * - original version |
7 | * - original version |
8 | * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> |
8 | * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> |
9 | * - extensive modifications |
9 | * - extensive modifications |
|
|
10 | * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> |
|
|
11 | * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> |
|
|
12 | * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> |
10 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
13 | * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> |
11 | * - extensive modifications |
14 | * - extensive modifications |
12 | * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> |
|
|
13 | * - QNX support |
|
|
14 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
15 | * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> |
15 | * |
16 | * |
16 | * This program is free software; you can redistribute it and/or modify |
17 | * This program is free software; you can redistribute it and/or modify |
17 | * it under the terms of the GNU General Public License as published by |
18 | * it under the terms of the GNU General Public License as published by |
18 | * the Free Software Foundation; either version 2 of the License, or |
19 | * the Free Software Foundation; either version 2 of the License, or |
19 | * (at your option) any later version. |
20 | * (at your option) any later version. |
… | |
… | |
33 | |
34 | |
34 | #include "../config.h" /* NECESSARY */ |
35 | #include "../config.h" /* NECESSARY */ |
35 | #include "rxvt.h" /* NECESSARY */ |
36 | #include "rxvt.h" /* NECESSARY */ |
36 | #include "rxvtutil.h" |
37 | #include "rxvtutil.h" |
37 | #include "init.h" |
38 | #include "init.h" |
|
|
39 | #include "keyboard.h" |
38 | |
40 | |
39 | #include <limits> |
41 | #include <limits> |
40 | |
42 | |
41 | #include <csignal> |
43 | #include <csignal> |
|
|
44 | |
|
|
45 | #include <fcntl.h> |
|
|
46 | |
|
|
47 | #ifdef HAVE_XSETLOCALE |
|
|
48 | # define X_LOCALE |
|
|
49 | # include <X11/Xlocale.h> |
|
|
50 | #else |
|
|
51 | # ifdef HAVE_SETLOCALE |
|
|
52 | # include <clocale> |
|
|
53 | # endif |
|
|
54 | #endif |
|
|
55 | |
|
|
56 | #ifdef HAVE_NL_LANGINFO |
|
|
57 | # include <langinfo.h> |
|
|
58 | #endif |
|
|
59 | |
|
|
60 | #ifdef DISPLAY_IS_IP |
|
|
61 | /* On Solaris link with -lsocket and -lnsl */ |
|
|
62 | #include <sys/types.h> |
|
|
63 | #include <sys/socket.h> |
|
|
64 | |
|
|
65 | /* these next two are probably only on Sun (not Solaris) */ |
|
|
66 | #ifdef HAVE_SYS_SOCKIO_H |
|
|
67 | #include <sys/sockio.h> |
|
|
68 | #endif |
|
|
69 | #ifdef HAVE_SYS_BYTEORDER_H |
|
|
70 | #include <sys/byteorder.h> |
|
|
71 | #endif |
|
|
72 | |
|
|
73 | #include <netinet/in.h> |
|
|
74 | #include <arpa/inet.h> |
|
|
75 | #include <net/if.h> |
|
|
76 | #include <net/if_arp.h> |
|
|
77 | |
|
|
78 | static char * |
|
|
79 | rxvt_network_display (const char *display) |
|
|
80 | { |
|
|
81 | char buffer[1024], *rval = NULL; |
|
|
82 | struct ifconf ifc; |
|
|
83 | struct ifreq *ifr; |
|
|
84 | int i, skfd; |
|
|
85 | |
|
|
86 | if (display[0] != ':' && strncmp (display, "unix:", 5)) |
|
|
87 | return (char *) display; /* nothing to do */ |
|
|
88 | |
|
|
89 | ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */ |
|
|
90 | ifc.ifc_buf = buffer; |
|
|
91 | |
|
|
92 | if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0) |
|
|
93 | { |
|
|
94 | perror ("socket"); |
|
|
95 | return NULL; |
|
|
96 | } |
|
|
97 | |
|
|
98 | if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0) |
|
|
99 | { |
|
|
100 | perror ("SIOCGIFCONF"); |
|
|
101 | close (skfd); |
|
|
102 | return NULL; |
|
|
103 | } |
|
|
104 | |
|
|
105 | for (i = 0, ifr = ifc.ifc_req; |
|
|
106 | i < (ifc.ifc_len / sizeof (struct ifreq)); |
|
|
107 | i++, ifr++) |
|
|
108 | { |
|
|
109 | struct ifreq ifr2; |
|
|
110 | |
|
|
111 | strcpy (ifr2.ifr_name, ifr->ifr_name); |
|
|
112 | |
|
|
113 | if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0) |
|
|
114 | { |
|
|
115 | unsigned long addr; |
|
|
116 | struct sockaddr_in *p_addr; |
|
|
117 | |
|
|
118 | p_addr = (struct sockaddr_in *) &ifr2.ifr_addr; |
|
|
119 | addr = htonl ((unsigned long)p_addr->sin_addr.s_addr); |
|
|
120 | |
|
|
121 | /* |
|
|
122 | * not "0.0.0.0" or "127.0.0.1" - so format the address |
|
|
123 | */ |
|
|
124 | if (addr && addr != 0x7F000001) |
|
|
125 | { |
|
|
126 | char *colon = strchr (display, ':'); |
|
|
127 | |
|
|
128 | if (colon == NULL) |
|
|
129 | colon = ":0.0"; |
|
|
130 | |
|
|
131 | rval = rxvt_malloc (strlen (colon) + 16); |
|
|
132 | sprintf (rval, "%d.%d.%d.%d%s", |
|
|
133 | (int) ((addr >> 030) & 0xFF), |
|
|
134 | (int) ((addr >> 020) & 0xFF), |
|
|
135 | (int) ((addr >> 010) & 0xFF), |
|
|
136 | (int) (addr & 0xFF), colon); |
|
|
137 | break; |
|
|
138 | } |
|
|
139 | } |
|
|
140 | } |
|
|
141 | |
|
|
142 | close (skfd); |
|
|
143 | |
|
|
144 | return rval; |
|
|
145 | } |
|
|
146 | #endif |
42 | |
147 | |
43 | const char *const def_colorName[] = |
148 | const char *const def_colorName[] = |
44 | { |
149 | { |
45 | COLOR_FOREGROUND, |
150 | COLOR_FOREGROUND, |
46 | COLOR_BACKGROUND, |
151 | COLOR_BACKGROUND, |
… | |
… | |
50 | "rgb:00/cd/00", // 2: green (Green3) |
155 | "rgb:00/cd/00", // 2: green (Green3) |
51 | "rgb:cd/cd/00", // 3: yellow (Yellow3) |
156 | "rgb:cd/cd/00", // 3: yellow (Yellow3) |
52 | "rgb:00/00/cd", // 4: blue (Blue3) |
157 | "rgb:00/00/cd", // 4: blue (Blue3) |
53 | "rgb:cd/00/cd", // 5: magenta (Magenta3) |
158 | "rgb:cd/00/cd", // 5: magenta (Magenta3) |
54 | "rgb:00/cd/cd", // 6: cyan (Cyan3) |
159 | "rgb:00/cd/cd", // 6: cyan (Cyan3) |
55 | # ifdef XTERM_COLORS |
160 | # ifdef XTERM_COLORS |
56 | "rgb:e5/e5/e5", // 7: white (Grey90) |
161 | "rgb:e5/e5/e5", // 7: white (Grey90) |
57 | # else |
162 | # else |
58 | "rgb:fa/eb/d7", // 7: white (AntiqueWhite) |
163 | "rgb:fa/eb/d7", // 7: white (AntiqueWhite) |
59 | # endif |
164 | # endif |
60 | /* high-intensity colors */ |
165 | /* high-intensity colors */ |
61 | # ifdef XTERM_COLORS |
166 | # ifdef XTERM_COLORS |
62 | "rgb:4d/4d/4d", // 8: bright black (Grey30) |
167 | "rgb:4d/4d/4d", // 8: bright black (Grey30) |
… | |
… | |
146 | "rgb:e7/e7/e7", |
251 | "rgb:e7/e7/e7", |
147 | |
252 | |
148 | #ifndef NO_CURSORCOLOR |
253 | #ifndef NO_CURSORCOLOR |
149 | COLOR_CURSOR_BACKGROUND, |
254 | COLOR_CURSOR_BACKGROUND, |
150 | COLOR_CURSOR_FOREGROUND, |
255 | COLOR_CURSOR_FOREGROUND, |
151 | #endif /* ! NO_CURSORCOLOR */ |
256 | #endif /* ! NO_CURSORCOLOR */ |
152 | NULL, /* Color_pointer_fg */ |
257 | NULL, /* Color_pointer_fg */ |
153 | NULL, /* Color_pointer_bg */ |
258 | NULL, /* Color_pointer_bg */ |
154 | NULL, /* Color_border */ |
259 | NULL, /* Color_border */ |
155 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
260 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
156 | NULL, /* Color_BD */ |
261 | NULL, /* Color_BD */ |
157 | NULL, /* Color_IT */ |
262 | NULL, /* Color_IT */ |
158 | NULL, /* Color_UL */ |
263 | NULL, /* Color_UL */ |
159 | NULL, /* Color_RV */ |
264 | NULL, /* Color_RV */ |
160 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
265 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
161 | #if ENABLE_FRILLS |
266 | #if ENABLE_FRILLS |
162 | NULL, // Color_underline |
267 | NULL, // Color_underline |
163 | #endif |
268 | #endif |
164 | #ifdef OPTION_HC |
269 | #ifdef OPTION_HC |
165 | NULL, |
270 | NULL, |
166 | #endif |
271 | #endif |
167 | #ifdef KEEP_SCROLLCOLOR |
272 | #ifdef KEEP_SCROLLCOLOR |
168 | COLOR_SCROLLBAR, |
273 | COLOR_SCROLLBAR, |
169 | COLOR_SCROLLTROUGH, |
274 | COLOR_SCROLLTROUGH, |
170 | #endif /* KEEP_SCROLLCOLOR */ |
275 | #endif /* KEEP_SCROLLCOLOR */ |
171 | #if ENABLE_TRANSPARENCY |
276 | #if ENABLE_TRANSPARENCY |
172 | NULL, |
277 | NULL, |
173 | #endif |
278 | #endif |
174 | #if OFF_FOCUS_FADING |
279 | #if OFF_FOCUS_FADING |
175 | "rgb:00/00/00", |
280 | "rgb:00/00/00", |
176 | #endif |
281 | #endif |
177 | }; |
282 | }; |
178 | |
283 | |
179 | bool |
284 | void |
180 | rxvt_term::init_vars () |
285 | rxvt_term::init_vars () |
181 | { |
286 | { |
182 | pix_colors = // |
287 | pix_colors = pix_colors_focused; |
183 | pix_colors_focused = new rxvt_color [TOTAL_COLORS]; |
|
|
184 | #ifdef OFF_FOCUS_FADING |
|
|
185 | pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; |
|
|
186 | #endif |
|
|
187 | |
|
|
188 | |
288 | |
189 | MEvent.time = CurrentTime; |
289 | MEvent.time = CurrentTime; |
190 | MEvent.button = AnyButton; |
290 | MEvent.button = AnyButton; |
191 | want_refresh = 1; |
291 | want_refresh = 1; |
192 | priv_modes = SavedModes = PrivMode_Default; |
292 | priv_modes = SavedModes = PrivMode_Default; |
… | |
… | |
194 | nrow = 24; |
294 | nrow = 24; |
195 | int_bwidth = INTERNALBORDERWIDTH; |
295 | int_bwidth = INTERNALBORDERWIDTH; |
196 | ext_bwidth = EXTERNALBORDERWIDTH; |
296 | ext_bwidth = EXTERNALBORDERWIDTH; |
197 | lineSpace = LINESPACE; |
297 | lineSpace = LINESPACE; |
198 | saveLines = SAVELINES; |
298 | saveLines = SAVELINES; |
199 | numpix_colors = TOTAL_COLORS; |
|
|
200 | |
299 | |
201 | refresh_type = SLOW_REFRESH; |
300 | refresh_type = SLOW_REFRESH; |
202 | |
301 | |
203 | oldcursor.row = oldcursor.col = -1; |
302 | oldcursor.row = oldcursor.col = -1; |
204 | #ifdef HAVE_BG_PIXMAP |
|
|
205 | #ifdef HAVE_AFTERIMAGE |
|
|
206 | bgPixmap.original_asim = NULL; |
|
|
207 | #endif |
|
|
208 | /* bgPixmap.w = bgPixmap.h = 0; */ |
|
|
209 | #ifdef XPM_BACKGROUND |
|
|
210 | bgPixmap.h_scale = bgPixmap.v_scale = 0; |
|
|
211 | bgPixmap.h_align = bgPixmap.v_align = 0; |
|
|
212 | #endif |
|
|
213 | bgPixmap.flags = 0; |
|
|
214 | bgPixmap.pixmap = None; |
|
|
215 | #endif |
|
|
216 | last_bot = last_state = -1; |
|
|
217 | |
303 | |
218 | set_option (Opt_scrollBar); |
304 | set_option (Opt_scrollBar); |
219 | set_option (Opt_scrollTtyOutput); |
305 | set_option (Opt_scrollTtyOutput); |
220 | set_option (Opt_jumpScroll); |
306 | set_option (Opt_jumpScroll); |
221 | set_option (Opt_skipScroll); |
307 | set_option (Opt_skipScroll); |
222 | set_option (Opt_secondaryScreen); |
308 | set_option (Opt_secondaryScreen); |
223 | set_option (Opt_secondaryScroll); |
309 | set_option (Opt_secondaryScroll); |
224 | set_option (Opt_pastableTabs); |
310 | set_option (Opt_pastableTabs); |
225 | set_option (Opt_intensityStyles); |
311 | set_option (Opt_intensityStyles); |
226 | set_option (Opt_iso14755_52); |
312 | set_option (Opt_iso14755_52); |
227 | |
|
|
228 | return true; |
|
|
229 | } |
313 | } |
230 | |
314 | |
231 | void |
315 | static void |
232 | rxvt_term::init_secondary () |
316 | init_secondary () |
233 | { |
317 | { |
234 | int i; |
318 | int i; |
235 | |
319 | |
236 | /* |
|
|
237 | * Close all unused file descriptors |
|
|
238 | * We don't want them, we don't need them. |
|
|
239 | */ |
|
|
240 | if ((i = open ("/dev/null", O_RDONLY)) < 0) |
320 | if ((i = open ("/dev/null", O_RDONLY)) < 0) |
241 | { |
321 | { |
242 | /* TODO: BOO HISS */ |
|
|
243 | dup2 (STDERR_FILENO, STDIN_FILENO); |
322 | dup2 (STDERR_FILENO, STDIN_FILENO); |
244 | } |
323 | } |
245 | else if (i > STDIN_FILENO) |
324 | else if (i != STDIN_FILENO) |
246 | { |
325 | { |
247 | dup2 (i, STDIN_FILENO); |
326 | dup2 (i, STDIN_FILENO); |
248 | close (i); |
327 | close (i); |
249 | } |
328 | } |
250 | |
329 | |
251 | dup2 (STDERR_FILENO, STDOUT_FILENO); |
330 | dup2 (STDERR_FILENO, STDOUT_FILENO); |
252 | |
|
|
253 | #if 0 // schmorp sayz closing filies is murder |
|
|
254 | for (i = STDERR_FILENO + 1; i < num_fds; i++) |
|
|
255 | { |
|
|
256 | #ifdef __sgi /* Alex Coventry says we need 4 & 7 too */ |
|
|
257 | if (i == 4 || i == 7) |
|
|
258 | continue; |
|
|
259 | #endif |
|
|
260 | close (i); |
|
|
261 | } |
|
|
262 | #endif |
|
|
263 | } |
331 | } |
264 | |
332 | |
265 | /*----------------------------------------------------------------------*/ |
333 | /*----------------------------------------------------------------------*/ |
266 | const char ** |
334 | const char ** |
267 | rxvt_term::init_resources (int argc, const char *const *argv) |
335 | rxvt_term::init_resources (int argc, const char *const *argv) |
268 | { |
336 | { |
269 | int i, r_argc; |
337 | int i, r_argc; |
270 | char *val; |
|
|
271 | const char **cmd_argv, **r_argv; |
338 | const char **cmd_argv, **r_argv; |
272 | |
339 | |
273 | /* |
340 | /* |
274 | * Look for -e option. Find => split and make cmd_argv[] of command args |
341 | * Look for -e option. Find => split and make cmd_argv[] of command args |
275 | */ |
342 | */ |
276 | for (r_argc = 0; r_argc < argc; r_argc++) |
343 | for (r_argc = 0; r_argc < argc; r_argc++) |
277 | if (!strcmp (argv[r_argc], "-e")) |
344 | if (!strcmp (argv[r_argc], "-e")) |
278 | break; |
345 | break; |
279 | |
346 | |
|
|
347 | if (r_argc == argc) |
|
|
348 | cmd_argv = NULL; |
|
|
349 | else if (!argv[r_argc + 1]) |
|
|
350 | rxvt_fatal ("option '-e' requires an argument, aborting.\n"); |
|
|
351 | else |
|
|
352 | { |
|
|
353 | cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); |
|
|
354 | |
|
|
355 | for (i = 0; i < argc - r_argc - 1; i++) |
|
|
356 | cmd_argv[i] = (const char *)argv[i + r_argc + 1]; |
|
|
357 | |
|
|
358 | cmd_argv[i] = NULL; |
|
|
359 | } |
|
|
360 | |
280 | r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); |
361 | r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); |
281 | |
362 | |
282 | for (i = 0; i < r_argc; i++) |
363 | for (i = 0; i < r_argc; i++) |
283 | r_argv[i] = (const char *)argv[i]; |
364 | r_argv[i] = (const char *)argv[i]; |
284 | |
365 | |
285 | r_argv[i] = NULL; |
366 | r_argv[i] = NULL; |
286 | |
367 | |
287 | if (r_argc == argc) |
|
|
288 | cmd_argv = NULL; |
|
|
289 | else |
|
|
290 | { |
|
|
291 | cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc)); |
|
|
292 | |
|
|
293 | for (i = 0; i < argc - r_argc - 1; i++) |
|
|
294 | cmd_argv[i] = (const char *)argv[i + r_argc + 1]; |
|
|
295 | |
|
|
296 | cmd_argv[i] = NULL; |
|
|
297 | } |
|
|
298 | |
|
|
299 | rs[Rs_name] = rxvt_r_basename (argv[0]); |
368 | rs[Rs_name] = rxvt_basename (argv[0]); |
300 | |
369 | |
301 | /* |
370 | /* |
302 | * Open display, get options/resources and create the window |
371 | * Open display, get options/resources and create the window |
303 | */ |
372 | */ |
304 | |
373 | |
… | |
… | |
306 | rs[Rs_display_name] = ":0"; |
375 | rs[Rs_display_name] = ":0"; |
307 | |
376 | |
308 | get_options (r_argc, r_argv); |
377 | get_options (r_argc, r_argv); |
309 | |
378 | |
310 | if (!(display = displays.get (rs[Rs_display_name]))) |
379 | if (!(display = displays.get (rs[Rs_display_name]))) |
|
|
380 | { |
|
|
381 | free (r_argv); |
311 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
382 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
|
|
383 | } |
312 | |
384 | |
313 | // using a local pointer decreases code size a lot |
385 | // using a local pointer decreases code size a lot |
314 | xa = display->xa; |
386 | xa = display->xa; |
315 | |
387 | |
316 | set (display); |
388 | set (display); |
… | |
… | |
320 | if (rs[Rs_depth]) |
392 | if (rs[Rs_depth]) |
321 | select_visual (strtol (rs[Rs_depth], 0, 0)); |
393 | select_visual (strtol (rs[Rs_depth], 0, 0)); |
322 | #endif |
394 | #endif |
323 | |
395 | |
324 | #ifdef HAVE_AFTERIMAGE |
396 | #ifdef HAVE_AFTERIMAGE |
|
|
397 | set_application_name ((char*)rs[Rs_name]); |
|
|
398 | set_output_threshold (OUTPUT_LEVEL_WARNING); |
325 | asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); |
399 | asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); |
326 | #endif |
400 | #endif |
327 | free (r_argv); |
401 | free (r_argv); |
328 | |
402 | |
329 | for (int i = NUM_RESOURCES; i--; ) |
403 | for (int i = NUM_RESOURCES; i--; ) |
… | |
… | |
347 | * set any defaults not already set |
421 | * set any defaults not already set |
348 | */ |
422 | */ |
349 | if (cmd_argv && cmd_argv[0]) |
423 | if (cmd_argv && cmd_argv[0]) |
350 | { |
424 | { |
351 | if (!rs[Rs_title]) |
425 | if (!rs[Rs_title]) |
352 | rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); |
426 | rs[Rs_title] = rxvt_basename (cmd_argv[0]); |
353 | if (!rs[Rs_iconName]) |
427 | if (!rs[Rs_iconName]) |
354 | rs[Rs_iconName] = rs[Rs_title]; |
428 | rs[Rs_iconName] = rs[Rs_title]; |
355 | } |
429 | } |
356 | else |
430 | else |
357 | { |
431 | { |
… | |
… | |
395 | rs[Rs_cutchars] = CUTCHARS; |
469 | rs[Rs_cutchars] = CUTCHARS; |
396 | |
470 | |
397 | #ifndef NO_BACKSPACE_KEY |
471 | #ifndef NO_BACKSPACE_KEY |
398 | if (!rs[Rs_backspace_key]) |
472 | if (!rs[Rs_backspace_key]) |
399 | # ifdef DEFAULT_BACKSPACE |
473 | # ifdef DEFAULT_BACKSPACE |
400 | key_backspace = DEFAULT_BACKSPACE; |
474 | rs[Rs_backspace_key] = DEFAULT_BACKSPACE; |
401 | # else |
475 | # else |
402 | key_backspace = "DEC"; /* can toggle between \010 or \177 */ |
476 | rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */ |
403 | # endif |
477 | # endif |
404 | else |
|
|
405 | { |
|
|
406 | val = strdup (rs[Rs_backspace_key]); |
|
|
407 | key_backspace = val; |
|
|
408 | } |
|
|
409 | #endif |
478 | #endif |
410 | |
479 | |
411 | #ifndef NO_DELETE_KEY |
480 | #ifndef NO_DELETE_KEY |
412 | if (!rs[Rs_delete_key]) |
481 | if (!rs[Rs_delete_key]) |
413 | # ifdef DEFAULT_DELETE |
482 | # ifdef DEFAULT_DELETE |
414 | key_delete = DEFAULT_DELETE; |
483 | rs[Rs_delete_key] = DEFAULT_DELETE; |
415 | # else |
484 | # else |
416 | key_delete = "\033[3~"; |
485 | rs[Rs_delete_key] = "\033[3~"; |
417 | # endif |
486 | # endif |
418 | else |
|
|
419 | { |
|
|
420 | val = strdup (rs[Rs_delete_key]); |
|
|
421 | key_delete = val; |
|
|
422 | } |
|
|
423 | #endif |
487 | #endif |
424 | |
488 | |
425 | #ifdef HAVE_SCROLLBARS |
489 | #ifdef HAVE_SCROLLBARS |
426 | setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); |
490 | setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); |
427 | #endif |
491 | #endif |
… | |
… | |
452 | color_aliases (Color_fg); |
516 | color_aliases (Color_fg); |
453 | color_aliases (Color_bg); |
517 | color_aliases (Color_bg); |
454 | #ifndef NO_CURSORCOLOR |
518 | #ifndef NO_CURSORCOLOR |
455 | color_aliases (Color_cursor); |
519 | color_aliases (Color_cursor); |
456 | color_aliases (Color_cursor2); |
520 | color_aliases (Color_cursor2); |
457 | #endif /* NO_CURSORCOLOR */ |
521 | #endif /* NO_CURSORCOLOR */ |
458 | color_aliases (Color_pointer_fg); |
522 | color_aliases (Color_pointer_fg); |
459 | color_aliases (Color_pointer_bg); |
523 | color_aliases (Color_pointer_bg); |
460 | color_aliases (Color_border); |
524 | color_aliases (Color_border); |
461 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
525 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
462 | color_aliases (Color_BD); |
526 | color_aliases (Color_BD); |
463 | color_aliases (Color_UL); |
527 | color_aliases (Color_UL); |
464 | color_aliases (Color_RV); |
528 | color_aliases (Color_RV); |
465 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
529 | #endif /* ! NO_BOLD_UNDERLINE_REVERSE */ |
466 | |
530 | |
467 | if (!rs[Rs_color + Color_border]) |
531 | if (!rs[Rs_color + Color_border]) |
468 | rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; |
532 | rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; |
469 | |
533 | |
470 | return cmd_argv; |
534 | return cmd_argv; |
|
|
535 | } |
|
|
536 | |
|
|
537 | /*----------------------------------------------------------------------*/ |
|
|
538 | void |
|
|
539 | rxvt_term::init (int argc, const char *const *argv, stringvec *envv) |
|
|
540 | { |
|
|
541 | this->envv = envv; |
|
|
542 | |
|
|
543 | SET_R (this); |
|
|
544 | set_locale (""); |
|
|
545 | set_environ (envv); // few things in X do not call setlocale :( |
|
|
546 | |
|
|
547 | init_vars (); |
|
|
548 | |
|
|
549 | init_secondary (); |
|
|
550 | |
|
|
551 | const char **cmd_argv = init_resources (argc, argv); |
|
|
552 | |
|
|
553 | #ifdef KEYSYM_RESOURCE |
|
|
554 | keyboard->register_done (); |
|
|
555 | #endif |
|
|
556 | |
|
|
557 | #ifdef HAVE_SCROLLBARS |
|
|
558 | if (option (Opt_scrollBar)) |
|
|
559 | scrollBar.setIdle (); /* set existence for size calculations */ |
|
|
560 | #endif |
|
|
561 | |
|
|
562 | pty = ptytty::create (); |
|
|
563 | |
|
|
564 | create_windows (argc, argv); |
|
|
565 | |
|
|
566 | init_xlocale (); |
|
|
567 | |
|
|
568 | scr_reset (); // initialize screen |
|
|
569 | |
|
|
570 | #if 0 |
|
|
571 | XSynchronize (dpy, True); |
|
|
572 | #endif |
|
|
573 | |
|
|
574 | #ifdef HAVE_SCROLLBARS |
|
|
575 | if (option (Opt_scrollBar)) |
|
|
576 | resize_scrollbar (); /* create and map scrollbar */ |
|
|
577 | #endif |
|
|
578 | #ifdef HAVE_BG_PIXMAP |
|
|
579 | { |
|
|
580 | bgPixmap.set_target (this); |
|
|
581 | bgPixmap.invalidate (); |
|
|
582 | |
|
|
583 | #ifdef ENABLE_TRANSPARENCY |
|
|
584 | if (option (Opt_transparent)) |
|
|
585 | { |
|
|
586 | bgPixmap.set_transparent (); |
|
|
587 | |
|
|
588 | #ifdef HAVE_AFTERIMAGE |
|
|
589 | if (rs [Rs_blurradius]) |
|
|
590 | bgPixmap.set_blur_radius (rs [Rs_blurradius]); |
|
|
591 | #endif |
|
|
592 | if (ISSET_PIXCOLOR (Color_tint)) |
|
|
593 | bgPixmap.set_tint (pix_colors_focused [Color_tint]); |
|
|
594 | |
|
|
595 | if (rs [Rs_shade]) |
|
|
596 | bgPixmap.set_shade (rs [Rs_shade]); |
|
|
597 | |
|
|
598 | bgPixmap.set_root_pixmap (); |
|
|
599 | XSelectInput (dpy, display->root, PropertyChangeMask); |
|
|
600 | rootwin_ev.start (display, display->root); |
|
|
601 | } |
|
|
602 | #endif |
|
|
603 | |
|
|
604 | #ifdef BG_IMAGE_FROM_FILE |
|
|
605 | if (rs[Rs_backgroundPixmap]) |
|
|
606 | { |
|
|
607 | const char *p = rs[Rs_backgroundPixmap]; |
|
|
608 | |
|
|
609 | if ((p = strchr (p, ';')) != 0) |
|
|
610 | { |
|
|
611 | p++; |
|
|
612 | bgPixmap.set_geometry (p); |
|
|
613 | } |
|
|
614 | else |
|
|
615 | bgPixmap.set_defaultGeometry (); |
|
|
616 | |
|
|
617 | if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) |
|
|
618 | if (!bgPixmap.window_position_sensitive ()) |
|
|
619 | update_background (); |
|
|
620 | } |
|
|
621 | #endif |
|
|
622 | } |
|
|
623 | #endif |
|
|
624 | |
|
|
625 | #if ENABLE_PERL |
|
|
626 | rootwin_ev.start (display, display->root); |
|
|
627 | #endif |
|
|
628 | |
|
|
629 | set_colorfgbg (); |
|
|
630 | |
|
|
631 | init_command (cmd_argv); |
|
|
632 | |
|
|
633 | free (cmd_argv); |
|
|
634 | |
|
|
635 | if (pty->pty >= 0) |
|
|
636 | pty_ev.start (pty->pty, ev::READ); |
|
|
637 | |
|
|
638 | HOOK_INVOKE ((this, HOOK_START, DT_END)); |
|
|
639 | |
|
|
640 | #if ENABLE_XEMBED |
|
|
641 | if (rs[Rs_embed]) |
|
|
642 | { |
|
|
643 | long info[2] = { 0, XEMBED_MAPPED }; |
|
|
644 | |
|
|
645 | XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
|
|
646 | 32, PropModeReplace, (unsigned char *)&info, 2); |
|
|
647 | } |
|
|
648 | #endif |
|
|
649 | |
|
|
650 | XMapWindow (dpy, vt); |
|
|
651 | XMapWindow (dpy, parent[0]); |
|
|
652 | |
|
|
653 | refresh_check (); |
471 | } |
654 | } |
472 | |
655 | |
473 | /*----------------------------------------------------------------------*/ |
656 | /*----------------------------------------------------------------------*/ |
474 | void |
657 | void |
475 | rxvt_term::init_env () |
658 | rxvt_term::init_env () |
… | |
… | |
490 | */ |
673 | */ |
491 | val = rxvt_network_display (rs[Rs_display_name]); |
674 | val = rxvt_network_display (rs[Rs_display_name]); |
492 | rs[Rs_display_name] = (const char *)val; |
675 | rs[Rs_display_name] = (const char *)val; |
493 | |
676 | |
494 | if (val == NULL) |
677 | if (val == NULL) |
495 | #endif /* DISPLAY_IS_IP */ |
678 | #endif /* DISPLAY_IS_IP */ |
496 | val = XDisplayString (dpy); |
679 | val = XDisplayString (dpy); |
497 | |
680 | |
498 | if (rs[Rs_display_name] == NULL) |
681 | if (rs[Rs_display_name] == NULL) |
499 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
682 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
500 | |
683 | |
… | |
… | |
540 | #ifdef HAVE_UNSETENV |
723 | #ifdef HAVE_UNSETENV |
541 | /* avoid passing old settings and confusing term size */ |
724 | /* avoid passing old settings and confusing term size */ |
542 | unsetenv ("LINES"); |
725 | unsetenv ("LINES"); |
543 | unsetenv ("COLUMNS"); |
726 | unsetenv ("COLUMNS"); |
544 | unsetenv ("TERMCAP"); /* terminfo should be okay */ |
727 | unsetenv ("TERMCAP"); /* terminfo should be okay */ |
545 | #endif /* HAVE_UNSETENV */ |
728 | #endif /* HAVE_UNSETENV */ |
546 | } |
729 | } |
547 | |
730 | |
548 | /*----------------------------------------------------------------------*/ |
731 | /*----------------------------------------------------------------------*/ |
549 | /* |
732 | /* |
550 | * This is more or less stolen straight from XFree86 xterm. |
733 | * This is more or less stolen straight from XFree86 xterm. |
… | |
… | |
571 | |
754 | |
572 | this->locale = "C"; |
755 | this->locale = "C"; |
573 | } |
756 | } |
574 | |
757 | |
575 | |
758 | |
576 | this->locale = rxvt_strdup (this->locale); |
759 | this->locale = strdup (this->locale); |
577 | SET_LOCALE (this->locale); |
760 | SET_LOCALE (this->locale); |
578 | mbstate.reset (); |
761 | mbstate.reset (); |
579 | #endif |
762 | #endif |
580 | |
763 | |
581 | #if HAVE_NL_LANGINFO |
764 | #if HAVE_NL_LANGINFO |
… | |
… | |
638 | priv_modes |= PrivMode_Keypress; |
821 | priv_modes |= PrivMode_Keypress; |
639 | if (!option (Opt_jumpScroll)) |
822 | if (!option (Opt_jumpScroll)) |
640 | priv_modes |= PrivMode_smoothScroll; |
823 | priv_modes |= PrivMode_smoothScroll; |
641 | |
824 | |
642 | #ifndef NO_BACKSPACE_KEY |
825 | #ifndef NO_BACKSPACE_KEY |
643 | if (strcmp (key_backspace, "DEC") == 0) |
826 | if (strcmp (rs[Rs_backspace_key], "DEC") == 0) |
644 | priv_modes |= PrivMode_HaveBackSpace; |
827 | priv_modes |= PrivMode_HaveBackSpace; |
645 | #endif |
828 | #endif |
646 | |
829 | |
647 | /* add value for scrollBar */ |
830 | /* add value for scrollBar */ |
648 | if (scrollBar.state) |
831 | if (scrollBar.state) |
… | |
… | |
661 | int i; |
844 | int i; |
662 | |
845 | |
663 | #ifdef OFF_FOCUS_FADING |
846 | #ifdef OFF_FOCUS_FADING |
664 | pix_colors = pix_colors_focused; |
847 | pix_colors = pix_colors_focused; |
665 | #endif |
848 | #endif |
666 | |
849 | |
667 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
850 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
668 | { |
851 | { |
669 | const char *name = rs[Rs_color + i]; |
852 | const char *name = rs[Rs_color + i]; |
670 | |
853 | |
671 | if (!name) |
854 | if (!name) |
… | |
… | |
749 | min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), |
932 | min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), |
750 | cscroll.a) |
933 | cscroll.a) |
751 | )) |
934 | )) |
752 | alias_color (Color_topShadow, Color_White); |
935 | alias_color (Color_topShadow, Color_White); |
753 | } |
936 | } |
754 | #endif /* KEEP_SCROLLCOLOR */ |
937 | #endif /* KEEP_SCROLLCOLOR */ |
755 | |
938 | |
756 | #ifdef OFF_FOCUS_FADING |
939 | #ifdef OFF_FOCUS_FADING |
757 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
940 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
758 | update_fade_color (i); |
941 | update_fade_color (i); |
759 | #endif |
942 | #endif |
… | |
… | |
767 | if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) |
950 | if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) |
768 | { |
951 | { |
769 | int i = atoi (rs[Rs_color + idx]); |
952 | int i = atoi (rs[Rs_color + idx]); |
770 | |
953 | |
771 | if (i >= 8 && i <= 15) |
954 | if (i >= 8 && i <= 15) |
772 | { /* bright colors */ |
955 | /* bright colors */ |
773 | i -= 8; |
|
|
774 | rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; |
956 | rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8]; |
775 | return; |
957 | else if (i >= 0 && i <= 7) |
776 | } |
958 | /* normal colors */ |
777 | |
|
|
778 | if (i >= 0 && i <= 7) /* normal colors */ |
|
|
779 | rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; |
959 | rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; |
780 | } |
960 | } |
781 | } |
961 | } |
782 | |
962 | |
783 | /*----------------------------------------------------------------------*/ |
963 | /*----------------------------------------------------------------------*/ |
… | |
… | |
999 | termwin_ev.start (display, top); |
1179 | termwin_ev.start (display, top); |
1000 | |
1180 | |
1001 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1181 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1002 | TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); |
1182 | TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); |
1003 | |
1183 | |
1004 | #ifdef HAVE_SCROLLBARS |
|
|
1005 | /* cursor scrollBar: Black-on-White */ |
|
|
1006 | leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr); |
|
|
1007 | #endif |
|
|
1008 | |
|
|
1009 | /* the vt window */ |
1184 | /* the vt window */ |
1010 | vt = XCreateSimpleWindow (dpy, top, |
1185 | vt = XCreateSimpleWindow (dpy, top, |
1011 | window_vt_x, window_vt_y, |
1186 | window_vt_x, window_vt_y, |
1012 | width, height, |
1187 | width, height, |
1013 | 0, |
1188 | 0, |
… | |
… | |
1037 | GCForeground | GCBackground | GCGraphicsExposures, |
1212 | GCForeground | GCBackground | GCGraphicsExposures, |
1038 | &gcvalue); |
1213 | &gcvalue); |
1039 | |
1214 | |
1040 | drawable = new rxvt_drawable (this, vt); |
1215 | drawable = new rxvt_drawable (this, vt); |
1041 | |
1216 | |
1042 | #ifdef RXVT_SCROLLBAR |
|
|
1043 | gcvalue.foreground = pix_colors[Color_topShadow]; |
|
|
1044 | topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); |
|
|
1045 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
|
|
1046 | botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); |
|
|
1047 | gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; |
|
|
1048 | scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); |
|
|
1049 | #endif |
|
|
1050 | |
|
|
1051 | #ifdef OFF_FOCUS_FADING |
1217 | #ifdef OFF_FOCUS_FADING |
1052 | // initially we are in unfocused state |
1218 | // initially we are in unfocused state |
1053 | if (rs[Rs_fade]) |
1219 | if (rs[Rs_fade]) |
1054 | pix_colors = pix_colors_unfocused; |
1220 | pix_colors = pix_colors_unfocused; |
1055 | #endif |
1221 | #endif |
… | |
… | |
1060 | |
1226 | |
1061 | /* ------------------------------------------------------------------------- * |
1227 | /* ------------------------------------------------------------------------- * |
1062 | * GET TTY CURRENT STATE * |
1228 | * GET TTY CURRENT STATE * |
1063 | * ------------------------------------------------------------------------- */ |
1229 | * ------------------------------------------------------------------------- */ |
1064 | void |
1230 | void |
1065 | rxvt_get_ttymode (ttymode_t *tio, int erase) |
1231 | rxvt_get_ttymode (struct termios *tio, int erase) |
1066 | { |
1232 | { |
1067 | /* |
1233 | /* |
1068 | * standard System V termios interface |
1234 | * standard System V termios interface |
1069 | */ |
1235 | */ |
1070 | if (GET_TERMIOS (STDIN_FILENO, tio) < 0) |
1236 | if (tcgetattr (STDIN_FILENO, tio) < 0) |
1071 | { |
1237 | { |
1072 | // return error - use system defaults, |
1238 | // return error - use system defaults, |
1073 | // where possible, and zero elsewhere |
1239 | // where possible, and zero elsewhere |
1074 | memset (tio, 0, sizeof (ttymode_t)); |
1240 | memset (tio, 0, sizeof (struct termios)); |
1075 | |
1241 | |
1076 | tio->c_cc[VINTR] = CINTR; |
1242 | tio->c_cc[VINTR] = CINTR; |
1077 | tio->c_cc[VQUIT] = CQUIT; |
1243 | tio->c_cc[VQUIT] = CQUIT; |
1078 | tio->c_cc[VERASE] = CERASE; |
1244 | tio->c_cc[VERASE] = CERASE; |
1079 | #ifdef VERASE2 |
1245 | #ifdef VERASE2 |
… | |
… | |
1143 | |
1309 | |
1144 | /* |
1310 | /* |
1145 | * Debugging |
1311 | * Debugging |
1146 | */ |
1312 | */ |
1147 | #ifdef DEBUG_TTYMODE |
1313 | #ifdef DEBUG_TTYMODE |
1148 | #ifdef HAVE_TERMIOS_H |
|
|
1149 | /* c_iflag bits */ |
1314 | /* c_iflag bits */ |
1150 | fprintf (stderr, "Input flags\n"); |
1315 | fprintf (stderr, "Input flags\n"); |
1151 | |
1316 | |
1152 | /* cpp token stringize doesn't work on all machines <sigh> */ |
1317 | /* cpp token stringize doesn't work on all machines <sigh> */ |
1153 | # define FOO(flag,name) \ |
1318 | # define FOO(flag,name) \ |
… | |
… | |
1216 | FOO (VLNEXT, "VLNEXT"); |
1381 | FOO (VLNEXT, "VLNEXT"); |
1217 | # endif |
1382 | # endif |
1218 | |
1383 | |
1219 | fprintf (stderr, "\n"); |
1384 | fprintf (stderr, "\n"); |
1220 | # undef FOO |
1385 | # undef FOO |
1221 | # endif /* HAVE_TERMIOS_H */ |
1386 | #endif /* DEBUG_TTYMODE */ |
1222 | #endif /* DEBUG_TTYMODE */ |
|
|
1223 | } |
1387 | } |
1224 | |
1388 | |
1225 | /*----------------------------------------------------------------------*/ |
1389 | /*----------------------------------------------------------------------*/ |
1226 | /* |
1390 | /* |
1227 | * Run the command in a subprocess and return a file descriptor for the |
1391 | * Run the command in a subprocess and return a file descriptor for the |
… | |
… | |
1251 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1415 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1252 | |
1416 | |
1253 | int er; |
1417 | int er; |
1254 | |
1418 | |
1255 | #ifndef NO_BACKSPACE_KEY |
1419 | #ifndef NO_BACKSPACE_KEY |
1256 | if (key_backspace[0] && !key_backspace[1]) |
1420 | if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) |
1257 | er = key_backspace[0]; |
1421 | er = rs[Rs_backspace_key][0]; |
1258 | else if (strcmp (key_backspace, "DEC") == 0) |
1422 | else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) |
1259 | er = '\177'; /* the initial state anyway */ |
1423 | er = '\177'; /* the initial state anyway */ |
1260 | else |
1424 | else |
1261 | #endif |
1425 | #endif |
1262 | er = -1; |
1426 | er = -1; |
1263 | |
1427 | |
1264 | rxvt_get_ttymode (&tio, er); |
1428 | rxvt_get_ttymode (&tio, er); |
1265 | SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ |
1429 | /* init terminal attributes */ |
|
|
1430 | cfsetospeed (&tio, BAUDRATE); |
|
|
1431 | cfsetispeed (&tio, BAUDRATE); |
|
|
1432 | tcsetattr (pty->tty, TCSANOW, &tio); |
1266 | pty->set_utf8_mode (enc_utf8); |
1433 | pty->set_utf8_mode (enc_utf8); |
1267 | |
1434 | |
1268 | /* set initial window size */ |
1435 | /* set initial window size */ |
1269 | tt_winch (); |
1436 | tt_winch (); |
1270 | |
1437 | |
… | |
… | |
1330 | rxvt_term::run_child (const char *const *argv) |
1497 | rxvt_term::run_child (const char *const *argv) |
1331 | { |
1498 | { |
1332 | char *login; |
1499 | char *login; |
1333 | |
1500 | |
1334 | if (option (Opt_console)) |
1501 | if (option (Opt_console)) |
|
|
1502 | { |
1335 | { /* be virtual console, fail silently */ |
1503 | /* be virtual console, fail silently */ |
1336 | #ifdef TIOCCONS |
1504 | #ifdef TIOCCONS |
1337 | unsigned int on = 1; |
1505 | unsigned int on = 1; |
1338 | |
1506 | |
1339 | ioctl (STDIN_FILENO, TIOCCONS, &on); |
1507 | ioctl (STDIN_FILENO, TIOCCONS, &on); |
1340 | #elif defined (SRIOCSREDIR) |
1508 | #elif defined (SRIOCSREDIR) |
… | |
… | |
1342 | |
1510 | |
1343 | fd = open (CONSOLE, O_WRONLY, 0); |
1511 | fd = open (CONSOLE, O_WRONLY, 0); |
1344 | if (fd >= 0) |
1512 | if (fd >= 0) |
1345 | if (ioctl (fd, SRIOCSREDIR, NULL) < 0) |
1513 | if (ioctl (fd, SRIOCSREDIR, NULL) < 0) |
1346 | close (fd); |
1514 | close (fd); |
1347 | #endif /* SRIOCSREDIR */ |
1515 | #endif /* SRIOCSREDIR */ |
1348 | } |
1516 | } |
1349 | |
1517 | |
1350 | /* reset signals and spin off the command interpreter */ |
1518 | /* reset signals and spin off the command interpreter */ |
1351 | signal (SIGINT, SIG_DFL); |
1519 | signal (SIGINT, SIG_DFL); |
1352 | signal (SIGQUIT, SIG_DFL); |
1520 | signal (SIGQUIT, SIG_DFL); |
… | |
… | |
1359 | */ |
1527 | */ |
1360 | #ifdef SIGTSTP |
1528 | #ifdef SIGTSTP |
1361 | signal (SIGTSTP, SIG_IGN); |
1529 | signal (SIGTSTP, SIG_IGN); |
1362 | signal (SIGTTIN, SIG_IGN); |
1530 | signal (SIGTTIN, SIG_IGN); |
1363 | signal (SIGTTOU, SIG_IGN); |
1531 | signal (SIGTTOU, SIG_IGN); |
1364 | #endif /* SIGTSTP */ |
1532 | #endif /* SIGTSTP */ |
1365 | |
1533 | |
1366 | // unblock signals (signals are blocked by iom.C |
1534 | // unblock signals (signals are blocked by iom.C |
1367 | sigset_t ss; |
1535 | sigset_t ss; |
1368 | sigemptyset (&ss); |
1536 | sigemptyset (&ss); |
1369 | sigprocmask (SIG_SETMASK, &ss, 0); |
1537 | sigprocmask (SIG_SETMASK, &ss, 0); |
1370 | |
1538 | |
1371 | /* command interpreter path */ |
1539 | /* command interpreter path */ |
1372 | if (argv != NULL) |
1540 | if (argv) |
1373 | { |
1541 | { |
1374 | # ifdef DEBUG_CMD |
1542 | # ifdef DEBUG_CMD |
1375 | int i; |
1543 | int i; |
1376 | |
1544 | |
1377 | for (i = 0; argv[i]; i++) |
1545 | for (i = 0; argv[i]; i++) |
… | |
… | |
1386 | const char *argv0, *shell; |
1554 | const char *argv0, *shell; |
1387 | |
1555 | |
1388 | if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') |
1556 | if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') |
1389 | shell = "/bin/sh"; |
1557 | shell = "/bin/sh"; |
1390 | |
1558 | |
1391 | argv0 = (const char *)rxvt_r_basename (shell); |
1559 | argv0 = (const char *)rxvt_basename (shell); |
1392 | |
1560 | |
1393 | if (option (Opt_loginShell)) |
1561 | if (option (Opt_loginShell)) |
1394 | { |
1562 | { |
1395 | login = (char *)rxvt_malloc (strlen (argv0) + 2); |
1563 | login = (char *)rxvt_malloc (strlen (argv0) + 2); |
1396 | |
1564 | |
1397 | login[0] = '-'; |
1565 | login[0] = '-'; |
1398 | strcpy (&login[1], argv0); |
1566 | strcpy (&login[1], argv0); |
1399 | argv0 = login; |
1567 | argv0 = login; |
1400 | } |
1568 | } |
1401 | |
1569 | |
1402 | execlp (shell, argv0, NULL); |
1570 | execlp (shell, argv0, (char *)0); |
1403 | /* no error message: STDERR is closed! */ |
1571 | /* no error message: STDERR is closed! */ |
1404 | } |
1572 | } |
1405 | |
1573 | |
1406 | return -1; |
1574 | return -1; |
1407 | } |
1575 | } |