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
This commit is contained in:
richlowe
richlowe
parent
cb64aa578f
commit
7b49512f62
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
34
src/border.c
34
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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
5
src/e.h
5
src/e.h
|
|
@ -1,3 +1,6 @@
|
|||
#ifndef __E_H_
|
||||
#define __E_H_
|
||||
|
||||
#include "../config.h"
|
||||
#include <X11/Xlib.h>
|
||||
#include <Imlib2.h>
|
||||
|
|
@ -336,3 +339,5 @@ void e_resist_border(E_Border *b);
|
|||
|
||||
time_t e_file_modified_time(char *file);
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
43
src/icccm.c
43
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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
Loading…
Reference in New Issue