Enlightenment CVS committal Author : doursse Project : e17 Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x Modified Files: Ecore_X.h Makefile.am Added Files: ecore_xcb_atom.c ecore_xcb_dnd.c ecore_xcb_events.c ecore_xcb_mwm.c ecore_xcb_randr.c ecore_xcb_shape.c ecore_xcb_xinerama.c ecore_xcb.c ecore_xcb_dpms.c ecore_xcb_fixes.c ecore_xcb_netwm.c ecore_xcb_reply.c ecore_xcb_sync.c ecore_xcb_cursor.c ecore_xcb_drawable.c ecore_xcb_gc.c ecore_xcb_pixmap.c ecore_xcb_screensaver.c ecore_xcb_window.c ecore_xcb_damage.c ecore_xcb_e.c ecore_xcb_icccm.c ecore_xcb_private.h ecore_xcb_selection.c ecore_xcb_window_prop.c Log Message: Here is ecore_x with XCB backend. * The XCB backend is disabled by default during the configuration. To enable it, add --enable-ecore-x-xcb. See the messages that configure displays when it finishes. * The way XCB is detected, and used in src/lib/ecore_x/Makefile.am should be improved * Any program that uses ecore_evas does not need to be modified. Any program that uses ecore_x may need some changes. That is, adding some functions (_prefetch and _fetch ones). No other change is needed. See the documention of any _get functions, as these are the ones that need those functions. * There are some missing parts, especially everything that involves the keyboard, as porting Xlib functions related to strings (utf8 stuff, XKeysymToString, etc...) is an horror. So keyboard events are not working yet. * I tried to write as much documentation as I could. But there is certainly some missing doc here and there. there are certainly other things that I have forgotten. Improvements of that backend: * the creation of an ecore_evas is faster. Especially when done over an ssh connection (on my computer, 7-10s with Xlib, 1.5s with XCB, over an ssh) * A Window Manager should be more responsive. But it's not tomorrow that e17 will use it :) Have fun ! =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/Ecore_X.h,v retrieving revision 1.186 retrieving revision 1.187 diff -u -3 -r1.186 -r1.187 --- Ecore_X.h 4 Apr 2007 11:43:29 -0000 1.186 +++ Ecore_X.h 13 Apr 2007 17:12:09 -0000 1.187 @@ -40,19 +40,30 @@ * @li @ref Ecore_X_Flush_Group */ + typedef unsigned int Ecore_X_ID; -#ifndef _ECORE_X_WINDOW_PREDEF +# ifndef _ECORE_X_WINDOW_PREDEF typedef Ecore_X_ID Ecore_X_Window; -#endif +# endif +#ifdef HAVE_ECORE_X_XCB +typedef Ecore_X_ID Ecore_X_Visual; +#else typedef void * Ecore_X_Visual; +#endif /* HAVE_ECORE_X_XCB */ typedef Ecore_X_ID Ecore_X_Pixmap; typedef Ecore_X_ID Ecore_X_Drawable; +#ifdef HAVE_ECORE_X_XCB +typedef Ecore_X_ID Ecore_X_GC; +#else typedef void * Ecore_X_GC; +#endif /* HAVE_ECORE_X_XCB */ typedef Ecore_X_ID Ecore_X_Atom; typedef Ecore_X_ID Ecore_X_Colormap; typedef Ecore_X_ID Ecore_X_Time; typedef Ecore_X_ID Ecore_X_Cursor; typedef void Ecore_X_Display; +typedef void Ecore_X_Connection; +typedef void Ecore_X_Screen; typedef Ecore_X_ID Ecore_X_Sync_Counter; typedef Ecore_X_ID Ecore_X_Sync_Alarm; @@ -972,7 +983,9 @@ EAPI int ecore_x_shutdown(void); EAPI int ecore_x_disconnect(void); EAPI Ecore_X_Display *ecore_x_display_get(void); +EAPI Ecore_X_Connection *ecore_x_connection_get(void); EAPI int ecore_x_fd_get(void); +EAPI Ecore_X_Screen *ecore_x_default_screen_get(void); EAPI void ecore_x_double_click_time_set(double t); EAPI double ecore_x_double_click_time_get(void); EAPI void ecore_x_flush(void); @@ -991,12 +1004,20 @@ EAPI void ecore_x_event_mask_unset(Ecore_X_Window w, Ecore_X_Event_Mask mask); EAPI int ecore_x_selection_notify_send(Ecore_X_Window requestor, Ecore_X_Atom selection, Ecore_X_Atom target, Ecore_X_Atom property, Ecore_X_Time time); +EAPI void ecore_x_selection_primary_prefetch(void); +EAPI void ecore_x_selection_primary_fetch(void); EAPI int ecore_x_selection_primary_set(Ecore_X_Window w, const void *data, int size); EAPI int ecore_x_selection_primary_clear(void); +EAPI void ecore_x_selection_secondary_prefetch(void); +EAPI void ecore_x_selection_secondary_fetch(void); EAPI int ecore_x_selection_secondary_set(Ecore_X_Window w, const void *data, int size); EAPI int ecore_x_selection_secondary_clear(void); +EAPI void ecore_x_selection_xdnd_prefetch(void); +EAPI void ecore_x_selection_xdnd_fetch(void); EAPI int ecore_x_selection_xdnd_set(Ecore_X_Window w, const void *data, int size); EAPI int ecore_x_selection_xdnd_clear(void); +EAPI void ecore_x_selection_clipboard_prefetch(void); +EAPI void ecore_x_selection_clipboard_fetch(void); EAPI int ecore_x_selection_clipboard_set(Ecore_X_Window w, const void *data, int size); EAPI int ecore_x_selection_clipboard_clear(void); EAPI void ecore_x_selection_primary_request(Ecore_X_Window w, const char *target); @@ -1012,10 +1033,16 @@ EAPI void ecore_x_selection_parser_del(const char *target); EAPI void ecore_x_dnd_aware_set(Ecore_X_Window win, int on); +EAPI void ecore_x_dnd_version_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_dnd_version_get_fetch(void); EAPI int ecore_x_dnd_version_get(Ecore_X_Window win); +EAPI void ecore_x_dnd_type_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_dnd_type_get_fetch(void); EAPI int ecore_x_dnd_type_isset(Ecore_X_Window win, const char *type); EAPI void ecore_x_dnd_type_set(Ecore_X_Window win, const char *type, int on); EAPI void ecore_x_dnd_types_set(Ecore_X_Window win, char **types, unsigned int num_types); +EAPI void ecore_x_dnd_begin_prefetch(Ecore_X_Window source); +EAPI void ecore_x_dnd_begin_fetch(void); EAPI int ecore_x_dnd_begin(Ecore_X_Window source, unsigned char *data, int size); EAPI int ecore_x_dnd_drop(void); EAPI void ecore_x_dnd_send_status(int will_accept, int suppress, Ecore_X_Rectangle rectangle, Ecore_X_Atom action); @@ -1047,6 +1074,8 @@ EAPI void ecore_x_window_move_resize(Ecore_X_Window win, int x, int y, int w, int h); EAPI void ecore_x_window_focus(Ecore_X_Window win); EAPI void ecore_x_window_focus_at_time(Ecore_X_Window win, Ecore_X_Time t); +EAPI void ecore_x_get_input_focus_prefetch(void); +EAPI void ecore_x_get_input_focus_fetch(void); EAPI Ecore_X_Window ecore_x_window_focus_get(void); EAPI void ecore_x_window_raise(Ecore_X_Window win); EAPI void ecore_x_window_lower(Ecore_X_Window win); @@ -1062,6 +1091,8 @@ EAPI Ecore_X_Window ecore_x_window_at_xy_get(int x, int y); EAPI Ecore_X_Window ecore_x_window_at_xy_with_skip_get(int x, int y, Ecore_X_Window *skip, int skip_num); EAPI Ecore_X_Window ecore_x_window_at_xy_begin_get(Ecore_X_Window begin, int x, int y); +EAPI void ecore_x_query_tree_prefetch(Ecore_X_Window window); +EAPI void ecore_x_query_tree_fetch(void); EAPI Ecore_X_Window ecore_x_window_parent_get(Ecore_X_Window win); EAPI void ecore_x_window_background_color_set(Ecore_X_Window win, @@ -1082,6 +1113,9 @@ EAPI void ecore_x_window_prop_card32_set(Ecore_X_Window win, Ecore_X_Atom atom, unsigned int *val, unsigned int num); +EAPI void ecore_x_window_prop_card32_get_prefetch(Ecore_X_Window window, + Ecore_X_Atom atom); +EAPI void ecore_x_window_prop_card32_get_fetch(void); EAPI int ecore_x_window_prop_card32_get(Ecore_X_Window win, Ecore_X_Atom atom, unsigned int *val, unsigned int len); EAPI int ecore_x_window_prop_card32_list_get(Ecore_X_Window win, @@ -1093,6 +1127,10 @@ Ecore_X_Atom type, Ecore_X_ID * lst, unsigned int num); +EAPI void ecore_x_window_prop_xid_get_prefetch(Ecore_X_Window window, + Ecore_X_Atom atom, + Ecore_X_Atom type); +EAPI void ecore_x_window_prop_xid_get_fetch(void); EAPI int ecore_x_window_prop_xid_get(Ecore_X_Window win, Ecore_X_Atom atom, Ecore_X_Atom type, @@ -1111,6 +1149,9 @@ Ecore_X_Atom atom, Ecore_X_Atom * val, unsigned int num); +EAPI void ecore_x_window_prop_atom_get_prefetch(Ecore_X_Window window, + Ecore_X_Atom atom); +EAPI void ecore_x_window_prop_atom_get_fetch(void); EAPI int ecore_x_window_prop_atom_get(Ecore_X_Window win, Ecore_X_Atom atom, Ecore_X_Atom * val, @@ -1126,6 +1167,9 @@ Ecore_X_Atom atom, Ecore_X_Window * val, unsigned int num); +EAPI void ecore_x_window_prop_window_get_prefetch(Ecore_X_Window window, + Ecore_X_Atom atom); +EAPI void ecore_x_window_prop_window_get_fetch(void); EAPI int ecore_x_window_prop_window_get(Ecore_X_Window win, Ecore_X_Atom atom, Ecore_X_Window * val, @@ -1136,10 +1180,19 @@ EAPI Ecore_X_Atom ecore_x_window_prop_any_type(void); EAPI void ecore_x_window_prop_property_set(Ecore_X_Window win, Ecore_X_Atom type, Ecore_X_Atom format, int size, void *data, int number); +EAPI void ecore_x_window_prop_property_get_prefetch(Ecore_X_Window window, + Ecore_X_Atom property, + Ecore_X_Atom type); +EAPI void ecore_x_window_prop_property_get_fetch(void); EAPI int ecore_x_window_prop_property_get(Ecore_X_Window win, Ecore_X_Atom property, Ecore_X_Atom type, int size, unsigned char **data, int *num); EAPI void ecore_x_window_prop_property_del(Ecore_X_Window win, Ecore_X_Atom property); +EAPI void ecore_x_window_prop_list_prefetch(Ecore_X_Window window); +EAPI void ecore_x_window_prop_list_fetch(void); EAPI Ecore_X_Atom *ecore_x_window_prop_list(Ecore_X_Window win, int *num_ret); EAPI void ecore_x_window_prop_string_set(Ecore_X_Window win, Ecore_X_Atom type, const char *str); +EAPI void ecore_x_window_prop_string_get_prefetch(Ecore_X_Window window, + Ecore_X_Atom type); +EAPI void ecore_x_window_prop_string_get_fetch(void); EAPI char *ecore_x_window_prop_string_get(Ecore_X_Window win, Ecore_X_Atom type); EAPI int ecore_x_window_prop_protocol_isset(Ecore_X_Window win, Ecore_X_WM_Protocol protocol); EAPI Ecore_X_WM_Protocol *ecore_x_window_prop_protocol_list_get(Ecore_X_Window win, int *num_ret); @@ -1154,6 +1207,8 @@ EAPI void ecore_x_window_shape_rectangle_add(Ecore_X_Window win, int x, int y, int w, int h); EAPI void ecore_x_window_shape_rectangle_clip(Ecore_X_Window win, int x, int y, int w, int h); EAPI void ecore_x_window_shape_rectangles_add(Ecore_X_Window win, Ecore_X_Rectangle *rects, int num); +EAPI void ecore_x_window_shape_rectangles_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_window_shape_rectangles_get_fetch(void); EAPI Ecore_X_Rectangle *ecore_x_window_shape_rectangles_get(Ecore_X_Window win, int *num_ret); EAPI void ecore_x_window_shape_events_select(Ecore_X_Window win, int on); @@ -1172,6 +1227,8 @@ EAPI int ecore_x_mouse_down_send(Ecore_X_Window win, int x, int y, int b); EAPI int ecore_x_mouse_up_send(Ecore_X_Window win, int x, int y, int b); +EAPI void ecore_x_drawable_geometry_get_prefetch(Ecore_X_Drawable drawable); +EAPI void ecore_x_drawable_geometry_get_fetch(void); EAPI void ecore_x_drawable_geometry_get(Ecore_X_Drawable d, int *x, int *y, int *w, int *h); EAPI int ecore_x_drawable_border_width_get(Ecore_X_Drawable d); EAPI int ecore_x_drawable_depth_get(Ecore_X_Drawable d); @@ -1192,6 +1249,8 @@ EAPI void ecore_x_window_client_manage(Ecore_X_Window win); EAPI void ecore_x_window_sniff(Ecore_X_Window win); EAPI void ecore_x_window_client_sniff(Ecore_X_Window win); +EAPI void ecore_x_atom_get_prefetch(const char *name); +EAPI void ecore_x_atom_get_fetch(void); EAPI Ecore_X_Atom ecore_x_atom_get(const char *name); @@ -1296,10 +1355,12 @@ ECORE_X_MWM_HINT_INPUT_FULL_APPLICATION_MODAL = 3, } Ecore_X_MWM_Hint_Input; -EAPI int ecore_x_mwm_hints_get(Ecore_X_Window win, - Ecore_X_MWM_Hint_Func *fhint, - Ecore_X_MWM_Hint_Decor *dhint, - Ecore_X_MWM_Hint_Input *ihint); +EAPI void ecore_x_mwm_hints_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_mwm_hints_get_fetch(void); +EAPI int ecore_x_mwm_hints_get(Ecore_X_Window win, + Ecore_X_MWM_Hint_Func *fhint, + Ecore_X_MWM_Hint_Decor *dhint, + Ecore_X_MWM_Hint_Input *ihint); EAPI void ecore_x_mwm_borderless_set(Ecore_X_Window win, int borderless); /* netwm */ @@ -1307,6 +1368,8 @@ EAPI void ecore_x_netwm_shutdown(void); EAPI void ecore_x_netwm_wm_identify(Ecore_X_Window root, Ecore_X_Window check, const char *wm_name); EAPI void ecore_x_netwm_supported_set(Ecore_X_Window root, Ecore_X_Atom *supported, int num); +EAPI void ecore_x_netwm_supported_get_prefetch(Ecore_X_Window root); +EAPI void ecore_x_netwm_supported_get_fetch(void); EAPI int ecore_x_netwm_supported_get(Ecore_X_Window root, Ecore_X_Atom **supported, int *num); EAPI void ecore_x_netwm_desk_count_set(Ecore_X_Window root, unsigned int n_desks); EAPI void ecore_x_netwm_desk_roots_set(Ecore_X_Window root, Ecore_X_Window *vroots, unsigned int n_desks); @@ -1321,41 +1384,79 @@ EAPI void ecore_x_netwm_client_list_stacking_set(Ecore_X_Window root, Ecore_X_Window *p_clients, unsigned int n_clients); EAPI void ecore_x_netwm_client_active_set(Ecore_X_Window root, Ecore_X_Window win); EAPI void ecore_x_netwm_name_set(Ecore_X_Window win, const char *name); +EAPI void ecore_x_netwm_name_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_netwm_name_get_fetch(void); EAPI int ecore_x_netwm_name_get(Ecore_X_Window win, char **name); EAPI void ecore_x_netwm_startup_id_set(Ecore_X_Window win, const char *id); +EAPI void ecore_x_netwm_startup_id_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_netwm_startup_id_get_fetch(void); EAPI int ecore_x_netwm_startup_id_get(Ecore_X_Window win, char **id); EAPI void ecore_x_netwm_visible_name_set(Ecore_X_Window win, const char *name); +EAPI void ecore_x_netwm_visible_name_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_netwm_visible_name_get_fetch(void); EAPI int ecore_x_netwm_visible_name_get(Ecore_X_Window win, char **name); EAPI void ecore_x_netwm_icon_name_set(Ecore_X_Window win, const char *name); +EAPI void ecore_x_netwm_icon_name_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_netwm_icon_name_get_fetch(void); EAPI int ecore_x_netwm_icon_name_get(Ecore_X_Window win, char **name); EAPI void ecore_x_netwm_visible_icon_name_set(Ecore_X_Window win, const char *name); +EAPI void ecore_x_netwm_visible_icon_name_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_netwm_visible_icon_name_get_fetch(void); EAPI int ecore_x_netwm_visible_icon_name_get(Ecore_X_Window win, char **name); EAPI void ecore_x_netwm_desktop_set(Ecore_X_Window win, unsigned int desk); +EAPI void ecore_x_netwm_desktop_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_netwm_desktop_get_fetch(void); EAPI int ecore_x_netwm_desktop_get(Ecore_X_Window win, unsigned int *desk); EAPI void ecore_x_netwm_strut_set(Ecore_X_Window win, int left, int right, int top, int bottom); +EAPI void ecore_x_netwm_strut_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_netwm_strut_get_fetch(void); EAPI int ecore_x_netwm_strut_get(Ecore_X_Window win, int *left, int *right, int *top, int *bottom); EAPI void ecore_x_netwm_strut_partial_set(Ecore_X_Window win, int left, int right, int top, int bottom, int left_start_y, int left_end_y, int right_start_y, int right_end_y, int top_start_x, int top_end_x, int bottom_start_x, int bottom_end_x); +EAPI void ecore_x_netwm_strut_partial_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_netwm_strut_partial_get_fetch(void); EAPI int ecore_x_netwm_strut_partial_get(Ecore_X_Window win, int *left, int *right, int *top, int *bottom, int *left_start_y, int *left_end_y, int *right_start_y, int *right_end_y, int *top_start_x, int *top_end_x, int *bottom_start_x, int *bottom_end_x); +EAPI void ecore_x_netwm_icons_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_netwm_icons_get_fetch(void); EAPI int ecore_x_netwm_icons_get(Ecore_X_Window win, Ecore_X_Icon **icon, int *num); EAPI void ecore_x_netwm_icon_geometry_set(Ecore_X_Window win, int x, int y, int width, int height); +EAPI void ecore_x_netwm_icon_geometry_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_netwm_icon_geometry_get_fetch(void); EAPI int ecore_x_netwm_icon_geometry_get(Ecore_X_Window win, int *x, int *y, int *width, int *height); EAPI void ecore_x_netwm_pid_set(Ecore_X_Window win, int pid); +EAPI void ecore_x_netwm_pid_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_netwm_pid_get_fetch(void); EAPI int ecore_x_netwm_pid_get(Ecore_X_Window win, int *pid); EAPI void ecore_x_netwm_handled_icons_set(Ecore_X_Window win); +EAPI void ecore_x_netwm_handled_icons_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_netwm_handled_icons_get_fetch(void); EAPI int ecore_x_netwm_handled_icons_get(Ecore_X_Window win); EAPI void ecore_x_netwm_user_time_set(Ecore_X_Window win, unsigned int time); +EAPI void ecore_x_netwm_user_time_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_netwm_user_time_get_fetch(void); EAPI int ecore_x_netwm_user_time_get(Ecore_X_Window win, unsigned int *time); EAPI void ecore_x_netwm_window_state_set(Ecore_X_Window win, Ecore_X_Window_State *state, unsigned int num); +EAPI void ecore_x_netwm_window_state_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_netwm_window_state_get_fetch(void); EAPI int ecore_x_netwm_window_state_get(Ecore_X_Window win, Ecore_X_Window_State **state, unsigned int *num); EAPI void ecore_x_netwm_window_type_set(Ecore_X_Window win, Ecore_X_Window_Type type); +EAPI void ecore_x_netwm_window_type_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_netwm_window_type_get_fetch(void); EAPI int ecore_x_netwm_window_type_get(Ecore_X_Window win, Ecore_X_Window_Type *type); EAPI int ecore_x_netwm_allowed_action_isset(Ecore_X_Window win, Ecore_X_Action action); EAPI void ecore_x_netwm_allowed_action_set(Ecore_X_Window win, Ecore_X_Action *action, unsigned int num); +EAPI void ecore_x_netwm_allowed_action_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_netwm_allowed_action_get_fetch(void); EAPI int ecore_x_netwm_allowed_action_get(Ecore_X_Window win, Ecore_X_Action **action, unsigned int *num); EAPI void ecore_x_netwm_opacity_set(Ecore_X_Window win, unsigned int opacity); +EAPI void ecore_x_netwm_opacity_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_netwm_opacity_get_fetch(void); EAPI int ecore_x_netwm_opacity_get(Ecore_X_Window win, unsigned int *opacity); EAPI void ecore_x_netwm_frame_size_set(Ecore_X_Window win, int fl, int fr, int ft, int fb); +EAPI void ecore_x_netwm_frame_size_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_netwm_frame_size_get_fetch(void); EAPI int ecore_x_netwm_frame_size_get(Ecore_X_Window win, int *fl, int *fr, int *ft, int *fb); +EAPI void ecore_x_netwm_sync_counter_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_netwm_sync_counter_get_fetch(void); EAPI int ecore_x_netwm_sync_counter_get(Ecore_X_Window win, Ecore_X_Sync_Counter *counter); EAPI void ecore_x_netwm_ping_send(Ecore_X_Window win); EAPI void ecore_x_netwm_sync_request_send(Ecore_X_Window win, unsigned int serial); @@ -1369,11 +1470,17 @@ EAPI void ecore_x_e_frame_size_set(Ecore_X_Window win, int fl, int fr, int ft, int fb); +EAPI void ecore_x_xinerama_query_screens_prefetch(void); +EAPI void ecore_x_xinerama_query_screens_fetch(void); EAPI int ecore_x_xinerama_screen_count_get(void); EAPI int ecore_x_xinerama_screen_geometry_get(int screen, int *x, int *y, int *w, int *h); EAPI int ecore_x_screensaver_event_available_get(void); -EAPI int ecore_x_screensaver_idle_time_get(void); +EAPI void ecore_x_screensaver_idle_time_prefetch(void); +EAPI void ecore_x_screensaver_idle_time_fetch(void); +EAPI int ecore_x_screensaver_idle_time_get(void); +EAPI void ecore_x_get_screensaver_prefetch(void); +EAPI void ecore_x_get_screensaver_fetch(void); EAPI void ecore_x_screensaver_set(int timeout, int interval, int blank, int expose); EAPI void ecore_x_screensaver_timeout_set(double timeout); EAPI double ecore_x_screensaver_timeout_get(void); @@ -1413,12 +1520,16 @@ */ } Ecore_X_Window_Attributes; +EAPI void ecore_x_get_window_attributes_prefetch(Ecore_X_Window window); +EAPI void ecore_x_get_window_attributes_fetch(void); EAPI int ecore_x_window_attributes_get(Ecore_X_Window win, Ecore_X_Window_Attributes *att_ret); EAPI void ecore_x_window_save_set_add(Ecore_X_Window win); EAPI void ecore_x_window_save_set_del(Ecore_X_Window win); EAPI Ecore_X_Window *ecore_x_window_children_get(Ecore_X_Window win, int *num); EAPI int ecore_x_pointer_control_set(int accel_num, int accel_denom, int threshold); +EAPI void ecore_x_pointer_control_get_prefetch(void); +EAPI void ecore_x_pointer_control_get_fetch(void); EAPI int ecore_x_pointer_control_get(int *accel_num, int *accel_denom, int *threshold); EAPI int ecore_x_pointer_grab(Ecore_X_Window win); EAPI int ecore_x_pointer_confine_grab(Ecore_X_Window win); @@ -1442,6 +1553,8 @@ EAPI void ecore_x_focus_reset(void); EAPI void ecore_x_events_allow_all(void); EAPI void ecore_x_pointer_last_xy_get(int *x, int *y); +EAPI void ecore_x_pointer_xy_get_prefetch(Ecore_X_Window window); +EAPI void ecore_x_pointer_xy_get_fetch(void); EAPI void ecore_x_pointer_xy_get(Ecore_X_Window win, int *x, int *y); /* ecore_x_sync.c */ @@ -1462,6 +1575,8 @@ }; EAPI int ecore_x_randr_events_select(Ecore_X_Window win, int on); +EAPI void ecore_x_randr_get_screen_info_prefetch(Ecore_X_Window window); +EAPI void ecore_x_randr_get_screen_info_fetch(void); EAPI Ecore_X_Randr_Rotation ecore_x_randr_screen_rotations_get(Ecore_X_Window root); EAPI Ecore_X_Randr_Rotation ecore_x_randr_screen_rotation_get(Ecore_X_Window root); EAPI void ecore_x_randr_screen_rotation_set(Ecore_X_Window root, Ecore_X_Randr_Rotation rot); @@ -1499,6 +1614,8 @@ EAPI void ecore_x_region_invert(Ecore_X_Region dest, Ecore_X_Rectangle *bounds, Ecore_X_Region source); EAPI void ecore_x_region_translate(Ecore_X_Region region, int dx, int dy); EAPI void ecore_x_region_extents(Ecore_X_Region dest, Ecore_X_Region source); +EAPI void ecore_x_region_fetch_prefetch(Ecore_X_Region region); +EAPI void ecore_x_region_fetch_fetch(void); EAPI Ecore_X_Rectangle * ecore_x_region_fetch(Ecore_X_Region region, int *num, Ecore_X_Rectangle *bounds); EAPI void ecore_x_region_expand(Ecore_X_Region dest, Ecore_X_Region source, unsigned int left, unsigned int right, unsigned int top, unsigned int bottom); EAPI void ecore_x_region_gc_clip_set(Ecore_X_Region region, Ecore_X_GC gc, int x_origin, int y_origin); @@ -1535,14 +1652,20 @@ EAPI int ecore_x_screen_is_composited(int screen); EAPI int ecore_x_dpms_query(void); +EAPI void ecore_x_dpms_capable_get_prefetch(void); +EAPI void ecore_x_dpms_capable_get_fetch(void); EAPI int ecore_x_dpms_capable_get(void); +EAPI void ecore_x_dpms_enable_get_prefetch(void); +EAPI void ecore_x_dpms_enable_get_fetch(void); EAPI int ecore_x_dpms_enabled_get(void); EAPI void ecore_x_dpms_enabled_set(int enabled); +EAPI void ecore_x_dpms_timeouts_get_prefetch(void); +EAPI void ecore_x_dpms_timeouts_get_fetch(void); EAPI void ecore_x_dpms_timeouts_get(unsigned int *standby, unsigned int *suspend, unsigned int *off); EAPI int ecore_x_dpms_timeouts_set(unsigned int standby, unsigned int suspend, unsigned int off); -EAPI unsigned int ecore_x_dpms_timeout_standby_get(); -EAPI unsigned int ecore_x_dpms_timeout_suspend_get(); -EAPI unsigned int ecore_x_dpms_timeout_off_get(); +EAPI unsigned int ecore_x_dpms_timeout_standby_get(void); +EAPI unsigned int ecore_x_dpms_timeout_suspend_get(void); +EAPI unsigned int ecore_x_dpms_timeout_off_get(void); EAPI void ecore_x_dpms_timeout_standby_set(unsigned int new_timeout); EAPI void ecore_x_dpms_timeout_suspend_set(unsigned int new_timeout); EAPI void ecore_x_dpms_timeout_off_set(unsigned int new_timeout); =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/Makefile.am,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- Makefile.am 21 Mar 2007 03:03:33 -0000 1.37 +++ Makefile.am 13 Apr 2007 17:12:09 -0000 1.38 @@ -1,5 +1,23 @@ MAINTAINERCLEANFILES = Makefile.in +if BUILD_ECORE_X_XCB +INCLUDES = \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ +-I$(top_srcdir)/src/lib/ecore \ +-I$(top_srcdir)/src/lib/ecore_txt \ +-I$(top_builddir)/src/lib/ecore \ +-I$(top_builddir)/src/lib/ecore_txt +else INCLUDES = \ @Xcursor_cflags@ \ @XDAMAGE_CFLAGS@ \ @@ -15,10 +33,67 @@ -I$(top_srcdir)/src/lib/ecore_txt \ -I$(top_builddir)/src/lib/ecore \ -I$(top_builddir)/src/lib/ecore_txt +endif libecore_x_la_LDFLAGS = -version-info 1:0:0 \ -L$(top_builddir)/src/lib/ecore/.libs \ -L$(top_builddir)/src/lib/ecore_txt/.libs + +if BUILD_ECORE_X_XCB + +lib_LTLIBRARIES = libecore_x.la +include_HEADERS = \ +Ecore_X.h \ +Ecore_X_Atoms.h \ +Ecore_X_Cursor.h + +libecore_x_la_SOURCES = \ +ecore_xcb_atom.c \ +ecore_xcb_cursor.c \ +ecore_xcb_damage.c \ +ecore_xcb_dnd.c \ +ecore_xcb_dpms.c \ +ecore_xcb_drawable.c \ +ecore_xcb_e.c \ +ecore_xcb_events.c \ +ecore_xcb_fixes.c \ +ecore_xcb_gc.c \ +ecore_xcb_icccm.c \ +ecore_xcb_mwm.c \ +ecore_xcb_netwm.c \ +ecore_xcb_pixmap.c \ +ecore_xcb_randr.c \ +ecore_xcb_reply.c \ +ecore_xcb_screensaver.c \ +ecore_xcb_selection.c \ +ecore_xcb_shape.c \ +ecore_xcb_sync.c \ +ecore_xcb_window.c \ +ecore_xcb_window_prop.c \ +ecore_xcb_xinerama.c \ +ecore_xcb.c \ +ecore_xcb_private.h + +libecore_x_la_LIBADD = \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ \ +$(top_builddir)/src/lib/ecore/libecore.la \ +$(top_builddir)/src/lib/ecore_txt/libecore_txt.la + +libecore_x_la_DEPENDENCIES = \ +$(top_builddir)/src/lib/ecore/libecore.la \ +$(top_builddir)/src/lib/ecore_txt/libecore_txt.la + +endif if BUILD_ECORE_X ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs