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

Diff Legend

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