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.173 by root, Wed Jul 5 20:31:48 2006 UTC vs.
Revision 1.250 by root, Tue Feb 19 17:47:01 2008 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,
47 /* low-intensity colors */ 152 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 153 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 154 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (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 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 291 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 292 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 293 ncol = 80;
198 nrow = 24; 294 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 298 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS;
204 299
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 300 refresh_type = SLOW_REFRESH;
207 301
208 oldcursor.row = oldcursor.col = -1; 302 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50;
212 bgPixmap.pixmap = None;
213#endif
214 303
215 last_bot = last_state = -1; 304 set_option (Opt_scrollBar);
216 305 set_option (Opt_scrollTtyOutput);
217 return true; 306 set_option (Opt_jumpScroll);
307 set_option (Opt_skipScroll);
308 set_option (Opt_secondaryScreen);
309 set_option (Opt_secondaryScroll);
310 set_option (Opt_pastableTabs);
311 set_option (Opt_intensityStyles);
312 set_option (Opt_iso14755_52);
313 set_option (Opt_buffered);
218} 314}
219 315
220void 316static void
221rxvt_term::init_secondary () 317init_secondary ()
222{ 318{
223 int i; 319 int i;
224 320
225 /*
226 * Close all unused file descriptors
227 * We don't want them, we don't need them.
228 */
229 if ((i = open ("/dev/null", O_RDONLY)) < 0) 321 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 { 322 {
231 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO); 323 dup2 (STDERR_FILENO, STDIN_FILENO);
233 } 324 }
234 else if (i > STDIN_FILENO) 325 else if (i != STDIN_FILENO)
235 { 326 {
236 dup2 (i, STDIN_FILENO); 327 dup2 (i, STDIN_FILENO);
237 close (i); 328 close (i);
238 } 329 }
239 330
240 dup2 (STDERR_FILENO, STDOUT_FILENO); 331 dup2 (STDERR_FILENO, STDOUT_FILENO);
241
242#if 0 // schmorp sayz closing filies is murder
243 for (i = STDERR_FILENO + 1; i < num_fds; i++)
244 {
245#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
246 if (i == 4 || i == 7)
247 continue;
248#endif
249 close (i);
250 }
251#endif
252} 332}
253 333
254/*----------------------------------------------------------------------*/ 334/*----------------------------------------------------------------------*/
255const char ** 335const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 336rxvt_term::init_resources (int argc, const char *const *argv)
257{ 337{
258 int i, r_argc; 338 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 339 const char **cmd_argv, **r_argv;
261 340
262 /* 341 /*
263 * 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
264 */ 343 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 344 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e")) 345 if (!strcmp (argv[r_argc], "-e"))
267 break; 346 break;
268 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
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 362 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 363
271 for (i = 0; i < r_argc; i++) 364 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 365 r_argv[i] = (const char *)argv[i];
273 366
274 r_argv[i] = NULL; 367 r_argv[i] = NULL;
275 368
276 if (r_argc == argc)
277 cmd_argv = NULL;
278 else
279 {
280 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
281
282 for (i = 0; i < argc - r_argc - 1; i++)
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284
285 cmd_argv[i] = NULL;
286 }
287
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 369 rs[Rs_name] = rxvt_basename (argv[0]);
289 370
290 /* 371 /*
291 * Open display, get options/resources and create the window 372 * Open display, get options/resources and create the window
292 */ 373 */
293 374
… …
295 rs[Rs_display_name] = ":0"; 376 rs[Rs_display_name] = ":0";
296 377
297 get_options (r_argc, r_argv); 378 get_options (r_argc, r_argv);
298 379
299 if (!(display = displays.get (rs[Rs_display_name]))) 380 if (!(display = displays.get (rs[Rs_display_name])))
381 {
382 free (r_argv);
300 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 }
301 385
302 // using a local pointer decreases code size a lot 386 // using a local pointer decreases code size a lot
303 xa = display->xa; 387 xa = display->xa;
304 388
305 set (display); 389 set (display);
… …
308#if XFT 392#if XFT
309 if (rs[Rs_depth]) 393 if (rs[Rs_depth])
310 select_visual (strtol (rs[Rs_depth], 0, 0)); 394 select_visual (strtol (rs[Rs_depth], 0, 0));
311#endif 395#endif
312 396
397#ifdef HAVE_AFTERIMAGE
398 set_application_name ((char*)rs[Rs_name]);
399 set_output_threshold (OUTPUT_LEVEL_WARNING);
400 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
401#endif
313 free (r_argv); 402 free (r_argv);
314 403
315 for (int i = NUM_RESOURCES; i--; ) 404 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef) 405 if (rs [i] == resval_undef)
317 rs [i] = 0; 406 rs [i] = 0;
… …
333 * set any defaults not already set 422 * set any defaults not already set
334 */ 423 */
335 if (cmd_argv && cmd_argv[0]) 424 if (cmd_argv && cmd_argv[0])
336 { 425 {
337 if (!rs[Rs_title]) 426 if (!rs[Rs_title])
338 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 427 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
339 if (!rs[Rs_iconName]) 428 if (!rs[Rs_iconName])
340 rs[Rs_iconName] = rs[Rs_title]; 429 rs[Rs_iconName] = rs[Rs_title];
341 } 430 }
342 else 431 else
343 { 432 {
… …
381 rs[Rs_cutchars] = CUTCHARS; 470 rs[Rs_cutchars] = CUTCHARS;
382 471
383#ifndef NO_BACKSPACE_KEY 472#ifndef NO_BACKSPACE_KEY
384 if (!rs[Rs_backspace_key]) 473 if (!rs[Rs_backspace_key])
385# ifdef DEFAULT_BACKSPACE 474# ifdef DEFAULT_BACKSPACE
386 key_backspace = DEFAULT_BACKSPACE; 475 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
387# else 476# else
388 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 477 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
389# endif 478# endif
390 else
391 {
392 val = strdup (rs[Rs_backspace_key]);
393 rxvt_Str_trim (val);
394 rxvt_Str_escaped (val);
395 key_backspace = val;
396 }
397#endif 479#endif
398 480
399#ifndef NO_DELETE_KEY 481#ifndef NO_DELETE_KEY
400 if (!rs[Rs_delete_key]) 482 if (!rs[Rs_delete_key])
401# ifdef DEFAULT_DELETE 483# ifdef DEFAULT_DELETE
402 key_delete = DEFAULT_DELETE; 484 rs[Rs_delete_key] = DEFAULT_DELETE;
403# else 485# else
404 key_delete = "\033[3~"; 486 rs[Rs_delete_key] = "\033[3~";
405# endif
406 else
407 {
408 val = strdup (rs[Rs_delete_key]);
409 rxvt_Str_trim (val);
410 rxvt_Str_escaped (val);
411 key_delete = val;
412 }
413#endif 487# endif
414 if (rs[Rs_answerbackstring])
415 {
416 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
417 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
418 }
419
420#ifdef HAVE_SCROLLBARS
421 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
422#endif 488#endif
489
490 scrollBar.setup (this);
423 491
424#ifdef XTERM_REVERSE_VIDEO 492#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 493 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 494 if (option (Opt_reverseVideo))
427 { 495 {
428 if (!rs[Rs_color + Color_fg]) 496 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 497 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 498
431 if (!rs[Rs_color + Color_bg]) 499 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 505 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 506 rs[Rs_color + i] = def_colorName[i];
439 507
440#ifndef XTERM_REVERSE_VIDEO 508#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 509 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 510 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 511 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 512#endif
445 513
446 /* convenient aliases for setting fg/bg to colors */ 514 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 515 color_aliases (Color_fg);
448 color_aliases (Color_bg); 516 color_aliases (Color_bg);
449#ifndef NO_CURSORCOLOR 517#ifndef NO_CURSORCOLOR
450 color_aliases (Color_cursor); 518 color_aliases (Color_cursor);
451 color_aliases (Color_cursor2); 519 color_aliases (Color_cursor2);
452#endif /* NO_CURSORCOLOR */ 520#endif /* NO_CURSORCOLOR */
453 color_aliases (Color_pointer_fg); 521 color_aliases (Color_pointer_fg);
454 color_aliases (Color_pointer_bg); 522 color_aliases (Color_pointer_bg);
455 color_aliases (Color_border); 523 color_aliases (Color_border);
456#ifndef NO_BOLD_UNDERLINE_REVERSE 524#ifndef NO_BOLD_UNDERLINE_REVERSE
457 color_aliases (Color_BD); 525 color_aliases (Color_BD);
458 color_aliases (Color_UL); 526 color_aliases (Color_UL);
459 color_aliases (Color_RV); 527 color_aliases (Color_RV);
460#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 528#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
461 529
462 if (!rs[Rs_color + Color_border]) 530 if (!rs[Rs_color + Color_border])
463 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 531 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
464 532
465 return cmd_argv; 533 return cmd_argv;
534}
535
536/*----------------------------------------------------------------------*/
537void
538rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
539{
540 this->envv = envv;
541
542 SET_R (this);
543 set_locale ("");
544 set_environ (envv); // few things in X do not call setlocale :(
545
546 init_vars ();
547
548 init_secondary ();
549
550 const char **cmd_argv = init_resources (argc, argv);
551
552#ifdef KEYSYM_RESOURCE
553 keyboard->register_done ();
554#endif
555
556 if (option (Opt_scrollBar))
557 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
558
559 pty = ptytty::create ();
560
561 create_windows (argc, argv);
562
563 init_xlocale ();
564
565 scr_reset (); // initialize screen
566
567#if 0
568 XSynchronize (dpy, True);
569#endif
570
571 if (option (Opt_scrollBar))
572 scrollBar.resize (); /* create and map scrollbar */
573#ifdef HAVE_BG_PIXMAP
574 {
575 bgPixmap.set_target (this);
576 bgPixmap.invalidate ();
577
578#ifdef ENABLE_TRANSPARENCY
579 if (option (Opt_transparent))
580 {
581 bgPixmap.set_transparent ();
582
583#ifdef HAVE_AFTERIMAGE
584 if (rs [Rs_blurradius])
585 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
586#endif
587 if (ISSET_PIXCOLOR (Color_tint))
588 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
589
590 if (rs [Rs_shade])
591 bgPixmap.set_shade (rs [Rs_shade]);
592
593 bgPixmap.set_root_pixmap ();
594 XSelectInput (dpy, display->root, PropertyChangeMask);
595 rootwin_ev.start (display, display->root);
596 }
597#endif
598
599#ifdef BG_IMAGE_FROM_FILE
600 if (rs[Rs_backgroundPixmap])
601 {
602 const char *p = rs[Rs_backgroundPixmap];
603
604 if ((p = strchr (p, ';')) != 0)
605 {
606 p++;
607 bgPixmap.set_geometry (p);
608 }
609 else
610 bgPixmap.set_defaultGeometry ();
611
612 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
613 if (!bgPixmap.window_position_sensitive ())
614 update_background ();
615 }
616#endif
617 }
618#endif
619
620#if ENABLE_PERL
621 rootwin_ev.start (display, display->root);
622#endif
623
624 set_colorfgbg ();
625
626 init_command (cmd_argv);
627
628 free (cmd_argv);
629
630 if (pty->pty >= 0)
631 pty_ev.start (pty->pty, ev::READ);
632
633 HOOK_INVOKE ((this, HOOK_START, DT_END));
634
635#if ENABLE_XEMBED
636 if (rs[Rs_embed])
637 {
638 long info[2] = { 0, XEMBED_MAPPED };
639
640 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
641 32, PropModeReplace, (unsigned char *)&info, 2);
642 }
643#endif
644
645 XMapWindow (dpy, vt);
646 XMapWindow (dpy, parent[0]);
647
648 refresh_check ();
466} 649}
467 650
468/*----------------------------------------------------------------------*/ 651/*----------------------------------------------------------------------*/
469void 652void
470rxvt_term::init_env () 653rxvt_term::init_env ()
471{ 654{
472 int i; 655 int i;
473 unsigned int u;
474 char *val; 656 char *val;
475 657
476#ifdef DISPLAY_IS_IP 658#ifdef DISPLAY_IS_IP
477 /* Fixup display_name for export over pty to any interested terminal 659 /* Fixup display_name for export over pty to any interested terminal
478 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 660 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
486 */ 668 */
487 val = rxvt_network_display (rs[Rs_display_name]); 669 val = rxvt_network_display (rs[Rs_display_name]);
488 rs[Rs_display_name] = (const char *)val; 670 rs[Rs_display_name] = (const char *)val;
489 671
490 if (val == NULL) 672 if (val == NULL)
491#endif /* DISPLAY_IS_IP */ 673#endif /* DISPLAY_IS_IP */
492 val = XDisplayString (dpy); 674 val = XDisplayString (dpy);
493 675
494 if (rs[Rs_display_name] == NULL) 676 if (rs[Rs_display_name] == NULL)
495 rs[Rs_display_name] = val; /* use broken `:0' value */ 677 rs[Rs_display_name] = val; /* use broken `:0' value */
496 678
497 i = strlen (val); 679 i = strlen (val);
498 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 680 env_display = (char *)rxvt_malloc (i + 9);
499 681
500 sprintf (env_display, "DISPLAY=%s", val); 682 sprintf (env_display, "DISPLAY=%s", val);
501 683
502 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 684 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
503 685
… …
524 else 706 else
525 putenv ("COLORTERM=" COLORTERMENVFULL); 707 putenv ("COLORTERM=" COLORTERMENVFULL);
526 708
527 if (rs[Rs_term_name] != NULL) 709 if (rs[Rs_term_name] != NULL)
528 { 710 {
529 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 711 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
530 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 712 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
531 putenv (env_term); 713 putenv (env_term);
532 } 714 }
533 else 715 else
534 putenv ("TERM=" TERMENV); 716 putenv ("TERM=" TERMENV);
… …
536#ifdef HAVE_UNSETENV 718#ifdef HAVE_UNSETENV
537 /* avoid passing old settings and confusing term size */ 719 /* avoid passing old settings and confusing term size */
538 unsetenv ("LINES"); 720 unsetenv ("LINES");
539 unsetenv ("COLUMNS"); 721 unsetenv ("COLUMNS");
540 unsetenv ("TERMCAP"); /* terminfo should be okay */ 722 unsetenv ("TERMCAP"); /* terminfo should be okay */
541#endif /* HAVE_UNSETENV */ 723#endif /* HAVE_UNSETENV */
542} 724}
543 725
544/*----------------------------------------------------------------------*/ 726/*----------------------------------------------------------------------*/
545/* 727/*
546 * This is more or less stolen straight from XFree86 xterm. 728 * This is more or less stolen straight from XFree86 xterm.
… …
567 749
568 this->locale = "C"; 750 this->locale = "C";
569 } 751 }
570 752
571 753
572 this->locale = rxvt_strdup (this->locale); 754 this->locale = strdup (this->locale);
573 SET_LOCALE (this->locale); 755 SET_LOCALE (this->locale);
574 mbstate.reset (); 756 mbstate.reset ();
575#endif 757#endif
576 758
577#if HAVE_NL_LANGINFO 759#if HAVE_NL_LANGINFO
… …
621 * Initialize the command connection. 803 * Initialize the command connection.
622 * This should be called after the X server connection is established. 804 * This should be called after the X server connection is established.
623 */ 805 */
624 806
625#ifdef META8_OPTION 807#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 808 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 809#endif
628 810
629 get_ourmods (); 811 get_ourmods ();
630 812
631 if (!OPTION (Opt_scrollTtyOutput)) 813 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 814 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 815 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 816 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 817 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 818 priv_modes |= PrivMode_smoothScroll;
637 819
638#ifndef NO_BACKSPACE_KEY 820#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 821 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 822 priv_modes |= PrivMode_HaveBackSpace;
641#endif 823#endif
642 824
643 /* add value for scrollBar */ 825 /* add value for scrollBar */
644 if (scrollBar.state) 826 if (scrollBar.state)
… …
657 int i; 839 int i;
658 840
659#ifdef OFF_FOCUS_FADING 841#ifdef OFF_FOCUS_FADING
660 pix_colors = pix_colors_focused; 842 pix_colors = pix_colors_focused;
661#endif 843#endif
662 844
663 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 845 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
664 { 846 {
665 const char *name = rs[Rs_color + i]; 847 const char *name = rs[Rs_color + i];
666 848
667 if (!name) 849 if (!name)
… …
670 rxvt_color xcol; 852 rxvt_color xcol;
671 853
672 if (!set_color (xcol, name)) 854 if (!set_color (xcol, name))
673 { 855 {
674#ifndef XTERM_REVERSE_VIDEO 856#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo)) 857 if (i < 2 && option (Opt_reverseVideo))
676 name = def_colorName [1 - i]; 858 name = def_colorName [1 - i];
677 else 859 else
678#endif 860#endif
679 name = def_colorName [i]; 861 name = def_colorName [i];
680 862
… …
720 * get scrollBar shadow colors 902 * get scrollBar shadow colors
721 * 903 *
722 * The calculations of topShadow/bottomShadow values are adapted 904 * The calculations of topShadow/bottomShadow values are adapted
723 * from the fvwm window manager. 905 * from the fvwm window manager.
724 */ 906 */
725#ifdef KEEP_SCROLLCOLOR 907#ifdef RXVT_SCROLLBAR
726 if (depth <= 2) 908 if (depth <= 2)
727 { 909 {
728 /* Monochrome */ 910 /* Monochrome */
729 alias_color (Color_scroll, Color_fg); 911 alias_color (Color_scroll, Color_fg);
730 alias_color (Color_topShadow, Color_bg); 912 alias_color (Color_topShadow, Color_bg);
… …
745 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 927 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
746 cscroll.a) 928 cscroll.a)
747 )) 929 ))
748 alias_color (Color_topShadow, Color_White); 930 alias_color (Color_topShadow, Color_White);
749 } 931 }
750#endif /* KEEP_SCROLLCOLOR */ 932#endif
751 933
752#ifdef OFF_FOCUS_FADING 934#ifdef OFF_FOCUS_FADING
753 if (rs[Rs_fade])
754 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 935 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
755 { 936 update_fade_color (i);
756 rgba c;
757 pix_colors [Color_fade].get (c);
758 pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
759 }
760#endif 937#endif
761} 938}
762 939
763/*----------------------------------------------------------------------*/ 940/*----------------------------------------------------------------------*/
764/* color aliases, fg/bg bright-bold */ 941/* color aliases, fg/bg bright-bold */
… …
768 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 945 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
769 { 946 {
770 int i = atoi (rs[Rs_color + idx]); 947 int i = atoi (rs[Rs_color + idx]);
771 948
772 if (i >= 8 && i <= 15) 949 if (i >= 8 && i <= 15)
773 { /* bright colors */ 950 /* bright colors */
774 i -= 8;
775 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 951 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
776 return; 952 else if (i >= 0 && i <= 7)
777 } 953 /* normal colors */
778
779 if (i >= 0 && i <= 7) /* normal colors */
780 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 954 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
781 } 955 }
782} 956}
783 957
784/*----------------------------------------------------------------------*/ 958/*----------------------------------------------------------------------*/
… …
876rxvt_term::create_windows (int argc, const char *const *argv) 1050rxvt_term::create_windows (int argc, const char *const *argv)
877{ 1051{
878 XClassHint classHint; 1052 XClassHint classHint;
879 XWMHints wmHint; 1053 XWMHints wmHint;
880#if ENABLE_FRILLS 1054#if ENABLE_FRILLS
881 MWMHints mwmhints; 1055 MWMHints mwmhints = { };
882#endif 1056#endif
883 XGCValues gcvalue; 1057 XGCValues gcvalue;
884 XSetWindowAttributes attributes; 1058 XSetWindowAttributes attributes;
885 Window top, parent; 1059 Window top, parent;
886 1060
… …
892 if (!set_fonts ()) 1066 if (!set_fonts ())
893 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1067 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
894 1068
895 parent = display->root; 1069 parent = display->root;
896 1070
897 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1071 attributes.override_redirect = !!option (Opt_override_redirect);
898 1072
899#if ENABLE_FRILLS 1073#if ENABLE_FRILLS
900 if (OPTION (Opt_borderLess)) 1074 if (option (Opt_borderLess))
901 { 1075 {
902 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1076 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
903 { 1077 {
904 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1078 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
905 attributes.override_redirect = true; 1079 attributes.override_redirect = true;
906 mwmhints.flags = 0;
907 } 1080 }
908 else 1081 else
909 { 1082 {
910 mwmhints.flags = MWM_HINTS_DECORATIONS; 1083 mwmhints.flags = MWM_HINTS_DECORATIONS;
911 mwmhints.decorations = 0;
912 } 1084 }
913 } 1085 }
914 else
915 mwmhints.flags = 0;
916#endif 1086#endif
917 1087
918#if ENABLE_XEMBED 1088#if ENABLE_XEMBED
919 if (rs[Rs_embed]) 1089 if (rs[Rs_embed])
920 { 1090 {
… …
955 classHint.res_name = (char *)rs[Rs_name]; 1125 classHint.res_name = (char *)rs[Rs_name];
956 classHint.res_class = (char *)RESCLASS; 1126 classHint.res_class = (char *)RESCLASS;
957 1127
958 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1128 wmHint.flags = InputHint | StateHint | WindowGroupHint;
959 wmHint.input = True; 1129 wmHint.input = True;
960 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1130 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
961 wmHint.window_group = top; 1131 wmHint.window_group = top;
962 1132
963 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1133 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
964 &szHint, &wmHint, &classHint); 1134 &szHint, &wmHint, &classHint);
965 1135
… …
1003 1173
1004 termwin_ev.start (display, top); 1174 termwin_ev.start (display, top);
1005 1175
1006 /* vt cursor: Black-on-White is standard, but this is more popular */ 1176 /* vt cursor: Black-on-White is standard, but this is more popular */
1007 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1177 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1008
1009#ifdef HAVE_SCROLLBARS
1010 /* cursor scrollBar: Black-on-White */
1011 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1012#endif
1013 1178
1014 /* the vt window */ 1179 /* the vt window */
1015 vt = XCreateSimpleWindow (dpy, top, 1180 vt = XCreateSimpleWindow (dpy, top,
1016 window_vt_x, window_vt_y, 1181 window_vt_x, window_vt_y,
1017 width, height, 1182 width, height,
… …
1022 attributes.bit_gravity = NorthWestGravity; 1187 attributes.bit_gravity = NorthWestGravity;
1023 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1188 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1024 1189
1025 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1190 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1026 1191
1027 if (OPTION (Opt_pointerBlank)) 1192 if (option (Opt_pointerBlank))
1028 vt_emask |= PointerMotionMask; 1193 vt_emask |= PointerMotionMask;
1029 else 1194 else
1030 vt_emask |= Button1MotionMask | Button3MotionMask; 1195 vt_emask |= Button1MotionMask | Button3MotionMask;
1031 1196
1032 vt_select_input (); 1197 vt_select_input ();
1033 1198
1034 vt_ev.start (display, vt); 1199 vt_ev.start (display, vt);
1035
1036#ifdef XPM_BACKGROUND
1037 if (rs[Rs_backgroundPixmap] != NULL
1038 && !OPTION (Opt_transparent))
1039 {
1040 const char *p = rs[Rs_backgroundPixmap];
1041
1042 if ((p = strchr (p, ';')) != NULL)
1043 {
1044 p++;
1045 scale_pixmap (p);
1046 }
1047
1048 set_bgPixmap (rs[Rs_backgroundPixmap]);
1049 scr_touch (true);
1050 }
1051#endif
1052 1200
1053 /* graphics context for the vt window */ 1201 /* graphics context for the vt window */
1054 gcvalue.foreground = pix_colors[Color_fg]; 1202 gcvalue.foreground = pix_colors[Color_fg];
1055 gcvalue.background = pix_colors[Color_bg]; 1203 gcvalue.background = pix_colors[Color_bg];
1056 gcvalue.graphics_exposures = 0; 1204 gcvalue.graphics_exposures = 0;
… …
1059 GCForeground | GCBackground | GCGraphicsExposures, 1207 GCForeground | GCBackground | GCGraphicsExposures,
1060 &gcvalue); 1208 &gcvalue);
1061 1209
1062 drawable = new rxvt_drawable (this, vt); 1210 drawable = new rxvt_drawable (this, vt);
1063 1211
1064#ifdef RXVT_SCROLLBAR
1065 gcvalue.foreground = pix_colors[Color_topShadow];
1066 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1067 gcvalue.foreground = pix_colors[Color_bottomShadow];
1068 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1069 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1070 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1071#endif
1072
1073#ifdef OFF_FOCUS_FADING 1212#ifdef OFF_FOCUS_FADING
1074 // initially we are in unfocused state 1213 // initially we are in unfocused state
1075 if (rs[Rs_fade]) 1214 if (rs[Rs_fade])
1076 pix_colors = pix_colors_unfocused; 1215 pix_colors = pix_colors_unfocused;
1077#endif 1216#endif
… …
1082 1221
1083/* ------------------------------------------------------------------------- * 1222/* ------------------------------------------------------------------------- *
1084 * GET TTY CURRENT STATE * 1223 * GET TTY CURRENT STATE *
1085 * ------------------------------------------------------------------------- */ 1224 * ------------------------------------------------------------------------- */
1086void 1225void
1087rxvt_get_ttymode (ttymode_t *tio, int erase) 1226rxvt_get_ttymode (struct termios *tio, int erase)
1088{ 1227{
1089#ifdef HAVE_TERMIOS_H
1090 /* 1228 /*
1091 * standard System V termios interface 1229 * standard System V termios interface
1092 */ 1230 */
1093 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1231 if (tcgetattr (STDIN_FILENO, tio) < 0)
1094 { 1232 {
1095 // return error - use system defaults, 1233 // return error - use system defaults,
1096 // where possible, and zero elsewhere 1234 // where possible, and zero elsewhere
1097 memset (tio, 0, sizeof (ttymode_t)); 1235 memset (tio, 0, sizeof (struct termios));
1098 1236
1099 tio->c_cc[VINTR] = CINTR; 1237 tio->c_cc[VINTR] = CINTR;
1100 tio->c_cc[VQUIT] = CQUIT; 1238 tio->c_cc[VQUIT] = CQUIT;
1101 tio->c_cc[VERASE] = CERASE; 1239 tio->c_cc[VERASE] = CERASE;
1102#ifdef VERASE2 1240#ifdef VERASE2
… …
1161 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1299 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1162# if defined (ECHOCTL) && defined (ECHOKE) 1300# if defined (ECHOCTL) && defined (ECHOKE)
1163 | ECHOCTL | ECHOKE 1301 | ECHOCTL | ECHOKE
1164# endif 1302# endif
1165 | ECHOE | ECHOK); 1303 | ECHOE | ECHOK);
1166# else /* HAVE_TERMIOS_H */
1167
1168 /*
1169 * sgtty interface
1170 */
1171
1172 /* get parameters -- gtty */
1173 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1174 {
1175 tio->sg.sg_erase = CERASE; /* ^H */
1176 tio->sg.sg_kill = CKILL; /* ^U */
1177 }
1178
1179 if (erase != -1)
1180 tio->sg.sg_erase = (char)erase;
1181
1182 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1183
1184 /* get special characters */
1185 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1186 {
1187 tio->tc.t_intrc = CINTR; /* ^C */
1188 tio->tc.t_quitc = CQUIT; /* ^\ */
1189 tio->tc.t_startc = CSTART; /* ^Q */
1190 tio->tc.t_stopc = CSTOP; /* ^S */
1191 tio->tc.t_eofc = CEOF; /* ^D */
1192 tio->tc.t_brkc = -1;
1193 }
1194
1195 /* get local special chars */
1196 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1197 {
1198 tio->lc.t_suspc = CSUSP; /* ^Z */
1199 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1200 tio->lc.t_rprntc = CRPRNT; /* ^R */
1201 tio->lc.t_flushc = CFLUSH; /* ^O */
1202 tio->lc.t_werasc = CWERASE; /* ^W */
1203 tio->lc.t_lnextc = CLNEXT; /* ^V */
1204 }
1205 /* get line discipline */
1206 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1207# ifdef NTTYDISC
1208 tio->line = NTTYDISC;
1209# endif /* NTTYDISC */
1210
1211 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1212#endif /* HAVE_TERMIOS_H */
1213 1304
1214 /* 1305 /*
1215 * Debugging 1306 * Debugging
1216 */ 1307 */
1217#ifdef DEBUG_TTYMODE 1308#ifdef DEBUG_TTYMODE
1218#ifdef HAVE_TERMIOS_H
1219 /* c_iflag bits */ 1309 /* c_iflag bits */
1220 fprintf (stderr, "Input flags\n"); 1310 fprintf (stderr, "Input flags\n");
1221 1311
1222 /* cpp token stringize doesn't work on all machines <sigh> */ 1312 /* cpp token stringize doesn't work on all machines <sigh> */
1223# define FOO(flag,name) \ 1313# define FOO(flag,name) \
… …
1286 FOO (VLNEXT, "VLNEXT"); 1376 FOO (VLNEXT, "VLNEXT");
1287# endif 1377# endif
1288 1378
1289 fprintf (stderr, "\n"); 1379 fprintf (stderr, "\n");
1290# undef FOO 1380# undef FOO
1291# endif /* HAVE_TERMIOS_H */ 1381#endif /* DEBUG_TTYMODE */
1292#endif /* DEBUG_TTYMODE */
1293} 1382}
1294 1383
1295/*----------------------------------------------------------------------*/ 1384/*----------------------------------------------------------------------*/
1296/* 1385/*
1297 * Run the command in a subprocess and return a file descriptor for the 1386 * Run the command in a subprocess and return a file descriptor for the
… …
1318 else 1407 else
1319#endif 1408#endif
1320 if (!pty->get ()) 1409 if (!pty->get ())
1321 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1410 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1322 1411
1412 int er;
1413
1414#ifndef NO_BACKSPACE_KEY
1415 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1416 er = rs[Rs_backspace_key][0];
1417 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1418 er = '\177'; /* the initial state anyway */
1419 else
1420#endif
1421 er = -1;
1422
1423 rxvt_get_ttymode (&tio, er);
1424 /* init terminal attributes */
1425 cfsetospeed (&tio, BAUDRATE);
1426 cfsetispeed (&tio, BAUDRATE);
1427 tcsetattr (pty->tty, TCSANOW, &tio);
1323 pty->set_utf8_mode (enc_utf8); 1428 pty->set_utf8_mode (enc_utf8);
1324 1429
1325 /* set initial window size */ 1430 /* set initial window size */
1326 tt_winch (); 1431 tt_winch ();
1327
1328 int er;
1329
1330#ifndef NO_BACKSPACE_KEY
1331 if (key_backspace[0] && !key_backspace[1])
1332 er = key_backspace[0];
1333 else if (strcmp (key_backspace, "DEC") == 0)
1334 er = '\177'; /* the initial state anyway */
1335 else
1336#endif
1337 er = -1;
1338
1339 rxvt_get_ttymode (&tio, er);
1340 1432
1341#if ENABLE_FRILLS 1433#if ENABLE_FRILLS
1342 if (rs[Rs_pty_fd]) 1434 if (rs[Rs_pty_fd])
1343 return; 1435 return;
1344#endif 1436#endif
… …
1375 } 1467 }
1376 1468
1377 _exit (EXIT_FAILURE); 1469 _exit (EXIT_FAILURE);
1378 1470
1379 default: 1471 default:
1380 if (!OPTION (Opt_utmpInhibit)) 1472 if (!option (Opt_utmpInhibit))
1381 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1473 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1382 1474
1383 pty->close_tty (); 1475 pty->close_tty ();
1384 1476
1385 child_ev.start (cmd_pid); 1477 child_ev.start (cmd_pid);
1386 1478
… …
1399int 1491int
1400rxvt_term::run_child (const char *const *argv) 1492rxvt_term::run_child (const char *const *argv)
1401{ 1493{
1402 char *login; 1494 char *login;
1403 1495
1404 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1405
1406 if (OPTION (Opt_console)) 1496 if (option (Opt_console))
1497 {
1407 { /* be virtual console, fail silently */ 1498 /* be virtual console, fail silently */
1408#ifdef TIOCCONS 1499#ifdef TIOCCONS
1409 unsigned int on = 1; 1500 unsigned int on = 1;
1410 1501
1411 ioctl (STDIN_FILENO, TIOCCONS, &on); 1502 ioctl (STDIN_FILENO, TIOCCONS, &on);
1412#elif defined (SRIOCSREDIR) 1503#elif defined (SRIOCSREDIR)
… …
1414 1505
1415 fd = open (CONSOLE, O_WRONLY, 0); 1506 fd = open (CONSOLE, O_WRONLY, 0);
1416 if (fd >= 0) 1507 if (fd >= 0)
1417 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1508 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1418 close (fd); 1509 close (fd);
1419#endif /* SRIOCSREDIR */ 1510#endif /* SRIOCSREDIR */
1420 } 1511 }
1421 1512
1422 /* reset signals and spin off the command interpreter */ 1513 /* reset signals and spin off the command interpreter */
1423 signal (SIGINT, SIG_DFL); 1514 signal (SIGINT, SIG_DFL);
1424 signal (SIGQUIT, SIG_DFL); 1515 signal (SIGQUIT, SIG_DFL);
… …
1431 */ 1522 */
1432#ifdef SIGTSTP 1523#ifdef SIGTSTP
1433 signal (SIGTSTP, SIG_IGN); 1524 signal (SIGTSTP, SIG_IGN);
1434 signal (SIGTTIN, SIG_IGN); 1525 signal (SIGTTIN, SIG_IGN);
1435 signal (SIGTTOU, SIG_IGN); 1526 signal (SIGTTOU, SIG_IGN);
1436#endif /* SIGTSTP */ 1527#endif /* SIGTSTP */
1437
1438 // unblock signals (signals are blocked by iom.C
1439 sigset_t ss;
1440 sigemptyset (&ss);
1441 sigprocmask (SIG_SETMASK, &ss, 0);
1442 1528
1443 /* command interpreter path */ 1529 /* command interpreter path */
1444 if (argv != NULL) 1530 if (argv)
1445 { 1531 {
1446# ifdef DEBUG_CMD 1532# ifdef DEBUG_CMD
1447 int i; 1533 int i;
1448 1534
1449 for (i = 0; argv[i]; i++) 1535 for (i = 0; argv[i]; i++)
… …
1458 const char *argv0, *shell; 1544 const char *argv0, *shell;
1459 1545
1460 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1546 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1461 shell = "/bin/sh"; 1547 shell = "/bin/sh";
1462 1548
1463 argv0 = (const char *)rxvt_r_basename (shell); 1549 argv0 = (const char *)rxvt_basename (shell);
1464 1550
1465 if (OPTION (Opt_loginShell)) 1551 if (option (Opt_loginShell))
1466 { 1552 {
1467 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1553 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1468 1554
1469 login[0] = '-'; 1555 login[0] = '-';
1470 strcpy (&login[1], argv0); 1556 strcpy (&login[1], argv0);
1471 argv0 = login; 1557 argv0 = login;
1472 } 1558 }
1473 1559
1474 execlp (shell, argv0, NULL); 1560 execlp (shell, argv0, (char *)0);
1475 /* no error message: STDERR is closed! */ 1561 /* no error message: STDERR is closed! */
1476 } 1562 }
1477 1563
1478 return -1; 1564 return -1;
1479} 1565}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines