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.181 by ayin, Tue May 1 21:10:04 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>
… …
38 41
39#include <limits> 42#include <limits>
40 43
41#include <csignal> 44#include <csignal>
42 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
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,
47 /* low-intensity colors */ 138 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 139 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 140 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 141 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 142 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 143 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 144 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 145 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 146# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 147 "rgb:e5/e5/e5", // 7: white (Grey90)
… …
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(TRANSPARENT)
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;
… …
199 ext_bwidth = EXTERNALBORDERWIDTH; 287 ext_bwidth = EXTERNALBORDERWIDTH;
200 lineSpace = LINESPACE; 288 lineSpace = LINESPACE;
201 saveLines = SAVELINES; 289 saveLines = SAVELINES;
202 numpix_colors = TOTAL_COLORS; 290 numpix_colors = TOTAL_COLORS;
203 291
204 refresh_limit = 1;
205 refresh_type = SLOW_REFRESH; 292 refresh_type = SLOW_REFRESH;
206 293
207 oldcursor.row = oldcursor.col = -1; 294 oldcursor.row = oldcursor.col = -1;
208#ifdef XPM_BACKGROUND
209 /* bgPixmap.w = bgPixmap.h = 0; */
210 bgPixmap.x = bgPixmap.y = 0;
211 bgPixmap.pixmap = None;
212#endif
213
214 last_bot = last_state = -1; 295 last_bot = last_state = -1;
215 296
216 set_option (Opt_scrollBar, 1); 297 set_option (Opt_scrollBar);
217 set_option (Opt_scrollTtyOutput, 1); 298 set_option (Opt_scrollTtyOutput);
218 set_option (Opt_jumpScroll, 1); 299 set_option (Opt_jumpScroll);
300 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen, 1); 301 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll, 1); 302 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs, 1); 303 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles, 1); 304 set_option (Opt_intensityStyles);
305 set_option (Opt_iso14755_52);
223 306
224 return true; 307 return true;
225} 308}
226 309
227void 310void
… …
236 if ((i = open ("/dev/null", O_RDONLY)) < 0) 319 if ((i = open ("/dev/null", O_RDONLY)) < 0)
237 { 320 {
238 /* TODO: BOO HISS */ 321 /* TODO: BOO HISS */
239 dup2 (STDERR_FILENO, STDIN_FILENO); 322 dup2 (STDERR_FILENO, STDIN_FILENO);
240 } 323 }
241 else if (i > STDIN_FILENO) 324 else if (i != STDIN_FILENO)
242 { 325 {
243 dup2 (i, STDIN_FILENO); 326 dup2 (i, STDIN_FILENO);
244 close (i); 327 close (i);
245 } 328 }
246 329
… …
261/*----------------------------------------------------------------------*/ 344/*----------------------------------------------------------------------*/
262const char ** 345const char **
263rxvt_term::init_resources (int argc, const char *const *argv) 346rxvt_term::init_resources (int argc, const char *const *argv)
264{ 347{
265 int i, r_argc; 348 int i, r_argc;
266 char *val;
267 const char **cmd_argv, **r_argv; 349 const char **cmd_argv, **r_argv;
268 350
269 /* 351 /*
270 * 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
271 */ 353 */
272 for (r_argc = 0; r_argc < argc; r_argc++) 354 for (r_argc = 0; r_argc < argc; r_argc++)
273 if (!strcmp (argv[r_argc], "-e")) 355 if (!strcmp (argv[r_argc], "-e"))
274 break; 356 break;
275 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
276 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 372 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
277 373
278 for (i = 0; i < r_argc; i++) 374 for (i = 0; i < r_argc; i++)
279 r_argv[i] = (const char *)argv[i]; 375 r_argv[i] = (const char *)argv[i];
280 376
281 r_argv[i] = NULL; 377 r_argv[i] = NULL;
282 378
283 if (r_argc == argc)
284 cmd_argv = NULL;
285 else
286 {
287 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
288
289 for (i = 0; i < argc - r_argc - 1; i++)
290 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
291
292 cmd_argv[i] = NULL;
293 }
294
295 rs[Rs_name] = rxvt_r_basename (argv[0]); 379 rs[Rs_name] = rxvt_basename (argv[0]);
296 380
297 /* 381 /*
298 * Open display, get options/resources and create the window 382 * Open display, get options/resources and create the window
299 */ 383 */
300 384
… …
302 rs[Rs_display_name] = ":0"; 386 rs[Rs_display_name] = ":0";
303 387
304 get_options (r_argc, r_argv); 388 get_options (r_argc, r_argv);
305 389
306 if (!(display = displays.get (rs[Rs_display_name]))) 390 if (!(display = displays.get (rs[Rs_display_name])))
391 {
392 free (r_argv);
307 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 }
308 395
309 // using a local pointer decreases code size a lot 396 // using a local pointer decreases code size a lot
310 xa = display->xa; 397 xa = display->xa;
311 398
312 set (display); 399 set (display);
… …
315#if XFT 402#if XFT
316 if (rs[Rs_depth]) 403 if (rs[Rs_depth])
317 select_visual (strtol (rs[Rs_depth], 0, 0)); 404 select_visual (strtol (rs[Rs_depth], 0, 0));
318#endif 405#endif
319 406
407#ifdef HAVE_AFTERIMAGE
408 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
409#endif
320 free (r_argv); 410 free (r_argv);
321 411
322 for (int i = NUM_RESOURCES; i--; ) 412 for (int i = NUM_RESOURCES; i--; )
323 if (rs [i] == resval_undef) 413 if (rs [i] == resval_undef)
324 rs [i] = 0; 414 rs [i] = 0;
… …
340 * set any defaults not already set 430 * set any defaults not already set
341 */ 431 */
342 if (cmd_argv && cmd_argv[0]) 432 if (cmd_argv && cmd_argv[0])
343 { 433 {
344 if (!rs[Rs_title]) 434 if (!rs[Rs_title])
345 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 435 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
346 if (!rs[Rs_iconName]) 436 if (!rs[Rs_iconName])
347 rs[Rs_iconName] = rs[Rs_title]; 437 rs[Rs_iconName] = rs[Rs_title];
348 } 438 }
349 else 439 else
350 { 440 {
… …
388 rs[Rs_cutchars] = CUTCHARS; 478 rs[Rs_cutchars] = CUTCHARS;
389 479
390#ifndef NO_BACKSPACE_KEY 480#ifndef NO_BACKSPACE_KEY
391 if (!rs[Rs_backspace_key]) 481 if (!rs[Rs_backspace_key])
392# ifdef DEFAULT_BACKSPACE 482# ifdef DEFAULT_BACKSPACE
393 key_backspace = DEFAULT_BACKSPACE; 483 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
394# else 484# else
395 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 485 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
396# endif 486# endif
397 else
398 {
399 val = strdup (rs[Rs_backspace_key]);
400 rxvt_Str_trim (val);
401 rxvt_Str_escaped (val);
402 key_backspace = val;
403 }
404#endif 487#endif
405 488
406#ifndef NO_DELETE_KEY 489#ifndef NO_DELETE_KEY
407 if (!rs[Rs_delete_key]) 490 if (!rs[Rs_delete_key])
408# ifdef DEFAULT_DELETE 491# ifdef DEFAULT_DELETE
409 key_delete = DEFAULT_DELETE; 492 rs[Rs_delete_key] = DEFAULT_DELETE;
410# else 493# else
411 key_delete = "\033[3~"; 494 rs[Rs_delete_key] = "\033[3~";
412# endif
413 else
414 {
415 val = strdup (rs[Rs_delete_key]);
416 rxvt_Str_trim (val);
417 rxvt_Str_escaped (val);
418 key_delete = val;
419 }
420#endif 495# endif
421 if (rs[Rs_answerbackstring]) 496#endif
422 {
423 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
424 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
425 }
426 497
427#ifdef HAVE_SCROLLBARS 498#ifdef HAVE_SCROLLBARS
428 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]);
429#endif 500#endif
430 501
431#ifdef XTERM_REVERSE_VIDEO 502#ifdef XTERM_REVERSE_VIDEO
432 /* this is how xterm implements reverseVideo */ 503 /* this is how xterm implements reverseVideo */
433 if (OPTION (Opt_reverseVideo)) 504 if (option (Opt_reverseVideo))
434 { 505 {
435 if (!rs[Rs_color + Color_fg]) 506 if (!rs[Rs_color + Color_fg])
436 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 507 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
437 508
438 if (!rs[Rs_color + Color_bg]) 509 if (!rs[Rs_color + Color_bg])
… …
444 if (!rs[Rs_color + i]) 515 if (!rs[Rs_color + i])
445 rs[Rs_color + i] = def_colorName[i]; 516 rs[Rs_color + i] = def_colorName[i];
446 517
447#ifndef XTERM_REVERSE_VIDEO 518#ifndef XTERM_REVERSE_VIDEO
448 /* this is how we implement reverseVideo */ 519 /* this is how we implement reverseVideo */
449 if (OPTION (Opt_reverseVideo)) 520 if (option (Opt_reverseVideo))
450 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 521 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
451#endif 522#endif
452 523
453 /* convenient aliases for setting fg/bg to colors */ 524 /* convenient aliases for setting fg/bg to colors */
454 color_aliases (Color_fg); 525 color_aliases (Color_fg);
… …
475/*----------------------------------------------------------------------*/ 546/*----------------------------------------------------------------------*/
476void 547void
477rxvt_term::init_env () 548rxvt_term::init_env ()
478{ 549{
479 int i; 550 int i;
480 unsigned int u;
481 char *val; 551 char *val;
482 552
483#ifdef DISPLAY_IS_IP 553#ifdef DISPLAY_IS_IP
484 /* Fixup display_name for export over pty to any interested terminal 554 /* Fixup display_name for export over pty to any interested terminal
485 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 555 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
500 570
501 if (rs[Rs_display_name] == NULL) 571 if (rs[Rs_display_name] == NULL)
502 rs[Rs_display_name] = val; /* use broken `:0' value */ 572 rs[Rs_display_name] = val; /* use broken `:0' value */
503 573
504 i = strlen (val); 574 i = strlen (val);
505 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 575 env_display = (char *)rxvt_malloc (i + 9);
506 576
507 sprintf (env_display, "DISPLAY=%s", val); 577 sprintf (env_display, "DISPLAY=%s", val);
508 578
509 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 579 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
510 580
… …
531 else 601 else
532 putenv ("COLORTERM=" COLORTERMENVFULL); 602 putenv ("COLORTERM=" COLORTERMENVFULL);
533 603
534 if (rs[Rs_term_name] != NULL) 604 if (rs[Rs_term_name] != NULL)
535 { 605 {
536 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 606 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
537 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 607 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
538 putenv (env_term); 608 putenv (env_term);
539 } 609 }
540 else 610 else
541 putenv ("TERM=" TERMENV); 611 putenv ("TERM=" TERMENV);
… …
628 * Initialize the command connection. 698 * Initialize the command connection.
629 * This should be called after the X server connection is established. 699 * This should be called after the X server connection is established.
630 */ 700 */
631 701
632#ifdef META8_OPTION 702#ifdef META8_OPTION
633 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 703 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
634#endif 704#endif
635 705
636 get_ourmods (); 706 get_ourmods ();
637 707
638 if (!OPTION (Opt_scrollTtyOutput)) 708 if (!option (Opt_scrollTtyOutput))
639 priv_modes |= PrivMode_TtyOutputInh; 709 priv_modes |= PrivMode_TtyOutputInh;
640 if (OPTION (Opt_scrollTtyKeypress)) 710 if (option (Opt_scrollTtyKeypress))
641 priv_modes |= PrivMode_Keypress; 711 priv_modes |= PrivMode_Keypress;
642 if (!OPTION (Opt_jumpScroll)) 712 if (!option (Opt_jumpScroll))
643 priv_modes |= PrivMode_smoothScroll; 713 priv_modes |= PrivMode_smoothScroll;
644 714
645#ifndef NO_BACKSPACE_KEY 715#ifndef NO_BACKSPACE_KEY
646 if (strcmp (key_backspace, "DEC") == 0) 716 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
647 priv_modes |= PrivMode_HaveBackSpace; 717 priv_modes |= PrivMode_HaveBackSpace;
648#endif 718#endif
649 719
650 /* add value for scrollBar */ 720 /* add value for scrollBar */
651 if (scrollBar.state) 721 if (scrollBar.state)
… …
677 rxvt_color xcol; 747 rxvt_color xcol;
678 748
679 if (!set_color (xcol, name)) 749 if (!set_color (xcol, name))
680 { 750 {
681#ifndef XTERM_REVERSE_VIDEO 751#ifndef XTERM_REVERSE_VIDEO
682 if (i < 2 && OPTION (Opt_reverseVideo)) 752 if (i < 2 && option (Opt_reverseVideo))
683 name = def_colorName [1 - i]; 753 name = def_colorName [1 - i];
684 else 754 else
685#endif 755#endif
686 name = def_colorName [i]; 756 name = def_colorName [i];
687 757
… …
878rxvt_term::create_windows (int argc, const char *const *argv) 948rxvt_term::create_windows (int argc, const char *const *argv)
879{ 949{
880 XClassHint classHint; 950 XClassHint classHint;
881 XWMHints wmHint; 951 XWMHints wmHint;
882#if ENABLE_FRILLS 952#if ENABLE_FRILLS
883 MWMHints mwmhints; 953 MWMHints mwmhints = { };
884#endif 954#endif
885 XGCValues gcvalue; 955 XGCValues gcvalue;
886 XSetWindowAttributes attributes; 956 XSetWindowAttributes attributes;
887 Window top, parent; 957 Window top, parent;
888 958
… …
894 if (!set_fonts ()) 964 if (!set_fonts ())
895 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 965 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
896 966
897 parent = display->root; 967 parent = display->root;
898 968
899 attributes.override_redirect = !!OPTION (Opt_override_redirect); 969 attributes.override_redirect = !!option (Opt_override_redirect);
900 970
901#if ENABLE_FRILLS 971#if ENABLE_FRILLS
902 if (OPTION (Opt_borderLess)) 972 if (option (Opt_borderLess))
903 { 973 {
904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 974 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905 { 975 {
906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 976 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
907 attributes.override_redirect = true; 977 attributes.override_redirect = true;
908 mwmhints.flags = 0;
909 } 978 }
910 else 979 else
911 { 980 {
912 mwmhints.flags = MWM_HINTS_DECORATIONS; 981 mwmhints.flags = MWM_HINTS_DECORATIONS;
913 mwmhints.decorations = 0;
914 } 982 }
915 } 983 }
916 else
917 mwmhints.flags = 0;
918#endif 984#endif
919 985
920#if ENABLE_XEMBED 986#if ENABLE_XEMBED
921 if (rs[Rs_embed]) 987 if (rs[Rs_embed])
922 { 988 {
… …
957 classHint.res_name = (char *)rs[Rs_name]; 1023 classHint.res_name = (char *)rs[Rs_name];
958 classHint.res_class = (char *)RESCLASS; 1024 classHint.res_class = (char *)RESCLASS;
959 1025
960 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1026 wmHint.flags = InputHint | StateHint | WindowGroupHint;
961 wmHint.input = True; 1027 wmHint.input = True;
962 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1028 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
963 wmHint.window_group = top; 1029 wmHint.window_group = top;
964 1030
965 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1031 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
966 &szHint, &wmHint, &classHint); 1032 &szHint, &wmHint, &classHint);
967 1033
… …
1024 attributes.bit_gravity = NorthWestGravity; 1090 attributes.bit_gravity = NorthWestGravity;
1025 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1091 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1026 1092
1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1093 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1028 1094
1029 if (OPTION (Opt_pointerBlank)) 1095 if (option (Opt_pointerBlank))
1030 vt_emask |= PointerMotionMask; 1096 vt_emask |= PointerMotionMask;
1031 else 1097 else
1032 vt_emask |= Button1MotionMask | Button3MotionMask; 1098 vt_emask |= Button1MotionMask | Button3MotionMask;
1033 1099
1034 vt_select_input (); 1100 vt_select_input ();
1035 1101
1036 vt_ev.start (display, vt); 1102 vt_ev.start (display, vt);
1037
1038#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL
1040 && !OPTION (Opt_transparent))
1041 {
1042 const char *p = rs[Rs_backgroundPixmap];
1043
1044 if ((p = strchr (p, ';')) != NULL)
1045 {
1046 p++;
1047 scale_pixmap (p);
1048 }
1049
1050 set_bgPixmap (rs[Rs_backgroundPixmap]);
1051 scr_touch (true);
1052 }
1053#endif
1054 1103
1055 /* graphics context for the vt window */ 1104 /* graphics context for the vt window */
1056 gcvalue.foreground = pix_colors[Color_fg]; 1105 gcvalue.foreground = pix_colors[Color_fg];
1057 gcvalue.background = pix_colors[Color_bg]; 1106 gcvalue.background = pix_colors[Color_bg];
1058 gcvalue.graphics_exposures = 0; 1107 gcvalue.graphics_exposures = 0;
… …
1275 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1324 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1276 1325
1277 int er; 1326 int er;
1278 1327
1279#ifndef NO_BACKSPACE_KEY 1328#ifndef NO_BACKSPACE_KEY
1280 if (key_backspace[0] && !key_backspace[1]) 1329 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1281 er = key_backspace[0]; 1330 er = rs[Rs_backspace_key][0];
1282 else if (strcmp (key_backspace, "DEC") == 0) 1331 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1283 er = '\177'; /* the initial state anyway */ 1332 er = '\177'; /* the initial state anyway */
1284 else 1333 else
1285#endif 1334#endif
1286 er = -1; 1335 er = -1;
1287 1336
… …
1329 } 1378 }
1330 1379
1331 _exit (EXIT_FAILURE); 1380 _exit (EXIT_FAILURE);
1332 1381
1333 default: 1382 default:
1334 if (!OPTION (Opt_utmpInhibit)) 1383 if (!option (Opt_utmpInhibit))
1335 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1384 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1336 1385
1337 pty->close_tty (); 1386 pty->close_tty ();
1338 1387
1339 child_ev.start (cmd_pid); 1388 child_ev.start (cmd_pid);
1340 1389
… …
1353int 1402int
1354rxvt_term::run_child (const char *const *argv) 1403rxvt_term::run_child (const char *const *argv)
1355{ 1404{
1356 char *login; 1405 char *login;
1357 1406
1358 if (OPTION (Opt_console)) 1407 if (option (Opt_console))
1359 { /* be virtual console, fail silently */ 1408 { /* be virtual console, fail silently */
1360#ifdef TIOCCONS 1409#ifdef TIOCCONS
1361 unsigned int on = 1; 1410 unsigned int on = 1;
1362 1411
1363 ioctl (STDIN_FILENO, TIOCCONS, &on); 1412 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1391 sigset_t ss; 1440 sigset_t ss;
1392 sigemptyset (&ss); 1441 sigemptyset (&ss);
1393 sigprocmask (SIG_SETMASK, &ss, 0); 1442 sigprocmask (SIG_SETMASK, &ss, 0);
1394 1443
1395 /* command interpreter path */ 1444 /* command interpreter path */
1396 if (argv != NULL) 1445 if (argv)
1397 { 1446 {
1398# ifdef DEBUG_CMD 1447# ifdef DEBUG_CMD
1399 int i; 1448 int i;
1400 1449
1401 for (i = 0; argv[i]; i++) 1450 for (i = 0; argv[i]; i++)
… …
1410 const char *argv0, *shell; 1459 const char *argv0, *shell;
1411 1460
1412 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1461 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1413 shell = "/bin/sh"; 1462 shell = "/bin/sh";
1414 1463
1415 argv0 = (const char *)rxvt_r_basename (shell); 1464 argv0 = (const char *)rxvt_basename (shell);
1416 1465
1417 if (OPTION (Opt_loginShell)) 1466 if (option (Opt_loginShell))
1418 { 1467 {
1419 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1468 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1420 1469
1421 login[0] = '-'; 1470 login[0] = '-';
1422 strcpy (&login[1], argv0); 1471 strcpy (&login[1], argv0);
1423 argv0 = login; 1472 argv0 = login;
1424 } 1473 }
1425 1474
1426 execlp (shell, argv0, NULL); 1475 execlp (shell, argv0, (char *)0);
1427 /* no error message: STDERR is closed! */ 1476 /* no error message: STDERR is closed! */
1428 } 1477 }
1429 1478
1430 return -1; 1479 return -1;
1431} 1480}

Diff Legend

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