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.96 by root, Sat Dec 11 23:01:36 2004 UTC vs.
Revision 1.217 by root, Tue Oct 9 13:36:10 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines