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

Diff Legend

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