--- rxvt-unicode/src/main.C 2010/01/30 20:43:56 1.320 +++ rxvt-unicode/src/main.C 2011/02/21 07:41:02 1.354 @@ -13,7 +13,7 @@ * Copyright (c) 1997,1998 Oezguer Kesim * Copyright (c) 1998-2001 Geoff Wing * - extensive modifications - * Copyright (c) 2003-2008 Marc Lehmann + * Copyright (c) 2003-2010 Marc Lehmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,11 +32,13 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ +#include "init.h" #include "keyboard.h" #include "rxvtperl.h" #include +#include #include #include @@ -51,6 +53,7 @@ # endif #endif +struct termios rxvt_term::def_tio; vector rxvt_term::termlist; // used to tell global functions which terminal instance is "active" @@ -95,7 +98,7 @@ compose_char *cc; // break compose chains, as stupid readline really likes to duplicate - // composing characters for some reason near the end of a line. + // composing characters for some reason, near the end of a line. cc = (*this)[c1]; while (cc) { @@ -103,12 +106,10 @@ cc = (*this)[cc->c1]; } - // check to see wether this combination already exists otherwise + // check to see whether this combination already exists otherwise for (cc = v.end (); cc-- > v.begin (); ) - { - if (cc->c1 == c1 && cc->c2 == c2) - return COMPOSE_LO + (cc - v.begin ()); - } + if (cc->c1 == c1 && cc->c2 == c2) + return COMPOSE_LO + (cc - v.begin ()); // allocate a new combination if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) @@ -116,7 +117,7 @@ static int seen; if (!seen++) - fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); + rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n"); return REPLACEMENT_CHAR; } @@ -188,7 +189,6 @@ flush_ev.set (this); destroy_ev.set (this); pty_ev.set (this); - incr_ev.set (this); termwin_ev.set (this); vt_ev.set (this); @@ -227,13 +227,7 @@ delete fontset[0]; #ifdef HAVE_BG_PIXMAP - bgPixmap.destroy (); -#endif -#ifdef HAVE_AFTERIMAGE - if (asv) - destroy_asvisual (asv, 0); - if (asimman) - destroy_image_manager (asimman, 0); + bg_destroy (); #endif if (display) @@ -280,7 +274,8 @@ free (env_term); free (locale); free (v_buffer); - free (incr_buf); + + delete selection_req; delete envv; delete argv; @@ -326,7 +321,6 @@ #if ENABLE_TRANSPARENCY || ENABLE_PERL rootwin_ev.stop (display); #endif - incr_ev.stop (); termwin_ev.stop (display); vt_ev.stop (display); } @@ -360,6 +354,18 @@ delete this; } +void +rxvt_term::set_option (uint8_t opt, bool set) +{ + if (!opt) + return; + + uint8_t mask = 1 << (opt & 7); + uint8_t &val = options [opt >> 3]; + + val = val & ~mask | (set ? mask : 0); +} + /*----------------------------------------------------------------------*/ /* * Exit gracefully, clearing the utmp entry and restoring tty attributes @@ -381,10 +387,10 @@ char buffer[BUFSIZ]; char mesg[BUFSIZ]; char number[32]; - char *mtype = "XlibMessage"; + const char mtype[] = "XlibMessage"; XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); - rxvt_warn ("An X Error occured, trying to continue after report.\n"); + rxvt_warn ("An X Error occurred, trying to continue after report.\n"); rxvt_warn ("%s: %s\n", mesg, buffer); XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); @@ -392,33 +398,33 @@ XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); rxvt_warn ("(which is %s)\n", buffer); if (event->request_code >= 128) { - XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", - mesg, BUFSIZ); + XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", + mesg, BUFSIZ); rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); } if ((event->error_code == BadWindow) || - (event->error_code == BadPixmap) || - (event->error_code == BadCursor) || - (event->error_code == BadFont) || - (event->error_code == BadDrawable) || - (event->error_code == BadColor) || - (event->error_code == BadGC) || - (event->error_code == BadIDChoice) || - (event->error_code == BadValue) || - (event->error_code == BadAtom)) { - if (event->error_code == BadValue) - XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", - mesg, BUFSIZ); - else if (event->error_code == BadAtom) - XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", - mesg, BUFSIZ); - else - XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", - mesg, BUFSIZ); - rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); + (event->error_code == BadPixmap) || + (event->error_code == BadCursor) || + (event->error_code == BadFont) || + (event->error_code == BadDrawable) || + (event->error_code == BadColor) || + (event->error_code == BadGC) || + (event->error_code == BadIDChoice) || + (event->error_code == BadValue) || + (event->error_code == BadAtom)) { + if (event->error_code == BadValue) + XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", + mesg, BUFSIZ); + else if (event->error_code == BadAtom) + XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", + mesg, BUFSIZ); + else + XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", + mesg, BUFSIZ); + rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); } XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", - mesg, BUFSIZ); + mesg, BUFSIZ); rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); } #endif @@ -475,14 +481,88 @@ kill (getpid (), w.signum); } +static void +rxvt_get_ttymode (struct termios *tio) +{ + if (tcgetattr (STDIN_FILENO, tio) < 0) + memset (tio, 0, sizeof (struct termios)); + + for (int i = 0; i < NCCS; i++) + tio->c_cc[i] = VDISABLE; + + tio->c_cc[VINTR] = CINTR; + tio->c_cc[VQUIT] = CQUIT; + tio->c_cc[VERASE] = CERASE; +#ifdef VERASE2 + tio->c_cc[VERASE2] = CERASE2; +#endif + tio->c_cc[VKILL] = CKILL; + tio->c_cc[VEOF] = CEOF; + tio->c_cc[VSTART] = CSTART; + tio->c_cc[VSTOP] = CSTOP; + tio->c_cc[VSUSP] = CSUSP; +# ifdef VDSUSP + tio->c_cc[VDSUSP] = CDSUSP; +# endif +# ifdef VREPRINT + tio->c_cc[VREPRINT] = CRPRNT; +# endif +# ifdef VDISCRD + tio->c_cc[VDISCRD] = CFLUSH; +# endif +# ifdef VWERSE + tio->c_cc[VWERSE] = CWERASE; +# endif +# ifdef VLNEXT + tio->c_cc[VLNEXT] = CLNEXT; +# endif +# ifdef VSTATUS + tio->c_cc[VSTATUS] = CSTATUS; +# endif + +# if VMIN != VEOF + tio->c_cc[VMIN] = 1; +# endif +# if VTIME != VEOL + tio->c_cc[VTIME] = 0; +# endif + + /* input modes */ + tio->c_iflag = (BRKINT | IGNPAR | ICRNL +# ifdef IMAXBEL + | IMAXBEL +# endif + | IXON); + + /* output modes */ + tio->c_oflag = (OPOST | ONLCR); + + /* control modes */ + tio->c_cflag = (CS8 | CREAD); + + /* local modes */ + tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO +# if defined (ECHOCTL) && defined (ECHOKE) + | ECHOCTL | ECHOKE +# endif + | ECHOE | ECHOK); +} + char **rxvt_environ; // startup environment void rxvt_init () { - ptytty::init (); + assert (("fontMask must not overlap other RS masks", + 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask)))); - if (!ev_default_loop (0)) + rxvt_get_ttymode (&rxvt_term::def_tio); + + // get rid of stdin/stdout as we don't need them, to free resources + dup2 (STDERR_FILENO, STDIN_FILENO); + dup2 (STDERR_FILENO, STDOUT_FILENO); + + if (!ev_default_loop ()) rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); rxvt_environ = environ; @@ -493,9 +573,6 @@ sig_handlers.sw_term.start (SIGTERM); ev_unref (); sig_handlers.sw_int.start (SIGINT); ev_unref (); - /* need to trap SIGURG for SVR4 (Unixware) rlogin */ - /* signal (SIGURG, SIG_DFL); */ - old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); // TODO: handle this with exceptions and tolerate the memory loss XSetIOErrorHandler (rxvt_xioerror_handler); @@ -690,7 +767,7 @@ delete fontset[0]; fontset[0] = fs; - prop = (*fs)[1]->properties (); + prop = (*fs)[rxvt_fontset::firstFont]->properties (); prop.height += lineSpace; prop.width += letterSpace; @@ -752,6 +829,18 @@ } void +rxvt_term::set_mbstring_property (Atom prop, const char *str, int len) +{ + XTextProperty ct; + + if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) + { + XSetTextProperty (dpy, parent[0], &ct, prop); + XFree (ct.value); + } +} + +void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) { wchar_t *ws = rxvt_mbstowcs (str, len); @@ -771,7 +860,7 @@ void rxvt_term::set_title (const char *str) { - set_string_property (XA_WM_NAME, str); + set_mbstring_property (XA_WM_NAME, str); #if ENABLE_EWMH set_utf8_property (xa[XA_NET_WM_NAME], str); #endif @@ -780,7 +869,7 @@ void rxvt_term::set_icon_name (const char *str) { - set_string_property (XA_WM_ICON_NAME, str); + set_mbstring_property (XA_WM_ICON_NAME, str); #if ENABLE_EWMH set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); #endif @@ -862,21 +951,20 @@ { unsigned int i; const char *xpmb = ""; - char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; + char fstr[] = "default"; + char bstr[] = "default"; - strcpy (fstr, "default"); - strcpy (bstr, "default"); for (i = Color_Black; i <= Color_White; i++) if (pix_colors[Color_fg] == pix_colors[i]) { - sprintf (fstr, "%d", (i - Color_Black)); + sprintf (fstr, "%d", i - Color_Black); break; } for (i = Color_Black; i <= Color_White; i++) if (pix_colors[Color_bg] == pix_colors[i]) { - sprintf (bstr, "%d", (i - Color_Black)); + sprintf (bstr, "%d", i - Color_Black); #ifdef BG_IMAGE_FROM_FILE xpmb = "default;"; #endif @@ -989,7 +1077,7 @@ width, height); #ifdef HAVE_BG_PIXMAP - if (bgPixmap.window_size_sensitive ()) + if (bg_window_size_sensitive ()) update_background (); #endif } @@ -997,15 +1085,6 @@ if (fix_screen || old_height == 0) scr_reset (); - // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version - //scr_touch (false); - -#ifdef HAVE_BG_PIXMAP -// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? -// if (bgPixmap.pixmap) -// scr_touch (false); -#endif - #ifdef USE_XIM IMSetPosition (); #endif @@ -1097,10 +1176,10 @@ win = XGetSelectionOwner (dpy, atom); if (win != None) - return True; + return true; } - return False; + return false; } void @@ -1263,7 +1342,7 @@ if (!p) continue; - s = rxvt_splitcommastring (p); + s = rxvt_strsplit (',', p); for (i = found = 0; !found && s[i]; i++) { @@ -1285,7 +1364,7 @@ for (j = 0; j < xim_styles->count_styles; j++) if (input_style == xim_styles->supported_styles[j]) { - rxvt_freecommastring (s); + rxvt_free_strsplit (s); found = 1; goto foundpet; @@ -1293,7 +1372,7 @@ } - rxvt_freecommastring (s); + rxvt_free_strsplit (s); } foundpet: @@ -1459,7 +1538,7 @@ { bool found = false; - s = rxvt_splitcommastring (p); + s = rxvt_strsplit (',', p); for (i = 0; s[i]; i++) { @@ -1475,7 +1554,7 @@ } } - rxvt_freecommastring (s); + rxvt_free_strsplit (s); if (found) goto done; @@ -1546,39 +1625,31 @@ { Window cr; XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); -/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/ } Pixmap -rxvt_term::get_pixmap_property (int prop_id) +rxvt_term::get_pixmap_property (Atom property) { - if (prop_id > 0 && prop_id < NUM_XA) - if (xa[prop_id]) - { - int aformat; - unsigned long nitems, bytes_after; - Atom atype; - unsigned char *prop = NULL; - int result = XGetWindowProperty (dpy, display->root, xa[prop_id], - 0L, 1L, False, XA_PIXMAP, &atype, &aformat, - &nitems, &bytes_after, &prop); - if (result == Success && prop && atype == XA_PIXMAP) - return *(Pixmap *)prop; - } + Pixmap pixmap = None; - return None; + int aformat; + unsigned long nitems, bytes_after; + Atom atype; + unsigned char *prop; + int result = XGetWindowProperty (dpy, display->root, property, + 0L, 1L, False, XA_PIXMAP, &atype, &aformat, + &nitems, &bytes_after, &prop); + if (result == Success) + { + if (atype == XA_PIXMAP) + pixmap = *(Pixmap *)prop; + XFree (prop); + } + + return pixmap; } #ifdef HAVE_BG_PIXMAP -# if TRACE_PIXMAPS -# undef update_background -void -rxvt_term::trace_update_background (const char *file, int line) -{ - fprintf (stderr, "%s:%d:update_background()\n", file, line); - update_background (); -} -# endif void rxvt_term::update_background () @@ -1586,12 +1657,12 @@ if (update_background_ev.is_active ()) return; - bgPixmap.invalidate (); + bg_invalidate (); - ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); + ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); if (to_wait <= 0.) - bgPixmap.render (); + bg_render (); else update_background_ev.start (to_wait); } @@ -1602,7 +1673,7 @@ make_current (); update_background_ev.stop (); - bgPixmap.render (); + bg_render (); refresh_check (); }