| … | |
… | |
| 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. |
| … | |
… | |
| 96 | text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) |
96 | text_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)); |
| … | |
… | |
| 370 | return; |
368 | return; |
| 371 | |
369 | |
| 372 | uint8_t mask = 1 << (opt & 7); |
370 | uint8_t mask = 1 << (opt & 7); |
| 373 | uint8_t &val = options [opt >> 3]; |
371 | uint8_t &val = options [opt >> 3]; |
| 374 | |
372 | |
| 375 | val = val & ~mask | (set ? 0 : mask); |
373 | val = val & ~mask | (set ? mask : 0); |
| 376 | } |
374 | } |
| 377 | |
375 | |
| 378 | /*----------------------------------------------------------------------*/ |
376 | /*----------------------------------------------------------------------*/ |
| 379 | /* |
377 | /* |
| 380 | * Exit gracefully, clearing the utmp entry and restoring tty attributes |
378 | * Exit gracefully, clearing the utmp entry and restoring tty attributes |
| … | |
… | |
| 394 | print_x_error (Display *dpy, XErrorEvent *event) |
392 | print_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); |
| … | |
… | |
| 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 | |
| 1646 | Pixmap |
1644 | Pixmap |
| 1647 | rxvt_term::get_pixmap_property (int prop_id) |
1645 | rxvt_term::get_pixmap_property (Atom property) |
| 1648 | { |
1646 | { |
| 1649 | if (prop_id > 0 && prop_id < NUM_XA) |
1647 | Pixmap pixmap = None; |
| 1650 | if (xa[prop_id]) |
1648 | |
| 1651 | { |
|
|
| 1652 | int aformat; |
1649 | int aformat; |
| 1653 | unsigned long nitems, bytes_after; |
1650 | unsigned long nitems, bytes_after; |
| 1654 | Atom atype; |
1651 | Atom atype; |
| 1655 | unsigned char *prop = NULL; |
1652 | unsigned char *prop; |
| 1656 | int result = XGetWindowProperty (dpy, display->root, xa[prop_id], |
1653 | int result = XGetWindowProperty (dpy, display->root, property, |
| 1657 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
1654 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
| 1658 | &nitems, &bytes_after, &prop); |
1655 | &nitems, &bytes_after, &prop); |
| 1659 | if (result == Success && prop && atype == XA_PIXMAP) |
1656 | if (result == Success) |
|
|
1657 | { |
|
|
1658 | if (atype == XA_PIXMAP) |
| 1660 | return *(Pixmap *)prop; |
1659 | pixmap = *(Pixmap *)prop; |
|
|
1660 | XFree (prop); |
| 1661 | } |
1661 | } |
| 1662 | |
1662 | |
| 1663 | return None; |
1663 | return pixmap; |
| 1664 | } |
1664 | } |
| 1665 | |
1665 | |
| 1666 | #ifdef HAVE_BG_PIXMAP |
1666 | #ifdef HAVE_BG_PIXMAP |
| 1667 | |
1667 | |
| 1668 | void |
1668 | void |
