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

Diff Legend

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