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.252 by root, Sun Jun 15 13:54:15 2008 UTC vs.
Revision 1.283 by sf-exg, Wed Oct 13 23:04:57 2010 UTC

… …
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
… …
293 ncol = 80; 538 ncol = 80;
294 nrow = 24; 539 nrow = 24;
295 int_bwidth = INTERNALBORDERWIDTH; 540 int_bwidth = INTERNALBORDERWIDTH;
296 ext_bwidth = EXTERNALBORDERWIDTH; 541 ext_bwidth = EXTERNALBORDERWIDTH;
297 lineSpace = LINESPACE; 542 lineSpace = LINESPACE;
543 letterSpace = LETTERSPACE;
298 saveLines = SAVELINES; 544 saveLines = SAVELINES;
299 545
300 refresh_type = SLOW_REFRESH; 546 refresh_type = SLOW_REFRESH;
301 547
302 oldcursor.row = oldcursor.col = -1; 548 oldcursor.row = oldcursor.col = -1;
… …
307 set_option (Opt_skipScroll); 553 set_option (Opt_skipScroll);
308 set_option (Opt_secondaryScreen); 554 set_option (Opt_secondaryScreen);
309 set_option (Opt_secondaryScroll); 555 set_option (Opt_secondaryScroll);
310 set_option (Opt_pastableTabs); 556 set_option (Opt_pastableTabs);
311 set_option (Opt_intensityStyles); 557 set_option (Opt_intensityStyles);
558 set_option (Opt_iso14755);
312 set_option (Opt_iso14755_52); 559 set_option (Opt_iso14755_52);
313 set_option (Opt_buffered); 560 set_option (Opt_buffered);
314}
315
316static void
317init_secondary ()
318{
319 int i;
320
321 if ((i = open ("/dev/null", O_RDONLY)) < 0)
322 {
323 dup2 (STDERR_FILENO, STDIN_FILENO);
324 }
325 else if (i != STDIN_FILENO)
326 {
327 dup2 (i, STDIN_FILENO);
328 close (i);
329 }
330
331 dup2 (STDERR_FILENO, STDOUT_FILENO);
332} 561}
333 562
334/*----------------------------------------------------------------------*/ 563/*----------------------------------------------------------------------*/
335const char ** 564const char **
336rxvt_term::init_resources (int argc, const char *const *argv) 565rxvt_term::init_resources (int argc, const char *const *argv)
… …
392#if XFT 621#if XFT
393 if (rs[Rs_depth]) 622 if (rs[Rs_depth])
394 select_visual (strtol (rs[Rs_depth], 0, 0)); 623 select_visual (strtol (rs[Rs_depth], 0, 0));
395#endif 624#endif
396 625
397#ifdef HAVE_AFTERIMAGE
398 set_application_name ((char*)rs[Rs_name]);
399 set_output_threshold (OUTPUT_LEVEL_WARNING);
400 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
401#endif
402 free (r_argv); 626 free (r_argv);
403 627
404 for (int i = NUM_RESOURCES; i--; ) 628 for (int i = NUM_RESOURCES; i--; )
405 if (rs [i] == resval_undef) 629 if (rs [i] == resval_undef)
406 rs [i] = 0; 630 rs [i] = 0;
631
632#ifdef HAVE_AFTERIMAGE
633 set_application_name ((char *)rs[Rs_name]);
634 set_output_threshold (OUTPUT_LEVEL_WARNING);
635#endif
636
637#ifdef HAVE_PIXBUF
638 g_type_init ();
639 gdk_pixbuf_xlib_init (dpy, display->screen);
640#endif
407 641
408#if ENABLE_PERL 642#if ENABLE_PERL
409 if (!rs[Rs_perl_ext_1]) 643 if (!rs[Rs_perl_ext_1])
410 rs[Rs_perl_ext_1] = "default"; 644 rs[Rs_perl_ext_1] = "default";
411 645
… …
423 */ 657 */
424 if (cmd_argv && cmd_argv[0]) 658 if (cmd_argv && cmd_argv[0])
425 { 659 {
426 if (!rs[Rs_title]) 660 if (!rs[Rs_title])
427 rs[Rs_title] = rxvt_basename (cmd_argv[0]); 661 rs[Rs_title] = rxvt_basename (cmd_argv[0]);
662
428 if (!rs[Rs_iconName]) 663 if (!rs[Rs_iconName])
429 rs[Rs_iconName] = rs[Rs_title]; 664 rs[Rs_iconName] = rs[Rs_title];
430 } 665 }
431 else 666 else
432 { 667 {
433 if (!rs[Rs_title]) 668 if (!rs[Rs_title])
434 rs[Rs_title] = rs[Rs_name]; 669 rs[Rs_title] = rs[Rs_name];
670
435 if (!rs[Rs_iconName]) 671 if (!rs[Rs_iconName])
436 rs[Rs_iconName] = rs[Rs_name]; 672 rs[Rs_iconName] = rs[Rs_name];
437 } 673 }
438 674
439 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 675 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
… …
446 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 682 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
447 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 683 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
448 684
449 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 685 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
450 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 686 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
687
688 if (rs[Rs_letterSpace])
689 letterSpace = atoi (rs[Rs_letterSpace]);
451#endif 690#endif
452 691
453#ifdef POINTER_BLANK 692#ifdef POINTER_BLANK
454 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 693 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
455 pointerBlankDelay = i; 694 pointerBlankDelay = i;
… …
458#endif 697#endif
459 698
460 /* no point having a scrollbar without having any scrollback! */ 699 /* no point having a scrollbar without having any scrollback! */
461 if (!saveLines) 700 if (!saveLines)
462 set_option (Opt_scrollBar, 0); 701 set_option (Opt_scrollBar, 0);
463
464#ifdef PRINTPIPE
465 if (!rs[Rs_print_pipe])
466 rs[Rs_print_pipe] = PRINTPIPE;
467#endif
468 702
469 if (!rs[Rs_cutchars]) 703 if (!rs[Rs_cutchars])
470 rs[Rs_cutchars] = CUTCHARS; 704 rs[Rs_cutchars] = CUTCHARS;
471 705
472#ifndef NO_BACKSPACE_KEY 706#ifndef NO_BACKSPACE_KEY
… …
543 set_locale (""); 777 set_locale ("");
544 set_environ (envv); // a few things in X do not call setlocale :( 778 set_environ (envv); // a few things in X do not call setlocale :(
545 779
546 init_vars (); 780 init_vars ();
547 781
548 init_secondary ();
549
550 const char **cmd_argv = init_resources (argc, argv); 782 const char **cmd_argv = init_resources (argc, argv);
551 783
552#ifdef KEYSYM_RESOURCE 784#ifdef KEYSYM_RESOURCE
553 keyboard->register_done (); 785 keyboard->register_done ();
554#endif 786#endif
… …
570 802
571 create_windows (argc, argv); 803 create_windows (argc, argv);
572 804
573 init_xlocale (); 805 init_xlocale ();
574 806
575 scr_reset (); // initialize screen 807 scr_poweron (); // initialize screen
576 808
577#if 0 809#if 0
578 XSynchronize (dpy, True); 810 XSynchronize (dpy, True);
579#endif 811#endif
580 812
… …
588#ifdef ENABLE_TRANSPARENCY 820#ifdef ENABLE_TRANSPARENCY
589 if (option (Opt_transparent)) 821 if (option (Opt_transparent))
590 { 822 {
591 bgPixmap.set_transparent (); 823 bgPixmap.set_transparent ();
592 824
593#ifdef HAVE_AFTERIMAGE
594 if (rs [Rs_blurradius]) 825 if (rs [Rs_blurradius])
595 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 826 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
596#endif 827
597 if (ISSET_PIXCOLOR (Color_tint)) 828 if (ISSET_PIXCOLOR (Color_tint))
598 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 829 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
599 830
600 if (rs [Rs_shade]) 831 if (rs [Rs_shade])
601 bgPixmap.set_shade (rs [Rs_shade]); 832 bgPixmap.set_shade (rs [Rs_shade]);
… …
1052 1283
1053 if (i) 1284 if (i)
1054 ModMetaMask = modmasks[i - 1]; 1285 ModMetaMask = modmasks[i - 1];
1055} 1286}
1056 1287
1288void
1289rxvt_term::set_icon (const char *file)
1290{
1291#ifdef HAVE_AFTERIMAGE
1292 init_asv ();
1293
1294 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1295 if (!im)
1296 {
1297 rxvt_warn ("Loading image icon failed, continuing without.\n");
1298 return;
1299 }
1300
1301 unsigned int w = im->width;
1302 unsigned int h = im->height;
1303
1304 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1305 {
1306 rxvt_warn ("Icon image too big, continuing without.\n");
1307 destroy_asimage (&im);
1308 return;
1309 }
1310
1311 ASImage *result = scale_asimage (asv, im,
1312 w, h, ASA_ARGB32,
1313 100, ASIMAGE_QUALITY_DEFAULT);
1314 destroy_asimage (&im);
1315
1316 if (!result)
1317 {
1318 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1319 return;
1320 }
1321
1322 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1323 if (buffer)
1324 {
1325 ARGB32 *asbuf = result->alt.argb32;
1326 buffer [0] = w;
1327 buffer [1] = h;
1328
1329 for (unsigned int i = 0; i < w * h; ++i)
1330 buffer [i + 2] = asbuf [i];
1331
1332 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1333 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1334 free (buffer);
1335 }
1336 else
1337 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1338
1339 destroy_asimage (&result);
1340#endif
1341
1342#ifdef HAVE_PIXBUF
1343 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1344 if (!pixbuf)
1345 {
1346 rxvt_warn ("Loading image icon failed, continuing without.\n");
1347 return;
1348 }
1349
1350 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1351 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1352
1353 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1354 {
1355 rxvt_warn ("Icon image too big, continuing without.\n");
1356 g_object_unref (pixbuf);
1357 return;
1358 }
1359
1360 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1361 {
1362 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1363 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1364 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1365
1366 buffer [0] = w;
1367 buffer [1] = h;
1368 for (int i = 0; i < h; i++)
1369 {
1370 for (int j = 0; j < w; j++)
1371 {
1372 unsigned char *pixel = row + j * channels;
1373 long value;
1374
1375 if (channels == 4)
1376 value = pixel[3];
1377 else
1378 value = (unsigned char)0x00ff;
1379
1380 value = (value << 8) + pixel[0];
1381 value = (value << 8) + pixel[1];
1382 value = (value << 8) + pixel[2];
1383 buffer[(i * w + j) + 2] = value;
1384 }
1385
1386 row += rowstride;
1387 }
1388
1389 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1390 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1391 free (buffer);
1392 }
1393 else
1394 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1395
1396 g_object_unref (pixbuf);
1397#endif
1398}
1399
1057/*----------------------------------------------------------------------*/ 1400/*----------------------------------------------------------------------*/
1058/* rxvt_Create_Windows () - Open and map the window */ 1401/* rxvt_Create_Windows () - Open and map the window */
1059void 1402void
1060rxvt_term::create_windows (int argc, const char *const *argv) 1403rxvt_term::create_windows (int argc, const char *const *argv)
1061{ 1404{
… …
1127 this->parent[0] = top; 1470 this->parent[0] = top;
1128 1471
1129 old_width = szHint.width; 1472 old_width = szHint.width;
1130 old_height = szHint.height; 1473 old_height = szHint.height;
1131 1474
1132 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1475 set_title (rs [Rs_title]);
1133 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1476 set_icon_name (rs [Rs_iconName]);
1134 1477
1135 classHint.res_name = (char *)rs[Rs_name]; 1478 classHint.res_name = (char *)rs[Rs_name];
1136 classHint.res_class = (char *)RESCLASS; 1479 classHint.res_class = (char *)RESCLASS;
1137 1480
1138 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1481 wmHint.flags = InputHint | StateHint | WindowGroupHint;
… …
1140 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1483 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1141 wmHint.window_group = top; 1484 wmHint.window_group = top;
1142 1485
1143 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1486 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1144 &szHint, &wmHint, &classHint); 1487 &szHint, &wmHint, &classHint);
1488#if ENABLE_EWMH
1489 /*
1490 * set up icon hint
1491 * rs [Rs_iconfile] is path to icon
1492 */
1493
1494 if (rs [Rs_iconfile])
1495 {
1496 set_icon (rs [Rs_iconfile]);
1497 }
1498#endif
1145 1499
1146#if ENABLE_FRILLS 1500#if ENABLE_FRILLS
1147 if (mwmhints.flags) 1501 if (mwmhints.flags)
1148 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1502 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1149 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1503 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
… …
1225 pix_colors = pix_colors_unfocused; 1579 pix_colors = pix_colors_unfocused;
1226#endif 1580#endif
1227 1581
1228 pointer_unblank (); 1582 pointer_unblank ();
1229 scr_recolour (); 1583 scr_recolour ();
1230}
1231
1232/* ------------------------------------------------------------------------- *
1233 * GET TTY CURRENT STATE *
1234 * ------------------------------------------------------------------------- */
1235void
1236rxvt_get_ttymode (struct termios *tio, int erase)
1237{
1238 /*
1239 * standard System V termios interface
1240 */
1241 if (tcgetattr (STDIN_FILENO, tio) < 0)
1242 {
1243 // return error - use system defaults,
1244 // where possible, and zero elsewhere
1245 memset (tio, 0, sizeof (struct termios));
1246
1247 tio->c_cc[VINTR] = CINTR;
1248 tio->c_cc[VQUIT] = CQUIT;
1249 tio->c_cc[VERASE] = CERASE;
1250#ifdef VERASE2
1251 tio->c_cc[VERASE2] = CERASE2;
1252#endif
1253 tio->c_cc[VKILL] = CKILL;
1254 tio->c_cc[VSTART] = CSTART;
1255 tio->c_cc[VSTOP] = CSTOP;
1256 tio->c_cc[VSUSP] = CSUSP;
1257# ifdef VDSUSP
1258 tio->c_cc[VDSUSP] = CDSUSP;
1259# endif
1260# ifdef VREPRINT
1261 tio->c_cc[VREPRINT] = CRPRNT;
1262# endif
1263# ifdef VDISCRD
1264 tio->c_cc[VDISCRD] = CFLUSH;
1265# endif
1266# ifdef VWERSE
1267 tio->c_cc[VWERSE] = CWERASE;
1268# endif
1269# ifdef VLNEXT
1270 tio->c_cc[VLNEXT] = CLNEXT;
1271# endif
1272 }
1273
1274 tio->c_cc[VEOF] = CEOF;
1275 tio->c_cc[VEOL] = VDISABLE;
1276# ifdef VEOL2
1277 tio->c_cc[VEOL2] = VDISABLE;
1278# endif
1279# ifdef VSWTC
1280 tio->c_cc[VSWTC] = VDISABLE;
1281# endif
1282# ifdef VSWTCH
1283 tio->c_cc[VSWTCH] = VDISABLE;
1284# endif
1285# if VMIN != VEOF
1286 tio->c_cc[VMIN] = 1;
1287# endif
1288# if VTIME != VEOL
1289 tio->c_cc[VTIME] = 0;
1290# endif
1291
1292 if (erase != -1)
1293 tio->c_cc[VERASE] = (char)erase;
1294
1295 /* input modes */
1296 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1297# ifdef IMAXBEL
1298 | IMAXBEL
1299# endif
1300 | IXON);
1301
1302 /* output modes */
1303 tio->c_oflag = (OPOST | ONLCR);
1304
1305 /* control modes */
1306 tio->c_cflag = (CS8 | CREAD);
1307
1308 /* line discipline modes */
1309 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1310# if defined (ECHOCTL) && defined (ECHOKE)
1311 | ECHOCTL | ECHOKE
1312# endif
1313 | ECHOE | ECHOK);
1314
1315 /*
1316 * Debugging
1317 */
1318#ifdef DEBUG_TTYMODE
1319 /* c_iflag bits */
1320 fprintf (stderr, "Input flags\n");
1321
1322 /* cpp token stringize doesn't work on all machines <sigh> */
1323# define FOO(flag,name) \
1324 if ((tio->c_iflag) & flag) \
1325 fprintf (stderr, "%s ", name)
1326
1327 /* c_iflag bits */
1328 FOO (IGNBRK, "IGNBRK");
1329 FOO (BRKINT, "BRKINT");
1330 FOO (IGNPAR, "IGNPAR");
1331 FOO (PARMRK, "PARMRK");
1332 FOO (INPCK, "INPCK");
1333 FOO (ISTRIP, "ISTRIP");
1334 FOO (INLCR, "INLCR");
1335 FOO (IGNCR, "IGNCR");
1336 FOO (ICRNL, "ICRNL");
1337 FOO (IXON, "IXON");
1338 FOO (IXOFF, "IXOFF");
1339# ifdef IUCLC
1340 FOO (IUCLC, "IUCLC");
1341# endif
1342# ifdef IXANY
1343 FOO (IXANY, "IXANY");
1344# endif
1345# ifdef IMAXBEL
1346 FOO (IMAXBEL, "IMAXBEL");
1347# endif
1348
1349 fprintf (stderr, "\n");
1350
1351# undef FOO
1352# define FOO(entry, name) \
1353 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1354
1355 FOO (VINTR, "VINTR");
1356 FOO (VQUIT, "VQUIT");
1357 FOO (VERASE, "VERASE");
1358 FOO (VKILL, "VKILL");
1359 FOO (VEOF, "VEOF");
1360 FOO (VEOL, "VEOL");
1361# ifdef VEOL2
1362 FOO (VEOL2, "VEOL2");
1363# endif
1364# ifdef VSWTC
1365 FOO (VSWTC, "VSWTC");
1366# endif
1367# ifdef VSWTCH
1368 FOO (VSWTCH, "VSWTCH");
1369# endif
1370 FOO (VSTART, "VSTART");
1371 FOO (VSTOP, "VSTOP");
1372 FOO (VSUSP, "VSUSP");
1373# ifdef VDSUSP
1374 FOO (VDSUSP, "VDSUSP");
1375# endif
1376# ifdef VREPRINT
1377 FOO (VREPRINT, "VREPRINT");
1378# endif
1379# ifdef VDISCRD
1380 FOO (VDISCRD, "VDISCRD");
1381# endif
1382# ifdef VWERSE
1383 FOO (VWERSE, "VWERSE");
1384# endif
1385# ifdef VLNEXT
1386 FOO (VLNEXT, "VLNEXT");
1387# endif
1388
1389 fprintf (stderr, "\n");
1390# undef FOO
1391#endif /* DEBUG_TTYMODE */
1392} 1584}
1393 1585
1394/*----------------------------------------------------------------------*/ 1586/*----------------------------------------------------------------------*/
1395/* 1587/*
1396 * Run the command in a subprocess and return a file descriptor for the 1588 * Run the command in a subprocess and return a file descriptor for the
… …
1417 else 1609 else
1418#endif 1610#endif
1419 if (!pty->get ()) 1611 if (!pty->get ())
1420 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1612 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1421 1613
1422 int er; 1614 struct termios tio = def_tio;
1423 1615
1424#ifndef NO_BACKSPACE_KEY 1616#ifndef NO_BACKSPACE_KEY
1425 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1617 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1426 er = rs[Rs_backspace_key][0]; 1618 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1427 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1619 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1428 er = '\177'; /* the initial state anyway */ 1620 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1429 else
1430#endif 1621#endif
1431 er = -1;
1432 1622
1433 rxvt_get_ttymode (&tio, er);
1434 /* init terminal attributes */ 1623 /* init terminal attributes */
1435 cfsetospeed (&tio, BAUDRATE); 1624 cfsetospeed (&tio, BAUDRATE);
1436 cfsetispeed (&tio, BAUDRATE); 1625 cfsetispeed (&tio, BAUDRATE);
1437 tcsetattr (pty->tty, TCSANOW, &tio); 1626 tcsetattr (pty->tty, TCSANOW, &tio);
1438 pty->set_utf8_mode (enc_utf8); 1627 pty->set_utf8_mode (enc_utf8);
… …
1525 signal (SIGQUIT, SIG_DFL); 1714 signal (SIGQUIT, SIG_DFL);
1526 signal (SIGCHLD, SIG_DFL); 1715 signal (SIGCHLD, SIG_DFL);
1527 signal (SIGHUP, SIG_DFL); 1716 signal (SIGHUP, SIG_DFL);
1528 signal (SIGPIPE, SIG_DFL); 1717 signal (SIGPIPE, SIG_DFL);
1529 /* 1718 /*
1530 * mimick login's behavior by disabling the job control signals 1719 * mimic login's behavior by disabling the job control signals
1531 * a shell that wants them can turn them back on 1720 * a shell that wants them can turn them back on
1532 */ 1721 */
1533#ifdef SIGTSTP 1722#ifdef SIGTSTP
1534 signal (SIGTSTP, SIG_IGN); 1723 signal (SIGTSTP, SIG_IGN);
1535 signal (SIGTTIN, SIG_IGN); 1724 signal (SIGTTIN, SIG_IGN);
… …
1554 const char *argv0, *shell; 1743 const char *argv0, *shell;
1555 1744
1556 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1745 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1557 shell = "/bin/sh"; 1746 shell = "/bin/sh";
1558 1747
1559 argv0 = (const char *)rxvt_basename (shell); 1748 argv0 = rxvt_basename (shell);
1560 1749
1561 if (option (Opt_loginShell)) 1750 if (option (Opt_loginShell))
1562 { 1751 {
1563 login = (char *)rxvt_malloc (strlen (argv0) + 2); 1752 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1564 1753

Diff Legend

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