vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Randr header to match other headers in E. 

SVN revision: 51211
This commit is contained in:
Christopher Michael 2010-08-16 14:02:21 +00:00
parent d7a2641908
commit 973c56bfe4
1 changed files with 41 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/bin/e_randr.h
View File

@ -1,7 +1,23 @@
#ifdef E_TYPEDEFS
typedef struct _E_Randr_Crtc_Info E_Randr_Crtc_Info;
typedef struct _E_Randr_Output_Info E_Randr_Output_Info;
typedef struct _E_Randr_Screen_Info_11 E_Randr_Screen_Info_11;
typedef struct _E_Randr_Screen_Info_12 E_Randr_Screen_Info_12;
typedef union _E_Randr_Screen_RRVD_Info E_Randr_Screen_RRVD_Info;
typedef struct _E_Randr_Screen_Info E_Randr_Screen_Info;
typedef struct _E_Randr_Output_Restore_Info E_Randr_Output_Restore_Info;
typedef struct _E_Randr_Crtc_Restore_Info E_Randr_Crtc_Restore_Info;
typedef struct _E_Randr_Screen_Restore_Info_11 E_Randr_Screen_Restore_Info_11;
typedef struct _E_Randr_Screen_Restore_Info_12 E_Randr_Screen_Restore_Info_12;
typedef union _E_Randr_Screen_Restore_Info_Union E_Randr_Screen_Restore_Info_Union;
typedef struct _E_Randr_Screen_Restore_Info E_Randr_Screen_Restore_Info;
#else
#ifndef E_RANDR_H
#define E_RANDR_H
typedef struct _E_Randr_Crtc_Info
struct _E_Randr_Crtc_Info
{
Ecore_X_ID xid;
Eina_Rectangle geometry;
@ -15,9 +31,9 @@ typedef struct _E_Randr_Crtc_Info
Eina_List *outputs;
Eina_List *possible_outputs;
Ecore_X_Randr_Mode_Info *current_mode;
} E_Randr_Crtc_Info;
};
typedef struct _E_Randr_Output_Info
struct _E_Randr_Output_Info
{
Ecore_X_ID xid;
char *name;
@ -43,9 +59,9 @@ typedef struct _E_Randr_Output_Info
double current_backlight;
Ecore_X_Render_Subpixel_Order subpixel_order;
Eina_List *compatible_outputs;
} E_Randr_Output_Info;
};
typedef struct _E_Randr_Screen_Info_11
struct _E_Randr_Screen_Info_11
{
//List of Ecore_X_Randr_Screen_Size_MM*
Eina_List *sizes;
@ -55,9 +71,9 @@ typedef struct _E_Randr_Screen_Info_11
//List of Ecore_X_Randr_Refresh_Rate*
Eina_List *rates;
Ecore_X_Randr_Refresh_Rate current_rate;
} E_Randr_Screen_Info_11;
};
typedef struct _E_Randr_Screen_Info_12
struct _E_Randr_Screen_Info_12
{
Ecore_X_Randr_Screen_Size min_size;
Ecore_X_Randr_Screen_Size max_size;
@ -68,62 +84,62 @@ typedef struct _E_Randr_Screen_Info_12
E_Randr_Output_Info *primary_output;
Ecore_X_Randr_Output_Policy output_policy;
Ecore_X_Randr_Relative_Alignment alignment;
} E_Randr_Screen_Info_12;
};
//RRVD == RandR(R) Version Depended
typedef union _E_Randr_Screen_RRVD_Info
union _E_Randr_Screen_RRVD_Info
{
E_Randr_Screen_Info_11 *randr_info_11;
E_Randr_Screen_Info_12 *randr_info_12;
} E_Randr_Screen_RRVD_Info;
};
typedef struct _E_Randr_Screen_Info
struct _E_Randr_Screen_Info
{
Ecore_X_Window root;
int randr_version;
E_Randr_Screen_RRVD_Info rrvd_info;
} E_Randr_Screen_Info;
};
//Following stuff is just for configuration purposes
typedef struct _E_Randr_Output_Restore_Info
struct _E_Randr_Output_Restore_Info
{
const char *edid;
double backlight_level;
} E_Randr_Output_Restore_Info;
};
typedef struct _E_Randr_Crtc_Restore_Info
struct _E_Randr_Crtc_Restore_Info
{
Eina_Rectangle geometry;
Ecore_X_Randr_Orientation orientation;
//list of the outputs;
Eina_List *outputs;
} E_Randr_Crtc_Restore_Info;
};
typedef struct _E_Randr_Screen_Restore_Info_11
struct _E_Randr_Screen_Restore_Info_11
{
Ecore_X_Randr_Screen_Size size;
Ecore_X_Randr_Refresh_Rate refresh_rate;
Ecore_X_Randr_Orientation orientation;
} E_Randr_Screen_Restore_Info_11;
};
typedef struct _E_Randr_Screen_Restore_Info_12
struct _E_Randr_Screen_Restore_Info_12
{
Eina_List *crtcs;
Ecore_X_Randr_Output_Policy output_policy;
Ecore_X_Randr_Relative_Alignment alignment;
} E_Randr_Screen_Restore_Info_12;
};
typedef union _E_Randr_Screen_Restore_Info_Union
union _E_Randr_Screen_Restore_Info_Union
{
E_Randr_Screen_Restore_Info_11 *restore_info_11;
Eina_List *restore_info_12;
} E_Randr_Screen_Restore_Info_Union;
};
typedef struct _E_Randr_Screen_Restore_Info
struct _E_Randr_Screen_Restore_Info
{
int randr_version;
E_Randr_Screen_Restore_Info_Union rrvd_restore_info;
} E_Randr_Screen_Restore_Info;
};
EAPI Eina_Bool e_randr_init(void);
EAPI int e_randr_shutdown(void);
@ -131,3 +147,4 @@ EAPI int e_randr_shutdown(void);
extern E_Randr_Screen_Info *e_randr_screen_info;
#endif
#endif