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.293 by root, Mon Feb 21 07:41:01 2011 UTC vs.
Revision 1.297 by sf-exg, Mon Aug 15 11:01:54 2011 UTC

… …
627 627
628 for (int i = NUM_RESOURCES; i--; ) 628 for (int i = NUM_RESOURCES; i--; )
629 if (rs [i] == resval_undef) 629 if (rs [i] == resval_undef)
630 rs [i] = 0; 630 rs [i] = 0;
631 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#endif
640
641#if ENABLE_PERL 632#if ENABLE_PERL
642 if (!rs[Rs_perl_ext_1]) 633 if (!rs[Rs_perl_ext_1])
643 rs[Rs_perl_ext_1] = "default"; 634 rs[Rs_perl_ext_1] = "default";
644 635
645 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 636 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
874#if ENABLE_XEMBED 865#if ENABLE_XEMBED
875 if (rs[Rs_embed]) 866 if (rs[Rs_embed])
876 { 867 {
877 long info[2] = { 0, XEMBED_MAPPED }; 868 long info[2] = { 0, XEMBED_MAPPED };
878 869
879 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 870 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
880 32, PropModeReplace, (unsigned char *)&info, 2); 871 32, PropModeReplace, (unsigned char *)&info, 2);
881 } 872 }
882#endif 873#endif
883 874
884 XMapWindow (dpy, vt); 875 XMapWindow (dpy, vt);
885 XMapWindow (dpy, parent[0]); 876 XMapWindow (dpy, parent);
886 877
887 refresh_check (); 878 refresh_check ();
888} 879}
889 880
890/*----------------------------------------------------------------------*/ 881/*----------------------------------------------------------------------*/
… …
916 907
917 env_display = (char *)rxvt_malloc (strlen (val) + 9); 908 env_display = (char *)rxvt_malloc (strlen (val) + 9);
918 909
919 sprintf (env_display, "DISPLAY=%s", val); 910 sprintf (env_display, "DISPLAY=%s", val);
920 911
921 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 912 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
922 913
923 /* add entries to the environment: 914 /* add entries to the environment:
924 * @ DISPLAY: in case we started with -display 915 * @ DISPLAY: in case we started with -display
925 * @ WINDOWID: X window id number of the window 916 * @ WINDOWID: X window id number of the window
926 * @ COLORTERM: terminal sub-name and also indicates its color 917 * @ COLORTERM: terminal sub-name and also indicates its color
… …
1323 buffer [1] = h; 1314 buffer [1] = h;
1324 1315
1325 for (unsigned int i = 0; i < w * h; ++i) 1316 for (unsigned int i = 0; i < w * h; ++i)
1326 buffer [i + 2] = asbuf [i]; 1317 buffer [i + 2] = asbuf [i];
1327 1318
1328 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1319 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1329 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1320 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1330 free (buffer); 1321 free (buffer);
1331 } 1322 }
1332 else 1323 else
1333 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1324 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1380 } 1371 }
1381 1372
1382 row += rowstride; 1373 row += rowstride;
1383 } 1374 }
1384 1375
1385 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1376 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1386 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1377 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1387 free (buffer); 1378 free (buffer);
1388 } 1379 }
1389 else 1380 else
1390 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1381 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1392 g_object_unref (pixbuf); 1383 g_object_unref (pixbuf);
1393#endif 1384#endif
1394} 1385}
1395 1386
1396/*----------------------------------------------------------------------*/ 1387/*----------------------------------------------------------------------*/
1397/* rxvt_Create_Windows () - Open and map the window */ 1388/* Open and map the window */
1398void 1389void
1399rxvt_term::create_windows (int argc, const char *const *argv) 1390rxvt_term::create_windows (int argc, const char *const *argv)
1400{ 1391{
1401 XClassHint classHint; 1392 XClassHint classHint;
1402 XWMHints wmHint; 1393 XWMHints wmHint;
… …
1448 } 1439 }
1449#endif 1440#endif
1450 1441
1451 window_calc (0, 0); 1442 window_calc (0, 0);
1452 1443
1453 /* sub-window placement & size in rxvt_resize_subwindows () */ 1444 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1454 attributes.background_pixel = pix_colors_focused [Color_border]; 1445 attributes.background_pixel = pix_colors_focused [Color_border];
1455 attributes.border_pixel = pix_colors_focused [Color_border]; 1446 attributes.border_pixel = pix_colors_focused [Color_border];
1456 attributes.colormap = cmap; 1447 attributes.colormap = cmap;
1457 1448
1458 top = XCreateWindow (dpy, parent, 1449 top = XCreateWindow (dpy, parent,
… …
1461 ext_bwidth, 1452 ext_bwidth,
1462 depth, InputOutput, visual, 1453 depth, InputOutput, visual,
1463 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1454 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1464 &attributes); 1455 &attributes);
1465 1456
1466 this->parent[0] = top; 1457 this->parent = top;
1467 1458
1468 old_width = szHint.width; 1459 old_width = szHint.width;
1469 old_height = szHint.height; 1460 old_height = szHint.height;
1470 1461
1471 set_title (rs [Rs_title]); 1462 set_title (rs [Rs_title]);
… …
1504#if ENABLE_EWMH 1495#if ENABLE_EWMH
1505 xa[XA_NET_WM_PING], 1496 xa[XA_NET_WM_PING],
1506#endif 1497#endif
1507 }; 1498 };
1508 1499
1509 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols)); 1500 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1510 1501
1511#if ENABLE_FRILLS 1502#if ENABLE_FRILLS
1512 if (rs[Rs_transient_for]) 1503 if (rs[Rs_transient_for])
1513 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1504 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1514#endif 1505#endif

Diff Legend

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