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.180 by ayin, Fri Feb 16 21:46:05 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 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 282 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 283 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 284 ncol = 80;
198 nrow = 24; 285 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 286 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 287 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 288 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 289 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS; 290 numpix_colors = TOTAL_COLORS;
204 291
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 292 refresh_type = SLOW_REFRESH;
207 293
208 oldcursor.row = oldcursor.col = -1; 294 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 0;
212 bgPixmap.pixmap = None;
213#endif
214
215 last_bot = last_state = -1; 295 last_bot = last_state = -1;
296
297 set_option (Opt_scrollBar);
298 set_option (Opt_scrollTtyOutput);
299 set_option (Opt_jumpScroll);
300 set_option (Opt_skipScroll);
301 set_option (Opt_secondaryScreen);
302 set_option (Opt_secondaryScroll);
303 set_option (Opt_pastableTabs);
304 set_option (Opt_intensityStyles);
305 set_option (Opt_iso14755_52);
216 306
217 return true; 307 return true;
218} 308}
219 309
220void 310void
… …
229 if ((i = open ("/dev/null", O_RDONLY)) < 0) 319 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 { 320 {
231 /* TODO: BOO HISS */ 321 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO); 322 dup2 (STDERR_FILENO, STDIN_FILENO);
233 } 323 }
234 else if (i > STDIN_FILENO) 324 else if (i != STDIN_FILENO)
235 { 325 {
236 dup2 (i, STDIN_FILENO); 326 dup2 (i, STDIN_FILENO);
237 close (i); 327 close (i);
238 } 328 }
239 329
… …
254/*----------------------------------------------------------------------*/ 344/*----------------------------------------------------------------------*/
255const char ** 345const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 346rxvt_term::init_resources (int argc, const char *const *argv)
257{ 347{
258 int i, r_argc; 348 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 349 const char **cmd_argv, **r_argv;
261 350
262 /* 351 /*
263 * 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
264 */ 353 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 354 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e")) 355 if (!strcmp (argv[r_argc], "-e"))
267 break; 356 break;
268 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
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 372 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 373
271 for (i = 0; i < r_argc; i++) 374 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 375 r_argv[i] = (const char *)argv[i];
273 376
274 r_argv[i] = NULL; 377 r_argv[i] = NULL;
275 378
276 if (r_argc == argc)
277 cmd_argv = NULL;
278 else
279 {
280 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
281
282 for (i = 0; i < argc - r_argc - 1; i++)
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284
285 cmd_argv[i] = NULL;
286 }
287
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 379 rs[Rs_name] = rxvt_basename (argv[0]);
289 380
290 /* 381 /*
291 * Open display, get options/resources and create the window 382 * Open display, get options/resources and create the window
292 */ 383 */
293 384
… …
295 rs[Rs_display_name] = ":0"; 386 rs[Rs_display_name] = ":0";
296 387
297 get_options (r_argc, r_argv); 388 get_options (r_argc, r_argv);
298 389
299 if (!(display = displays.get (rs[Rs_display_name]))) 390 if (!(display = displays.get (rs[Rs_display_name])))
391 {
392 free (r_argv);
300 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 }
301 395
302 // using a local pointer decreases code size a lot 396 // using a local pointer decreases code size a lot
303 xa = display->xa; 397 xa = display->xa;
304 398
305 set (display); 399 set (display);
… …
308#if XFT 402#if XFT
309 if (rs[Rs_depth]) 403 if (rs[Rs_depth])
310 select_visual (strtol (rs[Rs_depth], 0, 0)); 404 select_visual (strtol (rs[Rs_depth], 0, 0));
311#endif 405#endif
312 406
407#ifdef HAVE_AFTERIMAGE
408 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
409#endif
313 free (r_argv); 410 free (r_argv);
314 411
315 for (int i = NUM_RESOURCES; i--; ) 412 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef) 413 if (rs [i] == resval_undef)
317 rs [i] = 0; 414 rs [i] = 0;
… …
333 * set any defaults not already set 430 * set any defaults not already set
334 */ 431 */
335 if (cmd_argv && cmd_argv[0]) 432 if (cmd_argv && cmd_argv[0])
336 { 433 {
337 if (!rs[Rs_title]) 434 if (!rs[Rs_title])
338 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 435 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
339 if (!rs[Rs_iconName]) 436 if (!rs[Rs_iconName])
340 rs[Rs_iconName] = rs[Rs_title]; 437 rs[Rs_iconName] = rs[Rs_title];
341 } 438 }
342 else 439 else
343 { 440 {
… …
381 rs[Rs_cutchars] = CUTCHARS; 478 rs[Rs_cutchars] = CUTCHARS;
382 479
383#ifndef NO_BACKSPACE_KEY 480#ifndef NO_BACKSPACE_KEY
384 if (!rs[Rs_backspace_key]) 481 if (!rs[Rs_backspace_key])
385# ifdef DEFAULT_BACKSPACE 482# ifdef DEFAULT_BACKSPACE
386 key_backspace = DEFAULT_BACKSPACE; 483 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
387# else 484# else
388 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 485 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
389# endif 486# endif
390 else
391 {
392 val = strdup (rs[Rs_backspace_key]);
393 rxvt_Str_trim (val);
394 rxvt_Str_escaped (val);
395 key_backspace = val;
396 }
397#endif 487#endif
398 488
399#ifndef NO_DELETE_KEY 489#ifndef NO_DELETE_KEY
400 if (!rs[Rs_delete_key]) 490 if (!rs[Rs_delete_key])
401# ifdef DEFAULT_DELETE 491# ifdef DEFAULT_DELETE
402 key_delete = DEFAULT_DELETE; 492 rs[Rs_delete_key] = DEFAULT_DELETE;
403# else 493# else
404 key_delete = "\033[3~"; 494 rs[Rs_delete_key] = "\033[3~";
405# endif
406 else
407 {
408 val = strdup (rs[Rs_delete_key]);
409 rxvt_Str_trim (val);
410 rxvt_Str_escaped (val);
411 key_delete = val;
412 }
413#endif 495# endif
414 if (rs[Rs_answerbackstring]) 496#endif
415 {
416 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
417 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
418 }
419 497
420#ifdef HAVE_SCROLLBARS 498#ifdef HAVE_SCROLLBARS
421 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]);
422#endif 500#endif
423 501
424#ifdef XTERM_REVERSE_VIDEO 502#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 503 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 504 if (option (Opt_reverseVideo))
427 { 505 {
428 if (!rs[Rs_color + Color_fg]) 506 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 507 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 508
431 if (!rs[Rs_color + Color_bg]) 509 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 515 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 516 rs[Rs_color + i] = def_colorName[i];
439 517
440#ifndef XTERM_REVERSE_VIDEO 518#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 519 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 520 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 521 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 522#endif
445 523
446 /* convenient aliases for setting fg/bg to colors */ 524 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 525 color_aliases (Color_fg);
… …
468/*----------------------------------------------------------------------*/ 546/*----------------------------------------------------------------------*/
469void 547void
470rxvt_term::init_env () 548rxvt_term::init_env ()
471{ 549{
472 int i; 550 int i;
473 unsigned int u;
474 char *val; 551 char *val;
475 552
476#ifdef DISPLAY_IS_IP 553#ifdef DISPLAY_IS_IP
477 /* Fixup display_name for export over pty to any interested terminal 554 /* Fixup display_name for export over pty to any interested terminal
478 * 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
… …
493 570
494 if (rs[Rs_display_name] == NULL) 571 if (rs[Rs_display_name] == NULL)
495 rs[Rs_display_name] = val; /* use broken `:0' value */ 572 rs[Rs_display_name] = val; /* use broken `:0' value */
496 573
497 i = strlen (val); 574 i = strlen (val);
498 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 575 env_display = (char *)rxvt_malloc (i + 9);
499 576
500 sprintf (env_display, "DISPLAY=%s", val); 577 sprintf (env_display, "DISPLAY=%s", val);
501 578
502 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 579 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
503 580
… …
524 else 601 else
525 putenv ("COLORTERM=" COLORTERMENVFULL); 602 putenv ("COLORTERM=" COLORTERMENVFULL);
526 603
527 if (rs[Rs_term_name] != NULL) 604 if (rs[Rs_term_name] != NULL)
528 { 605 {
529 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);
530 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 607 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
531 putenv (env_term); 608 putenv (env_term);
532 } 609 }
533 else 610 else
534 putenv ("TERM=" TERMENV); 611 putenv ("TERM=" TERMENV);
… …
621 * Initialize the command connection. 698 * Initialize the command connection.
622 * This should be called after the X server connection is established. 699 * This should be called after the X server connection is established.
623 */ 700 */
624 701
625#ifdef META8_OPTION 702#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 703 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 704#endif
628 705
629 get_ourmods (); 706 get_ourmods ();
630 707
631 if (!OPTION (Opt_scrollTtyOutput)) 708 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 709 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 710 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 711 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 712 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 713 priv_modes |= PrivMode_smoothScroll;
637 714
638#ifndef NO_BACKSPACE_KEY 715#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 716 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 717 priv_modes |= PrivMode_HaveBackSpace;
641#endif 718#endif
642 719
643 /* add value for scrollBar */ 720 /* add value for scrollBar */
644 if (scrollBar.state) 721 if (scrollBar.state)
… …
670 rxvt_color xcol; 747 rxvt_color xcol;
671 748
672 if (!set_color (xcol, name)) 749 if (!set_color (xcol, name))
673 { 750 {
674#ifndef XTERM_REVERSE_VIDEO 751#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo)) 752 if (i < 2 && option (Opt_reverseVideo))
676 name = def_colorName [1 - i]; 753 name = def_colorName [1 - i];
677 else 754 else
678#endif 755#endif
679 name = def_colorName [i]; 756 name = def_colorName [i];
680 757
… …
871rxvt_term::create_windows (int argc, const char *const *argv) 948rxvt_term::create_windows (int argc, const char *const *argv)
872{ 949{
873 XClassHint classHint; 950 XClassHint classHint;
874 XWMHints wmHint; 951 XWMHints wmHint;
875#if ENABLE_FRILLS 952#if ENABLE_FRILLS
876 MWMHints mwmhints; 953 MWMHints mwmhints = { };
877#endif 954#endif
878 XGCValues gcvalue; 955 XGCValues gcvalue;
879 XSetWindowAttributes attributes; 956 XSetWindowAttributes attributes;
880 Window top, parent; 957 Window top, parent;
881 958
… …
887 if (!set_fonts ()) 964 if (!set_fonts ())
888 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");
889 966
890 parent = display->root; 967 parent = display->root;
891 968
892 attributes.override_redirect = !!OPTION (Opt_override_redirect); 969 attributes.override_redirect = !!option (Opt_override_redirect);
893 970
894#if ENABLE_FRILLS 971#if ENABLE_FRILLS
895 if (OPTION (Opt_borderLess)) 972 if (option (Opt_borderLess))
896 { 973 {
897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 974 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
898 { 975 {
899 /* 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");
900 attributes.override_redirect = true; 977 attributes.override_redirect = true;
901 mwmhints.flags = 0;
902 } 978 }
903 else 979 else
904 { 980 {
905 mwmhints.flags = MWM_HINTS_DECORATIONS; 981 mwmhints.flags = MWM_HINTS_DECORATIONS;
906 mwmhints.decorations = 0;
907 } 982 }
908 } 983 }
909 else
910 mwmhints.flags = 0;
911#endif 984#endif
912 985
913#if ENABLE_XEMBED 986#if ENABLE_XEMBED
914 if (rs[Rs_embed]) 987 if (rs[Rs_embed])
915 { 988 {
… …
950 classHint.res_name = (char *)rs[Rs_name]; 1023 classHint.res_name = (char *)rs[Rs_name];
951 classHint.res_class = (char *)RESCLASS; 1024 classHint.res_class = (char *)RESCLASS;
952 1025
953 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1026 wmHint.flags = InputHint | StateHint | WindowGroupHint;
954 wmHint.input = True; 1027 wmHint.input = True;
955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1028 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
956 wmHint.window_group = top; 1029 wmHint.window_group = top;
957 1030
958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1031 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
959 &szHint, &wmHint, &classHint); 1032 &szHint, &wmHint, &classHint);
960 1033
… …
1017 attributes.bit_gravity = NorthWestGravity; 1090 attributes.bit_gravity = NorthWestGravity;
1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1091 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1019 1092
1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1093 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1021 1094
1022 if (OPTION (Opt_pointerBlank)) 1095 if (option (Opt_pointerBlank))
1023 vt_emask |= PointerMotionMask; 1096 vt_emask |= PointerMotionMask;
1024 else 1097 else
1025 vt_emask |= Button1MotionMask | Button3MotionMask; 1098 vt_emask |= Button1MotionMask | Button3MotionMask;
1026 1099
1027 vt_select_input (); 1100 vt_select_input ();
1028 1101
1029 vt_ev.start (display, vt); 1102 vt_ev.start (display, vt);
1030
1031#ifdef XPM_BACKGROUND
1032 if (rs[Rs_backgroundPixmap] != NULL
1033 && !OPTION (Opt_transparent))
1034 {
1035 const char *p = rs[Rs_backgroundPixmap];
1036
1037 if ((p = strchr (p, ';')) != NULL)
1038 {
1039 p++;
1040 scale_pixmap (p);
1041 }
1042
1043 set_bgPixmap (rs[Rs_backgroundPixmap]);
1044 scr_touch (true);
1045 }
1046#endif
1047 1103
1048 /* graphics context for the vt window */ 1104 /* graphics context for the vt window */
1049 gcvalue.foreground = pix_colors[Color_fg]; 1105 gcvalue.foreground = pix_colors[Color_fg];
1050 gcvalue.background = pix_colors[Color_bg]; 1106 gcvalue.background = pix_colors[Color_bg];
1051 gcvalue.graphics_exposures = 0; 1107 gcvalue.graphics_exposures = 0;
… …
1268 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1324 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1269 1325
1270 int er; 1326 int er;
1271 1327
1272#ifndef NO_BACKSPACE_KEY 1328#ifndef NO_BACKSPACE_KEY
1273 if (key_backspace[0] && !key_backspace[1]) 1329 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1274 er = key_backspace[0]; 1330 er = rs[Rs_backspace_key][0];
1275 else if (strcmp (key_backspace, "DEC") == 0) 1331 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1276 er = '\177'; /* the initial state anyway */ 1332 er = '\177'; /* the initial state anyway */
1277 else 1333 else
1278#endif 1334#endif
1279 er = -1; 1335 er = -1;
1280 1336
… …
1322 } 1378 }
1323 1379
1324 _exit (EXIT_FAILURE); 1380 _exit (EXIT_FAILURE);
1325 1381
1326 default: 1382 default:
1327 if (!OPTION (Opt_utmpInhibit)) 1383 if (!option (Opt_utmpInhibit))
1328 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1384 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1329 1385
1330 pty->close_tty (); 1386 pty->close_tty ();
1331 1387
1332 child_ev.start (cmd_pid); 1388 child_ev.start (cmd_pid);
1333 1389
… …
1346int 1402int
1347rxvt_term::run_child (const char *const *argv) 1403rxvt_term::run_child (const char *const *argv)
1348{ 1404{
1349 char *login; 1405 char *login;
1350 1406
1351 if (OPTION (Opt_console)) 1407 if (option (Opt_console))
1352 { /* be virtual console, fail silently */ 1408 { /* be virtual console, fail silently */
1353#ifdef TIOCCONS 1409#ifdef TIOCCONS
1354 unsigned int on = 1; 1410 unsigned int on = 1;
1355 1411
1356 ioctl (STDIN_FILENO, TIOCCONS, &on); 1412 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1384 sigset_t ss; 1440 sigset_t ss;
1385 sigemptyset (&ss); 1441 sigemptyset (&ss);
1386 sigprocmask (SIG_SETMASK, &ss, 0); 1442 sigprocmask (SIG_SETMASK, &ss, 0);
1387 1443
1388 /* command interpreter path */ 1444 /* command interpreter path */
1389 if (argv != NULL) 1445 if (argv)
1390 { 1446 {
1391# ifdef DEBUG_CMD 1447# ifdef DEBUG_CMD
1392 int i; 1448 int i;
1393 1449
1394 for (i = 0; argv[i]; i++) 1450 for (i = 0; argv[i]; i++)
… …
1403 const char *argv0, *shell; 1459 const char *argv0, *shell;
1404 1460
1405 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1461 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1406 shell = "/bin/sh"; 1462 shell = "/bin/sh";
1407 1463
1408 argv0 = (const char *)rxvt_r_basename (shell); 1464 argv0 = (const char *)rxvt_basename (shell);
1409 1465
1410 if (OPTION (Opt_loginShell)) 1466 if (option (Opt_loginShell))
1411 { 1467 {
1412 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1468 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1413 1469
1414 login[0] = '-'; 1470 login[0] = '-';
1415 strcpy (&login[1], argv0); 1471 strcpy (&login[1], argv0);
1416 argv0 = login; 1472 argv0 = login;
1417 } 1473 }
1418 1474
1419 execlp (shell, argv0, NULL); 1475 execlp (shell, argv0, (char *)0);
1420 /* no error message: STDERR is closed! */ 1476 /* no error message: STDERR is closed! */
1421 } 1477 }
1422 1478
1423 return -1; 1479 return -1;
1424} 1480}

Diff Legend

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