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.153 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.217 by root, Tue Oct 9 13:36:10 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 267#endif
177 }; 268 };
178 269
179bool 270bool
180rxvt_term::init_vars () 271rxvt_term::init_vars ()
181{ 272{
273 pix_colors = //
182 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 274 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
183#ifdef OFF_FOCUS_FADING 275#ifdef OFF_FOCUS_FADING
184 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 276 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
185#endif 277#endif
186 pix_colors = pix_colors_focused;
187 278
188 if (pix_colors == NULL)
189 return false;
190
191#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
192 pixmap = None;
193#endif
194 279
195 MEvent.time = CurrentTime; 280 MEvent.time = CurrentTime;
196 MEvent.button = AnyButton; 281 MEvent.button = AnyButton;
197 options = DEFAULT_OPTIONS;
198 want_refresh = 1; 282 want_refresh = 1;
199 priv_modes = SavedModes = PrivMode_Default; 283 priv_modes = SavedModes = PrivMode_Default;
200 focus = 0;
201 ncol = 80; 284 ncol = 80;
202 nrow = 24; 285 nrow = 24;
203 int_bwidth = INTERNALBORDERWIDTH; 286 int_bwidth = INTERNALBORDERWIDTH;
204 ext_bwidth = EXTERNALBORDERWIDTH; 287 ext_bwidth = EXTERNALBORDERWIDTH;
205 lineSpace = LINESPACE; 288 lineSpace = LINESPACE;
206 saveLines = SAVELINES; 289 saveLines = SAVELINES;
207 numpix_colors = TOTAL_COLORS; 290 numpix_colors = TOTAL_COLORS;
208 291
209 refresh_limit = 1;
210 refresh_type = SLOW_REFRESH; 292 refresh_type = SLOW_REFRESH;
211 prev_nrow = prev_ncol = 0;
212 293
213 oldcursor.row = oldcursor.col = -1; 294 oldcursor.row = oldcursor.col = -1;
214#ifdef XPM_BACKGROUND
215 /* bgPixmap.w = bgPixmap.h = 0; */
216 bgPixmap.x = bgPixmap.y = 50;
217 bgPixmap.pixmap = None;
218#endif
219
220 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);
221 306
222 return true; 307 return true;
223} 308}
224 309
225void 310void
… …
234 if ((i = open ("/dev/null", O_RDONLY)) < 0) 319 if ((i = open ("/dev/null", O_RDONLY)) < 0)
235 { 320 {
236 /* TODO: BOO HISS */ 321 /* TODO: BOO HISS */
237 dup2 (STDERR_FILENO, STDIN_FILENO); 322 dup2 (STDERR_FILENO, STDIN_FILENO);
238 } 323 }
239 else if (i > STDIN_FILENO) 324 else if (i != STDIN_FILENO)
240 { 325 {
241 dup2 (i, STDIN_FILENO); 326 dup2 (i, STDIN_FILENO);
242 close (i); 327 close (i);
243 } 328 }
244 329
… …
259/*----------------------------------------------------------------------*/ 344/*----------------------------------------------------------------------*/
260const char ** 345const char **
261rxvt_term::init_resources (int argc, const char *const *argv) 346rxvt_term::init_resources (int argc, const char *const *argv)
262{ 347{
263 int i, r_argc; 348 int i, r_argc;
264 char *val;
265 const char **cmd_argv, **r_argv; 349 const char **cmd_argv, **r_argv;
266 350
267 /* 351 /*
268 * 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
269 */ 353 */
270 for (r_argc = 0; r_argc < argc; r_argc++) 354 for (r_argc = 0; r_argc < argc; r_argc++)
271 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 355 if (!strcmp (argv[r_argc], "-e"))
272 break; 356 break;
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 }
273 371
274 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 372 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
275 373
276 for (i = 0; i < r_argc; i++) 374 for (i = 0; i < r_argc; i++)
277 r_argv[i] = (const char *)argv[i]; 375 r_argv[i] = (const char *)argv[i];
278 376
279 r_argv[i] = NULL; 377 r_argv[i] = NULL;
280 378
281 if (r_argc == argc)
282 cmd_argv = NULL;
283 else
284 {
285 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
286
287 for (i = 0; i < argc - r_argc - 1; i++)
288 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
289
290 cmd_argv[i] = NULL;
291 }
292
293 rs[Rs_name] = rxvt_r_basename (argv[0]); 379 rs[Rs_name] = rxvt_basename (argv[0]);
294 380
295 /* 381 /*
296 * Open display, get options/resources and create the window 382 * Open display, get options/resources and create the window
297 */ 383 */
298 384
… …
300 rs[Rs_display_name] = ":0"; 386 rs[Rs_display_name] = ":0";
301 387
302 get_options (r_argc, r_argv); 388 get_options (r_argc, r_argv);
303 389
304 if (!(display = displays.get (rs[Rs_display_name]))) 390 if (!(display = displays.get (rs[Rs_display_name])))
391 {
392 free (r_argv);
305 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 }
306 395
396 // using a local pointer decreases code size a lot
397 xa = display->xa;
398
399 set (display);
307 extract_resources (); 400 extract_resources ();
308 401
402#if XFT
403 if (rs[Rs_depth])
404 select_visual (strtol (rs[Rs_depth], 0, 0));
405#endif
406
407#ifdef HAVE_AFTERIMAGE
408 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
409#endif
309 free (r_argv); 410 free (r_argv);
411
412 for (int i = NUM_RESOURCES; i--; )
413 if (rs [i] == resval_undef)
414 rs [i] = 0;
310 415
311#if ENABLE_PERL 416#if ENABLE_PERL
312 if (!rs[Rs_perl_ext_1]) 417 if (!rs[Rs_perl_ext_1])
313 rs[Rs_perl_ext_1] = "default"; 418 rs[Rs_perl_ext_1] = "default";
314 419
… …
325 * set any defaults not already set 430 * set any defaults not already set
326 */ 431 */
327 if (cmd_argv && cmd_argv[0]) 432 if (cmd_argv && cmd_argv[0])
328 { 433 {
329 if (!rs[Rs_title]) 434 if (!rs[Rs_title])
330 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 435 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
331 if (!rs[Rs_iconName]) 436 if (!rs[Rs_iconName])
332 rs[Rs_iconName] = rs[Rs_title]; 437 rs[Rs_iconName] = rs[Rs_title];
333 } 438 }
334 else 439 else
335 { 440 {
… …
373 rs[Rs_cutchars] = CUTCHARS; 478 rs[Rs_cutchars] = CUTCHARS;
374 479
375#ifndef NO_BACKSPACE_KEY 480#ifndef NO_BACKSPACE_KEY
376 if (!rs[Rs_backspace_key]) 481 if (!rs[Rs_backspace_key])
377# ifdef DEFAULT_BACKSPACE 482# ifdef DEFAULT_BACKSPACE
378 key_backspace = DEFAULT_BACKSPACE; 483 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
379# else 484# else
380 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 485 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
381# endif 486# endif
382 else
383 {
384 val = strdup (rs[Rs_backspace_key]);
385 rxvt_Str_trim (val);
386 rxvt_Str_escaped (val);
387 key_backspace = val;
388 }
389#endif 487#endif
390 488
391#ifndef NO_DELETE_KEY 489#ifndef NO_DELETE_KEY
392 if (!rs[Rs_delete_key]) 490 if (!rs[Rs_delete_key])
393# ifdef DEFAULT_DELETE 491# ifdef DEFAULT_DELETE
394 key_delete = DEFAULT_DELETE; 492 rs[Rs_delete_key] = DEFAULT_DELETE;
395# else 493# else
396 key_delete = "\033[3~"; 494 rs[Rs_delete_key] = "\033[3~";
397# endif
398 else
399 {
400 val = strdup (rs[Rs_delete_key]);
401 rxvt_Str_trim (val);
402 rxvt_Str_escaped (val);
403 key_delete = val;
404 }
405#endif 495# endif
406 if (rs[Rs_answerbackstring]) 496#endif
407 {
408 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
409 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
410 }
411 497
412#ifdef HAVE_SCROLLBARS 498#ifdef HAVE_SCROLLBARS
413 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]);
414#endif 500#endif
415 501
416#ifdef XTERM_REVERSE_VIDEO 502#ifdef XTERM_REVERSE_VIDEO
417 /* this is how xterm implements reverseVideo */ 503 /* this is how xterm implements reverseVideo */
418 if (OPTION (Opt_reverseVideo)) 504 if (option (Opt_reverseVideo))
419 { 505 {
420 if (!rs[Rs_color + Color_fg]) 506 if (!rs[Rs_color + Color_fg])
421 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 507 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
508
422 if (!rs[Rs_color + Color_bg]) 509 if (!rs[Rs_color + Color_bg])
423 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 510 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
424 } 511 }
425#endif 512#endif
426 513
… …
428 if (!rs[Rs_color + i]) 515 if (!rs[Rs_color + i])
429 rs[Rs_color + i] = def_colorName[i]; 516 rs[Rs_color + i] = def_colorName[i];
430 517
431#ifndef XTERM_REVERSE_VIDEO 518#ifndef XTERM_REVERSE_VIDEO
432 /* this is how we implement reverseVideo */ 519 /* this is how we implement reverseVideo */
433 if (OPTION (Opt_reverseVideo)) 520 if (option (Opt_reverseVideo))
434 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 521 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
435#endif 522#endif
436 523
437 /* convenient aliases for setting fg/bg to colors */ 524 /* convenient aliases for setting fg/bg to colors */
438 color_aliases (Color_fg); 525 color_aliases (Color_fg);
… …
459/*----------------------------------------------------------------------*/ 546/*----------------------------------------------------------------------*/
460void 547void
461rxvt_term::init_env () 548rxvt_term::init_env ()
462{ 549{
463 int i; 550 int i;
464 unsigned int u;
465 char *val; 551 char *val;
466 552
467#ifdef DISPLAY_IS_IP 553#ifdef DISPLAY_IS_IP
468 /* Fixup display_name for export over pty to any interested terminal 554 /* Fixup display_name for export over pty to any interested terminal
469 * 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
… …
478 val = rxvt_network_display (rs[Rs_display_name]); 564 val = rxvt_network_display (rs[Rs_display_name]);
479 rs[Rs_display_name] = (const char *)val; 565 rs[Rs_display_name] = (const char *)val;
480 566
481 if (val == NULL) 567 if (val == NULL)
482#endif /* DISPLAY_IS_IP */ 568#endif /* DISPLAY_IS_IP */
483 val = XDisplayString (display->display); 569 val = XDisplayString (dpy);
484 570
485 if (rs[Rs_display_name] == NULL) 571 if (rs[Rs_display_name] == NULL)
486 rs[Rs_display_name] = val; /* use broken `:0' value */ 572 rs[Rs_display_name] = val; /* use broken `:0' value */
487 573
488 i = strlen (val); 574 i = strlen (val);
489 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 575 env_display = (char *)rxvt_malloc (i + 9);
490 576
491 sprintf (env_display, "DISPLAY=%s", val); 577 sprintf (env_display, "DISPLAY=%s", val);
492 578
493 /* avoiding the math library: 579 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
494 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
495 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
496 ;
497 max_it (i, 1);
498 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
499
500 sprintf (env_windowid, "WINDOWID=%u",
501 (unsigned int)parent[0]);
502 580
503 /* add entries to the environment: 581 /* add entries to the environment:
504 * @ DISPLAY: in case we started with -display 582 * @ DISPLAY: in case we started with -display
505 * @ WINDOWID: X window id number of the window 583 * @ WINDOWID: X window id number of the window
506 * @ COLORTERM: terminal sub-name and also indicates its color 584 * @ COLORTERM: terminal sub-name and also indicates its color
… …
508 * @ TERMINFO: path to terminfo directory 586 * @ TERMINFO: path to terminfo directory
509 * @ COLORFGBG: fg;bg color codes 587 * @ COLORFGBG: fg;bg color codes
510 */ 588 */
511 putenv (env_display); 589 putenv (env_display);
512 putenv (env_windowid); 590 putenv (env_windowid);
591
513 if (env_colorfgbg) 592 if (env_colorfgbg)
514 putenv (env_colorfgbg); 593 putenv (env_colorfgbg);
515 594
516#ifdef RXVT_TERMINFO 595#ifdef RXVT_TERMINFO
517 putenv ("TERMINFO=" RXVT_TERMINFO); 596 putenv ("TERMINFO=" RXVT_TERMINFO);
518#endif 597#endif
519 598
520 if (display->depth <= 2) 599 if (depth <= 2)
521 putenv ("COLORTERM=" COLORTERMENV "-mono"); 600 putenv ("COLORTERM=" COLORTERMENV "-mono");
522 else 601 else
523 putenv ("COLORTERM=" COLORTERMENVFULL); 602 putenv ("COLORTERM=" COLORTERMENVFULL);
524 603
525 if (rs[Rs_term_name] != NULL) 604 if (rs[Rs_term_name] != NULL)
526 { 605 {
527 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);
528 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 607 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
529 putenv (env_term); 608 putenv (env_term);
530 } 609 }
531 else 610 else
532 putenv ("TERM=" TERMENV); 611 putenv ("TERM=" TERMENV);
… …
619 * Initialize the command connection. 698 * Initialize the command connection.
620 * This should be called after the X server connection is established. 699 * This should be called after the X server connection is established.
621 */ 700 */
622 701
623#ifdef META8_OPTION 702#ifdef META8_OPTION
624 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 703 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
625#endif 704#endif
626 705
627 get_ourmods (); 706 get_ourmods ();
628 707
629 if (!OPTION (Opt_scrollTtyOutput)) 708 if (!option (Opt_scrollTtyOutput))
630 priv_modes |= PrivMode_TtyOutputInh; 709 priv_modes |= PrivMode_TtyOutputInh;
631 if (OPTION (Opt_scrollTtyKeypress)) 710 if (option (Opt_scrollTtyKeypress))
632 priv_modes |= PrivMode_Keypress; 711 priv_modes |= PrivMode_Keypress;
633 if (!OPTION (Opt_jumpScroll)) 712 if (!option (Opt_jumpScroll))
634 priv_modes |= PrivMode_smoothScroll; 713 priv_modes |= PrivMode_smoothScroll;
635 714
636#ifndef NO_BACKSPACE_KEY 715#ifndef NO_BACKSPACE_KEY
637 if (strcmp (key_backspace, "DEC") == 0) 716 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
638 priv_modes |= PrivMode_HaveBackSpace; 717 priv_modes |= PrivMode_HaveBackSpace;
639#endif 718#endif
640 719
641 /* add value for scrollBar */ 720 /* add value for scrollBar */
642 if (scrollBar.state) 721 if (scrollBar.state)
… …
656 735
657#ifdef OFF_FOCUS_FADING 736#ifdef OFF_FOCUS_FADING
658 pix_colors = pix_colors_focused; 737 pix_colors = pix_colors_focused;
659#endif 738#endif
660 739
661 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 740 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
662 { 741 {
742 const char *name = rs[Rs_color + i];
743
744 if (!name)
745 continue;
746
663 rxvt_color xcol; 747 rxvt_color xcol;
664 748
665 if (!rs[Rs_color + i]) 749 if (!set_color (xcol, name))
666 continue;
667
668 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
669 { 750 {
670#ifndef XTERM_REVERSE_VIDEO 751#ifndef XTERM_REVERSE_VIDEO
671 if (i < 2 && OPTION (Opt_reverseVideo)) 752 if (i < 2 && option (Opt_reverseVideo))
672 rs[Rs_color + i] = def_colorName[!i]; 753 name = def_colorName [1 - i];
673 else 754 else
674#endif 755#endif
675 rs[Rs_color + i] = def_colorName[i]; 756 name = def_colorName [i];
676 757
677 if (!rs[Rs_color + i]) 758 if (!name)
678 continue; 759 continue;
679 760
680 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 761 if (!set_color (xcol, name))
681 { 762 {
682 switch (i) 763 switch (i)
683 { 764 {
684 case Color_fg: 765 case Color_fg:
685 case Color_bg: 766 case Color_bg:
686 /* fatal: need bg/fg color */
687 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 767 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
688 /* NOTREACHED */ 768 name = "";
689 break; 769 break;
690#ifndef NO_CURSORCOLOR 770#ifndef NO_CURSORCOLOR
691 case Color_cursor2: 771 case Color_cursor2:
692 xcol = pix_colors[Color_fg]; 772#endif
693 break;
694#endif /* ! NO_CURSORCOLOR */
695 case Color_pointer_fg: 773 case Color_pointer_fg:
696 xcol = pix_colors[Color_fg]; 774 name = rs[Rs_color + Color_fg];
775 xcol.set (this, name);
697 break; 776 break;
698 default: 777 default:
699 xcol = pix_colors[Color_bg]; /* None */ 778 name = rs[Rs_color + Color_bg];
779 xcol.set (this, name);
700 break; 780 break;
701 } 781 }
702 } 782 }
703 } 783 }
704 784
705 pix_colors[i] = xcol; 785 pix_colors[i] = xcol;
706 SET_PIXCOLOR (i); 786 rs[Rs_color + i] = name;
707 }
708
709#ifdef OFF_FOCUS_FADING
710 if (rs[Rs_fade])
711 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
712 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
713#endif
714
715 if (display->depth <= 2)
716 { 787 }
788
789 if (depth <= 2)
790 {
717 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 791 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
718 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 792 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
719 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 793 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
720 } 794 }
721 795
722 /* 796 /*
723 * get scrollBar shadow colors 797 * get scrollBar shadow colors
724 * 798 *
725 * The calculations of topShadow/bottomShadow values are adapted 799 * The calculations of topShadow/bottomShadow values are adapted
726 * from the fvwm window manager. 800 * from the fvwm window manager.
727 */ 801 */
728#ifdef KEEP_SCROLLCOLOR 802#ifdef KEEP_SCROLLCOLOR
729
730 if (display->depth <= 2) 803 if (depth <= 2)
731 { 804 {
732 /* Monochrome */ 805 /* Monochrome */
733 pix_colors[Color_scroll] = pix_colors[Color_fg]; 806 alias_color (Color_scroll, Color_fg);
734 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 807 alias_color (Color_topShadow, Color_bg);
735 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 808 alias_color (Color_bottomShadow, Color_bg);
736 } 809 }
737 else 810 else
738 { 811 {
739 rxvt_color xcol[2]; 812 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
740 /* xcol[0] == white
741 * xcol[1] == top shadow
742 * xcol[2] == bot shadow */
743 813
744 xcol[1] = pix_colors[Color_scroll]; 814 rgba cscroll;
745 xcol[0].set (display, 65535, 65535, 65535); 815 pix_colors [Color_scroll].get (cscroll);
746
747 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
748
749 xcol[0].get (display, pr0, pg0, pb0);
750 xcol[1].get (display, pr1, pg1, pb1);
751
752 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
753 816
754 /* topShadowColor */ 817 /* topShadowColor */
755 if (!xcol[1].set (display, 818 if (!pix_colors[Color_topShadow].set (this,
756 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 819 rgba (
757 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 820 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
758 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 821 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
759 xcol[1] = pix_colors[Color_White]; 822 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
760 823 cscroll.a)
761 pix_colors[Color_topShadow] = xcol[1]; 824 ))
825 alias_color (Color_topShadow, Color_White);
762 } 826 }
763#endif /* KEEP_SCROLLCOLOR */ 827#endif /* KEEP_SCROLLCOLOR */
828
829#ifdef OFF_FOCUS_FADING
830 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
831 update_fade_color (i);
832#endif
764} 833}
765 834
766/*----------------------------------------------------------------------*/ 835/*----------------------------------------------------------------------*/
767/* color aliases, fg/bg bright-bold */ 836/* color aliases, fg/bg bright-bold */
768void 837void
… …
807 876
808 if (rsmod 877 if (rsmod
809 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 878 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
810 requestedmeta = rsmod[3] - '0'; 879 requestedmeta = rsmod[3] - '0';
811 880
812 map = XGetModifierMapping (display->display); 881 map = XGetModifierMapping (dpy);
813 kc = map->modifiermap; 882 kc = map->modifiermap;
814 883
815 for (i = 1; i < 6; i++) 884 for (i = 1; i < 6; i++)
816 { 885 {
817 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 886 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
819 for (j = map->max_keypermod; j--; k++) 888 for (j = map->max_keypermod; j--; k++)
820 { 889 {
821 if (kc[k] == 0) 890 if (kc[k] == 0)
822 break; 891 break;
823 892
824 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 893 switch (XKeycodeToKeysym (dpy, kc[k], 0))
825 { 894 {
826 case XK_Num_Lock: 895 case XK_Num_Lock:
827 ModNumLockMask = modmasks[i - 1]; 896 ModNumLockMask = modmasks[i - 1];
828 continue; 897 continue;
829 898
… …
879rxvt_term::create_windows (int argc, const char *const *argv) 948rxvt_term::create_windows (int argc, const char *const *argv)
880{ 949{
881 XClassHint classHint; 950 XClassHint classHint;
882 XWMHints wmHint; 951 XWMHints wmHint;
883#if ENABLE_FRILLS 952#if ENABLE_FRILLS
884 MWMHints mwmhints; 953 MWMHints mwmhints = { };
885#endif 954#endif
886 XGCValues gcvalue; 955 XGCValues gcvalue;
887 XSetWindowAttributes attributes; 956 XSetWindowAttributes attributes;
888 Window top, parent; 957 Window top, parent;
889 dDisp;
890 958
891 xa = display->xa; 959 dLocal (Display *, dpy);
892 960
893 /* grab colors before netscape does */ 961 /* grab colors before netscape does */
894 Get_Colours (); 962 Get_Colours ();
895 963
896 if (!set_fonts ()) 964 if (!set_fonts ())
897 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");
898 966
899 parent = display->root; 967 parent = display->root;
900 968
901 attributes.override_redirect = !!OPTION (Opt_override_redirect); 969 attributes.override_redirect = !!option (Opt_override_redirect);
902 970
903#if ENABLE_FRILLS 971#if ENABLE_FRILLS
904 if (OPTION (Opt_borderLess)) 972 if (option (Opt_borderLess))
905 { 973 {
906 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) 974 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
907 { 975 {
908 /* 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");
909 attributes.override_redirect = TRUE; 977 attributes.override_redirect = true;
910 mwmhints.flags = 0;
911 } 978 }
912 else 979 else
913 { 980 {
914 mwmhints.flags = MWM_HINTS_DECORATIONS; 981 mwmhints.flags = MWM_HINTS_DECORATIONS;
915 mwmhints.decorations = 0;
916 } 982 }
917 } 983 }
918 else
919 mwmhints.flags = 0;
920#endif 984#endif
921 985
922#if ENABLE_XEMBED 986#if ENABLE_XEMBED
923 if (rs[Rs_embed]) 987 if (rs[Rs_embed])
924 { 988 {
925 XWindowAttributes wattr; 989 XWindowAttributes wattr;
926 990
927 parent = strtol (rs[Rs_embed], 0, 0); 991 parent = strtol (rs[Rs_embed], 0, 0);
928 992
929 if (!XGetWindowAttributes (disp, parent, &wattr)) 993 if (!XGetWindowAttributes (dpy, parent, &wattr))
930 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 994 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
931 995
932 window_calc (wattr.width, wattr.height); 996 window_calc (wattr.width, wattr.height);
933 } 997 }
934#endif 998#endif
935 999
936 window_calc (0, 0); 1000 window_calc (0, 0);
937 1001
938 /* sub-window placement & size in rxvt_resize_subwindows () */ 1002 /* sub-window placement & size in rxvt_resize_subwindows () */
939 attributes.background_pixel = pix_colors_focused[Color_border]; 1003 attributes.background_pixel = pix_colors_focused [Color_border];
940 attributes.border_pixel = pix_colors_focused[Color_border]; 1004 attributes.border_pixel = pix_colors_focused [Color_border];
941 attributes.colormap = display->cmap; 1005 attributes.colormap = cmap;
942 1006
943 top = XCreateWindow (disp, parent, 1007 top = XCreateWindow (dpy, parent,
944 szHint.x, szHint.y, 1008 szHint.x, szHint.y,
945 szHint.width, szHint.height, 1009 szHint.width, szHint.height,
946 ext_bwidth, 1010 ext_bwidth,
947 display->depth, InputOutput, 1011 depth, InputOutput, visual,
948 display->visual,
949 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1012 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
950 &attributes); 1013 &attributes);
951 1014
952 this->parent[0] = top; 1015 this->parent[0] = top;
953 1016
… …
960 classHint.res_name = (char *)rs[Rs_name]; 1023 classHint.res_name = (char *)rs[Rs_name];
961 classHint.res_class = (char *)RESCLASS; 1024 classHint.res_class = (char *)RESCLASS;
962 1025
963 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1026 wmHint.flags = InputHint | StateHint | WindowGroupHint;
964 wmHint.input = True; 1027 wmHint.input = True;
965 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1028 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
966 wmHint.window_group = top; 1029 wmHint.window_group = top;
967 1030
968 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1031 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
969 &szHint, &wmHint, &classHint); 1032 &szHint, &wmHint, &classHint);
970 1033
971#if ENABLE_FRILLS 1034#if ENABLE_FRILLS
972 if (mwmhints.flags) 1035 if (mwmhints.flags)
973 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1036 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
974 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1037 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
975#endif 1038#endif
976 1039
977 Atom protocols[] = { 1040 Atom protocols[] = {
978 xa[XA_WM_DELETE_WINDOW], 1041 xa[XA_WM_DELETE_WINDOW],
979#if ENABLE_EWMH 1042#if ENABLE_EWMH
980 xa[XA_NET_WM_PING], 1043 xa[XA_NET_WM_PING],
981#endif 1044#endif
982 }; 1045 };
983 1046
984 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1047 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
985 1048
986#if ENABLE_FRILLS 1049#if ENABLE_FRILLS
987 if (rs[Rs_transient_for]) 1050 if (rs[Rs_transient_for])
988 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1051 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
989#endif 1052#endif
990 1053
991#if ENABLE_EWMH 1054#if ENABLE_EWMH
992 long pid = getpid (); 1055 long pid = getpid ();
993 1056
994 XChangeProperty (disp, top, 1057 XChangeProperty (dpy, top,
995 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1058 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
996 PropModeReplace, (unsigned char *)&pid, 1); 1059 PropModeReplace, (unsigned char *)&pid, 1);
997 1060
998 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1061 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
999#endif 1062#endif
1000 1063
1001 XSelectInput (disp, top, 1064 XSelectInput (dpy, top,
1002 KeyPressMask 1065 KeyPressMask
1003#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1066#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1004 | KeyReleaseMask 1067 | KeyReleaseMask
1005#endif 1068#endif
1006 | FocusChangeMask | VisibilityChangeMask 1069 | FocusChangeMask | VisibilityChangeMask
1007 | ExposureMask | StructureNotifyMask); 1070 | ExposureMask | StructureNotifyMask);
1008 1071
1009 termwin_ev.start (display, top); 1072 termwin_ev.start (display, top);
1010 1073
1011 /* vt cursor: Black-on-White is standard, but this is more popular */ 1074 /* vt cursor: Black-on-White is standard, but this is more popular */
1012 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1075 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1013 1076
1014#ifdef HAVE_SCROLLBARS 1077#ifdef HAVE_SCROLLBARS
1015 /* cursor scrollBar: Black-on-White */ 1078 /* cursor scrollBar: Black-on-White */
1016 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1079 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1017#endif 1080#endif
1018 1081
1019 /* the vt window */ 1082 /* the vt window */
1020 vt = XCreateSimpleWindow (disp, top, 1083 vt = XCreateSimpleWindow (dpy, top,
1021 window_vt_x, window_vt_y, 1084 window_vt_x, window_vt_y,
1022 width, height, 1085 width, height,
1023 0, 1086 0,
1024 pix_colors_focused[Color_fg], 1087 pix_colors_focused[Color_fg],
1025 pix_colors_focused[Color_bg]); 1088 pix_colors_focused[Color_bg]);
1026 1089
1027 attributes.bit_gravity = NorthWestGravity; 1090 attributes.bit_gravity = NorthWestGravity;
1028 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1091 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1029 1092
1030 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1093 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1031 1094
1032 if (OPTION (Opt_pointerBlank)) 1095 if (option (Opt_pointerBlank))
1033 vt_emask |= PointerMotionMask; 1096 vt_emask |= PointerMotionMask;
1034 else 1097 else
1035 vt_emask |= Button1MotionMask | Button3MotionMask; 1098 vt_emask |= Button1MotionMask | Button3MotionMask;
1036 1099
1037 vt_select_input (); 1100 vt_select_input ();
1038 1101
1039 vt_ev.start (display, vt); 1102 vt_ev.start (display, vt);
1040 1103
1041#ifdef XPM_BACKGROUND
1042 if (rs[Rs_backgroundPixmap] != NULL
1043 && ! OPTION (Opt_transparent))
1044 {
1045 const char *p = rs[Rs_backgroundPixmap];
1046
1047 if ((p = strchr (p, ';')) != NULL)
1048 {
1049 p++;
1050 scale_pixmap (p);
1051 }
1052
1053 set_bgPixmap (rs[Rs_backgroundPixmap]);
1054 scr_touch (true);
1055 }
1056#endif
1057
1058 /* graphics context for the vt window */ 1104 /* graphics context for the vt window */
1059 gcvalue.foreground = pix_colors[Color_fg]; 1105 gcvalue.foreground = pix_colors[Color_fg];
1060 gcvalue.background = pix_colors[Color_bg]; 1106 gcvalue.background = pix_colors[Color_bg];
1061 gcvalue.graphics_exposures = 1; 1107 gcvalue.graphics_exposures = 0;
1062 1108
1063 gc = XCreateGC (disp, vt, 1109 gc = XCreateGC (dpy, vt,
1064 GCForeground | GCBackground | GCGraphicsExposures, 1110 GCForeground | GCBackground | GCGraphicsExposures,
1065 &gcvalue); 1111 &gcvalue);
1066 1112
1067 drawable = new rxvt_drawable (display, vt); 1113 drawable = new rxvt_drawable (this, vt);
1068 1114
1069#ifdef RXVT_SCROLLBAR 1115#ifdef RXVT_SCROLLBAR
1070 gcvalue.foreground = pix_colors[Color_topShadow]; 1116 gcvalue.foreground = pix_colors[Color_topShadow];
1071 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1117 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1118 gcvalue.foreground = pix_colors[Color_bottomShadow];
1073 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1119 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1074 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1120 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1075 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1121 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1076#endif 1122#endif
1077 1123
1078#ifdef OFF_FOCUS_FADING 1124#ifdef OFF_FOCUS_FADING
1079 // initially we are in unfocused state 1125 // initially we are in unfocused state
1080 if (rs[Rs_fade]) 1126 if (rs[Rs_fade])
… …
1089 * GET TTY CURRENT STATE * 1135 * GET TTY CURRENT STATE *
1090 * ------------------------------------------------------------------------- */ 1136 * ------------------------------------------------------------------------- */
1091void 1137void
1092rxvt_get_ttymode (ttymode_t *tio, int erase) 1138rxvt_get_ttymode (ttymode_t *tio, int erase)
1093{ 1139{
1094#ifdef HAVE_TERMIOS_H
1095 /* 1140 /*
1096 * standard System V termios interface 1141 * standard System V termios interface
1097 */ 1142 */
1098 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1143 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1099 { 1144 {
… …
1166 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1211 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1167# if defined (ECHOCTL) && defined (ECHOKE) 1212# if defined (ECHOCTL) && defined (ECHOKE)
1168 | ECHOCTL | ECHOKE 1213 | ECHOCTL | ECHOKE
1169# endif 1214# endif
1170 | ECHOE | ECHOK); 1215 | ECHOE | ECHOK);
1171# else /* HAVE_TERMIOS_H */
1172
1173 /*
1174 * sgtty interface
1175 */
1176
1177 /* get parameters -- gtty */
1178 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1179 {
1180 tio->sg.sg_erase = CERASE; /* ^H */
1181 tio->sg.sg_kill = CKILL; /* ^U */
1182 }
1183
1184 if (erase != -1)
1185 tio->sg.sg_erase = (char)erase;
1186
1187 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1188
1189 /* get special characters */
1190 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1191 {
1192 tio->tc.t_intrc = CINTR; /* ^C */
1193 tio->tc.t_quitc = CQUIT; /* ^\ */
1194 tio->tc.t_startc = CSTART; /* ^Q */
1195 tio->tc.t_stopc = CSTOP; /* ^S */
1196 tio->tc.t_eofc = CEOF; /* ^D */
1197 tio->tc.t_brkc = -1;
1198 }
1199
1200 /* get local special chars */
1201 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1202 {
1203 tio->lc.t_suspc = CSUSP; /* ^Z */
1204 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1205 tio->lc.t_rprntc = CRPRNT; /* ^R */
1206 tio->lc.t_flushc = CFLUSH; /* ^O */
1207 tio->lc.t_werasc = CWERASE; /* ^W */
1208 tio->lc.t_lnextc = CLNEXT; /* ^V */
1209 }
1210 /* get line discipline */
1211 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1212# ifdef NTTYDISC
1213 tio->line = NTTYDISC;
1214# endif /* NTTYDISC */
1215
1216 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1217#endif /* HAVE_TERMIOS_H */
1218 1216
1219 /* 1217 /*
1220 * Debugging 1218 * Debugging
1221 */ 1219 */
1222#ifdef DEBUG_TTYMODE 1220#ifdef DEBUG_TTYMODE
… …
1323 else 1321 else
1324#endif 1322#endif
1325 if (!pty->get ()) 1323 if (!pty->get ())
1326 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1324 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1327 1325
1326 int er;
1327
1328#ifndef NO_BACKSPACE_KEY
1329 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1330 er = rs[Rs_backspace_key][0];
1331 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1332 er = '\177'; /* the initial state anyway */
1333 else
1334#endif
1335 er = -1;
1336
1337 rxvt_get_ttymode (&tio, er);
1338 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1328 pty->set_utf8_mode (enc_utf8); 1339 pty->set_utf8_mode (enc_utf8);
1329 1340
1330 /* set initial window size */ 1341 /* set initial window size */
1331 tt_winch (); 1342 tt_winch ();
1332
1333 int er;
1334
1335#ifndef NO_BACKSPACE_KEY
1336 if (key_backspace[0] && !key_backspace[1])
1337 er = key_backspace[0];
1338 else if (strcmp (key_backspace, "DEC") == 0)
1339 er = '\177'; /* the initial state anyway */
1340 else
1341#endif
1342 er = -1;
1343
1344 rxvt_get_ttymode (&tio, er);
1345 1343
1346#if ENABLE_FRILLS 1344#if ENABLE_FRILLS
1347 if (rs[Rs_pty_fd]) 1345 if (rs[Rs_pty_fd])
1348 return; 1346 return;
1349#endif 1347#endif
… …
1380 } 1378 }
1381 1379
1382 _exit (EXIT_FAILURE); 1380 _exit (EXIT_FAILURE);
1383 1381
1384 default: 1382 default:
1385 if (!OPTION (Opt_utmpInhibit)) 1383 if (!option (Opt_utmpInhibit))
1386 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1384 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1387 1385
1388 pty->close_tty (); 1386 pty->close_tty ();
1389 1387
1390 child_ev.start (cmd_pid); 1388 child_ev.start (cmd_pid);
1391 1389
… …
1404int 1402int
1405rxvt_term::run_child (const char *const *argv) 1403rxvt_term::run_child (const char *const *argv)
1406{ 1404{
1407 char *login; 1405 char *login;
1408 1406
1409 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1410
1411 if (OPTION (Opt_console)) 1407 if (option (Opt_console))
1412 { /* be virtual console, fail silently */ 1408 { /* be virtual console, fail silently */
1413#ifdef TIOCCONS 1409#ifdef TIOCCONS
1414 unsigned int on = 1; 1410 unsigned int on = 1;
1415 1411
1416 ioctl (STDIN_FILENO, TIOCCONS, &on); 1412 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1444 sigset_t ss; 1440 sigset_t ss;
1445 sigemptyset (&ss); 1441 sigemptyset (&ss);
1446 sigprocmask (SIG_SETMASK, &ss, 0); 1442 sigprocmask (SIG_SETMASK, &ss, 0);
1447 1443
1448 /* command interpreter path */ 1444 /* command interpreter path */
1449 if (argv != NULL) 1445 if (argv)
1450 { 1446 {
1451# ifdef DEBUG_CMD 1447# ifdef DEBUG_CMD
1452 int i; 1448 int i;
1453 1449
1454 for (i = 0; argv[i]; i++) 1450 for (i = 0; argv[i]; i++)
… …
1463 const char *argv0, *shell; 1459 const char *argv0, *shell;
1464 1460
1465 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1461 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1466 shell = "/bin/sh"; 1462 shell = "/bin/sh";
1467 1463
1468 argv0 = (const char *)rxvt_r_basename (shell); 1464 argv0 = (const char *)rxvt_basename (shell);
1469 1465
1470 if (OPTION (Opt_loginShell)) 1466 if (option (Opt_loginShell))
1471 { 1467 {
1472 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1468 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1473 1469
1474 login[0] = '-'; 1470 login[0] = '-';
1475 strcpy (&login[1], argv0); 1471 strcpy (&login[1], argv0);
1476 argv0 = login; 1472 argv0 = login;
1477 } 1473 }
1478 1474
1479 execlp (shell, argv0, NULL); 1475 execlp (shell, argv0, (char *)0);
1480 /* no error message: STDERR is closed! */ 1476 /* no error message: STDERR is closed! */
1481 } 1477 }
1482 1478
1483 return -1; 1479 return -1;
1484} 1480}

Diff Legend

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