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.336 by sf-exg, Tue Nov 2 13:32:50 2010 UTC vs.
Revision 1.347 by sf-exg, Mon Jan 10 14:07:19 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));
… …
361 make_current (); 359 make_current ();
362 360
363 delete this; 361 delete this;
364} 362}
365 363
364void
365rxvt_term::set_option (uint8_t opt, bool set)
366{
367 if (!opt)
368 return;
369
370 uint8_t mask = 1 << (opt & 7);
371 uint8_t &val = options [opt >> 3];
372
373 val = val & ~mask | (set ? mask : 0);
374}
375
366/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
367/* 377/*
368 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * Exit gracefully, clearing the utmp entry and restoring tty attributes
369 * TODO: if debugging, this should free up any known resources if we can 379 * TODO: if debugging, this should free up any known resources if we can
370 */ 380 */
… …
382print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
383{ 393{
384 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
385 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
386 char number[32]; 396 char number[32];
387 char *mtype = "XlibMessage"; 397 const char mtype[] = "XlibMessage";
388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
390 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");
391 rxvt_warn ("%s: %s\n", mesg, buffer); 401 rxvt_warn ("%s: %s\n", mesg, buffer);
392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
… …
946void 956void
947rxvt_term::set_colorfgbg () 957rxvt_term::set_colorfgbg ()
948{ 958{
949 unsigned int i; 959 unsigned int i;
950 const char *xpmb = ""; 960 const char *xpmb = "";
951 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 961 char fstr[] = "default";
962 char bstr[] = "default";
952 963
953 strcpy (fstr, "default");
954 strcpy (bstr, "default");
955 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
956 if (pix_colors[Color_fg] == pix_colors[i]) 965 if (pix_colors[Color_fg] == pix_colors[i])
957 { 966 {
958 sprintf (fstr, "%d", (i - Color_Black)); 967 sprintf (fstr, "%d", i - Color_Black);
959 break; 968 break;
960 } 969 }
961 970
962 for (i = Color_Black; i <= Color_White; i++) 971 for (i = Color_Black; i <= Color_White; i++)
963 if (pix_colors[Color_bg] == pix_colors[i]) 972 if (pix_colors[Color_bg] == pix_colors[i])
964 { 973 {
965 sprintf (bstr, "%d", (i - Color_Black)); 974 sprintf (bstr, "%d", i - Color_Black);
966#ifdef BG_IMAGE_FROM_FILE 975#ifdef BG_IMAGE_FROM_FILE
967 xpmb = "default;"; 976 xpmb = "default;";
968#endif 977#endif
969 break; 978 break;
970 } 979 }
… …
1344 p = pet[pi]; 1353 p = pet[pi];
1345 1354
1346 if (!p) 1355 if (!p)
1347 continue; 1356 continue;
1348 1357
1349 s = rxvt_splitcommastring (p); 1358 s = rxvt_strsplit (',', p);
1350 1359
1351 for (i = found = 0; !found && s[i]; i++) 1360 for (i = found = 0; !found && s[i]; i++)
1352 { 1361 {
1353 if (!strcmp (s[i], "OverTheSpot")) 1362 if (!strcmp (s[i], "OverTheSpot"))
1354 input_style = XIMPreeditPosition | XIMStatusNothing; 1363 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1366 input_style = XIMPreeditNothing | XIMStatusNothing; 1375 input_style = XIMPreeditNothing | XIMStatusNothing;
1367 1376
1368 for (j = 0; j < xim_styles->count_styles; j++) 1377 for (j = 0; j < xim_styles->count_styles; j++)
1369 if (input_style == xim_styles->supported_styles[j]) 1378 if (input_style == xim_styles->supported_styles[j])
1370 { 1379 {
1371 rxvt_freecommastring (s); 1380 rxvt_free_strsplit (s);
1372 1381
1373 found = 1; 1382 found = 1;
1374 goto foundpet; 1383 goto foundpet;
1375 } 1384 }
1376 1385
1377 } 1386 }
1378 1387
1379 rxvt_freecommastring (s); 1388 rxvt_free_strsplit (s);
1380 } 1389 }
1381 1390
1382foundpet: 1391foundpet:
1383 1392
1384 XFree (xim_styles); 1393 XFree (xim_styles);
… …
1540 p = rs[Rs_inputMethod]; 1549 p = rs[Rs_inputMethod];
1541 if (p && *p) 1550 if (p && *p)
1542 { 1551 {
1543 bool found = false; 1552 bool found = false;
1544 1553
1545 s = rxvt_splitcommastring (p); 1554 s = rxvt_strsplit (',', p);
1546 1555
1547 for (i = 0; s[i]; i++) 1556 for (i = 0; s[i]; i++)
1548 { 1557 {
1549 if (*s[i]) 1558 if (*s[i])
1550 { 1559 {
… …
1556 break; 1565 break;
1557 } 1566 }
1558 } 1567 }
1559 } 1568 }
1560 1569
1561 rxvt_freecommastring (s); 1570 rxvt_free_strsplit (s);
1562 1571
1563 if (found) 1572 if (found)
1564 goto done; 1573 goto done;
1565 } 1574 }
1566 1575
… …
1630 Window cr; 1639 Window cr;
1631 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1640 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1632} 1641}
1633 1642
1634Pixmap 1643Pixmap
1635rxvt_term::get_pixmap_property (int prop_id) 1644rxvt_term::get_pixmap_property (Atom property)
1636{ 1645{
1637 if (prop_id > 0 && prop_id < NUM_XA) 1646 Pixmap pixmap = None;
1638 if (xa[prop_id]) 1647
1639 {
1640 int aformat; 1648 int aformat;
1641 unsigned long nitems, bytes_after; 1649 unsigned long nitems, bytes_after;
1642 Atom atype; 1650 Atom atype;
1643 unsigned char *prop = NULL; 1651 unsigned char *prop;
1644 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1652 int result = XGetWindowProperty (dpy, display->root, property,
1645 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1653 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1646 &nitems, &bytes_after, &prop); 1654 &nitems, &bytes_after, &prop);
1647 if (result == Success && prop && atype == XA_PIXMAP) 1655 if (result == Success)
1656 {
1657 if (atype == XA_PIXMAP)
1648 return *(Pixmap *)prop; 1658 pixmap = *(Pixmap *)prop;
1659 XFree (prop);
1649 } 1660 }
1650 1661
1651 return None; 1662 return pixmap;
1652} 1663}
1653 1664
1654#ifdef HAVE_BG_PIXMAP 1665#ifdef HAVE_BG_PIXMAP
1655 1666
1656void 1667void

Diff Legend

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