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.167 by root, Tue Jan 31 19:54:39 2006 UTC vs.
Revision 1.230 by root, Fri Dec 14 05:25:24 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 "rgb:00/00/00", // 0: black (Black) 152 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 153 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 154 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 155 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 156 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 157 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 158 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 159# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 160 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 161# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 162 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 163# endif
60 /* high-intensity colors */ 164 /* high-intensity colors */
61# ifdef XTERM_COLORS 165# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 166 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
146 "rgb:e7/e7/e7", 250 "rgb:e7/e7/e7",
147 251
148#ifndef NO_CURSORCOLOR 252#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 253 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 254 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 255#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 256 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 257 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 258 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 259#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 260 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 261 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 262 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 263 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 264#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 265#if ENABLE_FRILLS
162 NULL, // Color_underline 266 NULL, // Color_underline
163#endif 267#endif
164#ifdef OPTION_HC 268#ifdef OPTION_HC
165 NULL, 269 NULL,
166#endif 270#endif
167#ifdef KEEP_SCROLLCOLOR 271#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 273 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 274#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 275#if ENABLE_TRANSPARENCY
172 NULL, 276 NULL,
173#endif 277#endif
174#if OFF_FOCUS_FADING 278#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 279 "rgb:00/00/00",
176#endif 280#endif
177 }; 281 };
178 282
179bool 283void
180rxvt_term::init_vars () 284rxvt_term::init_vars ()
181{ 285{
182 pix_colors = // 286 pix_colors = //
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 287 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING 288#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 289 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif 290#endif
187 291
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191
192 MEvent.time = CurrentTime; 292 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 293 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 294 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 295 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 296 ncol = 80;
198 nrow = 24; 297 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 298 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 299 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 300 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 301 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS; 302 numpix_colors = TOTAL_COLORS;
204 303
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 304 refresh_type = SLOW_REFRESH;
207 305
208 oldcursor.row = oldcursor.col = -1; 306 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; 307 last_bot = last_state = -1;
216 308
217 return true; 309 set_option (Opt_scrollBar);
310 set_option (Opt_scrollTtyOutput);
311 set_option (Opt_jumpScroll);
312 set_option (Opt_skipScroll);
313 set_option (Opt_secondaryScreen);
314 set_option (Opt_secondaryScroll);
315 set_option (Opt_pastableTabs);
316 set_option (Opt_intensityStyles);
317 set_option (Opt_iso14755_52);
218} 318}
219 319
220void 320void
221rxvt_term::init_secondary () 321rxvt_term::init_secondary ()
222{ 322{
… …
229 if ((i = open ("/dev/null", O_RDONLY)) < 0) 329 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 { 330 {
231 /* TODO: BOO HISS */ 331 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO); 332 dup2 (STDERR_FILENO, STDIN_FILENO);
233 } 333 }
234 else if (i > STDIN_FILENO) 334 else if (i != STDIN_FILENO)
235 { 335 {
236 dup2 (i, STDIN_FILENO); 336 dup2 (i, STDIN_FILENO);
237 close (i); 337 close (i);
238 } 338 }
239 339
… …
254/*----------------------------------------------------------------------*/ 354/*----------------------------------------------------------------------*/
255const char ** 355const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 356rxvt_term::init_resources (int argc, const char *const *argv)
257{ 357{
258 int i, r_argc; 358 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 359 const char **cmd_argv, **r_argv;
261 360
262 /* 361 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 362 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 363 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 364 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 365 if (!strcmp (argv[r_argc], "-e"))
267 break; 366 break;
367
368 if (r_argc == argc)
369 cmd_argv = NULL;
370 else if (!argv[r_argc + 1])
371 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
372 else
373 {
374 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
375
376 for (i = 0; i < argc - r_argc - 1; i++)
377 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
378
379 cmd_argv[i] = NULL;
380 }
268 381
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 382 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 383
271 for (i = 0; i < r_argc; i++) 384 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 385 r_argv[i] = (const char *)argv[i];
273 386
274 r_argv[i] = NULL; 387 r_argv[i] = NULL;
275 388
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]); 389 rs[Rs_name] = rxvt_basename (argv[0]);
289 390
290 /* 391 /*
291 * Open display, get options/resources and create the window 392 * Open display, get options/resources and create the window
292 */ 393 */
293 394
… …
295 rs[Rs_display_name] = ":0"; 396 rs[Rs_display_name] = ":0";
296 397
297 get_options (r_argc, r_argv); 398 get_options (r_argc, r_argv);
298 399
299 if (!(display = displays.get (rs[Rs_display_name]))) 400 if (!(display = displays.get (rs[Rs_display_name])))
401 {
402 free (r_argv);
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 403 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
404 }
301 405
302 // using a local pointer decreases code size a lot 406 // using a local pointer decreases code size a lot
303 xa = display->xa; 407 xa = display->xa;
304 408
409 set (display);
410 extract_resources ();
411
305#if XFT 412#if XFT
306 if (rs[Rs_depth]) 413 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0)); 414 select_visual (strtol (rs[Rs_depth], 0, 0));
308 else
309#endif 415#endif
310 set (display);
311 416
312 extract_resources (); 417#ifdef HAVE_AFTERIMAGE
313 418 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
419#endif
314 free (r_argv); 420 free (r_argv);
315 421
316 for (int i = NUM_RESOURCES; i--; ) 422 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef) 423 if (rs [i] == resval_undef)
318 rs [i] = 0; 424 rs [i] = 0;
… …
334 * set any defaults not already set 440 * set any defaults not already set
335 */ 441 */
336 if (cmd_argv && cmd_argv[0]) 442 if (cmd_argv && cmd_argv[0])
337 { 443 {
338 if (!rs[Rs_title]) 444 if (!rs[Rs_title])
339 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 445 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
340 if (!rs[Rs_iconName]) 446 if (!rs[Rs_iconName])
341 rs[Rs_iconName] = rs[Rs_title]; 447 rs[Rs_iconName] = rs[Rs_title];
342 } 448 }
343 else 449 else
344 { 450 {
… …
382 rs[Rs_cutchars] = CUTCHARS; 488 rs[Rs_cutchars] = CUTCHARS;
383 489
384#ifndef NO_BACKSPACE_KEY 490#ifndef NO_BACKSPACE_KEY
385 if (!rs[Rs_backspace_key]) 491 if (!rs[Rs_backspace_key])
386# ifdef DEFAULT_BACKSPACE 492# ifdef DEFAULT_BACKSPACE
387 key_backspace = DEFAULT_BACKSPACE; 493 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
388# else 494# else
389 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 495 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
390# endif 496# endif
391 else
392 {
393 val = strdup (rs[Rs_backspace_key]);
394 rxvt_Str_trim (val);
395 rxvt_Str_escaped (val);
396 key_backspace = val;
397 }
398#endif 497#endif
399 498
400#ifndef NO_DELETE_KEY 499#ifndef NO_DELETE_KEY
401 if (!rs[Rs_delete_key]) 500 if (!rs[Rs_delete_key])
402# ifdef DEFAULT_DELETE 501# ifdef DEFAULT_DELETE
403 key_delete = DEFAULT_DELETE; 502 rs[Rs_delete_key] = DEFAULT_DELETE;
404# else 503# else
405 key_delete = "\033[3~"; 504 rs[Rs_delete_key] = "\033[3~";
406# endif
407 else
408 {
409 val = strdup (rs[Rs_delete_key]);
410 rxvt_Str_trim (val);
411 rxvt_Str_escaped (val);
412 key_delete = val;
413 }
414#endif 505# endif
415 if (rs[Rs_answerbackstring]) 506#endif
416 {
417 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
418 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
419 }
420 507
421#ifdef HAVE_SCROLLBARS 508#ifdef HAVE_SCROLLBARS
422 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 509 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
423#endif 510#endif
424 511
425#ifdef XTERM_REVERSE_VIDEO 512#ifdef XTERM_REVERSE_VIDEO
426 /* this is how xterm implements reverseVideo */ 513 /* this is how xterm implements reverseVideo */
427 if (OPTION (Opt_reverseVideo)) 514 if (option (Opt_reverseVideo))
428 { 515 {
429 if (!rs[Rs_color + Color_fg]) 516 if (!rs[Rs_color + Color_fg])
430 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 517 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
431 518
432 if (!rs[Rs_color + Color_bg]) 519 if (!rs[Rs_color + Color_bg])
… …
438 if (!rs[Rs_color + i]) 525 if (!rs[Rs_color + i])
439 rs[Rs_color + i] = def_colorName[i]; 526 rs[Rs_color + i] = def_colorName[i];
440 527
441#ifndef XTERM_REVERSE_VIDEO 528#ifndef XTERM_REVERSE_VIDEO
442 /* this is how we implement reverseVideo */ 529 /* this is how we implement reverseVideo */
443 if (OPTION (Opt_reverseVideo)) 530 if (option (Opt_reverseVideo))
444 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 531 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
445#endif 532#endif
446 533
447 /* convenient aliases for setting fg/bg to colors */ 534 /* convenient aliases for setting fg/bg to colors */
448 color_aliases (Color_fg); 535 color_aliases (Color_fg);
449 color_aliases (Color_bg); 536 color_aliases (Color_bg);
450#ifndef NO_CURSORCOLOR 537#ifndef NO_CURSORCOLOR
451 color_aliases (Color_cursor); 538 color_aliases (Color_cursor);
452 color_aliases (Color_cursor2); 539 color_aliases (Color_cursor2);
453#endif /* NO_CURSORCOLOR */ 540#endif /* NO_CURSORCOLOR */
454 color_aliases (Color_pointer_fg); 541 color_aliases (Color_pointer_fg);
455 color_aliases (Color_pointer_bg); 542 color_aliases (Color_pointer_bg);
456 color_aliases (Color_border); 543 color_aliases (Color_border);
457#ifndef NO_BOLD_UNDERLINE_REVERSE 544#ifndef NO_BOLD_UNDERLINE_REVERSE
458 color_aliases (Color_BD); 545 color_aliases (Color_BD);
459 color_aliases (Color_UL); 546 color_aliases (Color_UL);
460 color_aliases (Color_RV); 547 color_aliases (Color_RV);
461#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 548#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
462 549
463 if (!rs[Rs_color + Color_border]) 550 if (!rs[Rs_color + Color_border])
464 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 551 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
465 552
466 return cmd_argv; 553 return cmd_argv;
… …
469/*----------------------------------------------------------------------*/ 556/*----------------------------------------------------------------------*/
470void 557void
471rxvt_term::init_env () 558rxvt_term::init_env ()
472{ 559{
473 int i; 560 int i;
474 unsigned int u;
475 char *val; 561 char *val;
476 562
477#ifdef DISPLAY_IS_IP 563#ifdef DISPLAY_IS_IP
478 /* Fixup display_name for export over pty to any interested terminal 564 /* Fixup display_name for export over pty to any interested terminal
479 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 565 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
487 */ 573 */
488 val = rxvt_network_display (rs[Rs_display_name]); 574 val = rxvt_network_display (rs[Rs_display_name]);
489 rs[Rs_display_name] = (const char *)val; 575 rs[Rs_display_name] = (const char *)val;
490 576
491 if (val == NULL) 577 if (val == NULL)
492#endif /* DISPLAY_IS_IP */ 578#endif /* DISPLAY_IS_IP */
493 val = XDisplayString (xdisp); 579 val = XDisplayString (dpy);
494 580
495 if (rs[Rs_display_name] == NULL) 581 if (rs[Rs_display_name] == NULL)
496 rs[Rs_display_name] = val; /* use broken `:0' value */ 582 rs[Rs_display_name] = val; /* use broken `:0' value */
497 583
498 i = strlen (val); 584 i = strlen (val);
499 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 585 env_display = (char *)rxvt_malloc (i + 9);
500 586
501 sprintf (env_display, "DISPLAY=%s", val); 587 sprintf (env_display, "DISPLAY=%s", val);
502 588
503 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 589 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
504 590
… …
525 else 611 else
526 putenv ("COLORTERM=" COLORTERMENVFULL); 612 putenv ("COLORTERM=" COLORTERMENVFULL);
527 613
528 if (rs[Rs_term_name] != NULL) 614 if (rs[Rs_term_name] != NULL)
529 { 615 {
530 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 616 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
531 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 617 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
532 putenv (env_term); 618 putenv (env_term);
533 } 619 }
534 else 620 else
535 putenv ("TERM=" TERMENV); 621 putenv ("TERM=" TERMENV);
… …
537#ifdef HAVE_UNSETENV 623#ifdef HAVE_UNSETENV
538 /* avoid passing old settings and confusing term size */ 624 /* avoid passing old settings and confusing term size */
539 unsetenv ("LINES"); 625 unsetenv ("LINES");
540 unsetenv ("COLUMNS"); 626 unsetenv ("COLUMNS");
541 unsetenv ("TERMCAP"); /* terminfo should be okay */ 627 unsetenv ("TERMCAP"); /* terminfo should be okay */
542#endif /* HAVE_UNSETENV */ 628#endif /* HAVE_UNSETENV */
543} 629}
544 630
545/*----------------------------------------------------------------------*/ 631/*----------------------------------------------------------------------*/
546/* 632/*
547 * This is more or less stolen straight from XFree86 xterm. 633 * This is more or less stolen straight from XFree86 xterm.
… …
568 654
569 this->locale = "C"; 655 this->locale = "C";
570 } 656 }
571 657
572 658
573 this->locale = rxvt_strdup (this->locale); 659 this->locale = strdup (this->locale);
574 SET_LOCALE (this->locale); 660 SET_LOCALE (this->locale);
575 mbstate.reset (); 661 mbstate.reset ();
576#endif 662#endif
577 663
578#if HAVE_NL_LANGINFO 664#if HAVE_NL_LANGINFO
… …
622 * Initialize the command connection. 708 * Initialize the command connection.
623 * This should be called after the X server connection is established. 709 * This should be called after the X server connection is established.
624 */ 710 */
625 711
626#ifdef META8_OPTION 712#ifdef META8_OPTION
627 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 713 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
628#endif 714#endif
629 715
630 get_ourmods (); 716 get_ourmods ();
631 717
632 if (!OPTION (Opt_scrollTtyOutput)) 718 if (!option (Opt_scrollTtyOutput))
633 priv_modes |= PrivMode_TtyOutputInh; 719 priv_modes |= PrivMode_TtyOutputInh;
634 if (OPTION (Opt_scrollTtyKeypress)) 720 if (option (Opt_scrollTtyKeypress))
635 priv_modes |= PrivMode_Keypress; 721 priv_modes |= PrivMode_Keypress;
636 if (!OPTION (Opt_jumpScroll)) 722 if (!option (Opt_jumpScroll))
637 priv_modes |= PrivMode_smoothScroll; 723 priv_modes |= PrivMode_smoothScroll;
638 724
639#ifndef NO_BACKSPACE_KEY 725#ifndef NO_BACKSPACE_KEY
640 if (strcmp (key_backspace, "DEC") == 0) 726 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
641 priv_modes |= PrivMode_HaveBackSpace; 727 priv_modes |= PrivMode_HaveBackSpace;
642#endif 728#endif
643 729
644 /* add value for scrollBar */ 730 /* add value for scrollBar */
645 if (scrollBar.state) 731 if (scrollBar.state)
… …
658 int i; 744 int i;
659 745
660#ifdef OFF_FOCUS_FADING 746#ifdef OFF_FOCUS_FADING
661 pix_colors = pix_colors_focused; 747 pix_colors = pix_colors_focused;
662#endif 748#endif
663 749
664 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 750 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
665 { 751 {
666 const char *name = rs[Rs_color + i]; 752 const char *name = rs[Rs_color + i];
667 753
668 if (!name) 754 if (!name)
… …
671 rxvt_color xcol; 757 rxvt_color xcol;
672 758
673 if (!set_color (xcol, name)) 759 if (!set_color (xcol, name))
674 { 760 {
675#ifndef XTERM_REVERSE_VIDEO 761#ifndef XTERM_REVERSE_VIDEO
676 if (i < 2 && OPTION (Opt_reverseVideo)) 762 if (i < 2 && option (Opt_reverseVideo))
677 name = def_colorName [1 - i]; 763 name = def_colorName [1 - i];
678 else 764 else
679#endif 765#endif
680 name = def_colorName [i]; 766 name = def_colorName [i];
681 767
… …
694#ifndef NO_CURSORCOLOR 780#ifndef NO_CURSORCOLOR
695 case Color_cursor2: 781 case Color_cursor2:
696#endif 782#endif
697 case Color_pointer_fg: 783 case Color_pointer_fg:
698 name = rs[Rs_color + Color_fg]; 784 name = rs[Rs_color + Color_fg];
699 xcol = pix_colors[Color_fg]; 785 xcol.set (this, name);
700 break; 786 break;
701 default: 787 default:
702 name = rs[Rs_color + Color_bg]; 788 name = rs[Rs_color + Color_bg];
703 xcol = pix_colors[Color_bg]; 789 xcol.set (this, name);
704 break; 790 break;
705 } 791 }
706 } 792 }
707 } 793 }
708 794
709 pix_colors[i] = xcol; 795 pix_colors[i] = xcol;
710 rs[Rs_color + i] = name; 796 rs[Rs_color + i] = name;
711 } 797 }
712 798
713#ifdef OFF_FOCUS_FADING
714 if (rs[Rs_fade])
715 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
716 {
717 rgba c;
718 pix_colors[Color_fade].get (c);
719 pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
720 }
721#endif
722
723 if (depth <= 2) 799 if (depth <= 2)
724 { 800 {
725 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 801 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
726 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 802 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
727 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 803 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
728 } 804 }
729 805
730 /* 806 /*
731 * get scrollBar shadow colors 807 * get scrollBar shadow colors
732 * 808 *
733 * The calculations of topShadow/bottomShadow values are adapted 809 * The calculations of topShadow/bottomShadow values are adapted
734 * from the fvwm window manager. 810 * from the fvwm window manager.
735 */ 811 */
736#ifdef KEEP_SCROLLCOLOR 812#ifdef KEEP_SCROLLCOLOR
737
738 if (depth <= 2) 813 if (depth <= 2)
739 { 814 {
740 /* Monochrome */ 815 /* Monochrome */
741 pix_colors[Color_scroll] = pix_colors[Color_fg]; 816 alias_color (Color_scroll, Color_fg);
742 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 817 alias_color (Color_topShadow, Color_bg);
743 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 818 alias_color (Color_bottomShadow, Color_bg);
744 } 819 }
745 else 820 else
746 { 821 {
747 rxvt_color xcol[2]; 822 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
748 /* xcol[0] == white
749 * xcol[1] == top shadow
750 * xcol[2] == bot shadow */
751 823
752 xcol[1] = pix_colors[Color_scroll];
753 xcol[0].set (this, rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
754
755 rgba c0, c1; 824 rgba cscroll;
756 825 pix_colors [Color_scroll].get (cscroll);
757 xcol[0].get (c0);
758 xcol[1].get (c1);
759
760 xcol[1].fade (this, 50, pix_colors[Color_bottomShadow]);
761 826
762 /* topShadowColor */ 827 /* topShadowColor */
763 if (!xcol[1].set (this, 828 if (!pix_colors[Color_topShadow].set (this,
764 rgba ( 829 rgba (
765 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 830 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
766 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), 831 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
767 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), 832 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
768 c1.a) // pa1 vs. pa0: arbitrary 833 cscroll.a)
769 )); 834 ))
770 xcol[1] = pix_colors[Color_White]; 835 alias_color (Color_topShadow, Color_White);
771
772 pix_colors[Color_topShadow] = xcol[1];
773 } 836 }
774#endif /* KEEP_SCROLLCOLOR */ 837#endif /* KEEP_SCROLLCOLOR */
838
839#ifdef OFF_FOCUS_FADING
840 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
841 update_fade_color (i);
842#endif
775} 843}
776 844
777/*----------------------------------------------------------------------*/ 845/*----------------------------------------------------------------------*/
778/* color aliases, fg/bg bright-bold */ 846/* color aliases, fg/bg bright-bold */
779void 847void
… …
782 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 850 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
783 { 851 {
784 int i = atoi (rs[Rs_color + idx]); 852 int i = atoi (rs[Rs_color + idx]);
785 853
786 if (i >= 8 && i <= 15) 854 if (i >= 8 && i <= 15)
787 { /* bright colors */ 855 /* bright colors */
788 i -= 8;
789 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 856 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
790 return; 857 else if (i >= 0 && i <= 7)
791 } 858 /* normal colors */
792
793 if (i >= 0 && i <= 7) /* normal colors */
794 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 859 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
795 } 860 }
796} 861}
797 862
798/*----------------------------------------------------------------------*/ 863/*----------------------------------------------------------------------*/
… …
818 883
819 if (rsmod 884 if (rsmod
820 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 885 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
821 requestedmeta = rsmod[3] - '0'; 886 requestedmeta = rsmod[3] - '0';
822 887
823 map = XGetModifierMapping (xdisp); 888 map = XGetModifierMapping (dpy);
824 kc = map->modifiermap; 889 kc = map->modifiermap;
825 890
826 for (i = 1; i < 6; i++) 891 for (i = 1; i < 6; i++)
827 { 892 {
828 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 893 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
830 for (j = map->max_keypermod; j--; k++) 895 for (j = map->max_keypermod; j--; k++)
831 { 896 {
832 if (kc[k] == 0) 897 if (kc[k] == 0)
833 break; 898 break;
834 899
835 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 900 switch (XKeycodeToKeysym (dpy, kc[k], 0))
836 { 901 {
837 case XK_Num_Lock: 902 case XK_Num_Lock:
838 ModNumLockMask = modmasks[i - 1]; 903 ModNumLockMask = modmasks[i - 1];
839 continue; 904 continue;
840 905
… …
890rxvt_term::create_windows (int argc, const char *const *argv) 955rxvt_term::create_windows (int argc, const char *const *argv)
891{ 956{
892 XClassHint classHint; 957 XClassHint classHint;
893 XWMHints wmHint; 958 XWMHints wmHint;
894#if ENABLE_FRILLS 959#if ENABLE_FRILLS
895 MWMHints mwmhints; 960 MWMHints mwmhints = { };
896#endif 961#endif
897 XGCValues gcvalue; 962 XGCValues gcvalue;
898 XSetWindowAttributes attributes; 963 XSetWindowAttributes attributes;
899 Window top, parent; 964 Window top, parent;
900 965
901 dLocal (Display *, xdisp); 966 dLocal (Display *, dpy);
902 967
903 /* grab colors before netscape does */ 968 /* grab colors before netscape does */
904 Get_Colours (); 969 Get_Colours ();
905 970
906 if (!set_fonts ()) 971 if (!set_fonts ())
907 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 972 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
908 973
909 parent = display->root; 974 parent = display->root;
910 975
911 attributes.override_redirect = !!OPTION (Opt_override_redirect); 976 attributes.override_redirect = !!option (Opt_override_redirect);
912 977
913#if ENABLE_FRILLS 978#if ENABLE_FRILLS
914 if (OPTION (Opt_borderLess)) 979 if (option (Opt_borderLess))
915 { 980 {
916 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 981 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
917 { 982 {
918 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 983 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
919 attributes.override_redirect = true; 984 attributes.override_redirect = true;
920 mwmhints.flags = 0;
921 } 985 }
922 else 986 else
923 { 987 {
924 mwmhints.flags = MWM_HINTS_DECORATIONS; 988 mwmhints.flags = MWM_HINTS_DECORATIONS;
925 mwmhints.decorations = 0;
926 } 989 }
927 } 990 }
928 else
929 mwmhints.flags = 0;
930#endif 991#endif
931 992
932#if ENABLE_XEMBED 993#if ENABLE_XEMBED
933 if (rs[Rs_embed]) 994 if (rs[Rs_embed])
934 { 995 {
935 XWindowAttributes wattr; 996 XWindowAttributes wattr;
936 997
937 parent = strtol (rs[Rs_embed], 0, 0); 998 parent = strtol (rs[Rs_embed], 0, 0);
938 999
939 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 1000 if (!XGetWindowAttributes (dpy, parent, &wattr))
940 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1001 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
941 1002
942 window_calc (wattr.width, wattr.height); 1003 window_calc (wattr.width, wattr.height);
943 } 1004 }
944#endif 1005#endif
… …
948 /* sub-window placement & size in rxvt_resize_subwindows () */ 1009 /* sub-window placement & size in rxvt_resize_subwindows () */
949 attributes.background_pixel = pix_colors_focused [Color_border]; 1010 attributes.background_pixel = pix_colors_focused [Color_border];
950 attributes.border_pixel = pix_colors_focused [Color_border]; 1011 attributes.border_pixel = pix_colors_focused [Color_border];
951 attributes.colormap = cmap; 1012 attributes.colormap = cmap;
952 1013
953 top = XCreateWindow (xdisp, parent, 1014 top = XCreateWindow (dpy, parent,
954 szHint.x, szHint.y, 1015 szHint.x, szHint.y,
955 szHint.width, szHint.height, 1016 szHint.width, szHint.height,
956 ext_bwidth, 1017 ext_bwidth,
957 depth, InputOutput, visual, 1018 depth, InputOutput, visual,
958 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1019 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
969 classHint.res_name = (char *)rs[Rs_name]; 1030 classHint.res_name = (char *)rs[Rs_name];
970 classHint.res_class = (char *)RESCLASS; 1031 classHint.res_class = (char *)RESCLASS;
971 1032
972 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1033 wmHint.flags = InputHint | StateHint | WindowGroupHint;
973 wmHint.input = True; 1034 wmHint.input = True;
974 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1035 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
975 wmHint.window_group = top; 1036 wmHint.window_group = top;
976 1037
977 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 1038 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
978 &szHint, &wmHint, &classHint); 1039 &szHint, &wmHint, &classHint);
979 1040
980#if ENABLE_FRILLS 1041#if ENABLE_FRILLS
981 if (mwmhints.flags) 1042 if (mwmhints.flags)
982 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1043 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
983 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1044 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
984#endif 1045#endif
985 1046
986 Atom protocols[] = { 1047 Atom protocols[] = {
987 xa[XA_WM_DELETE_WINDOW], 1048 xa[XA_WM_DELETE_WINDOW],
988#if ENABLE_EWMH 1049#if ENABLE_EWMH
989 xa[XA_NET_WM_PING], 1050 xa[XA_NET_WM_PING],
990#endif 1051#endif
991 }; 1052 };
992 1053
993 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1054 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
994 1055
995#if ENABLE_FRILLS 1056#if ENABLE_FRILLS
996 if (rs[Rs_transient_for]) 1057 if (rs[Rs_transient_for])
997 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1058 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
998#endif 1059#endif
999 1060
1000#if ENABLE_EWMH 1061#if ENABLE_EWMH
1001 long pid = getpid (); 1062 long pid = getpid ();
1002 1063
1003 XChangeProperty (xdisp, top, 1064 XChangeProperty (dpy, top,
1004 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1065 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1005 PropModeReplace, (unsigned char *)&pid, 1); 1066 PropModeReplace, (unsigned char *)&pid, 1);
1006 1067
1007 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1068 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1008#endif 1069#endif
1009 1070
1010 XSelectInput (xdisp, top, 1071 XSelectInput (dpy, top,
1011 KeyPressMask 1072 KeyPressMask
1012#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1073#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1013 | KeyReleaseMask 1074 | KeyReleaseMask
1014#endif 1075#endif
1015 | FocusChangeMask | VisibilityChangeMask 1076 | FocusChangeMask | VisibilityChangeMask
1016 | ExposureMask | StructureNotifyMask); 1077 | ExposureMask | StructureNotifyMask);
1017 1078
1018 termwin_ev.start (display, top); 1079 termwin_ev.start (display, top);
1019 1080
1020 /* vt cursor: Black-on-White is standard, but this is more popular */ 1081 /* vt cursor: Black-on-White is standard, but this is more popular */
1021 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1082 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1022 1083
1023#ifdef HAVE_SCROLLBARS 1084#ifdef HAVE_SCROLLBARS
1024 /* cursor scrollBar: Black-on-White */ 1085 /* cursor scrollBar: Black-on-White */
1025 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr); 1086 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1026#endif 1087#endif
1027 1088
1028 /* the vt window */ 1089 /* the vt window */
1029 vt = XCreateSimpleWindow (xdisp, top, 1090 vt = XCreateSimpleWindow (dpy, top,
1030 window_vt_x, window_vt_y, 1091 window_vt_x, window_vt_y,
1031 width, height, 1092 width, height,
1032 0, 1093 0,
1033 pix_colors_focused[Color_fg], 1094 pix_colors_focused[Color_fg],
1034 pix_colors_focused[Color_bg]); 1095 pix_colors_focused[Color_bg]);
1035 1096
1036 attributes.bit_gravity = NorthWestGravity; 1097 attributes.bit_gravity = NorthWestGravity;
1037 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1098 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1038 1099
1039 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1100 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1040 1101
1041 if (OPTION (Opt_pointerBlank)) 1102 if (option (Opt_pointerBlank))
1042 vt_emask |= PointerMotionMask; 1103 vt_emask |= PointerMotionMask;
1043 else 1104 else
1044 vt_emask |= Button1MotionMask | Button3MotionMask; 1105 vt_emask |= Button1MotionMask | Button3MotionMask;
1045 1106
1046 vt_select_input (); 1107 vt_select_input ();
1047 1108
1048 vt_ev.start (display, vt); 1109 vt_ev.start (display, vt);
1049 1110
1050#ifdef XPM_BACKGROUND
1051 if (rs[Rs_backgroundPixmap] != NULL
1052 && !OPTION (Opt_transparent))
1053 {
1054 const char *p = rs[Rs_backgroundPixmap];
1055
1056 if ((p = strchr (p, ';')) != NULL)
1057 {
1058 p++;
1059 scale_pixmap (p);
1060 }
1061
1062 set_bgPixmap (rs[Rs_backgroundPixmap]);
1063 scr_touch (true);
1064 }
1065#endif
1066
1067 /* graphics context for the vt window */ 1111 /* graphics context for the vt window */
1068 gcvalue.foreground = pix_colors[Color_fg]; 1112 gcvalue.foreground = pix_colors[Color_fg];
1069 gcvalue.background = pix_colors[Color_bg]; 1113 gcvalue.background = pix_colors[Color_bg];
1070 gcvalue.graphics_exposures = 1; 1114 gcvalue.graphics_exposures = 0;
1071 1115
1072 gc = XCreateGC (xdisp, vt, 1116 gc = XCreateGC (dpy, vt,
1073 GCForeground | GCBackground | GCGraphicsExposures, 1117 GCForeground | GCBackground | GCGraphicsExposures,
1074 &gcvalue); 1118 &gcvalue);
1075 1119
1076 drawable = new rxvt_drawable (this, vt); 1120 drawable = new rxvt_drawable (this, vt);
1077 1121
1078#ifdef RXVT_SCROLLBAR 1122#ifdef RXVT_SCROLLBAR
1079 gcvalue.foreground = pix_colors[Color_topShadow]; 1123 gcvalue.foreground = pix_colors[Color_topShadow];
1080 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1124 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1081 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1125 gcvalue.foreground = pix_colors[Color_bottomShadow];
1082 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1126 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1083 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; 1127 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1084 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue); 1128 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1085#endif 1129#endif
1086 1130
1087#ifdef OFF_FOCUS_FADING 1131#ifdef OFF_FOCUS_FADING
1088 // initially we are in unfocused state 1132 // initially we are in unfocused state
1089 if (rs[Rs_fade]) 1133 if (rs[Rs_fade])
… …
1098 * GET TTY CURRENT STATE * 1142 * GET TTY CURRENT STATE *
1099 * ------------------------------------------------------------------------- */ 1143 * ------------------------------------------------------------------------- */
1100void 1144void
1101rxvt_get_ttymode (ttymode_t *tio, int erase) 1145rxvt_get_ttymode (ttymode_t *tio, int erase)
1102{ 1146{
1103#ifdef HAVE_TERMIOS_H
1104 /* 1147 /*
1105 * standard System V termios interface 1148 * standard System V termios interface
1106 */ 1149 */
1107 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1150 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1108 { 1151 {
… …
1175 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1218 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1176# if defined (ECHOCTL) && defined (ECHOKE) 1219# if defined (ECHOCTL) && defined (ECHOKE)
1177 | ECHOCTL | ECHOKE 1220 | ECHOCTL | ECHOKE
1178# endif 1221# endif
1179 | ECHOE | ECHOK); 1222 | ECHOE | ECHOK);
1180# else /* HAVE_TERMIOS_H */
1181
1182 /*
1183 * sgtty interface
1184 */
1185
1186 /* get parameters -- gtty */
1187 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1188 {
1189 tio->sg.sg_erase = CERASE; /* ^H */
1190 tio->sg.sg_kill = CKILL; /* ^U */
1191 }
1192
1193 if (erase != -1)
1194 tio->sg.sg_erase = (char)erase;
1195
1196 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1197
1198 /* get special characters */
1199 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1200 {
1201 tio->tc.t_intrc = CINTR; /* ^C */
1202 tio->tc.t_quitc = CQUIT; /* ^\ */
1203 tio->tc.t_startc = CSTART; /* ^Q */
1204 tio->tc.t_stopc = CSTOP; /* ^S */
1205 tio->tc.t_eofc = CEOF; /* ^D */
1206 tio->tc.t_brkc = -1;
1207 }
1208
1209 /* get local special chars */
1210 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1211 {
1212 tio->lc.t_suspc = CSUSP; /* ^Z */
1213 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1214 tio->lc.t_rprntc = CRPRNT; /* ^R */
1215 tio->lc.t_flushc = CFLUSH; /* ^O */
1216 tio->lc.t_werasc = CWERASE; /* ^W */
1217 tio->lc.t_lnextc = CLNEXT; /* ^V */
1218 }
1219 /* get line discipline */
1220 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1221# ifdef NTTYDISC
1222 tio->line = NTTYDISC;
1223# endif /* NTTYDISC */
1224
1225 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1226#endif /* HAVE_TERMIOS_H */
1227 1223
1228 /* 1224 /*
1229 * Debugging 1225 * Debugging
1230 */ 1226 */
1231#ifdef DEBUG_TTYMODE 1227#ifdef DEBUG_TTYMODE
1232#ifdef HAVE_TERMIOS_H
1233 /* c_iflag bits */ 1228 /* c_iflag bits */
1234 fprintf (stderr, "Input flags\n"); 1229 fprintf (stderr, "Input flags\n");
1235 1230
1236 /* cpp token stringize doesn't work on all machines <sigh> */ 1231 /* cpp token stringize doesn't work on all machines <sigh> */
1237# define FOO(flag,name) \ 1232# define FOO(flag,name) \
… …
1300 FOO (VLNEXT, "VLNEXT"); 1295 FOO (VLNEXT, "VLNEXT");
1301# endif 1296# endif
1302 1297
1303 fprintf (stderr, "\n"); 1298 fprintf (stderr, "\n");
1304# undef FOO 1299# undef FOO
1305# endif /* HAVE_TERMIOS_H */ 1300#endif /* DEBUG_TTYMODE */
1306#endif /* DEBUG_TTYMODE */
1307} 1301}
1308 1302
1309/*----------------------------------------------------------------------*/ 1303/*----------------------------------------------------------------------*/
1310/* 1304/*
1311 * Run the command in a subprocess and return a file descriptor for the 1305 * Run the command in a subprocess and return a file descriptor for the
… …
1332 else 1326 else
1333#endif 1327#endif
1334 if (!pty->get ()) 1328 if (!pty->get ())
1335 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1329 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1336 1330
1331 int er;
1332
1333#ifndef NO_BACKSPACE_KEY
1334 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1335 er = rs[Rs_backspace_key][0];
1336 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1337 er = '\177'; /* the initial state anyway */
1338 else
1339#endif
1340 er = -1;
1341
1342 rxvt_get_ttymode (&tio, er);
1343 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1337 pty->set_utf8_mode (enc_utf8); 1344 pty->set_utf8_mode (enc_utf8);
1338 1345
1339 /* set initial window size */ 1346 /* set initial window size */
1340 tt_winch (); 1347 tt_winch ();
1341
1342 int er;
1343
1344#ifndef NO_BACKSPACE_KEY
1345 if (key_backspace[0] && !key_backspace[1])
1346 er = key_backspace[0];
1347 else if (strcmp (key_backspace, "DEC") == 0)
1348 er = '\177'; /* the initial state anyway */
1349 else
1350#endif
1351 er = -1;
1352
1353 rxvt_get_ttymode (&tio, er);
1354 1348
1355#if ENABLE_FRILLS 1349#if ENABLE_FRILLS
1356 if (rs[Rs_pty_fd]) 1350 if (rs[Rs_pty_fd])
1357 return; 1351 return;
1358#endif 1352#endif
… …
1389 } 1383 }
1390 1384
1391 _exit (EXIT_FAILURE); 1385 _exit (EXIT_FAILURE);
1392 1386
1393 default: 1387 default:
1394 if (!OPTION (Opt_utmpInhibit)) 1388 if (!option (Opt_utmpInhibit))
1395 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1389 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1396 1390
1397 pty->close_tty (); 1391 pty->close_tty ();
1398 1392
1399 child_ev.start (cmd_pid); 1393 child_ev.start (cmd_pid);
1400 1394
… …
1413int 1407int
1414rxvt_term::run_child (const char *const *argv) 1408rxvt_term::run_child (const char *const *argv)
1415{ 1409{
1416 char *login; 1410 char *login;
1417 1411
1418 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1419
1420 if (OPTION (Opt_console)) 1412 if (option (Opt_console))
1413 {
1421 { /* be virtual console, fail silently */ 1414 /* be virtual console, fail silently */
1422#ifdef TIOCCONS 1415#ifdef TIOCCONS
1423 unsigned int on = 1; 1416 unsigned int on = 1;
1424 1417
1425 ioctl (STDIN_FILENO, TIOCCONS, &on); 1418 ioctl (STDIN_FILENO, TIOCCONS, &on);
1426#elif defined (SRIOCSREDIR) 1419#elif defined (SRIOCSREDIR)
… …
1428 1421
1429 fd = open (CONSOLE, O_WRONLY, 0); 1422 fd = open (CONSOLE, O_WRONLY, 0);
1430 if (fd >= 0) 1423 if (fd >= 0)
1431 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1424 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1432 close (fd); 1425 close (fd);
1433#endif /* SRIOCSREDIR */ 1426#endif /* SRIOCSREDIR */
1434 } 1427 }
1435 1428
1436 /* reset signals and spin off the command interpreter */ 1429 /* reset signals and spin off the command interpreter */
1437 signal (SIGINT, SIG_DFL); 1430 signal (SIGINT, SIG_DFL);
1438 signal (SIGQUIT, SIG_DFL); 1431 signal (SIGQUIT, SIG_DFL);
… …
1445 */ 1438 */
1446#ifdef SIGTSTP 1439#ifdef SIGTSTP
1447 signal (SIGTSTP, SIG_IGN); 1440 signal (SIGTSTP, SIG_IGN);
1448 signal (SIGTTIN, SIG_IGN); 1441 signal (SIGTTIN, SIG_IGN);
1449 signal (SIGTTOU, SIG_IGN); 1442 signal (SIGTTOU, SIG_IGN);
1450#endif /* SIGTSTP */ 1443#endif /* SIGTSTP */
1451 1444
1452 // unblock signals (signals are blocked by iom.C 1445 // unblock signals (signals are blocked by iom.C
1453 sigset_t ss; 1446 sigset_t ss;
1454 sigemptyset (&ss); 1447 sigemptyset (&ss);
1455 sigprocmask (SIG_SETMASK, &ss, 0); 1448 sigprocmask (SIG_SETMASK, &ss, 0);
1456 1449
1457 /* command interpreter path */ 1450 /* command interpreter path */
1458 if (argv != NULL) 1451 if (argv)
1459 { 1452 {
1460# ifdef DEBUG_CMD 1453# ifdef DEBUG_CMD
1461 int i; 1454 int i;
1462 1455
1463 for (i = 0; argv[i]; i++) 1456 for (i = 0; argv[i]; i++)
… …
1472 const char *argv0, *shell; 1465 const char *argv0, *shell;
1473 1466
1474 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1467 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1475 shell = "/bin/sh"; 1468 shell = "/bin/sh";
1476 1469
1477 argv0 = (const char *)rxvt_r_basename (shell); 1470 argv0 = (const char *)rxvt_basename (shell);
1478 1471
1479 if (OPTION (Opt_loginShell)) 1472 if (option (Opt_loginShell))
1480 { 1473 {
1481 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1474 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1482 1475
1483 login[0] = '-'; 1476 login[0] = '-';
1484 strcpy (&login[1], argv0); 1477 strcpy (&login[1], argv0);
1485 argv0 = login; 1478 argv0 = login;
1486 } 1479 }
1487 1480
1488 execlp (shell, argv0, NULL); 1481 execlp (shell, argv0, (char *)0);
1489 /* no error message: STDERR is closed! */ 1482 /* no error message: STDERR is closed! */
1490 } 1483 }
1491 1484
1492 return -1; 1485 return -1;
1493} 1486}

Diff Legend

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