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

Diff Legend

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