[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.354 by root, Mon Feb 21 07:41:02 2011 UTC vs.
Revision 1.377 by root, Tue Jun 5 11:00:40 2012 UTC

 #include "keyboard.h"
 #include "rxvtperl.h"
 #include <limits>
-#include <cassert>
+#include <assert.h>
-#include <csignal>
+#include <signal.h>
-#include <cstring>
+#include <string.h>
 #include <termios.h>
 #ifdef HAVE_XSETLOCALE
 # define X_LOCALE
 # include <X11/Xlocale.h>
 #else
-# ifdef HAVE_SETLOCALE
-#  include <clocale>
+# include <locale.h>
-# endif
 #endif
 struct termios rxvt_term::def_tio;
 vector<rxvt_term *> rxvt_term::termlist;
       if (cc->c2 == c2) return c1;
       cc = (*this)[cc->c1];
     }
   // check to see whether this combination already exists otherwise
-  for (cc = v.end (); cc-- > v.begin (); )
+  for (cc = v.begin (); cc < v.end (); cc++)
     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)
 #endif
 #if ENABLE_TRANSPARENCY || ENABLE_PERL
   rootwin_ev.set          <rxvt_term, &rxvt_term::rootwin_cb> (this),
 #endif
   scrollbar_ev.set        <rxvt_term, &rxvt_term::x_cb>       (this),
-#ifdef USE_XIM
+#if USE_XIM
   im_ev.set               <rxvt_term, &rxvt_term::im_cb>      (this),
 #endif
 #ifdef POINTER_BLANK
   pointer_ev.set          <rxvt_term, &rxvt_term::pointer_cb> (this);
 #endif
   if (display)
     {
       selection_clear ();
       selection_clear (true);
-#ifdef USE_XIM
+#if USE_XIM
       im_destroy ();
 #endif
       scrollBar.destroy ();
       if (gc)   XFreeGC (dpy, gc);
       delete drawable;
       // destroy all windows
-      if (parent[0])
+      if (parent)
-        XDestroyWindow (dpy, parent[0]);
+        XDestroyWindow (dpy, parent);
       for (int i = 0; i < TOTAL_COLORS; i++)
         if (ISSET_PIXCOLOR (i))
           {
             pix_colors_focused   [i].free (this);
   for (int i = 0; i < allocated.size (); i++)
     free (allocated [i]);
   free (selection.text);
   free (selection.clip_text);
-  // TODO: manage env vars in child only(!)
-  free (env_display);
-  free (env_term);
   free (locale);
   free (v_buffer);
   delete selection_req;
   delete this;
 }
 void
-rxvt_term::set_option (uint8_t opt, bool set)
+rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
 {
   if (!opt)
     return;
   uint8_t mask = 1 << (opt & 7);
   for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
     (*t)->emergency_cleanup ();
 }
 #if !ENABLE_MINIMAL
-static void
+static void ecb_cold
 print_x_error (Display *dpy, XErrorEvent *event)
 {
     char buffer[BUFSIZ];
     char mesg[BUFSIZ];
     char number[32];
                           mesg, BUFSIZ);
     rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
 }
 #endif
-int
+int ecb_cold
 rxvt_xerror_handler (Display *display, XErrorEvent *event)
 {
   if (GET_R->allowedxerror == -1)
     GET_R->allowedxerror = event->error_code;
   else
     }
   return 0;
 }
-int
+int ecb_cold
 rxvt_xioerror_handler (Display *display)
 {
   rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
              DisplayString (display));
   rxvt_emergency_cleanup ();
   old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
   // TODO: handle this with exceptions and tolerate the memory loss
   XSetIOErrorHandler (rxvt_xioerror_handler);
   XrmInitialize ();
+#if HAVE_PIXBUF
+  g_type_init ();
+#endif
 }
 /*----------------------------------------------------------------------*/
 /*
  * window size/position calculations for XSizeHint and other storage.
   if (recalc_y)
     szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
   ncol = width  / fwidth;
   nrow = height / fheight;
+  // When the size of the vt window is not a multiple of the cell
+  // size, i.e., when the wm does not honour our size hints, there are
+  // extra areas not covered by the terminal screen. Such gaps, when a
+  // bg pixmap is set, would have to be cleared manually to properly
+  // refresh the background. We take the simpler route and shrink the
+  // vt window so as to avoid creating gaps.
+  vt_width  = ncol * fwidth;
+  vt_height = nrow * fheight;
 }
 /*----------------------------------------------------------------------*/
 /*
  * Tell the teletype handler what size the window is.
   struct winsize ws;
   ws.ws_col = ncol;
   ws.ws_row = nrow;
-  ws.ws_xpixel = width;
+  ws.ws_xpixel = vt_width;
-  ws.ws_ypixel = height;
+  ws.ws_ypixel = vt_height;
   ioctl (pty->pty, TIOCSWINSZ, &ws);
 #if 0
   // TIOCSWINSZ is supposed to do this automatically and correctly
   if (cmd_pid)               /* force through to the command */
     kill (-cmd_pid, SIGWINCH);
 #endif
 }
 /*----------------------------------------------------------------------*/
