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.346 by sf-exg, Sat Jan 8 10:37:21 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);
… …
958void 956void
959rxvt_term::set_colorfgbg () 957rxvt_term::set_colorfgbg ()
960{ 958{
961 unsigned int i; 959 unsigned int i;
962 const char *xpmb = ""; 960 const char *xpmb = "";
963 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 961 char fstr[] = "default";
962 char bstr[] = "default";
964 963
965 strcpy (fstr, "default");
966 strcpy (bstr, "default");
967 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
968 if (pix_colors[Color_fg] == pix_colors[i]) 965 if (pix_colors[Color_fg] == pix_colors[i])
969 { 966 {
970 sprintf (fstr, "%d", (i - Color_Black)); 967 sprintf (fstr, "%d", i - Color_Black);
971 break; 968 break;
972 } 969 }
973 970
974 for (i = Color_Black; i <= Color_White; i++) 971 for (i = Color_Black; i <= Color_White; i++)
975 if (pix_colors[Color_bg] == pix_colors[i]) 972 if (pix_colors[Color_bg] == pix_colors[i])
976 { 973 {
977 sprintf (bstr, "%d", (i - Color_Black)); 974 sprintf (bstr, "%d", i - Color_Black);
978#ifdef BG_IMAGE_FROM_FILE 975#ifdef BG_IMAGE_FROM_FILE
979 xpmb = "default;"; 976 xpmb = "default;";
980#endif 977#endif
981 break; 978 break;
982 } 979 }
… …
1642 Window cr; 1639 Window cr;
1643 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1640 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1644} 1641}
1645 1642
1646Pixmap 1643Pixmap
1647rxvt_term::get_pixmap_property (int prop_id) 1644rxvt_term::get_pixmap_property (Atom property)
1648{ 1645{
1649 if (prop_id > 0 && prop_id < NUM_XA) 1646 Pixmap pixmap = None;
1650 if (xa[prop_id]) 1647
1651 {
1652 int aformat; 1648 int aformat;
1653 unsigned long nitems, bytes_after; 1649 unsigned long nitems, bytes_after;
1654 Atom atype; 1650 Atom atype;
1655 unsigned char *prop = NULL; 1651 unsigned char *prop;
1656 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1652 int result = XGetWindowProperty (dpy, display->root, property,
1657 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1653 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1658 &nitems, &bytes_after, &prop); 1654 &nitems, &bytes_after, &prop);
1659 if (result == Success && prop && atype == XA_PIXMAP) 1655 if (result == Success)
1656 {
1657 if (atype == XA_PIXMAP)
1660 return *(Pixmap *)prop; 1658 pixmap = *(Pixmap *)prop;
1659 XFree (prop);
1661 } 1660 }
1662 1661
1663 return None; 1662 return pixmap;
1664} 1663}
1665 1664
1666#ifdef HAVE_BG_PIXMAP 1665#ifdef HAVE_BG_PIXMAP
1667 1666
1668void 1667void

Diff Legend

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