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.215 by root, Mon Oct 8 15:36:13 2007 UTC vs.
Revision 1.230 by root, Fri Dec 14 05:25:24 2007 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
16 * - QNX support
17 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
18 * 16 *
19 * 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
20 * 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
21 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
22 * (at your option) any later version. 20 * (at your option) any later version.
… …
41 39
42#include <limits> 40#include <limits>
43 41
44#include <csignal> 42#include <csignal>
45 43
44#include <fcntl.h>
45
46#ifdef HAVE_XSETLOCALE
47# define X_LOCALE
48# include <X11/Xlocale.h>
49#else
50# ifdef HAVE_SETLOCALE
51# include <clocale>
52# endif
53#endif
54
55#ifdef HAVE_NL_LANGINFO
56# include <langinfo.h>
57#endif
58
46#ifdef DISPLAY_IS_IP 59#ifdef DISPLAY_IS_IP
47/* On Solaris link with -lsocket and -lnsl */ 60/* On Solaris link with -lsocket and -lnsl */
48#include <sys/types.h> 61#include <sys/types.h>
49#include <sys/socket.h> 62#include <sys/socket.h>
50 63
… …
141 "rgb:00/cd/00", // 2: green (Green3) 154 "rgb:00/cd/00", // 2: green (Green3)
142 "rgb:cd/cd/00", // 3: yellow (Yellow3) 155 "rgb:cd/cd/00", // 3: yellow (Yellow3)
143 "rgb:00/00/cd", // 4: blue (Blue3) 156 "rgb:00/00/cd", // 4: blue (Blue3)
144 "rgb:cd/00/cd", // 5: magenta (Magenta3) 157 "rgb:cd/00/cd", // 5: magenta (Magenta3)
145 "rgb:00/cd/cd", // 6: cyan (Cyan3) 158 "rgb:00/cd/cd", // 6: cyan (Cyan3)
146# ifdef XTERM_COLORS 159# ifdef XTERM_COLORS
147 "rgb:e5/e5/e5", // 7: white (Grey90) 160 "rgb:e5/e5/e5", // 7: white (Grey90)
148# else 161# else
149 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 162 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
150# endif 163# endif
151 /* high-intensity colors */ 164 /* high-intensity colors */
152# ifdef XTERM_COLORS 165# ifdef XTERM_COLORS
153 "rgb:4d/4d/4d", // 8: bright black (Grey30) 166 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
237 "rgb:e7/e7/e7", 250 "rgb:e7/e7/e7",
238 251
239#ifndef NO_CURSORCOLOR 252#ifndef NO_CURSORCOLOR
240 COLOR_CURSOR_BACKGROUND, 253 COLOR_CURSOR_BACKGROUND,
241 COLOR_CURSOR_FOREGROUND, 254 COLOR_CURSOR_FOREGROUND,
242#endif /* ! NO_CURSORCOLOR */ 255#endif /* ! NO_CURSORCOLOR */
243 NULL, /* Color_pointer_fg */ 256 NULL, /* Color_pointer_fg */
244 NULL, /* Color_pointer_bg */ 257 NULL, /* Color_pointer_bg */
245 NULL, /* Color_border */ 258 NULL, /* Color_border */
246#ifndef NO_BOLD_UNDERLINE_REVERSE 259#ifndef NO_BOLD_UNDERLINE_REVERSE
247 NULL, /* Color_BD */ 260 NULL, /* Color_BD */
248 NULL, /* Color_IT */ 261 NULL, /* Color_IT */
249 NULL, /* Color_UL */ 262 NULL, /* Color_UL */
250 NULL, /* Color_RV */ 263 NULL, /* Color_RV */
251#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 264#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
252#if ENABLE_FRILLS 265#if ENABLE_FRILLS
253 NULL, // Color_underline 266 NULL, // Color_underline
254#endif 267#endif
255#ifdef OPTION_HC 268#ifdef OPTION_HC
256 NULL, 269 NULL,
257#endif 270#endif
258#ifdef KEEP_SCROLLCOLOR 271#ifdef KEEP_SCROLLCOLOR
259 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
260 COLOR_SCROLLTROUGH, 273 COLOR_SCROLLTROUGH,
261#endif /* KEEP_SCROLLCOLOR */ 274#endif /* KEEP_SCROLLCOLOR */
262#if ENABLE_TRANSPARENCY 275#if ENABLE_TRANSPARENCY
263 NULL, 276 NULL,
264#endif 277#endif
265#if OFF_FOCUS_FADING 278#if OFF_FOCUS_FADING
266 "rgb:00/00/00", 279 "rgb:00/00/00",
267#endif 280#endif
268 }; 281 };
269 282
270bool 283void
271rxvt_term::init_vars () 284rxvt_term::init_vars ()
272{ 285{
273 pix_colors = // 286 pix_colors = //
274 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 287 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
275#ifdef OFF_FOCUS_FADING 288#ifdef OFF_FOCUS_FADING
276 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 289 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
277#endif 290#endif
278
279 291
280 MEvent.time = CurrentTime; 292 MEvent.time = CurrentTime;
281 MEvent.button = AnyButton; 293 MEvent.button = AnyButton;
282 want_refresh = 1; 294 want_refresh = 1;
283 priv_modes = SavedModes = PrivMode_Default; 295 priv_modes = SavedModes = PrivMode_Default;
… …
301 set_option (Opt_secondaryScreen); 313 set_option (Opt_secondaryScreen);
302 set_option (Opt_secondaryScroll); 314 set_option (Opt_secondaryScroll);
303 set_option (Opt_pastableTabs); 315 set_option (Opt_pastableTabs);
304 set_option (Opt_intensityStyles); 316 set_option (Opt_intensityStyles);
305 set_option (Opt_iso14755_52); 317 set_option (Opt_iso14755_52);
306
307 return true;
308} 318}
309 319
310void 320void
311rxvt_term::init_secondary () 321rxvt_term::init_secondary ()
312{ 322{
… …
353 */ 363 */
354 for (r_argc = 0; r_argc < argc; r_argc++) 364 for (r_argc = 0; r_argc < argc; r_argc++)
355 if (!strcmp (argv[r_argc], "-e")) 365 if (!strcmp (argv[r_argc], "-e"))
356 break; 366 break;
357 367
368 if (r_argc == argc)
369 cmd_argv = NULL;
370 else if (!argv[r_argc + 1])
371 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
372 else
373 {
374 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
375
376 for (i = 0; i < argc - r_argc - 1; i++)
377 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
378
379 cmd_argv[i] = NULL;
380 }
381
358 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 382 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
359 383
360 for (i = 0; i < r_argc; i++) 384 for (i = 0; i < r_argc; i++)
361 r_argv[i] = (const char *)argv[i]; 385 r_argv[i] = (const char *)argv[i];
362 386
363 r_argv[i] = NULL; 387 r_argv[i] = NULL;
364
365 if (r_argc == argc)
366 cmd_argv = NULL;
367 else
368 {
369 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
370
371 for (i = 0; i < argc - r_argc - 1; i++)
372 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
373
374 cmd_argv[i] = NULL;
375 }
376 388
377 rs[Rs_name] = rxvt_basename (argv[0]); 389 rs[Rs_name] = rxvt_basename (argv[0]);
378 390
379 /* 391 /*
380 * Open display, get options/resources and create the window 392 * Open display, get options/resources and create the window
… …
384 rs[Rs_display_name] = ":0"; 396 rs[Rs_display_name] = ":0";
385 397
386 get_options (r_argc, r_argv); 398 get_options (r_argc, r_argv);
387 399
388 if (!(display = displays.get (rs[Rs_display_name]))) 400 if (!(display = displays.get (rs[Rs_display_name])))
401 {
402 free (r_argv);
389 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 403 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
404 }
390 405
391 // using a local pointer decreases code size a lot 406 // using a local pointer decreases code size a lot
392 xa = display->xa; 407 xa = display->xa;
393 408
394 set (display); 409 set (display);
… …
520 color_aliases (Color_fg); 535 color_aliases (Color_fg);
521 color_aliases (Color_bg); 536 color_aliases (Color_bg);
522#ifndef NO_CURSORCOLOR 537#ifndef NO_CURSORCOLOR
523 color_aliases (Color_cursor); 538 color_aliases (Color_cursor);
524 color_aliases (Color_cursor2); 539 color_aliases (Color_cursor2);
525#endif /* NO_CURSORCOLOR */ 540#endif /* NO_CURSORCOLOR */
526 color_aliases (Color_pointer_fg); 541 color_aliases (Color_pointer_fg);
527 color_aliases (Color_pointer_bg); 542 color_aliases (Color_pointer_bg);
528 color_aliases (Color_border); 543 color_aliases (Color_border);
529#ifndef NO_BOLD_UNDERLINE_REVERSE 544#ifndef NO_BOLD_UNDERLINE_REVERSE
530 color_aliases (Color_BD); 545 color_aliases (Color_BD);
531 color_aliases (Color_UL); 546 color_aliases (Color_UL);
532 color_aliases (Color_RV); 547 color_aliases (Color_RV);
533#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 548#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
534 549
535 if (!rs[Rs_color + Color_border]) 550 if (!rs[Rs_color + Color_border])
536 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 551 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
537 552
538 return cmd_argv; 553 return cmd_argv;
… …
558 */ 573 */
559 val = rxvt_network_display (rs[Rs_display_name]); 574 val = rxvt_network_display (rs[Rs_display_name]);
560 rs[Rs_display_name] = (const char *)val; 575 rs[Rs_display_name] = (const char *)val;
561 576
562 if (val == NULL) 577 if (val == NULL)
563#endif /* DISPLAY_IS_IP */ 578#endif /* DISPLAY_IS_IP */
564 val = XDisplayString (dpy); 579 val = XDisplayString (dpy);
565 580
566 if (rs[Rs_display_name] == NULL) 581 if (rs[Rs_display_name] == NULL)
567 rs[Rs_display_name] = val; /* use broken `:0' value */ 582 rs[Rs_display_name] = val; /* use broken `:0' value */
568 583
… …
608#ifdef HAVE_UNSETENV 623#ifdef HAVE_UNSETENV
609 /* avoid passing old settings and confusing term size */ 624 /* avoid passing old settings and confusing term size */
610 unsetenv ("LINES"); 625 unsetenv ("LINES");
611 unsetenv ("COLUMNS"); 626 unsetenv ("COLUMNS");
612 unsetenv ("TERMCAP"); /* terminfo should be okay */ 627 unsetenv ("TERMCAP"); /* terminfo should be okay */
613#endif /* HAVE_UNSETENV */ 628#endif /* HAVE_UNSETENV */
614} 629}
615 630
616/*----------------------------------------------------------------------*/ 631/*----------------------------------------------------------------------*/
617/* 632/*
618 * This is more or less stolen straight from XFree86 xterm. 633 * This is more or less stolen straight from XFree86 xterm.
… …
639 654
640 this->locale = "C"; 655 this->locale = "C";
641 } 656 }
642 657
643 658
644 this->locale = rxvt_strdup (this->locale); 659 this->locale = strdup (this->locale);
645 SET_LOCALE (this->locale); 660 SET_LOCALE (this->locale);
646 mbstate.reset (); 661 mbstate.reset ();
647#endif 662#endif
648 663
649#if HAVE_NL_LANGINFO 664#if HAVE_NL_LANGINFO
… …
729 int i; 744 int i;
730 745
731#ifdef OFF_FOCUS_FADING 746#ifdef OFF_FOCUS_FADING
732 pix_colors = pix_colors_focused; 747 pix_colors = pix_colors_focused;
733#endif 748#endif
734 749
735 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 750 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
736 { 751 {
737 const char *name = rs[Rs_color + i]; 752 const char *name = rs[Rs_color + i];
738 753
739 if (!name) 754 if (!name)
… …
817 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 832 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
818 cscroll.a) 833 cscroll.a)
819 )) 834 ))
820 alias_color (Color_topShadow, Color_White); 835 alias_color (Color_topShadow, Color_White);
821 } 836 }
822#endif /* KEEP_SCROLLCOLOR */ 837#endif /* KEEP_SCROLLCOLOR */
823 838
824#ifdef OFF_FOCUS_FADING 839#ifdef OFF_FOCUS_FADING
825 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 840 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
826 update_fade_color (i); 841 update_fade_color (i);
827#endif 842#endif
… …
835 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 850 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
836 { 851 {
837 int i = atoi (rs[Rs_color + idx]); 852 int i = atoi (rs[Rs_color + idx]);
838 853
839 if (i >= 8 && i <= 15) 854 if (i >= 8 && i <= 15)
840 { /* bright colors */ 855 /* bright colors */
841 i -= 8;
842 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 856 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
843 return; 857 else if (i >= 0 && i <= 7)
844 } 858 /* normal colors */
845
846 if (i >= 0 && i <= 7) /* normal colors */
847 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 859 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
848 } 860 }
849} 861}
850 862
851/*----------------------------------------------------------------------*/ 863/*----------------------------------------------------------------------*/
… …
1211 1223
1212 /* 1224 /*
1213 * Debugging 1225 * Debugging
1214 */ 1226 */
1215#ifdef DEBUG_TTYMODE 1227#ifdef DEBUG_TTYMODE
1216#ifdef HAVE_TERMIOS_H
1217 /* c_iflag bits */ 1228 /* c_iflag bits */
1218 fprintf (stderr, "Input flags\n"); 1229 fprintf (stderr, "Input flags\n");
1219 1230
1220 /* cpp token stringize doesn't work on all machines <sigh> */ 1231 /* cpp token stringize doesn't work on all machines <sigh> */
1221# define FOO(flag,name) \ 1232# define FOO(flag,name) \
… …
1284 FOO (VLNEXT, "VLNEXT"); 1295 FOO (VLNEXT, "VLNEXT");
1285# endif 1296# endif
1286 1297
1287 fprintf (stderr, "\n"); 1298 fprintf (stderr, "\n");
1288# undef FOO 1299# undef FOO
1289# endif /* HAVE_TERMIOS_H */ 1300#endif /* DEBUG_TTYMODE */
1290#endif /* DEBUG_TTYMODE */
1291} 1301}
1292 1302
1293/*----------------------------------------------------------------------*/ 1303/*----------------------------------------------------------------------*/
1294/* 1304/*
1295 * Run the command in a subprocess and return a file descriptor for the 1305 * Run the command in a subprocess and return a file descriptor for the
… …
1398rxvt_term::run_child (const char *const *argv) 1408rxvt_term::run_child (const char *const *argv)
1399{ 1409{
1400 char *login; 1410 char *login;
1401 1411
1402 if (option (Opt_console)) 1412 if (option (Opt_console))
1413 {
1403 { /* be virtual console, fail silently */ 1414 /* be virtual console, fail silently */
1404#ifdef TIOCCONS 1415#ifdef TIOCCONS
1405 unsigned int on = 1; 1416 unsigned int on = 1;
1406 1417
1407 ioctl (STDIN_FILENO, TIOCCONS, &on); 1418 ioctl (STDIN_FILENO, TIOCCONS, &on);
1408#elif defined (SRIOCSREDIR) 1419#elif defined (SRIOCSREDIR)
… …
1410 1421
1411 fd = open (CONSOLE, O_WRONLY, 0); 1422 fd = open (CONSOLE, O_WRONLY, 0);
1412 if (fd >= 0) 1423 if (fd >= 0)
1413 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1424 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1414 close (fd); 1425 close (fd);
1415#endif /* SRIOCSREDIR */ 1426#endif /* SRIOCSREDIR */
1416 } 1427 }
1417 1428
1418 /* reset signals and spin off the command interpreter */ 1429 /* reset signals and spin off the command interpreter */
1419 signal (SIGINT, SIG_DFL); 1430 signal (SIGINT, SIG_DFL);
1420 signal (SIGQUIT, SIG_DFL); 1431 signal (SIGQUIT, SIG_DFL);
… …
1427 */ 1438 */
1428#ifdef SIGTSTP 1439#ifdef SIGTSTP
1429 signal (SIGTSTP, SIG_IGN); 1440 signal (SIGTSTP, SIG_IGN);
1430 signal (SIGTTIN, SIG_IGN); 1441 signal (SIGTTIN, SIG_IGN);
1431 signal (SIGTTOU, SIG_IGN); 1442 signal (SIGTTOU, SIG_IGN);
1432#endif /* SIGTSTP */ 1443#endif /* SIGTSTP */
1433 1444
1434 // unblock signals (signals are blocked by iom.C 1445 // unblock signals (signals are blocked by iom.C
1435 sigset_t ss; 1446 sigset_t ss;
1436 sigemptyset (&ss); 1447 sigemptyset (&ss);
1437 sigprocmask (SIG_SETMASK, &ss, 0); 1448 sigprocmask (SIG_SETMASK, &ss, 0);

Diff Legend

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