-/* set_fonts () - load and set the various fonts
+/* load and set the various fonts */
- *
- * init = 1   - initialize
- *
- * fontname == FONT_UP  - switch to bigger font
- * fontname == FONT_DN  - switch to smaller font
- */
 bool
 rxvt_term::set_fonts ()
 {
   rxvt_fontset *fs = new rxvt_fontset (this);
   rxvt_fontprop prop;
   delete fontset[0];
   fontset[0] = fs;
   prop = (*fs)[rxvt_fontset::firstFont]->properties ();
-  prop.height += lineSpace;
   prop.width += letterSpace;
   fs->set_prop (prop, false);
   fwidth  = prop.width;
-  fheight = prop.height;
+  fheight = prop.height + lineSpace;
   fbase   = prop.ascent;
   for (int style = 1; style < 4; style++)
     {
 #if ENABLE_STYLES
 #else
       fontset[style] = fontset[0];
 #endif
     }
-  if (parent[0])
+  if (parent)
     {
       resize_all_windows (0, 0, 0);
       scr_remap_chars ();
       scr_touch (true);
     }
 }
 void
 rxvt_term::set_string_property (Atom prop, const char *str, int len)
 {
-  XChangeProperty (dpy, parent[0],
+  XChangeProperty (dpy, parent,
                    prop, XA_STRING, 8, PropModeReplace,
                    (const unsigned char *)str, len >= 0 ? len : strlen (str));
 }
 void
 {
   XTextProperty ct;
   if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
     {
-      XSetTextProperty (dpy, parent[0], &ct, prop);
+      XSetTextProperty (dpy, parent, &ct, prop);
       XFree (ct.value);
     }
 }
 void
 rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
 {
   wchar_t *ws = rxvt_mbstowcs (str, len);
   char *s = rxvt_wcstoutf8 (ws);
-  XChangeProperty (dpy, parent[0],
+  XChangeProperty (dpy, parent,
                    prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
                    (const unsigned char *)s, strlen (s));
   free (s);
   free (ws);
 /*----------------------------------------------------------------------*/
 /*
  * find if fg/bg matches any of the normal (low-intensity) colors
  */
-void
+char *
-rxvt_term::set_colorfgbg ()
+rxvt_term::get_colorfgbg ()
 {
   unsigned int i;
   const char *xpmb = "";
   char fstr[] = "default";
   char bstr[] = "default";
+  char *env_colorfgbg;
   for (i = Color_Black; i <= Color_White; i++)
     if (pix_colors[Color_fg] == pix_colors[i])
       {
         sprintf (fstr, "%d", i - Color_Black);
   for (i = Color_Black; i <= Color_White; i++)
     if (pix_colors[Color_bg] == pix_colors[i])
       {
         sprintf (bstr, "%d", i - Color_Black);
-#ifdef BG_IMAGE_FROM_FILE
+#if BG_IMAGE_FROM_FILE
         xpmb = "default;";
 #endif
         break;
       }
+  env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
   sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
+  return env_colorfgbg;
 }
 /*----------------------------------------------------------------------*/
 bool
   // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
   if (set_hint)
     {
       szHint.flags &= ~(PBaseSize | PResizeInc);
-      XSetWMNormalHints (dpy, parent[0], &szHint);
+      XSetWMNormalHints (dpy, parent, &szHint);
       szHint.flags |= PBaseSize | PResizeInc;
     }
   if (!ignoreparent)
     {
       int x, y, x1, y1;
       int dx, dy;
       unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
       Window unused_cr;
-      XTranslateCoordinates (dpy, parent[0], display->root,
+      XTranslateCoordinates (dpy, parent, display->root,
                              0, 0, &x, &y, &unused_cr);
-      XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
+      XGetGeometry (dpy, parent, &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 (y < y1)             /* top half */
         dy = 0;
       else if (y == y1)       /* exact center */
         dy /= 2;
-      XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
+      XMoveResizeWindow (dpy, parent, x + dx, y + dy,
                          szHint.width, szHint.height);
 #else
-      XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
+      XResizeWindow (dpy, parent, szHint.width, szHint.height);
 #endif
     }
   if (set_hint)
-    XSetWMNormalHints (dpy, parent[0], &szHint);
+    XSetWMNormalHints (dpy, parent, &szHint);
   fix_screen = ncol != prev_ncol || nrow != prev_nrow;
   if (fix_screen || newwidth != old_width || newheight != old_height)
     {
       if (scrollBar.state)
         scrollBar.resize ();
       XMoveResizeWindow (dpy, vt,
                          window_vt_x, window_vt_y,
-                         width, height);
+                         vt_width, vt_height);
+      HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
 #ifdef HAVE_BG_PIXMAP
       if (bg_window_size_sensitive ())
         update_background ();
 #endif
     }
   if (fix_screen || old_height == 0)
     scr_reset ();
-#ifdef USE_XIM
+#if USE_XIM
-  IMSetPosition ();
+  im_set_position ();
 #endif
 }
 /*
  * Set the width/height of the vt window in characters.  Units are pixels.
         newwidth = wattr.width - szHint.base_width;
       if (newheight == 0)
         newheight = wattr.height - szHint.base_height;
     }
-  if (newwidth != width || newheight != height)
+  if (newwidth != vt_width || newheight != vt_height)
     {
       newwidth += szHint.base_width;
       newheight += szHint.base_height;
       resize_all_windows (newwidth, newheight, 0);
     }
 }
 /* -------------------------------------------------------------------- *
  * -                      X INPUT METHOD ROUTINES                     - *
  * -------------------------------------------------------------------- */
-#ifdef USE_XIM
+#if USE_XIM
 void
 rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
 {
   fg = pix_colors [Color_fg];
   status_rect.height  = fheight;
 }
 /* Checking whether input method is running. */
 bool
-rxvt_term::IMisRunning ()
+rxvt_term::im_is_running ()
 {
   Atom atom;
   Window win;
   char server[IMBUFSIZ];
   return false;
 }
 void
-rxvt_term::IMSendSpot ()
+rxvt_term::im_send_spot ()
 {
   XPoint nspot;
   XVaNestedList preedit_attr;
   if (!Input_Context
 /*
  * Try to open a XIM with the current modifiers, then see if we can
  * open a suitable preedit type
  */
 bool
-rxvt_term::IM_get_IC (const char *modifiers)
+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;
-#ifdef ENABLE_XIM_ONTHESPOT
-  XIMCallback xcb[4];
-#endif
   set_environ (envv);
   if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
     return false;
                                          NULL);
     }
 #if ENABLE_XIM_ONTHESPOT
   else if (input_style & XIMPreeditCallbacks)
     {
+      XIMCallback xcb[4];
       im_set_position (spot);
       xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
       xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
       xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
 #endif
   Input_Context = XCreateIC (xim,
                              XNInputStyle, input_style,
                              XNClientWindow, vt,
-                             XNFocusWindow, parent[0],
+                             XNFocusWindow, parent,
                              preedit_attr ? XNPreeditAttributes : NULL,
                              preedit_attr,
                              status_attr ? XNStatusAttributes : NULL,
                              status_attr, NULL);
   // unfortunately, only the focus window is used by XIM, hard to fix
   if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
     vt_select_input ();
 #endif
-  IMSetPosition ();
+  im_set_position ();
   return true;
 }
 void
   im_destroy ();
   if (Input_Context)
     return;
-#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;
         {
           if (*s[i])
             {
               strcpy (buf, "@im=");
               strncat (buf, s[i], IMBUFSIZ - 5);
-              if (IM_get_IC (buf))
+              if (im_get_ic (buf))
                 {
                   found = true;
                   break;
                 }
             }
       if (found)
         goto done;
     }
   /* try with XMODIFIERS env. var. */
-  if (IM_get_IC (""))
+  if (im_get_ic (""))
     goto done;
   /* try with no modifiers base IF the user didn't specify an IM */
-  if (IM_get_IC ("@im=none"))
+  if (im_get_ic ("@im=none"))
     goto done;
 done:
-#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
   if (rs[Rs_imLocale])
     SET_LOCALE (locale);
-#endif
 }
 void
-rxvt_term::IMSetPosition ()
+rxvt_term::im_set_position ()
 {
   XRectangle preedit_rect, status_rect, *needed_rect;
   XVaNestedList preedit_attr, status_attr;
   if (!Input_Context
       || !focus
       || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
-      || !IMisRunning ())
+      || !im_is_running ())
     return;
   if (input_style & XIMPreeditPosition)
     {
       im_set_size (preedit_rect);
 void
 rxvt_term::get_window_origin (int &x, int &y)
 {
   Window cr;
-  XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
+  XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
-}
-Pixmap
-rxvt_term::get_pixmap_property (Atom property)
-{
-  Pixmap pixmap = None;
-  int aformat;
-  unsigned long nitems, bytes_after;
-  Atom atype;
-  unsigned char *prop;
-  int result = XGetWindowProperty (dpy, display->root, property,
-                                   0L, 1L, False, XA_PIXMAP, &atype, &aformat,
-                                   &nitems, &bytes_after, &prop);
-  if (result == Success)
-    {
-      if (atype == XA_PIXMAP)
-        pixmap = *(Pixmap *)prop;
-      XFree (prop);
-    }
-  return pixmap;
 }
 #ifdef HAVE_BG_PIXMAP
 void
 {
   if (update_background_ev.is_active ())
     return;
   bg_invalidate ();
+  if (!mapped)
+    return;
   ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
   if (to_wait <= 0.)
     bg_render ();

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.354 by root, Mon Feb 21 07:41:02 2011 UTC vs. Revision 1.377 by root, Tue Jun 5 11:00:40 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.354 by root, Mon Feb 21 07:41:02 2011 UTC vs.
Revision 1.377 by root, Tue Jun 5 11:00:40 2012 UTC