Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
E.h ewin-ops.c mod-misc.c settings.c
Log Message:
Merge.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.314.2.49
retrieving revision 1.314.2.50
diff -u -3 -r1.314.2.49 -r1.314.2.50
--- E.h 26 Sep 2004 20:09:49 -0000 1.314.2.49
+++ E.h 2 Oct 2004 12:27:46 -0000 1.314.2.50
@@ -1036,6 +1036,7 @@
char manual;
char manual_mouse_pointer;
char ignore_struts;
+ char raise_fullscreen;
} place;
struct
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/ewin-ops.c,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -3 -r1.1.2.9 -r1.1.2.10
--- ewin-ops.c 21 Sep 2004 21:57:19 -0000 1.1.2.9
+++ ewin-ops.c 2 Oct 2004 12:27:47 -0000 1.1.2.10
@@ -1120,6 +1120,8 @@
EwinSetFullscreen(EWin * ewin, int on)
{
int x, y, w, h;
+ EWin **lst;
+ int i, num;
const Border *b;
if (ewin->st.fullscreen == on)
@@ -1133,9 +1135,20 @@
ewin->lh = ewin->client.h;
ewin->ll = ewin->layer;
ScreenGetAvailableArea(ewin->x, ewin->y, &x, &y, &w, &h);
-#if 0
- ewin->layer = 10;
-#endif
+
+ if (Conf.place.raise_fullscreen)
+ {
+ ewin->layer = 8;
+ lst = EwinListTransients(ewin, &num, 0);
+ for (i = 0; i < num; i++)
+ {
+ lst[i]->ll = lst[i]->layer;
+ lst[i]->layer += ewin->layer - ewin->ll;
+ }
+ if (lst)
+ Efree(lst);
+ }
+
ewin->fixedpos = 1;
b = (Border *) FindItem("BORDERLESS", 0, LIST_FINDBY_NAME,
LIST_TYPE_BORDER);
@@ -1146,9 +1159,18 @@
y = ewin->ly;
w = ewin->lw;
h = ewin->lh;
- ewin->layer = ewin->ll;
ewin->fixedpos = 0; /* Yeah - well */
b = ewin->normal_border;
+
+ if (Conf.place.raise_fullscreen)
+ {
+ lst = EwinListTransients(ewin, &num, 0);
+ for (i = 0; i < num; i++)
+ lst[i]->layer = lst[i]->ll;
+ if (lst)
+ Efree(lst);
+ }
+ ewin->layer = ewin->ll;
}
ewin->st.fullscreen = on;
RaiseEwin(ewin);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/mod-misc.c,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -3 -r1.1.2.19 -r1.1.2.20
--- mod-misc.c 27 Sep 2004 22:09:24 -0000 1.1.2.19
+++ mod-misc.c 2 Oct 2004 12:27:47 -0000 1.1.2.20
@@ -30,6 +30,7 @@
extern EModule ModAclass;
extern EModule ModBackgrounds;
extern EModule ModButtons;
+
#if USE_COMPOSITE
extern EModule ModCompMgr;
#endif
@@ -184,6 +185,8 @@
CFG_ITEM_BOOL(Conf, place.manual, 0),
CFG_ITEM_BOOL(Conf, place.manual_mouse_pointer, 0),
+ CFG_ITEM_BOOL(Conf, place.ignore_struts, 0),
+ CFG_ITEM_BOOL(Conf, place.raise_fullscreen, 0),
CFG_ITEM_BOOL(Conf, snap.enable, 1),
CFG_ITEM_INT(Conf, snap.edge_snap_dist, 8),
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/settings.c,v
retrieving revision 1.120.2.10
retrieving revision 1.120.2.11
diff -u -3 -r1.120.2.10 -r1.120.2.11
--- settings.c 31 Aug 2004 23:25:28 -0000 1.120.2.10
+++ settings.c 2 Oct 2004 12:27:47 -0000 1.120.2.11
@@ -704,6 +704,7 @@
static char tmp_manual_placement;
static char tmp_manual_placement_mouse_pointer;
static char tmp_place_ignore_struts;
+static char tmp_raise_fullscreen;
#ifdef HAS_XINERAMA
static char tmp_extra_head;
@@ -719,6 +720,7 @@
Conf.place.manual = tmp_manual_placement;
Conf.place.manual_mouse_pointer = tmp_manual_placement_mouse_pointer;
Conf.place.ignore_struts = tmp_place_ignore_struts;
+ Conf.place.raise_fullscreen = tmp_raise_fullscreen;
#ifdef HAS_XINERAMA
if (Mode.display.xinerama_active)
Conf.extra_head = tmp_extra_head;
@@ -748,6 +750,7 @@
tmp_manual_placement = Conf.place.manual;
tmp_manual_placement_mouse_pointer = Conf.place.manual_mouse_pointer;
tmp_place_ignore_struts = Conf.place.ignore_struts;
+ tmp_raise_fullscreen = Conf.place.raise_fullscreen;
#ifdef HAS_XINERAMA
tmp_extra_head = Conf.extra_head;
#endif
@@ -821,6 +824,14 @@
DialogItemCheckButtonSetState(di, tmp_place_ignore_struts);
DialogItemCheckButtonSetPtr(di, &tmp_place_ignore_struts);
+ di = DialogAddItem(table, DITEM_CHECKBUTTON);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
+ DialogItemSetFill(di, 1, 0);
+ DialogItemSetColSpan(di, 2);
+ DialogItemCheckButtonSetText(di, _("Raise fullscreen windows"));
+ DialogItemCheckButtonSetState(di, tmp_raise_fullscreen);
+ DialogItemCheckButtonSetPtr(di, &tmp_raise_fullscreen);
+
#ifdef HAS_XINERAMA
if (Mode.display.xinerama_active)
{
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
