vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

satrun_vk's patch to make manipulating windows while maximized an option and 

translation updates


SVN revision: 22638
This commit is contained in:
Carsten Haitzler 2006-05-16 07:32:37 +00:00
parent 0c6e5f1f96
commit 48e94671d8
8 changed files with 1402 additions and 745 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2091
po/bg.po
View File

File diff suppressed because it is too large Load Diff

6
src/bin/e_actions.c
View File

@ -1381,7 +1381,8 @@ ACT_FN_GO(pointer_resize_push)
E_Border *bd;
bd = (E_Border *)obj;
if ((bd->lock_user_size) || (bd->shaded) || (bd->shading) ||
(bd->fullscreen) || (bd->maximized == E_MAXIMIZE_FULLSCREEN))
(bd->fullscreen) ||
((bd->maximized == E_MAXIMIZE_FULLSCREEN)) && (!e_config->allow_manip))
return;
if (bd->zone)
man = bd->zone->container->manager;
@ -1401,7 +1402,8 @@ ACT_FN_GO(pointer_resize_pop)
E_Border *bd;
bd = (E_Border *)obj;
if ((bd->lock_user_size) || (bd->shaded) || (bd->shading) ||
(bd->fullscreen) || (bd->maximized == E_MAXIMIZE_FULLSCREEN))
(bd->fullscreen) ||
((bd->maximized == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip)))
return;
if (bd->zone)
man = (E_Manager *)bd->zone->container->manager;

22
src/bin/e_border.c
View File

@ -654,7 +654,9 @@ e_border_move(E_Border *bd, int x, int y)
E_OBJECT_CHECK(bd);
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
if ((bd->fullscreen) || (bd->maximized == E_MAXIMIZE_FULLSCREEN)) return;
if ((bd->fullscreen) ||
((bd->maximized == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip)))
return;
if (bd->new_client)
{
E_Border_Pending_Move_Resize *pnd;
@ -706,7 +708,7 @@ e_border_resize(E_Border *bd, int w, int h)
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
if ((bd->shaded) || (bd->shading) || (bd->fullscreen) ||
((bd->maximized == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_shading)))
((bd->maximized == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip)))
return;
if (bd->new_client)
{
@ -763,7 +765,9 @@ e_border_move_resize(E_Border *bd, int x, int y, int w, int h)
E_OBJECT_CHECK(bd);
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
if ((bd->fullscreen) || ((bd->maximized == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_shading))) return;
if ((bd->fullscreen) ||
((bd->maximized == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip)))
return;
if (bd->new_client)
{
E_Border_Pending_Move_Resize *pnd;
@ -1293,7 +1297,7 @@ e_border_shade(E_Border *bd, E_Direction dir)
E_OBJECT_CHECK(bd);
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
if ((bd->fullscreen) || ((bd->maximized) && (!e_config->allow_shading))
if ((bd->fullscreen) || ((bd->maximized) && (!e_config->allow_manip))
|| (bd->shading)) return;
if ((bd->client.border.name) &&
(!strcmp("borderless", bd->client.border.name))) return;
@ -1381,7 +1385,7 @@ e_border_unshade(E_Border *bd, E_Direction dir)
E_OBJECT_CHECK(bd);
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
if ((bd->fullscreen) || ((bd->maximized) && (!e_config->allow_shading))
if ((bd->fullscreen) || ((bd->maximized) && (!e_config->allow_manip))
|| (bd->shading)) return;
if (bd->shaded)
{
@ -3777,7 +3781,7 @@ _e_border_cb_window_move_resize_request(void *data, int ev_type, void *ev)
if (!bd) return 1;
if ((bd->shaded) || (bd->shading)
|| ((bd->maximized == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_shading))
|| ((bd->maximized == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip))
|| (bd->fullscreen) || (bd->moving)
|| (bd->resize_mode != RESIZE_NONE))
return 1;
@ -6341,7 +6345,7 @@ _e_border_resize_begin(E_Border *bd)
if (!bd->lock_user_stacking)
e_border_raise(bd);
if ((bd->shaded) || (bd->shading) ||
((bd->maximized == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_shading))
((bd->maximized == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip))
|| (bd->fullscreen) || (bd->lock_user_size))
return 0;
@ -6442,8 +6446,8 @@ _e_border_move_begin(E_Border *bd)
{
if (!bd->lock_user_stacking)
e_border_raise(bd);
if ((bd->maximized == E_MAXIMIZE_FULLSCREEN)
|| (bd->fullscreen) || (bd->lock_user_location))
if (((bd->maximized == E_MAXIMIZE_FULLSCREEN) && (!e_config->allow_manip))
|| (bd->fullscreen) || (bd->lock_user_location))
return 0;
if (grabbed)

6
src/bin/e_config.c
View File

@ -396,7 +396,7 @@ e_config_init(void)
E_CONFIG_VAL(D, T, winlist_pos_max_w, INT); /**/
E_CONFIG_VAL(D, T, winlist_pos_max_h, INT); /**/
E_CONFIG_VAL(D, T, maximize_policy, INT); /**/
E_CONFIG_VAL(D, T, allow_shading, INT); /**/
E_CONFIG_VAL(D, T, allow_manip, INT); /**/
E_CONFIG_VAL(D, T, kill_if_close_not_possible, INT); /**/
E_CONFIG_VAL(D, T, kill_process, INT); /**/
E_CONFIG_VAL(D, T, kill_timer_wait, DOUBLE); /**/
@ -572,7 +572,7 @@ e_config_init(void)
e_config->winlist_pos_max_w = 320;
e_config->winlist_pos_max_h = 320;
e_config->maximize_policy = E_MAXIMIZE_FULLSCREEN;
e_config->allow_shading = 0;
e_config->allow_manip = 0;
e_config->kill_if_close_not_possible = 1;
e_config->kill_process = 1;
e_config->kill_timer_wait = 10.0;
@ -1177,7 +1177,7 @@ e_config_init(void)
E_CONFIG_LIMIT(e_config->winlist_pos_max_w, 8, 4000);
E_CONFIG_LIMIT(e_config->winlist_pos_max_h, 8, 4000);
E_CONFIG_LIMIT(e_config->maximize_policy, E_MAXIMIZE_FULLSCREEN, E_MAXIMIZE_FILL);
E_CONFIG_LIMIT(e_config->allow_shading, 0, 1);
E_CONFIG_LIMIT(e_config->allow_manip, 0, 1);
E_CONFIG_LIMIT(e_config->kill_if_close_not_possible, 0, 1);
E_CONFIG_LIMIT(e_config->kill_process, 0, 1);
E_CONFIG_LIMIT(e_config->kill_timer_wait, 0.0, 120.0);

2
src/bin/e_config.h
View File

@ -159,7 +159,7 @@ struct _E_Config
int winlist_pos_max_w; // GUI
int winlist_pos_max_h; // GUI
int maximize_policy; // GUI
int allow_shading; // GUI
int allow_manip; // GUI
int kill_if_close_not_possible;
int kill_process;
double kill_timer_wait;

8
src/bin/e_int_config_window_manipulation.c
View File

@ -23,7 +23,7 @@ struct _E_Config_Dialog_Data
int desk_resist;
int window_resist;
int gadget_resist;
int allow_shading;
int allow_manip;
};
/* a nice easy setup function that does the dirty work */
@ -60,7 +60,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
cfdata->maximize_policy = e_config->maximize_policy;
if (cfdata->maximize_policy == E_MAXIMIZE_NONE)
cfdata->maximize_policy = E_MAXIMIZE_FULLSCREEN;
cfdata->allow_shading = e_config->allow_shading;
cfdata->allow_manip = e_config->allow_manip;
}
static void *
@ -107,7 +107,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
e_config->window_resist = cfdata->window_resist;
e_config->gadget_resist = cfdata->gadget_resist;
e_config->maximize_policy = cfdata->maximize_policy;
e_config->allow_shading = cfdata->allow_shading;
e_config->allow_manip = cfdata->allow_manip;
e_config_save_queue();
return 1; /* Apply was OK */
}
@ -189,7 +189,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Fill available space"), E_MAXIMIZE_FILL, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Allow shading/resizing"), &(cfdata->allow_shading));
ob = e_widget_check_add(evas, _("Allow window manipulation"), &(cfdata->allow_manip));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);

