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.340 by sf-exg, Sun Dec 12 19:30:10 2010 UTC vs.
Revision 1.345 by root, Sat Jan 8 10:17:43 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));
… …
394print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
395{ 393{
396 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
397 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
398 char number[32]; 396 char number[32];
399 char *mtype = "XlibMessage"; 397 const char mtype[] = "XlibMessage";
400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
402 rxvt_warn ("An X Error occurred, trying to continue after report.\n"); 400 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
403 rxvt_warn ("%s: %s\n", mesg, buffer); 401 rxvt_warn ("%s: %s\n", mesg, buffer);
404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
… …
965 strcpy (fstr, "default"); 963 strcpy (fstr, "default");
966 strcpy (bstr, "default"); 964 strcpy (bstr, "default");
967 for (i = Color_Black; i <= Color_White; i++) 965 for (i = Color_Black; i <= Color_White; i++)
968 if (pix_colors[Color_fg] == pix_colors[i]) 966 if (pix_colors[Color_fg] == pix_colors[i])
969 { 967 {
970 sprintf (fstr, "%d", (i - Color_Black)); 968 sprintf (fstr, "%d", i - Color_Black);
971 break; 969 break;
972 } 970 }
973 971
974 for (i = Color_Black; i <= Color_White; i++) 972 for (i = Color_Black; i <= Color_White; i++)
975 if (pix_colors[Color_bg] == pix_colors[i]) 973 if (pix_colors[Color_bg] == pix_colors[i])
976 { 974 {
977 sprintf (bstr, "%d", (i - Color_Black)); 975 sprintf (bstr, "%d", i - Color_Black);
978#ifdef BG_IMAGE_FROM_FILE 976#ifdef BG_IMAGE_FROM_FILE
979 xpmb = "default;"; 977 xpmb = "default;";
980#endif 978#endif
981 break; 979 break;
982 } 980 }
… …
1642 Window cr; 1640 Window cr;
1643 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1641 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1644} 1642}
1645 1643
1646Pixmap 1644Pixmap
1647rxvt_term::get_pixmap_property (int prop_id) 1645rxvt_term::get_pixmap_property (Atom property)
1648{ 1646{
1649 Pixmap pixmap = None; 1647 Pixmap pixmap = None;
1650 1648
1651 if (prop_id > 0 && prop_id < NUM_XA)
1652 if (xa[prop_id])
1653 {
1654 int aformat; 1649 int aformat;
1655 unsigned long nitems, bytes_after; 1650 unsigned long nitems, bytes_after;
1656 Atom atype; 1651 Atom atype;
1657 unsigned char *prop = NULL; 1652 unsigned char *prop;
1658 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1653 int result = XGetWindowProperty (dpy, display->root, property,
1659 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1654 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1660 &nitems, &bytes_after, &prop); 1655 &nitems, &bytes_after, &prop);
1661 if (result == Success && prop && atype == XA_PIXMAP) 1656 if (result == Success)
1657 {
1658 if (atype == XA_PIXMAP)
1662 pixmap = *(Pixmap *)prop; 1659 pixmap = *(Pixmap *)prop;
1663 XFree (prop); 1660 XFree (prop);
1664 } 1661 }
1665 1662
1666 return pixmap; 1663 return pixmap;
1667} 1664}
1668 1665
1669#ifdef HAVE_BG_PIXMAP 1666#ifdef HAVE_BG_PIXMAP

Diff Legend

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