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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.214 by root, Tue Jan 31 19:53:30 2006 UTC vs.
Revision 1.239 by sasha, Fri Aug 3 22:40:10 2007 UTC

-/*--------------------------------*-C-*---------------------------------*
+/*----------------------------------------------------------------------*
  * File:        main.C
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 1992      John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
 static char curlocale[128], savelocale[128];
 bool
 rxvt_set_locale (const char *locale) NOTHROW
 {
+  int size = strlen (locale) + 1;
+  if (size > sizeof (curlocale))
+    rxvt_fatal ("locale string too long, aborting.\n");
-  if (!locale || !strncmp (locale, curlocale, 128))
+  if (!locale || !memcmp (locale, curlocale, size))
     return false;
-  strncpy (curlocale, locale, 128);
+  memcpy (curlocale, locale, size);
   setlocale (LC_CTYPE, curlocale);
   return true;
 }
 void
 }
 #endif
 rxvt_term::rxvt_term ()
     :
-#if TRANSPARENT
+#if ENABLE_TRANSPARENCY || ENABLE_PERL
     rootwin_ev (this, &rxvt_term::rootwin_cb),
+#endif
+#if ENABLE_TRANSPARENCY
+    check_our_parents_ev(this, &rxvt_term::check_our_parents_cb),
 #endif
 #ifdef HAVE_SCROLLBARS
     scrollbar_ev (this, &rxvt_term::x_cb),
 #endif
 #ifdef CURSOR_BLINK
 void rxvt_term::emergency_cleanup ()
 {
   if (cmd_pid)
     kill (-cmd_pid, SIGHUP);
+  pty_ev.stop ();
   delete pty; pty = 0;
 }
 rxvt_term::~rxvt_term ()
 {
 #ifdef USE_XIM
       im_destroy ();
 #endif
 #ifdef XTERM_SCROLLBAR
-      if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
+      if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
-      if (ShadowGC)     XFreeGC (xdisp, ShadowGC);
+      if (ShadowGC)     XFreeGC (dpy, ShadowGC);
 #endif
 #ifdef PLAIN_SCROLLBAR
-      if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
+      if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
 #endif
 #ifdef NEXT_SCROLLBAR
-      if (blackGC)      XFreeGC (xdisp, blackGC);
+      if (blackGC)      XFreeGC (dpy, blackGC);
-      if (whiteGC)      XFreeGC (xdisp, whiteGC);
+      if (whiteGC)      XFreeGC (dpy, whiteGC);
-      if (grayGC)       XFreeGC (xdisp, grayGC);
+      if (grayGC)       XFreeGC (dpy, grayGC);
-      if (darkGC)       XFreeGC (xdisp, darkGC);
+      if (darkGC)       XFreeGC (dpy, darkGC);
-      if (stippleGC)    XFreeGC (xdisp, stippleGC);
+      if (stippleGC)    XFreeGC (dpy, stippleGC);
-      if (dimple)       XFreePixmap (xdisp, dimple);
+      if (dimple)       XFreePixmap (dpy, dimple);
-      if (upArrow)      XFreePixmap (xdisp, upArrow);
+      if (upArrow)      XFreePixmap (dpy, upArrow);
-      if (downArrow)    XFreePixmap (xdisp, downArrow);
+      if (downArrow)    XFreePixmap (dpy, downArrow);
-      if (upArrowHi)    XFreePixmap (xdisp, upArrowHi);
+      if (upArrowHi)    XFreePixmap (dpy, upArrowHi);
-      if (downArrowHi)  XFreePixmap (xdisp, downArrowHi);
+      if (downArrowHi)  XFreePixmap (dpy, downArrowHi);
 #endif
 #ifdef RXVT_SCROLLBAR
-      if (topShadowGC)  XFreeGC (xdisp, topShadowGC);
+      if (topShadowGC)  XFreeGC (dpy, topShadowGC);
-      if (botShadowGC)  XFreeGC (xdisp, botShadowGC);
+      if (botShadowGC)  XFreeGC (dpy, botShadowGC);
-      if (scrollbarGC)  XFreeGC (xdisp, scrollbarGC);
+      if (scrollbarGC)  XFreeGC (dpy, scrollbarGC);
 #endif
-      if (gc)   XFreeGC (xdisp, gc);
+      if (gc)   XFreeGC (dpy, gc);
       delete drawable;
       // destroy all windows
       if (parent[0])
-        XDestroyWindow (xdisp, parent[0]);
+        XDestroyWindow (dpy, parent[0]);
+      for (int i = 0; i < TOTAL_COLORS; i++)
+        if (ISSET_PIXCOLOR (i))
+          {
+            pix_colors_focused   [i].free (this);
+#if OFF_FOCUS_FADING
+            pix_colors_unfocused [i].free (this);
+#endif
+          }
       clear ();
     }
-  // TODO: free pixcolours, colours should become part of rxvt_display
-  delete pix_colors_focused;
+  delete [] pix_colors_focused;
 #if OFF_FOCUS_FADING
-  delete pix_colors_unfocused;
+  delete [] pix_colors_unfocused;
 #endif
   displays.put (display);
   scr_release ();
 {
   HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
   cmd_pid = 0;
-  if (!OPTION (Opt_hold))
+  if (!option (Opt_hold))
     destroy ();
 }
 void
 rxvt_term::destroy ()
       im_ev.stop (display);
 #endif
 #if HAVE_SCROLLBARS
       scrollbar_ev.stop (display);
 #endif
-#if TRANSPARENT
+#if ENABLE_TRANSPARENCY || ENABLE_PERL
       rootwin_ev.stop (display);
 #endif
       incr_ev.stop ();
       termwin_ev.stop (display);
       vt_ev.stop (display);
 #ifdef KEYSYM_RESOURCE
   keyboard->register_done ();
 #endif
 #ifdef HAVE_SCROLLBARS
-  if (OPTION (Opt_scrollBar))
+  if (option (Opt_scrollBar))
     scrollBar.setIdle ();    /* set existence for size calculations */
 #endif
   pty = ptytty::create ();
   init_xlocale ();
   scr_reset (); // initialize screen
 #if 0
