forked from AuroraMiddleware/gtk
4851efe296
Sun May 3 13:38:22 1998 Owen Taylor <otaylor@gtk.org>
* configure.in acheader.h gdk/gdkwindow.c
Check for Shape extension both on the client and server
side. (And, more importantly, check for the shape extension
so we may include -lXext even when compiling with --disable-xshm)
Don't set override_redirect on all shaped windows. It isn't
necessary.
* gdk/gdkwindow.c: Set ->colormap to NULL for root
and foreign windows. Use this to check if we
need to get the colormap from X.
Fri May 1 22:32:47 1998 Owen Taylor <otaylor@gtk.org>
* gtk/gtkbutton.c (gtk_button_paint): Draw the areas
between the default and the button always in GTK_STATE_NORMAL.
* gtk/gtkrange.c (gtk_range_style_set): Added a style_set
callback.
Fri May 1 16:40:57 1998 Owen Taylor <otaylor@gtk.org>
* gdk/gdkpixmap.c (gdk_pixmap_colormap_create_from_xpmp[_d]):
Fix a buffer overflow on pixmaps that claim to have
more than 31 characters per pixel.
(gdk_pixmap_read_string): Don't wrap around strings longer
than half of address space ;-)
* gtk/gtk[vh]ruler.c gtk/gtkinputdialog.c: Expand some buffers
that were used for printing integers.
* */* (almost):
Style: All
int foo () { ... }
changed to
int foo (void) { ... }
^^^^^^^ This is why some many files changed
Even where there were proper prototypes elsewhere.
* gdk/gxid.c (handle_claim_device): Some extra checks.
It isn't safe against being fed bad X id's, but at
least it should be safe against deleting all your
files.
121 lines
2.5 KiB
C
121 lines
2.5 KiB
C
/* GLIB - Library of useful routines for C programming
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Library General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Library General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Library General Public
|
|
* License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 02111-1307, USA.
|
|
*/
|
|
#include <sys/time.h>
|
|
#include <unistd.h>
|
|
#include "glib.h"
|
|
|
|
|
|
typedef struct _GRealTimer GRealTimer;
|
|
|
|
struct _GRealTimer
|
|
{
|
|
struct timeval start;
|
|
struct timeval end;
|
|
gint active;
|
|
};
|
|
|
|
|
|
GTimer*
|
|
g_timer_new (void)
|
|
{
|
|
GRealTimer *timer;
|
|
|
|
timer = g_new (GRealTimer, 1);
|
|
timer->active = TRUE;
|
|
|
|
gettimeofday (&timer->start, NULL);
|
|
|
|
return ((GTimer*) timer);
|
|
}
|
|
|
|
void
|
|
g_timer_destroy (GTimer *timer)
|
|
{
|
|
g_assert (timer != NULL);
|
|
|
|
g_free (timer);
|
|
}
|
|
|
|
void
|
|
g_timer_start (GTimer *timer)
|
|
{
|
|
GRealTimer *rtimer;
|
|
|
|
g_assert (timer != NULL);
|
|
|
|
rtimer = (GRealTimer*) timer;
|
|
gettimeofday (&rtimer->start, NULL);
|
|
rtimer->active = 1;
|
|
}
|
|
|
|
void
|
|
g_timer_stop (GTimer *timer)
|
|
{
|
|
GRealTimer *rtimer;
|
|
|
|
g_assert (timer != NULL);
|
|
|
|
rtimer = (GRealTimer*) timer;
|
|
gettimeofday (&rtimer->end, NULL);
|
|
rtimer->active = 0;
|
|
}
|
|
|
|
void
|
|
g_timer_reset (GTimer *timer)
|
|
{
|
|
GRealTimer *rtimer;
|
|
|
|
g_assert (timer != NULL);
|
|
|
|
rtimer = (GRealTimer*) timer;
|
|
gettimeofday (&rtimer->start, NULL);
|
|
}
|
|
|
|
gdouble
|
|
g_timer_elapsed (GTimer *timer,
|
|
gulong *microseconds)
|
|
{
|
|
GRealTimer *rtimer;
|
|
struct timeval elapsed;
|
|
gdouble total;
|
|
|
|
g_assert (timer != NULL);
|
|
|
|
rtimer = (GRealTimer*) timer;
|
|
|
|
if (rtimer->active)
|
|
gettimeofday (&rtimer->end, NULL);
|
|
|
|
if (rtimer->start.tv_usec > rtimer->end.tv_usec)
|
|
{
|
|
rtimer->end.tv_usec += 1000000;
|
|
rtimer->end.tv_sec--;
|
|
}
|
|
|
|
elapsed.tv_usec = rtimer->end.tv_usec - rtimer->start.tv_usec;
|
|
elapsed.tv_sec = rtimer->end.tv_sec - rtimer->start.tv_sec;
|
|
|
|
total = elapsed.tv_sec + ((gdouble) elapsed.tv_usec / 1e6);
|
|
|
|
if (microseconds)
|
|
*microseconds = elapsed.tv_usec;
|
|
|
|
return total;
|
|
}
|