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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines