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.152 by root, Sat Jan 21 22:38:05 2006 UTC vs.
Revision 1.214 by ayin, Fri Sep 14 17:10:34 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
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 "Black", /* 0: black (#000000) */ 139 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 140 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 141 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 142 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 143 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 144 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 145 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 146# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 147 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 148# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 149 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 150# endif
60 /* high-intensity colors */ 151 /* high-intensity colors */
61# ifdef XTERM_COLORS 152# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 153 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 154# else
64 "Grey25", /* 8: bright black (#404040) */ 155 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 156# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 157 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 158 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 159 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 160 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 161 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 162 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 163 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 164
74 // 88 xterm colours 165 // 88 xterm colours
75 "rgb:00/00/00", 166 "rgb:00/00/00",
76 "rgb:00/00/8b", 167 "rgb:00/00/8b",
77 "rgb:00/00/cd", 168 "rgb:00/00/cd",
… …
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 "black", 266 "rgb:00/00/00",
176#endif
177 };
178
179const char *const xa_names[] =
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#if ENABLE_XEMBED
209 "_XEMBED",
210 "_XEMBED_INFO",
211#endif 267#endif
212 }; 268 };
213 269
214bool 270bool
215rxvt_term::init_vars () 271rxvt_term::init_vars ()
216{ 272{
273 pix_colors = //
217 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 274 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
218#ifdef OFF_FOCUS_FADING 275#ifdef OFF_FOCUS_FADING
219 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 276 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
220#endif 277#endif
221 pix_colors = pix_colors_focused;
222 278
223 if (pix_colors == NULL)
224 return false;
225
226#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
227 pixmap = None;
228#endif
229 279
230 MEvent.time = CurrentTime; 280 MEvent.time = CurrentTime;
231 MEvent.button = AnyButton; 281 MEvent.button = AnyButton;
232 options = DEFAULT_OPTIONS;
233 want_refresh = 1; 282 want_refresh = 1;
234 priv_modes = SavedModes = PrivMode_Default; 283 priv_modes = SavedModes = PrivMode_Default;
235 focus = 0;
236 ncol = 80; 284 ncol = 80;
237 nrow = 24; 285 nrow = 24;
238 int_bwidth = INTERNALBORDERWIDTH; 286 int_bwidth = INTERNALBORDERWIDTH;
239 ext_bwidth = EXTERNALBORDERWIDTH; 287 ext_bwidth = EXTERNALBORDERWIDTH;
240 lineSpace = LINESPACE; 288 lineSpace = LINESPACE;
241 saveLines = SAVELINES; 289 saveLines = SAVELINES;
242 numpix_colors = TOTAL_COLORS; 290 numpix_colors = TOTAL_COLORS;
243 291
244 refresh_limit = 1;
245 refresh_type = SLOW_REFRESH; 292 refresh_type = SLOW_REFRESH;
246 prev_nrow = prev_ncol = 0;
247 293
248 oldcursor.row = oldcursor.col = -1; 294 oldcursor.row = oldcursor.col = -1;
249#ifdef XPM_BACKGROUND
250 /* bgPixmap.w = bgPixmap.h = 0; */
251 bgPixmap.x = bgPixmap.y = 50;
252 bgPixmap.pixmap = None;
253#endif
254
255 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);
256 306
257 return true; 307 return true;
258} 308}
259 309
260void 310void
… …
294/*----------------------------------------------------------------------*/ 344/*----------------------------------------------------------------------*/
295const char ** 345const char **
296rxvt_term::init_resources (int argc, const char *const *argv) 346rxvt_term::init_resources (int argc, const char *const *argv)
297{ 347{
298 int i, r_argc; 348 int i, r_argc;
299 char *val;
300 const char **cmd_argv, **r_argv; 349 const char **cmd_argv, **r_argv;
301 350
302 /* 351 /*
303 * Look for -exec option. Find => split and make cmd_argv[] of command args 352 * Look for -e option. Find => split and make cmd_argv[] of command args
304 */ 353 */
305 for (r_argc = 0; r_argc < argc; r_argc++) 354 for (r_argc = 0; r_argc < argc; r_argc++)
306 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 355 if (!strcmp (argv[r_argc], "-e"))
307 break; 356 break;
308 357
309 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 358 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
310 359
311 for (i = 0; i < r_argc; i++) 360 for (i = 0; i < r_argc; i++)
… …
323 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 372 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
324 373
325 cmd_argv[i] = NULL; 374 cmd_argv[i] = NULL;
326 } 375 }
327 376
328 rs[Rs_name] = rxvt_r_basename (argv[0]); 377 rs[Rs_name] = rxvt_basename (argv[0]);
329 378
330 /* 379 /*
331 * Open display, get options/resources and create the window 380 * Open display, get options/resources and create the window
332 */ 381 */
333 382
… …
337 get_options (r_argc, r_argv); 386 get_options (r_argc, r_argv);
338 387
339 if (!(display = displays.get (rs[Rs_display_name]))) 388 if (!(display = displays.get (rs[Rs_display_name])))
340 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 389 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
341 390
391 // using a local pointer decreases code size a lot
392 xa = display->xa;
393
394 set (display);
342 extract_resources (); 395 extract_resources ();
343 396
397#if XFT
398 if (rs[Rs_depth])
399 select_visual (strtol (rs[Rs_depth], 0, 0));
400#endif
401
402#ifdef HAVE_AFTERIMAGE
403 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
404#endif
344 free (r_argv); 405 free (r_argv);
406
407 for (int i = NUM_RESOURCES; i--; )
408 if (rs [i] == resval_undef)
409 rs [i] = 0;
345 410
346#if ENABLE_PERL 411#if ENABLE_PERL
347 if (!rs[Rs_perl_ext_1]) 412 if (!rs[Rs_perl_ext_1])
348 rs[Rs_perl_ext_1] = "default"; 413 rs[Rs_perl_ext_1] = "default";
349 414
… …
360 * set any defaults not already set 425 * set any defaults not already set
361 */ 426 */
362 if (cmd_argv && cmd_argv[0]) 427 if (cmd_argv && cmd_argv[0])
363 { 428 {
364 if (!rs[Rs_title]) 429 if (!rs[Rs_title])
365 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 430 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
366 if (!rs[Rs_iconName]) 431 if (!rs[Rs_iconName])
367 rs[Rs_iconName] = rs[Rs_title]; 432 rs[Rs_iconName] = rs[Rs_title];
368 } 433 }
369 else 434 else
370 { 435 {
… …
408 rs[Rs_cutchars] = CUTCHARS; 473 rs[Rs_cutchars] = CUTCHARS;
409 474
410#ifndef NO_BACKSPACE_KEY 475#ifndef NO_BACKSPACE_KEY
411 if (!rs[Rs_backspace_key]) 476 if (!rs[Rs_backspace_key])
412# ifdef DEFAULT_BACKSPACE 477# ifdef DEFAULT_BACKSPACE
413 key_backspace = DEFAULT_BACKSPACE; 478 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
414# else 479# else
415 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 480 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
416# endif 481# endif
417 else
418 {
419 val = strdup (rs[Rs_backspace_key]);
420 rxvt_Str_trim (val);
421 rxvt_Str_escaped (val);
422 key_backspace = val;
423 }
424#endif 482#endif
425 483
426#ifndef NO_DELETE_KEY 484#ifndef NO_DELETE_KEY
427 if (!rs[Rs_delete_key]) 485 if (!rs[Rs_delete_key])
428# ifdef DEFAULT_DELETE 486# ifdef DEFAULT_DELETE
429 key_delete = DEFAULT_DELETE; 487 rs[Rs_delete_key] = DEFAULT_DELETE;
430# else 488# else
431 key_delete = "\033[3~"; 489 rs[Rs_delete_key] = "\033[3~";
432# endif
433 else
434 {
435 val = strdup (rs[Rs_delete_key]);
436 rxvt_Str_trim (val);
437 rxvt_Str_escaped (val);
438 key_delete = val;
439 }
440#endif 490# endif
441 if (rs[Rs_answerbackstring]) 491#endif
442 {
443 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
444 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
445 }
446 492
447#ifdef HAVE_SCROLLBARS 493#ifdef HAVE_SCROLLBARS
448 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]);
449#endif 495#endif
450 496
451#ifdef XTERM_REVERSE_VIDEO 497#ifdef XTERM_REVERSE_VIDEO
452 /* this is how xterm implements reverseVideo */ 498 /* this is how xterm implements reverseVideo */
453 if (OPTION (Opt_reverseVideo)) 499 if (option (Opt_reverseVideo))
454 { 500 {
455 if (!rs[Rs_color + Color_fg]) 501 if (!rs[Rs_color + Color_fg])
456 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 502 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
503
457 if (!rs[Rs_color + Color_bg]) 504 if (!rs[Rs_color + Color_bg])
458 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 505 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
459 } 506 }
460#endif 507#endif
461 508
… …
463 if (!rs[Rs_color + i]) 510 if (!rs[Rs_color + i])
464 rs[Rs_color + i] = def_colorName[i]; 511 rs[Rs_color + i] = def_colorName[i];
465 512
466#ifndef XTERM_REVERSE_VIDEO 513#ifndef XTERM_REVERSE_VIDEO
467 /* this is how we implement reverseVideo */ 514 /* this is how we implement reverseVideo */
468 if (OPTION (Opt_reverseVideo)) 515 if (option (Opt_reverseVideo))
469 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 516 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
470#endif 517#endif
471 518
472 /* convenient aliases for setting fg/bg to colors */ 519 /* convenient aliases for setting fg/bg to colors */
473 color_aliases (Color_fg); 520 color_aliases (Color_fg);
… …
494/*----------------------------------------------------------------------*/ 541/*----------------------------------------------------------------------*/
495void 542void
496rxvt_term::init_env () 543rxvt_term::init_env ()
497{ 544{
498 int i; 545 int i;
499 unsigned int u;
500 char *val; 546 char *val;
501 547
502#ifdef DISPLAY_IS_IP 548#ifdef DISPLAY_IS_IP
503 /* Fixup display_name for export over pty to any interested terminal 549 /* Fixup display_name for export over pty to any interested terminal
504 * 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
… …
513 val = rxvt_network_display (rs[Rs_display_name]); 559 val = rxvt_network_display (rs[Rs_display_name]);
514 rs[Rs_display_name] = (const char *)val; 560 rs[Rs_display_name] = (const char *)val;
515 561
516 if (val == NULL) 562 if (val == NULL)
517#endif /* DISPLAY_IS_IP */ 563#endif /* DISPLAY_IS_IP */
518 val = XDisplayString (display->display); 564 val = XDisplayString (dpy);
519 565
520 if (rs[Rs_display_name] == NULL) 566 if (rs[Rs_display_name] == NULL)
521 rs[Rs_display_name] = val; /* use broken `:0' value */ 567 rs[Rs_display_name] = val; /* use broken `:0' value */
522 568
523 i = strlen (val); 569 i = strlen (val);
524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 570 env_display = (char *)rxvt_malloc (i + 9);
525 571
526 sprintf (env_display, "DISPLAY=%s", val); 572 sprintf (env_display, "DISPLAY=%s", val);
527 573
528 /* avoiding the math library: 574 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
529 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
530 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
531 ;
532 max_it (i, 1);
533 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
534
535 sprintf (env_windowid, "WINDOWID=%u",
536 (unsigned int)parent[0]);
537 575
538 /* add entries to the environment: 576 /* add entries to the environment:
539 * @ DISPLAY: in case we started with -display 577 * @ DISPLAY: in case we started with -display
540 * @ WINDOWID: X window id number of the window 578 * @ WINDOWID: X window id number of the window
541 * @ COLORTERM: terminal sub-name and also indicates its color 579 * @ COLORTERM: terminal sub-name and also indicates its color
… …
543 * @ TERMINFO: path to terminfo directory 581 * @ TERMINFO: path to terminfo directory
544 * @ COLORFGBG: fg;bg color codes 582 * @ COLORFGBG: fg;bg color codes
545 */ 583 */
546 putenv (env_display); 584 putenv (env_display);
547 putenv (env_windowid); 585 putenv (env_windowid);
586
548 if (env_colorfgbg) 587 if (env_colorfgbg)
549 putenv (env_colorfgbg); 588 putenv (env_colorfgbg);
550 589
551#ifdef RXVT_TERMINFO 590#ifdef RXVT_TERMINFO
552 putenv ("TERMINFO=" RXVT_TERMINFO); 591 putenv ("TERMINFO=" RXVT_TERMINFO);
553#endif 592#endif
554 593
555 if (display->depth <= 2) 594 if (depth <= 2)
556 putenv ("COLORTERM=" COLORTERMENV "-mono"); 595 putenv ("COLORTERM=" COLORTERMENV "-mono");
557 else 596 else
558 putenv ("COLORTERM=" COLORTERMENVFULL); 597 putenv ("COLORTERM=" COLORTERMENVFULL);
559 598
560 if (rs[Rs_term_name] != NULL) 599 if (rs[Rs_term_name] != NULL)
561 { 600 {
562 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);
563 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 602 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
564 putenv (env_term); 603 putenv (env_term);
565 } 604 }
566 else 605 else
567 putenv ("TERM=" TERMENV); 606 putenv ("TERM=" TERMENV);
… …
654 * Initialize the command connection. 693 * Initialize the command connection.
655 * This should be called after the X server connection is established. 694 * This should be called after the X server connection is established.
656 */ 695 */
657 696
658#ifdef META8_OPTION 697#ifdef META8_OPTION
659 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 698 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
660#endif 699#endif
661 700
662 get_ourmods (); 701 get_ourmods ();
663 702
664 if (!OPTION (Opt_scrollTtyOutput)) 703 if (!option (Opt_scrollTtyOutput))
665 priv_modes |= PrivMode_TtyOutputInh; 704 priv_modes |= PrivMode_TtyOutputInh;
666 if (OPTION (Opt_scrollTtyKeypress)) 705 if (option (Opt_scrollTtyKeypress))
667 priv_modes |= PrivMode_Keypress; 706 priv_modes |= PrivMode_Keypress;
668 if (!OPTION (Opt_jumpScroll)) 707 if (!option (Opt_jumpScroll))
669 priv_modes |= PrivMode_smoothScroll; 708 priv_modes |= PrivMode_smoothScroll;
670 709
671#ifndef NO_BACKSPACE_KEY 710#ifndef NO_BACKSPACE_KEY
672 if (strcmp (key_backspace, "DEC") == 0) 711 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
673 priv_modes |= PrivMode_HaveBackSpace; 712 priv_modes |= PrivMode_HaveBackSpace;
674#endif 713#endif
675 714
676 /* add value for scrollBar */ 715 /* add value for scrollBar */
677 if (scrollBar.state) 716 if (scrollBar.state)
… …
691 730
692#ifdef OFF_FOCUS_FADING 731#ifdef OFF_FOCUS_FADING
693 pix_colors = pix_colors_focused; 732 pix_colors = pix_colors_focused;
694#endif 733#endif
695 734
696 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 735 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
697 { 736 {
737 const char *name = rs[Rs_color + i];
738
739 if (!name)
740 continue;
741
698 rxvt_color xcol; 742 rxvt_color xcol;
699 743
700 if (!rs[Rs_color + i]) 744 if (!set_color (xcol, name))
701 continue;
702
703 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
704 { 745 {
705#ifndef XTERM_REVERSE_VIDEO 746#ifndef XTERM_REVERSE_VIDEO
706 if (i < 2 && OPTION (Opt_reverseVideo)) 747 if (i < 2 && option (Opt_reverseVideo))
707 rs[Rs_color + i] = def_colorName[!i]; 748 name = def_colorName [1 - i];
708 else 749 else
709#endif 750#endif
710 rs[Rs_color + i] = def_colorName[i]; 751 name = def_colorName [i];
711 752
712 if (!rs[Rs_color + i]) 753 if (!name)
713 continue; 754 continue;
714 755
715 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 756 if (!set_color (xcol, name))
716 { 757 {
717 switch (i) 758 switch (i)
718 { 759 {
719 case Color_fg: 760 case Color_fg:
720 case Color_bg: 761 case Color_bg:
721 /* fatal: need bg/fg color */
722 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 762 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
723 /* NOTREACHED */ 763 name = "";
724 break; 764 break;
725#ifndef NO_CURSORCOLOR 765#ifndef NO_CURSORCOLOR
726 case Color_cursor2: 766 case Color_cursor2:
727 xcol = pix_colors[Color_fg]; 767#endif
728 break;
729#endif /* ! NO_CURSORCOLOR */
730 case Color_pointer_fg: 768 case Color_pointer_fg:
731 xcol = pix_colors[Color_fg]; 769 name = rs[Rs_color + Color_fg];
770 xcol.set (this, name);
732 break; 771 break;
733 default: 772 default:
734 xcol = pix_colors[Color_bg]; /* None */ 773 name = rs[Rs_color + Color_bg];
774 xcol.set (this, name);
735 break; 775 break;
736 } 776 }
737 } 777 }
738 } 778 }
739 779
740 pix_colors[i] = xcol; 780 pix_colors[i] = xcol;
741 SET_PIXCOLOR (i); 781 rs[Rs_color + i] = name;
742 }
743
744#ifdef OFF_FOCUS_FADING
745 if (rs[Rs_fade])
746 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
747 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
748#endif
749
750 if (display->depth <= 2)
751 { 782 }
783
784 if (depth <= 2)
785 {
752 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 786 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
753 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 787 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
754 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 788 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
755 } 789 }
756 790
757 /* 791 /*
758 * get scrollBar shadow colors 792 * get scrollBar shadow colors
759 * 793 *
760 * The calculations of topShadow/bottomShadow values are adapted 794 * The calculations of topShadow/bottomShadow values are adapted
761 * from the fvwm window manager. 795 * from the fvwm window manager.
762 */ 796 */
763#ifdef KEEP_SCROLLCOLOR 797#ifdef KEEP_SCROLLCOLOR
764
765 if (display->depth <= 2) 798 if (depth <= 2)
766 { 799 {
767 /* Monochrome */ 800 /* Monochrome */
768 pix_colors[Color_scroll] = pix_colors[Color_fg]; 801 alias_color (Color_scroll, Color_fg);
769 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 802 alias_color (Color_topShadow, Color_bg);
770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 803 alias_color (Color_bottomShadow, Color_bg);
771 } 804 }
772 else 805 else
773 { 806 {
774 rxvt_color xcol[2]; 807 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
775 /* xcol[0] == white
776 * xcol[1] == top shadow
777 * xcol[2] == bot shadow */
778 808
779 xcol[1] = pix_colors[Color_scroll]; 809 rgba cscroll;
780 xcol[0].set (display, 65535, 65535, 65535); 810 pix_colors [Color_scroll].get (cscroll);
781
782 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
783
784 xcol[0].get (display, pr0, pg0, pb0);
785 xcol[1].get (display, pr1, pg1, pb1);
786
787 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
788 811
789 /* topShadowColor */ 812 /* topShadowColor */
790 if (!xcol[1].set (display, 813 if (!pix_colors[Color_topShadow].set (this,
791 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 814 rgba (
792 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 815 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
793 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 816 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
794 xcol[1] = pix_colors[Color_White]; 817 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
795 818 cscroll.a)
796 pix_colors[Color_topShadow] = xcol[1]; 819 ))
820 alias_color (Color_topShadow, Color_White);
797 } 821 }
798#endif /* KEEP_SCROLLCOLOR */ 822#endif /* KEEP_SCROLLCOLOR */
823
824#ifdef OFF_FOCUS_FADING
825 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
826 update_fade_color (i);
827#endif
799} 828}
800 829
801/*----------------------------------------------------------------------*/ 830/*----------------------------------------------------------------------*/
802/* color aliases, fg/bg bright-bold */ 831/* color aliases, fg/bg bright-bold */
803void 832void
… …
842 871
843 if (rsmod 872 if (rsmod
844 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 873 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
845 requestedmeta = rsmod[3] - '0'; 874 requestedmeta = rsmod[3] - '0';
846 875
847 map = XGetModifierMapping (display->display); 876 map = XGetModifierMapping (dpy);
848 kc = map->modifiermap; 877 kc = map->modifiermap;
849 878
850 for (i = 1; i < 6; i++) 879 for (i = 1; i < 6; i++)
851 { 880 {
852 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 881 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
854 for (j = map->max_keypermod; j--; k++) 883 for (j = map->max_keypermod; j--; k++)
855 { 884 {
856 if (kc[k] == 0) 885 if (kc[k] == 0)
857 break; 886 break;
858 887
859 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 888 switch (XKeycodeToKeysym (dpy, kc[k], 0))
860 { 889 {
861 case XK_Num_Lock: 890 case XK_Num_Lock:
862 ModNumLockMask = modmasks[i - 1]; 891 ModNumLockMask = modmasks[i - 1];
863 continue; 892 continue;
864 893
… …
914rxvt_term::create_windows (int argc, const char *const *argv) 943rxvt_term::create_windows (int argc, const char *const *argv)
915{ 944{
916 XClassHint classHint; 945 XClassHint classHint;
917 XWMHints wmHint; 946 XWMHints wmHint;
918#if ENABLE_FRILLS 947#if ENABLE_FRILLS
919 Atom prop = None;
920 MWMHints mwmhints; 948 MWMHints mwmhints = { };
921#endif 949#endif
922 XGCValues gcvalue; 950 XGCValues gcvalue;
923 XSetWindowAttributes attributes; 951 XSetWindowAttributes attributes;
924 XWindowAttributes gattr;
925 Window top, parent; 952 Window top, parent;
926 dDisp;
927 953
928#ifdef USING_W11LIB 954 dLocal (Display *, dpy);
929 /* enable W11 callbacks */
930 W11AddEventHandler (disp, rxvt_W11_process_x_event);
931#endif
932
933 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
934 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
935
936 if (OPTION (Opt_transparent))
937 {
938 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
939 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
940 }
941 955
942 /* grab colors before netscape does */ 956 /* grab colors before netscape does */
943 Get_Colours (); 957 Get_Colours ();
944 958
945 if (!set_fonts ()) 959 if (!set_fonts ())
946 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 960 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
947 961
948 parent = DefaultRootWindow (disp); 962 parent = display->root;
949 963
950 attributes.override_redirect = !!OPTION (Opt_override_redirect); 964 attributes.override_redirect = !!option (Opt_override_redirect);
951 965
952#if ENABLE_FRILLS 966#if ENABLE_FRILLS
953 if (OPTION (Opt_borderLess)) 967 if (option (Opt_borderLess))
954 { 968 {
955 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); 969 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
956
957 if (prop == None)
958 { 970 {
959 /* 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");
960 attributes.override_redirect = TRUE; 972 attributes.override_redirect = true;
961 mwmhints.flags = 0;
962 } 973 }
963 else 974 else
964 { 975 {
965 mwmhints.flags = MWM_HINTS_DECORATIONS; 976 mwmhints.flags = MWM_HINTS_DECORATIONS;
966 mwmhints.decorations = 0;
967 } 977 }
968 } 978 }
969 else
970 mwmhints.flags = 0;
971#endif 979#endif
972 980
973#if ENABLE_XEMBED 981#if ENABLE_XEMBED
974 if (rs[Rs_embed]) 982 if (rs[Rs_embed])
975 { 983 {
976 XWindowAttributes wattr; 984 XWindowAttributes wattr;
977 985
978 parent = strtol (rs[Rs_embed], 0, 0); 986 parent = strtol (rs[Rs_embed], 0, 0);
979 987
980 if (!XGetWindowAttributes (disp, parent, &wattr)) 988 if (!XGetWindowAttributes (dpy, parent, &wattr))
981 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 989 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
982 990
983 window_calc (wattr.width, wattr.height); 991 window_calc (wattr.width, wattr.height);
984 } 992 }
985#endif 993#endif
986 994
987 window_calc (0, 0); 995 window_calc (0, 0);
988 996
989 /* sub-window placement & size in rxvt_resize_subwindows () */ 997 /* sub-window placement & size in rxvt_resize_subwindows () */
990 attributes.background_pixel = pix_colors_focused[Color_border]; 998 attributes.background_pixel = pix_colors_focused [Color_border];
991 attributes.border_pixel = pix_colors_focused[Color_border]; 999 attributes.border_pixel = pix_colors_focused [Color_border];
992 attributes.colormap = display->cmap; 1000 attributes.colormap = cmap;
1001
993 top = XCreateWindow (disp, parent, 1002 top = XCreateWindow (dpy, parent,
994 szHint.x, szHint.y, 1003 szHint.x, szHint.y,
995 szHint.width, szHint.height, 1004 szHint.width, szHint.height,
996 ext_bwidth, 1005 ext_bwidth,
997 display->depth, InputOutput, 1006 depth, InputOutput, visual,
998 display->visual,
999 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1007 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1000 &attributes); 1008 &attributes);
1001 1009
1002 this->parent[0] = top; 1010 this->parent[0] = top;
1003 1011
1004 old_width = szHint.width; 1012 old_width = szHint.width;
1005 old_height = szHint.height; 1013 old_height = szHint.height;
1006 1014
1007 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1015 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1008 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1016 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1009 1017
1010 classHint.res_name = (char *)rs[Rs_name]; 1018 classHint.res_name = (char *)rs[Rs_name];
1011 classHint.res_class = (char *)RESCLASS; 1019 classHint.res_class = (char *)RESCLASS;
1012 1020
1013 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1021 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1014 wmHint.input = True; 1022 wmHint.input = True;
1015 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1023 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1016 wmHint.window_group = top; 1024 wmHint.window_group = top;
1017 1025
1018 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1026 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1019 &szHint, &wmHint, &classHint); 1027 &szHint, &wmHint, &classHint);
1028
1029#if ENABLE_FRILLS
1030 if (mwmhints.flags)
1031 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1032 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1033#endif
1020 1034
1021 Atom protocols[] = { 1035 Atom protocols[] = {
1022 xa[XA_WM_DELETE_WINDOW], 1036 xa[XA_WM_DELETE_WINDOW],
1023#if ENABLE_EWMH 1037#if ENABLE_EWMH
1024 xa[XA_NET_WM_PING], 1038 xa[XA_NET_WM_PING],
1025#endif 1039#endif
1026 }; 1040 };
1027 1041
1028 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1042 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1029 1043
1030#if ENABLE_FRILLS 1044#if ENABLE_FRILLS
1031 if (rs[Rs_transient_for]) 1045 if (rs[Rs_transient_for])
1032 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1046 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1033#endif 1047#endif
1034 1048
1035#if ENABLE_EWMH 1049#if ENABLE_EWMH
1036 long pid = getpid (); 1050 long pid = getpid ();
1037 1051
1038 XChangeProperty (disp, top, 1052 XChangeProperty (dpy, top,
1039 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1053 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1040 PropModeReplace, (unsigned char *)&pid, 1); 1054 PropModeReplace, (unsigned char *)&pid, 1);
1041 1055
1042 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1056 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1043#endif 1057#endif
1044 1058
1045 XSelectInput (disp, top, 1059 XSelectInput (dpy, top,
1046 KeyPressMask 1060 KeyPressMask
1047#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1061#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1048 | KeyReleaseMask 1062 | KeyReleaseMask
1049#endif 1063#endif
1050 | FocusChangeMask | VisibilityChangeMask 1064 | FocusChangeMask | VisibilityChangeMask
1051 | ExposureMask | StructureNotifyMask); 1065 | ExposureMask | StructureNotifyMask);
1052 1066
1053 termwin_ev.start (display, top); 1067 termwin_ev.start (display, top);
1054 1068
1055#if ENABLE_FRILLS
1056 if (mwmhints.flags)
1057 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1058 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1059#endif
1060
1061 /* vt cursor: Black-on-White is standard, but this is more popular */ 1069 /* vt cursor: Black-on-White is standard, but this is more popular */
1062 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1070 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1063 1071
1064#ifdef HAVE_SCROLLBARS 1072#ifdef HAVE_SCROLLBARS
1065 /* cursor scrollBar: Black-on-White */ 1073 /* cursor scrollBar: Black-on-White */
1066 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1074 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1067#endif 1075#endif
1068 1076
1069 /* the vt window */ 1077 /* the vt window */
1070 vt = XCreateSimpleWindow (disp, top, 1078 vt = XCreateSimpleWindow (dpy, top,
1071 window_vt_x,
1072 window_vt_y, 1079 window_vt_x, window_vt_y,
1073 width,
1074 height, 1080 width, height,
1075 0, 1081 0,
1076 pix_colors_focused[Color_fg], 1082 pix_colors_focused[Color_fg],
1077 pix_colors_focused[Color_bg]); 1083 pix_colors_focused[Color_bg]);
1078#ifdef DEBUG_X
1079 XStoreName (disp, vt, "vt window");
1080#endif
1081 1084
1082 attributes.bit_gravity = NorthWestGravity; 1085 attributes.bit_gravity = NorthWestGravity;
1083 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1086 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1084 1087
1085 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1088 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1086 1089
1087 if (OPTION (Opt_pointerBlank)) 1090 if (option (Opt_pointerBlank))
1088 vt_emask |= PointerMotionMask; 1091 vt_emask |= PointerMotionMask;
1089 else 1092 else
1090 vt_emask |= Button1MotionMask | Button3MotionMask; 1093 vt_emask |= Button1MotionMask | Button3MotionMask;
1091 1094
1092 vt_select_input (); 1095 vt_select_input ();
1093 1096
1094 vt_ev.start (display, vt); 1097 vt_ev.start (display, vt);
1095 1098
1096#ifdef XPM_BACKGROUND
1097 if (rs[Rs_backgroundPixmap] != NULL
1098 && ! OPTION (Opt_transparent))
1099 {
1100 const char *p = rs[Rs_backgroundPixmap];
1101
1102 if ((p = strchr (p, ';')) != NULL)
1103 {
1104 p++;
1105 scale_pixmap (p);
1106 }
1107
1108 set_bgPixmap (rs[Rs_backgroundPixmap]);
1109 scr_touch (true);
1110 }
1111#endif
1112
1113 /* graphics context for the vt window */ 1099 /* graphics context for the vt window */
1114 gcvalue.foreground = pix_colors[Color_fg]; 1100 gcvalue.foreground = pix_colors[Color_fg];
1115 gcvalue.background = pix_colors[Color_bg]; 1101 gcvalue.background = pix_colors[Color_bg];
1116 gcvalue.graphics_exposures = 1; 1102 gcvalue.graphics_exposures = 0;
1103
1117 gc = XCreateGC (disp, vt, 1104 gc = XCreateGC (dpy, vt,
1118 GCForeground | GCBackground | GCGraphicsExposures, 1105 GCForeground | GCBackground | GCGraphicsExposures,
1119 &gcvalue); 1106 &gcvalue);
1120 1107
1121 drawable = new rxvt_drawable (display, vt); 1108 drawable = new rxvt_drawable (this, vt);
1122 1109
1123#ifdef RXVT_SCROLLBAR 1110#ifdef RXVT_SCROLLBAR
1124 gcvalue.foreground = pix_colors[Color_topShadow]; 1111 gcvalue.foreground = pix_colors[Color_topShadow];
1125 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1112 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1126 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1113 gcvalue.foreground = pix_colors[Color_bottomShadow];
1127 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1114 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1128 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1115 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1129 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1116 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1130#endif 1117#endif
1131 1118
1132#ifdef OFF_FOCUS_FADING 1119#ifdef OFF_FOCUS_FADING
1133 // initially we are in unfocused state 1120 // initially we are in unfocused state
1134 if (rs[Rs_fade]) 1121 if (rs[Rs_fade])
1135 pix_colors = pix_colors_unfocused; 1122 pix_colors = pix_colors_unfocused;
1136#endif 1123#endif
1137 1124
1138 pointer_unblank (); 1125 pointer_unblank ();
1139 scr_recolour (); 1126 scr_recolour ();
1140
1141#if ENABLE_XEMBED
1142 if (rs[Rs_embed])
1143 {
1144 long info[2] = { 0, XEMBED_MAPPED };
1145
1146 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1147 32, PropModeReplace, (unsigned char *)&info, 2);
1148 }
1149#endif
1150} 1127}
1151 1128
1152/* ------------------------------------------------------------------------- * 1129/* ------------------------------------------------------------------------- *
1153 * GET TTY CURRENT STATE * 1130 * GET TTY CURRENT STATE *
1154 * ------------------------------------------------------------------------- */ 1131 * ------------------------------------------------------------------------- */
1155void 1132void
1156rxvt_get_ttymode (ttymode_t *tio, int erase) 1133rxvt_get_ttymode (ttymode_t *tio, int erase)
1157{ 1134{
1158#ifdef HAVE_TERMIOS_H
1159 /* 1135 /*
1160 * standard System V termios interface 1136 * standard System V termios interface
1161 */ 1137 */
1162 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1138 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1163 { 1139 {
… …
1230 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1206 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1231# if defined (ECHOCTL) && defined (ECHOKE) 1207# if defined (ECHOCTL) && defined (ECHOKE)
1232 | ECHOCTL | ECHOKE 1208 | ECHOCTL | ECHOKE
1233# endif 1209# endif
1234 | ECHOE | ECHOK); 1210 | ECHOE | ECHOK);
1235# else /* HAVE_TERMIOS_H */
1236
1237 /*
1238 * sgtty interface
1239 */
1240
1241 /* get parameters -- gtty */
1242 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1243 {
1244 tio->sg.sg_erase = CERASE; /* ^H */
1245 tio->sg.sg_kill = CKILL; /* ^U */
1246 }
1247
1248 if (erase != -1)
1249 tio->sg.sg_erase = (char)erase;
1250
1251 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1252
1253 /* get special characters */
1254 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1255 {
1256 tio->tc.t_intrc = CINTR; /* ^C */
1257 tio->tc.t_quitc = CQUIT; /* ^\ */
1258 tio->tc.t_startc = CSTART; /* ^Q */
1259 tio->tc.t_stopc = CSTOP; /* ^S */
1260 tio->tc.t_eofc = CEOF; /* ^D */
1261 tio->tc.t_brkc = -1;
1262 }
1263
1264 /* get local special chars */
1265 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1266 {
1267 tio->lc.t_suspc = CSUSP; /* ^Z */
1268 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1269 tio->lc.t_rprntc = CRPRNT; /* ^R */
1270 tio->lc.t_flushc = CFLUSH; /* ^O */
1271 tio->lc.t_werasc = CWERASE; /* ^W */
1272 tio->lc.t_lnextc = CLNEXT; /* ^V */
1273 }
1274 /* get line discipline */
1275 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1276# ifdef NTTYDISC
1277 tio->line = NTTYDISC;
1278# endif /* NTTYDISC */
1279
1280 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1281#endif /* HAVE_TERMIOS_H */
1282 1211
1283 /* 1212 /*
1284 * Debugging 1213 * Debugging
1285 */ 1214 */
1286#ifdef DEBUG_TTYMODE 1215#ifdef DEBUG_TTYMODE
… …
1387 else 1316 else
1388#endif 1317#endif
1389 if (!pty->get ()) 1318 if (!pty->get ())
1390 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1319 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1391 1320
1321 int er;
1322
1323#ifndef NO_BACKSPACE_KEY
1324 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1325 er = rs[Rs_backspace_key][0];
1326 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1327 er = '\177'; /* the initial state anyway */
1328 else
1329#endif
1330 er = -1;
1331
1332 rxvt_get_ttymode (&tio, er);
1333 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1392 pty->set_utf8_mode (enc_utf8); 1334 pty->set_utf8_mode (enc_utf8);
1393 1335
1394 /* set initial window size */ 1336 /* set initial window size */
1395 tt_winch (); 1337 tt_winch ();
1396
1397 int er;
1398
1399#ifndef NO_BACKSPACE_KEY
1400 if (key_backspace[0] && !key_backspace[1])
1401 er = key_backspace[0];
1402 else if (strcmp (key_backspace, "DEC") == 0)
1403 er = '\177'; /* the initial state anyway */
1404 else
1405#endif
1406 er = -1;
1407
1408 rxvt_get_ttymode (&tio, er);
1409 1338
1410#if ENABLE_FRILLS 1339#if ENABLE_FRILLS
1411 if (rs[Rs_pty_fd]) 1340 if (rs[Rs_pty_fd])
1412 return; 1341 return;
1413#endif 1342#endif
… …
1444 } 1373 }
1445 1374
1446 _exit (EXIT_FAILURE); 1375 _exit (EXIT_FAILURE);
1447 1376
1448 default: 1377 default:
1449 if (!OPTION (Opt_utmpInhibit)) 1378 if (!option (Opt_utmpInhibit))
1450 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1379 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1451 1380
1452 pty->close_tty (); 1381 pty->close_tty ();
1453 1382
1454 child_ev.start (cmd_pid); 1383 child_ev.start (cmd_pid);
1455 1384
… …
1468int 1397int
1469rxvt_term::run_child (const char *const *argv) 1398rxvt_term::run_child (const char *const *argv)
1470{ 1399{
1471 char *login; 1400 char *login;
1472 1401
1473 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1474
1475 if (OPTION (Opt_console)) 1402 if (option (Opt_console))
1476 { /* be virtual console, fail silently */ 1403 { /* be virtual console, fail silently */
1477#ifdef TIOCCONS 1404#ifdef TIOCCONS
1478 unsigned int on = 1; 1405 unsigned int on = 1;
1479 1406
1480 ioctl (STDIN_FILENO, TIOCCONS, &on); 1407 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1508 sigset_t ss; 1435 sigset_t ss;
1509 sigemptyset (&ss); 1436 sigemptyset (&ss);
1510 sigprocmask (SIG_SETMASK, &ss, 0); 1437 sigprocmask (SIG_SETMASK, &ss, 0);
1511 1438
1512 /* command interpreter path */ 1439 /* command interpreter path */
1513 if (argv != NULL) 1440 if (argv)
1514 { 1441 {
1515# ifdef DEBUG_CMD 1442# ifdef DEBUG_CMD
1516 int i; 1443 int i;
1517 1444
1518 for (i = 0; argv[i]; i++) 1445 for (i = 0; argv[i]; i++)
… …
1527 const char *argv0, *shell; 1454 const char *argv0, *shell;
1528 1455
1529 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1456 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1530 shell = "/bin/sh"; 1457 shell = "/bin/sh";
1531 1458
1532 argv0 = (const char *)rxvt_r_basename (shell); 1459 argv0 = (const char *)rxvt_basename (shell);
1533 1460
1534 if (OPTION (Opt_loginShell)) 1461 if (option (Opt_loginShell))
1535 { 1462 {
1536 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1463 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1537 1464
1538 login[0] = '-'; 1465 login[0] = '-';
1539 strcpy (&login[1], argv0); 1466 strcpy (&login[1], argv0);
1540 argv0 = login; 1467 argv0 = login;
1541 } 1468 }
1542 1469
1543 execlp (shell, argv0, NULL); 1470 execlp (shell, argv0, (char *)0);
1544 /* no error message: STDERR is closed! */ 1471 /* no error message: STDERR is closed! */
1545 } 1472 }
1546 1473
1547 return -1; 1474 return -1;
1548} 1475}

Diff Legend

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