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.139 by root, Wed Jan 11 03:13:26 2006 UTC vs.
Revision 1.258 by root, Sun Apr 26 01:59:53 2009 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-2006 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"
38 40
39#include <limits> 41#include <limits>
40 42
41#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
42 147
43const char *const def_colorName[] = 148const char *const def_colorName[] =
44 { 149 {
45 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
47 /* low-intensity colors */ 152 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 153 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 154 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 155 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 157 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 161 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 162# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 163 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 164# endif
60 /* high-intensity colors */ 165 /* high-intensity colors */
61# ifdef XTERM_COLORS 166# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 168# else
64 "Grey25", /* 8: bright black (#404040) */ 169 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 170# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 171 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 172 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 173 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
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 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 focus = 0;
240 ncol = 80; 293 ncol = 80;
241 nrow = 24; 294 nrow = 24;
242 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
243 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
244 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
245 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 */
344 {
345 TEMP_ENV;
346 374
347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 375 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
348 rs[Rs_display_name] = ":0"; 376 rs[Rs_display_name] = ":0";
349 377
350 get_options (r_argc, r_argv); 378 get_options (r_argc, r_argv);
351 379
352 if (!(display = displays.get (rs[Rs_display_name]))) 380 if (!(display = displays.get (rs[Rs_display_name])))
381 {
382 free (r_argv);
353 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 }
354 385
386 // using a local pointer decreases code size a lot
387 xa = display->xa;
388
389 set (display);
355 extract_resources (); 390 extract_resources ();
356 } 391
392#if XFT
393 if (rs[Rs_depth])
394 select_visual (strtol (rs[Rs_depth], 0, 0));
395#endif
357 396
358 free (r_argv); 397 free (r_argv);
398
399 for (int i = NUM_RESOURCES; i--; )
400 if (rs [i] == resval_undef)
401 rs [i] = 0;
402
403#ifdef HAVE_AFTERIMAGE
404 set_application_name ((char *)rs[Rs_name]);
405 set_output_threshold (OUTPUT_LEVEL_WARNING);
406#endif
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
359 420
360 /* 421 /*
361 * set any defaults not already set 422 * set any defaults not already set
362 */ 423 */
363 if (cmd_argv && cmd_argv[0]) 424 if (cmd_argv && cmd_argv[0])
364 { 425 {
365 if (!rs[Rs_title]) 426 if (!rs[Rs_title])
366 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 427 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
428
367 if (!rs[Rs_iconName]) 429 if (!rs[Rs_iconName])
368 rs[Rs_iconName] = rs[Rs_title]; 430 rs[Rs_iconName] = rs[Rs_title];
369 } 431 }
370 else 432 else
371 { 433 {
372 if (!rs[Rs_title]) 434 if (!rs[Rs_title])
373 rs[Rs_title] = rs[Rs_name]; 435 rs[Rs_title] = rs[Rs_name];
436
374 if (!rs[Rs_iconName]) 437 if (!rs[Rs_iconName])
375 rs[Rs_iconName] = rs[Rs_name]; 438 rs[Rs_iconName] = rs[Rs_name];
376 } 439 }
377 440
378 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 441 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
398 461
399 /* no point having a scrollbar without having any scrollback! */ 462 /* no point having a scrollbar without having any scrollback! */
400 if (!saveLines) 463 if (!saveLines)
401 set_option (Opt_scrollBar, 0); 464 set_option (Opt_scrollBar, 0);
402 465
403#ifdef PRINTPIPE
404 if (!rs[Rs_print_pipe])
405 rs[Rs_print_pipe] = PRINTPIPE;
406#endif
407
408 if (!rs[Rs_cutchars]) 466 if (!rs[Rs_cutchars])
409 rs[Rs_cutchars] = CUTCHARS; 467 rs[Rs_cutchars] = CUTCHARS;
410 468
411#ifndef NO_BACKSPACE_KEY 469#ifndef NO_BACKSPACE_KEY
412 if (!rs[Rs_backspace_key]) 470 if (!rs[Rs_backspace_key])
413# ifdef DEFAULT_BACKSPACE 471# ifdef DEFAULT_BACKSPACE
414 key_backspace = DEFAULT_BACKSPACE; 472 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
415# else 473# else
416 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 474 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
417# endif 475# endif
418 else
419 {
420 val = strdup (rs[Rs_backspace_key]);
421 rxvt_Str_trim (val);
422 rxvt_Str_escaped (val);
423 key_backspace = val;
424 }
425#endif 476#endif
426 477
427#ifndef NO_DELETE_KEY 478#ifndef NO_DELETE_KEY
428 if (!rs[Rs_delete_key]) 479 if (!rs[Rs_delete_key])
429# ifdef DEFAULT_DELETE 480# ifdef DEFAULT_DELETE
430 key_delete = DEFAULT_DELETE; 481 rs[Rs_delete_key] = DEFAULT_DELETE;
431# else 482# else
432 key_delete = "\033[3~"; 483 rs[Rs_delete_key] = "\033[3~";
433# endif
434 else
435 {
436 val = strdup (rs[Rs_delete_key]);
437 rxvt_Str_trim (val);
438 rxvt_Str_escaped (val);
439 key_delete = val;
440 }
441#endif 484# endif
442 if (rs[Rs_answerbackstring])
443 {
444 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
445 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
446 }
447
448#ifdef HAVE_SCROLLBARS
449 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
450#endif 485#endif
486
487 scrollBar.setup (this);
451 488
452#ifdef XTERM_REVERSE_VIDEO 489#ifdef XTERM_REVERSE_VIDEO
453 /* this is how xterm implements reverseVideo */ 490 /* this is how xterm implements reverseVideo */
454 if (OPTION (Opt_reverseVideo)) 491 if (option (Opt_reverseVideo))
455 { 492 {
456 if (!rs[Rs_color + Color_fg]) 493 if (!rs[Rs_color + Color_fg])
457 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 494 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
495
458 if (!rs[Rs_color + Color_bg]) 496 if (!rs[Rs_color + Color_bg])
459 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 497 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
460 } 498 }
461#endif 499#endif
462 500
… …
464 if (!rs[Rs_color + i]) 502 if (!rs[Rs_color + i])
465 rs[Rs_color + i] = def_colorName[i]; 503 rs[Rs_color + i] = def_colorName[i];
466 504
467#ifndef XTERM_REVERSE_VIDEO 505#ifndef XTERM_REVERSE_VIDEO
468 /* this is how we implement reverseVideo */ 506 /* this is how we implement reverseVideo */
469 if (OPTION (Opt_reverseVideo)) 507 if (option (Opt_reverseVideo))
470 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 508 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
471#endif 509#endif
472 510
473 /* convenient aliases for setting fg/bg to colors */ 511 /* convenient aliases for setting fg/bg to colors */
474 color_aliases (Color_fg); 512 color_aliases (Color_fg);
475 color_aliases (Color_bg); 513 color_aliases (Color_bg);
476#ifndef NO_CURSORCOLOR 514#ifndef NO_CURSORCOLOR
477 color_aliases (Color_cursor); 515 color_aliases (Color_cursor);
478 color_aliases (Color_cursor2); 516 color_aliases (Color_cursor2);
479#endif /* NO_CURSORCOLOR */ 517#endif /* NO_CURSORCOLOR */
480 color_aliases (Color_pointer_fg); 518 color_aliases (Color_pointer_fg);
481 color_aliases (Color_pointer_bg); 519 color_aliases (Color_pointer_bg);
482 color_aliases (Color_border); 520 color_aliases (Color_border);
483#ifndef NO_BOLD_UNDERLINE_REVERSE 521#ifndef NO_BOLD_UNDERLINE_REVERSE
484 color_aliases (Color_BD); 522 color_aliases (Color_BD);
485 color_aliases (Color_UL); 523 color_aliases (Color_UL);
486 color_aliases (Color_RV); 524 color_aliases (Color_RV);
487#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 525#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
488 526
489 if (!rs[Rs_color + Color_border]) 527 if (!rs[Rs_color + Color_border])
490 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 528 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
491 529
492 return cmd_argv; 530 return cmd_argv;
531}
532
533/*----------------------------------------------------------------------*/
534void
535rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
536{
537 this->envv = envv;
538
539 SET_R (this);
540 set_locale ("");
541 set_environ (envv); // a few things in X do not call setlocale :(
542
543 init_vars ();
544
545 init_secondary ();
546
547 const char **cmd_argv = init_resources (argc, argv);
548
549#ifdef KEYSYM_RESOURCE
550 keyboard->register_done ();
551#endif
552
553 if (const char *path = rs[Rs_chdir])
554 if (*path) // ignored if empty
555 {
556 if (*path != '/')
557 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
558
559 if (chdir (path))
560 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
561 }
562
563 if (option (Opt_scrollBar))
564 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
565
566 pty = ptytty::create ();
567
568 create_windows (argc, argv);
569
570 init_xlocale ();
571
572 scr_poweron (); // initialize screen
573
574#if 0
575 XSynchronize (dpy, True);
576#endif
577
578 if (option (Opt_scrollBar))
579 scrollBar.resize (); /* create and map scrollbar */
580#ifdef HAVE_BG_PIXMAP
581 {
582 bgPixmap.set_target (this);
583 bgPixmap.invalidate ();
584
585#ifdef ENABLE_TRANSPARENCY
586 if (option (Opt_transparent))
587 {
588 bgPixmap.set_transparent ();
589
590#ifdef HAVE_AFTERIMAGE
591 if (rs [Rs_blurradius])
592 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
593#endif
594 if (ISSET_PIXCOLOR (Color_tint))
595 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
596
597 if (rs [Rs_shade])
598 bgPixmap.set_shade (rs [Rs_shade]);
599
600 bgPixmap.set_root_pixmap ();
601 XSelectInput (dpy, display->root, PropertyChangeMask);
602 rootwin_ev.start (display, display->root);
603 }
604#endif
605
606#ifdef BG_IMAGE_FROM_FILE
607 if (rs[Rs_backgroundPixmap])
608 {
609 const char *p = rs[Rs_backgroundPixmap];
610
611 if ((p = strchr (p, ';')) != 0)
612 {
613 p++;
614 bgPixmap.set_geometry (p);
615 }
616 else
617 bgPixmap.set_defaultGeometry ();
618
619 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
620 if (!bgPixmap.window_position_sensitive ())
621 update_background ();
622 }
623#endif
624 }
625#endif
626
627#if ENABLE_PERL
628 rootwin_ev.start (display, display->root);
629#endif
630
631 set_colorfgbg ();
632
633 init_command (cmd_argv);
634
635 free (cmd_argv);
636
637 if (pty->pty >= 0)
638 pty_ev.start (pty->pty, ev::READ);
639
640 HOOK_INVOKE ((this, HOOK_START, DT_END));
641
642#if ENABLE_XEMBED
643 if (rs[Rs_embed])
644 {
645 long info[2] = { 0, XEMBED_MAPPED };
646
647 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
648 32, PropModeReplace, (unsigned char *)&info, 2);
649 }
650#endif
651
652 XMapWindow (dpy, vt);
653 XMapWindow (dpy, parent[0]);
654
655 refresh_check ();
493} 656}
494 657
495/*----------------------------------------------------------------------*/ 658/*----------------------------------------------------------------------*/
496void 659void
497rxvt_term::init_env () 660rxvt_term::init_env ()
498{ 661{
499 int i; 662 int i;
500 unsigned int u;
501 char *val; 663 char *val;
502 664
503#ifdef DISPLAY_IS_IP 665#ifdef DISPLAY_IS_IP
504 /* Fixup display_name for export over pty to any interested terminal 666 /* Fixup display_name for export over pty to any interested terminal
505 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 667 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
513 */ 675 */
514 val = rxvt_network_display (rs[Rs_display_name]); 676 val = rxvt_network_display (rs[Rs_display_name]);
515 rs[Rs_display_name] = (const char *)val; 677 rs[Rs_display_name] = (const char *)val;
516 678
517 if (val == NULL) 679 if (val == NULL)
518#endif /* DISPLAY_IS_IP */ 680#endif /* DISPLAY_IS_IP */
519 val = XDisplayString (display->display); 681 val = XDisplayString (dpy);
520 682
521 if (rs[Rs_display_name] == NULL) 683 if (rs[Rs_display_name] == NULL)
522 rs[Rs_display_name] = val; /* use broken `:0' value */ 684 rs[Rs_display_name] = val; /* use broken `:0' value */
523 685
524 i = strlen (val); 686 i = strlen (val);
525 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 687 env_display = (char *)rxvt_malloc (i + 9);
526 688
527 sprintf (env_display, "DISPLAY=%s", val); 689 sprintf (env_display, "DISPLAY=%s", val);
528 690
529 /* avoiding the math library: 691 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
530 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
531 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
532 ;
533 max_it (i, 1);
534 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
535
536 sprintf (env_windowid, "WINDOWID=%u",
537 (unsigned int)parent[0]);
538 692
539 /* add entries to the environment: 693 /* add entries to the environment:
540 * @ DISPLAY: in case we started with -display 694 * @ DISPLAY: in case we started with -display
541 * @ WINDOWID: X window id number of the window 695 * @ WINDOWID: X window id number of the window
542 * @ COLORTERM: terminal sub-name and also indicates its color 696 * @ COLORTERM: terminal sub-name and also indicates its color
… …
544 * @ TERMINFO: path to terminfo directory 698 * @ TERMINFO: path to terminfo directory
545 * @ COLORFGBG: fg;bg color codes 699 * @ COLORFGBG: fg;bg color codes
546 */ 700 */
547 putenv (env_display); 701 putenv (env_display);
548 putenv (env_windowid); 702 putenv (env_windowid);
703
549 if (env_colorfgbg) 704 if (env_colorfgbg)
550 putenv (env_colorfgbg); 705 putenv (env_colorfgbg);
551 706
552#ifdef RXVT_TERMINFO 707#ifdef RXVT_TERMINFO
553 putenv ("TERMINFO=" RXVT_TERMINFO); 708 putenv ("TERMINFO=" RXVT_TERMINFO);
554#endif 709#endif
555 710
556 if (display->depth <= 2) 711 if (depth <= 2)
557 putenv ("COLORTERM=" COLORTERMENV "-mono"); 712 putenv ("COLORTERM=" COLORTERMENV "-mono");
558 else 713 else
559 putenv ("COLORTERM=" COLORTERMENVFULL); 714 putenv ("COLORTERM=" COLORTERMENVFULL);
560 715
561 if (rs[Rs_term_name] != NULL) 716 if (rs[Rs_term_name] != NULL)
562 { 717 {
563 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 718 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
564 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 719 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
565 putenv (env_term); 720 putenv (env_term);
566 } 721 }
567 else 722 else
568 putenv ("TERM=" TERMENV); 723 putenv ("TERM=" TERMENV);
… …
570#ifdef HAVE_UNSETENV 725#ifdef HAVE_UNSETENV
571 /* avoid passing old settings and confusing term size */ 726 /* avoid passing old settings and confusing term size */
572 unsetenv ("LINES"); 727 unsetenv ("LINES");
573 unsetenv ("COLUMNS"); 728 unsetenv ("COLUMNS");
574 unsetenv ("TERMCAP"); /* terminfo should be okay */ 729 unsetenv ("TERMCAP"); /* terminfo should be okay */
575#endif /* HAVE_UNSETENV */ 730#endif /* HAVE_UNSETENV */
576} 731}
577 732
578/*----------------------------------------------------------------------*/ 733/*----------------------------------------------------------------------*/
579/* 734/*
580 * This is more or less stolen straight from XFree86 xterm. 735 * This is more or less stolen straight from XFree86 xterm.
581 * This should support all European type languages. 736 * This should support all European type languages.
582 */ 737 */
583void 738void
584rxvt_term::set_locale (const char *locale) 739rxvt_term::set_locale (const char *locale)
585{ 740{
586 TEMP_ENV; 741 set_environ (envv);
587 742
588#if HAVE_XSETLOCALE || HAVE_SETLOCALE 743#if HAVE_XSETLOCALE || HAVE_SETLOCALE
589 free (this->locale); 744 free (this->locale);
590 this->locale = setlocale (LC_CTYPE, locale); 745 this->locale = setlocale (LC_CTYPE, locale);
591 746
… …
601 756
602 this->locale = "C"; 757 this->locale = "C";
603 } 758 }
604 759
605 760
606 this->locale = rxvt_strdup (this->locale); 761 this->locale = strdup (this->locale);
607 SET_LOCALE (this->locale); 762 SET_LOCALE (this->locale);
608 mbstate.reset (); 763 mbstate.reset ();
609#endif 764#endif
610 765
611#if HAVE_NL_LANGINFO 766#if HAVE_NL_LANGINFO
… …
622} 777}
623 778
624void 779void
625rxvt_term::init_xlocale () 780rxvt_term::init_xlocale ()
626{ 781{
627 TEMP_ENV; 782 set_environ (envv);
628 783
629#ifdef USE_XIM 784#ifdef USE_XIM
630 if (!locale) 785 if (!locale)
631 rxvt_warn ("setting locale failed, working without locale support.\n"); 786 rxvt_warn ("setting locale failed, working without locale support.\n");
632 else 787 else
… …
655 * Initialize the command connection. 810 * Initialize the command connection.
656 * This should be called after the X server connection is established. 811 * This should be called after the X server connection is established.
657 */ 812 */
658 813
659#ifdef META8_OPTION 814#ifdef META8_OPTION
660 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 815 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
661#endif 816#endif
662 817
663 get_ourmods (); 818 get_ourmods ();
664 819
665 if (!OPTION (Opt_scrollTtyOutput)) 820 if (!option (Opt_scrollTtyOutput))
666 priv_modes |= PrivMode_TtyOutputInh; 821 priv_modes |= PrivMode_TtyOutputInh;
667 if (OPTION (Opt_scrollTtyKeypress)) 822 if (option (Opt_scrollTtyKeypress))
668 priv_modes |= PrivMode_Keypress; 823 priv_modes |= PrivMode_Keypress;
669 if (!OPTION (Opt_jumpScroll)) 824 if (!option (Opt_jumpScroll))
670 priv_modes |= PrivMode_smoothScroll; 825 priv_modes |= PrivMode_smoothScroll;
671 826
672#ifndef NO_BACKSPACE_KEY 827#ifndef NO_BACKSPACE_KEY
673 if (strcmp (key_backspace, "DEC") == 0) 828 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
674 priv_modes |= PrivMode_HaveBackSpace; 829 priv_modes |= PrivMode_HaveBackSpace;
675#endif 830#endif
676 831
677 /* add value for scrollBar */ 832 /* add value for scrollBar */
678 if (scrollbar_visible ()) 833 if (scrollBar.state)
679 { 834 {
680 priv_modes |= PrivMode_scrollBar; 835 priv_modes |= PrivMode_scrollBar;
681 SavedModes |= PrivMode_scrollBar; 836 SavedModes |= PrivMode_scrollBar;
682 } 837 }
683 838
684 if (menubar_visible ())
685 {
686 priv_modes |= PrivMode_menuBar;
687 SavedModes |= PrivMode_menuBar;
688 }
689
690 run_command (argv); 839 run_command (argv);
691} 840}
692 841
693/*----------------------------------------------------------------------*/ 842/*----------------------------------------------------------------------*/
694void 843void
695rxvt_term::Get_Colours () 844rxvt_term::get_colours ()
696{ 845{
697 int i; 846 int i;
698 847
699#ifdef OFF_FOCUS_FADING 848#ifdef OFF_FOCUS_FADING
700 pix_colors = pix_colors_focused; 849 pix_colors = pix_colors_focused;
701#endif 850#endif
702 851
703 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 852 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
704 { 853 {
854 const char *name = rs[Rs_color + i];
855
856 if (!name)
857 continue;
858
705 rxvt_color xcol; 859 rxvt_color xcol;
706 860
707 if (!rs[Rs_color + i]) 861 if (!set_color (xcol, name))
708 continue;
709
710 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
711 { 862 {
712#ifndef XTERM_REVERSE_VIDEO 863#ifndef XTERM_REVERSE_VIDEO
713 if (i < 2 && OPTION (Opt_reverseVideo)) 864 if (i < 2 && option (Opt_reverseVideo))
714 rs[Rs_color + i] = def_colorName[!i]; 865 name = def_colorName [1 - i];
715 else 866 else
716#endif 867#endif
717 rs[Rs_color + i] = def_colorName[i]; 868 name = def_colorName [i];
718 869
719 if (!rs[Rs_color + i]) 870 if (!name)
720 continue; 871 continue;
721 872
722 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 873 if (!set_color (xcol, name))
723 { 874 {
724 switch (i) 875 switch (i)
725 { 876 {
726 case Color_fg: 877 case Color_fg:
727 case Color_bg: 878 case Color_bg:
728 /* fatal: need bg/fg color */
729 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 879 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
730 /* NOTREACHED */ 880 name = "";
731 break; 881 break;
732#ifndef NO_CURSORCOLOR 882#ifndef NO_CURSORCOLOR
733 case Color_cursor2: 883 case Color_cursor2:
734 xcol = pix_colors[Color_fg]; 884#endif
735 break;
736#endif /* ! NO_CURSORCOLOR */
737 case Color_pointer_fg: 885 case Color_pointer_fg:
738 xcol = pix_colors[Color_fg]; 886 name = rs[Rs_color + Color_fg];
887 xcol.set (this, name);
739 break; 888 break;
740 default: 889 default:
741 xcol = pix_colors[Color_bg]; /* None */ 890 name = rs[Rs_color + Color_bg];
891 xcol.set (this, name);
742 break; 892 break;
743 } 893 }
744 } 894 }
745 } 895 }
746 896
747 pix_colors[i] = xcol; 897 pix_colors[i] = xcol;
748 SET_PIXCOLOR (i); 898 rs[Rs_color + i] = name;
749 }
750
751#ifdef OFF_FOCUS_FADING
752 if (rs[Rs_fade])
753 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
754 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
755#endif
756
757 if (display->depth <= 2)
758 { 899 }
900
901 if (depth <= 2)
902 {
759 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 903 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]; 904 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]; 905 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
762 } 906 }
763 907
764 /* 908 /*
765 * get scrollBar/menuBar shadow colors 909 * get scrollBar shadow colors
766 * 910 *
767 * The calculations of topShadow/bottomShadow values are adapted 911 * The calculations of topShadow/bottomShadow values are adapted
768 * from the fvwm window manager. 912 * from the fvwm window manager.
769 */ 913 */
770#ifdef KEEP_SCROLLCOLOR 914#ifdef RXVT_SCROLLBAR
771
772 if (display->depth <= 2) 915 if (depth <= 2)
773 { 916 {
774 /* Monochrome */ 917 /* Monochrome */
775 pix_colors[Color_scroll] = pix_colors[Color_fg]; 918 alias_color (Color_scroll, Color_fg);
776 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 919 alias_color (Color_topShadow, Color_bg);
777 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 920 alias_color (Color_bottomShadow, Color_bg);
778 } 921 }
779 else 922 else
780 { 923 {
781 rxvt_color xcol[2]; 924 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
782 /* xcol[0] == white
783 * xcol[1] == top shadow
784 * xcol[2] == bot shadow */
785 925
786 xcol[1] = pix_colors[Color_scroll]; 926 rgba cscroll;
787 xcol[0].set (display, 65535, 65535, 65535); 927 pix_colors [Color_scroll].get (cscroll);
788
789 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
790
791 xcol[0].get (display, pr0, pg0, pb0);
792 xcol[1].get (display, pr1, pg1, pb1);
793
794 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
795 928
796 /* topShadowColor */ 929 /* topShadowColor */
797 if (!xcol[1].set (display, 930 if (!pix_colors[Color_topShadow].set (this,
798 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 931 rgba (
799 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 932 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
800 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 933 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
801 xcol[1] = pix_colors[Color_White]; 934 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
802 935 cscroll.a)
803 pix_colors[Color_topShadow] = xcol[1]; 936 ))
937 alias_color (Color_topShadow, Color_White);
804 } 938 }
805#endif /* KEEP_SCROLLCOLOR */ 939#endif
940
941#ifdef OFF_FOCUS_FADING
942 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
943 update_fade_color (i);
944#endif
806} 945}
807 946
808/*----------------------------------------------------------------------*/ 947/*----------------------------------------------------------------------*/
809/* color aliases, fg/bg bright-bold */ 948/* color aliases, fg/bg bright-bold */
810void 949void
… …
813 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 952 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
814 { 953 {
815 int i = atoi (rs[Rs_color + idx]); 954 int i = atoi (rs[Rs_color + idx]);
816 955
817 if (i >= 8 && i <= 15) 956 if (i >= 8 && i <= 15)
818 { /* bright colors */ 957 /* bright colors */
819 i -= 8;
820 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 958 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
821 return; 959 else if (i >= 0 && i <= 7)
822 } 960 /* normal colors */
823
824 if (i >= 0 && i <= 7) /* normal colors */
825 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 961 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
826 } 962 }
827} 963}
828 964
829/*----------------------------------------------------------------------*/ 965/*----------------------------------------------------------------------*/
… …
849 985
850 if (rsmod 986 if (rsmod
851 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 987 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
852 requestedmeta = rsmod[3] - '0'; 988 requestedmeta = rsmod[3] - '0';
853 989
854 map = XGetModifierMapping (display->display); 990 map = XGetModifierMapping (dpy);
855 kc = map->modifiermap; 991 kc = map->modifiermap;
856 992
857 for (i = 1; i < 6; i++) 993 for (i = 1; i < 6; i++)
858 { 994 {
859 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 995 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
861 for (j = map->max_keypermod; j--; k++) 997 for (j = map->max_keypermod; j--; k++)
862 { 998 {
863 if (kc[k] == 0) 999 if (kc[k] == 0)
864 break; 1000 break;
865 1001
866 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 1002 switch (XKeycodeToKeysym (dpy, kc[k], 0))
867 { 1003 {
868 case XK_Num_Lock: 1004 case XK_Num_Lock:
869 ModNumLockMask = modmasks[i - 1]; 1005 ModNumLockMask = modmasks[i - 1];
870 continue; 1006 continue;
871 1007
… …
921rxvt_term::create_windows (int argc, const char *const *argv) 1057rxvt_term::create_windows (int argc, const char *const *argv)
922{ 1058{
923 XClassHint classHint; 1059 XClassHint classHint;
924 XWMHints wmHint; 1060 XWMHints wmHint;
925#if ENABLE_FRILLS 1061#if ENABLE_FRILLS
926 Atom prop = None;
927 MWMHints mwmhints; 1062 MWMHints mwmhints = { };
928#endif 1063#endif
929 XGCValues gcvalue; 1064 XGCValues gcvalue;
930 long vt_emask;
931 XSetWindowAttributes attributes; 1065 XSetWindowAttributes attributes;
932 XWindowAttributes gattr;
933 Window top, parent; 1066 Window top, parent;
934 dDisp;
935 1067
936#ifdef USING_W11LIB 1068 dLocal (Display *, dpy);
937 /* enable W11 callbacks */
938 W11AddEventHandler (disp, rxvt_W11_process_x_event);
939#endif
940 1069
941 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 1070 /* grab colors before netscape does */
942 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 1071 get_colours ();
943 1072
944 if (OPTION (Opt_transparent)) 1073 if (!set_fonts ())
945 { 1074 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
946 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 1075
947 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1076 parent = display->root;
948 } 1077
1078 attributes.override_redirect = !!option (Opt_override_redirect);
949 1079
950#if ENABLE_FRILLS 1080#if ENABLE_FRILLS
951 if (OPTION (Opt_borderLess)) 1081 if (option (Opt_borderLess))
952 { 1082 {
953 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 1083 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
954
955 if (prop == None)
956 { 1084 {
957 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1085 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
958#ifdef PREFER_24BIT
959 attributes.override_redirect = TRUE; 1086 attributes.override_redirect = true;
960#endif
961 mwmhints.flags = 0;
962 } 1087 }
963 else 1088 else
964 { 1089 {
965 mwmhints.flags = MWM_HINTS_DECORATIONS; 1090 mwmhints.flags = MWM_HINTS_DECORATIONS;
966 mwmhints.decorations = 0;
967 } 1091 }
968 } 1092 }
969 else
970 mwmhints.flags = 0;
971#endif 1093#endif
972
973 /* grab colors before netscape does */
974 Get_Colours ();
975
976 if (!set_fonts ())
977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
978
979 parent = DefaultRootWindow (disp);
980 1094
981#if ENABLE_XEMBED 1095#if ENABLE_XEMBED
982 if (rs[Rs_embed]) 1096 if (rs[Rs_embed])
983 { 1097 {
984 XWindowAttributes wattr; 1098 XWindowAttributes wattr;
985 1099
986 parent = strtol (rs[Rs_embed], 0, 0); 1100 parent = strtol (rs[Rs_embed], 0, 0);
987 1101
988 if (!XGetWindowAttributes (disp, parent, &wattr)) 1102 if (!XGetWindowAttributes (dpy, parent, &wattr))
989 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1103 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
990 1104
991 window_calc (wattr.width, wattr.height); 1105 window_calc (wattr.width, wattr.height);
992 } 1106 }
993#endif 1107#endif
994 1108
995 window_calc (0, 0); 1109 window_calc (0, 0);
996 1110
997 /* sub-window placement & size in rxvt_resize_subwindows () */ 1111 /* sub-window placement & size in rxvt_resize_subwindows () */
998#ifdef PREFER_24BIT
999 attributes.background_pixel = pix_colors_focused[Color_border]; 1112 attributes.background_pixel = pix_colors_focused [Color_border];
1000 attributes.border_pixel = pix_colors_focused[Color_border]; 1113 attributes.border_pixel = pix_colors_focused [Color_border];
1001 attributes.colormap = display->cmap; 1114 attributes.colormap = cmap;
1115
1002 top = XCreateWindow (disp, parent, 1116 top = XCreateWindow (dpy, parent,
1003 szHint.x, szHint.y, 1117 szHint.x, szHint.y,
1004 szHint.width, szHint.height, 1118 szHint.width, szHint.height,
1005 ext_bwidth, 1119 ext_bwidth,
1006 display->depth, InputOutput, 1120 depth, InputOutput, visual,
1007 display->visual,
1008 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1121 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1009#else 1122 &attributes);
1010 top = XCreateSimpleWindow (disp, parent,
1011 szHint.x, szHint.y,
1012 szHint.width, szHint.height,
1013 ext_bwidth,
1014 pix_colors_focused[Color_border],
1015 pix_colors_focused[Color_border]);
1016#endif
1017 1123
1018 this->parent[0] = top; 1124 this->parent[0] = top;
1019 1125
1020 old_width = szHint.width; 1126 old_width = szHint.width;
1021 old_height = szHint.height; 1127 old_height = szHint.height;
1022 1128
1023 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1129 set_title (rs [Rs_title]);
1024 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1130 set_icon_name (rs [Rs_iconName]);
1025 1131
1026 classHint.res_name = (char *)rs[Rs_name]; 1132 classHint.res_name = (char *)rs[Rs_name];
1027 classHint.res_class = (char *)RESCLASS; 1133 classHint.res_class = (char *)RESCLASS;
1028 1134
1029 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1135 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1030 wmHint.input = True; 1136 wmHint.input = True;
1031 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1137 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1032 wmHint.window_group = top; 1138 wmHint.window_group = top;
1033 1139
1034 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1140 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1035 &szHint, &wmHint, &classHint); 1141 &szHint, &wmHint, &classHint);
1142#if ENABLE_EWMH
1143# ifdef HAVE_AFTERIMAGE
1144 /*
1145 * set up icon hint
1146 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources
1147 */
1148
1149 if (rs [Rs_iconfile])
1150 {
1151 init_asv ();
1152
1153 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1154 if (asv && im)
1155 {
1156 int w = im->width;
1157 int h = im->height;
1158 long* buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1159 ASImage *result = scale_asimage (asv, im,
1160 w, h, ASA_ARGB32,
1161 100, ASIMAGE_QUALITY_DEFAULT);
1162 destroy_asimage (&im);
1163
1164 if (buffer && result)
1165 {
1166 ARGB32 *asbuf = result->alt.argb32;
1167 buffer [0] = w;
1168 buffer [1] = h;
1169
1170 for (unsigned int i = 0; i < w * h; ++i)
1171 buffer [i + 2] = asbuf [i];
1172
1173 destroy_asimage (&result);
1174 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1175 PropModeReplace, (const unsigned char*) buffer, 2 + w * h);
1176 free (buffer);
1177 }
1178 else
1179 {
1180 if (!buffer)
1181 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1182
1183 if (!result)
1184 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1185 }
1186 }
1187 else
1188 rxvt_warn ("Loading image icon failed, continuing without.\n");
1189 }
1190# endif
1191#endif
1192
1193#if ENABLE_FRILLS
1194 if (mwmhints.flags)
1195 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1196 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1197#endif
1036 1198
1037 Atom protocols[] = { 1199 Atom protocols[] = {
1038 xa[XA_WM_DELETE_WINDOW], 1200 xa[XA_WM_DELETE_WINDOW],
1039#if ENABLE_EWMH 1201#if ENABLE_EWMH
1040 xa[XA_NET_WM_PING], 1202 xa[XA_NET_WM_PING],
1041#endif 1203#endif
1042 }; 1204 };
1043 1205
1044 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1206 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1045 1207
1046#if ENABLE_FRILLS 1208#if ENABLE_FRILLS
1047 if (rs[Rs_transient_for]) 1209 if (rs[Rs_transient_for])
1048 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1210 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1049#endif 1211#endif
1050 1212
1051#if ENABLE_EWMH 1213#if ENABLE_EWMH
1052 long pid = getpid (); 1214 long pid = getpid ();
1053 1215
1054 XChangeProperty (disp, top, 1216 XChangeProperty (dpy, top,
1055 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1217 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1056 PropModeReplace, (unsigned char *)&pid, 1); 1218 PropModeReplace, (unsigned char *)&pid, 1);
1057 1219
1058 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1220 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1059#endif 1221#endif
1060 1222
1061 XSelectInput (disp, top, 1223 XSelectInput (dpy, top,
1062 KeyPressMask 1224 KeyPressMask
1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1225#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1064 | KeyReleaseMask 1226 | KeyReleaseMask
1065#endif 1227#endif
1066 | FocusChangeMask | VisibilityChangeMask 1228 | FocusChangeMask | VisibilityChangeMask
1067 | ExposureMask | StructureNotifyMask); 1229 | ExposureMask | StructureNotifyMask);
1068 1230
1069 termwin_ev.start (display, top); 1231 termwin_ev.start (display, top);
1070 1232
1071#if ENABLE_FRILLS
1072 if (mwmhints.flags)
1073 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1074 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1075#endif
1076
1077 /* vt cursor: Black-on-White is standard, but this is more popular */ 1233 /* vt cursor: Black-on-White is standard, but this is more popular */
1078 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1234 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1079
1080#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1081 /* cursor (menuBar/scrollBar): Black-on-White */
1082 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1083#endif
1084 1235
1085 /* the vt window */ 1236 /* the vt window */
1086 vt = XCreateSimpleWindow (disp, top, 1237 vt = XCreateSimpleWindow (dpy, top,
1087 window_vt_x,
1088 window_vt_y, 1238 window_vt_x, window_vt_y,
1089 width,
1090 height, 1239 width, height,
1091 0, 1240 0,
1092 pix_colors_focused[Color_fg], 1241 pix_colors_focused[Color_fg],
1093 pix_colors_focused[Color_bg]); 1242 pix_colors_focused[Color_bg]);
1094#ifdef DEBUG_X
1095 XStoreName (disp, vt, "vt window");
1096#endif
1097 1243
1098 attributes.bit_gravity = NorthWestGravity; 1244 attributes.bit_gravity = NorthWestGravity;
1099 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1245 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1100 1246
1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1247 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1102 1248
1103 if (OPTION (Opt_pointerBlank) 1249 if (option (Opt_pointerBlank))
1104#ifdef ENABLE_PERL
1105 || perl.self
1106#endif
1107 )
1108 vt_emask |= PointerMotionMask; 1250 vt_emask |= PointerMotionMask;
1109 else 1251 else
1110 vt_emask |= Button1MotionMask | Button3MotionMask; 1252 vt_emask |= Button1MotionMask | Button3MotionMask;
1111 1253
1112 XSelectInput (disp, vt, vt_emask); 1254 vt_select_input ();
1255
1113 vt_ev.start (display, vt); 1256 vt_ev.start (display, vt);
1114 1257
1115#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1116 if (menuBar_height ())
1117 {
1118 menuBar.win = XCreateSimpleWindow (disp, top,
1119 window_vt_x, 0,
1120 width,
1121 menuBar_TotalHeight (),
1122 0,
1123 pix_colors_focused[Color_fg],
1124 pix_colors_focused[Color_scroll]);
1125
1126#ifdef DEBUG_X
1127 XStoreName (disp, menuBar.win, "menubar");
1128#endif
1129
1130 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1131
1132 XDefineCursor (disp, menuBar.win,
1133 XCreateFontCursor (disp, XC_left_ptr));
1134
1135 XSelectInput (disp, menuBar.win,
1136 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1137 menubar_ev.start (display, menuBar.win);
1138 }
1139#endif
1140
1141#ifdef XPM_BACKGROUND
1142 if (rs[Rs_backgroundPixmap] != NULL
1143 && ! OPTION (Opt_transparent))
1144 {
1145 const char *p = rs[Rs_backgroundPixmap];
1146
1147 if ((p = strchr (p, ';')) != NULL)
1148 {
1149 p++;
1150 scale_pixmap (p);
1151 }
1152
1153 set_bgPixmap (rs[Rs_backgroundPixmap]);
1154 scr_touch (true);
1155 }
1156#endif
1157
1158 /* graphics context for the vt window */ 1258 /* graphics context for the vt window */
1159 gcvalue.foreground = pix_colors[Color_fg]; 1259 gcvalue.foreground = pix_colors[Color_fg];
1160 gcvalue.background = pix_colors[Color_bg]; 1260 gcvalue.background = pix_colors[Color_bg];
1161 gcvalue.graphics_exposures = 1; 1261 gcvalue.graphics_exposures = 0;
1262
1162 gc = XCreateGC (disp, vt, 1263 gc = XCreateGC (dpy, vt,
1163 GCForeground | GCBackground | GCGraphicsExposures, 1264 GCForeground | GCBackground | GCGraphicsExposures,
1164 &gcvalue); 1265 &gcvalue);
1165 1266
1166 drawable = new rxvt_drawable (display, vt); 1267 drawable = new rxvt_drawable (this, vt);
1167
1168#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1169 gcvalue.foreground = pix_colors[Color_topShadow];
1170 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1171 gcvalue.foreground = pix_colors[Color_bottomShadow];
1172 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1173 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1174 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1175#endif
1176 1268
1177#ifdef OFF_FOCUS_FADING 1269#ifdef OFF_FOCUS_FADING
1178 // initially we are in unfocused state 1270 // initially we are in unfocused state
1179 if (rs[Rs_fade]) 1271 if (rs[Rs_fade])
1180 pix_colors = pix_colors_unfocused; 1272 pix_colors = pix_colors_unfocused;
1181#endif 1273#endif
1182 1274
1183 pointer_unblank (); 1275 pointer_unblank ();
1184 scr_recolour (); 1276 scr_recolour ();
1185
1186#if ENABLE_XEMBED
1187 if (rs[Rs_embed])
1188 {
1189 long info[2] = { 0, XEMBED_MAPPED };
1190
1191 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1192 32, PropModeReplace, (unsigned char *)&info, 2);
1193 }
1194#endif
1195} 1277}
1196 1278
1197/* ------------------------------------------------------------------------- * 1279/* ------------------------------------------------------------------------- *
1198 * GET TTY CURRENT STATE * 1280 * GET TTY CURRENT STATE *
1199 * ------------------------------------------------------------------------- */ 1281 * ------------------------------------------------------------------------- */
1200void 1282void
1201rxvt_get_ttymode (ttymode_t *tio, int erase) 1283rxvt_get_ttymode (struct termios *tio, int erase)
1202{ 1284{
1203#ifdef HAVE_TERMIOS_H
1204 /* 1285 /*
1205 * standard System V termios interface 1286 * standard System V termios interface
1206 */ 1287 */
1207 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1288 if (tcgetattr (STDIN_FILENO, tio) < 0)
1208 { 1289 {
1209 // return error - use system defaults, 1290 // return error - use system defaults,
1210 // where possible, and zero elsewhere 1291 // where possible, and zero elsewhere
1211 memset (tio, 0, sizeof (ttymode_t)); 1292 memset (tio, 0, sizeof (struct termios));
1212 1293
1213 tio->c_cc[VINTR] = CINTR; 1294 tio->c_cc[VINTR] = CINTR;
1214 tio->c_cc[VQUIT] = CQUIT; 1295 tio->c_cc[VQUIT] = CQUIT;
1215 tio->c_cc[VERASE] = CERASE; 1296 tio->c_cc[VERASE] = CERASE;
1216#ifdef VERASE2 1297#ifdef VERASE2
… …
1275 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1356 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1276# if defined (ECHOCTL) && defined (ECHOKE) 1357# if defined (ECHOCTL) && defined (ECHOKE)
1277 | ECHOCTL | ECHOKE 1358 | ECHOCTL | ECHOKE
1278# endif 1359# endif
1279 | ECHOE | ECHOK); 1360 | ECHOE | ECHOK);
1280# else /* HAVE_TERMIOS_H */
1281
1282 /*
1283 * sgtty interface
1284 */
1285
1286 /* get parameters -- gtty */
1287 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1288 {
1289 tio->sg.sg_erase = CERASE; /* ^H */
1290 tio->sg.sg_kill = CKILL; /* ^U */
1291 }
1292
1293 if (erase != -1)
1294 tio->sg.sg_erase = (char)erase;
1295
1296 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1297
1298 /* get special characters */
1299 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1300 {
1301 tio->tc.t_intrc = CINTR; /* ^C */
1302 tio->tc.t_quitc = CQUIT; /* ^\ */
1303 tio->tc.t_startc = CSTART; /* ^Q */
1304 tio->tc.t_stopc = CSTOP; /* ^S */
1305 tio->tc.t_eofc = CEOF; /* ^D */
1306 tio->tc.t_brkc = -1;
1307 }
1308
1309 /* get local special chars */
1310 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1311 {
1312 tio->lc.t_suspc = CSUSP; /* ^Z */
1313 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1314 tio->lc.t_rprntc = CRPRNT; /* ^R */
1315 tio->lc.t_flushc = CFLUSH; /* ^O */
1316 tio->lc.t_werasc = CWERASE; /* ^W */
1317 tio->lc.t_lnextc = CLNEXT; /* ^V */
1318 }
1319 /* get line discipline */
1320 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1321# ifdef NTTYDISC
1322 tio->line = NTTYDISC;
1323# endif /* NTTYDISC */
1324
1325 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1326#endif /* HAVE_TERMIOS_H */
1327 1361
1328 /* 1362 /*
1329 * Debugging 1363 * Debugging
1330 */ 1364 */
1331#ifdef DEBUG_TTYMODE 1365#ifdef DEBUG_TTYMODE
1332#ifdef HAVE_TERMIOS_H
1333 /* c_iflag bits */ 1366 /* c_iflag bits */
1334 fprintf (stderr, "Input flags\n"); 1367 fprintf (stderr, "Input flags\n");
1335 1368
1336 /* cpp token stringize doesn't work on all machines <sigh> */ 1369 /* cpp token stringize doesn't work on all machines <sigh> */
1337# define FOO(flag,name) \ 1370# define FOO(flag,name) \
… …
1400 FOO (VLNEXT, "VLNEXT"); 1433 FOO (VLNEXT, "VLNEXT");
1401# endif 1434# endif
1402 1435
1403 fprintf (stderr, "\n"); 1436 fprintf (stderr, "\n");
1404# undef FOO 1437# undef FOO
1405# endif /* HAVE_TERMIOS_H */ 1438#endif /* DEBUG_TTYMODE */
1406#endif /* DEBUG_TTYMODE */
1407} 1439}
1408 1440
1409/*----------------------------------------------------------------------*/ 1441/*----------------------------------------------------------------------*/
1410/* 1442/*
1411 * Run the command in a subprocess and return a file descriptor for the 1443 * Run the command in a subprocess and return a file descriptor for the
… …
1413 * the slave. 1445 * the slave.
1414 */ 1446 */
1415void 1447void
1416rxvt_term::run_command (const char *const *argv) 1448rxvt_term::run_command (const char *const *argv)
1417{ 1449{
1418 TEMP_ENV; // not very temporary...
1419
1420#if ENABLE_FRILLS 1450#if ENABLE_FRILLS
1421 if (rs[Rs_pty_fd]) 1451 if (rs[Rs_pty_fd])
1422 { 1452 {
1423 pty.pty = atoi (rs[Rs_pty_fd]); 1453 pty->pty = atoi (rs[Rs_pty_fd]);
1424 1454
1425 if (pty.pty >= 0) 1455 if (pty->pty >= 0)
1426 { 1456 {
1427 if (getfd_hook) 1457 if (getfd_hook)
1428 pty.pty = (*getfd_hook) (pty.pty); 1458 pty->pty = (*getfd_hook) (pty->pty);
1429 1459
1430 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1460 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1431 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1461 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1432 } 1462 }
1433 } 1463 }
1434 else 1464 else
1435#endif 1465#endif
1436 if (!pty.get ()) 1466 if (!pty->get ())
1437 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1467 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1438 1468
1469 int er;
1470
1471#ifndef NO_BACKSPACE_KEY
1472 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1473 er = rs[Rs_backspace_key][0];
1474 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1475 er = '\177'; /* the initial state anyway */
1476 else
1477#endif
1478 er = -1;
1479
1480 rxvt_get_ttymode (&tio, er);
1481 /* init terminal attributes */
1482 cfsetospeed (&tio, BAUDRATE);
1483 cfsetispeed (&tio, BAUDRATE);
1484 tcsetattr (pty->tty, TCSANOW, &tio);
1439 pty.set_utf8_mode (enc_utf8); 1485 pty->set_utf8_mode (enc_utf8);
1440 1486
1441 /* set initial window size */ 1487 /* set initial window size */
1442 tt_winch (); 1488 tt_winch ();
1443
1444 int er;
1445
1446#ifndef NO_BACKSPACE_KEY
1447 if (key_backspace[0] && !key_backspace[1])
1448 er = key_backspace[0];
1449 else if (strcmp (key_backspace, "DEC") == 0)
1450 er = '\177'; /* the initial state anyway */
1451 else
1452#endif
1453 er = -1;
1454
1455 rxvt_get_ttymode (&tio, er);
1456 1489
1457#if ENABLE_FRILLS 1490#if ENABLE_FRILLS
1458 if (rs[Rs_pty_fd]) 1491 if (rs[Rs_pty_fd])
1459 return; 1492 return;
1460#endif 1493#endif
1461 1494
1462#ifndef __QNX__
1463 /* spin off the command interpreter */ 1495 /* spin off the command interpreter */
1464 switch (cmd_pid = fork ()) 1496 switch (cmd_pid = fork ())
1465 { 1497 {
1466 case -1: 1498 case -1:
1467 { 1499 {
… …
1469 rxvt_fatal ("can't fork, aborting.\n"); 1501 rxvt_fatal ("can't fork, aborting.\n");
1470 } 1502 }
1471 case 0: 1503 case 0:
1472 init_env (); 1504 init_env ();
1473 1505
1474 if (!pty.make_controlling_tty ()) 1506 if (!pty->make_controlling_tty ())
1475 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1507 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1476 else 1508 else
1477 { 1509 {
1478 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1510 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1479 dup2 (pty.tty, STDIN_FILENO); 1511 dup2 (pty->tty, STDIN_FILENO);
1480 dup2 (pty.tty, STDOUT_FILENO); 1512 dup2 (pty->tty, STDOUT_FILENO);
1481 dup2 (pty.tty, STDERR_FILENO); 1513 dup2 (pty->tty, STDERR_FILENO);
1482 1514
1483 // close all our file handles that we do no longer need 1515 // close all our file handles that we do no longer need
1484 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1516 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1485 { 1517 {
1486 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1518 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1487 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1519 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1488 } 1520 }
1489 1521
1490 run_child (argv); 1522 run_child (argv);
1491 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1523 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1492 } 1524 }
1493 1525
1494 _exit (EXIT_FAILURE); 1526 _exit (EXIT_FAILURE);
1495 1527
1496 default: 1528 default:
1497 { 1529 if (!option (Opt_utmpInhibit))
1498#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1530 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1499 int fdstdin;
1500 1531
1501 fdstdin = dup (STDIN_FILENO); 1532 pty->close_tty ();
1502 dup2 (pty.tty, STDIN_FILENO);
1503#endif
1504 1533
1505#ifdef UTMP_SUPPORT 1534 child_ev.start (cmd_pid);
1506 privileged_utmp (SAVE);
1507#endif
1508 1535
1509#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1536 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1510
1511 dup2 (fdstdin, STDIN_FILENO);
1512 close (fdstdin);
1513#endif
1514 }
1515
1516 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1517 break; 1537 break;
1518 } 1538 }
1519#else /* __QNX__ uses qnxspawn () */
1520 fchmod (pty.tty, 0622);
1521 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1522 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1523
1524 if (run_child (argv) == -1)
1525 exit (EXIT_FAILURE);
1526#endif
1527} 1539}
1528 1540
1529/* ------------------------------------------------------------------------- * 1541/* ------------------------------------------------------------------------- *
1530 * CHILD PROCESS OPERATIONS * 1542 * CHILD PROCESS OPERATIONS *
1531 * ------------------------------------------------------------------------- */ 1543 * ------------------------------------------------------------------------- */
… …
1536int 1548int
1537rxvt_term::run_child (const char *const *argv) 1549rxvt_term::run_child (const char *const *argv)
1538{ 1550{
1539 char *login; 1551 char *login;
1540 1552
1541 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1542
1543 if (OPTION (Opt_console)) 1553 if (option (Opt_console))
1554 {
1544 { /* be virtual console, fail silently */ 1555 /* be virtual console, fail silently */
1545#ifdef TIOCCONS 1556#ifdef TIOCCONS
1546 unsigned int on = 1; 1557 unsigned int on = 1;
1547 1558
1548 ioctl (STDIN_FILENO, TIOCCONS, &on); 1559 ioctl (STDIN_FILENO, TIOCCONS, &on);
1549#elif defined (SRIOCSREDIR) 1560#elif defined (SRIOCSREDIR)
… …
1551 1562
1552 fd = open (CONSOLE, O_WRONLY, 0); 1563 fd = open (CONSOLE, O_WRONLY, 0);
1553 if (fd >= 0) 1564 if (fd >= 0)
1554 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1565 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1555 close (fd); 1566 close (fd);
1556#endif /* SRIOCSREDIR */ 1567#endif /* SRIOCSREDIR */
1557 } 1568 }
1558 1569
1559 /* reset signals and spin off the command interpreter */ 1570 /* reset signals and spin off the command interpreter */
1560 signal (SIGINT, SIG_DFL); 1571 signal (SIGINT, SIG_DFL);
1561 signal (SIGQUIT, SIG_DFL); 1572 signal (SIGQUIT, SIG_DFL);
… …
1568 */ 1579 */
1569#ifdef SIGTSTP 1580#ifdef SIGTSTP
1570 signal (SIGTSTP, SIG_IGN); 1581 signal (SIGTSTP, SIG_IGN);
1571 signal (SIGTTIN, SIG_IGN); 1582 signal (SIGTTIN, SIG_IGN);
1572 signal (SIGTTOU, SIG_IGN); 1583 signal (SIGTTOU, SIG_IGN);
1573#endif /* SIGTSTP */ 1584#endif /* SIGTSTP */
1574 1585
1575 // unblock signals (signals are blocked by iom.C
1576 sigset_t ss;
1577 sigemptyset (&ss);
1578 sigprocmask (SIG_SETMASK, &ss, 0);
1579
1580#ifndef __QNX__
1581 /* command interpreter path */ 1586 /* command interpreter path */
1582 if (argv != NULL) 1587 if (argv)
1583 { 1588 {
1584# ifdef DEBUG_CMD 1589# ifdef DEBUG_CMD
1585 int i; 1590 int i;
1586 1591
1587 for (i = 0; argv[i]; i++) 1592 for (i = 0; argv[i]; i++)
… …
1596 const char *argv0, *shell; 1601 const char *argv0, *shell;
1597 1602
1598 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1603 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1599 shell = "/bin/sh"; 1604 shell = "/bin/sh";
1600 1605
1601 argv0 = (const char *)rxvt_r_basename (shell); 1606 argv0 = rxvt_basename (shell);
1602 1607
1603 if (OPTION (Opt_loginShell)) 1608 if (option (Opt_loginShell))
1604 { 1609 {
1605 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1610 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1606 1611
1607 login[0] = '-'; 1612 login[0] = '-';
1608 strcpy (&login[1], argv0); 1613 strcpy (&login[1], argv0);
1609 argv0 = login; 1614 argv0 = login;
1610 } 1615 }
1611 1616
1612 execlp (shell, argv0, NULL); 1617 execlp (shell, argv0, (char *)0);
1613 /* no error message: STDERR is closed! */ 1618 /* no error message: STDERR is closed! */
1614 } 1619 }
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 (OPTION (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 1620
1672 return -1; 1621 return -1;
1673} 1622}
1674 1623
1675/*----------------------- end-of-file (C source) -----------------------*/ 1624/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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