forked from enlightenment/enlightenment
Tiling2: Removed some redundant code.
This commit is contained in:
parent
df14cca8dd
commit
5d044ecad3
|
@ -6,37 +6,10 @@
|
||||||
#define TILING_RESIZE_STEP 5
|
#define TILING_RESIZE_STEP 5
|
||||||
#define TILING_WRAP_SPEED 0.1
|
#define TILING_WRAP_SPEED 0.1
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
TILING_RESIZE,
|
|
||||||
TILING_MOVE,
|
|
||||||
} tiling_change_t;
|
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
INPUT_MODE_NONE,
|
|
||||||
INPUT_MODE_SWAPPING,
|
|
||||||
INPUT_MODE_MOVING,
|
|
||||||
INPUT_MODE_GOING,
|
|
||||||
INPUT_MODE_TRANSITION,
|
|
||||||
} tiling_input_mode_t;
|
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
MOVE_UP,
|
|
||||||
MOVE_DOWN,
|
|
||||||
MOVE_LEFT,
|
|
||||||
MOVE_RIGHT,
|
|
||||||
|
|
||||||
MOVE_COUNT
|
|
||||||
} tiling_move_t;
|
|
||||||
|
|
||||||
typedef struct geom_t {
|
typedef struct geom_t {
|
||||||
int x, y, w, h;
|
int x, y, w, h;
|
||||||
} geom_t;
|
} geom_t;
|
||||||
|
|
||||||
typedef struct overlay_t {
|
|
||||||
Evas_Object *popup;
|
|
||||||
Evas_Object *obj;
|
|
||||||
} overlay_t;
|
|
||||||
|
|
||||||
typedef struct Client_Extra {
|
typedef struct Client_Extra {
|
||||||
E_Client *client;
|
E_Client *client;
|
||||||
geom_t expected;
|
geom_t expected;
|
||||||
|
@ -47,8 +20,6 @@ typedef struct Client_Extra {
|
||||||
E_Maximize maximized;
|
E_Maximize maximized;
|
||||||
const char *bordername;
|
const char *bordername;
|
||||||
} orig;
|
} orig;
|
||||||
overlay_t overlay;
|
|
||||||
char key[4];
|
|
||||||
int last_frame_adjustment; // FIXME: Hack for frame resize bug.
|
int last_frame_adjustment; // FIXME: Hack for frame resize bug.
|
||||||
Eina_Bool sticky : 1;
|
Eina_Bool sticky : 1;
|
||||||
Eina_Bool floating : 1;
|
Eina_Bool floating : 1;
|
||||||
|
@ -105,16 +76,13 @@ static struct tiling_mod_main_g
|
||||||
warp_to_y;
|
warp_to_y;
|
||||||
Ecore_Timer *warp_timer;
|
Ecore_Timer *warp_timer;
|
||||||
|
|
||||||
overlay_t move_overlays[MOVE_COUNT];
|
|
||||||
Ecore_Timer *action_timer;
|
Ecore_Timer *action_timer;
|
||||||
E_Client *focused_ec;
|
E_Client *focused_ec;
|
||||||
void (*action_cb)(E_Client *ec, Client_Extra *extra);
|
void (*action_cb)(E_Client *ec, Client_Extra *extra);
|
||||||
Tiling_Split_Type split_type;
|
Tiling_Split_Type split_type;
|
||||||
|
|
||||||
tiling_input_mode_t input_mode;
|
|
||||||
char keys[4];
|
char keys[4];
|
||||||
} _G = {
|
} _G = {
|
||||||
.input_mode = INPUT_MODE_NONE,
|
|
||||||
.split_type = TILING_SPLIT_HORIZONTAL,
|
.split_type = TILING_SPLIT_HORIZONTAL,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1203,7 +1171,6 @@ e_modapi_init(E_Module *m)
|
||||||
desk = get_current_desk();
|
desk = get_current_desk();
|
||||||
_G.tinfo = _initialize_tinfo(desk);
|
_G.tinfo = _initialize_tinfo(desk);
|
||||||
|
|
||||||
_G.input_mode = INPUT_MODE_NONE;
|
|
||||||
_G.currently_switching_desktop = 0;
|
_G.currently_switching_desktop = 0;
|
||||||
_G.action_cb = NULL;
|
_G.action_cb = NULL;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue