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

Diff Legend

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