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.152 by root, Sat Jan 21 22:38:05 2006 UTC vs.
Revision 1.245 by ayin, Sun Jan 27 16:52:13 2008 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 272#ifdef HAVE_SCROLLBARS
168 COLOR_SCROLLBAR, 273 COLOR_SCROLLBAR,
274#endif
275#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 276 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 277#endif
171#if TINTING 278#if ENABLE_TRANSPARENCY
172 NULL, 279 NULL,
173#endif 280#endif
174#if OFF_FOCUS_FADING 281#if OFF_FOCUS_FADING
175 "black", 282 "rgb:00/00/00",
176#endif 283#endif
177 }; 284 };
178 285
179const char *const xa_names[] = 286void
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#if ENABLE_XEMBED
209 "_XEMBED",
210 "_XEMBED_INFO",
211#endif
212 };
213
214bool
215rxvt_term::init_vars () 287rxvt_term::init_vars ()
216{ 288{
217 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
218#ifdef OFF_FOCUS_FADING
219 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
220#endif
221 pix_colors = pix_colors_focused; 289 pix_colors = pix_colors_focused;
222
223 if (pix_colors == NULL)
224 return false;
225
226#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
227 pixmap = None;
228#endif
229 290
230 MEvent.time = CurrentTime; 291 MEvent.time = CurrentTime;
231 MEvent.button = AnyButton; 292 MEvent.button = AnyButton;
232 options = DEFAULT_OPTIONS;
233 want_refresh = 1; 293 want_refresh = 1;
234 priv_modes = SavedModes = PrivMode_Default; 294 priv_modes = SavedModes = PrivMode_Default;
235 focus = 0;
236 ncol = 80; 295 ncol = 80;
237 nrow = 24; 296 nrow = 24;
238 int_bwidth = INTERNALBORDERWIDTH; 297 int_bwidth = INTERNALBORDERWIDTH;
239 ext_bwidth = EXTERNALBORDERWIDTH; 298 ext_bwidth = EXTERNALBORDERWIDTH;
240 lineSpace = LINESPACE; 299 lineSpace = LINESPACE;
241 saveLines = SAVELINES; 300 saveLines = SAVELINES;
242 numpix_colors = TOTAL_COLORS;
243 301
244 refresh_limit = 1;
245 refresh_type = SLOW_REFRESH; 302 refresh_type = SLOW_REFRESH;
246 prev_nrow = prev_ncol = 0;
247 303
248 oldcursor.row = oldcursor.col = -1; 304 oldcursor.row = oldcursor.col = -1;
249#ifdef XPM_BACKGROUND
250 /* bgPixmap.w = bgPixmap.h = 0; */
251 bgPixmap.x = bgPixmap.y = 50;
252 bgPixmap.pixmap = None;
253#endif
254 305
255 last_bot = last_state = -1; 306 set_option (Opt_scrollBar);
256 307 set_option (Opt_scrollTtyOutput);
257 return true; 308 set_option (Opt_jumpScroll);
309 set_option (Opt_skipScroll);
310 set_option (Opt_secondaryScreen);
311 set_option (Opt_secondaryScroll);
312 set_option (Opt_pastableTabs);
313 set_option (Opt_intensityStyles);
314 set_option (Opt_iso14755_52);
315 set_option (Opt_buffered);
258} 316}
259 317
260void 318static void
261rxvt_term::init_secondary () 319init_secondary ()
262{ 320{
263 int i; 321 int i;
264 322
265 /*
266 * Close all unused file descriptors
267 * We don't want them, we don't need them.
268 */
269 if ((i = open ("/dev/null", O_RDONLY)) < 0) 323 if ((i = open ("/dev/null", O_RDONLY)) < 0)
270 { 324 {
271 /* TODO: BOO HISS */
272 dup2 (STDERR_FILENO, STDIN_FILENO); 325 dup2 (STDERR_FILENO, STDIN_FILENO);
273 } 326 }
274 else if (i > STDIN_FILENO) 327 else if (i != STDIN_FILENO)
275 { 328 {
276 dup2 (i, STDIN_FILENO); 329 dup2 (i, STDIN_FILENO);
277 close (i); 330 close (i);
278 } 331 }
279 332
280 dup2 (STDERR_FILENO, STDOUT_FILENO); 333 dup2 (STDERR_FILENO, STDOUT_FILENO);
281
282#if 0 // schmorp sayz closing filies is murder
283 for (i = STDERR_FILENO + 1; i < num_fds; i++)
284 {
285#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
286 if (i == 4 || i == 7)
287 continue;
288#endif
289 close (i);
290 }
291#endif
292} 334}
293 335
294/*----------------------------------------------------------------------*/ 336/*----------------------------------------------------------------------*/
295const char ** 337const char **
296rxvt_term::init_resources (int argc, const char *const *argv) 338rxvt_term::init_resources (int argc, const char *const *argv)
297{ 339{
298 int i, r_argc; 340 int i, r_argc;
299 char *val;
300 const char **cmd_argv, **r_argv; 341 const char **cmd_argv, **r_argv;
301 342
302 /* 343 /*
303 * Look for -exec option. Find => split and make cmd_argv[] of command args 344 * Look for -e option. Find => split and make cmd_argv[] of command args
304 */ 345 */
305 for (r_argc = 0; r_argc < argc; r_argc++) 346 for (r_argc = 0; r_argc < argc; r_argc++)
306 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 347 if (!strcmp (argv[r_argc], "-e"))
307 break; 348 break;
349
350 if (r_argc == argc)
351 cmd_argv = NULL;
352 else if (!argv[r_argc + 1])
353 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
354 else
355 {
356 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
357
358 for (i = 0; i < argc - r_argc - 1; i++)
359 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
360
361 cmd_argv[i] = NULL;
362 }
308 363
309 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 364 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
310 365
311 for (i = 0; i < r_argc; i++) 366 for (i = 0; i < r_argc; i++)
312 r_argv[i] = (const char *)argv[i]; 367 r_argv[i] = (const char *)argv[i];
313 368
314 r_argv[i] = NULL; 369 r_argv[i] = NULL;
315 370
316 if (r_argc == argc)
317 cmd_argv = NULL;
318 else
319 {
320 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
321
322 for (i = 0; i < argc - r_argc - 1; i++)
323 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
324
325 cmd_argv[i] = NULL;
326 }
327
328 rs[Rs_name] = rxvt_r_basename (argv[0]); 371 rs[Rs_name] = rxvt_basename (argv[0]);
329 372
330 /* 373 /*
331 * Open display, get options/resources and create the window 374 * Open display, get options/resources and create the window
332 */ 375 */
333 376
… …
335 rs[Rs_display_name] = ":0"; 378 rs[Rs_display_name] = ":0";
336 379
337 get_options (r_argc, r_argv); 380 get_options (r_argc, r_argv);
338 381
339 if (!(display = displays.get (rs[Rs_display_name]))) 382 if (!(display = displays.get (rs[Rs_display_name])))
383 {
384 free (r_argv);
340 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 385 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
386 }
341 387
388 // using a local pointer decreases code size a lot
389 xa = display->xa;
390
391 set (display);
342 extract_resources (); 392 extract_resources ();
343 393
394#if XFT
395 if (rs[Rs_depth])
396 select_visual (strtol (rs[Rs_depth], 0, 0));
397#endif
398
399#ifdef HAVE_AFTERIMAGE
400 set_application_name ((char*)rs[Rs_name]);
401 set_output_threshold (OUTPUT_LEVEL_WARNING);
402 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
403#endif
344 free (r_argv); 404 free (r_argv);
405
406 for (int i = NUM_RESOURCES; i--; )
407 if (rs [i] == resval_undef)
408 rs [i] = 0;
345 409
346#if ENABLE_PERL 410#if ENABLE_PERL
347 if (!rs[Rs_perl_ext_1]) 411 if (!rs[Rs_perl_ext_1])
348 rs[Rs_perl_ext_1] = "default"; 412 rs[Rs_perl_ext_1] = "default";
349 413
… …
360 * set any defaults not already set 424 * set any defaults not already set
361 */ 425 */
362 if (cmd_argv && cmd_argv[0]) 426 if (cmd_argv && cmd_argv[0])
363 { 427 {
364 if (!rs[Rs_title]) 428 if (!rs[Rs_title])
365 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 429 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
366 if (!rs[Rs_iconName]) 430 if (!rs[Rs_iconName])
367 rs[Rs_iconName] = rs[Rs_title]; 431 rs[Rs_iconName] = rs[Rs_title];
368 } 432 }
369 else 433 else
370 { 434 {
… …
408 rs[Rs_cutchars] = CUTCHARS; 472 rs[Rs_cutchars] = CUTCHARS;
409 473
410#ifndef NO_BACKSPACE_KEY 474#ifndef NO_BACKSPACE_KEY
411 if (!rs[Rs_backspace_key]) 475 if (!rs[Rs_backspace_key])
412# ifdef DEFAULT_BACKSPACE 476# ifdef DEFAULT_BACKSPACE
413 key_backspace = DEFAULT_BACKSPACE; 477 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
414# else 478# else
415 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 479 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
416# endif 480# endif
417 else
418 {
419 val = strdup (rs[Rs_backspace_key]);
420 rxvt_Str_trim (val);
421 rxvt_Str_escaped (val);
422 key_backspace = val;
423 }
424#endif 481#endif
425 482
426#ifndef NO_DELETE_KEY 483#ifndef NO_DELETE_KEY
427 if (!rs[Rs_delete_key]) 484 if (!rs[Rs_delete_key])
428# ifdef DEFAULT_DELETE 485# ifdef DEFAULT_DELETE
429 key_delete = DEFAULT_DELETE; 486 rs[Rs_delete_key] = DEFAULT_DELETE;
430# else 487# else
431 key_delete = "\033[3~"; 488 rs[Rs_delete_key] = "\033[3~";
432# endif
433 else
434 {
435 val = strdup (rs[Rs_delete_key]);
436 rxvt_Str_trim (val);
437 rxvt_Str_escaped (val);
438 key_delete = val;
439 }
440#endif 489# endif
441 if (rs[Rs_answerbackstring]) 490#endif
442 {
443 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
444 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
445 }
446 491
447#ifdef HAVE_SCROLLBARS 492#ifdef HAVE_SCROLLBARS
448 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 493 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
449#endif 494#endif
450 495
451#ifdef XTERM_REVERSE_VIDEO 496#ifdef XTERM_REVERSE_VIDEO
452 /* this is how xterm implements reverseVideo */ 497 /* this is how xterm implements reverseVideo */
453 if (OPTION (Opt_reverseVideo)) 498 if (option (Opt_reverseVideo))
454 { 499 {
455 if (!rs[Rs_color + Color_fg]) 500 if (!rs[Rs_color + Color_fg])
456 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 501 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
502
457 if (!rs[Rs_color + Color_bg]) 503 if (!rs[Rs_color + Color_bg])
458 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 504 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
459 } 505 }
460#endif 506#endif
461 507
… …
463 if (!rs[Rs_color + i]) 509 if (!rs[Rs_color + i])
464 rs[Rs_color + i] = def_colorName[i]; 510 rs[Rs_color + i] = def_colorName[i];
465 511
466#ifndef XTERM_REVERSE_VIDEO 512#ifndef XTERM_REVERSE_VIDEO
467 /* this is how we implement reverseVideo */ 513 /* this is how we implement reverseVideo */
468 if (OPTION (Opt_reverseVideo)) 514 if (option (Opt_reverseVideo))
469 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 515 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
470#endif 516#endif
471 517
472 /* convenient aliases for setting fg/bg to colors */ 518 /* convenient aliases for setting fg/bg to colors */
473 color_aliases (Color_fg); 519 color_aliases (Color_fg);
474 color_aliases (Color_bg); 520 color_aliases (Color_bg);
475#ifndef NO_CURSORCOLOR 521#ifndef NO_CURSORCOLOR
476 color_aliases (Color_cursor); 522 color_aliases (Color_cursor);
477 color_aliases (Color_cursor2); 523 color_aliases (Color_cursor2);
478#endif /* NO_CURSORCOLOR */ 524#endif /* NO_CURSORCOLOR */
479 color_aliases (Color_pointer_fg); 525 color_aliases (Color_pointer_fg);
480 color_aliases (Color_pointer_bg); 526 color_aliases (Color_pointer_bg);
481 color_aliases (Color_border); 527 color_aliases (Color_border);
482#ifndef NO_BOLD_UNDERLINE_REVERSE 528#ifndef NO_BOLD_UNDERLINE_REVERSE
483 color_aliases (Color_BD); 529 color_aliases (Color_BD);
484 color_aliases (Color_UL); 530 color_aliases (Color_UL);
485 color_aliases (Color_RV); 531 color_aliases (Color_RV);
486#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 532#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
487 533
488 if (!rs[Rs_color + Color_border]) 534 if (!rs[Rs_color + Color_border])
489 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 535 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
490 536
491 return cmd_argv; 537 return cmd_argv;
538}
539
540/*----------------------------------------------------------------------*/
541void
542rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
543{
544 this->envv = envv;
545
546 SET_R (this);
547 set_locale ("");
548 set_environ (envv); // few things in X do not call setlocale :(
549
550 init_vars ();
551
552 init_secondary ();
553
554 const char **cmd_argv = init_resources (argc, argv);
555
556#ifdef KEYSYM_RESOURCE
557 keyboard->register_done ();
558#endif
559
560#ifdef HAVE_SCROLLBARS
561 if (option (Opt_scrollBar))
562 scrollBar.setIdle (); /* set existence for size calculations */
563#endif
564
565 pty = ptytty::create ();
566
567 create_windows (argc, argv);
568
569 init_xlocale ();
570
571 scr_reset (); // initialize screen
572
573#if 0
574 XSynchronize (dpy, True);
575#endif
576
577#ifdef HAVE_SCROLLBARS
578 if (option (Opt_scrollBar))
579 resize_scrollbar (); /* create and map scrollbar */
580#endif
581#ifdef HAVE_BG_PIXMAP
582 {
583 bgPixmap.set_target (this);
584 bgPixmap.invalidate ();
585
586#ifdef ENABLE_TRANSPARENCY
587 if (option (Opt_transparent))
588 {
589 bgPixmap.set_transparent ();
590
591#ifdef HAVE_AFTERIMAGE
592 if (rs [Rs_blurradius])
593 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
594#endif
595 if (ISSET_PIXCOLOR (Color_tint))
596 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
597
598 if (rs [Rs_shade])
599 bgPixmap.set_shade (rs [Rs_shade]);
600
601 bgPixmap.set_root_pixmap ();
602 XSelectInput (dpy, display->root, PropertyChangeMask);
603 rootwin_ev.start (display, display->root);
604 }
605#endif
606
607#ifdef BG_IMAGE_FROM_FILE
608 if (rs[Rs_backgroundPixmap])
609 {
610 const char *p = rs[Rs_backgroundPixmap];
611
612 if ((p = strchr (p, ';')) != 0)
613 {
614 p++;
615 bgPixmap.set_geometry (p);
616 }
617 else
618 bgPixmap.set_defaultGeometry ();
619
620 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
621 if (!bgPixmap.window_position_sensitive ())
622 update_background ();
623 }
624#endif
625 }
626#endif
627
628#if ENABLE_PERL
629 rootwin_ev.start (display, display->root);
630#endif
631
632 set_colorfgbg ();
633
634 init_command (cmd_argv);
635
636 free (cmd_argv);
637
638 if (pty->pty >= 0)
639 pty_ev.start (pty->pty, ev::READ);
640
641 HOOK_INVOKE ((this, HOOK_START, DT_END));
642
643#if ENABLE_XEMBED
644 if (rs[Rs_embed])
645 {
646 long info[2] = { 0, XEMBED_MAPPED };
647
648 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
649 32, PropModeReplace, (unsigned char *)&info, 2);
650 }
651#endif
652
653 XMapWindow (dpy, vt);
654 XMapWindow (dpy, parent[0]);
655
656 refresh_check ();
492} 657}
493 658
494/*----------------------------------------------------------------------*/ 659/*----------------------------------------------------------------------*/
495void 660void
496rxvt_term::init_env () 661rxvt_term::init_env ()
497{ 662{
498 int i; 663 int i;
499 unsigned int u;
500 char *val; 664 char *val;
501 665
502#ifdef DISPLAY_IS_IP 666#ifdef DISPLAY_IS_IP
503 /* Fixup display_name for export over pty to any interested terminal 667 /* Fixup display_name for export over pty to any interested terminal
504 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 668 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
512 */ 676 */
513 val = rxvt_network_display (rs[Rs_display_name]); 677 val = rxvt_network_display (rs[Rs_display_name]);
514 rs[Rs_display_name] = (const char *)val; 678 rs[Rs_display_name] = (const char *)val;
515 679
516 if (val == NULL) 680 if (val == NULL)
517#endif /* DISPLAY_IS_IP */ 681#endif /* DISPLAY_IS_IP */
518 val = XDisplayString (display->display); 682 val = XDisplayString (dpy);
519 683
520 if (rs[Rs_display_name] == NULL) 684 if (rs[Rs_display_name] == NULL)
521 rs[Rs_display_name] = val; /* use broken `:0' value */ 685 rs[Rs_display_name] = val; /* use broken `:0' value */
522 686
523 i = strlen (val); 687 i = strlen (val);
524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 688 env_display = (char *)rxvt_malloc (i + 9);
525 689
526 sprintf (env_display, "DISPLAY=%s", val); 690 sprintf (env_display, "DISPLAY=%s", val);
527 691
528 /* avoiding the math library: 692 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
529 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
530 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
531 ;
532 max_it (i, 1);
533 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
534
535 sprintf (env_windowid, "WINDOWID=%u",
536 (unsigned int)parent[0]);
537 693
538 /* add entries to the environment: 694 /* add entries to the environment:
539 * @ DISPLAY: in case we started with -display 695 * @ DISPLAY: in case we started with -display
540 * @ WINDOWID: X window id number of the window 696 * @ WINDOWID: X window id number of the window
541 * @ COLORTERM: terminal sub-name and also indicates its color 697 * @ COLORTERM: terminal sub-name and also indicates its color
… …
543 * @ TERMINFO: path to terminfo directory 699 * @ TERMINFO: path to terminfo directory
544 * @ COLORFGBG: fg;bg color codes 700 * @ COLORFGBG: fg;bg color codes
545 */ 701 */
546 putenv (env_display); 702 putenv (env_display);
547 putenv (env_windowid); 703 putenv (env_windowid);
704
548 if (env_colorfgbg) 705 if (env_colorfgbg)
549 putenv (env_colorfgbg); 706 putenv (env_colorfgbg);
550 707
551#ifdef RXVT_TERMINFO 708#ifdef RXVT_TERMINFO
552 putenv ("TERMINFO=" RXVT_TERMINFO); 709 putenv ("TERMINFO=" RXVT_TERMINFO);
553#endif 710#endif
554 711
555 if (display->depth <= 2) 712 if (depth <= 2)
556 putenv ("COLORTERM=" COLORTERMENV "-mono"); 713 putenv ("COLORTERM=" COLORTERMENV "-mono");
557 else 714 else
558 putenv ("COLORTERM=" COLORTERMENVFULL); 715 putenv ("COLORTERM=" COLORTERMENVFULL);
559 716
560 if (rs[Rs_term_name] != NULL) 717 if (rs[Rs_term_name] != NULL)
561 { 718 {
562 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 719 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
563 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 720 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
564 putenv (env_term); 721 putenv (env_term);
565 } 722 }
566 else 723 else
567 putenv ("TERM=" TERMENV); 724 putenv ("TERM=" TERMENV);
… …
569#ifdef HAVE_UNSETENV 726#ifdef HAVE_UNSETENV
570 /* avoid passing old settings and confusing term size */ 727 /* avoid passing old settings and confusing term size */
571 unsetenv ("LINES"); 728 unsetenv ("LINES");
572 unsetenv ("COLUMNS"); 729 unsetenv ("COLUMNS");
573 unsetenv ("TERMCAP"); /* terminfo should be okay */ 730 unsetenv ("TERMCAP"); /* terminfo should be okay */
574#endif /* HAVE_UNSETENV */ 731#endif /* HAVE_UNSETENV */
575} 732}
576 733
577/*----------------------------------------------------------------------*/ 734/*----------------------------------------------------------------------*/
578/* 735/*
579 * This is more or less stolen straight from XFree86 xterm. 736 * This is more or less stolen straight from XFree86 xterm.
… …
600 757
601 this->locale = "C"; 758 this->locale = "C";
602 } 759 }
603 760
604 761
605 this->locale = rxvt_strdup (this->locale); 762 this->locale = strdup (this->locale);
606 SET_LOCALE (this->locale); 763 SET_LOCALE (this->locale);
607 mbstate.reset (); 764 mbstate.reset ();
608#endif 765#endif
609 766
610#if HAVE_NL_LANGINFO 767#if HAVE_NL_LANGINFO
… …
654 * Initialize the command connection. 811 * Initialize the command connection.
655 * This should be called after the X server connection is established. 812 * This should be called after the X server connection is established.
656 */ 813 */
657 814
658#ifdef META8_OPTION 815#ifdef META8_OPTION
659 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 816 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
660#endif 817#endif
661 818
662 get_ourmods (); 819 get_ourmods ();
663 820
664 if (!OPTION (Opt_scrollTtyOutput)) 821 if (!option (Opt_scrollTtyOutput))
665 priv_modes |= PrivMode_TtyOutputInh; 822 priv_modes |= PrivMode_TtyOutputInh;
666 if (OPTION (Opt_scrollTtyKeypress)) 823 if (option (Opt_scrollTtyKeypress))
667 priv_modes |= PrivMode_Keypress; 824 priv_modes |= PrivMode_Keypress;
668 if (!OPTION (Opt_jumpScroll)) 825 if (!option (Opt_jumpScroll))
669 priv_modes |= PrivMode_smoothScroll; 826 priv_modes |= PrivMode_smoothScroll;
670 827
671#ifndef NO_BACKSPACE_KEY 828#ifndef NO_BACKSPACE_KEY
672 if (strcmp (key_backspace, "DEC") == 0) 829 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
673 priv_modes |= PrivMode_HaveBackSpace; 830 priv_modes |= PrivMode_HaveBackSpace;
674#endif 831#endif
675 832
676 /* add value for scrollBar */ 833 /* add value for scrollBar */
677 if (scrollBar.state) 834 if (scrollBar.state)
… …
690 int i; 847 int i;
691 848
692#ifdef OFF_FOCUS_FADING 849#ifdef OFF_FOCUS_FADING
693 pix_colors = pix_colors_focused; 850 pix_colors = pix_colors_focused;
694#endif 851#endif
695 852
696 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 853 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
697 { 854 {
855 const char *name = rs[Rs_color + i];
856
857 if (!name)
858 continue;
859
698 rxvt_color xcol; 860 rxvt_color xcol;
699 861
700 if (!rs[Rs_color + i]) 862 if (!set_color (xcol, name))
701 continue;
702
703 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
704 { 863 {
705#ifndef XTERM_REVERSE_VIDEO 864#ifndef XTERM_REVERSE_VIDEO
706 if (i < 2 && OPTION (Opt_reverseVideo)) 865 if (i < 2 && option (Opt_reverseVideo))
707 rs[Rs_color + i] = def_colorName[!i]; 866 name = def_colorName [1 - i];
708 else 867 else
709#endif 868#endif
710 rs[Rs_color + i] = def_colorName[i]; 869 name = def_colorName [i];
711 870
712 if (!rs[Rs_color + i]) 871 if (!name)
713 continue; 872 continue;
714 873
715 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 874 if (!set_color (xcol, name))
716 { 875 {
717 switch (i) 876 switch (i)
718 { 877 {
719 case Color_fg: 878 case Color_fg:
720 case Color_bg: 879 case Color_bg:
721 /* fatal: need bg/fg color */
722 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 880 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
723 /* NOTREACHED */ 881 name = "";
724 break; 882 break;
725#ifndef NO_CURSORCOLOR 883#ifndef NO_CURSORCOLOR
726 case Color_cursor2: 884 case Color_cursor2:
727 xcol = pix_colors[Color_fg]; 885#endif
728 break;
729#endif /* ! NO_CURSORCOLOR */
730 case Color_pointer_fg: 886 case Color_pointer_fg:
731 xcol = pix_colors[Color_fg]; 887 name = rs[Rs_color + Color_fg];
888 xcol.set (this, name);
732 break; 889 break;
733 default: 890 default:
734 xcol = pix_colors[Color_bg]; /* None */ 891 name = rs[Rs_color + Color_bg];
892 xcol.set (this, name);
735 break; 893 break;
736 } 894 }
737 } 895 }
738 } 896 }
739 897
740 pix_colors[i] = xcol; 898 pix_colors[i] = xcol;
741 SET_PIXCOLOR (i); 899 rs[Rs_color + i] = name;
742 }
743
744#ifdef OFF_FOCUS_FADING
745 if (rs[Rs_fade])
746 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
747 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
748#endif
749
750 if (display->depth <= 2)
751 { 900 }
901
902 if (depth <= 2)
903 {
752 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 904 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
753 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 905 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
754 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 906 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
755 } 907 }
756 908
757 /* 909 /*
758 * get scrollBar shadow colors 910 * get scrollBar shadow colors
759 * 911 *
760 * The calculations of topShadow/bottomShadow values are adapted 912 * The calculations of topShadow/bottomShadow values are adapted
761 * from the fvwm window manager. 913 * from the fvwm window manager.
762 */ 914 */
763#ifdef KEEP_SCROLLCOLOR 915#ifdef RXVT_SCROLLBAR
764
765 if (display->depth <= 2) 916 if (depth <= 2)
766 { 917 {
767 /* Monochrome */ 918 /* Monochrome */
768 pix_colors[Color_scroll] = pix_colors[Color_fg]; 919 alias_color (Color_scroll, Color_fg);
769 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 920 alias_color (Color_topShadow, Color_bg);
770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 921 alias_color (Color_bottomShadow, Color_bg);
771 } 922 }
772 else 923 else
773 { 924 {
774 rxvt_color xcol[2]; 925 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
775 /* xcol[0] == white
776 * xcol[1] == top shadow
777 * xcol[2] == bot shadow */
778 926
779 xcol[1] = pix_colors[Color_scroll]; 927 rgba cscroll;
780 xcol[0].set (display, 65535, 65535, 65535); 928 pix_colors [Color_scroll].get (cscroll);
781
782 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
783
784 xcol[0].get (display, pr0, pg0, pb0);
785 xcol[1].get (display, pr1, pg1, pb1);
786
787 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
788 929
789 /* topShadowColor */ 930 /* topShadowColor */
790 if (!xcol[1].set (display, 931 if (!pix_colors[Color_topShadow].set (this,
791 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 932 rgba (
792 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 933 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
793 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 934 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
794 xcol[1] = pix_colors[Color_White]; 935 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
795 936 cscroll.a)
796 pix_colors[Color_topShadow] = xcol[1]; 937 ))
938 alias_color (Color_topShadow, Color_White);
797 } 939 }
798#endif /* KEEP_SCROLLCOLOR */ 940#endif
941
942#ifdef OFF_FOCUS_FADING
943 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
944 update_fade_color (i);
945#endif
799} 946}
800 947
801/*----------------------------------------------------------------------*/ 948/*----------------------------------------------------------------------*/
802/* color aliases, fg/bg bright-bold */ 949/* color aliases, fg/bg bright-bold */
803void 950void
… …
806 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 953 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
807 { 954 {
808 int i = atoi (rs[Rs_color + idx]); 955 int i = atoi (rs[Rs_color + idx]);
809 956
810 if (i >= 8 && i <= 15) 957 if (i >= 8 && i <= 15)
811 { /* bright colors */ 958 /* bright colors */
812 i -= 8;
813 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 959 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
814 return; 960 else if (i >= 0 && i <= 7)
815 } 961 /* normal colors */
816
817 if (i >= 0 && i <= 7) /* normal colors */
818 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 962 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
819 } 963 }
820} 964}
821 965
822/*----------------------------------------------------------------------*/ 966/*----------------------------------------------------------------------*/
… …
842 986
843 if (rsmod 987 if (rsmod
844 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 988 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
845 requestedmeta = rsmod[3] - '0'; 989 requestedmeta = rsmod[3] - '0';
846 990
847 map = XGetModifierMapping (display->display); 991 map = XGetModifierMapping (dpy);
848 kc = map->modifiermap; 992 kc = map->modifiermap;
849 993
850 for (i = 1; i < 6; i++) 994 for (i = 1; i < 6; i++)
851 { 995 {
852 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 996 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
854 for (j = map->max_keypermod; j--; k++) 998 for (j = map->max_keypermod; j--; k++)
855 { 999 {
856 if (kc[k] == 0) 1000 if (kc[k] == 0)
857 break; 1001 break;
858 1002
859 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 1003 switch (XKeycodeToKeysym (dpy, kc[k], 0))
860 { 1004 {
861 case XK_Num_Lock: 1005 case XK_Num_Lock:
862 ModNumLockMask = modmasks[i - 1]; 1006 ModNumLockMask = modmasks[i - 1];
863 continue; 1007 continue;
864 1008
… …
914rxvt_term::create_windows (int argc, const char *const *argv) 1058rxvt_term::create_windows (int argc, const char *const *argv)
915{ 1059{
916 XClassHint classHint; 1060 XClassHint classHint;
917 XWMHints wmHint; 1061 XWMHints wmHint;
918#if ENABLE_FRILLS 1062#if ENABLE_FRILLS
919 Atom prop = None;
920 MWMHints mwmhints; 1063 MWMHints mwmhints = { };
921#endif 1064#endif
922 XGCValues gcvalue; 1065 XGCValues gcvalue;
923 XSetWindowAttributes attributes; 1066 XSetWindowAttributes attributes;
924 XWindowAttributes gattr;
925 Window top, parent; 1067 Window top, parent;
926 dDisp;
927 1068
928#ifdef USING_W11LIB 1069 dLocal (Display *, dpy);
929 /* enable W11 callbacks */
930 W11AddEventHandler (disp, rxvt_W11_process_x_event);
931#endif
932
933 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
934 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
935
936 if (OPTION (Opt_transparent))
937 {
938 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
939 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
940 }
941 1070
942 /* grab colors before netscape does */ 1071 /* grab colors before netscape does */
943 Get_Colours (); 1072 Get_Colours ();
944 1073
945 if (!set_fonts ()) 1074 if (!set_fonts ())
946 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1075 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
947 1076
948 parent = DefaultRootWindow (disp); 1077 parent = display->root;
949 1078
950 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1079 attributes.override_redirect = !!option (Opt_override_redirect);
951 1080
952#if ENABLE_FRILLS 1081#if ENABLE_FRILLS
953 if (OPTION (Opt_borderLess)) 1082 if (option (Opt_borderLess))
954 { 1083 {
955 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); 1084 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
956
957 if (prop == None)
958 { 1085 {
959 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1086 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
960 attributes.override_redirect = TRUE; 1087 attributes.override_redirect = true;
961 mwmhints.flags = 0;
962 } 1088 }
963 else 1089 else
964 { 1090 {
965 mwmhints.flags = MWM_HINTS_DECORATIONS; 1091 mwmhints.flags = MWM_HINTS_DECORATIONS;
966 mwmhints.decorations = 0;
967 } 1092 }
968 } 1093 }
969 else
970 mwmhints.flags = 0;
971#endif 1094#endif
972 1095
973#if ENABLE_XEMBED 1096#if ENABLE_XEMBED
974 if (rs[Rs_embed]) 1097 if (rs[Rs_embed])
975 { 1098 {
976 XWindowAttributes wattr; 1099 XWindowAttributes wattr;
977 1100
978 parent = strtol (rs[Rs_embed], 0, 0); 1101 parent = strtol (rs[Rs_embed], 0, 0);
979 1102
980 if (!XGetWindowAttributes (disp, parent, &wattr)) 1103 if (!XGetWindowAttributes (dpy, parent, &wattr))
981 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1104 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
982 1105
983 window_calc (wattr.width, wattr.height); 1106 window_calc (wattr.width, wattr.height);
984 } 1107 }
985#endif 1108#endif
986 1109
987 window_calc (0, 0); 1110 window_calc (0, 0);
988 1111
989 /* sub-window placement & size in rxvt_resize_subwindows () */ 1112 /* sub-window placement & size in rxvt_resize_subwindows () */
990 attributes.background_pixel = pix_colors_focused[Color_border]; 1113 attributes.background_pixel = pix_colors_focused [Color_border];
991 attributes.border_pixel = pix_colors_focused[Color_border]; 1114 attributes.border_pixel = pix_colors_focused [Color_border];
992 attributes.colormap = display->cmap; 1115 attributes.colormap = cmap;
1116
993 top = XCreateWindow (disp, parent, 1117 top = XCreateWindow (dpy, parent,
994 szHint.x, szHint.y, 1118 szHint.x, szHint.y,
995 szHint.width, szHint.height, 1119 szHint.width, szHint.height,
996 ext_bwidth, 1120 ext_bwidth,
997 display->depth, InputOutput, 1121 depth, InputOutput, visual,
998 display->visual,
999 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1122 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1000 &attributes); 1123 &attributes);
1001 1124
1002 this->parent[0] = top; 1125 this->parent[0] = top;
1003 1126
1004 old_width = szHint.width; 1127 old_width = szHint.width;
1005 old_height = szHint.height; 1128 old_height = szHint.height;
1006 1129
1007 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1130 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1008 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1131 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1009 1132
1010 classHint.res_name = (char *)rs[Rs_name]; 1133 classHint.res_name = (char *)rs[Rs_name];
1011 classHint.res_class = (char *)RESCLASS; 1134 classHint.res_class = (char *)RESCLASS;
1012 1135
1013 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1136 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1014 wmHint.input = True; 1137 wmHint.input = True;
1015 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1138 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1016 wmHint.window_group = top; 1139 wmHint.window_group = top;
1017 1140
1018 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1141 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1019 &szHint, &wmHint, &classHint); 1142 &szHint, &wmHint, &classHint);
1143
1144#if ENABLE_FRILLS
1145 if (mwmhints.flags)
1146 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1147 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1148#endif
1020 1149
1021 Atom protocols[] = { 1150 Atom protocols[] = {
1022 xa[XA_WM_DELETE_WINDOW], 1151 xa[XA_WM_DELETE_WINDOW],
1023#if ENABLE_EWMH 1152#if ENABLE_EWMH
1024 xa[XA_NET_WM_PING], 1153 xa[XA_NET_WM_PING],
1025#endif 1154#endif
1026 }; 1155 };
1027 1156
1028 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1157 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1029 1158
1030#if ENABLE_FRILLS 1159#if ENABLE_FRILLS
1031 if (rs[Rs_transient_for]) 1160 if (rs[Rs_transient_for])
1032 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1161 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1033#endif 1162#endif
1034 1163
1035#if ENABLE_EWMH 1164#if ENABLE_EWMH
1036 long pid = getpid (); 1165 long pid = getpid ();
1037 1166
1038 XChangeProperty (disp, top, 1167 XChangeProperty (dpy, top,
1039 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1168 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1040 PropModeReplace, (unsigned char *)&pid, 1); 1169 PropModeReplace, (unsigned char *)&pid, 1);
1041 1170
1042 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1171 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1043#endif 1172#endif
1044 1173
1045 XSelectInput (disp, top, 1174 XSelectInput (dpy, top,
1046 KeyPressMask 1175 KeyPressMask
1047#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1176#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1048 | KeyReleaseMask 1177 | KeyReleaseMask
1049#endif 1178#endif
1050 | FocusChangeMask | VisibilityChangeMask 1179 | FocusChangeMask | VisibilityChangeMask
1051 | ExposureMask | StructureNotifyMask); 1180 | ExposureMask | StructureNotifyMask);
1052 1181
1053 termwin_ev.start (display, top); 1182 termwin_ev.start (display, top);
1054 1183
1055#if ENABLE_FRILLS
1056 if (mwmhints.flags)
1057 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1058 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1059#endif
1060
1061 /* vt cursor: Black-on-White is standard, but this is more popular */ 1184 /* vt cursor: Black-on-White is standard, but this is more popular */
1062 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1185 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1063
1064#ifdef HAVE_SCROLLBARS
1065 /* cursor scrollBar: Black-on-White */
1066 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1067#endif
1068 1186
1069 /* the vt window */ 1187 /* the vt window */
1070 vt = XCreateSimpleWindow (disp, top, 1188 vt = XCreateSimpleWindow (dpy, top,
1071 window_vt_x,
1072 window_vt_y, 1189 window_vt_x, window_vt_y,
1073 width,
1074 height, 1190 width, height,
1075 0, 1191 0,
1076 pix_colors_focused[Color_fg], 1192 pix_colors_focused[Color_fg],
1077 pix_colors_focused[Color_bg]); 1193 pix_colors_focused[Color_bg]);
1078#ifdef DEBUG_X
1079 XStoreName (disp, vt, "vt window");
1080#endif
1081 1194
1082 attributes.bit_gravity = NorthWestGravity; 1195 attributes.bit_gravity = NorthWestGravity;
1083 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1196 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1084 1197
1085 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1198 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1086 1199
1087 if (OPTION (Opt_pointerBlank)) 1200 if (option (Opt_pointerBlank))
1088 vt_emask |= PointerMotionMask; 1201 vt_emask |= PointerMotionMask;
1089 else 1202 else
1090 vt_emask |= Button1MotionMask | Button3MotionMask; 1203 vt_emask |= Button1MotionMask | Button3MotionMask;
1091 1204
1092 vt_select_input (); 1205 vt_select_input ();
1093 1206
1094 vt_ev.start (display, vt); 1207 vt_ev.start (display, vt);
1095 1208
1096#ifdef XPM_BACKGROUND
1097 if (rs[Rs_backgroundPixmap] != NULL
1098 && ! OPTION (Opt_transparent))
1099 {
1100 const char *p = rs[Rs_backgroundPixmap];
1101
1102 if ((p = strchr (p, ';')) != NULL)
1103 {
1104 p++;
1105 scale_pixmap (p);
1106 }
1107
1108 set_bgPixmap (rs[Rs_backgroundPixmap]);
1109 scr_touch (true);
1110 }
1111#endif
1112
1113 /* graphics context for the vt window */ 1209 /* graphics context for the vt window */
1114 gcvalue.foreground = pix_colors[Color_fg]; 1210 gcvalue.foreground = pix_colors[Color_fg];
1115 gcvalue.background = pix_colors[Color_bg]; 1211 gcvalue.background = pix_colors[Color_bg];
1116 gcvalue.graphics_exposures = 1; 1212 gcvalue.graphics_exposures = 0;
1213
1117 gc = XCreateGC (disp, vt, 1214 gc = XCreateGC (dpy, vt,
1118 GCForeground | GCBackground | GCGraphicsExposures, 1215 GCForeground | GCBackground | GCGraphicsExposures,
1119 &gcvalue); 1216 &gcvalue);
1120 1217
1121 drawable = new rxvt_drawable (display, vt); 1218 drawable = new rxvt_drawable (this, vt);
1122
1123#ifdef RXVT_SCROLLBAR
1124 gcvalue.foreground = pix_colors[Color_topShadow];
1125 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1126 gcvalue.foreground = pix_colors[Color_bottomShadow];
1127 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1128 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1129 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1130#endif
1131 1219
1132#ifdef OFF_FOCUS_FADING 1220#ifdef OFF_FOCUS_FADING
1133 // initially we are in unfocused state 1221 // initially we are in unfocused state
1134 if (rs[Rs_fade]) 1222 if (rs[Rs_fade])
1135 pix_colors = pix_colors_unfocused; 1223 pix_colors = pix_colors_unfocused;
1136#endif 1224#endif
1137 1225
1138 pointer_unblank (); 1226 pointer_unblank ();
1139 scr_recolour (); 1227 scr_recolour ();
1140
1141#if ENABLE_XEMBED
1142 if (rs[Rs_embed])
1143 {
1144 long info[2] = { 0, XEMBED_MAPPED };
1145
1146 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1147 32, PropModeReplace, (unsigned char *)&info, 2);
1148 }
1149#endif
1150} 1228}
1151 1229
1152/* ------------------------------------------------------------------------- * 1230/* ------------------------------------------------------------------------- *
1153 * GET TTY CURRENT STATE * 1231 * GET TTY CURRENT STATE *
1154 * ------------------------------------------------------------------------- */ 1232 * ------------------------------------------------------------------------- */
1155void 1233void
1156rxvt_get_ttymode (ttymode_t *tio, int erase) 1234rxvt_get_ttymode (struct termios *tio, int erase)
1157{ 1235{
1158#ifdef HAVE_TERMIOS_H
1159 /* 1236 /*
1160 * standard System V termios interface 1237 * standard System V termios interface
1161 */ 1238 */
1162 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1239 if (tcgetattr (STDIN_FILENO, tio) < 0)
1163 { 1240 {
1164 // return error - use system defaults, 1241 // return error - use system defaults,
1165 // where possible, and zero elsewhere 1242 // where possible, and zero elsewhere
1166 memset (tio, 0, sizeof (ttymode_t)); 1243 memset (tio, 0, sizeof (struct termios));
1167 1244
1168 tio->c_cc[VINTR] = CINTR; 1245 tio->c_cc[VINTR] = CINTR;
1169 tio->c_cc[VQUIT] = CQUIT; 1246 tio->c_cc[VQUIT] = CQUIT;
1170 tio->c_cc[VERASE] = CERASE; 1247 tio->c_cc[VERASE] = CERASE;
1171#ifdef VERASE2 1248#ifdef VERASE2
… …
1230 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1307 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1231# if defined (ECHOCTL) && defined (ECHOKE) 1308# if defined (ECHOCTL) && defined (ECHOKE)
1232 | ECHOCTL | ECHOKE 1309 | ECHOCTL | ECHOKE
1233# endif 1310# endif
1234 | ECHOE | ECHOK); 1311 | ECHOE | ECHOK);
1235# else /* HAVE_TERMIOS_H */
1236
1237 /*
1238 * sgtty interface
1239 */
1240
1241 /* get parameters -- gtty */
1242 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1243 {
1244 tio->sg.sg_erase = CERASE; /* ^H */
1245 tio->sg.sg_kill = CKILL; /* ^U */
1246 }
1247
1248 if (erase != -1)
1249 tio->sg.sg_erase = (char)erase;
1250
1251 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1252
1253 /* get special characters */
1254 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1255 {
1256 tio->tc.t_intrc = CINTR; /* ^C */
1257 tio->tc.t_quitc = CQUIT; /* ^\ */
1258 tio->tc.t_startc = CSTART; /* ^Q */
1259 tio->tc.t_stopc = CSTOP; /* ^S */
1260 tio->tc.t_eofc = CEOF; /* ^D */
1261 tio->tc.t_brkc = -1;
1262 }
1263
1264 /* get local special chars */
1265 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1266 {
1267 tio->lc.t_suspc = CSUSP; /* ^Z */
1268 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1269 tio->lc.t_rprntc = CRPRNT; /* ^R */
1270 tio->lc.t_flushc = CFLUSH; /* ^O */
1271 tio->lc.t_werasc = CWERASE; /* ^W */
1272 tio->lc.t_lnextc = CLNEXT; /* ^V */
1273 }
1274 /* get line discipline */
1275 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1276# ifdef NTTYDISC
1277 tio->line = NTTYDISC;
1278# endif /* NTTYDISC */
1279
1280 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1281#endif /* HAVE_TERMIOS_H */
1282 1312
1283 /* 1313 /*
1284 * Debugging 1314 * Debugging
1285 */ 1315 */
1286#ifdef DEBUG_TTYMODE 1316#ifdef DEBUG_TTYMODE
1287#ifdef HAVE_TERMIOS_H
1288 /* c_iflag bits */ 1317 /* c_iflag bits */
1289 fprintf (stderr, "Input flags\n"); 1318 fprintf (stderr, "Input flags\n");
1290 1319
1291 /* cpp token stringize doesn't work on all machines <sigh> */ 1320 /* cpp token stringize doesn't work on all machines <sigh> */
1292# define FOO(flag,name) \ 1321# define FOO(flag,name) \
… …
1355 FOO (VLNEXT, "VLNEXT"); 1384 FOO (VLNEXT, "VLNEXT");
1356# endif 1385# endif
1357 1386
1358 fprintf (stderr, "\n"); 1387 fprintf (stderr, "\n");
1359# undef FOO 1388# undef FOO
1360# endif /* HAVE_TERMIOS_H */ 1389#endif /* DEBUG_TTYMODE */
1361#endif /* DEBUG_TTYMODE */
1362} 1390}
1363 1391
1364/*----------------------------------------------------------------------*/ 1392/*----------------------------------------------------------------------*/
1365/* 1393/*
1366 * Run the command in a subprocess and return a file descriptor for the 1394 * Run the command in a subprocess and return a file descriptor for the
… …
1387 else 1415 else
1388#endif 1416#endif
1389 if (!pty->get ()) 1417 if (!pty->get ())
1390 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1418 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1391 1419
1420 int er;
1421
1422#ifndef NO_BACKSPACE_KEY
1423 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1424 er = rs[Rs_backspace_key][0];
1425 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1426 er = '\177'; /* the initial state anyway */
1427 else
1428#endif
1429 er = -1;
1430
1431 rxvt_get_ttymode (&tio, er);
1432 /* init terminal attributes */
1433 cfsetospeed (&tio, BAUDRATE);
1434 cfsetispeed (&tio, BAUDRATE);
1435 tcsetattr (pty->tty, TCSANOW, &tio);
1392 pty->set_utf8_mode (enc_utf8); 1436 pty->set_utf8_mode (enc_utf8);
1393 1437
1394 /* set initial window size */ 1438 /* set initial window size */
1395 tt_winch (); 1439 tt_winch ();
1396
1397 int er;
1398
1399#ifndef NO_BACKSPACE_KEY
1400 if (key_backspace[0] && !key_backspace[1])
1401 er = key_backspace[0];
1402 else if (strcmp (key_backspace, "DEC") == 0)
1403 er = '\177'; /* the initial state anyway */
1404 else
1405#endif
1406 er = -1;
1407
1408 rxvt_get_ttymode (&tio, er);
1409 1440
1410#if ENABLE_FRILLS 1441#if ENABLE_FRILLS
1411 if (rs[Rs_pty_fd]) 1442 if (rs[Rs_pty_fd])
1412 return; 1443 return;
1413#endif 1444#endif
… …
1444 } 1475 }
1445 1476
1446 _exit (EXIT_FAILURE); 1477 _exit (EXIT_FAILURE);
1447 1478
1448 default: 1479 default:
1449 if (!OPTION (Opt_utmpInhibit)) 1480 if (!option (Opt_utmpInhibit))
1450 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1481 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1451 1482
1452 pty->close_tty (); 1483 pty->close_tty ();
1453 1484
1454 child_ev.start (cmd_pid); 1485 child_ev.start (cmd_pid);
1455 1486
… …
1468int 1499int
1469rxvt_term::run_child (const char *const *argv) 1500rxvt_term::run_child (const char *const *argv)
1470{ 1501{
1471 char *login; 1502 char *login;
1472 1503
1473 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1474
1475 if (OPTION (Opt_console)) 1504 if (option (Opt_console))
1505 {
1476 { /* be virtual console, fail silently */ 1506 /* be virtual console, fail silently */
1477#ifdef TIOCCONS 1507#ifdef TIOCCONS
1478 unsigned int on = 1; 1508 unsigned int on = 1;
1479 1509
1480 ioctl (STDIN_FILENO, TIOCCONS, &on); 1510 ioctl (STDIN_FILENO, TIOCCONS, &on);
1481#elif defined (SRIOCSREDIR) 1511#elif defined (SRIOCSREDIR)
… …
1483 1513
1484 fd = open (CONSOLE, O_WRONLY, 0); 1514 fd = open (CONSOLE, O_WRONLY, 0);
1485 if (fd >= 0) 1515 if (fd >= 0)
1486 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1516 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1487 close (fd); 1517 close (fd);
1488#endif /* SRIOCSREDIR */ 1518#endif /* SRIOCSREDIR */
1489 } 1519 }
1490 1520
1491 /* reset signals and spin off the command interpreter */ 1521 /* reset signals and spin off the command interpreter */
1492 signal (SIGINT, SIG_DFL); 1522 signal (SIGINT, SIG_DFL);
1493 signal (SIGQUIT, SIG_DFL); 1523 signal (SIGQUIT, SIG_DFL);
… …
1500 */ 1530 */
1501#ifdef SIGTSTP 1531#ifdef SIGTSTP
1502 signal (SIGTSTP, SIG_IGN); 1532 signal (SIGTSTP, SIG_IGN);
1503 signal (SIGTTIN, SIG_IGN); 1533 signal (SIGTTIN, SIG_IGN);
1504 signal (SIGTTOU, SIG_IGN); 1534 signal (SIGTTOU, SIG_IGN);
1505#endif /* SIGTSTP */ 1535#endif /* SIGTSTP */
1506 1536
1507 // unblock signals (signals are blocked by iom.C 1537 // unblock signals (signals are blocked by iom.C
1508 sigset_t ss; 1538 sigset_t ss;
1509 sigemptyset (&ss); 1539 sigemptyset (&ss);
1510 sigprocmask (SIG_SETMASK, &ss, 0); 1540 sigprocmask (SIG_SETMASK, &ss, 0);
1511 1541
1512 /* command interpreter path */ 1542 /* command interpreter path */
1513 if (argv != NULL) 1543 if (argv)
1514 { 1544 {
1515# ifdef DEBUG_CMD 1545# ifdef DEBUG_CMD
1516 int i; 1546 int i;
1517 1547
1518 for (i = 0; argv[i]; i++) 1548 for (i = 0; argv[i]; i++)
… …
1527 const char *argv0, *shell; 1557 const char *argv0, *shell;
1528 1558
1529 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1559 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1530 shell = "/bin/sh"; 1560 shell = "/bin/sh";
1531 1561
1532 argv0 = (const char *)rxvt_r_basename (shell); 1562 argv0 = (const char *)rxvt_basename (shell);
1533 1563
1534 if (OPTION (Opt_loginShell)) 1564 if (option (Opt_loginShell))
1535 { 1565 {
1536 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1566 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1537 1567
1538 login[0] = '-'; 1568 login[0] = '-';
1539 strcpy (&login[1], argv0); 1569 strcpy (&login[1], argv0);
1540 argv0 = login; 1570 argv0 = login;
1541 } 1571 }
1542 1572
1543 execlp (shell, argv0, NULL); 1573 execlp (shell, argv0, (char *)0);
1544 /* no error message: STDERR is closed! */ 1574 /* no error message: STDERR is closed! */
1545 } 1575 }
1546 1576
1547 return -1; 1577 return -1;
1548} 1578}

Diff Legend

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