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.113 by root, Sat Feb 19 04:16:49 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
… …
203 "DndProtocol", 209 "DndProtocol",
204 "DndSelection", 210 "DndSelection",
205#endif 211#endif
206#if ENABLE_XEMBED 212#if ENABLE_XEMBED
207 "_XEMBED", 213 "_XEMBED",
214 "_XEMBED_INFO",
208#endif 215#endif
209 }; 216 };
210 217
211bool 218bool
212rxvt_term::init_vars () 219rxvt_term::init_vars ()
… …
340 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
341 rs[Rs_display_name] = ":0"; 348 rs[Rs_display_name] = ":0";
342 349
343 get_options (r_argc, r_argv); 350 get_options (r_argc, r_argv);
344 351
345#ifdef LOCAL_X_IS_UNIX
346 if (rs[Rs_display_name][0] == ':')
347 {
348 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
349 strcpy (val, "unix");
350 strcat (val, rs[Rs_display_name]);
351 display = displays.get (val);
352 free (val);
353 }
354#endif
355
356 if (!display
357 && ! (display = displays.get (rs[Rs_display_name]))) 352 if (!(display = displays.get (rs[Rs_display_name])))
358 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]);
359 354
360 extract_resources (); 355 extract_resources ();
361 free (r_argv); 356 free (r_argv);
362 357
… …
745 } 740 }
746 } 741 }
747 } 742 }
748 743
749 pix_colors[i] = xcol; 744 pix_colors[i] = xcol;
745 SET_PIXCOLOR (i);
746 }
747
750#ifdef OFF_FOCUS_FADING 748#ifdef OFF_FOCUS_FADING
751 if (rs[Rs_fade]) 749 if (rs[Rs_fade])
750 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
752 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]);
753#endif 752#endif
754 SET_PIXCOLOR (i);
755 }
756 753
757 if (display->depth <= 2) 754 if (display->depth <= 2)
758 { 755 {
759 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];
760 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];
… …
768 * from the fvwm window manager. 765 * from the fvwm window manager.
769 */ 766 */
770#ifdef KEEP_SCROLLCOLOR 767#ifdef KEEP_SCROLLCOLOR
771 768
772 if (display->depth <= 2) 769 if (display->depth <= 2)
770 {
773 { /* Monochrome */ 771 /* Monochrome */
774 pix_colors[Color_scroll] = pix_colors[Color_fg]; 772 pix_colors[Color_scroll] = pix_colors[Color_fg];
775 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 773 pix_colors[Color_topShadow] = pix_colors[Color_bg];
776 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 774 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
777 } 775 }
778 else 776 else
… …
929#endif 927#endif
930 XGCValues gcvalue; 928 XGCValues gcvalue;
931 long vt_emask; 929 long vt_emask;
932 XSetWindowAttributes attributes; 930 XSetWindowAttributes attributes;
933 XWindowAttributes gattr; 931 XWindowAttributes gattr;
934 Window top; 932 Window top, parent;
935 dDisp; 933 dDisp;
936 934
937#ifdef USING_W11LIB 935#ifdef USING_W11LIB
938 /* enable W11 callbacks */ 936 /* enable W11 callbacks */
939 W11AddEventHandler (disp, rxvt_W11_process_x_event); 937 W11AddEventHandler (disp, rxvt_W11_process_x_event);
… …
966 mwmhints.flags = MWM_HINTS_DECORATIONS; 964 mwmhints.flags = MWM_HINTS_DECORATIONS;
967 mwmhints.decorations = 0; 965 mwmhints.decorations = 0;
968 } 966 }
969 } 967 }
970 else 968 else
971 {
972 mwmhints.flags = 0; 969 mwmhints.flags = 0;
973 }
974#endif 970#endif
975 971
976 /* grab colors before netscape does */ 972 /* grab colors before netscape does */
977 Get_Colours (); 973 Get_Colours ();
978 974
979 if (!set_fonts ()) 975 if (!set_fonts ())
980 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 976 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
981 977
978 parent = DefaultRootWindow (disp);
979
982#if ENABLE_XEMBED 980#if ENABLE_XEMBED
983 if (rs[Rs_embed]) 981 if (rs[Rs_embed])
984 { 982 {
985 XWindowAttributes wattr; 983 XWindowAttributes wattr;
986 984
987 top = strtol (rs[Rs_embed], 0, 0); 985 parent = strtol (rs[Rs_embed], 0, 0);
988 986
989 if (!XGetWindowAttributes (disp, top, &wattr)) 987 if (!XGetWindowAttributes (disp, parent, &wattr))
990 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 988 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
991 989
992 window_calc (wattr.width, wattr.height); 990 window_calc (wattr.width, wattr.height);
991 }
993 992
994#if 0 993#endif
995 if (wattr.map_state == IsViewable) 994 window_calc (0, 0);
996 { 995
997 TermWin.mapped = 1; 996 /* sub-window placement & size in rxvt_resize_subwindows () */
998 refresh_type = FAST_REFRESH; 997#ifdef PREFER_24BIT
999 XClearWindow (disp, top); 998 attributes.background_pixel = pix_colors_focused[Color_border];
1000 // TODO: make XMapNotify-event-code a function and call it 999 attributes.border_pixel = pix_colors_focused[Color_border];
1001 // TODO: how can I detect visibility without unmap/map? 1000 attributes.colormap = display->cmap;
1002 // TODO: focusin etc. 1001 top = XCreateWindow (disp, parent,
1003 } 1002 szHint.x, szHint.y,
1003 szHint.width, szHint.height,
1004 TermWin.ext_bwidth,
1005 display->depth, InputOutput,
1006 display->visual,
1007 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1004#else 1008#else
1005 // it's easiest just to unmap/map to get all state correctly set-up 1009 top = XCreateSimpleWindow (disp, parent,
1006 XUnmapWindow (disp, top);
1007#endif
1008 }
1009 else
1010#endif
1011 {
1012 window_calc (0, 0);
1013
1014 /* sub-window placement & size in rxvt_resize_subwindows () */
1015#ifdef PREFER_24BIT
1016 attributes.background_pixel = pix_colors_focused[Color_border];
1017 attributes.border_pixel = pix_colors_focused[Color_border];
1018 attributes.colormap = display->cmap;
1019 top = XCreateWindow (disp, DefaultRootWindow (disp),
1020 szHint.x, szHint.y, 1010 szHint.x, szHint.y,
1021 szHint.width, szHint.height, 1011 szHint.width, szHint.height,
1022 TermWin.ext_bwidth, 1012 TermWin.ext_bwidth,
1023 display->depth, InputOutput,
1024 display->visual,
1025 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1026#else
1027 top = XCreateSimpleWindow (disp, DefaultRootWindow (disp),
1028 szHint.x, szHint.y,
1029 szHint.width, szHint.height,
1030 TermWin.ext_bwidth,
1031 pix_colors_focused[Color_border], 1013 pix_colors_focused[Color_border],
1032 pix_colors_focused[Color_border]); 1014 pix_colors_focused[Color_border]);
1033#endif 1015#endif
1034 }
1035 1016
1036 TermWin.parent[0] = top; 1017 TermWin.parent[0] = top;
1037 1018
1038 old_width = szHint.width; 1019 old_width = szHint.width;
1039 old_height = szHint.height; 1020 old_height = szHint.height;
… …
1047 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1028 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1048 wmHint.input = True; 1029 wmHint.input = True;
1049 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1030 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1050 wmHint.window_group = top; 1031 wmHint.window_group = top;
1051 1032
1052 XSetWMProperties (disp, top, NULL, NULL, 1033 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1053 (char **)argv, argc, &szHint, &wmHint, &classHint); 1034 &szHint, &wmHint, &classHint);
1054 1035
1055 /* Enable delete window protocol */ 1036 Atom protocols[] = {
1056 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 };
1057 1042
1058#if ENABLE_FRILLS 1043 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1044
1045#if ENABLE_EWMH
1059 long pid = getpid (); 1046 long pid = getpid ();
1060 1047
1061 XChangeProperty (disp, top, 1048 XChangeProperty (disp, top,
1062 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1049 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1063 PropModeReplace, (unsigned char *)&pid, 1); 1050 PropModeReplace, (unsigned char *)&pid, 1);
1051
1052 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1064#endif 1053#endif
1065 1054
1066 XSelectInput (disp, top, 1055 XSelectInput (disp, top,
1067 KeyPressMask 1056 KeyPressMask
1068#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1057#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
… …
1185 1174
1186 pointer_unblank (); 1175 pointer_unblank ();
1187 scr_recolour (); 1176 scr_recolour ();
1188 1177
1189#if ENABLE_XEMBED 1178#if ENABLE_XEMBED
1190 // why this is necessary, I don't know, race condition?? 1179 if (rs[Rs_embed])
1191 XMoveWindow (disp, TermWin.vt, window_vt_x, window_vt_y); 1180 {
1181 long info[2] = { 0, XEMBED_MAPPED };
1182
1183 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1184 32, PropModeReplace, (unsigned char *)&info, 2);
1185 }
1192#endif 1186#endif
1193} 1187}
1194 1188
1195/* ------------------------------------------------------------------------- * 1189/* ------------------------------------------------------------------------- *
1196 * GET TTY CURRENT STATE * 1190 * GET TTY CURRENT STATE *
… …
1211 tio->c_cc[VKILL] = CKILL; 1205 tio->c_cc[VKILL] = CKILL;
1212 tio->c_cc[VSTART] = CSTART; 1206 tio->c_cc[VSTART] = CSTART;
1213 tio->c_cc[VSTOP] = CSTOP; 1207 tio->c_cc[VSTOP] = CSTOP;
1214 tio->c_cc[VSUSP] = CSUSP; 1208 tio->c_cc[VSUSP] = CSUSP;
1215# ifdef VDSUSP 1209# ifdef VDSUSP
1216
1217 tio->c_cc[VDSUSP] = CDSUSP; 1210 tio->c_cc[VDSUSP] = CDSUSP;
1218# endif 1211# endif
1219# ifdef VREPRINT 1212# ifdef VREPRINT
1220
1221 tio->c_cc[VREPRINT] = CRPRNT; 1213 tio->c_cc[VREPRINT] = CRPRNT;
1222# endif 1214# endif
1223# ifdef VDISCRD 1215# ifdef VDISCRD
1224
1225 tio->c_cc[VDISCRD] = CFLUSH; 1216 tio->c_cc[VDISCRD] = CFLUSH;
1226# endif 1217# endif
1227# ifdef VWERSE 1218# ifdef VWERSE
1228
1229 tio->c_cc[VWERSE] = CWERASE; 1219 tio->c_cc[VWERSE] = CWERASE;
1230# endif 1220# endif
1231# ifdef VLNEXT 1221# ifdef VLNEXT
1232
1233 tio->c_cc[VLNEXT] = CLNEXT; 1222 tio->c_cc[VLNEXT] = CLNEXT;
1234# endif 1223# endif
1235
1236 } 1224 }
1225
1237 tio->c_cc[VEOF] = CEOF; 1226 tio->c_cc[VEOF] = CEOF;
1238 tio->c_cc[VEOL] = VDISABLE; 1227 tio->c_cc[VEOL] = VDISABLE;
1239# ifdef VEOL2 1228# ifdef VEOL2
1240
1241 tio->c_cc[VEOL2] = VDISABLE; 1229 tio->c_cc[VEOL2] = VDISABLE;
1242# endif 1230# endif
1243# ifdef VSWTC 1231# ifdef VSWTC
1244
1245 tio->c_cc[VSWTC] = VDISABLE; 1232 tio->c_cc[VSWTC] = VDISABLE;
1246# endif 1233# endif
1247# ifdef VSWTCH 1234# ifdef VSWTCH
1248
1249 tio->c_cc[VSWTCH] = VDISABLE; 1235 tio->c_cc[VSWTCH] = VDISABLE;
1250# endif 1236# endif
1251# if VMIN != VEOF 1237# if VMIN != VEOF
1252
1253 tio->c_cc[VMIN] = 1; 1238 tio->c_cc[VMIN] = 1;
1254# endif 1239# endif
1255# if VTIME != VEOL 1240# if VTIME != VEOL
1256
1257 tio->c_cc[VTIME] = 0; 1241 tio->c_cc[VTIME] = 0;
1258# endif 1242# endif
1259 1243
1260 if (erase != -1) 1244 if (erase != -1)
1261 tio->c_cc[VERASE] = (char)erase; 1245 tio->c_cc[VERASE] = (char)erase;
… …
1289 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1273 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1290 { 1274 {
1291 tio->sg.sg_erase = CERASE; /* ^H */ 1275 tio->sg.sg_erase = CERASE; /* ^H */
1292 tio->sg.sg_kill = CKILL; /* ^U */ 1276 tio->sg.sg_kill = CKILL; /* ^U */
1293 } 1277 }
1278
1294 if (erase != -1) 1279 if (erase != -1)
1295 tio->sg.sg_erase = (char)erase; 1280 tio->sg.sg_erase = (char)erase;
1296 1281
1297 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1282 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1298 1283
… …
1304 tio->tc.t_startc = CSTART; /* ^Q */ 1289 tio->tc.t_startc = CSTART; /* ^Q */
1305 tio->tc.t_stopc = CSTOP; /* ^S */ 1290 tio->tc.t_stopc = CSTOP; /* ^S */
1306 tio->tc.t_eofc = CEOF; /* ^D */ 1291 tio->tc.t_eofc = CEOF; /* ^D */
1307 tio->tc.t_brkc = -1; 1292 tio->tc.t_brkc = -1;
1308 } 1293 }
1294
1309 /* get local special chars */ 1295 /* get local special chars */
1310 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1296 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1311 { 1297 {
1312 tio->lc.t_suspc = CSUSP; /* ^Z */ 1298 tio->lc.t_suspc = CSUSP; /* ^Z */
1313 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1299 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1317 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1303 tio->lc.t_lnextc = CLNEXT; /* ^V */
1318 } 1304 }
1319 /* get line discipline */ 1305 /* get line discipline */
1320 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1306 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1321# ifdef NTTYDISC 1307# ifdef NTTYDISC
1322
1323 tio->line = NTTYDISC; 1308 tio->line = NTTYDISC;
1324# endif /* NTTYDISC */ 1309# endif /* NTTYDISC */
1325 1310
1326 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1311 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1327#endif /* HAVE_TERMIOS_H */ 1312#endif /* HAVE_TERMIOS_H */
… …
1350 FOO (IGNCR, "IGNCR"); 1335 FOO (IGNCR, "IGNCR");
1351 FOO (ICRNL, "ICRNL"); 1336 FOO (ICRNL, "ICRNL");
1352 FOO (IXON, "IXON"); 1337 FOO (IXON, "IXON");
1353 FOO (IXOFF, "IXOFF"); 1338 FOO (IXOFF, "IXOFF");
1354# ifdef IUCLC 1339# ifdef IUCLC
1355
1356 FOO (IUCLC, "IUCLC"); 1340 FOO (IUCLC, "IUCLC");
1357# endif 1341# endif
1358# ifdef IXANY 1342# ifdef IXANY
1359
1360 FOO (IXANY, "IXANY"); 1343 FOO (IXANY, "IXANY");
1361# endif 1344# endif
1362# ifdef IMAXBEL 1345# ifdef IMAXBEL
1363
1364 FOO (IMAXBEL, "IMAXBEL"); 1346 FOO (IMAXBEL, "IMAXBEL");
1365# endif 1347# endif
1366 1348
1367 fprintf (stderr, "\n"); 1349 fprintf (stderr, "\n");
1368 1350
… …
1375 FOO (VERASE, "VERASE"); 1357 FOO (VERASE, "VERASE");
1376 FOO (VKILL, "VKILL"); 1358 FOO (VKILL, "VKILL");
1377 FOO (VEOF, "VEOF"); 1359 FOO (VEOF, "VEOF");
1378 FOO (VEOL, "VEOL"); 1360 FOO (VEOL, "VEOL");
1379# ifdef VEOL2 1361# ifdef VEOL2
1380
1381 FOO (VEOL2, "VEOL2"); 1362 FOO (VEOL2, "VEOL2");
1382# endif 1363# endif
1383# ifdef VSWTC 1364# ifdef VSWTC
1384
1385 FOO (VSWTC, "VSWTC"); 1365 FOO (VSWTC, "VSWTC");
1386# endif 1366# endif
1387# ifdef VSWTCH 1367# ifdef VSWTCH
1388
1389 FOO (VSWTCH, "VSWTCH"); 1368 FOO (VSWTCH, "VSWTCH");
1390# endif 1369# endif
1391
1392 FOO (VSTART, "VSTART"); 1370 FOO (VSTART, "VSTART");
1393 FOO (VSTOP, "VSTOP"); 1371 FOO (VSTOP, "VSTOP");
1394 FOO (VSUSP, "VSUSP"); 1372 FOO (VSUSP, "VSUSP");
1395# ifdef VDSUSP 1373# ifdef VDSUSP
1396
1397 FOO (VDSUSP, "VDSUSP"); 1374 FOO (VDSUSP, "VDSUSP");
1398# endif 1375# endif
1399# ifdef VREPRINT 1376# ifdef VREPRINT
1400
1401 FOO (VREPRINT, "VREPRINT"); 1377 FOO (VREPRINT, "VREPRINT");
1402# endif 1378# endif
1403# ifdef VDISCRD 1379# ifdef VDISCRD
1404
1405 FOO (VDISCRD, "VDISCRD"); 1380 FOO (VDISCRD, "VDISCRD");
1406# endif 1381# endif
1407# ifdef VWERSE 1382# ifdef VWERSE
1408
1409 FOO (VWERSE, "VWERSE"); 1383 FOO (VWERSE, "VWERSE");
1410# endif 1384# endif
1411# ifdef VLNEXT 1385# ifdef VLNEXT
1412
1413 FOO (VLNEXT, "VLNEXT"); 1386 FOO (VLNEXT, "VLNEXT");
1414# endif 1387# endif
1415 1388
1416 fprintf (stderr, "\n"); 1389 fprintf (stderr, "\n");
1417# undef FOO 1390# undef FOO

Diff Legend

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