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.213 by root, Fri Sep 14 10:15:41 2007 UTC vs.
Revision 1.226 by ayin, Tue Dec 11 17:42:04 2007 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> 15 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 16 * - QNX support
14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 17 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
… …
38 41
39#include <limits> 42#include <limits>
40 43
41#include <csignal> 44#include <csignal>
42 45
46#include <fcntl.h>
47
48#ifdef HAVE_XSETLOCALE
49# define X_LOCALE
50# include <X11/Xlocale.h>
51#else
52# ifdef HAVE_SETLOCALE
53# include <clocale>
54# endif
55#endif
56
57#ifdef HAVE_NL_LANGINFO
58# include <langinfo.h>
59#endif
60
61#ifdef DISPLAY_IS_IP
62/* On Solaris link with -lsocket and -lnsl */
63#include <sys/types.h>
64#include <sys/socket.h>
65
66/* these next two are probably only on Sun (not Solaris) */
67#ifdef HAVE_SYS_SOCKIO_H
68#include <sys/sockio.h>
69#endif
70#ifdef HAVE_SYS_BYTEORDER_H
71#include <sys/byteorder.h>
72#endif
73
74#include <netinet/in.h>
75#include <arpa/inet.h>
76#include <net/if.h>
77#include <net/if_arp.h>
78
79static char *
80rxvt_network_display (const char *display)
81{
82 char buffer[1024], *rval = NULL;
83 struct ifconf ifc;
84 struct ifreq *ifr;
85 int i, skfd;
86
87 if (display[0] != ':' && strncmp (display, "unix:", 5))
88 return (char *) display; /* nothing to do */
89
90 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
91 ifc.ifc_buf = buffer;
92
93 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
94 {
95 perror ("socket");
96 return NULL;
97 }
98
99 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
100 {
101 perror ("SIOCGIFCONF");
102 close (skfd);
103 return NULL;
104 }
105
106 for (i = 0, ifr = ifc.ifc_req;
107 i < (ifc.ifc_len / sizeof (struct ifreq));
108 i++, ifr++)
109 {
110 struct ifreq ifr2;
111
112 strcpy (ifr2.ifr_name, ifr->ifr_name);
113
114 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
115 {
116 unsigned long addr;
117 struct sockaddr_in *p_addr;
118
119 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
120 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
121
122 /*
123 * not "0.0.0.0" or "127.0.0.1" - so format the address
124 */
125 if (addr && addr != 0x7F000001)
126 {
127 char *colon = strchr (display, ':');
128
129 if (colon == NULL)
130 colon = ":0.0";
131
132 rval = rxvt_malloc (strlen (colon) + 16);
133 sprintf (rval, "%d.%d.%d.%d%s",
134 (int) ((addr >> 030) & 0xFF),
135 (int) ((addr >> 020) & 0xFF),
136 (int) ((addr >> 010) & 0xFF),
137 (int) (addr & 0xFF), colon);
138 break;
139 }
140 }
141 }
142
143 close (skfd);
144
145 return rval;
146}
147#endif
148
43const char *const def_colorName[] = 149const char *const def_colorName[] =
44 { 150 {
45 COLOR_FOREGROUND, 151 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 152 COLOR_BACKGROUND,
47 /* low-intensity colors */ 153 /* low-intensity colors */
… …
50 "rgb:00/cd/00", // 2: green (Green3) 156 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: yellow (Yellow3) 157 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 158 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 159 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 160 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 161# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 162 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 163# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 164 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 165# endif
60 /* high-intensity colors */ 166 /* high-intensity colors */
61# ifdef XTERM_COLORS 167# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 168 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
146 "rgb:e7/e7/e7", 252 "rgb:e7/e7/e7",
147 253
148#ifndef NO_CURSORCOLOR 254#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 255 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 256 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 257#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 258 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 259 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 260 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 261#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 262 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 263 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 264 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 265 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 266#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 267#if ENABLE_FRILLS
162 NULL, // Color_underline 268 NULL, // Color_underline
163#endif 269#endif
164#ifdef OPTION_HC 270#ifdef OPTION_HC
165 NULL, 271 NULL,
166#endif 272#endif
167#ifdef KEEP_SCROLLCOLOR 273#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 274 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 275 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 276#endif /* KEEP_SCROLLCOLOR */
171#if ENABLE_TRANSPARENCY 277#if ENABLE_TRANSPARENCY
172 NULL, 278 NULL,
173#endif 279#endif
174#if OFF_FOCUS_FADING 280#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 281 "rgb:00/00/00",
… …
228 if ((i = open ("/dev/null", O_RDONLY)) < 0) 334 if ((i = open ("/dev/null", O_RDONLY)) < 0)
229 { 335 {
230 /* TODO: BOO HISS */ 336 /* TODO: BOO HISS */
231 dup2 (STDERR_FILENO, STDIN_FILENO); 337 dup2 (STDERR_FILENO, STDIN_FILENO);
232 } 338 }
233 else if (i > STDIN_FILENO) 339 else if (i != STDIN_FILENO)
234 { 340 {
235 dup2 (i, STDIN_FILENO); 341 dup2 (i, STDIN_FILENO);
236 close (i); 342 close (i);
237 } 343 }
238 344
… …
262 */ 368 */
263 for (r_argc = 0; r_argc < argc; r_argc++) 369 for (r_argc = 0; r_argc < argc; r_argc++)
264 if (!strcmp (argv[r_argc], "-e")) 370 if (!strcmp (argv[r_argc], "-e"))
265 break; 371 break;
266 372
373 if (r_argc == argc)
374 cmd_argv = NULL;
375 else if (!argv[r_argc + 1])
376 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
377 else
378 {
379 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
380
381 for (i = 0; i < argc - r_argc - 1; i++)
382 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
383
384 cmd_argv[i] = NULL;
385 }
386
267 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 387 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
268 388
269 for (i = 0; i < r_argc; i++) 389 for (i = 0; i < r_argc; i++)
270 r_argv[i] = (const char *)argv[i]; 390 r_argv[i] = (const char *)argv[i];
271 391
272 r_argv[i] = NULL; 392 r_argv[i] = NULL;
273
274 if (r_argc == argc)
275 cmd_argv = NULL;
276 else
277 {
278 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
279
280 for (i = 0; i < argc - r_argc - 1; i++)
281 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
282
283 cmd_argv[i] = NULL;
284 }
285 393
286 rs[Rs_name] = rxvt_basename (argv[0]); 394 rs[Rs_name] = rxvt_basename (argv[0]);
287 395
288 /* 396 /*
289 * Open display, get options/resources and create the window 397 * Open display, get options/resources and create the window
… …
293 rs[Rs_display_name] = ":0"; 401 rs[Rs_display_name] = ":0";
294 402
295 get_options (r_argc, r_argv); 403 get_options (r_argc, r_argv);
296 404
297 if (!(display = displays.get (rs[Rs_display_name]))) 405 if (!(display = displays.get (rs[Rs_display_name])))
406 {
407 free (r_argv);
298 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 408 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
409 }
299 410
300 // using a local pointer decreases code size a lot 411 // using a local pointer decreases code size a lot
301 xa = display->xa; 412 xa = display->xa;
302 413
303 set (display); 414 set (display);
… …
429 color_aliases (Color_fg); 540 color_aliases (Color_fg);
430 color_aliases (Color_bg); 541 color_aliases (Color_bg);
431#ifndef NO_CURSORCOLOR 542#ifndef NO_CURSORCOLOR
432 color_aliases (Color_cursor); 543 color_aliases (Color_cursor);
433 color_aliases (Color_cursor2); 544 color_aliases (Color_cursor2);
434#endif /* NO_CURSORCOLOR */ 545#endif /* NO_CURSORCOLOR */
435 color_aliases (Color_pointer_fg); 546 color_aliases (Color_pointer_fg);
436 color_aliases (Color_pointer_bg); 547 color_aliases (Color_pointer_bg);
437 color_aliases (Color_border); 548 color_aliases (Color_border);
438#ifndef NO_BOLD_UNDERLINE_REVERSE 549#ifndef NO_BOLD_UNDERLINE_REVERSE
439 color_aliases (Color_BD); 550 color_aliases (Color_BD);
440 color_aliases (Color_UL); 551 color_aliases (Color_UL);
441 color_aliases (Color_RV); 552 color_aliases (Color_RV);
442#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 553#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
443 554
444 if (!rs[Rs_color + Color_border]) 555 if (!rs[Rs_color + Color_border])
445 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 556 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
446 557
447 return cmd_argv; 558 return cmd_argv;
… …
467 */ 578 */
468 val = rxvt_network_display (rs[Rs_display_name]); 579 val = rxvt_network_display (rs[Rs_display_name]);
469 rs[Rs_display_name] = (const char *)val; 580 rs[Rs_display_name] = (const char *)val;
470 581
471 if (val == NULL) 582 if (val == NULL)
472#endif /* DISPLAY_IS_IP */ 583#endif /* DISPLAY_IS_IP */
473 val = XDisplayString (dpy); 584 val = XDisplayString (dpy);
474 585
475 if (rs[Rs_display_name] == NULL) 586 if (rs[Rs_display_name] == NULL)
476 rs[Rs_display_name] = val; /* use broken `:0' value */ 587 rs[Rs_display_name] = val; /* use broken `:0' value */
477 588
… …
517#ifdef HAVE_UNSETENV 628#ifdef HAVE_UNSETENV
518 /* avoid passing old settings and confusing term size */ 629 /* avoid passing old settings and confusing term size */
519 unsetenv ("LINES"); 630 unsetenv ("LINES");
520 unsetenv ("COLUMNS"); 631 unsetenv ("COLUMNS");
521 unsetenv ("TERMCAP"); /* terminfo should be okay */ 632 unsetenv ("TERMCAP"); /* terminfo should be okay */
522#endif /* HAVE_UNSETENV */ 633#endif /* HAVE_UNSETENV */
523} 634}
524 635
525/*----------------------------------------------------------------------*/ 636/*----------------------------------------------------------------------*/
526/* 637/*
527 * This is more or less stolen straight from XFree86 xterm. 638 * This is more or less stolen straight from XFree86 xterm.
… …
548 659
549 this->locale = "C"; 660 this->locale = "C";
550 } 661 }
551 662
552 663
553 this->locale = rxvt_strdup (this->locale); 664 this->locale = strdup (this->locale);
554 SET_LOCALE (this->locale); 665 SET_LOCALE (this->locale);
555 mbstate.reset (); 666 mbstate.reset ();
556#endif 667#endif
557 668
558#if HAVE_NL_LANGINFO 669#if HAVE_NL_LANGINFO
… …
638 int i; 749 int i;
639 750
640#ifdef OFF_FOCUS_FADING 751#ifdef OFF_FOCUS_FADING
641 pix_colors = pix_colors_focused; 752 pix_colors = pix_colors_focused;
642#endif 753#endif
643 754
644 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
645 { 756 {
646 const char *name = rs[Rs_color + i]; 757 const char *name = rs[Rs_color + i];
647 758
648 if (!name) 759 if (!name)
… …
726 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 837 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
727 cscroll.a) 838 cscroll.a)
728 )) 839 ))
729 alias_color (Color_topShadow, Color_White); 840 alias_color (Color_topShadow, Color_White);
730 } 841 }
731#endif /* KEEP_SCROLLCOLOR */ 842#endif /* KEEP_SCROLLCOLOR */
732 843
733#ifdef OFF_FOCUS_FADING 844#ifdef OFF_FOCUS_FADING
734 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 845 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
735 update_fade_color (i); 846 update_fade_color (i);
736#endif 847#endif
… …
744 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 855 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
745 { 856 {
746 int i = atoi (rs[Rs_color + idx]); 857 int i = atoi (rs[Rs_color + idx]);
747 858
748 if (i >= 8 && i <= 15) 859 if (i >= 8 && i <= 15)
749 { /* bright colors */ 860 /* bright colors */
750 i -= 8;
751 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 861 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
752 return; 862 else if (i >= 0 && i <= 7)
753 } 863 /* normal colors */
754
755 if (i >= 0 && i <= 7) /* normal colors */
756 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 864 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
757 } 865 }
758} 866}
759 867
760/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
… …
1120 1228
1121 /* 1229 /*
1122 * Debugging 1230 * Debugging
1123 */ 1231 */
1124#ifdef DEBUG_TTYMODE 1232#ifdef DEBUG_TTYMODE
1125#ifdef HAVE_TERMIOS_H
1126 /* c_iflag bits */ 1233 /* c_iflag bits */
1127 fprintf (stderr, "Input flags\n"); 1234 fprintf (stderr, "Input flags\n");
1128 1235
1129 /* cpp token stringize doesn't work on all machines <sigh> */ 1236 /* cpp token stringize doesn't work on all machines <sigh> */
1130# define FOO(flag,name) \ 1237# define FOO(flag,name) \
… …
1193 FOO (VLNEXT, "VLNEXT"); 1300 FOO (VLNEXT, "VLNEXT");
1194# endif 1301# endif
1195 1302
1196 fprintf (stderr, "\n"); 1303 fprintf (stderr, "\n");
1197# undef FOO 1304# undef FOO
1198# endif /* HAVE_TERMIOS_H */ 1305#endif /* DEBUG_TTYMODE */
1199#endif /* DEBUG_TTYMODE */
1200} 1306}
1201 1307
1202/*----------------------------------------------------------------------*/ 1308/*----------------------------------------------------------------------*/
1203/* 1309/*
1204 * Run the command in a subprocess and return a file descriptor for the 1310 * Run the command in a subprocess and return a file descriptor for the
… …
1307rxvt_term::run_child (const char *const *argv) 1413rxvt_term::run_child (const char *const *argv)
1308{ 1414{
1309 char *login; 1415 char *login;
1310 1416
1311 if (option (Opt_console)) 1417 if (option (Opt_console))
1418 {
1312 { /* be virtual console, fail silently */ 1419 /* be virtual console, fail silently */
1313#ifdef TIOCCONS 1420#ifdef TIOCCONS
1314 unsigned int on = 1; 1421 unsigned int on = 1;
1315 1422
1316 ioctl (STDIN_FILENO, TIOCCONS, &on); 1423 ioctl (STDIN_FILENO, TIOCCONS, &on);
1317#elif defined (SRIOCSREDIR) 1424#elif defined (SRIOCSREDIR)
… …
1319 1426
1320 fd = open (CONSOLE, O_WRONLY, 0); 1427 fd = open (CONSOLE, O_WRONLY, 0);
1321 if (fd >= 0) 1428 if (fd >= 0)
1322 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1429 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1323 close (fd); 1430 close (fd);
1324#endif /* SRIOCSREDIR */ 1431#endif /* SRIOCSREDIR */
1325 } 1432 }
1326 1433
1327 /* reset signals and spin off the command interpreter */ 1434 /* reset signals and spin off the command interpreter */
1328 signal (SIGINT, SIG_DFL); 1435 signal (SIGINT, SIG_DFL);
1329 signal (SIGQUIT, SIG_DFL); 1436 signal (SIGQUIT, SIG_DFL);
… …
1336 */ 1443 */
1337#ifdef SIGTSTP 1444#ifdef SIGTSTP
1338 signal (SIGTSTP, SIG_IGN); 1445 signal (SIGTSTP, SIG_IGN);
1339 signal (SIGTTIN, SIG_IGN); 1446 signal (SIGTTIN, SIG_IGN);
1340 signal (SIGTTOU, SIG_IGN); 1447 signal (SIGTTOU, SIG_IGN);
1341#endif /* SIGTSTP */ 1448#endif /* SIGTSTP */
1342 1449
1343 // unblock signals (signals are blocked by iom.C 1450 // unblock signals (signals are blocked by iom.C
1344 sigset_t ss; 1451 sigset_t ss;
1345 sigemptyset (&ss); 1452 sigemptyset (&ss);
1346 sigprocmask (SIG_SETMASK, &ss, 0); 1453 sigprocmask (SIG_SETMASK, &ss, 0);

Diff Legend

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