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.115 by root, Sun Feb 20 02:00:43 2005 UTC vs.
Revision 1.121 by root, Wed Nov 30 21:05:39 2005 UTC

… …
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
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
175 "black",
176#endif
174 }; 177 };
175 178
176const char *const xa_names[] = 179const char *const xa_names[] =
177 { 180 {
178 "TEXT", 181 "TEXT",
… …
185 "INCR", 188 "INCR",
186 "WM_PROTOCOLS", 189 "WM_PROTOCOLS",
187 "WM_DELETE_WINDOW", 190 "WM_DELETE_WINDOW",
188 "CLIPBOARD", 191 "CLIPBOARD",
189#if ENABLE_FRILLS 192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
190 "_NET_WM_PID", 196 "_NET_WM_PID",
191 "_MOTIF_WM_HINTS",
192 "_NET_WM_NAME", 197 "_NET_WM_NAME",
193 "_NET_WM_ICON_NAME", 198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
194#endif 200#endif
195#if USE_XIM 201#if USE_XIM
196 "WM_LOCALE_NAME", 202 "WM_LOCALE_NAME",
197#endif 203#endif
198#ifdef TRANSPARENT 204#ifdef TRANSPARENT
… …
210 }; 216 };
211 217
212bool 218bool
213rxvt_term::init_vars () 219rxvt_term::init_vars ()
214{ 220{
215 sw_term.start (SIGTERM);
216 sw_int.start (SIGINT);
217
218 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
219#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
220 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
221#endif 224#endif
222 pix_colors = pix_colors_focused; 225 pix_colors = pix_colors_focused;
… …
341 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
342 rs[Rs_display_name] = ":0"; 345 rs[Rs_display_name] = ":0";
343 346
344 get_options (r_argc, r_argv); 347 get_options (r_argc, r_argv);
345 348
346#ifdef LOCAL_X_IS_UNIX
347 if (rs[Rs_display_name][0] == ':')
348 {
349 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
350 strcpy (val, "unix");
351 strcat (val, rs[Rs_display_name]);
352 display = displays.get (val);
353 free (val);
354 }
355#endif
356
357 if (!display
358 && ! (display = displays.get (rs[Rs_display_name]))) 349 if (!(display = displays.get (rs[Rs_display_name])))
359 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 350 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
360 351
361 extract_resources (); 352 extract_resources ();
362 free (r_argv); 353 free (r_argv);
363 354
… …
746 } 737 }
747 } 738 }
748 } 739 }
749 740
750 pix_colors[i] = xcol; 741 pix_colors[i] = xcol;
742 SET_PIXCOLOR (i);
743 }
744
751#ifdef OFF_FOCUS_FADING 745#ifdef OFF_FOCUS_FADING
752 if (rs[Rs_fade]) 746 if (rs[Rs_fade])
747 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
753 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 748 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
754#endif 749#endif
755 SET_PIXCOLOR (i);
756 }
757 750
758 if (display->depth <= 2) 751 if (display->depth <= 2)
759 { 752 {
760 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 753 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
761 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 754 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
… …
769 * from the fvwm window manager. 762 * from the fvwm window manager.
770 */ 763 */
771#ifdef KEEP_SCROLLCOLOR 764#ifdef KEEP_SCROLLCOLOR
772 765
773 if (display->depth <= 2) 766 if (display->depth <= 2)
767 {
774 { /* Monochrome */ 768 /* Monochrome */
775 pix_colors[Color_scroll] = pix_colors[Color_fg]; 769 pix_colors[Color_scroll] = pix_colors[Color_fg];
776 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 770 pix_colors[Color_topShadow] = pix_colors[Color_bg];
777 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 771 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
778 } 772 }
779 else 773 else
… …
967 mwmhints.flags = MWM_HINTS_DECORATIONS; 961 mwmhints.flags = MWM_HINTS_DECORATIONS;
968 mwmhints.decorations = 0; 962 mwmhints.decorations = 0;
969 } 963 }
970 } 964 }
971 else 965 else
972 {
973 mwmhints.flags = 0; 966 mwmhints.flags = 0;
974 }
975#endif 967#endif
976 968
977 /* grab colors before netscape does */ 969 /* grab colors before netscape does */
978 Get_Colours (); 970 Get_Colours ();
979 971
… …
1036 wmHint.window_group = top; 1028 wmHint.window_group = top;
1037 1029
1038 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1030 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1039 &szHint, &wmHint, &classHint); 1031 &szHint, &wmHint, &classHint);
1040 1032
1041 /* Enable delete window protocol */ 1033 Atom protocols[] = {
1042 XSetWMProtocols (disp, top, &xa[XA_WM_DELETE_WINDOW], 1); 1034 xa[XA_WM_DELETE_WINDOW],
1035#if ENABLE_EWMH
1036 xa[XA_NET_WM_PING],
1037#endif
1038 };
1043 1039
1044#if ENABLE_FRILLS 1040 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1041
1042#if ENABLE_EWMH
1045 long pid = getpid (); 1043 long pid = getpid ();
1046 1044
1047 XChangeProperty (disp, top, 1045 XChangeProperty (disp, top,
1048 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1046 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1049 PropModeReplace, (unsigned char *)&pid, 1); 1047 PropModeReplace, (unsigned char *)&pid, 1);
1048
1049 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1050#endif 1050#endif
1051 1051
1052 XSelectInput (disp, top, 1052 XSelectInput (disp, top,
1053 KeyPressMask 1053 KeyPressMask
1054#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1054#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
… …
1202 tio->c_cc[VKILL] = CKILL; 1202 tio->c_cc[VKILL] = CKILL;
1203 tio->c_cc[VSTART] = CSTART; 1203 tio->c_cc[VSTART] = CSTART;
1204 tio->c_cc[VSTOP] = CSTOP; 1204 tio->c_cc[VSTOP] = CSTOP;
1205 tio->c_cc[VSUSP] = CSUSP; 1205 tio->c_cc[VSUSP] = CSUSP;
1206# ifdef VDSUSP 1206# ifdef VDSUSP
1207
1208 tio->c_cc[VDSUSP] = CDSUSP; 1207 tio->c_cc[VDSUSP] = CDSUSP;
1209# endif 1208# endif
1210# ifdef VREPRINT 1209# ifdef VREPRINT
1211
1212 tio->c_cc[VREPRINT] = CRPRNT; 1210 tio->c_cc[VREPRINT] = CRPRNT;
1213# endif 1211# endif
1214# ifdef VDISCRD 1212# ifdef VDISCRD
1215
1216 tio->c_cc[VDISCRD] = CFLUSH; 1213 tio->c_cc[VDISCRD] = CFLUSH;
1217# endif 1214# endif
1218# ifdef VWERSE 1215# ifdef VWERSE
1219
1220 tio->c_cc[VWERSE] = CWERASE; 1216 tio->c_cc[VWERSE] = CWERASE;
1221# endif 1217# endif
1222# ifdef VLNEXT 1218# ifdef VLNEXT
1223
1224 tio->c_cc[VLNEXT] = CLNEXT; 1219 tio->c_cc[VLNEXT] = CLNEXT;
1225# endif 1220# endif
1226
1227 } 1221 }
1222
1228 tio->c_cc[VEOF] = CEOF; 1223 tio->c_cc[VEOF] = CEOF;
1229 tio->c_cc[VEOL] = VDISABLE; 1224 tio->c_cc[VEOL] = VDISABLE;
1230# ifdef VEOL2 1225# ifdef VEOL2
1231
1232 tio->c_cc[VEOL2] = VDISABLE; 1226 tio->c_cc[VEOL2] = VDISABLE;
1233# endif 1227# endif
1234# ifdef VSWTC 1228# ifdef VSWTC
1235
1236 tio->c_cc[VSWTC] = VDISABLE; 1229 tio->c_cc[VSWTC] = VDISABLE;
1237# endif 1230# endif
1238# ifdef VSWTCH 1231# ifdef VSWTCH
1239
1240 tio->c_cc[VSWTCH] = VDISABLE; 1232 tio->c_cc[VSWTCH] = VDISABLE;
1241# endif 1233# endif
1242# if VMIN != VEOF 1234# if VMIN != VEOF
1243
1244 tio->c_cc[VMIN] = 1; 1235 tio->c_cc[VMIN] = 1;
1245# endif 1236# endif
1246# if VTIME != VEOL 1237# if VTIME != VEOL
1247
1248 tio->c_cc[VTIME] = 0; 1238 tio->c_cc[VTIME] = 0;
1249# endif 1239# endif
1250 1240
1251 if (erase != -1) 1241 if (erase != -1)
1252 tio->c_cc[VERASE] = (char)erase; 1242 tio->c_cc[VERASE] = (char)erase;
… …
1280 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1270 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1281 { 1271 {
1282 tio->sg.sg_erase = CERASE; /* ^H */ 1272 tio->sg.sg_erase = CERASE; /* ^H */
1283 tio->sg.sg_kill = CKILL; /* ^U */ 1273 tio->sg.sg_kill = CKILL; /* ^U */
1284 } 1274 }
1275
1285 if (erase != -1) 1276 if (erase != -1)
1286 tio->sg.sg_erase = (char)erase; 1277 tio->sg.sg_erase = (char)erase;
1287 1278
1288 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1279 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1289 1280
… …
1295 tio->tc.t_startc = CSTART; /* ^Q */ 1286 tio->tc.t_startc = CSTART; /* ^Q */
1296 tio->tc.t_stopc = CSTOP; /* ^S */ 1287 tio->tc.t_stopc = CSTOP; /* ^S */
1297 tio->tc.t_eofc = CEOF; /* ^D */ 1288 tio->tc.t_eofc = CEOF; /* ^D */
1298 tio->tc.t_brkc = -1; 1289 tio->tc.t_brkc = -1;
1299 } 1290 }
1291
1300 /* get local special chars */ 1292 /* get local special chars */
1301 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1293 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1302 { 1294 {
1303 tio->lc.t_suspc = CSUSP; /* ^Z */ 1295 tio->lc.t_suspc = CSUSP; /* ^Z */
1304 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1296 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1308 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1300 tio->lc.t_lnextc = CLNEXT; /* ^V */
1309 } 1301 }
1310 /* get line discipline */ 1302 /* get line discipline */
1311 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1303 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1312# ifdef NTTYDISC 1304# ifdef NTTYDISC
1313
1314 tio->line = NTTYDISC; 1305 tio->line = NTTYDISC;
1315# endif /* NTTYDISC */ 1306# endif /* NTTYDISC */
1316 1307
1317 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1308 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1318#endif /* HAVE_TERMIOS_H */ 1309#endif /* HAVE_TERMIOS_H */
… …
1341 FOO (IGNCR, "IGNCR"); 1332 FOO (IGNCR, "IGNCR");
1342 FOO (ICRNL, "ICRNL"); 1333 FOO (ICRNL, "ICRNL");
1343 FOO (IXON, "IXON"); 1334 FOO (IXON, "IXON");
1344 FOO (IXOFF, "IXOFF"); 1335 FOO (IXOFF, "IXOFF");
1345# ifdef IUCLC 1336# ifdef IUCLC
1346
1347 FOO (IUCLC, "IUCLC"); 1337 FOO (IUCLC, "IUCLC");
1348# endif 1338# endif
1349# ifdef IXANY 1339# ifdef IXANY
1350
1351 FOO (IXANY, "IXANY"); 1340 FOO (IXANY, "IXANY");
1352# endif 1341# endif
1353# ifdef IMAXBEL 1342# ifdef IMAXBEL
1354
1355 FOO (IMAXBEL, "IMAXBEL"); 1343 FOO (IMAXBEL, "IMAXBEL");
1356# endif 1344# endif
1357 1345
1358 fprintf (stderr, "\n"); 1346 fprintf (stderr, "\n");
1359 1347
… …
1366 FOO (VERASE, "VERASE"); 1354 FOO (VERASE, "VERASE");
1367 FOO (VKILL, "VKILL"); 1355 FOO (VKILL, "VKILL");
1368 FOO (VEOF, "VEOF"); 1356 FOO (VEOF, "VEOF");
1369 FOO (VEOL, "VEOL"); 1357 FOO (VEOL, "VEOL");
1370# ifdef VEOL2 1358# ifdef VEOL2
1371
1372 FOO (VEOL2, "VEOL2"); 1359 FOO (VEOL2, "VEOL2");
1373# endif 1360# endif
1374# ifdef VSWTC 1361# ifdef VSWTC
1375
1376 FOO (VSWTC, "VSWTC"); 1362 FOO (VSWTC, "VSWTC");
1377# endif 1363# endif
1378# ifdef VSWTCH 1364# ifdef VSWTCH
1379
1380 FOO (VSWTCH, "VSWTCH"); 1365 FOO (VSWTCH, "VSWTCH");
1381# endif 1366# endif
1382
1383 FOO (VSTART, "VSTART"); 1367 FOO (VSTART, "VSTART");
1384 FOO (VSTOP, "VSTOP"); 1368 FOO (VSTOP, "VSTOP");
1385 FOO (VSUSP, "VSUSP"); 1369 FOO (VSUSP, "VSUSP");
1386# ifdef VDSUSP 1370# ifdef VDSUSP
1387
1388 FOO (VDSUSP, "VDSUSP"); 1371 FOO (VDSUSP, "VDSUSP");
1389# endif 1372# endif
1390# ifdef VREPRINT 1373# ifdef VREPRINT
1391
1392 FOO (VREPRINT, "VREPRINT"); 1374 FOO (VREPRINT, "VREPRINT");
1393# endif 1375# endif
1394# ifdef VDISCRD 1376# ifdef VDISCRD
1395
1396 FOO (VDISCRD, "VDISCRD"); 1377 FOO (VDISCRD, "VDISCRD");
1397# endif 1378# endif
1398# ifdef VWERSE 1379# ifdef VWERSE
1399
1400 FOO (VWERSE, "VWERSE"); 1380 FOO (VWERSE, "VWERSE");
1401# endif 1381# endif
1402# ifdef VLNEXT 1382# ifdef VLNEXT
1403
1404 FOO (VLNEXT, "VLNEXT"); 1383 FOO (VLNEXT, "VLNEXT");
1405# endif 1384# endif
1406 1385
1407 fprintf (stderr, "\n"); 1386 fprintf (stderr, "\n");
1408# undef FOO 1387# undef FOO
… …
1450 1429
1451#if ENABLE_FRILLS 1430#if ENABLE_FRILLS
1452 if (rs[Rs_pty_fd]) 1431 if (rs[Rs_pty_fd])
1453 return; 1432 return;
1454#endif 1433#endif
1455
1456 sw_chld.start (SIGCHLD);
1457 1434
1458#ifndef __QNX__ 1435#ifndef __QNX__
1459 /* spin off the command interpreter */ 1436 /* spin off the command interpreter */
1460 switch (cmd_pid = fork ()) 1437 switch (cmd_pid = fork ())
1461 { 1438 {

Diff Legend

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