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.210 by ayin, Sat Sep 8 21:25:56 2007 UTC vs.
Revision 1.217 by root, Tue Oct 9 13:36:10 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>
… …
37#include "init.h" 40#include "init.h"
38 41
39#include <limits> 42#include <limits>
40 43
41#include <csignal> 44#include <csignal>
45
46#ifdef DISPLAY_IS_IP
47/* On Solaris link with -lsocket and -lnsl */
48#include <sys/types.h>
49#include <sys/socket.h>
50
51/* these next two are probably only on Sun (not Solaris) */
52#ifdef HAVE_SYS_SOCKIO_H
53#include <sys/sockio.h>
54#endif
55#ifdef HAVE_SYS_BYTEORDER_H
56#include <sys/byteorder.h>
57#endif
58
59#include <netinet/in.h>
60#include <arpa/inet.h>
61#include <net/if.h>
62#include <net/if_arp.h>
63
64static char *
65rxvt_network_display (const char *display)
66{
67 char buffer[1024], *rval = NULL;
68 struct ifconf ifc;
69 struct ifreq *ifr;
70 int i, skfd;
71
72 if (display[0] != ':' && strncmp (display, "unix:", 5))
73 return (char *) display; /* nothing to do */
74
75 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
76 ifc.ifc_buf = buffer;
77
78 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
79 {
80 perror ("socket");
81 return NULL;
82 }
83
84 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
85 {
86 perror ("SIOCGIFCONF");
87 close (skfd);
88 return NULL;
89 }
90
91 for (i = 0, ifr = ifc.ifc_req;
92 i < (ifc.ifc_len / sizeof (struct ifreq));
93 i++, ifr++)
94 {
95 struct ifreq ifr2;
96
97 strcpy (ifr2.ifr_name, ifr->ifr_name);
98
99 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
100 {
101 unsigned long addr;
102 struct sockaddr_in *p_addr;
103
104 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
105 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
106
107 /*
108 * not "0.0.0.0" or "127.0.0.1" - so format the address
109 */
110 if (addr && addr != 0x7F000001)
111 {
112 char *colon = strchr (display, ':');
113
114 if (colon == NULL)
115 colon = ":0.0";
116
117 rval = rxvt_malloc (strlen (colon) + 16);
118 sprintf (rval, "%d.%d.%d.%d%s",
119 (int) ((addr >> 030) & 0xFF),
120 (int) ((addr >> 020) & 0xFF),
121 (int) ((addr >> 010) & 0xFF),
122 (int) (addr & 0xFF), colon);
123 break;
124 }
125 }
126 }
127
128 close (skfd);
129
130 return rval;
131}
132#endif
42 133
43const char *const def_colorName[] = 134const char *const def_colorName[] =
44 { 135 {
45 COLOR_FOREGROUND, 136 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 137 COLOR_BACKGROUND,
… …
199 numpix_colors = TOTAL_COLORS; 290 numpix_colors = TOTAL_COLORS;
200 291
201 refresh_type = SLOW_REFRESH; 292 refresh_type = SLOW_REFRESH;
202 293
203 oldcursor.row = oldcursor.col = -1; 294 oldcursor.row = oldcursor.col = -1;
204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
209#ifdef XPM_BACKGROUND
210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
214 bgPixmap.pixmap = None;
215#endif
216 last_bot = last_state = -1; 295 last_bot = last_state = -1;
217 296
218 set_option (Opt_scrollBar); 297 set_option (Opt_scrollBar);
219 set_option (Opt_scrollTtyOutput); 298 set_option (Opt_scrollTtyOutput);
220 set_option (Opt_jumpScroll); 299 set_option (Opt_jumpScroll);
… …
240 if ((i = open ("/dev/null", O_RDONLY)) < 0) 319 if ((i = open ("/dev/null", O_RDONLY)) < 0)
241 { 320 {
242 /* TODO: BOO HISS */ 321 /* TODO: BOO HISS */
243 dup2 (STDERR_FILENO, STDIN_FILENO); 322 dup2 (STDERR_FILENO, STDIN_FILENO);
244 } 323 }
245 else if (i > STDIN_FILENO) 324 else if (i != STDIN_FILENO)
246 { 325 {
247 dup2 (i, STDIN_FILENO); 326 dup2 (i, STDIN_FILENO);
248 close (i); 327 close (i);
249 } 328 }
250 329
… …
265/*----------------------------------------------------------------------*/ 344/*----------------------------------------------------------------------*/
266const char ** 345const char **
267rxvt_term::init_resources (int argc, const char *const *argv) 346rxvt_term::init_resources (int argc, const char *const *argv)
268{ 347{
269 int i, r_argc; 348 int i, r_argc;
270 char *val;
271 const char **cmd_argv, **r_argv; 349 const char **cmd_argv, **r_argv;
272 350
273 /* 351 /*
274 * Look for -e option. Find => split and make cmd_argv[] of command args 352 * Look for -e option. Find => split and make cmd_argv[] of command args
275 */ 353 */
276 for (r_argc = 0; r_argc < argc; r_argc++) 354 for (r_argc = 0; r_argc < argc; r_argc++)
277 if (!strcmp (argv[r_argc], "-e")) 355 if (!strcmp (argv[r_argc], "-e"))
278 break; 356 break;
279 357
358 if (r_argc == argc)
359 cmd_argv = NULL;
360 else if (!argv[r_argc + 1])
361 rxvt_fatal ("-e requires an argument\n");
362 else
363 {
364 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
365
366 for (i = 0; i < argc - r_argc - 1; i++)
367 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
368
369 cmd_argv[i] = NULL;
370 }
371
280 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 372 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
281 373
282 for (i = 0; i < r_argc; i++) 374 for (i = 0; i < r_argc; i++)
283 r_argv[i] = (const char *)argv[i]; 375 r_argv[i] = (const char *)argv[i];
284 376
285 r_argv[i] = NULL; 377 r_argv[i] = NULL;
286
287 if (r_argc == argc)
288 cmd_argv = NULL;
289 else
290 {
291 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
292
293 for (i = 0; i < argc - r_argc - 1; i++)
294 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
295
296 cmd_argv[i] = NULL;
297 }
298 378
299 rs[Rs_name] = rxvt_basename (argv[0]); 379 rs[Rs_name] = rxvt_basename (argv[0]);
300 380
301 /* 381 /*
302 * Open display, get options/resources and create the window 382 * Open display, get options/resources and create the window
… …
306 rs[Rs_display_name] = ":0"; 386 rs[Rs_display_name] = ":0";
307 387
308 get_options (r_argc, r_argv); 388 get_options (r_argc, r_argv);
309 389
310 if (!(display = displays.get (rs[Rs_display_name]))) 390 if (!(display = displays.get (rs[Rs_display_name])))
391 {
392 free (r_argv);
311 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 393 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
394 }
312 395
313 // using a local pointer decreases code size a lot 396 // using a local pointer decreases code size a lot
314 xa = display->xa; 397 xa = display->xa;
315 398
316 set (display); 399 set (display);
… …
395 rs[Rs_cutchars] = CUTCHARS; 478 rs[Rs_cutchars] = CUTCHARS;
396 479
397#ifndef NO_BACKSPACE_KEY 480#ifndef NO_BACKSPACE_KEY
398 if (!rs[Rs_backspace_key]) 481 if (!rs[Rs_backspace_key])
399# ifdef DEFAULT_BACKSPACE 482# ifdef DEFAULT_BACKSPACE
400 key_backspace = DEFAULT_BACKSPACE; 483 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
401# else 484# else
402 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 485 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
403# endif 486# endif
404 else
405 {
406 val = strdup (rs[Rs_backspace_key]);
407 key_backspace = val;
408 }
409#endif 487#endif
410 488
411#ifndef NO_DELETE_KEY 489#ifndef NO_DELETE_KEY
412 if (!rs[Rs_delete_key]) 490 if (!rs[Rs_delete_key])
413# ifdef DEFAULT_DELETE 491# ifdef DEFAULT_DELETE
414 key_delete = DEFAULT_DELETE; 492 rs[Rs_delete_key] = DEFAULT_DELETE;
415# else 493# else
416 key_delete = "\033[3~"; 494 rs[Rs_delete_key] = "\033[3~";
417# endif 495# endif
418 else
419 {
420 val = strdup (rs[Rs_delete_key]);
421 key_delete = val;
422 }
423#endif 496#endif
424 497
425#ifdef HAVE_SCROLLBARS 498#ifdef HAVE_SCROLLBARS
426 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 499 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
427#endif 500#endif
… …
638 priv_modes |= PrivMode_Keypress; 711 priv_modes |= PrivMode_Keypress;
639 if (!option (Opt_jumpScroll)) 712 if (!option (Opt_jumpScroll))
640 priv_modes |= PrivMode_smoothScroll; 713 priv_modes |= PrivMode_smoothScroll;
641 714
642#ifndef NO_BACKSPACE_KEY 715#ifndef NO_BACKSPACE_KEY
643 if (strcmp (key_backspace, "DEC") == 0) 716 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
644 priv_modes |= PrivMode_HaveBackSpace; 717 priv_modes |= PrivMode_HaveBackSpace;
645#endif 718#endif
646 719
647 /* add value for scrollBar */ 720 /* add value for scrollBar */
648 if (scrollBar.state) 721 if (scrollBar.state)
… …
1251 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1324 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1252 1325
1253 int er; 1326 int er;
1254 1327
1255#ifndef NO_BACKSPACE_KEY 1328#ifndef NO_BACKSPACE_KEY
1256 if (key_backspace[0] && !key_backspace[1]) 1329 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1257 er = key_backspace[0]; 1330 er = rs[Rs_backspace_key][0];
1258 else if (strcmp (key_backspace, "DEC") == 0) 1331 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1259 er = '\177'; /* the initial state anyway */ 1332 er = '\177'; /* the initial state anyway */
1260 else 1333 else
1261#endif 1334#endif
1262 er = -1; 1335 er = -1;
1263 1336
… …
1367 sigset_t ss; 1440 sigset_t ss;
1368 sigemptyset (&ss); 1441 sigemptyset (&ss);
1369 sigprocmask (SIG_SETMASK, &ss, 0); 1442 sigprocmask (SIG_SETMASK, &ss, 0);
1370 1443
1371 /* command interpreter path */ 1444 /* command interpreter path */
1372 if (argv != NULL) 1445 if (argv)
1373 { 1446 {
1374# ifdef DEBUG_CMD 1447# ifdef DEBUG_CMD
1375 int i; 1448 int i;
1376 1449
1377 for (i = 0; argv[i]; i++) 1450 for (i = 0; argv[i]; i++)
… …
1397 login[0] = '-'; 1470 login[0] = '-';
1398 strcpy (&login[1], argv0); 1471 strcpy (&login[1], argv0);
1399 argv0 = login; 1472 argv0 = login;
1400 } 1473 }
1401 1474
1402 execlp (shell, argv0, NULL); 1475 execlp (shell, argv0, (char *)0);
1403 /* no error message: STDERR is closed! */ 1476 /* no error message: STDERR is closed! */
1404 } 1477 }
1405 1478
1406 return -1; 1479 return -1;
1407} 1480}

Diff Legend

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