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

Diff Legend

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