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.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 ()
181{ 287{
288 pix_colors = //
182 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 289 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
183#ifdef OFF_FOCUS_FADING 290#ifdef OFF_FOCUS_FADING
184 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 291 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
185#endif 292#endif
186 pix_colors = pix_colors_focused;
187 293
188 if (pix_colors == NULL)
189 return false;
190
191#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
192 pixmap = None;
193#endif
194 294
195 MEvent.time = CurrentTime; 295 MEvent.time = CurrentTime;
196 MEvent.button = AnyButton; 296 MEvent.button = AnyButton;
197 options = DEFAULT_OPTIONS;
198 want_refresh = 1; 297 want_refresh = 1;
199 priv_modes = SavedModes = PrivMode_Default; 298 priv_modes = SavedModes = PrivMode_Default;
200 focus = 0;
201 ncol = 80; 299 ncol = 80;
202 nrow = 24; 300 nrow = 24;
203 int_bwidth = INTERNALBORDERWIDTH; 301 int_bwidth = INTERNALBORDERWIDTH;
204 ext_bwidth = EXTERNALBORDERWIDTH; 302 ext_bwidth = EXTERNALBORDERWIDTH;
205 lineSpace = LINESPACE; 303 lineSpace = LINESPACE;
206 saveLines = SAVELINES; 304 saveLines = SAVELINES;
207 numpix_colors = TOTAL_COLORS; 305 numpix_colors = TOTAL_COLORS;
208 306
209 refresh_limit = 1;
210 refresh_type = SLOW_REFRESH; 307 refresh_type = SLOW_REFRESH;
211 prev_nrow = prev_ncol = 0;
212 308
213 oldcursor.row = oldcursor.col = -1; 309 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; 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);
221 321
222 return true; 322 return true;
223} 323}
224 324
225void 325void
… …
234 if ((i = open ("/dev/null", O_RDONLY)) < 0) 334 if ((i = open ("/dev/null", O_RDONLY)) < 0)
235 { 335 {
236 /* TODO: BOO HISS */ 336 /* TODO: BOO HISS */
237 dup2 (STDERR_FILENO, STDIN_FILENO); 337 dup2 (STDERR_FILENO, STDIN_FILENO);
238 } 338 }
239 else if (i > STDIN_FILENO) 339 else if (i != STDIN_FILENO)
240 { 340 {
241 dup2 (i, STDIN_FILENO); 341 dup2 (i, STDIN_FILENO);
242 close (i); 342 close (i);
243 } 343 }
244 344
… …
259/*----------------------------------------------------------------------*/ 359/*----------------------------------------------------------------------*/
260const char ** 360const char **
261rxvt_term::init_resources (int argc, const char *const *argv) 361rxvt_term::init_resources (int argc, const char *const *argv)
262{ 362{
263 int i, r_argc; 363 int i, r_argc;
264 char *val;
265 const char **cmd_argv, **r_argv; 364 const char **cmd_argv, **r_argv;
266 365
267 /* 366 /*
268 * 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
269 */ 368 */
270 for (r_argc = 0; r_argc < argc; r_argc++) 369 for (r_argc = 0; r_argc < argc; r_argc++)
271 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 370 if (!strcmp (argv[r_argc], "-e"))
272 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 }
273 386
274 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 387 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
275 388
276 for (i = 0; i < r_argc; i++) 389 for (i = 0; i < r_argc; i++)
277 r_argv[i] = (const char *)argv[i]; 390 r_argv[i] = (const char *)argv[i];
278 391
279 r_argv[i] = NULL; 392 r_argv[i] = NULL;
280 393
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]); 394 rs[Rs_name] = rxvt_basename (argv[0]);
294 395
295 /* 396 /*
296 * Open display, get options/resources and create the window 397 * Open display, get options/resources and create the window
297 */ 398 */
298 399
… …
300 rs[Rs_display_name] = ":0"; 401 rs[Rs_display_name] = ":0";
301 402
302 get_options (r_argc, r_argv); 403 get_options (r_argc, r_argv);
303 404
304 if (!(display = displays.get (rs[Rs_display_name]))) 405 if (!(display = displays.get (rs[Rs_display_name])))
406 {
407 free (r_argv);
305 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 }
306 410
411 // using a local pointer decreases code size a lot
412 xa = display->xa;
413
414 set (display);
307 extract_resources (); 415 extract_resources ();
308 416
417#if XFT
418 if (rs[Rs_depth])
419 select_visual (strtol (rs[Rs_depth], 0, 0));
420#endif
421
422#ifdef HAVE_AFTERIMAGE
423 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
424#endif
309 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;
310 430
311#if ENABLE_PERL 431#if ENABLE_PERL
312 if (!rs[Rs_perl_ext_1]) 432 if (!rs[Rs_perl_ext_1])
313 rs[Rs_perl_ext_1] = "default"; 433 rs[Rs_perl_ext_1] = "default";
314 434
… …
325 * set any defaults not already set 445 * set any defaults not already set
326 */ 446 */
327 if (cmd_argv && cmd_argv[0]) 447 if (cmd_argv && cmd_argv[0])
328 { 448 {
329 if (!rs[Rs_title]) 449 if (!rs[Rs_title])
330 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 450 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
331 if (!rs[Rs_iconName]) 451 if (!rs[Rs_iconName])
332 rs[Rs_iconName] = rs[Rs_title]; 452 rs[Rs_iconName] = rs[Rs_title];
333 } 453 }
334 else 454 else
335 { 455 {
… …
373 rs[Rs_cutchars] = CUTCHARS; 493 rs[Rs_cutchars] = CUTCHARS;
374 494
375#ifndef NO_BACKSPACE_KEY 495#ifndef NO_BACKSPACE_KEY
376 if (!rs[Rs_backspace_key]) 496 if (!rs[Rs_backspace_key])
377# ifdef DEFAULT_BACKSPACE 497# ifdef DEFAULT_BACKSPACE
378 key_backspace = DEFAULT_BACKSPACE; 498 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
379# else 499# else
380 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 500 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
381# endif 501# 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 502#endif
390 503
391#ifndef NO_DELETE_KEY 504#ifndef NO_DELETE_KEY
392 if (!rs[Rs_delete_key]) 505 if (!rs[Rs_delete_key])
393# ifdef DEFAULT_DELETE 506# ifdef DEFAULT_DELETE
394 key_delete = DEFAULT_DELETE; 507 rs[Rs_delete_key] = DEFAULT_DELETE;
395# else 508# else
396 key_delete = "\033[3~"; 509 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 510# endif
406 if (rs[Rs_answerbackstring]) 511#endif
407 {
408 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
409 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
410 }
411 512
412#ifdef HAVE_SCROLLBARS 513#ifdef HAVE_SCROLLBARS
413 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]);
414#endif 515#endif
415 516
416#ifdef XTERM_REVERSE_VIDEO 517#ifdef XTERM_REVERSE_VIDEO
417 /* this is how xterm implements reverseVideo */ 518 /* this is how xterm implements reverseVideo */
418 if (OPTION (Opt_reverseVideo)) 519 if (option (Opt_reverseVideo))
419 { 520 {
420 if (!rs[Rs_color + Color_fg]) 521 if (!rs[Rs_color + Color_fg])
421 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 522 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
523
422 if (!rs[Rs_color + Color_bg]) 524 if (!rs[Rs_color + Color_bg])
423 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 525 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
424 } 526 }
425#endif 527#endif
426 528
… …
428 if (!rs[Rs_color + i]) 530 if (!rs[Rs_color + i])
429 rs[Rs_color + i] = def_colorName[i]; 531 rs[Rs_color + i] = def_colorName[i];
430 532
431#ifndef XTERM_REVERSE_VIDEO 533#ifndef XTERM_REVERSE_VIDEO
432 /* this is how we implement reverseVideo */ 534 /* this is how we implement reverseVideo */
433 if (OPTION (Opt_reverseVideo)) 535 if (option (Opt_reverseVideo))
434 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 536 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
435#endif 537#endif
436 538
437 /* convenient aliases for setting fg/bg to colors */ 539 /* convenient aliases for setting fg/bg to colors */
438 color_aliases (Color_fg); 540 color_aliases (Color_fg);
439 color_aliases (Color_bg); 541 color_aliases (Color_bg);
440#ifndef NO_CURSORCOLOR 542#ifndef NO_CURSORCOLOR
441 color_aliases (Color_cursor); 543 color_aliases (Color_cursor);
442 color_aliases (Color_cursor2); 544 color_aliases (Color_cursor2);
443#endif /* NO_CURSORCOLOR */ 545#endif /* NO_CURSORCOLOR */
444 color_aliases (Color_pointer_fg); 546 color_aliases (Color_pointer_fg);
445 color_aliases (Color_pointer_bg); 547 color_aliases (Color_pointer_bg);
446 color_aliases (Color_border); 548 color_aliases (Color_border);
447#ifndef NO_BOLD_UNDERLINE_REVERSE 549#ifndef NO_BOLD_UNDERLINE_REVERSE
448 color_aliases (Color_BD); 550 color_aliases (Color_BD);
449 color_aliases (Color_UL); 551 color_aliases (Color_UL);
450 color_aliases (Color_RV); 552 color_aliases (Color_RV);
451#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 553#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
452 554
453 if (!rs[Rs_color + Color_border]) 555 if (!rs[Rs_color + Color_border])
454 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 556 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
455 557
456 return cmd_argv; 558 return cmd_argv;
… …
459/*----------------------------------------------------------------------*/ 561/*----------------------------------------------------------------------*/
460void 562void
461rxvt_term::init_env () 563rxvt_term::init_env ()
462{ 564{
463 int i; 565 int i;
464 unsigned int u;
465 char *val; 566 char *val;
466 567
467#ifdef DISPLAY_IS_IP 568#ifdef DISPLAY_IS_IP
468 /* Fixup display_name for export over pty to any interested terminal 569 /* 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 570 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
477 */ 578 */
478 val = rxvt_network_display (rs[Rs_display_name]); 579 val = rxvt_network_display (rs[Rs_display_name]);
479 rs[Rs_display_name] = (const char *)val; 580 rs[Rs_display_name] = (const char *)val;
480 581
481 if (val == NULL) 582 if (val == NULL)
482#endif /* DISPLAY_IS_IP */ 583#endif /* DISPLAY_IS_IP */
483 val = XDisplayString (display->display); 584 val = XDisplayString (dpy);
484 585
485 if (rs[Rs_display_name] == NULL) 586 if (rs[Rs_display_name] == NULL)
486 rs[Rs_display_name] = val; /* use broken `:0' value */ 587 rs[Rs_display_name] = val; /* use broken `:0' value */
487 588
488 i = strlen (val); 589 i = strlen (val);
489 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 590 env_display = (char *)rxvt_malloc (i + 9);
490 591
491 sprintf (env_display, "DISPLAY=%s", val); 592 sprintf (env_display, "DISPLAY=%s", val);
492 593
493 /* avoiding the math library: 594 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 595
503 /* add entries to the environment: 596 /* add entries to the environment:
504 * @ DISPLAY: in case we started with -display 597 * @ DISPLAY: in case we started with -display
505 * @ WINDOWID: X window id number of the window 598 * @ WINDOWID: X window id number of the window
506 * @ COLORTERM: terminal sub-name and also indicates its color 599 * @ COLORTERM: terminal sub-name and also indicates its color
… …
508 * @ TERMINFO: path to terminfo directory 601 * @ TERMINFO: path to terminfo directory
509 * @ COLORFGBG: fg;bg color codes 602 * @ COLORFGBG: fg;bg color codes
510 */ 603 */
511 putenv (env_display); 604 putenv (env_display);
512 putenv (env_windowid); 605 putenv (env_windowid);
606
513 if (env_colorfgbg) 607 if (env_colorfgbg)
514 putenv (env_colorfgbg); 608 putenv (env_colorfgbg);
515 609
516#ifdef RXVT_TERMINFO 610#ifdef RXVT_TERMINFO
517 putenv ("TERMINFO=" RXVT_TERMINFO); 611 putenv ("TERMINFO=" RXVT_TERMINFO);
518#endif 612#endif
519 613
520 if (display->depth <= 2) 614 if (depth <= 2)
521 putenv ("COLORTERM=" COLORTERMENV "-mono"); 615 putenv ("COLORTERM=" COLORTERMENV "-mono");
522 else 616 else
523 putenv ("COLORTERM=" COLORTERMENVFULL); 617 putenv ("COLORTERM=" COLORTERMENVFULL);
524 618
525 if (rs[Rs_term_name] != NULL) 619 if (rs[Rs_term_name] != NULL)
526 { 620 {
527 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);
528 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 622 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
529 putenv (env_term); 623 putenv (env_term);
530 } 624 }
531 else 625 else
532 putenv ("TERM=" TERMENV); 626 putenv ("TERM=" TERMENV);
… …
534#ifdef HAVE_UNSETENV 628#ifdef HAVE_UNSETENV
535 /* avoid passing old settings and confusing term size */ 629 /* avoid passing old settings and confusing term size */
536 unsetenv ("LINES"); 630 unsetenv ("LINES");
537 unsetenv ("COLUMNS"); 631 unsetenv ("COLUMNS");
538 unsetenv ("TERMCAP"); /* terminfo should be okay */ 632 unsetenv ("TERMCAP"); /* terminfo should be okay */
539#endif /* HAVE_UNSETENV */ 633#endif /* HAVE_UNSETENV */
540} 634}
541 635
542/*----------------------------------------------------------------------*/ 636/*----------------------------------------------------------------------*/
543/* 637/*
544 * This is more or less stolen straight from XFree86 xterm. 638 * This is more or less stolen straight from XFree86 xterm.
… …
565 659
566 this->locale = "C"; 660 this->locale = "C";
567 } 661 }
568 662
569 663
570 this->locale = rxvt_strdup (this->locale); 664 this->locale = strdup (this->locale);
571 SET_LOCALE (this->locale); 665 SET_LOCALE (this->locale);
572 mbstate.reset (); 666 mbstate.reset ();
573#endif 667#endif
574 668
575#if HAVE_NL_LANGINFO 669#if HAVE_NL_LANGINFO
… …
619 * Initialize the command connection. 713 * Initialize the command connection.
620 * This should be called after the X server connection is established. 714 * This should be called after the X server connection is established.
621 */ 715 */
622 716
623#ifdef META8_OPTION 717#ifdef META8_OPTION
624 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 718 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
625#endif 719#endif
626 720
627 get_ourmods (); 721 get_ourmods ();
628 722
629 if (!OPTION (Opt_scrollTtyOutput)) 723 if (!option (Opt_scrollTtyOutput))
630 priv_modes |= PrivMode_TtyOutputInh; 724 priv_modes |= PrivMode_TtyOutputInh;
631 if (OPTION (Opt_scrollTtyKeypress)) 725 if (option (Opt_scrollTtyKeypress))
632 priv_modes |= PrivMode_Keypress; 726 priv_modes |= PrivMode_Keypress;
633 if (!OPTION (Opt_jumpScroll)) 727 if (!option (Opt_jumpScroll))
634 priv_modes |= PrivMode_smoothScroll; 728 priv_modes |= PrivMode_smoothScroll;
635 729
636#ifndef NO_BACKSPACE_KEY 730#ifndef NO_BACKSPACE_KEY
637 if (strcmp (key_backspace, "DEC") == 0) 731 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
638 priv_modes |= PrivMode_HaveBackSpace; 732 priv_modes |= PrivMode_HaveBackSpace;
639#endif 733#endif
640 734
641 /* add value for scrollBar */ 735 /* add value for scrollBar */
642 if (scrollBar.state) 736 if (scrollBar.state)
… …
655 int i; 749 int i;
656 750
657#ifdef OFF_FOCUS_FADING 751#ifdef OFF_FOCUS_FADING
658 pix_colors = pix_colors_focused; 752 pix_colors = pix_colors_focused;
659#endif 753#endif
660 754
661 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
662 { 756 {
757 const char *name = rs[Rs_color + i];
758
759 if (!name)
760 continue;
761
663 rxvt_color xcol; 762 rxvt_color xcol;
664 763
665 if (!rs[Rs_color + i]) 764 if (!set_color (xcol, name))
666 continue;
667
668 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
669 { 765 {
670#ifndef XTERM_REVERSE_VIDEO 766#ifndef XTERM_REVERSE_VIDEO
671 if (i < 2 && OPTION (Opt_reverseVideo)) 767 if (i < 2 && option (Opt_reverseVideo))
672 rs[Rs_color + i] = def_colorName[!i]; 768 name = def_colorName [1 - i];
673 else 769 else
674#endif 770#endif
675 rs[Rs_color + i] = def_colorName[i]; 771 name = def_colorName [i];
676 772
677 if (!rs[Rs_color + i]) 773 if (!name)
678 continue; 774 continue;
679 775
680 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 776 if (!set_color (xcol, name))
681 { 777 {
682 switch (i) 778 switch (i)
683 { 779 {
684 case Color_fg: 780 case Color_fg:
685 case Color_bg: 781 case Color_bg:
686 /* fatal: need bg/fg color */
687 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 782 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
688 /* NOTREACHED */ 783 name = "";
689 break; 784 break;
690#ifndef NO_CURSORCOLOR 785#ifndef NO_CURSORCOLOR
691 case Color_cursor2: 786 case Color_cursor2:
692 xcol = pix_colors[Color_fg]; 787#endif
693 break;
694#endif /* ! NO_CURSORCOLOR */
695 case Color_pointer_fg: 788 case Color_pointer_fg:
696 xcol = pix_colors[Color_fg]; 789 name = rs[Rs_color + Color_fg];
790 xcol.set (this, name);
697 break; 791 break;
698 default: 792 default:
699 xcol = pix_colors[Color_bg]; /* None */ 793 name = rs[Rs_color + Color_bg];
794 xcol.set (this, name);
700 break; 795 break;
701 } 796 }
702 } 797 }
703 } 798 }
704 799
705 pix_colors[i] = xcol; 800 pix_colors[i] = xcol;
706 SET_PIXCOLOR (i); 801 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 { 802 }
803
804 if (depth <= 2)
805 {
717 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);
718 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);
719 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);
720 } 809 }
721 810
722 /* 811 /*
723 * get scrollBar shadow colors 812 * get scrollBar shadow colors
724 * 813 *
725 * The calculations of topShadow/bottomShadow values are adapted 814 * The calculations of topShadow/bottomShadow values are adapted
726 * from the fvwm window manager. 815 * from the fvwm window manager.
727 */ 816 */
728#ifdef KEEP_SCROLLCOLOR 817#ifdef KEEP_SCROLLCOLOR
729
730 if (display->depth <= 2) 818 if (depth <= 2)
731 { 819 {
732 /* Monochrome */ 820 /* Monochrome */
733 pix_colors[Color_scroll] = pix_colors[Color_fg]; 821 alias_color (Color_scroll, Color_fg);
734 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 822 alias_color (Color_topShadow, Color_bg);
735 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 823 alias_color (Color_bottomShadow, Color_bg);
736 } 824 }
737 else 825 else
738 { 826 {
739 rxvt_color xcol[2]; 827 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 828
744 xcol[1] = pix_colors[Color_scroll]; 829 rgba cscroll;
745 xcol[0].set (display, 65535, 65535, 65535); 830 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 831
754 /* topShadowColor */ 832 /* topShadowColor */
755 if (!xcol[1].set (display, 833 if (!pix_colors[Color_topShadow].set (this,
756 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 834 rgba (
757 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 835 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
758 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 836 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
759 xcol[1] = pix_colors[Color_White]; 837 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
760 838 cscroll.a)
761 pix_colors[Color_topShadow] = xcol[1]; 839 ))
840 alias_color (Color_topShadow, Color_White);
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 (display->display); 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 (display->display, 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 dDisp;
890 970
891 xa = display->xa; 971 dLocal (Display *, dpy);
892 972
893 /* grab colors before netscape does */ 973 /* grab colors before netscape does */
894 Get_Colours (); 974 Get_Colours ();
895 975
896 if (!set_fonts ()) 976 if (!set_fonts ())
897 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");
898 978
899 parent = display->root; 979 parent = display->root;
900 980
901 attributes.override_redirect = !!OPTION (Opt_override_redirect); 981 attributes.override_redirect = !!option (Opt_override_redirect);
902 982
903#if ENABLE_FRILLS 983#if ENABLE_FRILLS
904 if (OPTION (Opt_borderLess)) 984 if (option (Opt_borderLess))
905 { 985 {
906 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) 986 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
907 { 987 {
908 /* 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");
909 attributes.override_redirect = TRUE; 989 attributes.override_redirect = true;
910 mwmhints.flags = 0;
911 } 990 }
912 else 991 else
913 { 992 {
914 mwmhints.flags = MWM_HINTS_DECORATIONS; 993 mwmhints.flags = MWM_HINTS_DECORATIONS;
915 mwmhints.decorations = 0;
916 } 994 }
917 } 995 }
918 else
919 mwmhints.flags = 0;
920#endif 996#endif
921 997
922#if ENABLE_XEMBED 998#if ENABLE_XEMBED
923 if (rs[Rs_embed]) 999 if (rs[Rs_embed])
924 { 1000 {
925 XWindowAttributes wattr; 1001 XWindowAttributes wattr;
926 1002
927 parent = strtol (rs[Rs_embed], 0, 0); 1003 parent = strtol (rs[Rs_embed], 0, 0);
928 1004
929 if (!XGetWindowAttributes (disp, parent, &wattr)) 1005 if (!XGetWindowAttributes (dpy, parent, &wattr))
930 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1006 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
931 1007
932 window_calc (wattr.width, wattr.height); 1008 window_calc (wattr.width, wattr.height);
933 } 1009 }
934#endif 1010#endif
935 1011
936 window_calc (0, 0); 1012 window_calc (0, 0);
937 1013
938 /* sub-window placement & size in rxvt_resize_subwindows () */ 1014 /* sub-window placement & size in rxvt_resize_subwindows () */
939 attributes.background_pixel = pix_colors_focused[Color_border]; 1015 attributes.background_pixel = pix_colors_focused [Color_border];
940 attributes.border_pixel = pix_colors_focused[Color_border]; 1016 attributes.border_pixel = pix_colors_focused [Color_border];
941 attributes.colormap = display->cmap; 1017 attributes.colormap = cmap;
942 1018
943 top = XCreateWindow (disp, parent, 1019 top = XCreateWindow (dpy, parent,
944 szHint.x, szHint.y, 1020 szHint.x, szHint.y,
945 szHint.width, szHint.height, 1021 szHint.width, szHint.height,
946 ext_bwidth, 1022 ext_bwidth,
947 display->depth, InputOutput, 1023 depth, InputOutput, visual,
948 display->visual,
949 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1024 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
950 &attributes); 1025 &attributes);
951 1026
952 this->parent[0] = top; 1027 this->parent[0] = top;
953 1028
… …
960 classHint.res_name = (char *)rs[Rs_name]; 1035 classHint.res_name = (char *)rs[Rs_name];
961 classHint.res_class = (char *)RESCLASS; 1036 classHint.res_class = (char *)RESCLASS;
962 1037
963 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1038 wmHint.flags = InputHint | StateHint | WindowGroupHint;
964 wmHint.input = True; 1039 wmHint.input = True;
965 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1040 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
966 wmHint.window_group = top; 1041 wmHint.window_group = top;
967 1042
968 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1043 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
969 &szHint, &wmHint, &classHint); 1044 &szHint, &wmHint, &classHint);
970 1045
971#if ENABLE_FRILLS 1046#if ENABLE_FRILLS
972 if (mwmhints.flags) 1047 if (mwmhints.flags)
973 XChangeProperty (disp, 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,
974 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1049 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
975#endif 1050#endif
976 1051
977 Atom protocols[] = { 1052 Atom protocols[] = {
978 xa[XA_WM_DELETE_WINDOW], 1053 xa[XA_WM_DELETE_WINDOW],
979#if ENABLE_EWMH 1054#if ENABLE_EWMH
980 xa[XA_NET_WM_PING], 1055 xa[XA_NET_WM_PING],
981#endif 1056#endif
982 }; 1057 };
983 1058
984 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1059 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
985 1060
986#if ENABLE_FRILLS 1061#if ENABLE_FRILLS
987 if (rs[Rs_transient_for]) 1062 if (rs[Rs_transient_for])
988 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1063 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
989#endif 1064#endif
990 1065
991#if ENABLE_EWMH 1066#if ENABLE_EWMH
992 long pid = getpid (); 1067 long pid = getpid ();
993 1068
994 XChangeProperty (disp, top, 1069 XChangeProperty (dpy, top,
995 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1070 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
996 PropModeReplace, (unsigned char *)&pid, 1); 1071 PropModeReplace, (unsigned char *)&pid, 1);
997 1072
998 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1073 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
999#endif 1074#endif
1000 1075
1001 XSelectInput (disp, top, 1076 XSelectInput (dpy, top,
1002 KeyPressMask 1077 KeyPressMask
1003#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1078#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1004 | KeyReleaseMask 1079 | KeyReleaseMask
1005#endif 1080#endif
1006 | FocusChangeMask | VisibilityChangeMask 1081 | FocusChangeMask | VisibilityChangeMask
1007 | ExposureMask | StructureNotifyMask); 1082 | ExposureMask | StructureNotifyMask);
1008 1083
1009 termwin_ev.start (display, top); 1084 termwin_ev.start (display, top);
1010 1085
1011 /* 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 */
1012 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1087 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1013 1088
1014#ifdef HAVE_SCROLLBARS 1089#ifdef HAVE_SCROLLBARS
1015 /* cursor scrollBar: Black-on-White */ 1090 /* cursor scrollBar: Black-on-White */
1016 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1091 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1017#endif 1092#endif
1018 1093
1019 /* the vt window */ 1094 /* the vt window */
1020 vt = XCreateSimpleWindow (disp, top, 1095 vt = XCreateSimpleWindow (dpy, top,
1021 window_vt_x, window_vt_y, 1096 window_vt_x, window_vt_y,
1022 width, height, 1097 width, height,
1023 0, 1098 0,
1024 pix_colors_focused[Color_fg], 1099 pix_colors_focused[Color_fg],
1025 pix_colors_focused[Color_bg]); 1100 pix_colors_focused[Color_bg]);
1026 1101
1027 attributes.bit_gravity = NorthWestGravity; 1102 attributes.bit_gravity = NorthWestGravity;
1028 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1103 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1029 1104
1030 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1105 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1031 1106
1032 if (OPTION (Opt_pointerBlank)) 1107 if (option (Opt_pointerBlank))
1033 vt_emask |= PointerMotionMask; 1108 vt_emask |= PointerMotionMask;
1034 else 1109 else
1035 vt_emask |= Button1MotionMask | Button3MotionMask; 1110 vt_emask |= Button1MotionMask | Button3MotionMask;
1036 1111
1037 vt_select_input (); 1112 vt_select_input ();
1038 1113
1039 vt_ev.start (display, vt); 1114 vt_ev.start (display, vt);
1040 1115
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 */ 1116 /* graphics context for the vt window */
1059 gcvalue.foreground = pix_colors[Color_fg]; 1117 gcvalue.foreground = pix_colors[Color_fg];
1060 gcvalue.background = pix_colors[Color_bg]; 1118 gcvalue.background = pix_colors[Color_bg];
1061 gcvalue.graphics_exposures = 1; 1119 gcvalue.graphics_exposures = 0;
1062 1120
1063 gc = XCreateGC (disp, vt, 1121 gc = XCreateGC (dpy, vt,
1064 GCForeground | GCBackground | GCGraphicsExposures, 1122 GCForeground | GCBackground | GCGraphicsExposures,
1065 &gcvalue); 1123 &gcvalue);
1066 1124
1067 drawable = new rxvt_drawable (display, vt); 1125 drawable = new rxvt_drawable (this, vt);
1068 1126
1069#ifdef RXVT_SCROLLBAR 1127#ifdef RXVT_SCROLLBAR
1070 gcvalue.foreground = pix_colors[Color_topShadow]; 1128 gcvalue.foreground = pix_colors[Color_topShadow];
1071 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1129 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1072 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1130 gcvalue.foreground = pix_colors[Color_bottomShadow];
1073 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1131 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1074 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1132 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1075 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1133 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1076#endif 1134#endif
1077 1135
1078#ifdef OFF_FOCUS_FADING 1136#ifdef OFF_FOCUS_FADING
1079 // initially we are in unfocused state 1137 // initially we are in unfocused state
1080 if (rs[Rs_fade]) 1138 if (rs[Rs_fade])
… …
1089 * GET TTY CURRENT STATE * 1147 * GET TTY CURRENT STATE *
1090 * ------------------------------------------------------------------------- */ 1148 * ------------------------------------------------------------------------- */
1091void 1149void
1092rxvt_get_ttymode (ttymode_t *tio, int erase) 1150rxvt_get_ttymode (ttymode_t *tio, int erase)
1093{ 1151{
1094#ifdef HAVE_TERMIOS_H
1095 /* 1152 /*
1096 * standard System V termios interface 1153 * standard System V termios interface
1097 */ 1154 */
1098 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1155 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1099 { 1156 {
… …
1166 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1223 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1167# if defined (ECHOCTL) && defined (ECHOKE) 1224# if defined (ECHOCTL) && defined (ECHOKE)
1168 | ECHOCTL | ECHOKE 1225 | ECHOCTL | ECHOKE
1169# endif 1226# endif
1170 | ECHOE | ECHOK); 1227 | 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 1228
1219 /* 1229 /*
1220 * Debugging 1230 * Debugging
1221 */ 1231 */
1222#ifdef DEBUG_TTYMODE 1232#ifdef DEBUG_TTYMODE
1223#ifdef HAVE_TERMIOS_H
1224 /* c_iflag bits */ 1233 /* c_iflag bits */
1225 fprintf (stderr, "Input flags\n"); 1234 fprintf (stderr, "Input flags\n");
1226 1235
1227 /* cpp token stringize doesn't work on all machines <sigh> */ 1236 /* cpp token stringize doesn't work on all machines <sigh> */
1228# define FOO(flag,name) \ 1237# define FOO(flag,name) \
… …
1291 FOO (VLNEXT, "VLNEXT"); 1300 FOO (VLNEXT, "VLNEXT");
1292# endif 1301# endif
1293 1302
1294 fprintf (stderr, "\n"); 1303 fprintf (stderr, "\n");
1295# undef FOO 1304# undef FOO
1296# endif /* HAVE_TERMIOS_H */ 1305#endif /* DEBUG_TTYMODE */
1297#endif /* DEBUG_TTYMODE */
1298} 1306}
1299 1307
1300/*----------------------------------------------------------------------*/ 1308/*----------------------------------------------------------------------*/
1301/* 1309/*
1302 * 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
… …
1323 else 1331 else
1324#endif 1332#endif
1325 if (!pty->get ()) 1333 if (!pty->get ())
1326 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1334 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1327 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 */
1328 pty->set_utf8_mode (enc_utf8); 1349 pty->set_utf8_mode (enc_utf8);
1329 1350
1330 /* set initial window size */ 1351 /* set initial window size */
1331 tt_winch (); 1352 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 1353
1346#if ENABLE_FRILLS 1354#if ENABLE_FRILLS
1347 if (rs[Rs_pty_fd]) 1355 if (rs[Rs_pty_fd])
1348 return; 1356 return;
1349#endif 1357#endif
… …
1380 } 1388 }
1381 1389
1382 _exit (EXIT_FAILURE); 1390 _exit (EXIT_FAILURE);
1383 1391
1384 default: 1392 default:
1385 if (!OPTION (Opt_utmpInhibit)) 1393 if (!option (Opt_utmpInhibit))
1386 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1394 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1387 1395
1388 pty->close_tty (); 1396 pty->close_tty ();
1389 1397
1390 child_ev.start (cmd_pid); 1398 child_ev.start (cmd_pid);
1391 1399
… …
1404int 1412int
1405rxvt_term::run_child (const char *const *argv) 1413rxvt_term::run_child (const char *const *argv)
1406{ 1414{
1407 char *login; 1415 char *login;
1408 1416
1409 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1410
1411 if (OPTION (Opt_console)) 1417 if (option (Opt_console))
1418 {
1412 { /* be virtual console, fail silently */ 1419 /* be virtual console, fail silently */
1413#ifdef TIOCCONS 1420#ifdef TIOCCONS
1414 unsigned int on = 1; 1421 unsigned int on = 1;
1415 1422
1416 ioctl (STDIN_FILENO, TIOCCONS, &on); 1423 ioctl (STDIN_FILENO, TIOCCONS, &on);
1417#elif defined (SRIOCSREDIR) 1424#elif defined (SRIOCSREDIR)
… …
1419 1426
1420 fd = open (CONSOLE, O_WRONLY, 0); 1427 fd = open (CONSOLE, O_WRONLY, 0);
1421 if (fd >= 0) 1428 if (fd >= 0)
1422 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1429 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1423 close (fd); 1430 close (fd);
1424#endif /* SRIOCSREDIR */ 1431#endif /* SRIOCSREDIR */
1425 } 1432 }
1426 1433
1427 /* reset signals and spin off the command interpreter */ 1434 /* reset signals and spin off the command interpreter */
1428 signal (SIGINT, SIG_DFL); 1435 signal (SIGINT, SIG_DFL);
1429 signal (SIGQUIT, SIG_DFL); 1436 signal (SIGQUIT, SIG_DFL);
… …
1436 */ 1443 */
1437#ifdef SIGTSTP 1444#ifdef SIGTSTP
1438 signal (SIGTSTP, SIG_IGN); 1445 signal (SIGTSTP, SIG_IGN);
1439 signal (SIGTTIN, SIG_IGN); 1446 signal (SIGTTIN, SIG_IGN);
1440 signal (SIGTTOU, SIG_IGN); 1447 signal (SIGTTOU, SIG_IGN);
1441#endif /* SIGTSTP */ 1448#endif /* SIGTSTP */
1442 1449
1443 // unblock signals (signals are blocked by iom.C 1450 // unblock signals (signals are blocked by iom.C
1444 sigset_t ss; 1451 sigset_t ss;
1445 sigemptyset (&ss); 1452 sigemptyset (&ss);
1446 sigprocmask (SIG_SETMASK, &ss, 0); 1453 sigprocmask (SIG_SETMASK, &ss, 0);
1447 1454
1448 /* command interpreter path */ 1455 /* command interpreter path */
1449 if (argv != NULL) 1456 if (argv)
1450 { 1457 {
1451# ifdef DEBUG_CMD 1458# ifdef DEBUG_CMD
1452 int i; 1459 int i;
1453 1460
1454 for (i = 0; argv[i]; i++) 1461 for (i = 0; argv[i]; i++)
… …
1463 const char *argv0, *shell; 1470 const char *argv0, *shell;
1464 1471
1465 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1472 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1466 shell = "/bin/sh"; 1473 shell = "/bin/sh";
1467 1474
1468 argv0 = (const char *)rxvt_r_basename (shell); 1475 argv0 = (const char *)rxvt_basename (shell);
1469 1476
1470 if (OPTION (Opt_loginShell)) 1477 if (option (Opt_loginShell))
1471 { 1478 {
1472 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1479 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1473 1480
1474 login[0] = '-'; 1481 login[0] = '-';
1475 strcpy (&login[1], argv0); 1482 strcpy (&login[1], argv0);
1476 argv0 = login; 1483 argv0 = login;
1477 } 1484 }
1478 1485
1479 execlp (shell, argv0, NULL); 1486 execlp (shell, argv0, (char *)0);
1480 /* no error message: STDERR is closed! */ 1487 /* no error message: STDERR is closed! */
1481 } 1488 }
1482 1489
1483 return -1; 1490 return -1;
1484} 1491}

Diff Legend

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