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

Diff Legend

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