--- rxvt-unicode/src/main.C 2005/02/20 00:09:25 1.143 +++ rxvt-unicode/src/main.C 2008/02/18 09:58:04 1.306 @@ -1,4 +1,4 @@ -/*--------------------------------*-C-*---------------------------------* +/*----------------------------------------------------------------------* * File: main.C *----------------------------------------------------------------------* * @@ -13,7 +13,7 @@ * Copyright (c) 1997,1998 Oezguer Kesim * Copyright (c) 1998-2001 Geoff Wing * - extensive modifications - * Copyright (c) 2003-2004 Marc Lehmann + * 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 @@ -32,44 +32,68 @@ #include "../config.h" /* NECESSARY */ #include "rxvt.h" /* NECESSARY */ +#include "keyboard.h" +#include "rxvtperl.h" + +#include #include #include -#ifdef TTY_GID_SUPPORT -# include -#endif +#include -#ifdef HAVE_TERMIOS_H -# include -#endif - -#ifdef KEYSYM_RESOURCE -# include "keyboard.h" +#ifdef HAVE_XSETLOCALE +# define X_LOCALE +# include +#else +# ifdef HAVE_SETLOCALE +# include +# endif #endif vector rxvt_term::termlist; -static char curlocale[128]; +// used to tell global functions which terminal instance is "active" +rxvt_t rxvt_current_term; + +static char curlocale[128], savelocale[128]; bool -rxvt_set_locale (const char *locale) +rxvt_set_locale (const char *locale) NOTHROW { - if (!locale || !strncmp (locale, curlocale, 128)) + int size = strlen (locale) + 1; + + if (size > sizeof (curlocale)) + rxvt_fatal ("locale string too long, aborting.\n"); + + if (!locale || !memcmp (locale, curlocale, size)) return false; - strncpy (curlocale, locale, 128); + memcpy (curlocale, locale, size); setlocale (LC_CTYPE, curlocale); return true; } +void +rxvt_push_locale (const char *locale) NOTHROW +{ + strcpy (savelocale, curlocale); + rxvt_set_locale (locale); +} + +void +rxvt_pop_locale () NOTHROW +{ + rxvt_set_locale (savelocale); +} + #if ENABLE_COMBINING class rxvt_composite_vec rxvt_composite; text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) { compose_char *cc; - + // break compose chains, as stupid readline really likes to duplicate // composing characters for some reason near the end of a line. cc = (*this)[c1]; @@ -128,72 +152,65 @@ #endif rxvt_term::rxvt_term () - : -#if TRANSPARENT - rootwin_ev (this, &rxvt_term::rootwin_cb), -#endif -#ifdef HAVE_SCROLLBARS - scrollbar_ev (this, &rxvt_term::x_cb), -#endif -#ifdef MENUBAR - menubar_ev (this, &rxvt_term::x_cb), +{ +#if HAVE_BG_PIXMAP + update_background_ev.set (this); #endif #ifdef CURSOR_BLINK - cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), + cursor_blink_ev.set (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL); #endif #ifdef TEXT_BLINK - text_blink_ev (this, &rxvt_term::text_blink_cb), + text_blink_ev.set (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL); #endif #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING - cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), + cont_scroll_ev.set (this); #endif #ifdef SELECTION_SCROLLING - sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), + sel_scroll_ev.set (this); #endif #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) - slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), + slip_wheel_ev.set (this); #endif -#ifdef POINTER_BLANK - pointer_ev (this, &rxvt_term::pointer_cb), +#if ENABLE_TRANSPARENCY || ENABLE_PERL + rootwin_ev.set (this), #endif + scrollbar_ev.set (this), #ifdef USE_XIM - im_ev (this, &rxvt_term::im_cb), + im_ev.set (this), #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) -{ +#ifdef POINTER_BLANK + 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); #ifdef KEYSYM_RESOURCE keyboard = new keyboard_manager; - - if (!keyboard) - rxvt_fatal ("out of memory, aborting.\n"); #endif } // clean up the most important stuff, do *not* call x or free mem etc. // for use before an emergency exit -void rxvt_term::emergency_cleanup () +void +rxvt_term::emergency_cleanup () { if (cmd_pid) kill (-cmd_pid, SIGHUP); -#ifdef UTMP_SUPPORT - privileged_utmp (RESTORE); -#endif - - pty.put (); + pty_ev.stop (); + delete pty; pty = 0; } rxvt_term::~rxvt_term () @@ -204,68 +221,67 @@ #if ENABLE_STYLES for (int i = RS_styleCount; --i; ) - if (TermWin.fontset[i] != TermWin.fontset[0]) - delete TermWin.fontset[i]; + if (fontset[i] != fontset[0]) + delete fontset[i]; +#endif + delete fontset[0]; + +#ifdef HAVE_BG_PIXMAP + bgPixmap.destroy (); #endif - delete TermWin.fontset[0]; if (display) { - dDisp; - selection_clear (); #ifdef USE_XIM im_destroy (); #endif -#ifdef MENUBAR - if (menubarGC) XFreeGC (disp, menubarGC); -#endif #ifdef XTERM_SCROLLBAR - if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); - if (ShadowGC) XFreeGC (disp, ShadowGC); + if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); + if (ShadowGC) XFreeGC (dpy, ShadowGC); #endif #ifdef PLAIN_SCROLLBAR - if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); + if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC); #endif #ifdef NEXT_SCROLLBAR - if (blackGC) XFreeGC (disp, blackGC); - if (whiteGC) XFreeGC (disp, whiteGC); - if (grayGC) XFreeGC (disp, grayGC); - if (darkGC) XFreeGC (disp, darkGC); - if (stippleGC) XFreeGC (disp, stippleGC); - if (dimple) XFreePixmap (disp, dimple); - if (upArrow) XFreePixmap (disp, upArrow); - if (downArrow) XFreePixmap (disp, downArrow); - if (upArrowHi) XFreePixmap (disp, upArrowHi); - if (downArrowHi) XFreePixmap (disp, downArrowHi); -#endif -#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) - if (topShadowGC) XFreeGC (disp, topShadowGC); - if (botShadowGC) XFreeGC (disp, botShadowGC); - if (scrollbarGC) XFreeGC (disp, scrollbarGC); -#endif - if (TermWin.gc) XFreeGC (disp, TermWin.gc); - -#if defined(MENUBAR) && (MENUBAR_MAX > 1) - delete menuBar.drawable; - //if (menuBar.win) - // XDestroyWindow (disp, menuBar.win); + if (blackGC) XFreeGC (dpy, blackGC); + if (whiteGC) XFreeGC (dpy, whiteGC); + if (grayGC) XFreeGC (dpy, grayGC); + if (darkGC) XFreeGC (dpy, darkGC); + if (stippleGC) XFreeGC (dpy, stippleGC); + if (dimple) XFreePixmap (dpy, dimple); + if (upArrow) XFreePixmap (dpy, upArrow); + if (downArrow) XFreePixmap (dpy, downArrow); + if (upArrowHi) XFreePixmap (dpy, upArrowHi); + if (downArrowHi) XFreePixmap (dpy, downArrowHi); +#endif +#ifdef RXVT_SCROLLBAR + if (topShadowGC) XFreeGC (dpy, topShadowGC); + if (botShadowGC) XFreeGC (dpy, botShadowGC); + if (scrollbarGC) XFreeGC (dpy, scrollbarGC); #endif - delete TermWin.drawable; - // destroy all windows - if (TermWin.parent[0]) - XDestroyWindow (disp, TermWin.parent[0]); - } + if (gc) XFreeGC (dpy, gc); - // TODO: free pixcolours, colours should become part of rxvt_display + delete drawable; + // destroy all windows + if (parent[0]) + XDestroyWindow (dpy, parent[0]); - delete pix_colors_focused; -#ifdef OFF_FOCUS_FADING - delete pix_colors_unfocused; + 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 + } - displays.put (display); + clear (); + + display->flush (); /* ideally .put should do this */ + displays.put (display); + } scr_release (); @@ -275,10 +291,8 @@ free (selection.text); // TODO: manage env vars in child only(!) - free (env_windowid); free (env_display); free (env_term); - free (env_colorfgbg); free (locale); free (v_buffer); free (incr_buf); @@ -289,14 +303,31 @@ #ifdef KEYSYM_RESOURCE delete keyboard; #endif +#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)); + + cmd_pid = 0; + + if (!option (Opt_hold)) + destroy (); } void rxvt_term::destroy () { - if (destroy_ev.active) + if (destroy_ev.is_active ()) return; + HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); + #if ENABLE_OVERLAY scr_overlay_off (); #endif @@ -306,13 +337,8 @@ #if USE_XIM im_ev.stop (display); #endif -#if HAVE_SCROLLBARS scrollbar_ev.stop (display); -#endif -#if MENUBAR - menubar_ev.stop (display); -#endif -#if TRANSPARENT +#if ENABLE_TRANSPARENCY || ENABLE_PERL rootwin_ev.stop (display); #endif incr_ev.stop (); @@ -320,7 +346,7 @@ vt_ev.stop (display); } - check_ev.stop (); + flush_ev.stop (); pty_ev.stop (); #ifdef CURSOR_BLINK cursor_blink_ev.stop (); @@ -338,13 +364,13 @@ pointer_ev.stop (); #endif - destroy_ev.start (0); + destroy_ev.start (); } void -rxvt_term::destroy_cb (time_watcher &w) +rxvt_term::destroy_cb (ev::idle &w, int revents) { - SET_R (this); + make_current (); delete this; } @@ -363,7 +389,7 @@ (*t)->emergency_cleanup (); } -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL static void print_x_error (Display *dpy, XErrorEvent *event) { @@ -406,7 +432,7 @@ mesg, BUFSIZ); rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); } - XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", + XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ); rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); } @@ -419,12 +445,12 @@ GET_R->allowedxerror = event->error_code; else { - //TODO: GET_R is most likely not the terminal which caused the error - //TODO: maybe just output the error and continue? -#if ENABLE_FRILLS - print_x_error (display, event); -#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); +#else + print_x_error (display, event); #endif } @@ -440,287 +466,94 @@ _exit (EXIT_FAILURE); } -/* - * Catch a fatal signal and tidy up before quitting - */ +static struct sig_handlers +{ + ev::sig sw_term, sw_int; + + /* + * Catch a fatal signal and tidy up before quitting + */ + void sig_term (ev::sig &w, int revents); + + sig_handlers () + { + sw_term.set (this); + sw_int .set (this); + } +} sig_handlers; + void -rxvt_term::sig_term (sig_watcher &w) +sig_handlers::sig_term (ev::sig &w, int revents) { -#ifdef DEBUG_CMD - rxvt_warn ("caught signal %d, exiting.\n", w.signum); -#endif rxvt_emergency_cleanup (); - signal (w.signum, SIG_DFL); + w.stop (); kill (getpid (), w.signum); } -/*----------------------------------------------------------------------*/ -/* rxvt_init () */ -bool -rxvt_term::init (int argc, const char *const *argv) -{ - SET_R (this); - - set_locale (""); - - if (!init_vars ()) - return false; - - init_secondary (); - - const char **cmd_argv = init_resources (argc, argv); - -#ifdef KEYSYM_RESOURCE - keyboard->register_done (); -#endif - -#if MENUBAR_MAX - menubar_read (rs[Rs_menu]); -#endif -#ifdef HAVE_SCROLLBARS - if (options & Opt_scrollBar) - scrollBar.setIdle (); /* set existence for size calculations */ -#endif - - create_windows (argc, argv); - - dDisp; - - init_xlocale (); - - scr_reset (); /* initialize screen */ - -#if 0 - XSynchronize (disp, True); -#endif - -#ifdef HAVE_SCROLLBARS - if (options & Opt_scrollBar) - resize_scrollbar (); /* create and map scrollbar */ -#endif -#if (MENUBAR_MAX) - if (menubar_visible ()) - XMapWindow (disp, menuBar.win); -#endif -#ifdef TRANSPARENT - if (options & Opt_transparent) - { - XSelectInput (disp, display->root, PropertyChangeMask); - check_our_parents (); - rootwin_ev.start (display, display->root); - } -#endif - - XMapWindow (disp, TermWin.vt); - XMapWindow (disp, TermWin.parent[0]); - - set_colorfgbg (); - - init_command (cmd_argv); - - free (cmd_argv); - - pty_ev.start (pty.pty, EVENT_READ); - - check_ev.start (); - - return true; -} +char **rxvt_environ; // startup environment void rxvt_init () { - /* - * 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); + ptytty::init (); + + if (!ev_default_loop (0)) + rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); + + rxvt_environ = environ; signal (SIGHUP, SIG_IGN); signal (SIGPIPE, SIG_IGN); + sig_handlers.sw_term.start (SIGTERM); ev_unref (); + sig_handlers.sw_int.start (SIGINT); ev_unref (); + /* need to trap SIGURG for SVR4 (Unixware) rlogin */ /* signal (SIGURG, SIG_DFL); */ old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); // TODO: handle this with exceptions and tolerate the memory loss XSetIOErrorHandler (rxvt_xioerror_handler); -} - -/* ------------------------------------------------------------------------- * - * SIGNAL HANDLING & EXIT HANDLER * - * ------------------------------------------------------------------------- */ -/* - * Catch a SIGCHLD signal and exit if the direct child has died - */ - -void -rxvt_term::sig_chld (sig_watcher &w) -{ - // we are being called for every SIGCHLD, not just ours - int pid; - - while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) - for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) - if (pid == (*t)->cmd_pid) - { - (*t)->destroy (); - break; - } -} - -/* ------------------------------------------------------------------------- * - * MEMORY ALLOCATION WRAPPERS * - * ------------------------------------------------------------------------- */ -void * -rxvt_malloc (size_t size) -{ - void *p = malloc (size); - - if (!p) - rxvt_fatal ("memory allocation failure. aborting.\n"); - return p; + XrmInitialize (); } -void * -rxvt_calloc (size_t number, size_t size) -{ - void *p = calloc (number, size); - - if (!p) - rxvt_fatal ("memory allocation failure. aborting.\n"); - - return p; -} - -void * -rxvt_realloc (void *ptr, size_t size) -{ - void *p = realloc (ptr, size); - - if (!p) - rxvt_fatal ("memory allocation failure. aborting.\n"); - - return p; -} - -/* ------------------------------------------------------------------------- * - * PRIVILEGED OPERATIONS * - * ------------------------------------------------------------------------- */ -/* take care of suid/sgid super-user (root) privileges */ -void -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 () */ -# define seteuid(a) setreuid(-1, (a)) -# define setegid(a) setregid(-1, (a)) -# define HAVE_SETEUID -# endif -# ifdef HAVE_SETEUID - switch (action) - { - 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 (action) - { - case IGNORE: - setuid (getuid ()); - setgid (getgid ()); - /* FALLTHROUGH */ - case SAVE: - /* FALLTHROUGH */ - case RESTORE: - break; - } -# endif -#endif -} - -#ifdef UTMP_SUPPORT -void -rxvt_term::privileged_utmp (rxvt_privaction action) -{ - if ((options & Opt_utmpInhibit) - || !pty.name || !*pty.name) - return; - - rxvt_privileges (RESTORE); - - if (action == SAVE) - makeutent (pty.name, rs[Rs_display_name]); - else - cleanutent (); - - rxvt_privileges (IGNORE); -} -#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; + int x, y, flags; unsigned int w, h; unsigned int max_width, max_height; - dDisp; - D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", - TermWin.ncol, TermWin.nrow, szHint.width, - szHint.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); if (flags & WidthValue) { - TermWin.ncol = BOUND_POSITIVE_INT16 (w); + ncol = clamp (w, 0, std::numeric_limits::max ()); szHint.flags |= USSize; } if (flags & HeightValue) { - TermWin.nrow = BOUND_POSITIVE_INT16 (h); + nrow = clamp (h, 0, std::numeric_limits::max ()); szHint.flags |= USSize; } @@ -728,6 +561,7 @@ { szHint.x = x; szHint.flags |= USPosition; + if (flags & XNegative) { recalc_x = 1; @@ -739,9 +573,11 @@ { szHint.y = y; szHint.flags |= USPosition; + if (flags & YNegative) { recalc_y = 1; + if (szHint.win_gravity == NorthEastGravity) szHint.win_gravity = SouthEastGravity; else @@ -751,74 +587,59 @@ } /* 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; + width = ncol * fwidth; + height = nrow * fheight; + max_width = MAX_COLS * fwidth; + max_height = MAX_ROWS * fheight; - szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; + szHint.base_width = szHint.base_height = 2 * int_bwidth; - sb_w = mb_h = 0; - window_vt_x = window_vt_y = TermWin.int_bwidth; + window_vt_x = window_vt_y = int_bwidth; - if (scrollbar_visible ()) + 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 (menubar_visible ()) - { - mb_h = menuBar_TotalHeight (); - szHint.base_height += mb_h; - window_vt_y += mb_h; + if (!option (Opt_scrollBar_right)) + window_vt_x += sb_w; } - 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 (disp, display->screen) - - szHint.width - 2 * TermWin.ext_bwidth); + szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; + if (recalc_y) - szHint.y += (DisplayHeight (disp, display->screen) - - 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; } /*----------------------------------------------------------------------*/ @@ -829,19 +650,19 @@ void rxvt_term::tt_winch () { - if (pty.pty < 0) + if (pty->pty < 0) return; struct winsize ws; - ws.ws_col = TermWin.ncol; - ws.ws_row = TermWin.nrow; - ws.ws_xpixel = TermWin.width; - ws.ws_ypixel = TermWin.height; - (void)ioctl (pty.pty, TIOCSWINSZ, &ws); + ws.ws_col = ncol; + ws.ws_row = nrow; + ws.ws_xpixel = width; + ws.ws_ypixel = height; + (void)ioctl (pty->pty, TIOCSWINSZ, &ws); #if 0 - // TIOCSWINSZ⎈ is supposed to do this automatically and correctly + // TIOCSWINSZ is supposed to do this automatically and correctly if (cmd_pid) /* force through to the command */ kill (-cmd_pid, SIGWINCH); #endif @@ -849,7 +670,7 @@ /*----------------------------------------------------------------------*/ /* set_fonts () - load and set the various fonts -/* + * * init = 1 - initialize * * fontname == FONT_UP - switch to bigger font @@ -871,22 +692,21 @@ #if ENABLE_STYLES for (int i = RS_styleCount; --i; ) - if (TermWin.fontset[i] != TermWin.fontset[0]) - delete TermWin.fontset[i]; + if (fontset[i] != fontset[0]) + delete fontset[i]; #endif - delete TermWin.fontset[0]; - TermWin.fontset[0] = fs; + delete fontset[0]; + fontset[0] = fs; prop = (*fs)[1]->properties (); - prop.height += TermWin.lineSpace; - fs->set_prop (prop); + prop.height += lineSpace; - TermWin.fwidth = prop.width; - TermWin.fheight = prop.height; - TermWin.fweight = prop.weight; - TermWin.fslant = prop.slant; - TermWin.fbase = (*fs)[1]->ascent; + fs->set_prop (prop, false); + + fwidth = prop.width; + fheight = prop.height; + fbase = prop.ascent; for (int style = 1; style < 4; style++) { @@ -894,55 +714,58 @@ const char *res = rs[Rs_font + style]; if (res && !*res) - TermWin.fontset[style] = TermWin.fontset[0]; + fontset[style] = fontset[0]; else { - TermWin.fontset[style] = fs = new rxvt_fontset (this); + fontset[style] = fs = new rxvt_fontset (this); rxvt_fontprop prop2 = prop; if (res) - prop2.weight = prop2.slant = rxvt_fontprop::unset; + { + fs->populate (res); + fs->set_prop (prop2, false); + } else { - res = TermWin.fontset[0]->fontdesc; + 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); } - fs->populate (res); - fs->set_prop (prop2); } #else - TermWin.fontset[style] = TermWin.fontset[0]; + fontset[style] = fontset[0]; #endif } - if (TermWin.parent[0]) + 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) +void +rxvt_term::set_string_property (Atom prop, const char *str, int len) { - // TODO: SMART_WINDOW_TITLE - XChangeProperty (display->display, TermWin.parent[0], + XChangeProperty (dpy, 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) +void +rxvt_term::set_utf8_property (Atom prop, const char *str, int len) { - // TODO: SMART_WINDOW_TITLE wchar_t *ws = rxvt_mbstowcs (str, len); char *s = rxvt_wcstoutf8 (ws); - XChangeProperty (display->display, TermWin.parent[0], + XChangeProperty (dpy, parent[0], prop, xa[XA_UTF8_STRING], 8, PropModeReplace, (const unsigned char *)s, strlen (s)); @@ -957,7 +780,7 @@ rxvt_term::set_title (const char *str) { set_string_property (XA_WM_NAME, str); -#if ENABLE_FRILLS +#if ENABLE_EWMH set_utf8_property (xa[XA_NET_WM_NAME], str); #endif } @@ -966,100 +789,76 @@ rxvt_term::set_icon_name (const char *str) { set_string_property (XA_WM_ICON_NAME, str); -#if ENABLE_FRILLS +#if ENABLE_EWMH set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); #endif } -#ifdef XTERM_COLOR_CHANGE void rxvt_term::set_window_color (int idx, const char *color) { +#ifdef XTERM_COLOR_CHANGE rxvt_color xcol; - int i; if (color == NULL || *color == '\0') return; + color = strdup (color); + allocated.push_back ((void *)color); + rs[Rs_color + idx] = color; + /* handle color aliases */ if (isdigit (*color)) { - i = atoi (color); + int i = atoi (color); if (i >= 8 && i <= 15) - { /* bright colors */ - i -= 8; -# ifndef NO_BRIGHTCOLOR - pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; - SET_PIXCOLOR (idx); - goto Done; -# endif + { + /* bright colors */ + pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; + goto done; } if (i >= 0 && i <= 7) - { /* normal colors */ + { + /* normal colors */ pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; - SET_PIXCOLOR (idx); - goto Done; + goto done; } } - if (!rXParseAllocColor (&xcol, color)) - return; - - /* XStoreColor (display->display, display->cmap, 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 (pix_colors[idx] == pix_colors[i]) - break; - if (i > Color_White) - { - /* 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 pix_colors_focused[idx] = xcol; - SET_PIXCOLOR (idx); - - /* XSetWindowAttributes attr; */ - /* Cursor cursor; */ -Done: -#ifdef OFF_FOCUS_FADING - if (rs[Rs_fade]) - pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); -#endif +done: /*TODO: handle Color_BD, scrollbar background, etc. */ + update_fade_color (idx); recolour_cursor (); scr_recolour (); +#endif /* XTERM_COLOR_CHANGE */ } -#else -# define set_window_color (idx,color) ((void)0) -#endif /* XTERM_COLOR_CHANGE */ - void rxvt_term::recolour_cursor () { - XColor xcol[2]; + XColor fg, bg; - 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]; + (ISSET_PIXCOLOR (Color_pointer_fg) + ? pix_colors_focused[Color_pointer_fg] + : pix_colors_focused[Color_fg]).get (fg); - XQueryColors (display->display, display->cmap, xcol, 2); - XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); + (ISSET_PIXCOLOR (Color_pointer_bg) + ? pix_colors_focused[Color_pointer_bg] + : pix_colors_focused[Color_bg]).get (bg); + + XRecolorCursor (dpy, TermWin_cursor, &fg, &bg); } /*----------------------------------------------------------------------*/ @@ -1070,10 +869,9 @@ rxvt_term::set_colorfgbg () { unsigned int i; - const char *xpmb = "\0"; + const char *xpmb = ""; 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++) @@ -1087,7 +885,7 @@ if (pix_colors[Color_bg] == pix_colors[i]) { sprintf (bstr, "%d", (i - Color_Black)); -#ifdef XPM_BACKGROUND +#ifdef BG_IMAGE_FROM_FILE xpmb = "default;"; #endif break; @@ -1098,32 +896,36 @@ /*----------------------------------------------------------------------*/ -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_warn ("can't get colour '%s', continuing without.\n", 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; -#ifdef SMART_RESIZE - int old_width = szHint.width, old_height = szHint.height; -#endif - dDisp; + int old_width = szHint.width; + int old_height = szHint.height; - window_calc (width, height); - XSetWMNormalHints (disp, TermWin.parent[0], &szHint); + window_calc (newwidth, newheight); + + if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) + XSetWMNormalHints (dpy, parent[0], &szHint); if (!ignoreparent) { @@ -1137,9 +939,9 @@ unsigned int unused_w1, unused_h1, unused_b1, unused_d1; Window unused_cr; - XTranslateCoordinates (disp, TermWin.parent[0], display->root, + XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &unused_cr); - XGetGeometry (disp, 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 @@ -1151,9 +953,9 @@ y -= y1; } - x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; - y1 = (DisplayHeight (disp, 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 */ @@ -1166,73 +968,46 @@ else if (y == y1) /* exact center */ dy /= 2; - XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, + XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, szHint.width, szHint.height); #else - XResizeWindow (disp, 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; + 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 (disp, scrollBar.win, - window_sb_x, 0, - scrollbar_TotalWidth (), szHint.height); - resize_scrollbar (); - } - - if (menubar_visible ()) - XMoveResizeWindow (disp, menuBar.win, - window_vt_x, 0, - TermWin_TotalWidth (), menuBar_TotalHeight ()); + if (scrollBar.state) + resize_scrollbar (); - XMoveResizeWindow (disp, TermWin.vt, + XMoveResizeWindow (dpy, vt, window_vt_x, window_vt_y, - TermWin_TotalWidth (), TermWin_TotalHeight ()); + width, height); - scr_clear (); -#ifdef XPM_BACKGROUND - resize_pixmap (); +#ifdef HAVE_BG_PIXMAP + if (bgPixmap.window_size_sensitive ()) + update_background (); #endif + + scr_clear (); } 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); - } - } + // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version + //scr_touch (false); - old_width = szHint.width; - old_height = szHint.height; - -#ifdef XPM_BACKGROUND - if (TermWin.pixmap) - scr_touch (false); +#ifdef HAVE_BG_PIXMAP +// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? +// if (bgPixmap.pixmap) +// scr_touch (false); #endif #ifdef USE_XIM - IMSetStatusPosition (); + IMSetPosition (); #endif } @@ -1241,25 +1016,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); + XGetWindowAttributes (dpy, display->root, &wattr); - if (width == 0) - width = wattr.width - szHint.base_width; - if (height == 0) - height = wattr.height - szHint.base_height; + if (newwidth == 0) + newwidth = wattr.width - szHint.base_width; + if (newheight == 0) + newheight = wattr.height - szHint.base_height; } - if (width != TermWin.width || height != TermWin.height) + if (newwidth != width || newheight != height) { - width += szHint.base_width; - height += szHint.base_height; - resize_all_windows (width, height, 0); + newwidth += szHint.base_width; + newheight += szHint.base_height; + resize_all_windows (newwidth, newheight, 0); } } @@ -1271,18 +1046,18 @@ void rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) { - fg = pix_colors[Color_fg]; - bg = pix_colors[Color_bg]; + fg = pix_colors [Color_fg]; + bg = pix_colors [Color_bg]; } void rxvt_term::im_set_size (XRectangle &size) { // 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; + size.x = int_bwidth; + size.y = int_bwidth; + size.width = Width2Pixel (ncol) + int_bwidth; + size.height = Height2Pixel (nrow) + int_bwidth; } void @@ -1292,13 +1067,13 @@ { 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; + 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 (TermWin.ncol) + 1; - status_rect.height = TermWin.fheight; + status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1; + status_rect.height = fheight; } /* Checking whether input method is running. */ @@ -1319,8 +1094,8 @@ if ((p = strchr (server + 1, '@')) != NULL) /* 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; @@ -1336,8 +1111,8 @@ XVaNestedList preedit_attr; if (!Input_Context - || !TermWin.focus - || !(input_style & XIMPreeditPosition)) + || !focus + || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks))) return; im_set_position (nspot); @@ -1367,6 +1142,80 @@ Input_Context = 0; } +#ifdef ENABLE_XIM_ONTHESPOT + +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)); +} + +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)); +} + +static void +xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data) +{ + rxvt_term *term = (rxvt_term *)client_data; + XIMText *text = call_data->text; + + term->make_current (); + + if (text) + { + void *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) * sizeof (wchar_t)); + mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); + + if (term->rs[Rs_imLocale]) + SET_LOCALE (term->locale); + } + else + str = (void *)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 * open a suitable preedit type @@ -1382,11 +1231,15 @@ const char *p; char **s; XIMStyles *xim_styles; +#ifdef ENABLE_XIM_ONTHESPOT + XIMCallback xcb[4]; +#endif + + 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; @@ -1416,13 +1269,19 @@ for (i = found = 0; !found && s[i]; i++) { if (!strcmp (s[i], "OverTheSpot")) - input_style = (XIMPreeditPosition | XIMStatusNothing); + input_style = XIMPreeditPosition | XIMStatusNothing; else if (!strcmp (s[i], "OffTheSpot")) - input_style = (XIMPreeditArea | XIMStatusArea); + input_style = XIMPreeditArea | XIMStatusArea; else if (!strcmp (s[i], "Root")) - input_style = (XIMPreeditNothing | XIMStatusNothing); + input_style = XIMPreeditNothing | XIMStatusNothing; else if (!strcmp (s[i], "None")) - input_style = (XIMPreeditNone | XIMStatusNone); + 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]) @@ -1466,11 +1325,11 @@ "-*-*-*-R-*-*-%d-*-*-*-*-*-*," "-*-*-*-R-*-*-%d-*-*-*-*-*-*," "*", - TermWin.fheight, - TermWin.fheight + 1, TermWin.fheight - 1, - TermWin.fheight - 2, TermWin.fheight + 2); + fheight, + fheight + 1, fheight - 1, + fheight - 2, fheight + 2); - fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, + fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat, &missing_charset_list, &missing_charset_count, &def_string); if (missing_charset_list) @@ -1521,19 +1380,42 @@ XNFontSet, fs, NULL); } +#if ENABLE_XIM_ONTHESPOT + else if (input_style & XIMPreeditCallbacks) + { + im_set_position (spot); + + 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, TermWin.vt, - XNFocusWindow, TermWin.parent[0], + 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 (display->display, fs); + if (status_attr) XFree (status_attr); + if (fs) XFreeFontSet (dpy, fs); if (Input_Context == NULL) { @@ -1542,26 +1424,29 @@ 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]; - SET_R (this); + make_current (); im_destroy (); - D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); if (Input_Context) return; @@ -1613,38 +1498,115 @@ } void -rxvt_term::IMSetStatusPosition () +rxvt_term::IMSetPosition () { XRectangle preedit_rect, status_rect, *needed_rect; XVaNestedList preedit_attr, status_attr; if (!Input_Context - || !TermWin.focus - || !(input_style & XIMPreeditArea) + || !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); - - 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); + 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); +/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/ +} + +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 +# if TRACE_PIXMAPS +# undef update_background +void +rxvt_term::trace_update_background (const char *file, int line) +{ + fprintf (stderr, "%s:%d:update_background()\n", file, line); + update_background (); +} +# endif + +void +rxvt_term::update_background () +{ + if (update_background_ev.is_active ()) + return; + + bgPixmap.invalidate (); - XFree (preedit_attr); - XFree (status_attr); + ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); + + if (to_wait <= 0.) + bgPixmap.render (); + else + update_background_ev.start (to_wait); } -#endif /* USE_XIM */ -/*----------------------------------------------------------------------*/ -rxvt_t rxvt_current_term; +void +rxvt_term::update_background_cb (ev::timer &w, int revents) +{ + make_current (); + + update_background_ev.stop (); + bgPixmap.render (); + refresh_check (); +} + +#endif /* HAVE_BG_PIXMAP */ /*----------------------- end-of-file (C source) -----------------------*/