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.339 by root, Tue Dec 7 19:53:20 2010 UTC vs.
Revision 1.352 by sf-exg, Fri Feb 11 01:24:46 2011 UTC

… …
96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
97{ 97{
98 compose_char *cc; 98 compose_char *cc;
99 99
100 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
101 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
102 cc = (*this)[c1]; 102 cc = (*this)[c1];
103 while (cc) 103 while (cc)
104 { 104 {
105 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
106 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
107 } 107 }
108 108
109 // check to see whether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
110 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
111 {
112 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
113 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
114 }
115 113
116 // allocate a new combination 114 // allocate a new combination
117 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
118 { 116 {
119 static int seen; 117 static int seen;
120 118
121 if (!seen++) 119 if (!seen++)
122 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
123 121
124 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
125 } 123 }
126 124
127 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
… …
189#endif 187#endif
190 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 194
198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
199 196
… …
228 delete fontset[i]; 225 delete fontset[i];
229#endif 226#endif
230 delete fontset[0]; 227 delete fontset[0];
231 228
232#ifdef HAVE_BG_PIXMAP 229#ifdef HAVE_BG_PIXMAP
233 bgPixmap.destroy (); 230 bg_destroy ();
234#endif
235#ifdef HAVE_AFTERIMAGE
236 if (asv)
237 destroy_asvisual (asv, 0);
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif 231#endif
241 232
242 if (display) 233 if (display)
243 { 234 {
244 selection_clear (); 235 selection_clear ();
… …
281 // TODO: manage env vars in child only(!) 272 // TODO: manage env vars in child only(!)
282 free (env_display); 273 free (env_display);
283 free (env_term); 274 free (env_term);
284 free (locale); 275 free (locale);
285 free (v_buffer); 276 free (v_buffer);
286 free (incr_buf);
287 277
288 delete envv; 278 delete envv;
289 delete argv; 279 delete argv;
290 280
291#ifdef KEYSYM_RESOURCE 281#ifdef KEYSYM_RESOURCE
… …
327#endif 317#endif
328 scrollbar_ev.stop (display); 318 scrollbar_ev.stop (display);
329#if ENABLE_TRANSPARENCY || ENABLE_PERL 319#if ENABLE_TRANSPARENCY || ENABLE_PERL
330 rootwin_ev.stop (display); 320 rootwin_ev.stop (display);
331#endif 321#endif
332 incr_ev.stop ();
333 termwin_ev.stop (display); 322 termwin_ev.stop (display);
334 vt_ev.stop (display); 323 vt_ev.stop (display);
335 } 324 }
336 325
337 flush_ev.stop (); 326 flush_ev.stop ();
… …
394print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
395{ 384{
396 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
397 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
398 char number[32]; 387 char number[32];
399 char *mtype = "XlibMessage"; 388 const char mtype[] = "XlibMessage";
400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 389 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
402 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 391 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
403 rxvt_warn ("%s: %s\n", mesg, buffer); 392 rxvt_warn ("%s: %s\n", mesg, buffer);
404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 393 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
… …
958void 947void
959rxvt_term::set_colorfgbg () 948rxvt_term::set_colorfgbg ()
960{ 949{
961 unsigned int i; 950 unsigned int i;
962 const char *xpmb = ""; 951 const char *xpmb = "";
963 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 952 char fstr[] = "default";
953 char bstr[] = "default";
964 954
965 strcpy (fstr, "default");
966 strcpy (bstr, "default");
967 for (i = Color_Black; i <= Color_White; i++) 955 for (i = Color_Black; i <= Color_White; i++)
968 if (pix_colors[Color_fg] == pix_colors[i]) 956 if (pix_colors[Color_fg] == pix_colors[i])
969 { 957 {
970 sprintf (fstr, "%d", (i - Color_Black)); 958 sprintf (fstr, "%d", i - Color_Black);
971 break; 959 break;
972 } 960 }
973 961
974 for (i = Color_Black; i <= Color_White; i++) 962 for (i = Color_Black; i <= Color_White; i++)
975 if (pix_colors[Color_bg] == pix_colors[i]) 963 if (pix_colors[Color_bg] == pix_colors[i])
976 { 964 {
977 sprintf (bstr, "%d", (i - Color_Black)); 965 sprintf (bstr, "%d", i - Color_Black);
978#ifdef BG_IMAGE_FROM_FILE 966#ifdef BG_IMAGE_FROM_FILE
979 xpmb = "default;"; 967 xpmb = "default;";
980#endif 968#endif
981 break; 969 break;
982 } 970 }
… …
1085 XMoveResizeWindow (dpy, vt, 1073 XMoveResizeWindow (dpy, vt,
1086 window_vt_x, window_vt_y, 1074 window_vt_x, window_vt_y,
1087 width, height); 1075 width, height);
1088 1076
1089#ifdef HAVE_BG_PIXMAP 1077#ifdef HAVE_BG_PIXMAP
1090 if (bgPixmap.window_size_sensitive ()) 1078 if (bg_window_size_sensitive ())
1091 update_background (); 1079 update_background ();
1092#endif 1080#endif
1093 } 1081 }
1094 1082
1095 if (fix_screen || old_height == 0) 1083 if (fix_screen || old_height == 0)
1096 scr_reset (); 1084 scr_reset ();
1097
1098#ifdef HAVE_BG_PIXMAP
1099// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1100// if (bgPixmap.pixmap)
1101// scr_touch (false);
1102#endif
1103 1085
1104#ifdef USE_XIM 1086#ifdef USE_XIM
1105 IMSetPosition (); 1087 IMSetPosition ();
1106#endif 1088#endif
1107} 1089}
… …
1190 1172
1191 atom = XInternAtom (dpy, server, False); 1173 atom = XInternAtom (dpy, server, False);
1192 win = XGetSelectionOwner (dpy, atom); 1174 win = XGetSelectionOwner (dpy, atom);
1193 1175
1194 if (win != None) 1176 if (win != None)
1195 return True; 1177 return true;
1196 } 1178 }
1197 1179
1198 return False; 1180 return false;
1199} 1181}
1200 1182
1201void 1183void
1202rxvt_term::IMSendSpot () 1184rxvt_term::IMSendSpot ()
1203{ 1185{
… …
1356 p = pet[pi]; 1338 p = pet[pi];
1357 1339
1358 if (!p) 1340 if (!p)
1359 continue; 1341 continue;
1360 1342
1361 s = rxvt_splitcommastring (p); 1343 s = rxvt_strsplit (',', p);
1362 1344
1363 for (i = found = 0; !found && s[i]; i++) 1345 for (i = found = 0; !found && s[i]; i++)
1364 { 1346 {
1365 if (!strcmp (s[i], "OverTheSpot")) 1347 if (!strcmp (s[i], "OverTheSpot"))
1366 input_style = XIMPreeditPosition | XIMStatusNothing; 1348 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1378 input_style = XIMPreeditNothing | XIMStatusNothing; 1360 input_style = XIMPreeditNothing | XIMStatusNothing;
1379 1361
1380 for (j = 0; j < xim_styles->count_styles; j++) 1362 for (j = 0; j < xim_styles->count_styles; j++)
1381 if (input_style == xim_styles->supported_styles[j]) 1363 if (input_style == xim_styles->supported_styles[j])
1382 { 1364 {
1383 rxvt_freecommastring (s); 1365 rxvt_free_strsplit (s);
1384 1366
1385 found = 1; 1367 found = 1;
1386 goto foundpet; 1368 goto foundpet;
1387 } 1369 }
1388 1370
1389 } 1371 }
1390 1372
1391 rxvt_freecommastring (s); 1373 rxvt_free_strsplit (s);
1392 } 1374 }
1393 1375
1394foundpet: 1376foundpet:
1395 1377
1396 XFree (xim_styles); 1378 XFree (xim_styles);
… …
1552 p = rs[Rs_inputMethod]; 1534 p = rs[Rs_inputMethod];
1553 if (p && *p) 1535 if (p && *p)
1554 { 1536 {
1555 bool found = false; 1537 bool found = false;
1556 1538
1557 s = rxvt_splitcommastring (p); 1539 s = rxvt_strsplit (',', p);
1558 1540
1559 for (i = 0; s[i]; i++) 1541 for (i = 0; s[i]; i++)
1560 { 1542 {
1561 if (*s[i]) 1543 if (*s[i])
1562 { 1544 {
… …
1568 break; 1550 break;
1569 } 1551 }
1570 } 1552 }
1571 } 1553 }
1572 1554
1573 rxvt_freecommastring (s); 1555 rxvt_free_strsplit (s);
1574 1556
1575 if (found) 1557 if (found)
1576 goto done; 1558 goto done;
1577 } 1559 }
1578 1560
… …
1642 Window cr; 1624 Window cr;
1643 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1625 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1644} 1626}
1645 1627
1646Pixmap 1628Pixmap
1647rxvt_term::get_pixmap_property (int prop_id) 1629rxvt_term::get_pixmap_property (Atom property)
1648{ 1630{
1649 if (prop_id > 0 && prop_id < NUM_XA) 1631 Pixmap pixmap = None;
1650 if (xa[prop_id]) 1632
1651 {
1652 int aformat; 1633 int aformat;
1653 unsigned long nitems, bytes_after; 1634 unsigned long nitems, bytes_after;
1654 Atom atype; 1635 Atom atype;
1655 unsigned char *prop = NULL; 1636 unsigned char *prop;
1656 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1637 int result = XGetWindowProperty (dpy, display->root, property,
1657 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1638 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1658 &nitems, &bytes_after, &prop); 1639 &nitems, &bytes_after, &prop);
1659 if (result == Success && prop && atype == XA_PIXMAP) 1640 if (result == Success)
1641 {
1642 if (atype == XA_PIXMAP)
1660 return *(Pixmap *)prop; 1643 pixmap = *(Pixmap *)prop;
1644 XFree (prop);
1661 } 1645 }
1662 1646
1663 return None; 1647 return pixmap;
1664} 1648}
1665 1649
1666#ifdef HAVE_BG_PIXMAP 1650#ifdef HAVE_BG_PIXMAP
1667 1651
1668void 1652void
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