Xcm.h   Xcm.h 
skipping to change at line 22 skipping to change at line 22
* Kai-Uwe Behrmann <ku.b@gmx.de> * Kai-Uwe Behrmann <ku.b@gmx.de>
* @par License: * @par License:
* MIT <http://www.opensource.org/licenses/mit-license.php> * MIT <http://www.opensource.org/licenses/mit-license.php>
* @since 2008/04/00 * @since 2008/04/00
*/ */
#ifndef __XCOLOR_H__ #ifndef __XCOLOR_H__
#define __XCOLOR_H__ #define __XCOLOR_H__
#include "XcmVersion.h" #include "XcmVersion.h"
#ifdef HAVE_X11 #ifdef XCM_HAVE_X11
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <stdint.h> #include <stdint.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#endif /* HAVE_X11 */ #endif /* XCM_HAVE_X11 */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#ifdef HAVE_X11 #ifdef XCM_HAVE_X11
/** \addtogroup Xcm X Color Management Core API's /** \addtogroup Xcm X Color Management Core API's
* @{ * @{
*/ */
/** /**
* The XcolorProfile typedefed structure * The XcolorProfile typedefed structure
* describes a single ICC profile. The 'md5' field is used to identify the * describes a single ICC profile. The 'md5' field is used to identify the
* profile. The actual data follows right after the structure. * profile. The actual data follows right after the structure.
*/ */
skipping to change at line 175 skipping to change at line 175
The fourth section contains the servers name identifier. The fourth section contains the servers name identifier.
As of this specification the third section must contain ICR and the As of this specification the third section must contain ICR and the
supported _ICC_PROFILE in X version. supported _ICC_PROFILE in X version.
A example of a valid atom might look like: A example of a valid atom might look like:
_ICC_COLOR_DESKTOP(STRING) = "4518 1274001512 |ICR|V0.3| compiz_colour_desk top" _ICC_COLOR_DESKTOP(STRING) = "4518 1274001512 |ICR|V0.3| compiz_colour_desk top"
*/ */
#define XCM_COLOR_DESKTOP "_ICC_COLOR_DESKTOP" #define XCM_COLOR_DESKTOP "_ICC_COLOR_DESKTOP"
#endif /* HAVE_X11 */ #endif /* XCM_HAVE_X11 */
/** /**
* The XCM_COLOR_SERVER_ enums * The XCM_COLOR_SERVER_ enums
* describe colour server capabilities as specified in XCM_COLOR_DESKTOP at om. * describe colour server capabilities as specified in XCM_COLOR_DESKTOP at om.
*/ */
enum { enum {
XCM_COLOR_SERVER_REGIONS = 0x01, /**< _ICC_COLOR_REGIONS */ XCM_COLOR_SERVER_REGIONS = 0x01, /**< _ICC_COLOR_REGIONS */
XCM_COLOR_SERVER_PROFILES = 0x02, /**< _ICC_COLOR_PROFILES */ XCM_COLOR_SERVER_PROFILES = 0x02, /**< _ICC_COLOR_PROFILES */
XCM_COLOR_SERVER_DISPLAY_ADVANCED = 0x04, /**< _ICC_COLOR_DISPLAY_ADVANC ED */ XCM_COLOR_SERVER_DISPLAY_ADVANCED = 0x04, /**< _ICC_COLOR_DISPLAY_ADVANC ED */
XCM_COLOR_SERVER_OUTPUTS = 0x08 /**< _ICC_COLOR_OUTPUTS */ XCM_COLOR_SERVER_OUTPUTS = 0x08 /**< _ICC_COLOR_OUTPUTS */
}; };
#ifdef HAVE_X11 #ifdef XCM_HAVE_X11
/** Function XcmColorServerCapabilities /** Function XcmColorServerCapabilities
* @brief informs which colour server services are available * @brief informs which colour server services are available
* *
* Query the capabilities of a colour server. In case no colour server is * Query the capabilities of a colour server. In case no colour server is
* running, the function should return zero. The return value consists of a bit * running, the function should return zero. The return value consists of a bit
* mask of XCM_COLOR_SERVER_ properties from the XCM_COLOR_DESKTOP atom. * mask of XCM_COLOR_SERVER_ properties from the XCM_COLOR_DESKTOP atom.
*/ */
int XcmColorServerCapabilities ( Display *dpy ); int XcmColorServerCapabilities ( Display *dpy );
/** /**
skipping to change at line 222 skipping to change at line 222
the _ICC_PROFILE(_xxx) atom to sRGB as well. the _ICC_PROFILE(_xxx) atom to sRGB as well.
The modification of the _ICC_DEVICE_PROFILE(_xxx) atoms by external applica tions The modification of the _ICC_DEVICE_PROFILE(_xxx) atoms by external applica tions
is undefined. is undefined.
*/ */
#define XCM_DEVICE_PROFILE "_ICC_DEVICE_PROFILE" #define XCM_DEVICE_PROFILE "_ICC_DEVICE_PROFILE"
/** /**
* @} *//*Xcm * @} *//*Xcm
*/ */
#endif /* HAVE_X11 */ #endif /* XCM_HAVE_X11 */
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __XCOLOR_H__ */ #endif /* __XCOLOR_H__ */
 End of changes. 6 change blocks. 
