From 0f834b91a4768673833ab4917e87d86c237bb1a6 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 23 Mar 2012 10:05:55 +0100 Subject: libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update 23 Mar 2012 --- xorg-server/hw/kdrive/ephyr/hostx.h | 240 +++++++++++++++++------------------- 1 file changed, 111 insertions(+), 129 deletions(-) (limited to 'xorg-server/hw/kdrive/ephyr/hostx.h') diff --git a/xorg-server/hw/kdrive/ephyr/hostx.h b/xorg-server/hw/kdrive/ephyr/hostx.h index 42578576a..d6217119a 100644 --- a/xorg-server/hw/kdrive/ephyr/hostx.h +++ b/xorg-server/hw/kdrive/ephyr/hostx.h @@ -35,230 +35,212 @@ #define EPHYR_DBG(x, a...) \ fprintf(stderr, __FILE__ ":%d,%s() " x "\n", __LINE__, __func__, ##a) #else -#define EPHYR_DBG(x, a...) do {} while (0) +#define EPHYR_DBG(x, a...) do {} while (0) #endif -typedef struct EphyrHostXVars EphyrHostXVars; +typedef struct EphyrHostXVars EphyrHostXVars; typedef struct EphyrHostXEvent EphyrHostXEvent; -typedef void* EphyrScreenInfo ; -typedef enum EphyrHostXEventType -{ - EPHYR_EV_MOUSE_MOTION, - EPHYR_EV_MOUSE_PRESS, - EPHYR_EV_MOUSE_RELEASE, - EPHYR_EV_KEY_PRESS, - EPHYR_EV_KEY_RELEASE, - EPHYR_EV_EXPOSE -} -EphyrHostXEventType; +typedef void *EphyrScreenInfo; +typedef enum EphyrHostXEventType { + EPHYR_EV_MOUSE_MOTION, + EPHYR_EV_MOUSE_PRESS, + EPHYR_EV_MOUSE_RELEASE, + EPHYR_EV_KEY_PRESS, + EPHYR_EV_KEY_RELEASE, + EPHYR_EV_EXPOSE +} EphyrHostXEventType; /* I can't believe it's not a KeySymsRec. */ typedef struct { - int minKeyCode; - int maxKeyCode; - int mapWidth; - CARD32 *map; + int minKeyCode; + int maxKeyCode; + int mapWidth; + CARD32 *map; } EphyrKeySyms; -struct EphyrHostXEvent -{ - EphyrHostXEventType type; +struct EphyrHostXEvent { + EphyrHostXEventType type; - union - { - struct mouse_motion { - int x; - int y; - int screen; - int window; - } mouse_motion; + union { + struct mouse_motion { + int x; + int y; + int screen; + int window; + } mouse_motion; - struct mouse_down { - int button_num; - } mouse_down; + struct mouse_down { + int button_num; + } mouse_down; - struct mouse_up { - int button_num; - } mouse_up; + struct mouse_up { + int button_num; + } mouse_up; - struct key_up { - int scancode; - } key_up; + struct key_up { + int scancode; + } key_up; - struct key_down { - int scancode; - } key_down; + struct key_down { + int scancode; + } key_down; - struct expose { - int window; - } expose; + struct expose { + int window; + } expose; - } data; + } data; - int key_state; + int key_state; }; typedef struct { - VisualID visualid; - int screen; - int depth; - int class; - unsigned long red_mask; - unsigned long green_mask; - unsigned long blue_mask; - int colormap_size; - int bits_per_rgb; + VisualID visualid; + int screen; + int depth; + int class; + unsigned long red_mask; + unsigned long green_mask; + unsigned long blue_mask; + int colormap_size; + int bits_per_rgb; } EphyrHostVisualInfo; typedef struct { int x, y; - int width, height ; - int visualid ; + int width, height; + int visualid; } EphyrHostWindowAttributes; typedef struct { - int x,y,width,height; + int x, y, width, height; } EphyrBox; typedef struct { - short x1,y1,x2,y2; + short x1, y1, x2, y2; } EphyrRect; int -hostx_want_screen_size(EphyrScreenInfo screen, int *width, int *height); + hostx_want_screen_size(EphyrScreenInfo screen, int *width, int *height); int -hostx_want_host_cursor(void); + hostx_want_host_cursor(void); void -hostx_use_host_cursor(void); + hostx_use_host_cursor(void); void -hostx_use_fullscreen(void); + hostx_use_fullscreen(void); int -hostx_want_fullscreen(void); + hostx_want_fullscreen(void); int -hostx_want_preexisting_window(EphyrScreenInfo screen); + hostx_want_preexisting_window(EphyrScreenInfo screen); void -hostx_use_preexisting_window(unsigned long win_id); + hostx_use_preexisting_window(unsigned long win_id); void -hostx_use_resname (char *name, int fromcmd); + hostx_use_resname(char *name, int fromcmd); void -hostx_set_title(char *name); + hostx_set_title(char *name); -void -hostx_handle_signal(int signum); +void + hostx_handle_signal(int signum); int -hostx_init(void); + hostx_init(void); void -hostx_add_screen(EphyrScreenInfo screen, unsigned long win_id, int screen_num); + hostx_add_screen(EphyrScreenInfo screen, unsigned long win_id, int screen_num); void -hostx_set_display_name(char *name); + hostx_set_display_name(char *name); void -hostx_set_screen_number(EphyrScreenInfo screen, int number); + hostx_set_screen_number(EphyrScreenInfo screen, int number); void -hostx_set_win_title(EphyrScreenInfo screen, char *extra_text); + hostx_set_win_title(EphyrScreenInfo screen, char *extra_text); int -hostx_get_depth (void); + hostx_get_depth(void); int -hostx_get_server_depth (EphyrScreenInfo screen); + hostx_get_server_depth(EphyrScreenInfo screen); void -hostx_set_server_depth(EphyrScreenInfo screen, int depth); + hostx_set_server_depth(EphyrScreenInfo screen, int depth); int -hostx_get_bpp(void *info); + hostx_get_bpp(void *info); void -hostx_get_visual_masks (void *info, - CARD32 *rmsk, - CARD32 *gmsk, - CARD32 *bmsk); + hostx_get_visual_masks(void *info, CARD32 *rmsk, CARD32 *gmsk, CARD32 *bmsk); void -hostx_set_cmap_entry(unsigned char idx, - unsigned char r, - unsigned char g, - unsigned char b); -void* -hostx_screen_init (EphyrScreenInfo screen, - int width, int height, - int buffer_height); +hostx_set_cmap_entry(unsigned char idx, + unsigned char r, unsigned char g, unsigned char b); + +void *hostx_screen_init(EphyrScreenInfo screen, + int width, int height, int buffer_height); void -hostx_paint_rect(EphyrScreenInfo screen, - int sx, int sy, - int dx, int dy, - int width, int height); +hostx_paint_rect(EphyrScreenInfo screen, + int sx, int sy, int dx, int dy, int width, int height); void -hostx_load_keymap (void); + hostx_load_keymap(void); int -hostx_get_event (EphyrHostXEvent *ev); + hostx_get_event(EphyrHostXEvent * ev); -void* -hostx_get_display (void) ; +void *hostx_get_display(void); int -hostx_get_window (int a_screen_number) ; + hostx_get_window(int a_screen_number); int -hostx_get_window_attributes (int a_window, EphyrHostWindowAttributes *a_attr) ; + hostx_get_window_attributes(int a_window, EphyrHostWindowAttributes * a_attr); int -hostx_get_extension_info (const char *a_ext_name, - int *a_major_opcode, - int *a_first_even, - int *a_first_error) ; -int -hostx_get_visuals_info (EphyrHostVisualInfo **a_visuals, - int *a_num_entries) ; -int hostx_create_window (int a_screen_number, - EphyrBox *a_geometry, - int a_visual_id, - int *a_host_win /*out parameter*/) ; +hostx_get_extension_info(const char *a_ext_name, + int *a_major_opcode, + int *a_first_even, int *a_first_error); +int + hostx_get_visuals_info(EphyrHostVisualInfo ** a_visuals, int *a_num_entries); -int hostx_destroy_window (int a_win) ; +int hostx_create_window(int a_screen_number, + EphyrBox * a_geometry, + int a_visual_id, int *a_host_win /*out parameter */ ); -int hostx_set_window_geometry (int a_win, EphyrBox *a_geo) ; +int hostx_destroy_window(int a_win); +int hostx_set_window_geometry(int a_win, EphyrBox * a_geo); -int hostx_set_window_bounding_rectangles (int a_window, - EphyrRect *a_rects, - int a_num_rects) ; +int hostx_set_window_bounding_rectangles(int a_window, + EphyrRect * a_rects, int a_num_rects); -int hostx_set_window_clipping_rectangles (int a_window, - EphyrRect *a_rects, - int a_num_rects) ; -int hostx_has_xshape (void) ; +int hostx_set_window_clipping_rectangles(int a_window, + EphyrRect * a_rects, int a_num_rects); +int hostx_has_xshape(void); #ifdef XF86DRI -int hostx_lookup_peer_window (void *a_local_window, - int *a_host_peer /*out parameter*/) ; +int hostx_lookup_peer_window(void *a_local_window, + int *a_host_peer /*out parameter */ ); int -hostx_allocate_resource_id_peer (int a_local_resource_id, - int *a_remote_resource_id) ; + +hostx_allocate_resource_id_peer(int a_local_resource_id, + int *a_remote_resource_id); int -hostx_get_resource_id_peer (int a_local_resource_id, - int *a_remote_resource_id) ; -int hostx_has_dri (void) ; + hostx_get_resource_id_peer(int a_local_resource_id, int *a_remote_resource_id); +int hostx_has_dri(void); -int hostx_has_glx (void) ; -#endif /* XF86DRI */ +int hostx_has_glx(void); +#endif /* XF86DRI */ #endif /*_XLIBS_STUFF_H_*/ -- cgit v1.2.3