1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*----------------------------------------------------------------------* |
2 | * File: init.C |
2 | * File: init.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * All portions of code are copyright by their respective author/s. |
5 | * All portions of code are copyright by their respective author/s. |
6 | * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> |
6 | * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> |
… | |
… | |
43 | const char *const def_colorName[] = |
43 | const char *const def_colorName[] = |
44 | { |
44 | { |
45 | COLOR_FOREGROUND, |
45 | COLOR_FOREGROUND, |
46 | COLOR_BACKGROUND, |
46 | COLOR_BACKGROUND, |
47 | /* low-intensity colors */ |
47 | /* low-intensity colors */ |
48 | "Black", /* 0: black (#000000) */ |
48 | "rgb:00/00/00", // 0: black (Black) |
49 | "Red3", /* 1: red (#CD0000) */ |
49 | "rgb:cd/00/00", // 1: red (Red3) |
50 | "Green3", /* 2: green (#00CD00) */ |
50 | "rgb:00/cd/00", // 2: green (Green3) |
51 | "Yellow3", /* 3: yellow (#CDCD00) */ |
51 | "rgb:cd/cd/00", // 3: yellow (Yellow3) |
52 | "Blue3", /* 4: blue (#0000CD) */ |
52 | "rgb:00/00/cd", // 4: blue (Blue3) |
53 | "Magenta3", /* 5: magenta (#CD00CD) */ |
53 | "rgb:cd/00/cd", // 5: magenta (Magenta3) |
54 | "Cyan3", /* 6: cyan (#00CDCD) */ |
54 | "rgb:00/cd/cd", // 6: cyan (Cyan3) |
55 | # ifdef XTERM_COLORS |
55 | # ifdef XTERM_COLORS |
56 | "Grey90", /* 7: white (#E5E5E5) */ |
56 | "rgb:e5/e5/e5", // 7: white (Grey90) |
57 | # else |
57 | # else |
58 | "AntiqueWhite", /* 7: white (#FAEBD7) */ |
58 | "rgb:fa/eb/d7", // 7: white (AntiqueWhite) |
59 | # endif |
59 | # endif |
60 | /* high-intensity colors */ |
60 | /* high-intensity colors */ |
61 | # ifdef XTERM_COLORS |
61 | # ifdef XTERM_COLORS |
62 | "Grey30", /* 8: bright black (#4D4D4D) */ |
62 | "rgb:4d/4d/4d", // 8: bright black (Grey30) |
63 | # else |
63 | # else |
64 | "Grey25", /* 8: bright black (#404040) */ |
64 | "rgb:40/40/40", // 8: bright black (Grey25) |
65 | # endif |
65 | # endif |
66 | "Red", /* 1/9: bright red (#FF0000) */ |
66 | "rgb:ff/00/00", // 1/9: bright red (Reed) |
67 | "Green", /* 2/10: bright green (#00FF00) */ |
67 | "rgb:00/ff/00", // 2/10: bright green (Green) |
68 | "Yellow", /* 3/11: bright yellow (#FFFF00) */ |
68 | "rgb:ff/ff/00", // 3/11: bright yellow (Yellow) |
69 | "Blue", /* 4/12: bright blue (#0000FF) */ |
69 | "rgb:00/00/ff", // 4/12: bright blue (Blue) |
70 | "Magenta", /* 5/13: bright magenta (#FF00FF) */ |
70 | "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) |
71 | "Cyan", /* 6/14: bright cyan (#00FFFF) */ |
71 | "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) |
72 | "White", /* 7/15: bright white (#FFFFFF) */ |
72 | "rgb:ff/ff/ff", // 7/15: bright white (White) |
73 | |
73 | |
74 | // 88 xterm colours |
74 | // 88 xterm colours |
75 | "rgb:00/00/00", |
75 | "rgb:00/00/00", |
76 | "rgb:00/00/8b", |
76 | "rgb:00/00/8b", |
77 | "rgb:00/00/cd", |
77 | "rgb:00/00/cd", |
… | |
… | |
170 | #endif /* KEEP_SCROLLCOLOR */ |
170 | #endif /* KEEP_SCROLLCOLOR */ |
171 | #if TINTING |
171 | #if TINTING |
172 | NULL, |
172 | NULL, |
173 | #endif |
173 | #endif |
174 | #if OFF_FOCUS_FADING |
174 | #if OFF_FOCUS_FADING |
175 | "black", |
175 | "rgb:00/00/00", |
176 | #endif |
|
|
177 | }; |
|
|
178 | |
|
|
179 | const char *const xa_names[] = |
|
|
180 | { |
|
|
181 | "TEXT", |
|
|
182 | "COMPOUND_TEXT", |
|
|
183 | "UTF8_STRING", |
|
|
184 | "MULTIPLE", |
|
|
185 | "TARGETS", |
|
|
186 | "TIMESTAMP", |
|
|
187 | "VT_SELECTION", |
|
|
188 | "INCR", |
|
|
189 | "WM_PROTOCOLS", |
|
|
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 |
|
|
204 | #ifdef TRANSPARENT |
|
|
205 | "_XROOTPMAP_ID", |
|
|
206 | "ESETROOT_PMAP_ID", |
|
|
207 | #endif |
|
|
208 | #ifdef OFFIX_DND |
|
|
209 | "DndProtocol", |
|
|
210 | "DndSelection", |
|
|
211 | #endif |
|
|
212 | #if ENABLE_XEMBED |
|
|
213 | "_XEMBED", |
|
|
214 | "_XEMBED_INFO", |
|
|
215 | #endif |
176 | #endif |
216 | }; |
177 | }; |
217 | |
178 | |
218 | bool |
179 | bool |
219 | rxvt_term::init_vars () |
180 | rxvt_term::init_vars () |
220 | { |
181 | { |
|
|
182 | pix_colors = // |
221 | pix_colors_focused = new rxvt_color [TOTAL_COLORS]; |
183 | pix_colors_focused = new rxvt_color [TOTAL_COLORS]; |
222 | #ifdef OFF_FOCUS_FADING |
184 | #ifdef OFF_FOCUS_FADING |
223 | pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; |
185 | pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; |
224 | #endif |
186 | #endif |
225 | pix_colors = pix_colors_focused; |
|
|
226 | |
187 | |
227 | if (pix_colors == NULL) |
|
|
228 | return false; |
|
|
229 | |
|
|
230 | #if defined(XPM_BACKGROUND) || defined(TRANSPARENT) |
188 | #if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY) |
231 | pixmap = None; |
189 | pixmap = None; |
232 | #endif |
190 | #endif |
233 | |
191 | |
234 | MEvent.time = CurrentTime; |
192 | MEvent.time = CurrentTime; |
235 | MEvent.button = AnyButton; |
193 | MEvent.button = AnyButton; |
236 | options = DEFAULT_OPTIONS; |
|
|
237 | want_refresh = 1; |
194 | want_refresh = 1; |
238 | priv_modes = SavedModes = PrivMode_Default; |
195 | priv_modes = SavedModes = PrivMode_Default; |
239 | focus = 0; |
|
|
240 | ncol = 80; |
196 | ncol = 80; |
241 | nrow = 24; |
197 | nrow = 24; |
242 | int_bwidth = INTERNALBORDERWIDTH; |
198 | int_bwidth = INTERNALBORDERWIDTH; |
243 | ext_bwidth = EXTERNALBORDERWIDTH; |
199 | ext_bwidth = EXTERNALBORDERWIDTH; |
244 | lineSpace = LINESPACE; |
200 | lineSpace = LINESPACE; |
245 | saveLines = SAVELINES; |
201 | saveLines = SAVELINES; |
246 | numpix_colors = TOTAL_COLORS; |
202 | numpix_colors = TOTAL_COLORS; |
247 | |
203 | |
248 | refresh_limit = 1; |
|
|
249 | refresh_type = SLOW_REFRESH; |
204 | refresh_type = SLOW_REFRESH; |
250 | prev_nrow = prev_ncol = 0; |
|
|
251 | |
205 | |
252 | oldcursor.row = oldcursor.col = -1; |
206 | oldcursor.row = oldcursor.col = -1; |
253 | #ifdef XPM_BACKGROUND |
207 | #ifdef XPM_BACKGROUND |
254 | /* bgPixmap.w = bgPixmap.h = 0; */ |
208 | /* bgPixmap.w = bgPixmap.h = 0; */ |
255 | bgPixmap.x = bgPixmap.y = 50; |
209 | bgPixmap.x = bgPixmap.y = 0; |
256 | bgPixmap.pixmap = None; |
210 | bgPixmap.pixmap = None; |
257 | #endif |
211 | #endif |
258 | |
212 | |
259 | last_bot = last_state = -1; |
213 | last_bot = last_state = -1; |
260 | |
214 | |
261 | #ifdef MENUBAR |
215 | set_option (Opt_scrollBar); |
262 | menu_readonly = 1; |
216 | set_option (Opt_scrollTtyOutput); |
263 | # if ! (MENUBAR_MAX > 1) |
217 | set_option (Opt_jumpScroll); |
264 | CurrentBar = &BarList; |
218 | set_option (Opt_skipScroll); |
265 | # endif /* (MENUBAR_MAX > 1) */ |
219 | set_option (Opt_secondaryScreen); |
266 | #endif |
220 | set_option (Opt_secondaryScroll); |
|
|
221 | set_option (Opt_pastableTabs); |
|
|
222 | set_option (Opt_intensityStyles); |
|
|
223 | set_option (Opt_iso14755_52); |
267 | |
224 | |
268 | return true; |
225 | return true; |
269 | } |
226 | } |
270 | |
227 | |
271 | void |
228 | void |
… | |
… | |
309 | int i, r_argc; |
266 | int i, r_argc; |
310 | char *val; |
267 | char *val; |
311 | const char **cmd_argv, **r_argv; |
268 | const char **cmd_argv, **r_argv; |
312 | |
269 | |
313 | /* |
270 | /* |
314 | * Look for -exec option. Find => split and make cmd_argv[] of command args |
271 | * Look for -e option. Find => split and make cmd_argv[] of command args |
315 | */ |
272 | */ |
316 | for (r_argc = 0; r_argc < argc; r_argc++) |
273 | for (r_argc = 0; r_argc < argc; r_argc++) |
317 | if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) |
274 | if (!strcmp (argv[r_argc], "-e")) |
318 | break; |
275 | break; |
319 | |
276 | |
320 | r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); |
277 | r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); |
321 | |
278 | |
322 | for (i = 0; i < r_argc; i++) |
279 | for (i = 0; i < r_argc; i++) |
… | |
… | |
348 | get_options (r_argc, r_argv); |
305 | get_options (r_argc, r_argv); |
349 | |
306 | |
350 | if (!(display = displays.get (rs[Rs_display_name]))) |
307 | if (!(display = displays.get (rs[Rs_display_name]))) |
351 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
308 | rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); |
352 | |
309 | |
|
|
310 | // using a local pointer decreases code size a lot |
|
|
311 | xa = display->xa; |
|
|
312 | |
|
|
313 | set (display); |
353 | extract_resources (); |
314 | extract_resources (); |
354 | |
315 | |
|
|
316 | #if XFT |
|
|
317 | if (rs[Rs_depth]) |
|
|
318 | select_visual (strtol (rs[Rs_depth], 0, 0)); |
|
|
319 | #endif |
|
|
320 | |
355 | free (r_argv); |
321 | free (r_argv); |
|
|
322 | |
|
|
323 | for (int i = NUM_RESOURCES; i--; ) |
|
|
324 | if (rs [i] == resval_undef) |
|
|
325 | rs [i] = 0; |
|
|
326 | |
|
|
327 | #if ENABLE_PERL |
|
|
328 | if (!rs[Rs_perl_ext_1]) |
|
|
329 | rs[Rs_perl_ext_1] = "default"; |
|
|
330 | |
|
|
331 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
|
|
332 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
|
|
333 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
|
|
334 | { |
|
|
335 | rxvt_perl.init (this); |
|
|
336 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
|
|
337 | } |
|
|
338 | #endif |
356 | |
339 | |
357 | /* |
340 | /* |
358 | * set any defaults not already set |
341 | * set any defaults not already set |
359 | */ |
342 | */ |
360 | if (cmd_argv && cmd_argv[0]) |
343 | if (cmd_argv && cmd_argv[0]) |
… | |
… | |
446 | setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); |
429 | setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); |
447 | #endif |
430 | #endif |
448 | |
431 | |
449 | #ifdef XTERM_REVERSE_VIDEO |
432 | #ifdef XTERM_REVERSE_VIDEO |
450 | /* this is how xterm implements reverseVideo */ |
433 | /* this is how xterm implements reverseVideo */ |
451 | if (OPTION (Opt_reverseVideo)) |
434 | if (option (Opt_reverseVideo)) |
452 | { |
435 | { |
453 | if (!rs[Rs_color + Color_fg]) |
436 | if (!rs[Rs_color + Color_fg]) |
454 | rs[Rs_color + Color_fg] = def_colorName[Color_bg]; |
437 | rs[Rs_color + Color_fg] = def_colorName[Color_bg]; |
|
|
438 | |
455 | if (!rs[Rs_color + Color_bg]) |
439 | if (!rs[Rs_color + Color_bg]) |
456 | rs[Rs_color + Color_bg] = def_colorName[Color_fg]; |
440 | rs[Rs_color + Color_bg] = def_colorName[Color_fg]; |
457 | } |
441 | } |
458 | #endif |
442 | #endif |
459 | |
443 | |
… | |
… | |
461 | if (!rs[Rs_color + i]) |
445 | if (!rs[Rs_color + i]) |
462 | rs[Rs_color + i] = def_colorName[i]; |
446 | rs[Rs_color + i] = def_colorName[i]; |
463 | |
447 | |
464 | #ifndef XTERM_REVERSE_VIDEO |
448 | #ifndef XTERM_REVERSE_VIDEO |
465 | /* this is how we implement reverseVideo */ |
449 | /* this is how we implement reverseVideo */ |
466 | if (OPTION (Opt_reverseVideo)) |
450 | if (option (Opt_reverseVideo)) |
467 | ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); |
451 | ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); |
468 | #endif |
452 | #endif |
469 | |
453 | |
470 | /* convenient aliases for setting fg/bg to colors */ |
454 | /* convenient aliases for setting fg/bg to colors */ |
471 | color_aliases (Color_fg); |
455 | color_aliases (Color_fg); |
… | |
… | |
511 | val = rxvt_network_display (rs[Rs_display_name]); |
495 | val = rxvt_network_display (rs[Rs_display_name]); |
512 | rs[Rs_display_name] = (const char *)val; |
496 | rs[Rs_display_name] = (const char *)val; |
513 | |
497 | |
514 | if (val == NULL) |
498 | if (val == NULL) |
515 | #endif /* DISPLAY_IS_IP */ |
499 | #endif /* DISPLAY_IS_IP */ |
516 | val = XDisplayString (display->display); |
500 | val = XDisplayString (dpy); |
517 | |
501 | |
518 | if (rs[Rs_display_name] == NULL) |
502 | if (rs[Rs_display_name] == NULL) |
519 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
503 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
520 | |
504 | |
521 | i = strlen (val); |
505 | i = strlen (val); |
522 | env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); |
506 | env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); |
523 | |
507 | |
524 | sprintf (env_display, "DISPLAY=%s", val); |
508 | sprintf (env_display, "DISPLAY=%s", val); |
525 | |
509 | |
526 | /* avoiding the math library: |
510 | sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); |
527 | * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */ |
|
|
528 | for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++) |
|
|
529 | ; |
|
|
530 | max_it (i, 1); |
|
|
531 | env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); |
|
|
532 | |
|
|
533 | sprintf (env_windowid, "WINDOWID=%u", |
|
|
534 | (unsigned int)parent[0]); |
|
|
535 | |
511 | |
536 | /* add entries to the environment: |
512 | /* add entries to the environment: |
537 | * @ DISPLAY: in case we started with -display |
513 | * @ DISPLAY: in case we started with -display |
538 | * @ WINDOWID: X window id number of the window |
514 | * @ WINDOWID: X window id number of the window |
539 | * @ COLORTERM: terminal sub-name and also indicates its color |
515 | * @ COLORTERM: terminal sub-name and also indicates its color |
… | |
… | |
541 | * @ TERMINFO: path to terminfo directory |
517 | * @ TERMINFO: path to terminfo directory |
542 | * @ COLORFGBG: fg;bg color codes |
518 | * @ COLORFGBG: fg;bg color codes |
543 | */ |
519 | */ |
544 | putenv (env_display); |
520 | putenv (env_display); |
545 | putenv (env_windowid); |
521 | putenv (env_windowid); |
|
|
522 | |
546 | if (env_colorfgbg) |
523 | if (env_colorfgbg) |
547 | putenv (env_colorfgbg); |
524 | putenv (env_colorfgbg); |
548 | |
525 | |
549 | #ifdef RXVT_TERMINFO |
526 | #ifdef RXVT_TERMINFO |
550 | putenv ("TERMINFO=" RXVT_TERMINFO); |
527 | putenv ("TERMINFO=" RXVT_TERMINFO); |
551 | #endif |
528 | #endif |
552 | |
529 | |
553 | if (display->depth <= 2) |
530 | if (depth <= 2) |
554 | putenv ("COLORTERM=" COLORTERMENV "-mono"); |
531 | putenv ("COLORTERM=" COLORTERMENV "-mono"); |
555 | else |
532 | else |
556 | putenv ("COLORTERM=" COLORTERMENVFULL); |
533 | putenv ("COLORTERM=" COLORTERMENVFULL); |
557 | |
534 | |
558 | if (rs[Rs_term_name] != NULL) |
535 | if (rs[Rs_term_name] != NULL) |
… | |
… | |
652 | * Initialize the command connection. |
629 | * Initialize the command connection. |
653 | * This should be called after the X server connection is established. |
630 | * This should be called after the X server connection is established. |
654 | */ |
631 | */ |
655 | |
632 | |
656 | #ifdef META8_OPTION |
633 | #ifdef META8_OPTION |
657 | meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; |
634 | meta_char = option (Opt_meta8) ? 0x80 : C0_ESC; |
658 | #endif |
635 | #endif |
659 | |
636 | |
660 | get_ourmods (); |
637 | get_ourmods (); |
661 | |
638 | |
662 | if (!OPTION (Opt_scrollTtyOutput)) |
639 | if (!option (Opt_scrollTtyOutput)) |
663 | priv_modes |= PrivMode_TtyOutputInh; |
640 | priv_modes |= PrivMode_TtyOutputInh; |
664 | if (OPTION (Opt_scrollTtyKeypress)) |
641 | if (option (Opt_scrollTtyKeypress)) |
665 | priv_modes |= PrivMode_Keypress; |
642 | priv_modes |= PrivMode_Keypress; |
666 | if (!OPTION (Opt_jumpScroll)) |
643 | if (!option (Opt_jumpScroll)) |
667 | priv_modes |= PrivMode_smoothScroll; |
644 | priv_modes |= PrivMode_smoothScroll; |
668 | |
645 | |
669 | #ifndef NO_BACKSPACE_KEY |
646 | #ifndef NO_BACKSPACE_KEY |
670 | if (strcmp (key_backspace, "DEC") == 0) |
647 | if (strcmp (key_backspace, "DEC") == 0) |
671 | priv_modes |= PrivMode_HaveBackSpace; |
648 | priv_modes |= PrivMode_HaveBackSpace; |
672 | #endif |
649 | #endif |
673 | |
650 | |
674 | /* add value for scrollBar */ |
651 | /* add value for scrollBar */ |
675 | if (scrollbar_visible ()) |
652 | if (scrollBar.state) |
676 | { |
653 | { |
677 | priv_modes |= PrivMode_scrollBar; |
654 | priv_modes |= PrivMode_scrollBar; |
678 | SavedModes |= PrivMode_scrollBar; |
655 | SavedModes |= PrivMode_scrollBar; |
679 | } |
|
|
680 | |
|
|
681 | if (menubar_visible ()) |
|
|
682 | { |
|
|
683 | priv_modes |= PrivMode_menuBar; |
|
|
684 | SavedModes |= PrivMode_menuBar; |
|
|
685 | } |
656 | } |
686 | |
657 | |
687 | run_command (argv); |
658 | run_command (argv); |
688 | } |
659 | } |
689 | |
660 | |
… | |
… | |
695 | |
666 | |
696 | #ifdef OFF_FOCUS_FADING |
667 | #ifdef OFF_FOCUS_FADING |
697 | pix_colors = pix_colors_focused; |
668 | pix_colors = pix_colors_focused; |
698 | #endif |
669 | #endif |
699 | |
670 | |
700 | for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) |
671 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
701 | { |
672 | { |
|
|
673 | const char *name = rs[Rs_color + i]; |
|
|
674 | |
|
|
675 | if (!name) |
|
|
676 | continue; |
|
|
677 | |
702 | rxvt_color xcol; |
678 | rxvt_color xcol; |
703 | |
679 | |
704 | if (!rs[Rs_color + i]) |
680 | if (!set_color (xcol, name)) |
705 | continue; |
|
|
706 | |
|
|
707 | if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) |
|
|
708 | { |
681 | { |
709 | #ifndef XTERM_REVERSE_VIDEO |
682 | #ifndef XTERM_REVERSE_VIDEO |
710 | if (i < 2 && OPTION (Opt_reverseVideo)) |
683 | if (i < 2 && option (Opt_reverseVideo)) |
711 | rs[Rs_color + i] = def_colorName[!i]; |
684 | name = def_colorName [1 - i]; |
712 | else |
685 | else |
713 | #endif |
686 | #endif |
714 | rs[Rs_color + i] = def_colorName[i]; |
687 | name = def_colorName [i]; |
715 | |
688 | |
716 | if (!rs[Rs_color + i]) |
689 | if (!name) |
717 | continue; |
690 | continue; |
718 | |
691 | |
719 | if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) |
692 | if (!set_color (xcol, name)) |
720 | { |
693 | { |
721 | switch (i) |
694 | switch (i) |
722 | { |
695 | { |
723 | case Color_fg: |
696 | case Color_fg: |
724 | case Color_bg: |
697 | case Color_bg: |
725 | /* fatal: need bg/fg color */ |
|
|
726 | rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); |
698 | rxvt_warn ("unable to get foreground/background colour, continuing.\n"); |
727 | /* NOTREACHED */ |
699 | name = ""; |
728 | break; |
700 | break; |
729 | #ifndef NO_CURSORCOLOR |
701 | #ifndef NO_CURSORCOLOR |
730 | case Color_cursor2: |
702 | case Color_cursor2: |
731 | xcol = pix_colors[Color_fg]; |
703 | #endif |
732 | break; |
|
|
733 | #endif /* ! NO_CURSORCOLOR */ |
|
|
734 | case Color_pointer_fg: |
704 | case Color_pointer_fg: |
735 | xcol = pix_colors[Color_fg]; |
705 | name = rs[Rs_color + Color_fg]; |
|
|
706 | xcol.set (this, name); |
736 | break; |
707 | break; |
737 | default: |
708 | default: |
738 | xcol = pix_colors[Color_bg]; /* None */ |
709 | name = rs[Rs_color + Color_bg]; |
|
|
710 | xcol.set (this, name); |
739 | break; |
711 | break; |
740 | } |
712 | } |
741 | } |
713 | } |
742 | } |
714 | } |
743 | |
715 | |
744 | pix_colors[i] = xcol; |
716 | pix_colors[i] = xcol; |
745 | SET_PIXCOLOR (i); |
717 | rs[Rs_color + i] = name; |
746 | } |
|
|
747 | |
|
|
748 | #ifdef OFF_FOCUS_FADING |
|
|
749 | if (rs[Rs_fade]) |
|
|
750 | for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) |
|
|
751 | pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]); |
|
|
752 | #endif |
|
|
753 | |
|
|
754 | if (display->depth <= 2) |
|
|
755 | { |
718 | } |
|
|
719 | |
|
|
720 | if (depth <= 2) |
|
|
721 | { |
756 | if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; |
722 | if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg); |
757 | if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; |
723 | if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg); |
758 | if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; |
724 | if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg); |
759 | } |
725 | } |
760 | |
726 | |
761 | /* |
727 | /* |
762 | * get scrollBar/menuBar shadow colors |
728 | * get scrollBar shadow colors |
763 | * |
729 | * |
764 | * The calculations of topShadow/bottomShadow values are adapted |
730 | * The calculations of topShadow/bottomShadow values are adapted |
765 | * from the fvwm window manager. |
731 | * from the fvwm window manager. |
766 | */ |
732 | */ |
767 | #ifdef KEEP_SCROLLCOLOR |
733 | #ifdef KEEP_SCROLLCOLOR |
768 | |
|
|
769 | if (display->depth <= 2) |
734 | if (depth <= 2) |
770 | { |
735 | { |
771 | /* Monochrome */ |
736 | /* Monochrome */ |
772 | pix_colors[Color_scroll] = pix_colors[Color_fg]; |
737 | alias_color (Color_scroll, Color_fg); |
773 | pix_colors[Color_topShadow] = pix_colors[Color_bg]; |
738 | alias_color (Color_topShadow, Color_bg); |
774 | pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; |
739 | alias_color (Color_bottomShadow, Color_bg); |
775 | } |
740 | } |
776 | else |
741 | else |
777 | { |
742 | { |
778 | rxvt_color xcol[2]; |
743 | pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); |
779 | /* xcol[0] == white |
|
|
780 | * xcol[1] == top shadow |
|
|
781 | * xcol[2] == bot shadow */ |
|
|
782 | |
744 | |
783 | xcol[1] = pix_colors[Color_scroll]; |
745 | rgba cscroll; |
784 | xcol[0].set (display, 65535, 65535, 65535); |
746 | pix_colors [Color_scroll].get (cscroll); |
785 | |
|
|
786 | unsigned short pr1, pg1, pb1, pr0, pg0, pb0; |
|
|
787 | |
|
|
788 | xcol[0].get (display, pr0, pg0, pb0); |
|
|
789 | xcol[1].get (display, pr1, pg1, pb1); |
|
|
790 | |
|
|
791 | pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50); |
|
|
792 | |
747 | |
793 | /* topShadowColor */ |
748 | /* topShadowColor */ |
794 | if (!xcol[1].set (display, |
749 | if (!pix_colors[Color_topShadow].set (this, |
795 | min (pr0, max (pr0 / 5, pr1) * 7 / 5), |
750 | rgba ( |
796 | min (pg0, max (pg0 / 5, pg1) * 7 / 5), |
751 | min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), |
797 | min (pb0, max (pb0 / 5, pb1) * 7 / 5))) |
752 | min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), |
798 | xcol[1] = pix_colors[Color_White]; |
753 | min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), |
799 | |
754 | cscroll.a) |
800 | pix_colors[Color_topShadow] = xcol[1]; |
755 | )) |
|
|
756 | alias_color (Color_topShadow, Color_White); |
801 | } |
757 | } |
802 | #endif /* KEEP_SCROLLCOLOR */ |
758 | #endif /* KEEP_SCROLLCOLOR */ |
|
|
759 | |
|
|
760 | #ifdef OFF_FOCUS_FADING |
|
|
761 | for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) |
|
|
762 | update_fade_color (i); |
|
|
763 | #endif |
803 | } |
764 | } |
804 | |
765 | |
805 | /*----------------------------------------------------------------------*/ |
766 | /*----------------------------------------------------------------------*/ |
806 | /* color aliases, fg/bg bright-bold */ |
767 | /* color aliases, fg/bg bright-bold */ |
807 | void |
768 | void |
… | |
… | |
846 | |
807 | |
847 | if (rsmod |
808 | if (rsmod |
848 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
809 | && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) |
849 | requestedmeta = rsmod[3] - '0'; |
810 | requestedmeta = rsmod[3] - '0'; |
850 | |
811 | |
851 | map = XGetModifierMapping (display->display); |
812 | map = XGetModifierMapping (dpy); |
852 | kc = map->modifiermap; |
813 | kc = map->modifiermap; |
853 | |
814 | |
854 | for (i = 1; i < 6; i++) |
815 | for (i = 1; i < 6; i++) |
855 | { |
816 | { |
856 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
817 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
… | |
… | |
858 | for (j = map->max_keypermod; j--; k++) |
819 | for (j = map->max_keypermod; j--; k++) |
859 | { |
820 | { |
860 | if (kc[k] == 0) |
821 | if (kc[k] == 0) |
861 | break; |
822 | break; |
862 | |
823 | |
863 | switch (XKeycodeToKeysym (display->display, kc[k], 0)) |
824 | switch (XKeycodeToKeysym (dpy, kc[k], 0)) |
864 | { |
825 | { |
865 | case XK_Num_Lock: |
826 | case XK_Num_Lock: |
866 | ModNumLockMask = modmasks[i - 1]; |
827 | ModNumLockMask = modmasks[i - 1]; |
867 | continue; |
828 | continue; |
868 | |
829 | |
… | |
… | |
918 | rxvt_term::create_windows (int argc, const char *const *argv) |
879 | rxvt_term::create_windows (int argc, const char *const *argv) |
919 | { |
880 | { |
920 | XClassHint classHint; |
881 | XClassHint classHint; |
921 | XWMHints wmHint; |
882 | XWMHints wmHint; |
922 | #if ENABLE_FRILLS |
883 | #if ENABLE_FRILLS |
923 | Atom prop = None; |
|
|
924 | MWMHints mwmhints; |
884 | MWMHints mwmhints; |
925 | #endif |
885 | #endif |
926 | XGCValues gcvalue; |
886 | XGCValues gcvalue; |
927 | long vt_emask; |
|
|
928 | XSetWindowAttributes attributes; |
887 | XSetWindowAttributes attributes; |
929 | XWindowAttributes gattr; |
|
|
930 | Window top, parent; |
888 | Window top, parent; |
931 | dDisp; |
|
|
932 | |
889 | |
933 | #ifdef USING_W11LIB |
890 | dLocal (Display *, dpy); |
934 | /* enable W11 callbacks */ |
|
|
935 | W11AddEventHandler (disp, rxvt_W11_process_x_event); |
|
|
936 | #endif |
|
|
937 | |
891 | |
938 | assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); |
892 | /* grab colors before netscape does */ |
939 | XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); |
893 | Get_Colours (); |
940 | |
894 | |
941 | if (OPTION (Opt_transparent)) |
895 | if (!set_fonts ()) |
942 | { |
896 | rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); |
943 | XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); |
897 | |
944 | display->depth = gattr.depth; // doh //TODO, per-term not per-display? |
898 | parent = display->root; |
945 | } |
899 | |
|
|
900 | attributes.override_redirect = !!option (Opt_override_redirect); |
946 | |
901 | |
947 | #if ENABLE_FRILLS |
902 | #if ENABLE_FRILLS |
948 | if (OPTION (Opt_borderLess)) |
903 | if (option (Opt_borderLess)) |
949 | { |
904 | { |
950 | prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); |
905 | if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) |
951 | |
|
|
952 | if (prop == None) |
|
|
953 | { |
906 | { |
954 | /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ |
907 | /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ |
955 | #ifdef PREFER_24BIT |
|
|
956 | attributes.override_redirect = TRUE; |
908 | attributes.override_redirect = true; |
957 | #endif |
|
|
958 | mwmhints.flags = 0; |
909 | mwmhints.flags = 0; |
959 | } |
910 | } |
960 | else |
911 | else |
961 | { |
912 | { |
962 | mwmhints.flags = MWM_HINTS_DECORATIONS; |
913 | mwmhints.flags = MWM_HINTS_DECORATIONS; |
… | |
… | |
965 | } |
916 | } |
966 | else |
917 | else |
967 | mwmhints.flags = 0; |
918 | mwmhints.flags = 0; |
968 | #endif |
919 | #endif |
969 | |
920 | |
970 | /* grab colors before netscape does */ |
|
|
971 | Get_Colours (); |
|
|
972 | |
|
|
973 | if (!set_fonts ()) |
|
|
974 | rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); |
|
|
975 | |
|
|
976 | parent = DefaultRootWindow (disp); |
|
|
977 | |
|
|
978 | #if ENABLE_XEMBED |
921 | #if ENABLE_XEMBED |
979 | if (rs[Rs_embed]) |
922 | if (rs[Rs_embed]) |
980 | { |
923 | { |
981 | XWindowAttributes wattr; |
924 | XWindowAttributes wattr; |
982 | |
925 | |
983 | parent = strtol (rs[Rs_embed], 0, 0); |
926 | parent = strtol (rs[Rs_embed], 0, 0); |
984 | |
927 | |
985 | if (!XGetWindowAttributes (disp, parent, &wattr)) |
928 | if (!XGetWindowAttributes (dpy, parent, &wattr)) |
986 | rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); |
929 | rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); |
987 | |
930 | |
988 | window_calc (wattr.width, wattr.height); |
931 | window_calc (wattr.width, wattr.height); |
989 | } |
932 | } |
990 | #endif |
933 | #endif |
991 | |
934 | |
992 | window_calc (0, 0); |
935 | window_calc (0, 0); |
993 | |
936 | |
994 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
937 | /* sub-window placement & size in rxvt_resize_subwindows () */ |
995 | #ifdef PREFER_24BIT |
|
|
996 | attributes.background_pixel = pix_colors_focused[Color_border]; |
938 | attributes.background_pixel = pix_colors_focused [Color_border]; |
997 | attributes.border_pixel = pix_colors_focused[Color_border]; |
939 | attributes.border_pixel = pix_colors_focused [Color_border]; |
998 | attributes.colormap = display->cmap; |
940 | attributes.colormap = cmap; |
|
|
941 | |
999 | top = XCreateWindow (disp, parent, |
942 | top = XCreateWindow (dpy, parent, |
1000 | szHint.x, szHint.y, |
943 | szHint.x, szHint.y, |
1001 | szHint.width, szHint.height, |
944 | szHint.width, szHint.height, |
1002 | ext_bwidth, |
945 | ext_bwidth, |
1003 | display->depth, InputOutput, |
946 | depth, InputOutput, visual, |
1004 | display->visual, |
|
|
1005 | CWColormap | CWBackPixel | CWBorderPixel, &attributes); |
947 | CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, |
1006 | #else |
948 | &attributes); |
1007 | top = XCreateSimpleWindow (disp, parent, |
|
|
1008 | szHint.x, szHint.y, |
|
|
1009 | szHint.width, szHint.height, |
|
|
1010 | ext_bwidth, |
|
|
1011 | pix_colors_focused[Color_border], |
|
|
1012 | pix_colors_focused[Color_border]); |
|
|
1013 | #endif |
|
|
1014 | |
949 | |
1015 | this->parent[0] = top; |
950 | this->parent[0] = top; |
1016 | |
951 | |
1017 | old_width = szHint.width; |
952 | old_width = szHint.width; |
1018 | old_height = szHint.height; |
953 | old_height = szHint.height; |
1019 | |
954 | |
1020 | process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); |
955 | process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); |
1021 | process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); |
956 | process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); |
1022 | |
957 | |
1023 | classHint.res_name = (char *)rs[Rs_name]; |
958 | classHint.res_name = (char *)rs[Rs_name]; |
1024 | classHint.res_class = (char *)RESCLASS; |
959 | classHint.res_class = (char *)RESCLASS; |
1025 | |
960 | |
1026 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
961 | wmHint.flags = InputHint | StateHint | WindowGroupHint; |
1027 | wmHint.input = True; |
962 | wmHint.input = True; |
1028 | wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; |
963 | wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; |
1029 | wmHint.window_group = top; |
964 | wmHint.window_group = top; |
1030 | |
965 | |
1031 | XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, |
966 | XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, |
1032 | &szHint, &wmHint, &classHint); |
967 | &szHint, &wmHint, &classHint); |
|
|
968 | |
|
|
969 | #if ENABLE_FRILLS |
|
|
970 | if (mwmhints.flags) |
|
|
971 | XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, |
|
|
972 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
|
|
973 | #endif |
1033 | |
974 | |
1034 | Atom protocols[] = { |
975 | Atom protocols[] = { |
1035 | xa[XA_WM_DELETE_WINDOW], |
976 | xa[XA_WM_DELETE_WINDOW], |
1036 | #if ENABLE_EWMH |
977 | #if ENABLE_EWMH |
1037 | xa[XA_NET_WM_PING], |
978 | xa[XA_NET_WM_PING], |
1038 | #endif |
979 | #endif |
1039 | }; |
980 | }; |
1040 | |
981 | |
1041 | XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
982 | XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); |
1042 | |
983 | |
1043 | #if ENABLE_FRILLS |
984 | #if ENABLE_FRILLS |
1044 | if (rs[Rs_transient_for]) |
985 | if (rs[Rs_transient_for]) |
1045 | XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
986 | XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); |
1046 | #endif |
987 | #endif |
1047 | |
988 | |
1048 | #if ENABLE_EWMH |
989 | #if ENABLE_EWMH |
1049 | long pid = getpid (); |
990 | long pid = getpid (); |
1050 | |
991 | |
1051 | XChangeProperty (disp, top, |
992 | XChangeProperty (dpy, top, |
1052 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
993 | xa[XA_NET_WM_PID], XA_CARDINAL, 32, |
1053 | PropModeReplace, (unsigned char *)&pid, 1); |
994 | PropModeReplace, (unsigned char *)&pid, 1); |
1054 | |
995 | |
1055 | // _NET_WM_WINDOW_TYPE is NORMAL, which is the default |
996 | // _NET_WM_WINDOW_TYPE is NORMAL, which is the default |
1056 | #endif |
997 | #endif |
1057 | |
998 | |
1058 | XSelectInput (disp, top, |
999 | XSelectInput (dpy, top, |
1059 | KeyPressMask |
1000 | KeyPressMask |
1060 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
1001 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 |
1061 | | KeyReleaseMask |
1002 | | KeyReleaseMask |
1062 | #endif |
1003 | #endif |
1063 | | FocusChangeMask | VisibilityChangeMask |
1004 | | FocusChangeMask | VisibilityChangeMask |
1064 | | ExposureMask | StructureNotifyMask); |
1005 | | ExposureMask | StructureNotifyMask); |
1065 | |
1006 | |
1066 | termwin_ev.start (display, top); |
1007 | termwin_ev.start (display, top); |
1067 | |
1008 | |
1068 | #if ENABLE_FRILLS |
|
|
1069 | if (mwmhints.flags) |
|
|
1070 | XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, |
|
|
1071 | PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); |
|
|
1072 | #endif |
|
|
1073 | |
|
|
1074 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1009 | /* vt cursor: Black-on-White is standard, but this is more popular */ |
1075 | TermWin_cursor = XCreateFontCursor (disp, XC_xterm); |
1010 | TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); |
1076 | |
1011 | |
1077 | #if defined(HAVE_SCROLLBARS) || defined(MENUBAR) |
1012 | #ifdef HAVE_SCROLLBARS |
1078 | /* cursor (menuBar/scrollBar): Black-on-White */ |
1013 | /* cursor scrollBar: Black-on-White */ |
1079 | leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); |
1014 | leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr); |
1080 | #endif |
1015 | #endif |
1081 | |
1016 | |
1082 | /* the vt window */ |
1017 | /* the vt window */ |
1083 | vt = XCreateSimpleWindow (disp, top, |
1018 | vt = XCreateSimpleWindow (dpy, top, |
1084 | window_vt_x, |
|
|
1085 | window_vt_y, |
1019 | window_vt_x, window_vt_y, |
1086 | width, |
|
|
1087 | height, |
1020 | width, height, |
1088 | 0, |
1021 | 0, |
1089 | pix_colors_focused[Color_fg], |
1022 | pix_colors_focused[Color_fg], |
1090 | pix_colors_focused[Color_bg]); |
1023 | pix_colors_focused[Color_bg]); |
1091 | #ifdef DEBUG_X |
|
|
1092 | XStoreName (disp, vt, "vt window"); |
|
|
1093 | #endif |
|
|
1094 | |
1024 | |
1095 | attributes.bit_gravity = NorthWestGravity; |
1025 | attributes.bit_gravity = NorthWestGravity; |
1096 | XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); |
1026 | XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); |
1097 | |
1027 | |
1098 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1028 | vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; |
1099 | |
1029 | |
1100 | if (OPTION (Opt_pointerBlank) |
1030 | if (option (Opt_pointerBlank)) |
1101 | #ifdef ENABLE_PERL |
|
|
1102 | || perl.self |
|
|
1103 | #endif |
|
|
1104 | ) |
|
|
1105 | vt_emask |= PointerMotionMask; |
1031 | vt_emask |= PointerMotionMask; |
1106 | else |
1032 | else |
1107 | vt_emask |= Button1MotionMask | Button3MotionMask; |
1033 | vt_emask |= Button1MotionMask | Button3MotionMask; |
1108 | |
1034 | |
1109 | XSelectInput (disp, vt, vt_emask); |
1035 | vt_select_input (); |
|
|
1036 | |
1110 | vt_ev.start (display, vt); |
1037 | vt_ev.start (display, vt); |
1111 | |
|
|
1112 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
|
|
1113 | if (menuBar_height ()) |
|
|
1114 | { |
|
|
1115 | menuBar.win = XCreateSimpleWindow (disp, top, |
|
|
1116 | window_vt_x, 0, |
|
|
1117 | width, |
|
|
1118 | menuBar_TotalHeight (), |
|
|
1119 | 0, |
|
|
1120 | pix_colors_focused[Color_fg], |
|
|
1121 | pix_colors_focused[Color_scroll]); |
|
|
1122 | |
|
|
1123 | #ifdef DEBUG_X |
|
|
1124 | XStoreName (disp, menuBar.win, "menubar"); |
|
|
1125 | #endif |
|
|
1126 | |
|
|
1127 | menuBar.drawable = new rxvt_drawable (display, menuBar.win); |
|
|
1128 | |
|
|
1129 | XDefineCursor (disp, menuBar.win, |
|
|
1130 | XCreateFontCursor (disp, XC_left_ptr)); |
|
|
1131 | |
|
|
1132 | XSelectInput (disp, menuBar.win, |
|
|
1133 | (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask)); |
|
|
1134 | menubar_ev.start (display, menuBar.win); |
|
|
1135 | } |
|
|
1136 | #endif |
|
|
1137 | |
1038 | |
1138 | #ifdef XPM_BACKGROUND |
1039 | #ifdef XPM_BACKGROUND |
1139 | if (rs[Rs_backgroundPixmap] != NULL |
1040 | if (rs[Rs_backgroundPixmap] != NULL |
|
|
1041 | #ifndef HAVE_AFTERIMAGE |
1140 | && ! OPTION (Opt_transparent)) |
1042 | && !option (Opt_transparent) |
|
|
1043 | #endif |
|
|
1044 | ) |
1141 | { |
1045 | { |
1142 | const char *p = rs[Rs_backgroundPixmap]; |
1046 | const char *p = rs[Rs_backgroundPixmap]; |
1143 | |
1047 | |
1144 | if ((p = strchr (p, ';')) != NULL) |
1048 | if ((p = strchr (p, ';')) != NULL) |
1145 | { |
1049 | { |
… | |
… | |
1151 | scr_touch (true); |
1055 | scr_touch (true); |
1152 | } |
1056 | } |
1153 | #endif |
1057 | #endif |
1154 | |
1058 | |
1155 | /* graphics context for the vt window */ |
1059 | /* graphics context for the vt window */ |
1156 | gcvalue.foreground = pix_colors[Color_fg]; |
1060 | gcvalue.foreground = pix_colors[Color_fg]; |
1157 | gcvalue.background = pix_colors[Color_bg]; |
1061 | gcvalue.background = pix_colors[Color_bg]; |
1158 | gcvalue.graphics_exposures = 1; |
1062 | gcvalue.graphics_exposures = 0; |
|
|
1063 | |
1159 | gc = XCreateGC (disp, vt, |
1064 | gc = XCreateGC (dpy, vt, |
1160 | GCForeground | GCBackground | GCGraphicsExposures, |
1065 | GCForeground | GCBackground | GCGraphicsExposures, |
1161 | &gcvalue); |
1066 | &gcvalue); |
1162 | |
1067 | |
1163 | drawable = new rxvt_drawable (display, vt); |
1068 | drawable = new rxvt_drawable (this, vt); |
1164 | |
1069 | |
1165 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
1070 | #ifdef RXVT_SCROLLBAR |
1166 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1071 | gcvalue.foreground = pix_colors[Color_topShadow]; |
1167 | topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1072 | topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); |
1168 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1073 | gcvalue.foreground = pix_colors[Color_bottomShadow]; |
1169 | botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1074 | botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); |
1170 | gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; |
1075 | gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)]; |
1171 | scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); |
1076 | scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue); |
1172 | #endif |
1077 | #endif |
1173 | |
1078 | |
1174 | #ifdef OFF_FOCUS_FADING |
1079 | #ifdef OFF_FOCUS_FADING |
1175 | // initially we are in unfocused state |
1080 | // initially we are in unfocused state |
1176 | if (rs[Rs_fade]) |
1081 | if (rs[Rs_fade]) |
1177 | pix_colors = pix_colors_unfocused; |
1082 | pix_colors = pix_colors_unfocused; |
1178 | #endif |
1083 | #endif |
1179 | |
1084 | |
1180 | pointer_unblank (); |
1085 | pointer_unblank (); |
1181 | scr_recolour (); |
1086 | scr_recolour (); |
1182 | |
|
|
1183 | #if ENABLE_XEMBED |
|
|
1184 | if (rs[Rs_embed]) |
|
|
1185 | { |
|
|
1186 | long info[2] = { 0, XEMBED_MAPPED }; |
|
|
1187 | |
|
|
1188 | XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], |
|
|
1189 | 32, PropModeReplace, (unsigned char *)&info, 2); |
|
|
1190 | } |
|
|
1191 | #endif |
|
|
1192 | } |
1087 | } |
1193 | |
1088 | |
1194 | /* ------------------------------------------------------------------------- * |
1089 | /* ------------------------------------------------------------------------- * |
1195 | * GET TTY CURRENT STATE * |
1090 | * GET TTY CURRENT STATE * |
1196 | * ------------------------------------------------------------------------- */ |
1091 | * ------------------------------------------------------------------------- */ |
1197 | void |
1092 | void |
1198 | rxvt_get_ttymode (ttymode_t *tio, int erase) |
1093 | rxvt_get_ttymode (ttymode_t *tio, int erase) |
1199 | { |
1094 | { |
1200 | #ifdef HAVE_TERMIOS_H |
|
|
1201 | /* |
1095 | /* |
1202 | * standard System V termios interface |
1096 | * standard System V termios interface |
1203 | */ |
1097 | */ |
1204 | if (GET_TERMIOS (STDIN_FILENO, tio) < 0) |
1098 | if (GET_TERMIOS (STDIN_FILENO, tio) < 0) |
1205 | { |
1099 | { |
… | |
… | |
1272 | tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO |
1166 | tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO |
1273 | # if defined (ECHOCTL) && defined (ECHOKE) |
1167 | # if defined (ECHOCTL) && defined (ECHOKE) |
1274 | | ECHOCTL | ECHOKE |
1168 | | ECHOCTL | ECHOKE |
1275 | # endif |
1169 | # endif |
1276 | | ECHOE | ECHOK); |
1170 | | ECHOE | ECHOK); |
1277 | # else /* HAVE_TERMIOS_H */ |
|
|
1278 | |
|
|
1279 | /* |
|
|
1280 | * sgtty interface |
|
|
1281 | */ |
|
|
1282 | |
|
|
1283 | /* get parameters -- gtty */ |
|
|
1284 | if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) |
|
|
1285 | { |
|
|
1286 | tio->sg.sg_erase = CERASE; /* ^H */ |
|
|
1287 | tio->sg.sg_kill = CKILL; /* ^U */ |
|
|
1288 | } |
|
|
1289 | |
|
|
1290 | if (erase != -1) |
|
|
1291 | tio->sg.sg_erase = (char)erase; |
|
|
1292 | |
|
|
1293 | tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); |
|
|
1294 | |
|
|
1295 | /* get special characters */ |
|
|
1296 | if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0) |
|
|
1297 | { |
|
|
1298 | tio->tc.t_intrc = CINTR; /* ^C */ |
|
|
1299 | tio->tc.t_quitc = CQUIT; /* ^\ */ |
|
|
1300 | tio->tc.t_startc = CSTART; /* ^Q */ |
|
|
1301 | tio->tc.t_stopc = CSTOP; /* ^S */ |
|
|
1302 | tio->tc.t_eofc = CEOF; /* ^D */ |
|
|
1303 | tio->tc.t_brkc = -1; |
|
|
1304 | } |
|
|
1305 | |
|
|
1306 | /* get local special chars */ |
|
|
1307 | if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) |
|
|
1308 | { |
|
|
1309 | tio->lc.t_suspc = CSUSP; /* ^Z */ |
|
|
1310 | tio->lc.t_dsuspc = CDSUSP; /* ^Y */ |
|
|
1311 | tio->lc.t_rprntc = CRPRNT; /* ^R */ |
|
|
1312 | tio->lc.t_flushc = CFLUSH; /* ^O */ |
|
|
1313 | tio->lc.t_werasc = CWERASE; /* ^W */ |
|
|
1314 | tio->lc.t_lnextc = CLNEXT; /* ^V */ |
|
|
1315 | } |
|
|
1316 | /* get line discipline */ |
|
|
1317 | ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); |
|
|
1318 | # ifdef NTTYDISC |
|
|
1319 | tio->line = NTTYDISC; |
|
|
1320 | # endif /* NTTYDISC */ |
|
|
1321 | |
|
|
1322 | tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); |
|
|
1323 | #endif /* HAVE_TERMIOS_H */ |
|
|
1324 | |
1171 | |
1325 | /* |
1172 | /* |
1326 | * Debugging |
1173 | * Debugging |
1327 | */ |
1174 | */ |
1328 | #ifdef DEBUG_TTYMODE |
1175 | #ifdef DEBUG_TTYMODE |
… | |
… | |
1413 | rxvt_term::run_command (const char *const *argv) |
1260 | rxvt_term::run_command (const char *const *argv) |
1414 | { |
1261 | { |
1415 | #if ENABLE_FRILLS |
1262 | #if ENABLE_FRILLS |
1416 | if (rs[Rs_pty_fd]) |
1263 | if (rs[Rs_pty_fd]) |
1417 | { |
1264 | { |
1418 | pty.pty = atoi (rs[Rs_pty_fd]); |
1265 | pty->pty = atoi (rs[Rs_pty_fd]); |
1419 | |
1266 | |
1420 | if (pty.pty >= 0) |
1267 | if (pty->pty >= 0) |
1421 | { |
1268 | { |
1422 | if (getfd_hook) |
1269 | if (getfd_hook) |
1423 | pty.pty = (*getfd_hook) (pty.pty); |
1270 | pty->pty = (*getfd_hook) (pty->pty); |
1424 | |
1271 | |
1425 | if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) |
1272 | if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) |
1426 | rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); |
1273 | rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); |
1427 | } |
1274 | } |
1428 | } |
1275 | } |
1429 | else |
1276 | else |
1430 | #endif |
1277 | #endif |
1431 | if (!pty.get ()) |
1278 | if (!pty->get ()) |
1432 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1279 | rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); |
1433 | |
|
|
1434 | pty.set_utf8_mode (enc_utf8); |
|
|
1435 | |
|
|
1436 | /* set initial window size */ |
|
|
1437 | tt_winch (); |
|
|
1438 | |
1280 | |
1439 | int er; |
1281 | int er; |
1440 | |
1282 | |
1441 | #ifndef NO_BACKSPACE_KEY |
1283 | #ifndef NO_BACKSPACE_KEY |
1442 | if (key_backspace[0] && !key_backspace[1]) |
1284 | if (key_backspace[0] && !key_backspace[1]) |
… | |
… | |
1446 | else |
1288 | else |
1447 | #endif |
1289 | #endif |
1448 | er = -1; |
1290 | er = -1; |
1449 | |
1291 | |
1450 | rxvt_get_ttymode (&tio, er); |
1292 | rxvt_get_ttymode (&tio, er); |
|
|
1293 | SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */ |
|
|
1294 | pty->set_utf8_mode (enc_utf8); |
|
|
1295 | |
|
|
1296 | /* set initial window size */ |
|
|
1297 | tt_winch (); |
1451 | |
1298 | |
1452 | #if ENABLE_FRILLS |
1299 | #if ENABLE_FRILLS |
1453 | if (rs[Rs_pty_fd]) |
1300 | if (rs[Rs_pty_fd]) |
1454 | return; |
1301 | return; |
1455 | #endif |
1302 | #endif |
1456 | |
1303 | |
1457 | #ifndef __QNX__ |
|
|
1458 | /* spin off the command interpreter */ |
1304 | /* spin off the command interpreter */ |
1459 | switch (cmd_pid = fork ()) |
1305 | switch (cmd_pid = fork ()) |
1460 | { |
1306 | { |
1461 | case -1: |
1307 | case -1: |
1462 | { |
1308 | { |
… | |
… | |
1464 | rxvt_fatal ("can't fork, aborting.\n"); |
1310 | rxvt_fatal ("can't fork, aborting.\n"); |
1465 | } |
1311 | } |
1466 | case 0: |
1312 | case 0: |
1467 | init_env (); |
1313 | init_env (); |
1468 | |
1314 | |
1469 | if (!pty.make_controlling_tty ()) |
1315 | if (!pty->make_controlling_tty ()) |
1470 | fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); |
1316 | fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); |
1471 | else |
1317 | else |
1472 | { |
1318 | { |
1473 | /* Reopen stdin, stdout and stderr over the tty file descriptor */ |
1319 | /* Reopen stdin, stdout and stderr over the tty file descriptor */ |
1474 | dup2 (pty.tty, STDIN_FILENO); |
1320 | dup2 (pty->tty, STDIN_FILENO); |
1475 | dup2 (pty.tty, STDOUT_FILENO); |
1321 | dup2 (pty->tty, STDOUT_FILENO); |
1476 | dup2 (pty.tty, STDERR_FILENO); |
1322 | dup2 (pty->tty, STDERR_FILENO); |
1477 | |
1323 | |
1478 | // close all our file handles that we do no longer need |
1324 | // close all our file handles that we do no longer need |
1479 | for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) |
1325 | for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) |
1480 | { |
1326 | { |
1481 | if ((*t)->pty.pty > 2) close ((*t)->pty.pty); |
1327 | if ((*t)->pty->pty > 2) close ((*t)->pty->pty); |
1482 | if ((*t)->pty.tty > 2) close ((*t)->pty.tty); |
1328 | if ((*t)->pty->tty > 2) close ((*t)->pty->tty); |
1483 | } |
1329 | } |
1484 | |
1330 | |
1485 | run_child (argv); |
1331 | run_child (argv); |
1486 | fprintf (stderr, "%s: unable to exec child.", RESNAME); |
1332 | fprintf (stderr, "%s: unable to exec child.", RESNAME); |
1487 | } |
1333 | } |
1488 | |
1334 | |
1489 | _exit (EXIT_FAILURE); |
1335 | _exit (EXIT_FAILURE); |
1490 | |
1336 | |
1491 | default: |
1337 | default: |
1492 | { |
1338 | if (!option (Opt_utmpInhibit)) |
1493 | #if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) |
1339 | pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); |
1494 | int fdstdin; |
|
|
1495 | |
1340 | |
1496 | fdstdin = dup (STDIN_FILENO); |
1341 | pty->close_tty (); |
1497 | dup2 (pty.tty, STDIN_FILENO); |
|
|
1498 | #endif |
|
|
1499 | |
1342 | |
1500 | #ifdef UTMP_SUPPORT |
1343 | child_ev.start (cmd_pid); |
1501 | privileged_utmp (SAVE); |
|
|
1502 | #endif |
|
|
1503 | |
1344 | |
1504 | #if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) |
1345 | HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END)); |
1505 | |
|
|
1506 | dup2 (fdstdin, STDIN_FILENO); |
|
|
1507 | close (fdstdin); |
|
|
1508 | #endif |
|
|
1509 | } |
|
|
1510 | |
|
|
1511 | pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */ |
|
|
1512 | break; |
1346 | break; |
1513 | } |
1347 | } |
1514 | #else /* __QNX__ uses qnxspawn () */ |
|
|
1515 | fchmod (pty.tty, 0622); |
|
|
1516 | fcntl (pty.tty, F_SETFD, FD_CLOEXEC); |
|
|
1517 | fcntl (pty.pty, F_SETFD, FD_CLOEXEC); |
|
|
1518 | |
|
|
1519 | if (run_child (argv) == -1) |
|
|
1520 | exit (EXIT_FAILURE); |
|
|
1521 | #endif |
|
|
1522 | } |
1348 | } |
1523 | |
1349 | |
1524 | /* ------------------------------------------------------------------------- * |
1350 | /* ------------------------------------------------------------------------- * |
1525 | * CHILD PROCESS OPERATIONS * |
1351 | * CHILD PROCESS OPERATIONS * |
1526 | * ------------------------------------------------------------------------- */ |
1352 | * ------------------------------------------------------------------------- */ |
… | |
… | |
1531 | int |
1357 | int |
1532 | rxvt_term::run_child (const char *const *argv) |
1358 | rxvt_term::run_child (const char *const *argv) |
1533 | { |
1359 | { |
1534 | char *login; |
1360 | char *login; |
1535 | |
1361 | |
1536 | SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ |
|
|
1537 | |
|
|
1538 | if (OPTION (Opt_console)) |
1362 | if (option (Opt_console)) |
1539 | { /* be virtual console, fail silently */ |
1363 | { /* be virtual console, fail silently */ |
1540 | #ifdef TIOCCONS |
1364 | #ifdef TIOCCONS |
1541 | unsigned int on = 1; |
1365 | unsigned int on = 1; |
1542 | |
1366 | |
1543 | ioctl (STDIN_FILENO, TIOCCONS, &on); |
1367 | ioctl (STDIN_FILENO, TIOCCONS, &on); |
… | |
… | |
1570 | // unblock signals (signals are blocked by iom.C |
1394 | // unblock signals (signals are blocked by iom.C |
1571 | sigset_t ss; |
1395 | sigset_t ss; |
1572 | sigemptyset (&ss); |
1396 | sigemptyset (&ss); |
1573 | sigprocmask (SIG_SETMASK, &ss, 0); |
1397 | sigprocmask (SIG_SETMASK, &ss, 0); |
1574 | |
1398 | |
1575 | #ifndef __QNX__ |
|
|
1576 | /* command interpreter path */ |
1399 | /* command interpreter path */ |
1577 | if (argv != NULL) |
1400 | if (argv != NULL) |
1578 | { |
1401 | { |
1579 | # ifdef DEBUG_CMD |
1402 | # ifdef DEBUG_CMD |
1580 | int i; |
1403 | int i; |
… | |
… | |
1593 | if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') |
1416 | if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') |
1594 | shell = "/bin/sh"; |
1417 | shell = "/bin/sh"; |
1595 | |
1418 | |
1596 | argv0 = (const char *)rxvt_r_basename (shell); |
1419 | argv0 = (const char *)rxvt_r_basename (shell); |
1597 | |
1420 | |
1598 | if (OPTION (Opt_loginShell)) |
1421 | if (option (Opt_loginShell)) |
1599 | { |
1422 | { |
1600 | login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); |
1423 | login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); |
1601 | |
1424 | |
1602 | login[0] = '-'; |
1425 | login[0] = '-'; |
1603 | strcpy (&login[1], argv0); |
1426 | strcpy (&login[1], argv0); |
… | |
… | |
1606 | |
1429 | |
1607 | execlp (shell, argv0, NULL); |
1430 | execlp (shell, argv0, NULL); |
1608 | /* no error message: STDERR is closed! */ |
1431 | /* no error message: STDERR is closed! */ |
1609 | } |
1432 | } |
1610 | |
1433 | |
1611 | #else /* __QNX__ uses qnxspawn () */ |
|
|
1612 | |
|
|
1613 | char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; |
|
|
1614 | char *command = NULL, fullcommand[_MAX_PATH]; |
|
|
1615 | char **arg_v, *arg_a[2] = { NULL, NULL }; |
|
|
1616 | |
|
|
1617 | if (argv != NULL) |
|
|
1618 | { |
|
|
1619 | if (access (argv[0], X_OK) == -1) |
|
|
1620 | { |
|
|
1621 | if (strchr (argv[0], '/') == NULL) |
|
|
1622 | { |
|
|
1623 | searchenv (argv[0], "PATH", fullcommand); |
|
|
1624 | |
|
|
1625 | if (fullcommand[0] != '\0') |
|
|
1626 | command = fullcommand; |
|
|
1627 | } |
|
|
1628 | |
|
|
1629 | if (access (command, X_OK) == -1) |
|
|
1630 | return -1; |
|
|
1631 | } |
|
|
1632 | else |
|
|
1633 | command = argv[0]; |
|
|
1634 | |
|
|
1635 | arg_v = argv; |
|
|
1636 | } |
|
|
1637 | else |
|
|
1638 | { |
|
|
1639 | if ((command = getenv ("SHELL")) == NULL || *command == '\0') |
|
|
1640 | command = "/bin/sh"; |
|
|
1641 | |
|
|
1642 | arg_a[0] = my_basename (command); |
|
|
1643 | |
|
|
1644 | if (OPTION (Opt_loginShell)) |
|
|
1645 | { |
|
|
1646 | login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); |
|
|
1647 | |
|
|
1648 | login[0] = '-'; |
|
|
1649 | strcpy (&login[1], arg_a[0]); |
|
|
1650 | arg_a[0] = login; |
|
|
1651 | } |
|
|
1652 | |
|
|
1653 | arg_v = arg_a; |
|
|
1654 | } |
|
|
1655 | |
|
|
1656 | iov_a[0] = iov_a[1] = iov_a[2] = pty.tty; |
|
|
1657 | cmd_pid = qnx_spawn (0, 0, 0, -1, -1, |
|
|
1658 | _SPAWN_SETSID | _SPAWN_TCSETPGRP, |
|
|
1659 | command, arg_v, environ, iov_a, 0); |
|
|
1660 | if (login) |
|
|
1661 | free (login); |
|
|
1662 | |
|
|
1663 | pty.close_tty (); |
|
|
1664 | return pty.pty; |
|
|
1665 | #endif |
|
|
1666 | |
|
|
1667 | return -1; |
1434 | return -1; |
1668 | } |
1435 | } |
1669 | |
1436 | |
1670 | /*----------------------- end-of-file (C source) -----------------------*/ |
1437 | /*----------------------- end-of-file (C source) -----------------------*/ |