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

Diff Legend

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