Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_actions.c e_border.c e_config.c e_config.h
e_int_config_window_manipulation.c e_int_shelf_config.c
e_ipc_handlers.h
Log Message:
satrun_vk's patch to make manipulating windows while maximized an option and
translation updates
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- e_actions.c 13 May 2006 14:23:42 -0000 1.56
+++ e_actions.c 16 May 2006 07:32:37 -0000 1.57
@@ -1381,7 +1381,8 @@
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 @@
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;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -3 -r1.487 -r1.488
--- e_border.c 14 May 2006 01:13:42 -0000 1.487
+++ e_border.c 16 May 2006 07:32:37 -0000 1.488
@@ -654,7 +654,9 @@
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_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_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_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_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 @@
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 @@
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 @@
{
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)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -3 -r1.169 -r1.170
--- e_config.c 13 May 2006 03:04:35 -0000 1.169
+++ e_config.c 16 May 2006 07:32:37 -0000 1.170
@@ -396,7 +396,7 @@
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->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_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);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -3 -r1.97 -r1.98
--- e_config.h 12 May 2006 15:12:00 -0000 1.97
+++ e_config.h 16 May 2006 07:32:37 -0000 1.98
@@ -159,7 +159,7 @@
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;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_window_manipulation.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_int_config_window_manipulation.c 15 Feb 2006 20:30:08 -0000 1.7
+++ e_int_config_window_manipulation.c 16 May 2006 07:32:37 -0000 1.8
@@ -23,7 +23,7 @@
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 @@
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 @@
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 @@
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);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_shelf_config.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_int_shelf_config.c 7 May 2006 12:55:07 -0000 1.8
+++ e_int_shelf_config.c 16 May 2006 07:32:37 -0000 1.9
@@ -182,7 +182,7 @@
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);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_ipc_handlers.h,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -3 -r1.128 -r1.129
--- e_ipc_handlers.h 9 Apr 2006 11:55:18 -0000 1.128
+++ e_ipc_handlers.h 16 May 2006 07:32:37 -0000 1.129
@@ -2449,13 +2449,13 @@
/****************************************************************************/
#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 @@
/****************************************************************************/
#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
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
