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.121 by root, Wed Nov 30 21:05:39 2005 UTC vs.
Revision 1.248 by ayin, Tue Jan 29 14:45:54 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
174#if OFF_FOCUS_FADING 279#if OFF_FOCUS_FADING
175 "black", 280 "rgb:00/00/00",
176#endif 281#endif
177 }; 282 };
178 283
179const char *const xa_names[] = 284void
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#ifdef OFFIX_DND
209 "DndProtocol",
210 "DndSelection",
211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif
216 };
217
218bool
219rxvt_term::init_vars () 285rxvt_term::init_vars ()
220{ 286{
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif
225 pix_colors = pix_colors_focused; 287 pix_colors = pix_colors_focused;
226
227 if (pix_colors == NULL)
228 return false;
229
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
231 TermWin.pixmap = None;
232#endif
233 288
234 MEvent.time = CurrentTime; 289 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 290 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 291 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 292 priv_modes = SavedModes = PrivMode_Default;
239 TermWin.focus = 0;
240 TermWin.ncol = 80; 293 ncol = 80;
241 TermWin.nrow = 24; 294 nrow = 24;
242 TermWin.int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
243 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
244 TermWin.lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
245 TermWin.saveLines = SAVELINES; 298 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS;
247 299
248 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 300 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 301
252 oldcursor.row = oldcursor.col = -1; 302 oldcursor.row = oldcursor.col = -1;
253#ifdef XPM_BACKGROUND
254 /* bgPixmap.w = bgPixmap.h = 0; */
255 bgPixmap.x = bgPixmap.y = 50;
256 bgPixmap.pixmap = None;
257#endif
258 303
259 last_bot = last_state = -1; 304 set_option (Opt_scrollBar);
260 305 set_option (Opt_scrollTtyOutput);
261#ifdef MENUBAR 306 set_option (Opt_jumpScroll);
262 menu_readonly = 1; 307 set_option (Opt_skipScroll);
263# if ! (MENUBAR_MAX > 1) 308 set_option (Opt_secondaryScreen);
264 CurrentBar = &BarList; 309 set_option (Opt_secondaryScroll);
265# endif /* (MENUBAR_MAX > 1) */ 310 set_option (Opt_pastableTabs);
266#endif 311 set_option (Opt_intensityStyles);
267 312 set_option (Opt_iso14755_52);
268 return true; 313 set_option (Opt_buffered);
269} 314}
270 315
271void 316static void
272rxvt_term::init_secondary () 317init_secondary ()
273{ 318{
274 int i; 319 int i;
275 320
276 /*
277 * Close all unused file descriptors
278 * We don't want them, we don't need them.
279 */
280 if ((i = open ("/dev/null", O_RDONLY)) < 0) 321 if ((i = open ("/dev/null", O_RDONLY)) < 0)
281 { 322 {
282 /* TODO: BOO HISS */
283 dup2 (STDERR_FILENO, STDIN_FILENO); 323 dup2 (STDERR_FILENO, STDIN_FILENO);
284 } 324 }
285 else if (i > STDIN_FILENO) 325 else if (i != STDIN_FILENO)
286 { 326 {
287 dup2 (i, STDIN_FILENO); 327 dup2 (i, STDIN_FILENO);
288 close (i); 328 close (i);
289 } 329 }
290 330
291 dup2 (STDERR_FILENO, STDOUT_FILENO); 331 dup2 (STDERR_FILENO, STDOUT_FILENO);
292
293#if 0 // schmorp sayz closing filies is murder
294 for (i = STDERR_FILENO + 1; i < num_fds; i++)
295 {
296#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
297 if (i == 4 || i == 7)
298 continue;
299#endif
300 close (i);
301 }
302#endif
303} 332}
304 333
305/*----------------------------------------------------------------------*/ 334/*----------------------------------------------------------------------*/
306const char ** 335const char **
307rxvt_term::init_resources (int argc, const char *const *argv) 336rxvt_term::init_resources (int argc, const char *const *argv)
308{ 337{
309 int i, r_argc; 338 int i, r_argc;
310 char *val;
311 const char **cmd_argv, **r_argv; 339 const char **cmd_argv, **r_argv;
312 340
313 /* 341 /*
314 * 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
315 */ 343 */
316 for (r_argc = 0; r_argc < argc; r_argc++) 344 for (r_argc = 0; r_argc < argc; r_argc++)
317 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 345 if (!strcmp (argv[r_argc], "-e"))
318 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 }
319 361
320 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 362 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
321 363
322 for (i = 0; i < r_argc; i++) 364 for (i = 0; i < r_argc; i++)
323 r_argv[i] = (const char *)argv[i]; 365 r_argv[i] = (const char *)argv[i];
324 366
325 r_argv[i] = NULL; 367 r_argv[i] = NULL;
326 368
327 if (r_argc == argc)
328 cmd_argv = NULL;
329 else
330 {
331 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
332
333 for (i = 0; i < argc - r_argc - 1; i++)
334 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
335
336 cmd_argv[i] = NULL;
337 }
338
339 rs[Rs_name] = rxvt_r_basename (argv[0]); 369 rs[Rs_name] = rxvt_basename (argv[0]);
340 370
341 /* 371 /*
342 * Open display, get options/resources and create the window 372 * Open display, get options/resources and create the window
343 */ 373 */
374
344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 375 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345 rs[Rs_display_name] = ":0"; 376 rs[Rs_display_name] = ":0";
346 377
347 get_options (r_argc, r_argv); 378 get_options (r_argc, r_argv);
348 379
349 if (!(display = displays.get (rs[Rs_display_name]))) 380 if (!(display = displays.get (rs[Rs_display_name])))
381 {
382 free (r_argv);
350 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 }
351 385
386 // using a local pointer decreases code size a lot
387 xa = display->xa;
388
389 set (display);
352 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
353 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
354 420
355 /* 421 /*
356 * set any defaults not already set 422 * set any defaults not already set
357 */ 423 */
358 if (cmd_argv && cmd_argv[0]) 424 if (cmd_argv && cmd_argv[0])
359 { 425 {
360 if (!rs[Rs_title]) 426 if (!rs[Rs_title])
361 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 427 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
362 if (!rs[Rs_iconName]) 428 if (!rs[Rs_iconName])
363 rs[Rs_iconName] = rs[Rs_title]; 429 rs[Rs_iconName] = rs[Rs_title];
364 } 430 }
365 else 431 else
366 { 432 {
… …
369 if (!rs[Rs_iconName]) 435 if (!rs[Rs_iconName])
370 rs[Rs_iconName] = rs[Rs_name]; 436 rs[Rs_iconName] = rs[Rs_name];
371 } 437 }
372 438
373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 439 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
374 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 440 saveLines = min (i, MAX_SAVELINES);
375 441
376#if ENABLE_FRILLS 442#if ENABLE_FRILLS
377 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)
378 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 444 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
445
379 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)
380 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 447 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
448
381 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 449 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
382 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 450 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
383#endif 451#endif
384 452
385#ifdef POINTER_BLANK 453#ifdef POINTER_BLANK
386 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 454 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
387 pointerBlankDelay = i; 455 pointerBlankDelay = i;
388 else 456 else
389 pointerBlankDelay = 2; 457 pointerBlankDelay = 2;
390#endif 458#endif
391 459
392 /* no point having a scrollbar without having any scrollback! */ 460 /* no point having a scrollbar without having any scrollback! */
393 if (!TermWin.saveLines) 461 if (!saveLines)
394 options &= ~Opt_scrollBar; 462 set_option (Opt_scrollBar, 0);
395 463
396#ifdef PRINTPIPE 464#ifdef PRINTPIPE
397 if (!rs[Rs_print_pipe]) 465 if (!rs[Rs_print_pipe])
398 rs[Rs_print_pipe] = PRINTPIPE; 466 rs[Rs_print_pipe] = PRINTPIPE;
399#endif 467#endif
… …
402 rs[Rs_cutchars] = CUTCHARS; 470 rs[Rs_cutchars] = CUTCHARS;
403 471
404#ifndef NO_BACKSPACE_KEY 472#ifndef NO_BACKSPACE_KEY
405 if (!rs[Rs_backspace_key]) 473 if (!rs[Rs_backspace_key])
406# ifdef DEFAULT_BACKSPACE 474# ifdef DEFAULT_BACKSPACE
407 key_backspace = DEFAULT_BACKSPACE; 475 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
408# else 476# else
409 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 477 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
410# endif 478# endif
411 else
412 {
413 val = strdup (rs[Rs_backspace_key]);
414 rxvt_Str_trim (val);
415 rxvt_Str_escaped (val);
416 key_backspace = val;
417 }
418#endif 479#endif
419 480
420#ifndef NO_DELETE_KEY 481#ifndef NO_DELETE_KEY
421 if (!rs[Rs_delete_key]) 482 if (!rs[Rs_delete_key])
422# ifdef DEFAULT_DELETE 483# ifdef DEFAULT_DELETE
423 key_delete = DEFAULT_DELETE; 484 rs[Rs_delete_key] = DEFAULT_DELETE;
424# else 485# else
425 key_delete = "\033[3~"; 486 rs[Rs_delete_key] = "\033[3~";
426# endif
427 else
428 {
429 val = strdup (rs[Rs_delete_key]);
430 rxvt_Str_trim (val);
431 rxvt_Str_escaped (val);
432 key_delete = val;
433 }
434#endif 487# endif
435 if (rs[Rs_answerbackstring])
436 {
437 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
438 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
439 }
440
441#ifdef HAVE_SCROLLBARS
442 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
443#endif 488#endif
489
490 scrollBar.setup (this);
444 491
445#ifdef XTERM_REVERSE_VIDEO 492#ifdef XTERM_REVERSE_VIDEO
446 /* this is how xterm implements reverseVideo */ 493 /* this is how xterm implements reverseVideo */
447 if (options & Opt_reverseVideo) 494 if (option (Opt_reverseVideo))
448 { 495 {
449 if (!rs[Rs_color + Color_fg]) 496 if (!rs[Rs_color + Color_fg])
450 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 497 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
498
451 if (!rs[Rs_color + Color_bg]) 499 if (!rs[Rs_color + Color_bg])
452 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 500 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
453 } 501 }
454#endif 502#endif
455 503
… …
457 if (!rs[Rs_color + i]) 505 if (!rs[Rs_color + i])
458 rs[Rs_color + i] = def_colorName[i]; 506 rs[Rs_color + i] = def_colorName[i];
459 507
460#ifndef XTERM_REVERSE_VIDEO 508#ifndef XTERM_REVERSE_VIDEO
461 /* this is how we implement reverseVideo */ 509 /* this is how we implement reverseVideo */
462 if (options & Opt_reverseVideo) 510 if (option (Opt_reverseVideo))
463 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]);
464#endif 512#endif
465 513
466 /* convenient aliases for setting fg/bg to colors */ 514 /* convenient aliases for setting fg/bg to colors */
467 color_aliases (Color_fg); 515 color_aliases (Color_fg);
468 color_aliases (Color_bg); 516 color_aliases (Color_bg);
469#ifndef NO_CURSORCOLOR 517#ifndef NO_CURSORCOLOR
470 color_aliases (Color_cursor); 518 color_aliases (Color_cursor);
471 color_aliases (Color_cursor2); 519 color_aliases (Color_cursor2);
472#endif /* NO_CURSORCOLOR */ 520#endif /* NO_CURSORCOLOR */
473 color_aliases (Color_pointer_fg); 521 color_aliases (Color_pointer_fg);
474 color_aliases (Color_pointer_bg); 522 color_aliases (Color_pointer_bg);
475 color_aliases (Color_border); 523 color_aliases (Color_border);
476#ifndef NO_BOLD_UNDERLINE_REVERSE 524#ifndef NO_BOLD_UNDERLINE_REVERSE
477 color_aliases (Color_BD); 525 color_aliases (Color_BD);
478 color_aliases (Color_UL); 526 color_aliases (Color_UL);
479 color_aliases (Color_RV); 527 color_aliases (Color_RV);
480#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 528#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
481 529
482 if (!rs[Rs_color + Color_border]) 530 if (!rs[Rs_color + Color_border])
483 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 531 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
484 532
485 return cmd_argv; 533 return cmd_argv;
534}
535
536/*----------------------------------------------------------------------*/
537void
538rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
539{
540 this->envv = envv;
541
542 SET_R (this);
543 set_locale ("");
544 set_environ (envv); // few things in X do not call setlocale :(
545
546 init_vars ();
547
548 init_secondary ();
549
550 const char **cmd_argv = init_resources (argc, argv);
551
552#ifdef KEYSYM_RESOURCE
553 keyboard->register_done ();
554#endif
555
556 if (option (Opt_scrollBar))
557 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
558
559 pty = ptytty::create ();
560
561 create_windows (argc, argv);
562
563 init_xlocale ();
564
565 scr_reset (); // initialize screen
566
567#if 0
568 XSynchronize (dpy, True);
569#endif
570
571 if (option (Opt_scrollBar))
572 resize_scrollbar (); /* create and map scrollbar */
573#ifdef HAVE_BG_PIXMAP
574 {
575 bgPixmap.set_target (this);
576 bgPixmap.invalidate ();
577
578#ifdef ENABLE_TRANSPARENCY
579 if (option (Opt_transparent))
580 {
581 bgPixmap.set_transparent ();
582
583#ifdef HAVE_AFTERIMAGE
584 if (rs [Rs_blurradius])
585 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
586#endif
587 if (ISSET_PIXCOLOR (Color_tint))
588 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
589
590 if (rs [Rs_shade])
591 bgPixmap.set_shade (rs [Rs_shade]);
592
593 bgPixmap.set_root_pixmap ();
594 XSelectInput (dpy, display->root, PropertyChangeMask);
595 rootwin_ev.start (display, display->root);
596 }
597#endif
598
599#ifdef BG_IMAGE_FROM_FILE
600 if (rs[Rs_backgroundPixmap])
601 {
602 const char *p = rs[Rs_backgroundPixmap];
603
604 if ((p = strchr (p, ';')) != 0)
605 {
606 p++;
607 bgPixmap.set_geometry (p);
608 }
609 else
610 bgPixmap.set_defaultGeometry ();
611
612 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
613 if (!bgPixmap.window_position_sensitive ())
614 update_background ();
615 }
616#endif
617 }
618#endif
619
620#if ENABLE_PERL
621 rootwin_ev.start (display, display->root);
622#endif
623
624 set_colorfgbg ();
625
626 init_command (cmd_argv);
627
628 free (cmd_argv);
629
630 if (pty->pty >= 0)
631 pty_ev.start (pty->pty, ev::READ);
632
633 HOOK_INVOKE ((this, HOOK_START, DT_END));
634
635#if ENABLE_XEMBED
636 if (rs[Rs_embed])
637 {
638 long info[2] = { 0, XEMBED_MAPPED };
639
640 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
641 32, PropModeReplace, (unsigned char *)&info, 2);
642 }
643#endif
644
645 XMapWindow (dpy, vt);
646 XMapWindow (dpy, parent[0]);
647
648 refresh_check ();
486} 649}
487 650
488/*----------------------------------------------------------------------*/ 651/*----------------------------------------------------------------------*/
489void 652void
490rxvt_term::init_env () 653rxvt_term::init_env ()
491{ 654{
492 int i; 655 int i;
493 unsigned int u;
494 char *val; 656 char *val;
495 657
496#ifdef DISPLAY_IS_IP 658#ifdef DISPLAY_IS_IP
497 /* Fixup display_name for export over pty to any interested terminal 659 /* Fixup display_name for export over pty to any interested terminal
498 * 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
… …
506 */ 668 */
507 val = rxvt_network_display (rs[Rs_display_name]); 669 val = rxvt_network_display (rs[Rs_display_name]);
508 rs[Rs_display_name] = (const char *)val; 670 rs[Rs_display_name] = (const char *)val;
509 671
510 if (val == NULL) 672 if (val == NULL)
511#endif /* DISPLAY_IS_IP */ 673#endif /* DISPLAY_IS_IP */
512 val = XDisplayString (display->display); 674 val = XDisplayString (dpy);
513 675
514 if (rs[Rs_display_name] == NULL) 676 if (rs[Rs_display_name] == NULL)
515 rs[Rs_display_name] = val; /* use broken `:0' value */ 677 rs[Rs_display_name] = val; /* use broken `:0' value */
516 678
517 i = strlen (val); 679 i = strlen (val);
518 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 680 env_display = (char *)rxvt_malloc (i + 9);
519 681
520 sprintf (env_display, "DISPLAY=%s", val); 682 sprintf (env_display, "DISPLAY=%s", val);
521 683
522 /* avoiding the math library: 684 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
523 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
524 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
525 ;
526 MAX_IT (i, 1);
527 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
528
529 sprintf (env_windowid, "WINDOWID=%u",
530 (unsigned int)TermWin.parent[0]);
531 685
532 /* add entries to the environment: 686 /* add entries to the environment:
533 * @ DISPLAY: in case we started with -display 687 * @ DISPLAY: in case we started with -display
534 * @ WINDOWID: X window id number of the window 688 * @ WINDOWID: X window id number of the window
535 * @ COLORTERM: terminal sub-name and also indicates its color 689 * @ COLORTERM: terminal sub-name and also indicates its color
… …
537 * @ TERMINFO: path to terminfo directory 691 * @ TERMINFO: path to terminfo directory
538 * @ COLORFGBG: fg;bg color codes 692 * @ COLORFGBG: fg;bg color codes
539 */ 693 */
540 putenv (env_display); 694 putenv (env_display);
541 putenv (env_windowid); 695 putenv (env_windowid);
696
542 if (env_colorfgbg) 697 if (env_colorfgbg)
543 putenv (env_colorfgbg); 698 putenv (env_colorfgbg);
544 699
545#ifdef RXVT_TERMINFO 700#ifdef RXVT_TERMINFO
546 putenv ("TERMINFO=" RXVT_TERMINFO); 701 putenv ("TERMINFO=" RXVT_TERMINFO);
547#endif 702#endif
548 703
549 if (display->depth <= 2) 704 if (depth <= 2)
550 putenv ("COLORTERM=" COLORTERMENV "-mono"); 705 putenv ("COLORTERM=" COLORTERMENV "-mono");
551 else 706 else
552 putenv ("COLORTERM=" COLORTERMENVFULL); 707 putenv ("COLORTERM=" COLORTERMENVFULL);
553 708
554 if (rs[Rs_term_name] != NULL) 709 if (rs[Rs_term_name] != NULL)
555 { 710 {
556 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);
557 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 712 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
558 putenv (env_term); 713 putenv (env_term);
559 } 714 }
560 else 715 else
561 putenv ("TERM=" TERMENV); 716 putenv ("TERM=" TERMENV);
… …
563#ifdef HAVE_UNSETENV 718#ifdef HAVE_UNSETENV
564 /* avoid passing old settings and confusing term size */ 719 /* avoid passing old settings and confusing term size */
565 unsetenv ("LINES"); 720 unsetenv ("LINES");
566 unsetenv ("COLUMNS"); 721 unsetenv ("COLUMNS");
567 unsetenv ("TERMCAP"); /* terminfo should be okay */ 722 unsetenv ("TERMCAP"); /* terminfo should be okay */
568#endif /* HAVE_UNSETENV */ 723#endif /* HAVE_UNSETENV */
569} 724}
570 725
571/*----------------------------------------------------------------------*/ 726/*----------------------------------------------------------------------*/
572/* 727/*
573 * This is more or less stolen straight from XFree86 xterm. 728 * This is more or less stolen straight from XFree86 xterm.
574 * This should support all European type languages. 729 * This should support all European type languages.
575 */ 730 */
576void 731void
577rxvt_term::set_locale (const char *locale) 732rxvt_term::set_locale (const char *locale)
578{ 733{
734 set_environ (envv);
735
579#if HAVE_XSETLOCALE || HAVE_SETLOCALE 736#if HAVE_XSETLOCALE || HAVE_SETLOCALE
580 free (this->locale); 737 free (this->locale);
581 this->locale = setlocale (LC_CTYPE, locale); 738 this->locale = setlocale (LC_CTYPE, locale);
582 739
583 if (!this->locale) 740 if (!this->locale)
584 { 741 {
585 if (*locale) 742 if (*locale)
586 { 743 {
587 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);
588 setlocale (LC_CTYPE, ""); 745 setlocale (LC_CTYPE, "C");
589 } 746 }
590 else 747 else
591 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");
592 749
593 this->locale = ""; 750 this->locale = "C";
594 } 751 }
595 752
596 753
597 this->locale = rxvt_strdup (this->locale); 754 this->locale = strdup (this->locale);
598 SET_LOCALE (this->locale); 755 SET_LOCALE (this->locale);
599 mbstate.reset (); 756 mbstate.reset ();
600#endif 757#endif
601 758
602#if HAVE_NL_LANGINFO 759#if HAVE_NL_LANGINFO
… …
613} 770}
614 771
615void 772void
616rxvt_term::init_xlocale () 773rxvt_term::init_xlocale ()
617{ 774{
775 set_environ (envv);
776
618#ifdef USE_XIM 777#ifdef USE_XIM
619 if (!locale) 778 if (!locale)
620 rxvt_warn ("setting locale failed, working without locale support.\n"); 779 rxvt_warn ("setting locale failed, working without locale support.\n");
621 else 780 else
622 { 781 {
… …
644 * Initialize the command connection. 803 * Initialize the command connection.
645 * This should be called after the X server connection is established. 804 * This should be called after the X server connection is established.
646 */ 805 */
647 806
648#ifdef META8_OPTION 807#ifdef META8_OPTION
649 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 808 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
650#endif 809#endif
651 810
652 get_ourmods (); 811 get_ourmods ();
653 812
654 if (!(options & Opt_scrollTtyOutput)) 813 if (!option (Opt_scrollTtyOutput))
655 priv_modes |= PrivMode_TtyOutputInh; 814 priv_modes |= PrivMode_TtyOutputInh;
656 if (options & Opt_scrollTtyKeypress) 815 if (option (Opt_scrollTtyKeypress))
657 priv_modes |= PrivMode_Keypress; 816 priv_modes |= PrivMode_Keypress;
658 if (!(options & Opt_jumpScroll)) 817 if (!option (Opt_jumpScroll))
659 priv_modes |= PrivMode_smoothScroll; 818 priv_modes |= PrivMode_smoothScroll;
660 819
661#ifndef NO_BACKSPACE_KEY 820#ifndef NO_BACKSPACE_KEY
662 if (strcmp (key_backspace, "DEC") == 0) 821 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
663 priv_modes |= PrivMode_HaveBackSpace; 822 priv_modes |= PrivMode_HaveBackSpace;
664#endif 823#endif
665 824
666 /* add value for scrollBar */ 825 /* add value for scrollBar */
667 if (scrollbar_visible ()) 826 if (scrollBar.state)
668 { 827 {
669 priv_modes |= PrivMode_scrollBar; 828 priv_modes |= PrivMode_scrollBar;
670 SavedModes |= PrivMode_scrollBar; 829 SavedModes |= PrivMode_scrollBar;
671 } 830 }
672
673 if (menubar_visible ())
674 {
675 priv_modes |= PrivMode_menuBar;
676 SavedModes |= PrivMode_menuBar;
677 }
678
679#ifdef CURSOR_BLINK
680 if (options & Opt_cursorBlink)
681 (void)gettimeofday (&lastcursorchange, NULL);
682#endif
683 831
684 run_command (argv); 832 run_command (argv);
685} 833}
686 834
687/*----------------------------------------------------------------------*/ 835/*----------------------------------------------------------------------*/
… …
691 int i; 839 int i;
692 840
693#ifdef OFF_FOCUS_FADING 841#ifdef OFF_FOCUS_FADING
694 pix_colors = pix_colors_focused; 842 pix_colors = pix_colors_focused;
695#endif 843#endif
696 844
697 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 845 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
698 { 846 {
847 const char *name = rs[Rs_color + i];
848
849 if (!name)
850 continue;
851
699 rxvt_color xcol; 852 rxvt_color xcol;
700 853
701 if (!rs[Rs_color + i]) 854 if (!set_color (xcol, name))
702 continue;
703
704 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
705 { 855 {
706#ifndef XTERM_REVERSE_VIDEO 856#ifndef XTERM_REVERSE_VIDEO
707 if (i < 2 && (options & Opt_reverseVideo)) 857 if (i < 2 && option (Opt_reverseVideo))
708 rs[Rs_color + i] = def_colorName[!i]; 858 name = def_colorName [1 - i];
709 else 859 else
710#endif 860#endif
711 rs[Rs_color + i] = def_colorName[i]; 861 name = def_colorName [i];
712 862
713 if (!rs[Rs_color + i]) 863 if (!name)
714 continue; 864 continue;
715 865
716 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 866 if (!set_color (xcol, name))
717 { 867 {
718 switch (i) 868 switch (i)
719 { 869 {
720 case Color_fg: 870 case Color_fg:
721 case Color_bg: 871 case Color_bg:
722 /* fatal: need bg/fg color */
723 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 872 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
724 /* NOTREACHED */ 873 name = "";
725 break; 874 break;
726#ifndef NO_CURSORCOLOR 875#ifndef NO_CURSORCOLOR
727 case Color_cursor2: 876 case Color_cursor2:
728 xcol = pix_colors[Color_fg]; 877#endif
729 break;
730#endif /* ! NO_CURSORCOLOR */
731 case Color_pointer_fg: 878 case Color_pointer_fg:
732 xcol = pix_colors[Color_fg]; 879 name = rs[Rs_color + Color_fg];
880 xcol.set (this, name);
733 break; 881 break;
734 default: 882 default:
735 xcol = pix_colors[Color_bg]; /* None */ 883 name = rs[Rs_color + Color_bg];
884 xcol.set (this, name);
736 break; 885 break;
737 } 886 }
738 } 887 }
739 } 888 }
740 889
741 pix_colors[i] = xcol; 890 pix_colors[i] = xcol;
742 SET_PIXCOLOR (i); 891 rs[Rs_color + i] = name;
743 }
744
745#ifdef OFF_FOCUS_FADING
746 if (rs[Rs_fade])
747 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
748 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
749#endif
750
751 if (display->depth <= 2)
752 { 892 }
893
894 if (depth <= 2)
895 {
753 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);
754 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);
755 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);
756 } 899 }
757 900
758 /* 901 /*
759 * get scrollBar/menuBar shadow colors 902 * get scrollBar shadow colors
760 * 903 *
761 * The calculations of topShadow/bottomShadow values are adapted 904 * The calculations of topShadow/bottomShadow values are adapted
762 * from the fvwm window manager. 905 * from the fvwm window manager.
763 */ 906 */
764#ifdef KEEP_SCROLLCOLOR 907#ifdef RXVT_SCROLLBAR
765
766 if (display->depth <= 2) 908 if (depth <= 2)
767 { 909 {
768 /* Monochrome */ 910 /* Monochrome */
769 pix_colors[Color_scroll] = pix_colors[Color_fg]; 911 alias_color (Color_scroll, Color_fg);
770 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 912 alias_color (Color_topShadow, Color_bg);
771 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 913 alias_color (Color_bottomShadow, Color_bg);
772 } 914 }
773 else 915 else
774 { 916 {
775 rxvt_color xcol[2]; 917 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
776 /* xcol[0] == white
777 * xcol[1] == top shadow
778 * xcol[2] == bot shadow */
779 918
780 xcol[1] = pix_colors[Color_scroll]; 919 rgba cscroll;
781 xcol[0].set (display, 65535, 65535, 65535); 920 pix_colors [Color_scroll].get (cscroll);
782
783 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
784
785 xcol[0].get (display, pr0, pg0, pb0);
786 xcol[1].get (display, pr1, pg1, pb1);
787
788 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
789 921
790 /* topShadowColor */ 922 /* topShadowColor */
791 if (!xcol[1].set (display, 923 if (!pix_colors[Color_topShadow].set (this,
792 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 924 rgba (
793 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 925 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
794 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 926 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
795 xcol[1] = pix_colors[Color_White]; 927 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
796 928 cscroll.a)
797 pix_colors[Color_topShadow] = xcol[1]; 929 ))
930 alias_color (Color_topShadow, Color_White);
798 } 931 }
799#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
800} 938}
801 939
802/*----------------------------------------------------------------------*/ 940/*----------------------------------------------------------------------*/
803/* color aliases, fg/bg bright-bold */ 941/* color aliases, fg/bg bright-bold */
804void 942void
… …
807 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 945 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
808 { 946 {
809 int i = atoi (rs[Rs_color + idx]); 947 int i = atoi (rs[Rs_color + idx]);
810 948
811 if (i >= 8 && i <= 15) 949 if (i >= 8 && i <= 15)
812 { /* bright colors */ 950 /* bright colors */
813 i -= 8;
814#ifndef NO_BRIGHTCOLOR
815 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 951 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
816 return; 952 else if (i >= 0 && i <= 7)
817#endif 953 /* normal colors */
818 }
819
820 if (i >= 0 && i <= 7) /* normal colors */
821 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 954 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
822 } 955 }
823} 956}
824 957
825/*----------------------------------------------------------------------*/ 958/*----------------------------------------------------------------------*/
… …
845 978
846 if (rsmod 979 if (rsmod
847 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 980 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
848 requestedmeta = rsmod[3] - '0'; 981 requestedmeta = rsmod[3] - '0';
849 982
850 map = XGetModifierMapping (display->display); 983 map = XGetModifierMapping (dpy);
851 kc = map->modifiermap; 984 kc = map->modifiermap;
852 985
853 for (i = 1; i < 6; i++) 986 for (i = 1; i < 6; i++)
854 { 987 {
855 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 988 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
857 for (j = map->max_keypermod; j--; k++) 990 for (j = map->max_keypermod; j--; k++)
858 { 991 {
859 if (kc[k] == 0) 992 if (kc[k] == 0)
860 break; 993 break;
861 994
862 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 995 switch (XKeycodeToKeysym (dpy, kc[k], 0))
863 { 996 {
864 case XK_Num_Lock: 997 case XK_Num_Lock:
865 ModNumLockMask = modmasks[i - 1]; 998 ModNumLockMask = modmasks[i - 1];
866 continue; 999 continue;
867 1000
… …
917rxvt_term::create_windows (int argc, const char *const *argv) 1050rxvt_term::create_windows (int argc, const char *const *argv)
918{ 1051{
919 XClassHint classHint; 1052 XClassHint classHint;
920 XWMHints wmHint; 1053 XWMHints wmHint;
921#if ENABLE_FRILLS 1054#if ENABLE_FRILLS
922 Atom prop = None;
923 MWMHints mwmhints; 1055 MWMHints mwmhints = { };
924#endif 1056#endif
925 XGCValues gcvalue; 1057 XGCValues gcvalue;
926 long vt_emask;
927 XSetWindowAttributes attributes; 1058 XSetWindowAttributes attributes;
928 XWindowAttributes gattr;
929 Window top, parent; 1059 Window top, parent;
930 dDisp;
931 1060
932#ifdef USING_W11LIB 1061 dLocal (Display *, dpy);
933 /* enable W11 callbacks */
934 W11AddEventHandler (disp, rxvt_W11_process_x_event);
935#endif
936 1062
937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 1063 /* grab colors before netscape does */
938 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 1064 Get_Colours ();
939 1065
940 if (options & Opt_transparent) 1066 if (!set_fonts ())
941 { 1067 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
942 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 1068
943 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1069 parent = display->root;
944 } 1070
1071 attributes.override_redirect = !!option (Opt_override_redirect);
945 1072
946#if ENABLE_FRILLS 1073#if ENABLE_FRILLS
947 if (options & Opt_borderLess) 1074 if (option (Opt_borderLess))
948 { 1075 {
949 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 1076 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
950
951 if (prop == None)
952 { 1077 {
953 /* 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");
954#ifdef PREFER_24BIT
955 attributes.override_redirect = TRUE; 1079 attributes.override_redirect = true;
956#endif
957 mwmhints.flags = 0;
958 } 1080 }
959 else 1081 else
960 { 1082 {
961 mwmhints.flags = MWM_HINTS_DECORATIONS; 1083 mwmhints.flags = MWM_HINTS_DECORATIONS;
962 mwmhints.decorations = 0;
963 } 1084 }
964 } 1085 }
965 else
966 mwmhints.flags = 0;
967#endif 1086#endif
968
969 /* grab colors before netscape does */
970 Get_Colours ();
971
972 if (!set_fonts ())
973 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
974
975 parent = DefaultRootWindow (disp);
976 1087
977#if ENABLE_XEMBED 1088#if ENABLE_XEMBED
978 if (rs[Rs_embed]) 1089 if (rs[Rs_embed])
979 { 1090 {
980 XWindowAttributes wattr; 1091 XWindowAttributes wattr;
981 1092
982 parent = strtol (rs[Rs_embed], 0, 0); 1093 parent = strtol (rs[Rs_embed], 0, 0);
983 1094
984 if (!XGetWindowAttributes (disp, parent, &wattr)) 1095 if (!XGetWindowAttributes (dpy, parent, &wattr))
985 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1096 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
986 1097
987 window_calc (wattr.width, wattr.height); 1098 window_calc (wattr.width, wattr.height);
988 } 1099 }
989
990#endif 1100#endif
1101
991 window_calc (0, 0); 1102 window_calc (0, 0);
992 1103
993 /* sub-window placement & size in rxvt_resize_subwindows () */ 1104 /* sub-window placement & size in rxvt_resize_subwindows () */
994#ifdef PREFER_24BIT
995 attributes.background_pixel = pix_colors_focused[Color_border]; 1105 attributes.background_pixel = pix_colors_focused [Color_border];
996 attributes.border_pixel = pix_colors_focused[Color_border]; 1106 attributes.border_pixel = pix_colors_focused [Color_border];
997 attributes.colormap = display->cmap; 1107 attributes.colormap = cmap;
1108
998 top = XCreateWindow (disp, parent, 1109 top = XCreateWindow (dpy, parent,
999 szHint.x, szHint.y, 1110 szHint.x, szHint.y,
1000 szHint.width, szHint.height, 1111 szHint.width, szHint.height,
1001 TermWin.ext_bwidth, 1112 ext_bwidth,
1002 display->depth, InputOutput, 1113 depth, InputOutput, visual,
1003 display->visual,
1004 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1114 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1005#else 1115 &attributes);
1006 top = XCreateSimpleWindow (disp, parent,
1007 szHint.x, szHint.y,
1008 szHint.width, szHint.height,
1009 TermWin.ext_bwidth,
1010 pix_colors_focused[Color_border],
1011 pix_colors_focused[Color_border]);
1012#endif
1013 1116
1014 TermWin.parent[0] = top; 1117 this->parent[0] = top;
1015 1118
1016 old_width = szHint.width; 1119 old_width = szHint.width;
1017 old_height = szHint.height; 1120 old_height = szHint.height;
1018 1121
1019 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1122 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1020 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1123 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1021 1124
1022 classHint.res_name = (char *)rs[Rs_name]; 1125 classHint.res_name = (char *)rs[Rs_name];
1023 classHint.res_class = (char *)RESCLASS; 1126 classHint.res_class = (char *)RESCLASS;
1024 1127
1025 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1128 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1026 wmHint.input = True; 1129 wmHint.input = True;
1027 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1130 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1028 wmHint.window_group = top; 1131 wmHint.window_group = top;
1029 1132
1030 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1133 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1031 &szHint, &wmHint, &classHint); 1134 &szHint, &wmHint, &classHint);
1135
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
1032 1141
1033 Atom protocols[] = { 1142 Atom protocols[] = {
1034 xa[XA_WM_DELETE_WINDOW], 1143 xa[XA_WM_DELETE_WINDOW],
1035#if ENABLE_EWMH 1144#if ENABLE_EWMH
1036 xa[XA_NET_WM_PING], 1145 xa[XA_NET_WM_PING],
1037#endif 1146#endif
1038 }; 1147 };
1039 1148
1040 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 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
1041 1155
1042#if ENABLE_EWMH 1156#if ENABLE_EWMH
1043 long pid = getpid (); 1157 long pid = getpid ();
1044 1158
1045 XChangeProperty (disp, top, 1159 XChangeProperty (dpy, top,
1046 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1160 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1047 PropModeReplace, (unsigned char *)&pid, 1); 1161 PropModeReplace, (unsigned char *)&pid, 1);
1048 1162
1049 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1163 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1050#endif 1164#endif
1051 1165
1052 XSelectInput (disp, top, 1166 XSelectInput (dpy, top,
1053 KeyPressMask 1167 KeyPressMask
1054#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1168#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1055 | KeyReleaseMask 1169 | KeyReleaseMask
1056#endif 1170#endif
1057 | FocusChangeMask | VisibilityChangeMask 1171 | FocusChangeMask | VisibilityChangeMask
1058 | ExposureMask | StructureNotifyMask); 1172 | ExposureMask | StructureNotifyMask);
1059 1173
1060 termwin_ev.start (display, top); 1174 termwin_ev.start (display, top);
1061 1175
1062#if ENABLE_FRILLS
1063 if (mwmhints.flags)
1064 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1065 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1066#endif
1067
1068 /* 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 */
1069 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1177 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1070
1071#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1072 /* cursor (menuBar/scrollBar): Black-on-White */
1073 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1074#endif
1075 1178
1076 /* the vt window */ 1179 /* the vt window */
1077 TermWin.vt = XCreateSimpleWindow (disp, top, 1180 vt = XCreateSimpleWindow (dpy, top,
1078 window_vt_x,
1079 window_vt_y, 1181 window_vt_x, window_vt_y,
1080 TermWin_TotalWidth (), 1182 width, height,
1081 TermWin_TotalHeight (),
1082 0, 1183 0,
1083 pix_colors_focused[Color_fg], 1184 pix_colors_focused[Color_fg],
1084 pix_colors_focused[Color_bg]); 1185 pix_colors_focused[Color_bg]);
1085#ifdef DEBUG_X
1086 XStoreName (disp, TermWin.vt, "vt window");
1087#endif
1088 1186
1089 attributes.bit_gravity = NorthWestGravity; 1187 attributes.bit_gravity = NorthWestGravity;
1090 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1188 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1091 1189
1092 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1190 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1093 1191
1094#ifdef POINTER_BLANK
1095 if (options & Opt_pointerBlank) 1192 if (option (Opt_pointerBlank))
1096 vt_emask |= PointerMotionMask; 1193 vt_emask |= PointerMotionMask;
1097 else 1194 else
1098#endif
1099 vt_emask |= Button1MotionMask | Button3MotionMask; 1195 vt_emask |= Button1MotionMask | Button3MotionMask;
1100 1196
1101 XSelectInput (disp, TermWin.vt, vt_emask); 1197 vt_select_input ();
1198
1102 vt_ev.start (display, TermWin.vt); 1199 vt_ev.start (display, vt);
1103
1104#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1105 if (menuBar_height ())
1106 {
1107 menuBar.win = XCreateSimpleWindow (disp, top,
1108 window_vt_x, 0,
1109 TermWin_TotalWidth (),
1110 menuBar_TotalHeight (),
1111 0,
1112 pix_colors_focused[Color_fg],
1113 pix_colors_focused[Color_scroll]);
1114
1115#ifdef DEBUG_X
1116 XStoreName (disp, menuBar.win, "menubar");
1117#endif
1118
1119 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1120
1121 XDefineCursor (disp, menuBar.win,
1122 XCreateFontCursor (disp, XC_left_ptr));
1123
1124 XSelectInput (disp, menuBar.win,
1125 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1126 menubar_ev.start (display, menuBar.win);
1127 }
1128#endif
1129
1130#ifdef XPM_BACKGROUND
1131 if (rs[Rs_backgroundPixmap] != NULL
1132 && ! (options & Opt_transparent))
1133 {
1134 const char *p = rs[Rs_backgroundPixmap];
1135
1136 if ((p = strchr (p, ';')) != NULL)
1137 {
1138 p++;
1139 scale_pixmap (p);
1140 }
1141
1142 set_bgPixmap (rs[Rs_backgroundPixmap]);
1143 scr_touch (true);
1144 }
1145#endif
1146 1200
1147 /* graphics context for the vt window */ 1201 /* graphics context for the vt window */
1148 gcvalue.foreground = pix_colors[Color_fg]; 1202 gcvalue.foreground = pix_colors[Color_fg];
1149 gcvalue.background = pix_colors[Color_bg]; 1203 gcvalue.background = pix_colors[Color_bg];
1150 gcvalue.graphics_exposures = 1; 1204 gcvalue.graphics_exposures = 0;
1151 TermWin.gc = XCreateGC (disp, TermWin.vt, 1205
1206 gc = XCreateGC (dpy, vt,
1152 GCForeground | GCBackground | GCGraphicsExposures, 1207 GCForeground | GCBackground | GCGraphicsExposures,
1153 &gcvalue); 1208 &gcvalue);
1154 1209
1155 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1210 drawable = new rxvt_drawable (this, vt);
1156
1157#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1158 gcvalue.foreground = pix_colors[Color_topShadow];
1159 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1160 gcvalue.foreground = pix_colors[Color_bottomShadow];
1161 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1162 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1163 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1164#endif
1165 1211
1166#ifdef OFF_FOCUS_FADING 1212#ifdef OFF_FOCUS_FADING
1167 // initially we are in unfocused state 1213 // initially we are in unfocused state
1168 if (rs[Rs_fade]) 1214 if (rs[Rs_fade])
1169 pix_colors = pix_colors_unfocused; 1215 pix_colors = pix_colors_unfocused;
1170#endif 1216#endif
1171 1217
1172 pointer_unblank (); 1218 pointer_unblank ();
1173 scr_recolour (); 1219 scr_recolour ();
1174
1175#if ENABLE_XEMBED
1176 if (rs[Rs_embed])
1177 {
1178 long info[2] = { 0, XEMBED_MAPPED };
1179
1180 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1181 32, PropModeReplace, (unsigned char *)&info, 2);
1182 }
1183#endif
1184} 1220}
1185 1221
1186/* ------------------------------------------------------------------------- * 1222/* ------------------------------------------------------------------------- *
1187 * GET TTY CURRENT STATE * 1223 * GET TTY CURRENT STATE *
1188 * ------------------------------------------------------------------------- */ 1224 * ------------------------------------------------------------------------- */
1189void 1225void
1190rxvt_get_ttymode (ttymode_t *tio, int erase) 1226rxvt_get_ttymode (struct termios *tio, int erase)
1191{ 1227{
1192#ifdef HAVE_TERMIOS_H
1193 /* 1228 /*
1194 * standard System V termios interface 1229 * standard System V termios interface
1195 */ 1230 */
1196 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1231 if (tcgetattr (STDIN_FILENO, tio) < 0)
1197 { 1232 {
1198 /* 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
1199 tio->c_cc[VINTR] = CINTR; 1237 tio->c_cc[VINTR] = CINTR;
1200 tio->c_cc[VQUIT] = CQUIT; 1238 tio->c_cc[VQUIT] = CQUIT;
1201 tio->c_cc[VERASE] = CERASE; 1239 tio->c_cc[VERASE] = CERASE;
1240#ifdef VERASE2
1241 tio->c_cc[VERASE2] = CERASE2;
1242#endif
1202 tio->c_cc[VKILL] = CKILL; 1243 tio->c_cc[VKILL] = CKILL;
1203 tio->c_cc[VSTART] = CSTART; 1244 tio->c_cc[VSTART] = CSTART;
1204 tio->c_cc[VSTOP] = CSTOP; 1245 tio->c_cc[VSTOP] = CSTOP;
1205 tio->c_cc[VSUSP] = CSUSP; 1246 tio->c_cc[VSUSP] = CSUSP;
1206# ifdef VDSUSP 1247# ifdef VDSUSP
… …
1258 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1299 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1259# if defined (ECHOCTL) && defined (ECHOKE) 1300# if defined (ECHOCTL) && defined (ECHOKE)
1260 | ECHOCTL | ECHOKE 1301 | ECHOCTL | ECHOKE
1261# endif 1302# endif
1262 | ECHOE | ECHOK); 1303 | ECHOE | ECHOK);
1263# else /* HAVE_TERMIOS_H */
1264
1265 /*
1266 * sgtty interface
1267 */
1268
1269 /* get parameters -- gtty */
1270 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1271 {
1272 tio->sg.sg_erase = CERASE; /* ^H */
1273 tio->sg.sg_kill = CKILL; /* ^U */
1274 }
1275
1276 if (erase != -1)
1277 tio->sg.sg_erase = (char)erase;
1278
1279 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1280
1281 /* get special characters */
1282 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1283 {
1284 tio->tc.t_intrc = CINTR; /* ^C */
1285 tio->tc.t_quitc = CQUIT; /* ^\ */
1286 tio->tc.t_startc = CSTART; /* ^Q */
1287 tio->tc.t_stopc = CSTOP; /* ^S */
1288 tio->tc.t_eofc = CEOF; /* ^D */
1289 tio->tc.t_brkc = -1;
1290 }
1291
1292 /* get local special chars */
1293 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1294 {
1295 tio->lc.t_suspc = CSUSP; /* ^Z */
1296 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1297 tio->lc.t_rprntc = CRPRNT; /* ^R */
1298 tio->lc.t_flushc = CFLUSH; /* ^O */
1299 tio->lc.t_werasc = CWERASE; /* ^W */
1300 tio->lc.t_lnextc = CLNEXT; /* ^V */
1301 }
1302 /* get line discipline */
1303 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1304# ifdef NTTYDISC
1305 tio->line = NTTYDISC;
1306# endif /* NTTYDISC */
1307
1308 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1309#endif /* HAVE_TERMIOS_H */
1310 1304
1311 /* 1305 /*
1312 * Debugging 1306 * Debugging
1313 */ 1307 */
1314#ifdef DEBUG_TTYMODE 1308#ifdef DEBUG_TTYMODE
1315#ifdef HAVE_TERMIOS_H
1316 /* c_iflag bits */ 1309 /* c_iflag bits */
1317 fprintf (stderr, "Input flags\n"); 1310 fprintf (stderr, "Input flags\n");
1318 1311
1319 /* cpp token stringize doesn't work on all machines <sigh> */ 1312 /* cpp token stringize doesn't work on all machines <sigh> */
1320# define FOO(flag,name) \ 1313# define FOO(flag,name) \
… …
1383 FOO (VLNEXT, "VLNEXT"); 1376 FOO (VLNEXT, "VLNEXT");
1384# endif 1377# endif
1385 1378
1386 fprintf (stderr, "\n"); 1379 fprintf (stderr, "\n");
1387# undef FOO 1380# undef FOO
1388# endif /* HAVE_TERMIOS_H */ 1381#endif /* DEBUG_TTYMODE */
1389#endif /* DEBUG_TTYMODE */
1390} 1382}
1391 1383
1392/*----------------------------------------------------------------------*/ 1384/*----------------------------------------------------------------------*/
1393/* 1385/*
1394 * 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
… …
1399rxvt_term::run_command (const char *const *argv) 1391rxvt_term::run_command (const char *const *argv)
1400{ 1392{
1401#if ENABLE_FRILLS 1393#if ENABLE_FRILLS
1402 if (rs[Rs_pty_fd]) 1394 if (rs[Rs_pty_fd])
1403 { 1395 {
1404 pty.pty = atoi (rs[Rs_pty_fd]); 1396 pty->pty = atoi (rs[Rs_pty_fd]);
1405 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 }
1406 } 1406 }
1407 else 1407 else
1408#endif 1408#endif
1409 if (!pty.get ()) 1409 if (!pty->get ())
1410 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1410 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1411 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);
1412 pty.set_utf8_mode (enc_utf8); 1428 pty->set_utf8_mode (enc_utf8);
1413 1429
1414 /* set initial window size */ 1430 /* set initial window size */
1415 tt_winch (); 1431 tt_winch ();
1416
1417 int er;
1418
1419#ifndef NO_BACKSPACE_KEY
1420 if (key_backspace[0] && !key_backspace[1])
1421 er = key_backspace[0];
1422 else if (strcmp (key_backspace, "DEC") == 0)
1423 er = '\177'; /* the initial state anyway */
1424 else
1425#endif
1426 er = -1;
1427
1428 rxvt_get_ttymode (&tio, er);
1429 1432
1430#if ENABLE_FRILLS 1433#if ENABLE_FRILLS
1431 if (rs[Rs_pty_fd]) 1434 if (rs[Rs_pty_fd])
1432 return; 1435 return;
1433#endif 1436#endif
1434 1437
1435#ifndef __QNX__
1436 /* spin off the command interpreter */ 1438 /* spin off the command interpreter */
1437 switch (cmd_pid = fork ()) 1439 switch (cmd_pid = fork ())
1438 { 1440 {
1439 case -1: 1441 case -1:
1440 { 1442 {
… …
1442 rxvt_fatal ("can't fork, aborting.\n"); 1444 rxvt_fatal ("can't fork, aborting.\n");
1443 } 1445 }
1444 case 0: 1446 case 0:
1445 init_env (); 1447 init_env ();
1446 1448
1447 if (!pty.make_controlling_tty ()) 1449 if (!pty->make_controlling_tty ())
1448 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1450 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1449 else 1451 else
1450 { 1452 {
1451 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1453 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1452 dup2 (pty.tty, STDIN_FILENO); 1454 dup2 (pty->tty, STDIN_FILENO);
1453 dup2 (pty.tty, STDOUT_FILENO); 1455 dup2 (pty->tty, STDOUT_FILENO);
1454 dup2 (pty.tty, STDERR_FILENO); 1456 dup2 (pty->tty, STDERR_FILENO);
1455 1457
1456 // close all our file handles that we do no longer need 1458 // close all our file handles that we do no longer need
1457 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1459 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1458 { 1460 {
1459 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1461 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1460 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1462 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1461 } 1463 }
1462 1464
1463 run_child (argv); 1465 run_child (argv);
1464 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1466 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1465 } 1467 }
1466 1468
1467 _exit (EXIT_FAILURE); 1469 _exit (EXIT_FAILURE);
1468 1470
1469 default: 1471 default:
1470 { 1472 if (!option (Opt_utmpInhibit))
1471#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1473 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1472 int fdstdin;
1473 1474
1474 fdstdin = dup (STDIN_FILENO); 1475 pty->close_tty ();
1475 dup2 (pty.tty, STDIN_FILENO);
1476#endif
1477 1476
1478#ifdef UTMP_SUPPORT 1477 child_ev.start (cmd_pid);
1479 privileged_utmp (SAVE);
1480#endif
1481 1478
1482#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1479 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1483
1484 dup2 (fdstdin, STDIN_FILENO);
1485 close (fdstdin);
1486#endif
1487 }
1488
1489 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1490 break; 1480 break;
1491 } 1481 }
1492#else /* __QNX__ uses qnxspawn () */
1493 fchmod (pty.tty, 0622);
1494 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1495 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1496
1497 if (run_child (argv) == -1)
1498 exit (EXIT_FAILURE);
1499#endif
1500} 1482}
1501 1483
1502/* ------------------------------------------------------------------------- * 1484/* ------------------------------------------------------------------------- *
1503 * CHILD PROCESS OPERATIONS * 1485 * CHILD PROCESS OPERATIONS *
1504 * ------------------------------------------------------------------------- */ 1486 * ------------------------------------------------------------------------- */
… …
1509int 1491int
1510rxvt_term::run_child (const char *const *argv) 1492rxvt_term::run_child (const char *const *argv)
1511{ 1493{
1512 char *login; 1494 char *login;
1513 1495
1514 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1515
1516 if (options & Opt_console) 1496 if (option (Opt_console))
1497 {
1517 { /* be virtual console, fail silently */ 1498 /* be virtual console, fail silently */
1518#ifdef TIOCCONS 1499#ifdef TIOCCONS
1519 unsigned int on = 1; 1500 unsigned int on = 1;
1520 1501
1521 ioctl (STDIN_FILENO, TIOCCONS, &on); 1502 ioctl (STDIN_FILENO, TIOCCONS, &on);
1522#elif defined (SRIOCSREDIR) 1503#elif defined (SRIOCSREDIR)
… …
1524 1505
1525 fd = open (CONSOLE, O_WRONLY, 0); 1506 fd = open (CONSOLE, O_WRONLY, 0);
1526 if (fd >= 0) 1507 if (fd >= 0)
1527 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1508 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1528 close (fd); 1509 close (fd);
1529#endif /* SRIOCSREDIR */ 1510#endif /* SRIOCSREDIR */
1530 } 1511 }
1531 1512
1532 /* reset signals and spin off the command interpreter */ 1513 /* reset signals and spin off the command interpreter */
1533 signal (SIGINT, SIG_DFL); 1514 signal (SIGINT, SIG_DFL);
1534 signal (SIGQUIT, SIG_DFL); 1515 signal (SIGQUIT, SIG_DFL);
… …
1541 */ 1522 */
1542#ifdef SIGTSTP 1523#ifdef SIGTSTP
1543 signal (SIGTSTP, SIG_IGN); 1524 signal (SIGTSTP, SIG_IGN);
1544 signal (SIGTTIN, SIG_IGN); 1525 signal (SIGTTIN, SIG_IGN);
1545 signal (SIGTTOU, SIG_IGN); 1526 signal (SIGTTOU, SIG_IGN);
1546#endif /* SIGTSTP */ 1527#endif /* SIGTSTP */
1547 1528
1548 // unblock signals (signals are blocked by iom.C 1529 // unblock signals (signals are blocked by iom.C
1549 sigset_t ss; 1530 sigset_t ss;
1550 sigemptyset (&ss); 1531 sigemptyset (&ss);
1551 sigprocmask (SIG_SETMASK, &ss, 0); 1532 sigprocmask (SIG_SETMASK, &ss, 0);
1552 1533
1553#ifndef __QNX__
1554 /* command interpreter path */ 1534 /* command interpreter path */
1555 if (argv != NULL) 1535 if (argv)
1556 { 1536 {
1557# ifdef DEBUG_CMD 1537# ifdef DEBUG_CMD
1558 int i; 1538 int i;
1559 1539
1560 for (i = 0; argv[i]; i++) 1540 for (i = 0; argv[i]; i++)
… …
1564 execvp (argv[0], (char *const *)argv); 1544 execvp (argv[0], (char *const *)argv);
1565 /* no error message: STDERR is closed! */ 1545 /* no error message: STDERR is closed! */
1566 } 1546 }
1567 else 1547 else
1568 { 1548 {
1569 const char *argv0, *shell; 1549 const char *argv0, *shell;
1570 1550
1571 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1551 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1572 shell = "/bin/sh"; 1552 shell = "/bin/sh";
1573 1553
1574 argv0 = (const char *)rxvt_r_basename (shell); 1554 argv0 = (const char *)rxvt_basename (shell);
1575 1555
1576 if (options & Opt_loginShell) 1556 if (option (Opt_loginShell))
1577 { 1557 {
1578 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1558 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1579 1559
1580 login[0] = '-'; 1560 login[0] = '-';
1581 strcpy (&login[1], argv0); 1561 strcpy (&login[1], argv0);
1582 argv0 = login; 1562 argv0 = login;
1583 } 1563 }
1564
1584 execlp (shell, argv0, NULL); 1565 execlp (shell, argv0, (char *)0);
1585 /* no error message: STDERR is closed! */ 1566 /* no error message: STDERR is closed! */
1586 } 1567 }
1587
1588#else /* __QNX__ uses qnxspawn () */
1589
1590 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1591 char *command = NULL, fullcommand[_MAX_PATH];
1592 char **arg_v, *arg_a[2] = { NULL, NULL };
1593
1594 if (argv != NULL)
1595 {
1596 if (access (argv[0], X_OK) == -1)
1597 {
1598 if (strchr (argv[0], '/') == NULL)
1599 {
1600 searchenv (argv[0], "PATH", fullcommand);
1601
1602 if (fullcommand[0] != '\0')
1603 command = fullcommand;
1604 }
1605
1606 if (access (command, X_OK) == -1)
1607 return -1;
1608 }
1609 else
1610 command = argv[0];
1611
1612 arg_v = argv;
1613 }
1614 else
1615 {
1616 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1617 command = "/bin/sh";
1618
1619 arg_a[0] = my_basename (command);
1620
1621 if (options & Opt_loginShell)
1622 {
1623 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1624
1625 login[0] = '-';
1626 strcpy (&login[1], arg_a[0]);
1627 arg_a[0] = login;
1628 }
1629
1630 arg_v = arg_a;
1631 }
1632
1633 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1634 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1635 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1636 command, arg_v, environ, iov_a, 0);
1637 if (login)
1638 free (login);
1639
1640 pty.close_tty ();
1641 return pty.pty;
1642#endif
1643 1568
1644 return -1; 1569 return -1;
1645} 1570}
1646 1571
1647/*----------------------- end-of-file (C source) -----------------------*/ 1572/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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