2
src/bin/e_int_shelf_config.c
View File

@ -182,7 +182,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_list_object_append(o2, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Size"), 0);
ob = e_widget_check_add(evas, _("Srink to Content Size"), &(cfdata->fit_along));
ob = e_widget_check_add(evas, _("Shrink to Content Size"), &(cfdata->fit_along));
e_widget_framelist_object_append(of, ob);
// ob = e_widget_check_add(evas, _("Expand width to fit contents"), &(cfdata->fit_size));
// e_widget_framelist_object_append(of, ob);

10
src/bin/e_ipc_handlers.h
View File

@ -2449,13 +2449,13 @@ break;
/****************************************************************************/
#define HDL E_IPC_OP_MAXIMIZE_MANIPULATION_SET
#if (TYPE == E_REMOTE_OPTIONS)
OP("-maximize-manipulation-set", 1, "Allow shading/resizing, 1 for enabled 0 for disabled", 0, HDL)
OP("-maximize-manipulation-set", 1, "Allow manipulation, 1 for enabled 0 for disabled", 0, HDL)
#elif (TYPE == E_REMOTE_OUT)
REQ_INT(atoi(params[0]), HDL);
#elif (TYPE == E_WM_IN)
START_INT(policy, HDL);
e_config->allow_shading = policy;
E_CONFIG_LIMIT(e_config->allow_shading, 0, 1);
e_config->allow_manip = policy;
E_CONFIG_LIMIT(e_config->allow_manip, 0, 1);
SAVE;
END_INT;
#elif (TYPE == E_REMOTE_IN)
@ -2465,11 +2465,11 @@ break;
/****************************************************************************/
#define HDL E_IPC_OP_MAXIMIZE_MANIPULATION_GET
#if (TYPE == E_REMOTE_OPTIONS)
OP("-maximize-manipulation-get", 0, "Get shading/resizing, 1 for enabled 0 for disabled", 1, HDL)
OP("-maximize-manipulation-get", 0, "Get manipulation, 1 for enabled 0 for disabled", 1, HDL)
#elif (TYPE == E_REMOTE_OUT)
REQ_NULL(HDL);
#elif (TYPE == E_WM_IN)
SEND_INT(e_config->allow_shading, E_IPC_OP_MAXIMIZE_MANIPULATION_GET_REPLY, HDL);
SEND_INT(e_config->allow_manip, E_IPC_OP_MAXIMIZE_MANIPULATION_GET_REPLY, HDL);
#elif (TYPE == E_REMOTE_IN)
#endif
#undef HDL