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.247 by ayin, Tue Jan 29 13:57:23 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
168 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR
169 COLOR_SCROLLTROUGH, 274 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 275#endif
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
447 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 490 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
448#endif
449 491
450#ifdef XTERM_REVERSE_VIDEO 492#ifdef XTERM_REVERSE_VIDEO
451 /* this is how xterm implements reverseVideo */ 493 /* this is how xterm implements reverseVideo */
452 if (options & Opt_reverseVideo) 494 if (option (Opt_reverseVideo))
453 { 495 {
454 if (!rs[Rs_color + Color_fg]) 496 if (!rs[Rs_color + Color_fg])
455 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 497 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
498
456 if (!rs[Rs_color + Color_bg]) 499 if (!rs[Rs_color + Color_bg])
457 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 500 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
458 } 501 }
459#endif 502#endif
460 503
… …
462 if (!rs[Rs_color + i]) 505 if (!rs[Rs_color + i])
463 rs[Rs_color + i] = def_colorName[i]; 506 rs[Rs_color + i] = def_colorName[i];
464 507
465#ifndef XTERM_REVERSE_VIDEO 508#ifndef XTERM_REVERSE_VIDEO
466 /* this is how we implement reverseVideo */ 509 /* this is how we implement reverseVideo */
467 if (options & Opt_reverseVideo) 510 if (option (Opt_reverseVideo))
468 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 511 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
469#endif 512#endif
470 513
471 /* convenient aliases for setting fg/bg to colors */ 514 /* convenient aliases for setting fg/bg to colors */
472 color_aliases (Color_fg); 515 color_aliases (Color_fg);
473 color_aliases (Color_bg); 516 color_aliases (Color_bg);
474#ifndef NO_CURSORCOLOR 517#ifndef NO_CURSORCOLOR
475 color_aliases (Color_cursor); 518 color_aliases (Color_cursor);
476 color_aliases (Color_cursor2); 519 color_aliases (Color_cursor2);
477#endif /* NO_CURSORCOLOR */ 520#endif /* NO_CURSORCOLOR */
478 color_aliases (Color_pointer_fg); 521 color_aliases (Color_pointer_fg);
479 color_aliases (Color_pointer_bg); 522 color_aliases (Color_pointer_bg);
480 color_aliases (Color_border); 523 color_aliases (Color_border);
481#ifndef NO_BOLD_UNDERLINE_REVERSE 524#ifndef NO_BOLD_UNDERLINE_REVERSE
482 color_aliases (Color_BD); 525 color_aliases (Color_BD);
483 color_aliases (Color_UL); 526 color_aliases (Color_UL);
484 color_aliases (Color_RV); 527 color_aliases (Color_RV);
485#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 528#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
486 529
487 if (!rs[Rs_color + Color_border]) 530 if (!rs[Rs_color + Color_border])
488 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 531 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
489 532
490 return cmd_argv; 533 return cmd_argv;
534}
535
536/*----------------------------------------------------------------------*/
537void
538rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
539{
540 this->envv = envv;
541
542 SET_R (this);
543 set_locale ("");
544 set_environ (envv); // few things in X do not call setlocale :(
545
546 init_vars ();
547
548 init_secondary ();
549
550 const char **cmd_argv = init_resources (argc, argv);
551
552#ifdef KEYSYM_RESOURCE
553 keyboard->register_done ();
554#endif
555
556 if (option (Opt_scrollBar))
557 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
558
559 pty = ptytty::create ();
560
561 create_windows (argc, argv);
562
563 init_xlocale ();
564
565 scr_reset (); // initialize screen
566
567#if 0
568 XSynchronize (dpy, True);
569#endif
570
571 if (option (Opt_scrollBar))
572 resize_scrollbar (); /* create and map scrollbar */
573#ifdef HAVE_BG_PIXMAP
574 {
575 bgPixmap.set_target (this);
576 bgPixmap.invalidate ();
577
578#ifdef ENABLE_TRANSPARENCY
579 if (option (Opt_transparent))
580 {
581 bgPixmap.set_transparent ();
582
583#ifdef HAVE_AFTERIMAGE
584 if (rs [Rs_blurradius])
585 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
586#endif
587 if (ISSET_PIXCOLOR (Color_tint))
588 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
589
590 if (rs [Rs_shade])
591 bgPixmap.set_shade (rs [Rs_shade]);
592
593 bgPixmap.set_root_pixmap ();
594 XSelectInput (dpy, display->root, PropertyChangeMask);
595 rootwin_ev.start (display, display->root);
596 }
597#endif
598
599#ifdef BG_IMAGE_FROM_FILE
600 if (rs[Rs_backgroundPixmap])
601 {
602 const char *p = rs[Rs_backgroundPixmap];
603
604 if ((p = strchr (p, ';')) != 0)
605 {
606 p++;
607 bgPixmap.set_geometry (p);
608 }
609 else
610 bgPixmap.set_defaultGeometry ();
611
612 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
613 if (!bgPixmap.window_position_sensitive ())
614 update_background ();
615 }
616#endif
617 }
618#endif
619
620#if ENABLE_PERL
621 rootwin_ev.start (display, display->root);
622#endif
623
624 set_colorfgbg ();
625
626 init_command (cmd_argv);
627
628 free (cmd_argv);
629
630 if (pty->pty >= 0)
631 pty_ev.start (pty->pty, ev::READ);
632
633 HOOK_INVOKE ((this, HOOK_START, DT_END));
634
635#if ENABLE_XEMBED
636 if (rs[Rs_embed])
637 {
638 long info[2] = { 0, XEMBED_MAPPED };
639
640 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
641 32, PropModeReplace, (unsigned char *)&info, 2);
642 }
643#endif
644
645 XMapWindow (dpy, vt);
646 XMapWindow (dpy, parent[0]);
647
648 refresh_check ();
491} 649}
492 650
493/*----------------------------------------------------------------------*/ 651/*----------------------------------------------------------------------*/
494void 652void
495rxvt_term::init_env () 653rxvt_term::init_env ()
496{ 654{
497 int i; 655 int i;
498 unsigned int u;
499 char *val; 656 char *val;
500 657
501#ifdef DISPLAY_IS_IP 658#ifdef DISPLAY_IS_IP
502 /* Fixup display_name for export over pty to any interested terminal 659 /* 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 660 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
511 */ 668 */
512 val = rxvt_network_display (rs[Rs_display_name]); 669 val = rxvt_network_display (rs[Rs_display_name]);
513 rs[Rs_display_name] = (const char *)val; 670 rs[Rs_display_name] = (const char *)val;
514 671
515 if (val == NULL) 672 if (val == NULL)
516#endif /* DISPLAY_IS_IP */ 673#endif /* DISPLAY_IS_IP */
517 val = XDisplayString (display->display); 674 val = XDisplayString (dpy);
518 675
519 if (rs[Rs_display_name] == NULL) 676 if (rs[Rs_display_name] == NULL)
520 rs[Rs_display_name] = val; /* use broken `:0' value */ 677 rs[Rs_display_name] = val; /* use broken `:0' value */
521 678
522 i = strlen (val); 679 i = strlen (val);
523 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 680 env_display = (char *)rxvt_malloc (i + 9);
524 681
525 sprintf (env_display, "DISPLAY=%s", val); 682 sprintf (env_display, "DISPLAY=%s", val);
526 683
527 /* avoiding the math library: 684 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 685
537 /* add entries to the environment: 686 /* add entries to the environment:
538 * @ DISPLAY: in case we started with -display 687 * @ DISPLAY: in case we started with -display
539 * @ WINDOWID: X window id number of the window 688 * @ WINDOWID: X window id number of the window
540 * @ COLORTERM: terminal sub-name and also indicates its color 689 * @ COLORTERM: terminal sub-name and also indicates its color
… …
542 * @ TERMINFO: path to terminfo directory 691 * @ TERMINFO: path to terminfo directory
543 * @ COLORFGBG: fg;bg color codes 692 * @ COLORFGBG: fg;bg color codes
544 */ 693 */
545 putenv (env_display); 694 putenv (env_display);
546 putenv (env_windowid); 695 putenv (env_windowid);
696
547 if (env_colorfgbg) 697 if (env_colorfgbg)
548 putenv (env_colorfgbg); 698 putenv (env_colorfgbg);
549 699
550#ifdef RXVT_TERMINFO 700#ifdef RXVT_TERMINFO
551 putenv ("TERMINFO=" RXVT_TERMINFO); 701 putenv ("TERMINFO=" RXVT_TERMINFO);
552#endif 702#endif
553 703
554 if (display->depth <= 2) 704 if (depth <= 2)
555 putenv ("COLORTERM=" COLORTERMENV "-mono"); 705 putenv ("COLORTERM=" COLORTERMENV "-mono");
556 else 706 else
557 putenv ("COLORTERM=" COLORTERMENVFULL); 707 putenv ("COLORTERM=" COLORTERMENVFULL);
558 708
559 if (rs[Rs_term_name] != NULL) 709 if (rs[Rs_term_name] != NULL)
560 { 710 {
561 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 711 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
562 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 712 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
563 putenv (env_term); 713 putenv (env_term);
564 } 714 }
565 else 715 else
566 putenv ("TERM=" TERMENV); 716 putenv ("TERM=" TERMENV);
… …
568#ifdef HAVE_UNSETENV 718#ifdef HAVE_UNSETENV
569 /* avoid passing old settings and confusing term size */ 719 /* avoid passing old settings and confusing term size */
570 unsetenv ("LINES"); 720 unsetenv ("LINES");
571 unsetenv ("COLUMNS"); 721 unsetenv ("COLUMNS");
572 unsetenv ("TERMCAP"); /* terminfo should be okay */ 722 unsetenv ("TERMCAP"); /* terminfo should be okay */
573#endif /* HAVE_UNSETENV */ 723#endif /* HAVE_UNSETENV */
574} 724}
575 725
576/*----------------------------------------------------------------------*/ 726/*----------------------------------------------------------------------*/
577/* 727/*
578 * This is more or less stolen straight from XFree86 xterm. 728 * This is more or less stolen straight from XFree86 xterm.
579 * This should support all European type languages. 729 * This should support all European type languages.
580 */ 730 */
581void 731void
582rxvt_term::set_locale (const char *locale) 732rxvt_term::set_locale (const char *locale)
583{ 733{
734 set_environ (envv);
735
584#if HAVE_XSETLOCALE || HAVE_SETLOCALE 736#if HAVE_XSETLOCALE || HAVE_SETLOCALE
585 free (this->locale); 737 free (this->locale);
586 this->locale = setlocale (LC_CTYPE, locale); 738 this->locale = setlocale (LC_CTYPE, locale);
587 739
588 if (!this->locale) 740 if (!this->locale)
589 { 741 {
590 if (*locale) 742 if (*locale)
591 { 743 {
592 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 744 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
593 setlocale (LC_CTYPE, ""); 745 setlocale (LC_CTYPE, "C");
594 } 746 }
595 else 747 else
596 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 748 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
597 749
598 this->locale = ""; 750 this->locale = "C";
599 } 751 }
600 752
601 753
602 this->locale = rxvt_strdup (this->locale); 754 this->locale = strdup (this->locale);
603 SET_LOCALE (this->locale); 755 SET_LOCALE (this->locale);
604 mbstate.reset (); 756 mbstate.reset ();
605#endif 757#endif
606 758
607#if HAVE_NL_LANGINFO 759#if HAVE_NL_LANGINFO
… …
618} 770}
619 771
620void 772void
621rxvt_term::init_xlocale () 773rxvt_term::init_xlocale ()
622{ 774{
775 set_environ (envv);
776
623#ifdef USE_XIM 777#ifdef USE_XIM
624 if (!locale) 778 if (!locale)
625 rxvt_warn ("setting locale failed, working without locale support.\n"); 779 rxvt_warn ("setting locale failed, working without locale support.\n");
626 else 780 else
627 { 781 {
… …
649 * Initialize the command connection. 803 * Initialize the command connection.
650 * This should be called after the X server connection is established. 804 * This should be called after the X server connection is established.
651 */ 805 */
652 806
653#ifdef META8_OPTION 807#ifdef META8_OPTION
654 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 808 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
655#endif 809#endif
656 810
657 get_ourmods (); 811 get_ourmods ();
658 812
659 if (!(options & Opt_scrollTtyOutput)) 813 if (!option (Opt_scrollTtyOutput))
660 priv_modes |= PrivMode_TtyOutputInh; 814 priv_modes |= PrivMode_TtyOutputInh;
661 if (options & Opt_scrollTtyKeypress) 815 if (option (Opt_scrollTtyKeypress))
662 priv_modes |= PrivMode_Keypress; 816 priv_modes |= PrivMode_Keypress;
663 if (!(options & Opt_jumpScroll)) 817 if (!option (Opt_jumpScroll))
664 priv_modes |= PrivMode_smoothScroll; 818 priv_modes |= PrivMode_smoothScroll;
665 819
666#ifndef NO_BACKSPACE_KEY 820#ifndef NO_BACKSPACE_KEY
667 if (strcmp (key_backspace, "DEC") == 0) 821 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
668 priv_modes |= PrivMode_HaveBackSpace; 822 priv_modes |= PrivMode_HaveBackSpace;
669#endif 823#endif
670 824
671 /* add value for scrollBar */ 825 /* add value for scrollBar */
672 if (scrollbar_visible ()) 826 if (scrollBar.state)
673 { 827 {
674 priv_modes |= PrivMode_scrollBar; 828 priv_modes |= PrivMode_scrollBar;
675 SavedModes |= PrivMode_scrollBar; 829 SavedModes |= PrivMode_scrollBar;
676 } 830 }
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 831
688 run_command (argv); 832 run_command (argv);
689} 833}
690 834
691/*----------------------------------------------------------------------*/ 835/*----------------------------------------------------------------------*/
… …
695 int i; 839 int i;
696 840
697#ifdef OFF_FOCUS_FADING 841#ifdef OFF_FOCUS_FADING
698 pix_colors = pix_colors_focused; 842 pix_colors = pix_colors_focused;
699#endif 843#endif
700 844
701 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 845 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
702 { 846 {
847 const char *name = rs[Rs_color + i];
848
849 if (!name)
850 continue;
851
703 rxvt_color xcol; 852 rxvt_color xcol;
704 853
705 if (!rs[Rs_color + i]) 854 if (!set_color (xcol, name))
706 continue;
707
708 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
709 { 855 {
710#ifndef XTERM_REVERSE_VIDEO 856#ifndef XTERM_REVERSE_VIDEO
711 if (i < 2 && (options & Opt_reverseVideo)) 857 if (i < 2 && option (Opt_reverseVideo))
712 rs[Rs_color + i] = def_colorName[!i]; 858 name = def_colorName [1 - i];
713 else 859 else
714#endif 860#endif
715 rs[Rs_color + i] = def_colorName[i]; 861 name = def_colorName [i];
716 862
717 if (!rs[Rs_color + i]) 863 if (!name)
718 continue; 864 continue;
719 865
720 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 866 if (!set_color (xcol, name))
721 { 867 {
722 switch (i) 868 switch (i)
723 { 869 {
724 case Color_fg: 870 case Color_fg:
725 case Color_bg: 871 case Color_bg:
726 /* fatal: need bg/fg color */
727 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 872 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
728 /* NOTREACHED */ 873 name = "";
729 break; 874 break;
730#ifndef NO_CURSORCOLOR 875#ifndef NO_CURSORCOLOR
731 case Color_cursor2: 876 case Color_cursor2:
732 xcol = pix_colors[Color_fg]; 877#endif
733 break;
734#endif /* ! NO_CURSORCOLOR */
735 case Color_pointer_fg: 878 case Color_pointer_fg:
736 xcol = pix_colors[Color_fg]; 879 name = rs[Rs_color + Color_fg];
880 xcol.set (this, name);
737 break; 881 break;
738 default: 882 default:
739 xcol = pix_colors[Color_bg]; /* None */ 883 name = rs[Rs_color + Color_bg];
884 xcol.set (this, name);
740 break; 885 break;
741 } 886 }
742 } 887 }
743 } 888 }
744 889
745 pix_colors[i] = xcol; 890 pix_colors[i] = xcol;
746#ifdef OFF_FOCUS_FADING 891 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 { 892 }
893
894 if (depth <= 2)
895 {
755 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 896 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]; 897 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]; 898 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
758 } 899 }
759 900
760 /* 901 /*
761 * get scrollBar/menuBar shadow colors 902 * get scrollBar shadow colors
762 * 903 *
763 * The calculations of topShadow/bottomShadow values are adapted 904 * The calculations of topShadow/bottomShadow values are adapted
764 * from the fvwm window manager. 905 * from the fvwm window manager.
765 */ 906 */
766#ifdef KEEP_SCROLLCOLOR 907#ifdef RXVT_SCROLLBAR
767
768 if (display->depth <= 2) 908 if (depth <= 2)
909 {
769 { /* Monochrome */ 910 /* Monochrome */
770 pix_colors[Color_scroll] = pix_colors[Color_fg]; 911 alias_color (Color_scroll, Color_fg);
771 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 912 alias_color (Color_topShadow, Color_bg);
772 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 913 alias_color (Color_bottomShadow, Color_bg);
773 } 914 }
774 else 915 else
775 { 916 {
776 rxvt_color xcol[2]; 917 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 918
781 xcol[1] = pix_colors[Color_scroll]; 919 rgba cscroll;
782 xcol[0].set (display, 65535, 65535, 65535); 920 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 921
791 /* topShadowColor */ 922 /* topShadowColor */
792 if (!xcol[1].set (display, 923 if (!pix_colors[Color_topShadow].set (this,
793 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 924 rgba (
794 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 925 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
795 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 926 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
796 xcol[1] = pix_colors[Color_White]; 927 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
797 928 cscroll.a)
798 pix_colors[Color_topShadow] = xcol[1]; 929 ))
930 alias_color (Color_topShadow, Color_White);
799 } 931 }
800#endif /* KEEP_SCROLLCOLOR */ 932#endif
933
934#ifdef OFF_FOCUS_FADING
935 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
936 update_fade_color (i);
937#endif
801} 938}
802 939
803/*----------------------------------------------------------------------*/ 940/*----------------------------------------------------------------------*/
804/* color aliases, fg/bg bright-bold */ 941/* color aliases, fg/bg bright-bold */
805void 942void
… …
808 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 945 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
809 { 946 {
810 int i = atoi (rs[Rs_color + idx]); 947 int i = atoi (rs[Rs_color + idx]);
811 948
812 if (i >= 8 && i <= 15) 949 if (i >= 8 && i <= 15)
813 { /* bright colors */ 950 /* bright colors */
814 i -= 8;
815#ifndef NO_BRIGHTCOLOR
816 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 951 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
817 return; 952 else if (i >= 0 && i <= 7)
818#endif 953 /* normal colors */
819 }
820
821 if (i >= 0 && i <= 7) /* normal colors */
822 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 954 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
823 } 955 }
824} 956}
825 957
826/*----------------------------------------------------------------------*/ 958/*----------------------------------------------------------------------*/
… …
829 * Use resource ``modifier'' to override the Meta modifier 961 * Use resource ``modifier'' to override the Meta modifier
830 */ 962 */
831void 963void
832rxvt_term::get_ourmods () 964rxvt_term::get_ourmods ()
833{ 965{
834 int i, j, k; 966 int i, j, k;
835 int requestedmeta, realmeta, realalt; 967 int requestedmeta, realmeta, realalt;
836 const char *cm, *rsmod; 968 const char *cm, *rsmod;
837 XModifierKeymap *map; 969 XModifierKeymap *map;
838 KeyCode *kc; 970 KeyCode *kc;
839 const unsigned int modmasks[] = 971 const unsigned int modmasks[] =
840 { 972 {
841 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 973 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
842 }; 974 };
843 975
… …
846 978
847 if (rsmod 979 if (rsmod
848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 980 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
849 requestedmeta = rsmod[3] - '0'; 981 requestedmeta = rsmod[3] - '0';
850 982
851 map = XGetModifierMapping (display->display); 983 map = XGetModifierMapping (dpy);
852 kc = map->modifiermap; 984 kc = map->modifiermap;
853 985
854 for (i = 1; i < 6; i++) 986 for (i = 1; i < 6; i++)
855 { 987 {
856 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 988 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
858 for (j = map->max_keypermod; j--; k++) 990 for (j = map->max_keypermod; j--; k++)
859 { 991 {
860 if (kc[k] == 0) 992 if (kc[k] == 0)
861 break; 993 break;
862 994
863 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 995 switch (XKeycodeToKeysym (dpy, kc[k], 0))
864 { 996 {
865 case XK_Num_Lock: 997 case XK_Num_Lock:
866 ModNumLockMask = modmasks[i - 1]; 998 ModNumLockMask = modmasks[i - 1];
867 continue; 999 continue;
868 1000
… …
918rxvt_term::create_windows (int argc, const char *const *argv) 1050rxvt_term::create_windows (int argc, const char *const *argv)
919{ 1051{
920 XClassHint classHint; 1052 XClassHint classHint;
921 XWMHints wmHint; 1053 XWMHints wmHint;
922#if ENABLE_FRILLS 1054#if ENABLE_FRILLS
923 Atom prop = None;
924 MWMHints mwmhints; 1055 MWMHints mwmhints = { };
925#endif 1056#endif
926 XGCValues gcvalue; 1057 XGCValues gcvalue;
927 long vt_emask;
928 XSetWindowAttributes attributes; 1058 XSetWindowAttributes attributes;
929 XWindowAttributes gattr; 1059 Window top, parent;
930 1060
931#ifdef USING_W11LIB 1061 dLocal (Display *, dpy);
932 /* enable W11 callbacks */
933 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
934#endif
935 1062
936 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 1063 /* grab colors before netscape does */
937 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 1064 Get_Colours ();
938 1065
939 if (options & Opt_transparent) 1066 if (!set_fonts ())
940 { 1067 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); 1068
942 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1069 parent = display->root;
943 } 1070
1071 attributes.override_redirect = !!option (Opt_override_redirect);
944 1072
945#if ENABLE_FRILLS 1073#if ENABLE_FRILLS
946 if (options & Opt_borderLess) 1074 if (option (Opt_borderLess))
947 { 1075 {
948 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 1076 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
949
950 if (prop == None)
951 { 1077 {
952 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1078 // 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; 1079 attributes.override_redirect = true;
955#endif
956 mwmhints.flags = 0;
957 } 1080 }
958 else 1081 else
959 { 1082 {
960 mwmhints.flags = MWM_HINTS_DECORATIONS; 1083 mwmhints.flags = MWM_HINTS_DECORATIONS;
961 mwmhints.decorations = 0;
962 } 1084 }
963 } 1085 }
964 else 1086#endif
965 { 1087
966 mwmhints.flags = 0; 1088#if ENABLE_XEMBED
1089 if (rs[Rs_embed])
967 } 1090 {
968#endif 1091 XWindowAttributes wattr;
969 1092
970 /* grab colors before netscape does */ 1093 parent = strtol (rs[Rs_embed], 0, 0);
971 Get_Colours ();
972 1094
973 if (!set_fonts ()) 1095 if (!XGetWindowAttributes (dpy, parent, &wattr))
974 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1096 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
1097
1098 window_calc (wattr.width, wattr.height);
1099 }
1100#endif
975 1101
976 window_calc (0, 0); 1102 window_calc (0, 0);
1103
1104 /* sub-window placement & size in rxvt_resize_subwindows () */
1105 attributes.background_pixel = pix_colors_focused [Color_border];
1106 attributes.border_pixel = pix_colors_focused [Color_border];
1107 attributes.colormap = cmap;
1108
1109 top = XCreateWindow (dpy, parent,
1110 szHint.x, szHint.y,
1111 szHint.width, szHint.height,
1112 ext_bwidth,
1113 depth, InputOutput, visual,
1114 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1115 &attributes);
1116
1117 this->parent[0] = top;
1118
977 old_width = szHint.width; 1119 old_width = szHint.width;
978 old_height = szHint.height; 1120 old_height = szHint.height;
979 1121
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); 1122 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1003 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1123 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1004 1124
1005 classHint.res_name = (char *)rs[Rs_name]; 1125 classHint.res_name = (char *)rs[Rs_name];
1006 classHint.res_class = (char *)RESCLASS; 1126 classHint.res_class = (char *)RESCLASS;
1007 1127
1008 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1128 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1009 wmHint.input = True; 1129 wmHint.input = True;
1010 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1130 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1011 wmHint.window_group = TermWin.parent[0]; 1131 wmHint.window_group = top;
1012 1132
1013 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1133 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1014 (char **)argv, argc, &szHint, &wmHint, &classHint); 1134 &szHint, &wmHint, &classHint);
1015
1016 /* Enable delete window protocol */
1017 XSetWMProtocols (display->display, TermWin.parent[0],
1018 &xa[XA_WMDELETEWINDOW], 1);
1019 1135
1020#if ENABLE_FRILLS 1136#if ENABLE_FRILLS
1137 if (mwmhints.flags)
1138 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1139 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1140#endif
1141
1142 Atom protocols[] = {
1143 xa[XA_WM_DELETE_WINDOW],
1144#if ENABLE_EWMH
1145 xa[XA_NET_WM_PING],
1146#endif
1147 };
1148
1149 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1150
1151#if ENABLE_FRILLS
1152 if (rs[Rs_transient_for])
1153 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1154#endif
1155
1156#if ENABLE_EWMH
1021 long pid = getpid (); 1157 long pid = getpid ();
1022 1158
1023 XChangeProperty (display->display, TermWin.parent[0], 1159 XChangeProperty (dpy, top,
1024 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1160 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1025 PropModeReplace, (unsigned char *)&pid, 1); 1161 PropModeReplace, (unsigned char *)&pid, 1);
1026#endif
1027 1162
1028 XSelectInput (display->display, TermWin.parent[0], 1163 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1164#endif
1165
1166 XSelectInput (dpy, top,
1029 KeyPressMask 1167 KeyPressMask
1030#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1168#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1031 | KeyReleaseMask 1169 | KeyReleaseMask
1032#endif 1170#endif
1033 | FocusChangeMask | VisibilityChangeMask 1171 | FocusChangeMask | VisibilityChangeMask
1034 | ExposureMask
1035 | StructureNotifyMask); 1172 | ExposureMask | StructureNotifyMask);
1173
1036 termwin_ev.start (display, TermWin.parent[0]); 1174 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 1175
1044 /* vt cursor: Black-on-White is standard, but this is more popular */ 1176 /* vt cursor: Black-on-White is standard, but this is more popular */
1045 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1177 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 1178
1052 /* the vt window */ 1179 /* the vt window */
1053 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1180 vt = XCreateSimpleWindow (dpy, top,
1054 window_vt_x,
1055 window_vt_y, 1181 window_vt_x, window_vt_y,
1056 TermWin_TotalWidth (), 1182 width, height,
1057 TermWin_TotalHeight (),
1058 0, 1183 0,
1059 pix_colors_focused[Color_fg], 1184 pix_colors_focused[Color_fg],
1060 pix_colors_focused[Color_bg]); 1185 pix_colors_focused[Color_bg]);
1061#ifdef DEBUG_X
1062 XStoreName (display->display, TermWin.vt, "vt window");
1063#endif
1064 1186
1065 attributes.bit_gravity = NorthWestGravity; 1187 attributes.bit_gravity = NorthWestGravity;
1066 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1188 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1067 1189
1068 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1190 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1069 1191
1070 pointer_unblank ();
1071
1072#ifdef POINTER_BLANK
1073 if (options & Opt_pointerBlank) 1192 if (option (Opt_pointerBlank))
1074 vt_emask |= PointerMotionMask; 1193 vt_emask |= PointerMotionMask;
1075 else 1194 else
1076#endif
1077 vt_emask |= Button1MotionMask | Button3MotionMask; 1195 vt_emask |= Button1MotionMask | Button3MotionMask;
1078 1196
1079 XSelectInput (display->display, TermWin.vt, vt_emask); 1197 vt_select_input ();
1198
1080 vt_ev.start (display, TermWin.vt); 1199 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 1200
1126 /* graphics context for the vt window */ 1201 /* graphics context for the vt window */
1127 gcvalue.foreground = pix_colors[Color_fg]; 1202 gcvalue.foreground = pix_colors[Color_fg];
1128 gcvalue.background = pix_colors[Color_bg]; 1203 gcvalue.background = pix_colors[Color_bg];
1129 gcvalue.graphics_exposures = 1; 1204 gcvalue.graphics_exposures = 0;
1130 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1205
1206 gc = XCreateGC (dpy, vt,
1131 GCForeground | GCBackground | GCGraphicsExposures, 1207 GCForeground | GCBackground | GCGraphicsExposures,
1132 &gcvalue); 1208 &gcvalue);
1133 1209
1134 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1210 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 1211
1145#ifdef OFF_FOCUS_FADING 1212#ifdef OFF_FOCUS_FADING
1146 // initially we are in unfocused state 1213 // initially we are in unfocused state
1147 if (rs[Rs_fade]) 1214 if (rs[Rs_fade])
1148 pix_colors = pix_colors_unfocused; 1215 pix_colors = pix_colors_unfocused;
1149#endif 1216#endif
1150 1217
1218 pointer_unblank ();
1151 scr_recolour (); 1219 scr_recolour ();
1152} 1220}
1153 1221
1154/* ------------------------------------------------------------------------- * 1222/* ------------------------------------------------------------------------- *
1155 * GET TTY CURRENT STATE * 1223 * GET TTY CURRENT STATE *
1156 * ------------------------------------------------------------------------- */ 1224 * ------------------------------------------------------------------------- */
1157void 1225void
1158rxvt_get_ttymode (ttymode_t *tio, int erase) 1226rxvt_get_ttymode (struct termios *tio, int erase)
1159{ 1227{
1160#ifdef HAVE_TERMIOS_H
1161 /* 1228 /*
1162 * standard System V termios interface 1229 * standard System V termios interface
1163 */ 1230 */
1164 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1231 if (tcgetattr (STDIN_FILENO, tio) < 0)
1165 { 1232 {
1166 /* return error - use system defaults */ 1233 // return error - use system defaults,
1234 // where possible, and zero elsewhere
1235 memset (tio, 0, sizeof (struct termios));
1236
1167 tio->c_cc[VINTR] = CINTR; 1237 tio->c_cc[VINTR] = CINTR;
1168 tio->c_cc[VQUIT] = CQUIT; 1238 tio->c_cc[VQUIT] = CQUIT;
1169 tio->c_cc[VERASE] = CERASE; 1239 tio->c_cc[VERASE] = CERASE;
1240#ifdef VERASE2
1241 tio->c_cc[VERASE2] = CERASE2;
1242#endif
1170 tio->c_cc[VKILL] = CKILL; 1243 tio->c_cc[VKILL] = CKILL;
1171 tio->c_cc[VSTART] = CSTART; 1244 tio->c_cc[VSTART] = CSTART;
1172 tio->c_cc[VSTOP] = CSTOP; 1245 tio->c_cc[VSTOP] = CSTOP;
1173 tio->c_cc[VSUSP] = CSUSP; 1246 tio->c_cc[VSUSP] = CSUSP;
1174# ifdef VDSUSP 1247# ifdef VDSUSP
1175
1176 tio->c_cc[VDSUSP] = CDSUSP; 1248 tio->c_cc[VDSUSP] = CDSUSP;
1177# endif 1249# endif
1178# ifdef VREPRINT 1250# ifdef VREPRINT
1179
1180 tio->c_cc[VREPRINT] = CRPRNT; 1251 tio->c_cc[VREPRINT] = CRPRNT;
1181# endif 1252# endif
1182# ifdef VDISCRD 1253# ifdef VDISCRD
1183
1184 tio->c_cc[VDISCRD] = CFLUSH; 1254 tio->c_cc[VDISCRD] = CFLUSH;
1185# endif 1255# endif
1186# ifdef VWERSE 1256# ifdef VWERSE
1187
1188 tio->c_cc[VWERSE] = CWERASE; 1257 tio->c_cc[VWERSE] = CWERASE;
1189# endif 1258# endif
1190# ifdef VLNEXT 1259# ifdef VLNEXT
1191
1192 tio->c_cc[VLNEXT] = CLNEXT; 1260 tio->c_cc[VLNEXT] = CLNEXT;
1193# endif 1261# endif
1194
1195 } 1262 }
1263
1196 tio->c_cc[VEOF] = CEOF; 1264 tio->c_cc[VEOF] = CEOF;
1197 tio->c_cc[VEOL] = VDISABLE; 1265 tio->c_cc[VEOL] = VDISABLE;
1198# ifdef VEOL2 1266# ifdef VEOL2
1199
1200 tio->c_cc[VEOL2] = VDISABLE; 1267 tio->c_cc[VEOL2] = VDISABLE;
1201# endif 1268# endif
1202# ifdef VSWTC 1269# ifdef VSWTC
1203
1204 tio->c_cc[VSWTC] = VDISABLE; 1270 tio->c_cc[VSWTC] = VDISABLE;
1205# endif 1271# endif
1206# ifdef VSWTCH 1272# ifdef VSWTCH
1207
1208 tio->c_cc[VSWTCH] = VDISABLE; 1273 tio->c_cc[VSWTCH] = VDISABLE;
1209# endif 1274# endif
1210# if VMIN != VEOF 1275# if VMIN != VEOF
1211
1212 tio->c_cc[VMIN] = 1; 1276 tio->c_cc[VMIN] = 1;
1213# endif 1277# endif
1214# if VTIME != VEOL 1278# if VTIME != VEOL
1215
1216 tio->c_cc[VTIME] = 0; 1279 tio->c_cc[VTIME] = 0;
1217# endif 1280# endif
1218 1281
1219 if (erase != -1) 1282 if (erase != -1)
1220 tio->c_cc[VERASE] = (char)erase; 1283 tio->c_cc[VERASE] = (char)erase;
… …
1236 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1299 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1237# if defined (ECHOCTL) && defined (ECHOKE) 1300# if defined (ECHOCTL) && defined (ECHOKE)
1238 | ECHOCTL | ECHOKE 1301 | ECHOCTL | ECHOKE
1239# endif 1302# endif
1240 | ECHOE | ECHOK); 1303 | 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 1304
1288 /* 1305 /*
1289 * Debugging 1306 * Debugging
1290 */ 1307 */
1291#ifdef DEBUG_TTYMODE 1308#ifdef DEBUG_TTYMODE
1292#ifdef HAVE_TERMIOS_H
1293 /* c_iflag bits */ 1309 /* c_iflag bits */
1294 fprintf (stderr, "Input flags\n"); 1310 fprintf (stderr, "Input flags\n");
1295 1311
1296 /* cpp token stringize doesn't work on all machines <sigh> */ 1312 /* cpp token stringize doesn't work on all machines <sigh> */
1297# define FOO(flag,name) \ 1313# define FOO(flag,name) \
… …
1309 FOO (IGNCR, "IGNCR"); 1325 FOO (IGNCR, "IGNCR");
1310 FOO (ICRNL, "ICRNL"); 1326 FOO (ICRNL, "ICRNL");
1311 FOO (IXON, "IXON"); 1327 FOO (IXON, "IXON");
1312 FOO (IXOFF, "IXOFF"); 1328 FOO (IXOFF, "IXOFF");
1313# ifdef IUCLC 1329# ifdef IUCLC
1314
1315 FOO (IUCLC, "IUCLC"); 1330 FOO (IUCLC, "IUCLC");
1316# endif 1331# endif
1317# ifdef IXANY 1332# ifdef IXANY
1318
1319 FOO (IXANY, "IXANY"); 1333 FOO (IXANY, "IXANY");
1320# endif 1334# endif
1321# ifdef IMAXBEL 1335# ifdef IMAXBEL
1322
1323 FOO (IMAXBEL, "IMAXBEL"); 1336 FOO (IMAXBEL, "IMAXBEL");
1324# endif 1337# endif
1325 1338
1326 fprintf (stderr, "\n"); 1339 fprintf (stderr, "\n");
1327 1340
… …
1334 FOO (VERASE, "VERASE"); 1347 FOO (VERASE, "VERASE");
1335 FOO (VKILL, "VKILL"); 1348 FOO (VKILL, "VKILL");
1336 FOO (VEOF, "VEOF"); 1349 FOO (VEOF, "VEOF");
1337 FOO (VEOL, "VEOL"); 1350 FOO (VEOL, "VEOL");
1338# ifdef VEOL2 1351# ifdef VEOL2
1339
1340 FOO (VEOL2, "VEOL2"); 1352 FOO (VEOL2, "VEOL2");
1341# endif 1353# endif
1342# ifdef VSWTC 1354# ifdef VSWTC
1343
1344 FOO (VSWTC, "VSWTC"); 1355 FOO (VSWTC, "VSWTC");
1345# endif 1356# endif
1346# ifdef VSWTCH 1357# ifdef VSWTCH
1347
1348 FOO (VSWTCH, "VSWTCH"); 1358 FOO (VSWTCH, "VSWTCH");
1349# endif 1359# endif
1350
1351 FOO (VSTART, "VSTART"); 1360 FOO (VSTART, "VSTART");
1352 FOO (VSTOP, "VSTOP"); 1361 FOO (VSTOP, "VSTOP");
1353 FOO (VSUSP, "VSUSP"); 1362 FOO (VSUSP, "VSUSP");
1354# ifdef VDSUSP 1363# ifdef VDSUSP
1355
1356 FOO (VDSUSP, "VDSUSP"); 1364 FOO (VDSUSP, "VDSUSP");
1357# endif 1365# endif
1358# ifdef VREPRINT 1366# ifdef VREPRINT
1359
1360 FOO (VREPRINT, "VREPRINT"); 1367 FOO (VREPRINT, "VREPRINT");
1361# endif 1368# endif
1362# ifdef VDISCRD 1369# ifdef VDISCRD
1363
1364 FOO (VDISCRD, "VDISCRD"); 1370 FOO (VDISCRD, "VDISCRD");
1365# endif 1371# endif
1366# ifdef VWERSE 1372# ifdef VWERSE
1367
1368 FOO (VWERSE, "VWERSE"); 1373 FOO (VWERSE, "VWERSE");
1369# endif 1374# endif
1370# ifdef VLNEXT 1375# ifdef VLNEXT
1371
1372 FOO (VLNEXT, "VLNEXT"); 1376 FOO (VLNEXT, "VLNEXT");
1373# endif 1377# endif
1374 1378
1375 fprintf (stderr, "\n"); 1379 fprintf (stderr, "\n");
1376# undef FOO 1380# undef FOO
1377# endif /* HAVE_TERMIOS_H */ 1381#endif /* DEBUG_TTYMODE */
1378#endif /* DEBUG_TTYMODE */
1379} 1382}
1380 1383
1381/*----------------------------------------------------------------------*/ 1384/*----------------------------------------------------------------------*/
1382/* 1385/*
1383 * Run the command in a subprocess and return a file descriptor for the 1386 * Run the command in a subprocess and return a file descriptor for the
… …
1385 * the slave. 1388 * the slave.
1386 */ 1389 */
1387void 1390void
1388rxvt_term::run_command (const char *const *argv) 1391rxvt_term::run_command (const char *const *argv)
1389{ 1392{
1393#if ENABLE_FRILLS
1394 if (rs[Rs_pty_fd])
1395 {
1396 pty->pty = atoi (rs[Rs_pty_fd]);
1397
1398 if (pty->pty >= 0)
1399 {
1400 if (getfd_hook)
1401 pty->pty = (*getfd_hook) (pty->pty);
1402
1403 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1404 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1405 }
1406 }
1407 else
1408#endif
1390 if (!pty.get ()) 1409 if (!pty->get ())
1391 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1410 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1392 1411
1412 int er;
1413
1414#ifndef NO_BACKSPACE_KEY
1415 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1416 er = rs[Rs_backspace_key][0];
1417 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1418 er = '\177'; /* the initial state anyway */
1419 else
1420#endif
1421 er = -1;
1422
1423 rxvt_get_ttymode (&tio, er);
1424 /* init terminal attributes */
1425 cfsetospeed (&tio, BAUDRATE);
1426 cfsetispeed (&tio, BAUDRATE);
1427 tcsetattr (pty->tty, TCSANOW, &tio);
1393 pty.set_utf8_mode (enc_utf8); 1428 pty->set_utf8_mode (enc_utf8);
1394 1429
1395 /* set initial window size */ 1430 /* set initial window size */
1396 tt_winch (); 1431 tt_winch ();
1397 1432
1398 int er; 1433#if ENABLE_FRILLS
1399 1434 if (rs[Rs_pty_fd])
1400#ifndef NO_BACKSPACE_KEY 1435 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 1436#endif
1407 er = -1;
1408 1437
1409 rxvt_get_ttymode (&tio, er);
1410
1411 sw_chld.start (SIGCHLD);
1412
1413#ifndef __QNX__
1414 /* spin off the command interpreter */ 1438 /* spin off the command interpreter */
1415 switch (cmd_pid = fork ()) 1439 switch (cmd_pid = fork ())
1416 { 1440 {
1417 case -1: 1441 case -1:
1442 {
1443 cmd_pid = 0;
1418 rxvt_fatal ("can't fork, aborting.\n"); 1444 rxvt_fatal ("can't fork, aborting.\n");
1445 }
1419 case 0: 1446 case 0:
1420 init_env (); 1447 init_env ();
1421 1448
1422 if (!pty.make_controlling_tty ()) 1449 if (!pty->make_controlling_tty ())
1423 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1450 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1424 else 1451 else
1425 { 1452 {
1426 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1453 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1427 dup2 (pty.tty, STDIN_FILENO); 1454 dup2 (pty->tty, STDIN_FILENO);
1428 dup2 (pty.tty, STDOUT_FILENO); 1455 dup2 (pty->tty, STDOUT_FILENO);
1429 dup2 (pty.tty, STDERR_FILENO); 1456 dup2 (pty->tty, STDERR_FILENO);
1430 1457
1431 // close all our file handles that we do no longer need 1458 // close all our file handles that we do no longer need
1432 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1459 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1433 { 1460 {
1434 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1461 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1435 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1462 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1436 } 1463 }
1437 1464
1438 run_child (argv); 1465 run_child (argv);
1439 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1466 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1440 } 1467 }
1441 1468
1442 _exit (EXIT_FAILURE); 1469 _exit (EXIT_FAILURE);
1443 1470
1444 default: 1471 default:
1445 { 1472 if (!option (Opt_utmpInhibit))
1446#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1473 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1447 int fdstdin;
1448 1474
1449 fdstdin = dup (STDIN_FILENO); 1475 pty->close_tty ();
1450 dup2 (pty.tty, STDIN_FILENO);
1451#endif
1452 1476
1453#ifdef UTMP_SUPPORT 1477 child_ev.start (cmd_pid);
1454 privileged_utmp (SAVE);
1455#endif
1456 1478
1457#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1479 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; 1480 break;
1466 } 1481 }
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} 1482}
1476 1483
1477/* ------------------------------------------------------------------------- * 1484/* ------------------------------------------------------------------------- *
1478 * CHILD PROCESS OPERATIONS * 1485 * CHILD PROCESS OPERATIONS *
1479 * ------------------------------------------------------------------------- */ 1486 * ------------------------------------------------------------------------- */
… …
1484int 1491int
1485rxvt_term::run_child (const char *const *argv) 1492rxvt_term::run_child (const char *const *argv)
1486{ 1493{
1487 char *login; 1494 char *login;
1488 1495
1489 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1490
1491 if (options & Opt_console) 1496 if (option (Opt_console))
1497 {
1492 { /* be virtual console, fail silently */ 1498 /* be virtual console, fail silently */
1493#ifdef TIOCCONS 1499#ifdef TIOCCONS
1494 unsigned int on = 1; 1500 unsigned int on = 1;
1495 1501
1496 ioctl (STDIN_FILENO, TIOCCONS, &on); 1502 ioctl (STDIN_FILENO, TIOCCONS, &on);
1497#elif defined (SRIOCSREDIR) 1503#elif defined (SRIOCSREDIR)
… …
1499 1505
1500 fd = open (CONSOLE, O_WRONLY, 0); 1506 fd = open (CONSOLE, O_WRONLY, 0);
1501 if (fd >= 0) 1507 if (fd >= 0)
1502 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1508 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1503 close (fd); 1509 close (fd);
1504#endif /* SRIOCSREDIR */ 1510#endif /* SRIOCSREDIR */
1505 } 1511 }
1506 1512
1507 /* reset signals and spin off the command interpreter */ 1513 /* reset signals and spin off the command interpreter */
1508 signal (SIGINT, SIG_DFL); 1514 signal (SIGINT, SIG_DFL);
1509 signal (SIGQUIT, SIG_DFL); 1515 signal (SIGQUIT, SIG_DFL);
… …
1516 */ 1522 */
1517#ifdef SIGTSTP 1523#ifdef SIGTSTP
1518 signal (SIGTSTP, SIG_IGN); 1524 signal (SIGTSTP, SIG_IGN);
1519 signal (SIGTTIN, SIG_IGN); 1525 signal (SIGTTIN, SIG_IGN);
1520 signal (SIGTTOU, SIG_IGN); 1526 signal (SIGTTOU, SIG_IGN);
1521#endif /* SIGTSTP */ 1527#endif /* SIGTSTP */
1522 1528
1523 // unblock signals (signals are blocked by iom.C 1529 // unblock signals (signals are blocked by iom.C
1524 sigset_t ss; 1530 sigset_t ss;
1525 sigemptyset (&ss); 1531 sigemptyset (&ss);
1526 sigprocmask (SIG_SETMASK, &ss, 0); 1532 sigprocmask (SIG_SETMASK, &ss, 0);
1527 1533
1528#ifndef __QNX__
1529 /* command interpreter path */ 1534 /* command interpreter path */
1530 if (argv != NULL) 1535 if (argv)
1531 { 1536 {
1532# ifdef DEBUG_CMD 1537# ifdef DEBUG_CMD
1533 int i; 1538 int i;
1534 1539
1535 for (i = 0; argv[i]; i++) 1540 for (i = 0; argv[i]; i++)
… …
1539 execvp (argv[0], (char *const *)argv); 1544 execvp (argv[0], (char *const *)argv);
1540 /* no error message: STDERR is closed! */ 1545 /* no error message: STDERR is closed! */
1541 } 1546 }
1542 else 1547 else
1543 { 1548 {
1544 const char *argv0, *shell; 1549 const char *argv0, *shell;
1545 1550
1546 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1551 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1547 shell = "/bin/sh"; 1552 shell = "/bin/sh";
1548 1553
1549 argv0 = (const char *)rxvt_r_basename (shell); 1554 argv0 = (const char *)rxvt_basename (shell);
1550 1555
1551 if (options & Opt_loginShell) 1556 if (option (Opt_loginShell))
1552 { 1557 {
1553 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1558 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1554 1559
1555 login[0] = '-'; 1560 login[0] = '-';
1556 strcpy (&login[1], argv0); 1561 strcpy (&login[1], argv0);
1557 argv0 = login; 1562 argv0 = login;
1558 } 1563 }
1564
1559 execlp (shell, argv0, NULL); 1565 execlp (shell, argv0, (char *)0);
1560 /* no error message: STDERR is closed! */ 1566 /* no error message: STDERR is closed! */
1561 } 1567 }
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 1568
1619 return -1; 1569 return -1;
1620} 1570}
1621 1571
1622/*----------------------- end-of-file (C source) -----------------------*/ 1572/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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