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.79 by root, Sun Aug 15 22:09:24 2004 UTC vs.
Revision 1.120 by root, Mon Nov 28 18:37:42 2005 UTC

… …
31 * Initialisation routines. 31 * Initialisation routines.
32 */ 32 */
33 33
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h"
36#include "init.h" 37#include "init.h"
37 38
38#include <signal.h> 39#include <csignal>
39 40
40const char *const def_colorName[] = 41const char *const def_colorName[] =
41 { 42 {
42 COLOR_FOREGROUND, 43 COLOR_FOREGROUND,
43 COLOR_BACKGROUND, 44 COLOR_BACKGROUND,
… …
67 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
68 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
69 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
70 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 71 "Cyan", /* 6/14: bright cyan (#00FFFF) */
71 "White", /* 7/15: bright white (#FFFFFF) */ 72 "White", /* 7/15: bright white (#FFFFFF) */
72#ifdef TTY_256COLOR 73
73 "rgbi:0/0/0", /* default 16-255 color table */ 74 // 88 xterm colours
74 "rgbi:0/0/.2", /* consists of 6 6x6 colour cubes */ 75 "rgb:00/00/00",
75 "rgbi:0/0/.4", /* and a 24 greyscale ramp w/o */
76 "rgbi:0/0/.6", /* black or white */
77 "rgbi:0/0/.8", 76 "rgb:00/00/8b",
78 "rgbi:0/0/1", 77 "rgb:00/00/cd",
79 "rgbi:0/.2/0", 78 "rgb:00/00/ff",
80 "rgbi:0/.2/.2",
81 "rgbi:0/.2/.4",
82 "rgbi:0/.2/.6",
83 "rgbi:0/.2/.8",
84 "rgbi:0/.2/1",
85 "rgbi:0/.4/0",
86 "rgbi:0/.4/.2",
87 "rgbi:0/.4/.4",
88 "rgbi:0/.4/.6",
89 "rgbi:0/.4/.8",
90 "rgbi:0/.4/1",
91 "rgbi:0/.6/0",
92 "rgbi:0/.6/.2",
93 "rgbi:0/.6/.4",
94 "rgbi:0/.6/.6",
95 "rgbi:0/.6/.8",
96 "rgbi:0/.6/1",
97 "rgbi:0/.8/0", 79 "rgb:00/8b/00",
98 "rgbi:0/.8/.2",
99 "rgbi:0/.8/.4",
100 "rgbi:0/.8/.6",
101 "rgbi:0/.8/.8", 80 "rgb:00/8b/8b",
102 "rgbi:0/.8/1", 81 "rgb:00/8b/cd",
82 "rgb:00/8b/ff",
103 "rgbi:0/1/0", 83 "rgb:00/cd/00",
104 "rgbi:0/1/.2",
105 "rgbi:0/1/.4",
106 "rgbi:0/1/.6",
107 "rgbi:0/1/.8", 84 "rgb:00/cd/8b",
108 "rgbi:0/1/1", 85 "rgb:00/cd/cd",
86 "rgb:00/cd/ff",
109 "rgbi:.2/0/0", 87 "rgb:00/ff/00",
110 "rgbi:.2/0/.2", 88 "rgb:00/ff/8b",
111 "rgbi:.2/0/.4", 89 "rgb:00/ff/cd",
112 "rgbi:.2/0/.6", 90 "rgb:00/ff/ff",
113 "rgbi:.2/0/.8",
114 "rgbi:.2/0/1",
115 "rgbi:.2/.2/0",
116 "rgbi:.2/.2/.2",
117 "rgbi:.2/.2/.4",
118 "rgbi:.2/.2/.6",
119 "rgbi:.2/.2/.8",
120 "rgbi:.2/.2/1",
121 "rgbi:.2/.4/0",
122 "rgbi:.2/.4/.2",
123 "rgbi:.2/.4/.4",
124 "rgbi:.2/.4/.6",
125 "rgbi:.2/.4/.8",
126 "rgbi:.2/.4/1",
127 "rgbi:.2/.6/0",
128 "rgbi:.2/.6/.2",
129 "rgbi:.2/.6/.4",
130 "rgbi:.2/.6/.6",
131 "rgbi:.2/.6/.8",
132 "rgbi:.2/.6/1",
133 "rgbi:.2/.8/0",
134 "rgbi:.2/.8/.2",
135 "rgbi:.2/.8/.4",
136 "rgbi:.2/.8/.6",
137 "rgbi:.2/.8/.8",
138 "rgbi:.2/.8/1",
139 "rgbi:.2/1/0",
140 "rgbi:.2/1/.2",
141 "rgbi:.2/1/.4",
142 "rgbi:.2/1/.6",
143 "rgbi:.2/1/.8",
144 "rgbi:.2/1/1",
145 "rgbi:.4/0/0",
146 "rgbi:.4/0/.2",
147 "rgbi:.4/0/.4",
148 "rgbi:.4/0/.6",
149 "rgbi:.4/0/.8",
150 "rgbi:.4/0/1",
151 "rgbi:.4/.2/0",
152 "rgbi:.4/.2/.2",
153 "rgbi:.4/.2/.4",
154 "rgbi:.4/.2/.6",
155 "rgbi:.4/.2/.8",
156 "rgbi:.4/.2/1",
157 "rgbi:.4/.4/0",
158 "rgbi:.4/.4/.2",
159 "rgbi:.4/.4/.4",
160 "rgbi:.4/.4/.6",
161 "rgbi:.4/.4/.8",
162 "rgbi:.4/.4/1",
163 "rgbi:.4/.6/0",
164 "rgbi:.4/.6/.2",
165 "rgbi:.4/.6/.4",
166 "rgbi:.4/.6/.6",
167 "rgbi:.4/.6/.8",
168 "rgbi:.4/.6/1",
169 "rgbi:.4/.8/0",
170 "rgbi:.4/.8/.2",
171 "rgbi:.4/.8/.4",
172 "rgbi:.4/.8/.6",
173 "rgbi:.4/.8/.8",
174 "rgbi:.4/.8/1",
175 "rgbi:.4/1/0",
176 "rgbi:.4/1/.2",
177 "rgbi:.4/1/.4",
178 "rgbi:.4/1/.6",
179 "rgbi:.4/1/.8",
180 "rgbi:.4/1/1",
181 "rgbi:.6/0/0",
182 "rgbi:.6/0/.2",
183 "rgbi:.6/0/.4",
184 "rgbi:.6/0/.6",
185 "rgbi:.6/0/.8",
186 "rgbi:.6/0/1",
187 "rgbi:.6/.2/0",
188 "rgbi:.6/.2/.2",
189 "rgbi:.6/.2/.4",
190 "rgbi:.6/.2/.6",
191 "rgbi:.6/.2/.8",
192 "rgbi:.6/.2/1",
193 "rgbi:.6/.4/0",
194 "rgbi:.6/.4/.2",
195 "rgbi:.6/.4/.4",
196 "rgbi:.6/.4/.6",
197 "rgbi:.6/.4/.8",
198 "rgbi:.6/.4/1",
199 "rgbi:.6/.6/0",
200 "rgbi:.6/.6/.2",
201 "rgbi:.6/.6/.4",
202 "rgbi:.6/.6/.6",
203 "rgbi:.6/.6/.8",
204 "rgbi:.6/.6/1",
205 "rgbi:.6/.8/0",
206 "rgbi:.6/.8/.2",
207 "rgbi:.6/.8/.4",
208 "rgbi:.6/.8/.6",
209 "rgbi:.6/.8/.8",
210 "rgbi:.6/.8/1",
211 "rgbi:.6/1/0",
212 "rgbi:.6/1/.2",
213 "rgbi:.6/1/.4",
214 "rgbi:.6/1/.6",
215 "rgbi:.6/1/.8",
216 "rgbi:.6/1/1",
217 "rgbi:.8/0/0", 91 "rgb:8b/00/00",
218 "rgbi:.8/0/.2",
219 "rgbi:.8/0/.4",
220 "rgbi:.8/0/.6",
221 "rgbi:.8/0/.8", 92 "rgb:8b/00/8b",
222 "rgbi:.8/0/1", 93 "rgb:8b/00/cd",
223 "rgbi:.8/.2/0", 94 "rgb:8b/00/ff",
224 "rgbi:.8/.2/.2",
225 "rgbi:.8/.2/.4",
226 "rgbi:.8/.2/.6",
227 "rgbi:.8/.2/.8",
228 "rgbi:.8/.2/1",
229 "rgbi:.8/.4/0",
230 "rgbi:.8/.4/.2",
231 "rgbi:.8/.4/.4",
232 "rgbi:.8/.4/.6",
233 "rgbi:.8/.4/.8",
234 "rgbi:.8/.4/1",
235 "rgbi:.8/.6/0",
236 "rgbi:.8/.6/.2",
237 "rgbi:.8/.6/.4",
238 "rgbi:.8/.6/.6",
239 "rgbi:.8/.6/.8",
240 "rgbi:.8/.6/1",
241 "rgbi:.8/.8/0", 95 "rgb:8b/8b/00",
242 "rgbi:.8/.8/.2",
243 "rgbi:.8/.8/.4",
244 "rgbi:.8/.8/.6",
245 "rgbi:.8/.8/.8",
246 "rgbi:.8/.8/1",
247 "rgbi:.8/1/0",
248 "rgbi:.8/1/.2",
249 "rgbi:.8/1/.4",
250 "rgbi:.8/1/.6",
251 "rgbi:.8/1/.8",
252 "rgbi:.8/1/1",
253 "rgbi:1/0/0",
254 "rgbi:1/0/.2",
255 "rgbi:1/0/.4",
256 "rgbi:1/0/.6",
257 "rgbi:1/0/.8",
258 "rgbi:1/0/1",
259 "rgbi:1/.2/0",
260 "rgbi:1/.2/.2",
261 "rgbi:1/.2/.4",
262 "rgbi:1/.2/.6",
263 "rgbi:1/.2/.8",
264 "rgbi:1/.2/1",
265 "rgbi:1/.4/0",
266 "rgbi:1/.4/.2",
267 "rgbi:1/.4/.4",
268 "rgbi:1/.4/.6",
269 "rgbi:1/.4/.8",
270 "rgbi:1/.4/1",
271 "rgbi:1/.6/0",
272 "rgbi:1/.6/.2",
273 "rgbi:1/.6/.4",
274 "rgbi:1/.6/.6",
275 "rgbi:1/.6/.8",
276 "rgbi:1/.6/1",
277 "rgbi:1/.8/0",
278 "rgbi:1/.8/.2",
279 "rgbi:1/.8/.4",
280 "rgbi:1/.8/.6",
281 "rgbi:1/.8/.8",
282 "rgbi:1/.8/1",
283 "rgbi:1/1/0",
284 "rgbi:1/1/.2",
285 "rgbi:1/1/.4",
286 "rgbi:1/1/.6",
287 "rgbi:1/1/.8",
288 "rgbi:1/1/1",
289 "rgb:08/08/08", 96 "rgb:8b/8b/8b",
290 "rgb:12/12/12", 97 "rgb:8b/8b/cd",
98 "rgb:8b/8b/ff",
99 "rgb:8b/cd/00",
100 "rgb:8b/cd/8b",
101 "rgb:8b/cd/cd",
102 "rgb:8b/cd/ff",
103 "rgb:8b/ff/00",
104 "rgb:8b/ff/8b",
105 "rgb:8b/ff/cd",
106 "rgb:8b/ff/ff",
107 "rgb:cd/00/00",
108 "rgb:cd/00/8b",
109 "rgb:cd/00/cd",
110 "rgb:cd/00/ff",
111 "rgb:cd/8b/00",
112 "rgb:cd/8b/8b",
113 "rgb:cd/8b/cd",
114 "rgb:cd/8b/ff",
115 "rgb:cd/cd/00",
116 "rgb:cd/cd/8b",
291 "rgb:1c/1c/1c", 117 "rgb:cd/cd/cd",
118 "rgb:cd/cd/ff",
119 "rgb:cd/ff/00",
120 "rgb:cd/ff/8b",
121 "rgb:cd/ff/cd",
122 "rgb:cd/ff/ff",
123 "rgb:ff/00/00",
124 "rgb:ff/00/8b",
125 "rgb:ff/00/cd",
126 "rgb:ff/00/ff",
127 "rgb:ff/8b/00",
128 "rgb:ff/8b/8b",
129 "rgb:ff/8b/cd",
130 "rgb:ff/8b/ff",
131 "rgb:ff/cd/00",
132 "rgb:ff/cd/8b",
133 "rgb:ff/cd/cd",
134 "rgb:ff/cd/ff",
135 "rgb:ff/ff/00",
136 "rgb:ff/ff/8b",
137 "rgb:ff/ff/cd",
138 "rgb:ff/ff/ff",
292 "rgb:26/26/26", 139 "rgb:2e/2e/2e",
293 "rgb:30/30/30",
294 "rgb:3a/3a/3a",
295 "rgb:44/44/44",
296 "rgb:4e/4e/4e",
297 "rgb:58/58/58", 140 "rgb:5c/5c/5c",
298 "rgb:62/62/62",
299 "rgb:6c/6c/6c",
300 "rgb:76/76/76", 141 "rgb:73/73/73",
301 "rgb:80/80/80", 142 "rgb:8b/8b/8b",
302 "rgb:8a/8a/8a", 143 "rgb:a2/a2/a2",
303 "rgb:94/94/94", 144 "rgb:b9/b9/b9",
304 "rgb:9e/9e/9e",
305 "rgb:a8/a8/a8",
306 "rgb:b2/b2/b2",
307 "rgb:bc/bc/bc",
308 "rgb:c6/c6/c6",
309 "rgb:d0/d0/d0", 145 "rgb:d0/d0/d0",
310 "rgb:da/da/da",
311 "rgb:e4/e4/e4", 146 "rgb:e7/e7/e7",
312 "rgb:ee/ee/ee", 147
313#endif
314#ifndef NO_CURSORCOLOR 148#ifndef NO_CURSORCOLOR
315 COLOR_CURSOR_BACKGROUND, 149 COLOR_CURSOR_BACKGROUND,
316 COLOR_CURSOR_FOREGROUND, 150 COLOR_CURSOR_FOREGROUND,
317#endif /* ! NO_CURSORCOLOR */ 151#endif /* ! NO_CURSORCOLOR */
318 NULL, /* Color_pointer_fg */ 152 NULL, /* Color_pointer_fg */
319 NULL, /* Color_pointer_bg */ 153 NULL, /* Color_pointer_bg */
320 NULL, /* Color_border */ 154 NULL, /* Color_border */
321#ifndef NO_BOLD_UNDERLINE_REVERSE 155#ifndef NO_BOLD_UNDERLINE_REVERSE
322 NULL, /* Color_BD */ 156 NULL, /* Color_BD */
157 NULL, /* Color_IT */
323 NULL, /* Color_UL */ 158 NULL, /* Color_UL */
324 NULL, /* Color_RV */ 159 NULL, /* Color_RV */
325#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 160#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
161#if ENABLE_FRILLS
162 NULL, // Color_underline
163#endif
326#ifdef OPTION_HC 164#ifdef OPTION_HC
327 NULL, 165 NULL,
328#endif 166#endif
329#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
330 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
331 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
332#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
333#if TINTING 171#if TINTING
334 NULL, 172 NULL,
335#endif 173#endif
174#if OFF_FOCUS_FADING
175 "black",
176#endif
336 }; 177 };
337 178
338const char *const xa_names[NUM_XA] = 179const char *const xa_names[] =
339 { 180 {
340 "TEXT", 181 "TEXT",
341 "COMPOUND_TEXT", 182 "COMPOUND_TEXT",
342 "UTF8_STRING", 183 "UTF8_STRING",
343 "MULTIPLE", 184 "MULTIPLE",
344 "TARGETS", 185 "TARGETS",
345 "TIMESTAMP", 186 "TIMESTAMP",
346 "VT_SELECTION", 187 "VT_SELECTION",
347 "INCR", 188 "INCR",
189 "WM_PROTOCOLS",
348 "WM_DELETE_WINDOW", 190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
349#ifdef TRANSPARENT 204#ifdef TRANSPARENT
350 "_XROOTPMAP_ID", 205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
351#endif 207#endif
352#ifdef OFFIX_DND 208#ifdef OFFIX_DND
353 "DndProtocol", 209 "DndProtocol",
354 "DndSelection", 210 "DndSelection",
355#endif 211#endif
356 "CLIPBOARD" 212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif
357 }; 216 };
358 217
359bool 218bool
360rxvt_term::init_vars () 219rxvt_term::init_vars ()
361{ 220{
221 sw_term.start (SIGTERM);
222 sw_int.start (SIGINT);
223
362 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 224 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
363#ifdef OFF_FOCUS_FADING 225#ifdef OFF_FOCUS_FADING
364 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 226 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
365#endif 227#endif
366 pix_colors = pix_colors_focused; 228 pix_colors = pix_colors_focused;
… …
374 236
375 MEvent.time = CurrentTime; 237 MEvent.time = CurrentTime;
376 MEvent.button = AnyButton; 238 MEvent.button = AnyButton;
377 options = DEFAULT_OPTIONS; 239 options = DEFAULT_OPTIONS;
378 want_refresh = 1; 240 want_refresh = 1;
379 cmd_pid = -1;
380 pty.pty = pty.tty = -1;
381 priv_modes = SavedModes = PrivMode_Default; 241 priv_modes = SavedModes = PrivMode_Default;
382 TermWin.focus = 0; 242 TermWin.focus = 0;
383 TermWin.ncol = 80; 243 TermWin.ncol = 80;
384 TermWin.nrow = 24; 244 TermWin.nrow = 24;
385 TermWin.int_bwidth = INTERNALBORDERWIDTH; 245 TermWin.int_bwidth = INTERNALBORDERWIDTH;
386 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 246 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
387 TermWin.lineSpace = LINESPACE; 247 TermWin.lineSpace = LINESPACE;
388 TermWin.saveLines = SAVELINES; 248 TermWin.saveLines = SAVELINES;
389 numpix_colors = TOTAL_COLORS; 249 numpix_colors = TOTAL_COLORS;
390 250
391#ifndef NO_BRIGHTCOLOR
392 colorfgbg = DEFAULT_RSTYLE;
393#endif
394
395 refresh_limit = 1; 251 refresh_limit = 1;
396 refresh_type = SLOW_REFRESH; 252 refresh_type = SLOW_REFRESH;
397 prev_nrow = prev_ncol = 0; 253 prev_nrow = prev_ncol = 0;
398 254
399 oldcursor.row = oldcursor.col = -1; 255 oldcursor.row = oldcursor.col = -1;
… …
406 last_bot = last_state = -1; 262 last_bot = last_state = -1;
407 263
408#ifdef MENUBAR 264#ifdef MENUBAR
409 menu_readonly = 1; 265 menu_readonly = 1;
410# if ! (MENUBAR_MAX > 1) 266# if ! (MENUBAR_MAX > 1)
411 CurrentBar = & (BarList); 267 CurrentBar = &BarList;
412# endif /* (MENUBAR_MAX > 1) */ 268# endif /* (MENUBAR_MAX > 1) */
413#endif 269#endif
414 270
415 return true; 271 return true;
416} 272}
… …
490 */ 346 */
491 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
492 rs[Rs_display_name] = ":0"; 348 rs[Rs_display_name] = ":0";
493 349
494 get_options (r_argc, r_argv); 350 get_options (r_argc, r_argv);
351
352 if (!(display = displays.get (rs[Rs_display_name])))
353 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
354
355 extract_resources ();
495 free (r_argv); 356 free (r_argv);
496
497#ifdef LOCAL_X_IS_UNIX
498 if (rs[Rs_display_name][0] == ':')
499 {
500 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
501 strcpy (val, "unix");
502 strcat (val, rs[Rs_display_name]);
503 display = displays.get (val);
504 free (val);
505 }
506#endif
507
508 if (!display
509 && ! (display = displays.get (rs[Rs_display_name])))
510 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
511
512 extract_resources (display->display, rs[Rs_name]);
513 357
514 /* 358 /*
515 * set any defaults not already set 359 * set any defaults not already set
516 */ 360 */
517 if (cmd_argv && cmd_argv[0]) 361 if (cmd_argv && cmd_argv[0])
… …
535#if ENABLE_FRILLS 379#if ENABLE_FRILLS
536 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 380 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
537 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 381 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
538 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 382 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
539 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 383 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
540#endif
541
542#ifndef NO_LINESPACE
543 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 384 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
544 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 385 TermWin.lineSpace = min (i, 100); /* arbitrary limit */
545#endif 386#endif
546 387
547#ifdef POINTER_BLANK 388#ifdef POINTER_BLANK
… …
599 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 440 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
600 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 441 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
601 } 442 }
602 443
603#ifdef HAVE_SCROLLBARS 444#ifdef HAVE_SCROLLBARS
604 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 445 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
605 rs[Rs_scrollBar_thickness]);
606#endif 446#endif
607 447
608#ifdef XTERM_REVERSE_VIDEO 448#ifdef XTERM_REVERSE_VIDEO
609 /* this is how xterm implements reverseVideo */ 449 /* this is how xterm implements reverseVideo */
610 if (options & Opt_reverseVideo) 450 if (options & Opt_reverseVideo)
… …
640 color_aliases (Color_BD); 480 color_aliases (Color_BD);
641 color_aliases (Color_UL); 481 color_aliases (Color_UL);
642 color_aliases (Color_RV); 482 color_aliases (Color_RV);
643#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 483#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
644 484
485 if (!rs[Rs_color + Color_border])
486 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
487
645 return cmd_argv; 488 return cmd_argv;
646} 489}
647 490
648/*----------------------------------------------------------------------*/ 491/*----------------------------------------------------------------------*/
649void 492void
… …
756 599
757 this->locale = rxvt_strdup (this->locale); 600 this->locale = rxvt_strdup (this->locale);
758 SET_LOCALE (this->locale); 601 SET_LOCALE (this->locale);
759 mbstate.reset (); 602 mbstate.reset ();
760#endif 603#endif
761#if 0 604
762#if HAVE_NL_LANGINFO 605#if HAVE_NL_LANGINFO
606 char *codeset = strdup (nl_langinfo (CODESET));
607 // /^UTF.?8/i
608 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
609 && (codeset[1] == 'T' || codeset[1] == 't')
610 && (codeset[2] == 'F' || codeset[2] == 'f')
611 && (codeset[3] == '8' || codeset[4] == '8');
763 free (codeset); 612 free (codeset);
764 codeset = strdup (nl_langinfo (CODESET));
765 enc_utf8 = !strcasecmp (codeset, "UTF-8")
766 || !strcasecmp (codeset, "UTF8");
767#else 613#else
768 enc_utf8 = 1; 614 enc_utf8 = 0;
769#endif
770#endif 615#endif
771} 616}
772 617
773void 618void
774rxvt_term::init_xlocale () 619rxvt_term::init_xlocale ()
… …
776#ifdef USE_XIM 621#ifdef USE_XIM
777 if (!locale) 622 if (!locale)
778 rxvt_warn ("setting locale failed, working without locale support.\n"); 623 rxvt_warn ("setting locale failed, working without locale support.\n");
779 else 624 else
780 { 625 {
781 Atom wmlocale; 626 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
782
783 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
784 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
785 XA_STRING, 8, PropModeReplace,
786 (unsigned char *)locale, strlen (locale));
787 627
788 if (!XSupportsLocale ()) 628 if (!XSupportsLocale ())
789 { 629 {
790 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n"); 630 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
791 return; 631 return;
792 } 632 }
793 633
794 im_ev.start (display); 634 im_ev.start (display);
795 635
… …
805{ 645{
806 /* 646 /*
807 * Initialize the command connection. 647 * Initialize the command connection.
808 * This should be called after the X server connection is established. 648 * This should be called after the X server connection is established.
809 */ 649 */
810 int i;
811
812 for (i = 0; i < NUM_XA; i++)
813 xa[i] = XInternAtom (display->display, xa_names[i], False);
814
815 /* Enable delete window protocol */
816 XSetWMProtocols (display->display, TermWin.parent[0],
817 & (xa[XA_WMDELETEWINDOW]), 1);
818
819#ifdef USING_W11LIB
820 /* enable W11 callbacks */
821 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
822#endif
823 650
824#ifdef META8_OPTION 651#ifdef META8_OPTION
825 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 652 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);
826#endif 653#endif
827 654
… …
843 if (scrollbar_visible ()) 670 if (scrollbar_visible ())
844 { 671 {
845 priv_modes |= PrivMode_scrollBar; 672 priv_modes |= PrivMode_scrollBar;
846 SavedModes |= PrivMode_scrollBar; 673 SavedModes |= PrivMode_scrollBar;
847 } 674 }
675
848 if (menubar_visible ()) 676 if (menubar_visible ())
849 { 677 {
850 priv_modes |= PrivMode_menuBar; 678 priv_modes |= PrivMode_menuBar;
851 SavedModes |= PrivMode_menuBar; 679 SavedModes |= PrivMode_menuBar;
852 } 680 }
… …
912 } 740 }
913 } 741 }
914 } 742 }
915 743
916 pix_colors[i] = xcol; 744 pix_colors[i] = xcol;
745 SET_PIXCOLOR (i);
746 }
747
917#ifdef OFF_FOCUS_FADING 748#ifdef OFF_FOCUS_FADING
918 if (rs[Rs_fade]) 749 if (rs[Rs_fade])
750 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
919 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 751 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
920#endif 752#endif
921 SET_PIXCOLOR (i);
922 }
923 753
924 if (display->depth <= 2) 754 if (display->depth <= 2)
925 { 755 {
926 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 756 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
927 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 757 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
… …
935 * from the fvwm window manager. 765 * from the fvwm window manager.
936 */ 766 */
937#ifdef KEEP_SCROLLCOLOR 767#ifdef KEEP_SCROLLCOLOR
938 768
939 if (display->depth <= 2) 769 if (display->depth <= 2)
770 {
940 { /* Monochrome */ 771 /* Monochrome */
941 pix_colors[Color_scroll] = pix_colors[Color_fg]; 772 pix_colors[Color_scroll] = pix_colors[Color_fg];
942 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 773 pix_colors[Color_topShadow] = pix_colors[Color_bg];
943 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 774 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
944 } 775 }
945 else 776 else
… …
985 i -= 8; 816 i -= 8;
986#ifndef NO_BRIGHTCOLOR 817#ifndef NO_BRIGHTCOLOR
987 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 818 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
988 return; 819 return;
989#endif 820#endif
990
991 } 821 }
992 822
993 if (i >= 0 && i <= 7) /* normal colors */ 823 if (i >= 0 && i <= 7) /* normal colors */
994 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 824 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
995 } 825 }
… …
1001 * Use resource ``modifier'' to override the Meta modifier 831 * Use resource ``modifier'' to override the Meta modifier
1002 */ 832 */
1003void 833void
1004rxvt_term::get_ourmods () 834rxvt_term::get_ourmods ()
1005{ 835{
1006 int i, j, k; 836 int i, j, k;
1007 int requestedmeta, realmeta, realalt; 837 int requestedmeta, realmeta, realalt;
1008 const char *cm, *rsmod; 838 const char *cm, *rsmod;
1009 XModifierKeymap *map; 839 XModifierKeymap *map;
1010 KeyCode *kc; 840 KeyCode *kc;
1011 const unsigned int modmasks[] = 841 const unsigned int modmasks[] =
1012 { 842 {
1013 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 843 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
1014 }; 844 };
1015 845
1016 requestedmeta = realmeta = realalt = 0; 846 requestedmeta = realmeta = realalt = 0;
1017 rsmod = rs[Rs_modifier]; 847 rsmod = rs[Rs_modifier];
848
1018 if (rsmod 849 if (rsmod
1019 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 850 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
1020 requestedmeta = rsmod[3] - '0'; 851 requestedmeta = rsmod[3] - '0';
1021 852
1022 map = XGetModifierMapping (display->display); 853 map = XGetModifierMapping (display->display);
1023 kc = map->modifiermap; 854 kc = map->modifiermap;
855
1024 for (i = 1; i < 6; i++) 856 for (i = 1; i < 6; i++)
1025 { 857 {
1026 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 858 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
859
1027 for (j = map->max_keypermod; j--; k++) 860 for (j = map->max_keypermod; j--; k++)
1028 { 861 {
1029 if (kc[k] == 0) 862 if (kc[k] == 0)
1030 break; 863 break;
864
1031 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 865 switch (XKeycodeToKeysym (display->display, kc[k], 0))
1032 { 866 {
1033 case XK_Num_Lock: 867 case XK_Num_Lock:
1034 ModNumLockMask = modmasks[i - 1]; 868 ModNumLockMask = modmasks[i - 1];
1035 /* FALLTHROUGH */ 869 continue;
1036 default: 870
1037 continue; /* for (;;) */ 871 case XK_ISO_Level3_Shift:
872 ModLevel3Mask = modmasks[i - 1];
873 continue;
874
1038 case XK_Meta_L: 875 case XK_Meta_L:
1039 case XK_Meta_R: 876 case XK_Meta_R:
1040 cm = "meta"; 877 cm = "meta";
1041 realmeta = i; 878 realmeta = i;
1042 break; 879 break;
880
1043 case XK_Alt_L: 881 case XK_Alt_L:
1044 case XK_Alt_R: 882 case XK_Alt_R:
1045 cm = "alt"; 883 cm = "alt";
1046 realalt = i; 884 realalt = i;
1047 break; 885 break;
886
1048 case XK_Super_L: 887 case XK_Super_L:
1049 case XK_Super_R: 888 case XK_Super_R:
1050 cm = "super"; 889 cm = "super";
1051 break; 890 break;
891
1052 case XK_Hyper_L: 892 case XK_Hyper_L:
1053 case XK_Hyper_R: 893 case XK_Hyper_R:
1054 cm = "hyper"; 894 cm = "hyper";
1055 break; 895 break;
896
897 default:
898 continue;
1056 } 899 }
900
1057 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0) 901 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
1058 requestedmeta = i; 902 requestedmeta = i;
1059 } 903 }
1060 } 904 }
905
1061 XFreeModifiermap (map); 906 XFreeModifiermap (map);
907
1062 i = (requestedmeta ? requestedmeta 908 i = requestedmeta ? requestedmeta
1063 : (realmeta ? realmeta 909 : realmeta ? realmeta
1064 : (realalt ? realalt : 0))); 910 : realalt ? realalt
911 : 0;
912
1065 if (i) 913 if (i)
1066 ModMetaMask = modmasks[i - 1]; 914 ModMetaMask = modmasks[i - 1];
1067} 915}
1068 916
1069/*----------------------------------------------------------------------*/ 917/*----------------------------------------------------------------------*/
… …
1079#endif 927#endif
1080 XGCValues gcvalue; 928 XGCValues gcvalue;
1081 long vt_emask; 929 long vt_emask;
1082 XSetWindowAttributes attributes; 930 XSetWindowAttributes attributes;
1083 XWindowAttributes gattr; 931 XWindowAttributes gattr;
932 Window top, parent;
933 dDisp;
934
935#ifdef USING_W11LIB
936 /* enable W11 callbacks */
937 W11AddEventHandler (disp, rxvt_W11_process_x_event);
938#endif
939
940 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
941 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
1084 942
1085 if (options & Opt_transparent) 943 if (options & Opt_transparent)
1086 { 944 {
1087 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 945 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
1088 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 946 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1089 } 947 }
1090 948
1091#if ENABLE_FRILLS 949#if ENABLE_FRILLS
1092 if (options & Opt_borderLess) 950 if (options & Opt_borderLess)
1093 { 951 {
1094 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 952 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
953
1095 if (prop == None) 954 if (prop == None)
1096 { 955 {
1097 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 956 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
1098#ifdef PREFER_24BIT 957#ifdef PREFER_24BIT
1099 attributes.override_redirect = TRUE; 958 attributes.override_redirect = TRUE;
… …
1105 mwmhints.flags = MWM_HINTS_DECORATIONS; 964 mwmhints.flags = MWM_HINTS_DECORATIONS;
1106 mwmhints.decorations = 0; 965 mwmhints.decorations = 0;
1107 } 966 }
1108 } 967 }
1109 else 968 else
1110 {
1111 mwmhints.flags = 0; 969 mwmhints.flags = 0;
1112 }
1113#endif 970#endif
1114 971
1115 /* grab colors before netscape does */ 972 /* grab colors before netscape does */
1116 Get_Colours (); 973 Get_Colours ();
1117 974
1118 if (!change_font (rs[Rs_font])) 975 if (!set_fonts ())
1119 { 976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1120 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n"); 977
1121 destroy (); 978 parent = DefaultRootWindow (disp);
1122 return; 979
980#if ENABLE_XEMBED
981 if (rs[Rs_embed])
1123 } 982 {
983 XWindowAttributes wattr;
1124 984
985 parent = strtol (rs[Rs_embed], 0, 0);
986
987 if (!XGetWindowAttributes (disp, parent, &wattr))
988 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
989
990 window_calc (wattr.width, wattr.height);
991 }
992
993#endif
1125 window_calc (0, 0); 994 window_calc (0, 0);
995
996 /* sub-window placement & size in rxvt_resize_subwindows () */
997#ifdef PREFER_24BIT
998 attributes.background_pixel = pix_colors_focused[Color_border];
999 attributes.border_pixel = pix_colors_focused[Color_border];
1000 attributes.colormap = display->cmap;
1001 top = XCreateWindow (disp, parent,
1002 szHint.x, szHint.y,
1003 szHint.width, szHint.height,
1004 TermWin.ext_bwidth,
1005 display->depth, InputOutput,
1006 display->visual,
1007 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1008#else
1009 top = XCreateSimpleWindow (disp, parent,
1010 szHint.x, szHint.y,
1011 szHint.width, szHint.height,
1012 TermWin.ext_bwidth,
1013 pix_colors_focused[Color_border],
1014 pix_colors_focused[Color_border]);
1015#endif
1016
1017 TermWin.parent[0] = top;
1018
1126 old_width = szHint.width; 1019 old_width = szHint.width;
1127 old_height = szHint.height; 1020 old_height = szHint.height;
1128
1129 /* sub-window placement & size in rxvt_resize_subwindows () */
1130
1131#ifdef PREFER_24BIT
1132 attributes.background_pixel = pix_colors[Color_bg];
1133 attributes.border_pixel = pix_colors[Color_border];
1134 attributes.colormap = display->cmap;
1135 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1136 szHint.x, szHint.y,
1137 szHint.width, szHint.height,
1138 TermWin.ext_bwidth,
1139 display->depth, InputOutput,
1140 display->visual,
1141 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1142#else
1143 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1144 szHint.x, szHint.y,
1145 szHint.width, szHint.height,
1146 TermWin.ext_bwidth,
1147 pix_colors[Color_border],
1148 pix_colors[Color_bg]);
1149#endif
1150 1021
1151 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1022 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1152 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1023 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1153 1024
1154 classHint.res_name = (char *)rs[Rs_name]; 1025 classHint.res_name = (char *)rs[Rs_name];
1155 classHint.res_class = (char *)RESCLASS; 1026 classHint.res_class = (char *)RESCLASS;
1156 1027
1157 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1028 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1158 wmHint.input = True; 1029 wmHint.input = True;
1159 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1030 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1160 wmHint.window_group = TermWin.parent[0]; 1031 wmHint.window_group = top;
1161 1032
1162 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1033 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1163 (char **)argv, argc, &szHint, &wmHint, &classHint); 1034 &szHint, &wmHint, &classHint);
1164 1035
1165#if ENABLE_FRILLS 1036 Atom protocols[] = {
1037 xa[XA_WM_DELETE_WINDOW],
1038#if ENABLE_EWMH
1039 xa[XA_NET_WM_PING],
1040#endif
1041 };
1042
1043 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1044
1045#if ENABLE_EWMH
1166 long pid = getpid (); 1046 long pid = getpid ();
1167 XChangeProperty (display->display, TermWin.parent[0], 1047
1048 XChangeProperty (disp, top,
1168 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1049 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1169 PropModeReplace, (unsigned char *)&pid, 1); 1050 PropModeReplace, (unsigned char *)&pid, 1);
1170#endif
1171 1051
1172 XSelectInput (display->display, TermWin.parent[0], 1052 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1053#endif
1054
1055 XSelectInput (disp, top,
1173 KeyPressMask 1056 KeyPressMask
1174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1057#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1175 | KeyReleaseMask 1058 | KeyReleaseMask
1176#endif 1059#endif
1177 | FocusChangeMask | VisibilityChangeMask 1060 | FocusChangeMask | VisibilityChangeMask
1178 | ExposureMask
1179 | StructureNotifyMask); 1061 | ExposureMask | StructureNotifyMask);
1062
1180 termwin_ev.start (display, TermWin.parent[0]); 1063 termwin_ev.start (display, top);
1181 1064
1182#if ENABLE_FRILLS 1065#if ENABLE_FRILLS
1183 if (mwmhints.flags) 1066 if (mwmhints.flags)
1184 { 1067 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1185 prop = XInternAtom(display->display, "_MOTIF_WM_HINTS", False); 1068 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1186 XChangeProperty(display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
1187 }
1188#endif 1069#endif
1189 1070
1190 /* vt cursor: Black-on-White is standard, but this is more popular */ 1071 /* vt cursor: Black-on-White is standard, but this is more popular */
1191 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1072 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1192 1073
1193#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1074#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1194 /* cursor (menuBar/scrollBar): Black-on-White */ 1075 /* cursor (menuBar/scrollBar): Black-on-White */
1195 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1076 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1196#endif
1197
1198#ifdef POINTER_BLANK
1199 {
1200 XColor blackcolour;
1201 blackcolour.red = 0;
1202 blackcolour.green = 0;
1203 blackcolour.blue = 0;
1204 Font f = XLoadFont (display->display, "fixed");
1205 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1206 &blackcolour, &blackcolour);
1207 XUnloadFont (display->display, f);
1208 }
1209#endif 1077#endif
1210 1078
1211 /* the vt window */ 1079 /* the vt window */
1212 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1080 TermWin.vt = XCreateSimpleWindow (disp, top,
1213 window_vt_x, 1081 window_vt_x,
1214 window_vt_y, 1082 window_vt_y,
1215 TermWin_TotalWidth (), 1083 TermWin_TotalWidth (),
1216 TermWin_TotalHeight (), 1084 TermWin_TotalHeight (),
1217 0, 1085 0,
1218 pix_colors[Color_fg], 1086 pix_colors_focused[Color_fg],
1219 pix_colors[Color_bg]); 1087 pix_colors_focused[Color_bg]);
1220#ifdef DEBUG_X 1088#ifdef DEBUG_X
1221 XStoreName (display->display, TermWin.vt, "vt window"); 1089 XStoreName (disp, TermWin.vt, "vt window");
1222#endif 1090#endif
1223 1091
1224 attributes.bit_gravity = NorthWestGravity; 1092 attributes.bit_gravity = NorthWestGravity;
1225 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1093 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1226 1094
1227 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1095 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1228
1229 pointer_unblank ();
1230 1096
1231#ifdef POINTER_BLANK 1097#ifdef POINTER_BLANK
1232 if (options & Opt_pointerBlank) 1098 if (options & Opt_pointerBlank)
1233 vt_emask |= PointerMotionMask; 1099 vt_emask |= PointerMotionMask;
1234 else 1100 else
1235#endif 1101#endif
1236 vt_emask |= Button1MotionMask | Button3MotionMask; 1102 vt_emask |= Button1MotionMask | Button3MotionMask;
1237 1103
1238 XSelectInput (display->display, TermWin.vt, vt_emask); 1104 XSelectInput (disp, TermWin.vt, vt_emask);
1239 vt_ev.start (display, TermWin.vt); 1105 vt_ev.start (display, TermWin.vt);
1240 1106
1241#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1107#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1242 if (menuBar_height ()) 1108 if (menuBar_height ())
1243 { 1109 {
1244 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1110 menuBar.win = XCreateSimpleWindow (disp, top,
1245 window_vt_x, 0, 1111 window_vt_x, 0,
1246 TermWin_TotalWidth (), 1112 TermWin_TotalWidth (),
1247 menuBar_TotalHeight (), 1113 menuBar_TotalHeight (),
1248 0, 1114 0,
1249 pix_colors[Color_fg], 1115 pix_colors_focused[Color_fg],
1250 pix_colors[Color_scroll]); 1116 pix_colors_focused[Color_scroll]);
1251 1117
1252#ifdef DEBUG_X 1118#ifdef DEBUG_X
1253 XStoreName (display->display, menuBar.win, "menubar"); 1119 XStoreName (disp, menuBar.win, "menubar");
1254#endif 1120#endif
1255 1121
1256 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1122 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1257 1123
1258 XDefineCursor (display->display, menuBar.win, 1124 XDefineCursor (disp, menuBar.win,
1259 XCreateFontCursor (display->display, XC_left_ptr)); 1125 XCreateFontCursor (disp, XC_left_ptr));
1260 1126
1261 XSelectInput (display->display, menuBar.win, 1127 XSelectInput (disp, menuBar.win,
1262 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1128 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1263 | Button1MotionMask));
1264 menubar_ev.start (display, menuBar.win); 1129 menubar_ev.start (display, menuBar.win);
1265 } 1130 }
1266#endif 1131#endif
1267 1132
1268#ifdef XPM_BACKGROUND 1133#ifdef XPM_BACKGROUND
… …
1274 if ((p = strchr (p, ';')) != NULL) 1139 if ((p = strchr (p, ';')) != NULL)
1275 { 1140 {
1276 p++; 1141 p++;
1277 scale_pixmap (p); 1142 scale_pixmap (p);
1278 } 1143 }
1144
1279 set_bgPixmap (rs[Rs_backgroundPixmap]); 1145 set_bgPixmap (rs[Rs_backgroundPixmap]);
1280 scr_touch (True); 1146 scr_touch (true);
1281 } 1147 }
1282#endif 1148#endif
1283 1149
1284 /* graphics context for the vt window */ 1150 /* graphics context for the vt window */
1285 gcvalue.foreground = pix_colors[Color_fg]; 1151 gcvalue.foreground = pix_colors[Color_fg];
1286 gcvalue.background = pix_colors[Color_bg]; 1152 gcvalue.background = pix_colors[Color_bg];
1287 gcvalue.graphics_exposures = 1; 1153 gcvalue.graphics_exposures = 1;
1288 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1154 TermWin.gc = XCreateGC (disp, TermWin.vt,
1289 GCForeground | GCBackground | GCGraphicsExposures, 1155 GCForeground | GCBackground | GCGraphicsExposures,
1290 &gcvalue); 1156 &gcvalue);
1291 1157
1292 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1158 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1293 1159
1294#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1160#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1295 gcvalue.foreground = pix_colors[Color_topShadow]; 1161 gcvalue.foreground = pix_colors[Color_topShadow];
1296 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1162 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1297 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1163 gcvalue.foreground = pix_colors[Color_bottomShadow];
1298 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1164 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1299 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1165 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1300 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1166 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1301#endif 1167#endif
1302 1168
1303#ifdef OFF_FOCUS_FADING 1169#ifdef OFF_FOCUS_FADING
1304 // initially we are in unfocused state 1170 // initially we are in unfocused state
1305 if (rs[Rs_fade]) 1171 if (rs[Rs_fade])
1306 pix_colors = pix_colors_unfocused; 1172 pix_colors = pix_colors_unfocused;
1173#endif
1174
1175 pointer_unblank ();
1176 scr_recolour ();
1177
1178#if ENABLE_XEMBED
1179 if (rs[Rs_embed])
1180 {
1181 long info[2] = { 0, XEMBED_MAPPED };
1182
1183 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1184 32, PropModeReplace, (unsigned char *)&info, 2);
1185 }
1307#endif 1186#endif
1308} 1187}
1309 1188
1310/* ------------------------------------------------------------------------- * 1189/* ------------------------------------------------------------------------- *
1311 * GET TTY CURRENT STATE * 1190 * GET TTY CURRENT STATE *
… …
1326 tio->c_cc[VKILL] = CKILL; 1205 tio->c_cc[VKILL] = CKILL;
1327 tio->c_cc[VSTART] = CSTART; 1206 tio->c_cc[VSTART] = CSTART;
1328 tio->c_cc[VSTOP] = CSTOP; 1207 tio->c_cc[VSTOP] = CSTOP;
1329 tio->c_cc[VSUSP] = CSUSP; 1208 tio->c_cc[VSUSP] = CSUSP;
1330# ifdef VDSUSP 1209# ifdef VDSUSP
1331
1332 tio->c_cc[VDSUSP] = CDSUSP; 1210 tio->c_cc[VDSUSP] = CDSUSP;
1333# endif 1211# endif
1334# ifdef VREPRINT 1212# ifdef VREPRINT
1335
1336 tio->c_cc[VREPRINT] = CRPRNT; 1213 tio->c_cc[VREPRINT] = CRPRNT;
1337# endif 1214# endif
1338# ifdef VDISCRD 1215# ifdef VDISCRD
1339
1340 tio->c_cc[VDISCRD] = CFLUSH; 1216 tio->c_cc[VDISCRD] = CFLUSH;
1341# endif 1217# endif
1342# ifdef VWERSE 1218# ifdef VWERSE
1343
1344 tio->c_cc[VWERSE] = CWERASE; 1219 tio->c_cc[VWERSE] = CWERASE;
1345# endif 1220# endif
1346# ifdef VLNEXT 1221# ifdef VLNEXT
1347
1348 tio->c_cc[VLNEXT] = CLNEXT; 1222 tio->c_cc[VLNEXT] = CLNEXT;
1349# endif 1223# endif
1350
1351 } 1224 }
1225
1352 tio->c_cc[VEOF] = CEOF; 1226 tio->c_cc[VEOF] = CEOF;
1353 tio->c_cc[VEOL] = VDISABLE; 1227 tio->c_cc[VEOL] = VDISABLE;
1354# ifdef VEOL2 1228# ifdef VEOL2
1355
1356 tio->c_cc[VEOL2] = VDISABLE; 1229 tio->c_cc[VEOL2] = VDISABLE;
1357# endif 1230# endif
1358# ifdef VSWTC 1231# ifdef VSWTC
1359
1360 tio->c_cc[VSWTC] = VDISABLE; 1232 tio->c_cc[VSWTC] = VDISABLE;
1361# endif 1233# endif
1362# ifdef VSWTCH 1234# ifdef VSWTCH
1363
1364 tio->c_cc[VSWTCH] = VDISABLE; 1235 tio->c_cc[VSWTCH] = VDISABLE;
1365# endif 1236# endif
1366# if VMIN != VEOF 1237# if VMIN != VEOF
1367
1368 tio->c_cc[VMIN] = 1; 1238 tio->c_cc[VMIN] = 1;
1369# endif 1239# endif
1370# if VTIME != VEOL 1240# if VTIME != VEOL
1371
1372 tio->c_cc[VTIME] = 0; 1241 tio->c_cc[VTIME] = 0;
1373# endif 1242# endif
1374 1243
1375 if (erase != -1) 1244 if (erase != -1)
1376 tio->c_cc[VERASE] = (char)erase; 1245 tio->c_cc[VERASE] = (char)erase;
… …
1404 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1273 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1405 { 1274 {
1406 tio->sg.sg_erase = CERASE; /* ^H */ 1275 tio->sg.sg_erase = CERASE; /* ^H */
1407 tio->sg.sg_kill = CKILL; /* ^U */ 1276 tio->sg.sg_kill = CKILL; /* ^U */
1408 } 1277 }
1278
1409 if (erase != -1) 1279 if (erase != -1)
1410 tio->sg.sg_erase = (char)erase; 1280 tio->sg.sg_erase = (char)erase;
1411 1281
1412 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1282 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1413 1283
… …
1419 tio->tc.t_startc = CSTART; /* ^Q */ 1289 tio->tc.t_startc = CSTART; /* ^Q */
1420 tio->tc.t_stopc = CSTOP; /* ^S */ 1290 tio->tc.t_stopc = CSTOP; /* ^S */
1421 tio->tc.t_eofc = CEOF; /* ^D */ 1291 tio->tc.t_eofc = CEOF; /* ^D */
1422 tio->tc.t_brkc = -1; 1292 tio->tc.t_brkc = -1;
1423 } 1293 }
1294
1424 /* get local special chars */ 1295 /* get local special chars */
1425 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1296 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1426 { 1297 {
1427 tio->lc.t_suspc = CSUSP; /* ^Z */ 1298 tio->lc.t_suspc = CSUSP; /* ^Z */
1428 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1299 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1432 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1303 tio->lc.t_lnextc = CLNEXT; /* ^V */
1433 } 1304 }
1434 /* get line discipline */ 1305 /* get line discipline */
1435 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1306 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1436# ifdef NTTYDISC 1307# ifdef NTTYDISC
1437
1438 tio->line = NTTYDISC; 1308 tio->line = NTTYDISC;
1439# endif /* NTTYDISC */ 1309# endif /* NTTYDISC */
1440 1310
1441 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1311 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1442#endif /* HAVE_TERMIOS_H */ 1312#endif /* HAVE_TERMIOS_H */
… …
1465 FOO (IGNCR, "IGNCR"); 1335 FOO (IGNCR, "IGNCR");
1466 FOO (ICRNL, "ICRNL"); 1336 FOO (ICRNL, "ICRNL");
1467 FOO (IXON, "IXON"); 1337 FOO (IXON, "IXON");
1468 FOO (IXOFF, "IXOFF"); 1338 FOO (IXOFF, "IXOFF");
1469# ifdef IUCLC 1339# ifdef IUCLC
1470
1471 FOO (IUCLC, "IUCLC"); 1340 FOO (IUCLC, "IUCLC");
1472# endif 1341# endif
1473# ifdef IXANY 1342# ifdef IXANY
1474
1475 FOO (IXANY, "IXANY"); 1343 FOO (IXANY, "IXANY");
1476# endif 1344# endif
1477# ifdef IMAXBEL 1345# ifdef IMAXBEL
1478
1479 FOO (IMAXBEL, "IMAXBEL"); 1346 FOO (IMAXBEL, "IMAXBEL");
1480# endif 1347# endif
1481 1348
1482 fprintf (stderr, "\n"); 1349 fprintf (stderr, "\n");
1483 1350
… …
1490 FOO (VERASE, "VERASE"); 1357 FOO (VERASE, "VERASE");
1491 FOO (VKILL, "VKILL"); 1358 FOO (VKILL, "VKILL");
1492 FOO (VEOF, "VEOF"); 1359 FOO (VEOF, "VEOF");
1493 FOO (VEOL, "VEOL"); 1360 FOO (VEOL, "VEOL");
1494# ifdef VEOL2 1361# ifdef VEOL2
1495
1496 FOO (VEOL2, "VEOL2"); 1362 FOO (VEOL2, "VEOL2");
1497# endif 1363# endif
1498# ifdef VSWTC 1364# ifdef VSWTC
1499
1500 FOO (VSWTC, "VSWTC"); 1365 FOO (VSWTC, "VSWTC");
1501# endif 1366# endif
1502# ifdef VSWTCH 1367# ifdef VSWTCH
1503
1504 FOO (VSWTCH, "VSWTCH"); 1368 FOO (VSWTCH, "VSWTCH");
1505# endif 1369# endif
1506
1507 FOO (VSTART, "VSTART"); 1370 FOO (VSTART, "VSTART");
1508 FOO (VSTOP, "VSTOP"); 1371 FOO (VSTOP, "VSTOP");
1509 FOO (VSUSP, "VSUSP"); 1372 FOO (VSUSP, "VSUSP");
1510# ifdef VDSUSP 1373# ifdef VDSUSP
1511
1512 FOO (VDSUSP, "VDSUSP"); 1374 FOO (VDSUSP, "VDSUSP");
1513# endif 1375# endif
1514# ifdef VREPRINT 1376# ifdef VREPRINT
1515
1516 FOO (VREPRINT, "VREPRINT"); 1377 FOO (VREPRINT, "VREPRINT");
1517# endif 1378# endif
1518# ifdef VDISCRD 1379# ifdef VDISCRD
1519
1520 FOO (VDISCRD, "VDISCRD"); 1380 FOO (VDISCRD, "VDISCRD");
1521# endif 1381# endif
1522# ifdef VWERSE 1382# ifdef VWERSE
1523
1524 FOO (VWERSE, "VWERSE"); 1383 FOO (VWERSE, "VWERSE");
1525# endif 1384# endif
1526# ifdef VLNEXT 1385# ifdef VLNEXT
1527
1528 FOO (VLNEXT, "VLNEXT"); 1386 FOO (VLNEXT, "VLNEXT");
1529# endif 1387# endif
1530 1388
1531 fprintf (stderr, "\n"); 1389 fprintf (stderr, "\n");
1532# undef FOO 1390# undef FOO
… …
1541 * the slave. 1399 * the slave.
1542 */ 1400 */
1543void 1401void
1544rxvt_term::run_command (const char *const *argv) 1402rxvt_term::run_command (const char *const *argv)
1545{ 1403{
1404#if ENABLE_FRILLS
1405 if (rs[Rs_pty_fd])
1406 {
1407 pty.pty = atoi (rs[Rs_pty_fd]);
1408 fcntl (pty.pty, F_SETFL, O_NONBLOCK);
1409 }
1410 else
1411#endif
1412 if (!pty.get ())
1413 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1414
1415 pty.set_utf8_mode (enc_utf8);
1416
1417 /* set initial window size */
1418 tt_winch ();
1419
1546 int er; 1420 int er;
1547
1548 if (!pty.get ())
1549 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1550 1421
1551#ifndef NO_BACKSPACE_KEY 1422#ifndef NO_BACKSPACE_KEY
1552 if (key_backspace[0] && !key_backspace[1]) 1423 if (key_backspace[0] && !key_backspace[1])
1553 er = key_backspace[0]; 1424 er = key_backspace[0];
1554 else if (strcmp (key_backspace, "DEC") == 0) 1425 else if (strcmp (key_backspace, "DEC") == 0)
… …
1557#endif 1428#endif
1558 er = -1; 1429 er = -1;
1559 1430
1560 rxvt_get_ttymode (&tio, er); 1431 rxvt_get_ttymode (&tio, er);
1561 1432
1562 /* set initial window size */ 1433#if ENABLE_FRILLS
1563 tt_winch (); 1434 if (rs[Rs_pty_fd])
1435 return;
1436#endif
1437
1438 sw_chld.start (SIGCHLD);
1564 1439
1565#ifndef __QNX__ 1440#ifndef __QNX__
1566 /* spin off the command interpreter */ 1441 /* spin off the command interpreter */
1567 switch (cmd_pid = fork ()) 1442 switch (cmd_pid = fork ())
1568 { 1443 {
1569 case -1: 1444 case -1:
1445 {
1446 cmd_pid = 0;
1570 rxvt_fatal ("can't fork, aborting.\n"); 1447 rxvt_fatal ("can't fork, aborting.\n");
1448 }
1571 case 0: 1449 case 0:
1572 init_env (); 1450 init_env ();
1573 1451
1574 if (!pty.make_controlling_tty ()) 1452 if (!pty.make_controlling_tty ())
1575 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1453 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);

Diff Legend

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