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

Change GDK_WINDOWING_WIN32 usage to #ifdef also here.

Browse Source 
1999-10-03  Tor Lillqvist  <tml@iki.fi>

* gdk/gdkimage.h gdk/gdkpixmap.h: Change GDK_WINDOWING_WIN32 usage
to #ifdef also here.

* gdk/win32/*.h gdk/win32/*.c: Make corresponding changes as those
Owen did to the X11 backend.

* gdk/win32/gdkdraw.c (gdk_draw_pixmap): Fix it again, don't use
ScrollWindowEx when blitting inside a window, it can't be correct
in the general case.

* gdk/win32/gdkevents.c: Don't handle WM_SIZING, handling
WM_GETMINMAXINFO is easier.

* gdk/win32/gdkimage.c (gdk_image_new): Create new image with
depth equal to the bitspixel value, not the visual's depth.

* gdk/win32/gdkvisual.c (gdk_visual_init): Set the visual's depth
to 24 even if the bitspixel value is 32.

* gdk/gdkrgb.c (gdk_rgb_select_conv): After the above change, no
need to check for depth==32 when bpp==32, depth will always be 24.
This commit is contained in:
Tor Lillqvist
1999-10-02 22:42:58 +00:00
committed by Tor Lillqvist
parent b196167dbc
commit c50941c82d
54 changed files with 636 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
gdk/win32/gdkmain-win32.c
View File

@ -33,11 +33,10 @@
#include <limits.h>
#include <io.h>
#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
#include <gdk/gdki18n.h>
#include "gdkx.h"
#include "gdkinput.h"
#include "gdk.h"
#include "gdkprivate.h"
#include "gdkinputprivate.h"
#include "gdkkeysyms.h"
static void gdkx_XConvertCase (KeySym symbol,
KeySym *lower,
@ -52,15 +51,6 @@ static void gdk_exit_func (void);
static int gdk_initialized = 0; /* 1 if the library is initialized,
* 0 otherwise.
*/
static guint start; /* We use the millisecond
* timestamps from GetTickCount
*/
static gboolean timerp = TRUE; /* If TRUE use timeouts when waiting
* for Windows messages
*/
static guint32 timer_val = 20; /* Timeout in milliseconds.
*/
#ifdef G_ENABLE_DEBUG
static const GDebugKey gdk_debug_keys[] = {
{"events", GDK_DEBUG_EVENTS},
@ -118,8 +108,6 @@ gdk_init_check (int *argc,
if (g_thread_supported ())
gdk_threads_mutex = g_mutex_new ();
start = GetTickCount ();
#ifdef G_ENABLE_DEBUG
{
gchar *debug_string = getenv("GDK_DEBUG");
@ -325,113 +313,6 @@ gdk_get_use_xshm (void)
return TRUE;
}
/*
*--------------------------------------------------------------
* gdk_time_get
*
* Get the number of milliseconds since the library was
* initialized.
*
* Arguments:
*
* Results:
* The time since the library was initialized is returned.
* This time value is accurate to milliseconds even though
* a more accurate time down to the microsecond could be
* returned.
*
* Side effects:
*
*--------------------------------------------------------------
*/
guint32
gdk_time_get (void)
{
guint32 milliseconds;
guint32 end = GetTickCount ();
if (end < start)
milliseconds = 0xFFFFFFFF - (start - end) + 1;
else
milliseconds = end - start;
return milliseconds;
}
/*
*--------------------------------------------------------------
* gdk_timer_get
*
* Returns the current timer.
*
* Arguments:
*
* Results:
* Returns the current timer interval. This interval is
* in units of milliseconds.
*
* Side effects:
*
*--------------------------------------------------------------
*/
guint32
gdk_timer_get (void)
{
return timer_val;
}
/*
*--------------------------------------------------------------
* gdk_timer_set
*
* Sets the timer interval.
*
* Arguments:
* "milliseconds" is the new value for the timer.
*
* Results:
*
* Side effects:
* Calls to "gdk_event_get" will last for a maximum
* of time of "milliseconds". However, a value of 0
* milliseconds will cause "gdk_event_get" to block
* indefinately until an event is received.
*
*--------------------------------------------------------------
*/
void
gdk_timer_set (guint32 milliseconds)
{
timer_val = milliseconds;
#ifdef USE_PEEKNAMEDPIPE
/* When using PeekNamedPipe, can't have too long timeouts.
*/
if (timer_val > 10)
timer_val = 10;
else if (timer_val == 0)
timer_val = 0;
#endif
}
void
gdk_timer_enable (void)
{
timerp = TRUE;
}
void
gdk_timer_disable (void)
{
#ifdef USE_PEEKNAMEDPIPE
/* Can't disable timeouts when using PeekNamedPipe */
#else
timerp = FALSE;
#endif
}
/*
*--------------------------------------------------------------
* gdk_screen_width