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

Diff Legend

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