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.65 by root, Fri Jul 30 16:13:46 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 "rgb:00/00/00", /* default 16-255 color table */ 74 // 88 xterm colours
74 "rgb:00/00/2a", 75 "rgb:00/00/00",
75 "rgb:00/00/55", 76 "rgb:00/00/8b",
76 "rgb:00/00/7f",
77 "rgb:00/00/aa",
78 "rgb:00/00/d4", 77 "rgb:00/00/cd",
78 "rgb:00/00/ff",
79 "rgb:00/2a/00", 79 "rgb:00/8b/00",
80 "rgb:00/2a/2a", 80 "rgb:00/8b/8b",
81 "rgb:00/2a/55",
82 "rgb:00/2a/7f",
83 "rgb:00/2a/aa",
84 "rgb:00/2a/d4", 81 "rgb:00/8b/cd",
85 "rgb:00/55/00",
86 "rgb:00/55/2a",
87 "rgb:00/55/55",
88 "rgb:00/55/7f", 82 "rgb:00/8b/ff",
89 "rgb:00/55/aa",
90 "rgb:00/55/d4",
91 "rgb:00/7f/00",
92 "rgb:00/7f/2a",
93 "rgb:00/7f/55",
94 "rgb:00/7f/7f",
95 "rgb:00/7f/aa",
96 "rgb:00/7f/d4",
97 "rgb:00/aa/00",
98 "rgb:00/aa/2a",
99 "rgb:00/aa/55",
100 "rgb:00/aa/7f",
101 "rgb:00/aa/aa",
102 "rgb:00/aa/d4",
103 "rgb:00/d4/00", 83 "rgb:00/cd/00",
104 "rgb:00/d4/2a", 84 "rgb:00/cd/8b",
105 "rgb:00/d4/55",
106 "rgb:00/d4/7f",
107 "rgb:00/d4/aa",
108 "rgb:00/d4/d4", 85 "rgb:00/cd/cd",
86 "rgb:00/cd/ff",
87 "rgb:00/ff/00",
88 "rgb:00/ff/8b",
89 "rgb:00/ff/cd",
90 "rgb:00/ff/ff",
109 "rgb:2a/00/00", 91 "rgb:8b/00/00",
110 "rgb:2a/00/2a", 92 "rgb:8b/00/8b",
111 "rgb:2a/00/55",
112 "rgb:2a/00/7f",
113 "rgb:2a/00/aa",
114 "rgb:2a/00/d4", 93 "rgb:8b/00/cd",
115 "rgb:2a/2a/00",
116 "rgb:2a/2a/2a",
117 "rgb:2a/2a/55",
118 "rgb:2a/2a/7f",
119 "rgb:2a/2a/aa",
120 "rgb:2a/2a/d4",
121 "rgb:2a/55/00",
122 "rgb:2a/55/2a",
123 "rgb:2a/55/55",
124 "rgb:2a/55/7f",
125 "rgb:2a/55/aa",
126 "rgb:2a/55/d4",
127 "rgb:2a/7f/00",
128 "rgb:2a/7f/2a",
129 "rgb:2a/7f/55",
130 "rgb:2a/7f/7f",
131 "rgb:2a/7f/aa",
132 "rgb:2a/7f/d4",
133 "rgb:2a/aa/00",
134 "rgb:2a/aa/2a",
135 "rgb:2a/aa/55",
136 "rgb:2a/aa/7f",
137 "rgb:2a/aa/aa",
138 "rgb:2a/aa/d4",
139 "rgb:2a/d4/00",
140 "rgb:2a/d4/2a",
141 "rgb:2a/d4/55",
142 "rgb:2a/d4/7f",
143 "rgb:2a/d4/aa",
144 "rgb:2a/d4/d4",
145 "rgb:55/00/00",
146 "rgb:55/00/2a",
147 "rgb:55/00/55",
148 "rgb:55/00/7f", 94 "rgb:8b/00/ff",
149 "rgb:55/00/aa",
150 "rgb:55/00/d4",
151 "rgb:55/2a/00", 95 "rgb:8b/8b/00",
152 "rgb:55/2a/2a", 96 "rgb:8b/8b/8b",
153 "rgb:55/2a/55", 97 "rgb:8b/8b/cd",
154 "rgb:55/2a/7f", 98 "rgb:8b/8b/ff",
155 "rgb:55/2a/aa",
156 "rgb:55/2a/d4",
157 "rgb:55/55/00",
158 "rgb:55/55/2a",
159 "rgb:55/55/55",
160 "rgb:55/55/7f",
161 "rgb:55/55/aa",
162 "rgb:55/55/d4",
163 "rgb:55/7f/00",
164 "rgb:55/7f/2a",
165 "rgb:55/7f/55",
166 "rgb:55/7f/7f",
167 "rgb:55/7f/aa",
168 "rgb:55/7f/d4",
169 "rgb:55/aa/00",
170 "rgb:55/aa/2a",
171 "rgb:55/aa/55",
172 "rgb:55/aa/7f",
173 "rgb:55/aa/aa",
174 "rgb:55/aa/d4",
175 "rgb:55/d4/00", 99 "rgb:8b/cd/00",
176 "rgb:55/d4/2a", 100 "rgb:8b/cd/8b",
177 "rgb:55/d4/55",
178 "rgb:55/d4/7f",
179 "rgb:55/d4/aa",
180 "rgb:55/d4/d4", 101 "rgb:8b/cd/cd",
181 "rgb:7f/00/00", 102 "rgb:8b/cd/ff",
182 "rgb:7f/00/2a",
183 "rgb:7f/00/55",
184 "rgb:7f/00/7f",
185 "rgb:7f/00/aa",
186 "rgb:7f/00/d4",
187 "rgb:7f/2a/00",
188 "rgb:7f/2a/2a",
189 "rgb:7f/2a/55",
190 "rgb:7f/2a/7f",
191 "rgb:7f/2a/aa",
192 "rgb:7f/2a/d4",
193 "rgb:7f/55/00",
194 "rgb:7f/55/2a",
195 "rgb:7f/55/55",
196 "rgb:7f/55/7f",
197 "rgb:7f/55/aa",
198 "rgb:7f/55/d4",
199 "rgb:7f/7f/00", 103 "rgb:8b/ff/00",
200 "rgb:7f/7f/2a", 104 "rgb:8b/ff/8b",
201 "rgb:7f/7f/55",
202 "rgb:7f/7f/7f",
203 "rgb:7f/7f/aa",
204 "rgb:7f/7f/d4",
205 "rgb:7f/aa/00",
206 "rgb:7f/aa/2a",
207 "rgb:7f/aa/55",
208 "rgb:7f/aa/7f",
209 "rgb:7f/aa/aa",
210 "rgb:7f/aa/d4",
211 "rgb:7f/d4/00",
212 "rgb:7f/d4/2a",
213 "rgb:7f/d4/55",
214 "rgb:7f/d4/7f",
215 "rgb:7f/d4/aa",
216 "rgb:7f/d4/d4",
217 "rgb:aa/00/00",
218 "rgb:aa/00/2a",
219 "rgb:aa/00/55",
220 "rgb:aa/00/7f",
221 "rgb:aa/00/aa",
222 "rgb:aa/00/d4",
223 "rgb:aa/2a/00",
224 "rgb:aa/2a/2a",
225 "rgb:aa/2a/55",
226 "rgb:aa/2a/7f",
227 "rgb:aa/2a/aa",
228 "rgb:aa/2a/d4",
229 "rgb:aa/55/00",
230 "rgb:aa/55/2a",
231 "rgb:aa/55/55",
232 "rgb:aa/55/7f",
233 "rgb:aa/55/aa",
234 "rgb:aa/55/d4",
235 "rgb:aa/7f/00",
236 "rgb:aa/7f/2a",
237 "rgb:aa/7f/55",
238 "rgb:aa/7f/7f",
239 "rgb:aa/7f/aa",
240 "rgb:aa/7f/d4", 105 "rgb:8b/ff/cd",
241 "rgb:aa/aa/00", 106 "rgb:8b/ff/ff",
242 "rgb:aa/aa/2a",
243 "rgb:aa/aa/55",
244 "rgb:aa/aa/7f",
245 "rgb:aa/aa/aa",
246 "rgb:aa/aa/d4",
247 "rgb:aa/d4/00",
248 "rgb:aa/d4/2a",
249 "rgb:aa/d4/55",
250 "rgb:aa/d4/7f",
251 "rgb:aa/d4/aa",
252 "rgb:aa/d4/d4",
253 "rgb:d4/00/00", 107 "rgb:cd/00/00",
254 "rgb:d4/00/2a", 108 "rgb:cd/00/8b",
255 "rgb:d4/00/55",
256 "rgb:d4/00/7f",
257 "rgb:d4/00/aa",
258 "rgb:d4/00/d4", 109 "rgb:cd/00/cd",
110 "rgb:cd/00/ff",
259 "rgb:d4/2a/00", 111 "rgb:cd/8b/00",
260 "rgb:d4/2a/2a", 112 "rgb:cd/8b/8b",
261 "rgb:d4/2a/55",
262 "rgb:d4/2a/7f",
263 "rgb:d4/2a/aa",
264 "rgb:d4/2a/d4", 113 "rgb:cd/8b/cd",
265 "rgb:d4/55/00",
266 "rgb:d4/55/2a",
267 "rgb:d4/55/55",
268 "rgb:d4/55/7f", 114 "rgb:cd/8b/ff",
269 "rgb:d4/55/aa",
270 "rgb:d4/55/d4",
271 "rgb:d4/7f/00",
272 "rgb:d4/7f/2a",
273 "rgb:d4/7f/55",
274 "rgb:d4/7f/7f",
275 "rgb:d4/7f/aa",
276 "rgb:d4/7f/d4",
277 "rgb:d4/aa/00",
278 "rgb:d4/aa/2a",
279 "rgb:d4/aa/55",
280 "rgb:d4/aa/7f",
281 "rgb:d4/aa/aa",
282 "rgb:d4/aa/d4",
283 "rgb:d4/d4/00", 115 "rgb:cd/cd/00",
284 "rgb:d4/d4/2a", 116 "rgb:cd/cd/8b",
285 "rgb:d4/d4/55",
286 "rgb:d4/d4/7f",
287 "rgb:d4/d4/aa",
288 "rgb:d4/d4/d4", 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",
289 "rgb:08/08/08", 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",
290 "rgb:12/12/12", 139 "rgb:2e/2e/2e",
291 "rgb:1c/1c/1c", 140 "rgb:5c/5c/5c",
292 "rgb:26/26/26",
293 "rgb:30/30/30", 141 "rgb:73/73/73",
294 "rgb:3a/3a/3a",
295 "rgb:44/44/44",
296 "rgb:4e/4e/4e",
297 "rgb:58/58/58", 142 "rgb:8b/8b/8b",
298 "rgb:62/62/62", 143 "rgb:a2/a2/a2",
299 "rgb:6c/6c/6c",
300 "rgb:76/76/76",
301 "rgb:80/80/80",
302 "rgb:8a/8a/8a",
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 if ((cmd_fd = run_command (argv)) < 0) 688 run_command (argv);
874 rxvt_fatal ("failure while running command, aborting");
875} 689}
876 690
877/*----------------------------------------------------------------------*/ 691/*----------------------------------------------------------------------*/
878void 692void
879rxvt_term::Get_Colours () 693rxvt_term::Get_Colours ()
880{ 694{
881 int i; 695 int i;
882 696
883#ifdef OFF_FOCUS_FADING 697#ifdef OFF_FOCUS_FADING
884 PixColors = PixColorsFocused; 698 pix_colors = pix_colors_focused;
885#endif 699#endif
886 700
887 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 701 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
888 { 702 {
889 rxvt_color xcol; 703 rxvt_color xcol;
890 704
891 if (!rs[Rs_color + i]) 705 if (!rs[Rs_color + i])
892 continue; 706 continue;
893 707
894 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 708 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
895 { 709 {
896#ifndef XTERM_REVERSE_VIDEO 710#ifndef XTERM_REVERSE_VIDEO
897 if (i < 2 && (Options & Opt_reverseVideo)) 711 if (i < 2 && (options & Opt_reverseVideo))
898 rs[Rs_color + i] = def_colorName[!i]; 712 rs[Rs_color + i] = def_colorName[!i];
899 else 713 else
900#endif 714#endif
901 rs[Rs_color + i] = def_colorName[i]; 715 rs[Rs_color + i] = def_colorName[i];
902 716
… …
908 switch (i) 722 switch (i)
909 { 723 {
910 case Color_fg: 724 case Color_fg:
911 case Color_bg: 725 case Color_bg:
912 /* fatal: need bg/fg color */ 726 /* fatal: need bg/fg color */
913 rxvt_fatal ("unable to get foreground/background colour, aborting"); 727 rxvt_fatal ("unable to get foreground/background colour, aborting.\n");
914 /* NOTREACHED */ 728 /* NOTREACHED */
915 break; 729 break;
916#ifndef NO_CURSORCOLOR 730#ifndef NO_CURSORCOLOR
917 case Color_cursor2: 731 case Color_cursor2:
918 xcol = PixColors[Color_fg]; 732 xcol = pix_colors[Color_fg];
919 break; 733 break;
920#endif /* ! NO_CURSORCOLOR */ 734#endif /* ! NO_CURSORCOLOR */
921 case Color_pointer_fg: 735 case Color_pointer_fg:
922 xcol = PixColors[Color_fg]; 736 xcol = pix_colors[Color_fg];
923 break; 737 break;
924 default: 738 default:
925 xcol = PixColors[Color_bg]; /* None */ 739 xcol = pix_colors[Color_bg]; /* None */
926 break; 740 break;
927 } 741 }
928 } 742 }
929 } 743 }
930 744
931 PixColors[i] = xcol; 745 pix_colors[i] = xcol;
932#ifdef OFF_FOCUS_FADING 746#ifdef OFF_FOCUS_FADING
933 if (rs[Rs_fade]) 747 if (rs[Rs_fade])
934 PixColorsUnFocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 748 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
935#endif 749#endif
936 SET_PIXCOLOR (i); 750 SET_PIXCOLOR (i);
937 } 751 }
938 752
939 if (XDEPTH <= 2) 753 if (display->depth <= 2)
940 { 754 {
941 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];
942 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];
943 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];
944 } 758 }
945 759
946 /* 760 /*
947 * get scrollBar/menuBar shadow colors 761 * get scrollBar/menuBar shadow colors
948 * 762 *
949 * The calculations of topShadow/bottomShadow values are adapted 763 * The calculations of topShadow/bottomShadow values are adapted
950 * from the fvwm window manager. 764 * from the fvwm window manager.
951 */ 765 */
952#ifdef KEEP_SCROLLCOLOR 766#ifdef KEEP_SCROLLCOLOR
953 767
954 if (XDEPTH <= 2) 768 if (display->depth <= 2)
955 { /* Monochrome */ 769 { /* Monochrome */
956 PixColors[Color_scroll] = PixColors[Color_fg]; 770 pix_colors[Color_scroll] = pix_colors[Color_fg];
957 PixColors[Color_topShadow] = PixColors[Color_bg]; 771 pix_colors[Color_topShadow] = pix_colors[Color_bg];
958 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 772 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
959 } 773 }
960 else 774 else
961 { 775 {
962 rxvt_color xcol[2]; 776 rxvt_color xcol[2];
963 /* xcol[0] == white 777 /* xcol[0] == white
964 * xcol[1] == top shadow 778 * xcol[1] == top shadow
965 * xcol[2] == bot shadow */ 779 * xcol[2] == bot shadow */
966 780
967 xcol[1] = PixColors[Color_scroll]; 781 xcol[1] = pix_colors[Color_scroll];
968 xcol[0].set (display, 65535, 65535, 65535); 782 xcol[0].set (display, 65535, 65535, 65535);
969 783
970 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 784 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
971 785
972 xcol[0].get (display, pr0, pg0, pb0); 786 xcol[0].get (display, pr0, pg0, pb0);
973 xcol[1].get (display, pr1, pg1, pb1); 787 xcol[1].get (display, pr1, pg1, pb1);
974 788
975 PixColors[Color_bottomShadow] = xcol[1].fade (display, 50); 789 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
976 790
977 /* topShadowColor */ 791 /* topShadowColor */
978 if (!xcol[1].set (display, 792 if (!xcol[1].set (display,
979 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 793 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
980 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 794 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
981 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 795 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
982 xcol[1] = PixColors[Color_White]; 796 xcol[1] = pix_colors[Color_White];
983 797
984 PixColors[Color_topShadow] = xcol[1]; 798 pix_colors[Color_topShadow] = xcol[1];
985 } 799 }
986#endif /* KEEP_SCROLLCOLOR */ 800#endif /* KEEP_SCROLLCOLOR */
987} 801}
988 802
989/*----------------------------------------------------------------------*/ 803/*----------------------------------------------------------------------*/
… …
1000 i -= 8; 814 i -= 8;
1001#ifndef NO_BRIGHTCOLOR 815#ifndef NO_BRIGHTCOLOR
1002 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 816 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1003 return; 817 return;
1004#endif 818#endif
1005
1006 } 819 }
1007 820
1008 if (i >= 0 && i <= 7) /* normal colors */ 821 if (i >= 0 && i <= 7) /* normal colors */
1009 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 822 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1010 } 823 }
… …
1028 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 841 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
1029 }; 842 };
1030 843
1031 requestedmeta = realmeta = realalt = 0; 844 requestedmeta = realmeta = realalt = 0;
1032 rsmod = rs[Rs_modifier]; 845 rsmod = rs[Rs_modifier];
846
1033 if (rsmod 847 if (rsmod
1034 && STRCASECMP (rsmod, "mod1") >= 0 && STRCASECMP (rsmod, "mod5") <= 0) 848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
1035 requestedmeta = rsmod[3] - '0'; 849 requestedmeta = rsmod[3] - '0';
1036 850
1037 map = XGetModifierMapping (display->display); 851 map = XGetModifierMapping (display->display);
1038 kc = map->modifiermap; 852 kc = map->modifiermap;
853
1039 for (i = 1; i < 6; i++) 854 for (i = 1; i < 6; i++)
1040 { 855 {
1041 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 856 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
857
1042 for (j = map->max_keypermod; j--; k++) 858 for (j = map->max_keypermod; j--; k++)
1043 { 859 {
1044 if (kc[k] == 0) 860 if (kc[k] == 0)
1045 break; 861 break;
862
1046 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 863 switch (XKeycodeToKeysym (display->display, kc[k], 0))
1047 { 864 {
1048 case XK_Num_Lock: 865 case XK_Num_Lock:
1049 ModNumLockMask = modmasks[i - 1]; 866 ModNumLockMask = modmasks[i - 1];
1050 /* FALLTHROUGH */ 867 continue;
1051 default: 868
1052 continue; /* for (;;) */ 869 case XK_ISO_Level3_Shift:
870 ModLevel3Mask = modmasks[i - 1];
871 continue;
872
1053 case XK_Meta_L: 873 case XK_Meta_L:
1054 case XK_Meta_R: 874 case XK_Meta_R:
1055 cm = "meta"; 875 cm = "meta";
1056 realmeta = i; 876 realmeta = i;
1057 break; 877 break;
878
1058 case XK_Alt_L: 879 case XK_Alt_L:
1059 case XK_Alt_R: 880 case XK_Alt_R:
1060 cm = "alt"; 881 cm = "alt";
1061 realalt = i; 882 realalt = i;
1062 break; 883 break;
884
1063 case XK_Super_L: 885 case XK_Super_L:
1064 case XK_Super_R: 886 case XK_Super_R:
1065 cm = "super"; 887 cm = "super";
1066 break; 888 break;
889
1067 case XK_Hyper_L: 890 case XK_Hyper_L:
1068 case XK_Hyper_R: 891 case XK_Hyper_R:
1069 cm = "hyper"; 892 cm = "hyper";
1070 break; 893 break;
894
895 default:
896 continue;
1071 } 897 }
1072 if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0) 898
899 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
1073 requestedmeta = i; 900 requestedmeta = i;
1074 } 901 }
1075 } 902 }
903
1076 XFreeModifiermap (map); 904 XFreeModifiermap (map);
905
1077 i = (requestedmeta ? requestedmeta 906 i = requestedmeta ? requestedmeta
1078 : (realmeta ? realmeta 907 : realmeta ? realmeta
1079 : (realalt ? realalt : 0))); 908 : realalt ? realalt
909 : 0;
910
1080 if (i) 911 if (i)
1081 ModMetaMask = modmasks[i - 1]; 912 ModMetaMask = modmasks[i - 1];
1082} 913}
1083 914
1084/*----------------------------------------------------------------------*/ 915/*----------------------------------------------------------------------*/
… …
1086void 917void
1087rxvt_term::create_windows (int argc, const char *const *argv) 918rxvt_term::create_windows (int argc, const char *const *argv)
1088{ 919{
1089 XClassHint classHint; 920 XClassHint classHint;
1090 XWMHints wmHint; 921 XWMHints wmHint;
922#if ENABLE_FRILLS
923 Atom prop = None;
924 MWMHints mwmhints;
925#endif
1091 XGCValues gcvalue; 926 XGCValues gcvalue;
1092 long vt_emask; 927 long vt_emask;
1093 XSetWindowAttributes attributes; 928 XSetWindowAttributes attributes;
1094 XWindowAttributes gattr; 929 XWindowAttributes gattr;
1095 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
1096 if (Options & Opt_transparent) 939 if (options & Opt_transparent)
1097 { 940 {
1098 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 941 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1099 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 942 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1100 } 943 }
1101 944
945#if ENABLE_FRILLS
946 if (options & Opt_borderLess)
947 {
948 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True);
949
950 if (prop == None)
951 {
952 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
953#ifdef PREFER_24BIT
954 attributes.override_redirect = TRUE;
955#endif
956 mwmhints.flags = 0;
957 }
958 else
959 {
960 mwmhints.flags = MWM_HINTS_DECORATIONS;
961 mwmhints.decorations = 0;
962 }
963 }
964 else
965 {
966 mwmhints.flags = 0;
967 }
968#endif
969
1102 /* grab colors before netscape does */ 970 /* grab colors before netscape does */
1103 Get_Colours (); 971 Get_Colours ();
1104 972
1105 if (!change_font (rs[Rs_font])) 973 if (!set_fonts ())
1106 { 974 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1107 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1108 destroy ();
1109 return;
1110 }
1111 975
1112 window_calc (0, 0); 976 window_calc (0, 0);
1113 old_width = szHint.width; 977 old_width = szHint.width;
1114 old_height = szHint.height; 978 old_height = szHint.height;
1115 979
1116 /* sub-window placement & size in rxvt_resize_subwindows () */ 980 /* sub-window placement & size in rxvt_resize_subwindows () */
1117 981
1118#ifdef PREFER_24BIT 982#ifdef PREFER_24BIT
1119 attributes.background_pixel = PixColors[Color_bg]; 983 attributes.background_pixel = pix_colors_focused[Color_border];
1120 attributes.border_pixel = PixColors[Color_border]; 984 attributes.border_pixel = pix_colors_focused[Color_border];
1121 attributes.colormap = display->cmap; 985 attributes.colormap = display->cmap;
1122 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 986 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1123 szHint.x, szHint.y, 987 szHint.x, szHint.y,
1124 szHint.width, szHint.height, 988 szHint.width, szHint.height,
1125 TermWin.ext_bwidth, 989 TermWin.ext_bwidth,
… …
1129#else 993#else
1130 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 994 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1131 szHint.x, szHint.y, 995 szHint.x, szHint.y,
1132 szHint.width, szHint.height, 996 szHint.width, szHint.height,
1133 TermWin.ext_bwidth, 997 TermWin.ext_bwidth,
1134 PixColors[Color_border], 998 pix_colors_focused[Color_border],
1135 PixColors[Color_bg]); 999 pix_colors_focused[Color_border]);
1136#endif 1000#endif
1137 1001
1138 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1002 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1139 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1003 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1140 1004
1141 classHint.res_name = (char *)rs[Rs_name]; 1005 classHint.res_name = (char *)rs[Rs_name];
1142 classHint.res_class = (char *)RESCLASS; 1006 classHint.res_class = (char *)RESCLASS;
1143 1007
1144 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1008 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1145 wmHint.input = True; 1009 wmHint.input = True;
1146 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState; 1010 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1147 wmHint.window_group = TermWin.parent[0]; 1011 wmHint.window_group = TermWin.parent[0];
1148 1012
1149 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1013 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1150 (char **)argv, argc, &szHint, &wmHint, &classHint); 1014 (char **)argv, argc, &szHint, &wmHint, &classHint);
1151 1015
1152#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
1153 long pid = getpid (); 1021 long pid = getpid ();
1022
1154 XChangeProperty (display->display, TermWin.parent[0], 1023 XChangeProperty (display->display, TermWin.parent[0],
1155 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1024 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1156 PropModeReplace, (unsigned char *)&pid, 1); 1025 PropModeReplace, (unsigned char *)&pid, 1);
1157#endif 1026#endif
1158 1027
1159 XSelectInput (display->display, TermWin.parent[0], 1028 XSelectInput (display->display, TermWin.parent[0],
1160 KeyPressMask 1029 KeyPressMask
1161#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1030#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1162 | KeyReleaseMask 1031 | KeyReleaseMask
1163#endif 1032#endif
1164 | FocusChangeMask | VisibilityChangeMask 1033 | FocusChangeMask | VisibilityChangeMask
1034 | ExposureMask
1165 | StructureNotifyMask); 1035 | StructureNotifyMask);
1166 termwin_ev.start (display, TermWin.parent[0]); 1036 termwin_ev.start (display, TermWin.parent[0]);
1037
1038#if ENABLE_FRILLS
1039 if (mwmhints.flags)
1040 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1041 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1042#endif
1167 1043
1168 /* 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 */
1169 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1045 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1170 1046
1171#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1047#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1172 /* cursor (menuBar/scrollBar): Black-on-White */ 1048 /* cursor (menuBar/scrollBar): Black-on-White */
1173 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1049 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1174#endif
1175
1176#ifdef POINTER_BLANK
1177 {
1178 XColor blackcolour;
1179 blackcolour.red = 0;
1180 blackcolour.green = 0;
1181 blackcolour.blue = 0;
1182 Font f = XLoadFont (display->display, "fixed");
1183 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1184 &blackcolour, &blackcolour);
1185 XUnloadFont (display->display, f);
1186 }
1187#endif 1050#endif
1188 1051
1189 /* the vt window */ 1052 /* the vt window */
1190 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1053 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1191 window_vt_x, 1054 window_vt_x,
1192 window_vt_y, 1055 window_vt_y,
1193 TermWin_TotalWidth (), 1056 TermWin_TotalWidth (),
1194 TermWin_TotalHeight (), 1057 TermWin_TotalHeight (),
1195 0, 1058 0,
1196 PixColors[Color_fg], 1059 pix_colors_focused[Color_fg],
1197 PixColors[Color_bg]); 1060 pix_colors_focused[Color_bg]);
1198#ifdef DEBUG_X 1061#ifdef DEBUG_X
1199 XStoreName (display->display, TermWin.vt, "vt window"); 1062 XStoreName (display->display, TermWin.vt, "vt window");
1200#endif 1063#endif
1201 1064
1202 attributes.bit_gravity = NorthWestGravity; 1065 attributes.bit_gravity = NorthWestGravity;
… …
1205 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1068 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1206 1069
1207 pointer_unblank (); 1070 pointer_unblank ();
1208 1071
1209#ifdef POINTER_BLANK 1072#ifdef POINTER_BLANK
1210 if (Options & Opt_pointerBlank) 1073 if (options & Opt_pointerBlank)
1211 vt_emask |= PointerMotionMask; 1074 vt_emask |= PointerMotionMask;
1212 else 1075 else
1213#endif 1076#endif
1214 vt_emask |= Button1MotionMask | Button3MotionMask; 1077 vt_emask |= Button1MotionMask | Button3MotionMask;
1215 1078
… …
1222 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1085 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1223 window_vt_x, 0, 1086 window_vt_x, 0,
1224 TermWin_TotalWidth (), 1087 TermWin_TotalWidth (),
1225 menuBar_TotalHeight (), 1088 menuBar_TotalHeight (),
1226 0, 1089 0,
1227 PixColors[Color_fg], 1090 pix_colors_focused[Color_fg],
1228 PixColors[Color_scroll]); 1091 pix_colors_focused[Color_scroll]);
1229 1092
1230#ifdef DEBUG_X 1093#ifdef DEBUG_X
1231 XStoreName (display->display, menuBar.win, "menubar"); 1094 XStoreName (display->display, menuBar.win, "menubar");
1232#endif 1095#endif
1233 1096
… …
1243 } 1106 }
1244#endif 1107#endif
1245 1108
1246#ifdef XPM_BACKGROUND 1109#ifdef XPM_BACKGROUND
1247 if (rs[Rs_backgroundPixmap] != NULL 1110 if (rs[Rs_backgroundPixmap] != NULL
1248 && ! (Options & Opt_transparent)) 1111 && ! (options & Opt_transparent))
1249 { 1112 {
1250 const char *p = rs[Rs_backgroundPixmap]; 1113 const char *p = rs[Rs_backgroundPixmap];
1251 1114
1252 if ((p = STRCHR (p, ';')) != NULL) 1115 if ((p = strchr (p, ';')) != NULL)
1253 { 1116 {
1254 p++; 1117 p++;
1255 scale_pixmap (p); 1118 scale_pixmap (p);
1256 } 1119 }
1120
1257 set_bgPixmap (rs[Rs_backgroundPixmap]); 1121 set_bgPixmap (rs[Rs_backgroundPixmap]);
1258 scr_touch (True); 1122 scr_touch (true);
1259 } 1123 }
1260#endif 1124#endif
1261 1125
1262 /* graphics context for the vt window */ 1126 /* graphics context for the vt window */
1263 gcvalue.foreground = PixColors[Color_fg]; 1127 gcvalue.foreground = pix_colors[Color_fg];
1264 gcvalue.background = PixColors[Color_bg]; 1128 gcvalue.background = pix_colors[Color_bg];
1265 gcvalue.graphics_exposures = 1; 1129 gcvalue.graphics_exposures = 1;
1266 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1130 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1267 GCForeground | GCBackground | GCGraphicsExposures, 1131 GCForeground | GCBackground | GCGraphicsExposures,
1268 &gcvalue); 1132 &gcvalue);
1269 1133
1270 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1134 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1271 1135
1272#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1136#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1273 gcvalue.foreground = PixColors[Color_topShadow]; 1137 gcvalue.foreground = pix_colors[Color_topShadow];
1274 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1138 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1275 gcvalue.foreground = PixColors[Color_bottomShadow]; 1139 gcvalue.foreground = pix_colors[Color_bottomShadow];
1276 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1140 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1277 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)]; 1141 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1278 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1142 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1279#endif 1143#endif
1280 1144
1281#ifdef OFF_FOCUS_FADING 1145#ifdef OFF_FOCUS_FADING
1282 // initially we are in unfocused state 1146 // initially we are in unfocused state
1283 if (rs[Rs_fade]) 1147 if (rs[Rs_fade])
1284 PixColors = PixColorsUnFocused; 1148 pix_colors = pix_colors_unfocused;
1285#endif
1286}
1287
1288/*----------------------------------------------------------------------*/
1289/*
1290 * Run the command in a subprocess and return a file descriptor for the
1291 * master end of the pseudo-teletype pair with the command talking to
1292 * the slave.
1293 */
1294int
1295rxvt_term::run_command (const char *const *argv)
1296{
1297 int cfd, er;
1298
1299 /* get master (pty) */
1300 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1301 rxvt_fatal ("can't open pseudo-tty");
1302
1303 fcntl (cfd, F_SETFL, O_NONBLOCK);
1304
1305 /* get slave (tty) */
1306 if (tty_fd < 0)
1307 {
1308#ifndef NO_SETOWNER_TTYDEV
1309 privileged_ttydev (SAVE);
1310#endif
1311
1312 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1313 {
1314 close (cfd);
1315 rxvt_fatal ("can't open slave tty %s", ttydev);
1316 }
1317 }
1318#ifndef NO_BACKSPACE_KEY
1319 if (key_backspace[0] && !key_backspace[1])
1320 er = key_backspace[0];
1321 else if (STRCMP (key_backspace, "DEC") == 0)
1322 er = '\177'; /* the initial state anyway */
1323 else
1324#endif
1325
1326 er = -1;
1327
1328 rxvt_get_ttymode (& (tio), er);
1329
1330#ifndef __QNX__
1331 /* spin off the command interpreter */
1332 switch (cmd_pid = fork ())
1333 {
1334 case -1:
1335 rxvt_fatal ("can't fork");
1336 case 0:
1337 close (cfd); /* only keep tty_fd and STDERR open */
1338
1339 init_env ();
1340
1341 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1342 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1343 else
1344 {
1345 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1346 dup2 (tty_fd, STDIN_FILENO);
1347 dup2 (tty_fd, STDOUT_FILENO);
1348 dup2 (tty_fd, STDERR_FILENO);
1349
1350 if (tty_fd > 2)
1351 close (tty_fd);
1352
1353 run_child (argv);
1354 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1355 }
1356
1357 _exit (EXIT_FAILURE);
1358
1359 default:
1360 {
1361#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1362 int fdstdin;
1363
1364 fdstdin = dup (STDIN_FILENO);
1365 dup2 (tty_fd, STDIN_FILENO);
1366#endif
1367
1368#ifdef UTMP_SUPPORT
1369 privileged_utmp (SAVE);
1370#endif
1371
1372#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1373
1374 dup2 (fdstdin, STDIN_FILENO);
1375 close (fdstdin);
1376#endif
1377 }
1378
1379 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1380 break;
1381 }
1382#else /* __QNX__ uses qnxspawn () */
1383 fchmod (tty_fd, 0622);
1384 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1385 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1386
1387 if (run_child (argv) == -1)
1388 exit (EXIT_FAILURE);
1389#endif
1390
1391 return cfd;
1392}
1393
1394/* ------------------------------------------------------------------------- *
1395 * CHILD PROCESS OPERATIONS *
1396 * ------------------------------------------------------------------------- */
1397/*
1398 * The only open file descriptor is the slave tty - so no error messages.
1399 * returns are fatal
1400 */
1401int
1402rxvt_term::run_child (const char *const *argv)
1403{
1404 char *login;
1405
1406 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1407
1408 if (Options & Opt_console)
1409 { /* be virtual console, fail silently */
1410#ifdef TIOCCONS
1411 unsigned int on = 1;
1412
1413 ioctl (STDIN_FILENO, TIOCCONS, &on);
1414#elif defined (SRIOCSREDIR)
1415 int fd;
1416
1417 fd = open (CONSOLE, O_WRONLY, 0);
1418 if (fd >= 0)
1419 {
1420 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1421 close (fd);
1422 }
1423#endif /* SRIOCSREDIR */
1424
1425 }
1426
1427 /* reset signals and spin off the command interpreter */
1428 signal (SIGINT, SIG_DFL);
1429 signal (SIGQUIT, SIG_DFL);
1430 signal (SIGCHLD, SIG_DFL);
1431 /*
1432 * mimick login's behavior by disabling the job control signals
1433 * a shell that wants them can turn them back on
1434 */
1435#ifdef SIGTSTP
1436 signal (SIGTSTP, SIG_IGN);
1437 signal (SIGTTIN, SIG_IGN);
1438 signal (SIGTTOU, SIG_IGN);
1439#endif /* SIGTSTP */
1440
1441 /* set window size */
1442 struct winsize ws;
1443
1444 ws.ws_col = TermWin.ncol;
1445 ws.ws_row = TermWin.nrow;
1446 ws.ws_xpixel = ws.ws_ypixel = 0;
1447 (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws);
1448
1449 // unblock signals (signals are blocked by iom.C
1450 sigset_t ss;
1451 sigemptyset (&ss);
1452 sigprocmask (SIG_SETMASK, &ss, 0);
1453
1454#ifndef __QNX__
1455 /* command interpreter path */
1456 if (argv != NULL)
1457 {
1458# ifdef DEBUG_CMD
1459 int i;
1460
1461 for (i = 0; argv[i]; i++)
1462 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1463# endif 1149#endif
1464 1150
1465 execvp (argv[0], (char *const *)argv); 1151 scr_recolour ();
1466 /* no error message: STDERR is closed! */
1467 }
1468 else
1469 {
1470 const char *argv0, *shell;
1471
1472 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1473 shell = "/bin/sh";
1474
1475 argv0 = (const char *)rxvt_r_basename (shell);
1476 if (Options & Opt_loginShell)
1477 {
1478 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char));
1479
1480 login[0] = '-';
1481 STRCPY (&login[1], argv0);
1482 argv0 = login;
1483 }
1484 execlp (shell, argv0, NULL);
1485 /* no error message: STDERR is closed! */
1486 }
1487
1488#else /* __QNX__ uses qnxspawn () */
1489
1490 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1491 char *command = NULL, fullcommand[_MAX_PATH];
1492 char **arg_v, *arg_a[2] = { NULL, NULL };
1493
1494 if (argv != NULL)
1495 {
1496 if (access (argv[0], X_OK) == -1)
1497 {
1498 if (STRCHR (argv[0], '/') == NULL)
1499 {
1500 searchenv (argv[0], "PATH", fullcommand);
1501 if (fullcommand[0] != '\0')
1502 command = fullcommand;
1503 }
1504 if (access (command, X_OK) == -1)
1505 return -1;
1506 }
1507 else
1508 command = argv[0];
1509 arg_v = argv;
1510 }
1511 else
1512 {
1513 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1514 command = "/bin/sh";
1515
1516 arg_a[0] = my_basename (command);
1517 if (Options & Opt_loginShell)
1518 {
1519 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1520
1521 login[0] = '-';
1522 STRCPY (&login[1], arg_a[0]);
1523 arg_a[0] = login;
1524 }
1525 arg_v = arg_a;
1526 }
1527 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1528 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1529 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1530 command, arg_v, environ, iov_a, 0);
1531 if (login)
1532 free (login);
1533
1534 close (tty_fd);
1535 return cmd_fd;
1536
1537#endif
1538 return -1;
1539} 1152}
1540 1153
1541/* ------------------------------------------------------------------------- * 1154/* ------------------------------------------------------------------------- *
1542 * GET TTY CURRENT STATE * 1155 * GET TTY CURRENT STATE *
1543 * ------------------------------------------------------------------------- */ 1156 * ------------------------------------------------------------------------- */
1544/* rxvt_get_ttymode () */
1545/* EXTPROTO */
1546void 1157void
1547rxvt_get_ttymode (ttymode_t *tio, int erase) 1158rxvt_get_ttymode (ttymode_t *tio, int erase)
1548{ 1159{
1549#ifdef HAVE_TERMIOS_H 1160#ifdef HAVE_TERMIOS_H
1550 /* 1161 /*
… …
1765# undef FOO 1376# undef FOO
1766# endif /* HAVE_TERMIOS_H */ 1377# endif /* HAVE_TERMIOS_H */
1767#endif /* DEBUG_TTYMODE */ 1378#endif /* DEBUG_TTYMODE */
1768} 1379}
1769 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
1770/*----------------------- end-of-file (C source) -----------------------*/ 1622/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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