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.24 by pcg, Mon Feb 9 07:11:49 2004 UTC vs.
Revision 1.98 by root, Wed Dec 15 00:53:23 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: init.c 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
14 * 15 *
15 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
16 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
17 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
18 * (at your option) any later version. 19 * (at your option) any later version.
… …
66 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 67 "Yellow", /* 3/11: bright yellow (#FFFF00) */
67 "Blue", /* 4/12: bright blue (#0000FF) */ 68 "Blue", /* 4/12: bright blue (#0000FF) */
68 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 69 "Magenta", /* 5/13: bright magenta (#FF00FF) */
69 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 70 "Cyan", /* 6/14: bright cyan (#00FFFF) */
70 "White", /* 7/15: bright white (#FFFFFF) */ 71 "White", /* 7/15: bright white (#FFFFFF) */
71#ifdef TTY_256COLOR 72
72 "rgb:00/00/00", /* default 16-255 color table */ 73 // 88 xterm colours
73 "rgb:00/00/2a", 74 "rgb:00/00/00",
74 "rgb:00/00/55", 75 "rgb:00/00/8b",
75 "rgb:00/00/7f",
76 "rgb:00/00/aa",
77 "rgb:00/00/d4", 76 "rgb:00/00/cd",
77 "rgb:00/00/ff",
78 "rgb:00/2a/00", 78 "rgb:00/8b/00",
79 "rgb:00/2a/2a", 79 "rgb:00/8b/8b",
80 "rgb:00/2a/55",
81 "rgb:00/2a/7f",
82 "rgb:00/2a/aa",
83 "rgb:00/2a/d4", 80 "rgb:00/8b/cd",
84 "rgb:00/55/00",
85 "rgb:00/55/2a",
86 "rgb:00/55/55",
87 "rgb:00/55/7f", 81 "rgb:00/8b/ff",
88 "rgb:00/55/aa",
89 "rgb:00/55/d4",
90 "rgb:00/7f/00",
91 "rgb:00/7f/2a",
92 "rgb:00/7f/55",
93 "rgb:00/7f/7f",
94 "rgb:00/7f/aa",
95 "rgb:00/7f/d4",
96 "rgb:00/aa/00",
97 "rgb:00/aa/2a",
98 "rgb:00/aa/55",
99 "rgb:00/aa/7f",
100 "rgb:00/aa/aa",
101 "rgb:00/aa/d4",
102 "rgb:00/d4/00", 82 "rgb:00/cd/00",
103 "rgb:00/d4/2a", 83 "rgb:00/cd/8b",
104 "rgb:00/d4/55",
105 "rgb:00/d4/7f",
106 "rgb:00/d4/aa",
107 "rgb:00/d4/d4", 84 "rgb:00/cd/cd",
85 "rgb:00/cd/ff",
86 "rgb:00/ff/00",
87 "rgb:00/ff/8b",
88 "rgb:00/ff/cd",
89 "rgb:00/ff/ff",
108 "rgb:2a/00/00", 90 "rgb:8b/00/00",
109 "rgb:2a/00/2a", 91 "rgb:8b/00/8b",
110 "rgb:2a/00/55",
111 "rgb:2a/00/7f",
112 "rgb:2a/00/aa",
113 "rgb:2a/00/d4", 92 "rgb:8b/00/cd",
114 "rgb:2a/2a/00",
115 "rgb:2a/2a/2a",
116 "rgb:2a/2a/55",
117 "rgb:2a/2a/7f",
118 "rgb:2a/2a/aa",
119 "rgb:2a/2a/d4",
120 "rgb:2a/55/00",
121 "rgb:2a/55/2a",
122 "rgb:2a/55/55",
123 "rgb:2a/55/7f",
124 "rgb:2a/55/aa",
125 "rgb:2a/55/d4",
126 "rgb:2a/7f/00",
127 "rgb:2a/7f/2a",
128 "rgb:2a/7f/55",
129 "rgb:2a/7f/7f",
130 "rgb:2a/7f/aa",
131 "rgb:2a/7f/d4",
132 "rgb:2a/aa/00",
133 "rgb:2a/aa/2a",
134 "rgb:2a/aa/55",
135 "rgb:2a/aa/7f",
136 "rgb:2a/aa/aa",
137 "rgb:2a/aa/d4",
138 "rgb:2a/d4/00",
139 "rgb:2a/d4/2a",
140 "rgb:2a/d4/55",
141 "rgb:2a/d4/7f",
142 "rgb:2a/d4/aa",
143 "rgb:2a/d4/d4",
144 "rgb:55/00/00",
145 "rgb:55/00/2a",
146 "rgb:55/00/55",
147 "rgb:55/00/7f", 93 "rgb:8b/00/ff",
148 "rgb:55/00/aa",
149 "rgb:55/00/d4",
150 "rgb:55/2a/00", 94 "rgb:8b/8b/00",
151 "rgb:55/2a/2a", 95 "rgb:8b/8b/8b",
152 "rgb:55/2a/55", 96 "rgb:8b/8b/cd",
153 "rgb:55/2a/7f", 97 "rgb:8b/8b/ff",
154 "rgb:55/2a/aa",
155 "rgb:55/2a/d4",
156 "rgb:55/55/00",
157 "rgb:55/55/2a",
158 "rgb:55/55/55",
159 "rgb:55/55/7f",
160 "rgb:55/55/aa",
161 "rgb:55/55/d4",
162 "rgb:55/7f/00",
163 "rgb:55/7f/2a",
164 "rgb:55/7f/55",
165 "rgb:55/7f/7f",
166 "rgb:55/7f/aa",
167 "rgb:55/7f/d4",
168 "rgb:55/aa/00",
169 "rgb:55/aa/2a",
170 "rgb:55/aa/55",
171 "rgb:55/aa/7f",
172 "rgb:55/aa/aa",
173 "rgb:55/aa/d4",
174 "rgb:55/d4/00", 98 "rgb:8b/cd/00",
175 "rgb:55/d4/2a", 99 "rgb:8b/cd/8b",
176 "rgb:55/d4/55",
177 "rgb:55/d4/7f",
178 "rgb:55/d4/aa",
179 "rgb:55/d4/d4", 100 "rgb:8b/cd/cd",
180 "rgb:7f/00/00", 101 "rgb:8b/cd/ff",
181 "rgb:7f/00/2a",
182 "rgb:7f/00/55",
183 "rgb:7f/00/7f",
184 "rgb:7f/00/aa",
185 "rgb:7f/00/d4",
186 "rgb:7f/2a/00",
187 "rgb:7f/2a/2a",
188 "rgb:7f/2a/55",
189 "rgb:7f/2a/7f",
190 "rgb:7f/2a/aa",
191 "rgb:7f/2a/d4",
192 "rgb:7f/55/00",
193 "rgb:7f/55/2a",
194 "rgb:7f/55/55",
195 "rgb:7f/55/7f",
196 "rgb:7f/55/aa",
197 "rgb:7f/55/d4",
198 "rgb:7f/7f/00", 102 "rgb:8b/ff/00",
199 "rgb:7f/7f/2a", 103 "rgb:8b/ff/8b",
200 "rgb:7f/7f/55",
201 "rgb:7f/7f/7f",
202 "rgb:7f/7f/aa",
203 "rgb:7f/7f/d4",
204 "rgb:7f/aa/00",
205 "rgb:7f/aa/2a",
206 "rgb:7f/aa/55",
207 "rgb:7f/aa/7f",
208 "rgb:7f/aa/aa",
209 "rgb:7f/aa/d4",
210 "rgb:7f/d4/00",
211 "rgb:7f/d4/2a",
212 "rgb:7f/d4/55",
213 "rgb:7f/d4/7f",
214 "rgb:7f/d4/aa",
215 "rgb:7f/d4/d4",
216 "rgb:aa/00/00",
217 "rgb:aa/00/2a",
218 "rgb:aa/00/55",
219 "rgb:aa/00/7f",
220 "rgb:aa/00/aa",
221 "rgb:aa/00/d4",
222 "rgb:aa/2a/00",
223 "rgb:aa/2a/2a",
224 "rgb:aa/2a/55",
225 "rgb:aa/2a/7f",
226 "rgb:aa/2a/aa",
227 "rgb:aa/2a/d4",
228 "rgb:aa/55/00",
229 "rgb:aa/55/2a",
230 "rgb:aa/55/55",
231 "rgb:aa/55/7f",
232 "rgb:aa/55/aa",
233 "rgb:aa/55/d4",
234 "rgb:aa/7f/00",
235 "rgb:aa/7f/2a",
236 "rgb:aa/7f/55",
237 "rgb:aa/7f/7f",
238 "rgb:aa/7f/aa",
239 "rgb:aa/7f/d4", 104 "rgb:8b/ff/cd",
240 "rgb:aa/aa/00", 105 "rgb:8b/ff/ff",
241 "rgb:aa/aa/2a",
242 "rgb:aa/aa/55",
243 "rgb:aa/aa/7f",
244 "rgb:aa/aa/aa",
245 "rgb:aa/aa/d4",
246 "rgb:aa/d4/00",
247 "rgb:aa/d4/2a",
248 "rgb:aa/d4/55",
249 "rgb:aa/d4/7f",
250 "rgb:aa/d4/aa",
251 "rgb:aa/d4/d4",
252 "rgb:d4/00/00", 106 "rgb:cd/00/00",
253 "rgb:d4/00/2a", 107 "rgb:cd/00/8b",
254 "rgb:d4/00/55",
255 "rgb:d4/00/7f",
256 "rgb:d4/00/aa",
257 "rgb:d4/00/d4", 108 "rgb:cd/00/cd",
109 "rgb:cd/00/ff",
258 "rgb:d4/2a/00", 110 "rgb:cd/8b/00",
259 "rgb:d4/2a/2a", 111 "rgb:cd/8b/8b",
260 "rgb:d4/2a/55",
261 "rgb:d4/2a/7f",
262 "rgb:d4/2a/aa",
263 "rgb:d4/2a/d4", 112 "rgb:cd/8b/cd",
264 "rgb:d4/55/00",
265 "rgb:d4/55/2a",
266 "rgb:d4/55/55",
267 "rgb:d4/55/7f", 113 "rgb:cd/8b/ff",
268 "rgb:d4/55/aa",
269 "rgb:d4/55/d4",
270 "rgb:d4/7f/00",
271 "rgb:d4/7f/2a",
272 "rgb:d4/7f/55",
273 "rgb:d4/7f/7f",
274 "rgb:d4/7f/aa",
275 "rgb:d4/7f/d4",
276 "rgb:d4/aa/00",
277 "rgb:d4/aa/2a",
278 "rgb:d4/aa/55",
279 "rgb:d4/aa/7f",
280 "rgb:d4/aa/aa",
281 "rgb:d4/aa/d4",
282 "rgb:d4/d4/00", 114 "rgb:cd/cd/00",
283 "rgb:d4/d4/2a", 115 "rgb:cd/cd/8b",
284 "rgb:d4/d4/55",
285 "rgb:d4/d4/7f",
286 "rgb:d4/d4/aa",
287 "rgb:d4/d4/d4", 116 "rgb:cd/cd/cd",
117 "rgb:cd/cd/ff",
118 "rgb:cd/ff/00",
119 "rgb:cd/ff/8b",
120 "rgb:cd/ff/cd",
121 "rgb:cd/ff/ff",
288 "rgb:08/08/08", 122 "rgb:ff/00/00",
123 "rgb:ff/00/8b",
124 "rgb:ff/00/cd",
125 "rgb:ff/00/ff",
126 "rgb:ff/8b/00",
127 "rgb:ff/8b/8b",
128 "rgb:ff/8b/cd",
129 "rgb:ff/8b/ff",
130 "rgb:ff/cd/00",
131 "rgb:ff/cd/8b",
132 "rgb:ff/cd/cd",
133 "rgb:ff/cd/ff",
134 "rgb:ff/ff/00",
135 "rgb:ff/ff/8b",
136 "rgb:ff/ff/cd",
137 "rgb:ff/ff/ff",
289 "rgb:12/12/12", 138 "rgb:2e/2e/2e",
290 "rgb:1c/1c/1c", 139 "rgb:5c/5c/5c",
291 "rgb:26/26/26",
292 "rgb:30/30/30", 140 "rgb:73/73/73",
293 "rgb:3a/3a/3a",
294 "rgb:44/44/44",
295 "rgb:4e/4e/4e",
296 "rgb:58/58/58", 141 "rgb:8b/8b/8b",
297 "rgb:62/62/62", 142 "rgb:a2/a2/a2",
298 "rgb:6c/6c/6c",
299 "rgb:76/76/76",
300 "rgb:80/80/80",
301 "rgb:8a/8a/8a",
302 "rgb:94/94/94", 143 "rgb:b9/b9/b9",
303 "rgb:9e/9e/9e",
304 "rgb:a8/a8/a8",
305 "rgb:b2/b2/b2",
306 "rgb:bc/bc/bc",
307 "rgb:c6/c6/c6",
308 "rgb:d0/d0/d0", 144 "rgb:d0/d0/d0",
309 "rgb:da/da/da",
310 "rgb:e4/e4/e4", 145 "rgb:e7/e7/e7",
311 "rgb:ee/ee/ee", 146
312#endif
313#ifndef NO_CURSORCOLOR 147#ifndef NO_CURSORCOLOR
314 COLOR_CURSOR_BACKGROUND, 148 COLOR_CURSOR_BACKGROUND,
315 COLOR_CURSOR_FOREGROUND, 149 COLOR_CURSOR_FOREGROUND,
316#endif /* ! NO_CURSORCOLOR */ 150#endif /* ! NO_CURSORCOLOR */
317 NULL, /* Color_pointer */ 151 NULL, /* Color_pointer_fg */
152 NULL, /* Color_pointer_bg */
318 NULL, /* Color_border */ 153 NULL, /* Color_border */
319#ifndef NO_BOLD_UNDERLINE_REVERSE 154#ifndef NO_BOLD_UNDERLINE_REVERSE
320 NULL, /* Color_BD */ 155 NULL, /* Color_BD */
156 NULL, /* Color_IT */
321 NULL, /* Color_UL */ 157 NULL, /* Color_UL */
322 NULL, /* Color_RV */ 158 NULL, /* Color_RV */
323#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 159#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
160#if ENABLE_FRILLS
161 NULL, // Color_underline
162#endif
324#ifdef OPTION_HC 163#ifdef OPTION_HC
325 NULL, 164 NULL,
326#endif 165#endif
327#ifdef KEEP_SCROLLCOLOR 166#ifdef KEEP_SCROLLCOLOR
328 COLOR_SCROLLBAR, 167 COLOR_SCROLLBAR,
329 COLOR_SCROLLTROUGH, 168 COLOR_SCROLLTROUGH,
330#endif /* KEEP_SCROLLCOLOR */ 169#endif /* KEEP_SCROLLCOLOR */
331 170#if TINTING
171 NULL,
172#endif
332 }; 173 };
333 174
334const char *const xa_names[NUM_XA] = 175const char *const xa_names[] =
335 { 176 {
336 "TEXT", 177 "TEXT",
337 "COMPOUND_TEXT", 178 "COMPOUND_TEXT",
338 "UTF8_STRING", 179 "UTF8_STRING",
339 "MULTIPLE", 180 "MULTIPLE",
340 "TARGETS", 181 "TARGETS",
341 "TIMESTAMP", 182 "TIMESTAMP",
342 "VT_SELECTION", 183 "VT_SELECTION",
343 "INCR", 184 "INCR",
344 "WM_DELETE_WINDOW", 185 "WM_DELETE_WINDOW",
186 "CLIPBOARD",
187#if ENABLE_FRILLS
188 "_NET_WM_PID",
189 "_MOTIF_WM_HINTS",
190 "_NET_WM_NAME",
191 "_NET_WM_ICON_NAME",
192#endif
193#if USE_XIM
194 "WM_LOCALE_NAME",
195#endif
345#ifdef TRANSPARENT 196#ifdef TRANSPARENT
346 "_XROOTPMAP_ID", 197 "_XROOTPMAP_ID",
198 "ESETROOT_PMAP_ID",
347#endif 199#endif
348#ifdef OFFIX_DND 200#ifdef OFFIX_DND
349 "DndProtocol", 201 "DndProtocol",
350 "DndSelection", 202 "DndSelection",
351#endif 203#endif
352 "CLIPBOARD"
353 }; 204 };
354 205
355bool 206bool
356rxvt_term::init_vars () 207rxvt_term::init_vars ()
357{ 208{
209 sw_term.start (SIGTERM);
210
358 PixColors = new rxvt_color [TOTAL_COLORS]; 211 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
212#ifdef OFF_FOCUS_FADING
213 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
214#endif
215 pix_colors = pix_colors_focused;
216
359 if (PixColors == NULL) 217 if (pix_colors == NULL)
360 return false; 218 return false;
361 219
362#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 220#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
363 TermWin.pixmap = None; 221 TermWin.pixmap = None;
364#endif 222#endif
365#ifdef UTMP_SUPPORT
366 next_utmp_action = SAVE;
367#endif
368#ifndef NO_SETOWNER_TTYDEV
369 next_tty_action = SAVE;
370#endif
371 223
372 MEvent.time = CurrentTime; 224 MEvent.time = CurrentTime;
373 MEvent.button = AnyButton; 225 MEvent.button = AnyButton;
374 Options = DEFAULT_OPTIONS; 226 options = DEFAULT_OPTIONS;
375 want_refresh = 1; 227 want_refresh = 1;
376 cmd_pid = -1; 228 cmd_pid = -1;
377 cmd_fd = tty_fd = -1; 229 pty.pty = pty.tty = -1;
378 PrivateModes = SavedModes = PrivMode_Default; 230 priv_modes = SavedModes = PrivMode_Default;
379 TermWin.focus = 0; 231 TermWin.focus = 0;
380 TermWin.ncol = 80; 232 TermWin.ncol = 80;
381 TermWin.nrow = 24; 233 TermWin.nrow = 24;
382 TermWin.int_bwidth = INTERNALBORDERWIDTH; 234 TermWin.int_bwidth = INTERNALBORDERWIDTH;
383 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 235 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
384 TermWin.lineSpace = LINESPACE; 236 TermWin.lineSpace = LINESPACE;
385 TermWin.saveLines = SAVELINES; 237 TermWin.saveLines = SAVELINES;
386 numPixColors = TOTAL_COLORS; 238 numpix_colors = TOTAL_COLORS;
387
388#ifndef NO_NEW_SELECTION
389 selection_style = NEW_SELECT;
390#else
391 selection_style = OLD_SELECT;
392#endif
393
394#ifndef NO_BRIGHTCOLOR
395 colorfgbg = DEFAULT_RSTYLE;
396#endif
397
398#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
399 ks_bigfont = XK_greater;
400 ks_smallfont = XK_less;
401#endif
402
403#ifdef GREEK_SUPPORT
404 ks_greekmodeswith = GREEK_KEYBOARD_MODESWITCH;
405#endif
406 239
407 refresh_limit = 1; 240 refresh_limit = 1;
408 refresh_type = SLOW_REFRESH; 241 refresh_type = SLOW_REFRESH;
409 prev_nrow = prev_ncol = 0; 242 prev_nrow = prev_ncol = 0;
410#ifdef MULTICHAR_SET
411# ifdef MULTICHAR_ENCODING
412 encoding_method = MULTICHAR_ENCODING;
413# endif
414 multichar_decode = rxvt_euc2jis;
415#endif
416 243
417 oldcursor.row = oldcursor.col = -1; 244 oldcursor.row = oldcursor.col = -1;
418#ifdef XPM_BACKGROUND 245#ifdef XPM_BACKGROUND
419 /* bgPixmap.w = bgPixmap.h = 0; */ 246 /* bgPixmap.w = bgPixmap.h = 0; */
420 bgPixmap.x = bgPixmap.y = 50; 247 bgPixmap.x = bgPixmap.y = 50;
… …
423 250
424 last_bot = last_state = -1; 251 last_bot = last_state = -1;
425 252
426#ifdef MENUBAR 253#ifdef MENUBAR
427 menu_readonly = 1; 254 menu_readonly = 1;
428# if !(MENUBAR_MAX > 1) 255# if ! (MENUBAR_MAX > 1)
429 CurrentBar = &(BarList); 256 CurrentBar = & (BarList);
430# endif /* (MENUBAR_MAX > 1) */ 257# endif /* (MENUBAR_MAX > 1) */
431#endif 258#endif
432 259
433 return true; 260 return true;
434} 261}
435 262
436void 263void
437rxvt_term::init_secondary () 264rxvt_term::init_secondary ()
438{ 265{
439 int i; 266 int i;
440#ifdef TTY_GID_SUPPORT
441 struct group *gr = getgrnam ("tty");
442
443 if (gr)
444 { /* change group ownership of tty to "tty" */
445 ttymode = S_IRUSR | S_IWUSR | S_IWGRP;
446 ttygid = gr->gr_gid;
447 }
448 else
449#endif /* TTY_GID_SUPPORT */
450
451 {
452 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
453 ttygid = getgid ();
454 }
455 267
456 /* 268 /*
457 * Close all unused file descriptors 269 * Close all unused file descriptors
458 * We don't want them, we don't need them. 270 * We don't want them, we don't need them.
459 */ 271 */
… …
475 { 287 {
476#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */ 288#ifdef __sgi /* Alex Coventry says we need 4 & 7 too */
477 if (i == 4 || i == 7) 289 if (i == 4 || i == 7)
478 continue; 290 continue;
479#endif 291#endif
480 close(i); 292 close (i);
481 } 293 }
482#endif 294#endif
483} 295}
484 296
485/*----------------------------------------------------------------------*/ 297/*----------------------------------------------------------------------*/
… …
492 304
493 /* 305 /*
494 * Look for -exec option. Find => split and make cmd_argv[] of command args 306 * Look for -exec option. Find => split and make cmd_argv[] of command args
495 */ 307 */
496 for (r_argc = 0; r_argc < argc; r_argc++) 308 for (r_argc = 0; r_argc < argc; r_argc++)
497 if (!STRCMP (argv[r_argc], "-e") || !STRCMP(argv[r_argc], "-exec")) 309 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec"))
498 break; 310 break;
499 311
500 r_argv = (const char **)rxvt_malloc (sizeof(char *) * (r_argc + 1)); 312 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
501 313
502 for (i = 0; i < r_argc; i++) 314 for (i = 0; i < r_argc; i++)
503 r_argv[i] = (const char *)argv[i]; 315 r_argv[i] = (const char *)argv[i];
504 316
505 r_argv[i] = NULL; 317 r_argv[i] = NULL;
506 318
507 if (r_argc == argc) 319 if (r_argc == argc)
508 cmd_argv = NULL; 320 cmd_argv = NULL;
509 else 321 else
510 { 322 {
511 cmd_argv = (const char **)rxvt_malloc (sizeof(char *) * (argc - r_argc)); 323 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
512 324
513 for (i = 0; i < argc - r_argc - 1; i++) 325 for (i = 0; i < argc - r_argc - 1; i++)
514 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 326 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
515 327
516 cmd_argv[i] = NULL; 328 cmd_argv[i] = NULL;
517 } 329 }
518 330
519 /* clear all resources */
520 for (i = 0; i < NUM_RESOURCES;)
521 rs[i++] = NULL;
522
523 rs[Rs_name] = rxvt_r_basename(argv[0]); 331 rs[Rs_name] = rxvt_r_basename (argv[0]);
524 332
525 /* 333 /*
526 * Open display, get options/resources and create the window 334 * Open display, get options/resources and create the window
527 */ 335 */
528 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 336 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
… …
532 free (r_argv); 340 free (r_argv);
533 341
534#ifdef LOCAL_X_IS_UNIX 342#ifdef LOCAL_X_IS_UNIX
535 if (rs[Rs_display_name][0] == ':') 343 if (rs[Rs_display_name][0] == ':')
536 { 344 {
537 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); 345 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
538 STRCPY (val, "unix"); 346 strcpy (val, "unix");
539 STRCAT (val, rs[Rs_display_name]); 347 strcat (val, rs[Rs_display_name]);
540 display = displays.get (val); 348 display = displays.get (val);
541 free (val); 349 free (val);
542 } 350 }
543#endif 351#endif
544 352
545 if (!display 353 if (!display
546 && !(display = displays.get (rs[Rs_display_name]))) 354 && ! (display = displays.get (rs[Rs_display_name])))
547 {
548 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 355 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
549 exit (EXIT_FAILURE);
550 }
551 356
552 extract_resources (display->display, rs[Rs_name]); 357 extract_resources (display->display, rs[Rs_name]);
553 358
554 /* 359 /*
555 * set any defaults not already set 360 * set any defaults not already set
556 */ 361 */
557 if (cmd_argv && cmd_argv[0]) 362 if (cmd_argv && cmd_argv[0])
558 { 363 {
559 if (!rs[Rs_title]) 364 if (!rs[Rs_title])
560 rs[Rs_title] = rxvt_r_basename(cmd_argv[0]); 365 rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);
561 if (!rs[Rs_iconName]) 366 if (!rs[Rs_iconName])
562 rs[Rs_iconName] = rs[Rs_title]; 367 rs[Rs_iconName] = rs[Rs_title];
563 } 368 }
564 else 369 else
565 { 370 {
… …
567 rs[Rs_title] = rs[Rs_name]; 372 rs[Rs_title] = rs[Rs_name];
568 if (!rs[Rs_iconName]) 373 if (!rs[Rs_iconName])
569 rs[Rs_iconName] = rs[Rs_name]; 374 rs[Rs_iconName] = rs[Rs_name];
570 } 375 }
571 376
572 if (rs[Rs_saveLines] && (i = atoi(rs[Rs_saveLines])) >= 0) 377 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
573 TermWin.saveLines = BOUND_POSITIVE_INT16(i); 378 TermWin.saveLines = BOUND_POSITIVE_INT16 (i);
574 379
575#ifndef NO_FRILLS 380#if ENABLE_FRILLS
576 if (rs[Rs_int_bwidth] && (i = atoi(rs[Rs_int_bwidth])) >= 0) 381 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
577 TermWin.int_bwidth = min(i, 100); /* arbitrary limit */ 382 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
578 if (rs[Rs_ext_bwidth] && (i = atoi(rs[Rs_ext_bwidth])) >= 0) 383 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
579 TermWin.ext_bwidth = min(i, 100); /* arbitrary limit */ 384 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
580#endif 385#endif
581 386
582#ifndef NO_LINESPACE 387#ifndef NO_LINESPACE
583 if (rs[Rs_lineSpace] && (i = atoi(rs[Rs_lineSpace])) >= 0) 388 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
584 TermWin.lineSpace = min(i, 100); /* arbitrary limit */ 389 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
585#endif 390#endif
586 391
587#ifdef POINTER_BLANK 392#ifdef POINTER_BLANK
588 if (rs[Rs_pointerBlankDelay] && (i = atoi(rs[Rs_pointerBlankDelay])) >= 0) 393 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
589 pointerBlankDelay = i; 394 pointerBlankDelay = i;
590 else 395 else
591 pointerBlankDelay = 2; 396 pointerBlankDelay = 2;
592#endif 397#endif
593 398
594 /* no point having a scrollbar without having any scrollback! */ 399 /* no point having a scrollbar without having any scrollback! */
595 if (!TermWin.saveLines) 400 if (!TermWin.saveLines)
596 Options &= ~Opt_scrollBar; 401 options &= ~Opt_scrollBar;
597 402
598#ifdef PRINTPIPE 403#ifdef PRINTPIPE
599 if (!rs[Rs_print_pipe]) 404 if (!rs[Rs_print_pipe])
600 rs[Rs_print_pipe] = PRINTPIPE; 405 rs[Rs_print_pipe] = PRINTPIPE;
601#endif 406#endif
602 407
603 if (!rs[Rs_cutchars]) 408 if (!rs[Rs_cutchars])
604 rs[Rs_cutchars] = CUTCHARS; 409 rs[Rs_cutchars] = CUTCHARS;
605
606#ifdef ACS_ASCII
607 if (!rs[Rs_acs_chars])
608 rs[Rs_acs_chars] = ACS_CHARS;
609 if ((i = STRLEN(rs[Rs_acs_chars])) < 0x20)
610 {
611 val = rxvt_realloc((void *)rs[Rs_acs_chars], 0x20);
612 for (; i < 0x20; )
613 val[i] = ' ';
614 rs[Rs_acs_chars] = val;
615 }
616#endif
617 410
618#ifndef NO_BACKSPACE_KEY 411#ifndef NO_BACKSPACE_KEY
619 if (!rs[Rs_backspace_key]) 412 if (!rs[Rs_backspace_key])
620# ifdef DEFAULT_BACKSPACE 413# ifdef DEFAULT_BACKSPACE
621 key_backspace = DEFAULT_BACKSPACE; 414 key_backspace = DEFAULT_BACKSPACE;
622# else 415# else
623 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 416 key_backspace = "DEC"; /* can toggle between \010 or \177 */
624# endif 417# endif
625 else 418 else
626 { 419 {
627 val = STRDUP(rs[Rs_backspace_key]); 420 val = strdup (rs[Rs_backspace_key]);
628 rxvt_Str_trim(val); 421 rxvt_Str_trim (val);
629 rxvt_Str_escaped(val); 422 rxvt_Str_escaped (val);
630 key_backspace = val; 423 key_backspace = val;
631 } 424 }
632#endif 425#endif
633 426
634#ifndef NO_DELETE_KEY 427#ifndef NO_DELETE_KEY
… …
638# else 431# else
639 key_delete = "\033[3~"; 432 key_delete = "\033[3~";
640# endif 433# endif
641 else 434 else
642 { 435 {
643 val = STRDUP(rs[Rs_delete_key]); 436 val = strdup (rs[Rs_delete_key]);
644 rxvt_Str_trim(val); 437 rxvt_Str_trim (val);
645 rxvt_Str_escaped(val); 438 rxvt_Str_escaped (val);
646 key_delete = val; 439 key_delete = val;
647 } 440 }
648#endif 441#endif
649 if (rs[Rs_answerbackstring]) 442 if (rs[Rs_answerbackstring])
650 { 443 {
651 rxvt_Str_trim((char *)rs[Rs_answerbackstring]); 444 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
652 rxvt_Str_escaped((char *)rs[Rs_answerbackstring]); 445 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
653 }
654
655 if (rs[Rs_selectstyle])
656 {
657 if (STRNCASECMP(rs[Rs_selectstyle], "oldword", 7) == 0)
658 selection_style = OLD_WORD_SELECT;
659#ifndef NO_OLD_SELECTION
660
661 else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0)
662 selection_style = OLD_SELECT;
663#endif
664
665 } 446 }
666 447
667#ifdef HAVE_SCROLLBARS 448#ifdef HAVE_SCROLLBARS
668 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 449 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
669 rs[Rs_scrollBar_thickness]);
670#endif 450#endif
671
672 TermWin.fontset = new rxvt_fontset (this);
673 TermWin.fontset->populate (rs[Rs_font]);
674 TermWin.fwidth = TermWin.fontset->base_font ()->width;
675 TermWin.fheight = TermWin.fontset->base_font ()->height;
676 TermWin.fbase = TermWin.fontset->base_font ()->ascent;
677 451
678#ifdef XTERM_REVERSE_VIDEO 452#ifdef XTERM_REVERSE_VIDEO
679 /* this is how xterm implements reverseVideo */ 453 /* this is how xterm implements reverseVideo */
680 if (Options & Opt_reverseVideo) 454 if (options & Opt_reverseVideo)
681 { 455 {
682 if (!rs[Rs_color + Color_fg]) 456 if (!rs[Rs_color + Color_fg])
683 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 457 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
684 if (!rs[Rs_color + Color_bg]) 458 if (!rs[Rs_color + Color_bg])
685 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 459 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
690 if (!rs[Rs_color + i]) 464 if (!rs[Rs_color + i])
691 rs[Rs_color + i] = def_colorName[i]; 465 rs[Rs_color + i] = def_colorName[i];
692 466
693#ifndef XTERM_REVERSE_VIDEO 467#ifndef XTERM_REVERSE_VIDEO
694 /* this is how we implement reverseVideo */ 468 /* this is how we implement reverseVideo */
695 if (Options & Opt_reverseVideo) 469 if (options & Opt_reverseVideo)
696 SWAP_IT(rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 470 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);
697#endif 471#endif
698 472
699 /* convenient aliases for setting fg/bg to colors */ 473 /* convenient aliases for setting fg/bg to colors */
700 color_aliases (Color_fg); 474 color_aliases (Color_fg);
701 color_aliases (Color_bg); 475 color_aliases (Color_bg);
702#ifndef NO_CURSORCOLOR 476#ifndef NO_CURSORCOLOR
703 color_aliases (Color_cursor); 477 color_aliases (Color_cursor);
704 color_aliases (Color_cursor2); 478 color_aliases (Color_cursor2);
705#endif /* NO_CURSORCOLOR */ 479#endif /* NO_CURSORCOLOR */
706 color_aliases (Color_pointer); 480 color_aliases (Color_pointer_fg);
481 color_aliases (Color_pointer_bg);
707 color_aliases (Color_border); 482 color_aliases (Color_border);
708#ifndef NO_BOLD_UNDERLINE_REVERSE 483#ifndef NO_BOLD_UNDERLINE_REVERSE
709 color_aliases (Color_BD); 484 color_aliases (Color_BD);
710 color_aliases (Color_UL); 485 color_aliases (Color_UL);
711 color_aliases (Color_RV); 486 color_aliases (Color_RV);
712#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 487#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
488
489 if (!rs[Rs_color + Color_border])
490 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
713 491
714 return cmd_argv; 492 return cmd_argv;
715} 493}
716 494
717/*----------------------------------------------------------------------*/ 495/*----------------------------------------------------------------------*/
… …
724 502
725#ifdef DISPLAY_IS_IP 503#ifdef DISPLAY_IS_IP
726 /* Fixup display_name for export over pty to any interested terminal 504 /* Fixup display_name for export over pty to any interested terminal
727 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 505 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
728 * (for the first non-loopback interface) that we get from 506 * (for the first non-loopback interface) that we get from
729 * rxvt_network_display(). This is more "name-resolution-portable", if you 507 * rxvt_network_display (). This is more "name-resolution-portable", if you
730 * will, and probably allows for faster x-client startup if your name 508 * will, and probably allows for faster x-client startup if your name
731 * server is beyond a slow link or overloaded at client startup. Of 509 * server is beyond a slow link or overloaded at client startup. Of
732 * course that only helps the shell's child processes, not us. 510 * course that only helps the shell's child processes, not us.
733 * 511 *
734 * Giving out the display_name also affords a potential security hole 512 * Giving out the display_name also affords a potential security hole
… …
736 val = rxvt_network_display (rs[Rs_display_name]); 514 val = rxvt_network_display (rs[Rs_display_name]);
737 rs[Rs_display_name] = (const char *)val; 515 rs[Rs_display_name] = (const char *)val;
738 516
739 if (val == NULL) 517 if (val == NULL)
740#endif /* DISPLAY_IS_IP */ 518#endif /* DISPLAY_IS_IP */
741 val = XDisplayString(display->display); 519 val = XDisplayString (display->display);
742 520
743 if (rs[Rs_display_name] == NULL) 521 if (rs[Rs_display_name] == NULL)
744 rs[Rs_display_name] = val; /* use broken `:0' value */ 522 rs[Rs_display_name] = val; /* use broken `:0' value */
745 523
746 i = STRLEN (val); 524 i = strlen (val);
747 env_display = (char *)rxvt_malloc ((i + 9) * sizeof(char)); 525 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
748 526
749 sprintf (env_display, "DISPLAY=%s", val); 527 sprintf (env_display, "DISPLAY=%s", val);
750 528
751 /* avoiding the math library: 529 /* avoiding the math library:
752 * i = (int)(ceil(log10((unsigned int)TermWin.parent[0]))) */ 530 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
753 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 531 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
754 ; 532 ;
755 MAX_IT(i, 1); 533 MAX_IT (i, 1);
756 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof(char)); 534 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
757 535
758 sprintf (env_windowid, "WINDOWID=%u", 536 sprintf (env_windowid, "WINDOWID=%u",
759 (unsigned int)TermWin.parent[0]); 537 (unsigned int)TermWin.parent[0]);
760 538
761 /* add entries to the environment: 539 /* add entries to the environment:
762 * @ DISPLAY: in case we started with -display 540 * @ DISPLAY: in case we started with -display
763 * @ WINDOWID: X window id number of the window 541 * @ WINDOWID: X window id number of the window
764 * @ COLORTERM: terminal sub-name and also indicates its color 542 * @ COLORTERM: terminal sub-name and also indicates its color
765 * @ TERM: terminal name 543 * @ TERM: terminal name
766 * @ TERMINFO: path to terminfo directory 544 * @ TERMINFO: path to terminfo directory
545 * @ COLORFGBG: fg;bg color codes
767 */ 546 */
768 putenv (env_display); 547 putenv (env_display);
769 putenv (env_windowid); 548 putenv (env_windowid);
549 if (env_colorfgbg)
550 putenv (env_colorfgbg);
770 551
771#ifdef RXVT_TERMINFO 552#ifdef RXVT_TERMINFO
772 putenv ("TERMINFO=" RXVT_TERMINFO); 553 putenv ("TERMINFO=" RXVT_TERMINFO);
773#endif 554#endif
774 555
… …
777 else 558 else
778 putenv ("COLORTERM=" COLORTERMENVFULL); 559 putenv ("COLORTERM=" COLORTERMENVFULL);
779 560
780 if (rs[Rs_term_name] != NULL) 561 if (rs[Rs_term_name] != NULL)
781 { 562 {
782 env_term = (char *)rxvt_malloc ((STRLEN(rs[Rs_term_name]) + 6) * sizeof(char)); 563 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char));
783 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 564 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
784 putenv (env_term); 565 putenv (env_term);
785 } 566 }
786 else 567 else
787 putenv ("TERM=" TERMENV); 568 putenv ("TERM=" TERMENV);
… …
802void 583void
803rxvt_term::set_locale (const char *locale) 584rxvt_term::set_locale (const char *locale)
804{ 585{
805#if HAVE_XSETLOCALE || HAVE_SETLOCALE 586#if HAVE_XSETLOCALE || HAVE_SETLOCALE
806 free (this->locale); 587 free (this->locale);
807 this->locale = rxvt_strdup (setlocale (LC_CTYPE, "")); 588 this->locale = setlocale (LC_CTYPE, locale);
589
590 if (!this->locale)
591 {
592 if (*locale)
593 {
594 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);
595 setlocale (LC_CTYPE, "");
596 }
597 else
598 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
599
600 this->locale = "";
601 }
602
603
604 this->locale = rxvt_strdup (this->locale);
605 SET_LOCALE (this->locale);
606 mbstate.reset ();
808#endif 607#endif
608
609#if 0
809#if HAVE_NL_LANGINFO 610#if HAVE_NL_LANGINFO
611 char *codeset = strdup (nl_langinfo (CODESET));
612 enc_utf8 = !strcasecmp (codeset, "UTF-8")
613 || !strcasecmp (codeset, "UTF8");
810 free (codeset); 614 free (codeset);
811 codeset = strdup (nl_langinfo (CODESET));
812 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
813 || !STRCASECMP (codeset, "UTF8");
814#else 615#else
815 enc_utf8 = 1; 616 enc_utf8 = 0;
617#endif
816#endif 618#endif
817} 619}
818 620
819void 621void
820rxvt_term::init_xlocale () 622rxvt_term::init_xlocale ()
821{ 623{
822#ifdef USE_XIM 624#ifdef USE_XIM
823 if (!locale) 625 if (!locale)
824 rxvt_print_error ("Setting locale failed."); 626 rxvt_warn ("setting locale failed, working without locale support.\n");
825 else 627 else
826 { 628 {
827 Atom wmlocale; 629 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
828
829 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
830 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
831 XA_STRING, 8, PropModeReplace,
832 (unsigned char *)locale, STRLEN(locale));
833 630
834 if (!XSupportsLocale ()) 631 if (!XSupportsLocale ())
835 { 632 {
836 rxvt_print_error ("The locale is not supported by Xlib"); 633 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
837 return; 634 return;
838 } 635 }
839 636
637 im_ev.start (display);
638
840 /* see if we can connect yet */ 639 /* see if we can connect already */
841 rxvt_IMInstantiateCallback (display->display, NULL, NULL); 640 im_cb ();
842
843 /* To avoid Segmentation Fault in C locale: Solaris only? */
844 if (STRCMP (locale, "C"))
845 XRegisterIMInstantiateCallback (display->display, NULL, NULL, NULL,
846 rxvt_IMInstantiateCallback, NULL);
847 } 641 }
848#endif 642#endif
849} 643}
850 644
851/*----------------------------------------------------------------------*/ 645/*----------------------------------------------------------------------*/
852void 646void
853rxvt_term::init_command(const char *const *argv) 647rxvt_term::init_command (const char *const *argv)
854{ 648{
855 /* 649 /*
856 * Initialize the command connection. 650 * Initialize the command connection.
857 * This should be called after the X server connection is established. 651 * This should be called after the X server connection is established.
858 */ 652 */
859 int i;
860
861 for (i = 0; i < NUM_XA; i++)
862 xa[i] = XInternAtom(display->display, xa_names[i], False);
863
864 /* Enable delete window protocol */
865 XSetWMProtocols (display->display, TermWin.parent[0],
866 &(xa[XA_WMDELETEWINDOW]), 1);
867
868#ifdef USING_W11LIB
869 /* enable W11 callbacks */
870 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
871#endif
872 653
873#ifdef META8_OPTION 654#ifdef META8_OPTION
874 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 655 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);
875#endif 656#endif
876 657
877 get_ourmods (); 658 get_ourmods ();
878 659
879 if (!(Options & Opt_scrollTtyOutput)) 660 if (!(options & Opt_scrollTtyOutput))
880 PrivateModes |= PrivMode_TtyOutputInh; 661 priv_modes |= PrivMode_TtyOutputInh;
881 if (Options & Opt_scrollTtyKeypress) 662 if (options & Opt_scrollTtyKeypress)
882 PrivateModes |= PrivMode_Keypress; 663 priv_modes |= PrivMode_Keypress;
883 if (!(Options & Opt_jumpScroll)) 664 if (!(options & Opt_jumpScroll))
884 PrivateModes |= PrivMode_smoothScroll; 665 priv_modes |= PrivMode_smoothScroll;
885 666
886#ifndef NO_BACKSPACE_KEY 667#ifndef NO_BACKSPACE_KEY
887 if (STRCMP(key_backspace, "DEC") == 0) 668 if (strcmp (key_backspace, "DEC") == 0)
888 PrivateModes |= PrivMode_HaveBackSpace; 669 priv_modes |= PrivMode_HaveBackSpace;
889#endif 670#endif
890 671
891 /* add value for scrollBar */ 672 /* add value for scrollBar */
892 if (scrollbar_visible ()) 673 if (scrollbar_visible ())
893 { 674 {
894 PrivateModes |= PrivMode_scrollBar; 675 priv_modes |= PrivMode_scrollBar;
895 SavedModes |= PrivMode_scrollBar; 676 SavedModes |= PrivMode_scrollBar;
896 } 677 }
897 if (menubar_visible ()) 678 if (menubar_visible ())
898 { 679 {
899 PrivateModes |= PrivMode_menuBar; 680 priv_modes |= PrivMode_menuBar;
900 SavedModes |= PrivMode_menuBar; 681 SavedModes |= PrivMode_menuBar;
901 } 682 }
902 683
903#ifdef GREEK_SUPPORT
904 greek_init();
905#endif
906
907#ifdef CURSOR_BLINK 684#ifdef CURSOR_BLINK
908 if (Options & Opt_cursorBlink) 685 if (options & Opt_cursorBlink)
909 (void)gettimeofday (&lastcursorchange, NULL); 686 (void)gettimeofday (&lastcursorchange, NULL);
910#endif 687#endif
911 688
912 if ((cmd_fd = run_command (argv)) < 0) 689 run_command (argv);
913 {
914 rxvt_print_error ("aborting");
915 exit (EXIT_FAILURE);
916 }
917} 690}
918 691
919/*----------------------------------------------------------------------*/ 692/*----------------------------------------------------------------------*/
920void 693void
921rxvt_term::Get_Colours () 694rxvt_term::Get_Colours ()
922{ 695{
923 int i; 696 int i;
924 697
698#ifdef OFF_FOCUS_FADING
699 pix_colors = pix_colors_focused;
700#endif
701
925 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 702 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
926 { 703 {
927 rxvt_color xcol; 704 rxvt_color xcol;
928 705
929 if (!rs[Rs_color + i]) 706 if (!rs[Rs_color + i])
930 continue; 707 continue;
931 708
932 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 709 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
933 { 710 {
934#ifndef XTERM_REVERSE_VIDEO 711#ifndef XTERM_REVERSE_VIDEO
935 if (i < 2 && (Options & Opt_reverseVideo)) 712 if (i < 2 && (options & Opt_reverseVideo))
936 rs[Rs_color + i] = def_colorName[!i]; 713 rs[Rs_color + i] = def_colorName[!i];
937 else 714 else
938#endif 715#endif
939 rs[Rs_color + i] = def_colorName[i]; 716 rs[Rs_color + i] = def_colorName[i];
940 717
… …
946 switch (i) 723 switch (i)
947 { 724 {
948 case Color_fg: 725 case Color_fg:
949 case Color_bg: 726 case Color_bg:
950 /* fatal: need bg/fg color */ 727 /* fatal: need bg/fg color */
951 rxvt_print_error ("aborting"); 728 rxvt_fatal ("unable to get foreground/background colour, aborting.\n");
952 exit (EXIT_FAILURE);
953 /* NOTREACHED */ 729 /* NOTREACHED */
954 break; 730 break;
955#ifndef NO_CURSORCOLOR 731#ifndef NO_CURSORCOLOR
956 case Color_cursor2: 732 case Color_cursor2:
957 xcol = PixColors[Color_fg]; 733 xcol = pix_colors[Color_fg];
958 break; 734 break;
959#endif /* ! NO_CURSORCOLOR */ 735#endif /* ! NO_CURSORCOLOR */
960 case Color_pointer: 736 case Color_pointer_fg:
961 xcol = PixColors[Color_fg]; 737 xcol = pix_colors[Color_fg];
962 break; 738 break;
963 default: 739 default:
964 xcol = PixColors[Color_bg]; /* None */ 740 xcol = pix_colors[Color_bg]; /* None */
965 break; 741 break;
966 } 742 }
967 } 743 }
968 } 744 }
969 745
970 PixColors[i] = xcol; 746 pix_colors[i] = xcol;
747#ifdef OFF_FOCUS_FADING
748 if (rs[Rs_fade])
749 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
750#endif
971 SET_PIXCOLOR (i); 751 SET_PIXCOLOR (i);
972 } 752 }
973 753
974 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) 754 if (display->depth <= 2)
975 PixColors[Color_pointer] = PixColors[Color_fg]; 755 {
976 if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) 756 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
977 PixColors[Color_border] = PixColors[Color_fg]; 757 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
758 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
759 }
978 760
979 /* 761 /*
980 * get scrollBar/menuBar shadow colors 762 * get scrollBar/menuBar shadow colors
981 * 763 *
982 * The calculations of topShadow/bottomShadow values are adapted 764 * The calculations of topShadow/bottomShadow values are adapted
983 * from the fvwm window manager. 765 * from the fvwm window manager.
984 */ 766 */
985#ifdef KEEP_SCROLLCOLOR 767#ifdef KEEP_SCROLLCOLOR
986 768
987 if (XDEPTH <= 2) 769 if (display->depth <= 2)
988 { /* Monochrome */ 770 { /* Monochrome */
989 PixColors[Color_scroll] = PixColors[Color_fg]; 771 pix_colors[Color_scroll] = pix_colors[Color_fg];
990 PixColors[Color_topShadow] = PixColors[Color_bg]; 772 pix_colors[Color_topShadow] = pix_colors[Color_bg];
991 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 773 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
992 } 774 }
993 else 775 else
994 { 776 {
995 rxvt_color xcol[3]; 777 rxvt_color xcol[2];
996 /* xcol[0] == white 778 /* xcol[0] == white
997 * xcol[1] == top shadow 779 * xcol[1] == top shadow
998 * xcol[2] == bot shadow */ 780 * xcol[2] == bot shadow */
999 781
1000 xcol[1] = PixColors[Color_scroll]; 782 xcol[1] = pix_colors[Color_scroll];
1001# ifdef PREFER_24BIT
1002 xcol[0].set (display, 65535, 65535, 65535); 783 xcol[0].set (display, 65535, 65535, 65535);
1003 /* XFreeColors(display->display, XCMAP, &(xcol[0].pixel), 1, ~0); */
1004# else
1005 xcol[0].set (display, WhitePixel (display->display, display->screen));
1006# endif
1007 784
1008 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 785 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1009 786
1010 xcol[0].get (display, pr0, pg0, pb0); 787 xcol[0].get (display, pr0, pg0, pb0);
1011 xcol[1].get (display, pr1, pg1, pb1); 788 xcol[1].get (display, pr1, pg1, pb1);
1012 789
1013 /* bottomShadowColor */
1014 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
1015 xcol[2] = PixColors[Color_Black];
1016
1017 PixColors[Color_bottomShadow] = xcol[2]; 790 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
1018 791
1019 /* topShadowColor */ 792 /* topShadowColor */
1020 if (!xcol[1].set (display, 793 if (!xcol[1].set (display,
1021 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 794 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1022 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 795 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1023 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 796 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1024 xcol[1] = PixColors[Color_White]; 797 xcol[1] = pix_colors[Color_White];
1025 798
1026 PixColors[Color_topShadow] = xcol[1]; 799 pix_colors[Color_topShadow] = xcol[1];
1027 } 800 }
1028#endif /* KEEP_SCROLLCOLOR */ 801#endif /* KEEP_SCROLLCOLOR */
1029} 802}
1030 803
1031/*----------------------------------------------------------------------*/ 804/*----------------------------------------------------------------------*/
1032/* color aliases, fg/bg bright-bold */ 805/* color aliases, fg/bg bright-bold */
1033void 806void
1034rxvt_term::color_aliases(int idx) 807rxvt_term::color_aliases (int idx)
1035{ 808{
1036 if (rs[Rs_color + idx] && isdigit (*(rs[Rs_color + idx]))) 809 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx])))
1037 { 810 {
1038 int i = atoi (rs[Rs_color + idx]); 811 int i = atoi (rs[Rs_color + idx]);
1039 812
1040 if (i >= 8 && i <= 15) 813 if (i >= 8 && i <= 15)
1041 { /* bright colors */ 814 { /* bright colors */
1042 i -= 8; 815 i -= 8;
1043#ifndef NO_BRIGHTCOLOR 816#ifndef NO_BRIGHTCOLOR
1044 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 817 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1045 return; 818 return;
1046#endif 819#endif
1047
1048 } 820 }
1049 821
1050 if (i >= 0 && i <= 7) /* normal colors */ 822 if (i >= 0 && i <= 7) /* normal colors */
1051 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 823 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1052 } 824 }
… …
1071 }; 843 };
1072 844
1073 requestedmeta = realmeta = realalt = 0; 845 requestedmeta = realmeta = realalt = 0;
1074 rsmod = rs[Rs_modifier]; 846 rsmod = rs[Rs_modifier];
1075 if (rsmod 847 if (rsmod
1076 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
1077 requestedmeta = rsmod[3] - '0'; 849 requestedmeta = rsmod[3] - '0';
1078 850
1079 map = XGetModifierMapping(display->display); 851 map = XGetModifierMapping (display->display);
1080 kc = map->modifiermap; 852 kc = map->modifiermap;
1081 for (i = 1; i < 6; i++) 853 for (i = 1; i < 6; i++)
1082 { 854 {
1083 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 855 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1084 for (j = map->max_keypermod; j--; k++) 856 for (j = map->max_keypermod; j--; k++)
1085 { 857 {
1086 if (kc[k] == 0) 858 if (kc[k] == 0)
1087 break; 859 break;
1088 switch (XKeycodeToKeysym(display->display, kc[k], 0)) 860 switch (XKeycodeToKeysym (display->display, kc[k], 0))
1089 { 861 {
1090 case XK_Num_Lock: 862 case XK_Num_Lock:
1091 ModNumLockMask = modmasks[i - 1]; 863 ModNumLockMask = modmasks[i - 1];
1092 /* FALLTHROUGH */ 864 /* FALLTHROUGH */
1093 default: 865 default:
1094 continue; /* for(;;) */ 866 continue; /* for (;;) */
1095 case XK_Meta_L: 867 case XK_Meta_L:
1096 case XK_Meta_R: 868 case XK_Meta_R:
1097 cm = "meta"; 869 cm = "meta";
1098 realmeta = i; 870 realmeta = i;
1099 break; 871 break;
… …
1109 case XK_Hyper_L: 881 case XK_Hyper_L:
1110 case XK_Hyper_R: 882 case XK_Hyper_R:
1111 cm = "hyper"; 883 cm = "hyper";
1112 break; 884 break;
1113 } 885 }
1114 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 886 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
1115 requestedmeta = i; 887 requestedmeta = i;
1116 } 888 }
1117 } 889 }
1118 XFreeModifiermap(map); 890 XFreeModifiermap (map);
1119 i = (requestedmeta ? requestedmeta 891 i = (requestedmeta ? requestedmeta
1120 : (realmeta ? realmeta 892 : (realmeta ? realmeta
1121 : (realalt ? realalt : 0))); 893 : (realalt ? realalt : 0)));
1122 if (i) 894 if (i)
1123 ModMetaMask = modmasks[i - 1]; 895 ModMetaMask = modmasks[i - 1];
1124} 896}
1125 897
1126/*----------------------------------------------------------------------*/ 898/*----------------------------------------------------------------------*/
1127/* rxvt_Create_Windows() - Open and map the window */ 899/* rxvt_Create_Windows () - Open and map the window */
1128void 900void
1129rxvt_term::create_windows (int argc, const char *const *argv) 901rxvt_term::create_windows (int argc, const char *const *argv)
1130{ 902{
1131 XClassHint classHint; 903 XClassHint classHint;
1132 XWMHints wmHint; 904 XWMHints wmHint;
905#if ENABLE_FRILLS
906 Atom prop = None;
907 MWMHints mwmhints;
908#endif
1133 XGCValues gcvalue; 909 XGCValues gcvalue;
1134 long vt_emask; 910 long vt_emask;
1135 911 XSetWindowAttributes attributes;
1136 XWindowAttributes gattr; 912 XWindowAttributes gattr;
1137 913
914#ifdef USING_W11LIB
915 /* enable W11 callbacks */
916 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
917#endif
918
919 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
920 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa);
921
1138 if (Options & Opt_transparent) 922 if (options & Opt_transparent)
1139 { 923 {
1140 XGetWindowAttributes (display->display, RootWindow(display->display, display->screen), &gattr); 924 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1141 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 925 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1142 } 926 }
927
928#if ENABLE_FRILLS
929 if (options & Opt_borderLess)
930 {
931 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True);
932
933 if (prop == None)
934 {
935 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
936#ifdef PREFER_24BIT
937 attributes.override_redirect = TRUE;
938#endif
939 mwmhints.flags = 0;
940 }
941 else
942 {
943 mwmhints.flags = MWM_HINTS_DECORATIONS;
944 mwmhints.decorations = 0;
945 }
946 }
947 else
948 {
949 mwmhints.flags = 0;
950 }
951#endif
1143 952
1144 /* grab colors before netscape does */ 953 /* grab colors before netscape does */
1145 Get_Colours (); 954 Get_Colours ();
1146 955
1147 change_font (1, NULL); 956 if (!set_fonts ())
957 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
958
1148 window_calc (0, 0); 959 window_calc (0, 0);
1149 old_width = szHint.width; 960 old_width = szHint.width;
1150 old_height = szHint.height; 961 old_height = szHint.height;
1151 962
1152 /* parent window - reverse video so we can see placement errors
1153 * sub-window placement & size in rxvt_resize_subwindows() 963 /* sub-window placement & size in rxvt_resize_subwindows () */
1154 */
1155 964
1156#ifdef PREFER_24BIT 965#ifdef PREFER_24BIT
1157 XSetWindowAttributes attributes;
1158
1159 attributes.background_pixel = PixColors[Color_fg]; 966 attributes.background_pixel = pix_colors_focused[Color_border];
1160 attributes.border_pixel = PixColors[Color_border]; 967 attributes.border_pixel = pix_colors_focused[Color_border];
1161 attributes.colormap = display->cmap; 968 attributes.colormap = display->cmap;
1162 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 969 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1163 szHint.x, szHint.y, 970 szHint.x, szHint.y,
1164 szHint.width, szHint.height, 971 szHint.width, szHint.height,
1165 TermWin.ext_bwidth, 972 TermWin.ext_bwidth,
1166 display->depth, InputOutput, 973 display->depth, InputOutput,
1167 display->visual, 974 display->visual,
1168 CWBackPixel | CWBorderPixel | CWColormap, &attributes); 975 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1169#else 976#else
1170 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 977 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1171 szHint.x, szHint.y, 978 szHint.x, szHint.y,
1172 szHint.width, 979 szHint.width, szHint.height,
1173 szHint.height,
1174 TermWin.ext_bwidth, 980 TermWin.ext_bwidth,
1175 PixColors[Color_border], 981 pix_colors_focused[Color_border],
1176 PixColors[Color_fg]); 982 pix_colors_focused[Color_border]);
1177#endif 983#endif
1178 984
1179 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 985 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1180 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 986 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1181 987
1182 classHint.res_name = (char *)rs[Rs_name]; 988 classHint.res_name = (char *)rs[Rs_name];
1183 classHint.res_class = (char *)APL_CLASS; 989 classHint.res_class = (char *)RESCLASS;
1184 990
1185 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 991 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1186 wmHint.input = True; 992 wmHint.input = True;
1187 wmHint.initial_state = (Options & Opt_iconic ? IconicState 993 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1188 : NormalState);
1189 wmHint.window_group = TermWin.parent[0]; 994 wmHint.window_group = TermWin.parent[0];
1190 995
1191 XSetWMProperties(display->display, TermWin.parent[0], NULL, NULL, 996 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1192 (char **)argv, argc, &szHint, &wmHint, &classHint); 997 (char **)argv, argc, &szHint, &wmHint, &classHint);
1193 998
999 /* Enable delete window protocol */
1000 XSetWMProtocols (display->display, TermWin.parent[0],
1001 &xa[XA_WMDELETEWINDOW], 1);
1002
1003#if ENABLE_FRILLS
1004 long pid = getpid ();
1005
1006 XChangeProperty (display->display, TermWin.parent[0],
1007 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1008 PropModeReplace, (unsigned char *)&pid, 1);
1009#endif
1010
1194 XSelectInput(display->display, TermWin.parent[0], 1011 XSelectInput (display->display, TermWin.parent[0],
1195 KeyPressMask 1012 KeyPressMask
1196#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1013#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1197 | KeyReleaseMask 1014 | KeyReleaseMask
1198#endif 1015#endif
1199 | FocusChangeMask | VisibilityChangeMask 1016 | FocusChangeMask | VisibilityChangeMask
1017 | ExposureMask
1200 | StructureNotifyMask); 1018 | StructureNotifyMask);
1201 termwin_ev.start (display, TermWin.parent[0]); 1019 termwin_ev.start (display, TermWin.parent[0]);
1202 1020
1021#if ENABLE_FRILLS
1022 if (mwmhints.flags)
1023 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1024 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1025#endif
1026
1203 /* vt cursor: Black-on-White is standard, but this is more popular */ 1027 /* vt cursor: Black-on-White is standard, but this is more popular */
1204 TermWin_cursor = XCreateFontCursor(display->display, XC_xterm); 1028 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1205 1029
1206#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1030#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1207 /* cursor (menuBar/scrollBar): Black-on-White */ 1031 /* cursor (menuBar/scrollBar): Black-on-White */
1208 leftptr_cursor = XCreateFontCursor(display->display, XC_left_ptr); 1032 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr);
1209#endif 1033#endif
1210 1034
1211#ifdef POINTER_BLANK 1035#ifdef POINTER_BLANK
1212 { 1036 {
1213 XColor blackcolour; 1037 XColor blackcolour;
… …
1220 XUnloadFont (display->display, f); 1044 XUnloadFont (display->display, f);
1221 } 1045 }
1222#endif 1046#endif
1223 1047
1224 /* the vt window */ 1048 /* the vt window */
1225 TermWin.vt = XCreateSimpleWindow(display->display, TermWin.parent[0], 1049 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1226 window_vt_x, window_vt_y, 1050 window_vt_x,
1051 window_vt_y,
1227 TermWin_TotalWidth(), 1052 TermWin_TotalWidth (),
1228 TermWin_TotalHeight(), 1053 TermWin_TotalHeight (),
1229 0, 1054 0,
1230 PixColors[Color_fg], 1055 pix_colors_focused[Color_fg],
1231 PixColors[Color_bg]); 1056 pix_colors_focused[Color_bg]);
1232
1233#ifdef DEBUG_X 1057#ifdef DEBUG_X
1234 XStoreName(display->display, TermWin.vt, "vt window"); 1058 XStoreName (display->display, TermWin.vt, "vt window");
1235#endif 1059#endif
1236 1060
1061 attributes.bit_gravity = NorthWestGravity;
1062 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1063
1237 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1064 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1238 | PropertyChangeMask); 1065
1066 pointer_unblank ();
1239 1067
1240#ifdef POINTER_BLANK 1068#ifdef POINTER_BLANK
1241 pointer_unblank ();
1242
1243 if ((Options & Opt_pointerBlank)) 1069 if (options & Opt_pointerBlank)
1244 vt_emask |= PointerMotionMask; 1070 vt_emask |= PointerMotionMask;
1245 else 1071 else
1246#endif 1072#endif
1247 vt_emask |= (Button1MotionMask | Button3MotionMask); 1073 vt_emask |= Button1MotionMask | Button3MotionMask;
1248 1074
1249 XSelectInput(display->display, TermWin.vt, vt_emask); 1075 XSelectInput (display->display, TermWin.vt, vt_emask);
1250 vt_ev.start (display, TermWin.vt); 1076 vt_ev.start (display, TermWin.vt);
1251 1077
1252#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1078#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1253 if (menuBar_height()) 1079 if (menuBar_height ())
1254 { 1080 {
1255 menuBar.win = XCreateSimpleWindow(display->display, TermWin.parent[0], 1081 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1256 window_vt_x, 0, 1082 window_vt_x, 0,
1257 TermWin_TotalWidth(), 1083 TermWin_TotalWidth (),
1258 menuBar_TotalHeight(), 1084 menuBar_TotalHeight (),
1259 0, 1085 0,
1260 PixColors[Color_fg], 1086 pix_colors_focused[Color_fg],
1261 PixColors[Color_scroll]); 1087 pix_colors_focused[Color_scroll]);
1088
1262#ifdef DEBUG_X 1089#ifdef DEBUG_X
1263 XStoreName(display->display, menuBar.win, "menubar"); 1090 XStoreName (display->display, menuBar.win, "menubar");
1264#endif 1091#endif
1265 1092
1093 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1094
1266 XDefineCursor(display->display, menuBar.win, pointer_leftptr); 1095 XDefineCursor (display->display, menuBar.win,
1096 XCreateFontCursor (display->display, XC_left_ptr));
1267 1097
1268 XSelectInput(display->display, menuBar.win, 1098 XSelectInput (display->display, menuBar.win,
1269 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1099 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1270 | Button1MotionMask)); 1100 | Button1MotionMask));
1271 menubar_ev.start (display, menuBar.win); 1101 menubar_ev.start (display, menuBar.win);
1272 } 1102 }
1273#endif 1103#endif
1274 1104
1275#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
1276 if (rs[Rs_backgroundPixmap] != NULL 1106 if (rs[Rs_backgroundPixmap] != NULL
1277 && !(Options & Opt_transparent)) 1107 && ! (options & Opt_transparent))
1278 { 1108 {
1279 const char *p = rs[Rs_backgroundPixmap]; 1109 const char *p = rs[Rs_backgroundPixmap];
1280 1110
1281 if ((p = STRCHR(p, ';')) != NULL) 1111 if ((p = strchr (p, ';')) != NULL)
1282 { 1112 {
1283 p++; 1113 p++;
1284 scale_pixmap (p); 1114 scale_pixmap (p);
1285 } 1115 }
1116
1286 set_bgPixmap (rs[Rs_backgroundPixmap]); 1117 set_bgPixmap (rs[Rs_backgroundPixmap]);
1287 scr_touch (True); 1118 scr_touch (true);
1288 } 1119 }
1289#endif 1120#endif
1290 1121
1291 /* graphics context for the vt window */ 1122 /* graphics context for the vt window */
1292 gcvalue.foreground = PixColors[Color_fg]; 1123 gcvalue.foreground = pix_colors[Color_fg];
1293 gcvalue.background = PixColors[Color_bg]; 1124 gcvalue.background = pix_colors[Color_bg];
1294 gcvalue.graphics_exposures = 1; 1125 gcvalue.graphics_exposures = 1;
1295 TermWin.gc = XCreateGC(display->display, TermWin.vt, 1126 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1296 GCForeground | GCBackground 1127 GCForeground | GCBackground | GCGraphicsExposures,
1297 | GCGraphicsExposures, &gcvalue); 1128 &gcvalue);
1129
1130 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1298 1131
1299#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1132#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1300 gcvalue.foreground = PixColors[Color_topShadow]; 1133 gcvalue.foreground = pix_colors[Color_topShadow];
1301 topShadowGC = XCreateGC(display->display, TermWin.vt, 1134 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1302 GCForeground, &gcvalue);
1303 gcvalue.foreground = PixColors[Color_bottomShadow]; 1135 gcvalue.foreground = pix_colors[Color_bottomShadow];
1304 botShadowGC = XCreateGC(display->display, TermWin.vt, 1136 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1305 GCForeground, &gcvalue); 1137 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1306 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg
1307 : Color_scroll)];
1308 scrollbarGC = XCreateGC(display->display, TermWin.vt, 1138 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1309 GCForeground, &gcvalue); 1139#endif
1140
1141#ifdef OFF_FOCUS_FADING
1142 // initially we are in unfocused state
1143 if (rs[Rs_fade])
1144 pix_colors = pix_colors_unfocused;
1145#endif
1146
1147 scr_recolour ();
1148}
1149
1150/* ------------------------------------------------------------------------- *
1151 * GET TTY CURRENT STATE *
1152 * ------------------------------------------------------------------------- */
1153void
1154rxvt_get_ttymode (ttymode_t *tio, int erase)
1155{
1156#ifdef HAVE_TERMIOS_H
1157 /*
1158 * standard System V termios interface
1159 */
1160 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1161 {
1162 /* return error - use system defaults */
1163 tio->c_cc[VINTR] = CINTR;
1164 tio->c_cc[VQUIT] = CQUIT;
1165 tio->c_cc[VERASE] = CERASE;
1166 tio->c_cc[VKILL] = CKILL;
1167 tio->c_cc[VSTART] = CSTART;
1168 tio->c_cc[VSTOP] = CSTOP;
1169 tio->c_cc[VSUSP] = CSUSP;
1170# ifdef VDSUSP
1171
1172 tio->c_cc[VDSUSP] = CDSUSP;
1310#endif 1173# endif
1174# ifdef VREPRINT
1175
1176 tio->c_cc[VREPRINT] = CRPRNT;
1177# endif
1178# ifdef VDISCRD
1179
1180 tio->c_cc[VDISCRD] = CFLUSH;
1181# endif
1182# ifdef VWERSE
1183
1184 tio->c_cc[VWERSE] = CWERASE;
1185# endif
1186# ifdef VLNEXT
1187
1188 tio->c_cc[VLNEXT] = CLNEXT;
1189# endif
1190
1191 }
1192 tio->c_cc[VEOF] = CEOF;
1193 tio->c_cc[VEOL] = VDISABLE;
1194# ifdef VEOL2
1195
1196 tio->c_cc[VEOL2] = VDISABLE;
1197# endif
1198# ifdef VSWTC
1199
1200 tio->c_cc[VSWTC] = VDISABLE;
1201# endif
1202# ifdef VSWTCH
1203
1204 tio->c_cc[VSWTCH] = VDISABLE;
1205# endif
1206# if VMIN != VEOF
1207
1208 tio->c_cc[VMIN] = 1;
1209# endif
1210# if VTIME != VEOL
1211
1212 tio->c_cc[VTIME] = 0;
1213# endif
1214
1215 if (erase != -1)
1216 tio->c_cc[VERASE] = (char)erase;
1217
1218 /* input modes */
1219 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1220# ifdef IMAXBEL
1221 | IMAXBEL
1222# endif
1223 | IXON);
1224
1225 /* output modes */
1226 tio->c_oflag = (OPOST | ONLCR);
1227
1228 /* control modes */
1229 tio->c_cflag = (CS8 | CREAD);
1230
1231 /* line discipline modes */
1232 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1233# if defined (ECHOCTL) && defined (ECHOKE)
1234 | ECHOCTL | ECHOKE
1235# endif
1236 | ECHOE | ECHOK);
1237# else /* HAVE_TERMIOS_H */
1238
1239 /*
1240 * sgtty interface
1241 */
1242
1243 /* get parameters -- gtty */
1244 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1245 {
1246 tio->sg.sg_erase = CERASE; /* ^H */
1247 tio->sg.sg_kill = CKILL; /* ^U */
1248 }
1249 if (erase != -1)
1250 tio->sg.sg_erase = (char)erase;
1251
1252 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1253
1254 /* get special characters */
1255 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1256 {
1257 tio->tc.t_intrc = CINTR; /* ^C */
1258 tio->tc.t_quitc = CQUIT; /* ^\ */
1259 tio->tc.t_startc = CSTART; /* ^Q */
1260 tio->tc.t_stopc = CSTOP; /* ^S */
1261 tio->tc.t_eofc = CEOF; /* ^D */
1262 tio->tc.t_brkc = -1;
1263 }
1264 /* get local special chars */
1265 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1266 {
1267 tio->lc.t_suspc = CSUSP; /* ^Z */
1268 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1269 tio->lc.t_rprntc = CRPRNT; /* ^R */
1270 tio->lc.t_flushc = CFLUSH; /* ^O */
1271 tio->lc.t_werasc = CWERASE; /* ^W */
1272 tio->lc.t_lnextc = CLNEXT; /* ^V */
1273 }
1274 /* get line discipline */
1275 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1276# ifdef NTTYDISC
1277
1278 tio->line = NTTYDISC;
1279# endif /* NTTYDISC */
1280
1281 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1282#endif /* HAVE_TERMIOS_H */
1283
1284 /*
1285 * Debugging
1286 */
1287#ifdef DEBUG_TTYMODE
1288#ifdef HAVE_TERMIOS_H
1289 /* c_iflag bits */
1290 fprintf (stderr, "Input flags\n");
1291
1292 /* cpp token stringize doesn't work on all machines <sigh> */
1293# define FOO(flag,name) \
1294 if ((tio->c_iflag) & flag) \
1295 fprintf (stderr, "%s ", name)
1296
1297 /* c_iflag bits */
1298 FOO (IGNBRK, "IGNBRK");
1299 FOO (BRKINT, "BRKINT");
1300 FOO (IGNPAR, "IGNPAR");
1301 FOO (PARMRK, "PARMRK");
1302 FOO (INPCK, "INPCK");
1303 FOO (ISTRIP, "ISTRIP");
1304 FOO (INLCR, "INLCR");
1305 FOO (IGNCR, "IGNCR");
1306 FOO (ICRNL, "ICRNL");
1307 FOO (IXON, "IXON");
1308 FOO (IXOFF, "IXOFF");
1309# ifdef IUCLC
1310
1311 FOO (IUCLC, "IUCLC");
1312# endif
1313# ifdef IXANY
1314
1315 FOO (IXANY, "IXANY");
1316# endif
1317# ifdef IMAXBEL
1318
1319 FOO (IMAXBEL, "IMAXBEL");
1320# endif
1321
1322 fprintf (stderr, "\n");
1323
1324# undef FOO
1325# define FOO(entry, name) \
1326 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1327
1328 FOO (VINTR, "VINTR");
1329 FOO (VQUIT, "VQUIT");
1330 FOO (VERASE, "VERASE");
1331 FOO (VKILL, "VKILL");
1332 FOO (VEOF, "VEOF");
1333 FOO (VEOL, "VEOL");
1334# ifdef VEOL2
1335
1336 FOO (VEOL2, "VEOL2");
1337# endif
1338# ifdef VSWTC
1339
1340 FOO (VSWTC, "VSWTC");
1341# endif
1342# ifdef VSWTCH
1343
1344 FOO (VSWTCH, "VSWTCH");
1345# endif
1346
1347 FOO (VSTART, "VSTART");
1348 FOO (VSTOP, "VSTOP");
1349 FOO (VSUSP, "VSUSP");
1350# ifdef VDSUSP
1351
1352 FOO (VDSUSP, "VDSUSP");
1353# endif
1354# ifdef VREPRINT
1355
1356 FOO (VREPRINT, "VREPRINT");
1357# endif
1358# ifdef VDISCRD
1359
1360 FOO (VDISCRD, "VDISCRD");
1361# endif
1362# ifdef VWERSE
1363
1364 FOO (VWERSE, "VWERSE");
1365# endif
1366# ifdef VLNEXT
1367
1368 FOO (VLNEXT, "VLNEXT");
1369# endif
1370
1371 fprintf (stderr, "\n");
1372# undef FOO
1373# endif /* HAVE_TERMIOS_H */
1374#endif /* DEBUG_TTYMODE */
1311} 1375}
1312 1376
1313/*----------------------------------------------------------------------*/ 1377/*----------------------------------------------------------------------*/
1314/* 1378/*
1315 * Run the command in a subprocess and return a file descriptor for the 1379 * Run the command in a subprocess and return a file descriptor for the
1316 * master end of the pseudo-teletype pair with the command talking to 1380 * master end of the pseudo-teletype pair with the command talking to
1317 * the slave. 1381 * the slave.
1318 */ 1382 */
1319int 1383void
1320rxvt_term::run_command (const char *const *argv) 1384rxvt_term::run_command (const char *const *argv)
1321{ 1385{
1322 int cfd, er; 1386 int er;
1323 1387
1324 /* get master (pty) */ 1388 if (!pty.get ())
1325 if ((cfd = rxvt_get_pty (&(tty_fd), &(ttydev))) < 0) 1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1326 {
1327 rxvt_print_error("can't open pseudo-tty");
1328 return -1;
1329 }
1330 1390
1331 fcntl (cfd, F_SETFL, O_NONBLOCK);
1332
1333 /* get slave (tty) */
1334 if (tty_fd < 0)
1335 {
1336#ifndef NO_SETOWNER_TTYDEV
1337 privileged_ttydev (SAVE);
1338#endif
1339
1340 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1341 {
1342 close(cfd);
1343 rxvt_print_error("can't open slave tty %s", ttydev);
1344 return -1;
1345 }
1346 }
1347#ifndef NO_BACKSPACE_KEY 1391#ifndef NO_BACKSPACE_KEY
1348 if (key_backspace[0] && !key_backspace[1]) 1392 if (key_backspace[0] && !key_backspace[1])
1349 er = key_backspace[0]; 1393 er = key_backspace[0];
1350 else if (STRCMP(key_backspace, "DEC") == 0) 1394 else if (strcmp (key_backspace, "DEC") == 0)
1351 er = '\177'; /* the initial state anyway */ 1395 er = '\177'; /* the initial state anyway */
1352 else 1396 else
1353#endif 1397#endif
1354
1355 er = -1; 1398 er = -1;
1356 1399
1357 rxvt_get_ttymode (&(tio), er); 1400 rxvt_get_ttymode (&tio, er);
1401
1402 /* set initial window size */
1403 tt_winch ();
1404
1405 sw_chld.start (SIGCHLD);
1358 1406
1359#ifndef __QNX__ 1407#ifndef __QNX__
1360 /* spin off the command interpreter */ 1408 /* spin off the command interpreter */
1361 switch (cmd_pid = fork ()) 1409 switch (cmd_pid = fork ())
1362 { 1410 {
1363 case -1: 1411 case -1:
1364 rxvt_print_error("can't fork"); 1412 rxvt_fatal ("can't fork, aborting.\n");
1365 return -1;
1366 case 0: 1413 case 0:
1367 close (cfd); /* only keep tty_fd and STDERR open */ 1414 init_env ();
1368 1415
1369 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1416 if (!pty.make_controlling_tty ())
1370 rxvt_print_error ("could not obtain control of tty"); 1417 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1371 else 1418 else
1372 { 1419 {
1373 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1420 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1374 dup2 (tty_fd, STDIN_FILENO); 1421 dup2 (pty.tty, STDIN_FILENO);
1375 dup2 (tty_fd, STDOUT_FILENO); 1422 dup2 (pty.tty, STDOUT_FILENO);
1376 dup2 (tty_fd, STDERR_FILENO); 1423 dup2 (pty.tty, STDERR_FILENO);
1377 1424
1378 if (tty_fd > 2) 1425 // close all our file handles that we do no longer need
1379 close (tty_fd); 1426 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1427 {
1428 if ((*t)->pty.pty > 2) close ((*t)->pty.pty);
1429 if ((*t)->pty.tty > 2) close ((*t)->pty.tty);
1430 }
1380 1431
1381 run_child (argv); 1432 run_child (argv);
1433 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1382 } 1434 }
1435
1383 exit (EXIT_FAILURE); 1436 _exit (EXIT_FAILURE);
1384 /* NOTREACHED */ 1437
1385 default: 1438 default:
1386 { 1439 {
1387#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1440#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1388 int fdstdin; 1441 int fdstdin;
1389 1442
1390 fdstdin = dup (STDIN_FILENO); 1443 fdstdin = dup (STDIN_FILENO);
1391 dup2 (tty_fd, STDIN_FILENO); 1444 dup2 (pty.tty, STDIN_FILENO);
1392#endif 1445#endif
1393 1446
1394#ifdef UTMP_SUPPORT 1447#ifdef UTMP_SUPPORT
1395 privileged_utmp (SAVE); 1448 privileged_utmp (SAVE);
1396#endif 1449#endif
… …
1398#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1451#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1399 1452
1400 dup2 (fdstdin, STDIN_FILENO); 1453 dup2 (fdstdin, STDIN_FILENO);
1401 close (fdstdin); 1454 close (fdstdin);
1402#endif 1455#endif
1403
1404 } 1456 }
1457
1405 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1458 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1406 break; 1459 break;
1407 } 1460 }
1408#else /* __QNX__ uses qnxspawn() */ 1461#else /* __QNX__ uses qnxspawn () */
1409 fchmod (tty_fd, 0622); 1462 fchmod (pty.tty, 0622);
1410 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1463 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1411 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1464 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1412 1465
1413 if (run_child (argv) == -1) 1466 if (run_child (argv) == -1)
1414 exit (EXIT_FAILURE); 1467 exit (EXIT_FAILURE);
1415#endif 1468#endif
1416
1417 return cfd;
1418} 1469}
1419 1470
1420/* ------------------------------------------------------------------------- * 1471/* ------------------------------------------------------------------------- *
1421 * CHILD PROCESS OPERATIONS * 1472 * CHILD PROCESS OPERATIONS *
1422 * ------------------------------------------------------------------------- */ 1473 * ------------------------------------------------------------------------- */
… …
1427int 1478int
1428rxvt_term::run_child (const char *const *argv) 1479rxvt_term::run_child (const char *const *argv)
1429{ 1480{
1430 char *login; 1481 char *login;
1431 1482
1432 SET_TTYMODE (STDIN_FILENO, &(tio)); /* init terminal attributes */ 1483 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1433 1484
1434 if (Options & Opt_console) 1485 if (options & Opt_console)
1435 { /* be virtual console, fail silently */ 1486 { /* be virtual console, fail silently */
1436#ifdef TIOCCONS 1487#ifdef TIOCCONS
1437 unsigned int on = 1; 1488 unsigned int on = 1;
1438 1489
1439 ioctl (STDIN_FILENO, TIOCCONS, &on); 1490 ioctl (STDIN_FILENO, TIOCCONS, &on);
1440#elif defined (SRIOCSREDIR) 1491#elif defined (SRIOCSREDIR)
1441 int fd; 1492 int fd;
1442 1493
1443 fd = open (CONSOLE, O_WRONLY, 0); 1494 fd = open (CONSOLE, O_WRONLY, 0);
1444 if (fd >= 0) 1495 if (fd >= 0)
1445 {
1446 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1496 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1447 close (fd); 1497 close (fd);
1448 }
1449#endif /* SRIOCSREDIR */ 1498#endif /* SRIOCSREDIR */
1450
1451 } 1499 }
1452 1500
1453 /* reset signals and spin off the command interpreter */ 1501 /* reset signals and spin off the command interpreter */
1454 signal (SIGINT, SIG_DFL); 1502 signal (SIGINT, SIG_DFL);
1455 signal (SIGQUIT, SIG_DFL); 1503 signal (SIGQUIT, SIG_DFL);
1456 signal (SIGCHLD, SIG_DFL); 1504 signal (SIGCHLD, SIG_DFL);
1505 signal (SIGHUP, SIG_DFL);
1506 signal (SIGPIPE, SIG_DFL);
1457 /* 1507 /*
1458 * mimick login's behavior by disabling the job control signals 1508 * mimick login's behavior by disabling the job control signals
1459 * a shell that wants them can turn them back on 1509 * a shell that wants them can turn them back on
1460 */ 1510 */
1461#ifdef SIGTSTP 1511#ifdef SIGTSTP
1462 signal (SIGTSTP, SIG_IGN); 1512 signal (SIGTSTP, SIG_IGN);
1463 signal (SIGTTIN, SIG_IGN); 1513 signal (SIGTTIN, SIG_IGN);
1464 signal (SIGTTOU, SIG_IGN); 1514 signal (SIGTTOU, SIG_IGN);
1465#endif /* SIGTSTP */ 1515#endif /* SIGTSTP */
1466 1516
1467 /* set window size */
1468 struct winsize ws;
1469
1470 ws.ws_col = TermWin.ncol;
1471 ws.ws_row = TermWin.nrow;
1472 ws.ws_xpixel = ws.ws_ypixel = 0;
1473 (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws);
1474
1475 // unblock signals (signals are blocked by iom.C 1517 // unblock signals (signals are blocked by iom.C
1476 sigset_t ss; 1518 sigset_t ss;
1477 sigemptyset (&ss); 1519 sigemptyset (&ss);
1478 sigprocmask (SIG_SETMASK, &ss, 0); 1520 sigprocmask (SIG_SETMASK, &ss, 0);
1479 1521
… …
1483 { 1525 {
1484# ifdef DEBUG_CMD 1526# ifdef DEBUG_CMD
1485 int i; 1527 int i;
1486 1528
1487 for (i = 0; argv[i]; i++) 1529 for (i = 0; argv[i]; i++)
1488 fprintf(stderr, "argv [%d] = \"%s\"\n", i, argv[i]); 1530 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1489# endif 1531# endif
1490 1532
1491 execvp(argv[0], (char *const *)argv); 1533 execvp (argv[0], (char *const *)argv);
1492 /* no error message: STDERR is closed! */ 1534 /* no error message: STDERR is closed! */
1493 } 1535 }
1494 else 1536 else
1495 { 1537 {
1496 const char *argv0, *shell; 1538 const char *argv0, *shell;
1497 1539
1498 if ((shell = getenv("SHELL")) == NULL || *shell == '\0') 1540 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1499 shell = "/bin/sh"; 1541 shell = "/bin/sh";
1500 1542
1501 argv0 = (const char *)rxvt_r_basename(shell); 1543 argv0 = (const char *)rxvt_r_basename (shell);
1544
1502 if (Options & Opt_loginShell) 1545 if (options & Opt_loginShell)
1503 { 1546 {
1504 login = (char *)rxvt_malloc((STRLEN(argv0) + 2) * sizeof(char)); 1547 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1505 1548
1506 login[0] = '-'; 1549 login[0] = '-';
1507 STRCPY(&login[1], argv0); 1550 strcpy (&login[1], argv0);
1508 argv0 = login; 1551 argv0 = login;
1509 } 1552 }
1510 execlp(shell, argv0, NULL); 1553 execlp (shell, argv0, NULL);
1511 /* no error message: STDERR is closed! */ 1554 /* no error message: STDERR is closed! */
1512 } 1555 }
1513 1556
1514#else /* __QNX__ uses qnxspawn() */ 1557#else /* __QNX__ uses qnxspawn () */
1515 1558
1516 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; 1559 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1517 char *command = NULL, fullcommand[_MAX_PATH]; 1560 char *command = NULL, fullcommand[_MAX_PATH];
1518 char **arg_v, *arg_a[2] = { NULL, NULL }; 1561 char **arg_v, *arg_a[2] = { NULL, NULL };
1519 1562
1520 if (argv != NULL) 1563 if (argv != NULL)
1521 { 1564 {
1522 if (access(argv[0], X_OK) == -1) 1565 if (access (argv[0], X_OK) == -1)
1523 { 1566 {
1524 if (STRCHR(argv[0], '/') == NULL) 1567 if (strchr (argv[0], '/') == NULL)
1525 { 1568 {
1526 searchenv(argv[0], "PATH", fullcommand); 1569 searchenv (argv[0], "PATH", fullcommand);
1570
1527 if (fullcommand[0] != '\0') 1571 if (fullcommand[0] != '\0')
1528 command = fullcommand; 1572 command = fullcommand;
1529 } 1573 }
1574
1530 if (access(command, X_OK) == -1) 1575 if (access (command, X_OK) == -1)
1531 return -1; 1576 return -1;
1532 } 1577 }
1533 else 1578 else
1534 command = argv[0]; 1579 command = argv[0];
1580
1535 arg_v = argv; 1581 arg_v = argv;
1536 } 1582 }
1537 else 1583 else
1538 { 1584 {
1539 if ((command = getenv("SHELL")) == NULL || *command == '\0') 1585 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1540 command = "/bin/sh"; 1586 command = "/bin/sh";
1541 1587
1542 arg_a[0] = my_basename(command); 1588 arg_a[0] = my_basename (command);
1589
1543 if (Options & Opt_loginShell) 1590 if (options & Opt_loginShell)
1544 { 1591 {
1545 login = rxvt_malloc((STRLEN(arg_a[0]) + 2) * sizeof(char)); 1592 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1546 1593
1547 login[0] = '-'; 1594 login[0] = '-';
1548 STRCPY(&login[1], arg_a[0]); 1595 strcpy (&login[1], arg_a[0]);
1549 arg_a[0] = login; 1596 arg_a[0] = login;
1550 } 1597 }
1598
1551 arg_v = arg_a; 1599 arg_v = arg_a;
1552 } 1600 }
1601
1553 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; 1602 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1554 cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1603 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1555 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1604 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1556 command, arg_v, environ, iov_a, 0); 1605 command, arg_v, environ, iov_a, 0);
1557 if (login) 1606 if (login)
1558 free(login); 1607 free (login);
1559 1608
1560 close(tty_fd); 1609 pty.close_tty ();
1561 return cmd_fd; 1610 return pty.pty;
1562
1563#endif 1611#endif
1612
1564 return -1; 1613 return -1;
1565} 1614}
1566 1615
1567/* ------------------------------------------------------------------------- *
1568 * GET TTY CURRENT STATE *
1569 * ------------------------------------------------------------------------- */
1570/* rxvt_get_ttymode() */
1571/* EXTPROTO */
1572void
1573rxvt_get_ttymode(ttymode_t *tio, int erase)
1574{
1575#ifdef HAVE_TERMIOS_H
1576 /*
1577 * standard System V termios interface
1578 */
1579 if (GET_TERMIOS(STDIN_FILENO, tio) < 0)
1580 {
1581 /* return error - use system defaults */
1582 tio->c_cc[VINTR] = CINTR;
1583 tio->c_cc[VQUIT] = CQUIT;
1584 tio->c_cc[VERASE] = CERASE;
1585 tio->c_cc[VKILL] = CKILL;
1586 tio->c_cc[VSTART] = CSTART;
1587 tio->c_cc[VSTOP] = CSTOP;
1588 tio->c_cc[VSUSP] = CSUSP;
1589# ifdef VDSUSP
1590
1591 tio->c_cc[VDSUSP] = CDSUSP;
1592# endif
1593# ifdef VREPRINT
1594
1595 tio->c_cc[VREPRINT] = CRPRNT;
1596# endif
1597# ifdef VDISCRD
1598
1599 tio->c_cc[VDISCRD] = CFLUSH;
1600# endif
1601# ifdef VWERSE
1602
1603 tio->c_cc[VWERSE] = CWERASE;
1604# endif
1605# ifdef VLNEXT
1606
1607 tio->c_cc[VLNEXT] = CLNEXT;
1608# endif
1609
1610 }
1611 tio->c_cc[VEOF] = CEOF;
1612 tio->c_cc[VEOL] = VDISABLE;
1613# ifdef VEOL2
1614
1615 tio->c_cc[VEOL2] = VDISABLE;
1616# endif
1617# ifdef VSWTC
1618
1619 tio->c_cc[VSWTC] = VDISABLE;
1620# endif
1621# ifdef VSWTCH
1622
1623 tio->c_cc[VSWTCH] = VDISABLE;
1624# endif
1625# if VMIN != VEOF
1626
1627 tio->c_cc[VMIN] = 1;
1628# endif
1629# if VTIME != VEOL
1630
1631 tio->c_cc[VTIME] = 0;
1632# endif
1633
1634 if (erase != -1)
1635 tio->c_cc[VERASE] = (char)erase;
1636
1637 /* input modes */
1638 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1639# ifdef IMAXBEL
1640 | IMAXBEL
1641# endif
1642 | IXON);
1643
1644 /* output modes */
1645 tio->c_oflag = (OPOST | ONLCR);
1646
1647 /* control modes */
1648 tio->c_cflag = (CS8 | CREAD);
1649
1650 /* line discipline modes */
1651 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1652# if defined (ECHOCTL) && defined (ECHOKE)
1653 | ECHOCTL | ECHOKE
1654# endif
1655 | ECHOE | ECHOK);
1656# else /* HAVE_TERMIOS_H */
1657
1658 /*
1659 * sgtty interface
1660 */
1661
1662 /* get parameters -- gtty */
1663 if (ioctl(STDIN_FILENO, TIOCGETP, &(tio->sg)) < 0)
1664 {
1665 tio->sg.sg_erase = CERASE; /* ^H */
1666 tio->sg.sg_kill = CKILL; /* ^U */
1667 }
1668 if (erase != -1)
1669 tio->sg.sg_erase = (char)erase;
1670
1671 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1672
1673 /* get special characters */
1674 if (ioctl(STDIN_FILENO, TIOCGETC, &(tio->tc)) < 0)
1675 {
1676 tio->tc.t_intrc = CINTR; /* ^C */
1677 tio->tc.t_quitc = CQUIT; /* ^\ */
1678 tio->tc.t_startc = CSTART; /* ^Q */
1679 tio->tc.t_stopc = CSTOP; /* ^S */
1680 tio->tc.t_eofc = CEOF; /* ^D */
1681 tio->tc.t_brkc = -1;
1682 }
1683 /* get local special chars */
1684 if (ioctl(STDIN_FILENO, TIOCGLTC, &(tio->lc)) < 0)
1685 {
1686 tio->lc.t_suspc = CSUSP; /* ^Z */
1687 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1688 tio->lc.t_rprntc = CRPRNT; /* ^R */
1689 tio->lc.t_flushc = CFLUSH; /* ^O */
1690 tio->lc.t_werasc = CWERASE; /* ^W */
1691 tio->lc.t_lnextc = CLNEXT; /* ^V */
1692 }
1693 /* get line discipline */
1694 ioctl(STDIN_FILENO, TIOCGETD, &(tio->line));
1695# ifdef NTTYDISC
1696
1697 tio->line = NTTYDISC;
1698# endif /* NTTYDISC */
1699
1700 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1701#endif /* HAVE_TERMIOS_H */
1702
1703 /*
1704 * Debugging
1705 */
1706#ifdef DEBUG_TTYMODE
1707#ifdef HAVE_TERMIOS_H
1708 /* c_iflag bits */
1709 fprintf(stderr, "Input flags\n");
1710
1711 /* cpp token stringize doesn't work on all machines <sigh> */
1712# define FOO(flag,name) \
1713 if ((tio->c_iflag) & flag) \
1714 fprintf (stderr, "%s ", name)
1715
1716 /* c_iflag bits */
1717 FOO(IGNBRK, "IGNBRK");
1718 FOO(BRKINT, "BRKINT");
1719 FOO(IGNPAR, "IGNPAR");
1720 FOO(PARMRK, "PARMRK");
1721 FOO(INPCK, "INPCK");
1722 FOO(ISTRIP, "ISTRIP");
1723 FOO(INLCR, "INLCR");
1724 FOO(IGNCR, "IGNCR");
1725 FOO(ICRNL, "ICRNL");
1726 FOO(IXON, "IXON");
1727 FOO(IXOFF, "IXOFF");
1728# ifdef IUCLC
1729
1730 FOO(IUCLC, "IUCLC");
1731# endif
1732# ifdef IXANY
1733
1734 FOO(IXANY, "IXANY");
1735# endif
1736# ifdef IMAXBEL
1737
1738 FOO(IMAXBEL, "IMAXBEL");
1739# endif
1740
1741 fprintf(stderr, "\n");
1742
1743# undef FOO
1744# define FOO(entry, name) \
1745 fprintf(stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1746
1747 FOO(VINTR, "VINTR");
1748 FOO(VQUIT, "VQUIT");
1749 FOO(VERASE, "VERASE");
1750 FOO(VKILL, "VKILL");
1751 FOO(VEOF, "VEOF");
1752 FOO(VEOL, "VEOL");
1753# ifdef VEOL2
1754
1755 FOO(VEOL2, "VEOL2");
1756# endif
1757# ifdef VSWTC
1758
1759 FOO(VSWTC, "VSWTC");
1760# endif
1761# ifdef VSWTCH
1762
1763 FOO(VSWTCH, "VSWTCH");
1764# endif
1765
1766 FOO(VSTART, "VSTART");
1767 FOO(VSTOP, "VSTOP");
1768 FOO(VSUSP, "VSUSP");
1769# ifdef VDSUSP
1770
1771 FOO(VDSUSP, "VDSUSP");
1772# endif
1773# ifdef VREPRINT
1774
1775 FOO(VREPRINT, "VREPRINT");
1776# endif
1777# ifdef VDISCRD
1778
1779 FOO(VDISCRD, "VDISCRD");
1780# endif
1781# ifdef VWERSE
1782
1783 FOO(VWERSE, "VWERSE");
1784# endif
1785# ifdef VLNEXT
1786
1787 FOO(VLNEXT, "VLNEXT");
1788# endif
1789
1790 fprintf(stderr, "\n");
1791# undef FOO
1792# endif /* HAVE_TERMIOS_H */
1793#endif /* DEBUG_TTYMODE */
1794}
1795
1796/*----------------------- end-of-file (C source) -----------------------*/ 1616/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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