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.194 by sasha, Thu Jul 26 16:17:50 2007 UTC vs.
Revision 1.235 by ayin, Sat Dec 29 12:36:56 2007 UTC

1 /*----------------------------------------------------------------------* 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>
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 TINTING 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#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
189 pixmap = None;
190#endif
191 287
192 MEvent.time = CurrentTime; 288 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 289 MEvent.button = AnyButton;
194 want_refresh = 1; 290 want_refresh = 1;
195 priv_modes = SavedModes = PrivMode_Default; 291 priv_modes = SavedModes = PrivMode_Default;
… …
197 nrow = 24; 293 nrow = 24;
198 int_bwidth = INTERNALBORDERWIDTH; 294 int_bwidth = INTERNALBORDERWIDTH;
199 ext_bwidth = EXTERNALBORDERWIDTH; 295 ext_bwidth = EXTERNALBORDERWIDTH;
200 lineSpace = LINESPACE; 296 lineSpace = LINESPACE;
201 saveLines = SAVELINES; 297 saveLines = SAVELINES;
202 numpix_colors = TOTAL_COLORS;
203 298
204 refresh_type = SLOW_REFRESH; 299 refresh_type = SLOW_REFRESH;
205 300
206 oldcursor.row = oldcursor.col = -1; 301 oldcursor.row = oldcursor.col = -1;
207#ifdef XPM_BACKGROUND
208 /* bgPixmap.w = bgPixmap.h = 0; */
209 bgPixmap.x = bgPixmap.y = 0;
210 bgPixmap.pixmap = None;
211#endif
212
213 last_bot = last_state = -1; 302 last_bot = last_state = -1;
214 303
215 set_option (Opt_scrollBar); 304 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput); 305 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll); 306 set_option (Opt_jumpScroll);
… …
219 set_option (Opt_secondaryScreen); 308 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll); 309 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs); 310 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles); 311 set_option (Opt_intensityStyles);
223 set_option (Opt_iso14755_52); 312 set_option (Opt_iso14755_52);
224
225 return true;
226} 313}
227 314
228void 315void
229rxvt_term::init_secondary () 316rxvt_term::init_secondary ()
230{ 317{
… …
237 if ((i = open ("/dev/null", O_RDONLY)) < 0) 324 if ((i = open ("/dev/null", O_RDONLY)) < 0)
238 { 325 {
239 /* TODO: BOO HISS */ 326 /* TODO: BOO HISS */
240 dup2 (STDERR_FILENO, STDIN_FILENO); 327 dup2 (STDERR_FILENO, STDIN_FILENO);
241 } 328 }
242 else if (i > STDIN_FILENO) 329 else if (i != STDIN_FILENO)
243 { 330 {
244 dup2 (i, STDIN_FILENO); 331 dup2 (i, STDIN_FILENO);
245 close (i); 332 close (i);
246 } 333 }
247 334
… …
262/*----------------------------------------------------------------------*/ 349/*----------------------------------------------------------------------*/
263const char ** 350const char **
264rxvt_term::init_resources (int argc, const char *const *argv) 351rxvt_term::init_resources (int argc, const char *const *argv)
265{ 352{
266 int i, r_argc; 353 int i, r_argc;
267 char *val;
268 const char **cmd_argv, **r_argv; 354 const char **cmd_argv, **r_argv;
269 355
270 /* 356 /*
271 * Look for -e option. Find => split and make cmd_argv[] of command args 357 * Look for -e option. Find => split and make cmd_argv[] of command args
272 */ 358 */
273 for (r_argc = 0; r_argc < argc; r_argc++) 359 for (r_argc = 0; r_argc < argc; r_argc++)
274 if (!strcmp (argv[r_argc], "-e")) 360 if (!strcmp (argv[r_argc], "-e"))
275 break; 361 break;
276 362
363 if (r_argc == argc)
364 cmd_argv = NULL;
365 else if (!argv[r_argc + 1])
366 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
367 else
368 {
369 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
370
371 for (i = 0; i < argc - r_argc - 1; i++)
372 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
373
374 cmd_argv[i] = NULL;
375 }
376
277 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 377 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
278 378
279 for (i = 0; i < r_argc; i++) 379 for (i = 0; i < r_argc; i++)
280 r_argv[i] = (const char *)argv[i]; 380 r_argv[i] = (const char *)argv[i];
281 381
282 r_argv[i] = NULL; 382 r_argv[i] = NULL;
283 383
284 if (r_argc == argc)
285 cmd_argv = NULL;
286 else
287 {
288 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
289
290 for (i = 0; i < argc - r_argc - 1; i++)
291 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
292
293 cmd_argv[i] = NULL;
294 }
295
296 rs[Rs_name] = rxvt_r_basename (argv[0]); 384 rs[Rs_name] = rxvt_basename (argv[0]);
297 385
298 /* 386 /*
299 * Open display, get options/resources and create the window 387 * Open display, get options/resources and create the window
300 */ 388 */
301 389
… …
303 rs[Rs_display_name] = ":0"; 391 rs[Rs_display_name] = ":0";
304 392
305 get_options (r_argc, r_argv); 393 get_options (r_argc, r_argv);
306 394
307 if (!(display = displays.get (rs[Rs_display_name]))) 395 if (!(display = displays.get (rs[Rs_display_name])))
396 {
397 free (r_argv);
308 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 398 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
399 }
309 400
310 // using a local pointer decreases code size a lot 401 // using a local pointer decreases code size a lot
311 xa = display->xa; 402 xa = display->xa;
312 403
313 set (display); 404 set (display);
… …
317 if (rs[Rs_depth]) 408 if (rs[Rs_depth])
318 select_visual (strtol (rs[Rs_depth], 0, 0)); 409 select_visual (strtol (rs[Rs_depth], 0, 0));
319#endif 410#endif
320 411
321#ifdef HAVE_AFTERIMAGE 412#ifdef HAVE_AFTERIMAGE
413 set_application_name ((char*)rs[Rs_name]);
414 set_output_threshold (OUTPUT_LEVEL_WARNING);
322 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 415 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
323#endif 416#endif
324 free (r_argv); 417 free (r_argv);
325 418
326 for (int i = NUM_RESOURCES; i--; ) 419 for (int i = NUM_RESOURCES; i--; )
… …
344 * set any defaults not already set 437 * set any defaults not already set
345 */ 438 */
346 if (cmd_argv && cmd_argv[0]) 439 if (cmd_argv && cmd_argv[0])
347 { 440 {
348 if (!rs[Rs_title]) 441 if (!rs[Rs_title])
349 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 442 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
350 if (!rs[Rs_iconName]) 443 if (!rs[Rs_iconName])
351 rs[Rs_iconName] = rs[Rs_title]; 444 rs[Rs_iconName] = rs[Rs_title];
352 } 445 }
353 else 446 else
354 { 447 {
… …
392 rs[Rs_cutchars] = CUTCHARS; 485 rs[Rs_cutchars] = CUTCHARS;
393 486
394#ifndef NO_BACKSPACE_KEY 487#ifndef NO_BACKSPACE_KEY
395 if (!rs[Rs_backspace_key]) 488 if (!rs[Rs_backspace_key])
396# ifdef DEFAULT_BACKSPACE 489# ifdef DEFAULT_BACKSPACE
397 key_backspace = DEFAULT_BACKSPACE; 490 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
398# else 491# else
399 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 492 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
400# endif 493# endif
401 else
402 {
403 val = strdup (rs[Rs_backspace_key]);
404 rxvt_Str_trim (val);
405 rxvt_Str_escaped (val);
406 key_backspace = val;
407 }
408#endif 494#endif
409 495
410#ifndef NO_DELETE_KEY 496#ifndef NO_DELETE_KEY
411 if (!rs[Rs_delete_key]) 497 if (!rs[Rs_delete_key])
412# ifdef DEFAULT_DELETE 498# ifdef DEFAULT_DELETE
413 key_delete = DEFAULT_DELETE; 499 rs[Rs_delete_key] = DEFAULT_DELETE;
414# else 500# else
415 key_delete = "\033[3~"; 501 rs[Rs_delete_key] = "\033[3~";
416# endif
417 else
418 {
419 val = strdup (rs[Rs_delete_key]);
420 rxvt_Str_trim (val);
421 rxvt_Str_escaped (val);
422 key_delete = val;
423 }
424#endif 502# endif
425 if (rs[Rs_answerbackstring]) 503#endif
426 {
427 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
428 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
429 }
430 504
431#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
432 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 506 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
433#endif 507#endif
434 508
… …
458 color_aliases (Color_fg); 532 color_aliases (Color_fg);
459 color_aliases (Color_bg); 533 color_aliases (Color_bg);
460#ifndef NO_CURSORCOLOR 534#ifndef NO_CURSORCOLOR
461 color_aliases (Color_cursor); 535 color_aliases (Color_cursor);
462 color_aliases (Color_cursor2); 536 color_aliases (Color_cursor2);
463#endif /* NO_CURSORCOLOR */ 537#endif /* NO_CURSORCOLOR */
464 color_aliases (Color_pointer_fg); 538 color_aliases (Color_pointer_fg);
465 color_aliases (Color_pointer_bg); 539 color_aliases (Color_pointer_bg);
466 color_aliases (Color_border); 540 color_aliases (Color_border);
467#ifndef NO_BOLD_UNDERLINE_REVERSE 541#ifndef NO_BOLD_UNDERLINE_REVERSE
468 color_aliases (Color_BD); 542 color_aliases (Color_BD);
469 color_aliases (Color_UL); 543 color_aliases (Color_UL);
470 color_aliases (Color_RV); 544 color_aliases (Color_RV);
471#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 545#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
472 546
473 if (!rs[Rs_color + Color_border]) 547 if (!rs[Rs_color + Color_border])
474 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 548 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
475 549
476 return cmd_argv; 550 return cmd_argv;
… …
479/*----------------------------------------------------------------------*/ 553/*----------------------------------------------------------------------*/
480void 554void
481rxvt_term::init_env () 555rxvt_term::init_env ()
482{ 556{
483 int i; 557 int i;
484 unsigned int u;
485 char *val; 558 char *val;
486 559
487#ifdef DISPLAY_IS_IP 560#ifdef DISPLAY_IS_IP
488 /* Fixup display_name for export over pty to any interested terminal 561 /* Fixup display_name for export over pty to any interested terminal
489 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 562 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
497 */ 570 */
498 val = rxvt_network_display (rs[Rs_display_name]); 571 val = rxvt_network_display (rs[Rs_display_name]);
499 rs[Rs_display_name] = (const char *)val; 572 rs[Rs_display_name] = (const char *)val;
500 573
501 if (val == NULL) 574 if (val == NULL)
502#endif /* DISPLAY_IS_IP */ 575#endif /* DISPLAY_IS_IP */
503 val = XDisplayString (dpy); 576 val = XDisplayString (dpy);
504 577
505 if (rs[Rs_display_name] == NULL) 578 if (rs[Rs_display_name] == NULL)
506 rs[Rs_display_name] = val; /* use broken `:0' value */ 579 rs[Rs_display_name] = val; /* use broken `:0' value */
507 580
508 i = strlen (val); 581 i = strlen (val);
509 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 582 env_display = (char *)rxvt_malloc (i + 9);
510 583
511 sprintf (env_display, "DISPLAY=%s", val); 584 sprintf (env_display, "DISPLAY=%s", val);
512 585
513 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 586 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
514 587
… …
535 else 608 else
536 putenv ("COLORTERM=" COLORTERMENVFULL); 609 putenv ("COLORTERM=" COLORTERMENVFULL);
537 610
538 if (rs[Rs_term_name] != NULL) 611 if (rs[Rs_term_name] != NULL)
539 { 612 {
540 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 613 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
541 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 614 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
542 putenv (env_term); 615 putenv (env_term);
543 } 616 }
544 else 617 else
545 putenv ("TERM=" TERMENV); 618 putenv ("TERM=" TERMENV);
… …
547#ifdef HAVE_UNSETENV 620#ifdef HAVE_UNSETENV
548 /* avoid passing old settings and confusing term size */ 621 /* avoid passing old settings and confusing term size */
549 unsetenv ("LINES"); 622 unsetenv ("LINES");
550 unsetenv ("COLUMNS"); 623 unsetenv ("COLUMNS");
551 unsetenv ("TERMCAP"); /* terminfo should be okay */ 624 unsetenv ("TERMCAP"); /* terminfo should be okay */
552#endif /* HAVE_UNSETENV */ 625#endif /* HAVE_UNSETENV */
553} 626}
554 627
555/*----------------------------------------------------------------------*/ 628/*----------------------------------------------------------------------*/
556/* 629/*
557 * This is more or less stolen straight from XFree86 xterm. 630 * This is more or less stolen straight from XFree86 xterm.
… …
578 651
579 this->locale = "C"; 652 this->locale = "C";
580 } 653 }
581 654
582 655
583 this->locale = rxvt_strdup (this->locale); 656 this->locale = strdup (this->locale);
584 SET_LOCALE (this->locale); 657 SET_LOCALE (this->locale);
585 mbstate.reset (); 658 mbstate.reset ();
586#endif 659#endif
587 660
588#if HAVE_NL_LANGINFO 661#if HAVE_NL_LANGINFO
… …
645 priv_modes |= PrivMode_Keypress; 718 priv_modes |= PrivMode_Keypress;
646 if (!option (Opt_jumpScroll)) 719 if (!option (Opt_jumpScroll))
647 priv_modes |= PrivMode_smoothScroll; 720 priv_modes |= PrivMode_smoothScroll;
648 721
649#ifndef NO_BACKSPACE_KEY 722#ifndef NO_BACKSPACE_KEY
650 if (strcmp (key_backspace, "DEC") == 0) 723 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
651 priv_modes |= PrivMode_HaveBackSpace; 724 priv_modes |= PrivMode_HaveBackSpace;
652#endif 725#endif
653 726
654 /* add value for scrollBar */ 727 /* add value for scrollBar */
655 if (scrollBar.state) 728 if (scrollBar.state)
… …
668 int i; 741 int i;
669 742
670#ifdef OFF_FOCUS_FADING 743#ifdef OFF_FOCUS_FADING
671 pix_colors = pix_colors_focused; 744 pix_colors = pix_colors_focused;
672#endif 745#endif
673 746
674 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 747 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
675 { 748 {
676 const char *name = rs[Rs_color + i]; 749 const char *name = rs[Rs_color + i];
677 750
678 if (!name) 751 if (!name)
… …
756 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 829 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
757 cscroll.a) 830 cscroll.a)
758 )) 831 ))
759 alias_color (Color_topShadow, Color_White); 832 alias_color (Color_topShadow, Color_White);
760 } 833 }
761#endif /* KEEP_SCROLLCOLOR */ 834#endif /* KEEP_SCROLLCOLOR */
762 835
763#ifdef OFF_FOCUS_FADING 836#ifdef OFF_FOCUS_FADING
764 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 837 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
765 update_fade_color (i); 838 update_fade_color (i);
766#endif 839#endif
… …
774 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 847 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
775 { 848 {
776 int i = atoi (rs[Rs_color + idx]); 849 int i = atoi (rs[Rs_color + idx]);
777 850
778 if (i >= 8 && i <= 15) 851 if (i >= 8 && i <= 15)
779 { /* bright colors */ 852 /* bright colors */
780 i -= 8;
781 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 853 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
782 return; 854 else if (i >= 0 && i <= 7)
783 } 855 /* normal colors */
784
785 if (i >= 0 && i <= 7) /* normal colors */
786 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 856 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
787 } 857 }
788} 858}
789 859
790/*----------------------------------------------------------------------*/ 860/*----------------------------------------------------------------------*/
… …
882rxvt_term::create_windows (int argc, const char *const *argv) 952rxvt_term::create_windows (int argc, const char *const *argv)
883{ 953{
884 XClassHint classHint; 954 XClassHint classHint;
885 XWMHints wmHint; 955 XWMHints wmHint;
886#if ENABLE_FRILLS 956#if ENABLE_FRILLS
887 MWMHints mwmhints; 957 MWMHints mwmhints = { };
888#endif 958#endif
889 XGCValues gcvalue; 959 XGCValues gcvalue;
890 XSetWindowAttributes attributes; 960 XSetWindowAttributes attributes;
891 Window top, parent; 961 Window top, parent;
892 962
… …
905#if ENABLE_FRILLS 975#if ENABLE_FRILLS
906 if (option (Opt_borderLess)) 976 if (option (Opt_borderLess))
907 { 977 {
908 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 978 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
909 { 979 {
910 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 980 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
911 attributes.override_redirect = true; 981 attributes.override_redirect = true;
912 mwmhints.flags = 0;
913 } 982 }
914 else 983 else
915 { 984 {
916 mwmhints.flags = MWM_HINTS_DECORATIONS; 985 mwmhints.flags = MWM_HINTS_DECORATIONS;
917 mwmhints.decorations = 0;
918 } 986 }
919 } 987 }
920 else
921 mwmhints.flags = 0;
922#endif 988#endif
923 989
924#if ENABLE_XEMBED 990#if ENABLE_XEMBED
925 if (rs[Rs_embed]) 991 if (rs[Rs_embed])
926 { 992 {
… …
1037 1103
1038 vt_select_input (); 1104 vt_select_input ();
1039 1105
1040 vt_ev.start (display, vt); 1106 vt_ev.start (display, vt);
1041 1107
1042#ifdef XPM_BACKGROUND
1043 if (rs[Rs_backgroundPixmap] != NULL
1044#ifndef HAVE_AFTERIMAGE
1045 && !option (Opt_transparent)
1046#endif
1047 )
1048 {
1049 const char *p = rs[Rs_backgroundPixmap];
1050
1051 if ((p = strchr (p, ';')) != NULL)
1052 {
1053 p++;
1054 scale_pixmap (p);
1055 }
1056
1057 set_bgPixmap (rs[Rs_backgroundPixmap]);
1058 scr_touch (true);
1059 }
1060#endif
1061
1062 /* graphics context for the vt window */ 1108 /* graphics context for the vt window */
1063 gcvalue.foreground = pix_colors[Color_fg]; 1109 gcvalue.foreground = pix_colors[Color_fg];
1064 gcvalue.background = pix_colors[Color_bg]; 1110 gcvalue.background = pix_colors[Color_bg];
1065 gcvalue.graphics_exposures = 0; 1111 gcvalue.graphics_exposures = 0;
1066 1112
… …
1091 1137
1092/* ------------------------------------------------------------------------- * 1138/* ------------------------------------------------------------------------- *
1093 * GET TTY CURRENT STATE * 1139 * GET TTY CURRENT STATE *
1094 * ------------------------------------------------------------------------- */ 1140 * ------------------------------------------------------------------------- */
1095void 1141void
1096rxvt_get_ttymode (ttymode_t *tio, int erase) 1142rxvt_get_ttymode (struct termios *tio, int erase)
1097{ 1143{
1098 /* 1144 /*
1099 * standard System V termios interface 1145 * standard System V termios interface
1100 */ 1146 */
1101 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1147 if (tcgetattr (STDIN_FILENO, tio) < 0)
1102 { 1148 {
1103 // return error - use system defaults, 1149 // return error - use system defaults,
1104 // where possible, and zero elsewhere 1150 // where possible, and zero elsewhere
1105 memset (tio, 0, sizeof (ttymode_t)); 1151 memset (tio, 0, sizeof (struct termios));
1106 1152
1107 tio->c_cc[VINTR] = CINTR; 1153 tio->c_cc[VINTR] = CINTR;
1108 tio->c_cc[VQUIT] = CQUIT; 1154 tio->c_cc[VQUIT] = CQUIT;
1109 tio->c_cc[VERASE] = CERASE; 1155 tio->c_cc[VERASE] = CERASE;
1110#ifdef VERASE2 1156#ifdef VERASE2
… …
1174 1220
1175 /* 1221 /*
1176 * Debugging 1222 * Debugging
1177 */ 1223 */
1178#ifdef DEBUG_TTYMODE 1224#ifdef DEBUG_TTYMODE
1179#ifdef HAVE_TERMIOS_H
1180 /* c_iflag bits */ 1225 /* c_iflag bits */
1181 fprintf (stderr, "Input flags\n"); 1226 fprintf (stderr, "Input flags\n");
1182 1227
1183 /* cpp token stringize doesn't work on all machines <sigh> */ 1228 /* cpp token stringize doesn't work on all machines <sigh> */
1184# define FOO(flag,name) \ 1229# define FOO(flag,name) \
… …
1247 FOO (VLNEXT, "VLNEXT"); 1292 FOO (VLNEXT, "VLNEXT");
1248# endif 1293# endif
1249 1294
1250 fprintf (stderr, "\n"); 1295 fprintf (stderr, "\n");
1251# undef FOO 1296# undef FOO
1252# endif /* HAVE_TERMIOS_H */ 1297#endif /* DEBUG_TTYMODE */
1253#endif /* DEBUG_TTYMODE */
1254} 1298}
1255 1299
1256/*----------------------------------------------------------------------*/ 1300/*----------------------------------------------------------------------*/
1257/* 1301/*
1258 * Run the command in a subprocess and return a file descriptor for the 1302 * Run the command in a subprocess and return a file descriptor for the
… …
1282 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1326 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1283 1327
1284 int er; 1328 int er;
1285 1329
1286#ifndef NO_BACKSPACE_KEY 1330#ifndef NO_BACKSPACE_KEY
1287 if (key_backspace[0] && !key_backspace[1]) 1331 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1288 er = key_backspace[0]; 1332 er = rs[Rs_backspace_key][0];
1289 else if (strcmp (key_backspace, "DEC") == 0) 1333 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1290 er = '\177'; /* the initial state anyway */ 1334 er = '\177'; /* the initial state anyway */
1291 else 1335 else
1292#endif 1336#endif
1293 er = -1; 1337 er = -1;
1294 1338
1295 rxvt_get_ttymode (&tio, er); 1339 rxvt_get_ttymode (&tio, er);
1296 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ 1340 /* init terminal attributes */
1341 cfsetospeed (&tio, BAUDRATE);
1342 cfsetispeed (&tio, BAUDRATE);
1343 tcsetattr (pty->tty, TCSANOW, &tio);
1297 pty->set_utf8_mode (enc_utf8); 1344 pty->set_utf8_mode (enc_utf8);
1298 1345
1299 /* set initial window size */ 1346 /* set initial window size */
1300 tt_winch (); 1347 tt_winch ();
1301 1348
… …
1361rxvt_term::run_child (const char *const *argv) 1408rxvt_term::run_child (const char *const *argv)
1362{ 1409{
1363 char *login; 1410 char *login;
1364 1411
1365 if (option (Opt_console)) 1412 if (option (Opt_console))
1413 {
1366 { /* be virtual console, fail silently */ 1414 /* be virtual console, fail silently */
1367#ifdef TIOCCONS 1415#ifdef TIOCCONS
1368 unsigned int on = 1; 1416 unsigned int on = 1;
1369 1417
1370 ioctl (STDIN_FILENO, TIOCCONS, &on); 1418 ioctl (STDIN_FILENO, TIOCCONS, &on);
1371#elif defined (SRIOCSREDIR) 1419#elif defined (SRIOCSREDIR)
… …
1373 1421
1374 fd = open (CONSOLE, O_WRONLY, 0); 1422 fd = open (CONSOLE, O_WRONLY, 0);
1375 if (fd >= 0) 1423 if (fd >= 0)
1376 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1424 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1377 close (fd); 1425 close (fd);
1378#endif /* SRIOCSREDIR */ 1426#endif /* SRIOCSREDIR */
1379 } 1427 }
1380 1428
1381 /* reset signals and spin off the command interpreter */ 1429 /* reset signals and spin off the command interpreter */
1382 signal (SIGINT, SIG_DFL); 1430 signal (SIGINT, SIG_DFL);
1383 signal (SIGQUIT, SIG_DFL); 1431 signal (SIGQUIT, SIG_DFL);
… …
1390 */ 1438 */
1391#ifdef SIGTSTP 1439#ifdef SIGTSTP
1392 signal (SIGTSTP, SIG_IGN); 1440 signal (SIGTSTP, SIG_IGN);
1393 signal (SIGTTIN, SIG_IGN); 1441 signal (SIGTTIN, SIG_IGN);
1394 signal (SIGTTOU, SIG_IGN); 1442 signal (SIGTTOU, SIG_IGN);
1395#endif /* SIGTSTP */ 1443#endif /* SIGTSTP */
1396 1444
1397 // unblock signals (signals are blocked by iom.C 1445 // unblock signals (signals are blocked by iom.C
1398 sigset_t ss; 1446 sigset_t ss;
1399 sigemptyset (&ss); 1447 sigemptyset (&ss);
1400 sigprocmask (SIG_SETMASK, &ss, 0); 1448 sigprocmask (SIG_SETMASK, &ss, 0);
1401 1449
1402 /* command interpreter path */ 1450 /* command interpreter path */
1403 if (argv != NULL) 1451 if (argv)
1404 { 1452 {
1405# ifdef DEBUG_CMD 1453# ifdef DEBUG_CMD
1406 int i; 1454 int i;
1407 1455
1408 for (i = 0; argv[i]; i++) 1456 for (i = 0; argv[i]; i++)
… …
1417 const char *argv0, *shell; 1465 const char *argv0, *shell;
1418 1466
1419 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1467 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1420 shell = "/bin/sh"; 1468 shell = "/bin/sh";
1421 1469
1422 argv0 = (const char *)rxvt_r_basename (shell); 1470 argv0 = (const char *)rxvt_basename (shell);
1423 1471
1424 if (option (Opt_loginShell)) 1472 if (option (Opt_loginShell))
1425 { 1473 {
1426 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1474 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1427 1475
1428 login[0] = '-'; 1476 login[0] = '-';
1429 strcpy (&login[1], argv0); 1477 strcpy (&login[1], argv0);
1430 argv0 = login; 1478 argv0 = login;
1431 } 1479 }
1432 1480
1433 execlp (shell, argv0, NULL); 1481 execlp (shell, argv0, (char *)0);
1434 /* no error message: STDERR is closed! */ 1482 /* no error message: STDERR is closed! */
1435 } 1483 }
1436 1484
1437 return -1; 1485 return -1;
1438} 1486}

Diff Legend

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