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

Diff Legend

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