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

Diff Legend

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