callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved pointer tracking when dragging navigator rectangle - less lag.

Browse Source 
Sat Aug 21 00:07:37 BST 1999  Adam D. Moss  <adam@gimp.org>

	* app/nav_window.c: Improved pointer tracking when
	dragging navigator rectangle - less lag.  Enabled hourglass
	when computing first thumbnail.
This commit is contained in:
BST 1999 Adam D. Moss
1999-08-20 23:20:23 +00:00
committed by Adam D. Moss
parent 70407d2882
commit 517cf3ed98
4 changed files with 93 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Aug 21 00:07:37 BST 1999 Adam D. Moss <adam@gimp.org>
* app/nav_window.c: Improved pointer tracking when
dragging navigator rectangle - less lag. Enabled hourglass
when computing first thumbnail.
1999-08-20 Michael Natterer <mitschel@cs.tu-berlin.de> 1999-08-20 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/Makefile.am * app/Makefile.am

47
app/display/gimpnavigationeditor.c
View File

@ -16,9 +16,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdio.h>
#include "appenv.h" #include "appenv.h"
#include "actionarea.h" #include "actionarea.h"
#include "colormaps.h" #include "colormaps.h"
#include "cursorutil.h"
#include "info_dialog.h" #include "info_dialog.h"
#include "info_window.h" #include "info_window.h"
#include "gdisplay.h" #include "gdisplay.h"
@ -33,11 +36,7 @@
#define MAX_BUF 256 #define MAX_BUF 256
#define PREVIEW_MASK GDK_EXPOSURE_MASK | \ #define PREVIEW_MASK GDK_EXPOSURE_MASK | \
GDK_MOTION_NOTIFY | \
GDK_POINTER_MOTION_MASK | \
GDK_BUTTON_PRESS_MASK | \ GDK_BUTTON_PRESS_MASK | \
GDK_BUTTON_RELEASE_MASK | \
GDK_BUTTON_MOTION_MASK | \
GDK_KEY_PRESS_MASK | \ GDK_KEY_PRESS_MASK | \
GDK_KEY_RELEASE_MASK GDK_KEY_RELEASE_MASK
@ -51,7 +50,7 @@ struct _NavWinData
{ {
gboolean showingPreview; gboolean showingPreview;
GtkWidget *preview; GtkWidget *preview;
void *gdisp_ptr; /* I'a not happy 'bout this one */ void *gdisp_ptr; /* I'm not happy 'bout this one */
GtkWidget *previewBox; GtkWidget *previewBox;
GtkWidget *previewAlign; GtkWidget *previewAlign;
gdouble ratio; gdouble ratio;
@ -59,7 +58,7 @@ struct _NavWinData
gint dispx; /* x pos of top left corner of display area */ gint dispx; /* x pos of top left corner of display area */
gint dispy; /* y pos of top left corner of display area */ gint dispy; /* y pos of top left corner of display area */
gint dispwidth; /* width of display area */ gint dispwidth; /* width of display area */
gint dispheight; /* height left corner of display area */ gint dispheight; /* height of display area */
gint sig_hand_id; gint sig_hand_id;
gboolean sq_grabbed; /* In the process of moving the preview square */ gboolean sq_grabbed; /* In the process of moving the preview square */
gint motion_offsetx; gint motion_offsetx;
@ -312,7 +311,6 @@ create_preview_widget(NavWinData *iwd)
/* iwd); */ /* iwd); */
gtk_widget_grab_focus(image); gtk_widget_grab_focus(image);
} }
#if 0 #if 0
@ -370,6 +368,9 @@ nav_window_update_preview(NavWinData *iwd)
gint x,y,has_alpha; gint x,y,has_alpha;
gint pwidth, pheight; gint pwidth, pheight;
GimpImage *gimage; GimpImage *gimage;
gimp_add_busy_cursors();
gdisp = (GDisplay *) iwd->gdisp_ptr; gdisp = (GDisplay *) iwd->gdisp_ptr;
/* Calculate preview size */ /* Calculate preview size */
@ -412,6 +413,8 @@ nav_window_update_preview(NavWinData *iwd)
temp_buf_free (preview_buf); temp_buf_free (preview_buf);
nav_window_disp_area(iwd,gdisp); nav_window_disp_area(iwd,gdisp);
gimp_remove_busy_cursors (NULL);
} }
static gint static gint
@ -485,7 +488,9 @@ nav_window_preview_events (GtkWidget *widget,
GDisplay *gdisp; GDisplay *gdisp;
GdkEventButton *bevent; GdkEventButton *bevent;
GdkEventMotion *mevent; GdkEventMotion *mevent;
GdkModifierType mask;
gint tx,ty; gint tx,ty;
gint mx,my;
iwd = (NavWinData *)data; iwd = (NavWinData *)data;
@ -519,6 +524,11 @@ nav_window_preview_events (GtkWidget *widget,
iwd->motion_offsety = ty - iwd->dispy; iwd->motion_offsety = ty - iwd->dispy;
iwd->sq_grabbed = TRUE; iwd->sq_grabbed = TRUE;
gtk_grab_add(widget); gtk_grab_add(widget);
gdk_pointer_grab (widget->window, TRUE,
GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_MOTION_MASK,
widget->window, NULL, 0);
} }
else else
{ {
@ -563,6 +573,8 @@ nav_window_preview_events (GtkWidget *widget,
case 1: case 1:
iwd->sq_grabbed = FALSE; iwd->sq_grabbed = FALSE;
gtk_grab_remove(widget); gtk_grab_remove(widget);
gdk_pointer_ungrab (0);
gdk_flush();
break; break;
default: default:
break; break;
@ -575,8 +587,12 @@ nav_window_preview_events (GtkWidget *widget,
if(!iwd->sq_grabbed) if(!iwd->sq_grabbed)
break; break;
tx = mevent->x; gdk_window_get_pointer (widget->window, &mx, &my, &mask);
ty = mevent->y; tx = mx;
ty = my;
tx = tx - iwd->motion_offsetx;
ty = ty - iwd->motion_offsety;
if(tx < 0) if(tx < 0)
{ {
@ -598,19 +614,14 @@ nav_window_preview_events (GtkWidget *widget,
ty = iwd->pwidth; ty = iwd->pwidth;
} }
tx = tx - iwd->motion_offsetx; if((tx + iwd->dispwidth) >= iwd->pwidth)
ty = ty - iwd->motion_offsety;
if(tx < 0 || (tx + iwd->dispwidth) >= iwd->pwidth)
{ {
iwd->motion_offsetx = mevent->x - iwd->dispx; tx = iwd->pwidth - iwd->dispwidth;
tx = iwd->dispx;
} }
if(ty < 0 || (ty + iwd->dispheight) >= iwd->pheight) if((ty + iwd->dispheight) >= iwd->pheight)
{ {
iwd->motion_offsety = mevent->y - iwd->dispy; ty = iwd->pheight - iwd->dispheight;
ty = iwd->dispy;
} }
/* Update the real display */ /* Update the real display */

47
app/display/gimpnavigationview.c
View File

@ -16,9 +16,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdio.h>
#include "appenv.h" #include "appenv.h"
#include "actionarea.h" #include "actionarea.h"
#include "colormaps.h" #include "colormaps.h"
#include "cursorutil.h"
#include "info_dialog.h" #include "info_dialog.h"
#include "info_window.h" #include "info_window.h"
#include "gdisplay.h" #include "gdisplay.h"
@ -33,11 +36,7 @@
#define MAX_BUF 256 #define MAX_BUF 256
#define PREVIEW_MASK GDK_EXPOSURE_MASK | \ #define PREVIEW_MASK GDK_EXPOSURE_MASK | \
GDK_MOTION_NOTIFY | \
GDK_POINTER_MOTION_MASK | \
GDK_BUTTON_PRESS_MASK | \ GDK_BUTTON_PRESS_MASK | \
GDK_BUTTON_RELEASE_MASK | \
GDK_BUTTON_MOTION_MASK | \
GDK_KEY_PRESS_MASK | \ GDK_KEY_PRESS_MASK | \
GDK_KEY_RELEASE_MASK GDK_KEY_RELEASE_MASK
@ -51,7 +50,7 @@ struct _NavWinData
{ {
gboolean showingPreview; gboolean showingPreview;
GtkWidget *preview; GtkWidget *preview;
void *gdisp_ptr; /* I'a not happy 'bout this one */ void *gdisp_ptr; /* I'm not happy 'bout this one */
GtkWidget *previewBox; GtkWidget *previewBox;
GtkWidget *previewAlign; GtkWidget *previewAlign;
gdouble ratio; gdouble ratio;
@ -59,7 +58,7 @@ struct _NavWinData
gint dispx; /* x pos of top left corner of display area */ gint dispx; /* x pos of top left corner of display area */
gint dispy; /* y pos of top left corner of display area */ gint dispy; /* y pos of top left corner of display area */
gint dispwidth; /* width of display area */ gint dispwidth; /* width of display area */
gint dispheight; /* height left corner of display area */ gint dispheight; /* height of display area */
gint sig_hand_id; gint sig_hand_id;
gboolean sq_grabbed; /* In the process of moving the preview square */ gboolean sq_grabbed; /* In the process of moving the preview square */
gint motion_offsetx; gint motion_offsetx;
@ -312,7 +311,6 @@ create_preview_widget(NavWinData *iwd)
/* iwd); */ /* iwd); */
gtk_widget_grab_focus(image); gtk_widget_grab_focus(image);
} }
#if 0 #if 0
@ -370,6 +368,9 @@ nav_window_update_preview(NavWinData *iwd)
gint x,y,has_alpha; gint x,y,has_alpha;
gint pwidth, pheight; gint pwidth, pheight;
GimpImage *gimage; GimpImage *gimage;
gimp_add_busy_cursors();
gdisp = (GDisplay *) iwd->gdisp_ptr; gdisp = (GDisplay *) iwd->gdisp_ptr;
/* Calculate preview size */ /* Calculate preview size */
@ -412,6 +413,8 @@ nav_window_update_preview(NavWinData *iwd)
temp_buf_free (preview_buf); temp_buf_free (preview_buf);
nav_window_disp_area(iwd,gdisp); nav_window_disp_area(iwd,gdisp);
gimp_remove_busy_cursors (NULL);
} }
static gint static gint
@ -485,7 +488,9 @@ nav_window_preview_events (GtkWidget *widget,
GDisplay *gdisp; GDisplay *gdisp;
GdkEventButton *bevent; GdkEventButton *bevent;
GdkEventMotion *mevent; GdkEventMotion *mevent;
GdkModifierType mask;
gint tx,ty; gint tx,ty;
gint mx,my;
iwd = (NavWinData *)data; iwd = (NavWinData *)data;
@ -519,6 +524,11 @@ nav_window_preview_events (GtkWidget *widget,
iwd->motion_offsety = ty - iwd->dispy; iwd->motion_offsety = ty - iwd->dispy;
iwd->sq_grabbed = TRUE; iwd->sq_grabbed = TRUE;
gtk_grab_add(widget); gtk_grab_add(widget);
gdk_pointer_grab (widget->window, TRUE,
GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_MOTION_MASK,
widget->window, NULL, 0);
} }
else else
{ {
@ -563,6 +573,8 @@ nav_window_preview_events (GtkWidget *widget,
case 1: case 1:
iwd->sq_grabbed = FALSE; iwd->sq_grabbed = FALSE;
gtk_grab_remove(widget); gtk_grab_remove(widget);
gdk_pointer_ungrab (0);
gdk_flush();
break; break;
default: default:
break; break;
@ -575,8 +587,12 @@ nav_window_preview_events (GtkWidget *widget,
if(!iwd->sq_grabbed) if(!iwd->sq_grabbed)
break; break;
tx = mevent->x; gdk_window_get_pointer (widget->window, &mx, &my, &mask);
ty = mevent->y; tx = mx;
ty = my;
tx = tx - iwd->motion_offsetx;
ty = ty - iwd->motion_offsety;
if(tx < 0) if(tx < 0)
{ {
@ -598,19 +614,14 @@ nav_window_preview_events (GtkWidget *widget,
ty = iwd->pwidth; ty = iwd->pwidth;
} }
tx = tx - iwd->motion_offsetx; if((tx + iwd->dispwidth) >= iwd->pwidth)
ty = ty - iwd->motion_offsety;
if(tx < 0 || (tx + iwd->dispwidth) >= iwd->pwidth)
{ {
iwd->motion_offsetx = mevent->x - iwd->dispx; tx = iwd->pwidth - iwd->dispwidth;
tx = iwd->dispx;
} }
if(ty < 0 || (ty + iwd->dispheight) >= iwd->pheight) if((ty + iwd->dispheight) >= iwd->pheight)
{ {
iwd->motion_offsety = mevent->y - iwd->dispy; ty = iwd->pheight - iwd->dispheight;
ty = iwd->dispy;
} }
/* Update the real display */ /* Update the real display */

47
app/nav_window.c
View File

@ -16,9 +16,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdio.h>
#include "appenv.h" #include "appenv.h"
#include "actionarea.h" #include "actionarea.h"
#include "colormaps.h" #include "colormaps.h"
#include "cursorutil.h"
#include "info_dialog.h" #include "info_dialog.h"
#include "info_window.h" #include "info_window.h"
#include "gdisplay.h" #include "gdisplay.h"
@ -33,11 +36,7 @@
#define MAX_BUF 256 #define MAX_BUF 256
#define PREVIEW_MASK GDK_EXPOSURE_MASK | \ #define PREVIEW_MASK GDK_EXPOSURE_MASK | \
GDK_MOTION_NOTIFY | \
GDK_POINTER_MOTION_MASK | \
GDK_BUTTON_PRESS_MASK | \ GDK_BUTTON_PRESS_MASK | \
GDK_BUTTON_RELEASE_MASK | \
GDK_BUTTON_MOTION_MASK | \
GDK_KEY_PRESS_MASK | \ GDK_KEY_PRESS_MASK | \
GDK_KEY_RELEASE_MASK GDK_KEY_RELEASE_MASK
@ -51,7 +50,7 @@ struct _NavWinData
{ {
gboolean showingPreview; gboolean showingPreview;
GtkWidget *preview; GtkWidget *preview;
void *gdisp_ptr; /* I'a not happy 'bout this one */ void *gdisp_ptr; /* I'm not happy 'bout this one */
GtkWidget *previewBox; GtkWidget *previewBox;
GtkWidget *previewAlign; GtkWidget *previewAlign;
gdouble ratio; gdouble ratio;
@ -59,7 +58,7 @@ struct _NavWinData
gint dispx; /* x pos of top left corner of display area */ gint dispx; /* x pos of top left corner of display area */
gint dispy; /* y pos of top left corner of display area */ gint dispy; /* y pos of top left corner of display area */
gint dispwidth; /* width of display area */ gint dispwidth; /* width of display area */
gint dispheight; /* height left corner of display area */ gint dispheight; /* height of display area */
gint sig_hand_id; gint sig_hand_id;
gboolean sq_grabbed; /* In the process of moving the preview square */ gboolean sq_grabbed; /* In the process of moving the preview square */
gint motion_offsetx; gint motion_offsetx;
@ -312,7 +311,6 @@ create_preview_widget(NavWinData *iwd)
/* iwd); */ /* iwd); */
gtk_widget_grab_focus(image); gtk_widget_grab_focus(image);
} }
#if 0 #if 0
@ -370,6 +368,9 @@ nav_window_update_preview(NavWinData *iwd)
gint x,y,has_alpha; gint x,y,has_alpha;
gint pwidth, pheight; gint pwidth, pheight;
GimpImage *gimage; GimpImage *gimage;
gimp_add_busy_cursors();
gdisp = (GDisplay *) iwd->gdisp_ptr; gdisp = (GDisplay *) iwd->gdisp_ptr;
/* Calculate preview size */ /* Calculate preview size */
@ -412,6 +413,8 @@ nav_window_update_preview(NavWinData *iwd)
temp_buf_free (preview_buf); temp_buf_free (preview_buf);
nav_window_disp_area(iwd,gdisp); nav_window_disp_area(iwd,gdisp);
gimp_remove_busy_cursors (NULL);
} }
static gint static gint
@ -485,7 +488,9 @@ nav_window_preview_events (GtkWidget *widget,
GDisplay *gdisp; GDisplay *gdisp;
GdkEventButton *bevent; GdkEventButton *bevent;
GdkEventMotion *mevent; GdkEventMotion *mevent;
GdkModifierType mask;
gint tx,ty; gint tx,ty;
gint mx,my;
iwd = (NavWinData *)data; iwd = (NavWinData *)data;
@ -519,6 +524,11 @@ nav_window_preview_events (GtkWidget *widget,
iwd->motion_offsety = ty - iwd->dispy; iwd->motion_offsety = ty - iwd->dispy;
iwd->sq_grabbed = TRUE; iwd->sq_grabbed = TRUE;
gtk_grab_add(widget); gtk_grab_add(widget);
gdk_pointer_grab (widget->window, TRUE,
GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_MOTION_MASK,
widget->window, NULL, 0);
} }
else else
{ {
@ -563,6 +573,8 @@ nav_window_preview_events (GtkWidget *widget,
case 1: case 1:
iwd->sq_grabbed = FALSE; iwd->sq_grabbed = FALSE;
gtk_grab_remove(widget); gtk_grab_remove(widget);
gdk_pointer_ungrab (0);
gdk_flush();
break; break;
default: default:
break; break;
@ -575,8 +587,12 @@ nav_window_preview_events (GtkWidget *widget,
if(!iwd->sq_grabbed) if(!iwd->sq_grabbed)
break; break;
tx = mevent->x; gdk_window_get_pointer (widget->window, &mx, &my, &mask);
ty = mevent->y; tx = mx;
ty = my;
tx = tx - iwd->motion_offsetx;
ty = ty - iwd->motion_offsety;
if(tx < 0) if(tx < 0)
{ {
@ -598,19 +614,14 @@ nav_window_preview_events (GtkWidget *widget,
ty = iwd->pwidth; ty = iwd->pwidth;
} }
tx = tx - iwd->motion_offsetx; if((tx + iwd->dispwidth) >= iwd->pwidth)
ty = ty - iwd->motion_offsety;
if(tx < 0 || (tx + iwd->dispwidth) >= iwd->pwidth)
{ {
iwd->motion_offsetx = mevent->x - iwd->dispx; tx = iwd->pwidth - iwd->dispwidth;
tx = iwd->dispx;
} }
if(ty < 0 || (ty + iwd->dispheight) >= iwd->pheight) if((ty + iwd->dispheight) >= iwd->pheight)
{ {
iwd->motion_offsety = mevent->y - iwd->dispy; ty = iwd->pheight - iwd->dispheight;
ty = iwd->dispy;
} }
/* Update the real display */ /* Update the real display */