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.181 by ayin, Tue May 1 21:10:04 2007 UTC vs.
Revision 1.258 by root, Sun Apr 26 01:59:53 2009 UTC

5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 14 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support
14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
15 * 16 *
16 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 20 * (at your option) any later version.
33 34
34#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 37#include "rxvtutil.h"
37#include "init.h" 38#include "init.h"
39#include "keyboard.h"
38 40
39#include <limits> 41#include <limits>
40 42
41#include <csignal> 43#include <csignal>
44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h>
58#endif
59
60#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h>
63#include <sys/socket.h>
64
65/* these next two are probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h>
68#endif
69#ifdef HAVE_SYS_BYTEORDER_H
70#include <sys/byteorder.h>
71#endif
72
73#include <netinet/in.h>
74#include <arpa/inet.h>
75#include <net/if.h>
76#include <net/if_arp.h>
77
78static char *
79rxvt_network_display (const char *display)
80{
81 char buffer[1024], *rval = NULL;
82 struct ifconf ifc;
83 struct ifreq *ifr;
84 int i, skfd;
85
86 if (display[0] != ':' && strncmp (display, "unix:", 5))
87 return (char *) display; /* nothing to do */
88
89 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
90 ifc.ifc_buf = buffer;
91
92 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
93 {
94 perror ("socket");
95 return NULL;
96 }
97
98 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
99 {
100 perror ("SIOCGIFCONF");
101 close (skfd);
102 return NULL;
103 }
104
105 for (i = 0, ifr = ifc.ifc_req;
106 i < (ifc.ifc_len / sizeof (struct ifreq));
107 i++, ifr++)
108 {
109 struct ifreq ifr2;
110
111 strcpy (ifr2.ifr_name, ifr->ifr_name);
112
113 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
114 {
115 unsigned long addr;
116 struct sockaddr_in *p_addr;
117
118 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
119 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
120
121 /*
122 * not "0.0.0.0" or "127.0.0.1" - so format the address
123 */
124 if (addr && addr != 0x7F000001)
125 {
126 char *colon = strchr (display, ':');
127
128 if (colon == NULL)
129 colon = ":0.0";
130
131 rval = rxvt_malloc (strlen (colon) + 16);
132 sprintf (rval, "%d.%d.%d.%d%s",
133 (int) ((addr >> 030) & 0xFF),
134 (int) ((addr >> 020) & 0xFF),
135 (int) ((addr >> 010) & 0xFF),
136 (int) (addr & 0xFF), colon);
137 break;
138 }
139 }
140 }
141
142 close (skfd);
143
144 return rval;
145}
146#endif
42 147
43const char *const def_colorName[] = 148const char *const def_colorName[] =
44 { 149 {
45 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
47 /* low-intensity colors */ 152 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 153 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 154 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 157 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 161 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 162# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 164# endif
60 /* high-intensity colors */ 165 /* high-intensity colors */
61# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
146 "rgb:e7/e7/e7", 251 "rgb:e7/e7/e7",
147 252
148#ifndef NO_CURSORCOLOR 253#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 254 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 255 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 256#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 257 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 258 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 259 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 260#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 261 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 262 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 263 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 264 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 265#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 266#if ENABLE_FRILLS
162 NULL, // Color_underline 267 NULL, // Color_underline
163#endif 268#endif
164#ifdef OPTION_HC 269#ifdef OPTION_HC
165 NULL, 270 NULL,
166#endif 271#endif
167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 274 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 275#endif
171#if TINTING 276#if ENABLE_TRANSPARENCY
172 NULL, 277 NULL,
173#endif 278#endif
174#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 280 "rgb:00/00/00",
176#endif 281#endif
177 }; 282 };
178 283
179bool 284void
180rxvt_term::init_vars () 285rxvt_term::init_vars ()
181{ 286{
182 pix_colors = // 287 pix_colors = pix_colors_focused;
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif
187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 288
192 MEvent.time = CurrentTime; 289 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 290 MEvent.button = AnyButton;
194 want_refresh = 1; 291 want_refresh = 1;
195 priv_modes = SavedModes = PrivMode_Default; 292 priv_modes = SavedModes = PrivMode_Default;
197 nrow = 24; 294 nrow = 24;
198 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
199 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
200 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
201 saveLines = SAVELINES; 298 saveLines = SAVELINES;
202 numpix_colors = TOTAL_COLORS;
203 299
204 refresh_limit = 1;
205 refresh_type = SLOW_REFRESH; 300 refresh_type = SLOW_REFRESH;
206 301
207 oldcursor.row = oldcursor.col = -1; 302 oldcursor.row = oldcursor.col = -1;
208#ifdef XPM_BACKGROUND
209 /* bgPixmap.w = bgPixmap.h = 0; */
210 bgPixmap.x = bgPixmap.y = 0;
211 bgPixmap.pixmap = None;
212#endif
213 303
214 last_bot = last_state = -1;
215
216 set_option (Opt_scrollBar, 1); 304 set_option (Opt_scrollBar);
217 set_option (Opt_scrollTtyOutput, 1); 305 set_option (Opt_scrollTtyOutput);
218 set_option (Opt_jumpScroll, 1); 306 set_option (Opt_jumpScroll);
307 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen, 1); 308 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll, 1); 309 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs, 1); 310 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles, 1); 311 set_option (Opt_intensityStyles);
223 312 set_option (Opt_iso14755_52);
224 return true; 313 set_option (Opt_buffered);
225} 314}
226 315
227void 316static void
228rxvt_term::init_secondary () 317init_secondary ()
229{ 318{
230 int i; 319 int i;
231 320
232 /*
233 * Close all unused file descriptors
234 * We don't want them, we don't need them.
235 */
236 if ((i = open ("/dev/null", O_RDONLY)) < 0) 321 if ((i = open ("/dev/null", O_RDONLY)) < 0)
237 { 322 {
238 /* TODO: BOO HISS */
239 dup2 (STDERR_FILENO, STDIN_FILENO); 323 dup2 (STDERR_FILENO, STDIN_FILENO);
240 } 324 }
241 else if (i > STDIN_FILENO) 325 else if (i != STDIN_FILENO)
242 { 326 {
243 dup2 (i, STDIN_FILENO); 327 dup2 (i, STDIN_FILENO);
244 close (i); 328 close (i);
245 } 329 }
246 330
247 dup2 (STDERR_FILENO, STDOUT_FILENO); 331 dup2 (STDERR_FILENO, STDOUT_FILENO);
248
249#if 0 // schmorp sayz closing filies is murder
250 for (i = STDERR_FILENO + 1; i < num_fds; i++)
251 {
252#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
253 if (i == 4 || i == 7)
254 continue;
255#endif
256 close (i);
257 }
258#endif
259} 332}
260 333
261/*----------------------------------------------------------------------*/ 334/*----------------------------------------------------------------------*/
262const char ** 335const char **
263rxvt_term::init_resources (int argc, const char *const *argv) 336rxvt_term::init_resources (int argc, const char *const *argv)
264{ 337{
265 int i, r_argc; 338 int i, r_argc;
266 char *val;
267 const char **cmd_argv, **r_argv; 339 const char **cmd_argv, **r_argv;
268 340
269 /* 341 /*
270 * Look for -e option. Find => split and make cmd_argv[] of command args 342 * Look for -e option. Find => split and make cmd_argv[] of command args
271 */ 343 */
272 for (r_argc = 0; r_argc < argc; r_argc++) 344 for (r_argc = 0; r_argc < argc; r_argc++)
273 if (!strcmp (argv[r_argc], "-e")) 345 if (!strcmp (argv[r_argc], "-e"))
274 break; 346 break;
275 347
348 if (r_argc == argc)
349 cmd_argv = NULL;
350 else if (!argv[r_argc + 1])
351 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
352 else
353 {
354 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
355
356 for (i = 0; i < argc - r_argc - 1; i++)
357 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
358
359 cmd_argv[i] = NULL;
360 }
361
276 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 362 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
277 363
278 for (i = 0; i < r_argc; i++) 364 for (i = 0; i < r_argc; i++)
279 r_argv[i] = (const char *)argv[i]; 365 r_argv[i] = (const char *)argv[i];
280 366
281 r_argv[i] = NULL; 367 r_argv[i] = NULL;
282 368
283 if (r_argc == argc)
284 cmd_argv = NULL;
285 else
286 {
287 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
288
289 for (i = 0; i < argc - r_argc - 1; i++)
290 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
291
292 cmd_argv[i] = NULL;
293 }
294
295 rs[Rs_name] = rxvt_r_basename (argv[0]); 369 rs[Rs_name] = rxvt_basename (argv[0]);
296 370
297 /* 371 /*
298 * Open display, get options/resources and create the window 372 * Open display, get options/resources and create the window
299 */ 373 */
300 374
302 rs[Rs_display_name] = ":0"; 376 rs[Rs_display_name] = ":0";
303 377
304 get_options (r_argc, r_argv); 378 get_options (r_argc, r_argv);
305 379
306 if (!(display = displays.get (rs[Rs_display_name]))) 380 if (!(display = displays.get (rs[Rs_display_name])))
381 {
382 free (r_argv);
307 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 383 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
384 }
308 385
309 // using a local pointer decreases code size a lot 386 // using a local pointer decreases code size a lot
310 xa = display->xa; 387 xa = display->xa;
311 388
312 set (display); 389 set (display);
320 free (r_argv); 397 free (r_argv);
321 398
322 for (int i = NUM_RESOURCES; i--; ) 399 for (int i = NUM_RESOURCES; i--; )
323 if (rs [i] == resval_undef) 400 if (rs [i] == resval_undef)
324 rs [i] = 0; 401 rs [i] = 0;
402
403#ifdef HAVE_AFTERIMAGE
404 set_application_name ((char *)rs[Rs_name]);
405 set_output_threshold (OUTPUT_LEVEL_WARNING);
406#endif
325 407
326#if ENABLE_PERL 408#if ENABLE_PERL
327 if (!rs[Rs_perl_ext_1]) 409 if (!rs[Rs_perl_ext_1])
328 rs[Rs_perl_ext_1] = "default"; 410 rs[Rs_perl_ext_1] = "default";
329 411
340 * set any defaults not already set 422 * set any defaults not already set
341 */ 423 */
342 if (cmd_argv && cmd_argv[0]) 424 if (cmd_argv && cmd_argv[0])
343 { 425 {
344 if (!rs[Rs_title]) 426 if (!rs[Rs_title])
345 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 427 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
428
346 if (!rs[Rs_iconName]) 429 if (!rs[Rs_iconName])
347 rs[Rs_iconName] = rs[Rs_title]; 430 rs[Rs_iconName] = rs[Rs_title];
348 } 431 }
349 else 432 else
350 { 433 {
351 if (!rs[Rs_title]) 434 if (!rs[Rs_title])
352 rs[Rs_title] = rs[Rs_name]; 435 rs[Rs_title] = rs[Rs_name];
436
353 if (!rs[Rs_iconName]) 437 if (!rs[Rs_iconName])
354 rs[Rs_iconName] = rs[Rs_name]; 438 rs[Rs_iconName] = rs[Rs_name];
355 } 439 }
356 440
357 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 441 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
377 461
378 /* no point having a scrollbar without having any scrollback! */ 462 /* no point having a scrollbar without having any scrollback! */
379 if (!saveLines) 463 if (!saveLines)
380 set_option (Opt_scrollBar, 0); 464 set_option (Opt_scrollBar, 0);
381 465
382#ifdef PRINTPIPE
383 if (!rs[Rs_print_pipe])
384 rs[Rs_print_pipe] = PRINTPIPE;
385#endif
386
387 if (!rs[Rs_cutchars]) 466 if (!rs[Rs_cutchars])
388 rs[Rs_cutchars] = CUTCHARS; 467 rs[Rs_cutchars] = CUTCHARS;
389 468
390#ifndef NO_BACKSPACE_KEY 469#ifndef NO_BACKSPACE_KEY
391 if (!rs[Rs_backspace_key]) 470 if (!rs[Rs_backspace_key])
392# ifdef DEFAULT_BACKSPACE 471# ifdef DEFAULT_BACKSPACE
393 key_backspace = DEFAULT_BACKSPACE; 472 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
394# else 473# else
395 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 474 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
396# endif 475# endif
397 else
398 {
399 val = strdup (rs[Rs_backspace_key]);
400 rxvt_Str_trim (val);
401 rxvt_Str_escaped (val);
402 key_backspace = val;
403 }
404#endif 476#endif
405 477
406#ifndef NO_DELETE_KEY 478#ifndef NO_DELETE_KEY
407 if (!rs[Rs_delete_key]) 479 if (!rs[Rs_delete_key])
408# ifdef DEFAULT_DELETE 480# ifdef DEFAULT_DELETE
409 key_delete = DEFAULT_DELETE; 481 rs[Rs_delete_key] = DEFAULT_DELETE;
410# else 482# else
411 key_delete = "\033[3~"; 483 rs[Rs_delete_key] = "\033[3~";
412# endif
413 else
414 {
415 val = strdup (rs[Rs_delete_key]);
416 rxvt_Str_trim (val);
417 rxvt_Str_escaped (val);
418 key_delete = val;
419 }
420#endif 484# endif
421 if (rs[Rs_answerbackstring])
422 {
423 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
424 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
425 }
426
427#ifdef HAVE_SCROLLBARS
428 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
429#endif 485#endif
486
487 scrollBar.setup (this);
430 488
431#ifdef XTERM_REVERSE_VIDEO 489#ifdef XTERM_REVERSE_VIDEO
432 /* this is how xterm implements reverseVideo */ 490 /* this is how xterm implements reverseVideo */
433 if (OPTION (Opt_reverseVideo)) 491 if (option (Opt_reverseVideo))
434 { 492 {
435 if (!rs[Rs_color + Color_fg]) 493 if (!rs[Rs_color + Color_fg])
436 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 494 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
437 495
438 if (!rs[Rs_color + Color_bg]) 496 if (!rs[Rs_color + Color_bg])
444 if (!rs[Rs_color + i]) 502 if (!rs[Rs_color + i])
445 rs[Rs_color + i] = def_colorName[i]; 503 rs[Rs_color + i] = def_colorName[i];
446 504
447#ifndef XTERM_REVERSE_VIDEO 505#ifndef XTERM_REVERSE_VIDEO
448 /* this is how we implement reverseVideo */ 506 /* this is how we implement reverseVideo */
449 if (OPTION (Opt_reverseVideo)) 507 if (option (Opt_reverseVideo))
450 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 508 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
451#endif 509#endif
452 510
453 /* convenient aliases for setting fg/bg to colors */ 511 /* convenient aliases for setting fg/bg to colors */
454 color_aliases (Color_fg); 512 color_aliases (Color_fg);
455 color_aliases (Color_bg); 513 color_aliases (Color_bg);
456#ifndef NO_CURSORCOLOR 514#ifndef NO_CURSORCOLOR
457 color_aliases (Color_cursor); 515 color_aliases (Color_cursor);
458 color_aliases (Color_cursor2); 516 color_aliases (Color_cursor2);
459#endif /* NO_CURSORCOLOR */ 517#endif /* NO_CURSORCOLOR */
460 color_aliases (Color_pointer_fg); 518 color_aliases (Color_pointer_fg);
461 color_aliases (Color_pointer_bg); 519 color_aliases (Color_pointer_bg);
462 color_aliases (Color_border); 520 color_aliases (Color_border);
463#ifndef NO_BOLD_UNDERLINE_REVERSE 521#ifndef NO_BOLD_UNDERLINE_REVERSE
464 color_aliases (Color_BD); 522 color_aliases (Color_BD);
465 color_aliases (Color_UL); 523 color_aliases (Color_UL);
466 color_aliases (Color_RV); 524 color_aliases (Color_RV);
467#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 525#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
468 526
469 if (!rs[Rs_color + Color_border]) 527 if (!rs[Rs_color + Color_border])
470 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 528 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
471 529
472 return cmd_argv; 530 return cmd_argv;
531}
532
533/*----------------------------------------------------------------------*/
534void
535rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
536{
537 this->envv = envv;
538
539 SET_R (this);
540 set_locale ("");
541 set_environ (envv); // a few things in X do not call setlocale :(
542
543 init_vars ();
544
545 init_secondary ();
546
547 const char **cmd_argv = init_resources (argc, argv);
548
549#ifdef KEYSYM_RESOURCE
550 keyboard->register_done ();
551#endif
552
553 if (const char *path = rs[Rs_chdir])
554 if (*path) // ignored if empty
555 {
556 if (*path != '/')
557 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
558
559 if (chdir (path))
560 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
561 }
562
563 if (option (Opt_scrollBar))
564 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
565
566 pty = ptytty::create ();
567
568 create_windows (argc, argv);
569
570 init_xlocale ();
571
572 scr_poweron (); // initialize screen
573
574#if 0
575 XSynchronize (dpy, True);
576#endif
577
578 if (option (Opt_scrollBar))
579 scrollBar.resize (); /* create and map scrollbar */
580#ifdef HAVE_BG_PIXMAP
581 {
582 bgPixmap.set_target (this);
583 bgPixmap.invalidate ();
584
585#ifdef ENABLE_TRANSPARENCY
586 if (option (Opt_transparent))
587 {
588 bgPixmap.set_transparent ();
589
590#ifdef HAVE_AFTERIMAGE
591 if (rs [Rs_blurradius])
592 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
593#endif
594 if (ISSET_PIXCOLOR (Color_tint))
595 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
596
597 if (rs [Rs_shade])
598 bgPixmap.set_shade (rs [Rs_shade]);
599
600 bgPixmap.set_root_pixmap ();
601 XSelectInput (dpy, display->root, PropertyChangeMask);
602 rootwin_ev.start (display, display->root);
603 }
604#endif
605
606#ifdef BG_IMAGE_FROM_FILE
607 if (rs[Rs_backgroundPixmap])
608 {
609 const char *p = rs[Rs_backgroundPixmap];
610
611 if ((p = strchr (p, ';')) != 0)
612 {
613 p++;
614 bgPixmap.set_geometry (p);
615 }
616 else
617 bgPixmap.set_defaultGeometry ();
618
619 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
620 if (!bgPixmap.window_position_sensitive ())
621 update_background ();
622 }
623#endif
624 }
625#endif
626
627#if ENABLE_PERL
628 rootwin_ev.start (display, display->root);
629#endif
630
631 set_colorfgbg ();
632
633 init_command (cmd_argv);
634
635 free (cmd_argv);
636
637 if (pty->pty >= 0)
638 pty_ev.start (pty->pty, ev::READ);
639
640 HOOK_INVOKE ((this, HOOK_START, DT_END));
641
642#if ENABLE_XEMBED
643 if (rs[Rs_embed])
644 {
645 long info[2] = { 0, XEMBED_MAPPED };
646
647 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
648 32, PropModeReplace, (unsigned char *)&info, 2);
649 }
650#endif
651
652 XMapWindow (dpy, vt);
653 XMapWindow (dpy, parent[0]);
654
655 refresh_check ();
473} 656}
474 657
475/*----------------------------------------------------------------------*/ 658/*----------------------------------------------------------------------*/
476void 659void
477rxvt_term::init_env () 660rxvt_term::init_env ()
478{ 661{
479 int i; 662 int i;
480 unsigned int u;
481 char *val; 663 char *val;
482 664
483#ifdef DISPLAY_IS_IP 665#ifdef DISPLAY_IS_IP
484 /* Fixup display_name for export over pty to any interested terminal 666 /* Fixup display_name for export over pty to any interested terminal
485 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 667 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
493 */ 675 */
494 val = rxvt_network_display (rs[Rs_display_name]); 676 val = rxvt_network_display (rs[Rs_display_name]);
495 rs[Rs_display_name] = (const char *)val; 677 rs[Rs_display_name] = (const char *)val;
496 678
497 if (val == NULL) 679 if (val == NULL)
498#endif /* DISPLAY_IS_IP */ 680#endif /* DISPLAY_IS_IP */
499 val = XDisplayString (dpy); 681 val = XDisplayString (dpy);
500 682
501 if (rs[Rs_display_name] == NULL) 683 if (rs[Rs_display_name] == NULL)
502 rs[Rs_display_name] = val; /* use broken `:0' value */ 684 rs[Rs_display_name] = val; /* use broken `:0' value */
503 685
504 i = strlen (val); 686 i = strlen (val);
505 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 687 env_display = (char *)rxvt_malloc (i + 9);
506 688
507 sprintf (env_display, "DISPLAY=%s", val); 689 sprintf (env_display, "DISPLAY=%s", val);
508 690
509 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 691 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
510 692
531 else 713 else
532 putenv ("COLORTERM=" COLORTERMENVFULL); 714 putenv ("COLORTERM=" COLORTERMENVFULL);
533 715
534 if (rs[Rs_term_name] != NULL) 716 if (rs[Rs_term_name] != NULL)
535 { 717 {
536 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 718 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
537 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 719 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
538 putenv (env_term); 720 putenv (env_term);
539 } 721 }
540 else 722 else
541 putenv ("TERM=" TERMENV); 723 putenv ("TERM=" TERMENV);
543#ifdef HAVE_UNSETENV 725#ifdef HAVE_UNSETENV
544 /* avoid passing old settings and confusing term size */ 726 /* avoid passing old settings and confusing term size */
545 unsetenv ("LINES"); 727 unsetenv ("LINES");
546 unsetenv ("COLUMNS"); 728 unsetenv ("COLUMNS");
547 unsetenv ("TERMCAP"); /* terminfo should be okay */ 729 unsetenv ("TERMCAP"); /* terminfo should be okay */
548#endif /* HAVE_UNSETENV */ 730#endif /* HAVE_UNSETENV */
549} 731}
550 732
551/*----------------------------------------------------------------------*/ 733/*----------------------------------------------------------------------*/
552/* 734/*
553 * This is more or less stolen straight from XFree86 xterm. 735 * This is more or less stolen straight from XFree86 xterm.
574 756
575 this->locale = "C"; 757 this->locale = "C";
576 } 758 }
577 759
578 760
579 this->locale = rxvt_strdup (this->locale); 761 this->locale = strdup (this->locale);
580 SET_LOCALE (this->locale); 762 SET_LOCALE (this->locale);
581 mbstate.reset (); 763 mbstate.reset ();
582#endif 764#endif
583 765
584#if HAVE_NL_LANGINFO 766#if HAVE_NL_LANGINFO
628 * Initialize the command connection. 810 * Initialize the command connection.
629 * This should be called after the X server connection is established. 811 * This should be called after the X server connection is established.
630 */ 812 */
631 813
632#ifdef META8_OPTION 814#ifdef META8_OPTION
633 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 815 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
634#endif 816#endif
635 817
636 get_ourmods (); 818 get_ourmods ();
637 819
638 if (!OPTION (Opt_scrollTtyOutput)) 820 if (!option (Opt_scrollTtyOutput))
639 priv_modes |= PrivMode_TtyOutputInh; 821 priv_modes |= PrivMode_TtyOutputInh;
640 if (OPTION (Opt_scrollTtyKeypress)) 822 if (option (Opt_scrollTtyKeypress))
641 priv_modes |= PrivMode_Keypress; 823 priv_modes |= PrivMode_Keypress;
642 if (!OPTION (Opt_jumpScroll)) 824 if (!option (Opt_jumpScroll))
643 priv_modes |= PrivMode_smoothScroll; 825 priv_modes |= PrivMode_smoothScroll;
644 826
645#ifndef NO_BACKSPACE_KEY 827#ifndef NO_BACKSPACE_KEY
646 if (strcmp (key_backspace, "DEC") == 0) 828 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
647 priv_modes |= PrivMode_HaveBackSpace; 829 priv_modes |= PrivMode_HaveBackSpace;
648#endif 830#endif
649 831
650 /* add value for scrollBar */ 832 /* add value for scrollBar */
651 if (scrollBar.state) 833 if (scrollBar.state)
657 run_command (argv); 839 run_command (argv);
658} 840}
659 841
660/*----------------------------------------------------------------------*/ 842/*----------------------------------------------------------------------*/
661void 843void
662rxvt_term::Get_Colours () 844rxvt_term::get_colours ()
663{ 845{
664 int i; 846 int i;
665 847
666#ifdef OFF_FOCUS_FADING 848#ifdef OFF_FOCUS_FADING
667 pix_colors = pix_colors_focused; 849 pix_colors = pix_colors_focused;
668#endif 850#endif
669 851
670 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 852 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
671 { 853 {
672 const char *name = rs[Rs_color + i]; 854 const char *name = rs[Rs_color + i];
673 855
674 if (!name) 856 if (!name)
677 rxvt_color xcol; 859 rxvt_color xcol;
678 860
679 if (!set_color (xcol, name)) 861 if (!set_color (xcol, name))
680 { 862 {
681#ifndef XTERM_REVERSE_VIDEO 863#ifndef XTERM_REVERSE_VIDEO
682 if (i < 2 && OPTION (Opt_reverseVideo)) 864 if (i < 2 && option (Opt_reverseVideo))
683 name = def_colorName [1 - i]; 865 name = def_colorName [1 - i];
684 else 866 else
685#endif 867#endif
686 name = def_colorName [i]; 868 name = def_colorName [i];
687 869
727 * get scrollBar shadow colors 909 * get scrollBar shadow colors
728 * 910 *
729 * The calculations of topShadow/bottomShadow values are adapted 911 * The calculations of topShadow/bottomShadow values are adapted
730 * from the fvwm window manager. 912 * from the fvwm window manager.
731 */ 913 */
732#ifdef KEEP_SCROLLCOLOR 914#ifdef RXVT_SCROLLBAR
733 if (depth <= 2) 915 if (depth <= 2)
734 { 916 {
735 /* Monochrome */ 917 /* Monochrome */
736 alias_color (Color_scroll, Color_fg); 918 alias_color (Color_scroll, Color_fg);
737 alias_color (Color_topShadow, Color_bg); 919 alias_color (Color_topShadow, Color_bg);
752 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 934 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
753 cscroll.a) 935 cscroll.a)
754 )) 936 ))
755 alias_color (Color_topShadow, Color_White); 937 alias_color (Color_topShadow, Color_White);
756 } 938 }
757#endif /* KEEP_SCROLLCOLOR */ 939#endif
758 940
759#ifdef OFF_FOCUS_FADING 941#ifdef OFF_FOCUS_FADING
760 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 942 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
761 update_fade_color (i); 943 update_fade_color (i);
762#endif 944#endif
770 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 952 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
771 { 953 {
772 int i = atoi (rs[Rs_color + idx]); 954 int i = atoi (rs[Rs_color + idx]);
773 955
774 if (i >= 8 && i <= 15) 956 if (i >= 8 && i <= 15)
775 { /* bright colors */ 957 /* bright colors */
776 i -= 8;
777 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 958 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
778 return; 959 else if (i >= 0 && i <= 7)
779 } 960 /* normal colors */
780
781 if (i >= 0 && i <= 7) /* normal colors */
782 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 961 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
783 } 962 }
784} 963}
785 964
786/*----------------------------------------------------------------------*/ 965/*----------------------------------------------------------------------*/
878rxvt_term::create_windows (int argc, const char *const *argv) 1057rxvt_term::create_windows (int argc, const char *const *argv)
879{ 1058{
880 XClassHint classHint; 1059 XClassHint classHint;
881 XWMHints wmHint; 1060 XWMHints wmHint;
882#if ENABLE_FRILLS 1061#if ENABLE_FRILLS
883 MWMHints mwmhints; 1062 MWMHints mwmhints = { };
884#endif 1063#endif
885 XGCValues gcvalue; 1064 XGCValues gcvalue;
886 XSetWindowAttributes attributes; 1065 XSetWindowAttributes attributes;
887 Window top, parent; 1066 Window top, parent;
888 1067
889 dLocal (Display *, dpy); 1068 dLocal (Display *, dpy);
890 1069
891 /* grab colors before netscape does */ 1070 /* grab colors before netscape does */
892 Get_Colours (); 1071 get_colours ();
893 1072
894 if (!set_fonts ()) 1073 if (!set_fonts ())
895 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1074 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
896 1075
897 parent = display->root; 1076 parent = display->root;
898 1077
899 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1078 attributes.override_redirect = !!option (Opt_override_redirect);
900 1079
901#if ENABLE_FRILLS 1080#if ENABLE_FRILLS
902 if (OPTION (Opt_borderLess)) 1081 if (option (Opt_borderLess))
903 { 1082 {
904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 1083 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905 { 1084 {
906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1085 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
907 attributes.override_redirect = true; 1086 attributes.override_redirect = true;
908 mwmhints.flags = 0;
909 } 1087 }
910 else 1088 else
911 { 1089 {
912 mwmhints.flags = MWM_HINTS_DECORATIONS; 1090 mwmhints.flags = MWM_HINTS_DECORATIONS;
913 mwmhints.decorations = 0;
914 } 1091 }
915 } 1092 }
916 else
917 mwmhints.flags = 0;
918#endif 1093#endif
919 1094
920#if ENABLE_XEMBED 1095#if ENABLE_XEMBED
921 if (rs[Rs_embed]) 1096 if (rs[Rs_embed])
922 { 1097 {
949 this->parent[0] = top; 1124 this->parent[0] = top;
950 1125
951 old_width = szHint.width; 1126 old_width = szHint.width;
952 old_height = szHint.height; 1127 old_height = szHint.height;
953 1128
954 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1129 set_title (rs [Rs_title]);
955 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1130 set_icon_name (rs [Rs_iconName]);
956 1131
957 classHint.res_name = (char *)rs[Rs_name]; 1132 classHint.res_name = (char *)rs[Rs_name];
958 classHint.res_class = (char *)RESCLASS; 1133 classHint.res_class = (char *)RESCLASS;
959 1134
960 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1135 wmHint.flags = InputHint | StateHint | WindowGroupHint;
961 wmHint.input = True; 1136 wmHint.input = True;
962 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1137 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
963 wmHint.window_group = top; 1138 wmHint.window_group = top;
964 1139
965 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1140 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
966 &szHint, &wmHint, &classHint); 1141 &szHint, &wmHint, &classHint);
1142#if ENABLE_EWMH
1143# ifdef HAVE_AFTERIMAGE
1144 /*
1145 * set up icon hint
1146 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1147 */
1148
1149 if (rs [Rs_iconfile])
1150 {
1151 init_asv ();
1152
1153 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1154 if (asv && im)
1155 {
1156 int w = im->width;
1157 int h = im->height;
1158 long* buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1159 ASImage *result = scale_asimage (asv, im,
1160 w, h, ASA_ARGB32,
1161 100, ASIMAGE_QUALITY_DEFAULT);
1162 destroy_asimage (&im);
1163
1164 if (buffer && result)
1165 {
1166 ARGB32 *asbuf = result->alt.argb32;
1167 buffer [0] = w;
1168 buffer [1] = h;
1169
1170 for (unsigned int i = 0; i < w * h; ++i)
1171 buffer [i + 2] = asbuf [i];
1172
1173 destroy_asimage (&result);
1174 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1175 PropModeReplace, (const unsigned char*) buffer, 2 + w * h);
1176 free (buffer);
1177 }
1178 else
1179 {
1180 if (!buffer)
1181 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1182
1183 if (!result)
1184 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1185 }
1186 }
1187 else
1188 rxvt_warn ("Loading image icon failed, continuing without.\n");
1189 }
1190# endif
1191#endif
967 1192
968#if ENABLE_FRILLS 1193#if ENABLE_FRILLS
969 if (mwmhints.flags) 1194 if (mwmhints.flags)
970 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1195 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
971 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1196 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1005 1230
1006 termwin_ev.start (display, top); 1231 termwin_ev.start (display, top);
1007 1232
1008 /* vt cursor: Black-on-White is standard, but this is more popular */ 1233 /* vt cursor: Black-on-White is standard, but this is more popular */
1009 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1234 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1010
1011#ifdef HAVE_SCROLLBARS
1012 /* cursor scrollBar: Black-on-White */
1013 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1014#endif
1015 1235
1016 /* the vt window */ 1236 /* the vt window */
1017 vt = XCreateSimpleWindow (dpy, top, 1237 vt = XCreateSimpleWindow (dpy, top,
1018 window_vt_x, window_vt_y, 1238 window_vt_x, window_vt_y,
1019 width, height, 1239 width, height,
1024 attributes.bit_gravity = NorthWestGravity; 1244 attributes.bit_gravity = NorthWestGravity;
1025 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1245 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1026 1246
1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1247 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1028 1248
1029 if (OPTION (Opt_pointerBlank)) 1249 if (option (Opt_pointerBlank))
1030 vt_emask |= PointerMotionMask; 1250 vt_emask |= PointerMotionMask;
1031 else 1251 else
1032 vt_emask |= Button1MotionMask | Button3MotionMask; 1252 vt_emask |= Button1MotionMask | Button3MotionMask;
1033 1253
1034 vt_select_input (); 1254 vt_select_input ();
1035 1255
1036 vt_ev.start (display, vt); 1256 vt_ev.start (display, vt);
1037
1038#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL
1040 && !OPTION (Opt_transparent))
1041 {
1042 const char *p = rs[Rs_backgroundPixmap];
1043
1044 if ((p = strchr (p, ';')) != NULL)
1045 {
1046 p++;
1047 scale_pixmap (p);
1048 }
1049
1050 set_bgPixmap (rs[Rs_backgroundPixmap]);
1051 scr_touch (true);
1052 }
1053#endif
1054 1257
1055 /* graphics context for the vt window */ 1258 /* graphics context for the vt window */
1056 gcvalue.foreground = pix_colors[Color_fg]; 1259 gcvalue.foreground = pix_colors[Color_fg];
1057 gcvalue.background = pix_colors[Color_bg]; 1260 gcvalue.background = pix_colors[Color_bg];
1058 gcvalue.graphics_exposures = 0; 1261 gcvalue.graphics_exposures = 0;
1061 GCForeground | GCBackground | GCGraphicsExposures, 1264 GCForeground | GCBackground | GCGraphicsExposures,
1062 &gcvalue); 1265 &gcvalue);
1063 1266
1064 drawable = new rxvt_drawable (this, vt); 1267 drawable = new rxvt_drawable (this, vt);
1065 1268
1066#ifdef RXVT_SCROLLBAR
1067 gcvalue.foreground = pix_colors[Color_topShadow];
1068 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1069 gcvalue.foreground = pix_colors[Color_bottomShadow];
1070 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1071 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1072 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1073#endif
1074
1075#ifdef OFF_FOCUS_FADING 1269#ifdef OFF_FOCUS_FADING
1076 // initially we are in unfocused state 1270 // initially we are in unfocused state
1077 if (rs[Rs_fade]) 1271 if (rs[Rs_fade])
1078 pix_colors = pix_colors_unfocused; 1272 pix_colors = pix_colors_unfocused;
1079#endif 1273#endif
1084 1278
1085/* ------------------------------------------------------------------------- * 1279/* ------------------------------------------------------------------------- *
1086 * GET TTY CURRENT STATE * 1280 * GET TTY CURRENT STATE *
1087 * ------------------------------------------------------------------------- */ 1281 * ------------------------------------------------------------------------- */
1088void 1282void
1089rxvt_get_ttymode (ttymode_t *tio, int erase) 1283rxvt_get_ttymode (struct termios *tio, int erase)
1090{ 1284{
1091 /* 1285 /*
1092 * standard System V termios interface 1286 * standard System V termios interface
1093 */ 1287 */
1094 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1288 if (tcgetattr (STDIN_FILENO, tio) < 0)
1095 { 1289 {
1096 // return error - use system defaults, 1290 // return error - use system defaults,
1097 // where possible, and zero elsewhere 1291 // where possible, and zero elsewhere
1098 memset (tio, 0, sizeof (ttymode_t)); 1292 memset (tio, 0, sizeof (struct termios));
1099 1293
1100 tio->c_cc[VINTR] = CINTR; 1294 tio->c_cc[VINTR] = CINTR;
1101 tio->c_cc[VQUIT] = CQUIT; 1295 tio->c_cc[VQUIT] = CQUIT;
1102 tio->c_cc[VERASE] = CERASE; 1296 tio->c_cc[VERASE] = CERASE;
1103#ifdef VERASE2 1297#ifdef VERASE2
1167 1361
1168 /* 1362 /*
1169 * Debugging 1363 * Debugging
1170 */ 1364 */
1171#ifdef DEBUG_TTYMODE 1365#ifdef DEBUG_TTYMODE
1172#ifdef HAVE_TERMIOS_H
1173 /* c_iflag bits */ 1366 /* c_iflag bits */
1174 fprintf (stderr, "Input flags\n"); 1367 fprintf (stderr, "Input flags\n");
1175 1368
1176 /* cpp token stringize doesn't work on all machines <sigh> */ 1369 /* cpp token stringize doesn't work on all machines <sigh> */
1177# define FOO(flag,name) \ 1370# define FOO(flag,name) \
1240 FOO (VLNEXT, "VLNEXT"); 1433 FOO (VLNEXT, "VLNEXT");
1241# endif 1434# endif
1242 1435
1243 fprintf (stderr, "\n"); 1436 fprintf (stderr, "\n");
1244# undef FOO 1437# undef FOO
1245# endif /* HAVE_TERMIOS_H */ 1438#endif /* DEBUG_TTYMODE */
1246#endif /* DEBUG_TTYMODE */
1247} 1439}
1248 1440
1249/*----------------------------------------------------------------------*/ 1441/*----------------------------------------------------------------------*/
1250/* 1442/*
1251 * Run the command in a subprocess and return a file descriptor for the 1443 * Run the command in a subprocess and return a file descriptor for the
1275 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1467 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1276 1468
1277 int er; 1469 int er;
1278 1470
1279#ifndef NO_BACKSPACE_KEY 1471#ifndef NO_BACKSPACE_KEY
1280 if (key_backspace[0] && !key_backspace[1]) 1472 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1281 er = key_backspace[0]; 1473 er = rs[Rs_backspace_key][0];
1282 else if (strcmp (key_backspace, "DEC") == 0) 1474 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1283 er = '\177'; /* the initial state anyway */ 1475 er = '\177'; /* the initial state anyway */
1284 else 1476 else
1285#endif 1477#endif
1286 er = -1; 1478 er = -1;
1287 1479
1288 rxvt_get_ttymode (&tio, er); 1480 rxvt_get_ttymode (&tio, er);
1289 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1481 /* init terminal attributes */
1482 cfsetospeed (&tio, BAUDRATE);
1483 cfsetispeed (&tio, BAUDRATE);
1484 tcsetattr (pty->tty, TCSANOW, &tio);
1290 pty->set_utf8_mode (enc_utf8); 1485 pty->set_utf8_mode (enc_utf8);
1291 1486
1292 /* set initial window size */ 1487 /* set initial window size */
1293 tt_winch (); 1488 tt_winch ();
1294 1489
1329 } 1524 }
1330 1525
1331 _exit (EXIT_FAILURE); 1526 _exit (EXIT_FAILURE);
1332 1527
1333 default: 1528 default:
1334 if (!OPTION (Opt_utmpInhibit)) 1529 if (!option (Opt_utmpInhibit))
1335 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1530 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1336 1531
1337 pty->close_tty (); 1532 pty->close_tty ();
1338 1533
1339 child_ev.start (cmd_pid); 1534 child_ev.start (cmd_pid);
1340 1535
1353int 1548int
1354rxvt_term::run_child (const char *const *argv) 1549rxvt_term::run_child (const char *const *argv)
1355{ 1550{
1356 char *login; 1551 char *login;
1357 1552
1358 if (OPTION (Opt_console)) 1553 if (option (Opt_console))
1554 {
1359 { /* be virtual console, fail silently */ 1555 /* be virtual console, fail silently */
1360#ifdef TIOCCONS 1556#ifdef TIOCCONS
1361 unsigned int on = 1; 1557 unsigned int on = 1;
1362 1558
1363 ioctl (STDIN_FILENO, TIOCCONS, &on); 1559 ioctl (STDIN_FILENO, TIOCCONS, &on);
1364#elif defined (SRIOCSREDIR) 1560#elif defined (SRIOCSREDIR)
1366 1562
1367 fd = open (CONSOLE, O_WRONLY, 0); 1563 fd = open (CONSOLE, O_WRONLY, 0);
1368 if (fd >= 0) 1564 if (fd >= 0)
1369 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1565 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1370 close (fd); 1566 close (fd);
1371#endif /* SRIOCSREDIR */ 1567#endif /* SRIOCSREDIR */
1372 } 1568 }
1373 1569
1374 /* reset signals and spin off the command interpreter */ 1570 /* reset signals and spin off the command interpreter */
1375 signal (SIGINT, SIG_DFL); 1571 signal (SIGINT, SIG_DFL);
1376 signal (SIGQUIT, SIG_DFL); 1572 signal (SIGQUIT, SIG_DFL);
1383 */ 1579 */
1384#ifdef SIGTSTP 1580#ifdef SIGTSTP
1385 signal (SIGTSTP, SIG_IGN); 1581 signal (SIGTSTP, SIG_IGN);
1386 signal (SIGTTIN, SIG_IGN); 1582 signal (SIGTTIN, SIG_IGN);
1387 signal (SIGTTOU, SIG_IGN); 1583 signal (SIGTTOU, SIG_IGN);
1388#endif /* SIGTSTP */ 1584#endif /* SIGTSTP */
1389
1390 // unblock signals (signals are blocked by iom.C
1391 sigset_t ss;
1392 sigemptyset (&ss);
1393 sigprocmask (SIG_SETMASK, &ss, 0);
1394 1585
1395 /* command interpreter path */ 1586 /* command interpreter path */
1396 if (argv != NULL) 1587 if (argv)
1397 { 1588 {
1398# ifdef DEBUG_CMD 1589# ifdef DEBUG_CMD
1399 int i; 1590 int i;
1400 1591
1401 for (i = 0; argv[i]; i++) 1592 for (i = 0; argv[i]; i++)
1410 const char *argv0, *shell; 1601 const char *argv0, *shell;
1411 1602
1412 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1603 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1413 shell = "/bin/sh"; 1604 shell = "/bin/sh";
1414 1605
1415 argv0 = (const char *)rxvt_r_basename (shell); 1606 argv0 = rxvt_basename (shell);
1416 1607
1417 if (OPTION (Opt_loginShell)) 1608 if (option (Opt_loginShell))
1418 { 1609 {
1419 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1610 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1420 1611
1421 login[0] = '-'; 1612 login[0] = '-';
1422 strcpy (&login[1], argv0); 1613 strcpy (&login[1], argv0);
1423 argv0 = login; 1614 argv0 = login;
1424 } 1615 }
1425 1616
1426 execlp (shell, argv0, NULL); 1617 execlp (shell, argv0, (char *)0);
1427 /* no error message: STDERR is closed! */ 1618 /* no error message: STDERR is closed! */
1428 } 1619 }
1429 1620
1430 return -1; 1621 return -1;
1431} 1622}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines