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.214 by ayin, Fri Sep 14 17:10:34 2007 UTC vs.
Revision 1.222 by ayin, Thu Nov 15 11:36:15 2007 UTC

… …
41 41
42#include <limits> 42#include <limits>
43 43
44#include <csignal> 44#include <csignal>
45 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",
… …
319 if ((i = open ("/dev/null", O_RDONLY)) < 0) 332 if ((i = open ("/dev/null", O_RDONLY)) < 0)
320 { 333 {
321 /* TODO: BOO HISS */ 334 /* TODO: BOO HISS */
322 dup2 (STDERR_FILENO, STDIN_FILENO); 335 dup2 (STDERR_FILENO, STDIN_FILENO);
323 } 336 }
324 else if (i > STDIN_FILENO) 337 else if (i != STDIN_FILENO)
325 { 338 {
326 dup2 (i, STDIN_FILENO); 339 dup2 (i, STDIN_FILENO);
327 close (i); 340 close (i);
328 } 341 }
329 342
… …
353 */ 366 */
354 for (r_argc = 0; r_argc < argc; r_argc++) 367 for (r_argc = 0; r_argc < argc; r_argc++)
355 if (!strcmp (argv[r_argc], "-e")) 368 if (!strcmp (argv[r_argc], "-e"))
356 break; 369 break;
357 370
371 if (r_argc == argc)
372 cmd_argv = NULL;
373 else if (!argv[r_argc + 1])
374 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
375 else
376 {
377 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
378
379 for (i = 0; i < argc - r_argc - 1; i++)
380 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
381
382 cmd_argv[i] = NULL;
383 }
384
358 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 385 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
359 386
360 for (i = 0; i < r_argc; i++) 387 for (i = 0; i < r_argc; i++)
361 r_argv[i] = (const char *)argv[i]; 388 r_argv[i] = (const char *)argv[i];
362 389
363 r_argv[i] = NULL; 390 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 391
377 rs[Rs_name] = rxvt_basename (argv[0]); 392 rs[Rs_name] = rxvt_basename (argv[0]);
378 393
379 /* 394 /*
380 * Open display, get options/resources and create the window 395 * Open display, get options/resources and create the window
… …
384 rs[Rs_display_name] = ":0"; 399 rs[Rs_display_name] = ":0";
385 400
386 get_options (r_argc, r_argv); 401 get_options (r_argc, r_argv);
387 402
388 if (!(display = displays.get (rs[Rs_display_name]))) 403 if (!(display = displays.get (rs[Rs_display_name])))
404 {
405 free (r_argv);
389 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 406 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
407 }
390 408
391 // using a local pointer decreases code size a lot 409 // using a local pointer decreases code size a lot
392 xa = display->xa; 410 xa = display->xa;
393 411
394 set (display); 412 set (display);
… …
520 color_aliases (Color_fg); 538 color_aliases (Color_fg);
521 color_aliases (Color_bg); 539 color_aliases (Color_bg);
522#ifndef NO_CURSORCOLOR 540#ifndef NO_CURSORCOLOR
523 color_aliases (Color_cursor); 541 color_aliases (Color_cursor);
524 color_aliases (Color_cursor2); 542 color_aliases (Color_cursor2);
525#endif /* NO_CURSORCOLOR */ 543#endif /* NO_CURSORCOLOR */
526 color_aliases (Color_pointer_fg); 544 color_aliases (Color_pointer_fg);
527 color_aliases (Color_pointer_bg); 545 color_aliases (Color_pointer_bg);
528 color_aliases (Color_border); 546 color_aliases (Color_border);
529#ifndef NO_BOLD_UNDERLINE_REVERSE 547#ifndef NO_BOLD_UNDERLINE_REVERSE
530 color_aliases (Color_BD); 548 color_aliases (Color_BD);
531 color_aliases (Color_UL); 549 color_aliases (Color_UL);
532 color_aliases (Color_RV); 550 color_aliases (Color_RV);
533#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 551#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
534 552
535 if (!rs[Rs_color + Color_border]) 553 if (!rs[Rs_color + Color_border])
536 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 554 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
537 555
538 return cmd_argv; 556 return cmd_argv;
… …
558 */ 576 */
559 val = rxvt_network_display (rs[Rs_display_name]); 577 val = rxvt_network_display (rs[Rs_display_name]);
560 rs[Rs_display_name] = (const char *)val; 578 rs[Rs_display_name] = (const char *)val;
561 579
562 if (val == NULL) 580 if (val == NULL)
563#endif /* DISPLAY_IS_IP */ 581#endif /* DISPLAY_IS_IP */
564 val = XDisplayString (dpy); 582 val = XDisplayString (dpy);
565 583
566 if (rs[Rs_display_name] == NULL) 584 if (rs[Rs_display_name] == NULL)
567 rs[Rs_display_name] = val; /* use broken `:0' value */ 585 rs[Rs_display_name] = val; /* use broken `:0' value */
568 586
… …
608#ifdef HAVE_UNSETENV 626#ifdef HAVE_UNSETENV
609 /* avoid passing old settings and confusing term size */ 627 /* avoid passing old settings and confusing term size */
610 unsetenv ("LINES"); 628 unsetenv ("LINES");
611 unsetenv ("COLUMNS"); 629 unsetenv ("COLUMNS");
612 unsetenv ("TERMCAP"); /* terminfo should be okay */ 630 unsetenv ("TERMCAP"); /* terminfo should be okay */
613#endif /* HAVE_UNSETENV */ 631#endif /* HAVE_UNSETENV */
614} 632}
615 633
616/*----------------------------------------------------------------------*/ 634/*----------------------------------------------------------------------*/
617/* 635/*
618 * This is more or less stolen straight from XFree86 xterm. 636 * This is more or less stolen straight from XFree86 xterm.
… …
639 657
640 this->locale = "C"; 658 this->locale = "C";
641 } 659 }
642 660
643 661
644 this->locale = rxvt_strdup (this->locale); 662 this->locale = strdup (this->locale);
645 SET_LOCALE (this->locale); 663 SET_LOCALE (this->locale);
646 mbstate.reset (); 664 mbstate.reset ();
647#endif 665#endif
648 666
649#if HAVE_NL_LANGINFO 667#if HAVE_NL_LANGINFO
… …
729 int i; 747 int i;
730 748
731#ifdef OFF_FOCUS_FADING 749#ifdef OFF_FOCUS_FADING
732 pix_colors = pix_colors_focused; 750 pix_colors = pix_colors_focused;
733#endif 751#endif
734 752
735 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
736 { 754 {
737 const char *name = rs[Rs_color + i]; 755 const char *name = rs[Rs_color + i];
738 756
739 if (!name) 757 if (!name)
… …
817 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 835 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
818 cscroll.a) 836 cscroll.a)
819 )) 837 ))
820 alias_color (Color_topShadow, Color_White); 838 alias_color (Color_topShadow, Color_White);
821 } 839 }
822#endif /* KEEP_SCROLLCOLOR */ 840#endif /* KEEP_SCROLLCOLOR */
823 841
824#ifdef OFF_FOCUS_FADING 842#ifdef OFF_FOCUS_FADING
825 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 843 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
826 update_fade_color (i); 844 update_fade_color (i);
827#endif 845#endif
… …
1284 FOO (VLNEXT, "VLNEXT"); 1302 FOO (VLNEXT, "VLNEXT");
1285# endif 1303# endif
1286 1304
1287 fprintf (stderr, "\n"); 1305 fprintf (stderr, "\n");
1288# undef FOO 1306# undef FOO
1289# endif /* HAVE_TERMIOS_H */ 1307# endif /* HAVE_TERMIOS_H */
1290#endif /* DEBUG_TTYMODE */ 1308#endif /* DEBUG_TTYMODE */
1291} 1309}
1292 1310
1293/*----------------------------------------------------------------------*/ 1311/*----------------------------------------------------------------------*/
1294/* 1312/*
1295 * Run the command in a subprocess and return a file descriptor for the 1313 * Run the command in a subprocess and return a file descriptor for the
… …
1410 1428
1411 fd = open (CONSOLE, O_WRONLY, 0); 1429 fd = open (CONSOLE, O_WRONLY, 0);
1412 if (fd >= 0) 1430 if (fd >= 0)
1413 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1431 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1414 close (fd); 1432 close (fd);
1415#endif /* SRIOCSREDIR */ 1433#endif /* SRIOCSREDIR */
1416 } 1434 }
1417 1435
1418 /* reset signals and spin off the command interpreter */ 1436 /* reset signals and spin off the command interpreter */
1419 signal (SIGINT, SIG_DFL); 1437 signal (SIGINT, SIG_DFL);
1420 signal (SIGQUIT, SIG_DFL); 1438 signal (SIGQUIT, SIG_DFL);
… …
1427 */ 1445 */
1428#ifdef SIGTSTP 1446#ifdef SIGTSTP
1429 signal (SIGTSTP, SIG_IGN); 1447 signal (SIGTSTP, SIG_IGN);
1430 signal (SIGTTIN, SIG_IGN); 1448 signal (SIGTTIN, SIG_IGN);
1431 signal (SIGTTOU, SIG_IGN); 1449 signal (SIGTTOU, SIG_IGN);
1432#endif /* SIGTSTP */ 1450#endif /* SIGTSTP */
1433 1451
1434 // unblock signals (signals are blocked by iom.C 1452 // unblock signals (signals are blocked by iom.C
1435 sigset_t ss; 1453 sigset_t ss;
1436 sigemptyset (&ss); 1454 sigemptyset (&ss);
1437 sigprocmask (SIG_SETMASK, &ss, 0); 1455 sigprocmask (SIG_SETMASK, &ss, 0);

Diff Legend

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