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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines