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.351 by sf-exg, Tue Feb 1 00:41:01 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));
… …
228 delete fontset[i]; 226 delete fontset[i];
229#endif 227#endif
230 delete fontset[0]; 228 delete fontset[0];
231 229
232#ifdef HAVE_BG_PIXMAP 230#ifdef HAVE_BG_PIXMAP
233 bgPixmap.destroy (); 231 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 232#endif
241 233
242 if (display) 234 if (display)
243 { 235 {
244 selection_clear (); 236 selection_clear ();
… …
394print_x_error (Display *dpy, XErrorEvent *event) 386print_x_error (Display *dpy, XErrorEvent *event)
395{ 387{
396 char buffer[BUFSIZ]; 388 char buffer[BUFSIZ];
397 char mesg[BUFSIZ]; 389 char mesg[BUFSIZ];
398 char number[32]; 390 char number[32];
399 char *mtype = "XlibMessage"; 391 const char mtype[] = "XlibMessage";
400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 392 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 393 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
402 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 394 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
403 rxvt_warn ("%s: %s\n", mesg, buffer); 395 rxvt_warn ("%s: %s\n", mesg, buffer);
404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 396 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
… …
958void 950void
959rxvt_term::set_colorfgbg () 951rxvt_term::set_colorfgbg ()
960{ 952{
961 unsigned int i; 953 unsigned int i;
962 const char *xpmb = ""; 954 const char *xpmb = "";
963 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 955 char fstr[] = "default";
956 char bstr[] = "default";
964 957
965 strcpy (fstr, "default");
966 strcpy (bstr, "default");
967 for (i = Color_Black; i <= Color_White; i++) 958 for (i = Color_Black; i <= Color_White; i++)
968 if (pix_colors[Color_fg] == pix_colors[i]) 959 if (pix_colors[Color_fg] == pix_colors[i])
969 { 960 {
970 sprintf (fstr, "%d", (i - Color_Black)); 961 sprintf (fstr, "%d", i - Color_Black);
971 break; 962 break;
972 } 963 }
973 964
974 for (i = Color_Black; i <= Color_White; i++) 965 for (i = Color_Black; i <= Color_White; i++)
975 if (pix_colors[Color_bg] == pix_colors[i]) 966 if (pix_colors[Color_bg] == pix_colors[i])
976 { 967 {
977 sprintf (bstr, "%d", (i - Color_Black)); 968 sprintf (bstr, "%d", i - Color_Black);
978#ifdef BG_IMAGE_FROM_FILE 969#ifdef BG_IMAGE_FROM_FILE
979 xpmb = "default;"; 970 xpmb = "default;";
980#endif 971#endif
981 break; 972 break;
982 } 973 }
… …
1085 XMoveResizeWindow (dpy, vt, 1076 XMoveResizeWindow (dpy, vt,
1086 window_vt_x, window_vt_y, 1077 window_vt_x, window_vt_y,
1087 width, height); 1078 width, height);
1088 1079
1089#ifdef HAVE_BG_PIXMAP 1080#ifdef HAVE_BG_PIXMAP
1090 if (bgPixmap.window_size_sensitive ()) 1081 if (bg_window_size_sensitive ())
1091 update_background (); 1082 update_background ();
1092#endif 1083#endif
1093 } 1084 }
1094 1085
1095 if (fix_screen || old_height == 0) 1086 if (fix_screen || old_height == 0)
1096 scr_reset (); 1087 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 1088
1104#ifdef USE_XIM 1089#ifdef USE_XIM
1105 IMSetPosition (); 1090 IMSetPosition ();
1106#endif 1091#endif
1107} 1092}
… …
1190 1175
1191 atom = XInternAtom (dpy, server, False); 1176 atom = XInternAtom (dpy, server, False);
1192 win = XGetSelectionOwner (dpy, atom); 1177 win = XGetSelectionOwner (dpy, atom);
1193 1178
1194 if (win != None) 1179 if (win != None)
1195 return True; 1180 return true;
1196 } 1181 }
1197 1182
1198 return False; 1183 return false;
1199} 1184}
1200 1185
1201void 1186void
1202rxvt_term::IMSendSpot () 1187rxvt_term::IMSendSpot ()
1203{ 1188{
… …
1356 p = pet[pi]; 1341 p = pet[pi];
1357 1342
1358 if (!p) 1343 if (!p)
1359 continue; 1344 continue;
1360 1345
1361 s = rxvt_splitcommastring (p); 1346 s = rxvt_strsplit (',', p);
1362 1347
1363 for (i = found = 0; !found && s[i]; i++) 1348 for (i = found = 0; !found && s[i]; i++)
1364 { 1349 {
1365 if (!strcmp (s[i], "OverTheSpot")) 1350 if (!strcmp (s[i], "OverTheSpot"))
1366 input_style = XIMPreeditPosition | XIMStatusNothing; 1351 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1378 input_style = XIMPreeditNothing | XIMStatusNothing; 1363 input_style = XIMPreeditNothing | XIMStatusNothing;
1379 1364
1380 for (j = 0; j < xim_styles->count_styles; j++) 1365 for (j = 0; j < xim_styles->count_styles; j++)
1381 if (input_style == xim_styles->supported_styles[j]) 1366 if (input_style == xim_styles->supported_styles[j])
1382 { 1367 {
1383 rxvt_freecommastring (s); 1368 rxvt_free_strsplit (s);
1384 1369
1385 found = 1; 1370 found = 1;
1386 goto foundpet; 1371 goto foundpet;
1387 } 1372 }
1388 1373
1389 } 1374 }
1390 1375
1391 rxvt_freecommastring (s); 1376 rxvt_free_strsplit (s);
1392 } 1377 }
1393 1378
1394foundpet: 1379foundpet:
1395 1380
1396 XFree (xim_styles); 1381 XFree (xim_styles);
… …
1552 p = rs[Rs_inputMethod]; 1537 p = rs[Rs_inputMethod];
1553 if (p && *p) 1538 if (p && *p)
1554 { 1539 {
1555 bool found = false; 1540 bool found = false;
1556 1541
1557 s = rxvt_splitcommastring (p); 1542 s = rxvt_strsplit (',', p);
1558 1543
1559 for (i = 0; s[i]; i++) 1544 for (i = 0; s[i]; i++)
1560 { 1545 {
1561 if (*s[i]) 1546 if (*s[i])
1562 { 1547 {
… …
1568 break; 1553 break;
1569 } 1554 }
1570 } 1555 }
1571 } 1556 }
1572 1557
1573 rxvt_freecommastring (s); 1558 rxvt_free_strsplit (s);
1574 1559
1575 if (found) 1560 if (found)
1576 goto done; 1561 goto done;
1577 } 1562 }
1578 1563
… …
1642 Window cr; 1627 Window cr;
1643 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1628 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1644} 1629}
1645 1630
1646Pixmap 1631Pixmap
1647rxvt_term::get_pixmap_property (int prop_id) 1632rxvt_term::get_pixmap_property (Atom property)
1648{ 1633{
1649 if (prop_id > 0 && prop_id < NUM_XA) 1634 Pixmap pixmap = None;
1650 if (xa[prop_id]) 1635
1651 {
1652 int aformat; 1636 int aformat;
1653 unsigned long nitems, bytes_after; 1637 unsigned long nitems, bytes_after;
1654 Atom atype; 1638 Atom atype;
1655 unsigned char *prop = NULL; 1639 unsigned char *prop;
1656 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1640 int result = XGetWindowProperty (dpy, display->root, property,
1657 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1641 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1658 &nitems, &bytes_after, &prop); 1642 &nitems, &bytes_after, &prop);
1659 if (result == Success && prop && atype == XA_PIXMAP) 1643 if (result == Success)
1644 {
1645 if (atype == XA_PIXMAP)
1660 return *(Pixmap *)prop; 1646 pixmap = *(Pixmap *)prop;
1647 XFree (prop);
1661 } 1648 }
1662 1649
1663 return None; 1650 return pixmap;
1664} 1651}
1665 1652
1666#ifdef HAVE_BG_PIXMAP 1653#ifdef HAVE_BG_PIXMAP
1667 1654
1668void 1655void
1669rxvt_term::update_background () 1656rxvt_term::update_background ()
1670{ 1657{
1671 if (update_background_ev.is_active ()) 1658 if (update_background_ev.is_active ())
1672 return; 1659 return;
1673 1660
1674 bgPixmap.invalidate (); 1661 bg_invalidate ();
1675 1662
1676 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1663 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1677 1664
1678 if (to_wait <= 0.) 1665 if (to_wait <= 0.)
1679 bgPixmap.render (); 1666 bg_render ();
1680 else 1667 else
1681 update_background_ev.start (to_wait); 1668 update_background_ev.start (to_wait);
1682} 1669}
1683 1670
1684void 1671void
1685rxvt_term::update_background_cb (ev::timer &w, int revents) 1672rxvt_term::update_background_cb (ev::timer &w, int revents)
1686{ 1673{
1687 make_current (); 1674 make_current ();
1688 1675
1689 update_background_ev.stop (); 1676 update_background_ev.stop ();
1690 bgPixmap.render (); 1677 bg_render ();
1691 refresh_check (); 1678 refresh_check ();
1692} 1679}
1693 1680
1694#endif /* HAVE_BG_PIXMAP */ 1681#endif /* HAVE_BG_PIXMAP */
1695 1682

Diff Legend

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