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.155 by root, Wed Jan 25 02:53:13 2006 UTC vs.
Revision 1.236 by ayin, Mon Dec 31 01:05:50 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 14 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support
14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
15 * 16 *
16 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 20 * (at your option) any later version.
… …
38 39
39#include <limits> 40#include <limits>
40 41
41#include <csignal> 42#include <csignal>
42 43
44#include <fcntl.h>
45
46#ifdef HAVE_XSETLOCALE
47# define X_LOCALE
48# include <X11/Xlocale.h>
49#else
50# ifdef HAVE_SETLOCALE
51# include <clocale>
52# endif
53#endif
54
55#ifdef HAVE_NL_LANGINFO
56# include <langinfo.h>
57#endif
58
59#ifdef DISPLAY_IS_IP
60/* On Solaris link with -lsocket and -lnsl */
61#include <sys/types.h>
62#include <sys/socket.h>
63
64/* these next two are probably only on Sun (not Solaris) */
65#ifdef HAVE_SYS_SOCKIO_H
66#include <sys/sockio.h>
67#endif
68#ifdef HAVE_SYS_BYTEORDER_H
69#include <sys/byteorder.h>
70#endif
71
72#include <netinet/in.h>
73#include <arpa/inet.h>
74#include <net/if.h>
75#include <net/if_arp.h>
76
77static char *
78rxvt_network_display (const char *display)
79{
80 char buffer[1024], *rval = NULL;
81 struct ifconf ifc;
82 struct ifreq *ifr;
83 int i, skfd;
84
85 if (display[0] != ':' && strncmp (display, "unix:", 5))
86 return (char *) display; /* nothing to do */
87
88 ifc.ifc_len = sizeof (buffer); /* Get names of all ifaces */
89 ifc.ifc_buf = buffer;
90
91 if ((skfd = socket (AF_INET, SOCK_DGRAM, 0)) < 0)
92 {
93 perror ("socket");
94 return NULL;
95 }
96
97 if (ioctl (skfd, SIOCGIFCONF, &ifc) < 0)
98 {
99 perror ("SIOCGIFCONF");
100 close (skfd);
101 return NULL;
102 }
103
104 for (i = 0, ifr = ifc.ifc_req;
105 i < (ifc.ifc_len / sizeof (struct ifreq));
106 i++, ifr++)
107 {
108 struct ifreq ifr2;
109
110 strcpy (ifr2.ifr_name, ifr->ifr_name);
111
112 if (ioctl (skfd, SIOCGIFADDR, &ifr2) >= 0)
113 {
114 unsigned long addr;
115 struct sockaddr_in *p_addr;
116
117 p_addr = (struct sockaddr_in *) &ifr2.ifr_addr;
118 addr = htonl ((unsigned long)p_addr->sin_addr.s_addr);
119
120 /*
121 * not "0.0.0.0" or "127.0.0.1" - so format the address
122 */
123 if (addr && addr != 0x7F000001)
124 {
125 char *colon = strchr (display, ':');
126
127 if (colon == NULL)
128 colon = ":0.0";
129
130 rval = rxvt_malloc (strlen (colon) + 16);
131 sprintf (rval, "%d.%d.%d.%d%s",
132 (int) ((addr >> 030) & 0xFF),
133 (int) ((addr >> 020) & 0xFF),
134 (int) ((addr >> 010) & 0xFF),
135 (int) (addr & 0xFF), colon);
136 break;
137 }
138 }
139 }
140
141 close (skfd);
142
143 return rval;
144}
145#endif
146
43const char *const def_colorName[] = 147const char *const def_colorName[] =
44 { 148 {
45 COLOR_FOREGROUND, 149 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 150 COLOR_BACKGROUND,
47 /* low-intensity colors */ 151 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 152 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 153 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 154 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 155 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 156 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 157 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 158 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 159# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 160 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 161# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 162 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 163# endif
60 /* high-intensity colors */ 164 /* high-intensity colors */
61# ifdef XTERM_COLORS 165# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 166 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 167# else
64 "Grey25", /* 8: bright black (#404040) */ 168 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 169# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 170 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 171 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 172 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 173 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 174 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 175 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 176 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 177
74 // 88 xterm colours 178 // 88 xterm colours
75 "rgb:00/00/00", 179 "rgb:00/00/00",
76 "rgb:00/00/8b", 180 "rgb:00/00/8b",
77 "rgb:00/00/cd", 181 "rgb:00/00/cd",
… …
146 "rgb:e7/e7/e7", 250 "rgb:e7/e7/e7",
147 251
148#ifndef NO_CURSORCOLOR 252#ifndef NO_CURSORCOLOR
149 COLOR_CURSOR_BACKGROUND, 253 COLOR_CURSOR_BACKGROUND,
150 COLOR_CURSOR_FOREGROUND, 254 COLOR_CURSOR_FOREGROUND,
151#endif /* ! NO_CURSORCOLOR */ 255#endif /* ! NO_CURSORCOLOR */
152 NULL, /* Color_pointer_fg */ 256 NULL, /* Color_pointer_fg */
153 NULL, /* Color_pointer_bg */ 257 NULL, /* Color_pointer_bg */
154 NULL, /* Color_border */ 258 NULL, /* Color_border */
155#ifndef NO_BOLD_UNDERLINE_REVERSE 259#ifndef NO_BOLD_UNDERLINE_REVERSE
156 NULL, /* Color_BD */ 260 NULL, /* Color_BD */
157 NULL, /* Color_IT */ 261 NULL, /* Color_IT */
158 NULL, /* Color_UL */ 262 NULL, /* Color_UL */
159 NULL, /* Color_RV */ 263 NULL, /* Color_RV */
160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 264#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS 265#if ENABLE_FRILLS
162 NULL, // Color_underline 266 NULL, // Color_underline
163#endif 267#endif
164#ifdef OPTION_HC 268#ifdef OPTION_HC
165 NULL, 269 NULL,
166#endif 270#endif
167#ifdef KEEP_SCROLLCOLOR 271#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 272 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 273 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 274#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 275#if ENABLE_TRANSPARENCY
172 NULL, 276 NULL,
173#endif 277#endif
174#if OFF_FOCUS_FADING 278#if OFF_FOCUS_FADING
175 "black", 279 "rgb:00/00/00",
176#endif 280#endif
177 }; 281 };
178 282
179bool 283void
180rxvt_term::init_vars () 284rxvt_term::init_vars ()
181{ 285{
182 pix_colors = // 286 pix_colors = pix_colors_focused;
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif
187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 287
192 MEvent.time = CurrentTime; 288 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 289 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 290 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 291 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 292 ncol = 80;
198 nrow = 24; 293 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 294 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 295 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 296 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 297 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS;
204 298
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 299 refresh_type = SLOW_REFRESH;
207 300
208 oldcursor.row = oldcursor.col = -1; 301 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50;
212 bgPixmap.pixmap = None;
213#endif
214 302
215 last_bot = last_state = -1; 303 set_option (Opt_scrollBar);
216 304 set_option (Opt_scrollTtyOutput);
217 return true; 305 set_option (Opt_jumpScroll);
306 set_option (Opt_skipScroll);
307 set_option (Opt_secondaryScreen);
308 set_option (Opt_secondaryScroll);
309 set_option (Opt_pastableTabs);
310 set_option (Opt_intensityStyles);
311 set_option (Opt_iso14755_52);
218} 312}
219 313
220void 314void
221rxvt_term::init_secondary () 315rxvt_term::init_secondary ()
222{ 316{
… …
229 if ((i = open ("/dev/null", O_RDONLY)) < 0) 323 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 { 324 {
231 /* TODO: BOO HISS */ 325 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO); 326 dup2 (STDERR_FILENO, STDIN_FILENO);
233 } 327 }
234 else if (i > STDIN_FILENO) 328 else if (i != STDIN_FILENO)
235 { 329 {
236 dup2 (i, STDIN_FILENO); 330 dup2 (i, STDIN_FILENO);
237 close (i); 331 close (i);
238 } 332 }
239 333
… …
254/*----------------------------------------------------------------------*/ 348/*----------------------------------------------------------------------*/
255const char ** 349const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 350rxvt_term::init_resources (int argc, const char *const *argv)
257{ 351{
258 int i, r_argc; 352 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 353 const char **cmd_argv, **r_argv;
261 354
262 /* 355 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 356 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 357 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 358 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 359 if (!strcmp (argv[r_argc], "-e"))
267 break; 360 break;
361
362 if (r_argc == argc)
363 cmd_argv = NULL;
364 else if (!argv[r_argc + 1])
365 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
366 else
367 {
368 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
369
370 for (i = 0; i < argc - r_argc - 1; i++)
371 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
372
373 cmd_argv[i] = NULL;
374 }
268 375
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 376 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 377
271 for (i = 0; i < r_argc; i++) 378 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 379 r_argv[i] = (const char *)argv[i];
273 380
274 r_argv[i] = NULL; 381 r_argv[i] = NULL;
275 382
276 if (r_argc == argc)
277 cmd_argv = NULL;
278 else
279 {
280 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
281
282 for (i = 0; i < argc - r_argc - 1; i++)
283 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
284
285 cmd_argv[i] = NULL;
286 }
287
288 rs[Rs_name] = rxvt_r_basename (argv[0]); 383 rs[Rs_name] = rxvt_basename (argv[0]);
289 384
290 /* 385 /*
291 * Open display, get options/resources and create the window 386 * Open display, get options/resources and create the window
292 */ 387 */
293 388
… …
295 rs[Rs_display_name] = ":0"; 390 rs[Rs_display_name] = ":0";
296 391
297 get_options (r_argc, r_argv); 392 get_options (r_argc, r_argv);
298 393
299 if (!(display = displays.get (rs[Rs_display_name]))) 394 if (!(display = displays.get (rs[Rs_display_name])))
395 {
396 free (r_argv);
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 397 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
398 }
301 399
400 // using a local pointer decreases code size a lot
401 xa = display->xa;
402
403 set (display);
302 extract_resources (); 404 extract_resources ();
303 405
406#if XFT
407 if (rs[Rs_depth])
408 select_visual (strtol (rs[Rs_depth], 0, 0));
409#endif
410
411#ifdef HAVE_AFTERIMAGE
412 set_application_name ((char*)rs[Rs_name]);
413 set_output_threshold (OUTPUT_LEVEL_WARNING);
414 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
415#endif
304 free (r_argv); 416 free (r_argv);
417
418 for (int i = NUM_RESOURCES; i--; )
419 if (rs [i] == resval_undef)
420 rs [i] = 0;
305 421
306#if ENABLE_PERL 422#if ENABLE_PERL
307 if (!rs[Rs_perl_ext_1]) 423 if (!rs[Rs_perl_ext_1])
308 rs[Rs_perl_ext_1] = "default"; 424 rs[Rs_perl_ext_1] = "default";
309 425
… …
320 * set any defaults not already set 436 * set any defaults not already set
321 */ 437 */
322 if (cmd_argv && cmd_argv[0]) 438 if (cmd_argv && cmd_argv[0])
323 { 439 {
324 if (!rs[Rs_title]) 440 if (!rs[Rs_title])
325 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 441 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
326 if (!rs[Rs_iconName]) 442 if (!rs[Rs_iconName])
327 rs[Rs_iconName] = rs[Rs_title]; 443 rs[Rs_iconName] = rs[Rs_title];
328 } 444 }
329 else 445 else
330 { 446 {
… …
368 rs[Rs_cutchars] = CUTCHARS; 484 rs[Rs_cutchars] = CUTCHARS;
369 485
370#ifndef NO_BACKSPACE_KEY 486#ifndef NO_BACKSPACE_KEY
371 if (!rs[Rs_backspace_key]) 487 if (!rs[Rs_backspace_key])
372# ifdef DEFAULT_BACKSPACE 488# ifdef DEFAULT_BACKSPACE
373 key_backspace = DEFAULT_BACKSPACE; 489 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
374# else 490# else
375 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 491 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
376# endif 492# endif
377 else
378 {
379 val = strdup (rs[Rs_backspace_key]);
380 rxvt_Str_trim (val);
381 rxvt_Str_escaped (val);
382 key_backspace = val;
383 }
384#endif 493#endif
385 494
386#ifndef NO_DELETE_KEY 495#ifndef NO_DELETE_KEY
387 if (!rs[Rs_delete_key]) 496 if (!rs[Rs_delete_key])
388# ifdef DEFAULT_DELETE 497# ifdef DEFAULT_DELETE
389 key_delete = DEFAULT_DELETE; 498 rs[Rs_delete_key] = DEFAULT_DELETE;
390# else 499# else
391 key_delete = "\033[3~"; 500 rs[Rs_delete_key] = "\033[3~";
392# endif
393 else
394 {
395 val = strdup (rs[Rs_delete_key]);
396 rxvt_Str_trim (val);
397 rxvt_Str_escaped (val);
398 key_delete = val;
399 }
400#endif 501# endif
401 if (rs[Rs_answerbackstring]) 502#endif
402 {
403 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
404 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
405 }
406 503
407#ifdef HAVE_SCROLLBARS 504#ifdef HAVE_SCROLLBARS
408 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 505 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
409#endif 506#endif
410 507
411#ifdef XTERM_REVERSE_VIDEO 508#ifdef XTERM_REVERSE_VIDEO
412 /* this is how xterm implements reverseVideo */ 509 /* this is how xterm implements reverseVideo */
413 if (OPTION (Opt_reverseVideo)) 510 if (option (Opt_reverseVideo))
414 { 511 {
415 if (!rs[Rs_color + Color_fg]) 512 if (!rs[Rs_color + Color_fg])
416 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 513 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
514
417 if (!rs[Rs_color + Color_bg]) 515 if (!rs[Rs_color + Color_bg])
418 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 516 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
419 } 517 }
420#endif 518#endif
421 519
… …
423 if (!rs[Rs_color + i]) 521 if (!rs[Rs_color + i])
424 rs[Rs_color + i] = def_colorName[i]; 522 rs[Rs_color + i] = def_colorName[i];
425 523
426#ifndef XTERM_REVERSE_VIDEO 524#ifndef XTERM_REVERSE_VIDEO
427 /* this is how we implement reverseVideo */ 525 /* this is how we implement reverseVideo */
428 if (OPTION (Opt_reverseVideo)) 526 if (option (Opt_reverseVideo))
429 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 527 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
430#endif 528#endif
431 529
432 /* convenient aliases for setting fg/bg to colors */ 530 /* convenient aliases for setting fg/bg to colors */
433 color_aliases (Color_fg); 531 color_aliases (Color_fg);
434 color_aliases (Color_bg); 532 color_aliases (Color_bg);
435#ifndef NO_CURSORCOLOR 533#ifndef NO_CURSORCOLOR
436 color_aliases (Color_cursor); 534 color_aliases (Color_cursor);
437 color_aliases (Color_cursor2); 535 color_aliases (Color_cursor2);
438#endif /* NO_CURSORCOLOR */ 536#endif /* NO_CURSORCOLOR */
439 color_aliases (Color_pointer_fg); 537 color_aliases (Color_pointer_fg);
440 color_aliases (Color_pointer_bg); 538 color_aliases (Color_pointer_bg);
441 color_aliases (Color_border); 539 color_aliases (Color_border);
442#ifndef NO_BOLD_UNDERLINE_REVERSE 540#ifndef NO_BOLD_UNDERLINE_REVERSE
443 color_aliases (Color_BD); 541 color_aliases (Color_BD);
444 color_aliases (Color_UL); 542 color_aliases (Color_UL);
445 color_aliases (Color_RV); 543 color_aliases (Color_RV);
446#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 544#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
447 545
448 if (!rs[Rs_color + Color_border]) 546 if (!rs[Rs_color + Color_border])
449 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 547 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
450 548
451 return cmd_argv; 549 return cmd_argv;
… …
454/*----------------------------------------------------------------------*/ 552/*----------------------------------------------------------------------*/
455void 553void
456rxvt_term::init_env () 554rxvt_term::init_env ()
457{ 555{
458 int i; 556 int i;
459 unsigned int u;
460 char *val; 557 char *val;
461 558
462#ifdef DISPLAY_IS_IP 559#ifdef DISPLAY_IS_IP
463 /* Fixup display_name for export over pty to any interested terminal 560 /* Fixup display_name for export over pty to any interested terminal
464 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 561 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
472 */ 569 */
473 val = rxvt_network_display (rs[Rs_display_name]); 570 val = rxvt_network_display (rs[Rs_display_name]);
474 rs[Rs_display_name] = (const char *)val; 571 rs[Rs_display_name] = (const char *)val;
475 572
476 if (val == NULL) 573 if (val == NULL)
477#endif /* DISPLAY_IS_IP */ 574#endif /* DISPLAY_IS_IP */
478 val = XDisplayString (display->display); 575 val = XDisplayString (dpy);
479 576
480 if (rs[Rs_display_name] == NULL) 577 if (rs[Rs_display_name] == NULL)
481 rs[Rs_display_name] = val; /* use broken `:0' value */ 578 rs[Rs_display_name] = val; /* use broken `:0' value */
482 579
483 i = strlen (val); 580 i = strlen (val);
484 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 581 env_display = (char *)rxvt_malloc (i + 9);
485 582
486 sprintf (env_display, "DISPLAY=%s", val); 583 sprintf (env_display, "DISPLAY=%s", val);
487 584
488 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 585 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
489 586
… …
503 600
504#ifdef RXVT_TERMINFO 601#ifdef RXVT_TERMINFO
505 putenv ("TERMINFO=" RXVT_TERMINFO); 602 putenv ("TERMINFO=" RXVT_TERMINFO);
506#endif 603#endif
507 604
508 if (display->depth <= 2) 605 if (depth <= 2)
509 putenv ("COLORTERM=" COLORTERMENV "-mono"); 606 putenv ("COLORTERM=" COLORTERMENV "-mono");
510 else 607 else
511 putenv ("COLORTERM=" COLORTERMENVFULL); 608 putenv ("COLORTERM=" COLORTERMENVFULL);
512 609
513 if (rs[Rs_term_name] != NULL) 610 if (rs[Rs_term_name] != NULL)
514 { 611 {
515 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 612 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
516 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 613 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
517 putenv (env_term); 614 putenv (env_term);
518 } 615 }
519 else 616 else
520 putenv ("TERM=" TERMENV); 617 putenv ("TERM=" TERMENV);
… …
522#ifdef HAVE_UNSETENV 619#ifdef HAVE_UNSETENV
523 /* avoid passing old settings and confusing term size */ 620 /* avoid passing old settings and confusing term size */
524 unsetenv ("LINES"); 621 unsetenv ("LINES");
525 unsetenv ("COLUMNS"); 622 unsetenv ("COLUMNS");
526 unsetenv ("TERMCAP"); /* terminfo should be okay */ 623 unsetenv ("TERMCAP"); /* terminfo should be okay */
527#endif /* HAVE_UNSETENV */ 624#endif /* HAVE_UNSETENV */
528} 625}
529 626
530/*----------------------------------------------------------------------*/ 627/*----------------------------------------------------------------------*/
531/* 628/*
532 * This is more or less stolen straight from XFree86 xterm. 629 * This is more or less stolen straight from XFree86 xterm.
… …
553 650
554 this->locale = "C"; 651 this->locale = "C";
555 } 652 }
556 653
557 654
558 this->locale = rxvt_strdup (this->locale); 655 this->locale = strdup (this->locale);
559 SET_LOCALE (this->locale); 656 SET_LOCALE (this->locale);
560 mbstate.reset (); 657 mbstate.reset ();
561#endif 658#endif
562 659
563#if HAVE_NL_LANGINFO 660#if HAVE_NL_LANGINFO
… …
607 * Initialize the command connection. 704 * Initialize the command connection.
608 * This should be called after the X server connection is established. 705 * This should be called after the X server connection is established.
609 */ 706 */
610 707
611#ifdef META8_OPTION 708#ifdef META8_OPTION
612 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 709 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
613#endif 710#endif
614 711
615 get_ourmods (); 712 get_ourmods ();
616 713
617 if (!OPTION (Opt_scrollTtyOutput)) 714 if (!option (Opt_scrollTtyOutput))
618 priv_modes |= PrivMode_TtyOutputInh; 715 priv_modes |= PrivMode_TtyOutputInh;
619 if (OPTION (Opt_scrollTtyKeypress)) 716 if (option (Opt_scrollTtyKeypress))
620 priv_modes |= PrivMode_Keypress; 717 priv_modes |= PrivMode_Keypress;
621 if (!OPTION (Opt_jumpScroll)) 718 if (!option (Opt_jumpScroll))
622 priv_modes |= PrivMode_smoothScroll; 719 priv_modes |= PrivMode_smoothScroll;
623 720
624#ifndef NO_BACKSPACE_KEY 721#ifndef NO_BACKSPACE_KEY
625 if (strcmp (key_backspace, "DEC") == 0) 722 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
626 priv_modes |= PrivMode_HaveBackSpace; 723 priv_modes |= PrivMode_HaveBackSpace;
627#endif 724#endif
628 725
629 /* add value for scrollBar */ 726 /* add value for scrollBar */
630 if (scrollBar.state) 727 if (scrollBar.state)
… …
643 int i; 740 int i;
644 741
645#ifdef OFF_FOCUS_FADING 742#ifdef OFF_FOCUS_FADING
646 pix_colors = pix_colors_focused; 743 pix_colors = pix_colors_focused;
647#endif 744#endif
648 745
649 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 746 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
650 { 747 {
748 const char *name = rs[Rs_color + i];
749
750 if (!name)
751 continue;
752
651 rxvt_color xcol; 753 rxvt_color xcol;
652 754
653 if (!rs[Rs_color + i]) 755 if (!set_color (xcol, name))
654 continue;
655
656 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
657 { 756 {
658#ifndef XTERM_REVERSE_VIDEO 757#ifndef XTERM_REVERSE_VIDEO
659 if (i < 2 && OPTION (Opt_reverseVideo)) 758 if (i < 2 && option (Opt_reverseVideo))
660 rs[Rs_color + i] = def_colorName[!i]; 759 name = def_colorName [1 - i];
661 else 760 else
662#endif 761#endif
663 rs[Rs_color + i] = def_colorName[i]; 762 name = def_colorName [i];
664 763
665 if (!rs[Rs_color + i]) 764 if (!name)
666 continue; 765 continue;
667 766
668 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 767 if (!set_color (xcol, name))
669 { 768 {
670 switch (i) 769 switch (i)
671 { 770 {
672 case Color_fg: 771 case Color_fg:
673 case Color_bg: 772 case Color_bg:
674 /* fatal: need bg/fg color */
675 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 773 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
676 /* NOTREACHED */ 774 name = "";
677 break; 775 break;
678#ifndef NO_CURSORCOLOR 776#ifndef NO_CURSORCOLOR
679 case Color_cursor2: 777 case Color_cursor2:
680 xcol = pix_colors[Color_fg]; 778#endif
681 break;
682#endif /* ! NO_CURSORCOLOR */
683 case Color_pointer_fg: 779 case Color_pointer_fg:
684 xcol = pix_colors[Color_fg]; 780 name = rs[Rs_color + Color_fg];
781 xcol.set (this, name);
685 break; 782 break;
686 default: 783 default:
687 xcol = pix_colors[Color_bg]; /* None */ 784 name = rs[Rs_color + Color_bg];
785 xcol.set (this, name);
688 break; 786 break;
689 } 787 }
690 } 788 }
691 } 789 }
692 790
693 pix_colors[i] = xcol; 791 pix_colors[i] = xcol;
694 SET_PIXCOLOR (i); 792 rs[Rs_color + i] = name;
695 }
696
697#ifdef OFF_FOCUS_FADING
698 if (rs[Rs_fade])
699 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
700 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
701#endif
702
703 if (display->depth <= 2)
704 { 793 }
794
795 if (depth <= 2)
796 {
705 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 797 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
706 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 798 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
707 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 799 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
708 } 800 }
709 801
710 /* 802 /*
711 * get scrollBar shadow colors 803 * get scrollBar shadow colors
712 * 804 *
713 * The calculations of topShadow/bottomShadow values are adapted 805 * The calculations of topShadow/bottomShadow values are adapted
714 * from the fvwm window manager. 806 * from the fvwm window manager.
715 */ 807 */
716#ifdef KEEP_SCROLLCOLOR 808#ifdef KEEP_SCROLLCOLOR
717
718 if (display->depth <= 2) 809 if (depth <= 2)
719 { 810 {
720 /* Monochrome */ 811 /* Monochrome */
721 pix_colors[Color_scroll] = pix_colors[Color_fg]; 812 alias_color (Color_scroll, Color_fg);
722 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 813 alias_color (Color_topShadow, Color_bg);
723 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 814 alias_color (Color_bottomShadow, Color_bg);
724 } 815 }
725 else 816 else
726 { 817 {
727 rxvt_color xcol[2]; 818 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
728 /* xcol[0] == white
729 * xcol[1] == top shadow
730 * xcol[2] == bot shadow */
731 819
732 xcol[1] = pix_colors[Color_scroll]; 820 rgba cscroll;
733 xcol[0].set (display, 65535, 65535, 65535); 821 pix_colors [Color_scroll].get (cscroll);
734
735 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
736
737 xcol[0].get (display, pr0, pg0, pb0);
738 xcol[1].get (display, pr1, pg1, pb1);
739
740 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
741 822
742 /* topShadowColor */ 823 /* topShadowColor */
743 if (!xcol[1].set (display, 824 if (!pix_colors[Color_topShadow].set (this,
744 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 825 rgba (
745 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 826 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
746 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 827 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
747 xcol[1] = pix_colors[Color_White]; 828 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
748 829 cscroll.a)
749 pix_colors[Color_topShadow] = xcol[1]; 830 ))
831 alias_color (Color_topShadow, Color_White);
750 } 832 }
751#endif /* KEEP_SCROLLCOLOR */ 833#endif /* KEEP_SCROLLCOLOR */
834
835#ifdef OFF_FOCUS_FADING
836 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
837 update_fade_color (i);
838#endif
752} 839}
753 840
754/*----------------------------------------------------------------------*/ 841/*----------------------------------------------------------------------*/
755/* color aliases, fg/bg bright-bold */ 842/* color aliases, fg/bg bright-bold */
756void 843void
… …
759 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 846 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
760 { 847 {
761 int i = atoi (rs[Rs_color + idx]); 848 int i = atoi (rs[Rs_color + idx]);
762 849
763 if (i >= 8 && i <= 15) 850 if (i >= 8 && i <= 15)
764 { /* bright colors */ 851 /* bright colors */
765 i -= 8;
766 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 852 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
767 return; 853 else if (i >= 0 && i <= 7)
768 } 854 /* normal colors */
769
770 if (i >= 0 && i <= 7) /* normal colors */
771 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 855 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
772 } 856 }
773} 857}
774 858
775/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
… …
795 879
796 if (rsmod 880 if (rsmod
797 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 881 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
798 requestedmeta = rsmod[3] - '0'; 882 requestedmeta = rsmod[3] - '0';
799 883
800 map = XGetModifierMapping (display->display); 884 map = XGetModifierMapping (dpy);
801 kc = map->modifiermap; 885 kc = map->modifiermap;
802 886
803 for (i = 1; i < 6; i++) 887 for (i = 1; i < 6; i++)
804 { 888 {
805 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 889 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
807 for (j = map->max_keypermod; j--; k++) 891 for (j = map->max_keypermod; j--; k++)
808 { 892 {
809 if (kc[k] == 0) 893 if (kc[k] == 0)
810 break; 894 break;
811 895
812 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 896 switch (XKeycodeToKeysym (dpy, kc[k], 0))
813 { 897 {
814 case XK_Num_Lock: 898 case XK_Num_Lock:
815 ModNumLockMask = modmasks[i - 1]; 899 ModNumLockMask = modmasks[i - 1];
816 continue; 900 continue;
817 901
… …
867rxvt_term::create_windows (int argc, const char *const *argv) 951rxvt_term::create_windows (int argc, const char *const *argv)
868{ 952{
869 XClassHint classHint; 953 XClassHint classHint;
870 XWMHints wmHint; 954 XWMHints wmHint;
871#if ENABLE_FRILLS 955#if ENABLE_FRILLS
872 MWMHints mwmhints; 956 MWMHints mwmhints = { };
873#endif 957#endif
874 XGCValues gcvalue; 958 XGCValues gcvalue;
875 XSetWindowAttributes attributes; 959 XSetWindowAttributes attributes;
876 Window top, parent; 960 Window top, parent;
877 dDisp;
878 961
879 xa = display->xa; 962 dLocal (Display *, dpy);
880 963
881 /* grab colors before netscape does */ 964 /* grab colors before netscape does */
882 Get_Colours (); 965 Get_Colours ();
883 966
884 if (!set_fonts ()) 967 if (!set_fonts ())
885 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 968 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
886 969
887 parent = display->root; 970 parent = display->root;
888 971
889 attributes.override_redirect = !!OPTION (Opt_override_redirect); 972 attributes.override_redirect = !!option (Opt_override_redirect);
890 973
891#if ENABLE_FRILLS 974#if ENABLE_FRILLS
892 if (OPTION (Opt_borderLess)) 975 if (option (Opt_borderLess))
893 { 976 {
894 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None) 977 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
895 { 978 {
896 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 979 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
897 attributes.override_redirect = TRUE; 980 attributes.override_redirect = true;
898 mwmhints.flags = 0;
899 } 981 }
900 else 982 else
901 { 983 {
902 mwmhints.flags = MWM_HINTS_DECORATIONS; 984 mwmhints.flags = MWM_HINTS_DECORATIONS;
903 mwmhints.decorations = 0;
904 } 985 }
905 } 986 }
906 else
907 mwmhints.flags = 0;
908#endif 987#endif
909 988
910#if ENABLE_XEMBED 989#if ENABLE_XEMBED
911 if (rs[Rs_embed]) 990 if (rs[Rs_embed])
912 { 991 {
913 XWindowAttributes wattr; 992 XWindowAttributes wattr;
914 993
915 parent = strtol (rs[Rs_embed], 0, 0); 994 parent = strtol (rs[Rs_embed], 0, 0);
916 995
917 if (!XGetWindowAttributes (disp, parent, &wattr)) 996 if (!XGetWindowAttributes (dpy, parent, &wattr))
918 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 997 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
919 998
920 window_calc (wattr.width, wattr.height); 999 window_calc (wattr.width, wattr.height);
921 } 1000 }
922#endif 1001#endif
923 1002
924 window_calc (0, 0); 1003 window_calc (0, 0);
925 1004
926 /* sub-window placement & size in rxvt_resize_subwindows () */ 1005 /* sub-window placement & size in rxvt_resize_subwindows () */
927 attributes.background_pixel = pix_colors_focused[Color_border]; 1006 attributes.background_pixel = pix_colors_focused [Color_border];
928 attributes.border_pixel = pix_colors_focused[Color_border]; 1007 attributes.border_pixel = pix_colors_focused [Color_border];
929 attributes.colormap = display->cmap; 1008 attributes.colormap = cmap;
930 1009
931 top = XCreateWindow (disp, parent, 1010 top = XCreateWindow (dpy, parent,
932 szHint.x, szHint.y, 1011 szHint.x, szHint.y,
933 szHint.width, szHint.height, 1012 szHint.width, szHint.height,
934 ext_bwidth, 1013 ext_bwidth,
935 display->depth, InputOutput, 1014 depth, InputOutput, visual,
936 display->visual,
937 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1015 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
938 &attributes); 1016 &attributes);
939 1017
940 this->parent[0] = top; 1018 this->parent[0] = top;
941 1019
… …
948 classHint.res_name = (char *)rs[Rs_name]; 1026 classHint.res_name = (char *)rs[Rs_name];
949 classHint.res_class = (char *)RESCLASS; 1027 classHint.res_class = (char *)RESCLASS;
950 1028
951 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1029 wmHint.flags = InputHint | StateHint | WindowGroupHint;
952 wmHint.input = True; 1030 wmHint.input = True;
953 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1031 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
954 wmHint.window_group = top; 1032 wmHint.window_group = top;
955 1033
956 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1034 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
957 &szHint, &wmHint, &classHint); 1035 &szHint, &wmHint, &classHint);
958 1036
959#if ENABLE_FRILLS 1037#if ENABLE_FRILLS
960 if (mwmhints.flags) 1038 if (mwmhints.flags)
961 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1039 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
962 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1040 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
963#endif 1041#endif
964 1042
965 Atom protocols[] = { 1043 Atom protocols[] = {
966 xa[XA_WM_DELETE_WINDOW], 1044 xa[XA_WM_DELETE_WINDOW],
967#if ENABLE_EWMH 1045#if ENABLE_EWMH
968 xa[XA_NET_WM_PING], 1046 xa[XA_NET_WM_PING],
969#endif 1047#endif
970 }; 1048 };
971 1049
972 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1050 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
973 1051
974#if ENABLE_FRILLS 1052#if ENABLE_FRILLS
975 if (rs[Rs_transient_for]) 1053 if (rs[Rs_transient_for])
976 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1054 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
977#endif 1055#endif
978 1056
979#if ENABLE_EWMH 1057#if ENABLE_EWMH
980 long pid = getpid (); 1058 long pid = getpid ();
981 1059
982 XChangeProperty (disp, top, 1060 XChangeProperty (dpy, top,
983 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1061 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
984 PropModeReplace, (unsigned char *)&pid, 1); 1062 PropModeReplace, (unsigned char *)&pid, 1);
985 1063
986 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1064 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
987#endif 1065#endif
988 1066
989 XSelectInput (disp, top, 1067 XSelectInput (dpy, top,
990 KeyPressMask 1068 KeyPressMask
991#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1069#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
992 | KeyReleaseMask 1070 | KeyReleaseMask
993#endif 1071#endif
994 | FocusChangeMask | VisibilityChangeMask 1072 | FocusChangeMask | VisibilityChangeMask
995 | ExposureMask | StructureNotifyMask); 1073 | ExposureMask | StructureNotifyMask);
996 1074
997 termwin_ev.start (display, top); 1075 termwin_ev.start (display, top);
998 1076
999 /* vt cursor: Black-on-White is standard, but this is more popular */ 1077 /* vt cursor: Black-on-White is standard, but this is more popular */
1000 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1078 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1001 1079
1002#ifdef HAVE_SCROLLBARS 1080#ifdef HAVE_SCROLLBARS
1003 /* cursor scrollBar: Black-on-White */ 1081 /* cursor scrollBar: Black-on-White */
1004 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1082 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1005#endif 1083#endif
1006 1084
1007 /* the vt window */ 1085 /* the vt window */
1008 vt = XCreateSimpleWindow (disp, top, 1086 vt = XCreateSimpleWindow (dpy, top,
1009 window_vt_x, window_vt_y, 1087 window_vt_x, window_vt_y,
1010 width, height, 1088 width, height,
1011 0, 1089 0,
1012 pix_colors_focused[Color_fg], 1090 pix_colors_focused[Color_fg],
1013 pix_colors_focused[Color_bg]); 1091 pix_colors_focused[Color_bg]);
1014 1092
1015 attributes.bit_gravity = NorthWestGravity; 1093 attributes.bit_gravity = NorthWestGravity;
1016 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1094 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1017 1095
1018 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1096 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1019 1097
1020 if (OPTION (Opt_pointerBlank)) 1098 if (option (Opt_pointerBlank))
1021 vt_emask |= PointerMotionMask; 1099 vt_emask |= PointerMotionMask;
1022 else 1100 else
1023 vt_emask |= Button1MotionMask | Button3MotionMask; 1101 vt_emask |= Button1MotionMask | Button3MotionMask;
1024 1102
1025 vt_select_input (); 1103 vt_select_input ();
1026 1104
1027 vt_ev.start (display, vt); 1105 vt_ev.start (display, vt);
1028 1106
1029#ifdef XPM_BACKGROUND
1030 if (rs[Rs_backgroundPixmap] != NULL
1031 && !OPTION (Opt_transparent))
1032 {
1033 const char *p = rs[Rs_backgroundPixmap];
1034
1035 if ((p = strchr (p, ';')) != NULL)
1036 {
1037 p++;
1038 scale_pixmap (p);
1039 }
1040
1041 set_bgPixmap (rs[Rs_backgroundPixmap]);
1042 scr_touch (true);
1043 }
1044#endif
1045
1046 /* graphics context for the vt window */ 1107 /* graphics context for the vt window */
1047 gcvalue.foreground = pix_colors[Color_fg]; 1108 gcvalue.foreground = pix_colors[Color_fg];
1048 gcvalue.background = pix_colors[Color_bg]; 1109 gcvalue.background = pix_colors[Color_bg];
1049 gcvalue.graphics_exposures = 1; 1110 gcvalue.graphics_exposures = 0;
1050 1111
1051 gc = XCreateGC (disp, vt, 1112 gc = XCreateGC (dpy, vt,
1052 GCForeground | GCBackground | GCGraphicsExposures, 1113 GCForeground | GCBackground | GCGraphicsExposures,
1053 &gcvalue); 1114 &gcvalue);
1054 1115
1055 drawable = new rxvt_drawable (display, vt); 1116 drawable = new rxvt_drawable (this, vt);
1056 1117
1057#ifdef RXVT_SCROLLBAR 1118#ifdef RXVT_SCROLLBAR
1058 gcvalue.foreground = pix_colors[Color_topShadow]; 1119 gcvalue.foreground = pix_colors[Color_topShadow];
1059 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1120 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1060 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1121 gcvalue.foreground = pix_colors[Color_bottomShadow];
1061 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1122 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1062 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1123 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1063 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1124 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1064#endif 1125#endif
1065 1126
1066#ifdef OFF_FOCUS_FADING 1127#ifdef OFF_FOCUS_FADING
1067 // initially we are in unfocused state 1128 // initially we are in unfocused state
1068 if (rs[Rs_fade]) 1129 if (rs[Rs_fade])
… …
1075 1136
1076/* ------------------------------------------------------------------------- * 1137/* ------------------------------------------------------------------------- *
1077 * GET TTY CURRENT STATE * 1138 * GET TTY CURRENT STATE *
1078 * ------------------------------------------------------------------------- */ 1139 * ------------------------------------------------------------------------- */
1079void 1140void
1080rxvt_get_ttymode (ttymode_t *tio, int erase) 1141rxvt_get_ttymode (struct termios *tio, int erase)
1081{ 1142{
1082#ifdef HAVE_TERMIOS_H
1083 /* 1143 /*
1084 * standard System V termios interface 1144 * standard System V termios interface
1085 */ 1145 */
1086 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1146 if (tcgetattr (STDIN_FILENO, tio) < 0)
1087 { 1147 {
1088 // return error - use system defaults, 1148 // return error - use system defaults,
1089 // where possible, and zero elsewhere 1149 // where possible, and zero elsewhere
1090 memset (tio, 0, sizeof (ttymode_t)); 1150 memset (tio, 0, sizeof (struct termios));
1091 1151
1092 tio->c_cc[VINTR] = CINTR; 1152 tio->c_cc[VINTR] = CINTR;
1093 tio->c_cc[VQUIT] = CQUIT; 1153 tio->c_cc[VQUIT] = CQUIT;
1094 tio->c_cc[VERASE] = CERASE; 1154 tio->c_cc[VERASE] = CERASE;
1095#ifdef VERASE2 1155#ifdef VERASE2
… …
1154 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1214 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1155# if defined (ECHOCTL) && defined (ECHOKE) 1215# if defined (ECHOCTL) && defined (ECHOKE)
1156 | ECHOCTL | ECHOKE 1216 | ECHOCTL | ECHOKE
1157# endif 1217# endif
1158 | ECHOE | ECHOK); 1218 | ECHOE | ECHOK);
1159# else /* HAVE_TERMIOS_H */
1160
1161 /*
1162 * sgtty interface
1163 */
1164
1165 /* get parameters -- gtty */
1166 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1167 {
1168 tio->sg.sg_erase = CERASE; /* ^H */
1169 tio->sg.sg_kill = CKILL; /* ^U */
1170 }
1171
1172 if (erase != -1)
1173 tio->sg.sg_erase = (char)erase;
1174
1175 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1176
1177 /* get special characters */
1178 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1179 {
1180 tio->tc.t_intrc = CINTR; /* ^C */
1181 tio->tc.t_quitc = CQUIT; /* ^\ */
1182 tio->tc.t_startc = CSTART; /* ^Q */
1183 tio->tc.t_stopc = CSTOP; /* ^S */
1184 tio->tc.t_eofc = CEOF; /* ^D */
1185 tio->tc.t_brkc = -1;
1186 }
1187
1188 /* get local special chars */
1189 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1190 {
1191 tio->lc.t_suspc = CSUSP; /* ^Z */
1192 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1193 tio->lc.t_rprntc = CRPRNT; /* ^R */
1194 tio->lc.t_flushc = CFLUSH; /* ^O */
1195 tio->lc.t_werasc = CWERASE; /* ^W */
1196 tio->lc.t_lnextc = CLNEXT; /* ^V */
1197 }
1198 /* get line discipline */
1199 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1200# ifdef NTTYDISC
1201 tio->line = NTTYDISC;
1202# endif /* NTTYDISC */
1203
1204 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1205#endif /* HAVE_TERMIOS_H */
1206 1219
1207 /* 1220 /*
1208 * Debugging 1221 * Debugging
1209 */ 1222 */
1210#ifdef DEBUG_TTYMODE 1223#ifdef DEBUG_TTYMODE
1211#ifdef HAVE_TERMIOS_H
1212 /* c_iflag bits */ 1224 /* c_iflag bits */
1213 fprintf (stderr, "Input flags\n"); 1225 fprintf (stderr, "Input flags\n");
1214 1226
1215 /* cpp token stringize doesn't work on all machines <sigh> */ 1227 /* cpp token stringize doesn't work on all machines <sigh> */
1216# define FOO(flag,name) \ 1228# define FOO(flag,name) \
… …
1279 FOO (VLNEXT, "VLNEXT"); 1291 FOO (VLNEXT, "VLNEXT");
1280# endif 1292# endif
1281 1293
1282 fprintf (stderr, "\n"); 1294 fprintf (stderr, "\n");
1283# undef FOO 1295# undef FOO
1284# endif /* HAVE_TERMIOS_H */ 1296#endif /* DEBUG_TTYMODE */
1285#endif /* DEBUG_TTYMODE */
1286} 1297}
1287 1298
1288/*----------------------------------------------------------------------*/ 1299/*----------------------------------------------------------------------*/
1289/* 1300/*
1290 * Run the command in a subprocess and return a file descriptor for the 1301 * Run the command in a subprocess and return a file descriptor for the
… …
1311 else 1322 else
1312#endif 1323#endif
1313 if (!pty->get ()) 1324 if (!pty->get ())
1314 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1325 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1315 1326
1327 int er;
1328
1329#ifndef NO_BACKSPACE_KEY
1330 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1331 er = rs[Rs_backspace_key][0];
1332 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1333 er = '\177'; /* the initial state anyway */
1334 else
1335#endif
1336 er = -1;
1337
1338 rxvt_get_ttymode (&tio, er);
1339 /* init terminal attributes */
1340 cfsetospeed (&tio, BAUDRATE);
1341 cfsetispeed (&tio, BAUDRATE);
1342 tcsetattr (pty->tty, TCSANOW, &tio);
1316 pty->set_utf8_mode (enc_utf8); 1343 pty->set_utf8_mode (enc_utf8);
1317 1344
1318 /* set initial window size */ 1345 /* set initial window size */
1319 tt_winch (); 1346 tt_winch ();
1320
1321 int er;
1322
1323#ifndef NO_BACKSPACE_KEY
1324 if (key_backspace[0] && !key_backspace[1])
1325 er = key_backspace[0];
1326 else if (strcmp (key_backspace, "DEC") == 0)
1327 er = '\177'; /* the initial state anyway */
1328 else
1329#endif
1330 er = -1;
1331
1332 rxvt_get_ttymode (&tio, er);
1333 1347
1334#if ENABLE_FRILLS 1348#if ENABLE_FRILLS
1335 if (rs[Rs_pty_fd]) 1349 if (rs[Rs_pty_fd])
1336 return; 1350 return;
1337#endif 1351#endif
… …
1368 } 1382 }
1369 1383
1370 _exit (EXIT_FAILURE); 1384 _exit (EXIT_FAILURE);
1371 1385
1372 default: 1386 default:
1373 if (!OPTION (Opt_utmpInhibit)) 1387 if (!option (Opt_utmpInhibit))
1374 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1388 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1375 1389
1376 pty->close_tty (); 1390 pty->close_tty ();
1377 1391
1378 child_ev.start (cmd_pid); 1392 child_ev.start (cmd_pid);
1379 1393
… …
1392int 1406int
1393rxvt_term::run_child (const char *const *argv) 1407rxvt_term::run_child (const char *const *argv)
1394{ 1408{
1395 char *login; 1409 char *login;
1396 1410
1397 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1398
1399 if (OPTION (Opt_console)) 1411 if (option (Opt_console))
1412 {
1400 { /* be virtual console, fail silently */ 1413 /* be virtual console, fail silently */
1401#ifdef TIOCCONS 1414#ifdef TIOCCONS
1402 unsigned int on = 1; 1415 unsigned int on = 1;
1403 1416
1404 ioctl (STDIN_FILENO, TIOCCONS, &on); 1417 ioctl (STDIN_FILENO, TIOCCONS, &on);
1405#elif defined (SRIOCSREDIR) 1418#elif defined (SRIOCSREDIR)
… …
1407 1420
1408 fd = open (CONSOLE, O_WRONLY, 0); 1421 fd = open (CONSOLE, O_WRONLY, 0);
1409 if (fd >= 0) 1422 if (fd >= 0)
1410 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1423 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1411 close (fd); 1424 close (fd);
1412#endif /* SRIOCSREDIR */ 1425#endif /* SRIOCSREDIR */
1413 } 1426 }
1414 1427
1415 /* reset signals and spin off the command interpreter */ 1428 /* reset signals and spin off the command interpreter */
1416 signal (SIGINT, SIG_DFL); 1429 signal (SIGINT, SIG_DFL);
1417 signal (SIGQUIT, SIG_DFL); 1430 signal (SIGQUIT, SIG_DFL);
… …
1424 */ 1437 */
1425#ifdef SIGTSTP 1438#ifdef SIGTSTP
1426 signal (SIGTSTP, SIG_IGN); 1439 signal (SIGTSTP, SIG_IGN);
1427 signal (SIGTTIN, SIG_IGN); 1440 signal (SIGTTIN, SIG_IGN);
1428 signal (SIGTTOU, SIG_IGN); 1441 signal (SIGTTOU, SIG_IGN);
1429#endif /* SIGTSTP */ 1442#endif /* SIGTSTP */
1430 1443
1431 // unblock signals (signals are blocked by iom.C 1444 // unblock signals (signals are blocked by iom.C
1432 sigset_t ss; 1445 sigset_t ss;
1433 sigemptyset (&ss); 1446 sigemptyset (&ss);
1434 sigprocmask (SIG_SETMASK, &ss, 0); 1447 sigprocmask (SIG_SETMASK, &ss, 0);
1435 1448
1436 /* command interpreter path */ 1449 /* command interpreter path */
1437 if (argv != NULL) 1450 if (argv)
1438 { 1451 {
1439# ifdef DEBUG_CMD 1452# ifdef DEBUG_CMD
1440 int i; 1453 int i;
1441 1454
1442 for (i = 0; argv[i]; i++) 1455 for (i = 0; argv[i]; i++)
… …
1451 const char *argv0, *shell; 1464 const char *argv0, *shell;
1452 1465
1453 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1466 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1454 shell = "/bin/sh"; 1467 shell = "/bin/sh";
1455 1468
1456 argv0 = (const char *)rxvt_r_basename (shell); 1469 argv0 = (const char *)rxvt_basename (shell);
1457 1470
1458 if (OPTION (Opt_loginShell)) 1471 if (option (Opt_loginShell))
1459 { 1472 {
1460 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1473 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1461 1474
1462 login[0] = '-'; 1475 login[0] = '-';
1463 strcpy (&login[1], argv0); 1476 strcpy (&login[1], argv0);
1464 argv0 = login; 1477 argv0 = login;
1465 } 1478 }
1466 1479
1467 execlp (shell, argv0, NULL); 1480 execlp (shell, argv0, (char *)0);
1468 /* no error message: STDERR is closed! */ 1481 /* no error message: STDERR is closed! */
1469 } 1482 }
1470 1483
1471 return -1; 1484 return -1;
1472} 1485}

Diff Legend

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