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.153 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.243 by root, Fri Jan 25 16:04:57 2008 UTC

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

Diff Legend

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