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.158 by root, Sun Jan 29 20:51:28 2006 UTC vs.
Revision 1.252 by root, Sun Jun 15 13:54:15 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 14 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support
14 * Copyright (c) 2003-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
179bool 284void
180rxvt_term::init_vars () 285rxvt_term::init_vars ()
181{ 286{
182 pix_colors = // 287 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 288
192 MEvent.time = CurrentTime; 289 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 290 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 291 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 292 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 293 ncol = 80;
198 nrow = 24; 294 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 295 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 296 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 297 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 298 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS;
204 299
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 300 refresh_type = SLOW_REFRESH;
207 301
208 oldcursor.row = oldcursor.col = -1; 302 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 303
215 last_bot = last_state = -1; 304 set_option (Opt_scrollBar);
216 305 set_option (Opt_scrollTtyOutput);
217 return true; 306 set_option (Opt_jumpScroll);
307 set_option (Opt_skipScroll);
308 set_option (Opt_secondaryScreen);
309 set_option (Opt_secondaryScroll);
310 set_option (Opt_pastableTabs);
311 set_option (Opt_intensityStyles);
312 set_option (Opt_iso14755_52);
313 set_option (Opt_buffered);
218} 314}
219 315
220void 316static void
221rxvt_term::init_secondary () 317init_secondary ()
222{ 318{
223 int i; 319 int i;
224 320
225 /*
226 * Close all unused file descriptors
227 * We don't want them, we don't need them.
228 */
229 if ((i = open ("/dev/null", O_RDONLY)) < 0) 321 if ((i = open ("/dev/null", O_RDONLY)) < 0)
230 { 322 {
231 /* TODO: BOO HISS */
232 dup2 (STDERR_FILENO, STDIN_FILENO); 323 dup2 (STDERR_FILENO, STDIN_FILENO);
233 } 324 }
234 else if (i > STDIN_FILENO) 325 else if (i != STDIN_FILENO)
235 { 326 {
236 dup2 (i, STDIN_FILENO); 327 dup2 (i, STDIN_FILENO);
237 close (i); 328 close (i);
238 } 329 }
239 330
240 dup2 (STDERR_FILENO, STDOUT_FILENO); 331 dup2 (STDERR_FILENO, STDOUT_FILENO);
241
242#if 0 // schmorp sayz closing filies is murder
243 for (i = STDERR_FILENO + 1; i < num_fds; i++)
244 {
245#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
246 if (i == 4 || i == 7)
247 continue;
248#endif
249 close (i);
250 }
251#endif
252} 332}
253 333
254/*----------------------------------------------------------------------*/ 334/*----------------------------------------------------------------------*/
255const char ** 335const char **
256rxvt_term::init_resources (int argc, const char *const *argv) 336rxvt_term::init_resources (int argc, const char *const *argv)
257{ 337{
258 int i, r_argc; 338 int i, r_argc;
259 char *val;
260 const char **cmd_argv, **r_argv; 339 const char **cmd_argv, **r_argv;
261 340
262 /* 341 /*
263 * 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
264 */ 343 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 344 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 345 if (!strcmp (argv[r_argc], "-e"))
267 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 }
268 361
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 362 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 363
271 for (i = 0; i < r_argc; i++) 364 for (i = 0; i < r_argc; i++)
272 r_argv[i] = (const char *)argv[i]; 365 r_argv[i] = (const char *)argv[i];
273 366
274 r_argv[i] = NULL; 367 r_argv[i] = NULL;
275 368
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]); 369 rs[Rs_name] = rxvt_basename (argv[0]);
289 370
290 /* 371 /*
291 * Open display, get options/resources and create the window 372 * Open display, get options/resources and create the window
292 */ 373 */
293 374
… …
295 rs[Rs_display_name] = ":0"; 376 rs[Rs_display_name] = ":0";
296 377
297 get_options (r_argc, r_argv); 378 get_options (r_argc, r_argv);
298 379
299 if (!(display = displays.get (rs[Rs_display_name]))) 380 if (!(display = displays.get (rs[Rs_display_name])))
381 {
382 free (r_argv);
300 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 }
301 385
386 // using a local pointer decreases code size a lot
302 xa = display->xa; 387 xa = display->xa;
303 388
304#if ENABLE_FRILLS 389 set (display);
390 extract_resources ();
391
392#if XFT
305 if (rs[Rs_depth]) 393 if (rs[Rs_depth])
306 set (display, strtol (rs[Rs_depth], 0, 0)); 394 select_visual (strtol (rs[Rs_depth], 0, 0));
307 else
308#endif 395#endif
309 set (display);
310 396
311 extract_resources (); 397#ifdef HAVE_AFTERIMAGE
312 398 set_application_name ((char*)rs[Rs_name]);
399 set_output_threshold (OUTPUT_LEVEL_WARNING);
400 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
401#endif
313 free (r_argv); 402 free (r_argv);
403
404 for (int i = NUM_RESOURCES; i--; )
405 if (rs [i] == resval_undef)
406 rs [i] = 0;
314 407
315#if ENABLE_PERL 408#if ENABLE_PERL
316 if (!rs[Rs_perl_ext_1]) 409 if (!rs[Rs_perl_ext_1])
317 rs[Rs_perl_ext_1] = "default"; 410 rs[Rs_perl_ext_1] = "default";
318 411
… …
329 * set any defaults not already set 422 * set any defaults not already set
330 */ 423 */
331 if (cmd_argv && cmd_argv[0]) 424 if (cmd_argv && cmd_argv[0])
332 { 425 {
333 if (!rs[Rs_title]) 426 if (!rs[Rs_title])
334 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]); 427 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
335 if (!rs[Rs_iconName]) 428 if (!rs[Rs_iconName])
336 rs[Rs_iconName] = rs[Rs_title]; 429 rs[Rs_iconName] = rs[Rs_title];
337 } 430 }
338 else 431 else
339 { 432 {
… …
377 rs[Rs_cutchars] = CUTCHARS; 470 rs[Rs_cutchars] = CUTCHARS;
378 471
379#ifndef NO_BACKSPACE_KEY 472#ifndef NO_BACKSPACE_KEY
380 if (!rs[Rs_backspace_key]) 473 if (!rs[Rs_backspace_key])
381# ifdef DEFAULT_BACKSPACE 474# ifdef DEFAULT_BACKSPACE
382 key_backspace = DEFAULT_BACKSPACE; 475 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
383# else 476# else
384 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 477 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
385# endif 478# endif
386 else
387 {
388 val = strdup (rs[Rs_backspace_key]);
389 rxvt_Str_trim (val);
390 rxvt_Str_escaped (val);
391 key_backspace = val;
392 }
393#endif 479#endif
394 480
395#ifndef NO_DELETE_KEY 481#ifndef NO_DELETE_KEY
396 if (!rs[Rs_delete_key]) 482 if (!rs[Rs_delete_key])
397# ifdef DEFAULT_DELETE 483# ifdef DEFAULT_DELETE
398 key_delete = DEFAULT_DELETE; 484 rs[Rs_delete_key] = DEFAULT_DELETE;
399# else 485# else
400 key_delete = "\033[3~"; 486 rs[Rs_delete_key] = "\033[3~";
401# endif
402 else
403 {
404 val = strdup (rs[Rs_delete_key]);
405 rxvt_Str_trim (val);
406 rxvt_Str_escaped (val);
407 key_delete = val;
408 }
409#endif 487# endif
410 if (rs[Rs_answerbackstring])
411 {
412 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
413 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
414 }
415
416#ifdef HAVE_SCROLLBARS
417 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
418#endif 488#endif
489
490 scrollBar.setup (this);
419 491
420#ifdef XTERM_REVERSE_VIDEO 492#ifdef XTERM_REVERSE_VIDEO
421 /* this is how xterm implements reverseVideo */ 493 /* this is how xterm implements reverseVideo */
422 if (OPTION (Opt_reverseVideo)) 494 if (option (Opt_reverseVideo))
423 { 495 {
424 if (!rs[Rs_color + Color_fg]) 496 if (!rs[Rs_color + Color_fg])
425 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 497 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
498
426 if (!rs[Rs_color + Color_bg]) 499 if (!rs[Rs_color + Color_bg])
427 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 500 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428 } 501 }
429#endif 502#endif
430 503
… …
432 if (!rs[Rs_color + i]) 505 if (!rs[Rs_color + i])
433 rs[Rs_color + i] = def_colorName[i]; 506 rs[Rs_color + i] = def_colorName[i];
434 507
435#ifndef XTERM_REVERSE_VIDEO 508#ifndef XTERM_REVERSE_VIDEO
436 /* this is how we implement reverseVideo */ 509 /* this is how we implement reverseVideo */
437 if (OPTION (Opt_reverseVideo)) 510 if (option (Opt_reverseVideo))
438 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 511 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439#endif 512#endif
440 513
441 /* convenient aliases for setting fg/bg to colors */ 514 /* convenient aliases for setting fg/bg to colors */
442 color_aliases (Color_fg); 515 color_aliases (Color_fg);
443 color_aliases (Color_bg); 516 color_aliases (Color_bg);
444#ifndef NO_CURSORCOLOR 517#ifndef NO_CURSORCOLOR
445 color_aliases (Color_cursor); 518 color_aliases (Color_cursor);
446 color_aliases (Color_cursor2); 519 color_aliases (Color_cursor2);
447#endif /* NO_CURSORCOLOR */ 520#endif /* NO_CURSORCOLOR */
448 color_aliases (Color_pointer_fg); 521 color_aliases (Color_pointer_fg);
449 color_aliases (Color_pointer_bg); 522 color_aliases (Color_pointer_bg);
450 color_aliases (Color_border); 523 color_aliases (Color_border);
451#ifndef NO_BOLD_UNDERLINE_REVERSE 524#ifndef NO_BOLD_UNDERLINE_REVERSE
452 color_aliases (Color_BD); 525 color_aliases (Color_BD);
453 color_aliases (Color_UL); 526 color_aliases (Color_UL);
454 color_aliases (Color_RV); 527 color_aliases (Color_RV);
455#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 528#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
456 529
457 if (!rs[Rs_color + Color_border]) 530 if (!rs[Rs_color + Color_border])
458 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 531 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
459 532
460 return cmd_argv; 533 return cmd_argv;
534}
535
536/*----------------------------------------------------------------------*/
537void
538rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
539{
540 this->envv = envv;
541
542 SET_R (this);
543 set_locale ("");
544 set_environ (envv); // a few things in X do not call setlocale :(
545
546 init_vars ();
547
548 init_secondary ();
549
550 const char **cmd_argv = init_resources (argc, argv);
551
552#ifdef KEYSYM_RESOURCE
553 keyboard->register_done ();
554#endif
555
556 if (const char *path = rs[Rs_chdir])
557 if (*path) // ignored if empty
558 {
559 if (*path != '/')
560 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
561
562 if (chdir (path))
563 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
564 }
565
566 if (option (Opt_scrollBar))
567 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
568
569 pty = ptytty::create ();
570
571 create_windows (argc, argv);
572
573 init_xlocale ();
574
575 scr_reset (); // initialize screen
576
577#if 0
578 XSynchronize (dpy, True);
579#endif
580
581 if (option (Opt_scrollBar))
582 scrollBar.resize (); /* create and map scrollbar */
583#ifdef HAVE_BG_PIXMAP
584 {
585 bgPixmap.set_target (this);
586 bgPixmap.invalidate ();
587
588#ifdef ENABLE_TRANSPARENCY
589 if (option (Opt_transparent))
590 {
591 bgPixmap.set_transparent ();
592
593#ifdef HAVE_AFTERIMAGE
594 if (rs [Rs_blurradius])
595 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
596#endif
597 if (ISSET_PIXCOLOR (Color_tint))
598 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
599
600 if (rs [Rs_shade])
601 bgPixmap.set_shade (rs [Rs_shade]);
602
603 bgPixmap.set_root_pixmap ();
604 XSelectInput (dpy, display->root, PropertyChangeMask);
605 rootwin_ev.start (display, display->root);
606 }
607#endif
608
609#ifdef BG_IMAGE_FROM_FILE
610 if (rs[Rs_backgroundPixmap])
611 {
612 const char *p = rs[Rs_backgroundPixmap];
613
614 if ((p = strchr (p, ';')) != 0)
615 {
616 p++;
617 bgPixmap.set_geometry (p);
618 }
619 else
620 bgPixmap.set_defaultGeometry ();
621
622 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
623 if (!bgPixmap.window_position_sensitive ())
624 update_background ();
625 }
626#endif
627 }
628#endif
629
630#if ENABLE_PERL
631 rootwin_ev.start (display, display->root);
632#endif
633
634 set_colorfgbg ();
635
636 init_command (cmd_argv);
637
638 free (cmd_argv);
639
640 if (pty->pty >= 0)
641 pty_ev.start (pty->pty, ev::READ);
642
643 HOOK_INVOKE ((this, HOOK_START, DT_END));
644
645#if ENABLE_XEMBED
646 if (rs[Rs_embed])
647 {
648 long info[2] = { 0, XEMBED_MAPPED };
649
650 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
651 32, PropModeReplace, (unsigned char *)&info, 2);
652 }
653#endif
654
655 XMapWindow (dpy, vt);
656 XMapWindow (dpy, parent[0]);
657
658 refresh_check ();
461} 659}
462 660
463/*----------------------------------------------------------------------*/ 661/*----------------------------------------------------------------------*/
464void 662void
465rxvt_term::init_env () 663rxvt_term::init_env ()
466{ 664{
467 int i; 665 int i;
468 unsigned int u;
469 char *val; 666 char *val;
470 667
471#ifdef DISPLAY_IS_IP 668#ifdef DISPLAY_IS_IP
472 /* Fixup display_name for export over pty to any interested terminal 669 /* Fixup display_name for export over pty to any interested terminal
473 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 670 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
481 */ 678 */
482 val = rxvt_network_display (rs[Rs_display_name]); 679 val = rxvt_network_display (rs[Rs_display_name]);
483 rs[Rs_display_name] = (const char *)val; 680 rs[Rs_display_name] = (const char *)val;
484 681
485 if (val == NULL) 682 if (val == NULL)
486#endif /* DISPLAY_IS_IP */ 683#endif /* DISPLAY_IS_IP */
487 val = XDisplayString (xdisp); 684 val = XDisplayString (dpy);
488 685
489 if (rs[Rs_display_name] == NULL) 686 if (rs[Rs_display_name] == NULL)
490 rs[Rs_display_name] = val; /* use broken `:0' value */ 687 rs[Rs_display_name] = val; /* use broken `:0' value */
491 688
492 i = strlen (val); 689 i = strlen (val);
493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 690 env_display = (char *)rxvt_malloc (i + 9);
494 691
495 sprintf (env_display, "DISPLAY=%s", val); 692 sprintf (env_display, "DISPLAY=%s", val);
496 693
497 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 694 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
498 695
… …
519 else 716 else
520 putenv ("COLORTERM=" COLORTERMENVFULL); 717 putenv ("COLORTERM=" COLORTERMENVFULL);
521 718
522 if (rs[Rs_term_name] != NULL) 719 if (rs[Rs_term_name] != NULL)
523 { 720 {
524 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 721 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
525 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 722 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
526 putenv (env_term); 723 putenv (env_term);
527 } 724 }
528 else 725 else
529 putenv ("TERM=" TERMENV); 726 putenv ("TERM=" TERMENV);
… …
531#ifdef HAVE_UNSETENV 728#ifdef HAVE_UNSETENV
532 /* avoid passing old settings and confusing term size */ 729 /* avoid passing old settings and confusing term size */
533 unsetenv ("LINES"); 730 unsetenv ("LINES");
534 unsetenv ("COLUMNS"); 731 unsetenv ("COLUMNS");
535 unsetenv ("TERMCAP"); /* terminfo should be okay */ 732 unsetenv ("TERMCAP"); /* terminfo should be okay */
536#endif /* HAVE_UNSETENV */ 733#endif /* HAVE_UNSETENV */
537} 734}
538 735
539/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
540/* 737/*
541 * This is more or less stolen straight from XFree86 xterm. 738 * This is more or less stolen straight from XFree86 xterm.
… …
562 759
563 this->locale = "C"; 760 this->locale = "C";
564 } 761 }
565 762
566 763
567 this->locale = rxvt_strdup (this->locale); 764 this->locale = strdup (this->locale);
568 SET_LOCALE (this->locale); 765 SET_LOCALE (this->locale);
569 mbstate.reset (); 766 mbstate.reset ();
570#endif 767#endif
571 768
572#if HAVE_NL_LANGINFO 769#if HAVE_NL_LANGINFO
… …
616 * Initialize the command connection. 813 * Initialize the command connection.
617 * This should be called after the X server connection is established. 814 * This should be called after the X server connection is established.
618 */ 815 */
619 816
620#ifdef META8_OPTION 817#ifdef META8_OPTION
621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 818 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622#endif 819#endif
623 820
624 get_ourmods (); 821 get_ourmods ();
625 822
626 if (!OPTION (Opt_scrollTtyOutput)) 823 if (!option (Opt_scrollTtyOutput))
627 priv_modes |= PrivMode_TtyOutputInh; 824 priv_modes |= PrivMode_TtyOutputInh;
628 if (OPTION (Opt_scrollTtyKeypress)) 825 if (option (Opt_scrollTtyKeypress))
629 priv_modes |= PrivMode_Keypress; 826 priv_modes |= PrivMode_Keypress;
630 if (!OPTION (Opt_jumpScroll)) 827 if (!option (Opt_jumpScroll))
631 priv_modes |= PrivMode_smoothScroll; 828 priv_modes |= PrivMode_smoothScroll;
632 829
633#ifndef NO_BACKSPACE_KEY 830#ifndef NO_BACKSPACE_KEY
634 if (strcmp (key_backspace, "DEC") == 0) 831 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
635 priv_modes |= PrivMode_HaveBackSpace; 832 priv_modes |= PrivMode_HaveBackSpace;
636#endif 833#endif
637 834
638 /* add value for scrollBar */ 835 /* add value for scrollBar */
639 if (scrollBar.state) 836 if (scrollBar.state)
… …
645 run_command (argv); 842 run_command (argv);
646} 843}
647 844
648/*----------------------------------------------------------------------*/ 845/*----------------------------------------------------------------------*/
649void 846void
650rxvt_term::Get_Colours () 847rxvt_term::get_colours ()
651{ 848{
652 int i; 849 int i;
653 850
654#ifdef OFF_FOCUS_FADING 851#ifdef OFF_FOCUS_FADING
655 pix_colors = pix_colors_focused; 852 pix_colors = pix_colors_focused;
656#endif 853#endif
657 854
658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 855 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 856 {
857 const char *name = rs[Rs_color + i];
858
859 if (!name)
860 continue;
861
660 rxvt_color xcol; 862 rxvt_color xcol;
661 863
662 if (!rs[Rs_color + i]) 864 if (!set_color (xcol, name))
663 continue;
664
665 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
666 { 865 {
667#ifndef XTERM_REVERSE_VIDEO 866#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 867 if (i < 2 && option (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 868 name = def_colorName [1 - i];
670 else 869 else
671#endif 870#endif
672 rs[Rs_color + i] = def_colorName[i]; 871 name = def_colorName [i];
673 872
674 if (!rs[Rs_color + i]) 873 if (!name)
675 continue; 874 continue;
676 875
677 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 876 if (!set_color (xcol, name))
678 { 877 {
679 switch (i) 878 switch (i)
680 { 879 {
681 case Color_fg: 880 case Color_fg:
682 case Color_bg: 881 case Color_bg:
683 /* fatal: need bg/fg color */
684 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 882 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
685 /* NOTREACHED */ 883 name = "";
686 break; 884 break;
687#ifndef NO_CURSORCOLOR 885#ifndef NO_CURSORCOLOR
688 case Color_cursor2: 886 case Color_cursor2:
689 xcol = pix_colors[Color_fg]; 887#endif
690 break;
691#endif /* ! NO_CURSORCOLOR */
692 case Color_pointer_fg: 888 case Color_pointer_fg:
693 xcol = pix_colors[Color_fg]; 889 name = rs[Rs_color + Color_fg];
890 xcol.set (this, name);
694 break; 891 break;
695 default: 892 default:
696 xcol = pix_colors[Color_bg]; /* None */ 893 name = rs[Rs_color + Color_bg];
894 xcol.set (this, name);
697 break; 895 break;
698 } 896 }
699 } 897 }
700 } 898 }
701 899
702 pix_colors[i] = xcol; 900 pix_colors[i] = xcol;
703 SET_PIXCOLOR (i); 901 rs[Rs_color + i] = name;
704 } 902 }
705
706#ifdef OFF_FOCUS_FADING
707 if (rs[Rs_fade])
708 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
709 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
710#endif
711 903
712 if (depth <= 2) 904 if (depth <= 2)
713 { 905 {
714 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 906 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
715 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 907 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
716 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 908 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
717 } 909 }
718 910
719 /* 911 /*
720 * get scrollBar shadow colors 912 * get scrollBar shadow colors
721 * 913 *
722 * The calculations of topShadow/bottomShadow values are adapted 914 * The calculations of topShadow/bottomShadow values are adapted
723 * from the fvwm window manager. 915 * from the fvwm window manager.
724 */ 916 */
725#ifdef KEEP_SCROLLCOLOR 917#ifdef RXVT_SCROLLBAR
726
727 if (depth <= 2) 918 if (depth <= 2)
728 { 919 {
729 /* Monochrome */ 920 /* Monochrome */
730 pix_colors[Color_scroll] = pix_colors[Color_fg]; 921 alias_color (Color_scroll, Color_fg);
731 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 922 alias_color (Color_topShadow, Color_bg);
732 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 923 alias_color (Color_bottomShadow, Color_bg);
733 } 924 }
734 else 925 else
735 { 926 {
736 rxvt_color xcol[2]; 927 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
737 /* xcol[0] == white
738 * xcol[1] == top shadow
739 * xcol[2] == bot shadow */
740 928
741 xcol[1] = pix_colors[Color_scroll]; 929 rgba cscroll;
742 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); 930 pix_colors [Color_scroll].get (cscroll);
743
744 rxvt_rgba c0, c1;
745
746 xcol[0].get (this, c0);
747 xcol[1].get (this, c1);
748
749 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
750 931
751 /* topShadowColor */ 932 /* topShadowColor */
752 if (!xcol[1].set (this, 933 if (!pix_colors[Color_topShadow].set (this,
753 rxvt_rgba ( 934 rgba (
754 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 935 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
755 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), 936 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
756 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), 937 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
757 c1.a) // pa1 vs. pa0: arbitrary 938 cscroll.a)
758 )); 939 ))
759 xcol[1] = pix_colors[Color_White]; 940 alias_color (Color_topShadow, Color_White);
760
761 pix_colors[Color_topShadow] = xcol[1];
762 } 941 }
763#endif /* KEEP_SCROLLCOLOR */ 942#endif
943
944#ifdef OFF_FOCUS_FADING
945 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
946 update_fade_color (i);
947#endif
764} 948}
765 949
766/*----------------------------------------------------------------------*/ 950/*----------------------------------------------------------------------*/
767/* color aliases, fg/bg bright-bold */ 951/* color aliases, fg/bg bright-bold */
768void 952void
… …
771 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 955 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
772 { 956 {
773 int i = atoi (rs[Rs_color + idx]); 957 int i = atoi (rs[Rs_color + idx]);
774 958
775 if (i >= 8 && i <= 15) 959 if (i >= 8 && i <= 15)
776 { /* bright colors */ 960 /* bright colors */
777 i -= 8;
778 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 961 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
779 return; 962 else if (i >= 0 && i <= 7)
780 } 963 /* normal colors */
781
782 if (i >= 0 && i <= 7) /* normal colors */
783 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 964 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
784 } 965 }
785} 966}
786 967
787/*----------------------------------------------------------------------*/ 968/*----------------------------------------------------------------------*/
… …
807 988
808 if (rsmod 989 if (rsmod
809 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 990 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
810 requestedmeta = rsmod[3] - '0'; 991 requestedmeta = rsmod[3] - '0';
811 992
812 map = XGetModifierMapping (xdisp); 993 map = XGetModifierMapping (dpy);
813 kc = map->modifiermap; 994 kc = map->modifiermap;
814 995
815 for (i = 1; i < 6; i++) 996 for (i = 1; i < 6; i++)
816 { 997 {
817 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 998 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
819 for (j = map->max_keypermod; j--; k++) 1000 for (j = map->max_keypermod; j--; k++)
820 { 1001 {
821 if (kc[k] == 0) 1002 if (kc[k] == 0)
822 break; 1003 break;
823 1004
824 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 1005 switch (XKeycodeToKeysym (dpy, kc[k], 0))
825 { 1006 {
826 case XK_Num_Lock: 1007 case XK_Num_Lock:
827 ModNumLockMask = modmasks[i - 1]; 1008 ModNumLockMask = modmasks[i - 1];
828 continue; 1009 continue;
829 1010
… …
879rxvt_term::create_windows (int argc, const char *const *argv) 1060rxvt_term::create_windows (int argc, const char *const *argv)
880{ 1061{
881 XClassHint classHint; 1062 XClassHint classHint;
882 XWMHints wmHint; 1063 XWMHints wmHint;
883#if ENABLE_FRILLS 1064#if ENABLE_FRILLS
884 MWMHints mwmhints; 1065 MWMHints mwmhints = { };
885#endif 1066#endif
886 XGCValues gcvalue; 1067 XGCValues gcvalue;
887 XSetWindowAttributes attributes; 1068 XSetWindowAttributes attributes;
888 Window top, parent; 1069 Window top, parent;
889 1070
890 dLocal (Display *, xdisp); 1071 dLocal (Display *, dpy);
891 1072
892 /* grab colors before netscape does */ 1073 /* grab colors before netscape does */
893 Get_Colours (); 1074 get_colours ();
894 1075
895 if (!set_fonts ()) 1076 if (!set_fonts ())
896 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1077 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
897 1078
898 parent = display->root; 1079 parent = display->root;
899 1080
900 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1081 attributes.override_redirect = !!option (Opt_override_redirect);
901 1082
902#if ENABLE_FRILLS 1083#if ENABLE_FRILLS
903 if (OPTION (Opt_borderLess)) 1084 if (option (Opt_borderLess))
904 { 1085 {
905 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 1086 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
906 { 1087 {
907 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1088 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
908 attributes.override_redirect = true; 1089 attributes.override_redirect = true;
909 mwmhints.flags = 0;
910 } 1090 }
911 else 1091 else
912 { 1092 {
913 mwmhints.flags = MWM_HINTS_DECORATIONS; 1093 mwmhints.flags = MWM_HINTS_DECORATIONS;
914 mwmhints.decorations = 0;
915 } 1094 }
916 } 1095 }
917 else
918 mwmhints.flags = 0;
919#endif 1096#endif
920 1097
921#if ENABLE_XEMBED 1098#if ENABLE_XEMBED
922 if (rs[Rs_embed]) 1099 if (rs[Rs_embed])
923 { 1100 {
924 XWindowAttributes wattr; 1101 XWindowAttributes wattr;
925 1102
926 parent = strtol (rs[Rs_embed], 0, 0); 1103 parent = strtol (rs[Rs_embed], 0, 0);
927 1104
928 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 1105 if (!XGetWindowAttributes (dpy, parent, &wattr))
929 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1106 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
930 1107
931 window_calc (wattr.width, wattr.height); 1108 window_calc (wattr.width, wattr.height);
932 } 1109 }
933#endif 1110#endif
… …
937 /* sub-window placement & size in rxvt_resize_subwindows () */ 1114 /* sub-window placement & size in rxvt_resize_subwindows () */
938 attributes.background_pixel = pix_colors_focused [Color_border]; 1115 attributes.background_pixel = pix_colors_focused [Color_border];
939 attributes.border_pixel = pix_colors_focused [Color_border]; 1116 attributes.border_pixel = pix_colors_focused [Color_border];
940 attributes.colormap = cmap; 1117 attributes.colormap = cmap;
941 1118
942 top = XCreateWindow (xdisp, parent, 1119 top = XCreateWindow (dpy, parent,
943 szHint.x, szHint.y, 1120 szHint.x, szHint.y,
944 szHint.width, szHint.height, 1121 szHint.width, szHint.height,
945 ext_bwidth, 1122 ext_bwidth,
946 depth, InputOutput, visual, 1123 depth, InputOutput, visual,
947 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1124 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
958 classHint.res_name = (char *)rs[Rs_name]; 1135 classHint.res_name = (char *)rs[Rs_name];
959 classHint.res_class = (char *)RESCLASS; 1136 classHint.res_class = (char *)RESCLASS;
960 1137
961 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1138 wmHint.flags = InputHint | StateHint | WindowGroupHint;
962 wmHint.input = True; 1139 wmHint.input = True;
963 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1140 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
964 wmHint.window_group = top; 1141 wmHint.window_group = top;
965 1142
966 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 1143 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
967 &szHint, &wmHint, &classHint); 1144 &szHint, &wmHint, &classHint);
968 1145
969#if ENABLE_FRILLS 1146#if ENABLE_FRILLS
970 if (mwmhints.flags) 1147 if (mwmhints.flags)
971 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1148 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
972 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1149 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
973#endif 1150#endif
974 1151
975 Atom protocols[] = { 1152 Atom protocols[] = {
976 xa[XA_WM_DELETE_WINDOW], 1153 xa[XA_WM_DELETE_WINDOW],
977#if ENABLE_EWMH 1154#if ENABLE_EWMH
978 xa[XA_NET_WM_PING], 1155 xa[XA_NET_WM_PING],
979#endif 1156#endif
980 }; 1157 };
981 1158
982 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1159 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
983 1160
984#if ENABLE_FRILLS 1161#if ENABLE_FRILLS
985 if (rs[Rs_transient_for]) 1162 if (rs[Rs_transient_for])
986 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1163 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
987#endif 1164#endif
988 1165
989#if ENABLE_EWMH 1166#if ENABLE_EWMH
990 long pid = getpid (); 1167 long pid = getpid ();
991 1168
992 XChangeProperty (xdisp, top, 1169 XChangeProperty (dpy, top,
993 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1170 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
994 PropModeReplace, (unsigned char *)&pid, 1); 1171 PropModeReplace, (unsigned char *)&pid, 1);
995 1172
996 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1173 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
997#endif 1174#endif
998 1175
999 XSelectInput (xdisp, top, 1176 XSelectInput (dpy, top,
1000 KeyPressMask 1177 KeyPressMask
1001#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1178#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1002 | KeyReleaseMask 1179 | KeyReleaseMask
1003#endif 1180#endif
1004 | FocusChangeMask | VisibilityChangeMask 1181 | FocusChangeMask | VisibilityChangeMask
1005 | ExposureMask | StructureNotifyMask); 1182 | ExposureMask | StructureNotifyMask);
1006 1183
1007 termwin_ev.start (display, top); 1184 termwin_ev.start (display, top);
1008 1185
1009 /* vt cursor: Black-on-White is standard, but this is more popular */ 1186 /* vt cursor: Black-on-White is standard, but this is more popular */
1010 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1187 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1011
1012#ifdef HAVE_SCROLLBARS
1013 /* cursor scrollBar: Black-on-White */
1014 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1015#endif
1016 1188
1017 /* the vt window */ 1189 /* the vt window */
1018 vt = XCreateSimpleWindow (xdisp, top, 1190 vt = XCreateSimpleWindow (dpy, top,
1019 window_vt_x, window_vt_y, 1191 window_vt_x, window_vt_y,
1020 width, height, 1192 width, height,
1021 0, 1193 0,
1022 pix_colors_focused[Color_fg], 1194 pix_colors_focused[Color_fg],
1023 pix_colors_focused[Color_bg]); 1195 pix_colors_focused[Color_bg]);
1024 1196
1025 attributes.bit_gravity = NorthWestGravity; 1197 attributes.bit_gravity = NorthWestGravity;
1026 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1198 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1027 1199
1028 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1200 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1029 1201
1030 if (OPTION (Opt_pointerBlank)) 1202 if (option (Opt_pointerBlank))
1031 vt_emask |= PointerMotionMask; 1203 vt_emask |= PointerMotionMask;
1032 else 1204 else
1033 vt_emask |= Button1MotionMask | Button3MotionMask; 1205 vt_emask |= Button1MotionMask | Button3MotionMask;
1034 1206
1035 vt_select_input (); 1207 vt_select_input ();
1036 1208
1037 vt_ev.start (display, vt); 1209 vt_ev.start (display, vt);
1038 1210
1039#ifdef XPM_BACKGROUND
1040 if (rs[Rs_backgroundPixmap] != NULL
1041 && !OPTION (Opt_transparent))
1042 {
1043 const char *p = rs[Rs_backgroundPixmap];
1044
1045 if ((p = strchr (p, ';')) != NULL)
1046 {
1047 p++;
1048 scale_pixmap (p);
1049 }
1050
1051 set_bgPixmap (rs[Rs_backgroundPixmap]);
1052 scr_touch (true);
1053 }
1054#endif
1055
1056 /* graphics context for the vt window */ 1211 /* graphics context for the vt window */
1057 gcvalue.foreground = pix_colors[Color_fg]; 1212 gcvalue.foreground = pix_colors[Color_fg];
1058 gcvalue.background = pix_colors[Color_bg]; 1213 gcvalue.background = pix_colors[Color_bg];
1059 gcvalue.graphics_exposures = 1; 1214 gcvalue.graphics_exposures = 0;
1060 1215
1061 gc = XCreateGC (xdisp, vt, 1216 gc = XCreateGC (dpy, vt,
1062 GCForeground | GCBackground | GCGraphicsExposures, 1217 GCForeground | GCBackground | GCGraphicsExposures,
1063 &gcvalue); 1218 &gcvalue);
1064 1219
1065 drawable = new rxvt_drawable (this, vt); 1220 drawable = new rxvt_drawable (this, vt);
1066
1067#ifdef RXVT_SCROLLBAR
1068 gcvalue.foreground = pix_colors[Color_topShadow];
1069 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1070 gcvalue.foreground = pix_colors[Color_bottomShadow];
1071 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1072 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1073 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1074#endif
1075 1221
1076#ifdef OFF_FOCUS_FADING 1222#ifdef OFF_FOCUS_FADING
1077 // initially we are in unfocused state 1223 // initially we are in unfocused state
1078 if (rs[Rs_fade]) 1224 if (rs[Rs_fade])
1079 pix_colors = pix_colors_unfocused; 1225 pix_colors = pix_colors_unfocused;
… …
1085 1231
1086/* ------------------------------------------------------------------------- * 1232/* ------------------------------------------------------------------------- *
1087 * GET TTY CURRENT STATE * 1233 * GET TTY CURRENT STATE *
1088 * ------------------------------------------------------------------------- */ 1234 * ------------------------------------------------------------------------- */
1089void 1235void
1090rxvt_get_ttymode (ttymode_t *tio, int erase) 1236rxvt_get_ttymode (struct termios *tio, int erase)
1091{ 1237{
1092#ifdef HAVE_TERMIOS_H
1093 /* 1238 /*
1094 * standard System V termios interface 1239 * standard System V termios interface
1095 */ 1240 */
1096 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1241 if (tcgetattr (STDIN_FILENO, tio) < 0)
1097 { 1242 {
1098 // return error - use system defaults, 1243 // return error - use system defaults,
1099 // where possible, and zero elsewhere 1244 // where possible, and zero elsewhere
1100 memset (tio, 0, sizeof (ttymode_t)); 1245 memset (tio, 0, sizeof (struct termios));
1101 1246
1102 tio->c_cc[VINTR] = CINTR; 1247 tio->c_cc[VINTR] = CINTR;
1103 tio->c_cc[VQUIT] = CQUIT; 1248 tio->c_cc[VQUIT] = CQUIT;
1104 tio->c_cc[VERASE] = CERASE; 1249 tio->c_cc[VERASE] = CERASE;
1105#ifdef VERASE2 1250#ifdef VERASE2
… …
1164 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1309 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1165# if defined (ECHOCTL) && defined (ECHOKE) 1310# if defined (ECHOCTL) && defined (ECHOKE)
1166 | ECHOCTL | ECHOKE 1311 | ECHOCTL | ECHOKE
1167# endif 1312# endif
1168 | ECHOE | ECHOK); 1313 | ECHOE | ECHOK);
1169# else /* HAVE_TERMIOS_H */
1170
1171 /*
1172 * sgtty interface
1173 */
1174
1175 /* get parameters -- gtty */
1176 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1177 {
1178 tio->sg.sg_erase = CERASE; /* ^H */
1179 tio->sg.sg_kill = CKILL; /* ^U */
1180 }
1181
1182 if (erase != -1)
1183 tio->sg.sg_erase = (char)erase;
1184
1185 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1186
1187 /* get special characters */
1188 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1189 {
1190 tio->tc.t_intrc = CINTR; /* ^C */
1191 tio->tc.t_quitc = CQUIT; /* ^\ */
1192 tio->tc.t_startc = CSTART; /* ^Q */
1193 tio->tc.t_stopc = CSTOP; /* ^S */
1194 tio->tc.t_eofc = CEOF; /* ^D */
1195 tio->tc.t_brkc = -1;
1196 }
1197
1198 /* get local special chars */
1199 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1200 {
1201 tio->lc.t_suspc = CSUSP; /* ^Z */
1202 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1203 tio->lc.t_rprntc = CRPRNT; /* ^R */
1204 tio->lc.t_flushc = CFLUSH; /* ^O */
1205 tio->lc.t_werasc = CWERASE; /* ^W */
1206 tio->lc.t_lnextc = CLNEXT; /* ^V */
1207 }
1208 /* get line discipline */
1209 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1210# ifdef NTTYDISC
1211 tio->line = NTTYDISC;
1212# endif /* NTTYDISC */
1213
1214 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1215#endif /* HAVE_TERMIOS_H */
1216 1314
1217 /* 1315 /*
1218 * Debugging 1316 * Debugging
1219 */ 1317 */
1220#ifdef DEBUG_TTYMODE 1318#ifdef DEBUG_TTYMODE
1221#ifdef HAVE_TERMIOS_H
1222 /* c_iflag bits */ 1319 /* c_iflag bits */
1223 fprintf (stderr, "Input flags\n"); 1320 fprintf (stderr, "Input flags\n");
1224 1321
1225 /* cpp token stringize doesn't work on all machines <sigh> */ 1322 /* cpp token stringize doesn't work on all machines <sigh> */
1226# define FOO(flag,name) \ 1323# define FOO(flag,name) \
… …
1289 FOO (VLNEXT, "VLNEXT"); 1386 FOO (VLNEXT, "VLNEXT");
1290# endif 1387# endif
1291 1388
1292 fprintf (stderr, "\n"); 1389 fprintf (stderr, "\n");
1293# undef FOO 1390# undef FOO
1294# endif /* HAVE_TERMIOS_H */ 1391#endif /* DEBUG_TTYMODE */
1295#endif /* DEBUG_TTYMODE */
1296} 1392}
1297 1393
1298/*----------------------------------------------------------------------*/ 1394/*----------------------------------------------------------------------*/
1299/* 1395/*
1300 * Run the command in a subprocess and return a file descriptor for the 1396 * Run the command in a subprocess and return a file descriptor for the
… …
1321 else 1417 else
1322#endif 1418#endif
1323 if (!pty->get ()) 1419 if (!pty->get ())
1324 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1420 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1325 1421
1422 int er;
1423
1424#ifndef NO_BACKSPACE_KEY
1425 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1426 er = rs[Rs_backspace_key][0];
1427 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1428 er = '\177'; /* the initial state anyway */
1429 else
1430#endif
1431 er = -1;
1432
1433 rxvt_get_ttymode (&tio, er);
1434 /* init terminal attributes */
1435 cfsetospeed (&tio, BAUDRATE);
1436 cfsetispeed (&tio, BAUDRATE);
1437 tcsetattr (pty->tty, TCSANOW, &tio);
1326 pty->set_utf8_mode (enc_utf8); 1438 pty->set_utf8_mode (enc_utf8);
1327 1439
1328 /* set initial window size */ 1440 /* set initial window size */
1329 tt_winch (); 1441 tt_winch ();
1330
1331 int er;
1332
1333#ifndef NO_BACKSPACE_KEY
1334 if (key_backspace[0] && !key_backspace[1])
1335 er = key_backspace[0];
1336 else if (strcmp (key_backspace, "DEC") == 0)
1337 er = '\177'; /* the initial state anyway */
1338 else
1339#endif
1340 er = -1;
1341
1342 rxvt_get_ttymode (&tio, er);
1343 1442
1344#if ENABLE_FRILLS 1443#if ENABLE_FRILLS
1345 if (rs[Rs_pty_fd]) 1444 if (rs[Rs_pty_fd])
1346 return; 1445 return;
1347#endif 1446#endif
… …
1378 } 1477 }
1379 1478
1380 _exit (EXIT_FAILURE); 1479 _exit (EXIT_FAILURE);
1381 1480
1382 default: 1481 default:
1383 if (!OPTION (Opt_utmpInhibit)) 1482 if (!option (Opt_utmpInhibit))
1384 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1483 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1385 1484
1386 pty->close_tty (); 1485 pty->close_tty ();
1387 1486
1388 child_ev.start (cmd_pid); 1487 child_ev.start (cmd_pid);
1389 1488
… …
1402int 1501int
1403rxvt_term::run_child (const char *const *argv) 1502rxvt_term::run_child (const char *const *argv)
1404{ 1503{
1405 char *login; 1504 char *login;
1406 1505
1407 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1408
1409 if (OPTION (Opt_console)) 1506 if (option (Opt_console))
1507 {
1410 { /* be virtual console, fail silently */ 1508 /* be virtual console, fail silently */
1411#ifdef TIOCCONS 1509#ifdef TIOCCONS
1412 unsigned int on = 1; 1510 unsigned int on = 1;
1413 1511
1414 ioctl (STDIN_FILENO, TIOCCONS, &on); 1512 ioctl (STDIN_FILENO, TIOCCONS, &on);
1415#elif defined (SRIOCSREDIR) 1513#elif defined (SRIOCSREDIR)
… …
1417 1515
1418 fd = open (CONSOLE, O_WRONLY, 0); 1516 fd = open (CONSOLE, O_WRONLY, 0);
1419 if (fd >= 0) 1517 if (fd >= 0)
1420 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1518 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1421 close (fd); 1519 close (fd);
1422#endif /* SRIOCSREDIR */ 1520#endif /* SRIOCSREDIR */
1423 } 1521 }
1424 1522
1425 /* reset signals and spin off the command interpreter */ 1523 /* reset signals and spin off the command interpreter */
1426 signal (SIGINT, SIG_DFL); 1524 signal (SIGINT, SIG_DFL);
1427 signal (SIGQUIT, SIG_DFL); 1525 signal (SIGQUIT, SIG_DFL);
… …
1434 */ 1532 */
1435#ifdef SIGTSTP 1533#ifdef SIGTSTP
1436 signal (SIGTSTP, SIG_IGN); 1534 signal (SIGTSTP, SIG_IGN);
1437 signal (SIGTTIN, SIG_IGN); 1535 signal (SIGTTIN, SIG_IGN);
1438 signal (SIGTTOU, SIG_IGN); 1536 signal (SIGTTOU, SIG_IGN);
1439#endif /* SIGTSTP */ 1537#endif /* SIGTSTP */
1440
1441 // unblock signals (signals are blocked by iom.C
1442 sigset_t ss;
1443 sigemptyset (&ss);
1444 sigprocmask (SIG_SETMASK, &ss, 0);
1445 1538
1446 /* command interpreter path */ 1539 /* command interpreter path */
1447 if (argv != NULL) 1540 if (argv)
1448 { 1541 {
1449# ifdef DEBUG_CMD 1542# ifdef DEBUG_CMD
1450 int i; 1543 int i;
1451 1544
1452 for (i = 0; argv[i]; i++) 1545 for (i = 0; argv[i]; i++)
… …
1461 const char *argv0, *shell; 1554 const char *argv0, *shell;
1462 1555
1463 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1556 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1464 shell = "/bin/sh"; 1557 shell = "/bin/sh";
1465 1558
1466 argv0 = (const char *)rxvt_r_basename (shell); 1559 argv0 = (const char *)rxvt_basename (shell);
1467 1560
1468 if (OPTION (Opt_loginShell)) 1561 if (option (Opt_loginShell))
1469 { 1562 {
1470 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1563 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1471 1564
1472 login[0] = '-'; 1565 login[0] = '-';
1473 strcpy (&login[1], argv0); 1566 strcpy (&login[1], argv0);
1474 argv0 = login; 1567 argv0 = login;
1475 } 1568 }
1476 1569
1477 execlp (shell, argv0, NULL); 1570 execlp (shell, argv0, (char *)0);
1478 /* no error message: STDERR is closed! */ 1571 /* no error message: STDERR is closed! */
1479 } 1572 }
1480 1573
1481 return -1; 1574 return -1;
1482} 1575}

Diff Legend

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