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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.309 by root, Wed Feb 27 01:02:33 2008 UTC vs.
Revision 1.324 by sf-exg, Wed Mar 31 13:14:50 2010 UTC

     {
       if (cc->c2 == c2) return c1;
       cc = (*this)[cc->c1];
     }
-  // check to see wether this combination already exists otherwise
+  // check to see whether this combination already exists otherwise
   for (cc = v.end (); cc-- > v.begin (); )
     {
       if (cc->c1 == c1 && cc->c2 == c2)
         return COMPOSE_LO + (cc - v.begin ());
     }
   delete fontset[0];
 #ifdef HAVE_BG_PIXMAP
   bgPixmap.destroy ();
 #endif
+#ifdef HAVE_AFTERIMAGE
+  if (asv)
+    destroy_asvisual (asv, 0);
+  if (asimman)
+    destroy_image_manager (asimman, 0);
+#endif
   if (display)
     {
       selection_clear ();
+      selection_clear (true);
 #ifdef USE_XIM
       im_destroy ();
 #endif
       scrollBar.destroy ();
   /* clear all resources */
   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);
       if (rs[Rs_geometry])
         flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
       if (flags & WidthValue)
         {
+          if (!w)
+            rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
-          ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
+          ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
           szHint.flags |= USSize;
         }
       if (flags & HeightValue)
         {
+          if (!h)
+            rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
-          nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
+          nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
           szHint.flags |= USSize;
         }
       if (flags & XValue)
         {
                 szHint.win_gravity = SouthEastGravity;
               else
                 szHint.win_gravity = SouthWestGravity;
             }
         }
-      if (!szHint.width || !szHint.height)
-        rxvt_fatal ("window width or height must not be zero, aborting.\n");
     }
   /* TODO: BOUNDS */
   width = ncol * fwidth;
   height = nrow * fheight;
     szHint.x += DisplayWidth  (dpy, display->screen) - szHint.width  - 2 * ext_bwidth;
   if (recalc_y)
     szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
-  ncol = width / fwidth;
+  ncol = width  / fwidth;
   nrow = height / fheight;
 }
 /*----------------------------------------------------------------------*/
 /*
   ws.ws_col = ncol;
   ws.ws_row = nrow;
   ws.ws_xpixel = width;
   ws.ws_ypixel = height;
-  (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
+  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);
   delete fontset[0];
   fontset[0] = fs;
   prop = (*fs)[1]->properties ();
   prop.height += lineSpace;
+  prop.width += letterSpace;
   fs->set_prop (prop, false);
   fwidth  = prop.width;
   fheight = prop.height;
   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)))
+  bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
+  // 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[0], &szHint);
+      szHint.flags |= PBaseSize | PResizeInc;
+    }
   if (!ignoreparent)
     {
 #ifdef SMART_RESIZE
       /*
 #else
       XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
 #endif
     }
+  if (set_hint)
+    XSetWMNormalHints (dpy, parent[0], &szHint);
   fix_screen = ncol != prev_ncol || nrow != prev_nrow;
   if (fix_screen || newwidth != old_width || newheight != old_height)
     {
       if (scrollBar.state)
 #ifdef HAVE_BG_PIXMAP
       if (bgPixmap.window_size_sensitive ())
         update_background ();
 #endif
-      scr_clear ();
     }
   if (fix_screen || old_height == 0)
     scr_reset ();
-  // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
-  //scr_touch (false);
 #ifdef HAVE_BG_PIXMAP
 //  TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
 //  if (bgPixmap.pixmap)
 //    scr_touch (false);
 /* Checking whether input method is running. */
 bool
 rxvt_term::IMisRunning ()
 {
-  char *p;
   Atom atom;
   Window win;
   char server[IMBUFSIZ];
   /* get current locale modifier */
-  if ((p = XSetLocaleModifiers (NULL)) != NULL)
+  if (char *p = XSetLocaleModifiers (0))
     {
       strcpy (server, "@server=");
-      strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
+      strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
-      if ((p = strchr (server + 1, '@')) != NULL)      /* first one only */
+      if (p = strchr (server + 1, '@'))      /* first one only */
         *p = '\0';
       atom = XInternAtom (dpy, server, False);
       win = XGetSelectionOwner (dpy, atom);
   term->make_current ();
   if (text)
     {
-      void *str;
+      wchar_t *str;
       if (!text->encoding_is_wchar && text->string.multi_byte)
         {
           // of course, X makes it ugly again
           if (term->rs[Rs_imLocale])
             SET_LOCALE (term->rs[Rs_imLocale]);
-          str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
+          str = rxvt_temp_buf<wchar_t> (text->length + 1);
-          mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
+          mbstowcs (str, text->string.multi_byte, text->length + 1);
           if (term->rs[Rs_imLocale])
             SET_LOCALE (term->locale);
         }
       else
-        str = (void *)text->string.wide_char;
+        str = text->string.wide_char;
       HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
                     DT_INT, call_data->caret,
                     DT_INT, call_data->chg_first,
                     DT_INT, call_data->chg_length,

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.309 by root, Wed Feb 27 01:02:33 2008 UTC vs. Revision 1.324 by sf-exg, Wed Mar 31 13:14:50 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.309 by root, Wed Feb 27 01:02:33 2008 UTC vs.
Revision 1.324 by sf-exg, Wed Mar 31 13:14:50 2010 UTC