--- rxvt-unicode/src/main.C 2004/02/01 01:34:41 1.26 +++ rxvt-unicode/src/main.C 2004/02/24 16:25:44 1.44 @@ -1,4 +1,4 @@ -/*--------------------------------*-C-*---------------------------------* +/*--------------------------------*-C-*---------------------------------*; * File: main.c *----------------------------------------------------------------------* * @@ -13,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 @@ -74,6 +75,15 @@ rxvt_term::rxvt_term () : + rootwin_ev (this, &rxvt_term::rootwin_cb), + termwin_ev (this, &rxvt_term::x_cb), + vt_ev (this, &rxvt_term::x_cb), +#ifdef HAVE_SCROLLBARS + scrollbar_ev (this, &rxvt_term::x_cb), +#endif +#ifdef MENUBAR + menubar_ev (this, &rxvt_term::x_cb), +#endif #ifdef CURSOR_BLINK cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), #endif @@ -83,10 +93,12 @@ #ifdef POINTER_BLANK pointer_ev (this, &rxvt_term::pointer_cb), #endif +#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), - x_ev (this, &rxvt_term::x_cb), incr_ev (this, &rxvt_term::incr_cb) { cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; @@ -94,10 +106,8 @@ rxvt_term::~rxvt_term () { - scr_release (); - - free (locale); - free (codeset); + if (cmd_fd >= 0) + close (cmd_fd); #ifndef NO_SETOWNER_TTYDEV privileged_ttydev (RESTORE); @@ -105,29 +115,61 @@ #ifdef UTMP_SUPPORT privileged_utmp (RESTORE); #endif -#ifdef USE_XIM - if (Input_Context != NULL) + + delete TermWin.fontset; + + if (display) { - XDestroyIC (Input_Context); - Input_Context = NULL; - } + if (TermWin.parent[0]) + XDestroyWindow (display->display, TermWin.parent[0]); +#if defined(MENUBAR) && (MENUBAR_MAX > 1) + if (menuBar.win) + XDestroyWindow (display->display, menuBar.win); + delete menuBar.drawable; #endif + } - if (cmd_fd >= 0) - close (cmd_fd); - - if (Xfd >= 0) - XCloseDisplay (Xdisplay); + // TODO: free pixcolours, colours should become part of rxvt_display delete PixColors; + + displays.put (display); + + scr_release (); + + free (env_windowid); + free (env_display); + free (env_term); + free (env_colorfgbg); + free (locale); + free (codeset); + + 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 cursor_blink_ev.stop (); #endif @@ -150,7 +192,7 @@ } /*----------------------------------------------------------------------*/ -/* rxvt_init() */ +/* rxvt_init () */ /* LIBPROTO */ rxvt_t rxvt_init (int argc, const char *const *argv) @@ -166,13 +208,15 @@ return GET_R; } +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); + atexit (rxvt_clean_exit); #else #endif #endif @@ -191,7 +235,7 @@ /* need to trap SIGURG for SVR4 (Unixware) rlogin */ /* signal (SIGURG, SIG_DFL); */ - XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); + old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); } @@ -214,7 +258,7 @@ set_locale (""); -#if (MENUBAR_MAX) +#if MENUBAR_MAX menubar_read (rs[Rs_menu]); #endif #ifdef HAVE_SCROLLBARS @@ -227,14 +271,9 @@ init_xlocale (); scr_reset (); /* initialize screen */ -#ifdef RXVT_GRAPHICS - Gr_reset (); /* reset graphics */ -#endif #if 0 -#ifdef DEBUG_X - XSynchronize(Xdisplay, True); -#endif + XSynchronize (display->display, True); #endif #ifdef HAVE_SCROLLBARS @@ -242,29 +281,28 @@ 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); + XSelectInput (display->display, display->root, PropertyChangeMask); check_our_parents (); } #endif - XMapWindow (Xdisplay, TermWin.vt); - XMapWindow (Xdisplay, TermWin.parent[0]); - init_env (); + 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; } @@ -277,7 +315,7 @@ /* 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) @@ -295,30 +333,25 @@ */ /* 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_print_error ("signal %d", sig); #endif - rxvt_clean_exit(); - kill(getpid(), sig); + rxvt_clean_exit (); + kill (getpid (), sig); } -/* ARGSUSED */ -/* EXTPROTO */ +/* INTPROTO */ int -rxvt_xerror_handler(const Display * display - __attribute__ ((unused)), const XErrorEvent * event) +rxvt_xerror_handler (Display *display, XErrorEvent *event) { 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); - + old_xerror_handler (display, event); GET_R->destroy (); } @@ -334,7 +367,9 @@ void rxvt_clean_exit () { - GET_R->destroy (); + // TODO: rxvtd should clean up all ressources + if (GET_R) + GET_R->destroy (); } /* ------------------------------------------------------------------------- * @@ -342,52 +377,52 @@ * ------------------------------------------------------------------------- */ /* EXTPROTO */ void * -rxvt_malloc(size_t size) +rxvt_malloc (size_t size) { void *p; - p = malloc(size); + p = malloc (size); if (p) return p; - fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); - rxvt_clean_exit(); - exit(EXIT_FAILURE); + fprintf (stderr, APL_NAME ": 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; - p = calloc(number, size); + p = calloc (number, size); if (p) return p; - fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); - rxvt_clean_exit(); - exit(EXIT_FAILURE); + fprintf (stderr, APL_NAME ": 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; if (ptr) - p = realloc(ptr, size); + p = realloc (ptr, size); else - p = malloc(size); + p = malloc (size); if (p) return p; - fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); - rxvt_clean_exit(); - exit(EXIT_FAILURE); + fprintf (stderr, APL_NAME ": memory allocation failure. Aborting"); + rxvt_clean_exit (); + exit (EXIT_FAILURE); /* NOTREACHED */ } @@ -400,7 +435,7 @@ { #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 @@ -413,24 +448,24 @@ * change effective uid/gid - not real uid/gid - so we can switch * back to root later, as required */ - seteuid(getuid()); - setegid(getgid()); + seteuid (getuid ()); + setegid (getgid ()); break; case SAVE: - euid = geteuid(); - egid = getegid(); + euid = geteuid (); + egid = getegid (); break; case RESTORE: - seteuid(euid); - setegid(egid); + seteuid (euid); + setegid (egid); break; } # else switch (mode) { case IGNORE: - setuid(getuid()); - setgid(getgid()); + setuid (getuid ()); + setgid (getgid ()); /* FALLTHROUGH */ case SAVE: /* FALLTHROUGH */ @@ -445,8 +480,8 @@ void rxvt_term::privileged_utmp (char action) { - D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", - action, next_utmp_action, getpid())); + 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') @@ -471,9 +506,9 @@ void rxvt_term::privileged_ttydev (char action) { - D_MAIN((stderr, + D_MAIN ((stderr, "privileged_ttydev (%c); waiting for: %c (pid: %d)", - action, next_tty_action, getpid())); + action, next_tty_action, getpid ())); if (next_tty_action != action || (action != SAVE && action != RESTORE) || ttydev == NULL || *ttydev == '\0') return; @@ -484,17 +519,17 @@ { next_tty_action = RESTORE; # ifndef RESET_TTY_TO_COMMON_DEFAULTS - /* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ - if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */ + /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */ + if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */ next_tty_action = IGNORE; else # endif { - chown(ttydev, getuid(), ttygid); /* fail silently */ - chmod(ttydev, ttymode); + chown (ttydev, getuid (), ttygid); /* fail silently */ + chmod (ttydev, ttymode); # ifdef HAVE_REVOKE - revoke(ttydev); + revoke (ttydev); # endif } @@ -503,12 +538,12 @@ { /* action == RESTORE */ next_tty_action = IGNORE; # ifndef RESET_TTY_TO_COMMON_DEFAULTS - chmod(ttydev, ttyfd_stat.st_mode); - chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid); + chmod (ttydev, ttyfd_stat.st_mode); + chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid); # else - chmod(ttydev, + chmod (ttydev, (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); - chown(ttydev, 0, 0); + chown (ttydev, 0, 0); # endif } @@ -516,7 +551,7 @@ privileges (IGNORE); # ifndef RESET_TTY_TO_COMMON_DEFAULTS - D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", + D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", action == RESTORE ? "Restoring" : (action == SAVE ? "Saving" : "UNKNOWN ERROR for"), ttydev, @@ -539,7 +574,7 @@ unsigned int w, h; unsigned int max_width, max_height; - D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", + 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; @@ -552,15 +587,15 @@ { parsed_geometry = 1; if (rs[Rs_geometry]) - flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h); + flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); if (flags & WidthValue) { - TermWin.ncol = BOUND_POSITIVE_INT16(w); + TermWin.ncol = BOUND_POSITIVE_INT16 (w); szHint.flags |= USSize; } if (flags & HeightValue) { - TermWin.nrow = BOUND_POSITIVE_INT16(h); + TermWin.nrow = BOUND_POSITIVE_INT16 (h); szHint.flags |= USSize; } if (flags & XValue) @@ -599,14 +634,14 @@ window_vt_x = window_vt_y = 0; if (scrollbar_visible ()) { - sb_w = scrollbar_TotalWidth(); + sb_w = scrollbar_TotalWidth (); szHint.base_width += sb_w; - if (!(Options & Opt_scrollBar_right)) + if (! (Options & Opt_scrollBar_right)) window_vt_x = sb_w; } if (menubar_visible ()) { - mb_h = menuBar_TotalHeight(); + mb_h = menuBar_TotalHeight (); szHint.base_height += mb_h; window_vt_y = mb_h; } @@ -622,7 +657,7 @@ } else { - MIN_IT(TermWin.width, max_width); + MIN_IT (TermWin.width, max_width); szHint.width = szHint.base_width + TermWin.width; } if (height && height - szHint.base_height < max_height) @@ -632,22 +667,22 @@ } else { - MIN_IT(TermWin.height, max_height); + 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 (Xdisplay, DefaultScreen (Xdisplay)) + szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) - szHint.width - 2 * TermWin.ext_bwidth); if (recalc_y) - szHint.y += (DisplayHeight (Xdisplay, DefaultScreen (Xdisplay)) + 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", + D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", TermWin.ncol, TermWin.nrow, szHint.width, szHint.height)); return; @@ -673,7 +708,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); @@ -682,20 +717,57 @@ } /*----------------------------------------------------------------------*/ -/* 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 */ -void -rxvt_term::change_font (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); -void + if (fs && fs->populate (fontname)) + { + delete TermWin.fontset; + TermWin.fontset = fs; + TermWin.fwidth = fs->base_font ()->width; + TermWin.fheight = fs->base_font ()->height; + TermWin.fbase = fs->base_font ()->ascent; + + // TODO: screen needs to be told about new fonts + + if (TermWin.parent[0]) + { + resize_all_windows (0, 0, 0); + scr_remap_chars (); + scr_touch (true); + } + + return true; + } + } + + return false; +} + +bool rxvt_term::font_up_down (int n, int direction) -{} +{ + return false; +} /*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/ @@ -704,16 +776,16 @@ rxvt_term::set_title (const char *str) { #ifndef SMART_WINDOW_TITLE - XStoreName(Xdisplay, TermWin.parent[0], str); + XStoreName (display->display, TermWin.parent[0], str); #else char *name; - if (XFetchName(Xdisplay, TermWin.parent[0], &name) == 0) + if (XFetchName (display->display, TermWin.parent[0], &name) == 0) name = NULL; - if (name == NULL || STRCMP(name, str)) - XStoreName(Xdisplay, TermWin.parent[0], str); + if (name == NULL || STRCMP (name, str)) + XStoreName (display->display, TermWin.parent[0], str); if (name) - XFree(name); + XFree (name); #endif } @@ -721,16 +793,16 @@ rxvt_term::set_iconName (const char *str) { #ifndef SMART_WINDOW_TITLE - XSetIconName(Xdisplay, TermWin.parent[0], str); + XSetIconName (display->display, TermWin.parent[0], str); #else char *name; - if (XGetIconName(Xdisplay, TermWin.parent[0], &name)) + if (XGetIconName (display->display, TermWin.parent[0], &name)) name = NULL; - if (name == NULL || STRCMP(name, str)) - XSetIconName(Xdisplay, TermWin.parent[0], str); + if (name == NULL || STRCMP (name, str)) + XSetIconName (display->display, TermWin.parent[0], str); if (name) - XFree(name); + XFree (name); #endif } @@ -745,15 +817,15 @@ return; /* handle color aliases */ - if (isdigit(*color)) + if (isdigit (*color)) { - i = atoi(color); + i = atoi (color); if (i >= 8 && i <= 15) { /* bright colors */ i -= 8; # ifndef NO_BRIGHTCOLOR PixColors[idx] = PixColors[minBrightCOLOR + i]; - SET_PIXCOLOR(idx); + SET_PIXCOLOR (idx); goto Done; # endif @@ -761,13 +833,13 @@ if (i >= 0 && i <= 7) { /* normal colors */ PixColors[idx] = PixColors[minCOLOR + i]; - SET_PIXCOLOR(idx); + SET_PIXCOLOR (idx); goto Done; } } if (!rXParseAllocColor (& xcol, color)) return; - /* XStoreColor (Xdisplay, XCMAP, XColor*); */ + /* XStoreColor (display->display, XCMAP, XColor*); */ /* * FIXME: should free colors here, but no idea how to do it so instead, @@ -780,19 +852,19 @@ if (i > Color_White) { /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ - XFreeColors(Xdisplay, XCMAP, (PixColors + idx), 1, - DisplayPlanes(Xdisplay, Xscreen)); + XFreeColors (display->display, XCMAP, (PixColors + idx), 1, + DisplayPlanes (display->display, display->screen)); } # endif PixColors[idx] = xcol; - SET_PIXCOLOR(idx); + SET_PIXCOLOR (idx); /* XSetWindowAttributes attr; */ /* Cursor cursor; */ Done: - if (idx == Color_bg && !(Options & Opt_transparent)) - XSetWindowBackground(Xdisplay, TermWin.vt, + if (idx == Color_bg && ! (Options & Opt_transparent)) + XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); /* handle Color_BD, scrollbar background, etc. */ @@ -815,8 +887,8 @@ xcol[0] = PixColors[Color_pointer]; xcol[1] = PixColors[Color_bg]; - XQueryColors (Xdisplay, XCMAP, xcol, 2); - XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1])); + XQueryColors (display->display, XCMAP, xcol, 2); + XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1])); #endif } @@ -829,38 +901,38 @@ { unsigned int i; const char *xpmb = "\0"; - char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; + 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"); + (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)); + 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)); + sprintf (bstr, "%d", (i - Color_Black)); #ifdef XPM_BACKGROUND xpmb = "default;"; #endif break; } - sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); - putenv(env_colorfgbg); + + sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); #ifndef NO_BRIGHTCOLOR colorfgbg = DEFAULT_RSTYLE; for (i = minCOLOR; i <= maxCOLOR; i++) { if (PixColors[Color_fg] == PixColors[i]) - colorfgbg = SET_FGCOLOR(colorfgbg, i); + colorfgbg = SET_FGCOLOR (colorfgbg, i); if (PixColors[Color_bg] == PixColors[i]) - colorfgbg = SET_BGCOLOR(colorfgbg, i); + colorfgbg = SET_BGCOLOR (colorfgbg, i); } #endif } @@ -874,9 +946,9 @@ int rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) { - if (!screen_in_out->set (this, colour)) + if (!screen_in_out->set (display, colour)) { - rxvt_print_error("can't allocate colour: %s", colour); + rxvt_print_error ("can't allocate colour: %s", colour); return false; } @@ -896,7 +968,7 @@ #endif window_calc (width, height); - XSetWMNormalHints (Xdisplay, TermWin.parent[0], &szHint); + XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); if (!ignoreparent) { #ifdef SMART_RESIZE @@ -909,12 +981,12 @@ unsigned int unused_w1, unused_h1, unused_b1, unused_d1; Window unused_cr; - XTranslateCoordinates (Xdisplay, TermWin.parent[0], Xroot, + XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 0, 0, &x, &y, &unused_cr); - XGetGeometry (Xdisplay, TermWin.parent[0], &unused_cr, &x1, &y1, + XGetGeometry (display->display, 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 + * 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) @@ -923,8 +995,8 @@ y -= y1; } - x1 = (DisplayWidth (Xdisplay, Xscreen) - old_width) / 2; - y1 = (DisplayHeight (Xdisplay, Xscreen) - old_height) / 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; @@ -938,10 +1010,10 @@ else if (y == y1) /* exact center */ dy /= 2; - XMoveResizeWindow (Xdisplay, TermWin.parent[0], x + dx, y + dy, + XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, szHint.width, szHint.height); #else - XResizeWindow (Xdisplay, TermWin.parent[0], szHint.width, + XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); #endif @@ -954,23 +1026,18 @@ { if (scrollbar_visible ()) { - XMoveResizeWindow (Xdisplay, scrollBar.win, window_sb_x, + XMoveResizeWindow (display->display, scrollBar.win, window_sb_x, 0, scrollbar_TotalWidth (), szHint.height); resize_scrollbar (); } if (menubar_visible ()) - XMoveResizeWindow (Xdisplay, menuBar.win, window_vt_x, + XMoveResizeWindow (display->display, menuBar.win, window_vt_x, 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); - XMoveResizeWindow (Xdisplay, TermWin.vt, window_vt_x, + XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, window_vt_y, TermWin_TotalWidth (), TermWin_TotalHeight ()); -#ifdef RXVT_GRAPHICS - if (old_height) - Gr_Resize (old_width - szHint.base_width, - old_height - szHint.base_height); -#endif scr_clear (); #ifdef XPM_BACKGROUND resize_pixmap (); @@ -992,7 +1059,7 @@ TermWin.ncol = ncol; } - scr_reset(); + scr_reset (); if (curr_screen >= 0) /* this is not the first time through */ { @@ -1020,7 +1087,7 @@ if (width == 0 || height == 0) { - XGetWindowAttributes(Xdisplay, Xroot, &wattr); + XGetWindowAttributes (display->display, display->root, &wattr); if (width == 0) width = wattr.width - szHint.base_width; if (height == 0) @@ -1038,17 +1105,18 @@ * - X INPUT METHOD ROUTINES - * * -------------------------------------------------------------------- */ #ifdef USE_XIM + void -rxvt_term::set_size (XRectangle *size) +rxvt_term::im_set_size (XRectangle *size) { size->x = TermWin.int_bwidth; size->y = TermWin.int_bwidth; - size->width = Width2Pixel(TermWin.ncol); - size->height = Height2Pixel(TermWin.nrow); + size->width = Width2Pixel (TermWin.ncol); + size->height = Height2Pixel (TermWin.nrow); } void -rxvt_term::set_color (unsigned long *fg, unsigned long *bg) +rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) { *fg = PixColors[Color_fg]; *bg = PixColors[Color_bg]; @@ -1064,15 +1132,15 @@ char server[IMBUFSIZ]; /* get current locale modifier */ - if ((p = XSetLocaleModifiers(NULL)) != NULL) + if ((p = XSetLocaleModifiers (NULL)) != NULL) { - STRCPY(server, "@server="); - STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ - if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ + STRCPY (server, "@server="); + STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ + if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */ *p = '\0'; - atom = XInternAtom(Xdisplay, server, False); - win = XGetSelectionOwner(Xdisplay, atom); + atom = XInternAtom (display->display, server, False); + win = XGetSelectionOwner (display->display, atom); if (win != None) return True; } @@ -1086,8 +1154,8 @@ XVaNestedList preedit_attr; if (Input_Context == NULL - || !TermWin.focus || !(input_style & XIMPreeditPosition) - || !(event_type == KeyPress + || !TermWin.focus || ! (input_style & XIMPreeditPosition) + || ! (event_type == KeyPress || event_type == Expose || event_type == NoExpose || event_type == SelectionNotify @@ -1095,50 +1163,52 @@ || !IMisRunning ()) return; - set_position (&spot); + im_set_position (&spot); - preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); - XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL); - XFree(preedit_attr); + preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); + XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); + XFree (preedit_attr); } void -rxvt_term::set_preedit_area (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; - if (scrollbar_visible () && !(Options & Opt_scrollBar_right)) - vtx = scrollbar_TotalWidth(); + if (scrollbar_visible () && ! (Options & Opt_scrollBar_right)) + vtx = scrollbar_TotalWidth (); - mbh = menubar_visible () ? menuBar_TotalHeight() : 0; + mbh = menubar_visible () ? menuBar_TotalHeight () : 0; mbh -= TermWin.lineSpace; preedit_rect->x = needed_rect->width + vtx; - preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; + preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh; - preedit_rect->width = Width2Pixel(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(TermWin.nrow - 1) + mbh; + status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh; - status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1); - status_rect->height = Height2Pixel(1); + status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1); + status_rect->height = Height2Pixel (1); } -/* ARGSUSED */ -/* EXTPROTO */ void -rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data - __attribute__ ((unused)), XPointer call_data - __attribute__ ((unused))) -{ - GET_R->Input_Context = NULL; - /* To avoid Segmentation Fault in C locale: Solaris only? */ - if (STRCMP (GET_R->locale, "C")) - XRegisterIMInstantiateCallback(GET_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; + } } /* @@ -1146,7 +1216,7 @@ * open a suitable preedit type */ bool -rxvt_term::IM_get_IC () +rxvt_term::IM_get_IC (const char *modifiers) { int i, j, found; XIM xim; @@ -1157,31 +1227,34 @@ char **s; XIMStyles *xim_styles; XVaNestedList preedit_attr, status_attr; - XIMCallback ximcallback; - D_MAIN((stderr, "rxvt_IM_get_IC()")); - xim = XOpenIM (Xdisplay, NULL, NULL, NULL); - if (xim == NULL) - return False; + 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) { - XCloseIM(xim); - return False; + display->put_xim (input_method); + return false; } - p = rs[Rs_preeditType] ? rs[Rs_preeditType] - : "OverTheSpot,OffTheSpot,Root"; - s = rxvt_splitcommastring(p); + 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")) + if (!STRCMP (s[i], "OverTheSpot")) input_style = (XIMPreeditPosition | XIMStatusNothing); - else if (!STRCMP(s[i], "OffTheSpot")) + else if (!STRCMP (s[i], "OffTheSpot")) input_style = (XIMPreeditArea | XIMStatusArea); - else if (!STRCMP(s[i], "Root")) + else if (!STRCMP (s[i], "Root")) input_style = (XIMPreeditNothing | XIMStatusNothing); for (j = 0; j < xim_styles->count_styles; j++) @@ -1191,31 +1264,28 @@ break; } } + for (i = 0; s[i]; i++) - free(s[i]); - free(s); - XFree(xim_styles); + free (s[i]); + + free (s); + XFree (xim_styles); if (!found) { - XCloseIM(xim); - return False; + display->put_xim (input_method); + 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 (input_style & XIMPreeditPosition) { - set_size (&rect); - set_position (&spot); - set_color (&fg, &bg); + im_set_size (&rect); + im_set_position (&spot); + im_set_color (&fg, &bg); - preedit_attr = XVaCreateNestedList(0, XNArea, &rect, + preedit_attr = XVaCreateNestedList (0, XNArea, &rect, XNSpotLocation, &spot, XNForeground, fg, XNBackground, bg, //XNFontSet, TermWin.fontset, @@ -1223,7 +1293,7 @@ } else if (input_style & XIMPreeditArea) { - set_color (&fg, &bg); + im_set_color (&fg, &bg); /* * The necessary width of preedit area is unknown @@ -1231,70 +1301,62 @@ */ needed_rect.width = 0; - set_preedit_area(&rect, &status_rect, &needed_rect); + im_set_preedit_area (&rect, &status_rect, &needed_rect); - preedit_attr = XVaCreateNestedList(0, XNArea, &rect, + preedit_attr = XVaCreateNestedList (0, XNArea, &rect, XNForeground, fg, XNBackground, bg, //XNFontSet, TermWin.fontset, NULL); - status_attr = XVaCreateNestedList(0, XNArea, &status_rect, + status_attr = XVaCreateNestedList (0, XNArea, &status_rect, XNForeground, fg, XNBackground, bg, //XNFontSet, TermWin.fontset, NULL); } - Input_Context = XCreateIC(xim, XNInputStyle, input_style, + + Input_Context = XCreateIC (xim, XNInputStyle, input_style, XNClientWindow, TermWin.parent[0], XNFocusWindow, 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 (preedit_attr) XFree (preedit_attr); + if (status_attr) XFree (status_attr); + if (Input_Context == NULL) { - rxvt_print_error("failed to create input context"); - XCloseIM(xim); - return False; + rxvt_print_error ("failed to create input context"); + display->put_xim (input_method); + return false; } + if (input_style & XIMPreeditArea) IMSetStatusPosition (); - D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); - return True; + + D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection")); + 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))) +rxvt_term::im_cb () { int i, found, had_im; const char *p; char **s; char buf[IMBUFSIZ]; - D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); - if (GET_R->Input_Context) + im_destroy (); + + D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); + if (Input_Context) return; #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) - if (GET_R->rs[Rs_imLocale]) - setlocale (LC_CTYPE, GET_R->rs[Rs_imLocale]); + if (rs[Rs_imLocale]) + SET_LOCALE (rs[Rs_imLocale]); #endif - p = GET_R->rs[Rs_inputMethod]; + p = rs[Rs_inputMethod]; if (p && *p) { bool found = false; @@ -1306,7 +1368,7 @@ { STRCPY (buf, "@im="); STRNCAT (buf, s[i], IMBUFSIZ - 5); - if ((p = XSetLocaleModifiers (buf)) && *p && GET_R->IM_get_IC ()) + if (IM_get_IC (buf)) { found = true; break; @@ -1314,27 +1376,25 @@ } } for (i = 0; s[i]; i++) - free(s[i]); - free(s); + free (s[i]); + free (s); if (found) goto done; } /* try with XMODIFIERS env. var. */ - if ((p = XSetLocaleModifiers ("")) && *p - && GET_R->IM_get_IC ()) + 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 - && GET_R->IM_get_IC () == True) + if (IM_get_IC ("@im=none")) goto done; done: #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) - if (GET_R->rs[Rs_imLocale]) - setlocale (LC_CTYPE, GET_R->locale); + if (rs[Rs_imLocale]) + SET_LOCALE (locale); #endif } @@ -1345,26 +1405,26 @@ XVaNestedList preedit_attr, status_attr; if (Input_Context == NULL - || !TermWin.focus || !(input_style & XIMPreeditArea) + || !TermWin.focus || ! (input_style & XIMPreeditArea) || !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); + status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); + XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); + XFree (status_attr); - set_preedit_area(&preedit_rect, &status_rect, needed_rect); + 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); + preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); + status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); - XSetICValues(Input_Context, + 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 */