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

Diff Legend

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