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

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.185 by ayin, Sat Jun 9 08:12:38 2007 UTC vs.
Revision 1.261 by sf-exg, Sat Jan 30 20:52:36 2010 UTC

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-2008 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
78static char *
79rxvt_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
43const char *const def_colorName[] = 148const 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
168 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 274 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 275#endif
171#if TINTING 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
179bool 284void
180rxvt_term::init_vars () 285rxvt_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#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 288
192 MEvent.time = CurrentTime; 289 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 290 MEvent.button = AnyButton;
194 want_refresh = 1; 291 want_refresh = 1;
195 priv_modes = SavedModes = PrivMode_Default; 292 priv_modes = SavedModes = PrivMode_Default;
196 ncol = 80; 293 ncol = 80;
197 nrow = 24; 294 nrow = 24;
198 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
199 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
200 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
298 letterSpace = LETTERSPACE;
201 saveLines = SAVELINES; 299 saveLines = SAVELINES;
202 numpix_colors = TOTAL_COLORS;
203 300
204 refresh_limit = 1;
205 refresh_type = SLOW_REFRESH; 301 refresh_type = SLOW_REFRESH;
206 302
207 oldcursor.row = oldcursor.col = -1; 303 oldcursor.row = oldcursor.col = -1;
208#ifdef XPM_BACKGROUND
209 /* bgPixmap.w = bgPixmap.h = 0; */
210 bgPixmap.x = bgPixmap.y = 0;
211 bgPixmap.pixmap = None;
212#endif
213
214 last_bot = last_state = -1;
215 304
216 set_option (Opt_scrollBar); 305 set_option (Opt_scrollBar);
217 set_option (Opt_scrollTtyOutput); 306 set_option (Opt_scrollTtyOutput);
218 set_option (Opt_jumpScroll); 307 set_option (Opt_jumpScroll);
308 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen); 309 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll); 310 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs); 311 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles); 312 set_option (Opt_intensityStyles);
223 313 set_option (Opt_iso14755);
224 return true; 314 set_option (Opt_iso14755_52);
315 set_option (Opt_buffered);
225} 316}
226 317
227void 318static void
228rxvt_term::init_secondary () 319init_secondary ()
229{ 320{
230 int i; 321 int i;
231 322
232 /*
233 * Close all unused file descriptors
234 * We don't want them, we don't need them.
235 */
236 if ((i = open ("/dev/null", O_RDONLY)) < 0) 323 if ((i = open ("/dev/null", O_RDONLY)) < 0)
237 { 324 {
238 /* TODO: BOO HISS */
239 dup2 (STDERR_FILENO, STDIN_FILENO); 325 dup2 (STDERR_FILENO, STDIN_FILENO);
240 } 326 }
241 else if (i > STDIN_FILENO) 327 else if (i != STDIN_FILENO)
242 { 328 {
243 dup2 (i, STDIN_FILENO); 329 dup2 (i, STDIN_FILENO);
244 close (i); 330 close (i);
245 } 331 }
246 332
247 dup2 (STDERR_FILENO, STDOUT_FILENO); 333 dup2 (STDERR_FILENO, STDOUT_FILENO);
248
249#if 0 // schmorp sayz closing filies is murder
250 for (i = STDERR_FILENO + 1; i < num_fds; i++)
251 {
252#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
253 if (i == 4 || i == 7)
254 continue;
255#endif
256 close (i);
257 }
258#endif
259} 334}
260 335
261/*----------------------------------------------------------------------*/ 336/*----------------------------------------------------------------------*/
262const char ** 337const char **
263rxvt_term::init_resources (int argc, const char *const *argv) 338rxvt_term::init_resources (int argc, const char *const *argv)
264{ 339{
265 int i, r_argc; 340 int i, r_argc;
266 char *val;
267 const char **cmd_argv, **r_argv; 341 const char **cmd_argv, **r_argv;
268 342
269 /* 343 /*
270 * Look for -e option. Find => split and make cmd_argv[] of command args 344 * Look for -e option. Find => split and make cmd_argv[] of command args
271 */ 345 */
272 for (r_argc = 0; r_argc < argc; r_argc++) 346 for (r_argc = 0; r_argc < argc; r_argc++)
273 if (!strcmp (argv[r_argc], "-e")) 347 if (!strcmp (argv[r_argc], "-e"))
274 break; 348 break;
275 349
350 if (r_argc == argc)
351 cmd_argv = NULL;
352 else if (!argv[r_argc + 1])
353 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
354 else
355 {
356 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
357
358 for (i = 0; i < argc - r_argc - 1; i++)
359 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
360
361 cmd_argv[i] = NULL;
362 }
363
276 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 364 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
277 365
278 for (i = 0; i < r_argc; i++) 366 for (i = 0; i < r_argc; i++)
279 r_argv[i] = (const char *)argv[i]; 367 r_argv[i] = (const char *)argv[i];
280 368
281 r_argv[i] = NULL; 369 r_argv[i] = NULL;
282 370
283 if (r_argc == argc)
284 cmd_argv = NULL;
285 else
286 {
287 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
288
289 for (i = 0; i < argc - r_argc - 1; i++)
290 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
291
292 cmd_argv[i] = NULL;
293 }
294
295 rs[Rs_name] = rxvt_r_basename (argv[0]); 371 rs[Rs_name] = rxvt_basename (argv[0]);
296 372
297 /* 373 /*
298 * Open display, get options/resources and create the window 374 * Open display, get options/resources and create the window
299 */ 375 */
300 376
302 rs[Rs_display_name] = ":0"; 378 rs[Rs_display_name] = ":0";
303 379
304 get_options (r_argc, r_argv); 380 get_options (r_argc, r_argv);
305 381
306 if (!(display = displays.get (rs[Rs_display_name]))) 382 if (!(display = displays.get (rs[Rs_display_name])))
383 {
384 free (r_argv);
307 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 385 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
386 }
308 387
309 // using a local pointer decreases code size a lot 388 // using a local pointer decreases code size a lot
310 xa = display->xa; 389 xa = display->xa;
311 390
312 set (display); 391 set (display);
320 free (r_argv); 399 free (r_argv);
321 400
322 for (int i = NUM_RESOURCES; i--; ) 401 for (int i = NUM_RESOURCES; i--; )
323 if (rs [i] == resval_undef) 402 if (rs [i] == resval_undef)
324 rs [i] = 0; 403 rs [i] = 0;
404
405#ifdef HAVE_AFTERIMAGE
406 set_application_name ((char *)rs[Rs_name]);
407 set_output_threshold (OUTPUT_LEVEL_WARNING);
408#endif
325 409
326#if ENABLE_PERL 410#if ENABLE_PERL
327 if (!rs[Rs_perl_ext_1]) 411 if (!rs[Rs_perl_ext_1])
328 rs[Rs_perl_ext_1] = "default"; 412 rs[Rs_perl_ext_1] = "default";
329 413
340 * set any defaults not already set 424 * set any defaults not already set
341 */ 425 */
342 if (cmd_argv && cmd_argv[0]) 426 if (cmd_argv && cmd_argv[0])
343 { 427 {
344 if (!rs[Rs_title]) 428 if (!rs[Rs_title])
345 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 429 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
430
346 if (!rs[Rs_iconName]) 431 if (!rs[Rs_iconName])
347 rs[Rs_iconName] = rs[Rs_title]; 432 rs[Rs_iconName] = rs[Rs_title];
348 } 433 }
349 else 434 else
350 { 435 {
351 if (!rs[Rs_title]) 436 if (!rs[Rs_title])
352 rs[Rs_title] = rs[Rs_name]; 437 rs[Rs_title] = rs[Rs_name];
438
353 if (!rs[Rs_iconName]) 439 if (!rs[Rs_iconName])
354 rs[Rs_iconName] = rs[Rs_name]; 440 rs[Rs_iconName] = rs[Rs_name];
355 } 441 }
356 442
357 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 443 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
364 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 450 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
365 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 451 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
366 452
367 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 453 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
368 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 454 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
455
456 if (rs[Rs_letterSpace])
457 letterSpace = atoi (rs[Rs_letterSpace]);
369#endif 458#endif
370 459
371#ifdef POINTER_BLANK 460#ifdef POINTER_BLANK
372 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 461 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
373 pointerBlankDelay = i; 462 pointerBlankDelay = i;
377 466
378 /* no point having a scrollbar without having any scrollback! */ 467 /* no point having a scrollbar without having any scrollback! */
379 if (!saveLines) 468 if (!saveLines)
380 set_option (Opt_scrollBar, 0); 469 set_option (Opt_scrollBar, 0);
381 470
382#ifdef PRINTPIPE
383 if (!rs[Rs_print_pipe])
384 rs[Rs_print_pipe] = PRINTPIPE;
385#endif
386
387 if (!rs[Rs_cutchars]) 471 if (!rs[Rs_cutchars])
388 rs[Rs_cutchars] = CUTCHARS; 472 rs[Rs_cutchars] = CUTCHARS;
389 473
390#ifndef NO_BACKSPACE_KEY 474#ifndef NO_BACKSPACE_KEY
391 if (!rs[Rs_backspace_key]) 475 if (!rs[Rs_backspace_key])
392# ifdef DEFAULT_BACKSPACE 476# ifdef DEFAULT_BACKSPACE
393 key_backspace = DEFAULT_BACKSPACE; 477 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
394# else 478# else
395 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 479 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
396# endif 480# endif
397 else
398 {
399 val = strdup (rs[Rs_backspace_key]);
400 rxvt_Str_trim (val);
401 rxvt_Str_escaped (val);
402 key_backspace = val;
403 }
404#endif 481#endif
405 482
406#ifndef NO_DELETE_KEY 483#ifndef NO_DELETE_KEY
407 if (!rs[Rs_delete_key]) 484 if (!rs[Rs_delete_key])
408# ifdef DEFAULT_DELETE 485# ifdef DEFAULT_DELETE
409 key_delete = DEFAULT_DELETE; 486 rs[Rs_delete_key] = DEFAULT_DELETE;
410# else 487# else
411 key_delete = "\033[3~"; 488 rs[Rs_delete_key] = "\033[3~";
412# endif
413 else
414 {
415 val = strdup (rs[Rs_delete_key]);
416 rxvt_Str_trim (val);
417 rxvt_Str_escaped (val);
418 key_delete = val;
419 }
420#endif 489# endif
421 if (rs[Rs_answerbackstring])
422 {
423 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
424 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
425 }
426
427#ifdef HAVE_SCROLLBARS
428 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
429#endif 490#endif
491
492 scrollBar.setup (this);
430 493
431#ifdef XTERM_REVERSE_VIDEO 494#ifdef XTERM_REVERSE_VIDEO
432 /* this is how xterm implements reverseVideo */ 495 /* this is how xterm implements reverseVideo */
433 if (option (Opt_reverseVideo)) 496 if (option (Opt_reverseVideo))
434 { 497 {
454 color_aliases (Color_fg); 517 color_aliases (Color_fg);
455 color_aliases (Color_bg); 518 color_aliases (Color_bg);
456#ifndef NO_CURSORCOLOR 519#ifndef NO_CURSORCOLOR
457 color_aliases (Color_cursor); 520 color_aliases (Color_cursor);
458 color_aliases (Color_cursor2); 521 color_aliases (Color_cursor2);
459#endif /* NO_CURSORCOLOR */ 522#endif /* NO_CURSORCOLOR */
460 color_aliases (Color_pointer_fg); 523 color_aliases (Color_pointer_fg);
461 color_aliases (Color_pointer_bg); 524 color_aliases (Color_pointer_bg);
462 color_aliases (Color_border); 525 color_aliases (Color_border);
463#ifndef NO_BOLD_UNDERLINE_REVERSE 526#ifndef NO_BOLD_UNDERLINE_REVERSE
464 color_aliases (Color_BD); 527 color_aliases (Color_BD);
465 color_aliases (Color_UL); 528 color_aliases (Color_UL);
466 color_aliases (Color_RV); 529 color_aliases (Color_RV);
467#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 530#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
468 531
469 if (!rs[Rs_color + Color_border]) 532 if (!rs[Rs_color + Color_border])
470 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 533 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
471 534
472 return cmd_argv; 535 return cmd_argv;
536}
537
538/*----------------------------------------------------------------------*/
539void
540rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
541{
542 this->envv = envv;
543
544 SET_R (this);
545 set_locale ("");
546 set_environ (envv); // a few things in X do not call setlocale :(
547
548 init_vars ();
549
550 init_secondary ();
551
552 const char **cmd_argv = init_resources (argc, argv);
553
554#ifdef KEYSYM_RESOURCE
555 keyboard->register_done ();
556#endif
557
558 if (const char *path = rs[Rs_chdir])
559 if (*path) // ignored if empty
560 {
561 if (*path != '/')
562 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
563
564 if (chdir (path))
565 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
566 }
567
568 if (option (Opt_scrollBar))
569 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
570
571 pty = ptytty::create ();
572
573 create_windows (argc, argv);
574
575 init_xlocale ();
576
577 scr_poweron (); // initialize screen
578
579#if 0
580 XSynchronize (dpy, True);
581#endif
582
583 if (option (Opt_scrollBar))
584 scrollBar.resize (); /* create and map scrollbar */
585#ifdef HAVE_BG_PIXMAP
586 {
587 bgPixmap.set_target (this);
588 bgPixmap.invalidate ();
589
590#ifdef ENABLE_TRANSPARENCY
591 if (option (Opt_transparent))
592 {
593 bgPixmap.set_transparent ();
594
595#ifdef HAVE_AFTERIMAGE
596 if (rs [Rs_blurradius])
597 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
598#endif
599 if (ISSET_PIXCOLOR (Color_tint))
600 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
601
602 if (rs [Rs_shade])
603 bgPixmap.set_shade (rs [Rs_shade]);
604
605 bgPixmap.set_root_pixmap ();
606 XSelectInput (dpy, display->root, PropertyChangeMask);
607 rootwin_ev.start (display, display->root);
608 }
609#endif
610
611#ifdef BG_IMAGE_FROM_FILE
612 if (rs[Rs_backgroundPixmap])
613 {
614 const char *p = rs[Rs_backgroundPixmap];
615
616 if ((p = strchr (p, ';')) != 0)
617 {
618 p++;
619 bgPixmap.set_geometry (p);
620 }
621 else
622 bgPixmap.set_defaultGeometry ();
623
624 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
625 if (!bgPixmap.window_position_sensitive ())
626 update_background ();
627 }
628#endif
629 }
630#endif
631
632#if ENABLE_PERL
633 rootwin_ev.start (display, display->root);
634#endif
635
636 set_colorfgbg ();
637
638 init_command (cmd_argv);
639
640 free (cmd_argv);
641
642 if (pty->pty >= 0)
643 pty_ev.start (pty->pty, ev::READ);
644
645 HOOK_INVOKE ((this, HOOK_START, DT_END));
646
647#if ENABLE_XEMBED
648 if (rs[Rs_embed])
649 {
650 long info[2] = { 0, XEMBED_MAPPED };
651
652 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
653 32, PropModeReplace, (unsigned char *)&info, 2);
654 }
655#endif
656
657 XMapWindow (dpy, vt);
658 XMapWindow (dpy, parent[0]);
659
660 refresh_check ();
473} 661}
474 662
475/*----------------------------------------------------------------------*/ 663/*----------------------------------------------------------------------*/
476void 664void
477rxvt_term::init_env () 665rxvt_term::init_env ()
478{ 666{
479 int i; 667 int i;
480 unsigned int u;
481 char *val; 668 char *val;
482 669
483#ifdef DISPLAY_IS_IP 670#ifdef DISPLAY_IS_IP
484 /* Fixup display_name for export over pty to any interested terminal 671 /* Fixup display_name for export over pty to any interested terminal
485 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 672 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
493 */ 680 */
494 val = rxvt_network_display (rs[Rs_display_name]); 681 val = rxvt_network_display (rs[Rs_display_name]);
495 rs[Rs_display_name] = (const char *)val; 682 rs[Rs_display_name] = (const char *)val;
496 683
497 if (val == NULL) 684 if (val == NULL)
498#endif /* DISPLAY_IS_IP */ 685#endif /* DISPLAY_IS_IP */
499 val = XDisplayString (dpy); 686 val = XDisplayString (dpy);
500 687
501 if (rs[Rs_display_name] == NULL) 688 if (rs[Rs_display_name] == NULL)
502 rs[Rs_display_name] = val; /* use broken `:0' value */ 689 rs[Rs_display_name] = val; /* use broken `:0' value */
503 690
504 i = strlen (val); 691 i = strlen (val);
505 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 692 env_display = (char *)rxvt_malloc (i + 9);
506 693
507 sprintf (env_display, "DISPLAY=%s", val); 694 sprintf (env_display, "DISPLAY=%s", val);
508 695
509 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 696 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
510 697
531 else 718 else
532 putenv ("COLORTERM=" COLORTERMENVFULL); 719 putenv ("COLORTERM=" COLORTERMENVFULL);
533 720
534 if (rs[Rs_term_name] != NULL) 721 if (rs[Rs_term_name] != NULL)
535 { 722 {
536 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 723 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
537 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 724 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
538 putenv (env_term); 725 putenv (env_term);
539 } 726 }
540 else 727 else
541 putenv ("TERM=" TERMENV); 728 putenv ("TERM=" TERMENV);
543#ifdef HAVE_UNSETENV 730#ifdef HAVE_UNSETENV
544 /* avoid passing old settings and confusing term size */ 731 /* avoid passing old settings and confusing term size */
545 unsetenv ("LINES"); 732 unsetenv ("LINES");
546 unsetenv ("COLUMNS"); 733 unsetenv ("COLUMNS");
547 unsetenv ("TERMCAP"); /* terminfo should be okay */ 734 unsetenv ("TERMCAP"); /* terminfo should be okay */
548#endif /* HAVE_UNSETENV */ 735#endif /* HAVE_UNSETENV */
549} 736}
550 737
551/*----------------------------------------------------------------------*/ 738/*----------------------------------------------------------------------*/
552/* 739/*
553 * This is more or less stolen straight from XFree86 xterm. 740 * This is more or less stolen straight from XFree86 xterm.
574 761
575 this->locale = "C"; 762 this->locale = "C";
576 } 763 }
577 764
578 765
579 this->locale = rxvt_strdup (this->locale); 766 this->locale = strdup (this->locale);
580 SET_LOCALE (this->locale); 767 SET_LOCALE (this->locale);
581 mbstate.reset (); 768 mbstate.reset ();
582#endif 769#endif
583 770
584#if HAVE_NL_LANGINFO 771#if HAVE_NL_LANGINFO
641 priv_modes |= PrivMode_Keypress; 828 priv_modes |= PrivMode_Keypress;
642 if (!option (Opt_jumpScroll)) 829 if (!option (Opt_jumpScroll))
643 priv_modes |= PrivMode_smoothScroll; 830 priv_modes |= PrivMode_smoothScroll;
644 831
645#ifndef NO_BACKSPACE_KEY 832#ifndef NO_BACKSPACE_KEY
646 if (strcmp (key_backspace, "DEC") == 0) 833 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
647 priv_modes |= PrivMode_HaveBackSpace; 834 priv_modes |= PrivMode_HaveBackSpace;
648#endif 835#endif
649 836
650 /* add value for scrollBar */ 837 /* add value for scrollBar */
651 if (scrollBar.state) 838 if (scrollBar.state)
657 run_command (argv); 844 run_command (argv);
658} 845}
659 846
660/*----------------------------------------------------------------------*/ 847/*----------------------------------------------------------------------*/
661void 848void
662rxvt_term::Get_Colours () 849rxvt_term::get_colours ()
663{ 850{
664 int i; 851 int i;
665 852
666#ifdef OFF_FOCUS_FADING 853#ifdef OFF_FOCUS_FADING
667 pix_colors = pix_colors_focused; 854 pix_colors = pix_colors_focused;
668#endif 855#endif
669 856
670 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 857 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
671 { 858 {
672 const char *name = rs[Rs_color + i]; 859 const char *name = rs[Rs_color + i];
673 860
674 if (!name) 861 if (!name)
727 * get scrollBar shadow colors 914 * get scrollBar shadow colors
728 * 915 *
729 * The calculations of topShadow/bottomShadow values are adapted 916 * The calculations of topShadow/bottomShadow values are adapted
730 * from the fvwm window manager. 917 * from the fvwm window manager.
731 */ 918 */
732#ifdef KEEP_SCROLLCOLOR 919#ifdef RXVT_SCROLLBAR
733 if (depth <= 2) 920 if (depth <= 2)
734 { 921 {
735 /* Monochrome */ 922 /* Monochrome */
736 alias_color (Color_scroll, Color_fg); 923 alias_color (Color_scroll, Color_fg);
737 alias_color (Color_topShadow, Color_bg); 924 alias_color (Color_topShadow, Color_bg);
752 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 939 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
753 cscroll.a) 940 cscroll.a)
754 )) 941 ))
755 alias_color (Color_topShadow, Color_White); 942 alias_color (Color_topShadow, Color_White);
756 } 943 }
757#endif /* KEEP_SCROLLCOLOR */ 944#endif
758 945
759#ifdef OFF_FOCUS_FADING 946#ifdef OFF_FOCUS_FADING
760 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 947 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
761 update_fade_color (i); 948 update_fade_color (i);
762#endif 949#endif
770 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 957 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
771 { 958 {
772 int i = atoi (rs[Rs_color + idx]); 959 int i = atoi (rs[Rs_color + idx]);
773 960
774 if (i >= 8 && i <= 15) 961 if (i >= 8 && i <= 15)
775 { /* bright colors */ 962 /* bright colors */
776 i -= 8;
777 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 963 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
778 return; 964 else if (i >= 0 && i <= 7)
779 } 965 /* normal colors */
780
781 if (i >= 0 && i <= 7) /* normal colors */
782 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 966 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
783 } 967 }
784} 968}
785 969
786/*----------------------------------------------------------------------*/ 970/*----------------------------------------------------------------------*/
878rxvt_term::create_windows (int argc, const char *const *argv) 1062rxvt_term::create_windows (int argc, const char *const *argv)
879{ 1063{
880 XClassHint classHint; 1064 XClassHint classHint;
881 XWMHints wmHint; 1065 XWMHints wmHint;
882#if ENABLE_FRILLS 1066#if ENABLE_FRILLS
883 MWMHints mwmhints; 1067 MWMHints mwmhints = { };
884#endif 1068#endif
885 XGCValues gcvalue; 1069 XGCValues gcvalue;
886 XSetWindowAttributes attributes; 1070 XSetWindowAttributes attributes;
887 Window top, parent; 1071 Window top, parent;
888 1072
889 dLocal (Display *, dpy); 1073 dLocal (Display *, dpy);
890 1074
891 /* grab colors before netscape does */ 1075 /* grab colors before netscape does */
892 Get_Colours (); 1076 get_colours ();
893 1077
894 if (!set_fonts ()) 1078 if (!set_fonts ())
895 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1079 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
896 1080
897 parent = display->root; 1081 parent = display->root;
901#if ENABLE_FRILLS 1085#if ENABLE_FRILLS
902 if (option (Opt_borderLess)) 1086 if (option (Opt_borderLess))
903 { 1087 {
904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1088 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905 { 1089 {
906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1090 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
907 attributes.override_redirect = true; 1091 attributes.override_redirect = true;
908 mwmhints.flags = 0;
909 } 1092 }
910 else 1093 else
911 { 1094 {
912 mwmhints.flags = MWM_HINTS_DECORATIONS; 1095 mwmhints.flags = MWM_HINTS_DECORATIONS;
913 mwmhints.decorations = 0;
914 } 1096 }
915 } 1097 }
916 else
917 mwmhints.flags = 0;
918#endif 1098#endif
919 1099
920#if ENABLE_XEMBED 1100#if ENABLE_XEMBED
921 if (rs[Rs_embed]) 1101 if (rs[Rs_embed])
922 { 1102 {
949 this->parent[0] = top; 1129 this->parent[0] = top;
950 1130
951 old_width = szHint.width; 1131 old_width = szHint.width;
952 old_height = szHint.height; 1132 old_height = szHint.height;
953 1133
954 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1134 set_title (rs [Rs_title]);
955 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1135 set_icon_name (rs [Rs_iconName]);
956 1136
957 classHint.res_name = (char *)rs[Rs_name]; 1137 classHint.res_name = (char *)rs[Rs_name];
958 classHint.res_class = (char *)RESCLASS; 1138 classHint.res_class = (char *)RESCLASS;
959 1139
960 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1140 wmHint.flags = InputHint | StateHint | WindowGroupHint;
962 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1142 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
963 wmHint.window_group = top; 1143 wmHint.window_group = top;
964 1144
965 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1145 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
966 &szHint, &wmHint, &classHint); 1146 &szHint, &wmHint, &classHint);
1147#if ENABLE_EWMH
1148# ifdef HAVE_AFTERIMAGE
1149 /*
1150 * set up icon hint
1151 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1152 */
1153
1154 if (rs [Rs_iconfile])
1155 {
1156 init_asv ();
1157
1158 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1159 if (asv && im)
1160 {
1161 int w = im->width;
1162 int h = im->height;
1163 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1164 ASImage *result = scale_asimage (asv, im,
1165 w, h, ASA_ARGB32,
1166 100, ASIMAGE_QUALITY_DEFAULT);
1167 destroy_asimage (&im);
1168
1169 if (buffer && result)
1170 {
1171 ARGB32 *asbuf = result->alt.argb32;
1172 buffer [0] = w;
1173 buffer [1] = h;
1174
1175 for (unsigned int i = 0; i < w * h; ++i)
1176 buffer [i + 2] = asbuf [i];
1177
1178 destroy_asimage (&result);
1179 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1180 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1181 free (buffer);
1182 }
1183 else
1184 {
1185 if (!buffer)
1186 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1187
1188 if (!result)
1189 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1190 }
1191 }
1192 else
1193 rxvt_warn ("Loading image icon failed, continuing without.\n");
1194 }
1195# endif
1196#endif
967 1197
968#if ENABLE_FRILLS 1198#if ENABLE_FRILLS
969 if (mwmhints.flags) 1199 if (mwmhints.flags)
970 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1200 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
971 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1201 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1005 1235
1006 termwin_ev.start (display, top); 1236 termwin_ev.start (display, top);
1007 1237
1008 /* vt cursor: Black-on-White is standard, but this is more popular */ 1238 /* vt cursor: Black-on-White is standard, but this is more popular */
1009 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1239 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1010
1011#ifdef HAVE_SCROLLBARS
1012 /* cursor scrollBar: Black-on-White */
1013 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1014#endif
1015 1240
1016 /* the vt window */ 1241 /* the vt window */
1017 vt = XCreateSimpleWindow (dpy, top, 1242 vt = XCreateSimpleWindow (dpy, top,
1018 window_vt_x, window_vt_y, 1243 window_vt_x, window_vt_y,
1019 width, height, 1244 width, height,
1033 1258
1034 vt_select_input (); 1259 vt_select_input ();
1035 1260
1036 vt_ev.start (display, vt); 1261 vt_ev.start (display, vt);
1037 1262
1038#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL
1040#ifndef HAVE_AFTERIMAGE
1041 && !option (Opt_transparent)
1042#endif
1043 )
1044 {
1045 const char *p = rs[Rs_backgroundPixmap];
1046
1047 if ((p = strchr (p, ';')) != NULL)
1048 {
1049 p++;
1050 scale_pixmap (p);
1051 }
1052
1053 set_bgPixmap (rs[Rs_backgroundPixmap]);
1054 scr_touch (true);
1055 }
1056#endif
1057
1058 /* graphics context for the vt window */ 1263 /* graphics context for the vt window */
1059 gcvalue.foreground = pix_colors[Color_fg]; 1264 gcvalue.foreground = pix_colors[Color_fg];
1060 gcvalue.background = pix_colors[Color_bg]; 1265 gcvalue.background = pix_colors[Color_bg];
1061 gcvalue.graphics_exposures = 0; 1266 gcvalue.graphics_exposures = 0;
1062 1267
1064 GCForeground | GCBackground | GCGraphicsExposures, 1269 GCForeground | GCBackground | GCGraphicsExposures,
1065 &gcvalue); 1270 &gcvalue);
1066 1271
1067 drawable = new rxvt_drawable (this, vt); 1272 drawable = new rxvt_drawable (this, vt);
1068 1273
1069#ifdef RXVT_SCROLLBAR
1070 gcvalue.foreground = pix_colors[Color_topShadow];
1071 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072 gcvalue.foreground = pix_colors[Color_bottomShadow];
1073 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1074 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1075 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1076#endif
1077
1078#ifdef OFF_FOCUS_FADING 1274#ifdef OFF_FOCUS_FADING
1079 // initially we are in unfocused state 1275 // initially we are in unfocused state
1080 if (rs[Rs_fade]) 1276 if (rs[Rs_fade])
1081 pix_colors = pix_colors_unfocused; 1277 pix_colors = pix_colors_unfocused;
1082#endif 1278#endif
1087 1283
1088/* ------------------------------------------------------------------------- * 1284/* ------------------------------------------------------------------------- *
1089 * GET TTY CURRENT STATE * 1285 * GET TTY CURRENT STATE *
1090 * ------------------------------------------------------------------------- */ 1286 * ------------------------------------------------------------------------- */
1091void 1287void
1092rxvt_get_ttymode (ttymode_t *tio, int erase) 1288rxvt_get_ttymode (struct termios *tio, int erase)
1093{ 1289{
1094 /* 1290 /*
1095 * standard System V termios interface 1291 * standard System V termios interface
1096 */ 1292 */
1097 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1293 if (tcgetattr (STDIN_FILENO, tio) < 0)
1098 { 1294 {
1099 // return error - use system defaults, 1295 // return error - use system defaults,
1100 // where possible, and zero elsewhere 1296 // where possible, and zero elsewhere
1101 memset (tio, 0, sizeof (ttymode_t)); 1297 memset (tio, 0, sizeof (struct termios));
1102 1298
1103 tio->c_cc[VINTR] = CINTR; 1299 tio->c_cc[VINTR] = CINTR;
1104 tio->c_cc[VQUIT] = CQUIT; 1300 tio->c_cc[VQUIT] = CQUIT;
1105 tio->c_cc[VERASE] = CERASE; 1301 tio->c_cc[VERASE] = CERASE;
1106#ifdef VERASE2 1302#ifdef VERASE2
1170 1366
1171 /* 1367 /*
1172 * Debugging 1368 * Debugging
1173 */ 1369 */
1174#ifdef DEBUG_TTYMODE 1370#ifdef DEBUG_TTYMODE
1175#ifdef HAVE_TERMIOS_H
1176 /* c_iflag bits */ 1371 /* c_iflag bits */
1177 fprintf (stderr, "Input flags\n"); 1372 fprintf (stderr, "Input flags\n");
1178 1373
1179 /* cpp token stringize doesn't work on all machines <sigh> */ 1374 /* cpp token stringize doesn't work on all machines <sigh> */
1180# define FOO(flag,name) \ 1375# define FOO(flag,name) \
1243 FOO (VLNEXT, "VLNEXT"); 1438 FOO (VLNEXT, "VLNEXT");
1244# endif 1439# endif
1245 1440
1246 fprintf (stderr, "\n"); 1441 fprintf (stderr, "\n");
1247# undef FOO 1442# undef FOO
1248# endif /* HAVE_TERMIOS_H */ 1443#endif /* DEBUG_TTYMODE */
1249#endif /* DEBUG_TTYMODE */
1250} 1444}
1251 1445
1252/*----------------------------------------------------------------------*/ 1446/*----------------------------------------------------------------------*/
1253/* 1447/*
1254 * Run the command in a subprocess and return a file descriptor for the 1448 * Run the command in a subprocess and return a file descriptor for the
1278 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1472 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1279 1473
1280 int er; 1474 int er;
1281 1475
1282#ifndef NO_BACKSPACE_KEY 1476#ifndef NO_BACKSPACE_KEY
1283 if (key_backspace[0] && !key_backspace[1]) 1477 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1284 er = key_backspace[0]; 1478 er = rs[Rs_backspace_key][0];
1285 else if (strcmp (key_backspace, "DEC") == 0) 1479 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1286 er = '\177'; /* the initial state anyway */ 1480 er = '\177'; /* the initial state anyway */
1287 else 1481 else
1288#endif 1482#endif
1289 er = -1; 1483 er = -1;
1290 1484
1291 rxvt_get_ttymode (&tio, er); 1485 rxvt_get_ttymode (&tio, er);
1292 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1486 /* init terminal attributes */
1487 cfsetospeed (&tio, BAUDRATE);
1488 cfsetispeed (&tio, BAUDRATE);
1489 tcsetattr (pty->tty, TCSANOW, &tio);
1293 pty->set_utf8_mode (enc_utf8); 1490 pty->set_utf8_mode (enc_utf8);
1294 1491
1295 /* set initial window size */ 1492 /* set initial window size */
1296 tt_winch (); 1493 tt_winch ();
1297 1494
1357rxvt_term::run_child (const char *const *argv) 1554rxvt_term::run_child (const char *const *argv)
1358{ 1555{
1359 char *login; 1556 char *login;
1360 1557
1361 if (option (Opt_console)) 1558 if (option (Opt_console))
1559 {
1362 { /* be virtual console, fail silently */ 1560 /* be virtual console, fail silently */
1363#ifdef TIOCCONS 1561#ifdef TIOCCONS
1364 unsigned int on = 1; 1562 unsigned int on = 1;
1365 1563
1366 ioctl (STDIN_FILENO, TIOCCONS, &on); 1564 ioctl (STDIN_FILENO, TIOCCONS, &on);
1367#elif defined (SRIOCSREDIR) 1565#elif defined (SRIOCSREDIR)
1369 1567
1370 fd = open (CONSOLE, O_WRONLY, 0); 1568 fd = open (CONSOLE, O_WRONLY, 0);
1371 if (fd >= 0) 1569 if (fd >= 0)
1372 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1570 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1373 close (fd); 1571 close (fd);
1374#endif /* SRIOCSREDIR */ 1572#endif /* SRIOCSREDIR */
1375 } 1573 }
1376 1574
1377 /* reset signals and spin off the command interpreter */ 1575 /* reset signals and spin off the command interpreter */
1378 signal (SIGINT, SIG_DFL); 1576 signal (SIGINT, SIG_DFL);
1379 signal (SIGQUIT, SIG_DFL); 1577 signal (SIGQUIT, SIG_DFL);
1386 */ 1584 */
1387#ifdef SIGTSTP 1585#ifdef SIGTSTP
1388 signal (SIGTSTP, SIG_IGN); 1586 signal (SIGTSTP, SIG_IGN);
1389 signal (SIGTTIN, SIG_IGN); 1587 signal (SIGTTIN, SIG_IGN);
1390 signal (SIGTTOU, SIG_IGN); 1588 signal (SIGTTOU, SIG_IGN);
1391#endif /* SIGTSTP */ 1589#endif /* SIGTSTP */
1392
1393 // unblock signals (signals are blocked by iom.C
1394 sigset_t ss;
1395 sigemptyset (&ss);
1396 sigprocmask (SIG_SETMASK, &ss, 0);
1397 1590
1398 /* command interpreter path */ 1591 /* command interpreter path */
1399 if (argv != NULL) 1592 if (argv)
1400 { 1593 {
1401# ifdef DEBUG_CMD 1594# ifdef DEBUG_CMD
1402 int i; 1595 int i;
1403 1596
1404 for (i = 0; argv[i]; i++) 1597 for (i = 0; argv[i]; i++)
1413 const char *argv0, *shell; 1606 const char *argv0, *shell;
1414 1607
1415 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1608 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1416 shell = "/bin/sh"; 1609 shell = "/bin/sh";
1417 1610
1418 argv0 = (const char *)rxvt_r_basename (shell); 1611 argv0 = rxvt_basename (shell);
1419 1612
1420 if (option (Opt_loginShell)) 1613 if (option (Opt_loginShell))
1421 { 1614 {
1422 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1615 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1423 1616
1424 login[0] = '-'; 1617 login[0] = '-';
1425 strcpy (&login[1], argv0); 1618 strcpy (&login[1], argv0);
1426 argv0 = login; 1619 argv0 = login;
1427 } 1620 }
1428 1621
1429 execlp (shell, argv0, NULL); 1622 execlp (shell, argv0, (char *)0);
1430 /* no error message: STDERR is closed! */ 1623 /* no error message: STDERR is closed! */
1431 } 1624 }
1432 1625
1433 return -1; 1626 return -1;
1434} 1627}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines