--- rxvt-unicode/src/main.C 2003/12/16 23:04:13 1.12 +++ rxvt-unicode/src/main.C 2004/03/28 02:07:08 1.60 @@ -1,7 +1,6 @@ -/*--------------------------------*-C-*---------------------------------* +/*--------------------------------*-C-*---------------------------------*; * File: main.c *----------------------------------------------------------------------* - * $Id: main.C,v 1.12 2003/12/16 23:04:13 pcg Exp $ * * All portions of code are copyright by their respective author/s. * Copyright (c) 1992 John Bovey, University of Kent at Canterbury @@ -14,6 +13,7 @@ * Copyright (c) 1997,1998 Oezguer Kesim * Copyright (c) 1998-2001 Geoff Wing * - extensive modifications + * Copyright (c) 2003-2004 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 @@ -44,6 +44,84 @@ # include #endif +#include + +static char curlocale[128]; + +void +rxvt_set_locale (const char *locale) +{ + if (locale && STRNCMP (locale, curlocale, 128)) + { + STRNCPY (curlocale, locale, 128); + setlocale (LC_CTYPE, curlocale); + } +} + +#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]; + while (cc) + { + if (cc->c2 == c2) return c1; + cc = (*this)[cc->c1]; + } + + // check to see wether this combination already exists otherwise + for (cc = v.end (); cc-- > v.begin (); ) + { + if (cc->c1 == c1 && cc->c2 == c2) + return COMPOSE_LO + (cc - v.begin ()); + } + + // allocate a new combination + if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) + { + static int seen; + + if (!seen++) + fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); + + return REPLACEMENT_CHAR; + } + + v.push_back (compose_char (c1, c2)); + + return v.size () - 1 + COMPOSE_LO; +} + +int rxvt_composite_vec::expand (unicode_t c, wchar_t *r) +{ + compose_char *cc = (*this)[c]; + + if (!cc) + { + if (r) *r = c; + return 1; + } + + int len = expand (cc->c1, r); + + if (r) r += len; + + if (cc->c2 != NOCHAR) + { + len++; + if (r) *r++ = cc->c2; + } + + return len; + +} +#endif + void * rxvt_term::operator new (size_t s) { @@ -60,56 +138,148 @@ } rxvt_term::rxvt_term () -: pty_ev (this, &rxvt_term::pty_cb), + : + 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), +#endif #ifdef CURSOR_BLINK - blink_ev (this, &rxvt_term::blink_cb), + 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), + pointer_ev (this, &rxvt_term::pointer_cb), #endif - x_ev (this, &rxvt_term::x_cb), - destroy_ev (this, &rxvt_term::destroy_cb), - check_ev (this, &rxvt_term::check_cb), - incr_ev (this, &rxvt_term::incr_cb) +#ifdef USE_XIM + im_ev (this, &rxvt_term::im_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) { cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; } rxvt_term::~rxvt_term () { - rxvt_scr_release (this); + if (cmd_fd >= 0) + close (cmd_fd); #ifndef NO_SETOWNER_TTYDEV - rxvt_privileged_ttydev (this, RESTORE); + privileged_ttydev (RESTORE); #endif #ifdef UTMP_SUPPORT - rxvt_privileged_utmp (this, RESTORE); + privileged_utmp (RESTORE); #endif -#ifdef USE_XIM - if (Input_Context != NULL) + + delete TermWin.fontset; + + if (display) { - XDestroyIC (Input_Context); - Input_Context = NULL; - } -#endif + selection_clear (); - if (cmd_fd >= 0) - close (cmd_fd); +#ifdef MENUBAR + if (menubarGC) XFreeGC (display->display, menubarGC); +#endif +#ifdef XTERM_SCROLLBAR + if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); + if (ShadowGC) XFreeGC (display->display, ShadowGC); +#endif +#ifdef PLAIN_SCROLLBAR + if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); +#endif +#ifdef NEXT_SCROLLBAR + if (blackGC) XFreeGC (display->display, blackGC); + if (whiteGC) XFreeGC (display->display, whiteGC); + if (grayGC) XFreeGC (display->display, grayGC); + if (darkGC) XFreeGC (display->display, darkGC); + if (stippleGC) XFreeGC (display->display, stippleGC); + if (dimple) XFreePixmap (display->display, dimple); + if (upArrow) XFreePixmap (display->display, upArrow); + if (downArrow) XFreePixmap (display->display, downArrow); + if (upArrowHi) XFreePixmap (display->display, upArrowHi); + if (downArrowHi) XFreePixmap (display->display, downArrowHi); +#endif +#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) + if (topShadowGC) XFreeGC (display->display, topShadowGC); + if (botShadowGC) XFreeGC (display->display, botShadowGC); + if (scrollbarGC) XFreeGC (display->display, scrollbarGC); +#endif + if (TermWin.gc) XFreeGC (display->display, TermWin.gc); + +#if defined(MENUBAR) && (MENUBAR_MAX > 1) + delete menuBar.drawable; + //if (menuBar.win) + // XDestroyWindow (display->display, menuBar.win); +#endif + delete TermWin.drawable; + // destroy all windows + if (TermWin.parent[0]) + XDestroyWindow (display->display, TermWin.parent[0]); + } - if (Xfd >= 0) - XCloseDisplay (Xdisplay); + // TODO: free pixcolours, colours should become part of rxvt_display delete PixColors; + + displays.put (display); + + scr_release (); + + /* clear all resources */ + for (int i = 0; i < allocated.size (); i++) + free (allocated[i]); + + free (selection.text); + // TODO: manage env vars in child only(!) + free (env_windowid); + free (env_display); + free (env_term); + free (env_colorfgbg); + free (locale); +#if 0 + free (codeset); +#endif + + delete envv; + delete argv; } void rxvt_term::destroy () { + if (display) + { + rootwin_ev.stop (display); + termwin_ev.stop (display); + vt_ev.stop (display); +#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 + } + check_ev.stop (); pty_ev.stop (); - x_ev.stop (); #ifdef CURSOR_BLINK - blink_ev.stop (); + cursor_blink_ev.stop (); +#endif +#ifdef TEXT_BLINK + text_blink_ev.stop (); #endif #ifdef POINTER_BLANK pointer_ev.stop (); @@ -127,57 +297,14 @@ } /*----------------------------------------------------------------------*/ -/* rxvt_init() */ -/* LIBPROTO */ -rxvt_t -rxvt_init (int argc, const char *const *argv) -{ - SET_R (new rxvt_term); - dR; - - if (!R->init_vars () || !R->init (argc, argv)) - { - delete R; - return NULL; - } - - return R; -} - -/* EXTPROTO */ -void -rxvt_init_signals () -{ -/* install exit handler for cleanup */ -#if 0 -#ifdef HAVE_ATEXIT - atexit(rxvt_clean_exit); -#else -#endif -#endif - - struct sigaction sa; - - 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); - -/* need to trap SIGURG for SVR4 (Unixware) rlogin */ -/* signal (SIGURG, SIG_DFL); */ - - XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); - //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); -} - +/* rxvt_init () */ bool rxvt_term::init (int argc, const char *const *argv) { - dR;//TODO (scrollbar, setidle) + SET_R (this); + + if (!init_vars ()) + return false; /* * Save and then give up any super-user privileges @@ -186,67 +313,94 @@ * 1. write utmp entries on some systems * 2. chown tty on some systems */ - rxvt_privileges (this, SAVE); - rxvt_privileges (this, IGNORE); + privileges (SAVE); + privileges (IGNORE); - rxvt_init_secondary (this); + init_secondary (); - const char **cmd_argv = rxvt_init_resources (this, argc, argv); + const char **cmd_argv = init_resources (argc, argv); -#if (MENUBAR_MAX) - rxvt_menubar_read (this, rs[Rs_menu]); + set_locale (""); + +#if MENUBAR_MAX + menubar_read (rs[Rs_menu]); #endif #ifdef HAVE_SCROLLBARS if (Options & Opt_scrollBar) - scrollbar_setIdle (); /* set existence for size calculations */ + scrollBar.setIdle (); /* set existence for size calculations */ #endif - rxvt_Create_Windows (this, argc, argv); + create_windows (argc, argv); - rxvt_init_xlocale (this); + init_xlocale (); - rxvt_scr_reset (this); /* initialize screen */ -#ifdef RXVT_GRAPHICS - rxvt_Gr_reset (this); /* reset graphics */ -#endif + scr_reset (); /* initialize screen */ #if 0 -#ifdef DEBUG_X - XSynchronize(Xdisplay, True); -#endif + XSynchronize (display->display, True); #endif #ifdef HAVE_SCROLLBARS if (Options & Opt_scrollBar) - rxvt_Resize_scrollBar (this); /* create and map scrollbar */ + resize_scrollbar (); /* create and map scrollbar */ #endif #if (MENUBAR_MAX) - if (menubar_visible(r)) - XMapWindow (Xdisplay, menuBar.win); + if (menubar_visible ()) + XMapWindow (display->display, menuBar.win); #endif #ifdef TRANSPARENT if (Options & Opt_transparent) { - XSelectInput (Xdisplay, Xroot, PropertyChangeMask); - rxvt_check_our_parents (this); + XSelectInput (display->display, display->root, PropertyChangeMask); + check_our_parents (); } #endif - XMapWindow (Xdisplay, TermWin.vt); - XMapWindow (Xdisplay, TermWin.parent[0]); - rxvt_init_env (this); - rxvt_init_command (this, cmd_argv); + rootwin_ev.start (display, display->root); + + XMapWindow (display->display, TermWin.vt); + XMapWindow (display->display, TermWin.parent[0]); + + init_command (cmd_argv); - x_ev.start (Xfd, EVENT_READ); pty_ev.start (cmd_fd, EVENT_READ); check_ev.start (); - process_x_events (); - return true; } +static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); + +void +rxvt_init_signals () +{ + /* install exit handler for cleanup */ +#if 0 +#ifdef HAVE_ATEXIT + atexit (rxvt_clean_exit); +#else +#endif +#endif + + struct sigaction sa; + + 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); + + /* need to trap SIGURG for SVR4 (Unixware) rlogin */ + /* signal (SIGURG, SIG_DFL); */ + + old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); + //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); +} + /* ------------------------------------------------------------------------- * * SIGNAL HANDLING & EXIT HANDLER * * ------------------------------------------------------------------------- */ @@ -256,16 +410,16 @@ /* ARGSUSED */ /* EXTPROTO */ RETSIGTYPE -rxvt_Child_signal(int sig __attribute__ ((unused))) +rxvt_Child_signal (int sig __attribute__ ((unused))) { - int pid, save_errno = errno; - while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) - ; - errno = save_errno; + int pid, save_errno = errno; + while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) + ; + errno = save_errno; #if 0 - if (pid == R->cmd_pid) - exit (EXIT_SUCCESS); + if (pid == cmd_pid) + exit (EXIT_SUCCESS); #endif } @@ -274,33 +428,26 @@ */ /* EXTPROTO */ RETSIGTYPE -rxvt_Exit_signal(int sig) +rxvt_Exit_signal (int sig) { - signal(sig, SIG_DFL); + signal (sig, SIG_DFL); #ifdef DEBUG_CMD - rxvt_print_error("signal %d", sig); + rxvt_warn ("caught signal %d, exiting.\n", sig); #endif - rxvt_clean_exit(); - kill(getpid(), sig); + rxvt_clean_exit (); + kill (getpid (), sig); } -/* ARGSUSED */ /* INTPROTO */ int -rxvt_xerror_handler(const Display * display - __attribute__ ((unused)), const XErrorEvent * event) +rxvt_xerror_handler (Display *display, XErrorEvent *event) { - dR; - - if (R->allowedxerror == -1) - R->allowedxerror = event->error_code; + if (GET_R->allowedxerror == -1) + GET_R->allowedxerror = event->error_code; else { - rxvt_print_error("XError: Request: %d . %d, Error: %d", - event->request_code, event->minor_code, - event->error_code); - - R->destroy (); + old_xerror_handler (display, event); + GET_R->destroy (); } return 0; @@ -315,9 +462,9 @@ void rxvt_clean_exit () { - dR; - - R->destroy (); + // TODO: rxvtd should clean up all ressources + if (GET_R) + GET_R->destroy (); } /* ------------------------------------------------------------------------- * @@ -325,98 +472,99 @@ * ------------------------------------------------------------------------- */ /* EXTPROTO */ void * -rxvt_malloc(size_t size) +rxvt_malloc (size_t size) { - void *p; + void *p; - p = malloc(size); - if (p) - return p; - - fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); - rxvt_clean_exit(); - exit(EXIT_FAILURE); -/* NOTREACHED */ + p = malloc (size); + if (p) + return p; + + fprintf (stderr, RESNAME ": memory allocation failure. Aborting"); + rxvt_clean_exit (); + exit (EXIT_FAILURE); + /* NOTREACHED */ } /* EXTPROTO */ void * -rxvt_calloc(size_t number, size_t size) +rxvt_calloc (size_t number, size_t size) { - void *p; + 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 */ + p = calloc (number, size); + if (p) + return p; + + fprintf (stderr, RESNAME ": memory allocation failure. Aborting"); + rxvt_clean_exit (); + exit (EXIT_FAILURE); + /* NOTREACHED */ } /* EXTPROTO */ void * -rxvt_realloc(void *ptr, size_t size) +rxvt_realloc (void *ptr, size_t size) { - void *p; + void *p; - 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 */ + 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 */ } /* ------------------------------------------------------------------------- * * PRIVILEGED OPERATIONS * * ------------------------------------------------------------------------- */ /* take care of suid/sgid super-user (root) privileges */ -/* INTPROTO */ void -rxvt_privileges(pR_ int mode) +rxvt_term::privileges (int mode) { #if ! defined(__CYGWIN32__) # if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) -/* setreuid() is the poor man's setuid(), seteuid() */ + /* 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 (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()); + 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: - R->euid = geteuid(); - R->egid = getegid(); + case SAVE: + euid = geteuid (); + egid = getegid (); break; - case RESTORE: - seteuid(R->euid); - setegid(R->egid); + case RESTORE: + seteuid (euid); + setegid (egid); break; } # else - switch (mode) { - case IGNORE: - setuid(getuid()); - setgid(getgid()); - /* FALLTHROUGH */ - case SAVE: - /* FALLTHROUGH */ - case RESTORE: + switch (mode) + { + case IGNORE: + setuid (getuid ()); + setgid (getgid ()); + /* FALLTHROUGH */ + case SAVE: + /* FALLTHROUGH */ + case RESTORE: break; } # endif @@ -424,79 +572,86 @@ } #ifdef UTMP_SUPPORT -/* EXTPROTO */ void -rxvt_privileged_utmp(pR_ char action) +rxvt_term::privileged_utmp (char action) { - D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", - action, R->next_utmp_action, getpid())); - if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) - || (R->Options & Opt_utmpInhibit) - || R->ttydev == NULL || *R->ttydev == '\0') - return; - - rxvt_privileges(aR_ RESTORE); - if (action == SAVE) { - R->next_utmp_action = RESTORE; - rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); - } else { /* action == RESTORE */ - R->next_utmp_action = IGNORE; - rxvt_cleanutent(aR); + 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 (); } - rxvt_privileges(aR_ IGNORE); + privileges (IGNORE); } #endif #ifndef NO_SETOWNER_TTYDEV -/* EXTPROTO */ void -rxvt_privileged_ttydev(pR_ char action) +rxvt_term::privileged_ttydev (char action) { - D_MAIN((stderr, - "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", - action, R->next_tty_action, getpid())); - if (R->next_tty_action != action || (action != SAVE && action != RESTORE) - || R->ttydev == NULL || *R->ttydev == '\0') - return; + 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; - rxvt_privileges(aR_ RESTORE); + privileges (RESTORE); - if (action == SAVE) { - R->next_tty_action = 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(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ - R->next_tty_action = IGNORE; - else + /* 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(R->ttydev, getuid(), R->ttygid); /* fail silently */ - chmod(R->ttydev, R->ttymode); + chown (ttydev, getuid (), ttygid); /* fail silently */ + chmod (ttydev, ttymode); # ifdef HAVE_REVOKE - revoke(R->ttydev); + revoke (ttydev); # endif + } - } else { /* action == RESTORE */ - R->next_tty_action = IGNORE; + } + else + { /* action == RESTORE */ + next_tty_action = IGNORE; # ifndef RESET_TTY_TO_COMMON_DEFAULTS - chmod(R->ttydev, R->ttyfd_stat.st_mode); - chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); + chmod (ttydev, ttyfd_stat.st_mode); + chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid); # else - chmod(R->ttydev, - (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); - chown(R->ttydev, 0, 0); + chmod (ttydev, + (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); + chown (ttydev, 0, 0); # endif + } - rxvt_privileges(aR_ IGNORE); + 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"), R->ttydev, - R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, - R->ttyfd_stat.st_gid)); + 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 } #endif @@ -506,112 +661,127 @@ * window size/position calculcations for XSizeHint and other storage. * if width/height are non-zero then override calculated width/height */ -/* EXTPROTO */ void -rxvt_window_calc(pR_ unsigned int width, unsigned int height) +rxvt_term::window_calc (unsigned int width, unsigned int height) { - 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", - R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, - R->szHint.height)); - R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; - R->szHint.win_gravity = NorthWestGravity; -/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ - - recalc_x = recalc_y = 0; - flags = 0; - if (!R->parsed_geometry) { - R->parsed_geometry = 1; - if (R->rs[Rs_geometry]) - flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); - if (flags & WidthValue) { - R->TermWin.ncol = BOUND_POSITIVE_INT16(w); - R->szHint.flags |= USSize; + 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)); + 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); + szHint.flags |= USSize; } - if (flags & HeightValue) { - R->TermWin.nrow = BOUND_POSITIVE_INT16(h); - R->szHint.flags |= USSize; + if (flags & HeightValue) + { + TermWin.nrow = BOUND_POSITIVE_INT16 (h); + szHint.flags |= USSize; } - if (flags & XValue) { - R->szHint.x = x; - R->szHint.flags |= USPosition; - if (flags & XNegative) { - recalc_x = 1; - R->szHint.win_gravity = NorthEastGravity; + if (flags & XValue) + { + szHint.x = x; + szHint.flags |= USPosition; + if (flags & XNegative) + { + recalc_x = 1; + szHint.win_gravity = NorthEastGravity; } } - if (flags & YValue) { - R->szHint.y = y; - R->szHint.flags |= USPosition; - if (flags & YNegative) { - recalc_y = 1; - if (R->szHint.win_gravity == NorthEastGravity) - R->szHint.win_gravity = SouthEastGravity; - else - R->szHint.win_gravity = SouthWestGravity; + 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 + szHint.win_gravity = SouthWestGravity; } } } -/* TODO: BOUNDS */ - R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; - R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; - max_width = MAX_COLS * R->TermWin.fwidth; - max_height = MAX_ROWS * R->TermWin.fheight; - - R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; - - sb_w = mb_h = 0; - R->window_vt_x = R->window_vt_y = 0; - if (scrollbar_visible(R)) { - sb_w = scrollbar_TotalWidth(); - R->szHint.base_width += sb_w; - if (!(R->Options & Opt_scrollBar_right)) - R->window_vt_x = sb_w; - } - if (menubar_visible(R)) { - mb_h = menuBar_TotalHeight(); - R->szHint.base_height += mb_h; - R->window_vt_y = mb_h; - } - R->szHint.width_inc = R->TermWin.fwidth; - R->szHint.height_inc = R->TermWin.fheight; - R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; - R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; - - if (width && width - R->szHint.base_width < max_width) { - R->szHint.width = width; - R->TermWin.width = width - R->szHint.base_width; - } else { - MIN_IT(R->TermWin.width, max_width); - R->szHint.width = R->szHint.base_width + R->TermWin.width; - } - if (height && height - R->szHint.base_height < max_height) { - R->szHint.height = height; - R->TermWin.height = height - R->szHint.base_height; - } else { - MIN_IT(R->TermWin.height, max_height); - R->szHint.height = R->szHint.base_height + R->TermWin.height; - } - if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) - R->window_sb_x = R->szHint.width - sb_w; - - if (recalc_x) - R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) - - R->szHint.width - 2 * R->TermWin.ext_bwidth); - if (recalc_y) - R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) - - R->szHint.height - 2 * R->TermWin.ext_bwidth); - - R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; - R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; - D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", - R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, - R->szHint.height)); - return; + + /* 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 ()) + { + sb_w = scrollbar_TotalWidth (); + 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; + } + szHint.width_inc = TermWin.fwidth; + szHint.height_inc = TermWin.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) + { + szHint.width = width; + TermWin.width = width - szHint.base_width; + } + else + { + MIN_IT (TermWin.width, max_width); + szHint.width = szHint.base_width + TermWin.width; + } + if (height && height - szHint.base_height < max_height) + { + szHint.height = height; + TermWin.height = height - szHint.base_height; + } + else + { + MIN_IT (TermWin.height, max_height); + szHint.height = szHint.base_height + TermWin.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); + if (recalc_y) + szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) + - szHint.height - 2 * TermWin.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; } /*----------------------------------------------------------------------*/ @@ -622,7 +792,7 @@ void rxvt_term::tt_winch () { - struct winsize ws; + struct winsize ws; if (cmd_fd < 0) return; @@ -634,7 +804,7 @@ (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)); + 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); @@ -643,144 +813,180 @@ } /*----------------------------------------------------------------------*/ -/* rxvt_change_font() - Switch to a new font */ +/* rxvt_change_font () - Switch to a new font */ /* * init = 1 - initialize * * fontname == FONT_UP - switch to bigger font * fontname == FONT_DN - switch to smaller font */ -/* EXTPROTO */ -void -rxvt_change_font(pR_ int init, const char *fontname) +bool +rxvt_term::change_font (const char *fontname) { + if (fontname == FONT_UP) + { + // TODO + } + else if (fontname == FONT_DN) + { + // TODO + } + else + { + rxvt_fontset *fs = new rxvt_fontset (this); + + if (fs && fs->populate (fontname ? fontname : "fixed")) + { + delete TermWin.fontset; + TermWin.fontset = fs; + TermWin.fwidth = fs->base_font ()->width; + TermWin.fheight = fs->base_font ()->height; + TermWin.fbase = fs->base_font ()->ascent; + + if (TermWin.parent[0]) + { + resize_all_windows (0, 0, 0); + scr_remap_chars (); + scr_touch (true); + } + + return true; + } + } + + return false; } -/* INTPROTO */ -void -rxvt_font_up_down(pR_ int n, int direction) +bool +rxvt_term::font_up_down (int n, int direction) { + return false; } /*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/ /* xterm sequences - title, iconName, color (exptl) */ -/* EXTPROTO */ void -rxvt_set_title(pR_ const char *str) +rxvt_term::set_title (const char *str) { #ifndef SMART_WINDOW_TITLE - XStoreName(R->Xdisplay, R->TermWin.parent[0], str); + XStoreName (display->display, TermWin.parent[0], str); #else - char *name; + char *name; - if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) - name = NULL; - if (name == NULL || STRCMP(name, str)) - XStoreName(R->Xdisplay, R->TermWin.parent[0], str); - if (name) - XFree(name); + if (!XFetchName (display->display, TermWin.parent[0], &name)) + name = NULL; + + if (name == NULL || STRCMP (name, str)) + XStoreName (display->display, TermWin.parent[0], str); + + if (name) + XFree (name); #endif } -/* EXTPROTO */ void -rxvt_set_iconName(pR_ const char *str) +rxvt_term::set_icon_name (const char *str) { #ifndef SMART_WINDOW_TITLE - XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); + XSetIconName (display->display, TermWin.parent[0], str); #else - char *name; + 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 (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) - name = NULL; - if (name == NULL || STRCMP(name, str)) - XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); - if (name) - XFree(name); + if (name) + XFree (name); #endif } #ifdef XTERM_COLOR_CHANGE -/* EXTPROTO */ void -rxvt_set_window_color(pR_ int idx, const char *color) +rxvt_term::set_window_color (int idx, const char *color) { - rxvt_color xcol; - int i; + rxvt_color xcol; + int i; - if (color == NULL || *color == '\0') - return; + if (color == NULL || *color == '\0') + return; -/* handle color aliases */ - if (isdigit(*color)) { - i = atoi(color); - if (i >= 8 && i <= 15) { /* bright colors */ - i -= 8; + /* handle color aliases */ + if (isdigit (*color)) + { + i = atoi (color); + if (i >= 8 && i <= 15) + { /* bright colors */ + i -= 8; # ifndef NO_BRIGHTCOLOR - R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; - SET_PIXCOLOR(R, idx); - goto Done; + PixColors[idx] = PixColors[minBrightCOLOR + i]; + SET_PIXCOLOR (idx); + goto Done; # endif + } - if (i >= 0 && i <= 7) { /* normal colors */ - R->PixColors[idx] = R->PixColors[minCOLOR + i]; - SET_PIXCOLOR(R, idx); - goto Done; + if (i >= 0 && i <= 7) + { /* normal colors */ + PixColors[idx] = PixColors[minCOLOR + i]; + SET_PIXCOLOR (idx); + goto Done; } } - if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) - return; -/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ + if (!rXParseAllocColor (& xcol, color)) + return; + /* XStoreColor (display->display, XCMAP, XColor*); */ -/* - * FIXME: should free colors here, but no idea how to do it so instead, - * so just keep gobbling up the colormap - */ + /* + * 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 (R->PixColors[idx] == R->PixColors[i]) - break; - if (i > Color_White) { - /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ - XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, - DisplayPlanes(R->Xdisplay, Xscreen)); + 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 - R->PixColors[idx] = xcol; - SET_PIXCOLOR(R, idx); + PixColors[idx] = xcol; + SET_PIXCOLOR (idx); -/* XSetWindowAttributes attr; */ -/* Cursor cursor; */ - Done: - if (idx == Color_bg && !(R->Options & Opt_transparent)) - XSetWindowBackground(R->Xdisplay, R->TermWin.vt, - R->PixColors[Color_bg]); - -/* handle Color_BD, scrollbar background, etc. */ - - rxvt_set_colorfgbg(aR); - rxvt_recolour_cursor(aR); -/* the only reasonable way to enforce a clean update */ - rxvt_scr_poweron(aR); + /* 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. */ + + set_colorfgbg (); + recolour_cursor (); + /* the only reasonable way to enforce a clean update */ + scr_poweron (); } #else -# define rxvt_set_window_color(aR_ idx,color) ((void)0) +# define set_window_color (idx,color) ((void)0) #endif /* XTERM_COLOR_CHANGE */ -/* EXTPROTO */ void -rxvt_recolour_cursor(pR) +rxvt_term::recolour_cursor () { - rxvt_color xcol[2]; - #if TODO - xcol[0] = R->PixColors[Color_pointer]; - xcol[1] = R->PixColors[Color_bg]; - XQueryColors(R->Xdisplay, XCMAP, xcol, 2); - XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); + rxvt_color xcol[2]; + + 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 } @@ -788,41 +994,43 @@ /* * find if fg/bg matches any of the normal (low-intensity) colors */ -/* INTPROTO */ void -rxvt_set_colorfgbg(pR) +rxvt_term::set_colorfgbg () { - unsigned int i; - const char *xpmb = "\0"; - char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; - - R->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 (R->PixColors[Color_fg] == R->PixColors[i]) { - sprintf(fstr, "%d", (i - Color_Black)); - break; - } - for (i = Color_Black; i <= Color_White; i++) - if (R->PixColors[Color_bg] == R->PixColors[i]) { - sprintf(bstr, "%d", (i - Color_Black)); + 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]) + { + sprintf (fstr, "%d", (i - Color_Black)); + break; + } + for (i = Color_Black; i <= Color_White; i++) + if (PixColors[Color_bg] == PixColors[i]) + { + sprintf (bstr, "%d", (i - Color_Black)); #ifdef XPM_BACKGROUND - xpmb = "default;"; + xpmb = "default;"; #endif - break; - } - sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); - putenv(R->env_colorfgbg); + break; + } + + sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); #ifndef NO_BRIGHTCOLOR - R->colorfgbg = DEFAULT_RSTYLE; - for (i = minCOLOR; i <= maxCOLOR; i++) { - if (R->PixColors[Color_fg] == R->PixColors[i]) - R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); - if (R->PixColors[Color_bg] == R->PixColors[i]) - R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); + 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 } @@ -833,127 +1041,136 @@ * Hans de Goede */ -/* EXTPROTO */ int -rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) +rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) { - screen_in_out->set(aR_ colour); - - if (!screen_in_out->set(aR_ colour)) { - rxvt_print_error("can't allocate colour: %s", colour); - return false; + if (!screen_in_out->set (display, colour)) + { + rxvt_warn ("can't get colour '%s', continuing without.\n", colour); + return false; } - return true; + return true; } /* -------------------------------------------------------------------- * * - WINDOW RESIZING - * * -------------------------------------------------------------------- */ -/* EXTPROTO */ void -rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, - int ignoreparent) +rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) { - int fix_screen; + int fix_screen; #ifdef SMART_RESIZE - int old_width = R->szHint.width, old_height = R->szHint.height; + int old_width = szHint.width, old_height = szHint.height; #endif - rxvt_window_calc(aR_ width, height); - XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); - if (!ignoreparent) { + window_calc (width, height); + XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); + if (!ignoreparent) + { #ifdef SMART_RESIZE -/* - * resize by Marius Gedminas - * reposition window on resize depending on placement on screen - */ - int x, y, x1, y1; - int dx, dy; - unsigned int unused_w1, unused_h1, unused_b1, unused_d1; - Window unused_cr; - - XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, - 0, 0, &x, &y, &unused_cr); - XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, - &unused_w1, &unused_h1, &unused_b1, &unused_d1); - /* - * if Xroot isn't the parent window, a WM will probably have offset - * our position for handles and decorations. Counter it - */ - if (x1 != x || y1 != y) { - x -= x1; - y -= y1; + /* + * resize by Marius Gedminas + * reposition window on resize depending on placement on screen + */ + int x, y, x1, y1; + int dx, dy; + unsigned int unused_w1, unused_h1, unused_b1, unused_d1; + Window unused_cr; + + XTranslateCoordinates (display->display, TermWin.parent[0], display->root, + 0, 0, &x, &y, &unused_cr); + XGetGeometry (display->display, TermWin.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 + * our position for handles and decorations. Counter it + */ + if (x1 != x || y1 != y) + { + x -= x1; + y -= y1; } - x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; - y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; - dx = old_width - R->szHint.width; - dy = old_height - R->szHint.height; - - /* Check position of the center of the window */ - if (x < x1) /* left half */ - dx = 0; - else if (x == x1) /* exact center */ - dx /= 2; - if (y < y1) /* top half */ - dy = 0; - else if (y == y1) /* exact center */ - dy /= 2; + x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; + y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; + dx = old_width - szHint.width; + dy = old_height - szHint.height; + + /* Check position of the center of the window */ + if (x < x1) /* left half */ + dx = 0; + else if (x == x1) /* exact center */ + dx /= 2; + if (y < y1) /* top half */ + dy = 0; + else if (y == y1) /* exact center */ + dy /= 2; - XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, - R->szHint.width, R->szHint.height); + XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, + szHint.width, szHint.height); #else - XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, - R->szHint.height); + XResizeWindow (display->display, TermWin.parent[0], szHint.width, + szHint.height); #endif + } - fix_screen = (R->TermWin.ncol != R->prev_ncol - || R->TermWin.nrow != R->prev_nrow); - if (fix_screen || width != R->old_width || height != R->old_height) { - if (scrollbar_visible(R)) { - XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, - 0, scrollbar_TotalWidth(), R->szHint.height); - rxvt_Resize_scrollBar(aR); + fix_screen = (TermWin.ncol != prev_ncol + || TermWin.nrow != prev_nrow); + + if (fix_screen || width != old_width || height != old_height) + { + if (scrollbar_visible ()) + { + XMoveResizeWindow (display->display, scrollBar.win, window_sb_x, + 0, scrollbar_TotalWidth (), szHint.height); + resize_scrollbar (); } - if (menubar_visible(R)) - XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, - 0, TermWin_TotalWidth(), menuBar_TotalHeight()); - XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, - R->window_vt_y, TermWin_TotalWidth(), - TermWin_TotalHeight()); -#ifdef RXVT_GRAPHICS - if (R->old_height) - rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width, - R->old_height - R->szHint.base_height); -#endif - rxvt_scr_clear(aR); + + 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 ()); + scr_clear (height != old_height); #ifdef XPM_BACKGROUND - rxvt_resize_pixmap(aR); + resize_pixmap (); #endif + } - if (fix_screen || R->old_height == 0) { - int curr_screen = -1; - uint16_t old_ncol = R->prev_ncol; + 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 only works on the primary screen */ - if (R->old_height) /* this is not the first time through */ - curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); - rxvt_scr_reset(aR); - if (curr_screen >= 0) { /* this is not the first time through */ - rxvt_scr_change_screen(aR_ curr_screen); - rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0)); + if (curr_screen >= 0) /* this is not the first time through */ + { + scr_change_screen (curr_screen); + selection_check (old_ncol != TermWin.ncol ? 4 : 0); } } - R->old_width = R->szHint.width; - R->old_height = R->szHint.height; + old_width = szHint.width; + old_height = szHint.height; #ifdef USE_XIM - rxvt_IMSetStatusPosition(aR); + IMSetStatusPosition (); #endif } @@ -961,23 +1178,24 @@ * Set the width/height of the vt window in characters. Units are pixels. * good for toggling 80/132 columns */ -/* EXTPROTO */ void -rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) +rxvt_term::set_widthheight (unsigned int width, unsigned int height) { - XWindowAttributes wattr; + XWindowAttributes wattr; - if (width == 0 || height == 0) { - XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); - if (width == 0) - width = wattr.width - R->szHint.base_width; - if (height == 0) - height = wattr.height - R->szHint.base_height; - } - if (width != R->TermWin.width || height != R->TermWin.height) { - width += R->szHint.base_width; - height += R->szHint.base_height; - rxvt_resize_all_windows(aR_ width, height, 0); + if (width == 0 || height == 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); } } @@ -985,153 +1203,258 @@ * - X INPUT METHOD ROUTINES - * * -------------------------------------------------------------------- */ #ifdef USE_XIM -/* INTPROTO */ + void -rxvt_setSize(pR_ XRectangle * size) +rxvt_term::im_set_size (XRectangle *size) { - size->x = R->TermWin.int_bwidth; - size->y = R->TermWin.int_bwidth; - size->width = Width2Pixel(R->TermWin.ncol); - size->height = Height2Pixel(R->TermWin.nrow); + size->x = TermWin.int_bwidth; + size->y = TermWin.int_bwidth; + size->width = Width2Pixel (TermWin.ncol); + size->height = Height2Pixel (TermWin.nrow); } -/* INTPROTO */ void -rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) +rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) { - *fg = R->PixColors[Color_fg]; - *bg = R->PixColors[Color_bg]; + *fg = PixColors[Color_fg]; + *bg = PixColors[Color_bg]; } /* Checking whether input method is running. */ -/* INTPROTO */ -Bool -rxvt_IMisRunning(pR) +bool +rxvt_term::IMisRunning () { - 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 */ - *p = '\0'; - - atom = XInternAtom(R->Xdisplay, server, False); - win = XGetSelectionOwner(R->Xdisplay, atom); - if (win != None) - return True; + 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 */ + *p = '\0'; + + atom = XInternAtom (display->display, server, False); + win = XGetSelectionOwner (display->display, atom); + if (win != None) + return True; } - return False; + return False; } -/* EXTPROTO */ void -rxvt_IMSendSpot(pR) +rxvt_term::IMSendSpot () { - XPoint spot; - XVaNestedList preedit_attr; + XPoint spot; + XVaNestedList preedit_attr; - if (R->Input_Context == NULL - || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) - || !(R->event_type == KeyPress - || R->event_type == Expose - || R->event_type == NoExpose - || R->event_type == SelectionNotify - || R->event_type == ButtonRelease || R->event_type == FocusIn) - || !rxvt_IMisRunning(aR)) - return; - - rxvt_setPosition(aR_ & spot); - - preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); - XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); - XFree(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 ()) + return; -/* EXTPROTO */ -void -rxvt_setTermFontSet(pR_ int idx) -{ - char *string; - long length; - int success = 0; + im_set_position (&spot); - if (idx < 0 || idx >= MAX_NFONTS) - return; + preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); + XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); + XFree (preedit_attr); } -/* INTPROTO */ void -rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect, - XRectangle * needed_rect) +rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, + XRectangle * needed_rect) { - int mbh, vtx = 0; + int mbh, vtx = 0; + + if (scrollbar_visible () && ! (Options & Opt_scrollBar_right)) + vtx = scrollbar_TotalWidth (); - if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right)) - vtx = scrollbar_TotalWidth(); - mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0; - mbh -= R->TermWin.lineSpace; + mbh = menubar_visible () ? menuBar_TotalHeight () : 0; + mbh -= TermWin.lineSpace; - preedit_rect->x = needed_rect->width + vtx; - preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; + preedit_rect->x = needed_rect->width + vtx; + preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh; - preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width - + vtx; - preedit_rect->height = Height2Pixel(1); + preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx; + preedit_rect->height = Height2Pixel (1); - status_rect->x = vtx; - status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh; + status_rect->x = vtx; + status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh; - status_rect->width = needed_rect->width ? needed_rect->width - : Width2Pixel(R->TermWin.ncol + 1); - status_rect->height = Height2Pixel(1); + status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1); + status_rect->height = Height2Pixel (1); } -/* ARGSUSED */ -/* INTPROTO */ void -rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data - __attribute__ ((unused)), XPointer call_data - __attribute__ ((unused))) -{ - dR; - - R->Input_Context = NULL; -/* To avoid Segmentation Fault in C locale: Solaris only? */ - if (STRCMP(R->locale, "C")) - XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, - rxvt_IMInstantiateCallback, NULL); +rxvt_term::im_destroy () +{ + if (Input_Context) + { + XDestroyIC (Input_Context); + Input_Context = NULL; + } + + if (input_method) + { + display->put_xim (input_method); + input_method = 0; + } } /* - * X manual pages and include files don't match on some systems: - * some think this is an XIDProc and others an XIMProc so we can't - * use the first argument - need to update this to be nice for - * both types via some sort of configure detection + * Try to open a XIM with the current modifiers, then see if we can + * open a suitable preedit type */ -/* ARGSUSED */ -/* EXTPROTO */ +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; + + 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; + + xim_styles = NULL; + if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) + || !xim_styles || !xim_styles->count_styles) + { + display->put_xim (input_method); + 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; + } + } + + for (i = 0; s[i]; i++) + free (s[i]); + + free (s); + XFree (xim_styles); + + if (!found) + { + display->put_xim (input_method); + return false; + } + + preedit_attr = status_attr = NULL; + + 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); + } + else if (input_style & XIMPreeditArea) + { + 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); + + preedit_attr = XVaCreateNestedList (0, XNArea, &rect, + XNForeground, fg, XNBackground, bg, + //XNFontSet, TermWin.fontset, + 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); + if (preedit_attr) XFree (preedit_attr); + if (status_attr) XFree (status_attr); + + if (Input_Context == NULL) + { + rxvt_warn ("failed to create input context, continuing without XIM.\n"); + display->put_xim (input_method); + return false; + } + + if (input_style & XIMPreeditArea) + IMSetStatusPosition (); + + D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection")); + return true; +} + void -rxvt_IMInstantiateCallback(Display * unused - __attribute__ ((unused)), XPointer client_data - __attribute__ ((unused)), XPointer call_data - __attribute__ ((unused))) +rxvt_term::im_cb () { - dR; int i, found, had_im; const char *p; char **s; char buf[IMBUFSIZ]; - D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); - if (R->Input_Context) + im_destroy (); + + D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); + if (Input_Context) return; - p = R->rs[Rs_inputMethod]; +#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) + if (rs[Rs_imLocale]) + SET_LOCALE (rs[Rs_imLocale]); +#endif + + p = rs[Rs_inputMethod]; if (p && *p) { bool found = false; @@ -1143,8 +1466,7 @@ { STRCPY (buf, "@im="); STRNCAT (buf, s[i], IMBUFSIZ - 5); - if ((p = XSetLocaleModifiers (buf)) && *p - && rxvt_IM_get_IC (aR)) + if (IM_get_IC (buf)) { found = true; break; @@ -1152,170 +1474,55 @@ } } for (i = 0; s[i]; i++) - free(s[i]); - free(s); + free (s[i]); + free (s); if (found) - return; + goto done; } -/* try with XMODIFIERS env. var. */ - if ((p = XSetLocaleModifiers ("")) && *p - && rxvt_IM_get_IC (aR)) - return; + /* try with XMODIFIERS env. var. */ + if (IM_get_IC ("")) + goto done; -/* try with no modifiers base IF the user didn't specify an IM */ - if ((p = XSetLocaleModifiers ("@im=none")) && *p - && rxvt_IM_get_IC (aR) == True) - return; -} + /* try with no modifiers base IF the user didn't specify an IM */ + if (IM_get_IC ("@im=none")) + goto done; -/* - * Try to open a XIM with the current modifiers, then see if we can - * open a suitable preedit type - */ -/* INTPROTO */ -Bool -rxvt_IM_get_IC(pR) -{ - 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; - XIMCallback ximcallback; - - D_MAIN((stderr, "rxvt_IM_get_IC()")); - xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); - if (xim == NULL) - return False; - - xim_styles = NULL; - if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) - || !xim_styles || !xim_styles->count_styles) { - XCloseIM(xim); - return False; - } - - p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] - : "OverTheSpot,OffTheSpot,Root"; - s = rxvt_splitcommastring(p); - for (i = found = 0; !found && s[i]; i++) { - if (!STRCMP(s[i], "OverTheSpot")) - R->input_style = (XIMPreeditPosition | XIMStatusNothing); - else if (!STRCMP(s[i], "OffTheSpot")) - R->input_style = (XIMPreeditArea | XIMStatusArea); - else if (!STRCMP(s[i], "Root")) - R->input_style = (XIMPreeditNothing | XIMStatusNothing); - - for (j = 0; j < xim_styles->count_styles; j++) - if (R->input_style == xim_styles->supported_styles[j]) { - found = 1; - break; - } - } - for (i = 0; s[i]; i++) - free(s[i]); - free(s); - XFree(xim_styles); - - if (!found) { - XCloseIM(xim); - return False; - } - - ximcallback.callback = rxvt_IMDestroyCallback; - -/* XXX: not sure why we need this (as well as IC one below) */ - XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); - - preedit_attr = status_attr = NULL; - - if (R->input_style & XIMPreeditPosition) { - rxvt_setSize(aR_ & rect); - rxvt_setPosition(aR_ & spot); - rxvt_setColor(aR_ & fg, &bg); - - preedit_attr = XVaCreateNestedList(0, XNArea, &rect, - XNSpotLocation, &spot, - XNForeground, fg, XNBackground, bg, - //XNFontSet, R->TermWin.fontset, - NULL); - } else if (R->input_style & XIMPreeditArea) { - rxvt_setColor(aR_ & fg, &bg); - - /* - * The necessary width of preedit area is unknown - * until create input context. - */ - needed_rect.width = 0; - - rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect); - - preedit_attr = XVaCreateNestedList(0, XNArea, &rect, - XNForeground, fg, XNBackground, bg, - //XNFontSet, R->TermWin.fontset, - NULL); - status_attr = XVaCreateNestedList(0, XNArea, &status_rect, - XNForeground, fg, XNBackground, bg, - //XNFontSet, R->TermWin.fontset, - NULL); - } - R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style, - XNClientWindow, R->TermWin.parent[0], - XNFocusWindow, R->TermWin.parent[0], - XNDestroyCallback, &ximcallback, - 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 (R->Input_Context == NULL) { - rxvt_print_error("failed to create input context"); - XCloseIM(xim); - return False; - } - if (R->input_style & XIMPreeditArea) - rxvt_IMSetStatusPosition(aR); - D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); - return True; +done: +#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) + if (rs[Rs_imLocale]) + SET_LOCALE (locale); +#endif } -/* EXTPROTO */ void -rxvt_IMSetStatusPosition(pR) +rxvt_term::IMSetStatusPosition () { - XRectangle preedit_rect, status_rect, *needed_rect; - XVaNestedList preedit_attr, status_attr; - - if (R->Input_Context == NULL - || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) - || !rxvt_IMisRunning(aR)) - return; - -/* Getting the necessary width of preedit area */ - status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); - XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); - XFree(status_attr); + XRectangle preedit_rect, status_rect, *needed_rect; + XVaNestedList preedit_attr, status_attr; - rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); - - preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); - status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); + if (Input_Context == NULL + || !TermWin.focus || ! (input_style & XIMPreeditArea) + || !IMisRunning ()) + return; - XSetICValues(R->Input_Context, - XNPreeditAttributes, preedit_attr, - XNStatusAttributes, status_attr, NULL); + /* 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); + + 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(preedit_attr); - XFree(status_attr); + XFree (preedit_attr); + XFree (status_attr); } #endif /* USE_XIM */