Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h Makefile.am actions.c borders.c ewmh.c gnome.c iconify.c
ipc.c menus.c pager.c
Removed Files:
sticky.c
Log Message:
Trivial code shuffle (sticky.c into borders.c) and namespace cleanup.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -3 -r1.279 -r1.280
--- E.h 3 Jun 2004 18:04:43 -0000 1.279
+++ E.h 4 Jun 2004 19:23:39 -0000 1.280
@@ -1738,11 +1738,12 @@
int typ, int tya, int borigin, int bxp,
int bxa, int byp, int bya,
char keep_for_shade);
-void MinShadeSize(EWin * ewin, int *mw, int *mh);
-void InstantShadeEwin(EWin * ewin, int force);
-void InstantUnShadeEwin(EWin * ewin);
-void ShadeEwin(EWin * ewin);
-void UnShadeEwin(EWin * ewin);
+void EwinStick(EWin * ewin);
+void EwinUnStick(EWin * ewin);
+void EwinInstantShade(EWin * ewin, int force);
+void EwinInstantUnShade(EWin * ewin);
+void EwinShade(EWin * ewin);
+void EwinUnShade(EWin * ewin);
void EwinSetFullscreen(EWin * ewin, int on);
void EwinSetBorder(EWin * ewin, Border * b, int apply);
void EwinSetBorderByName(EWin * ewin, const char *name,
@@ -2634,10 +2635,6 @@
void AddE(void);
void CreateStartupDisplay(char start);
-/* sticky.c */
-void MakeWindowSticky(EWin * ewin);
-void MakeWindowUnSticky(EWin * ewin);
-
/* tclass.c */
TextClass *CreateTclass(void);
void FreeTextState(TextState * ts);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Makefile.am,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- Makefile.am 8 May 2004 21:39:37 -0000 1.40
+++ Makefile.am 4 Jun 2004 19:23:42 -0000 1.41
@@ -73,7 +73,6 @@
sound.c \
stacking.c \
startup.c \
- sticky.c \
tclass.c \
text.c \
theme.c \
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -3 -r1.165 -r1.166
--- actions.c 3 Jun 2004 00:05:50 -0000 1.165
+++ actions.c 4 Jun 2004 19:23:42 -0000 1.166
@@ -1594,13 +1594,13 @@
&& ((curr_group && !curr_group->cfg.mirror) || sticky))
{
SoundPlay("SOUND_WINDOW_UNSTICK");
- MakeWindowUnSticky(gwins[i]);
+ EwinUnStick(gwins[i]);
}
else if (!gwins[i]->sticky
&& ((curr_group && !curr_group->cfg.mirror) || !sticky))
{
SoundPlay("SOUND_WINDOW_STICK");
- MakeWindowSticky(gwins[i]);
+ EwinStick(gwins[i]);
}
RememberImportantInfoForEwin(gwins[i]);
}
@@ -2434,13 +2434,13 @@
&& ((curr_group && !curr_group->cfg.mirror) || shaded))
{
SoundPlay("SOUND_UNSHADE");
- UnShadeEwin(gwins[i]);
+ EwinUnShade(gwins[i]);
}
else if (!gwins[i]->shaded
&& ((curr_group && !curr_group->cfg.mirror) || !shaded))
{
SoundPlay("SOUND_SHADE");
- ShadeEwin(gwins[i]);
+ EwinShade(gwins[i]);
}
RememberImportantInfoForEwin(gwins[i]);
}
@@ -2627,7 +2627,7 @@
if (ewin->iconified)
DeIconifyEwin(ewin);
if (ewin->shaded)
- UnShadeEwin(ewin);
+ EwinUnShade(ewin);
FocusToEWin(ewin, FOCUS_SET);
EDBUG_RETURN(0);
@@ -2852,11 +2852,11 @@
if (gwins[i]->shaded)
{
shadechange = 1;
- InstantUnShadeEwin(gwins[i]);
+ EwinInstantUnShade(gwins[i]);
}
EwinSetBorder(gwins[i], b, 1);
if (shadechange)
- InstantShadeEwin(gwins[i], 0);
+ EwinInstantShade(gwins[i], 0);
}
RememberImportantInfoForEwin(gwins[i]);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -3 -r1.189 -r1.190
--- borders.c 3 Jun 2004 18:04:44 -0000 1.189
+++ borders.c 4 Jun 2004 19:23:43 -0000 1.190
@@ -1142,7 +1142,7 @@
UngrabX();
if (ewin->shaded)
- InstantShadeEwin(ewin, 1);
+ EwinInstantShade(ewin, 1);
HintsSetWindowState(ewin);
HintsSetClientList();
@@ -1204,7 +1204,7 @@
UngrabX();
if (ewin->shaded)
- InstantShadeEwin(ewin, 1);
+ EwinInstantShade(ewin, 1);
HintsSetWindowState(ewin);
HintsSetClientList();
@@ -2253,6 +2253,51 @@
}
void
+EwinUnStick(EWin * ewin)
+{
+
+ EDBUG(4, "EwinUnStick");
+ if (!ewin)
+ EDBUG_RETURN_;
+
+ ewin->sticky = 0;
+ MoveEwinToDesktopAt(ewin, desks.current, ewin->x, ewin->y);
+ EwinBorderDraw(ewin, 0, 0);
+ HintsSetWindowState(ewin);
+
+ EDBUG_RETURN_;
+}
+
+void
+EwinStick(EWin * ewin)
+{
+ int x, y, dx, dy;
+
+ EDBUG(4, "EwinStick");
+ if (!ewin)
+ EDBUG_RETURN_;
+
+ /* Avoid "losing" windows made sticky while not in the current viewport */
+ dx = ewin->w / 2;
+ dy = ewin->h / 2;
+ x = (ewin->x + dx) % VRoot.w;
+ if (x < 0)
+ x += VRoot.w;
+ x -= dx;
+ y = (ewin->y + dy) % VRoot.h;
+ if (y < 0)
+ y += VRoot.h;
+ y -= dy;
+
+ MoveEwinToDesktopAt(ewin, desks.current, x, y);
+ ewin->sticky = 1;
+ EwinBorderDraw(ewin, 0, 0);
+ HintsSetWindowState(ewin);
+
+ EDBUG_RETURN_;
+}
+
+static void
MinShadeSize(EWin * ewin, int *mw, int *mh)
{
int i, pw, ph, w, h, min_w, min_h;
@@ -2351,13 +2396,13 @@
}
void
-InstantShadeEwin(EWin * ewin, int force)
+EwinInstantShade(EWin * ewin, int force)
{
XSetWindowAttributes att;
int b, d;
char pq;
- EDBUG(4, "InstantShadeEwin");
+ EDBUG(4, "EwinInstantShade");
if ((ewin->border->border.left == 0) && (ewin->border->border.right == 0)
&& (ewin->border->border.top == 0) && (ewin->border->border.bottom == 0))
@@ -2436,13 +2481,13 @@
}
void
-InstantUnShadeEwin(EWin * ewin)
+EwinInstantUnShade(EWin * ewin)
{
XSetWindowAttributes att;
int b, d;
char pq;
- EDBUG(4, "InstantUnShadeEwin");
+ EDBUG(4, "EwinInstantUnShade");
if (GetZoomEWin() == ewin)
EDBUG_RETURN_;
if (!ewin->shaded)
@@ -2512,7 +2557,7 @@
}
void
-ShadeEwin(EWin * ewin)
+EwinShade(EWin * ewin)
{
XSetWindowAttributes att;
int i, j, speed, a, b, c, d, ww, hh;
@@ -2522,7 +2567,7 @@
double tm;
char pq;
- EDBUG(4, "ShadeEwin");
+ EDBUG(4, "EwinShade");
if ((ewin->border->border.left == 0) && (ewin->border->border.right == 0)
&& (ewin->border->border.top == 0) && (ewin->border->border.bottom == 0))
@@ -2771,7 +2816,7 @@
}
void
-UnShadeEwin(EWin * ewin)
+EwinUnShade(EWin * ewin)
{
XSetWindowAttributes att;
int i, j, speed, a, b, c, d;
@@ -2781,7 +2826,7 @@
double tm;
char pq;
- EDBUG(4, "UnShadeEwin");
+ EDBUG(4, "EwinUnShade");
if (GetZoomEWin() == ewin)
EDBUG_RETURN_;
if (!ewin->shaded)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewmh.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- ewmh.c 31 May 2004 20:30:12 -0000 1.50
+++ ewmh.c 4 Jun 2004 19:23:44 -0000 1.51
@@ -781,7 +781,7 @@
DeIconifyEwin(ewin);
RaiseEwin(ewin);
if (ewin->shaded)
- UnShadeEwin(ewin);
+ EwinUnShade(ewin);
FocusToEWin(ewin, FOCUS_SET);
}
else if (event->message_type == _NET_CLOSE_WINDOW)
@@ -793,12 +793,12 @@
if ((unsigned)event->data.l[0] == 0xFFFFFFFF)
{
if (!ewin->sticky)
- MakeWindowSticky(ewin);
+ EwinStick(ewin);
}
else
{
if (ewin->sticky)
- MakeWindowUnSticky(ewin);
+ EwinUnStick(ewin);
else
MoveEwinToDesktop(ewin, event->data.l[0]);
}
@@ -819,18 +819,18 @@
{
action = do_set(ewin->sticky, action);
if (action)
- MakeWindowSticky(ewin);
+ EwinStick(ewin);
else
- MakeWindowUnSticky(ewin);
+ EwinUnStick(ewin);
ewin->sticky = action;
}
else if (atom == _NET_WM_STATE_SHADED)
{
action = do_set(ewin->shaded, action);
if (action)
- ShadeEwin(ewin);
+ EwinShade(ewin);
else
- UnShadeEwin(ewin);
+ EwinUnShade(ewin);
ewin->shaded = action;
}
else if (atom == _NET_WM_STATE_SKIP_TASKBAR)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/gnome.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- gnome.c 4 May 2004 19:04:29 -0000 1.38
+++ gnome.c 4 Jun 2004 19:23:44 -0000 1.39
@@ -846,28 +846,20 @@
if (event->data.l[1] & WIN_STATE_STICKY)
{
if (!(ewin->sticky))
- {
- ewin->sticky = 1;
- RaiseEwin(ewin);
- EwinBorderDraw(ewin, 0, 0);
- }
+ EwinStick(ewin);
}
else
{
if (ewin->sticky)
- {
- ewin->sticky = 0;
- RaiseEwin(ewin);
- EwinBorderDraw(ewin, 0, 0);
- }
+ EwinUnStick(ewin);
}
}
if (event->data.l[0] & WIN_STATE_SHADED)
{
if (event->data.l[1] & WIN_STATE_SHADED)
- ShadeEwin(ewin);
+ EwinShade(ewin);
else
- UnShadeEwin(ewin);
+ EwinUnShade(ewin);
}
HintsSetWindowState(ewin);
EDBUG_RETURN_;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -3 -r1.110 -r1.111
--- iconify.c 3 Jun 2004 18:04:45 -0000 1.110
+++ iconify.c 4 Jun 2004 19:23:44 -0000 1.111
@@ -234,7 +234,7 @@
HideEwin(ewin);
if (was_shaded != ewin->shaded)
- InstantShadeEwin(ewin, 0);
+ EwinInstantShade(ewin, 0);
ewin->iconified = 3;
ICCCM_Iconify(ewin);
@@ -618,7 +618,7 @@
}
else
{
- MakeWindowSticky(ewin);
+ EwinStick(ewin);
MoveResizeEwin(ewin, VRoot.w - 160, VRoot.h - h, 160, h);
}
@@ -1261,7 +1261,7 @@
if (!ewin->icon_pmm.pmap)
{
if (ewin->shaded)
- InstantUnShadeEwin(ewin);
+ EwinInstantUnShade(ewin);
RaiseEwin(ewin);
IB_SnapEWin(ewin);
}
@@ -1279,7 +1279,7 @@
if (!ewin->icon_pmm.pmap)
{
if (ewin->shaded)
- InstantUnShadeEwin(ewin);
+ EwinInstantUnShade(ewin);
RaiseEwin(ewin);
IB_SnapEWin(ewin);
}
@@ -1291,7 +1291,7 @@
if (!ewin->icon_pmm.pmap)
{
if (ewin->shaded)
- InstantUnShadeEwin(ewin);
+ EwinInstantUnShade(ewin);
RaiseEwin(ewin);
IB_SnapEWin(ewin);
}
@@ -2012,7 +2012,7 @@
if (ib->ewin->shaded)
{
was_shaded = 1;
- UnShadeEwin(ib->ewin);
+ EwinUnShade(ib->ewin);
}
IB_CalcMax(ib);
@@ -2078,7 +2078,7 @@
}
if (was_shaded)
- ShadeEwin(ib->ewin);
+ EwinShade(ib->ewin);
pq = Mode.queue_up;
Mode.queue_up = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -3 -r1.159 -r1.160
--- ipc.c 3 Jun 2004 18:04:45 -0000 1.159
+++ ipc.c 4 Jun 2004 19:23:44 -0000 1.160
@@ -3167,9 +3167,9 @@
&ewin->shaded, param1, 0))
{
if (ewin->shaded)
- UnShadeEwin(ewin);
+ EwinUnShade(ewin);
else
- ShadeEwin(ewin);
+ EwinShade(ewin);
}
}
else if (!strncmp(operation, "stick", 2))
@@ -3178,9 +3178,9 @@
&ewin->sticky, param1, 0))
{
if (ewin->sticky)
- MakeWindowUnSticky(ewin);
+ EwinUnStick(ewin);
else
- MakeWindowSticky(ewin);
+ EwinStick(ewin);
}
}
else if (!strcmp(operation, "fixedpos"))
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -3 -r1.135 -r1.136
--- menus.c 3 Jun 2004 18:04:46 -0000 1.135
+++ menus.c 4 Jun 2004 19:23:46 -0000 1.136
@@ -353,14 +353,14 @@
ewin->head = head_num;
if (Conf.menuslide)
- InstantShadeEwin(ewin, 0);
+ EwinInstantShade(ewin, 0);
ICCCM_Cmap(NULL);
MoveEwin(ewin, ewin->x, ewin->y);
if (!noshow)
{
ShowEwin(ewin);
if (Conf.menuslide)
- UnShadeEwin(ewin);
+ EwinUnShade(ewin);
}
}
@@ -2491,7 +2491,7 @@
RaiseEwin(ewin2);
ShowEwin(ewin2);
if (Conf.menuslide)
- UnShadeEwin(ewin2);
+ EwinUnShade(ewin2);
Mode.cur_menu[Mode.cur_menu_depth++] = mi->child;
}
#else
@@ -2623,7 +2623,7 @@
ShowEwin(ewin2);
if (Conf.menuslide)
- UnShadeEwin(ewin2);
+ EwinUnShade(ewin2);
if (Mode.cur_menu[Mode.cur_menu_depth - 1] != mi->child)
Mode.cur_menu[Mode.cur_menu_depth++] = mi->child;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -3 -r1.92 -r1.93
--- pager.c 3 Jun 2004 18:04:46 -0000 1.92
+++ pager.c 4 Jun 2004 19:23:46 -0000 1.93
@@ -383,7 +383,7 @@
/* show the pager ewin */
ShowEwin(ewin);
if (((sn) && (sn->use_sticky) && (sn->sticky)) || (!sn))
- MakeWindowSticky(ewin);
+ EwinStick(ewin);
RememberImportantInfoForEwin(ewin);
if (Conf.pagers.snap)
{
-------------------------------------------------------
This SF.Net email is sponsored by the new InstallShield X.
>From Windows to Linux, servers to mobile, InstallShield X is the one
installation-authoring solution that does it all. Learn more and
evaluate today! http://www.installshield.com/Dev2Dev/0504
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
