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

Various configuration and portability related changes. See ChangeLog

Browse Source 
for details.
                                        -owt
This commit is contained in:
Owen Taylor
1997-12-03 21:43:44 +00:00
parent c3ac6c80a6
commit 4b4c6aff91
17 changed files with 286 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/Makefile.am
View File

@ -74,3 +74,5 @@ files:
@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
echo $$p; \
done
$(DEP_FILES) : $(BUILT_SOURCES)

10
gdk/gdk.c
View File

@ -49,7 +49,7 @@
#include "gdkx.h"
#include "gdkkeysyms.h"
#endif
#include "gdki18n.h"
#ifndef X_GETTIMEOFDAY
#define X_GETTIMEOFDAY(tv) gettimeofday (tv, NULL)
@ -1754,8 +1754,10 @@ gdk_event_translate (GdkEvent *event,
{
if(gdk_dnd.drag_really)
{
GdkPoint foo = {xevent->xbutton.x_root,
xevent->xbutton.y_root};
GdkPoint foo;
foo.x = xevent->xbutton.x_root;
foo.y = xevent->xbutton.y_root;
XUngrabPointer(gdk_display, CurrentTime);
if(dnd_drag_target != None)
@ -2522,7 +2524,7 @@ gdk_event_translate (GdkEvent *event,
{
event->other.type = GDK_OTHER_EVENT;
event->other.window = window;
event->other.xevent = &other_xevent[other_xevent_i];
event->other.xevent = (GdkXEvent *)&other_xevent[other_xevent_i];
memcpy (&other_xevent[other_xevent_i], xevent, sizeof (XEvent));
other_xevent_i = (other_xevent_i+1) % OTHER_XEVENT_BUFSIZE;
return_val = TRUE;

1
gdk/gdk.h
View File

@ -20,7 +20,6 @@
#include <gdk/gdktypes.h>
#include <gdk/gdki18n.h>
#ifdef __cplusplus

28
gdk/gdki18n.h
View File

@ -19,13 +19,32 @@
#ifndef __GDK_I18N_H__
#define __GDK_I18N_H__
/* GDK uses "glib". (And so does GTK).
*/
#include <glib.h>
/* international string support */
#include <stdlib.h>
#ifdef HAVE_WCTYPE_H
#include <wctype.h>
#else
#define iswalnum isalnum
/* Other functions could be added here if necessary */
#endif /* HAVE_WCTYPE_H */
#ifndef X_LOCALE
#ifdef HAVE_WCHAR_H
#include <wchar.h>
#else /* !HAVE_WCHAR_H */
#ifdef HAVE_WCSTR_H
#include <wcstr.h>
#endif /* HAVE_WCSTR_H*/
#endif /* HAVE_WCHAR_H */
#ifdef X_LOCALE
#else /* X_LOCALE */
#include <X11/Xfuncproto.h>
#include <X11/Xosdefs.h>
@ -38,6 +57,7 @@ extern int _Xmblen (
#if NeedFunctionPrototypes
const char *s, size_t n
#endif
);
_XFUNCPROTOEND
@ -133,7 +153,7 @@ extern int _g_mbtowc (wchar_t *wstr, const char *str, size_t len);
#define wcstombs(a,b,c) _Xwcstombs ((a),(b),(c))
#define wcslen(a) _Xwcslen ((a))
#define wcscpy(a,b) _Xwcscpy ((a),(b))
#define wcsncpy(a,b,c) _Xwcsnpy ((a),(b),(c))
#define wcsncpy(a,b,c) _Xwcsncpy ((a),(b),(c))
#ifdef __cplusplus
}
@ -141,4 +161,4 @@ extern int _g_mbtowc (wchar_t *wstr, const char *str, size_t len);
#endif /* X_LOCALE */
#endif __GDK_I18N_H__
#endif /* __GDK_I18N_H__ */

8
gdk/gdktypes.h
View File

@ -19,8 +19,6 @@
#define __GDK_TYPES_H__
#include <wchar.h>
/* GDK uses "glib". (And so does GTK).
*/
#include <glib.h>
@ -960,15 +958,13 @@ struct _GdkEventClient
} data;
};
#ifndef _XLIB_H_
#define XEvent void
#endif
typedef void GdkXEvent; /* Can be cast to XEvent */
struct _GdkEventOther
{
GdkEventType type;
GdkWindow *window;
XEvent *xevent;
GdkXEvent *xevent;
};
union _GdkEvent

10
gdk/x11/gdkmain-x11.c
View File

@ -49,7 +49,7 @@
#include "gdkx.h"
#include "gdkkeysyms.h"
#endif
#include "gdki18n.h"
#ifndef X_GETTIMEOFDAY
#define X_GETTIMEOFDAY(tv) gettimeofday (tv, NULL)
@ -1754,8 +1754,10 @@ gdk_event_translate (GdkEvent *event,
{
if(gdk_dnd.drag_really)
{
GdkPoint foo = {xevent->xbutton.x_root,
xevent->xbutton.y_root};
GdkPoint foo;
foo.x = xevent->xbutton.x_root;
foo.y = xevent->xbutton.y_root;
XUngrabPointer(gdk_display, CurrentTime);
if(dnd_drag_target != None)
@ -2522,7 +2524,7 @@ gdk_event_translate (GdkEvent *event,
{
event->other.type = GDK_OTHER_EVENT;
event->other.window = window;
event->other.xevent = &other_xevent[other_xevent_i];
event->other.xevent = (GdkXEvent *)&other_xevent[other_xevent_i];
memcpy (&other_xevent[other_xevent_i], xevent, sizeof (XEvent));
other_xevent_i = (other_xevent_i+1) % OTHER_XEVENT_BUFSIZE;
return_val = TRUE;