6 lines changed or deleted 6 lines changed or added


 XcmDDC.h   XcmDDC.h 
skipping to change at line 22 skipping to change at line 22
* MIT <http://www.opensource.org/licenses/mit-license.php> * MIT <http://www.opensource.org/licenses/mit-license.php>
* @since 2010/12/28 * @since 2010/12/28
*/ */
#ifndef XCM_DDC_H #ifndef XCM_DDC_H
#define XCM_DDC_H #define XCM_DDC_H
#include <stddef.h> /* size_t */ #include <stddef.h> /* size_t */
#include "XcmVersion.h" #include "XcmVersion.h"
#if HAVE_LINUX #if XCM_HAVE_LINUX
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
/** \addtogroup XcmDDC /** \addtogroup XcmDDC
* *
* @{ * @{
*/ */
skipping to change at line 63 skipping to change at line 63
size_t * size ); size_t * size );
const char * XcmDDCErrorToString ( XCM_DDC_ERROR_e error ); const char * XcmDDCErrorToString ( XCM_DDC_ERROR_e error );
/** @} XcmDDC */ /** @} XcmDDC */
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* HAVE_LINUX */ #endif /* XCM_HAVE_LINUX */
#endif /* XCM_DDC_H */ #endif /* XCM_DDC_H */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 XcmEvents.h   XcmEvents.h 
skipping to change at line 16 skipping to change at line 16
* @par License: * @par License:
* MIT <http://www.opensource.org/licenses/mit-license.php> * MIT <http://www.opensource.org/licenses/mit-license.php>
* @par Copyright: * @par Copyright:
* 2009-2010 - Kai-Uwe Behrmann <ku.b@gmx.de> * 2009-2010 - Kai-Uwe Behrmann <ku.b@gmx.de>
* *
*/ */
#ifndef XCM_EVENTS_H #ifndef XCM_EVENTS_H
#define XCM_EVENTS_H #define XCM_EVENTS_H
#include "XcmVersion.h"
#ifdef XCM_HAVE_X11
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#include <stdint.h> /* size_t */ #include <stdint.h> /* size_t */
skipping to change at line 105 skipping to change at line 108
( XcmICCprofileGetName_f getName ); ( XcmICCprofileGetName_f getName );
void XcmICCprofileFromMD5FuncSet void XcmICCprofileFromMD5FuncSet
( XcmICCprofileGetFromMD5_f fromMD5 ); ( XcmICCprofileGetFromMD5_f fromMD5 );
/** @} XcmEvents */ /** @} XcmEvents */
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* XCM_HAVE_X11 */
#endif /* XCM_EVENTS_H */ #endif /* XCM_EVENTS_H */
 End of changes. 2 change blocks. 
0 lines changed or deleted 5 lines changed or added


 XcmVersion.h   XcmVersion.h 
skipping to change at line 19 skipping to change at line 19
* @internal * @internal
* @author Kai-Uwe Behrmann <ku.b@gmx.de> * @author Kai-Uwe Behrmann <ku.b@gmx.de>
* @par License: * @par License:
* MIT <http://www.opensource.org/licenses/mit-license.php> * MIT <http://www.opensource.org/licenses/mit-license.php>
* @since 2012/02/15 * @since 2012/02/15
*/ */
#ifndef __XCM_VERSION_H__ #ifndef __XCM_VERSION_H__
#define __XCM_VERSION_H__ #define __XCM_VERSION_H__
#define HAVE_X11 1 #define XCM_HAVE_X11 1
#define HAVE_LINUX 1 #define XCM_HAVE_LINUX 1
#define XCM_VERSION_MAJOR 0 #define XCM_VERSION_MAJOR 0
#define XCM_VERSION_MINOR 5 #define XCM_VERSION_MINOR 5
#define XCM_VERSION_MICRO 0 #define XCM_VERSION_MICRO 1
#define XCM_VERSION 0.5.0 #define XCM_VERSION 0.5.1
#define XCM_VERSION_NUM (0*10000+5*100+0) #define XCM_VERSION_NUM (0*10000+5*100+1)
#define XCM_LIB_VERSION 0:5:0 #define XCM_LIB_VERSION 0:5:0
#endif /* __XCM_VERSION_H__ */ #endif /* __XCM_VERSION_H__ */
 End of changes. 2 change blocks. 
5 lines changed or deleted 5 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/