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.333 by root, Fri Oct 22 05:57:59 2010 UTC vs.
Revision 1.344 by root, Fri Jan 7 21:17:08 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);
… …
511 tio->c_cc[VWERSE] = CWERASE; 521 tio->c_cc[VWERSE] = CWERASE;
512# endif 522# endif
513# ifdef VLNEXT 523# ifdef VLNEXT
514 tio->c_cc[VLNEXT] = CLNEXT; 524 tio->c_cc[VLNEXT] = CLNEXT;
515# endif 525# endif
526# ifdef VSTATUS
527 tio->c_cc[VSTATUS] = CSTATUS;
528# endif
516 529
517# if VMIN != VEOF 530# if VMIN != VEOF
518 tio->c_cc[VMIN] = 1; 531 tio->c_cc[VMIN] = 1;
519# endif 532# endif
520# if VTIME != VEOL 533# if VTIME != VEOL
… …
553 rxvt_get_ttymode (&rxvt_term::def_tio); 566 rxvt_get_ttymode (&rxvt_term::def_tio);
554 567
555 // get rid of stdin/stdout as we don't need them, to free resources 568 // get rid of stdin/stdout as we don't need them, to free resources
556 dup2 (STDERR_FILENO, STDIN_FILENO); 569 dup2 (STDERR_FILENO, STDIN_FILENO);
557 dup2 (STDERR_FILENO, STDOUT_FILENO); 570 dup2 (STDERR_FILENO, STDOUT_FILENO);
558
559 ptytty::init ();
560 571
561 if (!ev_default_loop ()) 572 if (!ev_default_loop ())
562 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 573 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
563 574
564 rxvt_environ = environ; 575 rxvt_environ = environ;
… …
1626void 1637void
1627rxvt_term::get_window_origin (int &x, int &y) 1638rxvt_term::get_window_origin (int &x, int &y)
1628{ 1639{
1629 Window cr; 1640 Window cr;
1630 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1641 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1631/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1632} 1642}
1633 1643
1634Pixmap 1644Pixmap
1635rxvt_term::get_pixmap_property (int prop_id) 1645rxvt_term::get_pixmap_property (Atom property)
1636{ 1646{
1637 if (prop_id > 0 && prop_id < NUM_XA) 1647 Pixmap pixmap = None;
1638 if (xa[prop_id]) 1648
1639 {
1640 int aformat; 1649 int aformat;
1641 unsigned long nitems, bytes_after; 1650 unsigned long nitems, bytes_after;
1642 Atom atype; 1651 Atom atype;
1643 unsigned char *prop = NULL; 1652 unsigned char *prop;
1644 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1653 int result = XGetWindowProperty (dpy, display->root, property,
1645 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1654 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1646 &nitems, &bytes_after, &prop); 1655 &nitems, &bytes_after, &prop);
1647 if (result == Success && prop && atype == XA_PIXMAP) 1656 if (result == Success)
1657 {
1658 if (atype == XA_PIXMAP)
1648 return *(Pixmap *)prop; 1659 pixmap = *(Pixmap *)prop;
1660 XFree (prop);
1649 } 1661 }
1650 1662
1651 return None; 1663 return pixmap;
1652} 1664}
1653 1665
1654#ifdef HAVE_BG_PIXMAP 1666#ifdef HAVE_BG_PIXMAP
1655# if TRACE_PIXMAPS
1656# undef update_background
1657void
1658rxvt_term::trace_update_background (const char *file, int line)
1659{
1660 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1661 update_background ();
1662}
1663# endif
1664 1667
1665void 1668void
1666rxvt_term::update_background () 1669rxvt_term::update_background ()
1667{ 1670{
1668 if (update_background_ev.is_active ()) 1671 if (update_background_ev.is_active ())

Diff Legend

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