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

Diff Legend

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