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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines