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.195 by ayin, Thu Jul 26 18:09:36 2007 UTC vs.
Revision 1.216 by ayin, Tue Oct 9 13:34:46 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
… …
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 274 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING 275#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 276 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif 277#endif
187 278
188#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
189 pixmap = None;
190#endif
191 279
192 MEvent.time = CurrentTime; 280 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 281 MEvent.button = AnyButton;
194 want_refresh = 1; 282 want_refresh = 1;
195 priv_modes = SavedModes = PrivMode_Default; 283 priv_modes = SavedModes = PrivMode_Default;
… …
202 numpix_colors = TOTAL_COLORS; 290 numpix_colors = TOTAL_COLORS;
203 291
204 refresh_type = SLOW_REFRESH; 292 refresh_type = SLOW_REFRESH;
205 293
206 oldcursor.row = oldcursor.col = -1; 294 oldcursor.row = oldcursor.col = -1;
207#ifdef XPM_BACKGROUND
208 /* bgPixmap.w = bgPixmap.h = 0; */
209 bgPixmap.x = bgPixmap.y = 0;
210 bgPixmap.pixmap = None;
211#endif
212
213 last_bot = last_state = -1; 295 last_bot = last_state = -1;
214 296
215 set_option (Opt_scrollBar); 297 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput); 298 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll); 299 set_option (Opt_jumpScroll);
… …
237 if ((i = open ("/dev/null", O_RDONLY)) < 0) 319 if ((i = open ("/dev/null", O_RDONLY)) < 0)
238 { 320 {
239 /* TODO: BOO HISS */ 321 /* TODO: BOO HISS */
240 dup2 (STDERR_FILENO, STDIN_FILENO); 322 dup2 (STDERR_FILENO, STDIN_FILENO);
241 } 323 }
242 else if (i > STDIN_FILENO) 324 else if (i != STDIN_FILENO)
243 { 325 {
244 dup2 (i, STDIN_FILENO); 326 dup2 (i, STDIN_FILENO);
245 close (i); 327 close (i);
246 } 328 }
247 329
… …
262/*----------------------------------------------------------------------*/ 344/*----------------------------------------------------------------------*/
263const char ** 345const char **
264rxvt_term::init_resources (int argc, const char *const *argv) 346rxvt_term::init_resources (int argc, const char *const *argv)
265{ 347{
266 int i, r_argc; 348 int i, r_argc;
267 char *val;
268 const char **cmd_argv, **r_argv; 349 const char **cmd_argv, **r_argv;
269 350
270 /* 351 /*
271 * 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
272 */ 353 */
273 for (r_argc = 0; r_argc < argc; r_argc++) 354 for (r_argc = 0; r_argc < argc; r_argc++)
274 if (!strcmp (argv[r_argc], "-e")) 355 if (!strcmp (argv[r_argc], "-e"))
275 break; 356 break;
276 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
277 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 372 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
278 373
279 for (i = 0; i < r_argc; i++) 374 for (i = 0; i < r_argc; i++)
280 r_argv[i] = (const char *)argv[i]; 375 r_argv[i] = (const char *)argv[i];
281 376
282 r_argv[i] = NULL; 377 r_argv[i] = NULL;
283 378
284 if (r_argc == argc)
285 cmd_argv = NULL;
286 else
287 {
288 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
289
290 for (i = 0; i < argc - r_argc - 1; i++)
291 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
292
293 cmd_argv[i] = NULL;
294 }
295
296 rs[Rs_name] = rxvt_r_basename (argv[0]); 379 rs[Rs_name] = rxvt_basename (argv[0]);
297 380
298 /* 381 /*
299 * Open display, get options/resources and create the window 382 * Open display, get options/resources and create the window
300 */ 383 */
301 384
… …
344 * set any defaults not already set 427 * set any defaults not already set
345 */ 428 */
346 if (cmd_argv && cmd_argv[0]) 429 if (cmd_argv && cmd_argv[0])
347 { 430 {
348 if (!rs[Rs_title]) 431 if (!rs[Rs_title])
349 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 432 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
350 if (!rs[Rs_iconName]) 433 if (!rs[Rs_iconName])
351 rs[Rs_iconName] = rs[Rs_title]; 434 rs[Rs_iconName] = rs[Rs_title];
352 } 435 }
353 else 436 else
354 { 437 {
… …
392 rs[Rs_cutchars] = CUTCHARS; 475 rs[Rs_cutchars] = CUTCHARS;
393 476
394#ifndef NO_BACKSPACE_KEY 477#ifndef NO_BACKSPACE_KEY
395 if (!rs[Rs_backspace_key]) 478 if (!rs[Rs_backspace_key])
396# ifdef DEFAULT_BACKSPACE 479# ifdef DEFAULT_BACKSPACE
397 key_backspace = DEFAULT_BACKSPACE; 480 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
398# else 481# else
399 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 482 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
400# endif 483# endif
401 else
402 {
403 val = strdup (rs[Rs_backspace_key]);
404 rxvt_Str_trim (val);
405 rxvt_Str_escaped (val);
406 key_backspace = val;
407 }
408#endif 484#endif
409 485
410#ifndef NO_DELETE_KEY 486#ifndef NO_DELETE_KEY
411 if (!rs[Rs_delete_key]) 487 if (!rs[Rs_delete_key])
412# ifdef DEFAULT_DELETE 488# ifdef DEFAULT_DELETE
413 key_delete = DEFAULT_DELETE; 489 rs[Rs_delete_key] = DEFAULT_DELETE;
414# else 490# else
415 key_delete = "\033[3~"; 491 rs[Rs_delete_key] = "\033[3~";
416# endif
417 else
418 {
419 val = strdup (rs[Rs_delete_key]);
420 rxvt_Str_trim (val);
421 rxvt_Str_escaped (val);
422 key_delete = val;
423 }
424#endif 492# endif
425 if (rs[Rs_answerbackstring]) 493#endif
426 {
427 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
428 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
429 }
430 494
431#ifdef HAVE_SCROLLBARS 495#ifdef HAVE_SCROLLBARS
432 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 496 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
433#endif 497#endif
434 498
… …
479/*----------------------------------------------------------------------*/ 543/*----------------------------------------------------------------------*/
480void 544void
481rxvt_term::init_env () 545rxvt_term::init_env ()
482{ 546{
483 int i; 547 int i;
484 unsigned int u;
485 char *val; 548 char *val;
486 549
487#ifdef DISPLAY_IS_IP 550#ifdef DISPLAY_IS_IP
488 /* Fixup display_name for export over pty to any interested terminal 551 /* Fixup display_name for export over pty to any interested terminal
489 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 552 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
504 567
505 if (rs[Rs_display_name] == NULL) 568 if (rs[Rs_display_name] == NULL)
506 rs[Rs_display_name] = val; /* use broken `:0' value */ 569 rs[Rs_display_name] = val; /* use broken `:0' value */
507 570
508 i = strlen (val); 571 i = strlen (val);
509 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 572 env_display = (char *)rxvt_malloc (i + 9);
510 573
511 sprintf (env_display, "DISPLAY=%s", val); 574 sprintf (env_display, "DISPLAY=%s", val);
512 575
513 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 576 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
514 577
… …
535 else 598 else
536 putenv ("COLORTERM=" COLORTERMENVFULL); 599 putenv ("COLORTERM=" COLORTERMENVFULL);
537 600
538 if (rs[Rs_term_name] != NULL) 601 if (rs[Rs_term_name] != NULL)
539 { 602 {
540 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 603 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
541 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 604 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
542 putenv (env_term); 605 putenv (env_term);
543 } 606 }
544 else 607 else
545 putenv ("TERM=" TERMENV); 608 putenv ("TERM=" TERMENV);
… …
645 priv_modes |= PrivMode_Keypress; 708 priv_modes |= PrivMode_Keypress;
646 if (!option (Opt_jumpScroll)) 709 if (!option (Opt_jumpScroll))
647 priv_modes |= PrivMode_smoothScroll; 710 priv_modes |= PrivMode_smoothScroll;
648 711
649#ifndef NO_BACKSPACE_KEY 712#ifndef NO_BACKSPACE_KEY
650 if (strcmp (key_backspace, "DEC") == 0) 713 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
651 priv_modes |= PrivMode_HaveBackSpace; 714 priv_modes |= PrivMode_HaveBackSpace;
652#endif 715#endif
653 716
654 /* add value for scrollBar */ 717 /* add value for scrollBar */
655 if (scrollBar.state) 718 if (scrollBar.state)
… …
882rxvt_term::create_windows (int argc, const char *const *argv) 945rxvt_term::create_windows (int argc, const char *const *argv)
883{ 946{
884 XClassHint classHint; 947 XClassHint classHint;
885 XWMHints wmHint; 948 XWMHints wmHint;
886#if ENABLE_FRILLS 949#if ENABLE_FRILLS
887 MWMHints mwmhints; 950 MWMHints mwmhints = { };
888#endif 951#endif
889 XGCValues gcvalue; 952 XGCValues gcvalue;
890 XSetWindowAttributes attributes; 953 XSetWindowAttributes attributes;
891 Window top, parent; 954 Window top, parent;
892 955
… …
905#if ENABLE_FRILLS 968#if ENABLE_FRILLS
906 if (option (Opt_borderLess)) 969 if (option (Opt_borderLess))
907 { 970 {
908 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 971 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
909 { 972 {
910 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 973 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
911 attributes.override_redirect = true; 974 attributes.override_redirect = true;
912 mwmhints.flags = 0;
913 } 975 }
914 else 976 else
915 { 977 {
916 mwmhints.flags = MWM_HINTS_DECORATIONS; 978 mwmhints.flags = MWM_HINTS_DECORATIONS;
917 mwmhints.decorations = 0;
918 } 979 }
919 } 980 }
920 else
921 mwmhints.flags = 0;
922#endif 981#endif
923 982
924#if ENABLE_XEMBED 983#if ENABLE_XEMBED
925 if (rs[Rs_embed]) 984 if (rs[Rs_embed])
926 { 985 {
… …
1036 vt_emask |= Button1MotionMask | Button3MotionMask; 1095 vt_emask |= Button1MotionMask | Button3MotionMask;
1037 1096
1038 vt_select_input (); 1097 vt_select_input ();
1039 1098
1040 vt_ev.start (display, vt); 1099 vt_ev.start (display, vt);
1041
1042#ifdef XPM_BACKGROUND
1043 if (rs[Rs_backgroundPixmap] != NULL
1044#ifndef HAVE_AFTERIMAGE
1045 && !option (Opt_transparent)
1046#endif
1047 )
1048 {
1049 const char *p = rs[Rs_backgroundPixmap];
1050
1051 if ((p = strchr (p, ';')) != NULL)
1052 {
1053 p++;
1054 scale_pixmap (p);
1055 }
1056
1057 set_bgPixmap (rs[Rs_backgroundPixmap]);
1058 scr_touch (true);
1059 }
1060#endif
1061 1100
1062 /* graphics context for the vt window */ 1101 /* graphics context for the vt window */
1063 gcvalue.foreground = pix_colors[Color_fg]; 1102 gcvalue.foreground = pix_colors[Color_fg];
1064 gcvalue.background = pix_colors[Color_bg]; 1103 gcvalue.background = pix_colors[Color_bg];
1065 gcvalue.graphics_exposures = 0; 1104 gcvalue.graphics_exposures = 0;
… …
1282 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1321 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1283 1322
1284 int er; 1323 int er;
1285 1324
1286#ifndef NO_BACKSPACE_KEY 1325#ifndef NO_BACKSPACE_KEY
1287 if (key_backspace[0] && !key_backspace[1]) 1326 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1288 er = key_backspace[0]; 1327 er = rs[Rs_backspace_key][0];
1289 else if (strcmp (key_backspace, "DEC") == 0) 1328 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1290 er = '\177'; /* the initial state anyway */ 1329 er = '\177'; /* the initial state anyway */
1291 else 1330 else
1292#endif 1331#endif
1293 er = -1; 1332 er = -1;
1294 1333
… …
1398 sigset_t ss; 1437 sigset_t ss;
1399 sigemptyset (&ss); 1438 sigemptyset (&ss);
1400 sigprocmask (SIG_SETMASK, &ss, 0); 1439 sigprocmask (SIG_SETMASK, &ss, 0);
1401 1440
1402 /* command interpreter path */ 1441 /* command interpreter path */
1403 if (argv != NULL) 1442 if (argv)
1404 { 1443 {
1405# ifdef DEBUG_CMD 1444# ifdef DEBUG_CMD
1406 int i; 1445 int i;
1407 1446
1408 for (i = 0; argv[i]; i++) 1447 for (i = 0; argv[i]; i++)
… …
1417 const char *argv0, *shell; 1456 const char *argv0, *shell;
1418 1457
1419 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1458 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1420 shell = "/bin/sh"; 1459 shell = "/bin/sh";
1421 1460
1422 argv0 = (const char *)rxvt_r_basename (shell); 1461 argv0 = (const char *)rxvt_basename (shell);
1423 1462
1424 if (option (Opt_loginShell)) 1463 if (option (Opt_loginShell))
1425 { 1464 {
1426 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1465 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1427 1466
1428 login[0] = '-'; 1467 login[0] = '-';
1429 strcpy (&login[1], argv0); 1468 strcpy (&login[1], argv0);
1430 argv0 = login; 1469 argv0 = login;
1431 } 1470 }
1432 1471
1433 execlp (shell, argv0, NULL); 1472 execlp (shell, argv0, (char *)0);
1434 /* no error message: STDERR is closed! */ 1473 /* no error message: STDERR is closed! */
1435 } 1474 }
1436 1475
1437 return -1; 1476 return -1;
1438} 1477}

Diff Legend

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