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.199 by sasha, Fri Aug 3 22:40:10 2007 UTC vs.
Revision 1.214 by ayin, Fri Sep 14 17:10:34 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,
… …
166#endif 257#endif
167#ifdef KEEP_SCROLLCOLOR 258#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 259 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 260 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 261#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 262#if ENABLE_TRANSPARENCY
172 NULL, 263 NULL,
173#endif 264#endif
174#if OFF_FOCUS_FADING 265#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 266 "rgb:00/00/00",
176#endif 267#endif
… …
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 bgPixmap.h_scale = bgPixmap.v_scale = 0;
210 bgPixmap.h_align = bgPixmap.v_align = 0;
211 bgPixmap.flags = 0;
212 bgPixmap.pixmap = None;
213#endif
214
215 last_bot = last_state = -1; 295 last_bot = last_state = -1;
216 296
217 set_option (Opt_scrollBar); 297 set_option (Opt_scrollBar);
218 set_option (Opt_scrollTtyOutput); 298 set_option (Opt_scrollTtyOutput);
219 set_option (Opt_jumpScroll); 299 set_option (Opt_jumpScroll);
… …
264/*----------------------------------------------------------------------*/ 344/*----------------------------------------------------------------------*/
265const char ** 345const char **
266rxvt_term::init_resources (int argc, const char *const *argv) 346rxvt_term::init_resources (int argc, const char *const *argv)
267{ 347{
268 int i, r_argc; 348 int i, r_argc;
269 char *val;
270 const char **cmd_argv, **r_argv; 349 const char **cmd_argv, **r_argv;
271 350
272 /* 351 /*
273 * 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
274 */ 353 */
… …
293 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 372 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
294 373
295 cmd_argv[i] = NULL; 374 cmd_argv[i] = NULL;
296 } 375 }
297 376
298 rs[Rs_name] = rxvt_r_basename (argv[0]); 377 rs[Rs_name] = rxvt_basename (argv[0]);
299 378
300 /* 379 /*
301 * Open display, get options/resources and create the window 380 * Open display, get options/resources and create the window
302 */ 381 */
303 382
… …
346 * set any defaults not already set 425 * set any defaults not already set
347 */ 426 */
348 if (cmd_argv && cmd_argv[0]) 427 if (cmd_argv && cmd_argv[0])
349 { 428 {
350 if (!rs[Rs_title]) 429 if (!rs[Rs_title])
351 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 430 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
352 if (!rs[Rs_iconName]) 431 if (!rs[Rs_iconName])
353 rs[Rs_iconName] = rs[Rs_title]; 432 rs[Rs_iconName] = rs[Rs_title];
354 } 433 }
355 else 434 else
356 { 435 {
… …
394 rs[Rs_cutchars] = CUTCHARS; 473 rs[Rs_cutchars] = CUTCHARS;
395 474
396#ifndef NO_BACKSPACE_KEY 475#ifndef NO_BACKSPACE_KEY
397 if (!rs[Rs_backspace_key]) 476 if (!rs[Rs_backspace_key])
398# ifdef DEFAULT_BACKSPACE 477# ifdef DEFAULT_BACKSPACE
399 key_backspace = DEFAULT_BACKSPACE; 478 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
400# else 479# else
401 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 480 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
402# endif 481# endif
403 else
404 {
405 val = strdup (rs[Rs_backspace_key]);
406 rxvt_Str_trim (val);
407 rxvt_Str_escaped (val);
408 key_backspace = val;
409 }
410#endif 482#endif
411 483
412#ifndef NO_DELETE_KEY 484#ifndef NO_DELETE_KEY
413 if (!rs[Rs_delete_key]) 485 if (!rs[Rs_delete_key])
414# ifdef DEFAULT_DELETE 486# ifdef DEFAULT_DELETE
415 key_delete = DEFAULT_DELETE; 487 rs[Rs_delete_key] = DEFAULT_DELETE;
416# else 488# else
417 key_delete = "\033[3~"; 489 rs[Rs_delete_key] = "\033[3~";
418# endif
419 else
420 {
421 val = strdup (rs[Rs_delete_key]);
422 rxvt_Str_trim (val);
423 rxvt_Str_escaped (val);
424 key_delete = val;
425 }
426#endif 490# endif
427 if (rs[Rs_answerbackstring]) 491#endif
428 {
429 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
430 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
431 }
432 492
433#ifdef HAVE_SCROLLBARS 493#ifdef HAVE_SCROLLBARS
434 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 494 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
435#endif 495#endif
436 496
… …
481/*----------------------------------------------------------------------*/ 541/*----------------------------------------------------------------------*/
482void 542void
483rxvt_term::init_env () 543rxvt_term::init_env ()
484{ 544{
485 int i; 545 int i;
486 unsigned int u;
487 char *val; 546 char *val;
488 547
489#ifdef DISPLAY_IS_IP 548#ifdef DISPLAY_IS_IP
490 /* Fixup display_name for export over pty to any interested terminal 549 /* Fixup display_name for export over pty to any interested terminal
491 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 550 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
506 565
507 if (rs[Rs_display_name] == NULL) 566 if (rs[Rs_display_name] == NULL)
508 rs[Rs_display_name] = val; /* use broken `:0' value */ 567 rs[Rs_display_name] = val; /* use broken `:0' value */
509 568
510 i = strlen (val); 569 i = strlen (val);
511 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 570 env_display = (char *)rxvt_malloc (i + 9);
512 571
513 sprintf (env_display, "DISPLAY=%s", val); 572 sprintf (env_display, "DISPLAY=%s", val);
514 573
515 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 574 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
516 575
… …
537 else 596 else
538 putenv ("COLORTERM=" COLORTERMENVFULL); 597 putenv ("COLORTERM=" COLORTERMENVFULL);
539 598
540 if (rs[Rs_term_name] != NULL) 599 if (rs[Rs_term_name] != NULL)
541 { 600 {
542 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 601 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
543 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 602 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
544 putenv (env_term); 603 putenv (env_term);
545 } 604 }
546 else 605 else
547 putenv ("TERM=" TERMENV); 606 putenv ("TERM=" TERMENV);
… …
647 priv_modes |= PrivMode_Keypress; 706 priv_modes |= PrivMode_Keypress;
648 if (!option (Opt_jumpScroll)) 707 if (!option (Opt_jumpScroll))
649 priv_modes |= PrivMode_smoothScroll; 708 priv_modes |= PrivMode_smoothScroll;
650 709
651#ifndef NO_BACKSPACE_KEY 710#ifndef NO_BACKSPACE_KEY
652 if (strcmp (key_backspace, "DEC") == 0) 711 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
653 priv_modes |= PrivMode_HaveBackSpace; 712 priv_modes |= PrivMode_HaveBackSpace;
654#endif 713#endif
655 714
656 /* add value for scrollBar */ 715 /* add value for scrollBar */
657 if (scrollBar.state) 716 if (scrollBar.state)
… …
907#if ENABLE_FRILLS 966#if ENABLE_FRILLS
908 if (option (Opt_borderLess)) 967 if (option (Opt_borderLess))
909 { 968 {
910 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 969 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
911 { 970 {
912 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 971 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
913 attributes.override_redirect = true; 972 attributes.override_redirect = true;
914 mwmhints.flags = 0;
915 } 973 }
916 else 974 else
917 { 975 {
918 mwmhints.flags = MWM_HINTS_DECORATIONS; 976 mwmhints.flags = MWM_HINTS_DECORATIONS;
919 mwmhints.decorations = 0;
920 } 977 }
921 } 978 }
922 else
923 mwmhints.flags = 0;
924#endif 979#endif
925 980
926#if ENABLE_XEMBED 981#if ENABLE_XEMBED
927 if (rs[Rs_embed]) 982 if (rs[Rs_embed])
928 { 983 {
… …
1038 vt_emask |= Button1MotionMask | Button3MotionMask; 1093 vt_emask |= Button1MotionMask | Button3MotionMask;
1039 1094
1040 vt_select_input (); 1095 vt_select_input ();
1041 1096
1042 vt_ev.start (display, vt); 1097 vt_ev.start (display, vt);
1043
1044#ifdef XPM_BACKGROUND
1045 if (rs[Rs_backgroundPixmap] != NULL)
1046 {
1047 const char *p = rs[Rs_backgroundPixmap];
1048
1049 if ((p = strchr (p, ';')) != NULL)
1050 {
1051 p++;
1052 bgPixmap.handle_geometry (p);
1053 }
1054
1055 set_bgPixmap (rs[Rs_backgroundPixmap]);
1056 scr_touch (true);
1057 }
1058#endif
1059 1098
1060 /* graphics context for the vt window */ 1099 /* graphics context for the vt window */
1061 gcvalue.foreground = pix_colors[Color_fg]; 1100 gcvalue.foreground = pix_colors[Color_fg];
1062 gcvalue.background = pix_colors[Color_bg]; 1101 gcvalue.background = pix_colors[Color_bg];
1063 gcvalue.graphics_exposures = 0; 1102 gcvalue.graphics_exposures = 0;
… …
1280 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1319 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1281 1320
1282 int er; 1321 int er;
1283 1322
1284#ifndef NO_BACKSPACE_KEY 1323#ifndef NO_BACKSPACE_KEY
1285 if (key_backspace[0] && !key_backspace[1]) 1324 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1286 er = key_backspace[0]; 1325 er = rs[Rs_backspace_key][0];
1287 else if (strcmp (key_backspace, "DEC") == 0) 1326 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1288 er = '\177'; /* the initial state anyway */ 1327 er = '\177'; /* the initial state anyway */
1289 else 1328 else
1290#endif 1329#endif
1291 er = -1; 1330 er = -1;
1292 1331
… …
1396 sigset_t ss; 1435 sigset_t ss;
1397 sigemptyset (&ss); 1436 sigemptyset (&ss);
1398 sigprocmask (SIG_SETMASK, &ss, 0); 1437 sigprocmask (SIG_SETMASK, &ss, 0);
1399 1438
1400 /* command interpreter path */ 1439 /* command interpreter path */
1401 if (argv != NULL) 1440 if (argv)
1402 { 1441 {
1403# ifdef DEBUG_CMD 1442# ifdef DEBUG_CMD
1404 int i; 1443 int i;
1405 1444
1406 for (i = 0; argv[i]; i++) 1445 for (i = 0; argv[i]; i++)
… …
1415 const char *argv0, *shell; 1454 const char *argv0, *shell;
1416 1455
1417 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1456 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1418 shell = "/bin/sh"; 1457 shell = "/bin/sh";
1419 1458
1420 argv0 = (const char *)rxvt_r_basename (shell); 1459 argv0 = (const char *)rxvt_basename (shell);
1421 1460
1422 if (option (Opt_loginShell)) 1461 if (option (Opt_loginShell))
1423 { 1462 {
1424 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1463 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1425 1464
1426 login[0] = '-'; 1465 login[0] = '-';
1427 strcpy (&login[1], argv0); 1466 strcpy (&login[1], argv0);
1428 argv0 = login; 1467 argv0 = login;
1429 } 1468 }
1430 1469
1431 execlp (shell, argv0, NULL); 1470 execlp (shell, argv0, (char *)0);
1432 /* no error message: STDERR is closed! */ 1471 /* no error message: STDERR is closed! */
1433 } 1472 }
1434 1473
1435 return -1; 1474 return -1;
1436} 1475}

Diff Legend

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