--- rxvt-unicode/src/main.C 2004/02/12 01:53:25 1.30 +++ rxvt-unicode/src/main.C 2010/11/02 13:32:50 1.336 @@ -1,5 +1,5 @@ -/*--------------------------------*-C-*---------------------------------* - * File: main.c +/*----------------------------------------------------------------------* + * File: main.C *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. @@ -13,6 +13,7 @@ * Copyright (c) 1997,1998 Oezguer Kesim * Copyright (c) 1998-2001 Geoff Wing * - extensive modifications + * Copyright (c) 2003-2008 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 @@ -31,307 +32,400 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ -#include "main.intpro" /* PROTOS for internal routines */ +#include "init.h" +#include "keyboard.h" +#include "rxvtperl.h" -#include +#include -#ifdef TTY_GID_SUPPORT -# include -#endif +#include +#include +#include -#ifdef HAVE_TERMIOS_H -# include +#include + +#ifdef HAVE_XSETLOCALE +# define X_LOCALE +# include +#else +# ifdef HAVE_SETLOCALE +# include +# endif #endif -#include +struct termios rxvt_term::def_tio; +vector rxvt_term::termlist; -static char curlocale[128]; +// used to tell global functions which terminal instance is "active" +rxvt_t rxvt_current_term; -void -rxvt_set_locale (const char *locale) -{ - if (locale && STRNCMP (locale, curlocale, 128)) - { - STRNCPY (curlocale, locale, 128); - setlocale (LC_CTYPE, curlocale); - } -} +static char curlocale[128], savelocale[128]; -void * -rxvt_term::operator new (size_t s) +bool +rxvt_set_locale (const char *locale) NOTHROW { - void *p = malloc (s); + int size = strlen (locale) + 1; - MEMSET (p, 0, s); - return p; + if (size > sizeof (curlocale)) + rxvt_fatal ("locale string too long, aborting.\n"); + + if (!locale || !memcmp (locale, curlocale, size)) + return false; + + memcpy (curlocale, locale, size); + setlocale (LC_CTYPE, curlocale); + return true; } void -rxvt_term::operator delete (void *p, size_t s) +rxvt_push_locale (const char *locale) NOTHROW { - free (p); + strcpy (savelocale, curlocale); + rxvt_set_locale (locale); } -rxvt_term::rxvt_term () - : - rootwin_ev (this, &rxvt_term::rootwin_cb), - termwin_ev (this, &rxvt_term::x_cb), - vt_ev (this, &rxvt_term::x_cb), -#ifdef HAVE_SCROLLBARS - scrollbar_ev (this, &rxvt_term::x_cb), -#endif -#ifdef MENUBAR - menubar_ev (this, &rxvt_term::x_cb), fixme -#endif -#ifdef CURSOR_BLINK - cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), -#endif -#ifdef TEXT_BLINK - text_blink_ev (this, &rxvt_term::text_blink_cb), -#endif -#ifdef POINTER_BLANK - pointer_ev (this, &rxvt_term::pointer_cb), -#endif - check_ev (this, &rxvt_term::check_cb), - destroy_ev (this, &rxvt_term::destroy_cb), - pty_ev (this, &rxvt_term::pty_cb), - incr_ev (this, &rxvt_term::incr_cb), -#ifdef USE_XIM - im_ev (this, &rxvt_term::im_cb) -#endif +void +rxvt_pop_locale () NOTHROW { - cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; + rxvt_set_locale (savelocale); } -rxvt_term::~rxvt_term () +#if ENABLE_COMBINING +class rxvt_composite_vec rxvt_composite; + +text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) { - if (cmd_fd >= 0) - close (cmd_fd); + compose_char *cc; - scr_release (); + // break compose chains, as stupid readline really likes to duplicate + // composing characters for some reason near the end of a line. + cc = (*this)[c1]; + while (cc) + { + if (cc->c2 == c2) return c1; + cc = (*this)[cc->c1]; + } - free (locale); - free (codeset); + // 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 ()); + } -#ifndef NO_SETOWNER_TTYDEV - privileged_ttydev (RESTORE); -#endif -#ifdef UTMP_SUPPORT - privileged_utmp (RESTORE); -#endif + // allocate a new combination + if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) + { + static int seen; - // TODO: free pixcolours, colours should become part of rxvt_display + if (!seen++) + fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); - delete PixColors; + return REPLACEMENT_CHAR; + } + + v.push_back (compose_char (c1, c2)); - displays.put (display); + return v.size () - 1 + COMPOSE_LO; } -void -rxvt_term::destroy () +int rxvt_composite_vec::expand (unicode_t c, wchar_t *r) { - if (display) + compose_char *cc = (*this)[c]; + + if (!cc) { - if (TermWin.parent[0]) - XDestroyWindow (display->display, TermWin.parent[0]); + if (r) *r = c; + return 1; + } - termwin_ev.stop (display); - vt_ev.stop (display); + int len = expand (cc->c1, r); -#ifdef USE_XIM - im_destroy (); - im_ev.stop (display); -#endif -#ifdef HAVE_SCROLLBARS - scrollbar_ev.stop (display); -#endif -#ifdef MENUBAR - menubar_ev.stop (display); -#endif + if (r) r += len; + + if (cc->c2 != NOCHAR) + { + len++; + if (r) *r++ = cc->c2; } - check_ev.stop (); - pty_ev.stop (); + return len; + +} +#endif + +rxvt_term::rxvt_term () +{ +#if HAVE_BG_PIXMAP + update_background_ev.set (this); +#endif #ifdef CURSOR_BLINK - cursor_blink_ev.stop (); + cursor_blink_ev.set (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL); #endif #ifdef TEXT_BLINK - text_blink_ev.stop (); + text_blink_ev.set (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL); +#endif +#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING + cont_scroll_ev.set (this); +#endif +#ifdef SELECTION_SCROLLING + sel_scroll_ev.set (this); +#endif +#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) + slip_wheel_ev.set (this); +#endif +#if ENABLE_TRANSPARENCY || ENABLE_PERL + rootwin_ev.set (this), +#endif + scrollbar_ev.set (this), +#ifdef USE_XIM + im_ev.set (this), #endif #ifdef POINTER_BLANK - pointer_ev.stop (); + pointer_ev.set (this); #endif +#ifndef NO_BELL + bell_ev.set (this); +#endif + child_ev.set (this); + flush_ev.set (this); + destroy_ev.set (this); + pty_ev.set (this); + incr_ev.set (this); + termwin_ev.set (this); + vt_ev.set (this); + + cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; + + termlist.push_back (this); - destroy_ev.start (0); +#ifdef KEYSYM_RESOURCE + keyboard = new keyboard_manager; +#endif } +// clean up the most important stuff, do *not* call x or free mem etc. +// for use before an emergency exit void -rxvt_term::destroy_cb (time_watcher &w) +rxvt_term::emergency_cleanup () { - SET_R (this); + if (cmd_pid) + kill (-cmd_pid, SIGHUP); - delete this; + pty_ev.stop (); + delete pty; pty = 0; } -/*----------------------------------------------------------------------*/ -/* rxvt_init() */ -/* LIBPROTO */ -rxvt_t -rxvt_init (int argc, const char *const *argv) +rxvt_term::~rxvt_term () { - SET_R (new rxvt_term); + termlist.erase (find (termlist.begin (), termlist.end(), this)); - if (!GET_R->init_vars () || !GET_R->init (argc, argv)) - { - delete GET_R; - SET_R (0); - } + emergency_cleanup (); - return GET_R; -} - -static int (*old_xerror_handler)(Display *dpy, XErrorEvent *event); +#if ENABLE_STYLES + for (int i = RS_styleCount; --i; ) + if (fontset[i] != fontset[0]) + delete fontset[i]; +#endif + delete fontset[0]; -void -rxvt_init_signals () -{ - /* install exit handler for cleanup */ -#if 0 -#ifdef HAVE_ATEXIT - atexit(rxvt_clean_exit); -#else +#ifdef HAVE_BG_PIXMAP + bgPixmap.destroy (); #endif +#ifdef HAVE_AFTERIMAGE + if (asv) + destroy_asvisual (asv, 0); + if (asimman) + destroy_image_manager (asimman, 0); #endif - struct sigaction sa; + if (display) + { + selection_clear (); + selection_clear (true); + +#ifdef USE_XIM + im_destroy (); +#endif + scrollBar.destroy (); + if (gc) XFreeGC (dpy, gc); - sigfillset (&sa.sa_mask); - sa.sa_flags = SA_NOCLDSTOP | SA_RESTART; - sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0); - sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0); - sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); - sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); - sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); - sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); + delete drawable; + // destroy all windows + if (parent[0]) + XDestroyWindow (dpy, parent[0]); - /* need to trap SIGURG for SVR4 (Unixware) rlogin */ - /* signal (SIGURG, SIG_DFL); */ + for (int i = 0; i < TOTAL_COLORS; i++) + if (ISSET_PIXCOLOR (i)) + { + pix_colors_focused [i].free (this); +#if OFF_FOCUS_FADING + pix_colors_unfocused [i].free (this); +#endif + } - old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); - //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); -} + clear (); -bool -rxvt_term::init (int argc, const char *const *argv) -{ - /* - * Save and then give up any super-user privileges - * If we need privileges in any area then we must specifically request it. - * We should only need to be root in these cases: - * 1. write utmp entries on some systems - * 2. chown tty on some systems - */ - privileges (SAVE); - privileges (IGNORE); + display->flush (); /* ideally .put should do this */ + displays.put (display); + } - init_secondary (); + scr_release (); - const char **cmd_argv = init_resources (argc, argv); + /* clear all resources */ + for (int i = 0; i < allocated.size (); i++) + free (allocated [i]); + + free (selection.text); + free (selection.clip_text); + // TODO: manage env vars in child only(!) + free (env_display); + free (env_term); + free (locale); + free (v_buffer); + free (incr_buf); - set_locale (""); + delete envv; + delete argv; -#if (MENUBAR_MAX) - menubar_read (rs[Rs_menu]); +#ifdef KEYSYM_RESOURCE + delete keyboard; #endif -#ifdef HAVE_SCROLLBARS - if (Options & Opt_scrollBar) - scrollBar.setIdle (); /* set existence for size calculations */ +#ifndef NO_RESOURCES + XrmDestroyDatabase (option_db); #endif +} + +// child has exited, usually destroys +void +rxvt_term::child_cb (ev::child &w, int status) +{ + HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); - create_windows (argc, argv); + cmd_pid = 0; - init_xlocale (); + if (!option (Opt_hold)) + destroy (); +} - scr_reset (); /* initialize screen */ -#ifdef RXVT_GRAPHICS - Gr_reset (); /* reset graphics */ +void +rxvt_term::destroy () +{ + if (destroy_ev.is_active ()) + return; + + HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); + +#if ENABLE_OVERLAY + scr_overlay_off (); #endif -#if 0 -#ifdef DEBUG_X - XSynchronize(display->display, True); + if (display) + { +#if USE_XIM + im_ev.stop (display); #endif + scrollbar_ev.stop (display); +#if ENABLE_TRANSPARENCY || ENABLE_PERL + rootwin_ev.stop (display); #endif + incr_ev.stop (); + termwin_ev.stop (display); + vt_ev.stop (display); + } -#ifdef HAVE_SCROLLBARS - if (Options & Opt_scrollBar) - resize_scrollbar (); /* create and map scrollbar */ + flush_ev.stop (); + pty_ev.stop (); +#ifdef CURSOR_BLINK + cursor_blink_ev.stop (); #endif -#if (MENUBAR_MAX) - if (menubar_visible(r)) - XMapWindow (display->display, menuBar.win); +#ifdef TEXT_BLINK + text_blink_ev.stop (); #endif -#ifdef TRANSPARENT - if (Options & Opt_transparent) - { - XSelectInput (display->display, display->root, PropertyChangeMask); - check_our_parents (); - } +#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING + cont_scroll_ev.stop (); +#endif +#ifdef SELECTION_SCROLLING + sel_scroll_ev.stop (); +#endif +#ifdef POINTER_BLANK + pointer_ev.stop (); #endif - rootwin_ev.start (display, display->root); - - XMapWindow (display->display, TermWin.vt); - XMapWindow (display->display, TermWin.parent[0]); - - init_env (); - init_command (cmd_argv); - - pty_ev.start (cmd_fd, EVENT_READ); + destroy_ev.start (); +} - check_ev.start (); +void +rxvt_term::destroy_cb (ev::idle &w, int revents) +{ + make_current (); - return true; + delete this; } -/* ------------------------------------------------------------------------- * - * SIGNAL HANDLING & EXIT HANDLER * - * ------------------------------------------------------------------------- */ +/*----------------------------------------------------------------------*/ /* - * Catch a SIGCHLD signal and exit if the direct child has died + * Exit gracefully, clearing the utmp entry and restoring tty attributes + * TODO: if debugging, this should free up any known resources if we can */ -/* ARGSUSED */ -/* EXTPROTO */ -RETSIGTYPE -rxvt_Child_signal(int sig __attribute__ ((unused))) -{ - int pid, save_errno = errno; - while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) - ; - errno = save_errno; +static XErrorHandler old_xerror_handler; -#if 0 - if (pid == cmd_pid) - exit (EXIT_SUCCESS); -#endif +static void +rxvt_emergency_cleanup () +{ + for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) + (*t)->emergency_cleanup (); } -/* - * Catch a fatal signal and tidy up before quitting - */ -/* EXTPROTO */ -RETSIGTYPE -rxvt_Exit_signal(int sig) -{ - signal (sig, SIG_DFL); -#ifdef DEBUG_CMD - rxvt_print_error ("signal %d", sig); -#endif - rxvt_clean_exit(); - kill (getpid (), sig); +#if !ENABLE_MINIMAL +static void +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 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); + 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); } +#endif -/* INTPROTO */ int rxvt_xerror_handler (Display *display, XErrorEvent *event) { @@ -339,270 +433,216 @@ GET_R->allowedxerror = event->error_code; else { + // GET_R is most likely not the terminal which caused the error, + // so just output the error and continue +#if ENABLE_MINIMAL old_xerror_handler (display, event); - GET_R->destroy (); +#else + print_x_error (display, event); +#endif } return 0; } -/*----------------------------------------------------------------------*/ -/* - * Exit gracefully, clearing the utmp entry and restoring tty attributes - * TODO: if debugging, this should free up any known resources if we can - */ -/* EXTPROTO */ -void -rxvt_clean_exit () +int +rxvt_xioerror_handler (Display *display) { - // TODO: rxvtd should clean up all ressources - if (GET_R) - GET_R->destroy (); + rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", + DisplayString (display)); + rxvt_emergency_cleanup (); + _exit (EXIT_FAILURE); } -/* ------------------------------------------------------------------------- * - * MEMORY ALLOCATION WRAPPERS * - * ------------------------------------------------------------------------- */ -/* EXTPROTO */ -void * -rxvt_malloc(size_t size) +static struct sig_handlers { - void *p; + ev::sig sw_term, sw_int; - p = malloc(size); - if (p) - return p; + /* + * Catch a fatal signal and tidy up before quitting + */ + void sig_term (ev::sig &w, int revents); - fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); - rxvt_clean_exit(); - exit(EXIT_FAILURE); - /* NOTREACHED */ -} + sig_handlers () + { + sw_term.set (this); + sw_int .set (this); + } +} sig_handlers; -/* EXTPROTO */ -void * -rxvt_calloc(size_t number, size_t size) +void +sig_handlers::sig_term (ev::sig &w, int revents) { - void *p; - - p = calloc(number, size); - if (p) - return p; - - fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); - rxvt_clean_exit(); - exit(EXIT_FAILURE); - /* NOTREACHED */ + rxvt_emergency_cleanup (); + w.stop (); + kill (getpid (), w.signum); } -/* EXTPROTO */ -void * -rxvt_realloc(void *ptr, size_t size) +static void +rxvt_get_ttymode (struct termios *tio) { - void *p; + if (tcgetattr (STDIN_FILENO, tio) < 0) + memset (tio, 0, sizeof (struct termios)); - if (ptr) - p = realloc(ptr, size); - else - p = malloc(size); - if (p) - return p; - - fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); - rxvt_clean_exit(); - exit(EXIT_FAILURE); - /* NOTREACHED */ -} - -/* ------------------------------------------------------------------------- * - * PRIVILEGED OPERATIONS * - * ------------------------------------------------------------------------- */ -/* take care of suid/sgid super-user (root) privileges */ -void -rxvt_term::privileges (int mode) -{ -#if ! defined(__CYGWIN32__) -# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) - /* setreuid() is the poor man's setuid(), seteuid() */ -# define seteuid(a) setreuid(-1, (a)) -# define setegid(a) setregid(-1, (a)) -# define HAVE_SETEUID + 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 HAVE_SETEUID - switch (mode) - { - case IGNORE: - /* - * change effective uid/gid - not real uid/gid - so we can switch - * back to root later, as required - */ - seteuid(getuid()); - setegid(getgid()); - break; - case SAVE: - euid = geteuid(); - egid = getegid(); - break; - case RESTORE: - seteuid(euid); - setegid(egid); - break; - } -# else - switch (mode) - { - case IGNORE: - setuid(getuid()); - setgid(getgid()); - /* FALLTHROUGH */ - case SAVE: - /* FALLTHROUGH */ - case RESTORE: - break; - } +# 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 -#endif -} -#ifdef UTMP_SUPPORT -void -rxvt_term::privileged_utmp (char action) -{ - D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", - action, next_utmp_action, getpid())); - if (next_utmp_action != action || (action != SAVE && action != RESTORE) - || (Options & Opt_utmpInhibit) - || ttydev == NULL || *ttydev == '\0') - return; +# if VMIN != VEOF + tio->c_cc[VMIN] = 1; +# endif +# if VTIME != VEOL + tio->c_cc[VTIME] = 0; +# endif - privileges (RESTORE); - if (action == SAVE) - { - next_utmp_action = RESTORE; - makeutent (ttydev, rs[Rs_display_name]); - } - else - { /* action == RESTORE */ - next_utmp_action = IGNORE; - cleanutent (); - } - privileges (IGNORE); + /* 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); } -#endif -#ifndef NO_SETOWNER_TTYDEV +char **rxvt_environ; // startup environment + void -rxvt_term::privileged_ttydev (char action) +rxvt_init () { - D_MAIN((stderr, - "privileged_ttydev (%c); waiting for: %c (pid: %d)", - action, next_tty_action, getpid())); - if (next_tty_action != action || (action != SAVE && action != RESTORE) - || ttydev == NULL || *ttydev == '\0') - return; + assert (("fontMask must not overlap other RS masks", + 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask)))); - privileges (RESTORE); + rxvt_get_ttymode (&rxvt_term::def_tio); - if (action == SAVE) - { - next_tty_action = RESTORE; -# ifndef RESET_TTY_TO_COMMON_DEFAULTS - /* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ - if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */ - next_tty_action = IGNORE; - else -# endif + // get rid of stdin/stdout as we don't need them, to free resources + dup2 (STDERR_FILENO, STDIN_FILENO); + dup2 (STDERR_FILENO, STDOUT_FILENO); - { - chown(ttydev, getuid(), ttygid); /* fail silently */ - chmod(ttydev, ttymode); -# ifdef HAVE_REVOKE - revoke(ttydev); -# endif + if (!ev_default_loop ()) + rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); - } - } - else - { /* action == RESTORE */ - next_tty_action = IGNORE; -# ifndef RESET_TTY_TO_COMMON_DEFAULTS - chmod(ttydev, ttyfd_stat.st_mode); - chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid); -# else - chmod(ttydev, - (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); - chown(ttydev, 0, 0); -# endif + rxvt_environ = environ; - } + signal (SIGHUP, SIG_IGN); + signal (SIGPIPE, SIG_IGN); - privileges (IGNORE); + sig_handlers.sw_term.start (SIGTERM); ev_unref (); + sig_handlers.sw_int.start (SIGINT); ev_unref (); -# ifndef RESET_TTY_TO_COMMON_DEFAULTS - D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", - action == RESTORE ? "Restoring" : (action == - SAVE ? "Saving" : - "UNKNOWN ERROR for"), ttydev, - ttyfd_stat.st_mode, ttyfd_stat.st_uid, - ttyfd_stat.st_gid)); -# endif + old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); + // TODO: handle this with exceptions and tolerate the memory loss + XSetIOErrorHandler (rxvt_xioerror_handler); + + XrmInitialize (); } -#endif /*----------------------------------------------------------------------*/ /* - * window size/position calculcations for XSizeHint and other storage. + * window size/position calculations for XSizeHint and other storage. * if width/height are non-zero then override calculated width/height */ void -rxvt_term::window_calc (unsigned int width, unsigned int height) +rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) { - short recalc_x, recalc_y; - int x, y, sb_w, mb_h, flags; - unsigned int w, h; - unsigned int max_width, max_height; - - D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", - TermWin.ncol, TermWin.nrow, szHint.width, - szHint.height)); + short recalc_x, recalc_y; + int x, y, flags; + unsigned int w, h; + unsigned int max_width, max_height; + szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; szHint.win_gravity = NorthWestGravity; /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ recalc_x = recalc_y = 0; flags = 0; + if (!parsed_geometry) { parsed_geometry = 1; + if (rs[Rs_geometry]) - flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h); + flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); + if (flags & WidthValue) { - TermWin.ncol = BOUND_POSITIVE_INT16(w); + 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) { - TermWin.nrow = BOUND_POSITIVE_INT16(h); + 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; } + if (flags & XValue) { szHint.x = x; szHint.flags |= USPosition; + if (flags & XNegative) { recalc_x = 1; szHint.win_gravity = NorthEastGravity; } } + if (flags & YValue) { szHint.y = y; szHint.flags |= USPosition; + if (flags & YNegative) { recalc_y = 1; + if (szHint.win_gravity == NorthEastGravity) szHint.win_gravity = SouthEastGravity; else @@ -610,70 +650,61 @@ } } } + /* TODO: BOUNDS */ - TermWin.width = TermWin.ncol * TermWin.fwidth; - TermWin.height = TermWin.nrow * TermWin.fheight; - max_width = MAX_COLS * TermWin.fwidth; - max_height = MAX_ROWS * TermWin.fheight; - - szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; - - sb_w = mb_h = 0; - window_vt_x = window_vt_y = 0; - if (scrollbar_visible ()) + width = ncol * fwidth; + height = nrow * fheight; + max_width = MAX_COLS * fwidth; + max_height = MAX_ROWS * fheight; + + szHint.base_width = szHint.base_height = 2 * int_bwidth; + + 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 (!(Options & Opt_scrollBar_right)) - window_vt_x = sb_w; + + if (!option (Opt_scrollBar_right)) + window_vt_x += sb_w; } - if (menubar_visible ()) - { - mb_h = menuBar_TotalHeight(); - szHint.base_height += mb_h; - window_vt_y = mb_h; - } - szHint.width_inc = TermWin.fwidth; - szHint.height_inc = TermWin.fheight; - szHint.min_width = szHint.base_width + szHint.width_inc; + + szHint.width_inc = fwidth; + szHint.height_inc = fheight; + szHint.min_width = szHint.base_width + szHint.width_inc; szHint.min_height = szHint.base_height + szHint.height_inc; - if (width && width - szHint.base_width < max_width) + if (newwidth && newwidth - szHint.base_width < max_width) { - szHint.width = width; - TermWin.width = width - szHint.base_width; + szHint.width = newwidth; + width = newwidth - szHint.base_width; } else { - MIN_IT(TermWin.width, max_width); - szHint.width = szHint.base_width + TermWin.width; + min_it (width, max_width); + szHint.width = szHint.base_width + width; } - if (height && height - szHint.base_height < max_height) + + if (newheight && newheight - szHint.base_height < max_height) { - szHint.height = height; - TermWin.height = height - szHint.base_height; + szHint.height = newheight; + height = newheight - szHint.base_height; } else { - MIN_IT(TermWin.height, max_height); - szHint.height = szHint.base_height + TermWin.height; + min_it (height, max_height); + szHint.height = szHint.base_height + height; } - if (scrollbar_visible () && (Options & Opt_scrollBar_right)) - window_sb_x = szHint.width - sb_w; if (recalc_x) - szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) - - szHint.width - 2 * TermWin.ext_bwidth); + szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; + if (recalc_y) - szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) - - szHint.height - 2 * TermWin.ext_bwidth); + szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; - TermWin.ncol = TermWin.width / TermWin.fwidth; - TermWin.nrow = TermWin.height / TermWin.fheight; - D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", - TermWin.ncol, TermWin.nrow, szHint.width, - szHint.height)); - return; + ncol = width / fwidth; + nrow = height / fheight; } /*----------------------------------------------------------------------*/ @@ -684,41 +715,141 @@ void rxvt_term::tt_winch () { + if (pty->pty < 0) + return; + struct winsize ws; - if (cmd_fd < 0) - return; + ws.ws_col = ncol; + ws.ws_row = nrow; + ws.ws_xpixel = width; + ws.ws_ypixel = height; + ioctl (pty->pty, TIOCSWINSZ, &ws); - ws.ws_col = TermWin.ncol; - ws.ws_row = TermWin.nrow; - ws.ws_xpixel = ws.ws_ypixel = 0; -#ifndef DEBUG_SIZE - (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); -#else - if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) - D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); -# ifdef SIGWINCH - else if (cmd_pid) /* force through to the command */ - kill (cmd_pid, SIGWINCH); -# endif +#if 0 + // TIOCSWINSZ is supposed to do this automatically and correctly + if (cmd_pid) /* force through to the command */ + kill (-cmd_pid, SIGWINCH); #endif } /*----------------------------------------------------------------------*/ -/* rxvt_change_font() - Switch to a new font */ -/* +/* 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 */ +bool +rxvt_term::set_fonts () +{ + rxvt_fontset *fs = new rxvt_fontset (this); + rxvt_fontprop prop; + + if (!fs + || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed") + || !fs->realize_font (1)) + { + delete fs; + return false; + } + +#if ENABLE_STYLES + for (int i = RS_styleCount; --i; ) + if (fontset[i] != fontset[0]) + delete fontset[i]; +#endif + + delete fontset[0]; + fontset[0] = fs; + + prop = (*fs)[rxvt_fontset::firstFont]->properties (); + prop.height += lineSpace; + prop.width += letterSpace; + + fs->set_prop (prop, false); + + fwidth = prop.width; + fheight = prop.height; + fbase = prop.ascent; + + for (int style = 1; style < 4; style++) + { +#if ENABLE_STYLES + const char *res = rs[Rs_font + style]; + + if (res && !*res) + fontset[style] = fontset[0]; + else + { + fontset[style] = fs = new rxvt_fontset (this); + rxvt_fontprop prop2 = prop; + + if (res) + { + fs->populate (res); + fs->set_prop (prop2, false); + } + else + { + fs->populate (fontset[0]->fontdesc); + + if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; + if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; + + fs->set_prop (prop2, true); + } + + } +#else + fontset[style] = fontset[0]; +#endif + } + + if (parent[0]) + { + 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) +{ + XChangeProperty (dpy, parent[0], + prop, XA_STRING, 8, PropModeReplace, + (const unsigned char *)str, len >= 0 ? len : strlen (str)); +} + void -rxvt_term::change_font (int init, const char *fontname) -{} +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::font_up_down (int n, int direction) -{} +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], + prop, xa[XA_UTF8_STRING], 8, PropModeReplace, + (const unsigned char *)s, strlen (s)); + + free (s); + free (ws); +} /*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/ @@ -726,121 +857,86 @@ void rxvt_term::set_title (const char *str) { -#ifndef SMART_WINDOW_TITLE - XStoreName(display->display, TermWin.parent[0], str); -#else - char *name; - - if (XFetchName(display->display, TermWin.parent[0], &name) == 0) - name = NULL; - if (name == NULL || STRCMP(name, str)) - XStoreName(display->display, TermWin.parent[0], str); - if (name) - XFree(name); + set_mbstring_property (XA_WM_NAME, str); +#if ENABLE_EWMH + set_utf8_property (xa[XA_NET_WM_NAME], str); #endif } void -rxvt_term::set_iconName (const char *str) +rxvt_term::set_icon_name (const char *str) { -#ifndef SMART_WINDOW_TITLE - XSetIconName(display->display, TermWin.parent[0], str); -#else - char *name; - - if (XGetIconName(display->display, TermWin.parent[0], &name)) - name = NULL; - if (name == NULL || STRCMP(name, str)) - XSetIconName(display->display, TermWin.parent[0], str); - if (name) - XFree(name); + 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) { - rxvt_color xcol; - int i; +#ifdef XTERM_COLOR_CHANGE + rxvt_color xcol; if (color == NULL || *color == '\0') return; + color = strdup (color); + allocated.push_back ((void *)color); + rs[Rs_color + idx] = color; + /* handle color aliases */ - if (isdigit(*color)) + if (isdigit (*color)) { - i = atoi(color); - if (i >= 8 && i <= 15) - { /* bright colors */ - i -= 8; -# ifndef NO_BRIGHTCOLOR - PixColors[idx] = PixColors[minBrightCOLOR + i]; - SET_PIXCOLOR(idx); - goto Done; -# endif + int i = atoi (color); + if (i >= 8 && i <= 15) + { + /* bright colors */ + pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; + goto done; } + if (i >= 0 && i <= 7) - { /* normal colors */ - PixColors[idx] = PixColors[minCOLOR + i]; - SET_PIXCOLOR(idx); - goto Done; + { + /* normal colors */ + pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; + goto done; } } - if (!rXParseAllocColor (& xcol, color)) - return; - /* XStoreColor (display->display, XCMAP, XColor*); */ + + set_color (xcol, color); /* * FIXME: should free colors here, but no idea how to do it so instead, * so just keep gobbling up the colormap */ -# if 0 - for (i = Color_Black; i <= Color_White; i++) - if (PixColors[idx] == PixColors[i]) - break; - if (i > Color_White) - { - /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ - XFreeColors(display->display, XCMAP, (PixColors + idx), 1, - DisplayPlanes(display->display, display->screen)); - } -# endif - PixColors[idx] = xcol; - SET_PIXCOLOR(idx); + pix_colors_focused[idx] = xcol; - /* XSetWindowAttributes attr; */ - /* Cursor cursor; */ -Done: - if (idx == Color_bg && !(Options & Opt_transparent)) - XSetWindowBackground(display->display, TermWin.vt, - PixColors[Color_bg]); - - /* handle Color_BD, scrollbar background, etc. */ +done: + /*TODO: handle Color_BD, scrollbar background, etc. */ - set_colorfgbg (); + update_fade_color (idx); recolour_cursor (); - /* the only reasonable way to enforce a clean update */ - scr_poweron (); + scr_recolour (); +#endif /* XTERM_COLOR_CHANGE */ } -#else -# define set_window_color (idx,color) ((void)0) -#endif /* XTERM_COLOR_CHANGE */ - void rxvt_term::recolour_cursor () { -#if TODO - rxvt_color xcol[2]; + XColor fg, bg; - xcol[0] = PixColors[Color_pointer]; - xcol[1] = PixColors[Color_bg]; - XQueryColors (display->display, XCMAP, xcol, 2); - XRecolorCursor (display->display, TermWin_cursor, &(xcol[0]), &(xcol[1])); -#endif + (ISSET_PIXCOLOR (Color_pointer_fg) + ? pix_colors_focused[Color_pointer_fg] + : pix_colors_focused[Color_fg]).get (fg); + + (ISSET_PIXCOLOR (Color_pointer_bg) + ? pix_colors_focused[Color_pointer_bg] + : pix_colors_focused[Color_bg]).get (bg); + + XRecolorCursor (dpy, TermWin_cursor, &fg, &bg); } /*----------------------------------------------------------------------*/ @@ -850,76 +946,72 @@ void rxvt_term::set_colorfgbg () { - unsigned int i; - const char *xpmb = "\0"; - char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; - - env_colorfgbg = - (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); - STRCPY(fstr, "default"); - STRCPY(bstr, "default"); + unsigned int i; + const char *xpmb = ""; + char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; + + strcpy (fstr, "default"); + strcpy (bstr, "default"); for (i = Color_Black; i <= Color_White; i++) - if (PixColors[Color_fg] == PixColors[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 (PixColors[Color_bg] == PixColors[i]) + if (pix_colors[Color_bg] == pix_colors[i]) { - sprintf(bstr, "%d", (i - Color_Black)); -#ifdef XPM_BACKGROUND + sprintf (bstr, "%d", (i - Color_Black)); +#ifdef BG_IMAGE_FROM_FILE xpmb = "default;"; #endif break; } - sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); - putenv(env_colorfgbg); -#ifndef NO_BRIGHTCOLOR - colorfgbg = DEFAULT_RSTYLE; - for (i = minCOLOR; i <= maxCOLOR; i++) - { - if (PixColors[Color_fg] == PixColors[i]) - colorfgbg = SET_FGCOLOR(colorfgbg, i); - if (PixColors[Color_bg] == PixColors[i]) - colorfgbg = SET_BGCOLOR(colorfgbg, i); - } -#endif + sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); } /*----------------------------------------------------------------------*/ -/* - * Colour determination for low colour displays, routine from - * Hans de Goede - */ -int -rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) +bool +rxvt_term::set_color (rxvt_color &color, const char *name) { - if (!screen_in_out->set (display, colour)) - { - rxvt_print_error("can't allocate colour: %s", colour); - return false; - } + if (color.set (this, name)) + return true; - return true; + rxvt_warn ("can't get colour '%s', continuing without.\n", name); + return false; +} + +void +rxvt_term::alias_color (int dst, int src) +{ + pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); } /* -------------------------------------------------------------------- * * - WINDOW RESIZING - * * -------------------------------------------------------------------- */ void -rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) +rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) { int fix_screen; + int old_width = szHint.width; + int old_height = szHint.height; -#ifdef SMART_RESIZE - int old_width = szHint.width, old_height = szHint.height; -#endif + window_calc (newwidth, newheight); + + 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[0], &szHint); + szHint.flags |= PBaseSize | PResizeInc; + } - window_calc (width, height); - XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); if (!ignoreparent) { #ifdef SMART_RESIZE @@ -932,9 +1024,9 @@ unsigned int unused_w1, unused_h1, unused_b1, unused_d1; Window unused_cr; - XTranslateCoordinates (display->display, TermWin.parent[0], display->root, + XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &unused_cr); - XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, + XGetGeometry (dpy, parent[0], &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 @@ -946,9 +1038,9 @@ y -= y1; } - x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; - y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; - dx = old_width - szHint.width; + x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2; + y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2; + dx = old_width - szHint.width; dy = old_height - szHint.height; /* Check position of the center of the window */ @@ -961,74 +1053,44 @@ else if (y == y1) /* exact center */ dy /= 2; - XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, + XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, szHint.width, szHint.height); #else - XResizeWindow (display->display, TermWin.parent[0], szHint.width, - szHint.height); + XResizeWindow (dpy, parent[0], szHint.width, szHint.height); #endif - } - fix_screen = (TermWin.ncol != prev_ncol - || TermWin.nrow != prev_nrow); + if (set_hint) + XSetWMNormalHints (dpy, parent[0], &szHint); + + fix_screen = ncol != prev_ncol || nrow != prev_nrow; - if (fix_screen || width != old_width || height != old_height) + if (fix_screen || newwidth != old_width || newheight != old_height) { - if (scrollbar_visible ()) - { - XMoveResizeWindow (display->display, scrollBar.win, window_sb_x, - 0, scrollbar_TotalWidth (), szHint.height); - resize_scrollbar (); - } + if (scrollBar.state) + scrollBar.resize (); - if (menubar_visible ()) - XMoveResizeWindow (display->display, menuBar.win, window_vt_x, - 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); - - XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, - window_vt_y, TermWin_TotalWidth (), - TermWin_TotalHeight ()); -#ifdef RXVT_GRAPHICS - if (old_height) - Gr_Resize (old_width - szHint.base_width, - old_height - szHint.base_height); -#endif - scr_clear (); -#ifdef XPM_BACKGROUND - resize_pixmap (); -#endif + XMoveResizeWindow (dpy, vt, + window_vt_x, window_vt_y, + width, height); +#ifdef HAVE_BG_PIXMAP + if (bgPixmap.window_size_sensitive ()) + update_background (); +#endif } if (fix_screen || old_height == 0) - { - int curr_screen = -1; - int old_ncol = prev_ncol; - - /* scr_reset only works on the primary screen */ - if (old_height) /* this is not the first time through */ - { - unsigned int ncol = TermWin.ncol; - TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this - curr_screen = scr_change_screen (PRIMARY); - TermWin.ncol = ncol; - } + scr_reset (); - scr_reset(); - - if (curr_screen >= 0) /* this is not the first time through */ - { - scr_change_screen (curr_screen); - selection_check (old_ncol != TermWin.ncol ? 4 : 0); - } - } - - old_width = szHint.width; - old_height = szHint.height; +#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 - IMSetStatusPosition (); + IMSetPosition (); #endif } @@ -1037,23 +1099,25 @@ * good for toggling 80/132 columns */ void -rxvt_term::set_widthheight (unsigned int width, unsigned int height) +rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight) { XWindowAttributes wattr; - if (width == 0 || height == 0) + if (newwidth == 0 || newheight == 0) { - XGetWindowAttributes(display->display, display->root, &wattr); - if (width == 0) - width = wattr.width - szHint.base_width; - if (height == 0) - height = wattr.height - szHint.base_height; - } - if (width != TermWin.width || height != TermWin.height) - { - width += szHint.base_width; - height += szHint.base_height; - resize_all_windows (width, height, 0); + XGetWindowAttributes (dpy, display->root, &wattr); + + if (newwidth == 0) + newwidth = wattr.width - szHint.base_width; + if (newheight == 0) + newheight = wattr.height - szHint.base_height; + } + + if (newwidth != width || newheight != height) + { + newwidth += szHint.base_width; + newheight += szHint.base_height; + resize_all_windows (newwidth, newheight, 0); } } @@ -1063,109 +1127,176 @@ #ifdef USE_XIM void -rxvt_term::im_set_size (XRectangle *size) +rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) { - size->x = TermWin.int_bwidth; - size->y = TermWin.int_bwidth; - size->width = Width2Pixel(TermWin.ncol); - size->height = Height2Pixel(TermWin.nrow); + fg = pix_colors [Color_fg]; + bg = pix_colors [Color_bg]; } void -rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) +rxvt_term::im_set_size (XRectangle &size) { - *fg = PixColors[Color_fg]; - *bg = PixColors[Color_bg]; + // the int_bwidth terms make no sense to me + size.x = int_bwidth; + size.y = int_bwidth; + size.width = Width2Pixel (ncol) + int_bwidth; + size.height = Height2Pixel (nrow) + int_bwidth; +} + +void +rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, + XRectangle &status_rect, + const XRectangle &needed_rect) +{ + preedit_rect.x = needed_rect.width; + preedit_rect.y = 0; + preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1; + preedit_rect.height = fheight; + + status_rect.x = 0; + status_rect.y = 0; + status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1; + status_rect.height = fheight; } /* Checking whether input method is running. */ bool rxvt_term::IMisRunning () { - char *p; - Atom atom; - Window win; - char server[IMBUFSIZ]; + 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=" */ - if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ + strcpy (server, "@server="); + strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */ + + if (p = strchr (server + 1, '@')) /* first one only */ *p = '\0'; - atom = XInternAtom(display->display, server, False); - win = XGetSelectionOwner(display->display, atom); + atom = XInternAtom (dpy, server, False); + win = XGetSelectionOwner (dpy, atom); + if (win != None) return True; } + return False; } void rxvt_term::IMSendSpot () { - XPoint spot; - XVaNestedList preedit_attr; + XPoint nspot; + XVaNestedList preedit_attr; - if (Input_Context == NULL - || !TermWin.focus || !(input_style & XIMPreeditPosition) - || !(event_type == KeyPress - || event_type == Expose - || event_type == NoExpose - || event_type == SelectionNotify - || event_type == ButtonRelease || event_type == FocusIn) - || !IMisRunning ()) + if (!Input_Context + || !focus + || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks))) return; - im_set_position (&spot); + im_set_position (nspot); - preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); - XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL); - XFree(preedit_attr); + if (nspot.x == spot.x && nspot.y == spot.y) + return; + + spot = nspot; + + preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); + XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); + XFree (preedit_attr); } void -rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, - XRectangle * needed_rect) +rxvt_term::im_destroy () { - int mbh, vtx = 0; - - if (scrollbar_visible () && !(Options & Opt_scrollBar_right)) - vtx = scrollbar_TotalWidth(); + if (input_method) + { + if (Input_Context && input_method->xim) + XDestroyIC (Input_Context); - mbh = menubar_visible () ? menuBar_TotalHeight() : 0; - mbh -= TermWin.lineSpace; + display->put_xim (input_method); + input_method = 0; + } - preedit_rect->x = needed_rect->width + vtx; - preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; + Input_Context = 0; +} - preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx; - preedit_rect->height = Height2Pixel(1); +#ifdef ENABLE_XIM_ONTHESPOT - status_rect->x = vtx; - status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; +static void +xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data) +{ + ((rxvt_term *)client_data)->make_current (); + HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END)); +} - status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1); - status_rect->height = Height2Pixel(1); +static void +xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data) +{ + ((rxvt_term *)client_data)->make_current (); + HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END)); } -void -rxvt_term::im_destroy () +static void +xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data) { - if (Input_Context) - { - XDestroyIC (Input_Context); - Input_Context = NULL; - } + rxvt_term *term = (rxvt_term *)client_data; + XIMText *text = call_data->text; - if (input_method) + term->make_current (); + + if (text) { - display->put_xim (input_method); - input_method = 0; + wchar_t *str; + + if (!text->encoding_is_wchar && text->string.multi_byte) + { + // of course, X makes it ugly again + if (term->rs[Rs_imLocale]) + SET_LOCALE (term->rs[Rs_imLocale]); + + 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 = text->string.wide_char; + + HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, + DT_INT, call_data->caret, + DT_INT, call_data->chg_first, + DT_INT, call_data->chg_length, + DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, + DT_WCS_LEN, str, str ? (int)text->length : 0, + DT_END)); } + else + HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, + DT_INT, call_data->caret, + DT_INT, call_data->chg_first, + DT_INT, call_data->chg_length, + DT_END)); +} + +#if 0 +static void +xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data) +{ + ((rxvt_term *)client_data)->make_current (); + HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET, + DT_INT, call_data->position, + DT_INT, call_data->direction, + DT_INT, call_data->style, + DT_END)); } +#endif + +#endif /* * Try to open a XIM with the current modifiers, then see if we can @@ -1174,142 +1305,236 @@ bool rxvt_term::IM_get_IC (const char *modifiers) { - int i, j, found; - XIM xim; - XPoint spot; - XRectangle rect, status_rect, needed_rect; - unsigned long fg, bg; - const char *p; - char **s; - XIMStyles *xim_styles; - XVaNestedList preedit_attr, status_attr; + int i, j, found; + XIM xim; + XPoint spot; + XRectangle rect, status_rect, needed_rect; + unsigned long fg, bg; + const char *p; + char **s; + XIMStyles *xim_styles; +#ifdef ENABLE_XIM_ONTHESPOT + XIMCallback xcb[4]; +#endif - if (!((p = XSetLocaleModifiers (modifiers)) && *p)) + set_environ (envv); + + if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) return false; - D_MAIN((stderr, "rxvt_IM_get_IC()")); input_method = display->get_xim (locale, modifiers); if (input_method == NULL) return false; xim = input_method->xim; + spot.x = spot.y = -1; xim_styles = NULL; if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) || !xim_styles || !xim_styles->count_styles) { - display->put_xim (input_method); + im_destroy (); return false; } - p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; - s = rxvt_splitcommastring(p); - for (i = found = 0; !found && s[i]; i++) - { - if (!STRCMP(s[i], "OverTheSpot")) - input_style = (XIMPreeditPosition | XIMStatusNothing); - else if (!STRCMP(s[i], "OffTheSpot")) - input_style = (XIMPreeditArea | XIMStatusArea); - else if (!STRCMP(s[i], "Root")) - input_style = (XIMPreeditNothing | XIMStatusNothing); + const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" }; - for (j = 0; j < xim_styles->count_styles; j++) - if (input_style == xim_styles->supported_styles[j]) - { - found = 1; - break; - } + for (int pi = 0; pi < 2; pi++) + { + p = pet[pi]; + + if (!p) + continue; + + s = rxvt_splitcommastring (p); + + for (i = found = 0; !found && s[i]; i++) + { + if (!strcmp (s[i], "OverTheSpot")) + input_style = XIMPreeditPosition | XIMStatusNothing; + else if (!strcmp (s[i], "OffTheSpot")) + input_style = XIMPreeditArea | XIMStatusArea; + else if (!strcmp (s[i], "Root")) + input_style = XIMPreeditNothing | XIMStatusNothing; + else if (!strcmp (s[i], "None")) + input_style = XIMPreeditNone | XIMStatusNone; +#ifdef ENABLE_XIM_ONTHESPOT + else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot")) + input_style = XIMPreeditCallbacks | XIMStatusNothing; +#endif + else + input_style = XIMPreeditNothing | XIMStatusNothing; + + for (j = 0; j < xim_styles->count_styles; j++) + if (input_style == xim_styles->supported_styles[j]) + { + rxvt_freecommastring (s); + + found = 1; + goto foundpet; + } + + } + + rxvt_freecommastring (s); } - for (i = 0; s[i]; i++) - free (s[i]); +foundpet: - free (s); XFree (xim_styles); if (!found) { - display->put_xim (input_method); + im_destroy (); return false; } - preedit_attr = status_attr = NULL; + XFontSet fs = 0; + XVaNestedList preedit_attr = 0, status_attr = 0; + + if (input_style & (XIMPreeditPosition | XIMPreeditArea)) + { + // fake us a font-set, please + char **missing_charset_list; + int missing_charset_count; + char *def_string; + char pat[512]; + + sprintf (pat, + "-*-*-*-R-*-*-%d-*-*-*-*-*-*," + "-*-*-*-R-*-*-%d-*-*-*-*-*-*," + "-*-*-*-R-*-*-%d-*-*-*-*-*-*," + "-*-*-*-R-*-*-%d-*-*-*-*-*-*," + "-*-*-*-R-*-*-%d-*-*-*-*-*-*," + "*", + fheight, + fheight + 1, fheight - 1, + fheight - 2, fheight + 2); + + fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat, + &missing_charset_list, &missing_charset_count, &def_string); + + if (missing_charset_list) + XFreeStringList (missing_charset_list); + + if (!fs) + { + input_style &= ~(XIMPreeditPosition | XIMPreeditArea); + rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n"); + } + } if (input_style & XIMPreeditPosition) { - im_set_size (&rect); - im_set_position (&spot); - im_set_color (&fg, &bg); - - preedit_attr = XVaCreateNestedList(0, XNArea, &rect, - XNSpotLocation, &spot, - XNForeground, fg, XNBackground, bg, - //XNFontSet, TermWin.fontset, - NULL); + im_set_size (rect); + im_set_position (spot); + im_set_color (fg, bg); + + preedit_attr = XVaCreateNestedList (0, + XNForeground, fg, + XNBackground, bg, + XNArea, &rect, + XNSpotLocation, &spot, + XNFontSet, fs, + NULL); } else if (input_style & XIMPreeditArea) { - im_set_color (&fg, &bg); + im_set_color (fg, bg); /* * The necessary width of preedit area is unknown * until create input context. */ needed_rect.width = 0; + im_set_preedit_area (rect, status_rect, needed_rect); - im_set_preedit_area (&rect, &status_rect, &needed_rect); - - preedit_attr = XVaCreateNestedList(0, XNArea, &rect, - XNForeground, fg, XNBackground, bg, - //XNFontSet, TermWin.fontset, + preedit_attr = XVaCreateNestedList (0, + XNForeground, fg, + XNBackground, bg, + XNArea, &rect, + XNFontSet, fs, + NULL); + status_attr = XVaCreateNestedList (0, + XNForeground, fg, + XNBackground, bg, + XNArea, &status_rect, + XNFontSet, fs, NULL); - status_attr = XVaCreateNestedList(0, XNArea, &status_rect, - XNForeground, fg, XNBackground, bg, - //XNFontSet, TermWin.fontset, - NULL); } +#if ENABLE_XIM_ONTHESPOT + else if (input_style & XIMPreeditCallbacks) + { + im_set_position (spot); - Input_Context = XCreateIC(xim, XNInputStyle, input_style, - XNClientWindow, TermWin.parent[0], - XNFocusWindow, TermWin.parent[0], - preedit_attr ? XNPreeditAttributes : NULL, - preedit_attr, - status_attr ? XNStatusAttributes : NULL, - status_attr, NULL); - if (preedit_attr) XFree(preedit_attr); - if (status_attr) XFree(status_attr); + xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; + xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; + xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; +# if 0 + xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; +# endif + + preedit_attr = XVaCreateNestedList (0, + XNSpotLocation, &spot, + XNPreeditStartCallback, &xcb[0], + XNPreeditDoneCallback , &xcb[1], + XNPreeditDrawCallback , &xcb[2], +# if 0 + XNPreeditCaretCallback, &xcb[3], +# endif + NULL); + } +#endif + + Input_Context = XCreateIC (xim, + XNInputStyle, input_style, + XNClientWindow, vt, + XNFocusWindow, parent[0], + preedit_attr ? XNPreeditAttributes : NULL, + preedit_attr, + status_attr ? XNStatusAttributes : NULL, + status_attr, NULL); + + if (preedit_attr) XFree (preedit_attr); + if (status_attr) XFree (status_attr); + if (fs) XFreeFontSet (dpy, fs); if (Input_Context == NULL) { - rxvt_print_error("failed to create input context"); - display->put_xim (input_method); + rxvt_warn ("failed to create input context, continuing without XIM.\n"); + im_destroy (); return false; } - if (input_style & XIMPreeditArea) - IMSetStatusPosition (); +#if 0 + // unfortunately, only the focus window is used by XIM, hard to fix + if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) + vt_select_input (); +#endif + + IMSetPosition (); - D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); return true; } void rxvt_term::im_cb () { - int i, found, had_im; + int i; const char *p; char **s; char buf[IMBUFSIZ]; + make_current (); + im_destroy (); - D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); if (Input_Context) return; #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) if (rs[Rs_imLocale]) - setlocale (LC_CTYPE, rs[Rs_imLocale]); + SET_LOCALE (rs[Rs_imLocale]); #endif p = rs[Rs_inputMethod]; @@ -1318,12 +1543,13 @@ bool found = false; s = rxvt_splitcommastring (p); + for (i = 0; s[i]; i++) { if (*s[i]) { - STRCPY (buf, "@im="); - STRNCAT (buf, s[i], IMBUFSIZ - 5); + strcpy (buf, "@im="); + strncat (buf, s[i], IMBUFSIZ - 5); if (IM_get_IC (buf)) { found = true; @@ -1331,9 +1557,8 @@ } } } - for (i = 0; s[i]; i++) - free(s[i]); - free(s); + + rxvt_freecommastring (s); if (found) goto done; @@ -1350,41 +1575,110 @@ done: #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) if (rs[Rs_imLocale]) - setlocale (LC_CTYPE, locale); + SET_LOCALE (locale); #endif } void -rxvt_term::IMSetStatusPosition () +rxvt_term::IMSetPosition () { - XRectangle preedit_rect, status_rect, *needed_rect; - XVaNestedList preedit_attr, status_attr; + XRectangle preedit_rect, status_rect, *needed_rect; + XVaNestedList preedit_attr, status_attr; - if (Input_Context == NULL - || !TermWin.focus || !(input_style & XIMPreeditArea) + if (!Input_Context + || !focus + || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) || !IMisRunning ()) return; - /* Getting the necessary width of preedit area */ - status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); - XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL); - XFree(status_attr); + if (input_style & XIMPreeditPosition) + { + im_set_size (preedit_rect); + preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); + + XSetICValues (Input_Context, + XNPreeditAttributes, preedit_attr, NULL); + } + else + { + /* Getting the necessary width of preedit area */ + status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); + XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); + XFree (status_attr); + + im_set_preedit_area (preedit_rect, status_rect, *needed_rect); + XFree (needed_rect); + + preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); + status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); + + XSetICValues (Input_Context, + XNPreeditAttributes, preedit_attr, + XNStatusAttributes, status_attr, + NULL); + + XFree (status_attr); + } + + XFree (preedit_attr); +} +#endif /* USE_XIM */ + +void +rxvt_term::get_window_origin (int &x, int &y) +{ + Window cr; + XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); +} + +Pixmap +rxvt_term::get_pixmap_property (int prop_id) +{ + 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; + } + + return None; +} + +#ifdef HAVE_BG_PIXMAP + +void +rxvt_term::update_background () +{ + if (update_background_ev.is_active ()) + return; + + bgPixmap.invalidate (); - im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); + ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); - preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); - status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); + if (to_wait <= 0.) + bgPixmap.render (); + else + update_background_ev.start (to_wait); +} - XSetICValues(Input_Context, - XNPreeditAttributes, preedit_attr, - XNStatusAttributes, status_attr, NULL); +void +rxvt_term::update_background_cb (ev::timer &w, int revents) +{ + make_current (); - XFree(preedit_attr); - XFree(status_attr); + update_background_ev.stop (); + bgPixmap.render (); + refresh_check (); } -#endif /* USE_XIM */ -/*----------------------------------------------------------------------*/ -rxvt_t rxvt_current_term; +#endif /* HAVE_BG_PIXMAP */ /*----------------------- end-of-file (C source) -----------------------*/