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.155 by root, Wed Jan 25 02:53:13 2006 UTC vs.
Revision 1.220 by ayin, Sun Oct 28 11:25:04 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 HAVE_XSETLOCALE
47# define X_LOCALE
48# include <X11/Xlocale.h>
49#else
50# ifdef HAVE_SETLOCALE
51# include <clocale>
52# endif
53#endif
54
55#ifdef HAVE_NL_LANGINFO
56# include <langinfo.h>
57#endif
58
59#ifdef DISPLAY_IS_IP
60/* On Solaris link with -lsocket and -lnsl */
61#include <sys/types.h>
62#include <sys/socket.h>
63
64/* these next two are probably only on Sun (not Solaris) */
65#ifdef HAVE_SYS_SOCKIO_H
66#include <sys/sockio.h>
67#endif
68#ifdef HAVE_SYS_BYTEORDER_H
69#include <sys/byteorder.h>
70#endif
71
72#include <netinet/in.h>
73#include <arpa/inet.h>
74#include <net/if.h>
75#include <net/if_arp.h>
76
77static char *
78rxvt_network_display (const char *display)
79{
80 char buffer[1024], *rval = NULL;
81 struct ifconf ifc;
82 struct ifreq *ifr;
83 int i, skfd;
84
85 if (display[0] != ':' && strncmp (display, "unix:", 5))
86 return (char *) display; /* nothing to do */
87
88 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
89 ifc.ifc_buf = buffer;
90
91 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
92 {
93 perror ("socket");
94 return NULL;
95 }
96
97 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
98 {
99 perror ("SIOCGIFCONF");
100 close (skfd);
101 return NULL;
102 }
103
104 for (i = 0, ifr = ifc.ifc_req;
105 i < (ifc.ifc_len / sizeof (struct ifreq));
106 i++, ifr++)
107 {
108 struct ifreq ifr2;
109
110 strcpy (ifr2.ifr_name, ifr->ifr_name);
111
112 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
113 {
114 unsigned long addr;
115 struct sockaddr_in *p_addr;
116
117 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
118 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
119
120 /*
121 * not "0.0.0.0" or "127.0.0.1" - so format the address
122 */
123 if (addr && addr != 0x7F000001)
124 {
125 char *colon = strchr (display, ':');
126
127 if (colon == NULL)
128 colon = ":0.0";
129
130 rval = rxvt_malloc (strlen (colon) + 16);
131 sprintf (rval, "%d.%d.%d.%d%s",
132 (int) ((addr >> 030) & 0xFF),
133 (int) ((addr >> 020) & 0xFF),
134 (int) ((addr >> 010) & 0xFF),
135 (int) (addr & 0xFF), colon);
136 break;
137 }
138 }
139 }
140
141 close (skfd);
142
143 return rval;
144}
145#endif
146
43const char *const def_colorName[] = 147const char *const def_colorName[] =
44 { 148 {
45 COLOR_FOREGROUND, 149 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 150 COLOR_BACKGROUND,
47 /* low-intensity colors */ 151 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 152 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 153 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 154 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 155 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 156 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 157 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 158 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 159# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 160 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 161# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 162 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 163# endif
60 /* high-intensity colors */ 164 /* high-intensity colors */
61# ifdef XTERM_COLORS 165# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 166 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 167# else
64 "Grey25", /* 8: bright black (#404040) */ 168 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 169# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 170 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 171 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 172 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 173 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 174 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 175 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 176 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 177
74 // 88 xterm colours 178 // 88 xterm colours
75 "rgb:00/00/00", 179 "rgb:00/00/00",
76 "rgb:00/00/8b", 180 "rgb:00/00/8b",
77 "rgb:00/00/cd", 181 "rgb:00/00/cd",
… …
166#endif 270#endif
167#ifdef KEEP_SCROLLCOLOR 271#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 273 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 274#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 275#if ENABLE_TRANSPARENCY
172 NULL, 276 NULL,
173#endif 277#endif
174#if OFF_FOCUS_FADING 278#if OFF_FOCUS_FADING
175 "black", 279 "rgb:00/00/00",
176#endif 280#endif
177 }; 281 };
178 282
179bool 283bool
180rxvt_term::init_vars () 284rxvt_term::init_vars ()
… …
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 287 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING 288#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 289 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif 290#endif
187 291
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 292
192 MEvent.time = CurrentTime; 293 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 294 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 295 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 296 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 297 ncol = 80;
198 nrow = 24; 298 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 299 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 300 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 301 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 302 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS; 303 numpix_colors = TOTAL_COLORS;
204 304
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 305 refresh_type = SLOW_REFRESH;
207 306
208 oldcursor.row = oldcursor.col = -1; 307 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50;
212 bgPixmap.pixmap = None;
213#endif
214
215 last_bot = last_state = -1; 308 last_bot = last_state = -1;
309
310 set_option (Opt_scrollBar);
311 set_option (Opt_scrollTtyOutput);
312 set_option (Opt_jumpScroll);
313 set_option (Opt_skipScroll);
314 set_option (Opt_secondaryScreen);
315 set_option (Opt_secondaryScroll);
316 set_option (Opt_pastableTabs);
317 set_option (Opt_intensityStyles);
318 set_option (Opt_iso14755_52);
216 319
217 return true; 320 return true;
218} 321}
219 322
220void 323void
… …
229 if ((i = open ("/dev/null", O_RDONLY)) < 0) 332 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 { 333 {
231 /* TODO: BOO HISS */ 334 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO); 335 dup2 (STDERR_FILENO, STDIN_FILENO);
233 } 336 }
234 else if (i > STDIN_FILENO) 337 else if (i != STDIN_FILENO)
235 { 338 {
236 dup2 (i, STDIN_FILENO); 339 dup2 (i, STDIN_FILENO);
237 close (i); 340 close (i);
238 } 341 }
239 342
… …
254/*----------------------------------------------------------------------*/ 357/*----------------------------------------------------------------------*/
255const char ** 358const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 359rxvt_term::init_resources (int argc, const char *const *argv)
257{ 360{
258 int i, r_argc; 361 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 362 const char **cmd_argv, **r_argv;
261 363
262 /* 364 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 365 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 366 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 367 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 368 if (!strcmp (argv[r_argc], "-e"))
267 break; 369 break;
370
371 if (r_argc == argc)
372 cmd_argv = NULL;
373 else if (!argv[r_argc + 1])
374 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
375 else
376 {
377 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
378
379 for (i = 0; i < argc - r_argc - 1; i++)
380 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
381
382 cmd_argv[i] = NULL;
383 }
268 384
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 385 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 386
271 for (i = 0; i < r_argc; i++) 387 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 388 r_argv[i] = (const char *)argv[i];
273 389
274 r_argv[i] = NULL; 390 r_argv[i] = NULL;
275 391
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]); 392 rs[Rs_name] = rxvt_basename (argv[0]);
289 393
290 /* 394 /*
291 * Open display, get options/resources and create the window 395 * Open display, get options/resources and create the window
292 */ 396 */
293 397
… …
295 rs[Rs_display_name] = ":0"; 399 rs[Rs_display_name] = ":0";
296 400
297 get_options (r_argc, r_argv); 401 get_options (r_argc, r_argv);
298 402
299 if (!(display = displays.get (rs[Rs_display_name]))) 403 if (!(display = displays.get (rs[Rs_display_name])))
404 {
405 free (r_argv);
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 406 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
407 }
301 408
409 // using a local pointer decreases code size a lot
410 xa = display->xa;
411
412 set (display);
302 extract_resources (); 413 extract_resources ();
303 414
415#if XFT
416 if (rs[Rs_depth])
417 select_visual (strtol (rs[Rs_depth], 0, 0));
418#endif
419
420#ifdef HAVE_AFTERIMAGE
421 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
422#endif
304 free (r_argv); 423 free (r_argv);
424
425 for (int i = NUM_RESOURCES; i--; )
426 if (rs [i] == resval_undef)
427 rs [i] = 0;
305 428
306#if ENABLE_PERL 429#if ENABLE_PERL
307 if (!rs[Rs_perl_ext_1]) 430 if (!rs[Rs_perl_ext_1])
308 rs[Rs_perl_ext_1] = "default"; 431 rs[Rs_perl_ext_1] = "default";
309 432
… …
320 * set any defaults not already set 443 * set any defaults not already set
321 */ 444 */
322 if (cmd_argv && cmd_argv[0]) 445 if (cmd_argv && cmd_argv[0])
323 { 446 {
324 if (!rs[Rs_title]) 447 if (!rs[Rs_title])
325 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 448 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
326 if (!rs[Rs_iconName]) 449 if (!rs[Rs_iconName])
327 rs[Rs_iconName] = rs[Rs_title]; 450 rs[Rs_iconName] = rs[Rs_title];
328 } 451 }
329 else 452 else
330 { 453 {
… …
368 rs[Rs_cutchars] = CUTCHARS; 491 rs[Rs_cutchars] = CUTCHARS;
369 492
370#ifndef NO_BACKSPACE_KEY 493#ifndef NO_BACKSPACE_KEY
371 if (!rs[Rs_backspace_key]) 494 if (!rs[Rs_backspace_key])
372# ifdef DEFAULT_BACKSPACE 495# ifdef DEFAULT_BACKSPACE
373 key_backspace = DEFAULT_BACKSPACE; 496 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
374# else 497# else
375 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 498 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
376# endif 499# endif
377 else
378 {
379 val = strdup (rs[Rs_backspace_key]);
380 rxvt_Str_trim (val);
381 rxvt_Str_escaped (val);
382 key_backspace = val;
383 }
384#endif 500#endif
385 501
386#ifndef NO_DELETE_KEY 502#ifndef NO_DELETE_KEY
387 if (!rs[Rs_delete_key]) 503 if (!rs[Rs_delete_key])
388# ifdef DEFAULT_DELETE 504# ifdef DEFAULT_DELETE
389 key_delete = DEFAULT_DELETE; 505 rs[Rs_delete_key] = DEFAULT_DELETE;
390# else 506# else
391 key_delete = "\033[3~"; 507 rs[Rs_delete_key] = "\033[3~";
392# endif
393 else
394 {
395 val = strdup (rs[Rs_delete_key]);
396 rxvt_Str_trim (val);
397 rxvt_Str_escaped (val);
398 key_delete = val;
399 }
400#endif 508# endif
401 if (rs[Rs_answerbackstring]) 509#endif
402 {
403 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
404 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
405 }
406 510
407#ifdef HAVE_SCROLLBARS 511#ifdef HAVE_SCROLLBARS
408 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 512 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
409#endif 513#endif
410 514
411#ifdef XTERM_REVERSE_VIDEO 515#ifdef XTERM_REVERSE_VIDEO
412 /* this is how xterm implements reverseVideo */ 516 /* this is how xterm implements reverseVideo */
413 if (OPTION (Opt_reverseVideo)) 517 if (option (Opt_reverseVideo))
414 { 518 {
415 if (!rs[Rs_color + Color_fg]) 519 if (!rs[Rs_color + Color_fg])
416 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 520 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
521
417 if (!rs[Rs_color + Color_bg]) 522 if (!rs[Rs_color + Color_bg])
418 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 523 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
419 } 524 }
420#endif 525#endif
421 526
… …
423 if (!rs[Rs_color + i]) 528 if (!rs[Rs_color + i])
424 rs[Rs_color + i] = def_colorName[i]; 529 rs[Rs_color + i] = def_colorName[i];
425 530
426#ifndef XTERM_REVERSE_VIDEO 531#ifndef XTERM_REVERSE_VIDEO
427 /* this is how we implement reverseVideo */ 532 /* this is how we implement reverseVideo */
428 if (OPTION (Opt_reverseVideo)) 533 if (option (Opt_reverseVideo))
429 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 534 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
430#endif 535#endif
431 536
432 /* convenient aliases for setting fg/bg to colors */ 537 /* convenient aliases for setting fg/bg to colors */
433 color_aliases (Color_fg); 538 color_aliases (Color_fg);
… …
454/*----------------------------------------------------------------------*/ 559/*----------------------------------------------------------------------*/
455void 560void
456rxvt_term::init_env () 561rxvt_term::init_env ()
457{ 562{
458 int i; 563 int i;
459 unsigned int u;
460 char *val; 564 char *val;
461 565
462#ifdef DISPLAY_IS_IP 566#ifdef DISPLAY_IS_IP
463 /* Fixup display_name for export over pty to any interested terminal 567 /* Fixup display_name for export over pty to any interested terminal
464 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 568 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
473 val = rxvt_network_display (rs[Rs_display_name]); 577 val = rxvt_network_display (rs[Rs_display_name]);
474 rs[Rs_display_name] = (const char *)val; 578 rs[Rs_display_name] = (const char *)val;
475 579
476 if (val == NULL) 580 if (val == NULL)
477#endif /* DISPLAY_IS_IP */ 581#endif /* DISPLAY_IS_IP */
478 val = XDisplayString (display->display); 582 val = XDisplayString (dpy);
479 583
480 if (rs[Rs_display_name] == NULL) 584 if (rs[Rs_display_name] == NULL)
481 rs[Rs_display_name] = val; /* use broken `:0' value */ 585 rs[Rs_display_name] = val; /* use broken `:0' value */
482 586
483 i = strlen (val); 587 i = strlen (val);
484 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 588 env_display = (char *)rxvt_malloc (i + 9);
485 589
486 sprintf (env_display, "DISPLAY=%s", val); 590 sprintf (env_display, "DISPLAY=%s", val);
487 591
488 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 592 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
489 593
… …
503 607
504#ifdef RXVT_TERMINFO 608#ifdef RXVT_TERMINFO
505 putenv ("TERMINFO=" RXVT_TERMINFO); 609 putenv ("TERMINFO=" RXVT_TERMINFO);
506#endif 610#endif
507 611
508 if (display->depth <= 2) 612 if (depth <= 2)
509 putenv ("COLORTERM=" COLORTERMENV "-mono"); 613 putenv ("COLORTERM=" COLORTERMENV "-mono");
510 else 614 else
511 putenv ("COLORTERM=" COLORTERMENVFULL); 615 putenv ("COLORTERM=" COLORTERMENVFULL);
512 616
513 if (rs[Rs_term_name] != NULL) 617 if (rs[Rs_term_name] != NULL)
514 { 618 {
515 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 619 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
516 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 620 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
517 putenv (env_term); 621 putenv (env_term);
518 } 622 }
519 else 623 else
520 putenv ("TERM=" TERMENV); 624 putenv ("TERM=" TERMENV);
… …
553 657
554 this->locale = "C"; 658 this->locale = "C";
555 } 659 }
556 660
557 661
558 this->locale = rxvt_strdup (this->locale); 662 this->locale = strdup (this->locale);
559 SET_LOCALE (this->locale); 663 SET_LOCALE (this->locale);
560 mbstate.reset (); 664 mbstate.reset ();
561#endif 665#endif
562 666
563#if HAVE_NL_LANGINFO 667#if HAVE_NL_LANGINFO
… …
607 * Initialize the command connection. 711 * Initialize the command connection.
608 * This should be called after the X server connection is established. 712 * This should be called after the X server connection is established.
609 */ 713 */
610 714
611#ifdef META8_OPTION 715#ifdef META8_OPTION
612 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 716 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
613#endif 717#endif
614 718
615 get_ourmods (); 719 get_ourmods ();
616 720
617 if (!OPTION (Opt_scrollTtyOutput)) 721 if (!option (Opt_scrollTtyOutput))
618 priv_modes |= PrivMode_TtyOutputInh; 722 priv_modes |= PrivMode_TtyOutputInh;
619 if (OPTION (Opt_scrollTtyKeypress)) 723 if (option (Opt_scrollTtyKeypress))
620 priv_modes |= PrivMode_Keypress; 724 priv_modes |= PrivMode_Keypress;
621 if (!OPTION (Opt_jumpScroll)) 725 if (!option (Opt_jumpScroll))
622 priv_modes |= PrivMode_smoothScroll; 726 priv_modes |= PrivMode_smoothScroll;
623 727
624#ifndef NO_BACKSPACE_KEY 728#ifndef NO_BACKSPACE_KEY
625 if (strcmp (key_backspace, "DEC") == 0) 729 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
626 priv_modes |= PrivMode_HaveBackSpace; 730 priv_modes |= PrivMode_HaveBackSpace;
627#endif 731#endif
628 732
629 /* add value for scrollBar */ 733 /* add value for scrollBar */
630 if (scrollBar.state) 734 if (scrollBar.state)
… …
644 748
645#ifdef OFF_FOCUS_FADING 749#ifdef OFF_FOCUS_FADING
646 pix_colors = pix_colors_focused; 750 pix_colors = pix_colors_focused;
647#endif 751#endif
648 752
649 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
650 { 754 {
755 const char *name = rs[Rs_color + i];
756
757 if (!name)
758 continue;
759
651 rxvt_color xcol; 760 rxvt_color xcol;
652 761
653 if (!rs[Rs_color + i]) 762 if (!set_color (xcol, name))
654 continue;
655
656 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
657 { 763 {
658#ifndef XTERM_REVERSE_VIDEO 764#ifndef XTERM_REVERSE_VIDEO
659 if (i < 2 && OPTION (Opt_reverseVideo)) 765 if (i < 2 && option (Opt_reverseVideo))
660 rs[Rs_color + i] = def_colorName[!i]; 766 name = def_colorName [1 - i];
661 else 767 else
662#endif 768#endif
663 rs[Rs_color + i] = def_colorName[i]; 769 name = def_colorName [i];
664 770
665 if (!rs[Rs_color + i]) 771 if (!name)
666 continue; 772 continue;
667 773
668 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 774 if (!set_color (xcol, name))
669 { 775 {
670 switch (i) 776 switch (i)
671 { 777 {
672 case Color_fg: 778 case Color_fg:
673 case Color_bg: 779 case Color_bg:
674 /* fatal: need bg/fg color */
675 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 780 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
676 /* NOTREACHED */ 781 name = "";
677 break; 782 break;
678#ifndef NO_CURSORCOLOR 783#ifndef NO_CURSORCOLOR
679 case Color_cursor2: 784 case Color_cursor2:
680 xcol = pix_colors[Color_fg]; 785#endif
681 break;
682#endif /* ! NO_CURSORCOLOR */
683 case Color_pointer_fg: 786 case Color_pointer_fg:
684 xcol = pix_colors[Color_fg]; 787 name = rs[Rs_color + Color_fg];
788 xcol.set (this, name);
685 break; 789 break;
686 default: 790 default:
687 xcol = pix_colors[Color_bg]; /* None */ 791 name = rs[Rs_color + Color_bg];
792 xcol.set (this, name);
688 break; 793 break;
689 } 794 }
690 } 795 }
691 } 796 }
692 797
693 pix_colors[i] = xcol; 798 pix_colors[i] = xcol;
694 SET_PIXCOLOR (i); 799 rs[Rs_color + i] = name;
695 }
696
697#ifdef OFF_FOCUS_FADING
698 if (rs[Rs_fade])
699 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
700 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
701#endif
702
703 if (display->depth <= 2)
704 { 800 }
801
802 if (depth <= 2)
803 {
705 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 804 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
706 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 805 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
707 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 806 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
708 } 807 }
709 808
710 /* 809 /*
711 * get scrollBar shadow colors 810 * get scrollBar shadow colors
712 * 811 *
713 * The calculations of topShadow/bottomShadow values are adapted 812 * The calculations of topShadow/bottomShadow values are adapted
714 * from the fvwm window manager. 813 * from the fvwm window manager.
715 */ 814 */
716#ifdef KEEP_SCROLLCOLOR 815#ifdef KEEP_SCROLLCOLOR
717
718 if (display->depth <= 2) 816 if (depth <= 2)
719 { 817 {
720 /* Monochrome */ 818 /* Monochrome */
721 pix_colors[Color_scroll] = pix_colors[Color_fg]; 819 alias_color (Color_scroll, Color_fg);
722 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 820 alias_color (Color_topShadow, Color_bg);
723 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 821 alias_color (Color_bottomShadow, Color_bg);
724 } 822 }
725 else 823 else
726 { 824 {
727 rxvt_color xcol[2]; 825 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
728 /* xcol[0] == white
729 * xcol[1] == top shadow
730 * xcol[2] == bot shadow */
731 826
732 xcol[1] = pix_colors[Color_scroll]; 827 rgba cscroll;
733 xcol[0].set (display, 65535, 65535, 65535); 828 pix_colors [Color_scroll].get (cscroll);
734
735 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
736
737 xcol[0].get (display, pr0, pg0, pb0);
738 xcol[1].get (display, pr1, pg1, pb1);
739
740 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
741 829
742 /* topShadowColor */ 830 /* topShadowColor */
743 if (!xcol[1].set (display, 831 if (!pix_colors[Color_topShadow].set (this,
744 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 832 rgba (
745 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 833 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
746 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 834 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
747 xcol[1] = pix_colors[Color_White]; 835 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
748 836 cscroll.a)
749 pix_colors[Color_topShadow] = xcol[1]; 837 ))
838 alias_color (Color_topShadow, Color_White);
750 } 839 }
751#endif /* KEEP_SCROLLCOLOR */ 840#endif /* KEEP_SCROLLCOLOR */
841
842#ifdef OFF_FOCUS_FADING
843 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
844 update_fade_color (i);
845#endif
752} 846}
753 847
754/*----------------------------------------------------------------------*/ 848/*----------------------------------------------------------------------*/
755/* color aliases, fg/bg bright-bold */ 849/* color aliases, fg/bg bright-bold */
756void 850void
… …
795 889
796 if (rsmod 890 if (rsmod
797 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 891 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
798 requestedmeta = rsmod[3] - '0'; 892 requestedmeta = rsmod[3] - '0';
799 893
800 map = XGetModifierMapping (display->display); 894 map = XGetModifierMapping (dpy);
801 kc = map->modifiermap; 895 kc = map->modifiermap;
802 896
803 for (i = 1; i < 6; i++) 897 for (i = 1; i < 6; i++)
804 { 898 {
805 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 899 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
807 for (j = map->max_keypermod; j--; k++) 901 for (j = map->max_keypermod; j--; k++)
808 { 902 {
809 if (kc[k] == 0) 903 if (kc[k] == 0)
810 break; 904 break;
811 905
812 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 906 switch (XKeycodeToKeysym (dpy, kc[k], 0))
813 { 907 {
814 case XK_Num_Lock: 908 case XK_Num_Lock:
815 ModNumLockMask = modmasks[i - 1]; 909 ModNumLockMask = modmasks[i - 1];
816 continue; 910 continue;
817 911
… …
867rxvt_term::create_windows (int argc, const char *const *argv) 961rxvt_term::create_windows (int argc, const char *const *argv)
868{ 962{
869 XClassHint classHint; 963 XClassHint classHint;
870 XWMHints wmHint; 964 XWMHints wmHint;
871#if ENABLE_FRILLS 965#if ENABLE_FRILLS
872 MWMHints mwmhints; 966 MWMHints mwmhints = { };
873#endif 967#endif
874 XGCValues gcvalue; 968 XGCValues gcvalue;
875 XSetWindowAttributes attributes; 969 XSetWindowAttributes attributes;
876 Window top, parent; 970 Window top, parent;
877 dDisp;
878 971
879 xa = display->xa; 972 dLocal (Display *, dpy);
880 973
881 /* grab colors before netscape does */ 974 /* grab colors before netscape does */
882 Get_Colours (); 975 Get_Colours ();
883 976
884 if (!set_fonts ()) 977 if (!set_fonts ())
885 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 978 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
886 979
887 parent = display->root; 980 parent = display->root;
888 981
889 attributes.override_redirect = !!OPTION (Opt_override_redirect); 982 attributes.override_redirect = !!option (Opt_override_redirect);
890 983
891#if ENABLE_FRILLS 984#if ENABLE_FRILLS
892 if (OPTION (Opt_borderLess)) 985 if (option (Opt_borderLess))
893 { 986 {
894 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) 987 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
895 { 988 {
896 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 989 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
897 attributes.override_redirect = TRUE; 990 attributes.override_redirect = true;
898 mwmhints.flags = 0;
899 } 991 }
900 else 992 else
901 { 993 {
902 mwmhints.flags = MWM_HINTS_DECORATIONS; 994 mwmhints.flags = MWM_HINTS_DECORATIONS;
903 mwmhints.decorations = 0;
904 } 995 }
905 } 996 }
906 else
907 mwmhints.flags = 0;
908#endif 997#endif
909 998
910#if ENABLE_XEMBED 999#if ENABLE_XEMBED
911 if (rs[Rs_embed]) 1000 if (rs[Rs_embed])
912 { 1001 {
913 XWindowAttributes wattr; 1002 XWindowAttributes wattr;
914 1003
915 parent = strtol (rs[Rs_embed], 0, 0); 1004 parent = strtol (rs[Rs_embed], 0, 0);
916 1005
917 if (!XGetWindowAttributes (disp, parent, &wattr)) 1006 if (!XGetWindowAttributes (dpy, parent, &wattr))
918 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1007 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
919 1008
920 window_calc (wattr.width, wattr.height); 1009 window_calc (wattr.width, wattr.height);
921 } 1010 }
922#endif 1011#endif
923 1012
924 window_calc (0, 0); 1013 window_calc (0, 0);
925 1014
926 /* sub-window placement & size in rxvt_resize_subwindows () */ 1015 /* sub-window placement & size in rxvt_resize_subwindows () */
927 attributes.background_pixel = pix_colors_focused[Color_border]; 1016 attributes.background_pixel = pix_colors_focused [Color_border];
928 attributes.border_pixel = pix_colors_focused[Color_border]; 1017 attributes.border_pixel = pix_colors_focused [Color_border];
929 attributes.colormap = display->cmap; 1018 attributes.colormap = cmap;
930 1019
931 top = XCreateWindow (disp, parent, 1020 top = XCreateWindow (dpy, parent,
932 szHint.x, szHint.y, 1021 szHint.x, szHint.y,
933 szHint.width, szHint.height, 1022 szHint.width, szHint.height,
934 ext_bwidth, 1023 ext_bwidth,
935 display->depth, InputOutput, 1024 depth, InputOutput, visual,
936 display->visual,
937 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1025 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
938 &attributes); 1026 &attributes);
939 1027
940 this->parent[0] = top; 1028 this->parent[0] = top;
941 1029
… …
948 classHint.res_name = (char *)rs[Rs_name]; 1036 classHint.res_name = (char *)rs[Rs_name];
949 classHint.res_class = (char *)RESCLASS; 1037 classHint.res_class = (char *)RESCLASS;
950 1038
951 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1039 wmHint.flags = InputHint | StateHint | WindowGroupHint;
952 wmHint.input = True; 1040 wmHint.input = True;
953 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1041 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
954 wmHint.window_group = top; 1042 wmHint.window_group = top;
955 1043
956 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1044 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
957 &szHint, &wmHint, &classHint); 1045 &szHint, &wmHint, &classHint);
958 1046
959#if ENABLE_FRILLS 1047#if ENABLE_FRILLS
960 if (mwmhints.flags) 1048 if (mwmhints.flags)
961 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1049 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
962 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1050 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
963#endif 1051#endif
964 1052
965 Atom protocols[] = { 1053 Atom protocols[] = {
966 xa[XA_WM_DELETE_WINDOW], 1054 xa[XA_WM_DELETE_WINDOW],
967#if ENABLE_EWMH 1055#if ENABLE_EWMH
968 xa[XA_NET_WM_PING], 1056 xa[XA_NET_WM_PING],
969#endif 1057#endif
970 }; 1058 };
971 1059
972 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1060 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
973 1061
974#if ENABLE_FRILLS 1062#if ENABLE_FRILLS
975 if (rs[Rs_transient_for]) 1063 if (rs[Rs_transient_for])
976 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1064 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
977#endif 1065#endif
978 1066
979#if ENABLE_EWMH 1067#if ENABLE_EWMH
980 long pid = getpid (); 1068 long pid = getpid ();
981 1069
982 XChangeProperty (disp, top, 1070 XChangeProperty (dpy, top,
983 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1071 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
984 PropModeReplace, (unsigned char *)&pid, 1); 1072 PropModeReplace, (unsigned char *)&pid, 1);
985 1073
986 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1074 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
987#endif 1075#endif
988 1076
989 XSelectInput (disp, top, 1077 XSelectInput (dpy, top,
990 KeyPressMask 1078 KeyPressMask
991#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1079#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
992 | KeyReleaseMask 1080 | KeyReleaseMask
993#endif 1081#endif
994 | FocusChangeMask | VisibilityChangeMask 1082 | FocusChangeMask | VisibilityChangeMask
995 | ExposureMask | StructureNotifyMask); 1083 | ExposureMask | StructureNotifyMask);
996 1084
997 termwin_ev.start (display, top); 1085 termwin_ev.start (display, top);
998 1086
999 /* vt cursor: Black-on-White is standard, but this is more popular */ 1087 /* vt cursor: Black-on-White is standard, but this is more popular */
1000 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1088 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1001 1089
1002#ifdef HAVE_SCROLLBARS 1090#ifdef HAVE_SCROLLBARS
1003 /* cursor scrollBar: Black-on-White */ 1091 /* cursor scrollBar: Black-on-White */
1004 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1092 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1005#endif 1093#endif
1006 1094
1007 /* the vt window */ 1095 /* the vt window */
1008 vt = XCreateSimpleWindow (disp, top, 1096 vt = XCreateSimpleWindow (dpy, top,
1009 window_vt_x, window_vt_y, 1097 window_vt_x, window_vt_y,
1010 width, height, 1098 width, height,
1011 0, 1099 0,
1012 pix_colors_focused[Color_fg], 1100 pix_colors_focused[Color_fg],
1013 pix_colors_focused[Color_bg]); 1101 pix_colors_focused[Color_bg]);
1014 1102
1015 attributes.bit_gravity = NorthWestGravity; 1103 attributes.bit_gravity = NorthWestGravity;
1016 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1104 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1017 1105
1018 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1106 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1019 1107
1020 if (OPTION (Opt_pointerBlank)) 1108 if (option (Opt_pointerBlank))
1021 vt_emask |= PointerMotionMask; 1109 vt_emask |= PointerMotionMask;
1022 else 1110 else
1023 vt_emask |= Button1MotionMask | Button3MotionMask; 1111 vt_emask |= Button1MotionMask | Button3MotionMask;
1024 1112
1025 vt_select_input (); 1113 vt_select_input ();
1026 1114
1027 vt_ev.start (display, vt); 1115 vt_ev.start (display, vt);
1028 1116
1029#ifdef XPM_BACKGROUND
1030 if (rs[Rs_backgroundPixmap] != NULL
1031 && !OPTION (Opt_transparent))
1032 {
1033 const char *p = rs[Rs_backgroundPixmap];
1034
1035 if ((p = strchr (p, ';')) != NULL)
1036 {
1037 p++;
1038 scale_pixmap (p);
1039 }
1040
1041 set_bgPixmap (rs[Rs_backgroundPixmap]);
1042 scr_touch (true);
1043 }
1044#endif
1045
1046 /* graphics context for the vt window */ 1117 /* graphics context for the vt window */
1047 gcvalue.foreground = pix_colors[Color_fg]; 1118 gcvalue.foreground = pix_colors[Color_fg];
1048 gcvalue.background = pix_colors[Color_bg]; 1119 gcvalue.background = pix_colors[Color_bg];
1049 gcvalue.graphics_exposures = 1; 1120 gcvalue.graphics_exposures = 0;
1050 1121
1051 gc = XCreateGC (disp, vt, 1122 gc = XCreateGC (dpy, vt,
1052 GCForeground | GCBackground | GCGraphicsExposures, 1123 GCForeground | GCBackground | GCGraphicsExposures,
1053 &gcvalue); 1124 &gcvalue);
1054 1125
1055 drawable = new rxvt_drawable (display, vt); 1126 drawable = new rxvt_drawable (this, vt);
1056 1127
1057#ifdef RXVT_SCROLLBAR 1128#ifdef RXVT_SCROLLBAR
1058 gcvalue.foreground = pix_colors[Color_topShadow]; 1129 gcvalue.foreground = pix_colors[Color_topShadow];
1059 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1130 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1060 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1131 gcvalue.foreground = pix_colors[Color_bottomShadow];
1061 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1132 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1062 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1133 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1063 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1134 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1064#endif 1135#endif
1065 1136
1066#ifdef OFF_FOCUS_FADING 1137#ifdef OFF_FOCUS_FADING
1067 // initially we are in unfocused state 1138 // initially we are in unfocused state
1068 if (rs[Rs_fade]) 1139 if (rs[Rs_fade])
… …
1077 * GET TTY CURRENT STATE * 1148 * GET TTY CURRENT STATE *
1078 * ------------------------------------------------------------------------- */ 1149 * ------------------------------------------------------------------------- */
1079void 1150void
1080rxvt_get_ttymode (ttymode_t *tio, int erase) 1151rxvt_get_ttymode (ttymode_t *tio, int erase)
1081{ 1152{
1082#ifdef HAVE_TERMIOS_H
1083 /* 1153 /*
1084 * standard System V termios interface 1154 * standard System V termios interface
1085 */ 1155 */
1086 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1156 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1087 { 1157 {
… …
1154 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1224 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1155# if defined (ECHOCTL) && defined (ECHOKE) 1225# if defined (ECHOCTL) && defined (ECHOKE)
1156 | ECHOCTL | ECHOKE 1226 | ECHOCTL | ECHOKE
1157# endif 1227# endif
1158 | ECHOE | ECHOK); 1228 | ECHOE | ECHOK);
1159# else /* HAVE_TERMIOS_H */
1160
1161 /*
1162 * sgtty interface
1163 */
1164
1165 /* get parameters -- gtty */
1166 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1167 {
1168 tio->sg.sg_erase = CERASE; /* ^H */
1169 tio->sg.sg_kill = CKILL; /* ^U */
1170 }
1171
1172 if (erase != -1)
1173 tio->sg.sg_erase = (char)erase;
1174
1175 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1176
1177 /* get special characters */
1178 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1179 {
1180 tio->tc.t_intrc = CINTR; /* ^C */
1181 tio->tc.t_quitc = CQUIT; /* ^\ */
1182 tio->tc.t_startc = CSTART; /* ^Q */
1183 tio->tc.t_stopc = CSTOP; /* ^S */
1184 tio->tc.t_eofc = CEOF; /* ^D */
1185 tio->tc.t_brkc = -1;
1186 }
1187
1188 /* get local special chars */
1189 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1190 {
1191 tio->lc.t_suspc = CSUSP; /* ^Z */
1192 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1193 tio->lc.t_rprntc = CRPRNT; /* ^R */
1194 tio->lc.t_flushc = CFLUSH; /* ^O */
1195 tio->lc.t_werasc = CWERASE; /* ^W */
1196 tio->lc.t_lnextc = CLNEXT; /* ^V */
1197 }
1198 /* get line discipline */
1199 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1200# ifdef NTTYDISC
1201 tio->line = NTTYDISC;
1202# endif /* NTTYDISC */
1203
1204 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1205#endif /* HAVE_TERMIOS_H */
1206 1229
1207 /* 1230 /*
1208 * Debugging 1231 * Debugging
1209 */ 1232 */
1210#ifdef DEBUG_TTYMODE 1233#ifdef DEBUG_TTYMODE
… …
1311 else 1334 else
1312#endif 1335#endif
1313 if (!pty->get ()) 1336 if (!pty->get ())
1314 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1337 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1315 1338
1339 int er;
1340
1341#ifndef NO_BACKSPACE_KEY
1342 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1343 er = rs[Rs_backspace_key][0];
1344 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1345 er = '\177'; /* the initial state anyway */
1346 else
1347#endif
1348 er = -1;
1349
1350 rxvt_get_ttymode (&tio, er);
1351 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1316 pty->set_utf8_mode (enc_utf8); 1352 pty->set_utf8_mode (enc_utf8);
1317 1353
1318 /* set initial window size */ 1354 /* set initial window size */
1319 tt_winch (); 1355 tt_winch ();
1320
1321 int er;
1322
1323#ifndef NO_BACKSPACE_KEY
1324 if (key_backspace[0] && !key_backspace[1])
1325 er = key_backspace[0];
1326 else if (strcmp (key_backspace, "DEC") == 0)
1327 er = '\177'; /* the initial state anyway */
1328 else
1329#endif
1330 er = -1;
1331
1332 rxvt_get_ttymode (&tio, er);
1333 1356
1334#if ENABLE_FRILLS 1357#if ENABLE_FRILLS
1335 if (rs[Rs_pty_fd]) 1358 if (rs[Rs_pty_fd])
1336 return; 1359 return;
1337#endif 1360#endif
… …
1368 } 1391 }
1369 1392
1370 _exit (EXIT_FAILURE); 1393 _exit (EXIT_FAILURE);
1371 1394
1372 default: 1395 default:
1373 if (!OPTION (Opt_utmpInhibit)) 1396 if (!option (Opt_utmpInhibit))
1374 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1397 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1375 1398
1376 pty->close_tty (); 1399 pty->close_tty ();
1377 1400
1378 child_ev.start (cmd_pid); 1401 child_ev.start (cmd_pid);
1379 1402
… …
1392int 1415int
1393rxvt_term::run_child (const char *const *argv) 1416rxvt_term::run_child (const char *const *argv)
1394{ 1417{
1395 char *login; 1418 char *login;
1396 1419
1397 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1398
1399 if (OPTION (Opt_console)) 1420 if (option (Opt_console))
1400 { /* be virtual console, fail silently */ 1421 { /* be virtual console, fail silently */
1401#ifdef TIOCCONS 1422#ifdef TIOCCONS
1402 unsigned int on = 1; 1423 unsigned int on = 1;
1403 1424
1404 ioctl (STDIN_FILENO, TIOCCONS, &on); 1425 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1432 sigset_t ss; 1453 sigset_t ss;
1433 sigemptyset (&ss); 1454 sigemptyset (&ss);
1434 sigprocmask (SIG_SETMASK, &ss, 0); 1455 sigprocmask (SIG_SETMASK, &ss, 0);
1435 1456
1436 /* command interpreter path */ 1457 /* command interpreter path */
1437 if (argv != NULL) 1458 if (argv)
1438 { 1459 {
1439# ifdef DEBUG_CMD 1460# ifdef DEBUG_CMD
1440 int i; 1461 int i;
1441 1462
1442 for (i = 0; argv[i]; i++) 1463 for (i = 0; argv[i]; i++)
… …
1451 const char *argv0, *shell; 1472 const char *argv0, *shell;
1452 1473
1453 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1474 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1454 shell = "/bin/sh"; 1475 shell = "/bin/sh";
1455 1476
1456 argv0 = (const char *)rxvt_r_basename (shell); 1477 argv0 = (const char *)rxvt_basename (shell);
1457 1478
1458 if (OPTION (Opt_loginShell)) 1479 if (option (Opt_loginShell))
1459 { 1480 {
1460 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1481 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1461 1482
1462 login[0] = '-'; 1483 login[0] = '-';
1463 strcpy (&login[1], argv0); 1484 strcpy (&login[1], argv0);
1464 argv0 = login; 1485 argv0 = login;
1465 } 1486 }
1466 1487
1467 execlp (shell, argv0, NULL); 1488 execlp (shell, argv0, (char *)0);
1468 /* no error message: STDERR is closed! */ 1489 /* no error message: STDERR is closed! */
1469 } 1490 }
1470 1491
1471 return -1; 1492 return -1;
1472} 1493}

Diff Legend

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