AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

x11: Move remaining APIs into gdkx11utils.h

Browse Source 
Now gdkx.h is a clean header equivalent to gdk.h.
This commit is contained in:
Benjamin Otte 2010-12-20 15:55:16 +01:00 committed by Matthias Clasen
parent dd177b5201
commit 04d1459fca
4 changed files with 65 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gdk/Makefile.am
View File

@ -221,6 +221,7 @@ x11_introspection_files = \
x11/gdkx11property.h \
x11/gdkx11screen.h \
x11/gdkx11selection.h \
x11/gdkx11utils.h \
x11/gdkx11visual.h \
x11/gdkx11window.h

1
gdk/x11/Makefile.am
View File

@ -81,6 +81,7 @@ libgdkx11include_HEADERS = \
gdkx11property.h \
gdkx11screen.h \
gdkx11selection.h \
gdkx11utils.h \
gdkx11visual.h \
gdkx11window.h

24
gdk/x11/gdkx.h
View File

@ -60,32 +60,10 @@
#include <gdk/x11/gdkx11property.h>
#include <gdk/x11/gdkx11screen.h>
#include <gdk/x11/gdkx11selection.h>
#include <gdk/x11/gdkx11utils.h>
#include <gdk/x11/gdkx11visual.h>
#include <gdk/x11/gdkx11window.h>
#undef __GDKX_H_INSIDE__
G_BEGIN_DECLS
#ifndef GDK_MULTIHEAD_SAFE
Window gdk_x11_get_default_root_xwindow (void);
Display *gdk_x11_get_default_xdisplay (void);
#endif
#ifndef GDK_MULTIHEAD_SAFE
/**
* GDK_ROOT_WINDOW:
*
* Obtains the Xlib window id of the root window of the current screen.
*/
#define GDK_ROOT_WINDOW() (gdk_x11_get_default_root_xwindow ())
#endif
#ifndef GDK_MULTIHEAD_SAFE
void gdk_x11_grab_server (void);
void gdk_x11_ungrab_server (void);
#endif
G_END_DECLS
#endif /* __GDK_X_H__ */

62
gdk/x11/gdkx11utils.h Normal file
View File

@ -0,0 +1,62 @@
/* 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 (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
#error "Only <gdk/gdkx.h> can be included directly."
#endif
#ifndef __GDK_X11_UTILS_H__
#define __GDK_X11_UTILS_H__
#include <gdk/gdk.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
G_BEGIN_DECLS
#ifndef GDK_MULTIHEAD_SAFE
Window gdk_x11_get_default_root_xwindow (void);
Display *gdk_x11_get_default_xdisplay (void);
#endif
#ifndef GDK_MULTIHEAD_SAFE
/**
* GDK_ROOT_WINDOW:
*
* Obtains the Xlib window id of the root window of the current screen.
*/
#define GDK_ROOT_WINDOW() (gdk_x11_get_default_root_xwindow ())
#endif
#ifndef GDK_MULTIHEAD_SAFE
void gdk_x11_grab_server (void);
void gdk_x11_ungrab_server (void);
#endif
G_END_DECLS
#endif /* __GDK_X11_UTILS_H__ */