gdisplay expose in undo

made 0.99.22 release

-Yosh

ChangeLog

+Thu Mar 19 21:36:41 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* Made 0.99.22 release
+	* app/undo.c: handle exposure correctly
+	
 Thu Mar 19 22:05:56 CST 1998  Larry Ewing  <lewing@gimp.org>
 
 	* app/palette.c: fixed out of bounds reference in pallete_create.

NOTES

-Some notes on GIMP-0.99.21:
+Some notes on GIMP-0.99.22:
 
 Please remove everything from your old plugins dir before upgrading to
-0.99.21. Some plugins are no longer in the dist and will not be updated.
+0.99.22. Some plugins are no longer in the dist and will not be updated.
 
 -- Federico Mena <federico@nuclecu.unam.mx>
 -- Christoph Hoegl <darkwing@bsddmail.franken.de>

README

 The GIMP: the GNU Image Manipulation Program
 --------------------------------------------
 
-This is version 0.99.21 of the GIMP. For the most part it contains all
+This is version 0.99.22 of the GIMP. For the most part it contains all
 of the features that will be in version 1.0 of the GIMP. It does,
 however, lack a) documentation, b) robustness and c) some of the
 plug-ins found in the 0.54 version.
 
-The main difference between v0.99.21 and much earlier versions is the
+The main difference between v0.99.22 and much earlier versions is the
 use of a tile based memory management for images. This allows the GIMP
 to work with images much larger than physical memory in a usable
 fashion. Before such memory management, the GIMP was nearly unusable

app/core/gimpimage-undo-push.c

@@ -275,6 +275,8 @@ pop_stack (GImage  *gimage,
   GSList *tmp;
   int status = 0;
   int in_group = 0;
+  int x, y;
+  GDisplay *gdisp;
 
   /*  Keep popping until we pop a valid object
    *  or get to the end of a group if we're in one
@@ -312,6 +314,27 @@ pop_stack (GImage  *gimage,
       if (status && !in_group)
 	{
 	  /*  Flush any image updates and displays  */
+	  gdisp = gdisplay_active();
+	  if (gdisp != NULL) {
+	    if (gdisp->disp_xoffset || gdisp->disp_yoffset)
+	      {
+		gdk_window_get_size (gdisp->canvas->window, &x, &y);
+		if (gdisp->disp_yoffset)
+		  {
+		    gdisplay_expose_area (gdisp, 0, 0, gdisp->disp_width,
+					  gdisp->disp_yoffset);
+		    gdisplay_expose_area (gdisp, 0, gdisp->disp_yoffset + y,
+					  gdisp->disp_width, gdisp->disp_height);
+		  }
+		if (gdisp->disp_xoffset)
+		  {
+		    gdisplay_expose_area (gdisp, 0, 0, gdisp->disp_xoffset,
+					  gdisp->disp_height);
+		    gdisplay_expose_area (gdisp, gdisp->disp_xoffset + x, 0,
+					  gdisp->disp_width, gdisp->disp_height);
+		  }
+	      }
+	  }
 	  gdisplays_flush ();
 
 	  /*  If the shrink_wrap flag was set  */

app/undo.c

@@ -275,6 +275,8 @@ pop_stack (GImage  *gimage,
   GSList *tmp;
   int status = 0;
   int in_group = 0;
+  int x, y;
+  GDisplay *gdisp;
 
   /*  Keep popping until we pop a valid object
    *  or get to the end of a group if we're in one
@@ -312,6 +314,27 @@ pop_stack (GImage  *gimage,
       if (status && !in_group)
 	{
 	  /*  Flush any image updates and displays  */
+	  gdisp = gdisplay_active();
+	  if (gdisp != NULL) {
+	    if (gdisp->disp_xoffset || gdisp->disp_yoffset)
+	      {
+		gdk_window_get_size (gdisp->canvas->window, &x, &y);
+		if (gdisp->disp_yoffset)
+		  {
+		    gdisplay_expose_area (gdisp, 0, 0, gdisp->disp_width,
+					  gdisp->disp_yoffset);
+		    gdisplay_expose_area (gdisp, 0, gdisp->disp_yoffset + y,
+					  gdisp->disp_width, gdisp->disp_height);
+		  }
+		if (gdisp->disp_xoffset)
+		  {
+		    gdisplay_expose_area (gdisp, 0, 0, gdisp->disp_xoffset,
+					  gdisp->disp_height);
+		    gdisplay_expose_area (gdisp, gdisp->disp_xoffset + x, 0,
+					  gdisp->disp_width, gdisp->disp_height);
+		  }
+	      }
+	  }
 	  gdisplays_flush ();
 
 	  /*  If the shrink_wrap flag was set  */

configure.in

@@ -7,10 +7,10 @@ GIMP_MAJOR_VERSION_NUMBER=0
 dnl $Format: "GIMP_MINOR_VERSION_NUMBER=$ReleaseMinorVersion$" $
 GIMP_MINOR_VERSION_NUMBER=99
 dnl $Format: "GIMP_MICRO_VERSION_NUMBER=$ReleaseMicroVersion$" $
-GIMP_MICRO_VERSION_NUMBER=21
+GIMP_MICRO_VERSION_NUMBER=22
 
 dnl $Format: "AM_INIT_AUTOMAKE(gimp, $ReleaseVersion$)" $
-AM_INIT_AUTOMAKE(gimp, 0.99.21)
+AM_INIT_AUTOMAKE(gimp, 0.99.22)
 
 dnl Specify a header configuration file
 AM_CONFIG_HEADER(config.h)