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.153 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.233 by ayin, Fri Dec 21 16:21:06 2007 UTC

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

Diff Legend

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