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.175 by root, Sat Jan 20 00:37:13 2007 UTC vs.
Revision 1.202 by sasha, Tue Aug 7 22:43:33 2007 UTC

… …
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "rgb:00/00/00", // 0: black (Black) 48 "rgb:00/00/00", // 0: black (Black)
49 "rgb:cd/00/00", // 1: red (Red3) 49 "rgb:cd/00/00", // 1: red (Red3)
50 "rgb:00/cd/00", // 2: green (Green3) 50 "rgb:00/cd/00", // 2: green (Green3)
51 "rgb:cd/cd/00", // 3: ywlloe (Yellow3) 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "rgb:00/00/cd", // 4: blue (Blue3) 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "rgb:cd/00/cd", // 5: magenta (Magenta3) 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "rgb:00/cd/cd", // 6: cyan (Cyan3) 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "rgb:e5/e5/e5", // 7: white (Grey90) 56 "rgb:e5/e5/e5", // 7: white (Grey90)
… …
166#endif 166#endif
167#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if ENABLE_TRANSPARENCY
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "rgb:00/00/00", 175 "rgb:00/00/00",
176#endif 176#endif
… …
183 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
184#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
186#endif 186#endif
187 187
188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
189 pixmap = None;
190#endif
191 188
192 MEvent.time = CurrentTime; 189 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 190 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 191 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 193 ncol = 80;
198 nrow = 24; 194 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 195 int_bwidth = INTERNALBORDERWIDTH;
200 ext_bwidth = EXTERNALBORDERWIDTH; 196 ext_bwidth = EXTERNALBORDERWIDTH;
201 lineSpace = LINESPACE; 197 lineSpace = LINESPACE;
202 saveLines = SAVELINES; 198 saveLines = SAVELINES;
203 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
204 200
205 refresh_limit = 1;
206 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
207 202
208 oldcursor.row = oldcursor.col = -1; 203 oldcursor.row = oldcursor.col = -1;
204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
209#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50; 210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
212 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
213#endif 215#endif
214 216
215 last_bot = last_state = -1; 217 last_bot = last_state = -1;
218
219 set_option (Opt_scrollBar);
220 set_option (Opt_scrollTtyOutput);
221 set_option (Opt_jumpScroll);
222 set_option (Opt_skipScroll);
223 set_option (Opt_secondaryScreen);
224 set_option (Opt_secondaryScroll);
225 set_option (Opt_pastableTabs);
226 set_option (Opt_intensityStyles);
227 set_option (Opt_iso14755_52);
216 228
217 return true; 229 return true;
218} 230}
219 231
220void 232void
… …
308#if XFT 320#if XFT
309 if (rs[Rs_depth]) 321 if (rs[Rs_depth])
310 select_visual (strtol (rs[Rs_depth], 0, 0)); 322 select_visual (strtol (rs[Rs_depth], 0, 0));
311#endif 323#endif
312 324
325#ifdef HAVE_AFTERIMAGE
326 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
327#endif
313 free (r_argv); 328 free (r_argv);
314 329
315 for (int i = NUM_RESOURCES; i--; ) 330 for (int i = NUM_RESOURCES; i--; )
316 if (rs [i] == resval_undef) 331 if (rs [i] == resval_undef)
317 rs [i] = 0; 332 rs [i] = 0;
… …
421 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 436 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
422#endif 437#endif
423 438
424#ifdef XTERM_REVERSE_VIDEO 439#ifdef XTERM_REVERSE_VIDEO
425 /* this is how xterm implements reverseVideo */ 440 /* this is how xterm implements reverseVideo */
426 if (OPTION (Opt_reverseVideo)) 441 if (option (Opt_reverseVideo))
427 { 442 {
428 if (!rs[Rs_color + Color_fg]) 443 if (!rs[Rs_color + Color_fg])
429 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 444 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
430 445
431 if (!rs[Rs_color + Color_bg]) 446 if (!rs[Rs_color + Color_bg])
… …
437 if (!rs[Rs_color + i]) 452 if (!rs[Rs_color + i])
438 rs[Rs_color + i] = def_colorName[i]; 453 rs[Rs_color + i] = def_colorName[i];
439 454
440#ifndef XTERM_REVERSE_VIDEO 455#ifndef XTERM_REVERSE_VIDEO
441 /* this is how we implement reverseVideo */ 456 /* this is how we implement reverseVideo */
442 if (OPTION (Opt_reverseVideo)) 457 if (option (Opt_reverseVideo))
443 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 458 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
444#endif 459#endif
445 460
446 /* convenient aliases for setting fg/bg to colors */ 461 /* convenient aliases for setting fg/bg to colors */
447 color_aliases (Color_fg); 462 color_aliases (Color_fg);
… …
621 * Initialize the command connection. 636 * Initialize the command connection.
622 * This should be called after the X server connection is established. 637 * This should be called after the X server connection is established.
623 */ 638 */
624 639
625#ifdef META8_OPTION 640#ifdef META8_OPTION
626 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 641 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
627#endif 642#endif
628 643
629 get_ourmods (); 644 get_ourmods ();
630 645
631 if (!OPTION (Opt_scrollTtyOutput)) 646 if (!option (Opt_scrollTtyOutput))
632 priv_modes |= PrivMode_TtyOutputInh; 647 priv_modes |= PrivMode_TtyOutputInh;
633 if (OPTION (Opt_scrollTtyKeypress)) 648 if (option (Opt_scrollTtyKeypress))
634 priv_modes |= PrivMode_Keypress; 649 priv_modes |= PrivMode_Keypress;
635 if (!OPTION (Opt_jumpScroll)) 650 if (!option (Opt_jumpScroll))
636 priv_modes |= PrivMode_smoothScroll; 651 priv_modes |= PrivMode_smoothScroll;
637 652
638#ifndef NO_BACKSPACE_KEY 653#ifndef NO_BACKSPACE_KEY
639 if (strcmp (key_backspace, "DEC") == 0) 654 if (strcmp (key_backspace, "DEC") == 0)
640 priv_modes |= PrivMode_HaveBackSpace; 655 priv_modes |= PrivMode_HaveBackSpace;
… …
670 rxvt_color xcol; 685 rxvt_color xcol;
671 686
672 if (!set_color (xcol, name)) 687 if (!set_color (xcol, name))
673 { 688 {
674#ifndef XTERM_REVERSE_VIDEO 689#ifndef XTERM_REVERSE_VIDEO
675 if (i < 2 && OPTION (Opt_reverseVideo)) 690 if (i < 2 && option (Opt_reverseVideo))
676 name = def_colorName [1 - i]; 691 name = def_colorName [1 - i];
677 else 692 else
678#endif 693#endif
679 name = def_colorName [i]; 694 name = def_colorName [i];
680 695
… …
871rxvt_term::create_windows (int argc, const char *const *argv) 886rxvt_term::create_windows (int argc, const char *const *argv)
872{ 887{
873 XClassHint classHint; 888 XClassHint classHint;
874 XWMHints wmHint; 889 XWMHints wmHint;
875#if ENABLE_FRILLS 890#if ENABLE_FRILLS
876 MWMHints mwmhints; 891 MWMHints mwmhints = { };
877#endif 892#endif
878 XGCValues gcvalue; 893 XGCValues gcvalue;
879 XSetWindowAttributes attributes; 894 XSetWindowAttributes attributes;
880 Window top, parent; 895 Window top, parent;
881 896
… …
887 if (!set_fonts ()) 902 if (!set_fonts ())
888 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 903 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
889 904
890 parent = display->root; 905 parent = display->root;
891 906
892 attributes.override_redirect = !!OPTION (Opt_override_redirect); 907 attributes.override_redirect = !!option (Opt_override_redirect);
893 908
894#if ENABLE_FRILLS 909#if ENABLE_FRILLS
895 if (OPTION (Opt_borderLess)) 910 if (option (Opt_borderLess))
896 { 911 {
897 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None) 912 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
898 { 913 {
899 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 914 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
900 attributes.override_redirect = true; 915 attributes.override_redirect = true;
… …
950 classHint.res_name = (char *)rs[Rs_name]; 965 classHint.res_name = (char *)rs[Rs_name];
951 classHint.res_class = (char *)RESCLASS; 966 classHint.res_class = (char *)RESCLASS;
952 967
953 wmHint.flags = InputHint | StateHint | WindowGroupHint; 968 wmHint.flags = InputHint | StateHint | WindowGroupHint;
954 wmHint.input = True; 969 wmHint.input = True;
955 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 970 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
956 wmHint.window_group = top; 971 wmHint.window_group = top;
957 972
958 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 973 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
959 &szHint, &wmHint, &classHint); 974 &szHint, &wmHint, &classHint);
960 975
… …
1017 attributes.bit_gravity = NorthWestGravity; 1032 attributes.bit_gravity = NorthWestGravity;
1018 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes); 1033 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1019 1034
1020 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1035 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1021 1036
1022 if (OPTION (Opt_pointerBlank)) 1037 if (option (Opt_pointerBlank))
1023 vt_emask |= PointerMotionMask; 1038 vt_emask |= PointerMotionMask;
1024 else 1039 else
1025 vt_emask |= Button1MotionMask | Button3MotionMask; 1040 vt_emask |= Button1MotionMask | Button3MotionMask;
1026 1041
1027 vt_select_input (); 1042 vt_select_input ();
1028 1043
1029 vt_ev.start (display, vt); 1044 vt_ev.start (display, vt);
1030 1045
1031#ifdef XPM_BACKGROUND 1046#ifdef XPM_BACKGROUND
1032 if (rs[Rs_backgroundPixmap] != NULL 1047 if (rs[Rs_backgroundPixmap] != NULL)
1033 && !OPTION (Opt_transparent))
1034 { 1048 {
1035 const char *p = rs[Rs_backgroundPixmap]; 1049 const char *p = rs[Rs_backgroundPixmap];
1036 1050
1037 if ((p = strchr (p, ';')) != NULL) 1051 if ((p = strchr (p, ';')) != NULL)
1038 { 1052 {
1039 p++; 1053 p++;
1040 scale_pixmap (p); 1054 bgPixmap.handle_geometry (p);
1041 } 1055 }
1056 else
1057 bgPixmap.set_defaultGeometry ();
1042 1058
1043 set_bgPixmap (rs[Rs_backgroundPixmap]); 1059 set_bgPixmap (rs[Rs_backgroundPixmap]);
1044 scr_touch (true); 1060 scr_touch (true);
1045 } 1061 }
1046#endif 1062#endif
… …
1079 * GET TTY CURRENT STATE * 1095 * GET TTY CURRENT STATE *
1080 * ------------------------------------------------------------------------- */ 1096 * ------------------------------------------------------------------------- */
1081void 1097void
1082rxvt_get_ttymode (ttymode_t *tio, int erase) 1098rxvt_get_ttymode (ttymode_t *tio, int erase)
1083{ 1099{
1084#ifdef HAVE_TERMIOS_H
1085 /* 1100 /*
1086 * standard System V termios interface 1101 * standard System V termios interface
1087 */ 1102 */
1088 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1103 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1089 { 1104 {
… …
1156 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1171 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1157# if defined (ECHOCTL) && defined (ECHOKE) 1172# if defined (ECHOCTL) && defined (ECHOKE)
1158 | ECHOCTL | ECHOKE 1173 | ECHOCTL | ECHOKE
1159# endif 1174# endif
1160 | ECHOE | ECHOK); 1175 | ECHOE | ECHOK);
1161# else /* HAVE_TERMIOS_H */
1162
1163 /*
1164 * sgtty interface
1165 */
1166
1167 /* get parameters -- gtty */
1168 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1169 {
1170 tio->sg.sg_erase = CERASE; /* ^H */
1171 tio->sg.sg_kill = CKILL; /* ^U */
1172 }
1173
1174 if (erase != -1)
1175 tio->sg.sg_erase = (char)erase;
1176
1177 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1178
1179 /* get special characters */
1180 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1181 {
1182 tio->tc.t_intrc = CINTR; /* ^C */
1183 tio->tc.t_quitc = CQUIT; /* ^\ */
1184 tio->tc.t_startc = CSTART; /* ^Q */
1185 tio->tc.t_stopc = CSTOP; /* ^S */
1186 tio->tc.t_eofc = CEOF; /* ^D */
1187 tio->tc.t_brkc = -1;
1188 }
1189
1190 /* get local special chars */
1191 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1192 {
1193 tio->lc.t_suspc = CSUSP; /* ^Z */
1194 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1195 tio->lc.t_rprntc = CRPRNT; /* ^R */
1196 tio->lc.t_flushc = CFLUSH; /* ^O */
1197 tio->lc.t_werasc = CWERASE; /* ^W */
1198 tio->lc.t_lnextc = CLNEXT; /* ^V */
1199 }
1200 /* get line discipline */
1201 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1202# ifdef NTTYDISC
1203 tio->line = NTTYDISC;
1204# endif /* NTTYDISC */
1205
1206 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1207#endif /* HAVE_TERMIOS_H */
1208 1176
1209 /* 1177 /*
1210 * Debugging 1178 * Debugging
1211 */ 1179 */
1212#ifdef DEBUG_TTYMODE 1180#ifdef DEBUG_TTYMODE
… …
1325 else 1293 else
1326#endif 1294#endif
1327 er = -1; 1295 er = -1;
1328 1296
1329 rxvt_get_ttymode (&tio, er); 1297 rxvt_get_ttymode (&tio, er);
1298 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1330 pty->set_utf8_mode (enc_utf8); 1299 pty->set_utf8_mode (enc_utf8);
1331 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1332 1300
1333 /* set initial window size */ 1301 /* set initial window size */
1334 tt_winch (); 1302 tt_winch ();
1335 1303
1336#if ENABLE_FRILLS 1304#if ENABLE_FRILLS
… …
1370 } 1338 }
1371 1339
1372 _exit (EXIT_FAILURE); 1340 _exit (EXIT_FAILURE);
1373 1341
1374 default: 1342 default:
1375 if (!OPTION (Opt_utmpInhibit)) 1343 if (!option (Opt_utmpInhibit))
1376 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1344 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1377 1345
1378 pty->close_tty (); 1346 pty->close_tty ();
1379 1347
1380 child_ev.start (cmd_pid); 1348 child_ev.start (cmd_pid);
1381 1349
… …
1394int 1362int
1395rxvt_term::run_child (const char *const *argv) 1363rxvt_term::run_child (const char *const *argv)
1396{ 1364{
1397 char *login; 1365 char *login;
1398 1366
1399 if (OPTION (Opt_console)) 1367 if (option (Opt_console))
1400 { /* be virtual console, fail silently */ 1368 { /* be virtual console, fail silently */
1401#ifdef TIOCCONS 1369#ifdef TIOCCONS
1402 unsigned int on = 1; 1370 unsigned int on = 1;
1403 1371
1404 ioctl (STDIN_FILENO, TIOCCONS, &on); 1372 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1453 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1421 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1454 shell = "/bin/sh"; 1422 shell = "/bin/sh";
1455 1423
1456 argv0 = (const char *)rxvt_r_basename (shell); 1424 argv0 = (const char *)rxvt_r_basename (shell);
1457 1425
1458 if (OPTION (Opt_loginShell)) 1426 if (option (Opt_loginShell))
1459 { 1427 {
1460 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1428 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1461 1429
1462 login[0] = '-'; 1430 login[0] = '-';
1463 strcpy (&login[1], argv0); 1431 strcpy (&login[1], argv0);

Diff Legend

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