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

Diff Legend

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