diff --git a/src/bin/e_border.c b/src/bin/e_border.c index 2e8bc4413..4cf45c5d0 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -1572,7 +1572,7 @@ e_border_focus_set_with_pointer(E_Border *bd) /* * this causes problems as the grab can cause an in/out event (by grab) that * normally would be like a grab from a menu or something else and e gets into - * a slef-feeding loop. sorry - can't grab :( + * a self-feeding loop. sorry - can't grab :( if (!ecore_x_pointer_grab(bd->zone->container->win)) return; */ diff --git a/src/bin/e_border.h b/src/bin/e_border.h index bfcb04d9b..42621c64e 100644 --- a/src/bin/e_border.h +++ b/src/bin/e_border.h @@ -114,7 +114,7 @@ typedef struct _E_Event_Border_Desk_Set E_Event_Border_Desk_Set; typedef struct _E_Event_Border_Stack E_Event_Border_Stack; typedef struct _E_Event_Border_Simple E_Event_Border_Icon_Change; typedef struct _E_Event_Border_Simple E_Event_Border_Urgent_Change; -typedef struct _E_Event_Border_Simple E_Event_Border_Focus_In; +typedef struct _E_Event_Border_Simple E_Event_Border_Focus_In; typedef struct _E_Event_Border_Simple E_Event_Border_Focus_Out; typedef struct _E_Event_Border_Simple E_Event_Border_Property; typedef struct _E_Event_Border_Simple E_Event_Border_Fullscreen; @@ -132,16 +132,16 @@ struct _E_Border struct { struct { - int x, y, w, h; - int mx, my; + int x, y, w, h; + int mx, my; } current, last_down[3], last_up[3]; } mouse; struct { struct { - int x, y, w, h; - int mx, my; - int button; + int x, y, w, h; + int mx, my; + int button; } down; } moveinfo; @@ -155,8 +155,8 @@ struct _E_Border struct { int x, y; struct { - int x, y; - double t; + int x, y; + double t; } start; } fx; @@ -180,9 +180,9 @@ struct _E_Border int x, y, w, h; struct { - unsigned char changed : 1; - unsigned char user_selected : 1; - const char *name; + unsigned char changed : 1; + unsigned char user_selected : 1; + const char *name; } border; unsigned char shaped : 1; @@ -190,178 +190,179 @@ struct _E_Border /* ICCCM */ struct { - char *title; - char *name; - char *class; - char *icon_name; - char *machine; - int min_w, min_h; - int max_w, max_h; - int base_w, base_h; - int step_w, step_h; - int start_x, start_y; - double min_aspect, max_aspect; - Ecore_X_Window_State_Hint initial_state; - Ecore_X_Window_State_Hint state; - Ecore_X_Pixmap icon_pixmap; - Ecore_X_Pixmap icon_mask; - Ecore_X_Window icon_window; - Ecore_X_Window window_group; - Ecore_X_Window transient_for; - Ecore_X_Window client_leader; - Ecore_X_Gravity gravity; - char *window_role; - unsigned char take_focus : 1; - unsigned char accepts_focus : 1; - unsigned char urgent : 1; - unsigned char delete_request : 1; - unsigned char request_pos : 1; - struct { - int argc; - char **argv; - } command; - struct { - unsigned char title : 1; - unsigned char name_class : 1; - unsigned char icon_name : 1; - unsigned char machine : 1; - unsigned char hints : 1; - unsigned char size_pos_hints : 1; - unsigned char protocol : 1; - unsigned char transient_for : 1; - unsigned char client_leader : 1; - unsigned char window_role : 1; - unsigned char state : 1; - unsigned char command : 1; - } fetch; + char *title; + char *name; + char *class; + char *icon_name; + char *machine; + int min_w, min_h; + int max_w, max_h; + int base_w, base_h; + int step_w, step_h; + int start_x, start_y; + double min_aspect, max_aspect; + Ecore_X_Window_State_Hint initial_state; + Ecore_X_Window_State_Hint state; + Ecore_X_Pixmap icon_pixmap; + Ecore_X_Pixmap icon_mask; + Ecore_X_Window icon_window; + Ecore_X_Window window_group; + Ecore_X_Window transient_for; + Ecore_X_Window client_leader; + Ecore_X_Gravity gravity; + char *window_role; + unsigned char take_focus : 1; + unsigned char accepts_focus : 1; + unsigned char urgent : 1; + unsigned char delete_request : 1; + unsigned char request_pos : 1; + struct { + int argc; + char **argv; + } command; + struct { + unsigned char title : 1; + unsigned char name_class : 1; + unsigned char icon_name : 1; + unsigned char machine : 1; + unsigned char hints : 1; + unsigned char size_pos_hints : 1; + unsigned char protocol : 1; + unsigned char transient_for : 1; + unsigned char client_leader : 1; + unsigned char window_role : 1; + unsigned char state : 1; + unsigned char command : 1; + } fetch; } icccm; /* MWM */ struct { - Ecore_X_MWM_Hint_Func func; - Ecore_X_MWM_Hint_Decor decor; - Ecore_X_MWM_Hint_Input input; - unsigned char exists : 1; - unsigned char borderless : 1; - struct { - unsigned char hints : 1; - } fetch; + Ecore_X_MWM_Hint_Func func; + Ecore_X_MWM_Hint_Decor decor; + Ecore_X_MWM_Hint_Input input; + unsigned char exists : 1; + unsigned char borderless : 1; + struct { + unsigned char hints : 1; + } fetch; } mwm; /* NetWM */ struct { - pid_t pid; - unsigned int desktop; - char *name; - char *icon_name; - Ecore_X_Icon *icons; - int num_icons; - unsigned int user_time; - struct { - 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; - } strut; - unsigned char ping : 1; - struct { - unsigned char request : 1; - unsigned int wait; - Ecore_X_Sync_Alarm alarm; - Ecore_X_Sync_Counter counter; - unsigned int serial; - double send_time; - } sync; - - /* NetWM Window state */ - struct { - unsigned char modal : 1; - unsigned char sticky : 1; - unsigned char maximized_v : 1; - unsigned char maximized_h : 1; - unsigned char shaded : 1; - unsigned char skip_taskbar : 1; - unsigned char skip_pager : 1; - unsigned char hidden : 1; - unsigned char fullscreen : 1; - E_Stacking stacking; - } state; - - /* NetWM Window allowed actions */ + pid_t pid; + unsigned int desktop; + char *name; + char *icon_name; + Ecore_X_Icon *icons; + int num_icons; + unsigned int user_time; struct { - unsigned char move : 1; - unsigned char resize : 1; - unsigned char minimize : 1; - unsigned char shade : 1; - unsigned char stick : 1; - unsigned char maximized_h : 1; + 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; + } strut; + unsigned char ping : 1; + struct { + unsigned char request : 1; + unsigned int wait; + Ecore_X_Sync_Alarm alarm; + Ecore_X_Sync_Counter counter; + unsigned int serial; + double send_time; + } sync; + + /* NetWM Window state */ + struct { + unsigned char modal : 1; + unsigned char sticky : 1; unsigned char maximized_v : 1; + unsigned char maximized_h : 1; + unsigned char shaded : 1; + unsigned char skip_taskbar : 1; + unsigned char skip_pager : 1; + unsigned char hidden : 1; unsigned char fullscreen : 1; - unsigned char change_desktop : 1; - unsigned char close : 1; - } action; + E_Stacking stacking; + } state; - Ecore_X_Window_Type type; - Ecore_X_Window_Type *extra_types; - int extra_types_num; - int startup_id; + /* NetWM Window allowed actions */ + struct { + unsigned char move : 1; + unsigned char resize : 1; + unsigned char minimize : 1; + unsigned char shade : 1; + unsigned char stick : 1; + unsigned char maximized_h : 1; + unsigned char maximized_v : 1; + unsigned char fullscreen : 1; + unsigned char change_desktop : 1; + unsigned char close : 1; + } action; - struct { - unsigned char name : 1; - unsigned char icon_name : 1; - unsigned char icon : 1; - unsigned char user_time : 1; - unsigned char strut : 1; - unsigned char type : 1; - unsigned char state : 1; - /* No, fetch on new_client, shouldn't be changed after map. - unsigned char pid : 1; - */ - /* No, ignore this - unsigned char desktop : 1; - */ - } fetch; + Ecore_X_Window_Type type; + Ecore_X_Window_Type *extra_types; + int extra_types_num; + int startup_id; - struct { - unsigned char state : 1; - } update; + struct { + unsigned char name : 1; + unsigned char icon_name : 1; + unsigned char icon : 1; + unsigned char user_time : 1; + unsigned char strut : 1; + unsigned char type : 1; + unsigned char state : 1; + /* No, fetch on new_client, shouldn't be changed after map. + unsigned char pid : 1; + */ + /* No, ignore this + unsigned char desktop : 1; + */ + } fetch; + + struct { + unsigned char state : 1; + } update; } netwm; /* Extra e stuff */ struct { - struct { - unsigned char centered : 1; - } state; + struct { + unsigned char centered : 1; + } state; - struct { - unsigned char state : 1; - } fetch; + struct { + unsigned char state : 1; + } fetch; } e; struct { - struct { - unsigned char soft_menu : 1; - unsigned char soft_menus : 1; - } fetch; - - unsigned char soft_menu : 1; - unsigned char soft_menus : 1; + struct { + unsigned char soft_menu : 1; + unsigned char soft_menus : 1; + } fetch; + + unsigned char soft_menu : 1; + unsigned char soft_menus : 1; } qtopia; + struct { - struct { - unsigned char state : 1; - unsigned char vkbd : 1; - } fetch; - Ecore_X_Virtual_Keyboard_State state; - unsigned char vkbd : 1; + struct { + unsigned char state : 1; + unsigned char vkbd : 1; + } fetch; + Ecore_X_Virtual_Keyboard_State state; + unsigned char vkbd : 1; } vkbd; struct @@ -492,7 +493,7 @@ struct _E_Border unsigned char valid : 1; int x, y, w, h; struct { - int x, y, w, h; + int x, y, w, h; } saved; } pre_res_change;