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

Diff Legend

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