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.70 by root, Fri Aug 13 03:47:09 2004 UTC vs.
Revision 1.105 by root, Mon Jan 17 00:59:23 2005 UTC

… …
31 * Initialisation routines. 31 * Initialisation routines.
32 */ 32 */
33 33
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h"
36#include "init.h" 37#include "init.h"
37 38
38#include <signal.h> 39#include <csignal>
39 40
40const char *const def_colorName[] = 41const char *const def_colorName[] =
41 { 42 {
42 COLOR_FOREGROUND, 43 COLOR_FOREGROUND,
43 COLOR_BACKGROUND, 44 COLOR_BACKGROUND,
… …
67 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
68 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
69 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
70 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 71 "Cyan", /* 6/14: bright cyan (#00FFFF) */
71 "White", /* 7/15: bright white (#FFFFFF) */ 72 "White", /* 7/15: bright white (#FFFFFF) */
72#ifdef TTY_256COLOR 73
73 "rgbi:0/0/0", /* default 16-255 color table */ 74 // 88 xterm colours
74 "rgbi:0/0/.2", /* consists of 6 6x6 colour cubes */ 75 "rgb:00/00/00",
75 "rgbi:0/0/.4", /* and a 24 greyscale ramp w/o */
76 "rgbi:0/0/.6", /* black or white */
77 "rgbi:0/0/.8", 76 "rgb:00/00/8b",
78 "rgbi:0/0/1", 77 "rgb:00/00/cd",
79 "rgbi:0/.2/0", 78 "rgb:00/00/ff",
80 "rgbi:0/.2/.2",
81 "rgbi:0/.2/.4",
82 "rgbi:0/.2/.6",
83 "rgbi:0/.2/.8",
84 "rgbi:0/.2/1",
85 "rgbi:0/.4/0",
86 "rgbi:0/.4/.2",
87 "rgbi:0/.4/.4",
88 "rgbi:0/.4/.6",
89 "rgbi:0/.4/.8",
90 "rgbi:0/.4/1",
91 "rgbi:0/.6/0",
92 "rgbi:0/.6/.2",
93 "rgbi:0/.6/.4",
94 "rgbi:0/.6/.6",
95 "rgbi:0/.6/.8",
96 "rgbi:0/.6/1",
97 "rgbi:0/.8/0", 79 "rgb:00/8b/00",
98 "rgbi:0/.8/.2",
99 "rgbi:0/.8/.4",
100 "rgbi:0/.8/.6",
101 "rgbi:0/.8/.8", 80 "rgb:00/8b/8b",
102 "rgbi:0/.8/1", 81 "rgb:00/8b/cd",
82 "rgb:00/8b/ff",
103 "rgbi:0/1/0", 83 "rgb:00/cd/00",
104 "rgbi:0/1/.2",
105 "rgbi:0/1/.4",
106 "rgbi:0/1/.6",
107 "rgbi:0/1/.8", 84 "rgb:00/cd/8b",
108 "rgbi:0/1/1", 85 "rgb:00/cd/cd",
86 "rgb:00/cd/ff",
109 "rgbi:.2/0/0", 87 "rgb:00/ff/00",
110 "rgbi:.2/0/.2", 88 "rgb:00/ff/8b",
111 "rgbi:.2/0/.4", 89 "rgb:00/ff/cd",
112 "rgbi:.2/0/.6", 90 "rgb:00/ff/ff",
113 "rgbi:.2/0/.8",
114 "rgbi:.2/0/1",
115 "rgbi:.2/.2/0",
116 "rgbi:.2/.2/.2",
117 "rgbi:.2/.2/.4",
118 "rgbi:.2/.2/.6",
119 "rgbi:.2/.2/.8",
120 "rgbi:.2/.2/1",
121 "rgbi:.2/.4/0",
122 "rgbi:.2/.4/.2",
123 "rgbi:.2/.4/.4",
124 "rgbi:.2/.4/.6",
125 "rgbi:.2/.4/.8",
126 "rgbi:.2/.4/1",
127 "rgbi:.2/.6/0",
128 "rgbi:.2/.6/.2",
129 "rgbi:.2/.6/.4",
130 "rgbi:.2/.6/.6",
131 "rgbi:.2/.6/.8",
132 "rgbi:.2/.6/1",
133 "rgbi:.2/.8/0",
134 "rgbi:.2/.8/.2",
135 "rgbi:.2/.8/.4",
136 "rgbi:.2/.8/.6",
137 "rgbi:.2/.8/.8",
138 "rgbi:.2/.8/1",
139 "rgbi:.2/1/0",
140 "rgbi:.2/1/.2",
141 "rgbi:.2/1/.4",
142 "rgbi:.2/1/.6",
143 "rgbi:.2/1/.8",
144 "rgbi:.2/1/1",
145 "rgbi:.4/0/0",
146 "rgbi:.4/0/.2",
147 "rgbi:.4/0/.4",
148 "rgbi:.4/0/.6",
149 "rgbi:.4/0/.8",
150 "rgbi:.4/0/1",
151 "rgbi:.4/.2/0",
152 "rgbi:.4/.2/.2",
153 "rgbi:.4/.2/.4",
154 "rgbi:.4/.2/.6",
155 "rgbi:.4/.2/.8",
156 "rgbi:.4/.2/1",
157 "rgbi:.4/.4/0",
158 "rgbi:.4/.4/.2",
159 "rgbi:.4/.4/.4",
160 "rgbi:.4/.4/.6",
161 "rgbi:.4/.4/.8",
162 "rgbi:.4/.4/1",
163 "rgbi:.4/.6/0",
164 "rgbi:.4/.6/.2",
165 "rgbi:.4/.6/.4",
166 "rgbi:.4/.6/.6",
167 "rgbi:.4/.6/.8",
168 "rgbi:.4/.6/1",
169 "rgbi:.4/.8/0",
170 "rgbi:.4/.8/.2",
171 "rgbi:.4/.8/.4",
172 "rgbi:.4/.8/.6",
173 "rgbi:.4/.8/.8",
174 "rgbi:.4/.8/1",
175 "rgbi:.4/1/0",
176 "rgbi:.4/1/.2",
177 "rgbi:.4/1/.4",
178 "rgbi:.4/1/.6",
179 "rgbi:.4/1/.8",
180 "rgbi:.4/1/1",
181 "rgbi:.6/0/0",
182 "rgbi:.6/0/.2",
183 "rgbi:.6/0/.4",
184 "rgbi:.6/0/.6",
185 "rgbi:.6/0/.8",
186 "rgbi:.6/0/1",
187 "rgbi:.6/.2/0",
188 "rgbi:.6/.2/.2",
189 "rgbi:.6/.2/.4",
190 "rgbi:.6/.2/.6",
191 "rgbi:.6/.2/.8",
192 "rgbi:.6/.2/1",
193 "rgbi:.6/.4/0",
194 "rgbi:.6/.4/.2",
195 "rgbi:.6/.4/.4",
196 "rgbi:.6/.4/.6",
197 "rgbi:.6/.4/.8",
198 "rgbi:.6/.4/1",
199 "rgbi:.6/.6/0",
200 "rgbi:.6/.6/.2",
201 "rgbi:.6/.6/.4",
202 "rgbi:.6/.6/.6",
203 "rgbi:.6/.6/.8",
204 "rgbi:.6/.6/1",
205 "rgbi:.6/.8/0",
206 "rgbi:.6/.8/.2",
207 "rgbi:.6/.8/.4",
208 "rgbi:.6/.8/.6",
209 "rgbi:.6/.8/.8",
210 "rgbi:.6/.8/1",
211 "rgbi:.6/1/0",
212 "rgbi:.6/1/.2",
213 "rgbi:.6/1/.4",
214 "rgbi:.6/1/.6",
215 "rgbi:.6/1/.8",
216 "rgbi:.6/1/1",
217 "rgbi:.8/0/0", 91 "rgb:8b/00/00",
218 "rgbi:.8/0/.2",
219 "rgbi:.8/0/.4",
220 "rgbi:.8/0/.6",
221 "rgbi:.8/0/.8", 92 "rgb:8b/00/8b",
222 "rgbi:.8/0/1", 93 "rgb:8b/00/cd",
223 "rgbi:.8/.2/0", 94 "rgb:8b/00/ff",
224 "rgbi:.8/.2/.2",
225 "rgbi:.8/.2/.4",
226 "rgbi:.8/.2/.6",
227 "rgbi:.8/.2/.8",
228 "rgbi:.8/.2/1",
229 "rgbi:.8/.4/0",
230 "rgbi:.8/.4/.2",
231 "rgbi:.8/.4/.4",
232 "rgbi:.8/.4/.6",
233 "rgbi:.8/.4/.8",
234 "rgbi:.8/.4/1",
235 "rgbi:.8/.6/0",
236 "rgbi:.8/.6/.2",
237 "rgbi:.8/.6/.4",
238 "rgbi:.8/.6/.6",
239 "rgbi:.8/.6/.8",
240 "rgbi:.8/.6/1",
241 "rgbi:.8/.8/0", 95 "rgb:8b/8b/00",
242 "rgbi:.8/.8/.2",
243 "rgbi:.8/.8/.4",
244 "rgbi:.8/.8/.6",
245 "rgbi:.8/.8/.8",
246 "rgbi:.8/.8/1",
247 "rgbi:.8/1/0",
248 "rgbi:.8/1/.2",
249 "rgbi:.8/1/.4",
250 "rgbi:.8/1/.6",
251 "rgbi:.8/1/.8",
252 "rgbi:.8/1/1",
253 "rgbi:1/0/0",
254 "rgbi:1/0/.2",
255 "rgbi:1/0/.4",
256 "rgbi:1/0/.6",
257 "rgbi:1/0/.8",
258 "rgbi:1/0/1",
259 "rgbi:1/.2/0",
260 "rgbi:1/.2/.2",
261 "rgbi:1/.2/.4",
262 "rgbi:1/.2/.6",
263 "rgbi:1/.2/.8",
264 "rgbi:1/.2/1",
265 "rgbi:1/.4/0",
266 "rgbi:1/.4/.2",
267 "rgbi:1/.4/.4",
268 "rgbi:1/.4/.6",
269 "rgbi:1/.4/.8",
270 "rgbi:1/.4/1",
271 "rgbi:1/.6/0",
272 "rgbi:1/.6/.2",
273 "rgbi:1/.6/.4",
274 "rgbi:1/.6/.6",
275 "rgbi:1/.6/.8",
276 "rgbi:1/.6/1",
277 "rgbi:1/.8/0",
278 "rgbi:1/.8/.2",
279 "rgbi:1/.8/.4",
280 "rgbi:1/.8/.6",
281 "rgbi:1/.8/.8",
282 "rgbi:1/.8/1",
283 "rgbi:1/1/0",
284 "rgbi:1/1/.2",
285 "rgbi:1/1/.4",
286 "rgbi:1/1/.6",
287 "rgbi:1/1/.8",
288 "rgbi:1/1/1",
289 "rgb:08/08/08", 96 "rgb:8b/8b/8b",
290 "rgb:12/12/12", 97 "rgb:8b/8b/cd",
98 "rgb:8b/8b/ff",
99 "rgb:8b/cd/00",
100 "rgb:8b/cd/8b",
101 "rgb:8b/cd/cd",
102 "rgb:8b/cd/ff",
103 "rgb:8b/ff/00",
104 "rgb:8b/ff/8b",
105 "rgb:8b/ff/cd",
106 "rgb:8b/ff/ff",
107 "rgb:cd/00/00",
108 "rgb:cd/00/8b",
109 "rgb:cd/00/cd",
110 "rgb:cd/00/ff",
111 "rgb:cd/8b/00",
112 "rgb:cd/8b/8b",
113 "rgb:cd/8b/cd",
114 "rgb:cd/8b/ff",
115 "rgb:cd/cd/00",
116 "rgb:cd/cd/8b",
291 "rgb:1c/1c/1c", 117 "rgb:cd/cd/cd",
118 "rgb:cd/cd/ff",
119 "rgb:cd/ff/00",
120 "rgb:cd/ff/8b",
121 "rgb:cd/ff/cd",
122 "rgb:cd/ff/ff",
123 "rgb:ff/00/00",
124 "rgb:ff/00/8b",
125 "rgb:ff/00/cd",
126 "rgb:ff/00/ff",
127 "rgb:ff/8b/00",
128 "rgb:ff/8b/8b",
129 "rgb:ff/8b/cd",
130 "rgb:ff/8b/ff",
131 "rgb:ff/cd/00",
132 "rgb:ff/cd/8b",
133 "rgb:ff/cd/cd",
134 "rgb:ff/cd/ff",
135 "rgb:ff/ff/00",
136 "rgb:ff/ff/8b",
137 "rgb:ff/ff/cd",
138 "rgb:ff/ff/ff",
292 "rgb:26/26/26", 139 "rgb:2e/2e/2e",
293 "rgb:30/30/30",
294 "rgb:3a/3a/3a",
295 "rgb:44/44/44",
296 "rgb:4e/4e/4e",
297 "rgb:58/58/58", 140 "rgb:5c/5c/5c",
298 "rgb:62/62/62",
299 "rgb:6c/6c/6c",
300 "rgb:76/76/76", 141 "rgb:73/73/73",
301 "rgb:80/80/80", 142 "rgb:8b/8b/8b",
302 "rgb:8a/8a/8a", 143 "rgb:a2/a2/a2",
303 "rgb:94/94/94", 144 "rgb:b9/b9/b9",
304 "rgb:9e/9e/9e",
305 "rgb:a8/a8/a8",
306 "rgb:b2/b2/b2",
307 "rgb:bc/bc/bc",
308 "rgb:c6/c6/c6",
309 "rgb:d0/d0/d0", 145 "rgb:d0/d0/d0",
310 "rgb:da/da/da",
311 "rgb:e4/e4/e4", 146 "rgb:e7/e7/e7",
312 "rgb:ee/ee/ee", 147
313#endif
314#ifndef NO_CURSORCOLOR 148#ifndef NO_CURSORCOLOR
315 COLOR_CURSOR_BACKGROUND, 149 COLOR_CURSOR_BACKGROUND,
316 COLOR_CURSOR_FOREGROUND, 150 COLOR_CURSOR_FOREGROUND,
317#endif /* ! NO_CURSORCOLOR */ 151#endif /* ! NO_CURSORCOLOR */
318 NULL, /* Color_pointer_fg */ 152 NULL, /* Color_pointer_fg */
319 NULL, /* Color_pointer_bg */ 153 NULL, /* Color_pointer_bg */
320 NULL, /* Color_border */ 154 NULL, /* Color_border */
321#ifndef NO_BOLD_UNDERLINE_REVERSE 155#ifndef NO_BOLD_UNDERLINE_REVERSE
322 NULL, /* Color_BD */ 156 NULL, /* Color_BD */
157 NULL, /* Color_IT */
323 NULL, /* Color_UL */ 158 NULL, /* Color_UL */
324 NULL, /* Color_RV */ 159 NULL, /* Color_RV */
325#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS
162 NULL, // Color_underline
163#endif
326#ifdef OPTION_HC 164#ifdef OPTION_HC
327 NULL, 165 NULL,
328#endif 166#endif
329#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
330 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
… …
333#if TINTING 171#if TINTING
334 NULL, 172 NULL,
335#endif 173#endif
336 }; 174 };
337 175
338const char *const xa_names[NUM_XA] = 176const char *const xa_names[] =
339 { 177 {
340 "TEXT", 178 "TEXT",
341 "COMPOUND_TEXT", 179 "COMPOUND_TEXT",
342 "UTF8_STRING", 180 "UTF8_STRING",
343 "MULTIPLE", 181 "MULTIPLE",
344 "TARGETS", 182 "TARGETS",
345 "TIMESTAMP", 183 "TIMESTAMP",
346 "VT_SELECTION", 184 "VT_SELECTION",
347 "INCR", 185 "INCR",
348 "WM_DELETE_WINDOW", 186 "WM_DELETE_WINDOW",
187 "CLIPBOARD",
188#if ENABLE_FRILLS
189 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS",
191 "_NET_WM_NAME",
192 "_NET_WM_ICON_NAME",
193#endif
194#if USE_XIM
195 "WM_LOCALE_NAME",
196#endif
349#ifdef TRANSPARENT 197#ifdef TRANSPARENT
350 "_XROOTPMAP_ID", 198 "_XROOTPMAP_ID",
199 "ESETROOT_PMAP_ID",
351#endif 200#endif
352#ifdef OFFIX_DND 201#ifdef OFFIX_DND
353 "DndProtocol", 202 "DndProtocol",
354 "DndSelection", 203 "DndSelection",
355#endif 204#endif
356 "CLIPBOARD"
357 }; 205 };
358 206
359bool 207bool
360rxvt_term::init_vars () 208rxvt_term::init_vars ()
361{ 209{
210 sw_term.start (SIGTERM);
211
362 PixColorsFocused = new rxvt_color [TOTAL_COLORS]; 212 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
363#ifdef OFF_FOCUS_FADING 213#ifdef OFF_FOCUS_FADING
364 PixColorsUnFocused = new rxvt_color [TOTAL_COLORS]; 214 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
365#endif 215#endif
366 PixColors = PixColorsFocused; 216 pix_colors = pix_colors_focused;
367 217
368 if (PixColors == NULL) 218 if (pix_colors == NULL)
369 return false; 219 return false;
370 220
371#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 221#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
372 TermWin.pixmap = None; 222 TermWin.pixmap = None;
373#endif 223#endif
374#ifdef UTMP_SUPPORT
375 next_utmp_action = SAVE;
376#endif
377#ifndef NO_SETOWNER_TTYDEV
378 next_tty_action = SAVE;
379#endif
380 224
381 MEvent.time = CurrentTime; 225 MEvent.time = CurrentTime;
382 MEvent.button = AnyButton; 226 MEvent.button = AnyButton;
383 Options = DEFAULT_OPTIONS; 227 options = DEFAULT_OPTIONS;
384 want_refresh = 1; 228 want_refresh = 1;
385 cmd_pid = -1; 229 cmd_pid = -1;
386 cmd_fd = tty_fd = -1; 230 pty.pty = pty.tty = -1;
387 PrivateModes = SavedModes = PrivMode_Default; 231 priv_modes = SavedModes = PrivMode_Default;
388 TermWin.focus = 0; 232 TermWin.focus = 0;
389 TermWin.ncol = 80; 233 TermWin.ncol = 80;
390 TermWin.nrow = 24; 234 TermWin.nrow = 24;
391 TermWin.int_bwidth = INTERNALBORDERWIDTH; 235 TermWin.int_bwidth = INTERNALBORDERWIDTH;
392 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 236 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
393 TermWin.lineSpace = LINESPACE; 237 TermWin.lineSpace = LINESPACE;
394 TermWin.saveLines = SAVELINES; 238 TermWin.saveLines = SAVELINES;
395 numPixColors = TOTAL_COLORS; 239 numpix_colors = TOTAL_COLORS;
396
397#ifndef NO_BRIGHTCOLOR
398 colorfgbg = DEFAULT_RSTYLE;
399#endif
400 240
401 refresh_limit = 1; 241 refresh_limit = 1;
402 refresh_type = SLOW_REFRESH; 242 refresh_type = SLOW_REFRESH;
403 prev_nrow = prev_ncol = 0; 243 prev_nrow = prev_ncol = 0;
404 244
… …
423 263
424void 264void
425rxvt_term::init_secondary () 265rxvt_term::init_secondary ()
426{ 266{
427 int i; 267 int i;
428#ifdef TTY_GID_SUPPORT
429 struct group *gr = getgrnam ("tty");
430
431 if (gr)
432 { /* change group ownership of tty to "tty" */
433 ttymode = S_IRUSR | S_IWUSR | S_IWGRP;
434 ttygid = gr->gr_gid;
435 }
436 else
437#endif /* TTY_GID_SUPPORT */
438
439 {
440 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
441 ttygid = getgid ();
442 }
443 268
444 /* 269 /*
445 * Close all unused file descriptors 270 * Close all unused file descriptors
446 * We don't want them, we don't need them. 271 * We don't want them, we don't need them.
447 */ 272 */
… …
480 305
481 /* 306 /*
482 * Look for -exec option. Find => split and make cmd_argv[] of command args 307 * Look for -exec option. Find => split and make cmd_argv[] of command args
483 */ 308 */
484 for (r_argc = 0; r_argc < argc; r_argc++) 309 for (r_argc = 0; r_argc < argc; r_argc++)
485 if (!STRCMP (argv[r_argc], "-e") || !STRCMP (argv[r_argc], "-exec")) 310 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec"))
486 break; 311 break;
487 312
488 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 313 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
489 314
490 for (i = 0; i < r_argc; i++) 315 for (i = 0; i < r_argc; i++)
… …
516 free (r_argv); 341 free (r_argv);
517 342
518#ifdef LOCAL_X_IS_UNIX 343#ifdef LOCAL_X_IS_UNIX
519 if (rs[Rs_display_name][0] == ':') 344 if (rs[Rs_display_name][0] == ':')
520 { 345 {
521 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); 346 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
522 STRCPY (val, "unix"); 347 strcpy (val, "unix");
523 STRCAT (val, rs[Rs_display_name]); 348 strcat (val, rs[Rs_display_name]);
524 display = displays.get (val); 349 display = displays.get (val);
525 free (val); 350 free (val);
526 } 351 }
527#endif 352#endif
528 353
529 if (!display 354 if (!display
530 && ! (display = displays.get (rs[Rs_display_name]))) 355 && ! (display = displays.get (rs[Rs_display_name])))
531 rxvt_fatal ("can't open display %s", rs[Rs_display_name]); 356 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
532 357
533 extract_resources (display->display, rs[Rs_name]); 358 extract_resources (display->display, rs[Rs_name]);
534 359
535 /* 360 /*
536 * set any defaults not already set 361 * set any defaults not already set
… …
551 } 376 }
552 377
553 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 378 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
554 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 379 TermWin.saveLines = BOUND_POSITIVE_INT16 (i);
555 380
556#ifndef NO_FRILLS 381#if ENABLE_FRILLS
557 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 382 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
558 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 383 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
559 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 384 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
560 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 385 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
561#endif
562
563#ifndef NO_LINESPACE
564 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 386 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
565 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 387 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
566#endif 388#endif
567 389
568#ifdef POINTER_BLANK 390#ifdef POINTER_BLANK
… …
572 pointerBlankDelay = 2; 394 pointerBlankDelay = 2;
573#endif 395#endif
574 396
575 /* no point having a scrollbar without having any scrollback! */ 397 /* no point having a scrollbar without having any scrollback! */
576 if (!TermWin.saveLines) 398 if (!TermWin.saveLines)
577 Options &= ~Opt_scrollBar; 399 options &= ~Opt_scrollBar;
578 400
579#ifdef PRINTPIPE 401#ifdef PRINTPIPE
580 if (!rs[Rs_print_pipe]) 402 if (!rs[Rs_print_pipe])
581 rs[Rs_print_pipe] = PRINTPIPE; 403 rs[Rs_print_pipe] = PRINTPIPE;
582#endif 404#endif
… …
591# else 413# else
592 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 414 key_backspace = "DEC"; /* can toggle between \010 or \177 */
593# endif 415# endif
594 else 416 else
595 { 417 {
596 val = STRDUP (rs[Rs_backspace_key]); 418 val = strdup (rs[Rs_backspace_key]);
597 rxvt_Str_trim (val); 419 rxvt_Str_trim (val);
598 rxvt_Str_escaped (val); 420 rxvt_Str_escaped (val);
599 key_backspace = val; 421 key_backspace = val;
600 } 422 }
601#endif 423#endif
… …
607# else 429# else
608 key_delete = "\033[3~"; 430 key_delete = "\033[3~";
609# endif 431# endif
610 else 432 else
611 { 433 {
612 val = STRDUP (rs[Rs_delete_key]); 434 val = strdup (rs[Rs_delete_key]);
613 rxvt_Str_trim (val); 435 rxvt_Str_trim (val);
614 rxvt_Str_escaped (val); 436 rxvt_Str_escaped (val);
615 key_delete = val; 437 key_delete = val;
616 } 438 }
617#endif 439#endif
… …
620 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 442 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
621 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 443 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
622 } 444 }
623 445
624#ifdef HAVE_SCROLLBARS 446#ifdef HAVE_SCROLLBARS
625 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 447 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
626 rs[Rs_scrollBar_thickness]);
627#endif 448#endif
628 449
629#ifdef XTERM_REVERSE_VIDEO 450#ifdef XTERM_REVERSE_VIDEO
630 /* this is how xterm implements reverseVideo */ 451 /* this is how xterm implements reverseVideo */
631 if (Options & Opt_reverseVideo) 452 if (options & Opt_reverseVideo)
632 { 453 {
633 if (!rs[Rs_color + Color_fg]) 454 if (!rs[Rs_color + Color_fg])
634 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 455 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
635 if (!rs[Rs_color + Color_bg]) 456 if (!rs[Rs_color + Color_bg])
636 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 457 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
641 if (!rs[Rs_color + i]) 462 if (!rs[Rs_color + i])
642 rs[Rs_color + i] = def_colorName[i]; 463 rs[Rs_color + i] = def_colorName[i];
643 464
644#ifndef XTERM_REVERSE_VIDEO 465#ifndef XTERM_REVERSE_VIDEO
645 /* this is how we implement reverseVideo */ 466 /* this is how we implement reverseVideo */
646 if (Options & Opt_reverseVideo) 467 if (options & Opt_reverseVideo)
647 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 468 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);
648#endif 469#endif
649 470
650 /* convenient aliases for setting fg/bg to colors */ 471 /* convenient aliases for setting fg/bg to colors */
651 color_aliases (Color_fg); 472 color_aliases (Color_fg);
… …
661 color_aliases (Color_BD); 482 color_aliases (Color_BD);
662 color_aliases (Color_UL); 483 color_aliases (Color_UL);
663 color_aliases (Color_RV); 484 color_aliases (Color_RV);
664#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 485#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
665 486
487 if (!rs[Rs_color + Color_border])
488 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
489
666 return cmd_argv; 490 return cmd_argv;
667} 491}
668 492
669/*----------------------------------------------------------------------*/ 493/*----------------------------------------------------------------------*/
670void 494void
… …
693 val = XDisplayString (display->display); 517 val = XDisplayString (display->display);
694 518
695 if (rs[Rs_display_name] == NULL) 519 if (rs[Rs_display_name] == NULL)
696 rs[Rs_display_name] = val; /* use broken `:0' value */ 520 rs[Rs_display_name] = val; /* use broken `:0' value */
697 521
698 i = STRLEN (val); 522 i = strlen (val);
699 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 523 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
700 524
701 sprintf (env_display, "DISPLAY=%s", val); 525 sprintf (env_display, "DISPLAY=%s", val);
702 526
703 /* avoiding the math library: 527 /* avoiding the math library:
… …
732 else 556 else
733 putenv ("COLORTERM=" COLORTERMENVFULL); 557 putenv ("COLORTERM=" COLORTERMENVFULL);
734 558
735 if (rs[Rs_term_name] != NULL) 559 if (rs[Rs_term_name] != NULL)
736 { 560 {
737 env_term = (char *)rxvt_malloc ((STRLEN (rs[Rs_term_name]) + 6) * sizeof (char)); 561 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char));
738 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 562 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
739 putenv (env_term); 563 putenv (env_term);
740 } 564 }
741 else 565 else
742 putenv ("TERM=" TERMENV); 566 putenv ("TERM=" TERMENV);
… …
761 free (this->locale); 585 free (this->locale);
762 this->locale = setlocale (LC_CTYPE, locale); 586 this->locale = setlocale (LC_CTYPE, locale);
763 587
764 if (!this->locale) 588 if (!this->locale)
765 { 589 {
590 if (*locale)
591 {
766 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 592 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);
767 setlocale (LC_CTYPE, ""); 593 setlocale (LC_CTYPE, "");
594 }
595 else
596 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
597
768 this->locale = ""; 598 this->locale = "";
769 } 599 }
600
770 601
771 this->locale = rxvt_strdup (this->locale); 602 this->locale = rxvt_strdup (this->locale);
772 SET_LOCALE (this->locale); 603 SET_LOCALE (this->locale);
773 mbstate.reset (); 604 mbstate.reset ();
774#endif 605#endif
775#if 0 606
776#if HAVE_NL_LANGINFO 607#if HAVE_NL_LANGINFO
608 char *codeset = strdup (nl_langinfo (CODESET));
609 // /^UTF.?8/i
610 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
611 && (codeset[1] == 'T' || codeset[1] == 't')
612 && (codeset[2] == 'F' || codeset[2] == 'f')
613 && (codeset[3] == '8' || codeset[4] == '8');
777 free (codeset); 614 free (codeset);
778 codeset = strdup (nl_langinfo (CODESET));
779 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
780 || !STRCASECMP (codeset, "UTF8");
781#else 615#else
782 enc_utf8 = 1; 616 enc_utf8 = 0;
783#endif
784#endif 617#endif
785} 618}
786 619
787void 620void
788rxvt_term::init_xlocale () 621rxvt_term::init_xlocale ()
… …
790#ifdef USE_XIM 623#ifdef USE_XIM
791 if (!locale) 624 if (!locale)
792 rxvt_warn ("setting locale failed, working without locale support.\n"); 625 rxvt_warn ("setting locale failed, working without locale support.\n");
793 else 626 else
794 { 627 {
795 Atom wmlocale; 628 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
796
797 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
798 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
799 XA_STRING, 8, PropModeReplace,
800 (unsigned char *)locale, STRLEN (locale));
801 629
802 if (!XSupportsLocale ()) 630 if (!XSupportsLocale ())
803 { 631 {
804 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n"); 632 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
805 return; 633 return;
806 } 634 }
807 635
808 im_ev.start (display); 636 im_ev.start (display);
809 637
… …
819{ 647{
820 /* 648 /*
821 * Initialize the command connection. 649 * Initialize the command connection.
822 * This should be called after the X server connection is established. 650 * This should be called after the X server connection is established.
823 */ 651 */
824 int i;
825
826 for (i = 0; i < NUM_XA; i++)
827 xa[i] = XInternAtom (display->display, xa_names[i], False);
828
829 /* Enable delete window protocol */
830 XSetWMProtocols (display->display, TermWin.parent[0],
831 & (xa[XA_WMDELETEWINDOW]), 1);
832
833#ifdef USING_W11LIB
834 /* enable W11 callbacks */
835 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
836#endif
837 652
838#ifdef META8_OPTION 653#ifdef META8_OPTION
839 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 654 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);
840#endif 655#endif
841 656
842 get_ourmods (); 657 get_ourmods ();
843 658
844 if (!(Options & Opt_scrollTtyOutput)) 659 if (!(options & Opt_scrollTtyOutput))
845 PrivateModes |= PrivMode_TtyOutputInh; 660 priv_modes |= PrivMode_TtyOutputInh;
846 if (Options & Opt_scrollTtyKeypress) 661 if (options & Opt_scrollTtyKeypress)
847 PrivateModes |= PrivMode_Keypress; 662 priv_modes |= PrivMode_Keypress;
848 if (!(Options & Opt_jumpScroll)) 663 if (!(options & Opt_jumpScroll))
849 PrivateModes |= PrivMode_smoothScroll; 664 priv_modes |= PrivMode_smoothScroll;
850 665
851#ifndef NO_BACKSPACE_KEY 666#ifndef NO_BACKSPACE_KEY
852 if (STRCMP (key_backspace, "DEC") == 0) 667 if (strcmp (key_backspace, "DEC") == 0)
853 PrivateModes |= PrivMode_HaveBackSpace; 668 priv_modes |= PrivMode_HaveBackSpace;
854#endif 669#endif
855 670
856 /* add value for scrollBar */ 671 /* add value for scrollBar */
857 if (scrollbar_visible ()) 672 if (scrollbar_visible ())
858 { 673 {
859 PrivateModes |= PrivMode_scrollBar; 674 priv_modes |= PrivMode_scrollBar;
860 SavedModes |= PrivMode_scrollBar; 675 SavedModes |= PrivMode_scrollBar;
861 } 676 }
862 if (menubar_visible ()) 677 if (menubar_visible ())
863 { 678 {
864 PrivateModes |= PrivMode_menuBar; 679 priv_modes |= PrivMode_menuBar;
865 SavedModes |= PrivMode_menuBar; 680 SavedModes |= PrivMode_menuBar;
866 } 681 }
867 682
868#ifdef CURSOR_BLINK 683#ifdef CURSOR_BLINK
869 if (Options & Opt_cursorBlink) 684 if (options & Opt_cursorBlink)
870 (void)gettimeofday (&lastcursorchange, NULL); 685 (void)gettimeofday (&lastcursorchange, NULL);
871#endif 686#endif
872 687
873 run_command (argv); 688 run_command (argv);
874} 689}
… …
878rxvt_term::Get_Colours () 693rxvt_term::Get_Colours ()
879{ 694{
880 int i; 695 int i;
881 696
882#ifdef OFF_FOCUS_FADING 697#ifdef OFF_FOCUS_FADING
883 PixColors = PixColorsFocused; 698 pix_colors = pix_colors_focused;
884#endif 699#endif
885 700
886 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 701 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
887 { 702 {
888 rxvt_color xcol; 703 rxvt_color xcol;
… …
891 continue; 706 continue;
892 707
893 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 708 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
894 { 709 {
895#ifndef XTERM_REVERSE_VIDEO 710#ifndef XTERM_REVERSE_VIDEO
896 if (i < 2 && (Options & Opt_reverseVideo)) 711 if (i < 2 && (options & Opt_reverseVideo))
897 rs[Rs_color + i] = def_colorName[!i]; 712 rs[Rs_color + i] = def_colorName[!i];
898 else 713 else
899#endif 714#endif
900 rs[Rs_color + i] = def_colorName[i]; 715 rs[Rs_color + i] = def_colorName[i];
901 716
… …
907 switch (i) 722 switch (i)
908 { 723 {
909 case Color_fg: 724 case Color_fg:
910 case Color_bg: 725 case Color_bg:
911 /* fatal: need bg/fg color */ 726 /* fatal: need bg/fg color */
912 rxvt_fatal ("unable to get foreground/background colour, aborting"); 727 rxvt_fatal ("unable to get foreground/background colour, aborting.\n");
913 /* NOTREACHED */ 728 /* NOTREACHED */
914 break; 729 break;
915#ifndef NO_CURSORCOLOR 730#ifndef NO_CURSORCOLOR
916 case Color_cursor2: 731 case Color_cursor2:
917 xcol = PixColors[Color_fg]; 732 xcol = pix_colors[Color_fg];
918 break; 733 break;
919#endif /* ! NO_CURSORCOLOR */ 734#endif /* ! NO_CURSORCOLOR */
920 case Color_pointer_fg: 735 case Color_pointer_fg:
921 xcol = PixColors[Color_fg]; 736 xcol = pix_colors[Color_fg];
922 break; 737 break;
923 default: 738 default:
924 xcol = PixColors[Color_bg]; /* None */ 739 xcol = pix_colors[Color_bg]; /* None */
925 break; 740 break;
926 } 741 }
927 } 742 }
928 } 743 }
929 744
930 PixColors[i] = xcol; 745 pix_colors[i] = xcol;
931#ifdef OFF_FOCUS_FADING 746#ifdef OFF_FOCUS_FADING
932 if (rs[Rs_fade]) 747 if (rs[Rs_fade])
933 PixColorsUnFocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 748 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
934#endif 749#endif
935 SET_PIXCOLOR (i); 750 SET_PIXCOLOR (i);
936 } 751 }
937 752
938 if (display->depth <= 2) 753 if (display->depth <= 2)
939 { 754 {
940 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg]; 755 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
941 if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg]; 756 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
942 if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg]; 757 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
943 } 758 }
944 759
945 /* 760 /*
946 * get scrollBar/menuBar shadow colors 761 * get scrollBar/menuBar shadow colors
947 * 762 *
… …
950 */ 765 */
951#ifdef KEEP_SCROLLCOLOR 766#ifdef KEEP_SCROLLCOLOR
952 767
953 if (display->depth <= 2) 768 if (display->depth <= 2)
954 { /* Monochrome */ 769 { /* Monochrome */
955 PixColors[Color_scroll] = PixColors[Color_fg]; 770 pix_colors[Color_scroll] = pix_colors[Color_fg];
956 PixColors[Color_topShadow] = PixColors[Color_bg]; 771 pix_colors[Color_topShadow] = pix_colors[Color_bg];
957 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 772 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
958 } 773 }
959 else 774 else
960 { 775 {
961 rxvt_color xcol[2]; 776 rxvt_color xcol[2];
962 /* xcol[0] == white 777 /* xcol[0] == white
963 * xcol[1] == top shadow 778 * xcol[1] == top shadow
964 * xcol[2] == bot shadow */ 779 * xcol[2] == bot shadow */
965 780
966 xcol[1] = PixColors[Color_scroll]; 781 xcol[1] = pix_colors[Color_scroll];
967 xcol[0].set (display, 65535, 65535, 65535); 782 xcol[0].set (display, 65535, 65535, 65535);
968 783
969 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 784 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
970 785
971 xcol[0].get (display, pr0, pg0, pb0); 786 xcol[0].get (display, pr0, pg0, pb0);
972 xcol[1].get (display, pr1, pg1, pb1); 787 xcol[1].get (display, pr1, pg1, pb1);
973 788
974 PixColors[Color_bottomShadow] = xcol[1].fade (display, 50); 789 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
975 790
976 /* topShadowColor */ 791 /* topShadowColor */
977 if (!xcol[1].set (display, 792 if (!xcol[1].set (display,
978 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 793 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
979 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 794 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
980 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 795 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
981 xcol[1] = PixColors[Color_White]; 796 xcol[1] = pix_colors[Color_White];
982 797
983 PixColors[Color_topShadow] = xcol[1]; 798 pix_colors[Color_topShadow] = xcol[1];
984 } 799 }
985#endif /* KEEP_SCROLLCOLOR */ 800#endif /* KEEP_SCROLLCOLOR */
986} 801}
987 802
988/*----------------------------------------------------------------------*/ 803/*----------------------------------------------------------------------*/
… …
999 i -= 8; 814 i -= 8;
1000#ifndef NO_BRIGHTCOLOR 815#ifndef NO_BRIGHTCOLOR
1001 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 816 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1002 return; 817 return;
1003#endif 818#endif
1004
1005 } 819 }
1006 820
1007 if (i >= 0 && i <= 7) /* normal colors */ 821 if (i >= 0 && i <= 7) /* normal colors */
1008 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 822 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1009 } 823 }
… …
1027 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 841 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
1028 }; 842 };
1029 843
1030 requestedmeta = realmeta = realalt = 0; 844 requestedmeta = realmeta = realalt = 0;
1031 rsmod = rs[Rs_modifier]; 845 rsmod = rs[Rs_modifier];
846
1032 if (rsmod 847 if (rsmod
1033 && STRCASECMP (rsmod, "mod1") >= 0 && STRCASECMP (rsmod, "mod5") <= 0) 848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
1034 requestedmeta = rsmod[3] - '0'; 849 requestedmeta = rsmod[3] - '0';
1035 850
1036 map = XGetModifierMapping (display->display); 851 map = XGetModifierMapping (display->display);
1037 kc = map->modifiermap; 852 kc = map->modifiermap;
853
1038 for (i = 1; i < 6; i++) 854 for (i = 1; i < 6; i++)
1039 { 855 {
1040 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 856 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
857
1041 for (j = map->max_keypermod; j--; k++) 858 for (j = map->max_keypermod; j--; k++)
1042 { 859 {
1043 if (kc[k] == 0) 860 if (kc[k] == 0)
1044 break; 861 break;
862
1045 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 863 switch (XKeycodeToKeysym (display->display, kc[k], 0))
1046 { 864 {
1047 case XK_Num_Lock: 865 case XK_Num_Lock:
1048 ModNumLockMask = modmasks[i - 1]; 866 ModNumLockMask = modmasks[i - 1];
1049 /* FALLTHROUGH */ 867 continue;
1050 default: 868
1051 continue; /* for (;;) */ 869 case XK_ISO_Level3_Shift:
870 ModLevel3Mask = modmasks[i - 1];
871 continue;
872
1052 case XK_Meta_L: 873 case XK_Meta_L:
1053 case XK_Meta_R: 874 case XK_Meta_R:
1054 cm = "meta"; 875 cm = "meta";
1055 realmeta = i; 876 realmeta = i;
1056 break; 877 break;
878
1057 case XK_Alt_L: 879 case XK_Alt_L:
1058 case XK_Alt_R: 880 case XK_Alt_R:
1059 cm = "alt"; 881 cm = "alt";
1060 realalt = i; 882 realalt = i;
1061 break; 883 break;
884
1062 case XK_Super_L: 885 case XK_Super_L:
1063 case XK_Super_R: 886 case XK_Super_R:
1064 cm = "super"; 887 cm = "super";
1065 break; 888 break;
889
1066 case XK_Hyper_L: 890 case XK_Hyper_L:
1067 case XK_Hyper_R: 891 case XK_Hyper_R:
1068 cm = "hyper"; 892 cm = "hyper";
1069 break; 893 break;
894
895 default:
896 continue;
1070 } 897 }
1071 if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0) 898
899 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
1072 requestedmeta = i; 900 requestedmeta = i;
1073 } 901 }
1074 } 902 }
903
1075 XFreeModifiermap (map); 904 XFreeModifiermap (map);
905
1076 i = (requestedmeta ? requestedmeta 906 i = requestedmeta ? requestedmeta
1077 : (realmeta ? realmeta 907 : realmeta ? realmeta
1078 : (realalt ? realalt : 0))); 908 : realalt ? realalt
909 : 0;
910
1079 if (i) 911 if (i)
1080 ModMetaMask = modmasks[i - 1]; 912 ModMetaMask = modmasks[i - 1];
1081} 913}
1082 914
1083/*----------------------------------------------------------------------*/ 915/*----------------------------------------------------------------------*/
… …
1085void 917void
1086rxvt_term::create_windows (int argc, const char *const *argv) 918rxvt_term::create_windows (int argc, const char *const *argv)
1087{ 919{
1088 XClassHint classHint; 920 XClassHint classHint;
1089 XWMHints wmHint; 921 XWMHints wmHint;
1090#ifndef NO_FRILLS 922#if ENABLE_FRILLS
1091 Atom prop = None; 923 Atom prop = None;
1092 MWMHints mwmhints; 924 MWMHints mwmhints;
1093#endif 925#endif
1094 XGCValues gcvalue; 926 XGCValues gcvalue;
1095 long vt_emask; 927 long vt_emask;
1096 XSetWindowAttributes attributes; 928 XSetWindowAttributes attributes;
1097 XWindowAttributes gattr; 929 XWindowAttributes gattr;
1098 930
931#ifdef USING_W11LIB
932 /* enable W11 callbacks */
933 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
934#endif
935
936 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
937 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa);
938
1099 if (Options & Opt_transparent) 939 if (options & Opt_transparent)
1100 { 940 {
1101 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 941 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1102 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 942 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1103 } 943 }
1104 944
1105#ifndef NO_FRILLS 945#if ENABLE_FRILLS
1106 if (Options & Opt_borderLess) 946 if (options & Opt_borderLess)
1107 { 947 {
1108 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 948 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True);
949
1109 if (prop == None) 950 if (prop == None)
1110 { 951 {
1111 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 952 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
1112#ifdef PREFER_24BIT 953#ifdef PREFER_24BIT
1113 attributes.override_redirect = TRUE; 954 attributes.override_redirect = TRUE;
… …
1127#endif 968#endif
1128 969
1129 /* grab colors before netscape does */ 970 /* grab colors before netscape does */
1130 Get_Colours (); 971 Get_Colours ();
1131 972
1132 if (!change_font (rs[Rs_font])) 973 if (!set_fonts ())
1133 { 974 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1134 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1135 destroy ();
1136 return;
1137 }
1138 975
1139 window_calc (0, 0); 976 window_calc (0, 0);
1140 old_width = szHint.width; 977 old_width = szHint.width;
1141 old_height = szHint.height; 978 old_height = szHint.height;
1142 979
1143 /* sub-window placement & size in rxvt_resize_subwindows () */ 980 /* sub-window placement & size in rxvt_resize_subwindows () */
1144 981
1145#ifdef PREFER_24BIT 982#ifdef PREFER_24BIT
1146 attributes.background_pixel = PixColors[Color_bg]; 983 attributes.background_pixel = pix_colors_focused[Color_border];
1147 attributes.border_pixel = PixColors[Color_border]; 984 attributes.border_pixel = pix_colors_focused[Color_border];
1148 attributes.colormap = display->cmap; 985 attributes.colormap = display->cmap;
1149 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 986 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1150 szHint.x, szHint.y, 987 szHint.x, szHint.y,
1151 szHint.width, szHint.height, 988 szHint.width, szHint.height,
1152 TermWin.ext_bwidth, 989 TermWin.ext_bwidth,
… …
1156#else 993#else
1157 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 994 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1158 szHint.x, szHint.y, 995 szHint.x, szHint.y,
1159 szHint.width, szHint.height, 996 szHint.width, szHint.height,
1160 TermWin.ext_bwidth, 997 TermWin.ext_bwidth,
1161 PixColors[Color_border], 998 pix_colors_focused[Color_border],
1162 PixColors[Color_bg]); 999 pix_colors_focused[Color_border]);
1163#endif 1000#endif
1164 1001
1165 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1002 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1166 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1003 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1167 1004
1168 classHint.res_name = (char *)rs[Rs_name]; 1005 classHint.res_name = (char *)rs[Rs_name];
1169 classHint.res_class = (char *)RESCLASS; 1006 classHint.res_class = (char *)RESCLASS;
1170 1007
1171 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1008 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1172 wmHint.input = True; 1009 wmHint.input = True;
1173 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState; 1010 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1174 wmHint.window_group = TermWin.parent[0]; 1011 wmHint.window_group = TermWin.parent[0];
1175 1012
1176 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1013 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1177 (char **)argv, argc, &szHint, &wmHint, &classHint); 1014 (char **)argv, argc, &szHint, &wmHint, &classHint);
1178 1015
1179#ifndef NO_FRILLS 1016 /* Enable delete window protocol */
1017 XSetWMProtocols (display->display, TermWin.parent[0],
1018 &xa[XA_WMDELETEWINDOW], 1);
1019
1020#if ENABLE_FRILLS
1180 long pid = getpid (); 1021 long pid = getpid ();
1022
1181 XChangeProperty (display->display, TermWin.parent[0], 1023 XChangeProperty (display->display, TermWin.parent[0],
1182 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1024 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1183 PropModeReplace, (unsigned char *)&pid, 1); 1025 PropModeReplace, (unsigned char *)&pid, 1);
1184#endif 1026#endif
1185 1027
1186 XSelectInput (display->display, TermWin.parent[0], 1028 XSelectInput (display->display, TermWin.parent[0],
1187 KeyPressMask 1029 KeyPressMask
1188#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1030#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1189 | KeyReleaseMask 1031 | KeyReleaseMask
1190#endif 1032#endif
1191 | FocusChangeMask | VisibilityChangeMask 1033 | FocusChangeMask | VisibilityChangeMask
1192 | ExposureMask 1034 | ExposureMask
1193 | StructureNotifyMask); 1035 | StructureNotifyMask);
1194 termwin_ev.start (display, TermWin.parent[0]); 1036 termwin_ev.start (display, TermWin.parent[0]);
1195 1037
1196#ifndef NO_FRILLS 1038#if ENABLE_FRILLS
1197 if (mwmhints.flags) 1039 if (mwmhints.flags)
1198 { 1040 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1199 prop = XInternAtom(display->display, "_MOTIF_WM_HINTS", False); 1041 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1200 XChangeProperty(display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
1201 }
1202#endif 1042#endif
1203 1043
1204 /* vt cursor: Black-on-White is standard, but this is more popular */ 1044 /* vt cursor: Black-on-White is standard, but this is more popular */
1205 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1045 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1206 1046
1207#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1047#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1208 /* cursor (menuBar/scrollBar): Black-on-White */ 1048 /* cursor (menuBar/scrollBar): Black-on-White */
1209 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1049 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1210#endif
1211
1212#ifdef POINTER_BLANK
1213 {
1214 XColor blackcolour;
1215 blackcolour.red = 0;
1216 blackcolour.green = 0;
1217 blackcolour.blue = 0;
1218 Font f = XLoadFont (display->display, "fixed");
1219 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1220 &blackcolour, &blackcolour);
1221 XUnloadFont (display->display, f);
1222 }
1223#endif 1050#endif
1224 1051
1225 /* the vt window */ 1052 /* the vt window */
1226 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1053 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1227 window_vt_x, 1054 window_vt_x,
1228 window_vt_y, 1055 window_vt_y,
1229 TermWin_TotalWidth (), 1056 TermWin_TotalWidth (),
1230 TermWin_TotalHeight (), 1057 TermWin_TotalHeight (),
1231 0, 1058 0,
1232 PixColors[Color_fg], 1059 pix_colors_focused[Color_fg],
1233 PixColors[Color_bg]); 1060 pix_colors_focused[Color_bg]);
1234#ifdef DEBUG_X 1061#ifdef DEBUG_X
1235 XStoreName (display->display, TermWin.vt, "vt window"); 1062 XStoreName (display->display, TermWin.vt, "vt window");
1236#endif 1063#endif
1237 1064
1238 attributes.bit_gravity = NorthWestGravity; 1065 attributes.bit_gravity = NorthWestGravity;
… …
1241 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1068 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1242 1069
1243 pointer_unblank (); 1070 pointer_unblank ();
1244 1071
1245#ifdef POINTER_BLANK 1072#ifdef POINTER_BLANK
1246 if (Options & Opt_pointerBlank) 1073 if (options & Opt_pointerBlank)
1247 vt_emask |= PointerMotionMask; 1074 vt_emask |= PointerMotionMask;
1248 else 1075 else
1249#endif 1076#endif
1250 vt_emask |= Button1MotionMask | Button3MotionMask; 1077 vt_emask |= Button1MotionMask | Button3MotionMask;
1251 1078
… …
1258 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1085 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1259 window_vt_x, 0, 1086 window_vt_x, 0,
1260 TermWin_TotalWidth (), 1087 TermWin_TotalWidth (),
1261 menuBar_TotalHeight (), 1088 menuBar_TotalHeight (),
1262 0, 1089 0,
1263 PixColors[Color_fg], 1090 pix_colors_focused[Color_fg],
1264 PixColors[Color_scroll]); 1091 pix_colors_focused[Color_scroll]);
1265 1092
1266#ifdef DEBUG_X 1093#ifdef DEBUG_X
1267 XStoreName (display->display, menuBar.win, "menubar"); 1094 XStoreName (display->display, menuBar.win, "menubar");
1268#endif 1095#endif
1269 1096
… …
1279 } 1106 }
1280#endif 1107#endif
1281 1108
1282#ifdef XPM_BACKGROUND 1109#ifdef XPM_BACKGROUND
1283 if (rs[Rs_backgroundPixmap] != NULL 1110 if (rs[Rs_backgroundPixmap] != NULL
1284 && ! (Options & Opt_transparent)) 1111 && ! (options & Opt_transparent))
1285 { 1112 {
1286 const char *p = rs[Rs_backgroundPixmap]; 1113 const char *p = rs[Rs_backgroundPixmap];
1287 1114
1288 if ((p = STRCHR (p, ';')) != NULL) 1115 if ((p = strchr (p, ';')) != NULL)
1289 { 1116 {
1290 p++; 1117 p++;
1291 scale_pixmap (p); 1118 scale_pixmap (p);
1292 } 1119 }
1120
1293 set_bgPixmap (rs[Rs_backgroundPixmap]); 1121 set_bgPixmap (rs[Rs_backgroundPixmap]);
1294 scr_touch (True); 1122 scr_touch (true);
1295 } 1123 }
1296#endif 1124#endif
1297 1125
1298 /* graphics context for the vt window */ 1126 /* graphics context for the vt window */
1299 gcvalue.foreground = PixColors[Color_fg]; 1127 gcvalue.foreground = pix_colors[Color_fg];
1300 gcvalue.background = PixColors[Color_bg]; 1128 gcvalue.background = pix_colors[Color_bg];
1301 gcvalue.graphics_exposures = 1; 1129 gcvalue.graphics_exposures = 1;
1302 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1130 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1303 GCForeground | GCBackground | GCGraphicsExposures, 1131 GCForeground | GCBackground | GCGraphicsExposures,
1304 &gcvalue); 1132 &gcvalue);
1305 1133
1306 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1134 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1307 1135
1308#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1136#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1309 gcvalue.foreground = PixColors[Color_topShadow]; 1137 gcvalue.foreground = pix_colors[Color_topShadow];
1310 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1138 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1311 gcvalue.foreground = PixColors[Color_bottomShadow]; 1139 gcvalue.foreground = pix_colors[Color_bottomShadow];
1312 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1140 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1313 gcvalue.foreground = PixColors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1141 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1314 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1142 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1315#endif 1143#endif
1316 1144
1317#ifdef OFF_FOCUS_FADING 1145#ifdef OFF_FOCUS_FADING
1318 // initially we are in unfocused state 1146 // initially we are in unfocused state
1319 if (rs[Rs_fade]) 1147 if (rs[Rs_fade])
1320 PixColors = PixColorsUnFocused; 1148 pix_colors = pix_colors_unfocused;
1321#endif
1322}
1323
1324/*----------------------------------------------------------------------*/
1325/*
1326 * Run the command in a subprocess and return a file descriptor for the
1327 * master end of the pseudo-teletype pair with the command talking to
1328 * the slave.
1329 */
1330void
1331rxvt_term::run_command (const char *const *argv)
1332{
1333 int er;
1334
1335 /* get master (pty) */
1336 if ((cmd_fd = rxvt_get_pty (&tty_fd, &ttydev)) < 0)
1337 rxvt_fatal ("can't open pseudo-tty");
1338
1339 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
1340
1341 /* get slave (tty) */
1342 if (tty_fd < 0)
1343 {
1344#ifndef NO_SETOWNER_TTYDEV
1345 privileged_ttydev (SAVE);
1346#endif
1347
1348 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1349 {
1350 close (cmd_fd);
1351 cmd_fd = -1;
1352 rxvt_fatal ("can't open slave tty %s", ttydev);
1353 }
1354 }
1355
1356#ifndef NO_BACKSPACE_KEY
1357 if (key_backspace[0] && !key_backspace[1])
1358 er = key_backspace[0];
1359 else if (STRCMP (key_backspace, "DEC") == 0)
1360 er = '\177'; /* the initial state anyway */
1361 else
1362#endif
1363 er = -1;
1364
1365 rxvt_get_ttymode (&tio, er);
1366
1367#ifndef __QNX__
1368 /* spin off the command interpreter */
1369 switch (cmd_pid = fork ())
1370 {
1371 case -1:
1372 rxvt_fatal ("can't fork");
1373 case 0:
1374 init_env ();
1375
1376 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1377 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1378 else
1379 {
1380 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1381 dup2 (tty_fd, STDIN_FILENO);
1382 dup2 (tty_fd, STDOUT_FILENO);
1383 dup2 (tty_fd, STDERR_FILENO);
1384
1385 // close all our file handles that we do no longer need
1386 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1387 {
1388 if ((*t)->cmd_fd > 2) close ((*t)->cmd_fd);
1389 if ((*t)->tty_fd > 2) close ((*t)->tty_fd);
1390 }
1391
1392 run_child (argv);
1393 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1394 }
1395
1396 _exit (EXIT_FAILURE);
1397
1398 default:
1399 {
1400#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1401 int fdstdin;
1402
1403 fdstdin = dup (STDIN_FILENO);
1404 dup2 (tty_fd, STDIN_FILENO);
1405#endif
1406
1407#ifdef UTMP_SUPPORT
1408 privileged_utmp (SAVE);
1409#endif
1410
1411#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1412
1413 dup2 (fdstdin, STDIN_FILENO);
1414 close (fdstdin);
1415#endif
1416 }
1417
1418 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1419 break;
1420 }
1421#else /* __QNX__ uses qnxspawn () */
1422 fchmod (tty_fd, 0622);
1423 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1424 fcntl (cmd_fd, F_SETFD, FD_CLOEXEC);
1425
1426 if (run_child (argv) == -1)
1427 exit (EXIT_FAILURE);
1428#endif
1429}
1430
1431/* ------------------------------------------------------------------------- *
1432 * CHILD PROCESS OPERATIONS *
1433 * ------------------------------------------------------------------------- */
1434/*
1435 * The only open file descriptor is the slave tty - so no error messages.
1436 * returns are fatal
1437 */
1438int
1439rxvt_term::run_child (const char *const *argv)
1440{
1441 char *login;
1442
1443 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1444
1445 if (Options & Opt_console)
1446 { /* be virtual console, fail silently */
1447#ifdef TIOCCONS
1448 unsigned int on = 1;
1449
1450 ioctl (STDIN_FILENO, TIOCCONS, &on);
1451#elif defined (SRIOCSREDIR)
1452 int fd;
1453
1454 fd = open (CONSOLE, O_WRONLY, 0);
1455 if (fd >= 0)
1456 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1457 close (fd);
1458#endif /* SRIOCSREDIR */
1459
1460 }
1461
1462 /* reset signals and spin off the command interpreter */
1463 signal (SIGINT, SIG_DFL);
1464 signal (SIGQUIT, SIG_DFL);
1465 signal (SIGCHLD, SIG_DFL);
1466 /*
1467 * mimick login's behavior by disabling the job control signals
1468 * a shell that wants them can turn them back on
1469 */
1470#ifdef SIGTSTP
1471 signal (SIGTSTP, SIG_IGN);
1472 signal (SIGTTIN, SIG_IGN);
1473 signal (SIGTTOU, SIG_IGN);
1474#endif /* SIGTSTP */
1475
1476 /* set window size */
1477 struct winsize ws;
1478
1479 ws.ws_col = TermWin.ncol;
1480 ws.ws_row = TermWin.nrow;
1481 ws.ws_xpixel = ws.ws_ypixel = 0;
1482 (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws);
1483
1484 // unblock signals (signals are blocked by iom.C
1485 sigset_t ss;
1486 sigemptyset (&ss);
1487 sigprocmask (SIG_SETMASK, &ss, 0);
1488
1489#ifndef __QNX__
1490 /* command interpreter path */
1491 if (argv != NULL)
1492 {
1493# ifdef DEBUG_CMD
1494 int i;
1495
1496 for (i = 0; argv[i]; i++)
1497 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1498# endif 1149#endif
1499 1150
1500 execvp (argv[0], (char *const *)argv); 1151 scr_recolour ();
1501 /* no error message: STDERR is closed! */
1502 }
1503 else
1504 {
1505 const char *argv0, *shell;
1506
1507 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1508 shell = "/bin/sh";
1509
1510 argv0 = (const char *)rxvt_r_basename (shell);
1511 if (Options & Opt_loginShell)
1512 {
1513 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char));
1514
1515 login[0] = '-';
1516 STRCPY (&login[1], argv0);
1517 argv0 = login;
1518 }
1519 execlp (shell, argv0, NULL);
1520 /* no error message: STDERR is closed! */
1521 }
1522
1523#else /* __QNX__ uses qnxspawn () */
1524
1525 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1526 char *command = NULL, fullcommand[_MAX_PATH];
1527 char **arg_v, *arg_a[2] = { NULL, NULL };
1528
1529 if (argv != NULL)
1530 {
1531 if (access (argv[0], X_OK) == -1)
1532 {
1533 if (STRCHR (argv[0], '/') == NULL)
1534 {
1535 searchenv (argv[0], "PATH", fullcommand);
1536 if (fullcommand[0] != '\0')
1537 command = fullcommand;
1538 }
1539 if (access (command, X_OK) == -1)
1540 return -1;
1541 }
1542 else
1543 command = argv[0];
1544 arg_v = argv;
1545 }
1546 else
1547 {
1548 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1549 command = "/bin/sh";
1550
1551 arg_a[0] = my_basename (command);
1552 if (Options & Opt_loginShell)
1553 {
1554 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1555
1556 login[0] = '-';
1557 STRCPY (&login[1], arg_a[0]);
1558 arg_a[0] = login;
1559 }
1560 arg_v = arg_a;
1561 }
1562 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1563 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1564 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1565 command, arg_v, environ, iov_a, 0);
1566 if (login)
1567 free (login);
1568
1569 close (tty_fd);
1570 return cmd_fd;
1571
1572#endif
1573 return -1;
1574} 1152}
1575 1153
1576/* ------------------------------------------------------------------------- * 1154/* ------------------------------------------------------------------------- *
1577 * GET TTY CURRENT STATE * 1155 * GET TTY CURRENT STATE *
1578 * ------------------------------------------------------------------------- */ 1156 * ------------------------------------------------------------------------- */
1579/* rxvt_get_ttymode () */
1580/* EXTPROTO */
1581void 1157void
1582rxvt_get_ttymode (ttymode_t *tio, int erase) 1158rxvt_get_ttymode (ttymode_t *tio, int erase)
1583{ 1159{
1584#ifdef HAVE_TERMIOS_H 1160#ifdef HAVE_TERMIOS_H
1585 /* 1161 /*
… …
1800# undef FOO 1376# undef FOO
1801# endif /* HAVE_TERMIOS_H */ 1377# endif /* HAVE_TERMIOS_H */
1802#endif /* DEBUG_TTYMODE */ 1378#endif /* DEBUG_TTYMODE */
1803} 1379}
1804 1380
1381/*----------------------------------------------------------------------*/
1382/*
1383 * Run the command in a subprocess and return a file descriptor for the
1384 * master end of the pseudo-teletype pair with the command talking to
1385 * the slave.
1386 */
1387void
1388rxvt_term::run_command (const char *const *argv)
1389{
1390 if (!pty.get ())
1391 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1392
1393 pty.set_utf8_mode (enc_utf8);
1394
1395 /* set initial window size */
1396 tt_winch ();
1397
1398 int er;
1399
1400#ifndef NO_BACKSPACE_KEY
1401 if (key_backspace[0] && !key_backspace[1])
1402 er = key_backspace[0];
1403 else if (strcmp (key_backspace, "DEC") == 0)
1404 er = '\177'; /* the initial state anyway */
1405 else
1406#endif
1407 er = -1;
1408
1409 rxvt_get_ttymode (&tio, er);
1410
1411 sw_chld.start (SIGCHLD);
1412
1413#ifndef __QNX__
1414 /* spin off the command interpreter */
1415 switch (cmd_pid = fork ())
1416 {
1417 case -1:
1418 rxvt_fatal ("can't fork, aborting.\n");
1419 case 0:
1420 init_env ();
1421
1422 if (!pty.make_controlling_tty ())
1423 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1424 else
1425 {
1426 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1427 dup2 (pty.tty, STDIN_FILENO);
1428 dup2 (pty.tty, STDOUT_FILENO);
1429 dup2 (pty.tty, STDERR_FILENO);
1430
1431 // close all our file handles that we do no longer need
1432 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1433 {
1434 if ((*t)->pty.pty > 2) close ((*t)->pty.pty);
1435 if ((*t)->pty.tty > 2) close ((*t)->pty.tty);
1436 }
1437
1438 run_child (argv);
1439 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1440 }
1441
1442 _exit (EXIT_FAILURE);
1443
1444 default:
1445 {
1446#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1447 int fdstdin;
1448
1449 fdstdin = dup (STDIN_FILENO);
1450 dup2 (pty.tty, STDIN_FILENO);
1451#endif
1452
1453#ifdef UTMP_SUPPORT
1454 privileged_utmp (SAVE);
1455#endif
1456
1457#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1458
1459 dup2 (fdstdin, STDIN_FILENO);
1460 close (fdstdin);
1461#endif
1462 }
1463
1464 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1465 break;
1466 }
1467#else /* __QNX__ uses qnxspawn () */
1468 fchmod (pty.tty, 0622);
1469 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1470 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1471
1472 if (run_child (argv) == -1)
1473 exit (EXIT_FAILURE);
1474#endif
1475}
1476
1477/* ------------------------------------------------------------------------- *
1478 * CHILD PROCESS OPERATIONS *
1479 * ------------------------------------------------------------------------- */
1480/*
1481 * The only open file descriptor is the slave tty - so no error messages.
1482 * returns are fatal
1483 */
1484int
1485rxvt_term::run_child (const char *const *argv)
1486{
1487 char *login;
1488
1489 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1490
1491 if (options & Opt_console)
1492 { /* be virtual console, fail silently */
1493#ifdef TIOCCONS
1494 unsigned int on = 1;
1495
1496 ioctl (STDIN_FILENO, TIOCCONS, &on);
1497#elif defined (SRIOCSREDIR)
1498 int fd;
1499
1500 fd = open (CONSOLE, O_WRONLY, 0);
1501 if (fd >= 0)
1502 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1503 close (fd);
1504#endif /* SRIOCSREDIR */
1505 }
1506
1507 /* reset signals and spin off the command interpreter */
1508 signal (SIGINT, SIG_DFL);
1509 signal (SIGQUIT, SIG_DFL);
1510 signal (SIGCHLD, SIG_DFL);
1511 signal (SIGHUP, SIG_DFL);
1512 signal (SIGPIPE, SIG_DFL);
1513 /*
1514 * mimick login's behavior by disabling the job control signals
1515 * a shell that wants them can turn them back on
1516 */
1517#ifdef SIGTSTP
1518 signal (SIGTSTP, SIG_IGN);
1519 signal (SIGTTIN, SIG_IGN);
1520 signal (SIGTTOU, SIG_IGN);
1521#endif /* SIGTSTP */
1522
1523 // unblock signals (signals are blocked by iom.C
1524 sigset_t ss;
1525 sigemptyset (&ss);
1526 sigprocmask (SIG_SETMASK, &ss, 0);
1527
1528#ifndef __QNX__
1529 /* command interpreter path */
1530 if (argv != NULL)
1531 {
1532# ifdef DEBUG_CMD
1533 int i;
1534
1535 for (i = 0; argv[i]; i++)
1536 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1537# endif
1538
1539 execvp (argv[0], (char *const *)argv);
1540 /* no error message: STDERR is closed! */
1541 }
1542 else
1543 {
1544 const char *argv0, *shell;
1545
1546 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1547 shell = "/bin/sh";
1548
1549 argv0 = (const char *)rxvt_r_basename (shell);
1550
1551 if (options & Opt_loginShell)
1552 {
1553 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1554
1555 login[0] = '-';
1556 strcpy (&login[1], argv0);
1557 argv0 = login;
1558 }
1559 execlp (shell, argv0, NULL);
1560 /* no error message: STDERR is closed! */
1561 }
1562
1563#else /* __QNX__ uses qnxspawn () */
1564
1565 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1566 char *command = NULL, fullcommand[_MAX_PATH];
1567 char **arg_v, *arg_a[2] = { NULL, NULL };
1568
1569 if (argv != NULL)
1570 {
1571 if (access (argv[0], X_OK) == -1)
1572 {
1573 if (strchr (argv[0], '/') == NULL)
1574 {
1575 searchenv (argv[0], "PATH", fullcommand);
1576
1577 if (fullcommand[0] != '\0')
1578 command = fullcommand;
1579 }
1580
1581 if (access (command, X_OK) == -1)
1582 return -1;
1583 }
1584 else
1585 command = argv[0];
1586
1587 arg_v = argv;
1588 }
1589 else
1590 {
1591 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1592 command = "/bin/sh";
1593
1594 arg_a[0] = my_basename (command);
1595
1596 if (options & Opt_loginShell)
1597 {
1598 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1599
1600 login[0] = '-';
1601 strcpy (&login[1], arg_a[0]);
1602 arg_a[0] = login;
1603 }
1604
1605 arg_v = arg_a;
1606 }
1607
1608 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1609 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1610 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1611 command, arg_v, environ, iov_a, 0);
1612 if (login)
1613 free (login);
1614
1615 pty.close_tty ();
1616 return pty.pty;
1617#endif
1618
1619 return -1;
1620}
1621
1805/*----------------------- end-of-file (C source) -----------------------*/ 1622/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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