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.194 by sasha, Thu Jul 26 16:17:50 2007 UTC vs.
Revision 1.258 by root, Sun Apr 26 01:59:53 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines