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.113 by root, Sat Feb 19 04:16:49 2005 UTC vs.
Revision 1.234 by ayin, Fri Dec 28 14:57:04 2007 UTC

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

Diff Legend

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