--- rxvt-unicode/src/main.C 2007/08/10 22:10:36 1.240 +++ rxvt-unicode/src/main.C 2012/12/30 15:38:04 1.387 @@ -13,7 +13,7 @@ * Copyright (c) 1997,1998 Oezguer Kesim * Copyright (c) 1998-2001 Geoff Wing * - extensive modifications - * Copyright (c) 2003-2006 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,22 +32,26 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ +#include "init.h" #include "keyboard.h" #include "rxvtperl.h" #include -#include -#include - -#ifdef TTY_GID_SUPPORT -# include -#endif - -#ifdef HAVE_TERMIOS_H -# include +#include +#include +#include + +#include + +#ifdef HAVE_XSETLOCALE +# define X_LOCALE +# include +#else +# include #endif +struct termios rxvt_term::def_tio; vector rxvt_term::termlist; // used to tell global functions which terminal instance is "active" @@ -90,9 +94,9 @@ text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) { 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) { @@ -100,12 +104,10 @@ cc = (*this)[cc->c1]; } - // check to see wether 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 ()); - } + // check to see whether this combination already exists otherwise + for (cc = v.begin (); cc < v.end (); cc++) + 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) @@ -113,7 +115,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; } @@ -149,49 +151,45 @@ #endif rxvt_term::rxvt_term () - : -#if ENABLE_TRANSPARENCY || ENABLE_PERL - rootwin_ev (this, &rxvt_term::rootwin_cb), -#endif -#if ENABLE_TRANSPARENCY - check_our_parents_ev(this, &rxvt_term::check_our_parents_cb), -#endif -#ifdef HAVE_SCROLLBARS - scrollbar_ev (this, &rxvt_term::x_cb), +{ +#if HAVE_BG_PIXMAP + update_background_ev.set (this); #endif #ifdef CURSOR_BLINK - cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), + cursor_blink_ev.set (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL); #endif #ifdef TEXT_BLINK - text_blink_ev (this, &rxvt_term::text_blink_cb), + text_blink_ev.set (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL); #endif #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING - cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), + cont_scroll_ev.set (this); #endif #ifdef SELECTION_SCROLLING - sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), + sel_scroll_ev.set (this); #endif #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) - slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), + slip_wheel_ev.set (this); #endif -#ifdef POINTER_BLANK - pointer_ev (this, &rxvt_term::pointer_cb), +#if BG_IMAGE_FROM_ROOT || ENABLE_PERL + rootwin_ev.set (this), #endif -#ifdef USE_XIM - im_ev (this, &rxvt_term::im_cb), + scrollbar_ev.set (this), +#if USE_XIM + im_ev.set (this), #endif -#ifndef NO_BELL - bell_ev (this, &rxvt_term::bell_cb), +#ifdef POINTER_BLANK + pointer_ev.set (this); #endif - termwin_ev (this, &rxvt_term::x_cb), - vt_ev (this, &rxvt_term::x_cb), - child_ev (this, &rxvt_term::child_cb), - check_ev (this, &rxvt_term::check_cb), - flush_ev (this, &rxvt_term::flush_cb), - destroy_ev (this, &rxvt_term::destroy_cb), - pty_ev (this, &rxvt_term::pty_cb), - incr_ev (this, &rxvt_term::incr_cb) -{ +#ifndef NO_BELL + bell_ev.set (this); +#endif + child_ev.set (this); + flush_ev.set (this); + destroy_ev.set (this); + pty_ev.set (this); + termwin_ev.set (this); + vt_ev.set (this); + cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; termlist.push_back (this); @@ -203,7 +201,8 @@ // clean up the most important stuff, do *not* call x or free mem etc. // for use before an emergency exit -void rxvt_term::emergency_cleanup () +void +rxvt_term::emergency_cleanup () { if (cmd_pid) kill (-cmd_pid, SIGHUP); @@ -225,43 +224,29 @@ #endif delete fontset[0]; +#ifdef HAVE_BG_PIXMAP + bg_destroy (); +#endif + +#if HAVE_IMG + delete bg_img; +#endif + if (display) { selection_clear (); + selection_clear (true); -#ifdef USE_XIM +#if USE_XIM im_destroy (); #endif -#ifdef XTERM_SCROLLBAR - if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); - if (ShadowGC) XFreeGC (dpy, ShadowGC); -#endif -#ifdef PLAIN_SCROLLBAR - if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC); -#endif -#ifdef NEXT_SCROLLBAR - if (blackGC) XFreeGC (dpy, blackGC); - if (whiteGC) XFreeGC (dpy, whiteGC); - if (grayGC) XFreeGC (dpy, grayGC); - if (darkGC) XFreeGC (dpy, darkGC); - if (stippleGC) XFreeGC (dpy, stippleGC); - if (dimple) XFreePixmap (dpy, dimple); - if (upArrow) XFreePixmap (dpy, upArrow); - if (downArrow) XFreePixmap (dpy, downArrow); - if (upArrowHi) XFreePixmap (dpy, upArrowHi); - if (downArrowHi) XFreePixmap (dpy, downArrowHi); -#endif -#ifdef RXVT_SCROLLBAR - if (topShadowGC) XFreeGC (dpy, topShadowGC); - if (botShadowGC) XFreeGC (dpy, botShadowGC); - if (scrollbarGC) XFreeGC (dpy, scrollbarGC); -#endif + scrollBar.destroy (); if (gc) XFreeGC (dpy, gc); delete drawable; // destroy all windows - if (parent[0]) - XDestroyWindow (dpy, parent[0]); + if (parent) + XDestroyWindow (dpy, parent); for (int i = 0; i < TOTAL_COLORS; i++) if (ISSET_PIXCOLOR (i)) @@ -273,14 +258,10 @@ } clear (); - } - delete [] pix_colors_focused; -#if OFF_FOCUS_FADING - delete [] pix_colors_unfocused; -#endif - - displays.put (display); + display->flush (); /* ideally .put should do this */ + displays.put (display); + } scr_release (); @@ -289,12 +270,11 @@ free (allocated [i]); free (selection.text); - // TODO: manage env vars in child only(!) - free (env_display); - free (env_term); + free (selection.clip_text); free (locale); free (v_buffer); - free (incr_buf); + + delete selection_req; delete envv; delete argv; @@ -302,11 +282,14 @@ #ifdef KEYSYM_RESOURCE delete keyboard; #endif +#ifndef NO_RESOURCES + XrmDestroyDatabase (option_db); +#endif } // child has exited, usually destroys void -rxvt_term::child_cb (child_watcher &w, int status) +rxvt_term::child_cb (ev::child &w, int status) { HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); @@ -319,7 +302,7 @@ void rxvt_term::destroy () { - if (destroy_ev.active) + if (destroy_ev.is_active ()) return; HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); @@ -333,18 +316,15 @@ #if USE_XIM im_ev.stop (display); #endif -#if HAVE_SCROLLBARS scrollbar_ev.stop (display); -#endif -#if ENABLE_TRANSPARENCY || ENABLE_PERL +#if BG_IMAGE_FROM_ROOT || ENABLE_PERL rootwin_ev.stop (display); #endif - incr_ev.stop (); termwin_ev.stop (display); vt_ev.stop (display); } - check_ev.stop (); + flush_ev.stop (); pty_ev.stop (); #ifdef CURSOR_BLINK cursor_blink_ev.stop (); @@ -362,21 +342,32 @@ pointer_ev.stop (); #endif - destroy_ev.start (0); + destroy_ev.start (); } void -rxvt_term::destroy_cb (time_watcher &w) +rxvt_term::destroy_cb (ev::idle &w, int revents) { make_current (); delete this; } +void +rxvt_term::set_option (uint8_t opt, bool set) NOTHROW +{ + 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 - * TODO: if debugging, this should free up any known resources if we can */ static XErrorHandler old_xerror_handler; @@ -388,55 +379,105 @@ } #if !ENABLE_MINIMAL -static void +static void ecb_cold print_x_error (Display *dpy, XErrorEvent *event) { char buffer[BUFSIZ]; char mesg[BUFSIZ]; char number[32]; - 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 ("%s: %s\n", mesg, buffer); - XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); - rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); - sprintf(number, "%d", event->request_code); - 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); - 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); - } - XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", - mesg, BUFSIZ); - rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); + + rxvt_warn ("An X Error occurred, trying to continue after report.\n"); + + XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ); + snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial); + + XGetErrorText (dpy, event->error_code, buffer, BUFSIZ); + XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ); + rxvt_warn ("+ %s: %s\n", mesg, buffer); + + XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ); + snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code); + + if (event->request_code >= 128) + { +#if 0 + /* XListExtensions and probably query extensions hangs when there are multiple queues errors */ + int nexts; + char **exts = XListExtensions (dpy, &nexts); + + while (nexts) + { + char *extname = exts [nexts - 1]; + int major, first_event, first_error; + + if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code) + { + XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); + rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code); + + snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code); + XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ); + rxvt_warn ("+ (which is %s)\n", buffer); + + break; + } + + printf ("nextss %d %s\n", nexts, extname);//D + --nexts; + ++exts; + } +#else + int nexts = 0; + char **exts = 0; +#endif + + if (!nexts) + { + rxvt_warn ("+ (which is an unknown extension)\n", buffer); + + XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ); + snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code); + +#if 0 + sprintf (number, "RENDER.%d", event->minor_code); + XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); + rxvt_warn ("+ (which is %s)\n", buffer); +#endif + } + + XFreeExtensionList (exts); + } + else + { + sprintf (number, "%d", event->request_code); + XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ); + rxvt_warn ("+ (which is %s)\n", buffer); + } + + 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, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ); + else if (event->error_code == BadAtom) + XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ); + else + XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ); + + snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid); + } } #endif -int +int ecb_cold rxvt_xerror_handler (Display *display, XErrorEvent *event) { if (GET_R->allowedxerror == -1) @@ -455,7 +496,7 @@ return 0; } -int +int ecb_cold rxvt_xioerror_handler (Display *display) { rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", @@ -464,211 +505,131 @@ _exit (EXIT_FAILURE); } -/*----------------------------------------------------------------------*/ -bool -rxvt_term::init (int argc, const char *const *argv, stringvec *envv) +static struct sig_handlers { - this->envv = envv; - - SET_R (this); - set_locale (""); - set_environ (envv); // few things in X do not call setlocale :( - - if (!init_vars ()) - return false; - - init_secondary (); - - const char **cmd_argv = init_resources (argc, argv); - -#ifdef KEYSYM_RESOURCE - keyboard->register_done (); -#endif - -#ifdef HAVE_SCROLLBARS - if (option (Opt_scrollBar)) - scrollBar.setIdle (); /* set existence for size calculations */ -#endif - - pty = ptytty::create (); - - create_windows (argc, argv); - - init_xlocale (); + ev::sig sw_term, sw_int; - scr_reset (); // initialize screen - -#if 0 - XSynchronize (dpy, True); -#endif + /* + * Catch a fatal signal and tidy up before quitting + */ + void sig_term (ev::sig &w, int revents); -#ifdef HAVE_SCROLLBARS - if (option (Opt_scrollBar)) - resize_scrollbar (); /* create and map scrollbar */ -#endif -#ifdef HAVE_BG_PIXMAP + sig_handlers () { - bool changed = false; - bgPixmap.set_target (this); - -#ifdef ENABLE_TRANSPARENCY - if (option (Opt_transparent)) - { - bgPixmap.set_transparent (); -#ifdef HAVE_AFTERIMAGE - if (rs [Rs_blurradius]) - bgPixmap.set_blur_radius (rs [Rs_blurradius]); -#endif - if (ISSET_PIXCOLOR (Color_tint)) - bgPixmap.set_tint (pix_colors_focused [Color_tint]); - if (rs [Rs_shade]) - bgPixmap.set_shade (rs [Rs_shade]); - changed = true; - - bgPixmap.set_root_pixmap (); - XSelectInput (dpy, display->root, PropertyChangeMask); - rootwin_ev.start (display, display->root); - } -#endif - -#ifdef XPM_BACKGROUND - if (rs[Rs_backgroundPixmap] != NULL) - { - const char *p = rs[Rs_backgroundPixmap]; - - if ((p = strchr (p, ';')) != NULL) - { - p++; - bgPixmap.set_geometry (p); - } - else - bgPixmap.set_defaultGeometry (); - - changed = bgPixmap.set_file (rs[Rs_backgroundPixmap]); - } -#endif - if (changed) - { - bgPixmap.render_background (); - scr_touch (true); - } + sw_term.set (this); + sw_int .set (this); } -#endif - -#if ENABLE_PERL - rootwin_ev.start (display, display->root); -#endif - - set_colorfgbg (); +} sig_handlers; - init_command (cmd_argv); +void +sig_handlers::sig_term (ev::sig &w, int revents) +{ + rxvt_emergency_cleanup (); + w.stop (); + kill (getpid (), w.signum); +} - free (cmd_argv); +static void +rxvt_get_ttymode (struct termios *tio) +{ + if (tcgetattr (STDIN_FILENO, tio) < 0) + memset (tio, 0, sizeof (struct termios)); - if (pty->pty >= 0) - pty_ev.start (pty->pty, EVENT_READ); + for (int i = 0; i < NCCS; i++) + tio->c_cc[i] = VDISABLE; - check_ev.start (); + 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 - HOOK_INVOKE ((this, HOOK_START, DT_END)); +# if VMIN != VEOF + tio->c_cc[VMIN] = 1; +# endif +# if VTIME != VEOL + tio->c_cc[VTIME] = 0; +# endif -#if ENABLE_XEMBED - if (rs[Rs_embed]) - { - long info[2] = { 0, XEMBED_MAPPED }; + /* input modes */ + tio->c_iflag = (BRKINT | IGNPAR | ICRNL +# ifdef IMAXBEL + | IMAXBEL +# endif + | IXON); - XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], - 32, PropModeReplace, (unsigned char *)&info, 2); - } -#endif + /* output modes */ + tio->c_oflag = (OPOST | ONLCR); - XMapWindow (dpy, vt); - XMapWindow (dpy, parent[0]); + /* control modes */ + tio->c_cflag = (CS8 | CREAD); - return true; + /* local modes */ + tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO +# if defined (ECHOCTL) && defined (ECHOKE) + | ECHOCTL | ECHOKE +# endif + | ECHOE | ECHOK); } -static struct sig_handlers -{ - sig_watcher sw_term, sw_int; - - /* - * Catch a fatal signal and tidy up before quitting - */ - void - sig_term (sig_watcher &w) - { - rxvt_emergency_cleanup (); - signal (w.signum, SIG_DFL); - kill (getpid (), w.signum); - } - - sig_handlers () - : sw_term (this, &sig_handlers::sig_term), - sw_int (this, &sig_handlers::sig_term) - { - } -} sig_handlers; - 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)))); + + 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; signal (SIGHUP, SIG_IGN); signal (SIGPIPE, SIG_IGN); - sig_handlers.sw_term.start (SIGTERM); - sig_handlers.sw_int.start (SIGINT); - - /* need to trap SIGURG for SVR4 (Unixware) rlogin */ - /* signal (SIGURG, SIG_DFL); */ + sig_handlers.sw_term.start (SIGTERM); ev_unref (); + sig_handlers.sw_int.start (SIGINT); ev_unref (); old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); // TODO: handle this with exceptions and tolerate the memory loss XSetIOErrorHandler (rxvt_xioerror_handler); XrmInitialize (); -} - -/* ------------------------------------------------------------------------- * - * MEMORY ALLOCATION WRAPPERS * - * ------------------------------------------------------------------------- */ -void * -rxvt_malloc (size_t size) -{ - void *p = malloc (size); - - if (!p) - rxvt_fatal ("memory allocation failure. aborting.\n"); - - return p; -} - -void * -rxvt_calloc (size_t number, size_t size) -{ - void *p = calloc (number, size); - - if (!p) - rxvt_fatal ("memory allocation failure. aborting.\n"); - return p; -} - -void * -rxvt_realloc (void *ptr, size_t size) -{ - void *p = realloc (ptr, size); - - if (!p) - rxvt_fatal ("memory allocation failure. aborting.\n"); - - return p; +#if HAVE_PIXBUF + g_type_init (); +#endif } /*----------------------------------------------------------------------*/ @@ -680,7 +641,7 @@ rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) { short recalc_x, recalc_y; - int x, y, sb_w, flags; + int x, y, flags; unsigned int w, h; unsigned int max_width, max_height; @@ -700,13 +661,19 @@ if (flags & WidthValue) { - ncol = clamp (w, 0, std::numeric_limits::max ()); + if (!w) + rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n"); + + ncol = clamp (w, 1, std::numeric_limits::max ()); szHint.flags |= USSize; } if (flags & HeightValue) { - nrow = clamp (h, 0, std::numeric_limits::max ()); + if (!h) + rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n"); + + nrow = clamp (h, 1, std::numeric_limits::max ()); szHint.flags |= USSize; } @@ -747,12 +714,11 @@ szHint.base_width = szHint.base_height = 2 * int_bwidth; - sb_w = 0; window_vt_x = window_vt_y = int_bwidth; if (scrollBar.state) { - sb_w = scrollbar_TotalWidth (); + int sb_w = scrollBar.total_width (); szHint.base_width += sb_w; if (!option (Opt_scrollBar_right)) @@ -786,17 +752,23 @@ szHint.height = szHint.base_height + height; } - if (scrollBar.state && option (Opt_scrollBar_right)) - window_sb_x = szHint.width - sb_w; - if (recalc_x) szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; if (recalc_y) szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; - ncol = width / fwidth; + ncol = width / fwidth; nrow = height / fheight; + + // When the size of the vt window is not a multiple of the cell + // size, i.e., when the wm does not honour our size hints, there are + // extra areas not covered by the terminal screen. Such gaps, when a + // bg pixmap is set, would have to be cleared manually to properly + // refresh the background. We take the simpler route and shrink the + // vt window so as to avoid creating gaps. + vt_width = ncol * fwidth; + vt_height = nrow * fheight; } /*----------------------------------------------------------------------*/ @@ -814,25 +786,19 @@ ws.ws_col = ncol; ws.ws_row = nrow; - ws.ws_xpixel = width; - ws.ws_ypixel = height; - (void)ioctl (pty->pty, TIOCSWINSZ, &ws); + ws.ws_xpixel = vt_width; + ws.ws_ypixel = vt_height; + ioctl (pty->pty, TIOCSWINSZ, &ws); #if 0 - // TIOCSWINSZ⎈ is supposed to do this automatically and correctly + // TIOCSWINSZ is supposed to do this automatically and correctly if (cmd_pid) /* force through to the command */ kill (-cmd_pid, SIGWINCH); #endif } /*----------------------------------------------------------------------*/ -/* set_fonts () - load and set the various fonts - * - * init = 1 - initialize - * - * fontname == FONT_UP - switch to bigger font - * fontname == FONT_DN - switch to smaller font - */ +/* load and set the various fonts */ bool rxvt_term::set_fonts () { @@ -856,13 +822,13 @@ delete fontset[0]; fontset[0] = fs; - prop = (*fs)[1]->properties (); - prop.height += lineSpace; + prop = (*fs)[rxvt_fontset::firstFont]->properties (); + prop.width = max (prop.width + letterSpace, 1); fs->set_prop (prop, false); fwidth = prop.width; - fheight = prop.height; + fheight = prop.height + lineSpace; fbase = prop.ascent; for (int style = 1; style < 4; style++) @@ -898,29 +864,43 @@ #endif } - if (parent[0]) + if (parent) { resize_all_windows (0, 0, 0); scr_remap_chars (); scr_touch (true); - } + } return true; } -void rxvt_term::set_string_property (Atom prop, const char *str, int len) +void +rxvt_term::set_string_property (Atom prop, const char *str, int len) { - XChangeProperty (dpy, parent[0], + XChangeProperty (dpy, parent, prop, XA_STRING, 8, PropModeReplace, (const unsigned char *)str, len >= 0 ? len : strlen (str)); } -void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) +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, &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); char *s = rxvt_wcstoutf8 (ws); - XChangeProperty (dpy, parent[0], + XChangeProperty (dpy, parent, prop, xa[XA_UTF8_STRING], 8, PropModeReplace, (const unsigned char *)s, strlen (s)); @@ -934,7 +914,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 @@ -943,19 +923,18 @@ 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 } -#ifdef XTERM_COLOR_CHANGE void rxvt_term::set_window_color (int idx, const char *color) { +#ifdef XTERM_COLOR_CHANGE rxvt_color xcol; - int i; - + if (color == NULL || *color == '\0') return; @@ -966,17 +945,18 @@ /* handle color aliases */ if (isdigit (*color)) { - i = atoi (color); + int i = atoi (color); if (i >= 8 && i <= 15) - { /* bright colors */ - i -= 8; - pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; + { + /* bright colors */ + pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; goto done; } if (i >= 0 && i <= 7) - { /* normal colors */ + { + /* normal colors */ pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; goto done; } @@ -991,20 +971,15 @@ pix_colors_focused[idx] = xcol; - /* XSetWindowAttributes attr; */ - /* Cursor cursor; */ done: /*TODO: handle Color_BD, scrollbar background, etc. */ update_fade_color (idx); recolour_cursor (); scr_recolour (); +#endif /* XTERM_COLOR_CHANGE */ } -#else -# define set_window_color (idx,color) ((void)0) -#endif /* XTERM_COLOR_CHANGE */ - void rxvt_term::recolour_cursor () { @@ -1025,33 +1000,35 @@ /* * find if fg/bg matches any of the normal (low-intensity) colors */ -void -rxvt_term::set_colorfgbg () +char * +rxvt_term::get_colorfgbg () { unsigned int i; - const char *xpmb = "\0"; - char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; + const char *xpmb = ""; + char fstr[] = "default"; + char bstr[] = "default"; + char *env_colorfgbg; - 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)); -#ifdef XPM_BACKGROUND + sprintf (bstr, "%d", i - Color_Black); +#if BG_IMAGE_FROM_FILE xpmb = "default;"; #endif break; } + env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg")); sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); + return env_colorfgbg; } /*----------------------------------------------------------------------*/ @@ -1084,8 +1061,15 @@ window_calc (newwidth, newheight); - if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) - XSetWMNormalHints (dpy, parent[0], &szHint); + bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)); + + // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow + if (set_hint) + { + szHint.flags &= ~(PBaseSize | PResizeInc); + XSetWMNormalHints (dpy, parent, &szHint); + szHint.flags |= PBaseSize | PResizeInc; + } if (!ignoreparent) { @@ -1099,9 +1083,9 @@ unsigned int unused_w1, unused_h1, unused_b1, unused_d1; Window unused_cr; - XTranslateCoordinates (dpy, parent[0], display->root, + XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &unused_cr); - XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, + XGetGeometry (dpy, parent, &unused_cr, &x1, &y1, &unused_w1, &unused_h1, &unused_b1, &unused_d1); /* * if display->root isn't the parent window, a WM will probably have offset @@ -1128,49 +1112,40 @@ else if (y == y1) /* exact center */ dy /= 2; - XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, + XMoveResizeWindow (dpy, parent, x + dx, y + dy, szHint.width, szHint.height); #else - XResizeWindow (dpy, parent[0], szHint.width, szHint.height); + XResizeWindow (dpy, parent, szHint.width, szHint.height); #endif } + if (set_hint) + XSetWMNormalHints (dpy, parent, &szHint); + fix_screen = ncol != prev_ncol || nrow != prev_nrow; if (fix_screen || newwidth != old_width || newheight != old_height) { if (scrollBar.state) - { - XMoveResizeWindow (dpy, scrollBar.win, - window_sb_x, 0, - scrollbar_TotalWidth (), szHint.height); - resize_scrollbar (); - } + scrollBar.resize (); XMoveResizeWindow (dpy, vt, window_vt_x, window_vt_y, - width, height); + vt_width, vt_height); - scr_clear (); -#ifdef XPM_BACKGROUND - /* TODO: should that really be here ? */ - bgPixmap.render_background (); + HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END)); + +#ifdef HAVE_BG_PIXMAP + if (bg_window_size_sensitive ()) + update_background (); #endif } 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 - if (bgPixmap.pixmap) - scr_touch (false); -#endif - -#ifdef USE_XIM - IMSetPosition (); +#if USE_XIM + im_set_position (); #endif } @@ -1193,7 +1168,7 @@ newheight = wattr.height - szHint.base_height; } - if (newwidth != width || newheight != height) + if (newwidth != vt_width || newheight != vt_height) { newwidth += szHint.base_width; newheight += szHint.base_height; @@ -1204,7 +1179,7 @@ /* -------------------------------------------------------------------- * * - X INPUT METHOD ROUTINES - * * -------------------------------------------------------------------- */ -#ifdef USE_XIM +#if USE_XIM void rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) @@ -1241,34 +1216,33 @@ /* Checking whether input method is running. */ bool -rxvt_term::IMisRunning () +rxvt_term::im_is_running () { - char *p; Atom atom; Window win; char server[IMBUFSIZ]; /* get current locale modifier */ - if ((p = XSetLocaleModifiers (NULL)) != NULL) + if (char *p = XSetLocaleModifiers (0)) { strcpy (server, "@server="); - strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ + strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */ - if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ + if (p = strchr (server + 1, '@')) /* first one only */ *p = '\0'; atom = XInternAtom (dpy, server, False); win = XGetSelectionOwner (dpy, atom); if (win != None) - return True; + return true; } - return False; + return false; } void -rxvt_term::IMSendSpot () +rxvt_term::im_send_spot () { XPoint nspot; XVaNestedList preedit_attr; @@ -1331,7 +1305,7 @@ if (text) { - void *str; + wchar_t *str; if (!text->encoding_is_wchar && text->string.multi_byte) { @@ -1339,15 +1313,15 @@ if (term->rs[Rs_imLocale]) SET_LOCALE (term->rs[Rs_imLocale]); - str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); - mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); + str = rxvt_temp_buf (text->length + 1); + mbstowcs (str, text->string.multi_byte, text->length + 1); if (term->rs[Rs_imLocale]) SET_LOCALE (term->locale); } else - str = (void *)text->string.wide_char; - + str = text->string.wide_char; + HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, DT_INT, call_data->caret, DT_INT, call_data->chg_first, @@ -1384,7 +1358,7 @@ * open a suitable preedit type */ bool -rxvt_term::IM_get_IC (const char *modifiers) +rxvt_term::im_get_ic (const char *modifiers) { int i, j, found; XIM xim; @@ -1394,9 +1368,6 @@ const char *p; char **s; XIMStyles *xim_styles; -#ifdef ENABLE_XIM_ONTHESPOT - XIMCallback xcb[4]; -#endif set_environ (envv); @@ -1427,7 +1398,7 @@ if (!p) continue; - s = rxvt_splitcommastring (p); + s = rxvt_strsplit (',', p); for (i = found = 0; !found && s[i]; i++) { @@ -1449,7 +1420,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; @@ -1457,7 +1428,7 @@ } - rxvt_freecommastring (s); + rxvt_free_strsplit (s); } foundpet: @@ -1546,6 +1517,8 @@ #if ENABLE_XIM_ONTHESPOT else if (input_style & XIMPreeditCallbacks) { + XIMCallback xcb[4]; + im_set_position (spot); xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; @@ -1570,7 +1543,7 @@ Input_Context = XCreateIC (xim, XNInputStyle, input_style, XNClientWindow, vt, - XNFocusWindow, parent[0], + XNFocusWindow, parent, preedit_attr ? XNPreeditAttributes : NULL, preedit_attr, status_attr ? XNStatusAttributes : NULL, @@ -1593,7 +1566,7 @@ vt_select_input (); #endif - IMSetPosition (); + im_set_position (); return true; } @@ -1613,17 +1586,15 @@ if (Input_Context) return; -#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) if (rs[Rs_imLocale]) SET_LOCALE (rs[Rs_imLocale]); -#endif p = rs[Rs_inputMethod]; if (p && *p) { bool found = false; - s = rxvt_splitcommastring (p); + s = rxvt_strsplit (',', p); for (i = 0; s[i]; i++) { @@ -1631,7 +1602,7 @@ { strcpy (buf, "@im="); strncat (buf, s[i], IMBUFSIZ - 5); - if (IM_get_IC (buf)) + if (im_get_ic (buf)) { found = true; break; @@ -1639,29 +1610,27 @@ } } - rxvt_freecommastring (s); + rxvt_free_strsplit (s); if (found) goto done; } /* try with XMODIFIERS env. var. */ - if (IM_get_IC ("")) + if (im_get_ic ("")) goto done; /* try with no modifiers base IF the user didn't specify an IM */ - if (IM_get_IC ("@im=none")) + if (im_get_ic ("@im=none")) goto done; done: -#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) if (rs[Rs_imLocale]) SET_LOCALE (locale); -#endif } void -rxvt_term::IMSetPosition () +rxvt_term::im_set_position () { XRectangle preedit_rect, status_rect, *needed_rect; XVaNestedList preedit_attr, status_attr; @@ -1669,14 +1638,14 @@ if (!Input_Context || !focus || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) - || !IMisRunning ()) + || !im_is_running ()) return; if (input_style & XIMPreeditPosition) { im_set_size (preedit_rect); preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); - + XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); } @@ -1703,6 +1672,41 @@ XFree (preedit_attr); } -#endif /* USE_XIM */ +#endif /* USE_XIM */ + +void +rxvt_term::get_window_origin (int &x, int &y) +{ + Window cr; + XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr); +} + +#ifdef HAVE_BG_PIXMAP + +void +rxvt_term::update_background () +{ + if (update_background_ev.is_active ()) + return; + + ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since); + + if (to_wait <= 0.) + bg_render (); + else + update_background_ev.start (to_wait); +} + +void +rxvt_term::update_background_cb (ev::timer &w, int revents) +{ + make_current (); + + update_background_ev.stop (); + bg_render (); + refresh_check (); +} + +#endif /* HAVE_BG_PIXMAP */ /*----------------------- end-of-file (C source) -----------------------*/