-  XSynchronize (xdisp, True);
+  XSynchronize (dpy, True);
 #endif
 #ifdef HAVE_SCROLLBARS
-  if (OPTION (Opt_scrollBar))
+  if (option (Opt_scrollBar))
     resize_scrollbar ();      /* create and map scrollbar */
 #endif
-#ifdef TRANSPARENT
+#ifdef ENABLE_TRANSPARENCY
-  if (OPTION (Opt_transparent))
+  if (option (Opt_transparent))
     {
-      XSelectInput (xdisp, display->root, PropertyChangeMask);
+      XSelectInput (dpy, display->root, PropertyChangeMask);
       check_our_parents ();
       rootwin_ev.start (display, display->root);
     }
 #endif
+#if ENABLE_PERL
+  rootwin_ev.start (display, display->root);
+#endif
   set_colorfgbg ();
   init_command (cmd_argv);
 #if ENABLE_XEMBED
   if (rs[Rs_embed])
     {
       long info[2] = { 0, XEMBED_MAPPED };
-      XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
+      XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
                        32, PropModeReplace, (unsigned char *)&info, 2);
     }
 #endif
-  XMapWindow (xdisp, vt);
+  XMapWindow (dpy, vt);
-  XMapWindow (xdisp, parent[0]);
+  XMapWindow (dpy, parent[0]);
   return true;
 }
 static struct sig_handlers
   return p;
 }
 /*----------------------------------------------------------------------*/
 /*
- * window size/position calculcations for XSizeHint and other storage.
+ * window size/position calculations for XSizeHint and other storage.
  * if width/height are non-zero then override calculated width/height
  */
 void
 rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
 {
   if (scrollBar.state)
     {
       sb_w = scrollbar_TotalWidth ();
       szHint.base_width += sb_w;
-      if (!OPTION (Opt_scrollBar_right))
+      if (!option (Opt_scrollBar_right))
         window_vt_x += sb_w;
     }
-  szHint.width_inc = fwidth;
+  szHint.width_inc  = fwidth;
   szHint.height_inc = fheight;
-  szHint.min_width = szHint.base_width + szHint.width_inc;
+  szHint.min_width  = szHint.base_width + szHint.width_inc;
   szHint.min_height = szHint.base_height + szHint.height_inc;
   if (newwidth && newwidth - szHint.base_width < max_width)
     {
       szHint.width = newwidth;
     {
       min_it (height, max_height);
       szHint.height = szHint.base_height + height;
     }
-  if (scrollBar.state && OPTION (Opt_scrollBar_right))
+  if (scrollBar.state && option (Opt_scrollBar_right))
     window_sb_x = szHint.width - sb_w;
   if (recalc_x)
-    szHint.x += DisplayWidth  (xdisp, display->screen) - szHint.width  - 2 * ext_bwidth;
+    szHint.x += DisplayWidth  (dpy, display->screen) - szHint.width  - 2 * ext_bwidth;
   if (recalc_y)
-    szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
+    szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
   ncol = width / fwidth;
   nrow = height / fheight;
 }
   delete fontset[0];
   fontset[0] = fs;
   prop = (*fs)[1]->properties ();
   prop.height += lineSpace;
-  fs->set_prop (prop);
+  fs->set_prop (prop, false);
   fwidth  = prop.width;
   fheight = prop.height;
   fbase   = prop.ascent;
         {
           fontset[style] = fs = new rxvt_fontset (this);
           rxvt_fontprop prop2 = prop;
           if (res)
-            prop2.weight = prop2.slant = rxvt_fontprop::unset;
+            {
+              fs->populate (res);
+              fs->set_prop (prop2, false);
+            }
           else
             {
-              res = fontset[0]->fontdesc;
+              fs->populate (fontset[0]->fontdesc);
               if (SET_STYLE (0, style) & RS_Bold)   prop2.weight = rxvt_fontprop::bold;
               if (SET_STYLE (0, style) & RS_Italic) prop2.slant  = rxvt_fontprop::italic;
+              fs->set_prop (prop2, true);
             }
-          fs->populate (res);
-          fs->set_prop (prop2);
         }
 #else
       fontset[style] = fontset[0];
 #endif
     }
   return true;
 }
 void rxvt_term::set_string_property (Atom prop, const char *str, int len)
 {
-  XChangeProperty (xdisp, parent[0],
+  XChangeProperty (dpy, parent[0],
                    prop, XA_STRING, 8, PropModeReplace,
                    (const unsigned char *)str, len >= 0 ? len : strlen (str));
 }
 void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
 {
   wchar_t *ws = rxvt_mbstowcs (str, len);
   char *s = rxvt_wcstoutf8 (ws);
-  XChangeProperty (xdisp, parent[0],
+  XChangeProperty (dpy, parent[0],
                    prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
                    (const unsigned char *)s, strlen (s));
   free (s);
   free (ws);
   pix_colors_focused[idx] = xcol;
   /* XSetWindowAttributes attr; */
   /* Cursor cursor; */
 done:
-#if OFF_FOCUS_FADING
-  if (rs[Rs_fade])
-    {
-      rgba c;
-      pix_colors [Color_fade].get (c);
-      pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
-    }
-#endif
   /*TODO: handle Color_BD, scrollbar background, etc. */
+  update_fade_color (idx);
   recolour_cursor ();
   scr_recolour ();
 }
 #else
 #endif                          /* XTERM_COLOR_CHANGE */
 void
 rxvt_term::recolour_cursor ()
 {
-  XColor xcol[2];
+  XColor fg, bg;
-  xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
+  (ISSET_PIXCOLOR (Color_pointer_fg)
-                     ? pix_colors_focused[Color_pointer_fg]
+     ? pix_colors_focused[Color_pointer_fg]
-                     : pix_colors_focused[Color_fg];
+     : pix_colors_focused[Color_fg]).get (fg);
-  xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
+  (ISSET_PIXCOLOR (Color_pointer_bg)
-                     ? pix_colors_focused[Color_pointer_bg]
+     ? pix_colors_focused[Color_pointer_bg]
-                     : pix_colors_focused[Color_bg];
+     : pix_colors_focused[Color_bg]).get (bg);
-  XQueryColors (xdisp, cmap, xcol, 2);
-  XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1);
+  XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
 }
 /*----------------------------------------------------------------------*/
 /*
  * find if fg/bg matches any of the normal (low-intensity) colors
   rxvt_warn ("can't get colour '%s', continuing without.\n", name);
   return false;
 }
+void
+rxvt_term::alias_color (int dst, int src)
+{
+  pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
+}
 /* -------------------------------------------------------------------- *
  * -                         WINDOW RESIZING                          - *
  * -------------------------------------------------------------------- */
 void
 rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
   int fix_screen;
   int old_width  = szHint.width;
   int old_height = szHint.height;
   window_calc (newwidth, newheight);
+  if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
-  XSetWMNormalHints (xdisp, parent[0], &szHint);
+    XSetWMNormalHints (dpy, parent[0], &szHint);
   if (!ignoreparent)
     {
 #ifdef SMART_RESIZE
       /*
       int x, y, x1, y1;
       int dx, dy;
       unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
       Window unused_cr;
-      XTranslateCoordinates (xdisp, parent[0], display->root,
+      XTranslateCoordinates (dpy, parent[0], display->root,
                              0, 0, &x, &y, &unused_cr);
-      XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
+      XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
                     &unused_w1, &unused_h1, &unused_b1, &unused_d1);
       /*
        * if display->root isn't the parent window, a WM will probably have offset
        * our position for handles and decorations.  Counter it
        */
         {
           x -= x1;
           y -= y1;
         }
-      x1 = (DisplayWidth  (xdisp, display->screen) - old_width ) / 2;
+      x1 = (DisplayWidth  (dpy, display->screen) - old_width ) / 2;
-      y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
+      y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
       dx = old_width  - szHint.width;
       dy = old_height - szHint.height;
       /* Check position of the center of the window */
       if (x < x1)             /* left half */
       if (y < y1)             /* top half */
         dy = 0;
       else if (y == y1)       /* exact center */
         dy /= 2;
-      XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
+      XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
                          szHint.width, szHint.height);
 #else
-      XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
+      XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
 #endif
     }
   fix_screen = ncol != prev_ncol || nrow != prev_nrow;
   if (fix_screen || newwidth != old_width || newheight != old_height)
     {
       if (scrollBar.state)
         {
-          XMoveResizeWindow (xdisp, scrollBar.win,
+          XMoveResizeWindow (dpy, scrollBar.win,
                              window_sb_x, 0,
                              scrollbar_TotalWidth (), szHint.height);
           resize_scrollbar ();
         }
-      XMoveResizeWindow (xdisp, vt,
+      XMoveResizeWindow (dpy, vt,
                          window_vt_x, window_vt_y,
                          width, height);
       scr_clear ();
 #ifdef XPM_BACKGROUND
     }
   if (fix_screen || old_height == 0)
     scr_reset ();
-#ifdef XPM_BACKGROUND
+  // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
-  if (pixmap)
+  //scr_touch (false);
+#ifdef HAVE_BG_PIXMAP
+  if (bgPixmap.pixmap)
     scr_touch (false);
 #endif
 #ifdef USE_XIM
-  IMSetStatusPosition ();
+  IMSetPosition ();
 #endif
 }
 /*
  * Set the width/height of the vt window in characters.  Units are pixels.
 {
   XWindowAttributes wattr;
   if (newwidth == 0 || newheight == 0)
     {
-      XGetWindowAttributes (xdisp, display->root, &wattr);
+      XGetWindowAttributes (dpy, display->root, &wattr);
       if (newwidth == 0)
         newwidth = wattr.width - szHint.base_width;
       if (newheight == 0)
         newheight = wattr.height - szHint.base_height;
 #ifdef USE_XIM
 void
 rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
 {
-  fg = pix_colors[Color_fg];
+  fg = pix_colors [Color_fg];
-  bg = pix_colors[Color_bg];
+  bg = pix_colors [Color_bg];
 }
 void
 rxvt_term::im_set_size (XRectangle &size)
 {
       strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
       if ((p = strchr (server + 1, '@')) != NULL)      /* first one only */
         *p = '\0';
-      atom = XInternAtom (xdisp, server, False);
+      atom = XInternAtom (dpy, server, False);
-      win = XGetSelectionOwner (xdisp, atom);
+      win = XGetSelectionOwner (dpy, atom);
       if (win != None)
         return True;
     }
                "*",
                fheight,
                fheight + 1, fheight - 1,
                fheight - 2, fheight + 2);
