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.259 by root, Sat May 30 08:51:23 2009 UTC vs.
Revision 1.287 by sf-exg, Sat Dec 18 14:00:43 2010 UTC

… …
143 143
144 return rval; 144 return rval;
145} 145}
146#endif 146#endif
147 147
148const char *const def_colorName[] = 148static const char *const def_colorName[] =
149 { 149 {
150 COLOR_FOREGROUND, 150 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 151 COLOR_BACKGROUND,
152 /* low-intensity colors */ 152 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 153 "rgb:00/00/00", // 0: black (Black)
… …
174 "rgb:00/00/ff", // 4/12: bright blue (Blue) 174 "rgb:00/00/ff", // 4/12: bright blue (Blue)
175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
177 "rgb:ff/ff/ff", // 7/15: bright white (White) 177 "rgb:ff/ff/ff", // 7/15: bright white (White)
178 178
179#if !USE_256_COLORS
179 // 88 xterm colours 180 // 88 xterm colours
180 "rgb:00/00/00", 181 "rgb:00/00/00",
181 "rgb:00/00/8b", 182 "rgb:00/00/8b",
182 "rgb:00/00/cd", 183 "rgb:00/00/cd",
183 "rgb:00/00/ff", 184 "rgb:00/00/ff",
… …
247 "rgb:8b/8b/8b", 248 "rgb:8b/8b/8b",
248 "rgb:a2/a2/a2", 249 "rgb:a2/a2/a2",
249 "rgb:b9/b9/b9", 250 "rgb:b9/b9/b9",
250 "rgb:d0/d0/d0", 251 "rgb:d0/d0/d0",
251 "rgb:e7/e7/e7", 252 "rgb:e7/e7/e7",
253#else
254 // 256 xterm colours
255 "rgb:00/00/00",
256 "rgb:00/00/5f",
257 "rgb:00/00/87",
258 "rgb:00/00/af",
259 "rgb:00/00/d7",
260 "rgb:00/00/ff",
261 "rgb:00/5f/00",
262 "rgb:00/5f/5f",
263 "rgb:00/5f/87",
264 "rgb:00/5f/af",
265 "rgb:00/5f/d7",
266 "rgb:00/5f/ff",
267 "rgb:00/87/00",
268 "rgb:00/87/5f",
269 "rgb:00/87/87",
270 "rgb:00/87/af",
271 "rgb:00/87/d7",
272 "rgb:00/87/ff",
273 "rgb:00/af/00",
274 "rgb:00/af/5f",
275 "rgb:00/af/87",
276 "rgb:00/af/af",
277 "rgb:00/af/d7",
278 "rgb:00/af/ff",
279 "rgb:00/d7/00",
280 "rgb:00/d7/5f",
281 "rgb:00/d7/87",
282 "rgb:00/d7/af",
283 "rgb:00/d7/d7",
284 "rgb:00/d7/ff",
285 "rgb:00/ff/00",
286 "rgb:00/ff/5f",
287 "rgb:00/ff/87",
288 "rgb:00/ff/af",
289 "rgb:00/ff/d7",
290 "rgb:00/ff/ff",
291 "rgb:5f/00/00",
292 "rgb:5f/00/5f",
293 "rgb:5f/00/87",
294 "rgb:5f/00/af",
295 "rgb:5f/00/d7",
296 "rgb:5f/00/ff",
297 "rgb:5f/5f/00",
298 "rgb:5f/5f/5f",
299 "rgb:5f/5f/87",
300 "rgb:5f/5f/af",
301 "rgb:5f/5f/d7",
302 "rgb:5f/5f/ff",
303 "rgb:5f/87/00",
304 "rgb:5f/87/5f",
305 "rgb:5f/87/87",
306 "rgb:5f/87/af",
307 "rgb:5f/87/d7",
308 "rgb:5f/87/ff",
309 "rgb:5f/af/00",
310 "rgb:5f/af/5f",
311 "rgb:5f/af/87",
312 "rgb:5f/af/af",
313 "rgb:5f/af/d7",
314 "rgb:5f/af/ff",
315 "rgb:5f/d7/00",
316 "rgb:5f/d7/5f",
317 "rgb:5f/d7/87",
318 "rgb:5f/d7/af",
319 "rgb:5f/d7/d7",
320 "rgb:5f/d7/ff",
321 "rgb:5f/ff/00",
322 "rgb:5f/ff/5f",
323 "rgb:5f/ff/87",
324 "rgb:5f/ff/af",
325 "rgb:5f/ff/d7",
326 "rgb:5f/ff/ff",
327 "rgb:87/00/00",
328 "rgb:87/00/5f",
329 "rgb:87/00/87",
330 "rgb:87/00/af",
331 "rgb:87/00/d7",
332 "rgb:87/00/ff",
333 "rgb:87/5f/00",
334 "rgb:87/5f/5f",
335 "rgb:87/5f/87",
336 "rgb:87/5f/af",
337 "rgb:87/5f/d7",
338 "rgb:87/5f/ff",
339 "rgb:87/87/00",
340 "rgb:87/87/5f",
341 "rgb:87/87/87",
342 "rgb:87/87/af",
343 "rgb:87/87/d7",
344 "rgb:87/87/ff",
345 "rgb:87/af/00",
346 "rgb:87/af/5f",
347 "rgb:87/af/87",
348 "rgb:87/af/af",
349 "rgb:87/af/d7",
350 "rgb:87/af/ff",
351 "rgb:87/d7/00",
352 "rgb:87/d7/5f",
353 "rgb:87/d7/87",
354 "rgb:87/d7/af",
355 "rgb:87/d7/d7",
356 "rgb:87/d7/ff",
357 "rgb:87/ff/00",
358 "rgb:87/ff/5f",
359 "rgb:87/ff/87",
360 "rgb:87/ff/af",
361 "rgb:87/ff/d7",
362 "rgb:87/ff/ff",
363 "rgb:af/00/00",
364 "rgb:af/00/5f",
365 "rgb:af/00/87",
366 "rgb:af/00/af",
367 "rgb:af/00/d7",
368 "rgb:af/00/ff",
369 "rgb:af/5f/00",
370 "rgb:af/5f/5f",
371 "rgb:af/5f/87",
372 "rgb:af/5f/af",
373 "rgb:af/5f/d7",
374 "rgb:af/5f/ff",
375 "rgb:af/87/00",
376 "rgb:af/87/5f",
377 "rgb:af/87/87",
378 "rgb:af/87/af",
379 "rgb:af/87/d7",
380 "rgb:af/87/ff",
381 "rgb:af/af/00",
382 "rgb:af/af/5f",
383 "rgb:af/af/87",
384 "rgb:af/af/af",
385 "rgb:af/af/d7",
386 "rgb:af/af/ff",
387 "rgb:af/d7/00",
388 "rgb:af/d7/5f",
389 "rgb:af/d7/87",
390 "rgb:af/d7/af",
391 "rgb:af/d7/d7",
392 "rgb:af/d7/ff",
393 "rgb:af/ff/00",
394 "rgb:af/ff/5f",
395 "rgb:af/ff/87",
396 "rgb:af/ff/af",
397 "rgb:af/ff/d7",
398 "rgb:af/ff/ff",
399 "rgb:d7/00/00",
400 "rgb:d7/00/5f",
401 "rgb:d7/00/87",
402 "rgb:d7/00/af",
403 "rgb:d7/00/d7",
404 "rgb:d7/00/ff",
405 "rgb:d7/5f/00",
406 "rgb:d7/5f/5f",
407 "rgb:d7/5f/87",
408 "rgb:d7/5f/af",
409 "rgb:d7/5f/d7",
410 "rgb:d7/5f/ff",
411 "rgb:d7/87/00",
412 "rgb:d7/87/5f",
413 "rgb:d7/87/87",
414 "rgb:d7/87/af",
415 "rgb:d7/87/d7",
416 "rgb:d7/87/ff",
417 "rgb:d7/af/00",
418 "rgb:d7/af/5f",
419 "rgb:d7/af/87",
420 "rgb:d7/af/af",
421 "rgb:d7/af/d7",
422 "rgb:d7/af/ff",
423 "rgb:d7/d7/00",
424 "rgb:d7/d7/5f",
425 "rgb:d7/d7/87",
426 "rgb:d7/d7/af",
427 "rgb:d7/d7/d7",
428 "rgb:d7/d7/ff",
429 "rgb:d7/ff/00",
430 "rgb:d7/ff/5f",
431 "rgb:d7/ff/87",
432 "rgb:d7/ff/af",
433 "rgb:d7/ff/d7",
434 "rgb:d7/ff/ff",
435 "rgb:ff/00/00",
436 "rgb:ff/00/5f",
437 "rgb:ff/00/87",
438 "rgb:ff/00/af",
439 "rgb:ff/00/d7",
440 "rgb:ff/00/ff",
441 "rgb:ff/5f/00",
442 "rgb:ff/5f/5f",
443 "rgb:ff/5f/87",
444 "rgb:ff/5f/af",
445 "rgb:ff/5f/d7",
446 "rgb:ff/5f/ff",
447 "rgb:ff/87/00",
448 "rgb:ff/87/5f",
449 "rgb:ff/87/87",
450 "rgb:ff/87/af",
451 "rgb:ff/87/d7",
452 "rgb:ff/87/ff",
453 "rgb:ff/af/00",
454 "rgb:ff/af/5f",
455 "rgb:ff/af/87",
456 "rgb:ff/af/af",
457 "rgb:ff/af/d7",
458 "rgb:ff/af/ff",
459 "rgb:ff/d7/00",
460 "rgb:ff/d7/5f",
461 "rgb:ff/d7/87",
462 "rgb:ff/d7/af",
463 "rgb:ff/d7/d7",
464 "rgb:ff/d7/ff",
465 "rgb:ff/ff/00",
466 "rgb:ff/ff/5f",
467 "rgb:ff/ff/87",
468 "rgb:ff/ff/af",
469 "rgb:ff/ff/d7",
470 "rgb:ff/ff/ff",
471 "rgb:08/08/08",
472 "rgb:12/12/12",
473 "rgb:1c/1c/1c",
474 "rgb:26/26/26",
475 "rgb:30/30/30",
476 "rgb:3a/3a/3a",
477 "rgb:44/44/44",
478 "rgb:4e/4e/4e",
479 "rgb:58/58/58",
480 "rgb:62/62/62",
481 "rgb:6c/6c/6c",
482 "rgb:76/76/76",
483 "rgb:80/80/80",
484 "rgb:8a/8a/8a",
485 "rgb:94/94/94",
486 "rgb:9e/9e/9e",
487 "rgb:a8/a8/a8",
488 "rgb:b2/b2/b2",
489 "rgb:bc/bc/bc",
490 "rgb:c6/c6/c6",
491 "rgb:d0/d0/d0",
492 "rgb:da/da/da",
493 "rgb:e4/e4/e4",
494 "rgb:ee/ee/ee",
495#endif
252 496
253#ifndef NO_CURSORCOLOR 497#ifndef NO_CURSORCOLOR
254 COLOR_CURSOR_BACKGROUND, 498 COLOR_CURSOR_BACKGROUND,
255 COLOR_CURSOR_FOREGROUND, 499 COLOR_CURSOR_FOREGROUND,
256#endif /* ! NO_CURSORCOLOR */ 500#endif /* ! NO_CURSORCOLOR */
… …
266#if ENABLE_FRILLS 510#if ENABLE_FRILLS
267 NULL, // Color_underline 511 NULL, // Color_underline
268#endif 512#endif
269#ifdef OPTION_HC 513#ifdef OPTION_HC
270 NULL, 514 NULL,
515 NULL,
271#endif 516#endif
272 COLOR_SCROLLBAR, 517 COLOR_SCROLLBAR,
273#ifdef RXVT_SCROLLBAR 518#ifdef RXVT_SCROLLBAR
274 COLOR_SCROLLTROUGH, 519 COLOR_SCROLLTROUGH,
275#endif 520#endif
… …
308 set_option (Opt_skipScroll); 553 set_option (Opt_skipScroll);
309 set_option (Opt_secondaryScreen); 554 set_option (Opt_secondaryScreen);
310 set_option (Opt_secondaryScroll); 555 set_option (Opt_secondaryScroll);
311 set_option (Opt_pastableTabs); 556 set_option (Opt_pastableTabs);
312 set_option (Opt_intensityStyles); 557 set_option (Opt_intensityStyles);
558 set_option (Opt_iso14755);
313 set_option (Opt_iso14755_52); 559 set_option (Opt_iso14755_52);
314 set_option (Opt_buffered); 560 set_option (Opt_buffered);
315}
316
317static void
318init_secondary ()
319{
320 int i;
321
322 if ((i = open ("/dev/null", O_RDONLY)) < 0)
323 {
324 dup2 (STDERR_FILENO, STDIN_FILENO);
325 }
326 else if (i != STDIN_FILENO)
327 {
328 dup2 (i, STDIN_FILENO);
329 close (i);
330 }
331
332 dup2 (STDERR_FILENO, STDOUT_FILENO);
333} 561}
334 562
335/*----------------------------------------------------------------------*/ 563/*----------------------------------------------------------------------*/
336const char ** 564const char **
337rxvt_term::init_resources (int argc, const char *const *argv) 565rxvt_term::init_resources (int argc, const char *const *argv)
… …
402 rs [i] = 0; 630 rs [i] = 0;
403 631
404#ifdef HAVE_AFTERIMAGE 632#ifdef HAVE_AFTERIMAGE
405 set_application_name ((char *)rs[Rs_name]); 633 set_application_name ((char *)rs[Rs_name]);
406 set_output_threshold (OUTPUT_LEVEL_WARNING); 634 set_output_threshold (OUTPUT_LEVEL_WARNING);
635#endif
636
637#ifdef HAVE_PIXBUF
638 g_type_init ();
407#endif 639#endif
408 640
409#if ENABLE_PERL 641#if ENABLE_PERL
410 if (!rs[Rs_perl_ext_1]) 642 if (!rs[Rs_perl_ext_1])
411 rs[Rs_perl_ext_1] = "default"; 643 rs[Rs_perl_ext_1] = "default";
… …
544 set_locale (""); 776 set_locale ("");
545 set_environ (envv); // a few things in X do not call setlocale :( 777 set_environ (envv); // a few things in X do not call setlocale :(
546 778
547 init_vars (); 779 init_vars ();
548 780
549 init_secondary ();
550
551 const char **cmd_argv = init_resources (argc, argv); 781 const char **cmd_argv = init_resources (argc, argv);
552 782
553#ifdef KEYSYM_RESOURCE 783#ifdef KEYSYM_RESOURCE
554 keyboard->register_done (); 784 keyboard->register_done ();
555#endif 785#endif
… …
589#ifdef ENABLE_TRANSPARENCY 819#ifdef ENABLE_TRANSPARENCY
590 if (option (Opt_transparent)) 820 if (option (Opt_transparent))
591 { 821 {
592 bgPixmap.set_transparent (); 822 bgPixmap.set_transparent ();
593 823
594#ifdef HAVE_AFTERIMAGE
595 if (rs [Rs_blurradius]) 824 if (rs [Rs_blurradius])
596 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 825 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
597#endif 826
598 if (ISSET_PIXCOLOR (Color_tint)) 827 if (ISSET_PIXCOLOR (Color_tint))
599 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 828 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
600 829
601 if (rs [Rs_shade]) 830 if (rs [Rs_shade])
602 bgPixmap.set_shade (rs [Rs_shade]); 831 bgPixmap.set_shade (rs [Rs_shade]);
… …
661 890
662/*----------------------------------------------------------------------*/ 891/*----------------------------------------------------------------------*/
663void 892void
664rxvt_term::init_env () 893rxvt_term::init_env ()
665{ 894{
666 int i;
667 char *val; 895 char *val;
668 896
669#ifdef DISPLAY_IS_IP 897#ifdef DISPLAY_IS_IP
670 /* Fixup display_name for export over pty to any interested terminal 898 /* Fixup display_name for export over pty to any interested terminal
671 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 899 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
685 val = XDisplayString (dpy); 913 val = XDisplayString (dpy);
686 914
687 if (rs[Rs_display_name] == NULL) 915 if (rs[Rs_display_name] == NULL)
688 rs[Rs_display_name] = val; /* use broken `:0' value */ 916 rs[Rs_display_name] = val; /* use broken `:0' value */
689 917
690 i = strlen (val);
691 env_display = (char *)rxvt_malloc (i + 9); 918 env_display = (char *)rxvt_malloc (strlen (val) + 9);
692 919
693 sprintf (env_display, "DISPLAY=%s", val); 920 sprintf (env_display, "DISPLAY=%s", val);
694 921
695 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 922 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
696 923
… …
1053 1280
1054 if (i) 1281 if (i)
1055 ModMetaMask = modmasks[i - 1]; 1282 ModMetaMask = modmasks[i - 1];
1056} 1283}
1057 1284
1285void
1286rxvt_term::set_icon (const char *file)
1287{
1288#ifdef HAVE_AFTERIMAGE
1289 init_asv ();
1290
1291 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1292 if (!im)
1293 {
1294 rxvt_warn ("Loading image icon failed, continuing without.\n");
1295 return;
1296 }
1297
1298 unsigned int w = im->width;
1299 unsigned int h = im->height;
1300
1301 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1302 {
1303 rxvt_warn ("Icon image too big, continuing without.\n");
1304 destroy_asimage (&im);
1305 return;
1306 }
1307
1308 ASImage *result = scale_asimage (asv, im,
1309 w, h, ASA_ARGB32,
1310 100, ASIMAGE_QUALITY_DEFAULT);
1311 destroy_asimage (&im);
1312
1313 if (!result)
1314 {
1315 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1316 return;
1317 }
1318
1319 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1320 if (buffer)
1321 {
1322 ARGB32 *asbuf = result->alt.argb32;
1323 buffer [0] = w;
1324 buffer [1] = h;
1325
1326 for (unsigned int i = 0; i < w * h; ++i)
1327 buffer [i + 2] = asbuf [i];
1328
1329 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1330 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1331 free (buffer);
1332 }
1333 else
1334 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1335
1336 destroy_asimage (&result);
1337#endif
1338
1339#ifdef HAVE_PIXBUF
1340 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1341 if (!pixbuf)
1342 {
1343 rxvt_warn ("Loading image icon failed, continuing without.\n");
1344 return;
1345 }
1346
1347 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1348 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1349
1350 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1351 {
1352 rxvt_warn ("Icon image too big, continuing without.\n");
1353 g_object_unref (pixbuf);
1354 return;
1355 }
1356
1357 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1358 {
1359 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1360 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1361 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1362
1363 buffer [0] = w;
1364 buffer [1] = h;
1365 for (int i = 0; i < h; i++)
1366 {
1367 for (int j = 0; j < w; j++)
1368 {
1369 unsigned char *pixel = row + j * channels;
1370 long value;
1371
1372 if (channels == 4)
1373 value = pixel[3];
1374 else
1375 value = (unsigned char)0x00ff;
1376
1377 value = (value << 8) + pixel[0];
1378 value = (value << 8) + pixel[1];
1379 value = (value << 8) + pixel[2];
1380 buffer[(i * w + j) + 2] = value;
1381 }
1382
1383 row += rowstride;
1384 }
1385
1386 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1387 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1388 free (buffer);
1389 }
1390 else
1391 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1392
1393 g_object_unref (pixbuf);
1394#endif
1395}
1396
1058/*----------------------------------------------------------------------*/ 1397/*----------------------------------------------------------------------*/
1059/* rxvt_Create_Windows () - Open and map the window */ 1398/* rxvt_Create_Windows () - Open and map the window */
1060void 1399void
1061rxvt_term::create_windows (int argc, const char *const *argv) 1400rxvt_term::create_windows (int argc, const char *const *argv)
1062{ 1401{
… …
1141 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1480 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1142 wmHint.window_group = top; 1481 wmHint.window_group = top;
1143 1482
1144 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1483 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1145 &szHint, &wmHint, &classHint); 1484 &szHint, &wmHint, &classHint);
1146#if ENABLE_EWMH 1485#if ENABLE_EWMH
1147# ifdef HAVE_AFTERIMAGE
1148 /* 1486 /*
1149 * set up icon hint 1487 * set up icon hint
1150 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1488 * rs [Rs_iconfile] is path to icon
1151 */ 1489 */
1152 1490
1153 if (rs [Rs_iconfile]) 1491 if (rs [Rs_iconfile])
1154 { 1492 {
1155 init_asv (); 1493 set_icon (rs [Rs_iconfile]);
1156
1157 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1158 if (asv && im)
1159 {
1160 int w = im->width;
1161 int h = im->height;
1162 long* buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1163 ASImage *result = scale_asimage (asv, im,
1164 w, h, ASA_ARGB32,
1165 100, ASIMAGE_QUALITY_DEFAULT);
1166 destroy_asimage (&im);
1167
1168 if (buffer && result)
1169 {
1170 ARGB32 *asbuf = result->alt.argb32;
1171 buffer [0] = w;
1172 buffer [1] = h;
1173
1174 for (unsigned int i = 0; i < w * h; ++i)
1175 buffer [i + 2] = asbuf [i];
1176
1177 destroy_asimage (&result);
1178 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1179 PropModeReplace, (const unsigned char*) buffer, 2 + w * h);
1180 free (buffer);
1181 }
1182 else
1183 {
1184 if (!buffer)
1185 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1186
1187 if (!result)
1188 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1189 }
1190 }
1191 else
1192 rxvt_warn ("Loading image icon failed, continuing without.\n");
1193 } 1494 }
1194# endif
1195#endif 1495#endif
1196 1496
1197#if ENABLE_FRILLS 1497#if ENABLE_FRILLS
1198 if (mwmhints.flags) 1498 if (mwmhints.flags)
1199 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1499 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1276 pix_colors = pix_colors_unfocused; 1576 pix_colors = pix_colors_unfocused;
1277#endif 1577#endif
1278 1578
1279 pointer_unblank (); 1579 pointer_unblank ();
1280 scr_recolour (); 1580 scr_recolour ();
1281}
1282
1283/* ------------------------------------------------------------------------- *
1284 * GET TTY CURRENT STATE *
1285 * ------------------------------------------------------------------------- */
1286void
1287rxvt_get_ttymode (struct termios *tio, int erase)
1288{
1289 /*
1290 * standard System V termios interface
1291 */
1292 if (tcgetattr (STDIN_FILENO, tio) < 0)
1293 {
1294 // return error - use system defaults,
1295 // where possible, and zero elsewhere
1296 memset (tio, 0, sizeof (struct termios));
1297
1298 tio->c_cc[VINTR] = CINTR;
1299 tio->c_cc[VQUIT] = CQUIT;
1300 tio->c_cc[VERASE] = CERASE;
1301#ifdef VERASE2
1302 tio->c_cc[VERASE2] = CERASE2;
1303#endif
1304 tio->c_cc[VKILL] = CKILL;
1305 tio->c_cc[VSTART] = CSTART;
1306 tio->c_cc[VSTOP] = CSTOP;
1307 tio->c_cc[VSUSP] = CSUSP;
1308# ifdef VDSUSP
1309 tio->c_cc[VDSUSP] = CDSUSP;
1310# endif
1311# ifdef VREPRINT
1312 tio->c_cc[VREPRINT] = CRPRNT;
1313# endif
1314# ifdef VDISCRD
1315 tio->c_cc[VDISCRD] = CFLUSH;
1316# endif
1317# ifdef VWERSE
1318 tio->c_cc[VWERSE] = CWERASE;
1319# endif
1320# ifdef VLNEXT
1321 tio->c_cc[VLNEXT] = CLNEXT;
1322# endif
1323 }
1324
1325 tio->c_cc[VEOF] = CEOF;
1326 tio->c_cc[VEOL] = VDISABLE;
1327# ifdef VEOL2
1328 tio->c_cc[VEOL2] = VDISABLE;
1329# endif
1330# ifdef VSWTC
1331 tio->c_cc[VSWTC] = VDISABLE;
1332# endif
1333# ifdef VSWTCH
1334 tio->c_cc[VSWTCH] = VDISABLE;
1335# endif
1336# if VMIN != VEOF
1337 tio->c_cc[VMIN] = 1;
1338# endif
1339# if VTIME != VEOL
1340 tio->c_cc[VTIME] = 0;
1341# endif
1342
1343 if (erase != -1)
1344 tio->c_cc[VERASE] = (char)erase;
1345
1346 /* input modes */
1347 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1348# ifdef IMAXBEL
1349 | IMAXBEL
1350# endif
1351 | IXON);
1352
1353 /* output modes */
1354 tio->c_oflag = (OPOST | ONLCR);
1355
1356 /* control modes */
1357 tio->c_cflag = (CS8 | CREAD);
1358
1359 /* line discipline modes */
1360 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1361# if defined (ECHOCTL) && defined (ECHOKE)
1362 | ECHOCTL | ECHOKE
1363# endif
1364 | ECHOE | ECHOK);
1365
1366 /*
1367 * Debugging
1368 */
1369#ifdef DEBUG_TTYMODE
1370 /* c_iflag bits */
1371 fprintf (stderr, "Input flags\n");
1372
1373 /* cpp token stringize doesn't work on all machines <sigh> */
1374# define FOO(flag,name) \
1375 if ((tio->c_iflag) & flag) \
1376 fprintf (stderr, "%s ", name)
1377
1378 /* c_iflag bits */
1379 FOO (IGNBRK, "IGNBRK");
1380 FOO (BRKINT, "BRKINT");
1381 FOO (IGNPAR, "IGNPAR");
1382 FOO (PARMRK, "PARMRK");
1383 FOO (INPCK, "INPCK");
1384 FOO (ISTRIP, "ISTRIP");
1385 FOO (INLCR, "INLCR");
1386 FOO (IGNCR, "IGNCR");
1387 FOO (ICRNL, "ICRNL");
1388 FOO (IXON, "IXON");
1389 FOO (IXOFF, "IXOFF");
1390# ifdef IUCLC
1391 FOO (IUCLC, "IUCLC");
1392# endif
1393# ifdef IXANY
1394 FOO (IXANY, "IXANY");
1395# endif
1396# ifdef IMAXBEL
1397 FOO (IMAXBEL, "IMAXBEL");
1398# endif
1399
1400 fprintf (stderr, "\n");
1401
1402# undef FOO
1403# define FOO(entry, name) \
1404 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1405
1406 FOO (VINTR, "VINTR");
1407 FOO (VQUIT, "VQUIT");
1408 FOO (VERASE, "VERASE");
1409 FOO (VKILL, "VKILL");
1410 FOO (VEOF, "VEOF");
1411 FOO (VEOL, "VEOL");
1412# ifdef VEOL2
1413 FOO (VEOL2, "VEOL2");
1414# endif
1415# ifdef VSWTC
1416 FOO (VSWTC, "VSWTC");
1417# endif
1418# ifdef VSWTCH
1419 FOO (VSWTCH, "VSWTCH");
1420# endif
1421 FOO (VSTART, "VSTART");
1422 FOO (VSTOP, "VSTOP");
1423 FOO (VSUSP, "VSUSP");
1424# ifdef VDSUSP
1425 FOO (VDSUSP, "VDSUSP");
1426# endif
1427# ifdef VREPRINT
1428 FOO (VREPRINT, "VREPRINT");
1429# endif
1430# ifdef VDISCRD
1431 FOO (VDISCRD, "VDISCRD");
1432# endif
1433# ifdef VWERSE
1434 FOO (VWERSE, "VWERSE");
1435# endif
1436# ifdef VLNEXT
1437 FOO (VLNEXT, "VLNEXT");
1438# endif
1439
1440 fprintf (stderr, "\n");
1441# undef FOO
1442#endif /* DEBUG_TTYMODE */
1443} 1581}
1444 1582
1445/*----------------------------------------------------------------------*/ 1583/*----------------------------------------------------------------------*/
1446/* 1584/*
1447 * Run the command in a subprocess and return a file descriptor for the 1585 * Run the command in a subprocess and return a file descriptor for the
… …
1468 else 1606 else
1469#endif 1607#endif
1470 if (!pty->get ()) 1608 if (!pty->get ())
1471 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1609 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1472 1610
1473 int er; 1611 struct termios tio = def_tio;
1474 1612
1475#ifndef NO_BACKSPACE_KEY 1613#ifndef NO_BACKSPACE_KEY
1476 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1614 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1477 er = rs[Rs_backspace_key][0]; 1615 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1478 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1616 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1479 er = '\177'; /* the initial state anyway */ 1617 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1480 else
1481#endif 1618#endif
1482 er = -1;
1483 1619
1484 rxvt_get_ttymode (&tio, er);
1485 /* init terminal attributes */ 1620 /* init terminal attributes */
1486 cfsetospeed (&tio, BAUDRATE); 1621 cfsetospeed (&tio, BAUDRATE);
1487 cfsetispeed (&tio, BAUDRATE); 1622 cfsetispeed (&tio, BAUDRATE);
1488 tcsetattr (pty->tty, TCSANOW, &tio); 1623 tcsetattr (pty->tty, TCSANOW, &tio);
1489 pty->set_utf8_mode (enc_utf8); 1624 pty->set_utf8_mode (enc_utf8);
… …
1576 signal (SIGQUIT, SIG_DFL); 1711 signal (SIGQUIT, SIG_DFL);
1577 signal (SIGCHLD, SIG_DFL); 1712 signal (SIGCHLD, SIG_DFL);
1578 signal (SIGHUP, SIG_DFL); 1713 signal (SIGHUP, SIG_DFL);
1579 signal (SIGPIPE, SIG_DFL); 1714 signal (SIGPIPE, SIG_DFL);
1580 /* 1715 /*
1581 * mimick login's behavior by disabling the job control signals 1716 * mimic login's behavior by disabling the job control signals
1582 * a shell that wants them can turn them back on 1717 * a shell that wants them can turn them back on
1583 */ 1718 */
1584#ifdef SIGTSTP 1719#ifdef SIGTSTP
1585 signal (SIGTSTP, SIG_IGN); 1720 signal (SIGTSTP, SIG_IGN);
1586 signal (SIGTTIN, SIG_IGN); 1721 signal (SIGTTIN, SIG_IGN);

Diff Legend

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