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.112 by root, Sat Feb 19 01:07:58 2005 UTC vs.
Revision 1.224 by ayin, Mon Nov 26 11:20:16 2007 UTC

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

Diff Legend

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