ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.119 by root, Thu Aug 11 02:05:07 2005 UTC vs.
Revision 1.226 by ayin, Tue Dec 11 17:42:04 2007 UTC

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

Diff Legend

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