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.157 by root, Wed Jan 25 21:09:21 2006 UTC vs.
Revision 1.225 by ayin, Tue Dec 11 11:39:06 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, 65535, 65535, 65535); 828 pix_colors [Color_scroll].get (cscroll);
743
744 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
745
746 xcol[0].get (this, pr0, pg0, pb0);
747 xcol[1].get (this, pr1, pg1, pb1);
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 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 832 rgba (
754 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 833 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
755 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 834 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
756 xcol[1] = pix_colors[Color_White]; 835 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
757 836 cscroll.a)
758 pix_colors[Color_topShadow] = xcol[1]; 837 ))
838 alias_color (Color_topShadow, Color_White);
759 } 839 }
760#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
761} 846}
762 847
763/*----------------------------------------------------------------------*/ 848/*----------------------------------------------------------------------*/
764/* color aliases, fg/bg bright-bold */ 849/* color aliases, fg/bg bright-bold */
765void 850void
768 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 853 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
769 { 854 {
770 int i = atoi (rs[Rs_color + idx]); 855 int i = atoi (rs[Rs_color + idx]);
771 856
772 if (i >= 8 && i <= 15) 857 if (i >= 8 && i <= 15)
773 { /* bright colors */ 858 /* bright colors */
774 i -= 8;
775 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 859 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
776 return; 860 else if (i >= 0 && i <= 7)
777 } 861 /* normal colors */
778
779 if (i >= 0 && i <= 7) /* normal colors */
780 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 862 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
781 } 863 }
782} 864}
783 865
784/*----------------------------------------------------------------------*/ 866/*----------------------------------------------------------------------*/
804 886
805 if (rsmod 887 if (rsmod
806 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 888 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
807 requestedmeta = rsmod[3] - '0'; 889 requestedmeta = rsmod[3] - '0';
808 890
809 map = XGetModifierMapping (xdisp); 891 map = XGetModifierMapping (dpy);
810 kc = map->modifiermap; 892 kc = map->modifiermap;
811 893
812 for (i = 1; i < 6; i++) 894 for (i = 1; i < 6; i++)
813 { 895 {
814 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 896 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
816 for (j = map->max_keypermod; j--; k++) 898 for (j = map->max_keypermod; j--; k++)
817 { 899 {
818 if (kc[k] == 0) 900 if (kc[k] == 0)
819 break; 901 break;
820 902
821 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 903 switch (XKeycodeToKeysym (dpy, kc[k], 0))
822 { 904 {
823 case XK_Num_Lock: 905 case XK_Num_Lock:
824 ModNumLockMask = modmasks[i - 1]; 906 ModNumLockMask = modmasks[i - 1];
825 continue; 907 continue;
826 908
876rxvt_term::create_windows (int argc, const char *const *argv) 958rxvt_term::create_windows (int argc, const char *const *argv)
877{ 959{
878 XClassHint classHint; 960 XClassHint classHint;
879 XWMHints wmHint; 961 XWMHints wmHint;
880#if ENABLE_FRILLS 962#if ENABLE_FRILLS
881 MWMHints mwmhints; 963 MWMHints mwmhints = { };
882#endif 964#endif
883 XGCValues gcvalue; 965 XGCValues gcvalue;
884 XSetWindowAttributes attributes; 966 XSetWindowAttributes attributes;
885 Window top, parent; 967 Window top, parent;
886 968
887 dLocal (Display *, xdisp); 969 dLocal (Display *, dpy);
888 970
889 /* grab colors before netscape does */ 971 /* grab colors before netscape does */
890 Get_Colours (); 972 Get_Colours ();
891 973
892 if (!set_fonts ()) 974 if (!set_fonts ())
893 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 975 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
894 976
895 parent = display->root; 977 parent = display->root;
896 978
897 attributes.override_redirect = !!OPTION (Opt_override_redirect); 979 attributes.override_redirect = !!option (Opt_override_redirect);
898 980
899#if ENABLE_FRILLS 981#if ENABLE_FRILLS
900 if (OPTION (Opt_borderLess)) 982 if (option (Opt_borderLess))
901 { 983 {
902 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 984 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
903 { 985 {
904 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 986 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
905 attributes.override_redirect = TRUE; 987 attributes.override_redirect = true;
906 mwmhints.flags = 0;
907 } 988 }
908 else 989 else
909 { 990 {
910 mwmhints.flags = MWM_HINTS_DECORATIONS; 991 mwmhints.flags = MWM_HINTS_DECORATIONS;
911 mwmhints.decorations = 0;
912 } 992 }
913 } 993 }
914 else
915 mwmhints.flags = 0;
916#endif 994#endif
917 995
918#if ENABLE_XEMBED 996#if ENABLE_XEMBED
919 if (rs[Rs_embed]) 997 if (rs[Rs_embed])
920 { 998 {
921 XWindowAttributes wattr; 999 XWindowAttributes wattr;
922 1000
923 parent = strtol (rs[Rs_embed], 0, 0); 1001 parent = strtol (rs[Rs_embed], 0, 0);
924 1002
925 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 1003 if (!XGetWindowAttributes (dpy, parent, &wattr))
926 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1004 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
927 1005
928 window_calc (wattr.width, wattr.height); 1006 window_calc (wattr.width, wattr.height);
929 } 1007 }
930#endif 1008#endif
934 /* sub-window placement & size in rxvt_resize_subwindows () */ 1012 /* sub-window placement & size in rxvt_resize_subwindows () */
935 attributes.background_pixel = pix_colors_focused [Color_border]; 1013 attributes.background_pixel = pix_colors_focused [Color_border];
936 attributes.border_pixel = pix_colors_focused [Color_border]; 1014 attributes.border_pixel = pix_colors_focused [Color_border];
937 attributes.colormap = cmap; 1015 attributes.colormap = cmap;
938 1016
939 top = XCreateWindow (xdisp, parent, 1017 top = XCreateWindow (dpy, parent,
940 szHint.x, szHint.y, 1018 szHint.x, szHint.y,
941 szHint.width, szHint.height, 1019 szHint.width, szHint.height,
942 ext_bwidth, 1020 ext_bwidth,
943 depth, InputOutput, visual, 1021 depth, InputOutput, visual,
944 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1022 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
955 classHint.res_name = (char *)rs[Rs_name]; 1033 classHint.res_name = (char *)rs[Rs_name];
956 classHint.res_class = (char *)RESCLASS; 1034 classHint.res_class = (char *)RESCLASS;
957 1035
958 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1036 wmHint.flags = InputHint | StateHint | WindowGroupHint;
959 wmHint.input = True; 1037 wmHint.input = True;
960 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1038 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
961 wmHint.window_group = top; 1039 wmHint.window_group = top;
962 1040
963 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 1041 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
964 &szHint, &wmHint, &classHint); 1042 &szHint, &wmHint, &classHint);
965 1043
966#if ENABLE_FRILLS 1044#if ENABLE_FRILLS
967 if (mwmhints.flags) 1045 if (mwmhints.flags)
968 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1046 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
969 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1047 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
970#endif 1048#endif
971 1049
972 Atom protocols[] = { 1050 Atom protocols[] = {
973 xa[XA_WM_DELETE_WINDOW], 1051 xa[XA_WM_DELETE_WINDOW],
974#if ENABLE_EWMH 1052#if ENABLE_EWMH
975 xa[XA_NET_WM_PING], 1053 xa[XA_NET_WM_PING],
976#endif 1054#endif
977 }; 1055 };
978 1056
979 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1057 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
980 1058
981#if ENABLE_FRILLS 1059#if ENABLE_FRILLS
982 if (rs[Rs_transient_for]) 1060 if (rs[Rs_transient_for])
983 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1061 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
984#endif 1062#endif
985 1063
986#if ENABLE_EWMH 1064#if ENABLE_EWMH
987 long pid = getpid (); 1065 long pid = getpid ();
988 1066
989 XChangeProperty (xdisp, top, 1067 XChangeProperty (dpy, top,
990 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1068 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
991 PropModeReplace, (unsigned char *)&pid, 1); 1069 PropModeReplace, (unsigned char *)&pid, 1);
992 1070
993 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1071 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
994#endif 1072#endif
995 1073
996 XSelectInput (xdisp, top, 1074 XSelectInput (dpy, top,
997 KeyPressMask 1075 KeyPressMask
998#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1076#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
999 | KeyReleaseMask 1077 | KeyReleaseMask
1000#endif 1078#endif
1001 | FocusChangeMask | VisibilityChangeMask 1079 | FocusChangeMask | VisibilityChangeMask
1002 | ExposureMask | StructureNotifyMask); 1080 | ExposureMask | StructureNotifyMask);
1003 1081
1004 termwin_ev.start (display, top); 1082 termwin_ev.start (display, top);
1005 1083
1006 /* vt cursor: Black-on-White is standard, but this is more popular */ 1084 /* vt cursor: Black-on-White is standard, but this is more popular */
1007 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1085 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1008 1086
1009#ifdef HAVE_SCROLLBARS 1087#ifdef HAVE_SCROLLBARS
1010 /* cursor scrollBar: Black-on-White */ 1088 /* cursor scrollBar: Black-on-White */
1011 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1089 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1012#endif 1090#endif
1013 1091
1014 /* the vt window */ 1092 /* the vt window */
1015 vt = XCreateSimpleWindow (xdisp, top, 1093 vt = XCreateSimpleWindow (dpy, top,
1016 window_vt_x, window_vt_y, 1094 window_vt_x, window_vt_y,
1017 width, height, 1095 width, height,
1018 0, 1096 0,
1019 pix_colors_focused[Color_fg], 1097 pix_colors_focused[Color_fg],
1020 pix_colors_focused[Color_bg]); 1098 pix_colors_focused[Color_bg]);
1021 1099
1022 attributes.bit_gravity = NorthWestGravity; 1100 attributes.bit_gravity = NorthWestGravity;
1023 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1101 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1024 1102
1025 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1103 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1026 1104
1027 if (OPTION (Opt_pointerBlank)) 1105 if (option (Opt_pointerBlank))
1028 vt_emask |= PointerMotionMask; 1106 vt_emask |= PointerMotionMask;
1029 else 1107 else
1030 vt_emask |= Button1MotionMask | Button3MotionMask; 1108 vt_emask |= Button1MotionMask | Button3MotionMask;
1031 1109
1032 vt_select_input (); 1110 vt_select_input ();
1033 1111
1034 vt_ev.start (display, vt); 1112 vt_ev.start (display, vt);
1035 1113
1036#ifdef XPM_BACKGROUND
1037 if (rs[Rs_backgroundPixmap] != NULL
1038 && !OPTION (Opt_transparent))
1039 {
1040 const char *p = rs[Rs_backgroundPixmap];
1041
1042 if ((p = strchr (p, ';')) != NULL)
1043 {
1044 p++;
1045 scale_pixmap (p);
1046 }
1047
1048 set_bgPixmap (rs[Rs_backgroundPixmap]);
1049 scr_touch (true);
1050 }
1051#endif
1052
1053 /* graphics context for the vt window */ 1114 /* graphics context for the vt window */
1054 gcvalue.foreground = pix_colors[Color_fg]; 1115 gcvalue.foreground = pix_colors[Color_fg];
1055 gcvalue.background = pix_colors[Color_bg]; 1116 gcvalue.background = pix_colors[Color_bg];
1056 gcvalue.graphics_exposures = 1; 1117 gcvalue.graphics_exposures = 0;
1057 1118
1058 gc = XCreateGC (xdisp, vt, 1119 gc = XCreateGC (dpy, vt,
1059 GCForeground | GCBackground | GCGraphicsExposures, 1120 GCForeground | GCBackground | GCGraphicsExposures,
1060 &gcvalue); 1121 &gcvalue);
1061 1122
1062 drawable = new rxvt_drawable (this, vt); 1123 drawable = new rxvt_drawable (this, vt);
1063 1124
1064#ifdef RXVT_SCROLLBAR 1125#ifdef RXVT_SCROLLBAR
1065 gcvalue.foreground = pix_colors[Color_topShadow]; 1126 gcvalue.foreground = pix_colors[Color_topShadow];
1066 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1127 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1067 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1128 gcvalue.foreground = pix_colors[Color_bottomShadow];
1068 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1129 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1069 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1130 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1070 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1131 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1071#endif 1132#endif
1072 1133
1073#ifdef OFF_FOCUS_FADING 1134#ifdef OFF_FOCUS_FADING
1074 // initially we are in unfocused state 1135 // initially we are in unfocused state
1075 if (rs[Rs_fade]) 1136 if (rs[Rs_fade])
1084 * GET TTY CURRENT STATE * 1145 * GET TTY CURRENT STATE *
1085 * ------------------------------------------------------------------------- */ 1146 * ------------------------------------------------------------------------- */
1086void 1147void
1087rxvt_get_ttymode (ttymode_t *tio, int erase) 1148rxvt_get_ttymode (ttymode_t *tio, int erase)
1088{ 1149{
1089#ifdef HAVE_TERMIOS_H
1090 /* 1150 /*
1091 * standard System V termios interface 1151 * standard System V termios interface
1092 */ 1152 */
1093 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1153 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1094 { 1154 {
1161 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1221 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1162# if defined (ECHOCTL) && defined (ECHOKE) 1222# if defined (ECHOCTL) && defined (ECHOKE)
1163 | ECHOCTL | ECHOKE 1223 | ECHOCTL | ECHOKE
1164# endif 1224# endif
1165 | ECHOE | ECHOK); 1225 | ECHOE | ECHOK);
1166# else /* HAVE_TERMIOS_H */
1167
1168 /*
1169 * sgtty interface
1170 */
1171
1172 /* get parameters -- gtty */
1173 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1174 {
1175 tio->sg.sg_erase = CERASE; /* ^H */
1176 tio->sg.sg_kill = CKILL; /* ^U */
1177 }
1178
1179 if (erase != -1)
1180 tio->sg.sg_erase = (char)erase;
1181
1182 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1183
1184 /* get special characters */
1185 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1186 {
1187 tio->tc.t_intrc = CINTR; /* ^C */
1188 tio->tc.t_quitc = CQUIT; /* ^\ */
1189 tio->tc.t_startc = CSTART; /* ^Q */
1190 tio->tc.t_stopc = CSTOP; /* ^S */
1191 tio->tc.t_eofc = CEOF; /* ^D */
1192 tio->tc.t_brkc = -1;
1193 }
1194
1195 /* get local special chars */
1196 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1197 {
1198 tio->lc.t_suspc = CSUSP; /* ^Z */
1199 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1200 tio->lc.t_rprntc = CRPRNT; /* ^R */
1201 tio->lc.t_flushc = CFLUSH; /* ^O */
1202 tio->lc.t_werasc = CWERASE; /* ^W */
1203 tio->lc.t_lnextc = CLNEXT; /* ^V */
1204 }
1205 /* get line discipline */
1206 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1207# ifdef NTTYDISC
1208 tio->line = NTTYDISC;
1209# endif /* NTTYDISC */
1210
1211 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1212#endif /* HAVE_TERMIOS_H */
1213 1226
1214 /* 1227 /*
1215 * Debugging 1228 * Debugging
1216 */ 1229 */
1217#ifdef DEBUG_TTYMODE 1230#ifdef DEBUG_TTYMODE
1218#ifdef HAVE_TERMIOS_H
1219 /* c_iflag bits */ 1231 /* c_iflag bits */
1220 fprintf (stderr, "Input flags\n"); 1232 fprintf (stderr, "Input flags\n");
1221 1233
1222 /* cpp token stringize doesn't work on all machines <sigh> */ 1234 /* cpp token stringize doesn't work on all machines <sigh> */
1223# define FOO(flag,name) \ 1235# define FOO(flag,name) \
1286 FOO (VLNEXT, "VLNEXT"); 1298 FOO (VLNEXT, "VLNEXT");
1287# endif 1299# endif
1288 1300
1289 fprintf (stderr, "\n"); 1301 fprintf (stderr, "\n");
1290# undef FOO 1302# undef FOO
1291# endif /* HAVE_TERMIOS_H */ 1303#endif /* DEBUG_TTYMODE */
1292#endif /* DEBUG_TTYMODE */
1293} 1304}
1294 1305
1295/*----------------------------------------------------------------------*/ 1306/*----------------------------------------------------------------------*/
1296/* 1307/*
1297 * Run the command in a subprocess and return a file descriptor for the 1308 * Run the command in a subprocess and return a file descriptor for the
1318 else 1329 else
1319#endif 1330#endif
1320 if (!pty->get ()) 1331 if (!pty->get ())
1321 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1332 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1322 1333
1334 int er;
1335
1336#ifndef NO_BACKSPACE_KEY
1337 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1338 er = rs[Rs_backspace_key][0];
1339 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1340 er = '\177'; /* the initial state anyway */
1341 else
1342#endif
1343 er = -1;
1344
1345 rxvt_get_ttymode (&tio, er);
1346 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1323 pty->set_utf8_mode (enc_utf8); 1347 pty->set_utf8_mode (enc_utf8);
1324 1348
1325 /* set initial window size */ 1349 /* set initial window size */
1326 tt_winch (); 1350 tt_winch ();
1327
1328 int er;
1329
1330#ifndef NO_BACKSPACE_KEY
1331 if (key_backspace[0] && !key_backspace[1])
1332 er = key_backspace[0];
1333 else if (strcmp (key_backspace, "DEC") == 0)
1334 er = '\177'; /* the initial state anyway */
1335 else
1336#endif
1337 er = -1;
1338
1339 rxvt_get_ttymode (&tio, er);
1340 1351
1341#if ENABLE_FRILLS 1352#if ENABLE_FRILLS
1342 if (rs[Rs_pty_fd]) 1353 if (rs[Rs_pty_fd])
1343 return; 1354 return;
1344#endif 1355#endif
1375 } 1386 }
1376 1387
1377 _exit (EXIT_FAILURE); 1388 _exit (EXIT_FAILURE);
1378 1389
1379 default: 1390 default:
1380 if (!OPTION (Opt_utmpInhibit)) 1391 if (!option (Opt_utmpInhibit))
1381 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1392 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1382 1393
1383 pty->close_tty (); 1394 pty->close_tty ();
1384 1395
1385 child_ev.start (cmd_pid); 1396 child_ev.start (cmd_pid);
1386 1397
1399int 1410int
1400rxvt_term::run_child (const char *const *argv) 1411rxvt_term::run_child (const char *const *argv)
1401{ 1412{
1402 char *login; 1413 char *login;
1403 1414
1404 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1405
1406 if (OPTION (Opt_console)) 1415 if (option (Opt_console))
1416 {
1407 { /* be virtual console, fail silently */ 1417 /* be virtual console, fail silently */
1408#ifdef TIOCCONS 1418#ifdef TIOCCONS
1409 unsigned int on = 1; 1419 unsigned int on = 1;
1410 1420
1411 ioctl (STDIN_FILENO, TIOCCONS, &on); 1421 ioctl (STDIN_FILENO, TIOCCONS, &on);
1412#elif defined (SRIOCSREDIR) 1422#elif defined (SRIOCSREDIR)
1414 1424
1415 fd = open (CONSOLE, O_WRONLY, 0); 1425 fd = open (CONSOLE, O_WRONLY, 0);
1416 if (fd >= 0) 1426 if (fd >= 0)
1417 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1427 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1418 close (fd); 1428 close (fd);
1419#endif /* SRIOCSREDIR */ 1429#endif /* SRIOCSREDIR */
1420 } 1430 }
1421 1431
1422 /* reset signals and spin off the command interpreter */ 1432 /* reset signals and spin off the command interpreter */
1423 signal (SIGINT, SIG_DFL); 1433 signal (SIGINT, SIG_DFL);
1424 signal (SIGQUIT, SIG_DFL); 1434 signal (SIGQUIT, SIG_DFL);
1431 */ 1441 */
1432#ifdef SIGTSTP 1442#ifdef SIGTSTP
1433 signal (SIGTSTP, SIG_IGN); 1443 signal (SIGTSTP, SIG_IGN);
1434 signal (SIGTTIN, SIG_IGN); 1444 signal (SIGTTIN, SIG_IGN);
1435 signal (SIGTTOU, SIG_IGN); 1445 signal (SIGTTOU, SIG_IGN);
1436#endif /* SIGTSTP */ 1446#endif /* SIGTSTP */
1437 1447
1438 // unblock signals (signals are blocked by iom.C 1448 // unblock signals (signals are blocked by iom.C
1439 sigset_t ss; 1449 sigset_t ss;
1440 sigemptyset (&ss); 1450 sigemptyset (&ss);
1441 sigprocmask (SIG_SETMASK, &ss, 0); 1451 sigprocmask (SIG_SETMASK, &ss, 0);
1442 1452
1443 /* command interpreter path */ 1453 /* command interpreter path */
1444 if (argv != NULL) 1454 if (argv)
1445 { 1455 {
1446# ifdef DEBUG_CMD 1456# ifdef DEBUG_CMD
1447 int i; 1457 int i;
1448 1458
1449 for (i = 0; argv[i]; i++) 1459 for (i = 0; argv[i]; i++)
1458 const char *argv0, *shell; 1468 const char *argv0, *shell;
1459 1469
1460 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1470 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1461 shell = "/bin/sh"; 1471 shell = "/bin/sh";
1462 1472
1463 argv0 = (const char *)rxvt_r_basename (shell); 1473 argv0 = (const char *)rxvt_basename (shell);
1464 1474
1465 if (OPTION (Opt_loginShell)) 1475 if (option (Opt_loginShell))
1466 { 1476 {
1467 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1477 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1468 1478
1469 login[0] = '-'; 1479 login[0] = '-';
1470 strcpy (&login[1], argv0); 1480 strcpy (&login[1], argv0);
1471 argv0 = login; 1481 argv0 = login;
1472 } 1482 }
1473 1483
1474 execlp (shell, argv0, NULL); 1484 execlp (shell, argv0, (char *)0);
1475 /* no error message: STDERR is closed! */ 1485 /* no error message: STDERR is closed! */
1476 } 1486 }
1477 1487
1478 return -1; 1488 return -1;
1479} 1489}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines