hugok
/
e16
forked from e16/e16
1
0
Fork 0
Code Pull Requests Activity

Wed Sep 22 20:07:31 PDT 1999 

(Raster)

disabel pagers and icobnoxes form going into groups - ok theres a bug
restoring them and i've had enough of looking at that code.. so i simply
disabled it. much simpler.


SVN revision: 378
This commit is contained in:
Carsten Haitzler 1999-09-23 02:31:53 +00:00
parent 88276aef9c
commit e18fe0a4c9
4 changed files with 66 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ChangeLog
View File

@ -2242,3 +2242,12 @@ Wed Sep 22 18:21:40 PDT 1999
(KainX)
Ergh...let's not go freeing image classes willy-nilly, shall we?
-------------------------------------------------------------------------------
Wed Sep 22 20:07:31 PDT 1999
(Raster)
disabel pagers and icobnoxes form going into groups - ok theres a bug
restoring them and i've had enough of looking at that code.. so i simply
disabled it. much simpler.

8
src/draw.c
View File

@ -1076,6 +1076,9 @@ DrawEwinShape(EWin * ewin, int md, int x, int y, int w, int h, char firstlast)
if (firstlast == 0)
{
XGCValues gcv;
GC gc;
if (ewin_pi)
EDestroyPixImg(ewin_pi);
if (root_pi)
@ -1098,7 +1101,10 @@ DrawEwinShape(EWin * ewin, int md, int x, int y, int w, int h, char firstlast)
EDBUG_RETURN_;
}
EFillPixmap(root.win, root_pi->pmap, x1, y1, ewin->w, ewin->h);
EFillPixmap(ewin->win, ewin_pi->pmap, 0, 0, ewin->w, ewin->h);
gc = XCreateGC(disp, root_pi->pmap, 0, &gcv);
XCopyArea(disp, root_pi->pmap, ewin_pi->pmap, gc, x1, y1,
ewin->w, ewin->h, 0, 0);
XFreeGC(disp, gc);
EBlendPixImg(ewin, root_pi, ewin_pi, draw_pi, x, y,
ewin->w, ewin->h);
}

30
src/groups.c
View File

@ -86,7 +86,11 @@ BuildWindowGroup(EWin ** ewins, int num)
AddItem(g, NULL, g->index, LIST_TYPE_GROUP);
for (i = 0; i < num; i++)
AddEwinToGroup(ewins[i], g);
{
/* disable iconboxes and pagers to go into groups */
if (!((ewins[i]->ibox) || (ewins[i]->pager)))
AddEwinToGroup(ewins[i], g);
}
}
void
@ -96,16 +100,20 @@ AddEwinToGroup(EWin * ewin, Group * g)
if (ewin && g)
{
for (i = 0; i < ewin->num_groups; i++)
if (ewin->groups[i] == g)
return;
ewin->num_groups++;
ewin->groups = Erealloc(ewin->groups, sizeof(Group *) * ewin->num_groups);
ewin->groups[ewin->num_groups - 1] = g;
g->num_members++;
g->members = Erealloc(g->members, sizeof(EWin *) * g->num_members);
g->members[g->num_members - 1] = ewin;
RememberImportantInfoForEwin(ewin);
/* disable iconboxes and pagers to go into groups */
if (!((ewin->ibox) || (ewin->pager)))
{
for (i = 0; i < ewin->num_groups; i++)
if (ewin->groups[i] == g)
return;
ewin->num_groups++;
ewin->groups = Erealloc(ewin->groups, sizeof(Group *) * ewin->num_groups);
ewin->groups[ewin->num_groups - 1] = g;
g->num_members++;
g->members = Erealloc(g->members, sizeof(EWin *) * g->num_members);
g->members[g->num_members - 1] = ewin;
RememberImportantInfoForEwin(ewin);
}
}
}

73
src/main.c
View File

@ -1,10 +1,14 @@
#include "E.h"
#include "timestamp.h"
int
main(int argc, char **argv)
{
int i, num;
Button **lst;
Background *bg;
ECursor *ec = NULL;
/* This function runs all the setup for startup, and then
* proceeds into the primary event loop at the end.
*/
@ -182,12 +186,6 @@ main(int argc, char **argv)
desks.desk[0].viewable = 0;
/* now we're going to load the configuration/theme */
LoadEConfig(themepath);
{
int i;
for (i = 0; i < child_count; i++)
kill(e_children[i], SIGCONT);
}
desks.desk[0].viewable = 1;
RefreshDesktop(0);
@ -201,21 +199,17 @@ main(int argc, char **argv)
/* toss down the dragbar and related */
InitDesktopControls();
/* then draw all the buttons that belong on the desktop */
{
Button **lst;
int i, num;
lst = (Button **) ListItemTypeID(&num, LIST_TYPE_BUTTON, 0);
if (lst)
{
for (i = 0; i < num; i++)
{
if ((!lst[i]->internal) && (lst[i]->default_show))
SimpleShowButton(lst[i]);
}
Efree(lst);
}
}
lst = (Button **) ListItemTypeID(&num, LIST_TYPE_BUTTON, 0);
if (lst)
{
for (i = 0; i < num; i++)
{
printf("%i / %i: %s\n", i, num, lst[i]->name);
if ((!lst[i]->internal) && (lst[i]->default_show))
SimpleShowButton(lst[i]);
}
Efree(lst);
}
/* gnome hints stuff & session initialization here */
GNOME_SetHints();
SessionInit();
@ -261,17 +255,14 @@ main(int argc, char **argv)
if (mode.resizemode == 5)
mode.resizemode = 0;
/* of course, we have to set the cursors */
{
ECursor *ec = NULL;
ec = FindItem("DEFAULT", 0, LIST_FINDBY_NAME, LIST_TYPE_ECURSOR);
if (ec)
{
ApplyECursor(root.win, ec);
ec->ref_count++;
ec->inroot = 1;
}
ec = FindItem("DEFAULT", 0, LIST_FINDBY_NAME, LIST_TYPE_ECURSOR);
if (ec)
{
ApplyECursor(root.win, ec);
ec->ref_count++;
ec->inroot = 1;
}
}
if (mode.display_warp < 0)
mode.display_warp = 0;
mode.startup = 0;
@ -313,16 +304,14 @@ main(int argc, char **argv)
XSync(disp, False);
if (!mode.mapslide)
CreateStartupDisplay(0);
{
Background *bg;
if ((bg = RemoveItem("STARTUP_BACKGROUND_SIDEWAYS", 0, LIST_FINDBY_NAME,
LIST_TYPE_BACKGROUND)))
FreeDesktopBG(bg);
if ((bg = RemoveItem("STARTUP_BACKGROUND", 0, LIST_FINDBY_NAME,
LIST_TYPE_BACKGROUND)))
FreeDesktopBG(bg);
}
if ((bg = RemoveItem("STARTUP_BACKGROUND_SIDEWAYS", 0, LIST_FINDBY_NAME,
LIST_TYPE_BACKGROUND)))
FreeDesktopBG(bg);
if ((bg = RemoveItem("STARTUP_BACKGROUND", 0, LIST_FINDBY_NAME,
LIST_TYPE_BACKGROUND)))
FreeDesktopBG(bg);
for (i = 0; i < child_count; i++)
kill(e_children[i], SIGCONT);
/* The primary event loop */
for (;;)