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

Diff Legend

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