forked from AuroraMiddleware/gtk
Make gdk.h an include-only header
Move declarations to other headers, and introduce some new ones: gdkmain.h, gdkrectangle.h, gdkthreads.h.
This commit is contained in:
Matthias Clasen
parent
e613d26448
commit
9d644e9d2d
@ -85,14 +85,17 @@ gdk_public_h_sources = \
|
||||
gdkkeys.h \
|
||||
gdkkeysyms.h \
|
||||
gdkkeysyms-compat.h \
|
||||
gdkmain.h \
|
||||
gdkpango.h \
|
||||
gdkpixbuf.h \
|
||||
gdkprivate.h \
|
||||
gdkproperty.h \
|
||||
gdkrectangle.h \
|
||||
gdkscreen.h \
|
||||
gdkselection.h \
|
||||
gdkspawn.h \
|
||||
gdktestutils.h \
|
||||
gdkthreads.h \
|
||||
gdktypes.h \
|
||||
gdkvisual.h \
|
||||
gdkwindow.h
|
||||
|
||||
135
gdk/gdk.h
135
gdk/gdk.h
@ -44,149 +44,20 @@
|
||||
#include <gdk/gdkinput.h>
|
||||
#include <gdk/gdkkeys.h>
|
||||
#include <gdk/gdkkeysyms.h>
|
||||
#include <gdk/gdkmain.h>
|
||||
#include <gdk/gdkpango.h>
|
||||
#include <gdk/gdkpixbuf.h>
|
||||
#include <gdk/gdkproperty.h>
|
||||
#include <gdk/gdkrectangle.h>
|
||||
#include <gdk/gdkscreen.h>
|
||||
#include <gdk/gdkselection.h>
|
||||
#include <gdk/gdkspawn.h>
|
||||
#include <gdk/gdktestutils.h>
|
||||
#include <gdk/gdkthreads.h>
|
||||
#include <gdk/gdktypes.h>
|
||||
#include <gdk/gdkvisual.h>
|
||||
#include <gdk/gdkwindow.h>
|
||||
|
||||
#undef __GDK_H_INSIDE__
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
||||
/* Initialization, exit and events
|
||||
*/
|
||||
#define GDK_PRIORITY_EVENTS (G_PRIORITY_DEFAULT)
|
||||
void gdk_enable_multidevice (void);
|
||||
void gdk_parse_args (gint *argc,
|
||||
gchar ***argv);
|
||||
void gdk_init (gint *argc,
|
||||
gchar ***argv);
|
||||
gboolean gdk_init_check (gint *argc,
|
||||
gchar ***argv);
|
||||
void gdk_add_option_entries_libgtk_only (GOptionGroup *group);
|
||||
void gdk_pre_parse_libgtk_only (void);
|
||||
|
||||
gchar* gdk_set_locale (void);
|
||||
|
||||
G_CONST_RETURN char *gdk_get_program_class (void);
|
||||
void gdk_set_program_class (const char *program_class);
|
||||
|
||||
/* Push and pop error handlers for X errors
|
||||
*/
|
||||
void gdk_error_trap_push (void);
|
||||
/* warn unused because you could use pop_ignored otherwise */
|
||||
G_GNUC_WARN_UNUSED_RESULT gint gdk_error_trap_pop (void);
|
||||
void gdk_error_trap_pop_ignored (void);
|
||||
|
||||
|
||||
gchar* gdk_get_display (void);
|
||||
G_CONST_RETURN gchar* gdk_get_display_arg_name (void);
|
||||
|
||||
#ifndef GDK_MULTIDEVICE_SAFE
|
||||
GdkGrabStatus gdk_pointer_grab (GdkWindow *window,
|
||||
gboolean owner_events,
|
||||
GdkEventMask event_mask,
|
||||
GdkWindow *confine_to,
|
||||
GdkCursor *cursor,
|
||||
guint32 time_);
|
||||
GdkGrabStatus gdk_keyboard_grab (GdkWindow *window,
|
||||
gboolean owner_events,
|
||||
guint32 time_);
|
||||
#endif /* GDK_MULTIDEVICE_SAFE */
|
||||
|
||||
#ifndef GDK_MULTIHEAD_SAFE
|
||||
|
||||
#ifndef GDK_MULTIDEVICE_SAFE
|
||||
void gdk_pointer_ungrab (guint32 time_);
|
||||
void gdk_keyboard_ungrab (guint32 time_);
|
||||
gboolean gdk_pointer_is_grabbed (void);
|
||||
#endif /* GDK_MULTIDEVICE_SAFE */
|
||||
|
||||
gint gdk_screen_width (void) G_GNUC_CONST;
|
||||
gint gdk_screen_height (void) G_GNUC_CONST;
|
||||
|
||||
gint gdk_screen_width_mm (void) G_GNUC_CONST;
|
||||
gint gdk_screen_height_mm (void) G_GNUC_CONST;
|
||||
|
||||
void gdk_beep (void);
|
||||
#endif /* GDK_MULTIHEAD_SAFE */
|
||||
|
||||
void gdk_flush (void);
|
||||
|
||||
#ifndef GDK_MULTIHEAD_SAFE
|
||||
void gdk_set_double_click_time (guint msec);
|
||||
#endif
|
||||
|
||||
/* Rectangle utilities
|
||||
*/
|
||||
gboolean gdk_rectangle_intersect (const GdkRectangle *src1,
|
||||
const GdkRectangle *src2,
|
||||
GdkRectangle *dest);
|
||||
void gdk_rectangle_union (const GdkRectangle *src1,
|
||||
const GdkRectangle *src2,
|
||||
GdkRectangle *dest);
|
||||
|
||||
GType gdk_rectangle_get_type (void) G_GNUC_CONST;
|
||||
|
||||
#define GDK_TYPE_RECTANGLE (gdk_rectangle_get_type ())
|
||||
|
||||
/* Miscellaneous */
|
||||
#ifndef GDK_MULTIHEAD_SAFE
|
||||
gboolean gdk_event_send_client_message (GdkEvent *event,
|
||||
GdkNativeWindow winid);
|
||||
void gdk_event_send_clientmessage_toall (GdkEvent *event);
|
||||
#endif
|
||||
gboolean gdk_event_send_client_message_for_display (GdkDisplay *display,
|
||||
GdkEvent *event,
|
||||
GdkNativeWindow winid);
|
||||
|
||||
void gdk_notify_startup_complete (void);
|
||||
|
||||
void gdk_notify_startup_complete_with_id (const gchar* startup_id);
|
||||
|
||||
/* Threading
|
||||
*/
|
||||
|
||||
void gdk_threads_enter (void);
|
||||
void gdk_threads_leave (void);
|
||||
void gdk_threads_init (void);
|
||||
void gdk_threads_set_lock_functions (GCallback enter_fn,
|
||||
GCallback leave_fn);
|
||||
|
||||
guint gdk_threads_add_idle_full (gint priority,
|
||||
GSourceFunc function,
|
||||
gpointer data,
|
||||
GDestroyNotify notify);
|
||||
guint gdk_threads_add_idle (GSourceFunc function,
|
||||
gpointer data);
|
||||
guint gdk_threads_add_timeout_full (gint priority,
|
||||
guint interval,
|
||||
GSourceFunc function,
|
||||
gpointer data,
|
||||
GDestroyNotify notify);
|
||||
guint gdk_threads_add_timeout (guint interval,
|
||||
GSourceFunc function,
|
||||
gpointer data);
|
||||
guint gdk_threads_add_timeout_seconds_full (gint priority,
|
||||
guint interval,
|
||||
GSourceFunc function,
|
||||
gpointer data,
|
||||
GDestroyNotify notify);
|
||||
guint gdk_threads_add_timeout_seconds (guint interval,
|
||||
GSourceFunc function,
|
||||
gpointer data);
|
||||
|
||||
#define GDK_THREADS_ENTER() gdk_threads_enter()
|
||||
#define GDK_THREADS_LEAVE() gdk_threads_leave()
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
|
||||
#endif /* __GDK_H__ */
|
||||
|
||||
@ -568,14 +568,22 @@ void gdk_set_show_events (gboolean show_events);
|
||||
gboolean gdk_get_show_events (void);
|
||||
|
||||
#ifndef GDK_MULTIHEAD_SAFE
|
||||
void gdk_add_client_message_filter (GdkAtom message_type,
|
||||
GdkFilterFunc func,
|
||||
gpointer data);
|
||||
|
||||
gboolean gdk_setting_get (const gchar *name,
|
||||
GValue *value);
|
||||
gboolean gdk_setting_get (const gchar *name,
|
||||
GValue *value);
|
||||
void gdk_add_client_message_filter (GdkAtom message_type,
|
||||
GdkFilterFunc func,
|
||||
gpointer data);
|
||||
gboolean gdk_event_send_client_message (GdkEvent *event,
|
||||
GdkNativeWindow winid);
|
||||
void gdk_event_send_clientmessage_toall (GdkEvent *event);
|
||||
|
||||
#endif /* GDK_MULTIHEAD_SAFE */
|
||||
|
||||
gboolean gdk_event_send_client_message_for_display (GdkDisplay *display,
|
||||
GdkEvent *event,
|
||||
GdkNativeWindow winid);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __GDK_EVENTS_H__ */
|
||||
|
||||
110
gdk/gdkmain.h
Normal file
110
gdk/gdkmain.h
Normal file
@ -0,0 +1,110 @@
|
||||
/* GDK - The GIMP Drawing Kit
|
||||
* 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 Lesser 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
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser 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.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
|
||||
* file for a list of people on the GTK+ Team. See the ChangeLog
|
||||
* files for a list of changes. These files are distributed with
|
||||
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
||||
*/
|
||||
|
||||
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
|
||||
#error "Only <gdk/gdk.h> can be included directly."
|
||||
#endif
|
||||
|
||||
#ifndef __GDK_MAIN_H__
|
||||
#define __GDK_MAIN_H__
|
||||
|
||||
#include <glib.h>
|
||||
#include <gdk/gdktypes.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
||||
/* Initialization, exit and events
|
||||
*/
|
||||
|
||||
#define GDK_PRIORITY_EVENTS (G_PRIORITY_DEFAULT)
|
||||
|
||||
void gdk_parse_args (gint *argc,
|
||||
gchar ***argv);
|
||||
void gdk_init (gint *argc,
|
||||
gchar ***argv);
|
||||
gboolean gdk_init_check (gint *argc,
|
||||
gchar ***argv);
|
||||
void gdk_add_option_entries_libgtk_only (GOptionGroup *group);
|
||||
void gdk_pre_parse_libgtk_only (void);
|
||||
|
||||
gchar* gdk_set_locale (void);
|
||||
void gdk_enable_multidevice (void);
|
||||
|
||||
G_CONST_RETURN gchar *gdk_get_program_class (void);
|
||||
void gdk_set_program_class (const gchar *program_class);
|
||||
|
||||
void gdk_notify_startup_complete (void);
|
||||
void gdk_notify_startup_complete_with_id (const gchar* startup_id);
|
||||
|
||||
/* Push and pop error handlers for X errors
|
||||
*/
|
||||
void gdk_error_trap_push (void);
|
||||
/* warn unused because you could use pop_ignored otherwise */
|
||||
G_GNUC_WARN_UNUSED_RESULT gint gdk_error_trap_pop (void);
|
||||
void gdk_error_trap_pop_ignored (void);
|
||||
|
||||
|
||||
G_CONST_RETURN gchar *gdk_get_display_arg_name (void);
|
||||
gchar* gdk_get_display (void);
|
||||
|
||||
#ifndef GDK_MULTIDEVICE_SAFE
|
||||
GdkGrabStatus gdk_pointer_grab (GdkWindow *window,
|
||||
gboolean owner_events,
|
||||
GdkEventMask event_mask,
|
||||
GdkWindow *confine_to,
|
||||
GdkCursor *cursor,
|
||||
guint32 time_);
|
||||
GdkGrabStatus gdk_keyboard_grab (GdkWindow *window,
|
||||
gboolean owner_events,
|
||||
guint32 time_);
|
||||
#endif /* GDK_MULTIDEVICE_SAFE */
|
||||
|
||||
#ifndef GDK_MULTIHEAD_SAFE
|
||||
|
||||
#ifndef GDK_MULTIDEVICE_SAFE
|
||||
void gdk_pointer_ungrab (guint32 time_);
|
||||
void gdk_keyboard_ungrab (guint32 time_);
|
||||
gboolean gdk_pointer_is_grabbed (void);
|
||||
#endif /* GDK_MULTIDEVICE_SAFE */
|
||||
|
||||
gint gdk_screen_width (void) G_GNUC_CONST;
|
||||
gint gdk_screen_height (void) G_GNUC_CONST;
|
||||
|
||||
gint gdk_screen_width_mm (void) G_GNUC_CONST;
|
||||
gint gdk_screen_height_mm (void) G_GNUC_CONST;
|
||||
|
||||
void gdk_set_double_click_time (guint msec);
|
||||
|
||||
void gdk_beep (void);
|
||||
|
||||
#endif /* GDK_MULTIHEAD_SAFE */
|
||||
|
||||
void gdk_flush (void);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __GDK_MAIN_H__ */
|
||||
51
gdk/gdkrectangle.h
Normal file
51
gdk/gdkrectangle.h
Normal file
@ -0,0 +1,51 @@
|
||||
/* GDK - The GIMP Drawing Kit
|
||||
* 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 Lesser 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
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser 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.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
|
||||
* file for a list of people on the GTK+ Team. See the ChangeLog
|
||||
* files for a list of changes. These files are distributed with
|
||||
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
||||
*/
|
||||
|
||||
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
|
||||
#error "Only <gdk/gdk.h> can be included directly."
|
||||
#endif
|
||||
|
||||
#ifndef __GDK_RECTANGLE_H__
|
||||
#define __GDK_RECTANGLE_H__
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
/* Rectangle utilities
|
||||
*/
|
||||
gboolean gdk_rectangle_intersect (const GdkRectangle *src1,
|
||||
const GdkRectangle *src2,
|
||||
GdkRectangle *dest);
|
||||
void gdk_rectangle_union (const GdkRectangle *src1,
|
||||
const GdkRectangle *src2,
|
||||
GdkRectangle *dest);
|
||||
|
||||
GType gdk_rectangle_get_type (void) G_GNUC_CONST;
|
||||
|
||||
#define GDK_TYPE_RECTANGLE (gdk_rectangle_get_type ())
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __GDK__RECTANGLE_H__ */
|
||||
70
gdk/gdkthreads.h
Normal file
70
gdk/gdkthreads.h
Normal file
@ -0,0 +1,70 @@
|
||||
/* GDK - The GIMP Drawing Kit
|
||||
* 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 Lesser 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
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser 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.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
|
||||
* file for a list of people on the GTK+ Team. See the ChangeLog
|
||||
* files for a list of changes. These files are distributed with
|
||||
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
|
||||
*/
|
||||
|
||||
#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
|
||||
#error "Only <gdk/gdk.h> can be included directly."
|
||||
#endif
|
||||
|
||||
#ifndef __GDK_THREADS_H__
|
||||
#define __GDK_THREADS_H__
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
void gdk_threads_init (void);
|
||||
void gdk_threads_enter (void);
|
||||
void gdk_threads_leave (void);
|
||||
void gdk_threads_set_lock_functions (GCallback enter_fn,
|
||||
GCallback leave_fn);
|
||||
|
||||
guint gdk_threads_add_idle_full (gint priority,
|
||||
GSourceFunc function,
|
||||
gpointer data,
|
||||
GDestroyNotify notify);
|
||||
guint gdk_threads_add_idle (GSourceFunc function,
|
||||
gpointer data);
|
||||
guint gdk_threads_add_timeout_full (gint priority,
|
||||
guint interval,
|
||||
GSourceFunc function,
|
||||
gpointer data,
|
||||
GDestroyNotify notify);
|
||||
guint gdk_threads_add_timeout (guint interval,
|
||||
GSourceFunc function,
|
||||
gpointer data);
|
||||
guint gdk_threads_add_timeout_seconds_full (gint priority,
|
||||
guint interval,
|
||||
GSourceFunc function,
|
||||
gpointer data,
|
||||
GDestroyNotify notify);
|
||||
guint gdk_threads_add_timeout_seconds (guint interval,
|
||||
GSourceFunc function,
|
||||
gpointer data);
|
||||
|
||||
#define GDK_THREADS_ENTER() gdk_threads_enter()
|
||||
#define GDK_THREADS_LEAVE() gdk_threads_leave()
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* __GDK_THREADS_H__ */
|
||||
Loading…
Reference in New Issue
Block a user