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.204 by sasha, Thu Aug 9 22:08:21 2007 UTC vs.
Revision 1.237 by ayin, Mon Dec 31 15:45:29 2007 UTC

… …
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 14 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support
14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
15 * 16 *
16 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 20 * (at your option) any later version.
… …
38 39
39#include <limits> 40#include <limits>
40 41
41#include <csignal> 42#include <csignal>
42 43
44#include <fcntl.h>
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 */
… …
50 "rgb:00/cd/00", // 2: green (Green3) 154 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: yellow (Yellow3) 155 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 156 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 157 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 158 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 159# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 160 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 161# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 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 "rgb:4d/4d/4d", // 8: bright black (Grey30) 166 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
146 "rgb:e7/e7/e7", 250 "rgb:e7/e7/e7",
147 251
148#ifndef NO_CURSORCOLOR 252#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 253 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 254 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 255#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 256 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 257 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 258 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 259#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 260 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 261 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 262 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 263 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 264#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 265#if ENABLE_FRILLS
162 NULL, // Color_underline 266 NULL, // Color_underline
163#endif 267#endif
164#ifdef OPTION_HC 268#ifdef OPTION_HC
165 NULL, 269 NULL,
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 ENABLE_TRANSPARENCY 275#if ENABLE_TRANSPARENCY
172 NULL, 276 NULL,
173#endif 277#endif
174#if OFF_FOCUS_FADING 278#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 279 "rgb:00/00/00",
176#endif 280#endif
177 }; 281 };
178 282
179bool 283void
180rxvt_term::init_vars () 284rxvt_term::init_vars ()
181{ 285{
182 pix_colors = // 286 pix_colors = pix_colors_focused;
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif
187
188 287
189 MEvent.time = CurrentTime; 288 MEvent.time = CurrentTime;
190 MEvent.button = AnyButton; 289 MEvent.button = AnyButton;
191 want_refresh = 1; 290 want_refresh = 1;
192 priv_modes = SavedModes = PrivMode_Default; 291 priv_modes = SavedModes = PrivMode_Default;
… …
194 nrow = 24; 293 nrow = 24;
195 int_bwidth = INTERNALBORDERWIDTH; 294 int_bwidth = INTERNALBORDERWIDTH;
196 ext_bwidth = EXTERNALBORDERWIDTH; 295 ext_bwidth = EXTERNALBORDERWIDTH;
197 lineSpace = LINESPACE; 296 lineSpace = LINESPACE;
198 saveLines = SAVELINES; 297 saveLines = SAVELINES;
199 numpix_colors = TOTAL_COLORS;
200 298
201 refresh_type = SLOW_REFRESH; 299 refresh_type = SLOW_REFRESH;
202 300
203 oldcursor.row = oldcursor.col = -1; 301 oldcursor.row = oldcursor.col = -1;
204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
209#ifdef XPM_BACKGROUND
210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
214 bgPixmap.pixmap = None;
215#endif
216 last_bot = last_state = -1;
217 302
218 set_option (Opt_scrollBar); 303 set_option (Opt_scrollBar);
219 set_option (Opt_scrollTtyOutput); 304 set_option (Opt_scrollTtyOutput);
220 set_option (Opt_jumpScroll); 305 set_option (Opt_jumpScroll);
221 set_option (Opt_skipScroll); 306 set_option (Opt_skipScroll);
222 set_option (Opt_secondaryScreen); 307 set_option (Opt_secondaryScreen);
223 set_option (Opt_secondaryScroll); 308 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs); 309 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles); 310 set_option (Opt_intensityStyles);
226 set_option (Opt_iso14755_52); 311 set_option (Opt_iso14755_52);
227
228 return true;
229} 312}
230 313
231void 314void
232rxvt_term::init_secondary () 315rxvt_term::init_secondary ()
233{ 316{
… …
240 if ((i = open ("/dev/null", O_RDONLY)) < 0) 323 if ((i = open ("/dev/null", O_RDONLY)) < 0)
241 { 324 {
242 /* TODO: BOO HISS */ 325 /* TODO: BOO HISS */
243 dup2 (STDERR_FILENO, STDIN_FILENO); 326 dup2 (STDERR_FILENO, STDIN_FILENO);
244 } 327 }
245 else if (i > STDIN_FILENO) 328 else if (i != STDIN_FILENO)
246 { 329 {
247 dup2 (i, STDIN_FILENO); 330 dup2 (i, STDIN_FILENO);
248 close (i); 331 close (i);
249 } 332 }
250 333
… …
265/*----------------------------------------------------------------------*/ 348/*----------------------------------------------------------------------*/
266const char ** 349const char **
267rxvt_term::init_resources (int argc, const char *const *argv) 350rxvt_term::init_resources (int argc, const char *const *argv)
268{ 351{
269 int i, r_argc; 352 int i, r_argc;
270 char *val;
271 const char **cmd_argv, **r_argv; 353 const char **cmd_argv, **r_argv;
272 354
273 /* 355 /*
274 * Look for -e option. Find => split and make cmd_argv[] of command args 356 * Look for -e option. Find => split and make cmd_argv[] of command args
275 */ 357 */
276 for (r_argc = 0; r_argc < argc; r_argc++) 358 for (r_argc = 0; r_argc < argc; r_argc++)
277 if (!strcmp (argv[r_argc], "-e")) 359 if (!strcmp (argv[r_argc], "-e"))
278 break; 360 break;
279 361
362 if (r_argc == argc)
363 cmd_argv = NULL;
364 else if (!argv[r_argc + 1])
365 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
366 else
367 {
368 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
369
370 for (i = 0; i < argc - r_argc - 1; i++)
371 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
372
373 cmd_argv[i] = NULL;
374 }
375
280 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 376 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
281 377
282 for (i = 0; i < r_argc; i++) 378 for (i = 0; i < r_argc; i++)
283 r_argv[i] = (const char *)argv[i]; 379 r_argv[i] = (const char *)argv[i];
284 380
285 r_argv[i] = NULL; 381 r_argv[i] = NULL;
286 382
287 if (r_argc == argc)
288 cmd_argv = NULL;
289 else
290 {
291 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
292
293 for (i = 0; i < argc - r_argc - 1; i++)
294 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
295
296 cmd_argv[i] = NULL;
297 }
298
299 rs[Rs_name] = rxvt_r_basename (argv[0]); 383 rs[Rs_name] = rxvt_basename (argv[0]);
300 384
301 /* 385 /*
302 * Open display, get options/resources and create the window 386 * Open display, get options/resources and create the window
303 */ 387 */
304 388
… …
306 rs[Rs_display_name] = ":0"; 390 rs[Rs_display_name] = ":0";
307 391
308 get_options (r_argc, r_argv); 392 get_options (r_argc, r_argv);
309 393
310 if (!(display = displays.get (rs[Rs_display_name]))) 394 if (!(display = displays.get (rs[Rs_display_name])))
395 {
396 free (r_argv);
311 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 397 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
398 }
312 399
313 // using a local pointer decreases code size a lot 400 // using a local pointer decreases code size a lot
314 xa = display->xa; 401 xa = display->xa;
315 402
316 set (display); 403 set (display);
… …
320 if (rs[Rs_depth]) 407 if (rs[Rs_depth])
321 select_visual (strtol (rs[Rs_depth], 0, 0)); 408 select_visual (strtol (rs[Rs_depth], 0, 0));
322#endif 409#endif
323 410
324#ifdef HAVE_AFTERIMAGE 411#ifdef HAVE_AFTERIMAGE
412 set_application_name ((char*)rs[Rs_name]);
413 set_output_threshold (OUTPUT_LEVEL_WARNING);
325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 414 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif 415#endif
327 free (r_argv); 416 free (r_argv);
328
329 bgPixmap.set_target (this);
330 417
331 for (int i = NUM_RESOURCES; i--; ) 418 for (int i = NUM_RESOURCES; i--; )
332 if (rs [i] == resval_undef) 419 if (rs [i] == resval_undef)
333 rs [i] = 0; 420 rs [i] = 0;
334 421
… …
349 * set any defaults not already set 436 * set any defaults not already set
350 */ 437 */
351 if (cmd_argv && cmd_argv[0]) 438 if (cmd_argv && cmd_argv[0])
352 { 439 {
353 if (!rs[Rs_title]) 440 if (!rs[Rs_title])
354 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 441 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
355 if (!rs[Rs_iconName]) 442 if (!rs[Rs_iconName])
356 rs[Rs_iconName] = rs[Rs_title]; 443 rs[Rs_iconName] = rs[Rs_title];
357 } 444 }
358 else 445 else
359 { 446 {
… …
397 rs[Rs_cutchars] = CUTCHARS; 484 rs[Rs_cutchars] = CUTCHARS;
398 485
399#ifndef NO_BACKSPACE_KEY 486#ifndef NO_BACKSPACE_KEY
400 if (!rs[Rs_backspace_key]) 487 if (!rs[Rs_backspace_key])
401# ifdef DEFAULT_BACKSPACE 488# ifdef DEFAULT_BACKSPACE
402 key_backspace = DEFAULT_BACKSPACE; 489 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
403# else 490# else
404 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 491 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
405# endif 492# endif
406 else
407 {
408 val = strdup (rs[Rs_backspace_key]);
409 rxvt_Str_trim (val);
410 rxvt_Str_escaped (val);
411 key_backspace = val;
412 }
413#endif 493#endif
414 494
415#ifndef NO_DELETE_KEY 495#ifndef NO_DELETE_KEY
416 if (!rs[Rs_delete_key]) 496 if (!rs[Rs_delete_key])
417# ifdef DEFAULT_DELETE 497# ifdef DEFAULT_DELETE
418 key_delete = DEFAULT_DELETE; 498 rs[Rs_delete_key] = DEFAULT_DELETE;
419# else 499# else
420 key_delete = "\033[3~"; 500 rs[Rs_delete_key] = "\033[3~";
421# endif
422 else
423 {
424 val = strdup (rs[Rs_delete_key]);
425 rxvt_Str_trim (val);
426 rxvt_Str_escaped (val);
427 key_delete = val;
428 }
429#endif 501# endif
430 if (rs[Rs_answerbackstring]) 502#endif
431 {
432 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
433 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
434 }
435 503
436#ifdef HAVE_SCROLLBARS 504#ifdef HAVE_SCROLLBARS
437 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 505 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
438#endif 506#endif
439 507
… …
463 color_aliases (Color_fg); 531 color_aliases (Color_fg);
464 color_aliases (Color_bg); 532 color_aliases (Color_bg);
465#ifndef NO_CURSORCOLOR 533#ifndef NO_CURSORCOLOR
466 color_aliases (Color_cursor); 534 color_aliases (Color_cursor);
467 color_aliases (Color_cursor2); 535 color_aliases (Color_cursor2);
468#endif /* NO_CURSORCOLOR */ 536#endif /* NO_CURSORCOLOR */
469 color_aliases (Color_pointer_fg); 537 color_aliases (Color_pointer_fg);
470 color_aliases (Color_pointer_bg); 538 color_aliases (Color_pointer_bg);
471 color_aliases (Color_border); 539 color_aliases (Color_border);
472#ifndef NO_BOLD_UNDERLINE_REVERSE 540#ifndef NO_BOLD_UNDERLINE_REVERSE
473 color_aliases (Color_BD); 541 color_aliases (Color_BD);
474 color_aliases (Color_UL); 542 color_aliases (Color_UL);
475 color_aliases (Color_RV); 543 color_aliases (Color_RV);
476#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 544#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
477 545
478 if (!rs[Rs_color + Color_border]) 546 if (!rs[Rs_color + Color_border])
479 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 547 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
480 548
481 return cmd_argv; 549 return cmd_argv;
… …
484/*----------------------------------------------------------------------*/ 552/*----------------------------------------------------------------------*/
485void 553void
486rxvt_term::init_env () 554rxvt_term::init_env ()
487{ 555{
488 int i; 556 int i;
489 unsigned int u;
490 char *val; 557 char *val;
491 558
492#ifdef DISPLAY_IS_IP 559#ifdef DISPLAY_IS_IP
493 /* Fixup display_name for export over pty to any interested terminal 560 /* Fixup display_name for export over pty to any interested terminal
494 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 561 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
502 */ 569 */
503 val = rxvt_network_display (rs[Rs_display_name]); 570 val = rxvt_network_display (rs[Rs_display_name]);
504 rs[Rs_display_name] = (const char *)val; 571 rs[Rs_display_name] = (const char *)val;
505 572
506 if (val == NULL) 573 if (val == NULL)
507#endif /* DISPLAY_IS_IP */ 574#endif /* DISPLAY_IS_IP */
508 val = XDisplayString (dpy); 575 val = XDisplayString (dpy);
509 576
510 if (rs[Rs_display_name] == NULL) 577 if (rs[Rs_display_name] == NULL)
511 rs[Rs_display_name] = val; /* use broken `:0' value */ 578 rs[Rs_display_name] = val; /* use broken `:0' value */
512 579
513 i = strlen (val); 580 i = strlen (val);
514 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 581 env_display = (char *)rxvt_malloc (i + 9);
515 582
516 sprintf (env_display, "DISPLAY=%s", val); 583 sprintf (env_display, "DISPLAY=%s", val);
517 584
518 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 585 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
519 586
… …
540 else 607 else
541 putenv ("COLORTERM=" COLORTERMENVFULL); 608 putenv ("COLORTERM=" COLORTERMENVFULL);
542 609
543 if (rs[Rs_term_name] != NULL) 610 if (rs[Rs_term_name] != NULL)
544 { 611 {
545 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 612 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
546 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 613 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
547 putenv (env_term); 614 putenv (env_term);
548 } 615 }
549 else 616 else
550 putenv ("TERM=" TERMENV); 617 putenv ("TERM=" TERMENV);
… …
552#ifdef HAVE_UNSETENV 619#ifdef HAVE_UNSETENV
553 /* avoid passing old settings and confusing term size */ 620 /* avoid passing old settings and confusing term size */
554 unsetenv ("LINES"); 621 unsetenv ("LINES");
555 unsetenv ("COLUMNS"); 622 unsetenv ("COLUMNS");
556 unsetenv ("TERMCAP"); /* terminfo should be okay */ 623 unsetenv ("TERMCAP"); /* terminfo should be okay */
557#endif /* HAVE_UNSETENV */ 624#endif /* HAVE_UNSETENV */
558} 625}
559 626
560/*----------------------------------------------------------------------*/ 627/*----------------------------------------------------------------------*/
561/* 628/*
562 * This is more or less stolen straight from XFree86 xterm. 629 * This is more or less stolen straight from XFree86 xterm.
… …
583 650
584 this->locale = "C"; 651 this->locale = "C";
585 } 652 }
586 653
587 654
588 this->locale = rxvt_strdup (this->locale); 655 this->locale = strdup (this->locale);
589 SET_LOCALE (this->locale); 656 SET_LOCALE (this->locale);
590 mbstate.reset (); 657 mbstate.reset ();
591#endif 658#endif
592 659
593#if HAVE_NL_LANGINFO 660#if HAVE_NL_LANGINFO
… …
650 priv_modes |= PrivMode_Keypress; 717 priv_modes |= PrivMode_Keypress;
651 if (!option (Opt_jumpScroll)) 718 if (!option (Opt_jumpScroll))
652 priv_modes |= PrivMode_smoothScroll; 719 priv_modes |= PrivMode_smoothScroll;
653 720
654#ifndef NO_BACKSPACE_KEY 721#ifndef NO_BACKSPACE_KEY
655 if (strcmp (key_backspace, "DEC") == 0) 722 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
656 priv_modes |= PrivMode_HaveBackSpace; 723 priv_modes |= PrivMode_HaveBackSpace;
657#endif 724#endif
658 725
659 /* add value for scrollBar */ 726 /* add value for scrollBar */
660 if (scrollBar.state) 727 if (scrollBar.state)
… …
673 int i; 740 int i;
674 741
675#ifdef OFF_FOCUS_FADING 742#ifdef OFF_FOCUS_FADING
676 pix_colors = pix_colors_focused; 743 pix_colors = pix_colors_focused;
677#endif 744#endif
678 745
679 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 746 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
680 { 747 {
681 const char *name = rs[Rs_color + i]; 748 const char *name = rs[Rs_color + i];
682 749
683 if (!name) 750 if (!name)
… …
761 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 828 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
762 cscroll.a) 829 cscroll.a)
763 )) 830 ))
764 alias_color (Color_topShadow, Color_White); 831 alias_color (Color_topShadow, Color_White);
765 } 832 }
766#endif /* KEEP_SCROLLCOLOR */ 833#endif /* KEEP_SCROLLCOLOR */
767 834
768#ifdef OFF_FOCUS_FADING 835#ifdef OFF_FOCUS_FADING
769 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 836 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
770 update_fade_color (i); 837 update_fade_color (i);
771#endif 838#endif
… …
779 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 846 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
780 { 847 {
781 int i = atoi (rs[Rs_color + idx]); 848 int i = atoi (rs[Rs_color + idx]);
782 849
783 if (i >= 8 && i <= 15) 850 if (i >= 8 && i <= 15)
784 { /* bright colors */ 851 /* bright colors */
785 i -= 8;
786 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 852 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
787 return; 853 else if (i >= 0 && i <= 7)
788 } 854 /* normal colors */
789
790 if (i >= 0 && i <= 7) /* normal colors */
791 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 855 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
792 } 856 }
793} 857}
794 858
795/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
… …
910#if ENABLE_FRILLS 974#if ENABLE_FRILLS
911 if (option (Opt_borderLess)) 975 if (option (Opt_borderLess))
912 { 976 {
913 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 977 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
914 { 978 {
915 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 979 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
916 attributes.override_redirect = true; 980 attributes.override_redirect = true;
917 mwmhints.flags = 0;
918 } 981 }
919 else 982 else
920 { 983 {
921 mwmhints.flags = MWM_HINTS_DECORATIONS; 984 mwmhints.flags = MWM_HINTS_DECORATIONS;
922 mwmhints.decorations = 0;
923 } 985 }
924 } 986 }
925 else
926 mwmhints.flags = 0;
927#endif 987#endif
928 988
929#if ENABLE_XEMBED 989#if ENABLE_XEMBED
930 if (rs[Rs_embed]) 990 if (rs[Rs_embed])
931 { 991 {
… …
1042 1102
1043 vt_select_input (); 1103 vt_select_input ();
1044 1104
1045 vt_ev.start (display, vt); 1105 vt_ev.start (display, vt);
1046 1106
1047#ifdef XPM_BACKGROUND
1048 if (rs[Rs_backgroundPixmap] != NULL)
1049 {
1050 const char *p = rs[Rs_backgroundPixmap];
1051
1052 if ((p = strchr (p, ';')) != NULL)
1053 {
1054 p++;
1055 bgPixmap.handle_geometry (p);
1056 }
1057 else
1058 bgPixmap.set_defaultGeometry ();
1059
1060 set_bgPixmap (rs[Rs_backgroundPixmap]);
1061 scr_touch (true);
1062 }
1063#endif
1064
1065 /* graphics context for the vt window */ 1107 /* graphics context for the vt window */
1066 gcvalue.foreground = pix_colors[Color_fg]; 1108 gcvalue.foreground = pix_colors[Color_fg];
1067 gcvalue.background = pix_colors[Color_bg]; 1109 gcvalue.background = pix_colors[Color_bg];
1068 gcvalue.graphics_exposures = 0; 1110 gcvalue.graphics_exposures = 0;
1069 1111
… …
1071 GCForeground | GCBackground | GCGraphicsExposures, 1113 GCForeground | GCBackground | GCGraphicsExposures,
1072 &gcvalue); 1114 &gcvalue);
1073 1115
1074 drawable = new rxvt_drawable (this, vt); 1116 drawable = new rxvt_drawable (this, vt);
1075 1117
1076#ifdef RXVT_SCROLLBAR
1077 gcvalue.foreground = pix_colors[Color_topShadow];
1078 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1079 gcvalue.foreground = pix_colors[Color_bottomShadow];
1080 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1081 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1082 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1083#endif
1084
1085#ifdef OFF_FOCUS_FADING 1118#ifdef OFF_FOCUS_FADING
1086 // initially we are in unfocused state 1119 // initially we are in unfocused state
1087 if (rs[Rs_fade]) 1120 if (rs[Rs_fade])
1088 pix_colors = pix_colors_unfocused; 1121 pix_colors = pix_colors_unfocused;
1089#endif 1122#endif
… …
1094 1127
1095/* ------------------------------------------------------------------------- * 1128/* ------------------------------------------------------------------------- *
1096 * GET TTY CURRENT STATE * 1129 * GET TTY CURRENT STATE *
1097 * ------------------------------------------------------------------------- */ 1130 * ------------------------------------------------------------------------- */
1098void 1131void
1099rxvt_get_ttymode (ttymode_t *tio, int erase) 1132rxvt_get_ttymode (struct termios *tio, int erase)
1100{ 1133{
1101 /* 1134 /*
1102 * standard System V termios interface 1135 * standard System V termios interface
1103 */ 1136 */
1104 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1137 if (tcgetattr (STDIN_FILENO, tio) < 0)
1105 { 1138 {
1106 // return error - use system defaults, 1139 // return error - use system defaults,
1107 // where possible, and zero elsewhere 1140 // where possible, and zero elsewhere
1108 memset (tio, 0, sizeof (ttymode_t)); 1141 memset (tio, 0, sizeof (struct termios));
1109 1142
1110 tio->c_cc[VINTR] = CINTR; 1143 tio->c_cc[VINTR] = CINTR;
1111 tio->c_cc[VQUIT] = CQUIT; 1144 tio->c_cc[VQUIT] = CQUIT;
1112 tio->c_cc[VERASE] = CERASE; 1145 tio->c_cc[VERASE] = CERASE;
1113#ifdef VERASE2 1146#ifdef VERASE2
… …
1177 1210
1178 /* 1211 /*
1179 * Debugging 1212 * Debugging
1180 */ 1213 */
1181#ifdef DEBUG_TTYMODE 1214#ifdef DEBUG_TTYMODE
1182#ifdef HAVE_TERMIOS_H
1183 /* c_iflag bits */ 1215 /* c_iflag bits */
1184 fprintf (stderr, "Input flags\n"); 1216 fprintf (stderr, "Input flags\n");
1185 1217
1186 /* cpp token stringize doesn't work on all machines <sigh> */ 1218 /* cpp token stringize doesn't work on all machines <sigh> */
1187# define FOO(flag,name) \ 1219# define FOO(flag,name) \
… …
1250 FOO (VLNEXT, "VLNEXT"); 1282 FOO (VLNEXT, "VLNEXT");
1251# endif 1283# endif
1252 1284
1253 fprintf (stderr, "\n"); 1285 fprintf (stderr, "\n");
1254# undef FOO 1286# undef FOO
1255# endif /* HAVE_TERMIOS_H */ 1287#endif /* DEBUG_TTYMODE */
1256#endif /* DEBUG_TTYMODE */
1257} 1288}
1258 1289
1259/*----------------------------------------------------------------------*/ 1290/*----------------------------------------------------------------------*/
1260/* 1291/*
1261 * Run the command in a subprocess and return a file descriptor for the 1292 * Run the command in a subprocess and return a file descriptor for the
… …
1285 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1316 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1286 1317
1287 int er; 1318 int er;
1288 1319
1289#ifndef NO_BACKSPACE_KEY 1320#ifndef NO_BACKSPACE_KEY
1290 if (key_backspace[0] && !key_backspace[1]) 1321 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1291 er = key_backspace[0]; 1322 er = rs[Rs_backspace_key][0];
1292 else if (strcmp (key_backspace, "DEC") == 0) 1323 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1293 er = '\177'; /* the initial state anyway */ 1324 er = '\177'; /* the initial state anyway */
1294 else 1325 else
1295#endif 1326#endif
1296 er = -1; 1327 er = -1;
1297 1328
1298 rxvt_get_ttymode (&tio, er); 1329 rxvt_get_ttymode (&tio, er);
1299 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1330 /* init terminal attributes */
1331 cfsetospeed (&tio, BAUDRATE);
1332 cfsetispeed (&tio, BAUDRATE);
1333 tcsetattr (pty->tty, TCSANOW, &tio);
1300 pty->set_utf8_mode (enc_utf8); 1334 pty->set_utf8_mode (enc_utf8);
1301 1335
1302 /* set initial window size */ 1336 /* set initial window size */
1303 tt_winch (); 1337 tt_winch ();
1304 1338
… …
1364rxvt_term::run_child (const char *const *argv) 1398rxvt_term::run_child (const char *const *argv)
1365{ 1399{
1366 char *login; 1400 char *login;
1367 1401
1368 if (option (Opt_console)) 1402 if (option (Opt_console))
1403 {
1369 { /* be virtual console, fail silently */ 1404 /* be virtual console, fail silently */
1370#ifdef TIOCCONS 1405#ifdef TIOCCONS
1371 unsigned int on = 1; 1406 unsigned int on = 1;
1372 1407
1373 ioctl (STDIN_FILENO, TIOCCONS, &on); 1408 ioctl (STDIN_FILENO, TIOCCONS, &on);
1374#elif defined (SRIOCSREDIR) 1409#elif defined (SRIOCSREDIR)
… …
1376 1411
1377 fd = open (CONSOLE, O_WRONLY, 0); 1412 fd = open (CONSOLE, O_WRONLY, 0);
1378 if (fd >= 0) 1413 if (fd >= 0)
1379 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1414 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1380 close (fd); 1415 close (fd);
1381#endif /* SRIOCSREDIR */ 1416#endif /* SRIOCSREDIR */
1382 } 1417 }
1383 1418
1384 /* reset signals and spin off the command interpreter */ 1419 /* reset signals and spin off the command interpreter */
1385 signal (SIGINT, SIG_DFL); 1420 signal (SIGINT, SIG_DFL);
1386 signal (SIGQUIT, SIG_DFL); 1421 signal (SIGQUIT, SIG_DFL);
… …
1393 */ 1428 */
1394#ifdef SIGTSTP 1429#ifdef SIGTSTP
1395 signal (SIGTSTP, SIG_IGN); 1430 signal (SIGTSTP, SIG_IGN);
1396 signal (SIGTTIN, SIG_IGN); 1431 signal (SIGTTIN, SIG_IGN);
1397 signal (SIGTTOU, SIG_IGN); 1432 signal (SIGTTOU, SIG_IGN);
1398#endif /* SIGTSTP */ 1433#endif /* SIGTSTP */
1399 1434
1400 // unblock signals (signals are blocked by iom.C 1435 // unblock signals (signals are blocked by iom.C
1401 sigset_t ss; 1436 sigset_t ss;
1402 sigemptyset (&ss); 1437 sigemptyset (&ss);
1403 sigprocmask (SIG_SETMASK, &ss, 0); 1438 sigprocmask (SIG_SETMASK, &ss, 0);
1404 1439
1405 /* command interpreter path */ 1440 /* command interpreter path */
1406 if (argv != NULL) 1441 if (argv)
1407 { 1442 {
1408# ifdef DEBUG_CMD 1443# ifdef DEBUG_CMD
1409 int i; 1444 int i;
1410 1445
1411 for (i = 0; argv[i]; i++) 1446 for (i = 0; argv[i]; i++)
… …
1420 const char *argv0, *shell; 1455 const char *argv0, *shell;
1421 1456
1422 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1457 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1423 shell = "/bin/sh"; 1458 shell = "/bin/sh";
1424 1459
1425 argv0 = (const char *)rxvt_r_basename (shell); 1460 argv0 = (const char *)rxvt_basename (shell);
1426 1461
1427 if (option (Opt_loginShell)) 1462 if (option (Opt_loginShell))
1428 { 1463 {
1429 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1464 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1430 1465
1431 login[0] = '-'; 1466 login[0] = '-';
1432 strcpy (&login[1], argv0); 1467 strcpy (&login[1], argv0);
1433 argv0 = login; 1468 argv0 = login;
1434 } 1469 }
1435 1470
1436 execlp (shell, argv0, NULL); 1471 execlp (shell, argv0, (char *)0);
1437 /* no error message: STDERR is closed! */ 1472 /* no error message: STDERR is closed! */
1438 } 1473 }
1439 1474
1440 return -1; 1475 return -1;
1441} 1476}

Diff Legend

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