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.171 by root, Mon Feb 20 20:44:22 2006 UTC vs.
Revision 1.241 by root, Sat Jan 19 14:23:33 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 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-2007 Marc Lehmann <pcg@goof.com>
15 * 16 *
16 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 20 * (at your option) any later version.
… …
33 34
34#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 37#include "rxvtutil.h"
37#include "init.h" 38#include "init.h"
39#include "keyboard.h"
38 40
39#include <limits> 41#include <limits>
40 42
41#include <csignal> 43#include <csignal>
44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h>
58#endif
59
60#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h>
63#include <sys/socket.h>
64
65/* these next two are probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h>
68#endif
69#ifdef HAVE_SYS_BYTEORDER_H
70#include <sys/byteorder.h>
71#endif
72
73#include <netinet/in.h>
74#include <arpa/inet.h>
75#include <net/if.h>
76#include <net/if_arp.h>
77
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 KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 273 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 274 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 275#endif /* KEEP_SCROLLCOLOR */
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);
218} 313}
219 314
220void 315static void
221rxvt_term::init_secondary () 316init_secondary ()
222{ 317{
223 int i; 318 int i;
224 319
225 /* 320 /*
226 * Close all unused file descriptors 321 * Close all unused file descriptors
… …
229 if ((i = open ("/dev/null", O_RDONLY)) < 0) 324 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 { 325 {
231 /* TODO: BOO HISS */ 326 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO); 327 dup2 (STDERR_FILENO, STDIN_FILENO);
233 } 328 }
234 else if (i > STDIN_FILENO) 329 else if (i != STDIN_FILENO)
235 { 330 {
236 dup2 (i, STDIN_FILENO); 331 dup2 (i, STDIN_FILENO);
237 close (i); 332 close (i);
238 } 333 }
239 334
240 dup2 (STDERR_FILENO, STDOUT_FILENO); 335 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} 336}
253 337
254/*----------------------------------------------------------------------*/ 338/*----------------------------------------------------------------------*/
255const char ** 339const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 340rxvt_term::init_resources (int argc, const char *const *argv)
257{ 341{
258 int i, r_argc; 342 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 343 const char **cmd_argv, **r_argv;
261 344
262 /* 345 /*
263 * Look for -e option. Find => split and make cmd_argv[] of command args 346 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 347 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 348 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e")) 349 if (!strcmp (argv[r_argc], "-e"))
267 break; 350 break;
268 351
352 if (r_argc == argc)
353 cmd_argv = NULL;
354 else if (!argv[r_argc + 1])
355 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
356 else
357 {
358 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
359
360 for (i = 0; i < argc - r_argc - 1; i++)
361 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
362
363 cmd_argv[i] = NULL;
364 }
365
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 366 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 367
271 for (i = 0; i < r_argc; i++) 368 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 369 r_argv[i] = (const char *)argv[i];
273 370
274 r_argv[i] = NULL; 371 r_argv[i] = NULL;
275 372
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]); 373 rs[Rs_name] = rxvt_basename (argv[0]);
289 374
290 /* 375 /*
291 * Open display, get options/resources and create the window 376 * Open display, get options/resources and create the window
292 */ 377 */
293 378
… …
295 rs[Rs_display_name] = ":0"; 380 rs[Rs_display_name] = ":0";
296 381
297 get_options (r_argc, r_argv); 382 get_options (r_argc, r_argv);
298 383
299 if (!(display = displays.get (rs[Rs_display_name]))) 384 if (!(display = displays.get (rs[Rs_display_name])))
385 {
386 free (r_argv);
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 387 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
388 }
301 389
302 // using a local pointer decreases code size a lot 390 // using a local pointer decreases code size a lot
303 xa = display->xa; 391 xa = display->xa;
304 392
393 set (display);
394 extract_resources ();
395
305#if XFT 396#if XFT
306 if (rs[Rs_depth]) 397 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0)); 398 select_visual (strtol (rs[Rs_depth], 0, 0));
308 else
309#endif 399#endif
310 set (display);
311 400
312 extract_resources (); 401#ifdef HAVE_AFTERIMAGE
313 402 set_application_name ((char*)rs[Rs_name]);
403 set_output_threshold (OUTPUT_LEVEL_WARNING);
404 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
405#endif
314 free (r_argv); 406 free (r_argv);
315 407
316 for (int i = NUM_RESOURCES; i--; ) 408 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef) 409 if (rs [i] == resval_undef)
318 rs [i] = 0; 410 rs [i] = 0;
… …
334 * set any defaults not already set 426 * set any defaults not already set
335 */ 427 */
336 if (cmd_argv && cmd_argv[0]) 428 if (cmd_argv && cmd_argv[0])
337 { 429 {
338 if (!rs[Rs_title]) 430 if (!rs[Rs_title])
339 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 431 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
340 if (!rs[Rs_iconName]) 432 if (!rs[Rs_iconName])
341 rs[Rs_iconName] = rs[Rs_title]; 433 rs[Rs_iconName] = rs[Rs_title];
342 } 434 }
343 else 435 else
344 { 436 {
… …
382 rs[Rs_cutchars] = CUTCHARS; 474 rs[Rs_cutchars] = CUTCHARS;
383 475
384#ifndef NO_BACKSPACE_KEY 476#ifndef NO_BACKSPACE_KEY
385 if (!rs[Rs_backspace_key]) 477 if (!rs[Rs_backspace_key])
386# ifdef DEFAULT_BACKSPACE 478# ifdef DEFAULT_BACKSPACE
387 key_backspace = DEFAULT_BACKSPACE; 479 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
388# else 480# else
389 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 481 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
390# endif 482# 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 483#endif
399 484
400#ifndef NO_DELETE_KEY 485#ifndef NO_DELETE_KEY
401 if (!rs[Rs_delete_key]) 486 if (!rs[Rs_delete_key])
402# ifdef DEFAULT_DELETE 487# ifdef DEFAULT_DELETE
403 key_delete = DEFAULT_DELETE; 488 rs[Rs_delete_key] = DEFAULT_DELETE;
404# else 489# else
405 key_delete = "\033[3~"; 490 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 491# endif
415 if (rs[Rs_answerbackstring]) 492#endif
416 {
417 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
418 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
419 }
420 493
421#ifdef HAVE_SCROLLBARS 494#ifdef HAVE_SCROLLBARS
422 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 495 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
423#endif 496#endif
424 497
425#ifdef XTERM_REVERSE_VIDEO 498#ifdef XTERM_REVERSE_VIDEO
426 /* this is how xterm implements reverseVideo */ 499 /* this is how xterm implements reverseVideo */
427 if (OPTION (Opt_reverseVideo)) 500 if (option (Opt_reverseVideo))
428 { 501 {
429 if (!rs[Rs_color + Color_fg]) 502 if (!rs[Rs_color + Color_fg])
430 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 503 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431 504
432 if (!rs[Rs_color + Color_bg]) 505 if (!rs[Rs_color + Color_bg])
… …
438 if (!rs[Rs_color + i]) 511 if (!rs[Rs_color + i])
439 rs[Rs_color + i] = def_colorName[i]; 512 rs[Rs_color + i] = def_colorName[i];
440 513
441#ifndef XTERM_REVERSE_VIDEO 514#ifndef XTERM_REVERSE_VIDEO
442 /* this is how we implement reverseVideo */ 515 /* this is how we implement reverseVideo */
443 if (OPTION (Opt_reverseVideo)) 516 if (option (Opt_reverseVideo))
444 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 517 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
445#endif 518#endif
446 519
447 /* convenient aliases for setting fg/bg to colors */ 520 /* convenient aliases for setting fg/bg to colors */
448 color_aliases (Color_fg); 521 color_aliases (Color_fg);
449 color_aliases (Color_bg); 522 color_aliases (Color_bg);
450#ifndef NO_CURSORCOLOR 523#ifndef NO_CURSORCOLOR
451 color_aliases (Color_cursor); 524 color_aliases (Color_cursor);
452 color_aliases (Color_cursor2); 525 color_aliases (Color_cursor2);
453#endif /* NO_CURSORCOLOR */ 526#endif /* NO_CURSORCOLOR */
454 color_aliases (Color_pointer_fg); 527 color_aliases (Color_pointer_fg);
455 color_aliases (Color_pointer_bg); 528 color_aliases (Color_pointer_bg);
456 color_aliases (Color_border); 529 color_aliases (Color_border);
457#ifndef NO_BOLD_UNDERLINE_REVERSE 530#ifndef NO_BOLD_UNDERLINE_REVERSE
458 color_aliases (Color_BD); 531 color_aliases (Color_BD);
459 color_aliases (Color_UL); 532 color_aliases (Color_UL);
460 color_aliases (Color_RV); 533 color_aliases (Color_RV);
461#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 534#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
462 535
463 if (!rs[Rs_color + Color_border]) 536 if (!rs[Rs_color + Color_border])
464 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 537 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
465 538
466 return cmd_argv; 539 return cmd_argv;
540}
541
542/*----------------------------------------------------------------------*/
543void
544rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
545{
546 this->envv = envv;
547
548 SET_R (this);
549 set_locale ("");
550 set_environ (envv); // few things in X do not call setlocale :(
551
552 init_vars ();
553
554 init_secondary ();
555
556 const char **cmd_argv = init_resources (argc, argv);
557
558#ifdef KEYSYM_RESOURCE
559 keyboard->register_done ();
560#endif
561
562#ifdef HAVE_SCROLLBARS
563 if (option (Opt_scrollBar))
564 scrollBar.setIdle (); /* set existence for size calculations */
565#endif
566
567 pty = ptytty::create ();
568
569 create_windows (argc, argv);
570
571 init_xlocale ();
572
573 scr_reset (); // initialize screen
574
575#if 0
576 XSynchronize (dpy, True);
577#endif
578
579#ifdef HAVE_SCROLLBARS
580 if (option (Opt_scrollBar))
581 resize_scrollbar (); /* create and map scrollbar */
582#endif
583#ifdef HAVE_BG_PIXMAP
584 {
585 bgPixmap.set_target (this);
586 bgPixmap.invalidate ();
587
588#ifdef ENABLE_TRANSPARENCY
589 if (option (Opt_transparent))
590 {
591 bgPixmap.set_transparent ();
592
593#ifdef HAVE_AFTERIMAGE
594 if (rs [Rs_blurradius])
595 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
596#endif
597 if (ISSET_PIXCOLOR (Color_tint))
598 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
599
600 if (rs [Rs_shade])
601 bgPixmap.set_shade (rs [Rs_shade]);
602
603 bgPixmap.set_root_pixmap ();
604 XSelectInput (dpy, display->root, PropertyChangeMask);
605 rootwin_ev.start (display, display->root);
606 }
607#endif
608
609#ifdef BG_IMAGE_FROM_FILE
610 if (rs[Rs_backgroundPixmap])
611 {
612 const char *p = rs[Rs_backgroundPixmap];
613
614 if ((p = strchr (p, ';')) != 0)
615 {
616 p++;
617 bgPixmap.set_geometry (p);
618 }
619 else
620 bgPixmap.set_defaultGeometry ();
621
622 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
623 if (!bgPixmap.window_position_sensitive ())
624 update_background ();
625 }
626#endif
627 }
628#endif
629
630#if ENABLE_PERL
631 rootwin_ev.start (display, display->root);
632#endif
633
634 set_colorfgbg ();
635
636 init_command (cmd_argv);
637
638 free (cmd_argv);
639
640 if (pty->pty >= 0)
641 pty_ev.start (pty->pty, ev::READ);
642
643 HOOK_INVOKE ((this, HOOK_START, DT_END));
644
645#if ENABLE_XEMBED
646 if (rs[Rs_embed])
647 {
648 long info[2] = { 0, XEMBED_MAPPED };
649
650 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
651 32, PropModeReplace, (unsigned char *)&info, 2);
652 }
653#endif
654
655 XMapWindow (dpy, vt);
656 XMapWindow (dpy, parent[0]);
657
658 refresh_check ();
467} 659}
468 660
469/*----------------------------------------------------------------------*/ 661/*----------------------------------------------------------------------*/
470void 662void
471rxvt_term::init_env () 663rxvt_term::init_env ()
472{ 664{
473 int i; 665 int i;
474 unsigned int u;
475 char *val; 666 char *val;
476 667
477#ifdef DISPLAY_IS_IP 668#ifdef DISPLAY_IS_IP
478 /* Fixup display_name for export over pty to any interested terminal 669 /* 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 670 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
487 */ 678 */
488 val = rxvt_network_display (rs[Rs_display_name]); 679 val = rxvt_network_display (rs[Rs_display_name]);
489 rs[Rs_display_name] = (const char *)val; 680 rs[Rs_display_name] = (const char *)val;
490 681
491 if (val == NULL) 682 if (val == NULL)
492#endif /* DISPLAY_IS_IP */ 683#endif /* DISPLAY_IS_IP */
493 val = XDisplayString (dpy); 684 val = XDisplayString (dpy);
494 685
495 if (rs[Rs_display_name] == NULL) 686 if (rs[Rs_display_name] == NULL)
496 rs[Rs_display_name] = val; /* use broken `:0' value */ 687 rs[Rs_display_name] = val; /* use broken `:0' value */
497 688
498 i = strlen (val); 689 i = strlen (val);
499 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 690 env_display = (char *)rxvt_malloc (i + 9);
500 691
501 sprintf (env_display, "DISPLAY=%s", val); 692 sprintf (env_display, "DISPLAY=%s", val);
502 693
503 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 694 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
504 695
… …
525 else 716 else
526 putenv ("COLORTERM=" COLORTERMENVFULL); 717 putenv ("COLORTERM=" COLORTERMENVFULL);
527 718
528 if (rs[Rs_term_name] != NULL) 719 if (rs[Rs_term_name] != NULL)
529 { 720 {
530 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 721 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
531 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 722 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
532 putenv (env_term); 723 putenv (env_term);
533 } 724 }
534 else 725 else
535 putenv ("TERM=" TERMENV); 726 putenv ("TERM=" TERMENV);
… …
537#ifdef HAVE_UNSETENV 728#ifdef HAVE_UNSETENV
538 /* avoid passing old settings and confusing term size */ 729 /* avoid passing old settings and confusing term size */
539 unsetenv ("LINES"); 730 unsetenv ("LINES");
540 unsetenv ("COLUMNS"); 731 unsetenv ("COLUMNS");
541 unsetenv ("TERMCAP"); /* terminfo should be okay */ 732 unsetenv ("TERMCAP"); /* terminfo should be okay */
542#endif /* HAVE_UNSETENV */ 733#endif /* HAVE_UNSETENV */
543} 734}
544 735
545/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
546/* 737/*
547 * This is more or less stolen straight from XFree86 xterm. 738 * This is more or less stolen straight from XFree86 xterm.
… …
568 759
569 this->locale = "C"; 760 this->locale = "C";
570 } 761 }
571 762
572 763
573 this->locale = rxvt_strdup (this->locale); 764 this->locale = strdup (this->locale);
574 SET_LOCALE (this->locale); 765 SET_LOCALE (this->locale);
575 mbstate.reset (); 766 mbstate.reset ();
576#endif 767#endif
577 768
578#if HAVE_NL_LANGINFO 769#if HAVE_NL_LANGINFO
… …
622 * Initialize the command connection. 813 * Initialize the command connection.
623 * This should be called after the X server connection is established. 814 * This should be called after the X server connection is established.
624 */ 815 */
625 816
626#ifdef META8_OPTION 817#ifdef META8_OPTION
627 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 818 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
628#endif 819#endif
629 820
630 get_ourmods (); 821 get_ourmods ();
631 822
632 if (!OPTION (Opt_scrollTtyOutput)) 823 if (!option (Opt_scrollTtyOutput))
633 priv_modes |= PrivMode_TtyOutputInh; 824 priv_modes |= PrivMode_TtyOutputInh;
634 if (OPTION (Opt_scrollTtyKeypress)) 825 if (option (Opt_scrollTtyKeypress))
635 priv_modes |= PrivMode_Keypress; 826 priv_modes |= PrivMode_Keypress;
636 if (!OPTION (Opt_jumpScroll)) 827 if (!option (Opt_jumpScroll))
637 priv_modes |= PrivMode_smoothScroll; 828 priv_modes |= PrivMode_smoothScroll;
638 829
639#ifndef NO_BACKSPACE_KEY 830#ifndef NO_BACKSPACE_KEY
640 if (strcmp (key_backspace, "DEC") == 0) 831 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
641 priv_modes |= PrivMode_HaveBackSpace; 832 priv_modes |= PrivMode_HaveBackSpace;
642#endif 833#endif
643 834
644 /* add value for scrollBar */ 835 /* add value for scrollBar */
645 if (scrollBar.state) 836 if (scrollBar.state)
… …
658 int i; 849 int i;
659 850
660#ifdef OFF_FOCUS_FADING 851#ifdef OFF_FOCUS_FADING
661 pix_colors = pix_colors_focused; 852 pix_colors = pix_colors_focused;
662#endif 853#endif
663 854
664 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 855 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
665 { 856 {
666 const char *name = rs[Rs_color + i]; 857 const char *name = rs[Rs_color + i];
667 858
668 if (!name) 859 if (!name)
… …
671 rxvt_color xcol; 862 rxvt_color xcol;
672 863
673 if (!set_color (xcol, name)) 864 if (!set_color (xcol, name))
674 { 865 {
675#ifndef XTERM_REVERSE_VIDEO 866#ifndef XTERM_REVERSE_VIDEO
676 if (i < 2 && OPTION (Opt_reverseVideo)) 867 if (i < 2 && option (Opt_reverseVideo))
677 name = def_colorName [1 - i]; 868 name = def_colorName [1 - i];
678 else 869 else
679#endif 870#endif
680 name = def_colorName [i]; 871 name = def_colorName [i];
681 872
… …
746 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 937 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
747 cscroll.a) 938 cscroll.a)
748 )) 939 ))
749 alias_color (Color_topShadow, Color_White); 940 alias_color (Color_topShadow, Color_White);
750 } 941 }
751#endif /* KEEP_SCROLLCOLOR */ 942#endif /* KEEP_SCROLLCOLOR */
752 943
753#ifdef OFF_FOCUS_FADING 944#ifdef OFF_FOCUS_FADING
754 if (rs[Rs_fade])
755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 945 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
756 { 946 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 947#endif
762} 948}
763 949
764/*----------------------------------------------------------------------*/ 950/*----------------------------------------------------------------------*/
765/* color aliases, fg/bg bright-bold */ 951/* color aliases, fg/bg bright-bold */
… …
769 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 955 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
770 { 956 {
771 int i = atoi (rs[Rs_color + idx]); 957 int i = atoi (rs[Rs_color + idx]);
772 958
773 if (i >= 8 && i <= 15) 959 if (i >= 8 && i <= 15)
774 { /* bright colors */ 960 /* bright colors */
775 i -= 8;
776 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 961 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
777 return; 962 else if (i >= 0 && i <= 7)
778 } 963 /* normal colors */
779
780 if (i >= 0 && i <= 7) /* normal colors */
781 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 964 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
782 } 965 }
783} 966}
784 967
785/*----------------------------------------------------------------------*/ 968/*----------------------------------------------------------------------*/
… …
877rxvt_term::create_windows (int argc, const char *const *argv) 1060rxvt_term::create_windows (int argc, const char *const *argv)
878{ 1061{
879 XClassHint classHint; 1062 XClassHint classHint;
880 XWMHints wmHint; 1063 XWMHints wmHint;
881#if ENABLE_FRILLS 1064#if ENABLE_FRILLS
882 MWMHints mwmhints; 1065 MWMHints mwmhints = { };
883#endif 1066#endif
884 XGCValues gcvalue; 1067 XGCValues gcvalue;
885 XSetWindowAttributes attributes; 1068 XSetWindowAttributes attributes;
886 Window top, parent; 1069 Window top, parent;
887 1070
… …
893 if (!set_fonts ()) 1076 if (!set_fonts ())
894 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1077 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
895 1078
896 parent = display->root; 1079 parent = display->root;
897 1080
898 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1081 attributes.override_redirect = !!option (Opt_override_redirect);
899 1082
900#if ENABLE_FRILLS 1083#if ENABLE_FRILLS
901 if (OPTION (Opt_borderLess)) 1084 if (option (Opt_borderLess))
902 { 1085 {
903 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1086 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
904 { 1087 {
905 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1088 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
906 attributes.override_redirect = true; 1089 attributes.override_redirect = true;
907 mwmhints.flags = 0;
908 } 1090 }
909 else 1091 else
910 { 1092 {
911 mwmhints.flags = MWM_HINTS_DECORATIONS; 1093 mwmhints.flags = MWM_HINTS_DECORATIONS;
912 mwmhints.decorations = 0;
913 } 1094 }
914 } 1095 }
915 else
916 mwmhints.flags = 0;
917#endif 1096#endif
918 1097
919#if ENABLE_XEMBED 1098#if ENABLE_XEMBED
920 if (rs[Rs_embed]) 1099 if (rs[Rs_embed])
921 { 1100 {
… …
956 classHint.res_name = (char *)rs[Rs_name]; 1135 classHint.res_name = (char *)rs[Rs_name];
957 classHint.res_class = (char *)RESCLASS; 1136 classHint.res_class = (char *)RESCLASS;
958 1137
959 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1138 wmHint.flags = InputHint | StateHint | WindowGroupHint;
960 wmHint.input = True; 1139 wmHint.input = True;
961 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1140 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
962 wmHint.window_group = top; 1141 wmHint.window_group = top;
963 1142
964 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1143 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
965 &szHint, &wmHint, &classHint); 1144 &szHint, &wmHint, &classHint);
966 1145
… …
1004 1183
1005 termwin_ev.start (display, top); 1184 termwin_ev.start (display, top);
1006 1185
1007 /* vt cursor: Black-on-White is standard, but this is more popular */ 1186 /* vt cursor: Black-on-White is standard, but this is more popular */
1008 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1187 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 1188
1015 /* the vt window */ 1189 /* the vt window */
1016 vt = XCreateSimpleWindow (dpy, top, 1190 vt = XCreateSimpleWindow (dpy, top,
1017 window_vt_x, window_vt_y, 1191 window_vt_x, window_vt_y,
1018 width, height, 1192 width, height,
… …
1023 attributes.bit_gravity = NorthWestGravity; 1197 attributes.bit_gravity = NorthWestGravity;
1024 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1198 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1025 1199
1026 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1200 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1027 1201
1028 if (OPTION (Opt_pointerBlank)) 1202 if (option (Opt_pointerBlank))
1029 vt_emask |= PointerMotionMask; 1203 vt_emask |= PointerMotionMask;
1030 else 1204 else
1031 vt_emask |= Button1MotionMask | Button3MotionMask; 1205 vt_emask |= Button1MotionMask | Button3MotionMask;
1032 1206
1033 vt_select_input (); 1207 vt_select_input ();
1034 1208
1035 vt_ev.start (display, vt); 1209 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 1210
1054 /* graphics context for the vt window */ 1211 /* graphics context for the vt window */
1055 gcvalue.foreground = pix_colors[Color_fg]; 1212 gcvalue.foreground = pix_colors[Color_fg];
1056 gcvalue.background = pix_colors[Color_bg]; 1213 gcvalue.background = pix_colors[Color_bg];
1057 gcvalue.graphics_exposures = 0; 1214 gcvalue.graphics_exposures = 0;
… …
1060 GCForeground | GCBackground | GCGraphicsExposures, 1217 GCForeground | GCBackground | GCGraphicsExposures,
1061 &gcvalue); 1218 &gcvalue);
1062 1219
1063 drawable = new rxvt_drawable (this, vt); 1220 drawable = new rxvt_drawable (this, vt);
1064 1221
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 1222#ifdef OFF_FOCUS_FADING
1075 // initially we are in unfocused state 1223 // initially we are in unfocused state
1076 if (rs[Rs_fade]) 1224 if (rs[Rs_fade])
1077 pix_colors = pix_colors_unfocused; 1225 pix_colors = pix_colors_unfocused;
1078#endif 1226#endif
… …
1083 1231
1084/* ------------------------------------------------------------------------- * 1232/* ------------------------------------------------------------------------- *
1085 * GET TTY CURRENT STATE * 1233 * GET TTY CURRENT STATE *
1086 * ------------------------------------------------------------------------- */ 1234 * ------------------------------------------------------------------------- */
1087void 1235void
1088rxvt_get_ttymode (ttymode_t *tio, int erase) 1236rxvt_get_ttymode (struct termios *tio, int erase)
1089{ 1237{
1090#ifdef HAVE_TERMIOS_H
1091 /* 1238 /*
1092 * standard System V termios interface 1239 * standard System V termios interface
1093 */ 1240 */
1094 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1241 if (tcgetattr (STDIN_FILENO, tio) < 0)
1095 { 1242 {
1096 // return error - use system defaults, 1243 // return error - use system defaults,
1097 // where possible, and zero elsewhere 1244 // where possible, and zero elsewhere
1098 memset (tio, 0, sizeof (ttymode_t)); 1245 memset (tio, 0, sizeof (struct termios));
1099 1246
1100 tio->c_cc[VINTR] = CINTR; 1247 tio->c_cc[VINTR] = CINTR;
1101 tio->c_cc[VQUIT] = CQUIT; 1248 tio->c_cc[VQUIT] = CQUIT;
1102 tio->c_cc[VERASE] = CERASE; 1249 tio->c_cc[VERASE] = CERASE;
1103#ifdef VERASE2 1250#ifdef VERASE2
… …
1162 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1309 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1163# if defined (ECHOCTL) && defined (ECHOKE) 1310# if defined (ECHOCTL) && defined (ECHOKE)
1164 | ECHOCTL | ECHOKE 1311 | ECHOCTL | ECHOKE
1165# endif 1312# endif
1166 | ECHOE | ECHOK); 1313 | 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 1314
1215 /* 1315 /*
1216 * Debugging 1316 * Debugging
1217 */ 1317 */
1218#ifdef DEBUG_TTYMODE 1318#ifdef DEBUG_TTYMODE
1219#ifdef HAVE_TERMIOS_H
1220 /* c_iflag bits */ 1319 /* c_iflag bits */
1221 fprintf (stderr, "Input flags\n"); 1320 fprintf (stderr, "Input flags\n");
1222 1321
1223 /* cpp token stringize doesn't work on all machines <sigh> */ 1322 /* cpp token stringize doesn't work on all machines <sigh> */
1224# define FOO(flag,name) \ 1323# define FOO(flag,name) \
… …
1287 FOO (VLNEXT, "VLNEXT"); 1386 FOO (VLNEXT, "VLNEXT");
1288# endif 1387# endif
1289 1388
1290 fprintf (stderr, "\n"); 1389 fprintf (stderr, "\n");
1291# undef FOO 1390# undef FOO
1292# endif /* HAVE_TERMIOS_H */ 1391#endif /* DEBUG_TTYMODE */
1293#endif /* DEBUG_TTYMODE */
1294} 1392}
1295 1393
1296/*----------------------------------------------------------------------*/ 1394/*----------------------------------------------------------------------*/
1297/* 1395/*
1298 * Run the command in a subprocess and return a file descriptor for the 1396 * Run the command in a subprocess and return a file descriptor for the
… …
1319 else 1417 else
1320#endif 1418#endif
1321 if (!pty->get ()) 1419 if (!pty->get ())
1322 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1420 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1323 1421
1422 int er;
1423
1424#ifndef NO_BACKSPACE_KEY
1425 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1426 er = rs[Rs_backspace_key][0];
1427 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1428 er = '\177'; /* the initial state anyway */
1429 else
1430#endif
1431 er = -1;
1432
1433 rxvt_get_ttymode (&tio, er);
1434 /* init terminal attributes */
1435 cfsetospeed (&tio, BAUDRATE);
1436 cfsetispeed (&tio, BAUDRATE);
1437 tcsetattr (pty->tty, TCSANOW, &tio);
1324 pty->set_utf8_mode (enc_utf8); 1438 pty->set_utf8_mode (enc_utf8);
1325 1439
1326 /* set initial window size */ 1440 /* set initial window size */
1327 tt_winch (); 1441 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 1442
1342#if ENABLE_FRILLS 1443#if ENABLE_FRILLS
1343 if (rs[Rs_pty_fd]) 1444 if (rs[Rs_pty_fd])
1344 return; 1445 return;
1345#endif 1446#endif
… …
1376 } 1477 }
1377 1478
1378 _exit (EXIT_FAILURE); 1479 _exit (EXIT_FAILURE);
1379 1480
1380 default: 1481 default:
1381 if (!OPTION (Opt_utmpInhibit)) 1482 if (!option (Opt_utmpInhibit))
1382 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1483 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1383 1484
1384 pty->close_tty (); 1485 pty->close_tty ();
1385 1486
1386 child_ev.start (cmd_pid); 1487 child_ev.start (cmd_pid);
1387 1488
… …
1400int 1501int
1401rxvt_term::run_child (const char *const *argv) 1502rxvt_term::run_child (const char *const *argv)
1402{ 1503{
1403 char *login; 1504 char *login;
1404 1505
1405 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1406
1407 if (OPTION (Opt_console)) 1506 if (option (Opt_console))
1507 {
1408 { /* be virtual console, fail silently */ 1508 /* be virtual console, fail silently */
1409#ifdef TIOCCONS 1509#ifdef TIOCCONS
1410 unsigned int on = 1; 1510 unsigned int on = 1;
1411 1511
1412 ioctl (STDIN_FILENO, TIOCCONS, &on); 1512 ioctl (STDIN_FILENO, TIOCCONS, &on);
1413#elif defined (SRIOCSREDIR) 1513#elif defined (SRIOCSREDIR)
… …
1415 1515
1416 fd = open (CONSOLE, O_WRONLY, 0); 1516 fd = open (CONSOLE, O_WRONLY, 0);
1417 if (fd >= 0) 1517 if (fd >= 0)
1418 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1518 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1419 close (fd); 1519 close (fd);
1420#endif /* SRIOCSREDIR */ 1520#endif /* SRIOCSREDIR */
1421 } 1521 }
1422 1522
1423 /* reset signals and spin off the command interpreter */ 1523 /* reset signals and spin off the command interpreter */
1424 signal (SIGINT, SIG_DFL); 1524 signal (SIGINT, SIG_DFL);
1425 signal (SIGQUIT, SIG_DFL); 1525 signal (SIGQUIT, SIG_DFL);
… …
1432 */ 1532 */
1433#ifdef SIGTSTP 1533#ifdef SIGTSTP
1434 signal (SIGTSTP, SIG_IGN); 1534 signal (SIGTSTP, SIG_IGN);
1435 signal (SIGTTIN, SIG_IGN); 1535 signal (SIGTTIN, SIG_IGN);
1436 signal (SIGTTOU, SIG_IGN); 1536 signal (SIGTTOU, SIG_IGN);
1437#endif /* SIGTSTP */ 1537#endif /* SIGTSTP */
1438 1538
1439 // unblock signals (signals are blocked by iom.C 1539 // unblock signals (signals are blocked by iom.C
1440 sigset_t ss; 1540 sigset_t ss;
1441 sigemptyset (&ss); 1541 sigemptyset (&ss);
1442 sigprocmask (SIG_SETMASK, &ss, 0); 1542 sigprocmask (SIG_SETMASK, &ss, 0);
1443 1543
1444 /* command interpreter path */ 1544 /* command interpreter path */
1445 if (argv != NULL) 1545 if (argv)
1446 { 1546 {
1447# ifdef DEBUG_CMD 1547# ifdef DEBUG_CMD
1448 int i; 1548 int i;
1449 1549
1450 for (i = 0; argv[i]; i++) 1550 for (i = 0; argv[i]; i++)
… …
1459 const char *argv0, *shell; 1559 const char *argv0, *shell;
1460 1560
1461 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1561 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1462 shell = "/bin/sh"; 1562 shell = "/bin/sh";
1463 1563
1464 argv0 = (const char *)rxvt_r_basename (shell); 1564 argv0 = (const char *)rxvt_basename (shell);
1465 1565
1466 if (OPTION (Opt_loginShell)) 1566 if (option (Opt_loginShell))
1467 { 1567 {
1468 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1568 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1469 1569
1470 login[0] = '-'; 1570 login[0] = '-';
1471 strcpy (&login[1], argv0); 1571 strcpy (&login[1], argv0);
1472 argv0 = login; 1572 argv0 = login;
1473 } 1573 }
1474 1574
1475 execlp (shell, argv0, NULL); 1575 execlp (shell, argv0, (char *)0);
1476 /* no error message: STDERR is closed! */ 1576 /* no error message: STDERR is closed! */
1477 } 1577 }
1478 1578
1479 return -1; 1579 return -1;
1480} 1580}

Diff Legend

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