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.153 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.260 by sf-exg, Wed Jan 6 12:10:44 2010 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 14 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support
14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
15 * 16 *
16 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 20 * (at your option) any later version.
… …
33 34
34#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 37#include "rxvtutil.h"
37#include "init.h" 38#include "init.h"
39#include "keyboard.h"
38 40
39#include <limits> 41#include <limits>
40 42
41#include <csignal> 43#include <csignal>
44
45#include <fcntl.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h>
58#endif
59
60#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h>
63#include <sys/socket.h>
64
65/* these next two are probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h>
68#endif
69#ifdef HAVE_SYS_BYTEORDER_H
70#include <sys/byteorder.h>
71#endif
72
73#include <netinet/in.h>
74#include <arpa/inet.h>
75#include <net/if.h>
76#include <net/if_arp.h>
77
78static char *
79rxvt_network_display (const char *display)
80{
81 char buffer[1024], *rval = NULL;
82 struct ifconf ifc;
83 struct ifreq *ifr;
84 int i, skfd;
85
86 if (display[0] != ':' && strncmp (display, "unix:", 5))
87 return (char *) display; /* nothing to do */
88
89 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
90 ifc.ifc_buf = buffer;
91
92 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
93 {
94 perror ("socket");
95 return NULL;
96 }
97
98 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
99 {
100 perror ("SIOCGIFCONF");
101 close (skfd);
102 return NULL;
103 }
104
105 for (i = 0, ifr = ifc.ifc_req;
106 i < (ifc.ifc_len / sizeof (struct ifreq));
107 i++, ifr++)
108 {
109 struct ifreq ifr2;
110
111 strcpy (ifr2.ifr_name, ifr->ifr_name);
112
113 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
114 {
115 unsigned long addr;
116 struct sockaddr_in *p_addr;
117
118 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
119 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
120
121 /*
122 * not "0.0.0.0" or "127.0.0.1" - so format the address
123 */
124 if (addr && addr != 0x7F000001)
125 {
126 char *colon = strchr (display, ':');
127
128 if (colon == NULL)
129 colon = ":0.0";
130
131 rval = rxvt_malloc (strlen (colon) + 16);
132 sprintf (rval, "%d.%d.%d.%d%s",
133 (int) ((addr >> 030) & 0xFF),
134 (int) ((addr >> 020) & 0xFF),
135 (int) ((addr >> 010) & 0xFF),
136 (int) (addr & 0xFF), colon);
137 break;
138 }
139 }
140 }
141
142 close (skfd);
143
144 return rval;
145}
146#endif
42 147
43const char *const def_colorName[] = 148const char *const def_colorName[] =
44 { 149 {
45 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
47 /* low-intensity colors */ 152 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 153 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 154 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 155 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 157 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 161 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 162# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 164# endif
60 /* high-intensity colors */ 165 /* high-intensity colors */
61# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 168# else
64 "Grey25", /* 8: bright black (#404040) */ 169 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 170# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 171 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 172 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 173 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 178
74 // 88 xterm colours 179 // 88 xterm colours
75 "rgb:00/00/00", 180 "rgb:00/00/00",
76 "rgb:00/00/8b", 181 "rgb:00/00/8b",
77 "rgb:00/00/cd", 182 "rgb:00/00/cd",
… …
146 "rgb:e7/e7/e7", 251 "rgb:e7/e7/e7",
147 252
148#ifndef NO_CURSORCOLOR 253#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 254 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 255 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 256#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 257 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 258 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 259 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 260#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 261 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 262 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 263 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 264 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 265#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 266#if ENABLE_FRILLS
162 NULL, // Color_underline 267 NULL, // Color_underline
163#endif 268#endif
164#ifdef OPTION_HC 269#ifdef OPTION_HC
165 NULL, 270 NULL,
166#endif 271#endif
167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 274 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 275#endif
171#if TINTING 276#if ENABLE_TRANSPARENCY
172 NULL, 277 NULL,
173#endif 278#endif
174#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
175 "black", 280 "rgb:00/00/00",
176#endif 281#endif
177 }; 282 };
178 283
179bool 284void
180rxvt_term::init_vars () 285rxvt_term::init_vars ()
181{ 286{
182 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
183#ifdef OFF_FOCUS_FADING
184 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
185#endif
186 pix_colors = pix_colors_focused; 287 pix_colors = pix_colors_focused;
187
188 if (pix_colors == NULL)
189 return false;
190
191#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
192 pixmap = None;
193#endif
194 288
195 MEvent.time = CurrentTime; 289 MEvent.time = CurrentTime;
196 MEvent.button = AnyButton; 290 MEvent.button = AnyButton;
197 options = DEFAULT_OPTIONS;
198 want_refresh = 1; 291 want_refresh = 1;
199 priv_modes = SavedModes = PrivMode_Default; 292 priv_modes = SavedModes = PrivMode_Default;
200 focus = 0;
201 ncol = 80; 293 ncol = 80;
202 nrow = 24; 294 nrow = 24;
203 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
204 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
205 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
298 letterSpace = LETTERSPACE;
206 saveLines = SAVELINES; 299 saveLines = SAVELINES;
207 numpix_colors = TOTAL_COLORS;
208 300
209 refresh_limit = 1;
210 refresh_type = SLOW_REFRESH; 301 refresh_type = SLOW_REFRESH;
211 prev_nrow = prev_ncol = 0;
212 302
213 oldcursor.row = oldcursor.col = -1; 303 oldcursor.row = oldcursor.col = -1;
214#ifdef XPM_BACKGROUND
215 /* bgPixmap.w = bgPixmap.h = 0; */
216 bgPixmap.x = bgPixmap.y = 50;
217 bgPixmap.pixmap = None;
218#endif
219 304
220 last_bot = last_state = -1; 305 set_option (Opt_scrollBar);
221 306 set_option (Opt_scrollTtyOutput);
222 return true; 307 set_option (Opt_jumpScroll);
308 set_option (Opt_skipScroll);
309 set_option (Opt_secondaryScreen);
310 set_option (Opt_secondaryScroll);
311 set_option (Opt_pastableTabs);
312 set_option (Opt_intensityStyles);
313 set_option (Opt_iso14755);
314 set_option (Opt_iso14755_52);
315 set_option (Opt_buffered);
223} 316}
224 317
225void 318static void
226rxvt_term::init_secondary () 319init_secondary ()
227{ 320{
228 int i; 321 int i;
229 322
230 /*
231 * Close all unused file descriptors
232 * We don't want them, we don't need them.
233 */
234 if ((i = open ("/dev/null", O_RDONLY)) < 0) 323 if ((i = open ("/dev/null", O_RDONLY)) < 0)
235 { 324 {
236 /* TODO: BOO HISS */
237 dup2 (STDERR_FILENO, STDIN_FILENO); 325 dup2 (STDERR_FILENO, STDIN_FILENO);
238 } 326 }
239 else if (i > STDIN_FILENO) 327 else if (i != STDIN_FILENO)
240 { 328 {
241 dup2 (i, STDIN_FILENO); 329 dup2 (i, STDIN_FILENO);
242 close (i); 330 close (i);
243 } 331 }
244 332
245 dup2 (STDERR_FILENO, STDOUT_FILENO); 333 dup2 (STDERR_FILENO, STDOUT_FILENO);
246
247#if 0 // schmorp sayz closing filies is murder
248 for (i = STDERR_FILENO + 1; i < num_fds; i++)
249 {
250#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
251 if (i == 4 || i == 7)
252 continue;
253#endif
254 close (i);
255 }
256#endif
257} 334}
258 335
259/*----------------------------------------------------------------------*/ 336/*----------------------------------------------------------------------*/
260const char ** 337const char **
261rxvt_term::init_resources (int argc, const char *const *argv) 338rxvt_term::init_resources (int argc, const char *const *argv)
262{ 339{
263 int i, r_argc; 340 int i, r_argc;
264 char *val;
265 const char **cmd_argv, **r_argv; 341 const char **cmd_argv, **r_argv;
266 342
267 /* 343 /*
268 * Look for -exec option. Find => split and make cmd_argv[] of command args 344 * Look for -e option. Find => split and make cmd_argv[] of command args
269 */ 345 */
270 for (r_argc = 0; r_argc < argc; r_argc++) 346 for (r_argc = 0; r_argc < argc; r_argc++)
271 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 347 if (!strcmp (argv[r_argc], "-e"))
272 break; 348 break;
349
350 if (r_argc == argc)
351 cmd_argv = NULL;
352 else if (!argv[r_argc + 1])
353 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
354 else
355 {
356 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
357
358 for (i = 0; i < argc - r_argc - 1; i++)
359 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
360
361 cmd_argv[i] = NULL;
362 }
273 363
274 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 364 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
275 365
276 for (i = 0; i < r_argc; i++) 366 for (i = 0; i < r_argc; i++)
277 r_argv[i] = (const char *)argv[i]; 367 r_argv[i] = (const char *)argv[i];
278 368
279 r_argv[i] = NULL; 369 r_argv[i] = NULL;
280 370
281 if (r_argc == argc)
282 cmd_argv = NULL;
283 else
284 {
285 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
286
287 for (i = 0; i < argc - r_argc - 1; i++)
288 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
289
290 cmd_argv[i] = NULL;
291 }
292
293 rs[Rs_name] = rxvt_r_basename (argv[0]); 371 rs[Rs_name] = rxvt_basename (argv[0]);
294 372
295 /* 373 /*
296 * Open display, get options/resources and create the window 374 * Open display, get options/resources and create the window
297 */ 375 */
298 376
… …
300 rs[Rs_display_name] = ":0"; 378 rs[Rs_display_name] = ":0";
301 379
302 get_options (r_argc, r_argv); 380 get_options (r_argc, r_argv);
303 381
304 if (!(display = displays.get (rs[Rs_display_name]))) 382 if (!(display = displays.get (rs[Rs_display_name])))
383 {
384 free (r_argv);
305 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 385 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
386 }
306 387
388 // using a local pointer decreases code size a lot
389 xa = display->xa;
390
391 set (display);
307 extract_resources (); 392 extract_resources ();
308 393
394#if XFT
395 if (rs[Rs_depth])
396 select_visual (strtol (rs[Rs_depth], 0, 0));
397#endif
398
309 free (r_argv); 399 free (r_argv);
400
401 for (int i = NUM_RESOURCES; i--; )
402 if (rs [i] == resval_undef)
403 rs [i] = 0;
404
405#ifdef HAVE_AFTERIMAGE
406 set_application_name ((char *)rs[Rs_name]);
407 set_output_threshold (OUTPUT_LEVEL_WARNING);
408#endif
310 409
311#if ENABLE_PERL 410#if ENABLE_PERL
312 if (!rs[Rs_perl_ext_1]) 411 if (!rs[Rs_perl_ext_1])
313 rs[Rs_perl_ext_1] = "default"; 412 rs[Rs_perl_ext_1] = "default";
314 413
… …
325 * set any defaults not already set 424 * set any defaults not already set
326 */ 425 */
327 if (cmd_argv && cmd_argv[0]) 426 if (cmd_argv && cmd_argv[0])
328 { 427 {
329 if (!rs[Rs_title]) 428 if (!rs[Rs_title])
330 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 429 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
430
331 if (!rs[Rs_iconName]) 431 if (!rs[Rs_iconName])
332 rs[Rs_iconName] = rs[Rs_title]; 432 rs[Rs_iconName] = rs[Rs_title];
333 } 433 }
334 else 434 else
335 { 435 {
336 if (!rs[Rs_title]) 436 if (!rs[Rs_title])
337 rs[Rs_title] = rs[Rs_name]; 437 rs[Rs_title] = rs[Rs_name];
438
338 if (!rs[Rs_iconName]) 439 if (!rs[Rs_iconName])
339 rs[Rs_iconName] = rs[Rs_name]; 440 rs[Rs_iconName] = rs[Rs_name];
340 } 441 }
341 442
342 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 443 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
349 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 450 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
350 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 451 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
351 452
352 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 453 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
353 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 454 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
455
456 if (rs[Rs_letterSpace])
457 letterSpace = atoi (rs[Rs_letterSpace]);
354#endif 458#endif
355 459
356#ifdef POINTER_BLANK 460#ifdef POINTER_BLANK
357 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 461 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
358 pointerBlankDelay = i; 462 pointerBlankDelay = i;
… …
362 466
363 /* no point having a scrollbar without having any scrollback! */ 467 /* no point having a scrollbar without having any scrollback! */
364 if (!saveLines) 468 if (!saveLines)
365 set_option (Opt_scrollBar, 0); 469 set_option (Opt_scrollBar, 0);
366 470
367#ifdef PRINTPIPE
368 if (!rs[Rs_print_pipe])
369 rs[Rs_print_pipe] = PRINTPIPE;
370#endif
371
372 if (!rs[Rs_cutchars]) 471 if (!rs[Rs_cutchars])
373 rs[Rs_cutchars] = CUTCHARS; 472 rs[Rs_cutchars] = CUTCHARS;
374 473
375#ifndef NO_BACKSPACE_KEY 474#ifndef NO_BACKSPACE_KEY
376 if (!rs[Rs_backspace_key]) 475 if (!rs[Rs_backspace_key])
377# ifdef DEFAULT_BACKSPACE 476# ifdef DEFAULT_BACKSPACE
378 key_backspace = DEFAULT_BACKSPACE; 477 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
379# else 478# else
380 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 479 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
381# endif 480# endif
382 else
383 {
384 val = strdup (rs[Rs_backspace_key]);
385 rxvt_Str_trim (val);
386 rxvt_Str_escaped (val);
387 key_backspace = val;
388 }
389#endif 481#endif
390 482
391#ifndef NO_DELETE_KEY 483#ifndef NO_DELETE_KEY
392 if (!rs[Rs_delete_key]) 484 if (!rs[Rs_delete_key])
393# ifdef DEFAULT_DELETE 485# ifdef DEFAULT_DELETE
394 key_delete = DEFAULT_DELETE; 486 rs[Rs_delete_key] = DEFAULT_DELETE;
395# else 487# else
396 key_delete = "\033[3~"; 488 rs[Rs_delete_key] = "\033[3~";
397# endif
398 else
399 {
400 val = strdup (rs[Rs_delete_key]);
401 rxvt_Str_trim (val);
402 rxvt_Str_escaped (val);
403 key_delete = val;
404 }
405#endif 489# endif
406 if (rs[Rs_answerbackstring])
407 {
408 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
409 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
410 }
411
412#ifdef HAVE_SCROLLBARS
413 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
414#endif 490#endif
491
492 scrollBar.setup (this);
415 493
416#ifdef XTERM_REVERSE_VIDEO 494#ifdef XTERM_REVERSE_VIDEO
417 /* this is how xterm implements reverseVideo */ 495 /* this is how xterm implements reverseVideo */
418 if (OPTION (Opt_reverseVideo)) 496 if (option (Opt_reverseVideo))
419 { 497 {
420 if (!rs[Rs_color + Color_fg]) 498 if (!rs[Rs_color + Color_fg])
421 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 499 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
500
422 if (!rs[Rs_color + Color_bg]) 501 if (!rs[Rs_color + Color_bg])
423 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 502 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
424 } 503 }
425#endif 504#endif
426 505
… …
428 if (!rs[Rs_color + i]) 507 if (!rs[Rs_color + i])
429 rs[Rs_color + i] = def_colorName[i]; 508 rs[Rs_color + i] = def_colorName[i];
430 509
431#ifndef XTERM_REVERSE_VIDEO 510#ifndef XTERM_REVERSE_VIDEO
432 /* this is how we implement reverseVideo */ 511 /* this is how we implement reverseVideo */
433 if (OPTION (Opt_reverseVideo)) 512 if (option (Opt_reverseVideo))
434 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 513 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
435#endif 514#endif
436 515
437 /* convenient aliases for setting fg/bg to colors */ 516 /* convenient aliases for setting fg/bg to colors */
438 color_aliases (Color_fg); 517 color_aliases (Color_fg);
439 color_aliases (Color_bg); 518 color_aliases (Color_bg);
440#ifndef NO_CURSORCOLOR 519#ifndef NO_CURSORCOLOR
441 color_aliases (Color_cursor); 520 color_aliases (Color_cursor);
442 color_aliases (Color_cursor2); 521 color_aliases (Color_cursor2);
443#endif /* NO_CURSORCOLOR */ 522#endif /* NO_CURSORCOLOR */
444 color_aliases (Color_pointer_fg); 523 color_aliases (Color_pointer_fg);
445 color_aliases (Color_pointer_bg); 524 color_aliases (Color_pointer_bg);
446 color_aliases (Color_border); 525 color_aliases (Color_border);
447#ifndef NO_BOLD_UNDERLINE_REVERSE 526#ifndef NO_BOLD_UNDERLINE_REVERSE
448 color_aliases (Color_BD); 527 color_aliases (Color_BD);
449 color_aliases (Color_UL); 528 color_aliases (Color_UL);
450 color_aliases (Color_RV); 529 color_aliases (Color_RV);
451#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 530#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
452 531
453 if (!rs[Rs_color + Color_border]) 532 if (!rs[Rs_color + Color_border])
454 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 533 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
455 534
456 return cmd_argv; 535 return cmd_argv;
536}
537
538/*----------------------------------------------------------------------*/
539void
540rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
541{
542 this->envv = envv;
543
544 SET_R (this);
545 set_locale ("");
546 set_environ (envv); // a few things in X do not call setlocale :(
547
548 init_vars ();
549
550 init_secondary ();
551
552 const char **cmd_argv = init_resources (argc, argv);
553
554#ifdef KEYSYM_RESOURCE
555 keyboard->register_done ();
556#endif
557
558 if (const char *path = rs[Rs_chdir])
559 if (*path) // ignored if empty
560 {
561 if (*path != '/')
562 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
563
564 if (chdir (path))
565 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
566 }
567
568 if (option (Opt_scrollBar))
569 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
570
571 pty = ptytty::create ();
572
573 create_windows (argc, argv);
574
575 init_xlocale ();
576
577 scr_poweron (); // initialize screen
578
579#if 0
580 XSynchronize (dpy, True);
581#endif
582
583 if (option (Opt_scrollBar))
584 scrollBar.resize (); /* create and map scrollbar */
585#ifdef HAVE_BG_PIXMAP
586 {
587 bgPixmap.set_target (this);
588 bgPixmap.invalidate ();
589
590#ifdef ENABLE_TRANSPARENCY
591 if (option (Opt_transparent))
592 {
593 bgPixmap.set_transparent ();
594
595#ifdef HAVE_AFTERIMAGE
596 if (rs [Rs_blurradius])
597 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
598#endif
599 if (ISSET_PIXCOLOR (Color_tint))
600 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
601
602 if (rs [Rs_shade])
603 bgPixmap.set_shade (rs [Rs_shade]);
604
605 bgPixmap.set_root_pixmap ();
606 XSelectInput (dpy, display->root, PropertyChangeMask);
607 rootwin_ev.start (display, display->root);
608 }
609#endif
610
611#ifdef BG_IMAGE_FROM_FILE
612 if (rs[Rs_backgroundPixmap])
613 {
614 const char *p = rs[Rs_backgroundPixmap];
615
616 if ((p = strchr (p, ';')) != 0)
617 {
618 p++;
619 bgPixmap.set_geometry (p);
620 }
621 else
622 bgPixmap.set_defaultGeometry ();
623
624 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
625 if (!bgPixmap.window_position_sensitive ())
626 update_background ();
627 }
628#endif
629 }
630#endif
631
632#if ENABLE_PERL
633 rootwin_ev.start (display, display->root);
634#endif
635
636 set_colorfgbg ();
637
638 init_command (cmd_argv);
639
640 free (cmd_argv);
641
642 if (pty->pty >= 0)
643 pty_ev.start (pty->pty, ev::READ);
644
645 HOOK_INVOKE ((this, HOOK_START, DT_END));
646
647#if ENABLE_XEMBED
648 if (rs[Rs_embed])
649 {
650 long info[2] = { 0, XEMBED_MAPPED };
651
652 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
653 32, PropModeReplace, (unsigned char *)&info, 2);
654 }
655#endif
656
657 XMapWindow (dpy, vt);
658 XMapWindow (dpy, parent[0]);
659
660 refresh_check ();
457} 661}
458 662
459/*----------------------------------------------------------------------*/ 663/*----------------------------------------------------------------------*/
460void 664void
461rxvt_term::init_env () 665rxvt_term::init_env ()
462{ 666{
463 int i; 667 int i;
464 unsigned int u;
465 char *val; 668 char *val;
466 669
467#ifdef DISPLAY_IS_IP 670#ifdef DISPLAY_IS_IP
468 /* Fixup display_name for export over pty to any interested terminal 671 /* Fixup display_name for export over pty to any interested terminal
469 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 672 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
477 */ 680 */
478 val = rxvt_network_display (rs[Rs_display_name]); 681 val = rxvt_network_display (rs[Rs_display_name]);
479 rs[Rs_display_name] = (const char *)val; 682 rs[Rs_display_name] = (const char *)val;
480 683
481 if (val == NULL) 684 if (val == NULL)
482#endif /* DISPLAY_IS_IP */ 685#endif /* DISPLAY_IS_IP */
483 val = XDisplayString (display->display); 686 val = XDisplayString (dpy);
484 687
485 if (rs[Rs_display_name] == NULL) 688 if (rs[Rs_display_name] == NULL)
486 rs[Rs_display_name] = val; /* use broken `:0' value */ 689 rs[Rs_display_name] = val; /* use broken `:0' value */
487 690
488 i = strlen (val); 691 i = strlen (val);
489 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 692 env_display = (char *)rxvt_malloc (i + 9);
490 693
491 sprintf (env_display, "DISPLAY=%s", val); 694 sprintf (env_display, "DISPLAY=%s", val);
492 695
493 /* avoiding the math library: 696 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
494 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
495 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
496 ;
497 max_it (i, 1);
498 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
499
500 sprintf (env_windowid, "WINDOWID=%u",
501 (unsigned int)parent[0]);
502 697
503 /* add entries to the environment: 698 /* add entries to the environment:
504 * @ DISPLAY: in case we started with -display 699 * @ DISPLAY: in case we started with -display
505 * @ WINDOWID: X window id number of the window 700 * @ WINDOWID: X window id number of the window
506 * @ COLORTERM: terminal sub-name and also indicates its color 701 * @ COLORTERM: terminal sub-name and also indicates its color
… …
508 * @ TERMINFO: path to terminfo directory 703 * @ TERMINFO: path to terminfo directory
509 * @ COLORFGBG: fg;bg color codes 704 * @ COLORFGBG: fg;bg color codes
510 */ 705 */
511 putenv (env_display); 706 putenv (env_display);
512 putenv (env_windowid); 707 putenv (env_windowid);
708
513 if (env_colorfgbg) 709 if (env_colorfgbg)
514 putenv (env_colorfgbg); 710 putenv (env_colorfgbg);
515 711
516#ifdef RXVT_TERMINFO 712#ifdef RXVT_TERMINFO
517 putenv ("TERMINFO=" RXVT_TERMINFO); 713 putenv ("TERMINFO=" RXVT_TERMINFO);
518#endif 714#endif
519 715
520 if (display->depth <= 2) 716 if (depth <= 2)
521 putenv ("COLORTERM=" COLORTERMENV "-mono"); 717 putenv ("COLORTERM=" COLORTERMENV "-mono");
522 else 718 else
523 putenv ("COLORTERM=" COLORTERMENVFULL); 719 putenv ("COLORTERM=" COLORTERMENVFULL);
524 720
525 if (rs[Rs_term_name] != NULL) 721 if (rs[Rs_term_name] != NULL)
526 { 722 {
527 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 723 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
528 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 724 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
529 putenv (env_term); 725 putenv (env_term);
530 } 726 }
531 else 727 else
532 putenv ("TERM=" TERMENV); 728 putenv ("TERM=" TERMENV);
… …
534#ifdef HAVE_UNSETENV 730#ifdef HAVE_UNSETENV
535 /* avoid passing old settings and confusing term size */ 731 /* avoid passing old settings and confusing term size */
536 unsetenv ("LINES"); 732 unsetenv ("LINES");
537 unsetenv ("COLUMNS"); 733 unsetenv ("COLUMNS");
538 unsetenv ("TERMCAP"); /* terminfo should be okay */ 734 unsetenv ("TERMCAP"); /* terminfo should be okay */
539#endif /* HAVE_UNSETENV */ 735#endif /* HAVE_UNSETENV */
540} 736}
541 737
542/*----------------------------------------------------------------------*/ 738/*----------------------------------------------------------------------*/
543/* 739/*
544 * This is more or less stolen straight from XFree86 xterm. 740 * This is more or less stolen straight from XFree86 xterm.
… …
565 761
566 this->locale = "C"; 762 this->locale = "C";
567 } 763 }
568 764
569 765
570 this->locale = rxvt_strdup (this->locale); 766 this->locale = strdup (this->locale);
571 SET_LOCALE (this->locale); 767 SET_LOCALE (this->locale);
572 mbstate.reset (); 768 mbstate.reset ();
573#endif 769#endif
574 770
575#if HAVE_NL_LANGINFO 771#if HAVE_NL_LANGINFO
… …
619 * Initialize the command connection. 815 * Initialize the command connection.
620 * This should be called after the X server connection is established. 816 * This should be called after the X server connection is established.
621 */ 817 */
622 818
623#ifdef META8_OPTION 819#ifdef META8_OPTION
624 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 820 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
625#endif 821#endif
626 822
627 get_ourmods (); 823 get_ourmods ();
628 824
629 if (!OPTION (Opt_scrollTtyOutput)) 825 if (!option (Opt_scrollTtyOutput))
630 priv_modes |= PrivMode_TtyOutputInh; 826 priv_modes |= PrivMode_TtyOutputInh;
631 if (OPTION (Opt_scrollTtyKeypress)) 827 if (option (Opt_scrollTtyKeypress))
632 priv_modes |= PrivMode_Keypress; 828 priv_modes |= PrivMode_Keypress;
633 if (!OPTION (Opt_jumpScroll)) 829 if (!option (Opt_jumpScroll))
634 priv_modes |= PrivMode_smoothScroll; 830 priv_modes |= PrivMode_smoothScroll;
635 831
636#ifndef NO_BACKSPACE_KEY 832#ifndef NO_BACKSPACE_KEY
637 if (strcmp (key_backspace, "DEC") == 0) 833 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
638 priv_modes |= PrivMode_HaveBackSpace; 834 priv_modes |= PrivMode_HaveBackSpace;
639#endif 835#endif
640 836
641 /* add value for scrollBar */ 837 /* add value for scrollBar */
642 if (scrollBar.state) 838 if (scrollBar.state)
… …
648 run_command (argv); 844 run_command (argv);
649} 845}
650 846
651/*----------------------------------------------------------------------*/ 847/*----------------------------------------------------------------------*/
652void 848void
653rxvt_term::Get_Colours () 849rxvt_term::get_colours ()
654{ 850{
655 int i; 851 int i;
656 852
657#ifdef OFF_FOCUS_FADING 853#ifdef OFF_FOCUS_FADING
658 pix_colors = pix_colors_focused; 854 pix_colors = pix_colors_focused;
659#endif 855#endif
660 856
661 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 857 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
662 { 858 {
859 const char *name = rs[Rs_color + i];
860
861 if (!name)
862 continue;
863
663 rxvt_color xcol; 864 rxvt_color xcol;
664 865
665 if (!rs[Rs_color + i]) 866 if (!set_color (xcol, name))
666 continue;
667
668 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
669 { 867 {
670#ifndef XTERM_REVERSE_VIDEO 868#ifndef XTERM_REVERSE_VIDEO
671 if (i < 2 && OPTION (Opt_reverseVideo)) 869 if (i < 2 && option (Opt_reverseVideo))
672 rs[Rs_color + i] = def_colorName[!i]; 870 name = def_colorName [1 - i];
673 else 871 else
674#endif 872#endif
675 rs[Rs_color + i] = def_colorName[i]; 873 name = def_colorName [i];
676 874
677 if (!rs[Rs_color + i]) 875 if (!name)
678 continue; 876 continue;
679 877
680 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 878 if (!set_color (xcol, name))
681 { 879 {
682 switch (i) 880 switch (i)
683 { 881 {
684 case Color_fg: 882 case Color_fg:
685 case Color_bg: 883 case Color_bg:
686 /* fatal: need bg/fg color */
687 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 884 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
688 /* NOTREACHED */ 885 name = "";
689 break; 886 break;
690#ifndef NO_CURSORCOLOR 887#ifndef NO_CURSORCOLOR
691 case Color_cursor2: 888 case Color_cursor2:
692 xcol = pix_colors[Color_fg]; 889#endif
693 break;
694#endif /* ! NO_CURSORCOLOR */
695 case Color_pointer_fg: 890 case Color_pointer_fg:
696 xcol = pix_colors[Color_fg]; 891 name = rs[Rs_color + Color_fg];
892 xcol.set (this, name);
697 break; 893 break;
698 default: 894 default:
699 xcol = pix_colors[Color_bg]; /* None */ 895 name = rs[Rs_color + Color_bg];
896 xcol.set (this, name);
700 break; 897 break;
701 } 898 }
702 } 899 }
703 } 900 }
704 901
705 pix_colors[i] = xcol; 902 pix_colors[i] = xcol;
706 SET_PIXCOLOR (i); 903 rs[Rs_color + i] = name;
707 }
708
709#ifdef OFF_FOCUS_FADING
710 if (rs[Rs_fade])
711 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
712 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
713#endif
714
715 if (display->depth <= 2)
716 { 904 }
905
906 if (depth <= 2)
907 {
717 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 908 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
718 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 909 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
719 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 910 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
720 } 911 }
721 912
722 /* 913 /*
723 * get scrollBar shadow colors 914 * get scrollBar shadow colors
724 * 915 *
725 * The calculations of topShadow/bottomShadow values are adapted 916 * The calculations of topShadow/bottomShadow values are adapted
726 * from the fvwm window manager. 917 * from the fvwm window manager.
727 */ 918 */
728#ifdef KEEP_SCROLLCOLOR 919#ifdef RXVT_SCROLLBAR
729
730 if (display->depth <= 2) 920 if (depth <= 2)
731 { 921 {
732 /* Monochrome */ 922 /* Monochrome */
733 pix_colors[Color_scroll] = pix_colors[Color_fg]; 923 alias_color (Color_scroll, Color_fg);
734 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 924 alias_color (Color_topShadow, Color_bg);
735 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 925 alias_color (Color_bottomShadow, Color_bg);
736 } 926 }
737 else 927 else
738 { 928 {
739 rxvt_color xcol[2]; 929 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
740 /* xcol[0] == white
741 * xcol[1] == top shadow
742 * xcol[2] == bot shadow */
743 930
744 xcol[1] = pix_colors[Color_scroll]; 931 rgba cscroll;
745 xcol[0].set (display, 65535, 65535, 65535); 932 pix_colors [Color_scroll].get (cscroll);
746
747 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
748
749 xcol[0].get (display, pr0, pg0, pb0);
750 xcol[1].get (display, pr1, pg1, pb1);
751
752 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
753 933
754 /* topShadowColor */ 934 /* topShadowColor */
755 if (!xcol[1].set (display, 935 if (!pix_colors[Color_topShadow].set (this,
756 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 936 rgba (
757 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 937 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
758 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 938 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
759 xcol[1] = pix_colors[Color_White]; 939 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
760 940 cscroll.a)
761 pix_colors[Color_topShadow] = xcol[1]; 941 ))
942 alias_color (Color_topShadow, Color_White);
762 } 943 }
763#endif /* KEEP_SCROLLCOLOR */ 944#endif
945
946#ifdef OFF_FOCUS_FADING
947 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
948 update_fade_color (i);
949#endif
764} 950}
765 951
766/*----------------------------------------------------------------------*/ 952/*----------------------------------------------------------------------*/
767/* color aliases, fg/bg bright-bold */ 953/* color aliases, fg/bg bright-bold */
768void 954void
… …
771 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 957 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
772 { 958 {
773 int i = atoi (rs[Rs_color + idx]); 959 int i = atoi (rs[Rs_color + idx]);
774 960
775 if (i >= 8 && i <= 15) 961 if (i >= 8 && i <= 15)
776 { /* bright colors */ 962 /* bright colors */
777 i -= 8;
778 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 963 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
779 return; 964 else if (i >= 0 && i <= 7)
780 } 965 /* normal colors */
781
782 if (i >= 0 && i <= 7) /* normal colors */
783 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 966 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
784 } 967 }
785} 968}
786 969
787/*----------------------------------------------------------------------*/ 970/*----------------------------------------------------------------------*/
… …
807 990
808 if (rsmod 991 if (rsmod
809 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 992 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
810 requestedmeta = rsmod[3] - '0'; 993 requestedmeta = rsmod[3] - '0';
811 994
812 map = XGetModifierMapping (display->display); 995 map = XGetModifierMapping (dpy);
813 kc = map->modifiermap; 996 kc = map->modifiermap;
814 997
815 for (i = 1; i < 6; i++) 998 for (i = 1; i < 6; i++)
816 { 999 {
817 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1000 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
819 for (j = map->max_keypermod; j--; k++) 1002 for (j = map->max_keypermod; j--; k++)
820 { 1003 {
821 if (kc[k] == 0) 1004 if (kc[k] == 0)
822 break; 1005 break;
823 1006
824 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 1007 switch (XKeycodeToKeysym (dpy, kc[k], 0))
825 { 1008 {
826 case XK_Num_Lock: 1009 case XK_Num_Lock:
827 ModNumLockMask = modmasks[i - 1]; 1010 ModNumLockMask = modmasks[i - 1];
828 continue; 1011 continue;
829 1012
… …
879rxvt_term::create_windows (int argc, const char *const *argv) 1062rxvt_term::create_windows (int argc, const char *const *argv)
880{ 1063{
881 XClassHint classHint; 1064 XClassHint classHint;
882 XWMHints wmHint; 1065 XWMHints wmHint;
883#if ENABLE_FRILLS 1066#if ENABLE_FRILLS
884 MWMHints mwmhints; 1067 MWMHints mwmhints = { };
885#endif 1068#endif
886 XGCValues gcvalue; 1069 XGCValues gcvalue;
887 XSetWindowAttributes attributes; 1070 XSetWindowAttributes attributes;
888 Window top, parent; 1071 Window top, parent;
889 dDisp;
890 1072
891 xa = display->xa; 1073 dLocal (Display *, dpy);
892 1074
893 /* grab colors before netscape does */ 1075 /* grab colors before netscape does */
894 Get_Colours (); 1076 get_colours ();
895 1077
896 if (!set_fonts ()) 1078 if (!set_fonts ())
897 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1079 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
898 1080
899 parent = display->root; 1081 parent = display->root;
900 1082
901 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1083 attributes.override_redirect = !!option (Opt_override_redirect);
902 1084
903#if ENABLE_FRILLS 1085#if ENABLE_FRILLS
904 if (OPTION (Opt_borderLess)) 1086 if (option (Opt_borderLess))
905 { 1087 {
906 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) 1088 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
907 { 1089 {
908 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1090 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
909 attributes.override_redirect = TRUE; 1091 attributes.override_redirect = true;
910 mwmhints.flags = 0;
911 } 1092 }
912 else 1093 else
913 { 1094 {
914 mwmhints.flags = MWM_HINTS_DECORATIONS; 1095 mwmhints.flags = MWM_HINTS_DECORATIONS;
915 mwmhints.decorations = 0;
916 } 1096 }
917 } 1097 }
918 else
919 mwmhints.flags = 0;
920#endif 1098#endif
921 1099
922#if ENABLE_XEMBED 1100#if ENABLE_XEMBED
923 if (rs[Rs_embed]) 1101 if (rs[Rs_embed])
924 { 1102 {
925 XWindowAttributes wattr; 1103 XWindowAttributes wattr;
926 1104
927 parent = strtol (rs[Rs_embed], 0, 0); 1105 parent = strtol (rs[Rs_embed], 0, 0);
928 1106
929 if (!XGetWindowAttributes (disp, parent, &wattr)) 1107 if (!XGetWindowAttributes (dpy, parent, &wattr))
930 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1108 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
931 1109
932 window_calc (wattr.width, wattr.height); 1110 window_calc (wattr.width, wattr.height);
933 } 1111 }
934#endif 1112#endif
935 1113
936 window_calc (0, 0); 1114 window_calc (0, 0);
937 1115
938 /* sub-window placement & size in rxvt_resize_subwindows () */ 1116 /* sub-window placement & size in rxvt_resize_subwindows () */
939 attributes.background_pixel = pix_colors_focused[Color_border]; 1117 attributes.background_pixel = pix_colors_focused [Color_border];
940 attributes.border_pixel = pix_colors_focused[Color_border]; 1118 attributes.border_pixel = pix_colors_focused [Color_border];
941 attributes.colormap = display->cmap; 1119 attributes.colormap = cmap;
942 1120
943 top = XCreateWindow (disp, parent, 1121 top = XCreateWindow (dpy, parent,
944 szHint.x, szHint.y, 1122 szHint.x, szHint.y,
945 szHint.width, szHint.height, 1123 szHint.width, szHint.height,
946 ext_bwidth, 1124 ext_bwidth,
947 display->depth, InputOutput, 1125 depth, InputOutput, visual,
948 display->visual,
949 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1126 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
950 &attributes); 1127 &attributes);
951 1128
952 this->parent[0] = top; 1129 this->parent[0] = top;
953 1130
954 old_width = szHint.width; 1131 old_width = szHint.width;
955 old_height = szHint.height; 1132 old_height = szHint.height;
956 1133
957 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1134 set_title (rs [Rs_title]);
958 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1135 set_icon_name (rs [Rs_iconName]);
959 1136
960 classHint.res_name = (char *)rs[Rs_name]; 1137 classHint.res_name = (char *)rs[Rs_name];
961 classHint.res_class = (char *)RESCLASS; 1138 classHint.res_class = (char *)RESCLASS;
962 1139
963 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1140 wmHint.flags = InputHint | StateHint | WindowGroupHint;
964 wmHint.input = True; 1141 wmHint.input = True;
965 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1142 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
966 wmHint.window_group = top; 1143 wmHint.window_group = top;
967 1144
968 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1145 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
969 &szHint, &wmHint, &classHint); 1146 &szHint, &wmHint, &classHint);
1147#if ENABLE_EWMH
1148# ifdef HAVE_AFTERIMAGE
1149 /*
1150 * set up icon hint
1151 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1152 */
1153
1154 if (rs [Rs_iconfile])
1155 {
1156 init_asv ();
1157
1158 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1159 if (asv && im)
1160 {
1161 int w = im->width;
1162 int h = im->height;
1163 long* buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1164 ASImage *result = scale_asimage (asv, im,
1165 w, h, ASA_ARGB32,
1166 100, ASIMAGE_QUALITY_DEFAULT);
1167 destroy_asimage (&im);
1168
1169 if (buffer && result)
1170 {
1171 ARGB32 *asbuf = result->alt.argb32;
1172 buffer [0] = w;
1173 buffer [1] = h;
1174
1175 for (unsigned int i = 0; i < w * h; ++i)
1176 buffer [i + 2] = asbuf [i];
1177
1178 destroy_asimage (&result);
1179 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1180 PropModeReplace, (const unsigned char*) buffer, 2 + w * h);
1181 free (buffer);
1182 }
1183 else
1184 {
1185 if (!buffer)
1186 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1187
1188 if (!result)
1189 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1190 }
1191 }
1192 else
1193 rxvt_warn ("Loading image icon failed, continuing without.\n");
1194 }
1195# endif
1196#endif
970 1197
971#if ENABLE_FRILLS 1198#if ENABLE_FRILLS
972 if (mwmhints.flags) 1199 if (mwmhints.flags)
973 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1200 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
974 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1201 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
975#endif 1202#endif
976 1203
977 Atom protocols[] = { 1204 Atom protocols[] = {
978 xa[XA_WM_DELETE_WINDOW], 1205 xa[XA_WM_DELETE_WINDOW],
979#if ENABLE_EWMH 1206#if ENABLE_EWMH
980 xa[XA_NET_WM_PING], 1207 xa[XA_NET_WM_PING],
981#endif 1208#endif
982 }; 1209 };
983 1210
984 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1211 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
985 1212
986#if ENABLE_FRILLS 1213#if ENABLE_FRILLS
987 if (rs[Rs_transient_for]) 1214 if (rs[Rs_transient_for])
988 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1215 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
989#endif 1216#endif
990 1217
991#if ENABLE_EWMH 1218#if ENABLE_EWMH
992 long pid = getpid (); 1219 long pid = getpid ();
993 1220
994 XChangeProperty (disp, top, 1221 XChangeProperty (dpy, top,
995 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1222 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
996 PropModeReplace, (unsigned char *)&pid, 1); 1223 PropModeReplace, (unsigned char *)&pid, 1);
997 1224
998 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1225 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
999#endif 1226#endif
1000 1227
1001 XSelectInput (disp, top, 1228 XSelectInput (dpy, top,
1002 KeyPressMask 1229 KeyPressMask
1003#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1230#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1004 | KeyReleaseMask 1231 | KeyReleaseMask
1005#endif 1232#endif
1006 | FocusChangeMask | VisibilityChangeMask 1233 | FocusChangeMask | VisibilityChangeMask
1007 | ExposureMask | StructureNotifyMask); 1234 | ExposureMask | StructureNotifyMask);
1008 1235
1009 termwin_ev.start (display, top); 1236 termwin_ev.start (display, top);
1010 1237
1011 /* vt cursor: Black-on-White is standard, but this is more popular */ 1238 /* vt cursor: Black-on-White is standard, but this is more popular */
1012 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1239 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1013
1014#ifdef HAVE_SCROLLBARS
1015 /* cursor scrollBar: Black-on-White */
1016 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1017#endif
1018 1240
1019 /* the vt window */ 1241 /* the vt window */
1020 vt = XCreateSimpleWindow (disp, top, 1242 vt = XCreateSimpleWindow (dpy, top,
1021 window_vt_x, window_vt_y, 1243 window_vt_x, window_vt_y,
1022 width, height, 1244 width, height,
1023 0, 1245 0,
1024 pix_colors_focused[Color_fg], 1246 pix_colors_focused[Color_fg],
1025 pix_colors_focused[Color_bg]); 1247 pix_colors_focused[Color_bg]);
1026 1248
1027 attributes.bit_gravity = NorthWestGravity; 1249 attributes.bit_gravity = NorthWestGravity;
1028 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1250 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1029 1251
1030 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1252 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1031 1253
1032 if (OPTION (Opt_pointerBlank)) 1254 if (option (Opt_pointerBlank))
1033 vt_emask |= PointerMotionMask; 1255 vt_emask |= PointerMotionMask;
1034 else 1256 else
1035 vt_emask |= Button1MotionMask | Button3MotionMask; 1257 vt_emask |= Button1MotionMask | Button3MotionMask;
1036 1258
1037 vt_select_input (); 1259 vt_select_input ();
1038 1260
1039 vt_ev.start (display, vt); 1261 vt_ev.start (display, vt);
1040 1262
1041#ifdef XPM_BACKGROUND
1042 if (rs[Rs_backgroundPixmap] != NULL
1043 && ! OPTION (Opt_transparent))
1044 {
1045 const char *p = rs[Rs_backgroundPixmap];
1046
1047 if ((p = strchr (p, ';')) != NULL)
1048 {
1049 p++;
1050 scale_pixmap (p);
1051 }
1052
1053 set_bgPixmap (rs[Rs_backgroundPixmap]);
1054 scr_touch (true);
1055 }
1056#endif
1057
1058 /* graphics context for the vt window */ 1263 /* graphics context for the vt window */
1059 gcvalue.foreground = pix_colors[Color_fg]; 1264 gcvalue.foreground = pix_colors[Color_fg];
1060 gcvalue.background = pix_colors[Color_bg]; 1265 gcvalue.background = pix_colors[Color_bg];
1061 gcvalue.graphics_exposures = 1; 1266 gcvalue.graphics_exposures = 0;
1062 1267
1063 gc = XCreateGC (disp, vt, 1268 gc = XCreateGC (dpy, vt,
1064 GCForeground | GCBackground | GCGraphicsExposures, 1269 GCForeground | GCBackground | GCGraphicsExposures,
1065 &gcvalue); 1270 &gcvalue);
1066 1271
1067 drawable = new rxvt_drawable (display, vt); 1272 drawable = new rxvt_drawable (this, vt);
1068
1069#ifdef RXVT_SCROLLBAR
1070 gcvalue.foreground = pix_colors[Color_topShadow];
1071 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1072 gcvalue.foreground = pix_colors[Color_bottomShadow];
1073 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1074 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1075 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1076#endif
1077 1273
1078#ifdef OFF_FOCUS_FADING 1274#ifdef OFF_FOCUS_FADING
1079 // initially we are in unfocused state 1275 // initially we are in unfocused state
1080 if (rs[Rs_fade]) 1276 if (rs[Rs_fade])
1081 pix_colors = pix_colors_unfocused; 1277 pix_colors = pix_colors_unfocused;
… …
1087 1283
1088/* ------------------------------------------------------------------------- * 1284/* ------------------------------------------------------------------------- *
1089 * GET TTY CURRENT STATE * 1285 * GET TTY CURRENT STATE *
1090 * ------------------------------------------------------------------------- */ 1286 * ------------------------------------------------------------------------- */
1091void 1287void
1092rxvt_get_ttymode (ttymode_t *tio, int erase) 1288rxvt_get_ttymode (struct termios *tio, int erase)
1093{ 1289{
1094#ifdef HAVE_TERMIOS_H
1095 /* 1290 /*
1096 * standard System V termios interface 1291 * standard System V termios interface
1097 */ 1292 */
1098 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1293 if (tcgetattr (STDIN_FILENO, tio) < 0)
1099 { 1294 {
1100 // return error - use system defaults, 1295 // return error - use system defaults,
1101 // where possible, and zero elsewhere 1296 // where possible, and zero elsewhere
1102 memset (tio, 0, sizeof (ttymode_t)); 1297 memset (tio, 0, sizeof (struct termios));
1103 1298
1104 tio->c_cc[VINTR] = CINTR; 1299 tio->c_cc[VINTR] = CINTR;
1105 tio->c_cc[VQUIT] = CQUIT; 1300 tio->c_cc[VQUIT] = CQUIT;
1106 tio->c_cc[VERASE] = CERASE; 1301 tio->c_cc[VERASE] = CERASE;
1107#ifdef VERASE2 1302#ifdef VERASE2
… …
1166 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1361 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1167# if defined (ECHOCTL) && defined (ECHOKE) 1362# if defined (ECHOCTL) && defined (ECHOKE)
1168 | ECHOCTL | ECHOKE 1363 | ECHOCTL | ECHOKE
1169# endif 1364# endif
1170 | ECHOE | ECHOK); 1365 | ECHOE | ECHOK);
1171# else /* HAVE_TERMIOS_H */
1172
1173 /*
1174 * sgtty interface
1175 */
1176
1177 /* get parameters -- gtty */
1178 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1179 {
1180 tio->sg.sg_erase = CERASE; /* ^H */
1181 tio->sg.sg_kill = CKILL; /* ^U */
1182 }
1183
1184 if (erase != -1)
1185 tio->sg.sg_erase = (char)erase;
1186
1187 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1188
1189 /* get special characters */
1190 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1191 {
1192 tio->tc.t_intrc = CINTR; /* ^C */
1193 tio->tc.t_quitc = CQUIT; /* ^\ */
1194 tio->tc.t_startc = CSTART; /* ^Q */
1195 tio->tc.t_stopc = CSTOP; /* ^S */
1196 tio->tc.t_eofc = CEOF; /* ^D */
1197 tio->tc.t_brkc = -1;
1198 }
1199
1200 /* get local special chars */
1201 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1202 {
1203 tio->lc.t_suspc = CSUSP; /* ^Z */
1204 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1205 tio->lc.t_rprntc = CRPRNT; /* ^R */
1206 tio->lc.t_flushc = CFLUSH; /* ^O */
1207 tio->lc.t_werasc = CWERASE; /* ^W */
1208 tio->lc.t_lnextc = CLNEXT; /* ^V */
1209 }
1210 /* get line discipline */
1211 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1212# ifdef NTTYDISC
1213 tio->line = NTTYDISC;
1214# endif /* NTTYDISC */
1215
1216 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1217#endif /* HAVE_TERMIOS_H */
1218 1366
1219 /* 1367 /*
1220 * Debugging 1368 * Debugging
1221 */ 1369 */
1222#ifdef DEBUG_TTYMODE 1370#ifdef DEBUG_TTYMODE
1223#ifdef HAVE_TERMIOS_H
1224 /* c_iflag bits */ 1371 /* c_iflag bits */
1225 fprintf (stderr, "Input flags\n"); 1372 fprintf (stderr, "Input flags\n");
1226 1373
1227 /* cpp token stringize doesn't work on all machines <sigh> */ 1374 /* cpp token stringize doesn't work on all machines <sigh> */
1228# define FOO(flag,name) \ 1375# define FOO(flag,name) \
… …
1291 FOO (VLNEXT, "VLNEXT"); 1438 FOO (VLNEXT, "VLNEXT");
1292# endif 1439# endif
1293 1440
1294 fprintf (stderr, "\n"); 1441 fprintf (stderr, "\n");
1295# undef FOO 1442# undef FOO
1296# endif /* HAVE_TERMIOS_H */ 1443#endif /* DEBUG_TTYMODE */
1297#endif /* DEBUG_TTYMODE */
1298} 1444}
1299 1445
1300/*----------------------------------------------------------------------*/ 1446/*----------------------------------------------------------------------*/
1301/* 1447/*
1302 * Run the command in a subprocess and return a file descriptor for the 1448 * Run the command in a subprocess and return a file descriptor for the
… …
1323 else 1469 else
1324#endif 1470#endif
1325 if (!pty->get ()) 1471 if (!pty->get ())
1326 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1472 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1327 1473
1474 int er;
1475
1476#ifndef NO_BACKSPACE_KEY
1477 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1478 er = rs[Rs_backspace_key][0];
1479 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1480 er = '\177'; /* the initial state anyway */
1481 else
1482#endif
1483 er = -1;
1484
1485 rxvt_get_ttymode (&tio, er);
1486 /* init terminal attributes */
1487 cfsetospeed (&tio, BAUDRATE);
1488 cfsetispeed (&tio, BAUDRATE);
1489 tcsetattr (pty->tty, TCSANOW, &tio);
1328 pty->set_utf8_mode (enc_utf8); 1490 pty->set_utf8_mode (enc_utf8);
1329 1491
1330 /* set initial window size */ 1492 /* set initial window size */
1331 tt_winch (); 1493 tt_winch ();
1332
1333 int er;
1334
1335#ifndef NO_BACKSPACE_KEY
1336 if (key_backspace[0] && !key_backspace[1])
1337 er = key_backspace[0];
1338 else if (strcmp (key_backspace, "DEC") == 0)
1339 er = '\177'; /* the initial state anyway */
1340 else
1341#endif
1342 er = -1;
1343
1344 rxvt_get_ttymode (&tio, er);
1345 1494
1346#if ENABLE_FRILLS 1495#if ENABLE_FRILLS
1347 if (rs[Rs_pty_fd]) 1496 if (rs[Rs_pty_fd])
1348 return; 1497 return;
1349#endif 1498#endif
… …
1380 } 1529 }
1381 1530
1382 _exit (EXIT_FAILURE); 1531 _exit (EXIT_FAILURE);
1383 1532
1384 default: 1533 default:
1385 if (!OPTION (Opt_utmpInhibit)) 1534 if (!option (Opt_utmpInhibit))
1386 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1535 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1387 1536
1388 pty->close_tty (); 1537 pty->close_tty ();
1389 1538
1390 child_ev.start (cmd_pid); 1539 child_ev.start (cmd_pid);
1391 1540
… …
1404int 1553int
1405rxvt_term::run_child (const char *const *argv) 1554rxvt_term::run_child (const char *const *argv)
1406{ 1555{
1407 char *login; 1556 char *login;
1408 1557
1409 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1410
1411 if (OPTION (Opt_console)) 1558 if (option (Opt_console))
1559 {
1412 { /* be virtual console, fail silently */ 1560 /* be virtual console, fail silently */
1413#ifdef TIOCCONS 1561#ifdef TIOCCONS
1414 unsigned int on = 1; 1562 unsigned int on = 1;
1415 1563
1416 ioctl (STDIN_FILENO, TIOCCONS, &on); 1564 ioctl (STDIN_FILENO, TIOCCONS, &on);
1417#elif defined (SRIOCSREDIR) 1565#elif defined (SRIOCSREDIR)
… …
1419 1567
1420 fd = open (CONSOLE, O_WRONLY, 0); 1568 fd = open (CONSOLE, O_WRONLY, 0);
1421 if (fd >= 0) 1569 if (fd >= 0)
1422 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1570 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1423 close (fd); 1571 close (fd);
1424#endif /* SRIOCSREDIR */ 1572#endif /* SRIOCSREDIR */
1425 } 1573 }
1426 1574
1427 /* reset signals and spin off the command interpreter */ 1575 /* reset signals and spin off the command interpreter */
1428 signal (SIGINT, SIG_DFL); 1576 signal (SIGINT, SIG_DFL);
1429 signal (SIGQUIT, SIG_DFL); 1577 signal (SIGQUIT, SIG_DFL);
… …
1436 */ 1584 */
1437#ifdef SIGTSTP 1585#ifdef SIGTSTP
1438 signal (SIGTSTP, SIG_IGN); 1586 signal (SIGTSTP, SIG_IGN);
1439 signal (SIGTTIN, SIG_IGN); 1587 signal (SIGTTIN, SIG_IGN);
1440 signal (SIGTTOU, SIG_IGN); 1588 signal (SIGTTOU, SIG_IGN);
1441#endif /* SIGTSTP */ 1589#endif /* SIGTSTP */
1442
1443 // unblock signals (signals are blocked by iom.C
1444 sigset_t ss;
1445 sigemptyset (&ss);
1446 sigprocmask (SIG_SETMASK, &ss, 0);
1447 1590
1448 /* command interpreter path */ 1591 /* command interpreter path */
1449 if (argv != NULL) 1592 if (argv)
1450 { 1593 {
1451# ifdef DEBUG_CMD 1594# ifdef DEBUG_CMD
1452 int i; 1595 int i;
1453 1596
1454 for (i = 0; argv[i]; i++) 1597 for (i = 0; argv[i]; i++)
… …
1463 const char *argv0, *shell; 1606 const char *argv0, *shell;
1464 1607
1465 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1608 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1466 shell = "/bin/sh"; 1609 shell = "/bin/sh";
1467 1610
1468 argv0 = (const char *)rxvt_r_basename (shell); 1611 argv0 = rxvt_basename (shell);
1469 1612
1470 if (OPTION (Opt_loginShell)) 1613 if (option (Opt_loginShell))
1471 { 1614 {
1472 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1615 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1473 1616
1474 login[0] = '-'; 1617 login[0] = '-';
1475 strcpy (&login[1], argv0); 1618 strcpy (&login[1], argv0);
1476 argv0 = login; 1619 argv0 = login;
1477 } 1620 }
1478 1621
1479 execlp (shell, argv0, NULL); 1622 execlp (shell, argv0, (char *)0);
1480 /* no error message: STDERR is closed! */ 1623 /* no error message: STDERR is closed! */
1481 } 1624 }
1482 1625
1483 return -1; 1626 return -1;
1484} 1627}

Diff Legend

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