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.159 by root, Mon Jan 30 02:21:20 2006 UTC vs.
Revision 1.228 by ayin, Wed Dec 12 23:50:00 2007 UTC

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

Diff Legend

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