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

Diff Legend

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