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.180 by ayin, Fri Feb 16 21:46:05 2007 UTC vs.
Revision 1.231 by ayin, Tue Dec 18 12:04:50 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 */
48 "rgb:00/00/00", // 0: black (Black) 152 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 153 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 154 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (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 = //
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
192 MEvent.time = CurrentTime; 292 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 293 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 294 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 295 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 296 ncol = 80;
198 nrow = 24; 297 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 298 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 299 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 300 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 301 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS;
204 302
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 303 refresh_type = SLOW_REFRESH;
207 304
208 oldcursor.row = oldcursor.col = -1; 305 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 0;
212 bgPixmap.pixmap = None;
213#endif
214
215 last_bot = last_state = -1; 306 last_bot = last_state = -1;
216 307
217 return true; 308 set_option (Opt_scrollBar);
309 set_option (Opt_scrollTtyOutput);
310 set_option (Opt_jumpScroll);
311 set_option (Opt_skipScroll);
312 set_option (Opt_secondaryScreen);
313 set_option (Opt_secondaryScroll);
314 set_option (Opt_pastableTabs);
315 set_option (Opt_intensityStyles);
316 set_option (Opt_iso14755_52);
218} 317}
219 318
220void 319void
221rxvt_term::init_secondary () 320rxvt_term::init_secondary ()
222{ 321{
… …
229 if ((i = open ("/dev/null", O_RDONLY)) < 0) 328 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 { 329 {
231 /* TODO: BOO HISS */ 330 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO); 331 dup2 (STDERR_FILENO, STDIN_FILENO);
233 } 332 }
234 else if (i > STDIN_FILENO) 333 else if (i != STDIN_FILENO)
235 { 334 {
236 dup2 (i, STDIN_FILENO); 335 dup2 (i, STDIN_FILENO);
237 close (i); 336 close (i);
238 } 337 }
239 338
… …
254/*----------------------------------------------------------------------*/ 353/*----------------------------------------------------------------------*/
255const char ** 354const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 355rxvt_term::init_resources (int argc, const char *const *argv)
257{ 356{
258 int i, r_argc; 357 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 358 const char **cmd_argv, **r_argv;
261 359
262 /* 360 /*
263 * Look for -e option. Find => split and make cmd_argv[] of command args 361 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 362 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 363 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e")) 364 if (!strcmp (argv[r_argc], "-e"))
267 break; 365 break;
268 366
367 if (r_argc == argc)
368 cmd_argv = NULL;
369 else if (!argv[r_argc + 1])
370 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
371 else
372 {
373 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
374
375 for (i = 0; i < argc - r_argc - 1; i++)
376 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
377
378 cmd_argv[i] = NULL;
379 }
380
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 381 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 382
271 for (i = 0; i < r_argc; i++) 383 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 384 r_argv[i] = (const char *)argv[i];
273 385
274 r_argv[i] = NULL; 386 r_argv[i] = NULL;
275 387
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]); 388 rs[Rs_name] = rxvt_basename (argv[0]);
289 389
290 /* 390 /*
291 * Open display, get options/resources and create the window 391 * Open display, get options/resources and create the window
292 */ 392 */
293 393
… …
295 rs[Rs_display_name] = ":0"; 395 rs[Rs_display_name] = ":0";
296 396
297 get_options (r_argc, r_argv); 397 get_options (r_argc, r_argv);
298 398
299 if (!(display = displays.get (rs[Rs_display_name]))) 399 if (!(display = displays.get (rs[Rs_display_name])))
400 {
401 free (r_argv);
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 402 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
403 }
301 404
302 // using a local pointer decreases code size a lot 405 // using a local pointer decreases code size a lot
303 xa = display->xa; 406 xa = display->xa;
304 407
305 set (display); 408 set (display);
… …
308#if XFT 411#if XFT
309 if (rs[Rs_depth]) 412 if (rs[Rs_depth])
310 select_visual (strtol (rs[Rs_depth], 0, 0)); 413 select_visual (strtol (rs[Rs_depth], 0, 0));
311#endif 414#endif
312 415
416#ifdef HAVE_AFTERIMAGE
417 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
418#endif
313 free (r_argv); 419 free (r_argv);
314 420
315 for (int i = NUM_RESOURCES; i--; ) 421 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef) 422 if (rs [i] == resval_undef)
317 rs [i] = 0; 423 rs [i] = 0;
… …
333 * set any defaults not already set 439 * set any defaults not already set
334 */ 440 */
335 if (cmd_argv && cmd_argv[0]) 441 if (cmd_argv && cmd_argv[0])
336 { 442 {
337 if (!rs[Rs_title]) 443 if (!rs[Rs_title])
338 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 444 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
339 if (!rs[Rs_iconName]) 445 if (!rs[Rs_iconName])
340 rs[Rs_iconName] = rs[Rs_title]; 446 rs[Rs_iconName] = rs[Rs_title];
341 } 447 }
342 else 448 else
343 { 449 {
… …
381 rs[Rs_cutchars] = CUTCHARS; 487 rs[Rs_cutchars] = CUTCHARS;
382 488
383#ifndef NO_BACKSPACE_KEY 489#ifndef NO_BACKSPACE_KEY
384 if (!rs[Rs_backspace_key]) 490 if (!rs[Rs_backspace_key])
385# ifdef DEFAULT_BACKSPACE 491# ifdef DEFAULT_BACKSPACE
386 key_backspace = DEFAULT_BACKSPACE; 492 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
387# else 493# else
388 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 494 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
389# endif 495# endif
390 else
391 {
392 val = strdup (rs[Rs_backspace_key]);
393 rxvt_Str_trim (val);
394 rxvt_Str_escaped (val);
395 key_backspace = val;
396 }
397#endif 496#endif
398 497
399#ifndef NO_DELETE_KEY 498#ifndef NO_DELETE_KEY
400 if (!rs[Rs_delete_key]) 499 if (!rs[Rs_delete_key])
401# ifdef DEFAULT_DELETE 500# ifdef DEFAULT_DELETE
402 key_delete = DEFAULT_DELETE; 501 rs[Rs_delete_key] = DEFAULT_DELETE;
403# else 502# else
404 key_delete = "\033[3~"; 503 rs[Rs_delete_key] = "\033[3~";
405# endif
406 else
407 {
408 val = strdup (rs[Rs_delete_key]);
409 rxvt_Str_trim (val);
410 rxvt_Str_escaped (val);
411 key_delete = val;
412 }
413#endif 504# endif
414 if (rs[Rs_answerbackstring]) 505#endif
415 {
416 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
417 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
418 }
419 506
420#ifdef HAVE_SCROLLBARS 507#ifdef HAVE_SCROLLBARS
421 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 508 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
422#endif 509#endif
423 510
424#ifdef XTERM_REVERSE_VIDEO 511#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 512 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 513 if (option (Opt_reverseVideo))
427 { 514 {
428 if (!rs[Rs_color + Color_fg]) 515 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 516 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 517
431 if (!rs[Rs_color + Color_bg]) 518 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 524 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 525 rs[Rs_color + i] = def_colorName[i];
439 526
440#ifndef XTERM_REVERSE_VIDEO 527#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 528 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 529 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 530 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 531#endif
445 532
446 /* convenient aliases for setting fg/bg to colors */ 533 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 534 color_aliases (Color_fg);
448 color_aliases (Color_bg); 535 color_aliases (Color_bg);
449#ifndef NO_CURSORCOLOR 536#ifndef NO_CURSORCOLOR
450 color_aliases (Color_cursor); 537 color_aliases (Color_cursor);
451 color_aliases (Color_cursor2); 538 color_aliases (Color_cursor2);
452#endif /* NO_CURSORCOLOR */ 539#endif /* NO_CURSORCOLOR */
453 color_aliases (Color_pointer_fg); 540 color_aliases (Color_pointer_fg);
454 color_aliases (Color_pointer_bg); 541 color_aliases (Color_pointer_bg);
455 color_aliases (Color_border); 542 color_aliases (Color_border);
456#ifndef NO_BOLD_UNDERLINE_REVERSE 543#ifndef NO_BOLD_UNDERLINE_REVERSE
457 color_aliases (Color_BD); 544 color_aliases (Color_BD);
458 color_aliases (Color_UL); 545 color_aliases (Color_UL);
459 color_aliases (Color_RV); 546 color_aliases (Color_RV);
460#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 547#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
461 548
462 if (!rs[Rs_color + Color_border]) 549 if (!rs[Rs_color + Color_border])
463 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 550 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
464 551
465 return cmd_argv; 552 return cmd_argv;
… …
468/*----------------------------------------------------------------------*/ 555/*----------------------------------------------------------------------*/
469void 556void
470rxvt_term::init_env () 557rxvt_term::init_env ()
471{ 558{
472 int i; 559 int i;
473 unsigned int u;
474 char *val; 560 char *val;
475 561
476#ifdef DISPLAY_IS_IP 562#ifdef DISPLAY_IS_IP
477 /* Fixup display_name for export over pty to any interested terminal 563 /* Fixup display_name for export over pty to any interested terminal
478 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 564 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
486 */ 572 */
487 val = rxvt_network_display (rs[Rs_display_name]); 573 val = rxvt_network_display (rs[Rs_display_name]);
488 rs[Rs_display_name] = (const char *)val; 574 rs[Rs_display_name] = (const char *)val;
489 575
490 if (val == NULL) 576 if (val == NULL)
491#endif /* DISPLAY_IS_IP */ 577#endif /* DISPLAY_IS_IP */
492 val = XDisplayString (dpy); 578 val = XDisplayString (dpy);
493 579
494 if (rs[Rs_display_name] == NULL) 580 if (rs[Rs_display_name] == NULL)
495 rs[Rs_display_name] = val; /* use broken `:0' value */ 581 rs[Rs_display_name] = val; /* use broken `:0' value */
496 582
497 i = strlen (val); 583 i = strlen (val);
498 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 584 env_display = (char *)rxvt_malloc (i + 9);
499 585
500 sprintf (env_display, "DISPLAY=%s", val); 586 sprintf (env_display, "DISPLAY=%s", val);
501 587
502 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 588 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
503 589
… …
524 else 610 else
525 putenv ("COLORTERM=" COLORTERMENVFULL); 611 putenv ("COLORTERM=" COLORTERMENVFULL);
526 612
527 if (rs[Rs_term_name] != NULL) 613 if (rs[Rs_term_name] != NULL)
528 { 614 {
529 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 615 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
530 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 616 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
531 putenv (env_term); 617 putenv (env_term);
532 } 618 }
533 else 619 else
534 putenv ("TERM=" TERMENV); 620 putenv ("TERM=" TERMENV);
… …
536#ifdef HAVE_UNSETENV 622#ifdef HAVE_UNSETENV
537 /* avoid passing old settings and confusing term size */ 623 /* avoid passing old settings and confusing term size */
538 unsetenv ("LINES"); 624 unsetenv ("LINES");
539 unsetenv ("COLUMNS"); 625 unsetenv ("COLUMNS");
540 unsetenv ("TERMCAP"); /* terminfo should be okay */ 626 unsetenv ("TERMCAP"); /* terminfo should be okay */
541#endif /* HAVE_UNSETENV */ 627#endif /* HAVE_UNSETENV */
542} 628}
543 629
544/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
545/* 631/*
546 * This is more or less stolen straight from XFree86 xterm. 632 * This is more or less stolen straight from XFree86 xterm.
… …
567 653
568 this->locale = "C"; 654 this->locale = "C";
569 } 655 }
570 656
571 657
572 this->locale = rxvt_strdup (this->locale); 658 this->locale = strdup (this->locale);
573 SET_LOCALE (this->locale); 659 SET_LOCALE (this->locale);
574 mbstate.reset (); 660 mbstate.reset ();
575#endif 661#endif
576 662
577#if HAVE_NL_LANGINFO 663#if HAVE_NL_LANGINFO
… …
621 * Initialize the command connection. 707 * Initialize the command connection.
622 * This should be called after the X server connection is established. 708 * This should be called after the X server connection is established.
623 */ 709 */
624 710
625#ifdef META8_OPTION 711#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 712 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 713#endif
628 714
629 get_ourmods (); 715 get_ourmods ();
630 716
631 if (!OPTION (Opt_scrollTtyOutput)) 717 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 718 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 719 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 720 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 721 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 722 priv_modes |= PrivMode_smoothScroll;
637 723
638#ifndef NO_BACKSPACE_KEY 724#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 725 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 726 priv_modes |= PrivMode_HaveBackSpace;
641#endif 727#endif
642 728
643 /* add value for scrollBar */ 729 /* add value for scrollBar */
644 if (scrollBar.state) 730 if (scrollBar.state)
… …
657 int i; 743 int i;
658 744
659#ifdef OFF_FOCUS_FADING 745#ifdef OFF_FOCUS_FADING
660 pix_colors = pix_colors_focused; 746 pix_colors = pix_colors_focused;
661#endif 747#endif
662 748
663 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 749 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
664 { 750 {
665 const char *name = rs[Rs_color + i]; 751 const char *name = rs[Rs_color + i];
666 752
667 if (!name) 753 if (!name)
… …
670 rxvt_color xcol; 756 rxvt_color xcol;
671 757
672 if (!set_color (xcol, name)) 758 if (!set_color (xcol, name))
673 { 759 {
674#ifndef XTERM_REVERSE_VIDEO 760#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo)) 761 if (i < 2 && option (Opt_reverseVideo))
676 name = def_colorName [1 - i]; 762 name = def_colorName [1 - i];
677 else 763 else
678#endif 764#endif
679 name = def_colorName [i]; 765 name = def_colorName [i];
680 766
… …
745 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 831 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
746 cscroll.a) 832 cscroll.a)
747 )) 833 ))
748 alias_color (Color_topShadow, Color_White); 834 alias_color (Color_topShadow, Color_White);
749 } 835 }
750#endif /* KEEP_SCROLLCOLOR */ 836#endif /* KEEP_SCROLLCOLOR */
751 837
752#ifdef OFF_FOCUS_FADING 838#ifdef OFF_FOCUS_FADING
753 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 839 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
754 update_fade_color (i); 840 update_fade_color (i);
755#endif 841#endif
… …
763 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 849 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
764 { 850 {
765 int i = atoi (rs[Rs_color + idx]); 851 int i = atoi (rs[Rs_color + idx]);
766 852
767 if (i >= 8 && i <= 15) 853 if (i >= 8 && i <= 15)
768 { /* bright colors */ 854 /* bright colors */
769 i -= 8;
770 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 855 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
771 return; 856 else if (i >= 0 && i <= 7)
772 } 857 /* normal colors */
773
774 if (i >= 0 && i <= 7) /* normal colors */
775 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 858 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
776 } 859 }
777} 860}
778 861
779/*----------------------------------------------------------------------*/ 862/*----------------------------------------------------------------------*/
… …
871rxvt_term::create_windows (int argc, const char *const *argv) 954rxvt_term::create_windows (int argc, const char *const *argv)
872{ 955{
873 XClassHint classHint; 956 XClassHint classHint;
874 XWMHints wmHint; 957 XWMHints wmHint;
875#if ENABLE_FRILLS 958#if ENABLE_FRILLS
876 MWMHints mwmhints; 959 MWMHints mwmhints = { };
877#endif 960#endif
878 XGCValues gcvalue; 961 XGCValues gcvalue;
879 XSetWindowAttributes attributes; 962 XSetWindowAttributes attributes;
880 Window top, parent; 963 Window top, parent;
881 964
… …
887 if (!set_fonts ()) 970 if (!set_fonts ())
888 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 971 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
889 972
890 parent = display->root; 973 parent = display->root;
891 974
892 attributes.override_redirect = !!OPTION (Opt_override_redirect); 975 attributes.override_redirect = !!option (Opt_override_redirect);
893 976
894#if ENABLE_FRILLS 977#if ENABLE_FRILLS
895 if (OPTION (Opt_borderLess)) 978 if (option (Opt_borderLess))
896 { 979 {
897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 980 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
898 { 981 {
899 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 982 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
900 attributes.override_redirect = true; 983 attributes.override_redirect = true;
901 mwmhints.flags = 0;
902 } 984 }
903 else 985 else
904 { 986 {
905 mwmhints.flags = MWM_HINTS_DECORATIONS; 987 mwmhints.flags = MWM_HINTS_DECORATIONS;
906 mwmhints.decorations = 0;
907 } 988 }
908 } 989 }
909 else
910 mwmhints.flags = 0;
911#endif 990#endif
912 991
913#if ENABLE_XEMBED 992#if ENABLE_XEMBED
914 if (rs[Rs_embed]) 993 if (rs[Rs_embed])
915 { 994 {
… …
950 classHint.res_name = (char *)rs[Rs_name]; 1029 classHint.res_name = (char *)rs[Rs_name];
951 classHint.res_class = (char *)RESCLASS; 1030 classHint.res_class = (char *)RESCLASS;
952 1031
953 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1032 wmHint.flags = InputHint | StateHint | WindowGroupHint;
954 wmHint.input = True; 1033 wmHint.input = True;
955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1034 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
956 wmHint.window_group = top; 1035 wmHint.window_group = top;
957 1036
958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1037 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
959 &szHint, &wmHint, &classHint); 1038 &szHint, &wmHint, &classHint);
960 1039
… …
1017 attributes.bit_gravity = NorthWestGravity; 1096 attributes.bit_gravity = NorthWestGravity;
1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1097 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1019 1098
1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1099 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1021 1100
1022 if (OPTION (Opt_pointerBlank)) 1101 if (option (Opt_pointerBlank))
1023 vt_emask |= PointerMotionMask; 1102 vt_emask |= PointerMotionMask;
1024 else 1103 else
1025 vt_emask |= Button1MotionMask | Button3MotionMask; 1104 vt_emask |= Button1MotionMask | Button3MotionMask;
1026 1105
1027 vt_select_input (); 1106 vt_select_input ();
1028 1107
1029 vt_ev.start (display, vt); 1108 vt_ev.start (display, vt);
1030
1031#ifdef XPM_BACKGROUND
1032 if (rs[Rs_backgroundPixmap] != NULL
1033 && !OPTION (Opt_transparent))
1034 {
1035 const char *p = rs[Rs_backgroundPixmap];
1036
1037 if ((p = strchr (p, ';')) != NULL)
1038 {
1039 p++;
1040 scale_pixmap (p);
1041 }
1042
1043 set_bgPixmap (rs[Rs_backgroundPixmap]);
1044 scr_touch (true);
1045 }
1046#endif
1047 1109
1048 /* graphics context for the vt window */ 1110 /* graphics context for the vt window */
1049 gcvalue.foreground = pix_colors[Color_fg]; 1111 gcvalue.foreground = pix_colors[Color_fg];
1050 gcvalue.background = pix_colors[Color_bg]; 1112 gcvalue.background = pix_colors[Color_bg];
1051 gcvalue.graphics_exposures = 0; 1113 gcvalue.graphics_exposures = 0;
… …
1160 1222
1161 /* 1223 /*
1162 * Debugging 1224 * Debugging
1163 */ 1225 */
1164#ifdef DEBUG_TTYMODE 1226#ifdef DEBUG_TTYMODE
1165#ifdef HAVE_TERMIOS_H
1166 /* c_iflag bits */ 1227 /* c_iflag bits */
1167 fprintf (stderr, "Input flags\n"); 1228 fprintf (stderr, "Input flags\n");
1168 1229
1169 /* cpp token stringize doesn't work on all machines <sigh> */ 1230 /* cpp token stringize doesn't work on all machines <sigh> */
1170# define FOO(flag,name) \ 1231# define FOO(flag,name) \
… …
1233 FOO (VLNEXT, "VLNEXT"); 1294 FOO (VLNEXT, "VLNEXT");
1234# endif 1295# endif
1235 1296
1236 fprintf (stderr, "\n"); 1297 fprintf (stderr, "\n");
1237# undef FOO 1298# undef FOO
1238# endif /* HAVE_TERMIOS_H */ 1299#endif /* DEBUG_TTYMODE */
1239#endif /* DEBUG_TTYMODE */
1240} 1300}
1241 1301
1242/*----------------------------------------------------------------------*/ 1302/*----------------------------------------------------------------------*/
1243/* 1303/*
1244 * Run the command in a subprocess and return a file descriptor for the 1304 * Run the command in a subprocess and return a file descriptor for the
… …
1268 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1328 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1269 1329
1270 int er; 1330 int er;
1271 1331
1272#ifndef NO_BACKSPACE_KEY 1332#ifndef NO_BACKSPACE_KEY
1273 if (key_backspace[0] && !key_backspace[1]) 1333 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1274 er = key_backspace[0]; 1334 er = rs[Rs_backspace_key][0];
1275 else if (strcmp (key_backspace, "DEC") == 0) 1335 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1276 er = '\177'; /* the initial state anyway */ 1336 er = '\177'; /* the initial state anyway */
1277 else 1337 else
1278#endif 1338#endif
1279 er = -1; 1339 er = -1;
1280 1340
… …
1322 } 1382 }
1323 1383
1324 _exit (EXIT_FAILURE); 1384 _exit (EXIT_FAILURE);
1325 1385
1326 default: 1386 default:
1327 if (!OPTION (Opt_utmpInhibit)) 1387 if (!option (Opt_utmpInhibit))
1328 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1388 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1329 1389
1330 pty->close_tty (); 1390 pty->close_tty ();
1331 1391
1332 child_ev.start (cmd_pid); 1392 child_ev.start (cmd_pid);
1333 1393
… …
1346int 1406int
1347rxvt_term::run_child (const char *const *argv) 1407rxvt_term::run_child (const char *const *argv)
1348{ 1408{
1349 char *login; 1409 char *login;
1350 1410
1351 if (OPTION (Opt_console)) 1411 if (option (Opt_console))
1412 {
1352 { /* be virtual console, fail silently */ 1413 /* be virtual console, fail silently */
1353#ifdef TIOCCONS 1414#ifdef TIOCCONS
1354 unsigned int on = 1; 1415 unsigned int on = 1;
1355 1416
1356 ioctl (STDIN_FILENO, TIOCCONS, &on); 1417 ioctl (STDIN_FILENO, TIOCCONS, &on);
1357#elif defined (SRIOCSREDIR) 1418#elif defined (SRIOCSREDIR)
… …
1359 1420
1360 fd = open (CONSOLE, O_WRONLY, 0); 1421 fd = open (CONSOLE, O_WRONLY, 0);
1361 if (fd >= 0) 1422 if (fd >= 0)
1362 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1423 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1363 close (fd); 1424 close (fd);
1364#endif /* SRIOCSREDIR */ 1425#endif /* SRIOCSREDIR */
1365 } 1426 }
1366 1427
1367 /* reset signals and spin off the command interpreter */ 1428 /* reset signals and spin off the command interpreter */
1368 signal (SIGINT, SIG_DFL); 1429 signal (SIGINT, SIG_DFL);
1369 signal (SIGQUIT, SIG_DFL); 1430 signal (SIGQUIT, SIG_DFL);
… …
1376 */ 1437 */
1377#ifdef SIGTSTP 1438#ifdef SIGTSTP
1378 signal (SIGTSTP, SIG_IGN); 1439 signal (SIGTSTP, SIG_IGN);
1379 signal (SIGTTIN, SIG_IGN); 1440 signal (SIGTTIN, SIG_IGN);
1380 signal (SIGTTOU, SIG_IGN); 1441 signal (SIGTTOU, SIG_IGN);
1381#endif /* SIGTSTP */ 1442#endif /* SIGTSTP */
1382 1443
1383 // unblock signals (signals are blocked by iom.C 1444 // unblock signals (signals are blocked by iom.C
1384 sigset_t ss; 1445 sigset_t ss;
1385 sigemptyset (&ss); 1446 sigemptyset (&ss);
1386 sigprocmask (SIG_SETMASK, &ss, 0); 1447 sigprocmask (SIG_SETMASK, &ss, 0);
1387 1448
1388 /* command interpreter path */ 1449 /* command interpreter path */
1389 if (argv != NULL) 1450 if (argv)
1390 { 1451 {
1391# ifdef DEBUG_CMD 1452# ifdef DEBUG_CMD
1392 int i; 1453 int i;
1393 1454
1394 for (i = 0; argv[i]; i++) 1455 for (i = 0; argv[i]; i++)
… …
1403 const char *argv0, *shell; 1464 const char *argv0, *shell;
1404 1465
1405 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1466 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1406 shell = "/bin/sh"; 1467 shell = "/bin/sh";
1407 1468
1408 argv0 = (const char *)rxvt_r_basename (shell); 1469 argv0 = (const char *)rxvt_basename (shell);
1409 1470
1410 if (OPTION (Opt_loginShell)) 1471 if (option (Opt_loginShell))
1411 { 1472 {
1412 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1473 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1413 1474
1414 login[0] = '-'; 1475 login[0] = '-';
1415 strcpy (&login[1], argv0); 1476 strcpy (&login[1], argv0);
1416 argv0 = login; 1477 argv0 = login;
1417 } 1478 }
1418 1479
1419 execlp (shell, argv0, NULL); 1480 execlp (shell, argv0, (char *)0);
1420 /* no error message: STDERR is closed! */ 1481 /* no error message: STDERR is closed! */
1421 } 1482 }
1422 1483
1423 return -1; 1484 return -1;
1424} 1485}

Diff Legend

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