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.120 by root, Mon Nov 28 18:37:42 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
… …
341 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
342 rs[Rs_display_name] = ":0"; 348 rs[Rs_display_name] = ":0";
343 349
344 get_options (r_argc, r_argv); 350 get_options (r_argc, r_argv);
345 351
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]))) 352 if (!(display = displays.get (rs[Rs_display_name])))
359 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 353 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
360 354
361 extract_resources (); 355 extract_resources ();
362 free (r_argv); 356 free (r_argv);
363 357
… …
746 } 740 }
747 } 741 }
748 } 742 }
749 743
750 pix_colors[i] = xcol; 744 pix_colors[i] = xcol;
745 SET_PIXCOLOR (i);
746 }
747
751#ifdef OFF_FOCUS_FADING 748#ifdef OFF_FOCUS_FADING
752 if (rs[Rs_fade]) 749 if (rs[Rs_fade])
750 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
753 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]);
754#endif 752#endif
755 SET_PIXCOLOR (i);
756 }
757 753
758 if (display->depth <= 2) 754 if (display->depth <= 2)
759 { 755 {
760 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];
761 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];
… …
769 * from the fvwm window manager. 765 * from the fvwm window manager.
770 */ 766 */
771#ifdef KEEP_SCROLLCOLOR 767#ifdef KEEP_SCROLLCOLOR
772 768
773 if (display->depth <= 2) 769 if (display->depth <= 2)
770 {
774 { /* Monochrome */ 771 /* Monochrome */
775 pix_colors[Color_scroll] = pix_colors[Color_fg]; 772 pix_colors[Color_scroll] = pix_colors[Color_fg];
776 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 773 pix_colors[Color_topShadow] = pix_colors[Color_bg];
777 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 774 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
778 } 775 }
779 else 776 else
… …
967 mwmhints.flags = MWM_HINTS_DECORATIONS; 964 mwmhints.flags = MWM_HINTS_DECORATIONS;
968 mwmhints.decorations = 0; 965 mwmhints.decorations = 0;
969 } 966 }
970 } 967 }
971 else 968 else
972 {
973 mwmhints.flags = 0; 969 mwmhints.flags = 0;
974 }
975#endif 970#endif
976 971
977 /* grab colors before netscape does */ 972 /* grab colors before netscape does */
978 Get_Colours (); 973 Get_Colours ();
979 974
… …
1036 wmHint.window_group = top; 1031 wmHint.window_group = top;
1037 1032
1038 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1033 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1039 &szHint, &wmHint, &classHint); 1034 &szHint, &wmHint, &classHint);
1040 1035
1041 /* Enable delete window protocol */ 1036 Atom protocols[] = {
1042 XSetWMProtocols (disp, top, &xa[XA_WM_DELETE_WINDOW], 1); 1037 xa[XA_WM_DELETE_WINDOW],
1038#if ENABLE_EWMH
1039 xa[XA_NET_WM_PING],
1040#endif
1041 };
1043 1042
1044#if ENABLE_FRILLS 1043 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1044
1045#if ENABLE_EWMH
1045 long pid = getpid (); 1046 long pid = getpid ();
1046 1047
1047 XChangeProperty (disp, top, 1048 XChangeProperty (disp, top,
1048 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1049 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1049 PropModeReplace, (unsigned char *)&pid, 1); 1050 PropModeReplace, (unsigned char *)&pid, 1);
1051
1052 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1050#endif 1053#endif
1051 1054
1052 XSelectInput (disp, top, 1055 XSelectInput (disp, top,
1053 KeyPressMask 1056 KeyPressMask
1054#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1057#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
… …
1202 tio->c_cc[VKILL] = CKILL; 1205 tio->c_cc[VKILL] = CKILL;
1203 tio->c_cc[VSTART] = CSTART; 1206 tio->c_cc[VSTART] = CSTART;
1204 tio->c_cc[VSTOP] = CSTOP; 1207 tio->c_cc[VSTOP] = CSTOP;
1205 tio->c_cc[VSUSP] = CSUSP; 1208 tio->c_cc[VSUSP] = CSUSP;
1206# ifdef VDSUSP 1209# ifdef VDSUSP
1207
1208 tio->c_cc[VDSUSP] = CDSUSP; 1210 tio->c_cc[VDSUSP] = CDSUSP;
1209# endif 1211# endif
1210# ifdef VREPRINT 1212# ifdef VREPRINT
1211
1212 tio->c_cc[VREPRINT] = CRPRNT; 1213 tio->c_cc[VREPRINT] = CRPRNT;
1213# endif 1214# endif
1214# ifdef VDISCRD 1215# ifdef VDISCRD
1215
1216 tio->c_cc[VDISCRD] = CFLUSH; 1216 tio->c_cc[VDISCRD] = CFLUSH;
1217# endif 1217# endif
1218# ifdef VWERSE 1218# ifdef VWERSE
1219
1220 tio->c_cc[VWERSE] = CWERASE; 1219 tio->c_cc[VWERSE] = CWERASE;
1221# endif 1220# endif
1222# ifdef VLNEXT 1221# ifdef VLNEXT
1223
1224 tio->c_cc[VLNEXT] = CLNEXT; 1222 tio->c_cc[VLNEXT] = CLNEXT;
1225# endif 1223# endif
1226
1227 } 1224 }
1225
1228 tio->c_cc[VEOF] = CEOF; 1226 tio->c_cc[VEOF] = CEOF;
1229 tio->c_cc[VEOL] = VDISABLE; 1227 tio->c_cc[VEOL] = VDISABLE;
1230# ifdef VEOL2 1228# ifdef VEOL2
1231
1232 tio->c_cc[VEOL2] = VDISABLE; 1229 tio->c_cc[VEOL2] = VDISABLE;
1233# endif 1230# endif
1234# ifdef VSWTC 1231# ifdef VSWTC
1235
1236 tio->c_cc[VSWTC] = VDISABLE; 1232 tio->c_cc[VSWTC] = VDISABLE;
1237# endif 1233# endif
1238# ifdef VSWTCH 1234# ifdef VSWTCH
1239
1240 tio->c_cc[VSWTCH] = VDISABLE; 1235 tio->c_cc[VSWTCH] = VDISABLE;
1241# endif 1236# endif
1242# if VMIN != VEOF 1237# if VMIN != VEOF
1243
1244 tio->c_cc[VMIN] = 1; 1238 tio->c_cc[VMIN] = 1;
1245# endif 1239# endif
1246# if VTIME != VEOL 1240# if VTIME != VEOL
1247
1248 tio->c_cc[VTIME] = 0; 1241 tio->c_cc[VTIME] = 0;
1249# endif 1242# endif
1250 1243
1251 if (erase != -1) 1244 if (erase != -1)
1252 tio->c_cc[VERASE] = (char)erase; 1245 tio->c_cc[VERASE] = (char)erase;
… …
1280 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1273 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1281 { 1274 {
1282 tio->sg.sg_erase = CERASE; /* ^H */ 1275 tio->sg.sg_erase = CERASE; /* ^H */
1283 tio->sg.sg_kill = CKILL; /* ^U */ 1276 tio->sg.sg_kill = CKILL; /* ^U */
1284 } 1277 }
1278
1285 if (erase != -1) 1279 if (erase != -1)
1286 tio->sg.sg_erase = (char)erase; 1280 tio->sg.sg_erase = (char)erase;
1287 1281
1288 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1282 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1289 1283
… …
1295 tio->tc.t_startc = CSTART; /* ^Q */ 1289 tio->tc.t_startc = CSTART; /* ^Q */
1296 tio->tc.t_stopc = CSTOP; /* ^S */ 1290 tio->tc.t_stopc = CSTOP; /* ^S */
1297 tio->tc.t_eofc = CEOF; /* ^D */ 1291 tio->tc.t_eofc = CEOF; /* ^D */
1298 tio->tc.t_brkc = -1; 1292 tio->tc.t_brkc = -1;
1299 } 1293 }
1294
1300 /* get local special chars */ 1295 /* get local special chars */
1301 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1296 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1302 { 1297 {
1303 tio->lc.t_suspc = CSUSP; /* ^Z */ 1298 tio->lc.t_suspc = CSUSP; /* ^Z */
1304 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1299 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1308 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1303 tio->lc.t_lnextc = CLNEXT; /* ^V */
1309 } 1304 }
1310 /* get line discipline */ 1305 /* get line discipline */
1311 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1306 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1312# ifdef NTTYDISC 1307# ifdef NTTYDISC
1313
1314 tio->line = NTTYDISC; 1308 tio->line = NTTYDISC;
1315# endif /* NTTYDISC */ 1309# endif /* NTTYDISC */
1316 1310
1317 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1311 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1318#endif /* HAVE_TERMIOS_H */ 1312#endif /* HAVE_TERMIOS_H */
… …
1341 FOO (IGNCR, "IGNCR"); 1335 FOO (IGNCR, "IGNCR");
1342 FOO (ICRNL, "ICRNL"); 1336 FOO (ICRNL, "ICRNL");
1343 FOO (IXON, "IXON"); 1337 FOO (IXON, "IXON");
1344 FOO (IXOFF, "IXOFF"); 1338 FOO (IXOFF, "IXOFF");
1345# ifdef IUCLC 1339# ifdef IUCLC
1346
1347 FOO (IUCLC, "IUCLC"); 1340 FOO (IUCLC, "IUCLC");
1348# endif 1341# endif
1349# ifdef IXANY 1342# ifdef IXANY
1350
1351 FOO (IXANY, "IXANY"); 1343 FOO (IXANY, "IXANY");
1352# endif 1344# endif
1353# ifdef IMAXBEL 1345# ifdef IMAXBEL
1354
1355 FOO (IMAXBEL, "IMAXBEL"); 1346 FOO (IMAXBEL, "IMAXBEL");
1356# endif 1347# endif
1357 1348
1358 fprintf (stderr, "\n"); 1349 fprintf (stderr, "\n");
1359 1350
… …
1366 FOO (VERASE, "VERASE"); 1357 FOO (VERASE, "VERASE");
1367 FOO (VKILL, "VKILL"); 1358 FOO (VKILL, "VKILL");
1368 FOO (VEOF, "VEOF"); 1359 FOO (VEOF, "VEOF");
1369 FOO (VEOL, "VEOL"); 1360 FOO (VEOL, "VEOL");
1370# ifdef VEOL2 1361# ifdef VEOL2
1371
1372 FOO (VEOL2, "VEOL2"); 1362 FOO (VEOL2, "VEOL2");
1373# endif 1363# endif
1374# ifdef VSWTC 1364# ifdef VSWTC
1375
1376 FOO (VSWTC, "VSWTC"); 1365 FOO (VSWTC, "VSWTC");
1377# endif 1366# endif
1378# ifdef VSWTCH 1367# ifdef VSWTCH
1379
1380 FOO (VSWTCH, "VSWTCH"); 1368 FOO (VSWTCH, "VSWTCH");
1381# endif 1369# endif
1382
1383 FOO (VSTART, "VSTART"); 1370 FOO (VSTART, "VSTART");
1384 FOO (VSTOP, "VSTOP"); 1371 FOO (VSTOP, "VSTOP");
1385 FOO (VSUSP, "VSUSP"); 1372 FOO (VSUSP, "VSUSP");
1386# ifdef VDSUSP 1373# ifdef VDSUSP
1387
1388 FOO (VDSUSP, "VDSUSP"); 1374 FOO (VDSUSP, "VDSUSP");
1389# endif 1375# endif
1390# ifdef VREPRINT 1376# ifdef VREPRINT
1391
1392 FOO (VREPRINT, "VREPRINT"); 1377 FOO (VREPRINT, "VREPRINT");
1393# endif 1378# endif
1394# ifdef VDISCRD 1379# ifdef VDISCRD
1395
1396 FOO (VDISCRD, "VDISCRD"); 1380 FOO (VDISCRD, "VDISCRD");
1397# endif 1381# endif
1398# ifdef VWERSE 1382# ifdef VWERSE
1399
1400 FOO (VWERSE, "VWERSE"); 1383 FOO (VWERSE, "VWERSE");
1401# endif 1384# endif
1402# ifdef VLNEXT 1385# ifdef VLNEXT
1403
1404 FOO (VLNEXT, "VLNEXT"); 1386 FOO (VLNEXT, "VLNEXT");
1405# endif 1387# endif
1406 1388
1407 fprintf (stderr, "\n"); 1389 fprintf (stderr, "\n");
1408# undef FOO 1390# undef FOO

Diff Legend

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