From 7b49512f623477dc34b3081cbb61fb4b52cae47e Mon Sep 17 00:00:00 2001 From: richlowe Date: Sat, 9 Dec 2000 05:33:36 +0000 Subject: [PATCH] Seeing as all the public prototypes are in e.h we may has well have the private ones in headers as well. keep things tidy. now to have a look at those *ahem*cough*hack*splutter*choke*gotos*whisper*mumble :-) SVN revision: 3967 --- src/Makefile.am | 3 +++ src/actions.c | 53 ++------------------------------------------ src/actions.h | 58 +++++++++++++++++++++++++++++++++++++++++++++++++ src/border.c | 34 ----------------------------- src/border.h | 41 ++++++++++++++++++++++++++++++++++ src/e.h | 5 +++++ src/icccm.c | 43 +----------------------------------- src/icccm.h | 46 +++++++++++++++++++++++++++++++++++++++ 8 files changed, 156 insertions(+), 127 deletions(-) create mode 100644 src/actions.h create mode 100644 src/border.h create mode 100644 src/icccm.h diff --git a/src/Makefile.am b/src/Makefile.am index eb7caf2ee..f20f07e0d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,9 +8,12 @@ bin_PROGRAMS = e e_SOURCES = \ actions.c \ +actions.h \ border.c \ +border.h \ desktops.c \ icccm.c \ +icccm.h \ main.c \ resist.c \ util.c \ diff --git a/src/actions.c b/src/actions.c index b567bea47..e817e35ab 100644 --- a/src/actions.c +++ b/src/actions.c @@ -1,59 +1,10 @@ #include "e.h" +#include "actions.h" + static Evas_List action_protos = NULL; static Evas_List current_actions = NULL; -static void _e_action_find(char *action, int act, int button, char *key, Ev_Key_Modifiers mods, void *o); -static void _e_action_free(E_Action *a); - -static void e_act_move_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); -static void e_act_move_stop (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); -static void e_act_move_go (void *o, E_Action *a, void *data, int x, int y, int rx, int ry, int dx, int dy); - -static void e_act_resize_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); -static void e_act_resize_stop (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); -static void e_act_resize_go (void *o, E_Action *a, void *data, int x, int y, int rx, int ry, int dx, int dy); - -static void e_act_resize_h_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); -static void e_act_resize_h_stop (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); -static void e_act_resize_h_go (void *o, E_Action *a, void *data, int x, int y, int rx, int ry, int dx, int dy); - -static void e_act_resize_v_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); -static void e_act_resize_v_stop (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); -static void e_act_resize_v_go (void *o, E_Action *a, void *data, int x, int y, int rx, int ry, int dx, int dy); - -static void e_act_close_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); - -static void e_act_kill_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); - -static void e_act_shade_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); - -static void e_act_raise_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); - -static void e_act_lower_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); - -static void e_act_raise_lower_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); - -static void e_act_exec_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); - -static void e_act_menu_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); - -static void e_act_exit_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); - -static void e_act_restart_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); - -static void e_act_stick_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); - -static void e_act_sound_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); - -static void e_act_iconify_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); - -static void e_act_max_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); - -static void e_act_snap_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); - -static void e_act_zoom_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); - static void _e_action_find(char *action, int act, int button, char *key, Ev_Key_Modifiers mods, void *o) { diff --git a/src/actions.h b/src/actions.h new file mode 100644 index 000000000..a33315f19 --- /dev/null +++ b/src/actions.h @@ -0,0 +1,58 @@ +#ifndef __ACTIONS_H_ +#define __ACTIONS_H_ + +#include "e.h" + +static void _e_action_find(char *action, int act, int button, char *key, Ev_Key_Modifiers mods, void *o); +static void _e_action_free(E_Action *a); + +static void e_act_move_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); +static void e_act_move_stop (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); +static void e_act_move_go (void *o, E_Action *a, void *data, int x, int y, int rx, int ry, int dx, int dy); + +static void e_act_resize_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); +static void e_act_resize_stop (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); +static void e_act_resize_go (void *o, E_Action *a, void *data, int x, int y, int rx, int ry, int dx, int dy); + +static void e_act_resize_h_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); +static void e_act_resize_h_stop (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); +static void e_act_resize_h_go (void *o, E_Action *a, void *data, int x, int y, int rx, int ry, int dx, int dy); + +static void e_act_resize_v_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); +static void e_act_resize_v_stop (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); +static void e_act_resize_v_go (void *o, E_Action *a, void *data, int x, int y, int rx, int ry, int dx, int dy); + +static void e_act_close_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); + +static void e_act_kill_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); + +static void e_act_shade_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); + +static void e_act_raise_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); + +static void e_act_lower_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); + +static void e_act_raise_lower_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); + +static void e_act_exec_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); + +static void e_act_menu_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); + +static void e_act_exit_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); + +static void e_act_restart_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); + +static void e_act_stick_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); + +static void e_act_sound_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); + +static void e_act_iconify_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); + +static void e_act_max_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); + +static void e_act_snap_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); + +static void e_act_zoom_start (void *o, E_Action *a, void *data, int x, int y, int rx, int ry); + +#endif + diff --git a/src/border.c b/src/border.c index 4106d9726..e59d5dabd 100644 --- a/src/border.c +++ b/src/border.c @@ -15,40 +15,6 @@ static int border_mouse_buttons = 0; static Eevent *current_ev = NULL; -static void e_idle(void *data); -static void e_map_request(Eevent * ev); -static void e_configure_request(Eevent * ev); -static void e_property(Eevent * ev); -static void e_unmap(Eevent * ev); -static void e_destroy(Eevent * ev); -static void e_circulate_request(Eevent * ev); -static void e_reparent(Eevent * ev); -static void e_shape(Eevent * ev); -static void e_focus_in(Eevent * ev); -static void e_focus_out(Eevent * ev); -static void e_colormap(Eevent * ev); -static void e_mouse_down(Eevent * ev); -static void e_mouse_up(Eevent * ev); -static void e_mouse_in(Eevent * ev); -static void e_mouse_out(Eevent * ev); -static void e_window_expose(Eevent * ev); - -static void e_cb_mouse_in(void *data, Ebits_Object o, char *class, int bt, int x, int y, int ox, int oy, int ow, int oh); -static void e_cb_mouse_out(void *data, Ebits_Object o, char *class, int bt, int x, int y, int ox, int oy, int ow, int oh); -static void e_cb_mouse_down(void *data, Ebits_Object o, char *class, int bt, int x, int y, int ox, int oy, int ow, int oh); -static void e_cb_mouse_up(void *data, Ebits_Object o, char *class, int bt, int x, int y, int ox, int oy, int ow, int oh); -static void e_cb_mouse_move(void *data, Ebits_Object o, char *class, int bt, int x, int y, int ox, int oy, int ow, int oh); - -static void e_cb_border_mouse_in(E_Border *b, Eevent *e); -static void e_cb_border_mouse_out(E_Border *b, Eevent *e); -static void e_cb_border_mouse_down(E_Border *b, Eevent *e); -static void e_cb_border_mouse_up(E_Border *b, Eevent *e); -static void e_cb_border_mouse_move(E_Border *b, Eevent *e); -static void e_cb_border_move_resize(E_Border *b); -static void e_cb_border_visibility(E_Border *b); - -static void e_border_poll(int val, void *data); - /* what to dowhen we're idle */ static void e_idle(void *data) diff --git a/src/border.h b/src/border.h new file mode 100644 index 000000000..24614112b --- /dev/null +++ b/src/border.h @@ -0,0 +1,41 @@ +#ifndef __BORDERS_H_ +#define __BORDERS_H_ + +#include "e.h" + +static void e_idle(void *data); +static void e_map_request(Eevent * ev); +static void e_configure_request(Eevent * ev); +static void e_property(Eevent * ev); +static void e_unmap(Eevent * ev); +static void e_destroy(Eevent * ev); +static void e_circulate_request(Eevent * ev); +static void e_reparent(Eevent * ev); +static void e_shape(Eevent * ev); +static void e_focus_in(Eevent * ev); +static void e_focus_out(Eevent * ev); +static void e_colormap(Eevent * ev); +static void e_mouse_down(Eevent * ev); +static void e_mouse_up(Eevent * ev); +static void e_mouse_in(Eevent * ev); +static void e_mouse_out(Eevent * ev); +static void e_window_expose(Eevent * ev); + +static void e_cb_mouse_in(void *data, Ebits_Object o, char *class, int bt, int x, int y, int ox, int oy, int ow, int oh); +static void e_cb_mouse_out(void *data, Ebits_Object o, char *class, int bt, int x, int y, int ox, int oy, int ow, int oh); +static void e_cb_mouse_down(void *data, Ebits_Object o, char *class, int bt, int x, int y, int ox, int oy, int ow, int oh); +static void e_cb_mouse_up(void *data, Ebits_Object o, char *class, int bt, int x, int y, int ox, int oy, int ow, int oh); +static void e_cb_mouse_move(void *data, Ebits_Object o, char *class, int bt, int x, int y, int ox, int oy, int ow, int oh); + +static void e_cb_border_mouse_in(E_Border *b, Eevent *e); +static void e_cb_border_mouse_out(E_Border *b, Eevent *e); +static void e_cb_border_mouse_down(E_Border *b, Eevent *e); +static void e_cb_border_mouse_up(E_Border *b, Eevent *e); +static void e_cb_border_mouse_move(E_Border *b, Eevent *e); +static void e_cb_border_move_resize(E_Border *b); +static void e_cb_border_visibility(E_Border *b); + +static void e_border_poll(int val, void *data); + + +#endif diff --git a/src/e.h b/src/e.h index a63968107..b0506bedb 100644 --- a/src/e.h +++ b/src/e.h @@ -1,3 +1,6 @@ +#ifndef __E_H_ +#define __E_H_ + #include "../config.h" #include #include @@ -335,4 +338,6 @@ void e_desktops_update(E_Desktop *desk); void e_resist_border(E_Border *b); time_t e_file_modified_time(char *file); + +#endif diff --git a/src/icccm.c b/src/icccm.c index e81f4490a..c845b8f3c 100644 --- a/src/icccm.c +++ b/src/icccm.c @@ -1,46 +1,5 @@ #include "e.h" - -/* Motif window hints */ -#define MWM_HINTS_FUNCTIONS (1L << 0) -#define MWM_HINTS_DECORATIONS (1L << 1) -#define MWM_HINTS_INPUT_MODE (1L << 2) -#define MWM_HINTS_STATUS (1L << 3) - -/* bit definitions for MwmHints.functions */ -#define MWM_FUNC_ALL (1L << 0) -#define MWM_FUNC_RESIZE (1L << 1) -#define MWM_FUNC_MOVE (1L << 2) -#define MWM_FUNC_MINIMIZE (1L << 3) -#define MWM_FUNC_MAXIMIZE (1L << 4) -#define MWM_FUNC_CLOSE (1L << 5) - -/* bit definitions for MwmHints.decorations */ -#define MWM_DECOR_ALL (1L << 0) -#define MWM_DECOR_BORDER (1L << 1) -#define MWM_DECOR_RESIZEH (1L << 2) -#define MWM_DECOR_TITLE (1L << 3) -#define MWM_DECOR_MENU (1L << 4) -#define MWM_DECOR_MINIMIZE (1L << 5) -#define MWM_DECOR_MAXIMIZE (1L << 6) - -/* bit definitions for MwmHints.inputMode */ -#define MWM_INPUT_MODELESS 0 -#define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1 -#define MWM_INPUT_SYSTEM_MODAL 2 -#define MWM_INPUT_FULL_APPLICATION_MODAL 3 - -#define PROP_MWM_HINTS_ELEMENTS 5 - -/* Motif window hints */ -typedef struct _mwmhints -{ - int flags; - int functions; - int decorations; - int inputMode; - int status; -} -MWMHints; +#include "icccm.h" void e_icccm_move_resize(Window win, int x, int y, int w, int h) diff --git a/src/icccm.h b/src/icccm.h new file mode 100644 index 000000000..bdd6fb752 --- /dev/null +++ b/src/icccm.h @@ -0,0 +1,46 @@ +#ifndef __ICCCM_H_ +#define __ICCCM_H_ + +/* Motif window hints */ +#define MWM_HINTS_FUNCTIONS (1L << 0) +#define MWM_HINTS_DECORATIONS (1L << 1) +#define MWM_HINTS_INPUT_MODE (1L << 2) +#define MWM_HINTS_STATUS (1L << 3) + +/* bit definitions for MwmHints.functions */ +#define MWM_FUNC_ALL (1L << 0) +#define MWM_FUNC_RESIZE (1L << 1) +#define MWM_FUNC_MOVE (1L << 2) +#define MWM_FUNC_MINIMIZE (1L << 3) +#define MWM_FUNC_MAXIMIZE (1L << 4) +#define MWM_FUNC_CLOSE (1L << 5) + +/* bit definitions for MwmHints.decorations */ +#define MWM_DECOR_ALL (1L << 0) +#define MWM_DECOR_BORDER (1L << 1) +#define MWM_DECOR_RESIZEH (1L << 2) +#define MWM_DECOR_TITLE (1L << 3) +#define MWM_DECOR_MENU (1L << 4) +#define MWM_DECOR_MINIMIZE (1L << 5) +#define MWM_DECOR_MAXIMIZE (1L << 6) + +/* bit definitions for MwmHints.inputMode */ +#define MWM_INPUT_MODELESS 0 +#define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1 +#define MWM_INPUT_SYSTEM_MODAL 2 +#define MWM_INPUT_FULL_APPLICATION_MODAL 3 + +#define PROP_MWM_HINTS_ELEMENTS 5 + +/* Motif window hints */ +typedef struct _mwmhints +{ + int flags; + int functions; + int decorations; + int inputMode; + int status; +} +MWMHints; + +#endif