From 499504b2f8f9096e6b2e3f2f94b3db9de6bd7094 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Tue, 19 Feb 2013 10:54:49 +0000 Subject: [PATCH] Remove timestamps from config (not needed). Add randr versions to header. Signed-off-by: Christopher Michael SVN revision: 84111 --- src/bin/e_randr.h | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/src/bin/e_randr.h b/src/bin/e_randr.h index 9c09ee864..044eef277 100644 --- a/src/bin/e_randr.h +++ b/src/bin/e_randr.h @@ -8,6 +8,11 @@ typedef struct _E_Randr_Config E_Randr_Config; # ifndef E_RANDR_H # define E_RANDR_H +#define E_RANDR_VERSION_1_1 ((1 << 16) | 1) +#define E_RANDR_VERSION_1_2 ((1 << 16) | 2) +#define E_RANDR_VERSION_1_3 ((1 << 16) | 3) +#define E_RANDR_VERSION_1_4 ((1 << 16) | 4) + #define E_RANDR_CONFIG_FILE_EPOCH 1 #define E_RANDR_CONFIG_FILE_GENERATION 1 #define E_RANDR_CONFIG_FILE_VERSION \ @@ -21,7 +26,6 @@ struct _E_Randr_Output_Config unsigned char primary; // flag to indicate if primary output unsigned long edid_count; // monitor's edid length unsigned char *edid; // monitor's edid - double timestamp; // config timestamp }; struct _E_Randr_Crtc_Config @@ -31,35 +35,15 @@ struct _E_Randr_Crtc_Config unsigned int orient; // value of the ecore_x_randr_orientation unsigned int mode; // ecore_x_randr mode id (xid) Eina_List *outputs; // list of outputs for this crtc - double timestamp; // config timestamp }; struct _E_Randr_Config { - /* RANDR CONFIG - * - * Screen: - * width, height (int); - * - * list of crtcs - * each crtc having: - * unsigned int crtc_id (Ecore_X_ID); - * int x, y, w, h; (Eina_Rectangle); - * unsigned int orientation (Ecore_X_Randr_Orienation); - * unsigned int mode_id (Ecore_X_ID); - * list of outputs - * each output having: - * unsigned int output_id (Ecore_X_ID); - * unsigned int crtc_id (Ecore_X_ID); - * unsigned int output_policy; - */ - int version; // INTERNAL CONFIG VERSION struct { int width, height; // geometry - double timestamp; // config timestamp } screen; Eina_List *crtcs;