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.348 by sf-exg, Thu Jan 20 16:41:23 2011 UTC vs.
Revision 1.355 by sf-exg, Thu Apr 7 12:19:40 2011 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2010 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
187#endif 187#endif
188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 194
196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
197 196
… …
226 delete fontset[i]; 225 delete fontset[i];
227#endif 226#endif
228 delete fontset[0]; 227 delete fontset[0];
229 228
230#ifdef HAVE_BG_PIXMAP 229#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy (); 230 bg_destroy ();
232#endif
233#ifdef HAVE_AFTERIMAGE
234 if (asv)
235 destroy_asvisual (asv, 0);
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif 231#endif
239 232
240 if (display) 233 if (display)
241 { 234 {
242 selection_clear (); 235 selection_clear ();
… …
248 scrollBar.destroy (); 241 scrollBar.destroy ();
249 if (gc) XFreeGC (dpy, gc); 242 if (gc) XFreeGC (dpy, gc);
250 243
251 delete drawable; 244 delete drawable;
252 // destroy all windows 245 // destroy all windows
253 if (parent[0]) 246 if (parent)
254 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
255 248
256 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
257 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
258 { 251 {
259 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
… …
279 // TODO: manage env vars in child only(!) 272 // TODO: manage env vars in child only(!)
280 free (env_display); 273 free (env_display);
281 free (env_term); 274 free (env_term);
282 free (locale); 275 free (locale);
283 free (v_buffer); 276 free (v_buffer);
284 free (incr_buf); 277
278 delete selection_req;
285 279
286 delete envv; 280 delete envv;
287 delete argv; 281 delete argv;
288 282
289#ifdef KEYSYM_RESOURCE 283#ifdef KEYSYM_RESOURCE
… …
325#endif 319#endif
326 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
327#if ENABLE_TRANSPARENCY || ENABLE_PERL 321#if ENABLE_TRANSPARENCY || ENABLE_PERL
328 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
329#endif 323#endif
330 incr_ev.stop ();
331 termwin_ev.stop (display); 324 termwin_ev.stop (display);
332 vt_ev.stop (display); 325 vt_ev.stop (display);
333 } 326 }
334 327
335 flush_ev.stop (); 328 flush_ev.stop ();
… …
815#else 808#else
816 fontset[style] = fontset[0]; 809 fontset[style] = fontset[0];
817#endif 810#endif
818 } 811 }
819 812
820 if (parent[0]) 813 if (parent)
821 { 814 {
822 resize_all_windows (0, 0, 0); 815 resize_all_windows (0, 0, 0);
823 scr_remap_chars (); 816 scr_remap_chars ();
824 scr_touch (true); 817 scr_touch (true);
825 } 818 }
… …
828} 821}
829 822
830void 823void
831rxvt_term::set_string_property (Atom prop, const char *str, int len) 824rxvt_term::set_string_property (Atom prop, const char *str, int len)
832{ 825{
833 XChangeProperty (dpy, parent[0], 826 XChangeProperty (dpy, parent,
834 prop, XA_STRING, 8, PropModeReplace, 827 prop, XA_STRING, 8, PropModeReplace,
835 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 828 (const unsigned char *)str, len >= 0 ? len : strlen (str));
836} 829}
837 830
838void 831void
… …
840{ 833{
841 XTextProperty ct; 834 XTextProperty ct;
842 835
843 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 836 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844 { 837 {
845 XSetTextProperty (dpy, parent[0], &ct, prop); 838 XSetTextProperty (dpy, parent, &ct, prop);
846 XFree (ct.value); 839 XFree (ct.value);
847 } 840 }
848} 841}
849 842
850void 843void
851rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 844rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
852{ 845{
853 wchar_t *ws = rxvt_mbstowcs (str, len); 846 wchar_t *ws = rxvt_mbstowcs (str, len);
854 char *s = rxvt_wcstoutf8 (ws); 847 char *s = rxvt_wcstoutf8 (ws);
855 848
856 XChangeProperty (dpy, parent[0], 849 XChangeProperty (dpy, parent,
857 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 850 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
858 (const unsigned char *)s, strlen (s)); 851 (const unsigned char *)s, strlen (s));
859 852
860 free (s); 853 free (s);
861 free (ws); 854 free (ws);
… …
1015 1008
1016 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1009 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1017 if (set_hint) 1010 if (set_hint)
1018 { 1011 {
1019 szHint.flags &= ~(PBaseSize | PResizeInc); 1012 szHint.flags &= ~(PBaseSize | PResizeInc);
1020 XSetWMNormalHints (dpy, parent[0], &szHint); 1013 XSetWMNormalHints (dpy, parent, &szHint);
1021 szHint.flags |= PBaseSize | PResizeInc; 1014 szHint.flags |= PBaseSize | PResizeInc;
1022 } 1015 }
1023 1016
1024 if (!ignoreparent) 1017 if (!ignoreparent)
1025 { 1018 {
… …
1031 int x, y, x1, y1; 1024 int x, y, x1, y1;
1032 int dx, dy; 1025 int dx, dy;
1033 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1026 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1034 Window unused_cr; 1027 Window unused_cr;
1035 1028
1036 XTranslateCoordinates (dpy, parent[0], display->root, 1029 XTranslateCoordinates (dpy, parent, display->root,
1037 0, 0, &x, &y, &unused_cr); 1030 0, 0, &x, &y, &unused_cr);
1038 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1031 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1039 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1032 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1040 /* 1033 /*
1041 * if display->root isn't the parent window, a WM will probably have offset 1034 * if display->root isn't the parent window, a WM will probably have offset
1042 * our position for handles and decorations. Counter it 1035 * our position for handles and decorations. Counter it
1043 */ 1036 */
… …
1060 if (y < y1) /* top half */ 1053 if (y < y1) /* top half */
1061 dy = 0; 1054 dy = 0;
1062 else if (y == y1) /* exact center */ 1055 else if (y == y1) /* exact center */
1063 dy /= 2; 1056 dy /= 2;
1064 1057
1065 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1058 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1066 szHint.width, szHint.height); 1059 szHint.width, szHint.height);
1067#else 1060#else
1068 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1061 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1069#endif 1062#endif
1070 } 1063 }
1071 1064
1072 if (set_hint) 1065 if (set_hint)
1073 XSetWMNormalHints (dpy, parent[0], &szHint); 1066 XSetWMNormalHints (dpy, parent, &szHint);
1074 1067
1075 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1068 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1076 1069
1077 if (fix_screen || newwidth != old_width || newheight != old_height) 1070 if (fix_screen || newwidth != old_width || newheight != old_height)
1078 { 1071 {
… …
1082 XMoveResizeWindow (dpy, vt, 1075 XMoveResizeWindow (dpy, vt,
1083 window_vt_x, window_vt_y, 1076 window_vt_x, window_vt_y,
1084 width, height); 1077 width, height);
1085 1078
1086#ifdef HAVE_BG_PIXMAP 1079#ifdef HAVE_BG_PIXMAP
1087 if (bgPixmap.window_size_sensitive ()) 1080 if (bg_window_size_sensitive ())
1088 update_background (); 1081 update_background ();
1089#endif 1082#endif
1090 } 1083 }
1091 1084
1092 if (fix_screen || old_height == 0) 1085 if (fix_screen || old_height == 0)
… …
1181 1174
1182 atom = XInternAtom (dpy, server, False); 1175 atom = XInternAtom (dpy, server, False);
1183 win = XGetSelectionOwner (dpy, atom); 1176 win = XGetSelectionOwner (dpy, atom);
1184 1177
1185 if (win != None) 1178 if (win != None)
1186 return True; 1179 return true;
1187 } 1180 }
1188 1181
1189 return False; 1182 return false;
1190} 1183}
1191 1184
1192void 1185void
1193rxvt_term::IMSendSpot () 1186rxvt_term::IMSendSpot ()
1194{ 1187{
… …
1490#endif 1483#endif
1491 1484
1492 Input_Context = XCreateIC (xim, 1485 Input_Context = XCreateIC (xim,
1493 XNInputStyle, input_style, 1486 XNInputStyle, input_style,
1494 XNClientWindow, vt, 1487 XNClientWindow, vt,
1495 XNFocusWindow, parent[0], 1488 XNFocusWindow, parent,
1496 preedit_attr ? XNPreeditAttributes : NULL, 1489 preedit_attr ? XNPreeditAttributes : NULL,
1497 preedit_attr, 1490 preedit_attr,
1498 status_attr ? XNStatusAttributes : NULL, 1491 status_attr ? XNStatusAttributes : NULL,
1499 status_attr, NULL); 1492 status_attr, NULL);
1500 1493
… …
1629 1622
1630void 1623void
1631rxvt_term::get_window_origin (int &x, int &y) 1624rxvt_term::get_window_origin (int &x, int &y)
1632{ 1625{
1633 Window cr; 1626 Window cr;
1634 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1627 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1635} 1628}
1636 1629
1637Pixmap 1630Pixmap
1638rxvt_term::get_pixmap_property (Atom property) 1631rxvt_term::get_pixmap_property (Atom property)
1639{ 1632{
… …
1662rxvt_term::update_background () 1655rxvt_term::update_background ()
1663{ 1656{
1664 if (update_background_ev.is_active ()) 1657 if (update_background_ev.is_active ())
1665 return; 1658 return;
1666 1659
1667 bgPixmap.invalidate (); 1660 bg_invalidate ();
1668 1661
1669 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1662 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1670 1663
1671 if (to_wait <= 0.) 1664 if (to_wait <= 0.)
1672 bgPixmap.render (); 1665 bg_render ();
1673 else 1666 else
1674 update_background_ev.start (to_wait); 1667 update_background_ev.start (to_wait);
1675} 1668}
1676 1669
1677void 1670void
1678rxvt_term::update_background_cb (ev::timer &w, int revents) 1671rxvt_term::update_background_cb (ev::timer &w, int revents)
1679{ 1672{
1680 make_current (); 1673 make_current ();
1681 1674
1682 update_background_ev.stop (); 1675 update_background_ev.stop ();
1683 bgPixmap.render (); 1676 bg_render ();
1684 refresh_check (); 1677 refresh_check ();
1685} 1678}
1686 1679
1687#endif /* HAVE_BG_PIXMAP */ 1680#endif /* HAVE_BG_PIXMAP */
1688 1681

Diff Legend

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