-      fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
+      fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
                            &missing_charset_list, &missing_charset_count, &def_string);
       if (missing_charset_list)
         XFreeStringList (missing_charset_list);
                              preedit_attr,
                              status_attr ? XNStatusAttributes : NULL,
                              status_attr, NULL);
   if (preedit_attr) XFree (preedit_attr);
-  if (status_attr) XFree (status_attr);
+  if (status_attr)  XFree (status_attr);
-  if (fs) XFreeFontSet (xdisp, fs);
+  if (fs)           XFreeFontSet (dpy, fs);
   if (Input_Context == NULL)
     {
       rxvt_warn ("failed to create input context, continuing without XIM.\n");
       im_destroy ();
   // 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
-  if (input_style & XIMPreeditArea)
-    IMSetStatusPosition ();
+  IMSetPosition ();
   return true;
 }
 void
     SET_LOCALE (locale);
 #endif
 }
 void
-rxvt_term::IMSetStatusPosition ()
+rxvt_term::IMSetPosition ()
 {
   XRectangle preedit_rect, status_rect, *needed_rect;
   XVaNestedList preedit_attr, status_attr;
   if (!Input_Context
       || !focus
-      || !(input_style & XIMPreeditArea)
+      || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
       || !IMisRunning ())
     return;
+  if (input_style & XIMPreeditPosition)
+    {
+      im_set_size (preedit_rect);
+      preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
+      XSetICValues (Input_Context,
+                    XNPreeditAttributes, preedit_attr, NULL);
+    }
+  else
+    {
-  /* Getting the necessary width of preedit area */
+      /* Getting the necessary width of preedit area */
-  status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
+      status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
-  XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
+      XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
-  XFree (status_attr);
+      XFree (status_attr);
-  im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
+      im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
-  XFree (needed_rect);
+      XFree (needed_rect);
-  preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
+      preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
-  status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
+      status_attr  = XVaCreateNestedList (0, XNArea, &status_rect,  NULL);
-  XSetICValues (Input_Context,
+      XSetICValues (Input_Context,
-                XNPreeditAttributes, preedit_attr,
+                    XNPreeditAttributes, preedit_attr,
-                XNStatusAttributes, status_attr, NULL);
+                    XNStatusAttributes,  status_attr,
+                    NULL);
+      XFree (status_attr);
+    }
-  XFree (preedit_attr);
+   XFree (preedit_attr);
-  XFree (status_attr);
 }
 #endif                          /* USE_XIM */
 /*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.214 by root, Tue Jan 31 19:53:30 2006 UTC vs. Revision 1.239 by sasha, Fri Aug 3 22:40:10 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.214 by root, Tue Jan 31 19:53:30 2006 UTC vs.
Revision 1.239 by sasha, Fri Aug 3 22:40:10 2007 UTC