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.162 by root, Tue Jan 31 16:19:16 2006 UTC vs.
Revision 1.253 by root, Tue Jul 15 16:41:22 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 "rgb:00/00/00", // 0: black (Black) 153 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 154 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 155 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 156 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 157 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 158 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 159 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 160# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 161 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 162# else
58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite) 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 "rgb:4d/4d/4d", // 8: bright black (Grey30) 167 "rgb:4d/4d/4d", // 8: bright black (Grey30)
… …
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 "rgb:00/00/00", 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;
388
389 set (display);
390 extract_resources ();
303 391
304#if XFT 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 {
… …
366 459
367 /* no point having a scrollbar without having any scrollback! */ 460 /* no point having a scrollbar without having any scrollback! */
368 if (!saveLines) 461 if (!saveLines)
369 set_option (Opt_scrollBar, 0); 462 set_option (Opt_scrollBar, 0);
370 463
371#ifdef PRINTPIPE
372 if (!rs[Rs_print_pipe])
373 rs[Rs_print_pipe] = PRINTPIPE;
374#endif
375
376 if (!rs[Rs_cutchars]) 464 if (!rs[Rs_cutchars])
377 rs[Rs_cutchars] = CUTCHARS; 465 rs[Rs_cutchars] = CUTCHARS;
378 466
379#ifndef NO_BACKSPACE_KEY 467#ifndef NO_BACKSPACE_KEY
380 if (!rs[Rs_backspace_key]) 468 if (!rs[Rs_backspace_key])
381# ifdef DEFAULT_BACKSPACE 469# ifdef DEFAULT_BACKSPACE
382 key_backspace = DEFAULT_BACKSPACE; 470 rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
383# else 471# else
384 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 472 rs[Rs_backspace_key] = "DEC"; /* can toggle between \010 or \177 */
385# endif 473# 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 474#endif
394 475
395#ifndef NO_DELETE_KEY 476#ifndef NO_DELETE_KEY
396 if (!rs[Rs_delete_key]) 477 if (!rs[Rs_delete_key])
397# ifdef DEFAULT_DELETE 478# ifdef DEFAULT_DELETE
398 key_delete = DEFAULT_DELETE; 479 rs[Rs_delete_key] = DEFAULT_DELETE;
399# else 480# else
400 key_delete = "\033[3~"; 481 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 482# 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 483#endif
484
485 scrollBar.setup (this);
419 486
420#ifdef XTERM_REVERSE_VIDEO 487#ifdef XTERM_REVERSE_VIDEO
421 /* this is how xterm implements reverseVideo */ 488 /* this is how xterm implements reverseVideo */
422 if (OPTION (Opt_reverseVideo)) 489 if (option (Opt_reverseVideo))
423 { 490 {
424 if (!rs[Rs_color + Color_fg]) 491 if (!rs[Rs_color + Color_fg])
425 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 492 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
493
426 if (!rs[Rs_color + Color_bg]) 494 if (!rs[Rs_color + Color_bg])
427 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 495 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
428 } 496 }
429#endif 497#endif
430 498
… …
432 if (!rs[Rs_color + i]) 500 if (!rs[Rs_color + i])
433 rs[Rs_color + i] = def_colorName[i]; 501 rs[Rs_color + i] = def_colorName[i];
434 502
435#ifndef XTERM_REVERSE_VIDEO 503#ifndef XTERM_REVERSE_VIDEO
436 /* this is how we implement reverseVideo */ 504 /* this is how we implement reverseVideo */
437 if (OPTION (Opt_reverseVideo)) 505 if (option (Opt_reverseVideo))
438 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 506 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
439#endif 507#endif
440 508
441 /* convenient aliases for setting fg/bg to colors */ 509 /* convenient aliases for setting fg/bg to colors */
442 color_aliases (Color_fg); 510 color_aliases (Color_fg);
443 color_aliases (Color_bg); 511 color_aliases (Color_bg);
444#ifndef NO_CURSORCOLOR 512#ifndef NO_CURSORCOLOR
445 color_aliases (Color_cursor); 513 color_aliases (Color_cursor);
446 color_aliases (Color_cursor2); 514 color_aliases (Color_cursor2);
447#endif /* NO_CURSORCOLOR */ 515#endif /* NO_CURSORCOLOR */
448 color_aliases (Color_pointer_fg); 516 color_aliases (Color_pointer_fg);
449 color_aliases (Color_pointer_bg); 517 color_aliases (Color_pointer_bg);
450 color_aliases (Color_border); 518 color_aliases (Color_border);
451#ifndef NO_BOLD_UNDERLINE_REVERSE 519#ifndef NO_BOLD_UNDERLINE_REVERSE
452 color_aliases (Color_BD); 520 color_aliases (Color_BD);
453 color_aliases (Color_UL); 521 color_aliases (Color_UL);
454 color_aliases (Color_RV); 522 color_aliases (Color_RV);
455#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 523#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
456 524
457 if (!rs[Rs_color + Color_border]) 525 if (!rs[Rs_color + Color_border])
458 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg]; 526 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
459 527
460 return cmd_argv; 528 return cmd_argv;
529}
530
531/*----------------------------------------------------------------------*/
532void
533rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
534{
535 this->envv = envv;
536
537 SET_R (this);
538 set_locale ("");
539 set_environ (envv); // a few things in X do not call setlocale :(
540
541 init_vars ();
542
543 init_secondary ();
544
545 const char **cmd_argv = init_resources (argc, argv);
546
547#ifdef KEYSYM_RESOURCE
548 keyboard->register_done ();
549#endif
550
551 if (const char *path = rs[Rs_chdir])
552 if (*path) // ignored if empty
553 {
554 if (*path != '/')
555 rxvt_fatal ("specified shell working directory must start with a slash, aborting.\n");
556
557 if (chdir (path))
558 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
559 }
560
561 if (option (Opt_scrollBar))
562 scrollBar.state = STATE_IDLE; /* set existence for size calculations */
563
564 pty = ptytty::create ();
565
566 create_windows (argc, argv);
567
568 init_xlocale ();
569
570 scr_reset (); // initialize screen
571
572#if 0
573 XSynchronize (dpy, True);
574#endif
575
576 if (option (Opt_scrollBar))
577 scrollBar.resize (); /* create and map scrollbar */
578#ifdef HAVE_BG_PIXMAP
579 {
580 bgPixmap.set_target (this);
581 bgPixmap.invalidate ();
582
583#ifdef ENABLE_TRANSPARENCY
584 if (option (Opt_transparent))
585 {
586 bgPixmap.set_transparent ();
587
588#ifdef HAVE_AFTERIMAGE
589 if (rs [Rs_blurradius])
590 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
591#endif
592 if (ISSET_PIXCOLOR (Color_tint))
593 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
594
595 if (rs [Rs_shade])
596 bgPixmap.set_shade (rs [Rs_shade]);
597
598 bgPixmap.set_root_pixmap ();
599 XSelectInput (dpy, display->root, PropertyChangeMask);
600 rootwin_ev.start (display, display->root);
601 }
602#endif
603
604#ifdef BG_IMAGE_FROM_FILE
605 if (rs[Rs_backgroundPixmap])
606 {
607 const char *p = rs[Rs_backgroundPixmap];
608
609 if ((p = strchr (p, ';')) != 0)
610 {
611 p++;
612 bgPixmap.set_geometry (p);
613 }
614 else
615 bgPixmap.set_defaultGeometry ();
616
617 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
618 if (!bgPixmap.window_position_sensitive ())
619 update_background ();
620 }
621#endif
622 }
623#endif
624
625#if ENABLE_PERL
626 rootwin_ev.start (display, display->root);
627#endif
628
629 set_colorfgbg ();
630
631 init_command (cmd_argv);
632
633 free (cmd_argv);
634
635 if (pty->pty >= 0)
636 pty_ev.start (pty->pty, ev::READ);
637
638 HOOK_INVOKE ((this, HOOK_START, DT_END));
639
640#if ENABLE_XEMBED
641 if (rs[Rs_embed])
642 {
643 long info[2] = { 0, XEMBED_MAPPED };
644
645 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
646 32, PropModeReplace, (unsigned char *)&info, 2);
647 }
648#endif
649
650 XMapWindow (dpy, vt);
651 XMapWindow (dpy, parent[0]);
652
653 refresh_check ();
461} 654}
462 655
463/*----------------------------------------------------------------------*/ 656/*----------------------------------------------------------------------*/
464void 657void
465rxvt_term::init_env () 658rxvt_term::init_env ()
466{ 659{
467 int i; 660 int i;
468 unsigned int u;
469 char *val; 661 char *val;
470 662
471#ifdef DISPLAY_IS_IP 663#ifdef DISPLAY_IS_IP
472 /* Fixup display_name for export over pty to any interested terminal 664 /* 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 665 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
481 */ 673 */
482 val = rxvt_network_display (rs[Rs_display_name]); 674 val = rxvt_network_display (rs[Rs_display_name]);
483 rs[Rs_display_name] = (const char *)val; 675 rs[Rs_display_name] = (const char *)val;
484 676
485 if (val == NULL) 677 if (val == NULL)
486#endif /* DISPLAY_IS_IP */ 678#endif /* DISPLAY_IS_IP */
487 val = XDisplayString (xdisp); 679 val = XDisplayString (dpy);
488 680
489 if (rs[Rs_display_name] == NULL) 681 if (rs[Rs_display_name] == NULL)
490 rs[Rs_display_name] = val; /* use broken `:0' value */ 682 rs[Rs_display_name] = val; /* use broken `:0' value */
491 683
492 i = strlen (val); 684 i = strlen (val);
493 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 685 env_display = (char *)rxvt_malloc (i + 9);
494 686
495 sprintf (env_display, "DISPLAY=%s", val); 687 sprintf (env_display, "DISPLAY=%s", val);
496 688
497 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 689 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
498 690
… …
519 else 711 else
520 putenv ("COLORTERM=" COLORTERMENVFULL); 712 putenv ("COLORTERM=" COLORTERMENVFULL);
521 713
522 if (rs[Rs_term_name] != NULL) 714 if (rs[Rs_term_name] != NULL)
523 { 715 {
524 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 716 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
525 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 717 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
526 putenv (env_term); 718 putenv (env_term);
527 } 719 }
528 else 720 else
529 putenv ("TERM=" TERMENV); 721 putenv ("TERM=" TERMENV);
… …
531#ifdef HAVE_UNSETENV 723#ifdef HAVE_UNSETENV
532 /* avoid passing old settings and confusing term size */ 724 /* avoid passing old settings and confusing term size */
533 unsetenv ("LINES"); 725 unsetenv ("LINES");
534 unsetenv ("COLUMNS"); 726 unsetenv ("COLUMNS");
535 unsetenv ("TERMCAP"); /* terminfo should be okay */ 727 unsetenv ("TERMCAP"); /* terminfo should be okay */
536#endif /* HAVE_UNSETENV */ 728#endif /* HAVE_UNSETENV */
537} 729}
538 730
539/*----------------------------------------------------------------------*/ 731/*----------------------------------------------------------------------*/
540/* 732/*
541 * This is more or less stolen straight from XFree86 xterm. 733 * This is more or less stolen straight from XFree86 xterm.
… …
562 754
563 this->locale = "C"; 755 this->locale = "C";
564 } 756 }
565 757
566 758
567 this->locale = rxvt_strdup (this->locale); 759 this->locale = strdup (this->locale);
568 SET_LOCALE (this->locale); 760 SET_LOCALE (this->locale);
569 mbstate.reset (); 761 mbstate.reset ();
570#endif 762#endif
571 763
572#if HAVE_NL_LANGINFO 764#if HAVE_NL_LANGINFO
… …
616 * Initialize the command connection. 808 * Initialize the command connection.
617 * This should be called after the X server connection is established. 809 * This should be called after the X server connection is established.
618 */ 810 */
619 811
620#ifdef META8_OPTION 812#ifdef META8_OPTION
621 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 813 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
622#endif 814#endif
623 815
624 get_ourmods (); 816 get_ourmods ();
625 817
626 if (!OPTION (Opt_scrollTtyOutput)) 818 if (!option (Opt_scrollTtyOutput))
627 priv_modes |= PrivMode_TtyOutputInh; 819 priv_modes |= PrivMode_TtyOutputInh;
628 if (OPTION (Opt_scrollTtyKeypress)) 820 if (option (Opt_scrollTtyKeypress))
629 priv_modes |= PrivMode_Keypress; 821 priv_modes |= PrivMode_Keypress;
630 if (!OPTION (Opt_jumpScroll)) 822 if (!option (Opt_jumpScroll))
631 priv_modes |= PrivMode_smoothScroll; 823 priv_modes |= PrivMode_smoothScroll;
632 824
633#ifndef NO_BACKSPACE_KEY 825#ifndef NO_BACKSPACE_KEY
634 if (strcmp (key_backspace, "DEC") == 0) 826 if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
635 priv_modes |= PrivMode_HaveBackSpace; 827 priv_modes |= PrivMode_HaveBackSpace;
636#endif 828#endif
637 829
638 /* add value for scrollBar */ 830 /* add value for scrollBar */
639 if (scrollBar.state) 831 if (scrollBar.state)
… …
645 run_command (argv); 837 run_command (argv);
646} 838}
647 839
648/*----------------------------------------------------------------------*/ 840/*----------------------------------------------------------------------*/
649void 841void
650rxvt_term::Get_Colours () 842rxvt_term::get_colours ()
651{ 843{
652 int i; 844 int i;
653 845
654#ifdef OFF_FOCUS_FADING 846#ifdef OFF_FOCUS_FADING
655 pix_colors = pix_colors_focused; 847 pix_colors = pix_colors_focused;
656#endif 848#endif
657 849
658 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 850 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
659 { 851 {
852 const char *name = rs[Rs_color + i];
853
854 if (!name)
855 continue;
856
660 rxvt_color xcol; 857 rxvt_color xcol;
661 858
662 if (!rs[Rs_color + i])
663 continue;
664
665 if (!set_color (xcol, rs[Rs_color + i])) 859 if (!set_color (xcol, name))
666 { 860 {
667#ifndef XTERM_REVERSE_VIDEO 861#ifndef XTERM_REVERSE_VIDEO
668 if (i < 2 && OPTION (Opt_reverseVideo)) 862 if (i < 2 && option (Opt_reverseVideo))
669 rs[Rs_color + i] = def_colorName[!i]; 863 name = def_colorName [1 - i];
670 else 864 else
671#endif 865#endif
672 rs[Rs_color + i] = def_colorName[i]; 866 name = def_colorName [i];
673 867
674 if (!rs[Rs_color + i]) 868 if (!name)
675 continue; 869 continue;
676 870
677 if (!set_color (xcol, rs[Rs_color + i])) 871 if (!set_color (xcol, name))
678 { 872 {
679 switch (i) 873 switch (i)
680 { 874 {
681 case Color_fg: 875 case Color_fg:
682 case Color_bg: 876 case Color_bg:
683 /* fatal: need bg/fg color */
684 rxvt_warn ("unable to get foreground/background colour, continuing.\n"); 877 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
878 name = "";
685 break; 879 break;
686#ifndef NO_CURSORCOLOR 880#ifndef NO_CURSORCOLOR
687 case Color_cursor2: 881 case Color_cursor2:
688 xcol = pix_colors[Color_fg]; 882#endif
689 break;
690#endif /* ! NO_CURSORCOLOR */
691 case Color_pointer_fg: 883 case Color_pointer_fg:
692 xcol = pix_colors[Color_fg]; 884 name = rs[Rs_color + Color_fg];
885 xcol.set (this, name);
693 break; 886 break;
694 default: 887 default:
695 xcol = pix_colors[Color_bg]; /* None */ 888 name = rs[Rs_color + Color_bg];
889 xcol.set (this, name);
696 break; 890 break;
697 } 891 }
698 } 892 }
699 } 893 }
700 894
701 pix_colors[i] = xcol; 895 pix_colors[i] = xcol;
702 SET_PIXCOLOR (i); 896 rs[Rs_color + i] = name;
703 }
704
705#ifdef OFF_FOCUS_FADING
706 if (rs[Rs_fade])
707 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
708 {
709 rxvt_rgba c;
710 pix_colors[Color_fade].get (this, c);
711 pix_colors_unfocused[i] = pix_colors_focused[i].fade (this, atoi (rs[Rs_fade]), c);
712 } 897 }
713#endif
714 898
715 if (depth <= 2) 899 if (depth <= 2)
716 { 900 {
717 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 901 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
718 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 902 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
719 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 903 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
720 } 904 }
721 905
722 /* 906 /*
723 * get scrollBar shadow colors 907 * get scrollBar shadow colors
724 * 908 *
725 * The calculations of topShadow/bottomShadow values are adapted 909 * The calculations of topShadow/bottomShadow values are adapted
726 * from the fvwm window manager. 910 * from the fvwm window manager.
727 */ 911 */
728#ifdef KEEP_SCROLLCOLOR 912#ifdef RXVT_SCROLLBAR
729
730 if (depth <= 2) 913 if (depth <= 2)
731 { 914 {
732 /* Monochrome */ 915 /* Monochrome */
733 pix_colors[Color_scroll] = pix_colors[Color_fg]; 916 alias_color (Color_scroll, Color_fg);
734 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 917 alias_color (Color_topShadow, Color_bg);
735 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 918 alias_color (Color_bottomShadow, Color_bg);
736 } 919 }
737 else 920 else
738 { 921 {
739 rxvt_color xcol[2]; 922 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
740 /* xcol[0] == white
741 * xcol[1] == top shadow
742 * xcol[2] == bot shadow */
743 923
744 xcol[1] = pix_colors[Color_scroll]; 924 rgba cscroll;
745 xcol[0].set (this, rxvt_rgba (rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC, rxvt_rgba::MAX_CC)); 925 pix_colors [Color_scroll].get (cscroll);
746
747 rxvt_rgba c0, c1;
748
749 xcol[0].get (this, c0);
750 xcol[1].get (this, c1);
751
752 pix_colors[Color_bottomShadow] = xcol[1].fade (this, 50);
753 926
754 /* topShadowColor */ 927 /* topShadowColor */
755 if (!xcol[1].set (this, 928 if (!pix_colors[Color_topShadow].set (this,
756 rxvt_rgba ( 929 rgba (
757 min (c0.r, max (c1.r / 5, c1.r) * 7 / 5), 930 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
758 min (c0.g, max (c1.g / 5, c1.g) * 7 / 5), 931 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
759 min (c0.b, max (c1.b / 5, c1.b) * 7 / 5), 932 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
760 c1.a) // pa1 vs. pa0: arbitrary 933 cscroll.a)
761 )); 934 ))
762 xcol[1] = pix_colors[Color_White]; 935 alias_color (Color_topShadow, Color_White);
763
764 pix_colors[Color_topShadow] = xcol[1];
765 } 936 }
766#endif /* KEEP_SCROLLCOLOR */ 937#endif
938
939#ifdef OFF_FOCUS_FADING
940 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
941 update_fade_color (i);
942#endif
767} 943}
768 944
769/*----------------------------------------------------------------------*/ 945/*----------------------------------------------------------------------*/
770/* color aliases, fg/bg bright-bold */ 946/* color aliases, fg/bg bright-bold */
771void 947void
… …
774 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 950 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
775 { 951 {
776 int i = atoi (rs[Rs_color + idx]); 952 int i = atoi (rs[Rs_color + idx]);
777 953
778 if (i >= 8 && i <= 15) 954 if (i >= 8 && i <= 15)
779 { /* bright colors */ 955 /* bright colors */
780 i -= 8;
781 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 956 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
782 return; 957 else if (i >= 0 && i <= 7)
783 } 958 /* normal colors */
784
785 if (i >= 0 && i <= 7) /* normal colors */
786 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 959 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
787 } 960 }
788} 961}
789 962
790/*----------------------------------------------------------------------*/ 963/*----------------------------------------------------------------------*/
… …
810 983
811 if (rsmod 984 if (rsmod
812 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 985 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
813 requestedmeta = rsmod[3] - '0'; 986 requestedmeta = rsmod[3] - '0';
814 987
815 map = XGetModifierMapping (xdisp); 988 map = XGetModifierMapping (dpy);
816 kc = map->modifiermap; 989 kc = map->modifiermap;
817 990
818 for (i = 1; i < 6; i++) 991 for (i = 1; i < 6; i++)
819 { 992 {
820 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 993 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
822 for (j = map->max_keypermod; j--; k++) 995 for (j = map->max_keypermod; j--; k++)
823 { 996 {
824 if (kc[k] == 0) 997 if (kc[k] == 0)
825 break; 998 break;
826 999
827 switch (XKeycodeToKeysym (xdisp, kc[k], 0)) 1000 switch (XKeycodeToKeysym (dpy, kc[k], 0))
828 { 1001 {
829 case XK_Num_Lock: 1002 case XK_Num_Lock:
830 ModNumLockMask = modmasks[i - 1]; 1003 ModNumLockMask = modmasks[i - 1];
831 continue; 1004 continue;
832 1005
… …
882rxvt_term::create_windows (int argc, const char *const *argv) 1055rxvt_term::create_windows (int argc, const char *const *argv)
883{ 1056{
884 XClassHint classHint; 1057 XClassHint classHint;
885 XWMHints wmHint; 1058 XWMHints wmHint;
886#if ENABLE_FRILLS 1059#if ENABLE_FRILLS
887 MWMHints mwmhints; 1060 MWMHints mwmhints = { };
888#endif 1061#endif
889 XGCValues gcvalue; 1062 XGCValues gcvalue;
890 XSetWindowAttributes attributes; 1063 XSetWindowAttributes attributes;
891 Window top, parent; 1064 Window top, parent;
892 1065
893 dLocal (Display *, xdisp); 1066 dLocal (Display *, dpy);
894 1067
895 /* grab colors before netscape does */ 1068 /* grab colors before netscape does */
896 Get_Colours (); 1069 get_colours ();
897 1070
898 if (!set_fonts ()) 1071 if (!set_fonts ())
899 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1072 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
900 1073
901 parent = display->root; 1074 parent = display->root;
902 1075
903 attributes.override_redirect = !!OPTION (Opt_override_redirect); 1076 attributes.override_redirect = !!option (Opt_override_redirect);
904 1077
905#if ENABLE_FRILLS 1078#if ENABLE_FRILLS
906 if (OPTION (Opt_borderLess)) 1079 if (option (Opt_borderLess))
907 { 1080 {
908 if (XInternAtom (xdisp, "_MOTIF_WM_INFO", True) == None) 1081 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
909 { 1082 {
910 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1083 // rxvt_warn("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");
911 attributes.override_redirect = true; 1084 attributes.override_redirect = true;
912 mwmhints.flags = 0;
913 } 1085 }
914 else 1086 else
915 { 1087 {
916 mwmhints.flags = MWM_HINTS_DECORATIONS; 1088 mwmhints.flags = MWM_HINTS_DECORATIONS;
917 mwmhints.decorations = 0;
918 } 1089 }
919 } 1090 }
920 else
921 mwmhints.flags = 0;
922#endif 1091#endif
923 1092
924#if ENABLE_XEMBED 1093#if ENABLE_XEMBED
925 if (rs[Rs_embed]) 1094 if (rs[Rs_embed])
926 { 1095 {
927 XWindowAttributes wattr; 1096 XWindowAttributes wattr;
928 1097
929 parent = strtol (rs[Rs_embed], 0, 0); 1098 parent = strtol (rs[Rs_embed], 0, 0);
930 1099
931 if (!XGetWindowAttributes (xdisp, parent, &wattr)) 1100 if (!XGetWindowAttributes (dpy, parent, &wattr))
932 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 1101 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
933 1102
934 window_calc (wattr.width, wattr.height); 1103 window_calc (wattr.width, wattr.height);
935 } 1104 }
936#endif 1105#endif
… …
940 /* sub-window placement & size in rxvt_resize_subwindows () */ 1109 /* sub-window placement & size in rxvt_resize_subwindows () */
941 attributes.background_pixel = pix_colors_focused [Color_border]; 1110 attributes.background_pixel = pix_colors_focused [Color_border];
942 attributes.border_pixel = pix_colors_focused [Color_border]; 1111 attributes.border_pixel = pix_colors_focused [Color_border];
943 attributes.colormap = cmap; 1112 attributes.colormap = cmap;
944 1113
945 top = XCreateWindow (xdisp, parent, 1114 top = XCreateWindow (dpy, parent,
946 szHint.x, szHint.y, 1115 szHint.x, szHint.y,
947 szHint.width, szHint.height, 1116 szHint.width, szHint.height,
948 ext_bwidth, 1117 ext_bwidth,
949 depth, InputOutput, visual, 1118 depth, InputOutput, visual,
950 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1119 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
… …
961 classHint.res_name = (char *)rs[Rs_name]; 1130 classHint.res_name = (char *)rs[Rs_name];
962 classHint.res_class = (char *)RESCLASS; 1131 classHint.res_class = (char *)RESCLASS;
963 1132
964 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1133 wmHint.flags = InputHint | StateHint | WindowGroupHint;
965 wmHint.input = True; 1134 wmHint.input = True;
966 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 1135 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
967 wmHint.window_group = top; 1136 wmHint.window_group = top;
968 1137
969 XmbSetWMProperties (xdisp, top, NULL, NULL, (char **)argv, argc, 1138 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
970 &szHint, &wmHint, &classHint); 1139 &szHint, &wmHint, &classHint);
971 1140
972#if ENABLE_FRILLS 1141#if ENABLE_FRILLS
973 if (mwmhints.flags) 1142 if (mwmhints.flags)
974 XChangeProperty (xdisp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1143 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
975 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1144 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
976#endif 1145#endif
977 1146
978 Atom protocols[] = { 1147 Atom protocols[] = {
979 xa[XA_WM_DELETE_WINDOW], 1148 xa[XA_WM_DELETE_WINDOW],
980#if ENABLE_EWMH 1149#if ENABLE_EWMH
981 xa[XA_NET_WM_PING], 1150 xa[XA_NET_WM_PING],
982#endif 1151#endif
983 }; 1152 };
984 1153
985 XSetWMProtocols (xdisp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1154 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
986 1155
987#if ENABLE_FRILLS 1156#if ENABLE_FRILLS
988 if (rs[Rs_transient_for]) 1157 if (rs[Rs_transient_for])
989 XSetTransientForHint (xdisp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1158 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
990#endif 1159#endif
991 1160
992#if ENABLE_EWMH 1161#if ENABLE_EWMH
993 long pid = getpid (); 1162 long pid = getpid ();
994 1163
995 XChangeProperty (xdisp, top, 1164 XChangeProperty (dpy, top,
996 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1165 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
997 PropModeReplace, (unsigned char *)&pid, 1); 1166 PropModeReplace, (unsigned char *)&pid, 1);
998 1167
999 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1168 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1000#endif 1169#endif
1001 1170
1002 XSelectInput (xdisp, top, 1171 XSelectInput (dpy, top,
1003 KeyPressMask 1172 KeyPressMask
1004#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1173#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1005 | KeyReleaseMask 1174 | KeyReleaseMask
1006#endif 1175#endif
1007 | FocusChangeMask | VisibilityChangeMask 1176 | FocusChangeMask | VisibilityChangeMask
1008 | ExposureMask | StructureNotifyMask); 1177 | ExposureMask | StructureNotifyMask);
1009 1178
1010 termwin_ev.start (display, top); 1179 termwin_ev.start (display, top);
1011 1180
1012 /* vt cursor: Black-on-White is standard, but this is more popular */ 1181 /* vt cursor: Black-on-White is standard, but this is more popular */
1013 TermWin_cursor = XCreateFontCursor (xdisp, XC_xterm); 1182 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1014
1015#ifdef HAVE_SCROLLBARS
1016 /* cursor scrollBar: Black-on-White */
1017 leftptr_cursor = XCreateFontCursor (xdisp, XC_left_ptr);
1018#endif
1019 1183
1020 /* the vt window */ 1184 /* the vt window */
1021 vt = XCreateSimpleWindow (xdisp, top, 1185 vt = XCreateSimpleWindow (dpy, top,
1022 window_vt_x, window_vt_y, 1186 window_vt_x, window_vt_y,
1023 width, height, 1187 width, height,
1024 0, 1188 0,
1025 pix_colors_focused[Color_fg], 1189 pix_colors_focused[Color_fg],
1026 pix_colors_focused[Color_bg]); 1190 pix_colors_focused[Color_bg]);
1027 1191
1028 attributes.bit_gravity = NorthWestGravity; 1192 attributes.bit_gravity = NorthWestGravity;
1029 XChangeWindowAttributes (xdisp, vt, CWBitGravity, &attributes); 1193 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1030 1194
1031 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1195 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1032 1196
1033 if (OPTION (Opt_pointerBlank)) 1197 if (option (Opt_pointerBlank))
1034 vt_emask |= PointerMotionMask; 1198 vt_emask |= PointerMotionMask;
1035 else 1199 else
1036 vt_emask |= Button1MotionMask | Button3MotionMask; 1200 vt_emask |= Button1MotionMask | Button3MotionMask;
1037 1201
1038 vt_select_input (); 1202 vt_select_input ();
1039 1203
1040 vt_ev.start (display, vt); 1204 vt_ev.start (display, vt);
1041 1205
1042#ifdef XPM_BACKGROUND
1043 if (rs[Rs_backgroundPixmap] != NULL
1044 && !OPTION (Opt_transparent))
1045 {
1046 const char *p = rs[Rs_backgroundPixmap];
1047
1048 if ((p = strchr (p, ';')) != NULL)
1049 {
1050 p++;
1051 scale_pixmap (p);
1052 }
1053
1054 set_bgPixmap (rs[Rs_backgroundPixmap]);
1055 scr_touch (true);
1056 }
1057#endif
1058
1059 /* graphics context for the vt window */ 1206 /* graphics context for the vt window */
1060 gcvalue.foreground = pix_colors[Color_fg]; 1207 gcvalue.foreground = pix_colors[Color_fg];
1061 gcvalue.background = pix_colors[Color_bg]; 1208 gcvalue.background = pix_colors[Color_bg];
1062 gcvalue.graphics_exposures = 1; 1209 gcvalue.graphics_exposures = 0;
1063 1210
1064 gc = XCreateGC (xdisp, vt, 1211 gc = XCreateGC (dpy, vt,
1065 GCForeground | GCBackground | GCGraphicsExposures, 1212 GCForeground | GCBackground | GCGraphicsExposures,
1066 &gcvalue); 1213 &gcvalue);
1067 1214
1068 drawable = new rxvt_drawable (this, vt); 1215 drawable = new rxvt_drawable (this, vt);
1069
1070#ifdef RXVT_SCROLLBAR
1071 gcvalue.foreground = pix_colors[Color_topShadow];
1072 topShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1073 gcvalue.foreground = pix_colors[Color_bottomShadow];
1074 botShadowGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1075 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1076 scrollbarGC = XCreateGC (xdisp, vt, GCForeground, &gcvalue);
1077#endif
1078 1216
1079#ifdef OFF_FOCUS_FADING 1217#ifdef OFF_FOCUS_FADING
1080 // initially we are in unfocused state 1218 // initially we are in unfocused state
1081 if (rs[Rs_fade]) 1219 if (rs[Rs_fade])
1082 pix_colors = pix_colors_unfocused; 1220 pix_colors = pix_colors_unfocused;
… …
1088 1226
1089/* ------------------------------------------------------------------------- * 1227/* ------------------------------------------------------------------------- *
1090 * GET TTY CURRENT STATE * 1228 * GET TTY CURRENT STATE *
1091 * ------------------------------------------------------------------------- */ 1229 * ------------------------------------------------------------------------- */
1092void 1230void
1093rxvt_get_ttymode (ttymode_t *tio, int erase) 1231rxvt_get_ttymode (struct termios *tio, int erase)
1094{ 1232{
1095#ifdef HAVE_TERMIOS_H
1096 /* 1233 /*
1097 * standard System V termios interface 1234 * standard System V termios interface
1098 */ 1235 */
1099 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1236 if (tcgetattr (STDIN_FILENO, tio) < 0)
1100 { 1237 {
1101 // return error - use system defaults, 1238 // return error - use system defaults,
1102 // where possible, and zero elsewhere 1239 // where possible, and zero elsewhere
1103 memset (tio, 0, sizeof (ttymode_t)); 1240 memset (tio, 0, sizeof (struct termios));
1104 1241
1105 tio->c_cc[VINTR] = CINTR; 1242 tio->c_cc[VINTR] = CINTR;
1106 tio->c_cc[VQUIT] = CQUIT; 1243 tio->c_cc[VQUIT] = CQUIT;
1107 tio->c_cc[VERASE] = CERASE; 1244 tio->c_cc[VERASE] = CERASE;
1108#ifdef VERASE2 1245#ifdef VERASE2
… …
1167 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1304 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1168# if defined (ECHOCTL) && defined (ECHOKE) 1305# if defined (ECHOCTL) && defined (ECHOKE)
1169 | ECHOCTL | ECHOKE 1306 | ECHOCTL | ECHOKE
1170# endif 1307# endif
1171 | ECHOE | ECHOK); 1308 | ECHOE | ECHOK);
1172# else /* HAVE_TERMIOS_H */
1173
1174 /*
1175 * sgtty interface
1176 */
1177
1178 /* get parameters -- gtty */
1179 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1180 {
1181 tio->sg.sg_erase = CERASE; /* ^H */
1182 tio->sg.sg_kill = CKILL; /* ^U */
1183 }
1184
1185 if (erase != -1)
1186 tio->sg.sg_erase = (char)erase;
1187
1188 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1189
1190 /* get special characters */
1191 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1192 {
1193 tio->tc.t_intrc = CINTR; /* ^C */
1194 tio->tc.t_quitc = CQUIT; /* ^\ */
1195 tio->tc.t_startc = CSTART; /* ^Q */
1196 tio->tc.t_stopc = CSTOP; /* ^S */
1197 tio->tc.t_eofc = CEOF; /* ^D */
1198 tio->tc.t_brkc = -1;
1199 }
1200
1201 /* get local special chars */
1202 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1203 {
1204 tio->lc.t_suspc = CSUSP; /* ^Z */
1205 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1206 tio->lc.t_rprntc = CRPRNT; /* ^R */
1207 tio->lc.t_flushc = CFLUSH; /* ^O */
1208 tio->lc.t_werasc = CWERASE; /* ^W */
1209 tio->lc.t_lnextc = CLNEXT; /* ^V */
1210 }
1211 /* get line discipline */
1212 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1213# ifdef NTTYDISC
1214 tio->line = NTTYDISC;
1215# endif /* NTTYDISC */
1216
1217 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1218#endif /* HAVE_TERMIOS_H */
1219 1309
1220 /* 1310 /*
1221 * Debugging 1311 * Debugging
1222 */ 1312 */
1223#ifdef DEBUG_TTYMODE 1313#ifdef DEBUG_TTYMODE
1224#ifdef HAVE_TERMIOS_H
1225 /* c_iflag bits */ 1314 /* c_iflag bits */
1226 fprintf (stderr, "Input flags\n"); 1315 fprintf (stderr, "Input flags\n");
1227 1316
1228 /* cpp token stringize doesn't work on all machines <sigh> */ 1317 /* cpp token stringize doesn't work on all machines <sigh> */
1229# define FOO(flag,name) \ 1318# define FOO(flag,name) \
… …
1292 FOO (VLNEXT, "VLNEXT"); 1381 FOO (VLNEXT, "VLNEXT");
1293# endif 1382# endif
1294 1383
1295 fprintf (stderr, "\n"); 1384 fprintf (stderr, "\n");
1296# undef FOO 1385# undef FOO
1297# endif /* HAVE_TERMIOS_H */ 1386#endif /* DEBUG_TTYMODE */
1298#endif /* DEBUG_TTYMODE */
1299} 1387}
1300 1388
1301/*----------------------------------------------------------------------*/ 1389/*----------------------------------------------------------------------*/
1302/* 1390/*
1303 * Run the command in a subprocess and return a file descriptor for the 1391 * Run the command in a subprocess and return a file descriptor for the
… …
1324 else 1412 else
1325#endif 1413#endif
1326 if (!pty->get ()) 1414 if (!pty->get ())
1327 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1415 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1328 1416
1417 int er;
1418
1419#ifndef NO_BACKSPACE_KEY
1420 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1421 er = rs[Rs_backspace_key][0];
1422 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1423 er = '\177'; /* the initial state anyway */
1424 else
1425#endif
1426 er = -1;
1427
1428 rxvt_get_ttymode (&tio, er);
1429 /* init terminal attributes */
1430 cfsetospeed (&tio, BAUDRATE);
1431 cfsetispeed (&tio, BAUDRATE);
1432 tcsetattr (pty->tty, TCSANOW, &tio);
1329 pty->set_utf8_mode (enc_utf8); 1433 pty->set_utf8_mode (enc_utf8);
1330 1434
1331 /* set initial window size */ 1435 /* set initial window size */
1332 tt_winch (); 1436 tt_winch ();
1333
1334 int er;
1335
1336#ifndef NO_BACKSPACE_KEY
1337 if (key_backspace[0] && !key_backspace[1])
1338 er = key_backspace[0];
1339 else if (strcmp (key_backspace, "DEC") == 0)
1340 er = '\177'; /* the initial state anyway */
1341 else
1342#endif
1343 er = -1;
1344
1345 rxvt_get_ttymode (&tio, er);
1346 1437
1347#if ENABLE_FRILLS 1438#if ENABLE_FRILLS
1348 if (rs[Rs_pty_fd]) 1439 if (rs[Rs_pty_fd])
1349 return; 1440 return;
1350#endif 1441#endif
… …
1381 } 1472 }
1382 1473
1383 _exit (EXIT_FAILURE); 1474 _exit (EXIT_FAILURE);
1384 1475
1385 default: 1476 default:
1386 if (!OPTION (Opt_utmpInhibit)) 1477 if (!option (Opt_utmpInhibit))
1387 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1478 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1388 1479
1389 pty->close_tty (); 1480 pty->close_tty ();
1390 1481
1391 child_ev.start (cmd_pid); 1482 child_ev.start (cmd_pid);
1392 1483
… …
1405int 1496int
1406rxvt_term::run_child (const char *const *argv) 1497rxvt_term::run_child (const char *const *argv)
1407{ 1498{
1408 char *login; 1499 char *login;
1409 1500
1410 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1411
1412 if (OPTION (Opt_console)) 1501 if (option (Opt_console))
1502 {
1413 { /* be virtual console, fail silently */ 1503 /* be virtual console, fail silently */
1414#ifdef TIOCCONS 1504#ifdef TIOCCONS
1415 unsigned int on = 1; 1505 unsigned int on = 1;
1416 1506
1417 ioctl (STDIN_FILENO, TIOCCONS, &on); 1507 ioctl (STDIN_FILENO, TIOCCONS, &on);
1418#elif defined (SRIOCSREDIR) 1508#elif defined (SRIOCSREDIR)
… …
1420 1510
1421 fd = open (CONSOLE, O_WRONLY, 0); 1511 fd = open (CONSOLE, O_WRONLY, 0);
1422 if (fd >= 0) 1512 if (fd >= 0)
1423 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1513 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1424 close (fd); 1514 close (fd);
1425#endif /* SRIOCSREDIR */ 1515#endif /* SRIOCSREDIR */
1426 } 1516 }
1427 1517
1428 /* reset signals and spin off the command interpreter */ 1518 /* reset signals and spin off the command interpreter */
1429 signal (SIGINT, SIG_DFL); 1519 signal (SIGINT, SIG_DFL);
1430 signal (SIGQUIT, SIG_DFL); 1520 signal (SIGQUIT, SIG_DFL);
… …
1437 */ 1527 */
1438#ifdef SIGTSTP 1528#ifdef SIGTSTP
1439 signal (SIGTSTP, SIG_IGN); 1529 signal (SIGTSTP, SIG_IGN);
1440 signal (SIGTTIN, SIG_IGN); 1530 signal (SIGTTIN, SIG_IGN);
1441 signal (SIGTTOU, SIG_IGN); 1531 signal (SIGTTOU, SIG_IGN);
1442#endif /* SIGTSTP */ 1532#endif /* SIGTSTP */
1443
1444 // unblock signals (signals are blocked by iom.C
1445 sigset_t ss;
1446 sigemptyset (&ss);
1447 sigprocmask (SIG_SETMASK, &ss, 0);
1448 1533
1449 /* command interpreter path */ 1534 /* command interpreter path */
1450 if (argv != NULL) 1535 if (argv)
1451 { 1536 {
1452# ifdef DEBUG_CMD 1537# ifdef DEBUG_CMD
1453 int i; 1538 int i;
1454 1539
1455 for (i = 0; argv[i]; i++) 1540 for (i = 0; argv[i]; i++)
… …
1464 const char *argv0, *shell; 1549 const char *argv0, *shell;
1465 1550
1466 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1551 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1467 shell = "/bin/sh"; 1552 shell = "/bin/sh";
1468 1553
1469 argv0 = (const char *)rxvt_r_basename (shell); 1554 argv0 = (const char *)rxvt_basename (shell);
1470 1555
1471 if (OPTION (Opt_loginShell)) 1556 if (option (Opt_loginShell))
1472 { 1557 {
1473 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1558 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1474 1559
1475 login[0] = '-'; 1560 login[0] = '-';
1476 strcpy (&login[1], argv0); 1561 strcpy (&login[1], argv0);
1477 argv0 = login; 1562 argv0 = login;
1478 } 1563 }
1479 1564
1480 execlp (shell, argv0, NULL); 1565 execlp (shell, argv0, (char *)0);
1481 /* no error message: STDERR is closed! */ 1566 /* no error message: STDERR is closed! */
1482 } 1567 }
1483 1568
1484 return -1; 1569 return -1;
1485} 1570}

Diff Legend

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