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.94 by root, Mon Nov 29 13:37:20 2004 UTC vs.
Revision 1.245 by ayin, Sun Jan 27 16:52:13 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 14 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support
14 * Copyright (c) 2003-2004 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.
31 * Initialisation routines. 32 * Initialisation routines.
32 */ 33 */
33 34
34#include "../config.h" /* NECESSARY */ 35#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 36#include "rxvt.h" /* NECESSARY */
37#include "rxvtutil.h"
36#include "init.h" 38#include "init.h"
39#include "keyboard.h"
37 40
41#include <limits>
42
38#include <signal.h> 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
39 147
40const char *const def_colorName[] = 148const char *const def_colorName[] =
41 { 149 {
42 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
43 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
44 /* low-intensity colors */ 152 /* low-intensity colors */
45 "Black", /* 0: black (#000000) */ 153 "rgb:00/00/00", // 0: black (Black)
46#ifndef NO_BRIGHTCOLOR 154 "rgb:cd/00/00", // 1: red (Red3)
47 "Red3", /* 1: red (#CD0000) */ 155 "rgb:00/cd/00", // 2: green (Green3)
48 "Green3", /* 2: green (#00CD00) */ 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
49 "Yellow3", /* 3: yellow (#CDCD00) */ 157 "rgb:00/00/cd", // 4: blue (Blue3)
50 "Blue3", /* 4: blue (#0000CD) */ 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
51 "Magenta3", /* 5: magenta (#CD00CD) */ 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
52 "Cyan3", /* 6: cyan (#00CDCD) */
53# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
54 "Grey90", /* 7: white (#E5E5E5) */ 161 "rgb:e5/e5/e5", // 7: white (Grey90)
55# else 162# else
56 "AntiqueWhite", /* 7: white (#FAEBD7) */ 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
57# endif 164# endif
58 /* high-intensity colors */ 165 /* high-intensity colors */
59# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
60 "Grey30", /* 8: bright black (#4D4D4D) */ 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
61# else 168# else
62 "Grey25", /* 8: bright black (#404040) */ 169 "rgb:40/40/40", // 8: bright black (Grey25)
63# endif 170# endif
64#endif /* NO_BRIGHTCOLOR */ 171 "rgb:ff/00/00", // 1/9: bright red (Reed)
65 "Red", /* 1/9: bright red (#FF0000) */ 172 "rgb:00/ff/00", // 2/10: bright green (Green)
66 "Green", /* 2/10: bright green (#00FF00) */ 173 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
67 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
68 "Blue", /* 4/12: bright blue (#0000FF) */ 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
69 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
70 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
71 "White", /* 7/15: bright white (#FFFFFF) */
72 178
73 // 88 xterm colours 179 // 88 xterm colours
74 "rgb:00/00/00", 180 "rgb:00/00/00",
75 "rgb:00/00/8b", 181 "rgb:00/00/8b",
76 "rgb:00/00/cd", 182 "rgb:00/00/cd",
145 "rgb:e7/e7/e7", 251 "rgb:e7/e7/e7",
146 252
147#ifndef NO_CURSORCOLOR 253#ifndef NO_CURSORCOLOR
148 COLOR_CURSOR_BACKGROUND, 254 COLOR_CURSOR_BACKGROUND,
149 COLOR_CURSOR_FOREGROUND, 255 COLOR_CURSOR_FOREGROUND,
150#endif /* ! NO_CURSORCOLOR */ 256#endif /* ! NO_CURSORCOLOR */
151 NULL, /* Color_pointer_fg */ 257 NULL, /* Color_pointer_fg */
152 NULL, /* Color_pointer_bg */ 258 NULL, /* Color_pointer_bg */
153 NULL, /* Color_border */ 259 NULL, /* Color_border */
154#ifndef NO_BOLD_UNDERLINE_REVERSE 260#ifndef NO_BOLD_UNDERLINE_REVERSE
155 NULL, /* Color_BD */ 261 NULL, /* Color_BD */
156 NULL, /* Color_IT */ 262 NULL, /* Color_IT */
157 NULL, /* Color_UL */ 263 NULL, /* Color_UL */
158 NULL, /* Color_RV */ 264 NULL, /* Color_RV */
159#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 265#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
266#if ENABLE_FRILLS
267 NULL, // Color_underline
268#endif
160#ifdef OPTION_HC 269#ifdef OPTION_HC
161 NULL, 270 NULL,
162#endif 271#endif
163#ifdef KEEP_SCROLLCOLOR 272#ifdef HAVE_SCROLLBARS
164 COLOR_SCROLLBAR, 273 COLOR_SCROLLBAR,
274#endif
275#ifdef RXVT_SCROLLBAR
165 COLOR_SCROLLTROUGH, 276 COLOR_SCROLLTROUGH,
166#endif /* KEEP_SCROLLCOLOR */ 277#endif
167#if TINTING 278#if ENABLE_TRANSPARENCY
168 NULL, 279 NULL,
169#endif 280#endif
281#if OFF_FOCUS_FADING
282 "rgb:00/00/00",
283#endif
170 }; 284 };
171 285
172const char *const xa_names[NUM_XA] = 286void
173 {
174 "TEXT",
175 "COMPOUND_TEXT",
176 "UTF8_STRING",
177 "MULTIPLE",
178 "TARGETS",
179 "TIMESTAMP",
180 "VT_SELECTION",
181 "INCR",
182 "WM_DELETE_WINDOW",
183#ifdef TRANSPARENT
184 "_XROOTPMAP_ID",
185#endif
186#ifdef OFFIX_DND
187 "DndProtocol",
188 "DndSelection",
189#endif
190 "CLIPBOARD"
191 };
192
193bool
194rxvt_term::init_vars () 287rxvt_term::init_vars ()
195{ 288{
196 sw_term.start (SIGTERM);
197
198 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
199#ifdef OFF_FOCUS_FADING
200 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
201#endif
202 pix_colors = pix_colors_focused; 289 pix_colors = pix_colors_focused;
203
204 if (pix_colors == NULL)
205 return false;
206
207#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
208 TermWin.pixmap = None;
209#endif
210 290
211 MEvent.time = CurrentTime; 291 MEvent.time = CurrentTime;
212 MEvent.button = AnyButton; 292 MEvent.button = AnyButton;
213 options = DEFAULT_OPTIONS;
214 want_refresh = 1; 293 want_refresh = 1;
215 cmd_pid = -1;
216 pty.pty = pty.tty = -1;
217 priv_modes = SavedModes = PrivMode_Default; 294 priv_modes = SavedModes = PrivMode_Default;
218 TermWin.focus = 0;
219 TermWin.ncol = 80; 295 ncol = 80;
220 TermWin.nrow = 24; 296 nrow = 24;
221 TermWin.int_bwidth = INTERNALBORDERWIDTH; 297 int_bwidth = INTERNALBORDERWIDTH;
222 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 298 ext_bwidth = EXTERNALBORDERWIDTH;
223 TermWin.lineSpace = LINESPACE; 299 lineSpace = LINESPACE;
224 TermWin.saveLines = SAVELINES; 300 saveLines = SAVELINES;
225 numpix_colors = TOTAL_COLORS;
226 301
227 refresh_limit = 1;
228 refresh_type = SLOW_REFRESH; 302 refresh_type = SLOW_REFRESH;
229 prev_nrow = prev_ncol = 0;
230 303
231 oldcursor.row = oldcursor.col = -1; 304 oldcursor.row = oldcursor.col = -1;
232#ifdef XPM_BACKGROUND
233 /* bgPixmap.w = bgPixmap.h = 0; */
234 bgPixmap.x = bgPixmap.y = 50;
235 bgPixmap.pixmap = None;
236#endif
237 305
238 last_bot = last_state = -1; 306 set_option (Opt_scrollBar);
239 307 set_option (Opt_scrollTtyOutput);
240#ifdef MENUBAR 308 set_option (Opt_jumpScroll);
241 menu_readonly = 1; 309 set_option (Opt_skipScroll);
242# if ! (MENUBAR_MAX > 1) 310 set_option (Opt_secondaryScreen);
243 CurrentBar = & (BarList); 311 set_option (Opt_secondaryScroll);
244# endif /* (MENUBAR_MAX > 1) */ 312 set_option (Opt_pastableTabs);
245#endif 313 set_option (Opt_intensityStyles);
246 314 set_option (Opt_iso14755_52);
247 return true; 315 set_option (Opt_buffered);
248} 316}
249 317
250void 318static void
251rxvt_term::init_secondary () 319init_secondary ()
252{ 320{
253 int i; 321 int i;
254 322
255 /*
256 * Close all unused file descriptors
257 * We don't want them, we don't need them.
258 */
259 if ((i = open ("/dev/null", O_RDONLY)) < 0) 323 if ((i = open ("/dev/null", O_RDONLY)) < 0)
260 { 324 {
261 /* TODO: BOO HISS */
262 dup2 (STDERR_FILENO, STDIN_FILENO); 325 dup2 (STDERR_FILENO, STDIN_FILENO);
263 } 326 }
264 else if (i > STDIN_FILENO) 327 else if (i != STDIN_FILENO)
265 { 328 {
266 dup2 (i, STDIN_FILENO); 329 dup2 (i, STDIN_FILENO);
267 close (i); 330 close (i);
268 } 331 }
269 332
270 dup2 (STDERR_FILENO, STDOUT_FILENO); 333 dup2 (STDERR_FILENO, STDOUT_FILENO);
271
272#if 0 // schmorp sayz closing filies is murder
273 for (i = STDERR_FILENO + 1; i < num_fds; i++)
274 {
275#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
276 if (i == 4 || i == 7)
277 continue;
278#endif
279 close (i);
280 }
281#endif
282} 334}
283 335
284/*----------------------------------------------------------------------*/ 336/*----------------------------------------------------------------------*/
285const char ** 337const char **
286rxvt_term::init_resources (int argc, const char *const *argv) 338rxvt_term::init_resources (int argc, const char *const *argv)
287{ 339{
288 int i, r_argc; 340 int i, r_argc;
289 char *val;
290 const char **cmd_argv, **r_argv; 341 const char **cmd_argv, **r_argv;
291 342
292 /* 343 /*
293 * 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
294 */ 345 */
295 for (r_argc = 0; r_argc < argc; r_argc++) 346 for (r_argc = 0; r_argc < argc; r_argc++)
296 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 347 if (!strcmp (argv[r_argc], "-e"))
297 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 }
298 363
299 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 364 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
300 365
301 for (i = 0; i < r_argc; i++) 366 for (i = 0; i < r_argc; i++)
302 r_argv[i] = (const char *)argv[i]; 367 r_argv[i] = (const char *)argv[i];
303 368
304 r_argv[i] = NULL; 369 r_argv[i] = NULL;
305 370
306 if (r_argc == argc)
307 cmd_argv = NULL;
308 else
309 {
310 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
311
312 for (i = 0; i < argc - r_argc - 1; i++)
313 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
314
315 cmd_argv[i] = NULL;
316 }
317
318 rs[Rs_name] = rxvt_r_basename (argv[0]); 371 rs[Rs_name] = rxvt_basename (argv[0]);
319 372
320 /* 373 /*
321 * Open display, get options/resources and create the window 374 * Open display, get options/resources and create the window
322 */ 375 */
376
323 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 377 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
324 rs[Rs_display_name] = ":0"; 378 rs[Rs_display_name] = ":0";
325 379
326 get_options (r_argc, r_argv); 380 get_options (r_argc, r_argv);
381
382 if (!(display = displays.get (rs[Rs_display_name])))
383 {
384 free (r_argv);
385 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
386 }
387
388 // using a local pointer decreases code size a lot
389 xa = display->xa;
390
391 set (display);
392 extract_resources ();
393
394#if XFT
395 if (rs[Rs_depth])
396 select_visual (strtol (rs[Rs_depth], 0, 0));
397#endif
398
399#ifdef HAVE_AFTERIMAGE
400 set_application_name ((char*)rs[Rs_name]);
401 set_output_threshold (OUTPUT_LEVEL_WARNING);
402 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
403#endif
327 free (r_argv); 404 free (r_argv);
328 405
329#ifdef LOCAL_X_IS_UNIX 406 for (int i = NUM_RESOURCES; i--; )
330 if (rs[Rs_display_name][0] == ':') 407 if (rs [i] == resval_undef)
331 { 408 rs [i] = 0;
332 val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); 409
333 strcpy (val, "unix"); 410#if ENABLE_PERL
334 strcat (val, rs[Rs_display_name]); 411 if (!rs[Rs_perl_ext_1])
335 display = displays.get (val); 412 rs[Rs_perl_ext_1] = "default";
336 free (val); 413
414 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
415 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
416 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
337 } 417 {
418 rxvt_perl.init (this);
419 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
420 }
338#endif 421#endif
339
340 if (!display
341 && ! (display = displays.get (rs[Rs_display_name])))
342 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
343
344 extract_resources (display->display, rs[Rs_name]);
345 422
346 /* 423 /*
347 * set any defaults not already set 424 * set any defaults not already set
348 */ 425 */
349 if (cmd_argv && cmd_argv[0]) 426 if (cmd_argv && cmd_argv[0])
350 { 427 {
351 if (!rs[Rs_title]) 428 if (!rs[Rs_title])
352 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 429 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
353 if (!rs[Rs_iconName]) 430 if (!rs[Rs_iconName])
354 rs[Rs_iconName] = rs[Rs_title]; 431 rs[Rs_iconName] = rs[Rs_title];
355 } 432 }
356 else 433 else
357 { 434 {
360 if (!rs[Rs_iconName]) 437 if (!rs[Rs_iconName])
361 rs[Rs_iconName] = rs[Rs_name]; 438 rs[Rs_iconName] = rs[Rs_name];
362 } 439 }
363 440
364 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 441 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
365 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 442 saveLines = min (i, MAX_SAVELINES);
366 443
367#if ENABLE_FRILLS 444#if ENABLE_FRILLS
368 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 445 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
369 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 446 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
447
370 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 448 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
371 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 449 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
372#endif
373 450
374#ifndef NO_LINESPACE
375 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 451 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
376 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 452 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
377#endif 453#endif
378 454
379#ifdef POINTER_BLANK 455#ifdef POINTER_BLANK
380 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 456 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
381 pointerBlankDelay = i; 457 pointerBlankDelay = i;
382 else 458 else
383 pointerBlankDelay = 2; 459 pointerBlankDelay = 2;
384#endif 460#endif
385 461
386 /* no point having a scrollbar without having any scrollback! */ 462 /* no point having a scrollbar without having any scrollback! */
387 if (!TermWin.saveLines) 463 if (!saveLines)
388 options &= ~Opt_scrollBar; 464 set_option (Opt_scrollBar, 0);
389 465
390#ifdef PRINTPIPE 466#ifdef PRINTPIPE
391 if (!rs[Rs_print_pipe]) 467 if (!rs[Rs_print_pipe])
392 rs[Rs_print_pipe] = PRINTPIPE; 468 rs[Rs_print_pipe] = PRINTPIPE;
393#endif 469#endif
396 rs[Rs_cutchars] = CUTCHARS; 472 rs[Rs_cutchars] = CUTCHARS;
397 473
398#ifndef NO_BACKSPACE_KEY 474#ifndef NO_BACKSPACE_KEY
399 if (!rs[Rs_backspace_key]) 475 if (!rs[Rs_backspace_key])
400# ifdef DEFAULT_BACKSPACE 476# ifdef DEFAULT_BACKSPACE
401 key_backspace = DEFAULT_BACKSPACE; 477 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
402# else 478# else
403 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 479 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
404# endif 480# endif
405 else
406 {
407 val = strdup (rs[Rs_backspace_key]);
408 rxvt_Str_trim (val);
409 rxvt_Str_escaped (val);
410 key_backspace = val;
411 }
412#endif 481#endif
413 482
414#ifndef NO_DELETE_KEY 483#ifndef NO_DELETE_KEY
415 if (!rs[Rs_delete_key]) 484 if (!rs[Rs_delete_key])
416# ifdef DEFAULT_DELETE 485# ifdef DEFAULT_DELETE
417 key_delete = DEFAULT_DELETE; 486 rs[Rs_delete_key] = DEFAULT_DELETE;
418# else 487# else
419 key_delete = "\033[3~"; 488 rs[Rs_delete_key] = "\033[3~";
420# endif
421 else
422 {
423 val = strdup (rs[Rs_delete_key]);
424 rxvt_Str_trim (val);
425 rxvt_Str_escaped (val);
426 key_delete = val;
427 }
428#endif 489# endif
429 if (rs[Rs_answerbackstring]) 490#endif
430 {
431 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
432 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
433 }
434 491
435#ifdef HAVE_SCROLLBARS 492#ifdef HAVE_SCROLLBARS
436 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 493 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
437#endif 494#endif
438 495
439#ifdef XTERM_REVERSE_VIDEO 496#ifdef XTERM_REVERSE_VIDEO
440 /* this is how xterm implements reverseVideo */ 497 /* this is how xterm implements reverseVideo */
441 if (options & Opt_reverseVideo) 498 if (option (Opt_reverseVideo))
442 { 499 {
443 if (!rs[Rs_color + Color_fg]) 500 if (!rs[Rs_color + Color_fg])
444 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 501 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
502
445 if (!rs[Rs_color + Color_bg]) 503 if (!rs[Rs_color + Color_bg])
446 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 504 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
447 } 505 }
448#endif 506#endif
449 507
451 if (!rs[Rs_color + i]) 509 if (!rs[Rs_color + i])
452 rs[Rs_color + i] = def_colorName[i]; 510 rs[Rs_color + i] = def_colorName[i];
453 511
454#ifndef XTERM_REVERSE_VIDEO 512#ifndef XTERM_REVERSE_VIDEO
455 /* this is how we implement reverseVideo */ 513 /* this is how we implement reverseVideo */
456 if (options & Opt_reverseVideo) 514 if (option (Opt_reverseVideo))
457 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 515 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
458#endif 516#endif
459 517
460 /* convenient aliases for setting fg/bg to colors */ 518 /* convenient aliases for setting fg/bg to colors */
461 color_aliases (Color_fg); 519 color_aliases (Color_fg);
462 color_aliases (Color_bg); 520 color_aliases (Color_bg);
463#ifndef NO_CURSORCOLOR 521#ifndef NO_CURSORCOLOR
464 color_aliases (Color_cursor); 522 color_aliases (Color_cursor);
465 color_aliases (Color_cursor2); 523 color_aliases (Color_cursor2);
466#endif /* NO_CURSORCOLOR */ 524#endif /* NO_CURSORCOLOR */
467 color_aliases (Color_pointer_fg); 525 color_aliases (Color_pointer_fg);
468 color_aliases (Color_pointer_bg); 526 color_aliases (Color_pointer_bg);
469 color_aliases (Color_border); 527 color_aliases (Color_border);
470#ifndef NO_BOLD_UNDERLINE_REVERSE 528#ifndef NO_BOLD_UNDERLINE_REVERSE
471 color_aliases (Color_BD); 529 color_aliases (Color_BD);
472 color_aliases (Color_UL); 530 color_aliases (Color_UL);
473 color_aliases (Color_RV); 531 color_aliases (Color_RV);
474#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 532#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
475 533
476 if (!rs[Rs_color + Color_border]) 534 if (!rs[Rs_color + Color_border])
477 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 535 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
478 536
479 return cmd_argv; 537 return cmd_argv;
538}
539
540/*----------------------------------------------------------------------*/
541void
542rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
543{
544 this->envv = envv;
545
546 SET_R (this);
547 set_locale ("");
548 set_environ (envv); // few things in X do not call setlocale :(
549
550 init_vars ();
551
552 init_secondary ();
553
554 const char **cmd_argv = init_resources (argc, argv);
555
556#ifdef KEYSYM_RESOURCE
557 keyboard->register_done ();
558#endif
559
560#ifdef HAVE_SCROLLBARS
561 if (option (Opt_scrollBar))
562 scrollBar.setIdle (); /* set existence for size calculations */
563#endif
564
565 pty = ptytty::create ();
566
567 create_windows (argc, argv);
568
569 init_xlocale ();
570
571 scr_reset (); // initialize screen
572
573#if 0
574 XSynchronize (dpy, True);
575#endif
576
577#ifdef HAVE_SCROLLBARS
578 if (option (Opt_scrollBar))
579 resize_scrollbar (); /* create and map scrollbar */
580#endif
581#ifdef HAVE_BG_PIXMAP
582 {
583 bgPixmap.set_target (this);
584 bgPixmap.invalidate ();
585
586#ifdef ENABLE_TRANSPARENCY
587 if (option (Opt_transparent))
588 {
589 bgPixmap.set_transparent ();
590
591#ifdef HAVE_AFTERIMAGE
592 if (rs [Rs_blurradius])
593 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
594#endif
595 if (ISSET_PIXCOLOR (Color_tint))
596 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
597
598 if (rs [Rs_shade])
599 bgPixmap.set_shade (rs [Rs_shade]);
600
601 bgPixmap.set_root_pixmap ();
602 XSelectInput (dpy, display->root, PropertyChangeMask);
603 rootwin_ev.start (display, display->root);
604 }
605#endif
606
607#ifdef BG_IMAGE_FROM_FILE
608 if (rs[Rs_backgroundPixmap])
609 {
610 const char *p = rs[Rs_backgroundPixmap];
611
612 if ((p = strchr (p, ';')) != 0)
613 {
614 p++;
615 bgPixmap.set_geometry (p);
616 }
617 else
618 bgPixmap.set_defaultGeometry ();
619
620 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
621 if (!bgPixmap.window_position_sensitive ())
622 update_background ();
623 }
624#endif
625 }
626#endif
627
628#if ENABLE_PERL
629 rootwin_ev.start (display, display->root);
630#endif
631
632 set_colorfgbg ();
633
634 init_command (cmd_argv);
635
636 free (cmd_argv);
637
638 if (pty->pty >= 0)
639 pty_ev.start (pty->pty, ev::READ);
640
641 HOOK_INVOKE ((this, HOOK_START, DT_END));
642
643#if ENABLE_XEMBED
644 if (rs[Rs_embed])
645 {
646 long info[2] = { 0, XEMBED_MAPPED };
647
648 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
649 32, PropModeReplace, (unsigned char *)&info, 2);
650 }
651#endif
652
653 XMapWindow (dpy, vt);
654 XMapWindow (dpy, parent[0]);
655
656 refresh_check ();
480} 657}
481 658
482/*----------------------------------------------------------------------*/ 659/*----------------------------------------------------------------------*/
483void 660void
484rxvt_term::init_env () 661rxvt_term::init_env ()
485{ 662{
486 int i; 663 int i;
487 unsigned int u;
488 char *val; 664 char *val;
489 665
490#ifdef DISPLAY_IS_IP 666#ifdef DISPLAY_IS_IP
491 /* Fixup display_name for export over pty to any interested terminal 667 /* Fixup display_name for export over pty to any interested terminal
492 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 668 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
500 */ 676 */
501 val = rxvt_network_display (rs[Rs_display_name]); 677 val = rxvt_network_display (rs[Rs_display_name]);
502 rs[Rs_display_name] = (const char *)val; 678 rs[Rs_display_name] = (const char *)val;
503 679
504 if (val == NULL) 680 if (val == NULL)
505#endif /* DISPLAY_IS_IP */ 681#endif /* DISPLAY_IS_IP */
506 val = XDisplayString (display->display); 682 val = XDisplayString (dpy);
507 683
508 if (rs[Rs_display_name] == NULL) 684 if (rs[Rs_display_name] == NULL)
509 rs[Rs_display_name] = val; /* use broken `:0' value */ 685 rs[Rs_display_name] = val; /* use broken `:0' value */
510 686
511 i = strlen (val); 687 i = strlen (val);
512 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 688 env_display = (char *)rxvt_malloc (i + 9);
513 689
514 sprintf (env_display, "DISPLAY=%s", val); 690 sprintf (env_display, "DISPLAY=%s", val);
515 691
516 /* avoiding the math library: 692 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
517 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
518 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
519 ;
520 MAX_IT (i, 1);
521 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
522
523 sprintf (env_windowid, "WINDOWID=%u",
524 (unsigned int)TermWin.parent[0]);
525 693
526 /* add entries to the environment: 694 /* add entries to the environment:
527 * @ DISPLAY: in case we started with -display 695 * @ DISPLAY: in case we started with -display
528 * @ WINDOWID: X window id number of the window 696 * @ WINDOWID: X window id number of the window
529 * @ COLORTERM: terminal sub-name and also indicates its color 697 * @ COLORTERM: terminal sub-name and also indicates its color
531 * @ TERMINFO: path to terminfo directory 699 * @ TERMINFO: path to terminfo directory
532 * @ COLORFGBG: fg;bg color codes 700 * @ COLORFGBG: fg;bg color codes
533 */ 701 */
534 putenv (env_display); 702 putenv (env_display);
535 putenv (env_windowid); 703 putenv (env_windowid);
704
536 if (env_colorfgbg) 705 if (env_colorfgbg)
537 putenv (env_colorfgbg); 706 putenv (env_colorfgbg);
538 707
539#ifdef RXVT_TERMINFO 708#ifdef RXVT_TERMINFO
540 putenv ("TERMINFO=" RXVT_TERMINFO); 709 putenv ("TERMINFO=" RXVT_TERMINFO);
541#endif 710#endif
542 711
543 if (display->depth <= 2) 712 if (depth <= 2)
544 putenv ("COLORTERM=" COLORTERMENV "-mono"); 713 putenv ("COLORTERM=" COLORTERMENV "-mono");
545 else 714 else
546 putenv ("COLORTERM=" COLORTERMENVFULL); 715 putenv ("COLORTERM=" COLORTERMENVFULL);
547 716
548 if (rs[Rs_term_name] != NULL) 717 if (rs[Rs_term_name] != NULL)
549 { 718 {
550 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 719 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
551 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 720 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
552 putenv (env_term); 721 putenv (env_term);
553 } 722 }
554 else 723 else
555 putenv ("TERM=" TERMENV); 724 putenv ("TERM=" TERMENV);
557#ifdef HAVE_UNSETENV 726#ifdef HAVE_UNSETENV
558 /* avoid passing old settings and confusing term size */ 727 /* avoid passing old settings and confusing term size */
559 unsetenv ("LINES"); 728 unsetenv ("LINES");
560 unsetenv ("COLUMNS"); 729 unsetenv ("COLUMNS");
561 unsetenv ("TERMCAP"); /* terminfo should be okay */ 730 unsetenv ("TERMCAP"); /* terminfo should be okay */
562#endif /* HAVE_UNSETENV */ 731#endif /* HAVE_UNSETENV */
563} 732}
564 733
565/*----------------------------------------------------------------------*/ 734/*----------------------------------------------------------------------*/
566/* 735/*
567 * This is more or less stolen straight from XFree86 xterm. 736 * This is more or less stolen straight from XFree86 xterm.
568 * This should support all European type languages. 737 * This should support all European type languages.
569 */ 738 */
570void 739void
571rxvt_term::set_locale (const char *locale) 740rxvt_term::set_locale (const char *locale)
572{ 741{
742 set_environ (envv);
743
573#if HAVE_XSETLOCALE || HAVE_SETLOCALE 744#if HAVE_XSETLOCALE || HAVE_SETLOCALE
574 free (this->locale); 745 free (this->locale);
575 this->locale = setlocale (LC_CTYPE, locale); 746 this->locale = setlocale (LC_CTYPE, locale);
576 747
577 if (!this->locale) 748 if (!this->locale)
578 { 749 {
579 if (*locale) 750 if (*locale)
580 { 751 {
581 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 752 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
582 setlocale (LC_CTYPE, ""); 753 setlocale (LC_CTYPE, "C");
583 } 754 }
584 else 755 else
585 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 756 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
586 757
587 this->locale = ""; 758 this->locale = "C";
588 } 759 }
589 760
590 761
591 this->locale = rxvt_strdup (this->locale); 762 this->locale = strdup (this->locale);
592 SET_LOCALE (this->locale); 763 SET_LOCALE (this->locale);
593 mbstate.reset (); 764 mbstate.reset ();
594#endif 765#endif
595#if 0 766
596#if HAVE_NL_LANGINFO 767#if HAVE_NL_LANGINFO
768 char *codeset = strdup (nl_langinfo (CODESET));
769 // /^UTF.?8/i
770 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
771 && (codeset[1] == 'T' || codeset[1] == 't')
772 && (codeset[2] == 'F' || codeset[2] == 'f')
773 && (codeset[3] == '8' || codeset[4] == '8');
597 free (codeset); 774 free (codeset);
598 codeset = strdup (nl_langinfo (CODESET));
599 enc_utf8 = !strcasecmp (codeset, "UTF-8")
600 || !strcasecmp (codeset, "UTF8");
601#else 775#else
602 enc_utf8 = 1; 776 enc_utf8 = 0;
603#endif
604#endif 777#endif
605} 778}
606 779
607void 780void
608rxvt_term::init_xlocale () 781rxvt_term::init_xlocale ()
609{ 782{
783 set_environ (envv);
784
610#ifdef USE_XIM 785#ifdef USE_XIM
611 if (!locale) 786 if (!locale)
612 rxvt_warn ("setting locale failed, working without locale support.\n"); 787 rxvt_warn ("setting locale failed, working without locale support.\n");
613 else 788 else
614 { 789 {
615 Atom wmlocale; 790 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
616
617 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
618 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
619 XA_STRING, 8, PropModeReplace,
620 (unsigned char *)locale, strlen (locale));
621 791
622 if (!XSupportsLocale ()) 792 if (!XSupportsLocale ())
623 { 793 {
624 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 794 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
625 return; 795 return;
639{ 809{
640 /* 810 /*
641 * Initialize the command connection. 811 * Initialize the command connection.
642 * This should be called after the X server connection is established. 812 * This should be called after the X server connection is established.
643 */ 813 */
644 int i;
645
646 for (i = 0; i < NUM_XA; i++)
647 xa[i] = XInternAtom (display->display, xa_names[i], False);
648
649 /* Enable delete window protocol */
650 XSetWMProtocols (display->display, TermWin.parent[0],
651 & (xa[XA_WMDELETEWINDOW]), 1);
652
653#ifdef USING_W11LIB
654 /* enable W11 callbacks */
655 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
656#endif
657 814
658#ifdef META8_OPTION 815#ifdef META8_OPTION
659 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 816 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
660#endif 817#endif
661 818
662 get_ourmods (); 819 get_ourmods ();
663 820
664 if (!(options & Opt_scrollTtyOutput)) 821 if (!option (Opt_scrollTtyOutput))
665 priv_modes |= PrivMode_TtyOutputInh; 822 priv_modes |= PrivMode_TtyOutputInh;
666 if (options & Opt_scrollTtyKeypress) 823 if (option (Opt_scrollTtyKeypress))
667 priv_modes |= PrivMode_Keypress; 824 priv_modes |= PrivMode_Keypress;
668 if (!(options & Opt_jumpScroll)) 825 if (!option (Opt_jumpScroll))
669 priv_modes |= PrivMode_smoothScroll; 826 priv_modes |= PrivMode_smoothScroll;
670 827
671#ifndef NO_BACKSPACE_KEY 828#ifndef NO_BACKSPACE_KEY
672 if (strcmp (key_backspace, "DEC") == 0) 829 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
673 priv_modes |= PrivMode_HaveBackSpace; 830 priv_modes |= PrivMode_HaveBackSpace;
674#endif 831#endif
675 832
676 /* add value for scrollBar */ 833 /* add value for scrollBar */
677 if (scrollbar_visible ()) 834 if (scrollBar.state)
678 { 835 {
679 priv_modes |= PrivMode_scrollBar; 836 priv_modes |= PrivMode_scrollBar;
680 SavedModes |= PrivMode_scrollBar; 837 SavedModes |= PrivMode_scrollBar;
681 } 838 }
682 if (menubar_visible ())
683 {
684 priv_modes |= PrivMode_menuBar;
685 SavedModes |= PrivMode_menuBar;
686 }
687
688#ifdef CURSOR_BLINK
689 if (options & Opt_cursorBlink)
690 (void)gettimeofday (&lastcursorchange, NULL);
691#endif
692 839
693 run_command (argv); 840 run_command (argv);
694} 841}
695 842
696/*----------------------------------------------------------------------*/ 843/*----------------------------------------------------------------------*/
700 int i; 847 int i;
701 848
702#ifdef OFF_FOCUS_FADING 849#ifdef OFF_FOCUS_FADING
703 pix_colors = pix_colors_focused; 850 pix_colors = pix_colors_focused;
704#endif 851#endif
705 852
706 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 853 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
707 { 854 {
855 const char *name = rs[Rs_color + i];
856
857 if (!name)
858 continue;
859
708 rxvt_color xcol; 860 rxvt_color xcol;
709 861
710 if (!rs[Rs_color + i]) 862 if (!set_color (xcol, name))
711 continue;
712
713 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
714 { 863 {
715#ifndef XTERM_REVERSE_VIDEO 864#ifndef XTERM_REVERSE_VIDEO
716 if (i < 2 && (options & Opt_reverseVideo)) 865 if (i < 2 && option (Opt_reverseVideo))
717 rs[Rs_color + i] = def_colorName[!i]; 866 name = def_colorName [1 - i];
718 else 867 else
719#endif 868#endif
720 rs[Rs_color + i] = def_colorName[i]; 869 name = def_colorName [i];
721 870
722 if (!rs[Rs_color + i]) 871 if (!name)
723 continue; 872 continue;
724 873
725 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 874 if (!set_color (xcol, name))
726 { 875 {
727 switch (i) 876 switch (i)
728 { 877 {
729 case Color_fg: 878 case Color_fg:
730 case Color_bg: 879 case Color_bg:
731 /* fatal: need bg/fg color */
732 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 880 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
733 /* NOTREACHED */ 881 name = "";
734 break; 882 break;
735#ifndef NO_CURSORCOLOR 883#ifndef NO_CURSORCOLOR
736 case Color_cursor2: 884 case Color_cursor2:
737 xcol = pix_colors[Color_fg]; 885#endif
738 break;
739#endif /* ! NO_CURSORCOLOR */
740 case Color_pointer_fg: 886 case Color_pointer_fg:
741 xcol = pix_colors[Color_fg]; 887 name = rs[Rs_color + Color_fg];
888 xcol.set (this, name);
742 break; 889 break;
743 default: 890 default:
744 xcol = pix_colors[Color_bg]; /* None */ 891 name = rs[Rs_color + Color_bg];
892 xcol.set (this, name);
745 break; 893 break;
746 } 894 }
747 } 895 }
748 } 896 }
749 897
750 pix_colors[i] = xcol; 898 pix_colors[i] = xcol;
751#ifdef OFF_FOCUS_FADING 899 rs[Rs_color + i] = name;
752 if (rs[Rs_fade])
753 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
754#endif
755 SET_PIXCOLOR (i);
756 }
757
758 if (display->depth <= 2)
759 { 900 }
901
902 if (depth <= 2)
903 {
760 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 904 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
761 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 905 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
762 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 906 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
763 } 907 }
764 908
765 /* 909 /*
766 * get scrollBar/menuBar shadow colors 910 * get scrollBar shadow colors
767 * 911 *
768 * The calculations of topShadow/bottomShadow values are adapted 912 * The calculations of topShadow/bottomShadow values are adapted
769 * from the fvwm window manager. 913 * from the fvwm window manager.
770 */ 914 */
771#ifdef KEEP_SCROLLCOLOR 915#ifdef RXVT_SCROLLBAR
772
773 if (display->depth <= 2) 916 if (depth <= 2)
917 {
774 { /* Monochrome */ 918 /* Monochrome */
775 pix_colors[Color_scroll] = pix_colors[Color_fg]; 919 alias_color (Color_scroll, Color_fg);
776 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 920 alias_color (Color_topShadow, Color_bg);
777 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 921 alias_color (Color_bottomShadow, Color_bg);
778 } 922 }
779 else 923 else
780 { 924 {
781 rxvt_color xcol[2]; 925 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
782 /* xcol[0] == white
783 * xcol[1] == top shadow
784 * xcol[2] == bot shadow */
785 926
786 xcol[1] = pix_colors[Color_scroll]; 927 rgba cscroll;
787 xcol[0].set (display, 65535, 65535, 65535); 928 pix_colors [Color_scroll].get (cscroll);
788
789 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
790
791 xcol[0].get (display, pr0, pg0, pb0);
792 xcol[1].get (display, pr1, pg1, pb1);
793
794 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
795 929
796 /* topShadowColor */ 930 /* topShadowColor */
797 if (!xcol[1].set (display, 931 if (!pix_colors[Color_topShadow].set (this,
798 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 932 rgba (
799 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 933 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
800 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 934 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
801 xcol[1] = pix_colors[Color_White]; 935 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
802 936 cscroll.a)
803 pix_colors[Color_topShadow] = xcol[1]; 937 ))
938 alias_color (Color_topShadow, Color_White);
804 } 939 }
805#endif /* KEEP_SCROLLCOLOR */ 940#endif
941
942#ifdef OFF_FOCUS_FADING
943 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
944 update_fade_color (i);
945#endif
806} 946}
807 947
808/*----------------------------------------------------------------------*/ 948/*----------------------------------------------------------------------*/
809/* color aliases, fg/bg bright-bold */ 949/* color aliases, fg/bg bright-bold */
810void 950void
813 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 953 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
814 { 954 {
815 int i = atoi (rs[Rs_color + idx]); 955 int i = atoi (rs[Rs_color + idx]);
816 956
817 if (i >= 8 && i <= 15) 957 if (i >= 8 && i <= 15)
818 { /* bright colors */ 958 /* bright colors */
819 i -= 8;
820#ifndef NO_BRIGHTCOLOR
821 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 959 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
822 return; 960 else if (i >= 0 && i <= 7)
823#endif 961 /* normal colors */
824 }
825
826 if (i >= 0 && i <= 7) /* normal colors */
827 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 962 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
828 } 963 }
829} 964}
830 965
831/*----------------------------------------------------------------------*/ 966/*----------------------------------------------------------------------*/
834 * Use resource ``modifier'' to override the Meta modifier 969 * Use resource ``modifier'' to override the Meta modifier
835 */ 970 */
836void 971void
837rxvt_term::get_ourmods () 972rxvt_term::get_ourmods ()
838{ 973{
839 int i, j, k; 974 int i, j, k;
840 int requestedmeta, realmeta, realalt; 975 int requestedmeta, realmeta, realalt;
841 const char *cm, *rsmod; 976 const char *cm, *rsmod;
842 XModifierKeymap *map; 977 XModifierKeymap *map;
843 KeyCode *kc; 978 KeyCode *kc;
844 const unsigned int modmasks[] = 979 const unsigned int modmasks[] =
845 { 980 {
846 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 981 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
847 }; 982 };
848 983
849 requestedmeta = realmeta = realalt = 0; 984 requestedmeta = realmeta = realalt = 0;
850 rsmod = rs[Rs_modifier]; 985 rsmod = rs[Rs_modifier];
986
851 if (rsmod 987 if (rsmod
852 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 988 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
853 requestedmeta = rsmod[3] - '0'; 989 requestedmeta = rsmod[3] - '0';
854 990
855 map = XGetModifierMapping (display->display); 991 map = XGetModifierMapping (dpy);
856 kc = map->modifiermap; 992 kc = map->modifiermap;
993
857 for (i = 1; i < 6; i++) 994 for (i = 1; i < 6; i++)
858 { 995 {
859 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 996 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
997
860 for (j = map->max_keypermod; j--; k++) 998 for (j = map->max_keypermod; j--; k++)
861 { 999 {
862 if (kc[k] == 0) 1000 if (kc[k] == 0)
863 break; 1001 break;
1002
864 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 1003 switch (XKeycodeToKeysym (dpy, kc[k], 0))
865 { 1004 {
866 case XK_Num_Lock: 1005 case XK_Num_Lock:
867 ModNumLockMask = modmasks[i - 1]; 1006 ModNumLockMask = modmasks[i - 1];
868 /* FALLTHROUGH */ 1007 continue;
869 default: 1008
870 continue; /* for (;;) */ 1009 case XK_ISO_Level3_Shift:
1010 ModLevel3Mask = modmasks[i - 1];
1011 continue;
1012
871 case XK_Meta_L: 1013 case XK_Meta_L:
872 case XK_Meta_R: 1014 case XK_Meta_R:
873 cm = "meta"; 1015 cm = "meta";
874 realmeta = i; 1016 realmeta = i;
875 break; 1017 break;
1018
876 case XK_Alt_L: 1019 case XK_Alt_L:
877 case XK_Alt_R: 1020 case XK_Alt_R:
878 cm = "alt"; 1021 cm = "alt";
879 realalt = i; 1022 realalt = i;
880 break; 1023 break;
1024
881 case XK_Super_L: 1025 case XK_Super_L:
882 case XK_Super_R: 1026 case XK_Super_R:
883 cm = "super"; 1027 cm = "super";
884 break; 1028 break;
1029
885 case XK_Hyper_L: 1030 case XK_Hyper_L:
886 case XK_Hyper_R: 1031 case XK_Hyper_R:
887 cm = "hyper"; 1032 cm = "hyper";
888 break; 1033 break;
1034
1035 default:
1036 continue;
889 } 1037 }
1038
890 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 1039 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
891 requestedmeta = i; 1040 requestedmeta = i;
892 } 1041 }
893 } 1042 }
1043
894 XFreeModifiermap (map); 1044 XFreeModifiermap (map);
1045
895 i = (requestedmeta ? requestedmeta 1046 i = requestedmeta ? requestedmeta
896 : (realmeta ? realmeta 1047 : realmeta ? realmeta
897 : (realalt ? realalt : 0))); 1048 : realalt ? realalt
1049 : 0;
1050
898 if (i) 1051 if (i)
899 ModMetaMask = modmasks[i - 1]; 1052 ModMetaMask = modmasks[i - 1];
900} 1053}
901 1054
902/*----------------------------------------------------------------------*/ 1055/*----------------------------------------------------------------------*/
905rxvt_term::create_windows (int argc, const char *const *argv) 1058rxvt_term::create_windows (int argc, const char *const *argv)
906{ 1059{
907 XClassHint classHint; 1060 XClassHint classHint;
908 XWMHints wmHint; 1061 XWMHints wmHint;
909#if ENABLE_FRILLS 1062#if ENABLE_FRILLS
910 Atom prop = None;
911 MWMHints mwmhints; 1063 MWMHints mwmhints = { };
912#endif 1064#endif
913 XGCValues gcvalue; 1065 XGCValues gcvalue;
914 long vt_emask;
915 XSetWindowAttributes attributes; 1066 XSetWindowAttributes attributes;
916 XWindowAttributes gattr; 1067 Window top, parent;
917 1068
918 if (options & Opt_transparent) 1069 dLocal (Display *, dpy);
919 { 1070
920 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 1071 /* grab colors before netscape does */
921 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1072 Get_Colours ();
922 } 1073
1074 if (!set_fonts ())
1075 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1076
1077 parent = display->root;
1078
1079 attributes.override_redirect = !!option (Opt_override_redirect);
923 1080
924#if ENABLE_FRILLS 1081#if ENABLE_FRILLS
925 if (options & Opt_borderLess) 1082 if (option (Opt_borderLess))
926 { 1083 {
927 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 1084 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
928
929 if (prop == None)
930 { 1085 {
931 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1086 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
932#ifdef PREFER_24BIT
933 attributes.override_redirect = TRUE; 1087 attributes.override_redirect = true;
934#endif
935 mwmhints.flags = 0;
936 } 1088 }
937 else 1089 else
938 { 1090 {
939 mwmhints.flags = MWM_HINTS_DECORATIONS; 1091 mwmhints.flags = MWM_HINTS_DECORATIONS;
940 mwmhints.decorations = 0;
941 } 1092 }
942 } 1093 }
943 else 1094#endif
944 { 1095
945 mwmhints.flags = 0; 1096#if ENABLE_XEMBED
1097 if (rs[Rs_embed])
946 } 1098 {
947#endif 1099 XWindowAttributes wattr;
948 1100
949 /* grab colors before netscape does */ 1101 parent = strtol (rs[Rs_embed], 0, 0);
950 Get_Colours ();
951 1102
952 if (!set_fonts ()) 1103 if (!XGetWindowAttributes (dpy, parent, &wattr))
953 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1104 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
1105
1106 window_calc (wattr.width, wattr.height);
1107 }
1108#endif
954 1109
955 window_calc (0, 0); 1110 window_calc (0, 0);
1111
1112 /* sub-window placement & size in rxvt_resize_subwindows () */
1113 attributes.background_pixel = pix_colors_focused [Color_border];
1114 attributes.border_pixel = pix_colors_focused [Color_border];
1115 attributes.colormap = cmap;
1116
1117 top = XCreateWindow (dpy, parent,
1118 szHint.x, szHint.y,
1119 szHint.width, szHint.height,
1120 ext_bwidth,
1121 depth, InputOutput, visual,
1122 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1123 &attributes);
1124
1125 this->parent[0] = top;
1126
956 old_width = szHint.width; 1127 old_width = szHint.width;
957 old_height = szHint.height; 1128 old_height = szHint.height;
958 1129
959 /* sub-window placement & size in rxvt_resize_subwindows () */
960
961#ifdef PREFER_24BIT
962 attributes.background_pixel = pix_colors_focused[Color_border];
963 attributes.border_pixel = pix_colors_focused[Color_border];
964 attributes.colormap = display->cmap;
965 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
966 szHint.x, szHint.y,
967 szHint.width, szHint.height,
968 TermWin.ext_bwidth,
969 display->depth, InputOutput,
970 display->visual,
971 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
972#else
973 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
974 szHint.x, szHint.y,
975 szHint.width, szHint.height,
976 TermWin.ext_bwidth,
977 pix_colors_focused[Color_border],
978 pix_colors_focused[Color_border]);
979#endif
980
981 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1130 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
982 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1131 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
983 1132
984 classHint.res_name = (char *)rs[Rs_name]; 1133 classHint.res_name = (char *)rs[Rs_name];
985 classHint.res_class = (char *)RESCLASS; 1134 classHint.res_class = (char *)RESCLASS;
986 1135
987 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1136 wmHint.flags = InputHint | StateHint | WindowGroupHint;
988 wmHint.input = True; 1137 wmHint.input = True;
989 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1138 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
990 wmHint.window_group = TermWin.parent[0]; 1139 wmHint.window_group = top;
991 1140
992 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1141 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
993 (char **)argv, argc, &szHint, &wmHint, &classHint); 1142 &szHint, &wmHint, &classHint);
994 1143
995#if ENABLE_FRILLS 1144#if ENABLE_FRILLS
1145 if (mwmhints.flags)
1146 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1147 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1148#endif
1149
1150 Atom protocols[] = {
1151 xa[XA_WM_DELETE_WINDOW],
1152#if ENABLE_EWMH
1153 xa[XA_NET_WM_PING],
1154#endif
1155 };
1156
1157 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1158
1159#if ENABLE_FRILLS
1160 if (rs[Rs_transient_for])
1161 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1162#endif
1163
1164#if ENABLE_EWMH
996 long pid = getpid (); 1165 long pid = getpid ();
997 1166
998 XChangeProperty (display->display, TermWin.parent[0], 1167 XChangeProperty (dpy, top,
999 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1168 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1000 PropModeReplace, (unsigned char *)&pid, 1); 1169 PropModeReplace, (unsigned char *)&pid, 1);
1001#endif
1002 1170
1003 XSelectInput (display->display, TermWin.parent[0], 1171 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1172#endif
1173
1174 XSelectInput (dpy, top,
1004 KeyPressMask 1175 KeyPressMask
1005#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1176#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1006 | KeyReleaseMask 1177 | KeyReleaseMask
1007#endif 1178#endif
1008 | FocusChangeMask | VisibilityChangeMask 1179 | FocusChangeMask | VisibilityChangeMask
1009 | ExposureMask
1010 | StructureNotifyMask); 1180 | ExposureMask | StructureNotifyMask);
1181
1011 termwin_ev.start (display, TermWin.parent[0]); 1182 termwin_ev.start (display, top);
1012
1013#if ENABLE_FRILLS
1014 if (mwmhints.flags)
1015 {
1016 prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False);
1017 XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32,
1018 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1019 }
1020#endif
1021 1183
1022 /* vt cursor: Black-on-White is standard, but this is more popular */ 1184 /* vt cursor: Black-on-White is standard, but this is more popular */
1023 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1185 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1024
1025#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1026 /* cursor (menuBar/scrollBar): Black-on-White */
1027 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1028#endif
1029
1030#ifdef POINTER_BLANK
1031 {
1032 XColor blackcolour;
1033 blackcolour.red = 0;
1034 blackcolour.green = 0;
1035 blackcolour.blue = 0;
1036 Font f = XLoadFont (display->display, "fixed");
1037 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1038 &blackcolour, &blackcolour);
1039 XUnloadFont (display->display, f);
1040 }
1041#endif
1042 1186
1043 /* the vt window */ 1187 /* the vt window */
1044 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1188 vt = XCreateSimpleWindow (dpy, top,
1045 window_vt_x,
1046 window_vt_y, 1189 window_vt_x, window_vt_y,
1047 TermWin_TotalWidth (), 1190 width, height,
1048 TermWin_TotalHeight (),
1049 0, 1191 0,
1050 pix_colors_focused[Color_fg], 1192 pix_colors_focused[Color_fg],
1051 pix_colors_focused[Color_bg]); 1193 pix_colors_focused[Color_bg]);
1052#ifdef DEBUG_X
1053 XStoreName (display->display, TermWin.vt, "vt window");
1054#endif
1055 1194
1056 attributes.bit_gravity = NorthWestGravity; 1195 attributes.bit_gravity = NorthWestGravity;
1057 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1196 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1058 1197
1059 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1198 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1060 1199
1061 pointer_unblank ();
1062
1063#ifdef POINTER_BLANK
1064 if (options & Opt_pointerBlank) 1200 if (option (Opt_pointerBlank))
1065 vt_emask |= PointerMotionMask; 1201 vt_emask |= PointerMotionMask;
1066 else 1202 else
1067#endif
1068 vt_emask |= Button1MotionMask | Button3MotionMask; 1203 vt_emask |= Button1MotionMask | Button3MotionMask;
1069 1204
1070 XSelectInput (display->display, TermWin.vt, vt_emask); 1205 vt_select_input ();
1206
1071 vt_ev.start (display, TermWin.vt); 1207 vt_ev.start (display, vt);
1072
1073#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1074 if (menuBar_height ())
1075 {
1076 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1077 window_vt_x, 0,
1078 TermWin_TotalWidth (),
1079 menuBar_TotalHeight (),
1080 0,
1081 pix_colors_focused[Color_fg],
1082 pix_colors_focused[Color_scroll]);
1083
1084#ifdef DEBUG_X
1085 XStoreName (display->display, menuBar.win, "menubar");
1086#endif
1087
1088 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1089
1090 XDefineCursor (display->display, menuBar.win,
1091 XCreateFontCursor (display->display, XC_left_ptr));
1092
1093 XSelectInput (display->display, menuBar.win,
1094 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1095 | Button1MotionMask));
1096 menubar_ev.start (display, menuBar.win);
1097 }
1098#endif
1099
1100#ifdef XPM_BACKGROUND
1101 if (rs[Rs_backgroundPixmap] != NULL
1102 && ! (options & Opt_transparent))
1103 {
1104 const char *p = rs[Rs_backgroundPixmap];
1105
1106 if ((p = strchr (p, ';')) != NULL)
1107 {
1108 p++;
1109 scale_pixmap (p);
1110 }
1111
1112 set_bgPixmap (rs[Rs_backgroundPixmap]);
1113 scr_touch (true);
1114 }
1115#endif
1116 1208
1117 /* graphics context for the vt window */ 1209 /* graphics context for the vt window */
1118 gcvalue.foreground = pix_colors[Color_fg]; 1210 gcvalue.foreground = pix_colors[Color_fg];
1119 gcvalue.background = pix_colors[Color_bg]; 1211 gcvalue.background = pix_colors[Color_bg];
1120 gcvalue.graphics_exposures = 1; 1212 gcvalue.graphics_exposures = 0;
1121 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1213
1214 gc = XCreateGC (dpy, vt,
1122 GCForeground | GCBackground | GCGraphicsExposures, 1215 GCForeground | GCBackground | GCGraphicsExposures,
1123 &gcvalue); 1216 &gcvalue);
1124 1217
1125 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1218 drawable = new rxvt_drawable (this, vt);
1126
1127#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1128 gcvalue.foreground = pix_colors[Color_topShadow];
1129 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1130 gcvalue.foreground = pix_colors[Color_bottomShadow];
1131 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1132 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1133 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1134#endif
1135 1219
1136#ifdef OFF_FOCUS_FADING 1220#ifdef OFF_FOCUS_FADING
1137 // initially we are in unfocused state 1221 // initially we are in unfocused state
1138 if (rs[Rs_fade]) 1222 if (rs[Rs_fade])
1139 pix_colors = pix_colors_unfocused; 1223 pix_colors = pix_colors_unfocused;
1140#endif 1224#endif
1141 1225
1226 pointer_unblank ();
1142 scr_recolour (); 1227 scr_recolour ();
1143} 1228}
1144 1229
1145/* ------------------------------------------------------------------------- * 1230/* ------------------------------------------------------------------------- *
1146 * GET TTY CURRENT STATE * 1231 * GET TTY CURRENT STATE *
1147 * ------------------------------------------------------------------------- */ 1232 * ------------------------------------------------------------------------- */
1148void 1233void
1149rxvt_get_ttymode (ttymode_t *tio, int erase) 1234rxvt_get_ttymode (struct termios *tio, int erase)
1150{ 1235{
1151#ifdef HAVE_TERMIOS_H
1152 /* 1236 /*
1153 * standard System V termios interface 1237 * standard System V termios interface
1154 */ 1238 */
1155 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1239 if (tcgetattr (STDIN_FILENO, tio) < 0)
1156 { 1240 {
1157 /* return error - use system defaults */ 1241 // return error - use system defaults,
1242 // where possible, and zero elsewhere
1243 memset (tio, 0, sizeof (struct termios));
1244
1158 tio->c_cc[VINTR] = CINTR; 1245 tio->c_cc[VINTR] = CINTR;
1159 tio->c_cc[VQUIT] = CQUIT; 1246 tio->c_cc[VQUIT] = CQUIT;
1160 tio->c_cc[VERASE] = CERASE; 1247 tio->c_cc[VERASE] = CERASE;
1248#ifdef VERASE2
1249 tio->c_cc[VERASE2] = CERASE2;
1250#endif
1161 tio->c_cc[VKILL] = CKILL; 1251 tio->c_cc[VKILL] = CKILL;
1162 tio->c_cc[VSTART] = CSTART; 1252 tio->c_cc[VSTART] = CSTART;
1163 tio->c_cc[VSTOP] = CSTOP; 1253 tio->c_cc[VSTOP] = CSTOP;
1164 tio->c_cc[VSUSP] = CSUSP; 1254 tio->c_cc[VSUSP] = CSUSP;
1165# ifdef VDSUSP 1255# ifdef VDSUSP
1166
1167 tio->c_cc[VDSUSP] = CDSUSP; 1256 tio->c_cc[VDSUSP] = CDSUSP;
1168# endif 1257# endif
1169# ifdef VREPRINT 1258# ifdef VREPRINT
1170
1171 tio->c_cc[VREPRINT] = CRPRNT; 1259 tio->c_cc[VREPRINT] = CRPRNT;
1172# endif 1260# endif
1173# ifdef VDISCRD 1261# ifdef VDISCRD
1174
1175 tio->c_cc[VDISCRD] = CFLUSH; 1262 tio->c_cc[VDISCRD] = CFLUSH;
1176# endif 1263# endif
1177# ifdef VWERSE 1264# ifdef VWERSE
1178
1179 tio->c_cc[VWERSE] = CWERASE; 1265 tio->c_cc[VWERSE] = CWERASE;
1180# endif 1266# endif
1181# ifdef VLNEXT 1267# ifdef VLNEXT
1182
1183 tio->c_cc[VLNEXT] = CLNEXT; 1268 tio->c_cc[VLNEXT] = CLNEXT;
1184# endif 1269# endif
1185
1186 } 1270 }
1271
1187 tio->c_cc[VEOF] = CEOF; 1272 tio->c_cc[VEOF] = CEOF;
1188 tio->c_cc[VEOL] = VDISABLE; 1273 tio->c_cc[VEOL] = VDISABLE;
1189# ifdef VEOL2 1274# ifdef VEOL2
1190
1191 tio->c_cc[VEOL2] = VDISABLE; 1275 tio->c_cc[VEOL2] = VDISABLE;
1192# endif 1276# endif
1193# ifdef VSWTC 1277# ifdef VSWTC
1194
1195 tio->c_cc[VSWTC] = VDISABLE; 1278 tio->c_cc[VSWTC] = VDISABLE;
1196# endif 1279# endif
1197# ifdef VSWTCH 1280# ifdef VSWTCH
1198
1199 tio->c_cc[VSWTCH] = VDISABLE; 1281 tio->c_cc[VSWTCH] = VDISABLE;
1200# endif 1282# endif
1201# if VMIN != VEOF 1283# if VMIN != VEOF
1202
1203 tio->c_cc[VMIN] = 1; 1284 tio->c_cc[VMIN] = 1;
1204# endif 1285# endif
1205# if VTIME != VEOL 1286# if VTIME != VEOL
1206
1207 tio->c_cc[VTIME] = 0; 1287 tio->c_cc[VTIME] = 0;
1208# endif 1288# endif
1209 1289
1210 if (erase != -1) 1290 if (erase != -1)
1211 tio->c_cc[VERASE] = (char)erase; 1291 tio->c_cc[VERASE] = (char)erase;
1227 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1307 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1228# if defined (ECHOCTL) && defined (ECHOKE) 1308# if defined (ECHOCTL) && defined (ECHOKE)
1229 | ECHOCTL | ECHOKE 1309 | ECHOCTL | ECHOKE
1230# endif 1310# endif
1231 | ECHOE | ECHOK); 1311 | ECHOE | ECHOK);
1232# else /* HAVE_TERMIOS_H */
1233
1234 /*
1235 * sgtty interface
1236 */
1237
1238 /* get parameters -- gtty */
1239 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1240 {
1241 tio->sg.sg_erase = CERASE; /* ^H */
1242 tio->sg.sg_kill = CKILL; /* ^U */
1243 }
1244 if (erase != -1)
1245 tio->sg.sg_erase = (char)erase;
1246
1247 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1248
1249 /* get special characters */
1250 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1251 {
1252 tio->tc.t_intrc = CINTR; /* ^C */
1253 tio->tc.t_quitc = CQUIT; /* ^\ */
1254 tio->tc.t_startc = CSTART; /* ^Q */
1255 tio->tc.t_stopc = CSTOP; /* ^S */
1256 tio->tc.t_eofc = CEOF; /* ^D */
1257 tio->tc.t_brkc = -1;
1258 }
1259 /* get local special chars */
1260 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1261 {
1262 tio->lc.t_suspc = CSUSP; /* ^Z */
1263 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1264 tio->lc.t_rprntc = CRPRNT; /* ^R */
1265 tio->lc.t_flushc = CFLUSH; /* ^O */
1266 tio->lc.t_werasc = CWERASE; /* ^W */
1267 tio->lc.t_lnextc = CLNEXT; /* ^V */
1268 }
1269 /* get line discipline */
1270 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1271# ifdef NTTYDISC
1272
1273 tio->line = NTTYDISC;
1274# endif /* NTTYDISC */
1275
1276 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1277#endif /* HAVE_TERMIOS_H */
1278 1312
1279 /* 1313 /*
1280 * Debugging 1314 * Debugging
1281 */ 1315 */
1282#ifdef DEBUG_TTYMODE 1316#ifdef DEBUG_TTYMODE
1283#ifdef HAVE_TERMIOS_H
1284 /* c_iflag bits */ 1317 /* c_iflag bits */
1285 fprintf (stderr, "Input flags\n"); 1318 fprintf (stderr, "Input flags\n");
1286 1319
1287 /* cpp token stringize doesn't work on all machines <sigh> */ 1320 /* cpp token stringize doesn't work on all machines <sigh> */
1288# define FOO(flag,name) \ 1321# define FOO(flag,name) \
1300 FOO (IGNCR, "IGNCR"); 1333 FOO (IGNCR, "IGNCR");
1301 FOO (ICRNL, "ICRNL"); 1334 FOO (ICRNL, "ICRNL");
1302 FOO (IXON, "IXON"); 1335 FOO (IXON, "IXON");
1303 FOO (IXOFF, "IXOFF"); 1336 FOO (IXOFF, "IXOFF");
1304# ifdef IUCLC 1337# ifdef IUCLC
1305
1306 FOO (IUCLC, "IUCLC"); 1338 FOO (IUCLC, "IUCLC");
1307# endif 1339# endif
1308# ifdef IXANY 1340# ifdef IXANY
1309
1310 FOO (IXANY, "IXANY"); 1341 FOO (IXANY, "IXANY");
1311# endif 1342# endif
1312# ifdef IMAXBEL 1343# ifdef IMAXBEL
1313
1314 FOO (IMAXBEL, "IMAXBEL"); 1344 FOO (IMAXBEL, "IMAXBEL");
1315# endif 1345# endif
1316 1346
1317 fprintf (stderr, "\n"); 1347 fprintf (stderr, "\n");
1318 1348
1325 FOO (VERASE, "VERASE"); 1355 FOO (VERASE, "VERASE");
1326 FOO (VKILL, "VKILL"); 1356 FOO (VKILL, "VKILL");
1327 FOO (VEOF, "VEOF"); 1357 FOO (VEOF, "VEOF");
1328 FOO (VEOL, "VEOL"); 1358 FOO (VEOL, "VEOL");
1329# ifdef VEOL2 1359# ifdef VEOL2
1330
1331 FOO (VEOL2, "VEOL2"); 1360 FOO (VEOL2, "VEOL2");
1332# endif 1361# endif
1333# ifdef VSWTC 1362# ifdef VSWTC
1334
1335 FOO (VSWTC, "VSWTC"); 1363 FOO (VSWTC, "VSWTC");
1336# endif 1364# endif
1337# ifdef VSWTCH 1365# ifdef VSWTCH
1338
1339 FOO (VSWTCH, "VSWTCH"); 1366 FOO (VSWTCH, "VSWTCH");
1340# endif 1367# endif
1341
1342 FOO (VSTART, "VSTART"); 1368 FOO (VSTART, "VSTART");
1343 FOO (VSTOP, "VSTOP"); 1369 FOO (VSTOP, "VSTOP");
1344 FOO (VSUSP, "VSUSP"); 1370 FOO (VSUSP, "VSUSP");
1345# ifdef VDSUSP 1371# ifdef VDSUSP
1346
1347 FOO (VDSUSP, "VDSUSP"); 1372 FOO (VDSUSP, "VDSUSP");
1348# endif 1373# endif
1349# ifdef VREPRINT 1374# ifdef VREPRINT
1350
1351 FOO (VREPRINT, "VREPRINT"); 1375 FOO (VREPRINT, "VREPRINT");
1352# endif 1376# endif
1353# ifdef VDISCRD 1377# ifdef VDISCRD
1354
1355 FOO (VDISCRD, "VDISCRD"); 1378 FOO (VDISCRD, "VDISCRD");
1356# endif 1379# endif
1357# ifdef VWERSE 1380# ifdef VWERSE
1358
1359 FOO (VWERSE, "VWERSE"); 1381 FOO (VWERSE, "VWERSE");
1360# endif 1382# endif
1361# ifdef VLNEXT 1383# ifdef VLNEXT
1362
1363 FOO (VLNEXT, "VLNEXT"); 1384 FOO (VLNEXT, "VLNEXT");
1364# endif 1385# endif
1365 1386
1366 fprintf (stderr, "\n"); 1387 fprintf (stderr, "\n");
1367# undef FOO 1388# undef FOO
1368# endif /* HAVE_TERMIOS_H */ 1389#endif /* DEBUG_TTYMODE */
1369#endif /* DEBUG_TTYMODE */
1370} 1390}
1371 1391
1372/*----------------------------------------------------------------------*/ 1392/*----------------------------------------------------------------------*/
1373/* 1393/*
1374 * Run the command in a subprocess and return a file descriptor for the 1394 * Run the command in a subprocess and return a file descriptor for the
1376 * the slave. 1396 * the slave.
1377 */ 1397 */
1378void 1398void
1379rxvt_term::run_command (const char *const *argv) 1399rxvt_term::run_command (const char *const *argv)
1380{ 1400{
1401#if ENABLE_FRILLS
1402 if (rs[Rs_pty_fd])
1403 {
1404 pty->pty = atoi (rs[Rs_pty_fd]);
1405
1406 if (pty->pty >= 0)
1407 {
1408 if (getfd_hook)
1409 pty->pty = (*getfd_hook) (pty->pty);
1410
1411 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1412 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1413 }
1414 }
1415 else
1416#endif
1417 if (!pty->get ())
1418 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1419
1381 int er; 1420 int er;
1382 1421
1383 if (!pty.get ())
1384 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1385
1386#ifndef NO_BACKSPACE_KEY 1422#ifndef NO_BACKSPACE_KEY
1387 if (key_backspace[0] && !key_backspace[1]) 1423 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1388 er = key_backspace[0]; 1424 er = rs[Rs_backspace_key][0];
1389 else if (strcmp (key_backspace, "DEC") == 0) 1425 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1390 er = '\177'; /* the initial state anyway */ 1426 er = '\177'; /* the initial state anyway */
1391 else 1427 else
1392#endif 1428#endif
1393 er = -1; 1429 er = -1;
1394 1430
1395 rxvt_get_ttymode (&tio, er); 1431 rxvt_get_ttymode (&tio, er);
1432 /* init terminal attributes */
1433 cfsetospeed (&tio, BAUDRATE);
1434 cfsetispeed (&tio, BAUDRATE);
1435 tcsetattr (pty->tty, TCSANOW, &tio);
1436 pty->set_utf8_mode (enc_utf8);
1396 1437
1397 /* set initial window size */ 1438 /* set initial window size */
1398 tt_winch (); 1439 tt_winch ();
1399 1440
1400 sw_chld.start (SIGCHLD); 1441#if ENABLE_FRILLS
1442 if (rs[Rs_pty_fd])
1443 return;
1444#endif
1401 1445
1402#ifndef __QNX__
1403 /* spin off the command interpreter */ 1446 /* spin off the command interpreter */
1404 switch (cmd_pid = fork ()) 1447 switch (cmd_pid = fork ())
1405 { 1448 {
1406 case -1: 1449 case -1:
1450 {
1451 cmd_pid = 0;
1407 rxvt_fatal ("can't fork, aborting.\n"); 1452 rxvt_fatal ("can't fork, aborting.\n");
1453 }
1408 case 0: 1454 case 0:
1409 init_env (); 1455 init_env ();
1410 1456
1411 if (!pty.make_controlling_tty ()) 1457 if (!pty->make_controlling_tty ())
1412 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1458 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1413 else 1459 else
1414 { 1460 {
1415 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1461 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1416 dup2 (pty.tty, STDIN_FILENO); 1462 dup2 (pty->tty, STDIN_FILENO);
1417 dup2 (pty.tty, STDOUT_FILENO); 1463 dup2 (pty->tty, STDOUT_FILENO);
1418 dup2 (pty.tty, STDERR_FILENO); 1464 dup2 (pty->tty, STDERR_FILENO);
1419 1465
1420 // close all our file handles that we do no longer need 1466 // close all our file handles that we do no longer need
1421 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1467 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1422 { 1468 {
1423 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1469 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1424 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1470 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1425 } 1471 }
1426 1472
1427 run_child (argv); 1473 run_child (argv);
1428 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1474 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1429 } 1475 }
1430 1476
1431 _exit (EXIT_FAILURE); 1477 _exit (EXIT_FAILURE);
1432 1478
1433 default: 1479 default:
1434 { 1480 if (!option (Opt_utmpInhibit))
1435#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1481 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1436 int fdstdin;
1437 1482
1438 fdstdin = dup (STDIN_FILENO); 1483 pty->close_tty ();
1439 dup2 (pty.tty, STDIN_FILENO);
1440#endif
1441 1484
1442#ifdef UTMP_SUPPORT 1485 child_ev.start (cmd_pid);
1443 privileged_utmp (SAVE);
1444#endif
1445 1486
1446#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1487 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1447
1448 dup2 (fdstdin, STDIN_FILENO);
1449 close (fdstdin);
1450#endif
1451 }
1452
1453 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1454 break; 1488 break;
1455 } 1489 }
1456#else /* __QNX__ uses qnxspawn () */
1457 fchmod (pty.tty, 0622);
1458 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1459 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1460
1461 if (run_child (argv) == -1)
1462 exit (EXIT_FAILURE);
1463#endif
1464} 1490}
1465 1491
1466/* ------------------------------------------------------------------------- * 1492/* ------------------------------------------------------------------------- *
1467 * CHILD PROCESS OPERATIONS * 1493 * CHILD PROCESS OPERATIONS *
1468 * ------------------------------------------------------------------------- */ 1494 * ------------------------------------------------------------------------- */
1473int 1499int
1474rxvt_term::run_child (const char *const *argv) 1500rxvt_term::run_child (const char *const *argv)
1475{ 1501{
1476 char *login; 1502 char *login;
1477 1503
1478 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1479
1480 if (options & Opt_console) 1504 if (option (Opt_console))
1505 {
1481 { /* be virtual console, fail silently */ 1506 /* be virtual console, fail silently */
1482#ifdef TIOCCONS 1507#ifdef TIOCCONS
1483 unsigned int on = 1; 1508 unsigned int on = 1;
1484 1509
1485 ioctl (STDIN_FILENO, TIOCCONS, &on); 1510 ioctl (STDIN_FILENO, TIOCCONS, &on);
1486#elif defined (SRIOCSREDIR) 1511#elif defined (SRIOCSREDIR)
1488 1513
1489 fd = open (CONSOLE, O_WRONLY, 0); 1514 fd = open (CONSOLE, O_WRONLY, 0);
1490 if (fd >= 0) 1515 if (fd >= 0)
1491 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1516 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1492 close (fd); 1517 close (fd);
1493#endif /* SRIOCSREDIR */ 1518#endif /* SRIOCSREDIR */
1494 } 1519 }
1495 1520
1496 /* reset signals and spin off the command interpreter */ 1521 /* reset signals and spin off the command interpreter */
1497 signal (SIGINT, SIG_DFL); 1522 signal (SIGINT, SIG_DFL);
1498 signal (SIGQUIT, SIG_DFL); 1523 signal (SIGQUIT, SIG_DFL);
1505 */ 1530 */
1506#ifdef SIGTSTP 1531#ifdef SIGTSTP
1507 signal (SIGTSTP, SIG_IGN); 1532 signal (SIGTSTP, SIG_IGN);
1508 signal (SIGTTIN, SIG_IGN); 1533 signal (SIGTTIN, SIG_IGN);
1509 signal (SIGTTOU, SIG_IGN); 1534 signal (SIGTTOU, SIG_IGN);
1510#endif /* SIGTSTP */ 1535#endif /* SIGTSTP */
1511 1536
1512 // unblock signals (signals are blocked by iom.C 1537 // unblock signals (signals are blocked by iom.C
1513 sigset_t ss; 1538 sigset_t ss;
1514 sigemptyset (&ss); 1539 sigemptyset (&ss);
1515 sigprocmask (SIG_SETMASK, &ss, 0); 1540 sigprocmask (SIG_SETMASK, &ss, 0);
1516 1541
1517#ifndef __QNX__
1518 /* command interpreter path */ 1542 /* command interpreter path */
1519 if (argv != NULL) 1543 if (argv)
1520 { 1544 {
1521# ifdef DEBUG_CMD 1545# ifdef DEBUG_CMD
1522 int i; 1546 int i;
1523 1547
1524 for (i = 0; argv[i]; i++) 1548 for (i = 0; argv[i]; i++)
1528 execvp (argv[0], (char *const *)argv); 1552 execvp (argv[0], (char *const *)argv);
1529 /* no error message: STDERR is closed! */ 1553 /* no error message: STDERR is closed! */
1530 } 1554 }
1531 else 1555 else
1532 { 1556 {
1533 const char *argv0, *shell; 1557 const char *argv0, *shell;
1534 1558
1535 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1559 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1536 shell = "/bin/sh"; 1560 shell = "/bin/sh";
1537 1561
1538 argv0 = (const char *)rxvt_r_basename (shell); 1562 argv0 = (const char *)rxvt_basename (shell);
1539 1563
1540 if (options & Opt_loginShell) 1564 if (option (Opt_loginShell))
1541 { 1565 {
1542 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1566 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1543 1567
1544 login[0] = '-'; 1568 login[0] = '-';
1545 strcpy (&login[1], argv0); 1569 strcpy (&login[1], argv0);
1546 argv0 = login; 1570 argv0 = login;
1547 } 1571 }
1572
1548 execlp (shell, argv0, NULL); 1573 execlp (shell, argv0, (char *)0);
1549 /* no error message: STDERR is closed! */ 1574 /* no error message: STDERR is closed! */
1550 } 1575 }
1551
1552#else /* __QNX__ uses qnxspawn () */
1553
1554 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1555 char *command = NULL, fullcommand[_MAX_PATH];
1556 char **arg_v, *arg_a[2] = { NULL, NULL };
1557
1558 if (argv != NULL)
1559 {
1560 if (access (argv[0], X_OK) == -1)
1561 {
1562 if (strchr (argv[0], '/') == NULL)
1563 {
1564 searchenv (argv[0], "PATH", fullcommand);
1565
1566 if (fullcommand[0] != '\0')
1567 command = fullcommand;
1568 }
1569
1570 if (access (command, X_OK) == -1)
1571 return -1;
1572 }
1573 else
1574 command = argv[0];
1575
1576 arg_v = argv;
1577 }
1578 else
1579 {
1580 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1581 command = "/bin/sh";
1582
1583 arg_a[0] = my_basename (command);
1584
1585 if (options & Opt_loginShell)
1586 {
1587 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1588
1589 login[0] = '-';
1590 strcpy (&login[1], arg_a[0]);
1591 arg_a[0] = login;
1592 }
1593
1594 arg_v = arg_a;
1595 }
1596
1597 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1598 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1599 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1600 command, arg_v, environ, iov_a, 0);
1601 if (login)
1602 free (login);
1603
1604 pty.close_tty ();
1605 return pty.pty;
1606#endif
1607 1576
1608 return -1; 1577 return -1;
1609} 1578}
1610 1579
1611/*----------------------- end-of-file (C source) -----------------------*/ 1580/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines