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.321 by sf-exg, Sun Feb 14 11:11:10 2010 UTC vs.
Revision 1.343 by sf-exg, Tue Dec 21 10:37:42 2010 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.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
… …
49# ifdef HAVE_SETLOCALE 51# ifdef HAVE_SETLOCALE
50# include <clocale> 52# include <clocale>
51# endif 53# endif
52#endif 54#endif
53 55
56struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
55 58
56// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
58 61
… …
101 { 104 {
102 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
104 } 107 }
105 108
106 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
108 { 111 {
109 if (cc->c1 == c1 && cc->c2 == c2) 112 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 113 return COMPOSE_LO + (cc - v.begin ());
111 } 114 }
… …
358 make_current (); 361 make_current ();
359 362
360 delete this; 363 delete this;
361} 364}
362 365
366void
367rxvt_term::set_option (uint8_t opt, bool set)
368{
369 if (!opt)
370 return;
371
372 uint8_t mask = 1 << (opt & 7);
373 uint8_t &val = options [opt >> 3];
374
375 val = val & ~mask | (set ? mask : 0);
376}
377
363/*----------------------------------------------------------------------*/ 378/*----------------------------------------------------------------------*/
364/* 379/*
365 * Exit gracefully, clearing the utmp entry and restoring tty attributes 380 * Exit gracefully, clearing the utmp entry and restoring tty attributes
366 * TODO: if debugging, this should free up any known resources if we can 381 * TODO: if debugging, this should free up any known resources if we can
367 */ 382 */
… …
379print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
380{ 395{
381 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
382 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
383 char number[32]; 398 char number[32];
384 char *mtype = "XlibMessage"; 399 const char mtype[] = "XlibMessage";
385 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
386 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
387 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 402 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
388 rxvt_warn ("%s: %s\n", mesg, buffer); 403 rxvt_warn ("%s: %s\n", mesg, buffer);
389 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
390 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
391 sprintf(number, "%d", event->request_code); 406 sprintf(number, "%d", event->request_code);
392 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 407 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
393 rxvt_warn ("(which is %s)\n", buffer); 408 rxvt_warn ("(which is %s)\n", buffer);
394 if (event->request_code >= 128) { 409 if (event->request_code >= 128) {
395 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 410 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
396 mesg, BUFSIZ); 411 mesg, BUFSIZ);
397 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
398 } 413 }
399 if ((event->error_code == BadWindow) || 414 if ((event->error_code == BadWindow) ||
400 (event->error_code == BadPixmap) || 415 (event->error_code == BadPixmap) ||
401 (event->error_code == BadCursor) || 416 (event->error_code == BadCursor) ||
402 (event->error_code == BadFont) || 417 (event->error_code == BadFont) ||
403 (event->error_code == BadDrawable) || 418 (event->error_code == BadDrawable) ||
404 (event->error_code == BadColor) || 419 (event->error_code == BadColor) ||
405 (event->error_code == BadGC) || 420 (event->error_code == BadGC) ||
406 (event->error_code == BadIDChoice) || 421 (event->error_code == BadIDChoice) ||
407 (event->error_code == BadValue) || 422 (event->error_code == BadValue) ||
408 (event->error_code == BadAtom)) { 423 (event->error_code == BadAtom)) {
409 if (event->error_code == BadValue) 424 if (event->error_code == BadValue)
410 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 425 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
411 mesg, BUFSIZ); 426 mesg, BUFSIZ);
412 else if (event->error_code == BadAtom) 427 else if (event->error_code == BadAtom)
413 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 428 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
414 mesg, BUFSIZ); 429 mesg, BUFSIZ);
415 else 430 else
416 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
417 mesg, BUFSIZ); 432 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
419 } 434 }
420 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
421 mesg, BUFSIZ); 436 mesg, BUFSIZ);
422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
423} 438}
424#endif 439#endif
425 440
426int 441int
… …
473 rxvt_emergency_cleanup (); 488 rxvt_emergency_cleanup ();
474 w.stop (); 489 w.stop ();
475 kill (getpid (), w.signum); 490 kill (getpid (), w.signum);
476} 491}
477 492
493static void
494rxvt_get_ttymode (struct termios *tio)
495{
496 if (tcgetattr (STDIN_FILENO, tio) < 0)
497 memset (tio, 0, sizeof (struct termios));
498
499 for (int i = 0; i < NCCS; i++)
500 tio->c_cc[i] = VDISABLE;
501
502 tio->c_cc[VINTR] = CINTR;
503 tio->c_cc[VQUIT] = CQUIT;
504 tio->c_cc[VERASE] = CERASE;
505#ifdef VERASE2
506 tio->c_cc[VERASE2] = CERASE2;
507#endif
508 tio->c_cc[VKILL] = CKILL;
509 tio->c_cc[VEOF] = CEOF;
510 tio->c_cc[VSTART] = CSTART;
511 tio->c_cc[VSTOP] = CSTOP;
512 tio->c_cc[VSUSP] = CSUSP;
513# ifdef VDSUSP
514 tio->c_cc[VDSUSP] = CDSUSP;
515# endif
516# ifdef VREPRINT
517 tio->c_cc[VREPRINT] = CRPRNT;
518# endif
519# ifdef VDISCRD
520 tio->c_cc[VDISCRD] = CFLUSH;
521# endif
522# ifdef VWERSE
523 tio->c_cc[VWERSE] = CWERASE;
524# endif
525# ifdef VLNEXT
526 tio->c_cc[VLNEXT] = CLNEXT;
527# endif
528# ifdef VSTATUS
529 tio->c_cc[VSTATUS] = CSTATUS;
530# endif
531
532# if VMIN != VEOF
533 tio->c_cc[VMIN] = 1;
534# endif
535# if VTIME != VEOL
536 tio->c_cc[VTIME] = 0;
537# endif
538
539 /* input modes */
540 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
541# ifdef IMAXBEL
542 | IMAXBEL
543# endif
544 | IXON);
545
546 /* output modes */
547 tio->c_oflag = (OPOST | ONLCR);
548
549 /* control modes */
550 tio->c_cflag = (CS8 | CREAD);
551
552 /* local modes */
553 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
554# if defined (ECHOCTL) && defined (ECHOKE)
555 | ECHOCTL | ECHOKE
556# endif
557 | ECHOE | ECHOK);
558}
559
478char **rxvt_environ; // startup environment 560char **rxvt_environ; // startup environment
479 561
480void 562void
481rxvt_init () 563rxvt_init ()
482{ 564{
483 ptytty::init (); 565 assert (("fontMask must not overlap other RS masks",
566 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
484 567
568 rxvt_get_ttymode (&rxvt_term::def_tio);
569
570 // get rid of stdin/stdout as we don't need them, to free resources
571 dup2 (STDERR_FILENO, STDIN_FILENO);
572 dup2 (STDERR_FILENO, STDOUT_FILENO);
573
485 if (!ev_default_loop (0)) 574 if (!ev_default_loop ())
486 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 575 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
487 576
488 rxvt_environ = environ; 577 rxvt_environ = environ;
489 578
490 signal (SIGHUP, SIG_IGN); 579 signal (SIGHUP, SIG_IGN);
491 signal (SIGPIPE, SIG_IGN); 580 signal (SIGPIPE, SIG_IGN);
492 581
493 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 582 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
494 sig_handlers.sw_int.start (SIGINT); ev_unref (); 583 sig_handlers.sw_int.start (SIGINT); ev_unref ();
495
496 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
497 /* signal (SIGURG, SIG_DFL); */
498 584
499 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 585 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
500 // TODO: handle this with exceptions and tolerate the memory loss 586 // TODO: handle this with exceptions and tolerate the memory loss
501 XSetIOErrorHandler (rxvt_xioerror_handler); 587 XSetIOErrorHandler (rxvt_xioerror_handler);
502 588
… …
688#endif 774#endif
689 775
690 delete fontset[0]; 776 delete fontset[0];
691 fontset[0] = fs; 777 fontset[0] = fs;
692 778
693 prop = (*fs)[1]->properties (); 779 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
694 prop.height += lineSpace; 780 prop.height += lineSpace;
695 prop.width += letterSpace; 781 prop.width += letterSpace;
696 782
697 fs->set_prop (prop, false); 783 fs->set_prop (prop, false);
698 784
… …
750 prop, XA_STRING, 8, PropModeReplace, 836 prop, XA_STRING, 8, PropModeReplace,
751 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 837 (const unsigned char *)str, len >= 0 ? len : strlen (str));
752} 838}
753 839
754void 840void
841rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
842{
843 XTextProperty ct;
844
845 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
846 {
847 XSetTextProperty (dpy, parent[0], &ct, prop);
848 XFree (ct.value);
849 }
850}
851
852void
755rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 853rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
756{ 854{
757 wchar_t *ws = rxvt_mbstowcs (str, len); 855 wchar_t *ws = rxvt_mbstowcs (str, len);
758 char *s = rxvt_wcstoutf8 (ws); 856 char *s = rxvt_wcstoutf8 (ws);
759 857
… …
769/*----------------------------------------------------------------------*/ 867/*----------------------------------------------------------------------*/
770/* xterm sequences - title, iconName, color (exptl) */ 868/* xterm sequences - title, iconName, color (exptl) */
771void 869void
772rxvt_term::set_title (const char *str) 870rxvt_term::set_title (const char *str)
773{ 871{
774 set_string_property (XA_WM_NAME, str); 872 set_mbstring_property (XA_WM_NAME, str);
775#if ENABLE_EWMH 873#if ENABLE_EWMH
776 set_utf8_property (xa[XA_NET_WM_NAME], str); 874 set_utf8_property (xa[XA_NET_WM_NAME], str);
777#endif 875#endif
778} 876}
779 877
780void 878void
781rxvt_term::set_icon_name (const char *str) 879rxvt_term::set_icon_name (const char *str)
782{ 880{
783 set_string_property (XA_WM_ICON_NAME, str); 881 set_mbstring_property (XA_WM_ICON_NAME, str);
784#if ENABLE_EWMH 882#if ENABLE_EWMH
785 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 883 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
786#endif 884#endif
787} 885}
788 886
… …
1541void 1639void
1542rxvt_term::get_window_origin (int &x, int &y) 1640rxvt_term::get_window_origin (int &x, int &y)
1543{ 1641{
1544 Window cr; 1642 Window cr;
1545 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1643 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1546/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1547} 1644}
1548 1645
1549Pixmap 1646Pixmap
1550rxvt_term::get_pixmap_property (int prop_id) 1647rxvt_term::get_pixmap_property (Atom property)
1551{ 1648{
1552 if (prop_id > 0 && prop_id < NUM_XA) 1649 Pixmap pixmap = None;
1553 if (xa[prop_id]) 1650
1554 {
1555 int aformat; 1651 int aformat;
1556 unsigned long nitems, bytes_after; 1652 unsigned long nitems, bytes_after;
1557 Atom atype; 1653 Atom atype;
1558 unsigned char *prop = NULL; 1654 unsigned char *prop;
1559 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1655 int result = XGetWindowProperty (dpy, display->root, property,
1560 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1656 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1561 &nitems, &bytes_after, &prop); 1657 &nitems, &bytes_after, &prop);
1562 if (result == Success && prop && atype == XA_PIXMAP) 1658 if (result == Success)
1659 {
1660 if (atype == XA_PIXMAP)
1563 return *(Pixmap *)prop; 1661 pixmap = *(Pixmap *)prop;
1662 XFree (prop);
1564 } 1663 }
1565 1664
1566 return None; 1665 return pixmap;
1567} 1666}
1568 1667
1569#ifdef HAVE_BG_PIXMAP 1668#ifdef HAVE_BG_PIXMAP
1570# if TRACE_PIXMAPS
1571# undef update_background
1572void
1573rxvt_term::trace_update_background (const char *file, int line)
1574{
1575 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1576 update_background ();
1577}
1578# endif
1579 1669
1580void 1670void
1581rxvt_term::update_background () 1671rxvt_term::update_background ()
1582{ 1672{
1583 if (update_background_ev.is_active ()) 1673 if (update_background_ev.is_active ())

Diff Legend

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