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.338 by root, Tue Dec 7 19:47:02 2010 UTC vs.
Revision 1.348 by sf-exg, Thu Jan 20 16:41:23 2011 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
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 }
… …
1093 } 1090 }
1094 1091
1095 if (fix_screen || old_height == 0) 1092 if (fix_screen || old_height == 0)
1096 scr_reset (); 1093 scr_reset ();
1097 1094
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
1104#ifdef USE_XIM 1095#ifdef USE_XIM
1105 IMSetPosition (); 1096 IMSetPosition ();
1106#endif 1097#endif
1107} 1098}
1108 1099
… …
1356 p = pet[pi]; 1347 p = pet[pi];
1357 1348
1358 if (!p) 1349 if (!p)
1359 continue; 1350 continue;
1360 1351
1361 s = rxvt_splitcommastring (p); 1352 s = rxvt_strsplit (',', p);
1362 1353
1363 for (i = found = 0; !found && s[i]; i++) 1354 for (i = found = 0; !found && s[i]; i++)
1364 { 1355 {
1365 if (!strcmp (s[i], "OverTheSpot")) 1356 if (!strcmp (s[i], "OverTheSpot"))
1366 input_style = XIMPreeditPosition | XIMStatusNothing; 1357 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1378 input_style = XIMPreeditNothing | XIMStatusNothing; 1369 input_style = XIMPreeditNothing | XIMStatusNothing;
1379 1370
1380 for (j = 0; j < xim_styles->count_styles; j++) 1371 for (j = 0; j < xim_styles->count_styles; j++)
1381 if (input_style == xim_styles->supported_styles[j]) 1372 if (input_style == xim_styles->supported_styles[j])
1382 { 1373 {
1383 rxvt_freecommastring (s); 1374 rxvt_free_strsplit (s);
1384 1375
1385 found = 1; 1376 found = 1;
1386 goto foundpet; 1377 goto foundpet;
1387 } 1378 }
1388 1379
1389 } 1380 }
1390 1381
1391 rxvt_freecommastring (s); 1382 rxvt_free_strsplit (s);
1392 } 1383 }
1393 1384
1394foundpet: 1385foundpet:
1395 1386
1396 XFree (xim_styles); 1387 XFree (xim_styles);
… …
1552 p = rs[Rs_inputMethod]; 1543 p = rs[Rs_inputMethod];
1553 if (p && *p) 1544 if (p && *p)
1554 { 1545 {
1555 bool found = false; 1546 bool found = false;
1556 1547
1557 s = rxvt_splitcommastring (p); 1548 s = rxvt_strsplit (',', p);
1558 1549
1559 for (i = 0; s[i]; i++) 1550 for (i = 0; s[i]; i++)
1560 { 1551 {
1561 if (*s[i]) 1552 if (*s[i])
1562 { 1553 {
… …
1568 break; 1559 break;
1569 } 1560 }
1570 } 1561 }
1571 } 1562 }
1572 1563
1573 rxvt_freecommastring (s); 1564 rxvt_free_strsplit (s);
1574 1565
1575 if (found) 1566 if (found)
1576 goto done; 1567 goto done;
1577 } 1568 }
1578 1569
… …
1642 Window cr; 1633 Window cr;
1643 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1634 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1644} 1635}
1645 1636
1646Pixmap 1637Pixmap
1647rxvt_term::get_pixmap_property (int prop_id) 1638rxvt_term::get_pixmap_property (Atom property)
1648{ 1639{
1649 if (prop_id > 0 && prop_id < NUM_XA) 1640 Pixmap pixmap = None;
1650 if (xa[prop_id]) 1641
1651 {
1652 int aformat; 1642 int aformat;
1653 unsigned long nitems, bytes_after; 1643 unsigned long nitems, bytes_after;
1654 Atom atype; 1644 Atom atype;
1655 unsigned char *prop = NULL; 1645 unsigned char *prop;
1656 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1646 int result = XGetWindowProperty (dpy, display->root, property,
1657 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1647 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1658 &nitems, &bytes_after, &prop); 1648 &nitems, &bytes_after, &prop);
1659 if (result == Success && prop && atype == XA_PIXMAP) 1649 if (result == Success)
1650 {
1651 if (atype == XA_PIXMAP)
1660 return *(Pixmap *)prop; 1652 pixmap = *(Pixmap *)prop;
1653 XFree (prop);
1661 } 1654 }
1662 1655
1663 return None; 1656 return pixmap;
1664} 1657}
1665 1658
1666#ifdef HAVE_BG_PIXMAP 1659#ifdef HAVE_BG_PIXMAP
1667 1660
1668void 1661void

Diff Legend

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