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.345 by root, Sat Jan 8 10:17:43 2011 UTC vs.
Revision 1.352 by sf-exg, Fri Feb 11 01:24:46 2011 UTC

… …
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);
285 277
286 delete envv; 278 delete envv;
287 delete argv; 279 delete argv;
288 280
289#ifdef KEYSYM_RESOURCE 281#ifdef KEYSYM_RESOURCE
… …
325#endif 317#endif
326 scrollbar_ev.stop (display); 318 scrollbar_ev.stop (display);
327#if ENABLE_TRANSPARENCY || ENABLE_PERL 319#if ENABLE_TRANSPARENCY || ENABLE_PERL
328 rootwin_ev.stop (display); 320 rootwin_ev.stop (display);
329#endif 321#endif
330 incr_ev.stop ();
331 termwin_ev.stop (display); 322 termwin_ev.stop (display);
332 vt_ev.stop (display); 323 vt_ev.stop (display);
333 } 324 }
334 325
335 flush_ev.stop (); 326 flush_ev.stop ();
… …
956void 947void
957rxvt_term::set_colorfgbg () 948rxvt_term::set_colorfgbg ()
958{ 949{
959 unsigned int i; 950 unsigned int i;
960 const char *xpmb = ""; 951 const char *xpmb = "";
961 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 952 char fstr[] = "default";
953 char bstr[] = "default";
962 954
963 strcpy (fstr, "default");
964 strcpy (bstr, "default");
965 for (i = Color_Black; i <= Color_White; i++) 955 for (i = Color_Black; i <= Color_White; i++)
966 if (pix_colors[Color_fg] == pix_colors[i]) 956 if (pix_colors[Color_fg] == pix_colors[i])
967 { 957 {
968 sprintf (fstr, "%d", i - Color_Black); 958 sprintf (fstr, "%d", i - Color_Black);
969 break; 959 break;
… …
1083 XMoveResizeWindow (dpy, vt, 1073 XMoveResizeWindow (dpy, vt,
1084 window_vt_x, window_vt_y, 1074 window_vt_x, window_vt_y,
1085 width, height); 1075 width, height);
1086 1076
1087#ifdef HAVE_BG_PIXMAP 1077#ifdef HAVE_BG_PIXMAP
1088 if (bgPixmap.window_size_sensitive ()) 1078 if (bg_window_size_sensitive ())
1089 update_background (); 1079 update_background ();
1090#endif 1080#endif
1091 } 1081 }
1092 1082
1093 if (fix_screen || old_height == 0) 1083 if (fix_screen || old_height == 0)
1094 scr_reset (); 1084 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 1085
1102#ifdef USE_XIM 1086#ifdef USE_XIM
1103 IMSetPosition (); 1087 IMSetPosition ();
1104#endif 1088#endif
1105} 1089}
… …
1188 1172
1189 atom = XInternAtom (dpy, server, False); 1173 atom = XInternAtom (dpy, server, False);
1190 win = XGetSelectionOwner (dpy, atom); 1174 win = XGetSelectionOwner (dpy, atom);
1191 1175
1192 if (win != None) 1176 if (win != None)
1193 return True; 1177 return true;
1194 } 1178 }
1195 1179
1196 return False; 1180 return false;
1197} 1181}
1198 1182
1199void 1183void
1200rxvt_term::IMSendSpot () 1184rxvt_term::IMSendSpot ()
1201{ 1185{
… …
1354 p = pet[pi]; 1338 p = pet[pi];
1355 1339
1356 if (!p) 1340 if (!p)
1357 continue; 1341 continue;
1358 1342
1359 s = rxvt_splitcommastring (p); 1343 s = rxvt_strsplit (',', p);
1360 1344
1361 for (i = found = 0; !found && s[i]; i++) 1345 for (i = found = 0; !found && s[i]; i++)
1362 { 1346 {
1363 if (!strcmp (s[i], "OverTheSpot")) 1347 if (!strcmp (s[i], "OverTheSpot"))
1364 input_style = XIMPreeditPosition | XIMStatusNothing; 1348 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1376 input_style = XIMPreeditNothing | XIMStatusNothing; 1360 input_style = XIMPreeditNothing | XIMStatusNothing;
1377 1361
1378 for (j = 0; j < xim_styles->count_styles; j++) 1362 for (j = 0; j < xim_styles->count_styles; j++)
1379 if (input_style == xim_styles->supported_styles[j]) 1363 if (input_style == xim_styles->supported_styles[j])
1380 { 1364 {
1381 rxvt_freecommastring (s); 1365 rxvt_free_strsplit (s);
1382 1366
1383 found = 1; 1367 found = 1;
1384 goto foundpet; 1368 goto foundpet;
1385 } 1369 }
1386 1370
1387 } 1371 }
1388 1372
1389 rxvt_freecommastring (s); 1373 rxvt_free_strsplit (s);
1390 } 1374 }
1391 1375
1392foundpet: 1376foundpet:
1393 1377
1394 XFree (xim_styles); 1378 XFree (xim_styles);
… …
1550 p = rs[Rs_inputMethod]; 1534 p = rs[Rs_inputMethod];
1551 if (p && *p) 1535 if (p && *p)
1552 { 1536 {
1553 bool found = false; 1537 bool found = false;
1554 1538
1555 s = rxvt_splitcommastring (p); 1539 s = rxvt_strsplit (',', p);
1556 1540
1557 for (i = 0; s[i]; i++) 1541 for (i = 0; s[i]; i++)
1558 { 1542 {
1559 if (*s[i]) 1543 if (*s[i])
1560 { 1544 {
… …
1566 break; 1550 break;
1567 } 1551 }
1568 } 1552 }
1569 } 1553 }
1570 1554
1571 rxvt_freecommastring (s); 1555 rxvt_free_strsplit (s);
1572 1556
1573 if (found) 1557 if (found)
1574 goto done; 1558 goto done;
1575 } 1559 }
1576 1560
… …
1669rxvt_term::update_background () 1653rxvt_term::update_background ()
1670{ 1654{
1671 if (update_background_ev.is_active ()) 1655 if (update_background_ev.is_active ())
1672 return; 1656 return;
1673 1657
1674 bgPixmap.invalidate (); 1658 bg_invalidate ();
1675 1659
1676 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1660 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1677 1661
1678 if (to_wait <= 0.) 1662 if (to_wait <= 0.)
1679 bgPixmap.render (); 1663 bg_render ();
1680 else 1664 else
1681 update_background_ev.start (to_wait); 1665 update_background_ev.start (to_wait);
1682} 1666}
1683 1667
1684void 1668void
1685rxvt_term::update_background_cb (ev::timer &w, int revents) 1669rxvt_term::update_background_cb (ev::timer &w, int revents)
1686{ 1670{
1687 make_current (); 1671 make_current ();
1688 1672
1689 update_background_ev.stop (); 1673 update_background_ev.stop ();
1690 bgPixmap.render (); 1674 bg_render ();
1691 refresh_check (); 1675 refresh_check ();
1692} 1676}
1693 1677
1694#endif /* HAVE_BG_PIXMAP */ 1678#endif /* HAVE_BG_PIXMAP */
1695 1679

Diff Legend

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