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

Diff Legend

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