--- rxvt-unicode/src/main.C 2003/11/25 15:44:38 1.5 +++ rxvt-unicode/src/main.C 2003/12/19 06:17:03 1.18 @@ -1,7 +1,7 @@ /*--------------------------------*-C-*---------------------------------* * File: main.c *----------------------------------------------------------------------* - * $Id: main.C,v 1.5 2003/11/25 15:44:38 pcg Exp $ + * $Id: main.C,v 1.18 2003/12/19 06:17:03 pcg Exp $ * * All portions of code are copyright by their respective author/s. * Copyright (c) 1992 John Bovey, University of Kent at Canterbury @@ -44,6 +44,20 @@ # 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); + } +} + void * rxvt_term::operator new (size_t s) { @@ -60,27 +74,82 @@ } rxvt_term::rxvt_term () -: pty_ev (this, &rxvt_term::pty_cb), +: destroy_ev (this, &rxvt_term::destroy_cb), #ifdef CURSOR_BLINK - blink_ev (this, &rxvt_term::blink_cb), + blink_ev (this, &rxvt_term::blink_cb), +#endif +#ifdef POINTER_BLANK + pointer_ev (this, &rxvt_term::pointer_cb), #endif - x_ev (this, &rxvt_term::x_cb) + x_ev (this, &rxvt_term::x_cb), + check_ev (this, &rxvt_term::check_cb), + incr_ev (this, &rxvt_term::incr_cb), + pty_ev (this, &rxvt_term::pty_cb) { cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; } rxvt_term::~rxvt_term () { + scr_release (); + + free (locale); + free (codeset); + +#ifndef NO_SETOWNER_TTYDEV + rxvt_privileged_ttydev (this, RESTORE); +#endif +#ifdef UTMP_SUPPORT + rxvt_privileged_utmp (this, RESTORE); +#endif +#ifdef USE_XIM + if (Input_Context != NULL) + { + XDestroyIC (Input_Context); + Input_Context = NULL; + } +#endif + + if (cmd_fd >= 0) + close (cmd_fd); + + if (Xfd >= 0) + XCloseDisplay (Xdisplay); + delete PixColors; } +void +rxvt_term::destroy () +{ + check_ev.stop (); + pty_ev.stop (); + x_ev.stop (); +#ifdef CURSOR_BLINK + blink_ev.stop (); +#endif +#ifdef POINTER_BLANK + pointer_ev.stop (); +#endif + + destroy_ev.start (0); +} + +void +rxvt_term::destroy_cb (time_watcher &w) +{ + SET_R (this); + + delete this; +} + /*----------------------------------------------------------------------*/ /* rxvt_init() */ /* LIBPROTO */ rxvt_t -rxvt_init(int argc, const char *const *argv) +rxvt_init (int argc, const char *const *argv) { - SET_R(new rxvt_term); + SET_R (new rxvt_term); dR; if (!R->init_vars () || !R->init (argc, argv)) @@ -92,11 +161,39 @@ 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); +} + bool rxvt_term::init (int argc, const char *const *argv) { - dR;//TODO (scrollbar, setidle) - /* * Save and then give up any super-user privileges * If we need privileges in any area then we must specifically request it. @@ -107,23 +204,25 @@ rxvt_privileges (this, SAVE); rxvt_privileges (this, 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); + + set_locale (""); #if (MENUBAR_MAX) rxvt_menubar_read (this, 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 */ + scr_reset (); /* initialize screen */ #ifdef RXVT_GRAPHICS rxvt_Gr_reset (this); /* reset graphics */ #endif @@ -131,15 +230,12 @@ #if 0 #ifdef DEBUG_X XSynchronize(Xdisplay, True); - XSetErrorHandler((XErrorHandler) abort); -#else - XSetErrorHandler((XErrorHandler) rxvt_xerror_handler); #endif #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)) @@ -155,12 +251,16 @@ XMapWindow (Xdisplay, TermWin.vt); XMapWindow (Xdisplay, TermWin.parent[0]); - rxvt_init_env (this); - rxvt_init_command (this, cmd_argv); + init_env (); + 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; } @@ -175,18 +275,15 @@ RETSIGTYPE rxvt_Child_signal(int sig __attribute__ ((unused))) { - dR; - int pid, save_errno = errno; - - do { - errno = 0; - } while ((pid = waitpid(-1, NULL, WNOHANG)) == -1 && errno == EINTR); + 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); - - errno = save_errno; - signal(SIGCHLD, rxvt_Child_signal); + exit (EXIT_SUCCESS); +#endif } /* @@ -210,18 +307,20 @@ rxvt_xerror_handler(const Display * display __attribute__ ((unused)), const XErrorEvent * event) { - dR; + dR; - if (R->allowedxerror == -1) { - R->allowedxerror = event->error_code; - return 0; /* ignored anyway */ - } - rxvt_print_error("XError: Request: %d . %d, Error: %d", - event->request_code, event->minor_code, - event->error_code); -/* XXX: probably should call rxvt_clean_exit() bypassing X routines */ - exit(EXIT_FAILURE); -/* NOTREACHED */ + if (R->allowedxerror == -1) + 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 (); + } + + return 0; } /*----------------------------------------------------------------------*/ @@ -231,25 +330,11 @@ */ /* EXTPROTO */ void -rxvt_clean_exit(void) +rxvt_clean_exit () { - dR; + dR; -#ifdef DEBUG_SCREEN - rxvt_scr_release(aR); -#endif -#ifndef NO_SETOWNER_TTYDEV - rxvt_privileged_ttydev(aR_ RESTORE); -#endif -#ifdef UTMP_SUPPORT - rxvt_privileged_utmp(aR_ RESTORE); -#endif -#ifdef USE_XIM - if (R->Input_Context != NULL) { - XDestroyIC(R->Input_Context); - R->Input_Context = NULL; - } -#endif + R->destroy (); } /* ------------------------------------------------------------------------- * @@ -438,9 +523,8 @@ * 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; @@ -448,101 +532,101 @@ 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; */ + 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 (!R->parsed_geometry) { - R->parsed_geometry = 1; - if (R->rs[Rs_geometry]) - flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); + if (!parsed_geometry) { + parsed_geometry = 1; + if (rs[Rs_geometry]) + flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h); if (flags & WidthValue) { - R->TermWin.ncol = BOUND_POSITIVE_INT16(w); - R->szHint.flags |= USSize; + TermWin.ncol = BOUND_POSITIVE_INT16(w); + szHint.flags |= USSize; } if (flags & HeightValue) { - R->TermWin.nrow = BOUND_POSITIVE_INT16(h); - R->szHint.flags |= USSize; + TermWin.nrow = BOUND_POSITIVE_INT16(h); + szHint.flags |= USSize; } if (flags & XValue) { - R->szHint.x = x; - R->szHint.flags |= USPosition; + szHint.x = x; + szHint.flags |= USPosition; if (flags & XNegative) { recalc_x = 1; - R->szHint.win_gravity = NorthEastGravity; + szHint.win_gravity = NorthEastGravity; } } if (flags & YValue) { - R->szHint.y = y; - R->szHint.flags |= USPosition; + szHint.y = y; + szHint.flags |= USPosition; if (flags & YNegative) { recalc_y = 1; - if (R->szHint.win_gravity == NorthEastGravity) - R->szHint.win_gravity = SouthEastGravity; + if (szHint.win_gravity == NorthEastGravity) + szHint.win_gravity = SouthEastGravity; else - R->szHint.win_gravity = SouthWestGravity; + 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; + TermWin.width = TermWin.ncol * TermWin.fwidth; + TermWin.height = TermWin.nrow * TermWin.fheight; + max_width = MAX_COLS * TermWin.fwidth; + max_height = MAX_ROWS * TermWin.fheight; - R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; + szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; sb_w = mb_h = 0; - R->window_vt_x = R->window_vt_y = 0; - if (scrollbar_visible(R)) { + window_vt_x = window_vt_y = 0; + if (scrollbar_visible (this)) { sb_w = scrollbar_TotalWidth(); - R->szHint.base_width += sb_w; - if (!(R->Options & Opt_scrollBar_right)) - R->window_vt_x = sb_w; + szHint.base_width += sb_w; + if (!(Options & Opt_scrollBar_right)) + window_vt_x = sb_w; } - if (menubar_visible(R)) { + if (menubar_visible (this)) { mb_h = menuBar_TotalHeight(); - R->szHint.base_height += mb_h; - R->window_vt_y = mb_h; + szHint.base_height += mb_h; + 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; + 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(R->TermWin.width, max_width); - R->szHint.width = R->szHint.base_width + R->TermWin.width; + MIN_IT(TermWin.width, max_width); + szHint.width = szHint.base_width + TermWin.width; } - if (height && height - R->szHint.base_height < max_height) { - R->szHint.height = height; - R->TermWin.height = height - R->szHint.base_height; + if (height && height - szHint.base_height < max_height) { + szHint.height = height; + TermWin.height = height - szHint.base_height; } else { - MIN_IT(R->TermWin.height, max_height); - R->szHint.height = R->szHint.base_height + R->TermWin.height; + MIN_IT(TermWin.height, max_height); + szHint.height = szHint.base_height + TermWin.height; } - if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) - R->window_sb_x = R->szHint.width - sb_w; + if (scrollbar_visible (this) && (Options & Opt_scrollBar_right)) + window_sb_x = szHint.width - sb_w; if (recalc_x) - R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) - - R->szHint.width - 2 * R->TermWin.ext_bwidth); + szHint.x += (DisplayWidth (Xdisplay, DefaultScreen (Xdisplay)) + - szHint.width - 2 * TermWin.ext_bwidth); if (recalc_y) - R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) - - R->szHint.height - 2 * R->TermWin.ext_bwidth); + szHint.y += (DisplayHeight (Xdisplay, DefaultScreen (Xdisplay)) + - szHint.height - 2 * TermWin.ext_bwidth); - R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; - R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; + 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", - R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, - R->szHint.height)); + TermWin.ncol, TermWin.nrow, szHint.width, + szHint.height)); return; } @@ -551,26 +635,25 @@ * Tell the teletype handler what size the window is. * Called after a window size change. */ -/* EXTPROTO */ void -rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) +rxvt_term::tt_winch () { - struct winsize ws; + struct winsize ws; - if (fd < 0) - return; - ws.ws_col = col; - ws.ws_row = row; - ws.ws_xpixel = ws.ws_ypixel = 0; + if (cmd_fd < 0) + return; + + ws.ws_col = TermWin.ncol; + ws.ws_row = TermWin.nrow; + ws.ws_xpixel = ws.ws_ypixel = 0; #ifndef DEBUG_SIZE - (void)ioctl(fd, TIOCSWINSZ, &ws); + (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); #else - if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { - D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); - } + if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) + D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); # ifdef SIGWINCH - else if (pid) /* force through to the command */ - kill(pid, SIGWINCH); + else if (cmd_pid) /* force through to the command */ + kill (cmd_pid, SIGWINCH); # endif #endif } @@ -693,27 +776,26 @@ /* handle Color_BD, scrollbar background, etc. */ - rxvt_set_colorfgbg(aR); - rxvt_recolour_cursor(aR); + rxvt_set_colorfgbg (aR); + R->recolour_cursor (); /* the only reasonable way to enforce a clean update */ - rxvt_scr_poweron(aR); + rxvt_scr_poweron (aR); } #else # define rxvt_set_window_color(aR_ 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 (Xdisplay, XCMAP, xcol, 2); + XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1])); #endif } @@ -783,110 +865,118 @@ /* -------------------------------------------------------------------- * * - 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 (Xdisplay, 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; - } - - 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; + /* + * 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 (Xdisplay, TermWin.parent[0], Xroot, + 0, 0, &x, &y, &unused_cr); + XGetGeometry (Xdisplay, 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; + } + + x1 = (DisplayWidth (Xdisplay, Xscreen) - old_width) / 2; + y1 = (DisplayHeight (Xdisplay, Xscreen) - 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 (Xdisplay, 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 (Xdisplay, 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 (this)) + { + XMoveResizeWindow (Xdisplay, 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()); + + if (menubar_visible (this)) + XMoveResizeWindow (Xdisplay, menuBar.win, window_vt_x, + 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); + + XMoveResizeWindow (Xdisplay, TermWin.vt, window_vt_x, + 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); + if (old_height) + rxvt_Gr_Resize (this, old_width - szHint.base_width, + old_height - szHint.base_height); #endif - rxvt_scr_clear(aR); + scr_clear (); #ifdef XPM_BACKGROUND - rxvt_resize_pixmap(aR); + rxvt_resize_pixmap (this); #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; + uint16_t old_ncol = prev_ncol; + + /* scr_reset only works on the primary screen */ + if (old_height) /* this is not the first time through */ + curr_screen = rxvt_scr_change_screen (this, PRIMARY); - /* 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)); + scr_reset(); + + if (curr_screen >= 0) /* this is not the first time through */ + { + rxvt_scr_change_screen (this, curr_screen); + rxvt_selection_check (this, 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); + rxvt_IMSetStatusPosition (this); #endif } @@ -910,7 +1000,7 @@ 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); + R->resize_all_windows (width, height, 0); } } @@ -918,22 +1008,20 @@ * - X INPUT METHOD ROUTINES - * * -------------------------------------------------------------------- */ #ifdef USE_XIM -/* INTPROTO */ void -rxvt_setSize(pR_ XRectangle * size) +rxvt_term::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::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. */ @@ -978,50 +1066,36 @@ || !rxvt_IMisRunning(aR)) return; - rxvt_setPosition(aR_ & spot); + R->set_position (&spot); preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); XFree(preedit_attr); } -/* EXTPROTO */ void -rxvt_setTermFontSet(pR_ int idx) +rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, + XRectangle * needed_rect) { - char *string; - long length; - int success = 0; + int mbh, vtx = 0; - if (idx < 0 || idx >= MAX_NFONTS) - return; -} + if (scrollbar_visible (this) && !(Options & Opt_scrollBar_right)) + vtx = scrollbar_TotalWidth(); -/* INTPROTO */ -void -rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect, - XRectangle * needed_rect) -{ - int mbh, vtx = 0; - - 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 (this) ? 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 */ @@ -1041,71 +1115,11 @@ } /* - * 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 - */ -/* ARGSUSED */ -/* EXTPROTO */ -void -rxvt_IMInstantiateCallback(Display * unused - __attribute__ ((unused)), XPointer client_data - __attribute__ ((unused)), XPointer call_data - __attribute__ ((unused))) -{ - dR; - int i, found, had_im; - const char *p; - char **s; - char buf[IMBUFSIZ]; - - D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); - if (R->Input_Context) - return; - - found = had_im = 0; - p = R->rs[Rs_inputMethod]; - if (p && *p) { - had_im = 1; - s = rxvt_splitcommastring(p); - for (i = 0; s[i]; i++) { - if (*s[i]) { - STRCPY(buf, "@im="); - STRNCAT(buf, s[i], IMBUFSIZ - 5); - if ((p = XSetLocaleModifiers(buf)) != NULL && *p - && (rxvt_IM_get_IC(aR) == True)) { - found = 1; - break; - } - } - } - for (i = 0; s[i]; i++) - free(s[i]); - free(s); - } - if (found) - return; - -/* try with XMODIFIERS env. var. */ - if ((p = XSetLocaleModifiers("")) != NULL && *p) { - rxvt_IM_get_IC(aR); - return; - } - -/* try with no modifiers base IF the user didn't specify an IM */ - if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p - && rxvt_IM_get_IC(aR) == True) - return; -} - -/* * 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) +static Bool +rxvt_IM_get_IC (pR) { int i, j, found; XIM xim; @@ -1119,12 +1133,12 @@ XIMCallback ximcallback; D_MAIN((stderr, "rxvt_IM_get_IC()")); - xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); + xim = XOpenIM (R->Xdisplay, NULL, NULL, NULL); if (xim == NULL) return False; xim_styles = NULL; - if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) + if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) || !xim_styles || !xim_styles->count_styles) { XCloseIM(xim); return False; @@ -1159,15 +1173,15 @@ ximcallback.callback = rxvt_IMDestroyCallback; -/* XXX: not sure why we need this (as well as IC one below) */ + /* 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); + R->set_size (&rect); + R->set_position (&spot); + R->set_color (&fg, &bg); preedit_attr = XVaCreateNestedList(0, XNArea, &rect, XNSpotLocation, &spot, @@ -1175,7 +1189,7 @@ //XNFontSet, R->TermWin.fontset, NULL); } else if (R->input_style & XIMPreeditArea) { - rxvt_setColor(aR_ & fg, &bg); + R->set_color (&fg, &bg); /* * The necessary width of preedit area is unknown @@ -1183,7 +1197,7 @@ */ needed_rect.width = 0; - rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect); + R->set_preedit_area(&rect, &status_rect, &needed_rect); preedit_attr = XVaCreateNestedList(0, XNArea, &rect, XNForeground, fg, XNBackground, bg, @@ -1217,6 +1231,80 @@ return True; } +/* + * 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 + */ +/* ARGSUSED */ +/* EXTPROTO */ +void +rxvt_IMInstantiateCallback(Display * unused + __attribute__ ((unused)), XPointer client_data + __attribute__ ((unused)), XPointer call_data + __attribute__ ((unused))) +{ + dR; + int i, found, had_im; + const char *p; + char **s; + char buf[IMBUFSIZ]; + + D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); + if (R->Input_Context) + return; + +#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) + if (R->rs[Rs_imLocale]) + setlocale (LC_CTYPE, R->rs[Rs_imLocale]); +#endif + + p = R->rs[Rs_inputMethod]; + if (p && *p) + { + bool found = false; + + s = rxvt_splitcommastring (p); + for (i = 0; s[i]; i++) + { + if (*s[i]) + { + STRCPY (buf, "@im="); + STRNCAT (buf, s[i], IMBUFSIZ - 5); + if ((p = XSetLocaleModifiers (buf)) && *p + && rxvt_IM_get_IC (aR)) + { + found = true; + break; + } + } + } + for (i = 0; s[i]; i++) + free(s[i]); + free(s); + + if (found) + goto done; + } + +/* try with XMODIFIERS env. var. */ + if ((p = XSetLocaleModifiers ("")) && *p + && rxvt_IM_get_IC (aR)) + 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) + goto done; + +done: +#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) + if (R->rs[Rs_imLocale]) + setlocale (LC_CTYPE, R->locale); +#endif +} + /* EXTPROTO */ void rxvt_IMSetStatusPosition(pR) @@ -1234,7 +1322,7 @@ XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); XFree(status_attr); - rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); + R->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);