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

Diff Legend

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