ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.245 by sasha, Fri Aug 17 22:02:14 2007 UTC vs.
Revision 1.253 by ayin, Mon Oct 15 07:33:48 2007 UTC

… …
201#endif 201#endif
202} 202}
203 203
204// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
205// for use before an emergency exit 205// for use before an emergency exit
206void
206void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
207{ 208{
208 if (cmd_pid) 209 if (cmd_pid)
209 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
210 211
211 pty_ev.stop (); 212 pty_ev.stop ();
… …
527 XSelectInput (dpy, display->root, PropertyChangeMask); 528 XSelectInput (dpy, display->root, PropertyChangeMask);
528 rootwin_ev.start (display, display->root); 529 rootwin_ev.start (display, display->root);
529 } 530 }
530#endif 531#endif
531 532
532#ifdef XPM_BACKGROUND 533#ifdef BG_IMAGE_FROM_FILE
533 if (rs[Rs_backgroundPixmap] != NULL) 534 if (rs[Rs_backgroundPixmap] != NULL)
534 { 535 {
535 const char *p = rs[Rs_backgroundPixmap]; 536 const char *p = rs[Rs_backgroundPixmap];
536 537
537 if ((p = strchr (p, ';')) != NULL) 538 if ((p = strchr (p, ';')) != NULL)
… …
540 bgPixmap.set_geometry (p); 541 bgPixmap.set_geometry (p);
541 } 542 }
542 else 543 else
543 bgPixmap.set_defaultGeometry (); 544 bgPixmap.set_defaultGeometry ();
544 545
545 bgPixmap.set_file (rs[Rs_backgroundPixmap]); 546 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
547 if (!bgPixmap.window_position_sensitive ())
548 update_background ();
546 } 549 }
547 /* do not want to render Pixmap yet if we are size/position dependant -
548 * wait for ConfigureNotify at least
549 * TODO: this does not work for some reason when transparency is disabled !!!!
550 */
551 if (!bgPixmap.window_size_sensitive ())
552 update_background ();
553#endif 550#endif
554 } 551 }
555#endif 552#endif
556 553
557#if ENABLE_PERL 554#if ENABLE_PERL
… …
905 } 902 }
906 903
907 return true; 904 return true;
908} 905}
909 906
907void
910void rxvt_term::set_string_property (Atom prop, const char *str, int len) 908rxvt_term::set_string_property (Atom prop, const char *str, int len)
911{ 909{
912 XChangeProperty (dpy, parent[0], 910 XChangeProperty (dpy, parent[0],
913 prop, XA_STRING, 8, PropModeReplace, 911 prop, XA_STRING, 8, PropModeReplace,
914 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 912 (const unsigned char *)str, len >= 0 ? len : strlen (str));
915} 913}
916 914
915void
917void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 916rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
918{ 917{
919 wchar_t *ws = rxvt_mbstowcs (str, len); 918 wchar_t *ws = rxvt_mbstowcs (str, len);
920 char *s = rxvt_wcstoutf8 (ws); 919 char *s = rxvt_wcstoutf8 (ws);
921 920
922 XChangeProperty (dpy, parent[0], 921 XChangeProperty (dpy, parent[0],
… …
946#if ENABLE_EWMH 945#if ENABLE_EWMH
947 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 946 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
948#endif 947#endif
949} 948}
950 949
950void
951rxvt_term::set_window_color (int idx, const char *color)
952{
951#ifdef XTERM_COLOR_CHANGE 953#ifdef XTERM_COLOR_CHANGE
952void
953rxvt_term::set_window_color (int idx, const char *color)
954{
955 rxvt_color xcol; 954 rxvt_color xcol;
956 int i; 955 int i;
957 956
958 if (color == NULL || *color == '\0') 957 if (color == NULL || *color == '\0')
959 return; 958 return;
… …
996 /*TODO: handle Color_BD, scrollbar background, etc. */ 995 /*TODO: handle Color_BD, scrollbar background, etc. */
997 996
998 update_fade_color (idx); 997 update_fade_color (idx);
999 recolour_cursor (); 998 recolour_cursor ();
1000 scr_recolour (); 999 scr_recolour ();
1001}
1002
1003#else
1004# define set_window_color (idx,color) ((void)0)
1005#endif /* XTERM_COLOR_CHANGE */ 1000#endif /* XTERM_COLOR_CHANGE */
1001}
1006 1002
1007void 1003void
1008rxvt_term::recolour_cursor () 1004rxvt_term::recolour_cursor ()
1009{ 1005{
1010 XColor fg, bg; 1006 XColor fg, bg;
… …
1042 1038
1043 for (i = Color_Black; i <= Color_White; i++) 1039 for (i = Color_Black; i <= Color_White; i++)
1044 if (pix_colors[Color_bg] == pix_colors[i]) 1040 if (pix_colors[Color_bg] == pix_colors[i])
1045 { 1041 {
1046 sprintf (bstr, "%d", (i - Color_Black)); 1042 sprintf (bstr, "%d", (i - Color_Black));
1047#ifdef XPM_BACKGROUND 1043#ifdef BG_IMAGE_FROM_FILE
1048 xpmb = "default;"; 1044 xpmb = "default;";
1049#endif 1045#endif
1050 break; 1046 break;
1051 } 1047 }
1052 1048
… …
1148 1144
1149 XMoveResizeWindow (dpy, vt, 1145 XMoveResizeWindow (dpy, vt,
1150 window_vt_x, window_vt_y, 1146 window_vt_x, window_vt_y,
1151 width, height); 1147 width, height);
1152 1148
1153#ifdef XPM_BACKGROUND 1149#ifdef HAVE_BG_PIXMAP
1154 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1155 if (bgPixmap.window_size_sensitive ()) 1150 if (bgPixmap.window_size_sensitive ())
1156 update_background (); 1151 update_background ();
1157#endif 1152#endif
1158 1153
1159 scr_clear (); 1154 scr_clear ();
1160 } 1155 }
1161 1156
… …
1705 1700
1706 XFree (preedit_attr); 1701 XFree (preedit_attr);
1707} 1702}
1708#endif /* USE_XIM */ 1703#endif /* USE_XIM */
1709 1704
1705void
1706rxvt_term::get_window_origin (int &x, int &y)
1707{
1708 Window cr;
1709 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1710/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1711}
1712
1713Pixmap
1714rxvt_term::get_pixmap_property (int prop_id)
1715{
1716 if (prop_id > 0 && prop_id < NUM_XA)
1717 if (xa[prop_id])
1718 {
1719 int aformat;
1720 unsigned long nitems, bytes_after;
1721 Atom atype;
1722 unsigned char *prop = NULL;
1723 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1724 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1725 &nitems, &bytes_after, &prop);
1726 if (result == Success && prop && atype == XA_PIXMAP)
1727 {
1728 return *(Pixmap *)prop;
1729 }
1730 }
1731 return None;
1732}
1733
1734#ifdef HAVE_BG_PIXMAP
1735int
1736rxvt_term::update_background ()
1737{
1738 bgPixmap.invalidate ();
1739
1740 /* no chance of real time refresh if we are blurring ! */
1741 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1742 bgPixmap.render ();
1743 else
1744 {
1745 update_background_ev.stop ();
1746 if (!bgPixmap.need_client_side_rendering())
1747 update_background_ev.start (NOW + .05);
1748 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1749 update_background_ev.start (NOW + .2); /* very slow !!! */
1750 else
1751 update_background_ev.start (NOW + .07);
1752 }
1753 return 0;
1754}
1755
1756void
1757rxvt_term::update_background_cb (time_watcher &w)
1758{
1759 bgPixmap.render ();
1760}
1761
1762#endif /* HAVE_BG_PIXMAP */
1763
1710/*----------------------- end-of-file (C source) -----------------------*/ 1764/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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