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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines