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.169 by root, Thu Feb 2 18:04:46 2006 UTC vs.
Revision 1.181 by ayin, Tue May 1 21:10:04 2007 UTC

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>
… …
189 pixmap = None; 189 pixmap = None;
190#endif 190#endif
191 191
192 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
193 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
194 options = DEFAULT_OPTIONS;
195 want_refresh = 1; 194 want_refresh = 1;
196 priv_modes = SavedModes = PrivMode_Default; 195 priv_modes = SavedModes = PrivMode_Default;
197 ncol = 80; 196 ncol = 80;
198 nrow = 24; 197 nrow = 24;
199 int_bwidth = INTERNALBORDERWIDTH; 198 int_bwidth = INTERNALBORDERWIDTH;
… …
206 refresh_type = SLOW_REFRESH; 205 refresh_type = SLOW_REFRESH;
207 206
208 oldcursor.row = oldcursor.col = -1; 207 oldcursor.row = oldcursor.col = -1;
209#ifdef XPM_BACKGROUND 208#ifdef XPM_BACKGROUND
210 /* bgPixmap.w = bgPixmap.h = 0; */ 209 /* bgPixmap.w = bgPixmap.h = 0; */
211 bgPixmap.x = bgPixmap.y = 50; 210 bgPixmap.x = bgPixmap.y = 0;
212 bgPixmap.pixmap = None; 211 bgPixmap.pixmap = None;
213#endif 212#endif
214 213
215 last_bot = last_state = -1; 214 last_bot = last_state = -1;
215
216 set_option (Opt_scrollBar, 1);
217 set_option (Opt_scrollTtyOutput, 1);
218 set_option (Opt_jumpScroll, 1);
219 set_option (Opt_secondaryScreen, 1);
220 set_option (Opt_secondaryScroll, 1);
221 set_option (Opt_pastableTabs, 1);
222 set_option (Opt_intensityStyles, 1);
216 223
217 return true; 224 return true;
218} 225}
219 226
220void 227void
… …
258 int i, r_argc; 265 int i, r_argc;
259 char *val; 266 char *val;
260 const char **cmd_argv, **r_argv; 267 const char **cmd_argv, **r_argv;
261 268
262 /* 269 /*
263 * Look for -exec option. Find => split and make cmd_argv[] of command args 270 * Look for -e option. Find => split and make cmd_argv[] of command args
264 */ 271 */
265 for (r_argc = 0; r_argc < argc; r_argc++) 272 for (r_argc = 0; r_argc < argc; r_argc++)
266 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 273 if (!strcmp (argv[r_argc], "-e"))
267 break; 274 break;
268 275
269 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 276 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
270 277
271 for (i = 0; i < r_argc; i++) 278 for (i = 0; i < r_argc; i++)
… …
300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 307 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
301 308
302 // using a local pointer decreases code size a lot 309 // using a local pointer decreases code size a lot
303 xa = display->xa; 310 xa = display->xa;
304 311
312 set (display);
313 extract_resources ();
314
305#if XFT 315#if XFT
306 if (rs[Rs_depth]) 316 if (rs[Rs_depth])
307 set (display, strtol (rs[Rs_depth], 0, 0)); 317 select_visual (strtol (rs[Rs_depth], 0, 0));
308 else
309#endif 318#endif
310 set (display);
311
312 extract_resources ();
313 319
314 free (r_argv); 320 free (r_argv);
315 321
316 for (int i = NUM_RESOURCES; i--; ) 322 for (int i = NUM_RESOURCES; i--; )
317 if (rs [i] == resval_undef) 323 if (rs [i] == resval_undef)
… …
749 alias_color (Color_topShadow, Color_White); 755 alias_color (Color_topShadow, Color_White);
750 } 756 }
751#endif /* KEEP_SCROLLCOLOR */ 757#endif /* KEEP_SCROLLCOLOR */
752 758
753#ifdef OFF_FOCUS_FADING 759#ifdef OFF_FOCUS_FADING
754 if (rs[Rs_fade])
755 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 760 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
756 { 761 update_fade_color (i);
757 rgba c;
758 pix_colors [Color_fade].get (c);
759 pix_colors_focused [i].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused[i],c);
760 }
761#endif 762#endif
762} 763}
763 764
764/*----------------------------------------------------------------------*/ 765/*----------------------------------------------------------------------*/
765/* color aliases, fg/bg bright-bold */ 766/* color aliases, fg/bg bright-bold */
… …
1052#endif 1053#endif
1053 1054
1054 /* graphics context for the vt window */ 1055 /* graphics context for the vt window */
1055 gcvalue.foreground = pix_colors[Color_fg]; 1056 gcvalue.foreground = pix_colors[Color_fg];
1056 gcvalue.background = pix_colors[Color_bg]; 1057 gcvalue.background = pix_colors[Color_bg];
1057 gcvalue.graphics_exposures = 1; 1058 gcvalue.graphics_exposures = 0;
1058 1059
1059 gc = XCreateGC (dpy, vt, 1060 gc = XCreateGC (dpy, vt,
1060 GCForeground | GCBackground | GCGraphicsExposures, 1061 GCForeground | GCBackground | GCGraphicsExposures,
1061 &gcvalue); 1062 &gcvalue);
1062 1063
… …
1085 * GET TTY CURRENT STATE * 1086 * GET TTY CURRENT STATE *
1086 * ------------------------------------------------------------------------- */ 1087 * ------------------------------------------------------------------------- */
1087void 1088void
1088rxvt_get_ttymode (ttymode_t *tio, int erase) 1089rxvt_get_ttymode (ttymode_t *tio, int erase)
1089{ 1090{
1090#ifdef HAVE_TERMIOS_H
1091 /* 1091 /*
1092 * standard System V termios interface 1092 * standard System V termios interface
1093 */ 1093 */
1094 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1094 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1095 { 1095 {
… …
1162 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1162 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1163# if defined (ECHOCTL) && defined (ECHOKE) 1163# if defined (ECHOCTL) && defined (ECHOKE)
1164 | ECHOCTL | ECHOKE 1164 | ECHOCTL | ECHOKE
1165# endif 1165# endif
1166 | ECHOE | ECHOK); 1166 | ECHOE | ECHOK);
1167# else /* HAVE_TERMIOS_H */
1168
1169 /*
1170 * sgtty interface
1171 */
1172
1173 /* get parameters -- gtty */
1174 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1175 {
1176 tio->sg.sg_erase = CERASE; /* ^H */
1177 tio->sg.sg_kill = CKILL; /* ^U */
1178 }
1179
1180 if (erase != -1)
1181 tio->sg.sg_erase = (char)erase;
1182
1183 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1184
1185 /* get special characters */
1186 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1187 {
1188 tio->tc.t_intrc = CINTR; /* ^C */
1189 tio->tc.t_quitc = CQUIT; /* ^\ */
1190 tio->tc.t_startc = CSTART; /* ^Q */
1191 tio->tc.t_stopc = CSTOP; /* ^S */
1192 tio->tc.t_eofc = CEOF; /* ^D */
1193 tio->tc.t_brkc = -1;
1194 }
1195
1196 /* get local special chars */
1197 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1198 {
1199 tio->lc.t_suspc = CSUSP; /* ^Z */
1200 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1201 tio->lc.t_rprntc = CRPRNT; /* ^R */
1202 tio->lc.t_flushc = CFLUSH; /* ^O */
1203 tio->lc.t_werasc = CWERASE; /* ^W */
1204 tio->lc.t_lnextc = CLNEXT; /* ^V */
1205 }
1206 /* get line discipline */
1207 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1208# ifdef NTTYDISC
1209 tio->line = NTTYDISC;
1210# endif /* NTTYDISC */
1211
1212 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1213#endif /* HAVE_TERMIOS_H */
1214 1167
1215 /* 1168 /*
1216 * Debugging 1169 * Debugging
1217 */ 1170 */
1218#ifdef DEBUG_TTYMODE 1171#ifdef DEBUG_TTYMODE
… …
1319 else 1272 else
1320#endif 1273#endif
1321 if (!pty->get ()) 1274 if (!pty->get ())
1322 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1275 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1323 1276
1324 pty->set_utf8_mode (enc_utf8);
1325
1326 /* set initial window size */
1327 tt_winch ();
1328
1329 int er; 1277 int er;
1330 1278
1331#ifndef NO_BACKSPACE_KEY 1279#ifndef NO_BACKSPACE_KEY
1332 if (key_backspace[0] && !key_backspace[1]) 1280 if (key_backspace[0] && !key_backspace[1])
1333 er = key_backspace[0]; 1281 er = key_backspace[0];
… …
1336 else 1284 else
1337#endif 1285#endif
1338 er = -1; 1286 er = -1;
1339 1287
1340 rxvt_get_ttymode (&tio, er); 1288 rxvt_get_ttymode (&tio, er);
1289 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1290 pty->set_utf8_mode (enc_utf8);
1291
1292 /* set initial window size */
1293 tt_winch ();
1341 1294
1342#if ENABLE_FRILLS 1295#if ENABLE_FRILLS
1343 if (rs[Rs_pty_fd]) 1296 if (rs[Rs_pty_fd])
1344 return; 1297 return;
1345#endif 1298#endif
… …
1399 */ 1352 */
1400int 1353int
1401rxvt_term::run_child (const char *const *argv) 1354rxvt_term::run_child (const char *const *argv)
1402{ 1355{
1403 char *login; 1356 char *login;
1404
1405 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1406 1357
1407 if (OPTION (Opt_console)) 1358 if (OPTION (Opt_console))
1408 { /* be virtual console, fail silently */ 1359 { /* be virtual console, fail silently */
1409#ifdef TIOCCONS 1360#ifdef TIOCCONS
1410 unsigned int on = 1; 1361 unsigned int on = 1;

Diff Legend

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