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.257 by root, Sun Apr 26 01:51:20 2009 UTC vs.
Revision 1.289 by root, Mon Jan 3 03:05:47 2011 UTC

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

Diff Legend

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