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.112 by root, Sat Feb 19 01:07:58 2005 UTC vs.
Revision 1.251 by ayin, Tue Feb 19 18:15:26 2008 UTC

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

Diff Legend

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