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.344 by root, Fri Jan 7 21:17:08 2011 UTC vs.
Revision 1.354 by root, Mon Feb 21 07:41:02 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 ();
… …
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 ();
… …
956void 949void
957rxvt_term::set_colorfgbg () 950rxvt_term::set_colorfgbg ()
958{ 951{
959 unsigned int i; 952 unsigned int i;
960 const char *xpmb = ""; 953 const char *xpmb = "";
961 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 954 char fstr[] = "default";
955 char bstr[] = "default";
962 956
963 strcpy (fstr, "default");
964 strcpy (bstr, "default");
965 for (i = Color_Black; i <= Color_White; i++) 957 for (i = Color_Black; i <= Color_White; i++)
966 if (pix_colors[Color_fg] == pix_colors[i]) 958 if (pix_colors[Color_fg] == pix_colors[i])
967 { 959 {
968 sprintf (fstr, "%d", (i - Color_Black)); 960 sprintf (fstr, "%d", i - Color_Black);
969 break; 961 break;
970 } 962 }
971 963
972 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
973 if (pix_colors[Color_bg] == pix_colors[i]) 965 if (pix_colors[Color_bg] == pix_colors[i])
974 { 966 {
975 sprintf (bstr, "%d", (i - Color_Black)); 967 sprintf (bstr, "%d", i - Color_Black);
976#ifdef BG_IMAGE_FROM_FILE 968#ifdef BG_IMAGE_FROM_FILE
977 xpmb = "default;"; 969 xpmb = "default;";
978#endif 970#endif
979 break; 971 break;
980 } 972 }
… …
1083 XMoveResizeWindow (dpy, vt, 1075 XMoveResizeWindow (dpy, vt,
1084 window_vt_x, window_vt_y, 1076 window_vt_x, window_vt_y,
1085 width, height); 1077 width, height);
1086 1078
1087#ifdef HAVE_BG_PIXMAP 1079#ifdef HAVE_BG_PIXMAP
1088 if (bgPixmap.window_size_sensitive ()) 1080 if (bg_window_size_sensitive ())
1089 update_background (); 1081 update_background ();
1090#endif 1082#endif
1091 } 1083 }
1092 1084
1093 if (fix_screen || old_height == 0) 1085 if (fix_screen || old_height == 0)
1094 scr_reset (); 1086 scr_reset ();
1095
1096#ifdef HAVE_BG_PIXMAP
1097// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1098// if (bgPixmap.pixmap)
1099// scr_touch (false);
1100#endif
1101 1087
1102#ifdef USE_XIM 1088#ifdef USE_XIM
1103 IMSetPosition (); 1089 IMSetPosition ();
1104#endif 1090#endif
1105} 1091}
… …
1188 1174
1189 atom = XInternAtom (dpy, server, False); 1175 atom = XInternAtom (dpy, server, False);
1190 win = XGetSelectionOwner (dpy, atom); 1176 win = XGetSelectionOwner (dpy, atom);
1191 1177
1192 if (win != None) 1178 if (win != None)
1193 return True; 1179 return true;
1194 } 1180 }
1195 1181
1196 return False; 1182 return false;
1197} 1183}
1198 1184
1199void 1185void
1200rxvt_term::IMSendSpot () 1186rxvt_term::IMSendSpot ()
1201{ 1187{
… …
1354 p = pet[pi]; 1340 p = pet[pi];
1355 1341
1356 if (!p) 1342 if (!p)
1357 continue; 1343 continue;
1358 1344
1359 s = rxvt_splitcommastring (p); 1345 s = rxvt_strsplit (',', p);
1360 1346
1361 for (i = found = 0; !found && s[i]; i++) 1347 for (i = found = 0; !found && s[i]; i++)
1362 { 1348 {
1363 if (!strcmp (s[i], "OverTheSpot")) 1349 if (!strcmp (s[i], "OverTheSpot"))
1364 input_style = XIMPreeditPosition | XIMStatusNothing; 1350 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1376 input_style = XIMPreeditNothing | XIMStatusNothing; 1362 input_style = XIMPreeditNothing | XIMStatusNothing;
1377 1363
1378 for (j = 0; j < xim_styles->count_styles; j++) 1364 for (j = 0; j < xim_styles->count_styles; j++)
1379 if (input_style == xim_styles->supported_styles[j]) 1365 if (input_style == xim_styles->supported_styles[j])
1380 { 1366 {
1381 rxvt_freecommastring (s); 1367 rxvt_free_strsplit (s);
1382 1368
1383 found = 1; 1369 found = 1;
1384 goto foundpet; 1370 goto foundpet;
1385 } 1371 }
1386 1372
1387 } 1373 }
1388 1374
1389 rxvt_freecommastring (s); 1375 rxvt_free_strsplit (s);
1390 } 1376 }
1391 1377
1392foundpet: 1378foundpet:
1393 1379
1394 XFree (xim_styles); 1380 XFree (xim_styles);
… …
1550 p = rs[Rs_inputMethod]; 1536 p = rs[Rs_inputMethod];
1551 if (p && *p) 1537 if (p && *p)
1552 { 1538 {
1553 bool found = false; 1539 bool found = false;
1554 1540
1555 s = rxvt_splitcommastring (p); 1541 s = rxvt_strsplit (',', p);
1556 1542
1557 for (i = 0; s[i]; i++) 1543 for (i = 0; s[i]; i++)
1558 { 1544 {
1559 if (*s[i]) 1545 if (*s[i])
1560 { 1546 {
… …
1566 break; 1552 break;
1567 } 1553 }
1568 } 1554 }
1569 } 1555 }
1570 1556
1571 rxvt_freecommastring (s); 1557 rxvt_free_strsplit (s);
1572 1558
1573 if (found) 1559 if (found)
1574 goto done; 1560 goto done;
1575 } 1561 }
1576 1562
… …
1669rxvt_term::update_background () 1655rxvt_term::update_background ()
1670{ 1656{
1671 if (update_background_ev.is_active ()) 1657 if (update_background_ev.is_active ())
1672 return; 1658 return;
1673 1659
1674 bgPixmap.invalidate (); 1660 bg_invalidate ();
1675 1661
1676 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1662 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1677 1663
1678 if (to_wait <= 0.) 1664 if (to_wait <= 0.)
1679 bgPixmap.render (); 1665 bg_render ();
1680 else 1666 else
1681 update_background_ev.start (to_wait); 1667 update_background_ev.start (to_wait);
1682} 1668}
1683 1669
1684void 1670void
1685rxvt_term::update_background_cb (ev::timer &w, int revents) 1671rxvt_term::update_background_cb (ev::timer &w, int revents)
1686{ 1672{
1687 make_current (); 1673 make_current ();
1688 1674
1689 update_background_ev.stop (); 1675 update_background_ev.stop ();
1690 bgPixmap.render (); 1676 bg_render ();
1691 refresh_check (); 1677 refresh_check ();
1692} 1678}
1693 1679
1694#endif /* HAVE_BG_PIXMAP */ 1680#endif /* HAVE_BG_PIXMAP */
1695 1681

Diff Legend

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