--- rxvt-unicode/src/main.C 2004/07/26 18:01:19 1.70 +++ rxvt-unicode/src/main.C 2005/02/03 07:18:30 1.132 @@ -34,7 +34,8 @@ #include "rxvt.h" /* NECESSARY */ #include "main.intpro" /* PROTOS for internal routines */ -#include +#include +#include #ifdef TTY_GID_SUPPORT # include @@ -44,7 +45,9 @@ # include #endif -#include +#ifdef KEYSYM_RESOURCE +# include "keyboard.h" +#endif vector rxvt_term::termlist; @@ -53,10 +56,10 @@ bool rxvt_set_locale (const char *locale) { - if (!locale || !STRNCMP (locale, curlocale, 128)) + if (!locale || !strncmp (locale, curlocale, 128)) return false; - STRNCPY (curlocale, locale, 128); + strncpy (curlocale, locale, 128); setlocale (LC_CTYPE, curlocale); return true; } @@ -125,26 +128,11 @@ } #endif -void * -rxvt_term::operator new (size_t s) -{ - void *p = malloc (s); - - MEMSET (p, 0, s); - return p; -} - -void -rxvt_term::operator delete (void *p, size_t s) -{ - free (p); -} - rxvt_term::rxvt_term () : +#if TRANSPARENT rootwin_ev (this, &rxvt_term::rootwin_cb), - termwin_ev (this, &rxvt_term::x_cb), - vt_ev (this, &rxvt_term::x_cb), +#endif #ifdef HAVE_SCROLLBARS scrollbar_ev (this, &rxvt_term::x_cb), #endif @@ -172,7 +160,13 @@ #ifdef USE_XIM im_ev (this, &rxvt_term::im_cb), #endif + sw_term (this, &rxvt_term::sig_term), + sw_int (this, &rxvt_term::sig_term), + sw_chld (this, &rxvt_term::sig_chld), + termwin_ev (this, &rxvt_term::x_cb), + vt_ev (this, &rxvt_term::x_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) @@ -180,30 +174,44 @@ cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; termlist.push_back (this); + +#ifdef KEYSYM_RESOURCE + keyboard = new keyboard_manager; + + if (!keyboard) + rxvt_fatal ("out of memory, aborting.\n"); +#endif } rxvt_term::~rxvt_term () { termlist.erase (find (termlist.begin (), termlist.end(), this)); - if (cmd_fd >= 0) - close (cmd_fd); + if (cmd_pid) + kill (-cmd_pid, SIGHUP); -#ifndef NO_SETOWNER_TTYDEV - privileged_ttydev (RESTORE); -#endif #ifdef UTMP_SUPPORT privileged_utmp (RESTORE); #endif - delete TermWin.fontset; + pty.put (); + +#if ENABLE_STYLES + for (int i = RS_styleCount; --i; ) + if (TermWin.fontset[i] != TermWin.fontset[0]) + delete TermWin.fontset[i]; +#endif + delete TermWin.fontset[0]; if (display) { selection_clear (); +#ifdef USE_XIM + im_destroy (); +#endif #ifdef MENUBAR - if (menubarGC) XFreeGC (display->display, menubarGC); + if (menubarGC) XFreeGC (display->display, menubarGC); #endif #ifdef XTERM_SCROLLBAR if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); @@ -244,7 +252,10 @@ // TODO: free pixcolours, colours should become part of rxvt_display - delete PixColors; + delete pix_colors_focused; +#ifdef OFF_FOCUS_FADING + delete pix_colors_unfocused; +#endif displays.put (display); @@ -261,32 +272,44 @@ free (env_term); free (env_colorfgbg); free (locale); -#if 0 - free (codeset); -#endif + free (v_buffer); + free (incr_buf); delete envv; delete argv; + +#ifdef KEYSYM_RESOURCE + delete keyboard; +#endif } void rxvt_term::destroy () { + if (destroy_ev.active) + return; + +#if ENABLE_OVERLAY + scr_overlay_off (); +#endif + if (display) { - rootwin_ev.stop (display); - termwin_ev.stop (display); - vt_ev.stop (display); -#ifdef USE_XIM - im_destroy (); +#if USE_XIM im_ev.stop (display); #endif -#ifdef HAVE_SCROLLBARS +#if HAVE_SCROLLBARS scrollbar_ev.stop (display); #endif -#ifdef MENUBAR +#if MENUBAR menubar_ev.stop (display); #endif +#if TRANSPARENT + rootwin_ev.stop (display); +#endif + incr_ev.stop (); + termwin_ev.stop (display); + vt_ev.stop (display); } check_ev.stop (); @@ -325,30 +348,24 @@ { SET_R (this); + set_locale (""); + if (!init_vars ()) return false; - /* - * 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); - init_secondary (); const char **cmd_argv = init_resources (argc, argv); - set_locale (""); +#ifdef KEYSYM_RESOURCE + keyboard->register_done (); +#endif #if MENUBAR_MAX menubar_read (rs[Rs_menu]); #endif #ifdef HAVE_SCROLLBARS - if (Options & Opt_scrollBar) + if (options & Opt_scrollBar) scrollBar.setIdle (); /* set existence for size calculations */ #endif @@ -363,7 +380,7 @@ #endif #ifdef HAVE_SCROLLBARS - if (Options & Opt_scrollBar) + if (options & Opt_scrollBar) resize_scrollbar (); /* create and map scrollbar */ #endif #if (MENUBAR_MAX) @@ -371,21 +388,24 @@ XMapWindow (display->display, menuBar.win); #endif #ifdef TRANSPARENT - if (Options & Opt_transparent) + if (options & Opt_transparent) { XSelectInput (display->display, display->root, PropertyChangeMask); check_our_parents (); + rootwin_ev.start (display, display->root); } #endif - rootwin_ev.start (display, display->root); - XMapWindow (display->display, TermWin.vt); XMapWindow (display->display, TermWin.parent[0]); + set_colorfgbg (); + init_command (cmd_argv); - pty_ev.start (cmd_fd, EVENT_READ); + free (cmd_argv); + + pty_ev.start (pty.pty, EVENT_READ); check_ev.start (); @@ -395,31 +415,26 @@ static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); void -rxvt_init_signals () +rxvt_init () { - /* install exit handler for cleanup */ -#if 0 -#ifdef HAVE_ATEXIT - atexit (rxvt_clean_exit); -#else -#endif -#endif - - struct sigaction sa; + /* + * 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 + */ + rxvt_privileges (SAVE); + rxvt_privileges (IGNORE); - 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); + signal (SIGHUP, SIG_IGN); + signal (SIGPIPE, SIG_IGN); /* need to trap SIGURG for SVR4 (Unixware) rlogin */ /* signal (SIGURG, SIG_DFL); */ old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); + // TODO: handle this with exceptions and tolerate the memory loss //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); } @@ -430,42 +445,46 @@ * Catch a SIGCHLD signal and exit if the direct child has died */ -void rxvt_term::child_exited (int pid) -{ - for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) - if (pid == (*t)->cmd_pid) - { - (*t)->destroy (); - break; - } -} - -/* ARGSUSED */ -/* EXTPROTO */ -RETSIGTYPE -rxvt_Child_signal (int sig __attribute__ ((unused))) +void +rxvt_term::sig_chld (sig_watcher &w) { - int pid, save_errno = errno; + // we are being called for every SIGCHLD, not just ours + int pid; while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) - rxvt_term::child_exited (pid); + for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) + if (pid == (*t)->cmd_pid) + { + (*t)->destroy (); + break; + } +} - errno = save_errno; +/*----------------------------------------------------------------------*/ +/* + * Exit gracefully, clearing the utmp entry and restoring tty attributes + * TODO: if debugging, this should free up any known resources if we can + */ +void +rxvt_destroy_all () +{ + // TODO: rxvtd should clean up all ressources + for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) + (*t)->destroy (); } /* * Catch a fatal signal and tidy up before quitting */ -/* EXTPROTO */ -RETSIGTYPE -rxvt_Exit_signal (int sig) +void +rxvt_term::sig_term (sig_watcher &w) { - signal (sig, SIG_DFL); #ifdef DEBUG_CMD - rxvt_warn ("caught signal %d, exiting.\n", sig); + rxvt_warn ("caught signal %d, exiting.\n", w.signum); #endif - rxvt_clean_exit (); - kill (getpid (), sig); + rxvt_destroy_all (); + signal (w.signum, SIG_DFL); + kill (getpid (), w.signum); } /* INTPROTO */ @@ -483,72 +502,42 @@ 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 () -{ - // TODO: rxvtd should clean up all ressources - if (GET_R) - GET_R->destroy (); -} - /* ------------------------------------------------------------------------- * * MEMORY ALLOCATION WRAPPERS * * ------------------------------------------------------------------------- */ -/* EXTPROTO */ -void * +void * rxvt_malloc (size_t size) { - void *p; + void *p = malloc (size); - p = malloc (size); - if (p) - return p; + if (!p) + rxvt_fatal ("memory allocation failure. aborting.\n"); - fprintf (stderr, RESNAME ": memory allocation failure. Aborting"); - rxvt_clean_exit (); - exit (EXIT_FAILURE); - /* NOTREACHED */ + return p; } -/* EXTPROTO */ +/* INTPROTO */ void * rxvt_calloc (size_t number, size_t size) { - void *p; + void *p = calloc (number, size); - p = calloc (number, size); - if (p) - return p; + if (!p) + rxvt_fatal ("memory allocation failure. aborting.\n"); - fprintf (stderr, RESNAME ": memory allocation failure. Aborting"); - rxvt_clean_exit (); - exit (EXIT_FAILURE); - /* NOTREACHED */ + return p; } -/* EXTPROTO */ +/* INTPROTO */ void * rxvt_realloc (void *ptr, size_t size) { - void *p; + void *p = realloc (ptr, size); - if (ptr) - p = realloc (ptr, size); - else - p = malloc (size); - if (p) - return p; - - fprintf (stderr, RESNAME ": memory allocation failure. Aborting"); - rxvt_clean_exit (); - exit (EXIT_FAILURE); - /* NOTREACHED */ + if (!p) + rxvt_fatal ("memory allocation failure. aborting.\n"); + + return p; } /* ------------------------------------------------------------------------- * @@ -556,8 +545,13 @@ * ------------------------------------------------------------------------- */ /* take care of suid/sgid super-user (root) privileges */ void -rxvt_term::privileges (int mode) +rxvt_privileges (rxvt_privaction action) { +#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) + static uid_t euid; + static gid_t egid; +#endif + #if ! defined(__CYGWIN32__) # if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) /* setreuid () is the poor man's setuid (), seteuid () */ @@ -566,7 +560,7 @@ # define HAVE_SETEUID # endif # ifdef HAVE_SETEUID - switch (mode) + switch (action) { case IGNORE: /* @@ -586,7 +580,7 @@ break; } # else - switch (mode) + switch (action) { case IGNORE: setuid (getuid ()); @@ -603,86 +597,20 @@ #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; - - 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); -} -#endif - -#ifndef NO_SETOWNER_TTYDEV -void -rxvt_term::privileged_ttydev (char action) +rxvt_term::privileged_utmp (rxvt_privaction action) { - 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') + if ((options & Opt_utmpInhibit) + || !pty.name || !*pty.name) return; - privileges (RESTORE); + rxvt_privileges (RESTORE); 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 - - { - chown (ttydev, getuid (), ttygid); /* fail silently */ - chmod (ttydev, ttymode); -# ifdef HAVE_REVOKE - revoke (ttydev); -# endif - - } - } + makeutent (pty.name, rs[Rs_display_name]); 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 + cleanutent (); - } - - privileges (IGNORE); - -# 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 + rxvt_privileges (IGNORE); } #endif @@ -763,7 +691,7 @@ { sb_w = scrollbar_TotalWidth (); szHint.base_width += sb_w; - if (!(Options & Opt_scrollBar_right)) + if (!(options & Opt_scrollBar_right)) window_vt_x += sb_w; } @@ -801,7 +729,7 @@ szHint.height = szHint.base_height + TermWin.height; } - if (scrollbar_visible () && (Options & Opt_scrollBar_right)) + if (scrollbar_visible () && (options & Opt_scrollBar_right)) window_sb_x = szHint.width - sb_w; if (recalc_x) @@ -827,28 +755,26 @@ void rxvt_term::tt_winch () { - struct winsize ws; - - if (cmd_fd < 0) + if (pty.pty < 0) return; + struct winsize 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 */ + ws.ws_xpixel = TermWin.width; + ws.ws_ypixel = TermWin.height; + (void)ioctl (pty.pty, TIOCSWINSZ, &ws); + +#if 0 + // TIOCSWINSZ⎈ is supposed to do this automatically and correctly + if (cmd_pid) /* force through to the command */ kill (cmd_pid, SIGWINCH); -# endif #endif } /*----------------------------------------------------------------------*/ -/* rxvt_change_font () - Switch to a new font */ +/* set_fonts () - load and set the various fonts /* * init = 1 - initialize * @@ -856,46 +782,98 @@ * fontname == FONT_DN - switch to smaller font */ bool -rxvt_term::change_font (const char *fontname) +rxvt_term::set_fonts () { - if (fontname == FONT_UP) - { - // TODO - } - else if (fontname == FONT_DN) + 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)) { - // TODO + delete fs; + return false; } - else + +#if ENABLE_STYLES + for (int i = RS_styleCount; --i; ) + if (TermWin.fontset[i] != TermWin.fontset[0]) + delete TermWin.fontset[i]; +#endif + + delete TermWin.fontset[0]; + TermWin.fontset[0] = fs; + + prop = (*fs)[1]->properties (); + prop.height += TermWin.lineSpace; + fs->set_prop (prop); + + TermWin.fwidth = prop.width; + TermWin.fheight = prop.height; + TermWin.fweight = prop.weight; + TermWin.fslant = prop.slant; + TermWin.fbase = (*fs)[1]->ascent; + + for (int style = 1; style < 4; style++) { - rxvt_fontset *fs = new rxvt_fontset (this); +#if ENABLE_STYLES + const char *res = rs[Rs_font + style]; - if (fs && fs->populate (fontname ? fontname : "fixed")) + if (res && !*res) + TermWin.fontset[style] = TermWin.fontset[0]; + else { - delete TermWin.fontset; - TermWin.fontset = fs; - TermWin.fwidth = fs->base_font ()->width; - TermWin.fheight = fs->base_font ()->height; - TermWin.fbase = fs->base_font ()->ascent; + TermWin.fontset[style] = fs = new rxvt_fontset (this); + rxvt_fontprop prop2 = prop; - if (TermWin.parent[0]) + if (res) + prop2.weight = prop2.slant = rxvt_fontprop::unset; + else { - resize_all_windows (0, 0, 0); - scr_remap_chars (); - scr_touch (true); - } + res = TermWin.fontset[0]->fontdesc; - return true; + 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->populate (res); + fs->set_prop (prop2); } +#else + TermWin.fontset[style] = TermWin.fontset[0]; +#endif } - return false; + if (TermWin.parent[0]) + { + resize_all_windows (0, 0, 0); + scr_remap_chars (); + scr_touch (true); + } + + return true; } -bool -rxvt_term::font_up_down (int n, int direction) +void rxvt_term::set_string_property (Atom prop, const char *str, int len) +{ + // TODO: SMART_WINDOW_TITLE + XChangeProperty (display->display, TermWin.parent[0], + 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) { - return false; + // TODO: SMART_WINDOW_TITLE + wchar_t *ws = rxvt_mbstowcs (str, len); + char *s = rxvt_wcstoutf8 (ws); + + XChangeProperty (display->display, TermWin.parent[0], + prop, xa[XA_UTF8_STRING], 8, PropModeReplace, + (const unsigned char *)s, strlen (s)); + + free (s); + free (ws); } /*----------------------------------------------------------------------*/ @@ -904,38 +882,18 @@ void rxvt_term::set_title (const char *str) { -#ifdef SMART_WINDOW_TITLE - char *name; - - if (!XFetchName (display->display, TermWin.parent[0], &name)) - name = NULL; - - if (name == NULL || STRCMP (name, str)) -#endif - XStoreName (display->display, TermWin.parent[0], str); - -#ifdef SMART_WINDOW_TITLE - if (name) - XFree (name); + set_string_property (XA_WM_NAME, str); +#if ENABLE_FRILLS + set_utf8_property (xa[XA_NET_WM_NAME], str); #endif } void rxvt_term::set_icon_name (const char *str) { -#ifdef SMART_WINDOW_TITLE - char *name; - - if (!XGetIconName (display->display, TermWin.parent[0], &name)) - name = NULL; - - if (name == NULL || STRCMP (name, str)) -#endif - XSetIconName (display->display, TermWin.parent[0], str); - -#ifdef SMART_WINDOW_TITLE - if (name) - XFree (name); + set_string_property (XA_WM_ICON_NAME, str); +#if ENABLE_FRILLS + set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); #endif } @@ -957,7 +915,7 @@ { /* bright colors */ i -= 8; # ifndef NO_BRIGHTCOLOR - PixColors[idx] = PixColors[minBrightCOLOR + i]; + pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; SET_PIXCOLOR (idx); goto Done; # endif @@ -965,7 +923,7 @@ } if (i >= 0 && i <= 7) { /* normal colors */ - PixColors[idx] = PixColors[minCOLOR + i]; + pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; SET_PIXCOLOR (idx); goto Done; } @@ -974,7 +932,7 @@ if (!rXParseAllocColor (& xcol, color)) return; - /* XStoreColor (display->display, XCMAP, XColor*); */ + /* XStoreColor (display->display, display->cmap, XColor*); */ /* * FIXME: should free colors here, but no idea how to do it so instead, @@ -982,31 +940,31 @@ */ # if 0 for (i = Color_Black; i <= Color_White; i++) - if (PixColors[idx] == PixColors[i]) + if (pix_colors[idx] == pix_colors[i]) break; if (i > Color_White) { - /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ - XFreeColors (display->display, XCMAP, (PixColors + idx), 1, + /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */ + XFreeColors (display->display, display->cmap, (pix_colors + idx), 1, DisplayPlanes (display->display, display->screen)); } # endif - PixColors[idx] = xcol; + pix_colors_focused[idx] = xcol; SET_PIXCOLOR (idx); /* XSetWindowAttributes attr; */ /* Cursor cursor; */ Done: - if (idx == Color_bg && ! (Options & Opt_transparent)) - XSetWindowBackground (display->display, TermWin.vt, - PixColors[Color_bg]); +#ifdef OFF_FOCUS_FADING + if (rs[Rs_fade]) + pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); +#endif - /* handle Color_BD, scrollbar background, etc. */ + /*TODO: handle Color_BD, scrollbar background, etc. */ - set_colorfgbg (); recolour_cursor (); - scr_touch (true); + scr_recolour (); } #else @@ -1018,9 +976,14 @@ { XColor xcol[2]; - xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColors[Color_pointer_fg] : PixColors[Color_fg]; - xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColors[Color_pointer_bg] : PixColors[Color_bg]; - XQueryColors (display->display, XCMAP, xcol, 2); + xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) + ? pix_colors_focused[Color_pointer_fg] + : pix_colors_focused[Color_fg]; + xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) + ? pix_colors_focused[Color_pointer_bg] + : pix_colors_focused[Color_bg]; + + XQueryColors (display->display, display->cmap, xcol, 2); XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); } @@ -1031,22 +994,22 @@ 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 = "\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"); 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)); 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 @@ -1056,24 +1019,9 @@ } sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); - -#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 } /*----------------------------------------------------------------------*/ -/* - * Colour determination for low colour displays, routine from - * Hans de Goede - */ int rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) @@ -1170,6 +1118,7 @@ XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, window_vt_y, TermWin_TotalWidth (), TermWin_TotalHeight ()); + scr_clear (); #ifdef XPM_BACKGROUND resize_pixmap (); @@ -1202,6 +1151,11 @@ old_width = szHint.width; old_height = szHint.height; +#ifdef XPM_BACKGROUND + if (TermWin.pixmap) + scr_touch (false); +#endif + #ifdef USE_XIM IMSetStatusPosition (); #endif @@ -1224,6 +1178,7 @@ if (height == 0) height = wattr.height - szHint.base_height; } + if (width != TermWin.width || height != TermWin.height) { width += szHint.base_width; @@ -1238,63 +1193,83 @@ #ifdef USE_XIM void -rxvt_term::im_set_size (XRectangle *size) +rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) +{ + fg = pix_colors[Color_fg]; + bg = pix_colors[Color_bg]; +} + +void +rxvt_term::im_set_size (XRectangle &size) { - size->x = TermWin.int_bwidth; - size->y = TermWin.int_bwidth; - size->width = Width2Pixel (TermWin.ncol); - size->height = Height2Pixel (TermWin.nrow); + // the int_bwidth terms make no sense to me + size.x = TermWin.int_bwidth; + size.y = TermWin.int_bwidth; + size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; + size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; } void -rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) +rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, + XRectangle &status_rect, + const XRectangle &needed_rect) { - *fg = PixColors[Color_fg]; - *bg = PixColors[Color_bg]; + preedit_rect.x = needed_rect.width; + preedit_rect.y = 0; + preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; + preedit_rect.height = TermWin.fheight; + + status_rect.x = 0; + status_rect.y = 0; + status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; + status_rect.height = TermWin.fheight; } /* Checking whether input method is running. */ bool rxvt_term::IMisRunning () { - char *p; - Atom atom; - Window win; - char server[IMBUFSIZ]; + char *p; + Atom atom; + Window win; + char server[IMBUFSIZ]; /* get current locale modifier */ if ((p = XSetLocaleModifiers (NULL)) != NULL) { - 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, '@')) != NULL) /* first one only */ *p = '\0'; atom = XInternAtom (display->display, server, False); win = XGetSelectionOwner (display->display, 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 + || !TermWin.focus + || !(input_style & XIMPreeditPosition)) return; - im_set_position (&spot); + im_set_position (nspot); + + 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); @@ -1302,44 +1277,18 @@ } void -rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, - XRectangle * needed_rect) -{ - int mbh, vtx = 0; - - if (scrollbar_visible () && ! (Options & Opt_scrollBar_right)) - vtx = scrollbar_TotalWidth (); - - mbh = menubar_visible () ? menuBar_TotalHeight () : 0; - mbh -= TermWin.lineSpace; - - preedit_rect->x = needed_rect->width + vtx; - preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh; - - preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx; - preedit_rect->height = Height2Pixel (1); - - status_rect->x = vtx; - status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh; - - status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1); - status_rect->height = Height2Pixel (1); -} - -void rxvt_term::im_destroy () { - if (Input_Context) - { - XDestroyIC (Input_Context); - Input_Context = NULL; - } - if (input_method) { + if (Input_Context && input_method->xim) + XDestroyIC (Input_Context); + display->put_xim (input_method); input_method = 0; } + + Input_Context = 0; } /* @@ -1349,15 +1298,14 @@ 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; if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) return false; @@ -1368,96 +1316,153 @@ 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); - - for (j = 0; j < xim_styles->count_styles; j++) - if (input_style == xim_styles->supported_styles[j]) - { - found = 1; - break; - } + const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" }; + + 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); + + 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-*-*-*-*-*-*," + "*", + TermWin.fheight, + TermWin.fheight + 1, TermWin.fheight - 1, + TermWin.fheight - 2, TermWin.fheight + 2); + + fs = XCreateFontSet (display->display, 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); } - 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); + Input_Context = XCreateIC (xim, + XNInputStyle, input_style, + XNClientWindow, TermWin.vt, + 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); + if (fs) XFreeFontSet (display->display, fs); if (Input_Context == NULL) { rxvt_warn ("failed to create input context, continuing without XIM.\n"); - display->put_xim (input_method); + im_destroy (); return false; } @@ -1493,12 +1498,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; @@ -1506,9 +1512,8 @@ } } } - for (i = 0; s[i]; i++) - free (s[i]); - free (s); + + rxvt_freecommastring (s); if (found) goto done; @@ -1532,11 +1537,12 @@ void rxvt_term::IMSetStatusPosition () { - 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 + || !TermWin.focus + || !(input_style & XIMPreeditArea) || !IMisRunning ()) return; @@ -1545,14 +1551,15 @@ XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); XFree (status_attr); - im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); + 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); + XNPreeditAttributes, preedit_attr, + XNStatusAttributes, status_attr, NULL); XFree (preedit_attr); XFree (status_attr);