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.160 by root, Mon Jan 30 19:46:13 2006 UTC vs.
Revision 1.262 by sf-exg, Sun Jan 31 09:02:48 2010 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-2008 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.
… …
33 34
34#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 37#include "rxvtutil.h"
37#include "init.h" 38#include "init.h"
39#include "keyboard.h"
38 40
39#include <limits> 41#include <limits>
40 42
41#include <csignal> 43#include <csignal>
44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h>
58#endif
59
60#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h>
63#include <sys/socket.h>
64
65/* these next two are probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h>
68#endif
69#ifdef HAVE_SYS_BYTEORDER_H
70#include <sys/byteorder.h>
71#endif
72
73#include <netinet/in.h>
74#include <arpa/inet.h>
75#include <net/if.h>
76#include <net/if_arp.h>
77
78static char *
79rxvt_network_display (const char *display)
80{
81 char buffer[1024], *rval = NULL;
82 struct ifconf ifc;
83 struct ifreq *ifr;
84 int i, skfd;
85
86 if (display[0] != ':' && strncmp (display, "unix:", 5))
87 return (char *) display; /* nothing to do */
88
89 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
90 ifc.ifc_buf = buffer;
91
92 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
93 {
94 perror ("socket");
95 return NULL;
96 }
97
98 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
99 {
100 perror ("SIOCGIFCONF");
101 close (skfd);
102 return NULL;
103 }
104
105 for (i = 0, ifr = ifc.ifc_req;
106 i < (ifc.ifc_len / sizeof (struct ifreq));
107 i++, ifr++)
108 {
109 struct ifreq ifr2;
110
111 strcpy (ifr2.ifr_name, ifr->ifr_name);
112
113 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
114 {
115 unsigned long addr;
116 struct sockaddr_in *p_addr;
117
118 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
119 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
120
121 /*
122 * not "0.0.0.0" or "127.0.0.1" - so format the address
123 */
124 if (addr && addr != 0x7F000001)
125 {
126 char *colon = strchr (display, ':');
127
128 if (colon == NULL)
129 colon = ":0.0";
130
131 rval = rxvt_malloc (strlen (colon) + 16);
132 sprintf (rval, "%d.%d.%d.%d%s",
133 (int) ((addr >> 030) & 0xFF),
134 (int) ((addr >> 020) & 0xFF),
135 (int) ((addr >> 010) & 0xFF),
136 (int) (addr & 0xFF), colon);
137 break;
138 }
139 }
140 }
141
142 close (skfd);
143
144 return rval;
145}
146#endif
42 147
43const char *const def_colorName[] = 148const char *const def_colorName[] =
44 { 149 {
45 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
47 /* low-intensity colors */ 152 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 153 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 154 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 157 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 161 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 162# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 164# endif
60 /* high-intensity colors */ 165 /* high-intensity colors */
61# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
62 "rgb:4d/4d/4d", // 8: bright black (Grey30) 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
146 "rgb:e7/e7/e7", 251 "rgb:e7/e7/e7",
147 252
148#ifndef NO_CURSORCOLOR 253#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 254 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 255 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 256#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 257 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 258 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 259 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 260#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 261 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 262 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 263 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 264 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 265#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 266#if ENABLE_FRILLS
162 NULL, // Color_underline 267 NULL, // Color_underline
163#endif 268#endif
164#ifdef OPTION_HC 269#ifdef OPTION_HC
165 NULL, 270 NULL,
166#endif 271#endif
167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 274 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 275#endif
171#if TINTING 276#if ENABLE_TRANSPARENCY
172 NULL, 277 NULL,
173#endif 278#endif
174#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 280 "rgb:00/00/00",
176#endif 281#endif
177 }; 282 };
178 283
179bool 284void
180rxvt_term::init_vars () 285rxvt_term::init_vars ()
181{ 286{
182 pix_colors = // 287 pix_colors = pix_colors_focused;
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif
187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 288
192 MEvent.time = CurrentTime; 289 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 290 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 291 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 292 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 293 ncol = 80;
198 nrow = 24; 294 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
298 letterSpace = LETTERSPACE;
202 saveLines = SAVELINES; 299 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS;
204 300
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 301 refresh_type = SLOW_REFRESH;
207 302
208 oldcursor.row = oldcursor.col = -1; 303 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50;
212 bgPixmap.pixmap = None;
213#endif
214 304
215 last_bot = last_state = -1; 305 set_option (Opt_scrollBar);
216 306 set_option (Opt_scrollTtyOutput);
217 return true; 307 set_option (Opt_jumpScroll);
308 set_option (Opt_skipScroll);
309 set_option (Opt_secondaryScreen);
310 set_option (Opt_secondaryScroll);
311 set_option (Opt_pastableTabs);
312 set_option (Opt_intensityStyles);
313 set_option (Opt_iso14755);
314 set_option (Opt_iso14755_52);
315 set_option (Opt_buffered);
218} 316}
219 317
220void 318static void
221rxvt_term::init_secondary () 319init_secondary ()
222{ 320{
223 int i; 321 int i;
224 322
225 /*
226 * Close all unused file descriptors
227 * We don't want them, we don't need them.
228 */
229 if ((i = open ("/dev/null", O_RDONLY)) < 0) 323 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 { 324 {
231 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO); 325 dup2 (STDERR_FILENO, STDIN_FILENO);
233 } 326 }
234 else if (i > STDIN_FILENO) 327 else if (i != STDIN_FILENO)
235 { 328 {
236 dup2 (i, STDIN_FILENO); 329 dup2 (i, STDIN_FILENO);
237 close (i); 330 close (i);
238 } 331 }
239 332
240 dup2 (STDERR_FILENO, STDOUT_FILENO); 333 dup2 (STDERR_FILENO, STDOUT_FILENO);
241
242#if 0 // schmorp sayz closing filies is murder
243 for (i = STDERR_FILENO + 1; i < num_fds; i++)
244 {
245#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
246 if (i == 4 || i == 7)
247 continue;
248#endif
249 close (i);
250 }
251#endif
252} 334}
253 335
254/*----------------------------------------------------------------------*/ 336/*----------------------------------------------------------------------*/
255const char ** 337const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 338rxvt_term::init_resources (int argc, const char *const *argv)
257{ 339{
258 int i, r_argc; 340 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 341 const char **cmd_argv, **r_argv;
261 342
262 /* 343 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 344 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 345 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 346 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 347 if (!strcmp (argv[r_argc], "-e"))
267 break; 348 break;
349
350 if (r_argc == argc)
351 cmd_argv = NULL;
352 else if (!argv[r_argc + 1])
353 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
354 else
355 {
356 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
357
358 for (i = 0; i < argc - r_argc - 1; i++)
359 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
360
361 cmd_argv[i] = NULL;
362 }
268 363
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 364 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 365
271 for (i = 0; i < r_argc; i++) 366 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 367 r_argv[i] = (const char *)argv[i];
273 368
274 r_argv[i] = NULL; 369 r_argv[i] = NULL;
275 370
276 if (r_argc == argc)
277 cmd_argv = NULL;
278 else
279 {
280 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
281
282 for (i = 0; i < argc - r_argc - 1; i++)
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284
285 cmd_argv[i] = NULL;
286 }
287
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 371 rs[Rs_name] = rxvt_basename (argv[0]);
289 372
290 /* 373 /*
291 * Open display, get options/resources and create the window 374 * Open display, get options/resources and create the window
292 */ 375 */
293 376
… …
295 rs[Rs_display_name] = ":0"; 378 rs[Rs_display_name] = ":0";
296 379
297 get_options (r_argc, r_argv); 380 get_options (r_argc, r_argv);
298 381
299 if (!(display = displays.get (rs[Rs_display_name]))) 382 if (!(display = displays.get (rs[Rs_display_name])))
383 {
384 free (r_argv);
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 385 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
386 }
301 387
388 // using a local pointer decreases code size a lot
302 xa = display->xa; 389 xa = display->xa;
303 390
304#if ENABLE_FRILLS 391 set (display);
392 extract_resources ();
393
394#if XFT
305 if (rs[Rs_depth]) 395 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0)); 396 select_visual (strtol (rs[Rs_depth], 0, 0));
307 else
308#endif 397#endif
309 set (display);
310
311 extract_resources ();
312 398
313 free (r_argv); 399 free (r_argv);
400
401 for (int i = NUM_RESOURCES; i--; )
402 if (rs [i] == resval_undef)
403 rs [i] = 0;
404
405#ifdef HAVE_AFTERIMAGE
406 set_application_name ((char *)rs[Rs_name]);
407 set_output_threshold (OUTPUT_LEVEL_WARNING);
408#endif
314 409
315#if ENABLE_PERL 410#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1]) 411 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default"; 412 rs[Rs_perl_ext_1] = "default";
318 413
… …
329 * set any defaults not already set 424 * set any defaults not already set
330 */ 425 */
331 if (cmd_argv && cmd_argv[0]) 426 if (cmd_argv && cmd_argv[0])
332 { 427 {
333 if (!rs[Rs_title]) 428 if (!rs[Rs_title])
334 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 429 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
430
335 if (!rs[Rs_iconName]) 431 if (!rs[Rs_iconName])
336 rs[Rs_iconName] = rs[Rs_title]; 432 rs[Rs_iconName] = rs[Rs_title];
337 } 433 }
338 else 434 else
339 { 435 {
340 if (!rs[Rs_title]) 436 if (!rs[Rs_title])
341 rs[Rs_title] = rs[Rs_name]; 437 rs[Rs_title] = rs[Rs_name];
438
342 if (!rs[Rs_iconName]) 439 if (!rs[Rs_iconName])
343 rs[Rs_iconName] = rs[Rs_name]; 440 rs[Rs_iconName] = rs[Rs_name];
344 } 441 }
345 442
346 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 443 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
353 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 450 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
354 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 451 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
355 452
356 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 453 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
357 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 454 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
455
456 if (rs[Rs_letterSpace])
457 letterSpace = atoi (rs[Rs_letterSpace]);
358#endif 458#endif
359 459
360#ifdef POINTER_BLANK 460#ifdef POINTER_BLANK
361 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 461 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
362 pointerBlankDelay = i; 462 pointerBlankDelay = i;
… …
366 466
367 /* no point having a scrollbar without having any scrollback! */ 467 /* no point having a scrollbar without having any scrollback! */
368 if (!saveLines) 468 if (!saveLines)
369 set_option (Opt_scrollBar, 0); 469 set_option (Opt_scrollBar, 0);
370 470
371#ifdef PRINTPIPE
372 if (!rs[Rs_print_pipe])
373 rs[Rs_print_pipe] = PRINTPIPE;
374#endif
375
376 if (!rs[Rs_cutchars]) 471 if (!rs[Rs_cutchars])
377 rs[Rs_cutchars] = CUTCHARS; 472 rs[Rs_cutchars] = CUTCHARS;
378 473
379#ifndef NO_BACKSPACE_KEY 474#ifndef NO_BACKSPACE_KEY
380 if (!rs[Rs_backspace_key]) 475 if (!rs[Rs_backspace_key])
381# ifdef DEFAULT_BACKSPACE 476# ifdef DEFAULT_BACKSPACE
382 key_backspace = DEFAULT_BACKSPACE; 477 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
383# else 478# else
384 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 479 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
385# endif 480# endif
386 else
387 {
388 val = strdup (rs[Rs_backspace_key]);
389 rxvt_Str_trim (val);
390 rxvt_Str_escaped (val);
391 key_backspace = val;
392 }
393#endif 481#endif
394 482
395#ifndef NO_DELETE_KEY 483#ifndef NO_DELETE_KEY
396 if (!rs[Rs_delete_key]) 484 if (!rs[Rs_delete_key])
397# ifdef DEFAULT_DELETE 485# ifdef DEFAULT_DELETE
398 key_delete = DEFAULT_DELETE; 486 rs[Rs_delete_key] = DEFAULT_DELETE;
399# else 487# else
400 key_delete = "\033[3~"; 488 rs[Rs_delete_key] = "\033[3~";
401# endif
402 else
403 {
404 val = strdup (rs[Rs_delete_key]);
405 rxvt_Str_trim (val);
406 rxvt_Str_escaped (val);
407 key_delete = val;
408 }
409#endif 489# endif
410 if (rs[Rs_answerbackstring])
411 {
412 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
413 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
414 }
415
416#ifdef HAVE_SCROLLBARS
417 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
418#endif 490#endif
491
492 scrollBar.setup (this);
419 493
420#ifdef XTERM_REVERSE_VIDEO 494#ifdef XTERM_REVERSE_VIDEO
421 /* this is how xterm implements reverseVideo */ 495 /* this is how xterm implements reverseVideo */
422 if (OPTION (Opt_reverseVideo)) 496 if (option (Opt_reverseVideo))
423 { 497 {
424 if (!rs[Rs_color + Color_fg]) 498 if (!rs[Rs_color + Color_fg])
425 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 499 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
500
426 if (!rs[Rs_color + Color_bg]) 501 if (!rs[Rs_color + Color_bg])
427 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 502 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428 } 503 }
429#endif 504#endif
430 505
… …
432 if (!rs[Rs_color + i]) 507 if (!rs[Rs_color + i])
433 rs[Rs_color + i] = def_colorName[i]; 508 rs[Rs_color + i] = def_colorName[i];
434 509
435#ifndef XTERM_REVERSE_VIDEO 510#ifndef XTERM_REVERSE_VIDEO
436 /* this is how we implement reverseVideo */ 511 /* this is how we implement reverseVideo */
437 if (OPTION (Opt_reverseVideo)) 512 if (option (Opt_reverseVideo))
438 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 513 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439#endif 514#endif
440 515
441 /* convenient aliases for setting fg/bg to colors */ 516 /* convenient aliases for setting fg/bg to colors */
442 color_aliases (Color_fg); 517 color_aliases (Color_fg);
443 color_aliases (Color_bg); 518 color_aliases (Color_bg);
444#ifndef NO_CURSORCOLOR 519#ifndef NO_CURSORCOLOR
445 color_aliases (Color_cursor); 520 color_aliases (Color_cursor);
446 color_aliases (Color_cursor2); 521 color_aliases (Color_cursor2);
447#endif /* NO_CURSORCOLOR */ 522#endif /* NO_CURSORCOLOR */
448 color_aliases (Color_pointer_fg); 523 color_aliases (Color_pointer_fg);
449 color_aliases (Color_pointer_bg); 524 color_aliases (Color_pointer_bg);
450 color_aliases (Color_border); 525 color_aliases (Color_border);
451#ifndef NO_BOLD_UNDERLINE_REVERSE 526#ifndef NO_BOLD_UNDERLINE_REVERSE
452 color_aliases (Color_BD); 527 color_aliases (Color_BD);
453 color_aliases (Color_UL); 528 color_aliases (Color_UL);
454 color_aliases (Color_RV); 529 color_aliases (Color_RV);
455#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 530#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
456 531
457 if (!rs[Rs_color + Color_border]) 532 if (!rs[Rs_color + Color_border])
458 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 533 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
459 534
460 return cmd_argv; 535 return cmd_argv;
536}
537
538/*----------------------------------------------------------------------*/
539void
540rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
541{
542 this->envv = envv;
543
544 SET_R (this);
545 set_locale ("");
546 set_environ (envv); // a few things in X do not call setlocale :(
547
548 init_vars ();
549
550 init_secondary ();
551
552 const char **cmd_argv = init_resources (argc, argv);
553
554#ifdef KEYSYM_RESOURCE
555 keyboard->register_done ();
556#endif
557
558 if (const char *path = rs[Rs_chdir])
559 if (*path) // ignored if empty
560 {
561 if (*path != '/')
562 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
563
564 if (chdir (path))
565 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
566 }
567
568 if (option (Opt_scrollBar))
569 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
570
571 pty = ptytty::create ();
572
573 create_windows (argc, argv);
574
575 init_xlocale ();
576
577 scr_poweron (); // initialize screen
578
579#if 0
580 XSynchronize (dpy, True);
581#endif
582
583 if (option (Opt_scrollBar))
584 scrollBar.resize (); /* create and map scrollbar */
585#ifdef HAVE_BG_PIXMAP
586 {
587 bgPixmap.set_target (this);
588 bgPixmap.invalidate ();
589
590#ifdef ENABLE_TRANSPARENCY
591 if (option (Opt_transparent))
592 {
593 bgPixmap.set_transparent ();
594
595#ifdef HAVE_AFTERIMAGE
596 if (rs [Rs_blurradius])
597 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
598#endif
599 if (ISSET_PIXCOLOR (Color_tint))
600 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
601
602 if (rs [Rs_shade])
603 bgPixmap.set_shade (rs [Rs_shade]);
604
605 bgPixmap.set_root_pixmap ();
606 XSelectInput (dpy, display->root, PropertyChangeMask);
607 rootwin_ev.start (display, display->root);
608 }
609#endif
610
611#ifdef BG_IMAGE_FROM_FILE
612 if (rs[Rs_backgroundPixmap])
613 {
614 const char *p = rs[Rs_backgroundPixmap];
615
616 if ((p = strchr (p, ';')) != 0)
617 {
618 p++;
619 bgPixmap.set_geometry (p);
620 }
621 else
622 bgPixmap.set_defaultGeometry ();
623
624 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
625 if (!bgPixmap.window_position_sensitive ())
626 update_background ();
627 }
628#endif
629 }
630#endif
631
632#if ENABLE_PERL
633 rootwin_ev.start (display, display->root);
634#endif
635
636 set_colorfgbg ();
637
638 init_command (cmd_argv);
639
640 free (cmd_argv);
641
642 if (pty->pty >= 0)
643 pty_ev.start (pty->pty, ev::READ);
644
645 HOOK_INVOKE ((this, HOOK_START, DT_END));
646
647#if ENABLE_XEMBED
648 if (rs[Rs_embed])
649 {
650 long info[2] = { 0, XEMBED_MAPPED };
651
652 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
653 32, PropModeReplace, (unsigned char *)&info, 2);
654 }
655#endif
656
657 XMapWindow (dpy, vt);
658 XMapWindow (dpy, parent[0]);
659
660 refresh_check ();
461} 661}
462 662
463/*----------------------------------------------------------------------*/ 663/*----------------------------------------------------------------------*/
464void 664void
465rxvt_term::init_env () 665rxvt_term::init_env ()
466{ 666{
467 int i; 667 int i;
468 unsigned int u;
469 char *val; 668 char *val;
470 669
471#ifdef DISPLAY_IS_IP 670#ifdef DISPLAY_IS_IP
472 /* Fixup display_name for export over pty to any interested terminal 671 /* Fixup display_name for export over pty to any interested terminal
473 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 672 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
481 */ 680 */
482 val = rxvt_network_display (rs[Rs_display_name]); 681 val = rxvt_network_display (rs[Rs_display_name]);
483 rs[Rs_display_name] = (const char *)val; 682 rs[Rs_display_name] = (const char *)val;
484 683
485 if (val == NULL) 684 if (val == NULL)
486#endif /* DISPLAY_IS_IP */ 685#endif /* DISPLAY_IS_IP */
487 val = XDisplayString (xdisp); 686 val = XDisplayString (dpy);
488 687
489 if (rs[Rs_display_name] == NULL) 688 if (rs[Rs_display_name] == NULL)
490 rs[Rs_display_name] = val; /* use broken `:0' value */ 689 rs[Rs_display_name] = val; /* use broken `:0' value */
491 690
492 i = strlen (val); 691 i = strlen (val);
493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 692 env_display = (char *)rxvt_malloc (i + 9);
494 693
495 sprintf (env_display, "DISPLAY=%s", val); 694 sprintf (env_display, "DISPLAY=%s", val);
496 695
497 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 696 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
498 697
… …
519 else 718 else
520 putenv ("COLORTERM=" COLORTERMENVFULL); 719 putenv ("COLORTERM=" COLORTERMENVFULL);
521 720
522 if (rs[Rs_term_name] != NULL) 721 if (rs[Rs_term_name] != NULL)
523 { 722 {
524 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 723 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
525 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 724 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
526 putenv (env_term); 725 putenv (env_term);
527 } 726 }
528 else 727 else
529 putenv ("TERM=" TERMENV); 728 putenv ("TERM=" TERMENV);
… …
531#ifdef HAVE_UNSETENV 730#ifdef HAVE_UNSETENV
532 /* avoid passing old settings and confusing term size */ 731 /* avoid passing old settings and confusing term size */
533 unsetenv ("LINES"); 732 unsetenv ("LINES");
534 unsetenv ("COLUMNS"); 733 unsetenv ("COLUMNS");
535 unsetenv ("TERMCAP"); /* terminfo should be okay */ 734 unsetenv ("TERMCAP"); /* terminfo should be okay */
536#endif /* HAVE_UNSETENV */ 735#endif /* HAVE_UNSETENV */
537} 736}
538 737
539/*----------------------------------------------------------------------*/ 738/*----------------------------------------------------------------------*/
540/* 739/*
541 * This is more or less stolen straight from XFree86 xterm. 740 * This is more or less stolen straight from XFree86 xterm.
… …
562 761
563 this->locale = "C"; 762 this->locale = "C";
564 } 763 }
565 764
566 765
567 this->locale = rxvt_strdup (this->locale); 766 this->locale = strdup (this->locale);
568 SET_LOCALE (this->locale); 767 SET_LOCALE (this->locale);
569 mbstate.reset (); 768 mbstate.reset ();
570#endif 769#endif
571 770
572#if HAVE_NL_LANGINFO 771#if HAVE_NL_LANGINFO
… …
616 * Initialize the command connection. 815 * Initialize the command connection.
617 * This should be called after the X server connection is established. 816 * This should be called after the X server connection is established.
618 */ 817 */
619 818
620#ifdef META8_OPTION 819#ifdef META8_OPTION
621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 820 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622#endif 821#endif
623 822
624 get_ourmods (); 823 get_ourmods ();
625 824
626 if (!OPTION (Opt_scrollTtyOutput)) 825 if (!option (Opt_scrollTtyOutput))
627 priv_modes |= PrivMode_TtyOutputInh; 826 priv_modes |= PrivMode_TtyOutputInh;
628 if (OPTION (Opt_scrollTtyKeypress)) 827 if (option (Opt_scrollTtyKeypress))
629 priv_modes |= PrivMode_Keypress; 828 priv_modes |= PrivMode_Keypress;
630 if (!OPTION (Opt_jumpScroll)) 829 if (!option (Opt_jumpScroll))
631 priv_modes |= PrivMode_smoothScroll; 830 priv_modes |= PrivMode_smoothScroll;
632 831
633#ifndef NO_BACKSPACE_KEY 832#ifndef NO_BACKSPACE_KEY
634 if (strcmp (key_backspace, "DEC") == 0) 833 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
635 priv_modes |= PrivMode_HaveBackSpace; 834 priv_modes |= PrivMode_HaveBackSpace;
636#endif 835#endif
637 836
638 /* add value for scrollBar */ 837 /* add value for scrollBar */
639 if (scrollBar.state) 838 if (scrollBar.state)
… …
645 run_command (argv); 844 run_command (argv);
646} 845}
647 846
648/*----------------------------------------------------------------------*/ 847/*----------------------------------------------------------------------*/
649void 848void
650rxvt_term::Get_Colours () 849rxvt_term::get_colours ()
651{ 850{
652 int i; 851 int i;
653 852
654#ifdef OFF_FOCUS_FADING 853#ifdef OFF_FOCUS_FADING
655 pix_colors = pix_colors_focused; 854 pix_colors = pix_colors_focused;
656#endif 855#endif
657 856
658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 857 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 858 {
859 const char *name = rs[Rs_color + i];
860
861 if (!name)
862 continue;
863
660 rxvt_color xcol; 864 rxvt_color xcol;
661 865
662 if (!rs[Rs_color + i])
663 continue;
664
665 if (!set_color (xcol, rs[Rs_color + i])) 866 if (!set_color (xcol, name))
666 { 867 {
667#ifndef XTERM_REVERSE_VIDEO 868#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 869 if (i < 2 && option (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 870 name = def_colorName [1 - i];
670 else 871 else
671#endif 872#endif
672 rs[Rs_color + i] = def_colorName[i]; 873 name = def_colorName [i];
673 874
674 if (!rs[Rs_color + i]) 875 if (!name)
675 continue; 876 continue;
676 877
677 if (!set_color (xcol, rs[Rs_color + i])) 878 if (!set_color (xcol, name))
678 { 879 {
679 switch (i) 880 switch (i)
680 { 881 {
681 case Color_fg: 882 case Color_fg:
682 case Color_bg: 883 case Color_bg:
683 /* fatal: need bg/fg color */
684 rxvt_warn ("unable to get foreground/background colour, continuing.\n"); 884 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
885 name = "";
685 break; 886 break;
686#ifndef NO_CURSORCOLOR 887#ifndef NO_CURSORCOLOR
687 case Color_cursor2: 888 case Color_cursor2:
688 xcol = pix_colors[Color_fg]; 889#endif
689 break;
690#endif /* ! NO_CURSORCOLOR */
691 case Color_pointer_fg: 890 case Color_pointer_fg:
692 xcol = pix_colors[Color_fg]; 891 name = rs[Rs_color + Color_fg];
892 xcol.set (this, name);
693 break; 893 break;
694 default: 894 default:
695 xcol = pix_colors[Color_bg]; /* None */ 895 name = rs[Rs_color + Color_bg];
896 xcol.set (this, name);
696 break; 897 break;
697 } 898 }
698 } 899 }
699 } 900 }
700 901
701 pix_colors[i] = xcol; 902 pix_colors[i] = xcol;
702 SET_PIXCOLOR (i); 903 rs[Rs_color + i] = name;
703 } 904 }
704
705#ifdef OFF_FOCUS_FADING
706 if (rs[Rs_fade])
707 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
708 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
709#endif
710 905
711 if (depth <= 2) 906 if (depth <= 2)
712 { 907 {
713 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 908 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
714 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 909 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
715 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 910 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
716 } 911 }
717 912
718 /* 913 /*
719 * get scrollBar shadow colors 914 * get scrollBar shadow colors
720 * 915 *
721 * The calculations of topShadow/bottomShadow values are adapted 916 * The calculations of topShadow/bottomShadow values are adapted
722 * from the fvwm window manager. 917 * from the fvwm window manager.
723 */ 918 */
724#ifdef KEEP_SCROLLCOLOR 919#ifdef RXVT_SCROLLBAR
725
726 if (depth <= 2) 920 if (depth <= 2)
727 { 921 {
728 /* Monochrome */ 922 /* Monochrome */
729 pix_colors[Color_scroll] = pix_colors[Color_fg]; 923 alias_color (Color_scroll, Color_fg);
730 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 924 alias_color (Color_topShadow, Color_bg);
731 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 925 alias_color (Color_bottomShadow, Color_bg);
732 } 926 }
733 else 927 else
734 { 928 {
735 rxvt_color xcol[2]; 929 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
736 /* xcol[0] == white
737 * xcol[1] == top shadow
738 * xcol[2] == bot shadow */
739 930
740 xcol[1] = pix_colors[Color_scroll]; 931 rgba cscroll;
741 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); 932 pix_colors [Color_scroll].get (cscroll);
742
743 rxvt_rgba c0, c1;
744
745 xcol[0].get (this, c0);
746 xcol[1].get (this, c1);
747
748 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
749 933
750 /* topShadowColor */ 934 /* topShadowColor */
751 if (!xcol[1].set (this, 935 if (!pix_colors[Color_topShadow].set (this,
752 rxvt_rgba ( 936 rgba (
753 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 937 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
754 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), 938 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
755 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), 939 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
756 c1.a) // pa1 vs. pa0: arbitrary 940 cscroll.a)
757 )); 941 ))
758 xcol[1] = pix_colors[Color_White]; 942 alias_color (Color_topShadow, Color_White);
759
760 pix_colors[Color_topShadow] = xcol[1];
761 } 943 }
762#endif /* KEEP_SCROLLCOLOR */ 944#endif
945
946#ifdef OFF_FOCUS_FADING
947 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
948 update_fade_color (i);
949#endif
763} 950}
764 951
765/*----------------------------------------------------------------------*/ 952/*----------------------------------------------------------------------*/
766/* color aliases, fg/bg bright-bold */ 953/* color aliases, fg/bg bright-bold */
767void 954void
… …
770 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 957 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
771 { 958 {
772 int i = atoi (rs[Rs_color + idx]); 959 int i = atoi (rs[Rs_color + idx]);
773 960
774 if (i >= 8 && i <= 15) 961 if (i >= 8 && i <= 15)
775 { /* bright colors */ 962 /* bright colors */
776 i -= 8;
777 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 963 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
778 return; 964 else if (i >= 0 && i <= 7)
779 } 965 /* normal colors */
780
781 if (i >= 0 && i <= 7) /* normal colors */
782 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 966 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
783 } 967 }
784} 968}
785 969
786/*----------------------------------------------------------------------*/ 970/*----------------------------------------------------------------------*/
… …
806 990
807 if (rsmod 991 if (rsmod
808 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 992 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
809 requestedmeta = rsmod[3] - '0'; 993 requestedmeta = rsmod[3] - '0';
810 994
811 map = XGetModifierMapping (xdisp); 995 map = XGetModifierMapping (dpy);
812 kc = map->modifiermap; 996 kc = map->modifiermap;
813 997
814 for (i = 1; i < 6; i++) 998 for (i = 1; i < 6; i++)
815 { 999 {
816 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1000 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
818 for (j = map->max_keypermod; j--; k++) 1002 for (j = map->max_keypermod; j--; k++)
819 { 1003 {
820 if (kc[k] == 0) 1004 if (kc[k] == 0)
821 break; 1005 break;
822 1006
823 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 1007 switch (XKeycodeToKeysym (dpy, kc[k], 0))
824 { 1008 {
825 case XK_Num_Lock: 1009 case XK_Num_Lock:
826 ModNumLockMask = modmasks[i - 1]; 1010 ModNumLockMask = modmasks[i - 1];
827 continue; 1011 continue;
828 1012
… …
878rxvt_term::create_windows (int argc, const char *const *argv) 1062rxvt_term::create_windows (int argc, const char *const *argv)
879{ 1063{
880 XClassHint classHint; 1064 XClassHint classHint;
881 XWMHints wmHint; 1065 XWMHints wmHint;
882#if ENABLE_FRILLS 1066#if ENABLE_FRILLS
883 MWMHints mwmhints; 1067 MWMHints mwmhints = { };
884#endif 1068#endif
885 XGCValues gcvalue; 1069 XGCValues gcvalue;
886 XSetWindowAttributes attributes; 1070 XSetWindowAttributes attributes;
887 Window top, parent; 1071 Window top, parent;
888 1072
889 dLocal (Display *, xdisp); 1073 dLocal (Display *, dpy);
890 1074
891 /* grab colors before netscape does */ 1075 /* grab colors before netscape does */
892 Get_Colours (); 1076 get_colours ();
893 1077
894 if (!set_fonts ()) 1078 if (!set_fonts ())
895 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1079 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
896 1080
897 parent = display->root; 1081 parent = display->root;
898 1082
899 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1083 attributes.override_redirect = !!option (Opt_override_redirect);
900 1084
901#if ENABLE_FRILLS 1085#if ENABLE_FRILLS
902 if (OPTION (Opt_borderLess)) 1086 if (option (Opt_borderLess))
903 { 1087 {
904 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 1088 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
905 { 1089 {
906 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1090 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
907 attributes.override_redirect = true; 1091 attributes.override_redirect = true;
908 mwmhints.flags = 0;
909 } 1092 }
910 else 1093 else
911 { 1094 {
912 mwmhints.flags = MWM_HINTS_DECORATIONS; 1095 mwmhints.flags = MWM_HINTS_DECORATIONS;
913 mwmhints.decorations = 0;
914 } 1096 }
915 } 1097 }
916 else
917 mwmhints.flags = 0;
918#endif 1098#endif
919 1099
920#if ENABLE_XEMBED 1100#if ENABLE_XEMBED
921 if (rs[Rs_embed]) 1101 if (rs[Rs_embed])
922 { 1102 {
923 XWindowAttributes wattr; 1103 XWindowAttributes wattr;
924 1104
925 parent = strtol (rs[Rs_embed], 0, 0); 1105 parent = strtol (rs[Rs_embed], 0, 0);
926 1106
927 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 1107 if (!XGetWindowAttributes (dpy, parent, &wattr))
928 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1108 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
929 1109
930 window_calc (wattr.width, wattr.height); 1110 window_calc (wattr.width, wattr.height);
931 } 1111 }
932#endif 1112#endif
… …
936 /* sub-window placement & size in rxvt_resize_subwindows () */ 1116 /* sub-window placement & size in rxvt_resize_subwindows () */
937 attributes.background_pixel = pix_colors_focused [Color_border]; 1117 attributes.background_pixel = pix_colors_focused [Color_border];
938 attributes.border_pixel = pix_colors_focused [Color_border]; 1118 attributes.border_pixel = pix_colors_focused [Color_border];
939 attributes.colormap = cmap; 1119 attributes.colormap = cmap;
940 1120
941 top = XCreateWindow (xdisp, parent, 1121 top = XCreateWindow (dpy, parent,
942 szHint.x, szHint.y, 1122 szHint.x, szHint.y,
943 szHint.width, szHint.height, 1123 szHint.width, szHint.height,
944 ext_bwidth, 1124 ext_bwidth,
945 depth, InputOutput, visual, 1125 depth, InputOutput, visual,
946 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1126 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
949 this->parent[0] = top; 1129 this->parent[0] = top;
950 1130
951 old_width = szHint.width; 1131 old_width = szHint.width;
952 old_height = szHint.height; 1132 old_height = szHint.height;
953 1133
954 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1134 set_title (rs [Rs_title]);
955 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1135 set_icon_name (rs [Rs_iconName]);
956 1136
957 classHint.res_name = (char *)rs[Rs_name]; 1137 classHint.res_name = (char *)rs[Rs_name];
958 classHint.res_class = (char *)RESCLASS; 1138 classHint.res_class = (char *)RESCLASS;
959 1139
960 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1140 wmHint.flags = InputHint | StateHint | WindowGroupHint;
961 wmHint.input = True; 1141 wmHint.input = True;
962 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1142 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
963 wmHint.window_group = top; 1143 wmHint.window_group = top;
964 1144
965 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 1145 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
966 &szHint, &wmHint, &classHint); 1146 &szHint, &wmHint, &classHint);
1147#if ENABLE_EWMH
1148# ifdef HAVE_AFTERIMAGE
1149 /*
1150 * set up icon hint
1151 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1152 */
1153
1154 if (rs [Rs_iconfile])
1155 {
1156 init_asv ();
1157
1158 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1159 if (asv && im)
1160 {
1161 int w = im->width;
1162 int h = im->height;
1163 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1164 ASImage *result = scale_asimage (asv, im,
1165 w, h, ASA_ARGB32,
1166 100, ASIMAGE_QUALITY_DEFAULT);
1167 destroy_asimage (&im);
1168
1169 if (buffer && result)
1170 {
1171 ARGB32 *asbuf = result->alt.argb32;
1172 buffer [0] = w;
1173 buffer [1] = h;
1174
1175 for (unsigned int i = 0; i < w * h; ++i)
1176 buffer [i + 2] = asbuf [i];
1177
1178 destroy_asimage (&result);
1179 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1180 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1181 free (buffer);
1182 }
1183 else
1184 {
1185 if (!buffer)
1186 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1187
1188 if (!result)
1189 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1190 }
1191 }
1192 else
1193 rxvt_warn ("Loading image icon failed, continuing without.\n");
1194 }
1195# endif
1196#endif
967 1197
968#if ENABLE_FRILLS 1198#if ENABLE_FRILLS
969 if (mwmhints.flags) 1199 if (mwmhints.flags)
970 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1200 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
971 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1201 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
972#endif 1202#endif
973 1203
974 Atom protocols[] = { 1204 Atom protocols[] = {
975 xa[XA_WM_DELETE_WINDOW], 1205 xa[XA_WM_DELETE_WINDOW],
976#if ENABLE_EWMH 1206#if ENABLE_EWMH
977 xa[XA_NET_WM_PING], 1207 xa[XA_NET_WM_PING],
978#endif 1208#endif
979 }; 1209 };
980 1210
981 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1211 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
982 1212
983#if ENABLE_FRILLS 1213#if ENABLE_FRILLS
984 if (rs[Rs_transient_for]) 1214 if (rs[Rs_transient_for])
985 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1215 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
986#endif 1216#endif
987 1217
988#if ENABLE_EWMH 1218#if ENABLE_EWMH
989 long pid = getpid (); 1219 long pid = getpid ();
990 1220
991 XChangeProperty (xdisp, top, 1221 XChangeProperty (dpy, top,
992 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1222 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
993 PropModeReplace, (unsigned char *)&pid, 1); 1223 PropModeReplace, (unsigned char *)&pid, 1);
994 1224
995 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1225 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
996#endif 1226#endif
997 1227
998 XSelectInput (xdisp, top, 1228 XSelectInput (dpy, top,
999 KeyPressMask 1229 KeyPressMask
1000#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1230#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1001 | KeyReleaseMask 1231 | KeyReleaseMask
1002#endif 1232#endif
1003 | FocusChangeMask | VisibilityChangeMask 1233 | FocusChangeMask | VisibilityChangeMask
1004 | ExposureMask | StructureNotifyMask); 1234 | ExposureMask | StructureNotifyMask);
1005 1235
1006 termwin_ev.start (display, top); 1236 termwin_ev.start (display, top);
1007 1237
1008 /* vt cursor: Black-on-White is standard, but this is more popular */ 1238 /* vt cursor: Black-on-White is standard, but this is more popular */
1009 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1239 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1010
1011#ifdef HAVE_SCROLLBARS
1012 /* cursor scrollBar: Black-on-White */
1013 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1014#endif
1015 1240
1016 /* the vt window */ 1241 /* the vt window */
1017 vt = XCreateSimpleWindow (xdisp, top, 1242 vt = XCreateSimpleWindow (dpy, top,
1018 window_vt_x, window_vt_y, 1243 window_vt_x, window_vt_y,
1019 width, height, 1244 width, height,
1020 0, 1245 0,
1021 pix_colors_focused[Color_fg], 1246 pix_colors_focused[Color_fg],
1022 pix_colors_focused[Color_bg]); 1247 pix_colors_focused[Color_bg]);
1023 1248
1024 attributes.bit_gravity = NorthWestGravity; 1249 attributes.bit_gravity = NorthWestGravity;
1025 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1250 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1026 1251
1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1252 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1028 1253
1029 if (OPTION (Opt_pointerBlank)) 1254 if (option (Opt_pointerBlank))
1030 vt_emask |= PointerMotionMask; 1255 vt_emask |= PointerMotionMask;
1031 else 1256 else
1032 vt_emask |= Button1MotionMask | Button3MotionMask; 1257 vt_emask |= Button1MotionMask | Button3MotionMask;
1033 1258
1034 vt_select_input (); 1259 vt_select_input ();
1035 1260
1036 vt_ev.start (display, vt); 1261 vt_ev.start (display, vt);
1037 1262
1038#ifdef XPM_BACKGROUND
1039 if (rs[Rs_backgroundPixmap] != NULL
1040 && !OPTION (Opt_transparent))
1041 {
1042 const char *p = rs[Rs_backgroundPixmap];
1043
1044 if ((p = strchr (p, ';')) != NULL)
1045 {
1046 p++;
1047 scale_pixmap (p);
1048 }
1049
1050 set_bgPixmap (rs[Rs_backgroundPixmap]);
1051 scr_touch (true);
1052 }
1053#endif
1054
1055 /* graphics context for the vt window */ 1263 /* graphics context for the vt window */
1056 gcvalue.foreground = pix_colors[Color_fg]; 1264 gcvalue.foreground = pix_colors[Color_fg];
1057 gcvalue.background = pix_colors[Color_bg]; 1265 gcvalue.background = pix_colors[Color_bg];
1058 gcvalue.graphics_exposures = 1; 1266 gcvalue.graphics_exposures = 0;
1059 1267
1060 gc = XCreateGC (xdisp, vt, 1268 gc = XCreateGC (dpy, vt,
1061 GCForeground | GCBackground | GCGraphicsExposures, 1269 GCForeground | GCBackground | GCGraphicsExposures,
1062 &gcvalue); 1270 &gcvalue);
1063 1271
1064 drawable = new rxvt_drawable (this, vt); 1272 drawable = new rxvt_drawable (this, vt);
1065
1066#ifdef RXVT_SCROLLBAR
1067 gcvalue.foreground = pix_colors[Color_topShadow];
1068 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1069 gcvalue.foreground = pix_colors[Color_bottomShadow];
1070 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1071 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1072 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1073#endif
1074 1273
1075#ifdef OFF_FOCUS_FADING 1274#ifdef OFF_FOCUS_FADING
1076 // initially we are in unfocused state 1275 // initially we are in unfocused state
1077 if (rs[Rs_fade]) 1276 if (rs[Rs_fade])
1078 pix_colors = pix_colors_unfocused; 1277 pix_colors = pix_colors_unfocused;
… …
1084 1283
1085/* ------------------------------------------------------------------------- * 1284/* ------------------------------------------------------------------------- *
1086 * GET TTY CURRENT STATE * 1285 * GET TTY CURRENT STATE *
1087 * ------------------------------------------------------------------------- */ 1286 * ------------------------------------------------------------------------- */
1088void 1287void
1089rxvt_get_ttymode (ttymode_t *tio, int erase) 1288rxvt_get_ttymode (struct termios *tio, int erase)
1090{ 1289{
1091#ifdef HAVE_TERMIOS_H
1092 /* 1290 /*
1093 * standard System V termios interface 1291 * standard System V termios interface
1094 */ 1292 */
1095 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1293 if (tcgetattr (STDIN_FILENO, tio) < 0)
1096 { 1294 {
1097 // return error - use system defaults, 1295 // return error - use system defaults,
1098 // where possible, and zero elsewhere 1296 // where possible, and zero elsewhere
1099 memset (tio, 0, sizeof (ttymode_t)); 1297 memset (tio, 0, sizeof (struct termios));
1100 1298
1101 tio->c_cc[VINTR] = CINTR; 1299 tio->c_cc[VINTR] = CINTR;
1102 tio->c_cc[VQUIT] = CQUIT; 1300 tio->c_cc[VQUIT] = CQUIT;
1103 tio->c_cc[VERASE] = CERASE; 1301 tio->c_cc[VERASE] = CERASE;
1104#ifdef VERASE2 1302#ifdef VERASE2
… …
1163 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1361 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1164# if defined (ECHOCTL) && defined (ECHOKE) 1362# if defined (ECHOCTL) && defined (ECHOKE)
1165 | ECHOCTL | ECHOKE 1363 | ECHOCTL | ECHOKE
1166# endif 1364# endif
1167 | ECHOE | ECHOK); 1365 | ECHOE | ECHOK);
1168# else /* HAVE_TERMIOS_H */
1169
1170 /*
1171 * sgtty interface
1172 */
1173
1174 /* get parameters -- gtty */
1175 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1176 {
1177 tio->sg.sg_erase = CERASE; /* ^H */
1178 tio->sg.sg_kill = CKILL; /* ^U */
1179 }
1180
1181 if (erase != -1)
1182 tio->sg.sg_erase = (char)erase;
1183
1184 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1185
1186 /* get special characters */
1187 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1188 {
1189 tio->tc.t_intrc = CINTR; /* ^C */
1190 tio->tc.t_quitc = CQUIT; /* ^\ */
1191 tio->tc.t_startc = CSTART; /* ^Q */
1192 tio->tc.t_stopc = CSTOP; /* ^S */
1193 tio->tc.t_eofc = CEOF; /* ^D */
1194 tio->tc.t_brkc = -1;
1195 }
1196
1197 /* get local special chars */
1198 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1199 {
1200 tio->lc.t_suspc = CSUSP; /* ^Z */
1201 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1202 tio->lc.t_rprntc = CRPRNT; /* ^R */
1203 tio->lc.t_flushc = CFLUSH; /* ^O */
1204 tio->lc.t_werasc = CWERASE; /* ^W */
1205 tio->lc.t_lnextc = CLNEXT; /* ^V */
1206 }
1207 /* get line discipline */
1208 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1209# ifdef NTTYDISC
1210 tio->line = NTTYDISC;
1211# endif /* NTTYDISC */
1212
1213 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1214#endif /* HAVE_TERMIOS_H */
1215 1366
1216 /* 1367 /*
1217 * Debugging 1368 * Debugging
1218 */ 1369 */
1219#ifdef DEBUG_TTYMODE 1370#ifdef DEBUG_TTYMODE
1220#ifdef HAVE_TERMIOS_H
1221 /* c_iflag bits */ 1371 /* c_iflag bits */
1222 fprintf (stderr, "Input flags\n"); 1372 fprintf (stderr, "Input flags\n");
1223 1373
1224 /* cpp token stringize doesn't work on all machines <sigh> */ 1374 /* cpp token stringize doesn't work on all machines <sigh> */
1225# define FOO(flag,name) \ 1375# define FOO(flag,name) \
… …
1288 FOO (VLNEXT, "VLNEXT"); 1438 FOO (VLNEXT, "VLNEXT");
1289# endif 1439# endif
1290 1440
1291 fprintf (stderr, "\n"); 1441 fprintf (stderr, "\n");
1292# undef FOO 1442# undef FOO
1293# endif /* HAVE_TERMIOS_H */ 1443#endif /* DEBUG_TTYMODE */
1294#endif /* DEBUG_TTYMODE */
1295} 1444}
1296 1445
1297/*----------------------------------------------------------------------*/ 1446/*----------------------------------------------------------------------*/
1298/* 1447/*
1299 * Run the command in a subprocess and return a file descriptor for the 1448 * Run the command in a subprocess and return a file descriptor for the
… …
1320 else 1469 else
1321#endif 1470#endif
1322 if (!pty->get ()) 1471 if (!pty->get ())
1323 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1472 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1324 1473
1474 int er;
1475
1476#ifndef NO_BACKSPACE_KEY
1477 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1478 er = rs[Rs_backspace_key][0];
1479 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1480 er = '\177'; /* the initial state anyway */
1481 else
1482#endif
1483 er = -1;
1484
1485 rxvt_get_ttymode (&tio, er);
1486 /* init terminal attributes */
1487 cfsetospeed (&tio, BAUDRATE);
1488 cfsetispeed (&tio, BAUDRATE);
1489 tcsetattr (pty->tty, TCSANOW, &tio);
1325 pty->set_utf8_mode (enc_utf8); 1490 pty->set_utf8_mode (enc_utf8);
1326 1491
1327 /* set initial window size */ 1492 /* set initial window size */
1328 tt_winch (); 1493 tt_winch ();
1329
1330 int er;
1331
1332#ifndef NO_BACKSPACE_KEY
1333 if (key_backspace[0] && !key_backspace[1])
1334 er = key_backspace[0];
1335 else if (strcmp (key_backspace, "DEC") == 0)
1336 er = '\177'; /* the initial state anyway */
1337 else
1338#endif
1339 er = -1;
1340
1341 rxvt_get_ttymode (&tio, er);
1342 1494
1343#if ENABLE_FRILLS 1495#if ENABLE_FRILLS
1344 if (rs[Rs_pty_fd]) 1496 if (rs[Rs_pty_fd])
1345 return; 1497 return;
1346#endif 1498#endif
… …
1377 } 1529 }
1378 1530
1379 _exit (EXIT_FAILURE); 1531 _exit (EXIT_FAILURE);
1380 1532
1381 default: 1533 default:
1382 if (!OPTION (Opt_utmpInhibit)) 1534 if (!option (Opt_utmpInhibit))
1383 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1535 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1384 1536
1385 pty->close_tty (); 1537 pty->close_tty ();
1386 1538
1387 child_ev.start (cmd_pid); 1539 child_ev.start (cmd_pid);
1388 1540
… …
1401int 1553int
1402rxvt_term::run_child (const char *const *argv) 1554rxvt_term::run_child (const char *const *argv)
1403{ 1555{
1404 char *login; 1556 char *login;
1405 1557
1406 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1407
1408 if (OPTION (Opt_console)) 1558 if (option (Opt_console))
1559 {
1409 { /* be virtual console, fail silently */ 1560 /* be virtual console, fail silently */
1410#ifdef TIOCCONS 1561#ifdef TIOCCONS
1411 unsigned int on = 1; 1562 unsigned int on = 1;
1412 1563
1413 ioctl (STDIN_FILENO, TIOCCONS, &on); 1564 ioctl (STDIN_FILENO, TIOCCONS, &on);
1414#elif defined (SRIOCSREDIR) 1565#elif defined (SRIOCSREDIR)
… …
1416 1567
1417 fd = open (CONSOLE, O_WRONLY, 0); 1568 fd = open (CONSOLE, O_WRONLY, 0);
1418 if (fd >= 0) 1569 if (fd >= 0)
1419 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1570 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1420 close (fd); 1571 close (fd);
1421#endif /* SRIOCSREDIR */ 1572#endif /* SRIOCSREDIR */
1422 } 1573 }
1423 1574
1424 /* reset signals and spin off the command interpreter */ 1575 /* reset signals and spin off the command interpreter */
1425 signal (SIGINT, SIG_DFL); 1576 signal (SIGINT, SIG_DFL);
1426 signal (SIGQUIT, SIG_DFL); 1577 signal (SIGQUIT, SIG_DFL);
… …
1433 */ 1584 */
1434#ifdef SIGTSTP 1585#ifdef SIGTSTP
1435 signal (SIGTSTP, SIG_IGN); 1586 signal (SIGTSTP, SIG_IGN);
1436 signal (SIGTTIN, SIG_IGN); 1587 signal (SIGTTIN, SIG_IGN);
1437 signal (SIGTTOU, SIG_IGN); 1588 signal (SIGTTOU, SIG_IGN);
1438#endif /* SIGTSTP */ 1589#endif /* SIGTSTP */
1439
1440 // unblock signals (signals are blocked by iom.C
1441 sigset_t ss;
1442 sigemptyset (&ss);
1443 sigprocmask (SIG_SETMASK, &ss, 0);
1444 1590
1445 /* command interpreter path */ 1591 /* command interpreter path */
1446 if (argv != NULL) 1592 if (argv)
1447 { 1593 {
1448# ifdef DEBUG_CMD 1594# ifdef DEBUG_CMD
1449 int i; 1595 int i;
1450 1596
1451 for (i = 0; argv[i]; i++) 1597 for (i = 0; argv[i]; i++)
… …
1460 const char *argv0, *shell; 1606 const char *argv0, *shell;
1461 1607
1462 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1608 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1463 shell = "/bin/sh"; 1609 shell = "/bin/sh";
1464 1610
1465 argv0 = (const char *)rxvt_r_basename (shell); 1611 argv0 = rxvt_basename (shell);
1466 1612
1467 if (OPTION (Opt_loginShell)) 1613 if (option (Opt_loginShell))
1468 { 1614 {
1469 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1615 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1470 1616
1471 login[0] = '-'; 1617 login[0] = '-';
1472 strcpy (&login[1], argv0); 1618 strcpy (&login[1], argv0);
1473 argv0 = login; 1619 argv0 = login;
1474 } 1620 }
1475 1621
1476 execlp (shell, argv0, NULL); 1622 execlp (shell, argv0, (char *)0);
1477 /* no error message: STDERR is closed! */ 1623 /* no error message: STDERR is closed! */
1478 } 1624 }
1479 1625
1480 return -1; 1626 return -1;
1481} 1627}

Diff Legend

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