Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h actions.c buttons.c desktops.c main.c slideout.c
Log Message:
Reduce hint noise due to button ops.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -3 -r1.115 -r1.116
--- E.h 22 May 2003 19:14:57 -0000 1.115
+++ E.h 30 May 2003 20:26:46 -0000 1.116
@@ -2350,9 +2350,9 @@
void DestroyButton(Button * b);
void CalcButton(Button * b);
void ShowButton(Button * b);
-void SimpleShowButton(Button * b);
void MoveButtonToDesktop(Button * b, int num);
void HideButton(Button * b);
+void ToggleButton(Button * b);
void DrawButton(Button * b);
void MovebuttonToCoord(Button * b, int x, int y);
int EmbedWindowIntoButton(Button * ButtonToUse,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -3 -r1.102 -r1.103
--- actions.c 22 May 2003 19:14:57 -0000 1.102
+++ actions.c 30 May 2003 20:26:52 -0000 1.103
@@ -2461,9 +2461,11 @@
/* This is unused - where did this come from? -Mandrake */
/* static char lasthide = 0; */
- EDBUG(6, "doHideButtons");
+ EDBUG(6, "doHideShowButton");
+
if (InZoom())
EDBUG_RETURN(0);
+
if ((mode.mode == MODE_MOVE) || (mode.mode == MODE_RESIZE_H)
|| (mode.mode == MODE_RESIZE_V) || (mode.mode == MODE_RESIZE))
EDBUG_RETURN(0);
@@ -2476,16 +2478,7 @@
sscanf((char *)params, "%*s %1000s", s);
b = (Button *) FindItem(s, 0, LIST_FINDBY_NAME, LIST_TYPE_BUTTON);
if ((b) && (!b->used))
- {
- if (b->visible)
- {
- HideButton(b);
- }
- else
- {
- ShowButton(b);
- }
- }
+ ToggleButton(b);
}
else if (!strcmp(s, "buttons"))
{
@@ -2499,20 +2492,10 @@
{
if (matchregexp(ss, lst[i]->name))
{
- if ((strcmp
- (lst[i]->name,
- "_DESKTOP_DESKRAY_DRAG_CONTROL")
+ if ((strcmp(lst[i]->name,
+ "_DESKTOP_DESKRAY_DRAG_CONTROL")
&& (!lst[i]->used)))
- {
- if (!(lst[i]->visible))
- {
- ShowButton(lst[i]);
- }
- else
- {
- HideButton(lst[i]);
- }
- }
+ ToggleButton(lst[i]);
}
}
}
@@ -2530,20 +2513,10 @@
{
if (!matchregexp(ss, lst[i]->name))
{
- if ((strcmp
- (lst[i]->name,
- "_DESKTOP_DESKRAY_DRAG_CONTROL")
+ if ((strcmp(lst[i]->name,
+ "_DESKTOP_DESKRAY_DRAG_CONTROL")
&& (!lst[i]->used)))
- {
- if (!(lst[i]->visible))
- {
- ShowButton(lst[i]);
- }
- else
- {
- HideButton(lst[i]);
- }
- }
+ ToggleButton(lst[i]);
}
}
}
@@ -2559,16 +2532,7 @@
if ((strcmp
(lst[i]->name, "_DESKTOP_DESKRAY_DRAG_CONTROL")
&& (!lst[i]->used)))
- {
- if (!(lst[i]->visible))
- {
- ShowButton(lst[i]);
- }
- else
- {
- HideButton(lst[i]);
- }
- }
+ ToggleButton(lst[i]);
}
}
}
@@ -2581,19 +2545,11 @@
for (i = 0; i < num; i++)
{
if (!lst[i]->used)
- {
- if (!(lst[i]->visible))
- {
- ShowButton(lst[i]);
- }
- else
- {
- HideButton(lst[i]);
- }
- }
+ ToggleButton(lst[i]);
}
}
}
+ StackDesktops();
autosave();
EDBUG_RETURN(0);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/buttons.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- buttons.c 22 May 2003 19:14:58 -0000 1.18
+++ buttons.c 30 May 2003 20:26:52 -0000 1.19
@@ -108,7 +108,6 @@
b->ref_count = 0;
EDBUG_RETURN(b);
-
}
void
@@ -214,45 +213,7 @@
b->y = y;
b->w = w;
b->h = h;
- EDBUG_RETURN_;
-}
-
-void
-SimpleShowButton(Button * b)
-{
- char move, resize;
- EDBUG(4, "SimpleShowButton");
- CalcButton(b);
- move = 0;
- resize = 0;
- if ((b->x != b->cx) || (b->y != b->cy))
- move = 1;
- if ((b->w != b->cw) || (b->h != b->ch))
- resize = 1;
- if ((move) && (resize))
- EMoveResizeWindow(disp, b->win, b->x, b->y, b->w, b->h);
- else if (move)
- EMoveWindow(disp, b->win, b->x, b->y);
- else if (resize)
- EResizeWindow(disp, b->win, b->w, b->h);
- if (b->sticky)
- XRaiseWindow(disp, b->win);
- DrawButton(b);
- b->visible = 1;
- if (init_win1)
- {
- XRaiseWindow(disp, init_win1);
- XRaiseWindow(disp, init_win2);
- }
- if (init_win_ext)
- XRaiseWindow(disp, init_win_ext);
- RaiseProgressbars();
- EMapWindow(disp, b->win);
- b->cx = b->x;
- b->cy = b->y;
- b->cw = b->w;
- b->ch = b->h;
EDBUG_RETURN_;
}
@@ -264,26 +225,20 @@
EDBUG(4, "ShowButton");
CalcButton(b);
+
move = 0;
resize = 0;
-
if ((b->x != b->cx) || (b->y != b->cy))
move = 1;
if ((b->w != b->cw) || (b->h != b->ch))
resize = 1;
if ((move) && (resize))
- {
- EMoveResizeWindow(disp, b->win, b->x, b->y, b->w, b->h);
- }
+ EMoveResizeWindow(disp, b->win, b->x, b->y, b->w, b->h);
else if (move)
- {
- EMoveWindow(disp, b->win, b->x, b->y);
- }
+ EMoveWindow(disp, b->win, b->x, b->y);
else if (resize)
- {
- EResizeWindow(disp, b->win, b->w, b->h);
- }
+ EResizeWindow(disp, b->win, b->w, b->h);
if (b->sticky)
XRaiseWindow(disp, b->win);
@@ -294,7 +249,6 @@
b->cy = b->y;
b->cw = b->w;
b->ch = b->h;
- StackDesktops();
EDBUG_RETURN_;
}
@@ -316,7 +270,6 @@
EReparentWindow(disp, b->win, desks.desk[DESKTOPS_WRAP_NUM(num)].win,
b->x, b->y);
}
- StackDesktops();
EDBUG_RETURN_;
}
@@ -333,6 +286,19 @@
}
void
+ToggleButton(Button * b)
+{
+ EDBUG(3, "ToggleButton");
+
+ if (b->visible)
+ HideButton(b);
+ else
+ ShowButton(b);
+
+ EDBUG_RETURN_;
+}
+
+void
DrawButton(Button * b)
{
EDBUG(3, "DrawButton");
@@ -402,7 +368,7 @@
b->cy = b->y;
b->cw = b->w;
b->ch = b->h;
- StackDesktops();
+
EDBUG_RETURN_;
}
@@ -429,7 +395,6 @@
EMapRaised(disp, ButtonToUse->event_win);
EDBUG_RETURN(0);
-
}
void
@@ -475,6 +440,6 @@
Efree(blst);
}
MovebuttonToCoord(bt, bt->x, bt->y);
- EDBUG_RETURN_;
+ EDBUG_RETURN_;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- desktops.c 22 May 2003 19:14:59 -0000 1.39
+++ desktops.c 30 May 2003 20:26:53 -0000 1.40
@@ -188,15 +188,15 @@
void
ShowDesktopControls()
{
- Button **lst;
+ Button **blst;
int num, i;
- lst = (Button **) ListItemTypeID(&num, LIST_TYPE_BUTTON, 1);
- if ((lst) && (num > 0))
+ blst = (Button **) ListItemTypeID(&num, LIST_TYPE_BUTTON, 1);
+ if ((blst) && (num > 0))
{
for (i = 0; i < num; i++)
- SimpleShowButton(lst[i]);
- Efree(lst);
+ ShowButton(blst[i]);
+ Efree(blst);
StackDesktops();
}
}
@@ -204,15 +204,15 @@
void
ShowDesktopTabs()
{
- Button **lst;
+ Button **blst;
int num, i;
- lst = (Button **) ListItemTypeID(&num, LIST_TYPE_BUTTON, 2);
- if ((lst) && (num > 0))
+ blst = (Button **) ListItemTypeID(&num, LIST_TYPE_BUTTON, 2);
+ if ((blst) && (num > 0))
{
for (i = 0; i < num; i++)
- SimpleShowButton(lst[i]);
- Efree(lst);
+ ShowButton(blst[i]);
+ Efree(blst);
StackDesktops();
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- main.c 22 May 2003 19:15:01 -0000 1.54
+++ main.c 30 May 2003 20:26:53 -0000 1.55
@@ -45,7 +45,7 @@
{
char restarting = 0;
int i, num;
- Button **lst;
+ Button **blst;
Background *bg;
ECursor *ec = NULL;
struct utsname ubuf;
@@ -270,15 +270,15 @@
/* toss down the dragbar and related */
InitDesktopControls();
/* then draw all the buttons that belong on the desktop */
- lst = (Button **) ListItemTypeID(&num, LIST_TYPE_BUTTON, 0);
- if (lst)
+ blst = (Button **) ListItemTypeID(&num, LIST_TYPE_BUTTON, 0);
+ if (blst)
{
for (i = 0; i < num; i++)
{
- if ((!lst[i]->internal) && (lst[i]->default_show))
- SimpleShowButton(lst[i]);
+ if ((!blst[i]->internal) && (blst[i]->default_show))
+ ShowButton(blst[i]);
}
- Efree(lst);
+ Efree(blst);
}
HintsInit();
SessionInit();
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/slideout.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- slideout.c 22 May 2003 19:15:02 -0000 1.9
+++ slideout.c 30 May 2003 20:26:53 -0000 1.10
@@ -336,7 +336,7 @@
b->default_show = 0;
b->flags |= FLAG_FIXED;
b->used = 1;
- SimpleShowButton(b);
+ ShowButton(b);
CalcSlideoutSize(s);
EDBUG_RETURN_;
-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
