Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_config.c e_config.h
e_int_config_window_manipulation.c
Log Message:
options to allow shading etc.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.474
retrieving revision 1.475
diff -u -3 -r1.474 -r1.475
--- e_border.c 7 Jan 2006 10:39:45 -0000 1.474
+++ e_border.c 8 Jan 2006 12:32:15 -0000 1.475
@@ -695,7 +695,7 @@
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
if ((bd->shaded) || (bd->shading) || (bd->fullscreen) ||
- (bd->maximized == E_MAXIMIZE_FULLSCREEN))
+ ((bd->maximized == E_MAXIMIZE_FULLSCREEN) &&
(!e_config->allow_shading)))
return;
if (bd->new_client)
{
@@ -752,7 +752,7 @@
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_shading))) return;
if (bd->new_client)
{
E_Border_Pending_Move_Resize *pnd;
@@ -1284,7 +1284,8 @@
E_OBJECT_CHECK(bd);
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
- if ((bd->fullscreen) || (bd->maximized) || (bd->shading)) return;
+ if ((bd->fullscreen) || ((bd->maximized) && (!e_config->allow_shading))
+ || (bd->shading)) return;
if ((bd->client.border.name) &&
(!strcmp("borderless", bd->client.border.name))) return;
if (!bd->shaded)
@@ -1371,7 +1372,8 @@
E_OBJECT_CHECK(bd);
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
- if ((bd->fullscreen) || (bd->maximized) || (bd->shading)) return;
+ if ((bd->fullscreen) || ((bd->maximized) && (!e_config->allow_shading))
+ || (bd->shading)) return;
if (bd->shaded)
{
// printf("UNSHADE!\n");
@@ -3754,8 +3756,10 @@
bd = e_border_find_by_client_window(e->win);
if (!bd) return 1;
- if ((bd->shaded) || (bd->shading) || (bd->maximized ==
E_MAXIMIZE_FULLSCREEN) ||
- (bd->fullscreen) || (bd->moving) || (bd->resize_mode != RESIZE_NONE))
+ if ((bd->shaded) || (bd->shading)
+ || ((bd->maximized == E_MAXIMIZE_FULLSCREEN) &&
(!e_config->allow_shading))
+ || (bd->fullscreen) || (bd->moving)
+ || (bd->resize_mode != RESIZE_NONE))
return 1;
if ((e->button >= 1) && (e->button <= 3))
@@ -6284,8 +6288,9 @@
if (!bd->lock_user_stacking)
e_border_raise(bd);
- if ((bd->shaded) || (bd->shading) || (bd->maximized ==
E_MAXIMIZE_FULLSCREEN) ||
- (bd->fullscreen) || (bd->lock_user_size))
+ if ((bd->shaded) || (bd->shading) ||
+ ((bd->maximized == E_MAXIMIZE_FULLSCREEN) &&
(!e_config->allow_shading))
+ || (bd->fullscreen) || (bd->lock_user_size))
return 0;
if ((bd->client.icccm.base_w >= 0) &&
@@ -6385,7 +6390,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)
+ || (bd->fullscreen) || (bd->lock_user_location))
return 0;
if (grabbed)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -3 -r1.135 -r1.136
--- e_config.c 7 Jan 2006 10:39:45 -0000 1.135
+++ e_config.c 8 Jan 2006 12:32:16 -0000 1.136
@@ -332,6 +332,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, kill_if_close_not_possible, INT); /**/
E_CONFIG_VAL(D, T, kill_process, INT); /**/
E_CONFIG_VAL(D, T, kill_timer_wait, DOUBLE); /**/
@@ -479,6 +480,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->kill_if_close_not_possible = 1;
e_config->kill_process = 1;
e_config->kill_timer_wait = 10.0;
@@ -1494,6 +1496,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->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: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- e_config.h 4 Jan 2006 22:20:51 -0000 1.73
+++ e_config.h 8 Jan 2006 12:32:16 -0000 1.74
@@ -152,6 +152,7 @@
int winlist_pos_max_w; // GUI
int winlist_pos_max_h; // GUI
int maximize_policy; // GUI
+ int allow_shading; // GUI
int kill_if_close_not_possible;
int kill_process;
double kill_timer_wait;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_window_manipulation.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_int_config_window_manipulation.c 7 Jan 2006 10:39:45 -0000 1.2
+++ e_int_config_window_manipulation.c 8 Jan 2006 12:32:16 -0000 1.3
@@ -28,6 +28,7 @@
int window_resist;
int gadget_resist;
int maximize_policy;
+ int allow_shading;
};
/* a nice easy setup function that does the dirty work */
@@ -65,6 +66,7 @@
if (cfdata->use_auto_raise) cfdata->auto_raise = 1;
if (cfdata->use_resist) cfdata->resist = 1;
cfdata->maximize = cfdata->maximize_policy;
+ cfdata->allow_shading = e_config->allow_shading;
}
static void *
@@ -111,6 +113,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_save_queue();
return 1; /* Apply was OK */
}
@@ -196,6 +199,8 @@
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));
+ e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
