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.158 by root, Sun Jan 29 20:51:28 2006 UTC vs.
Revision 1.222 by ayin, Thu Nov 15 11:36:15 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines