Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h actions.c borders.c menus.c
Log Message:
More fixups after mode.ewin elimination (inhibit menu border actions,
fix pager mini-window actions).
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -3 -r1.185 -r1.186
--- E.h 19 Jan 2004 22:30:27 -0000 1.185
+++ E.h 20 Jan 2004 17:17:36 -0000 1.186
@@ -993,6 +993,7 @@
char skipwinlist;
char focusclick;
char neverfocus;
+ char no_actions;
int ewmh_flags;
Menu *menu;
Window shownmenu;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -3 -r1.131 -r1.132
--- actions.c 19 Jan 2004 22:30:27 -0000 1.131
+++ actions.c 20 Jan 2004 17:17:36 -0000 1.132
@@ -357,25 +357,31 @@
af = &ActionFunctions[id];
if (!af->ok_zoom && InZoom())
- EDBUG_RETURN(0);
+ return 0;
if (!af->ok_movres &&
((mode.mode == MODE_MOVE_PENDING) || (mode.mode == MODE_MOVE) ||
(mode.mode == MODE_RESIZE_H) || (mode.mode == MODE_RESIZE_V) ||
(mode.mode == MODE_RESIZE)))
- EDBUG_RETURN(0);
+ return 0;
if (af->hide_slideouts && mode.slideout)
SlideoutsHide();
- if (af->need_ewin && ewin == NULL)
+ if (af->need_ewin)
{
- if (params)
- ewin = FindItem(NULL, atoi((char *)params), LIST_FINDBY_ID,
- LIST_TYPE_EWIN);
- else
- ewin = GetFocusEwin();
+ if (ewin == NULL)
+ {
+ if (params)
+ ewin = FindItem(NULL, atoi((char *)params), LIST_FINDBY_ID,
+ LIST_TYPE_EWIN);
+ else
+ ewin = GetContextEwin();
+ }
if (ewin == NULL)
return -1;
+
+ if (ewin->no_actions)
+ return 0;
}
return ActionFunctions[id].func(ewin, params);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -3 -r1.124 -r1.125
--- borders.c 19 Jan 2004 22:30:27 -0000 1.124
+++ borders.c 20 Jan 2004 17:17:36 -0000 1.125
@@ -189,7 +189,7 @@
EWin *
GetContextEwin(void)
{
- EDBUG(4, "GetFocusEwin");
+ EDBUG(4, "GetContextEwin");
EDBUG_RETURN(GetFocusEwin());
}
@@ -1277,6 +1277,7 @@
ewin->layer = 99;
ewin->skiptask = 1;
ewin->skip_ext_pager = 1;
+ ewin->no_actions = 1;
break;
case EWIN_TYPE_ICONBOX:
ewin->skiptask = 1;
@@ -1320,7 +1321,7 @@
EDBUG(5, "CreateEwin");
ewin = Emalloc(sizeof(EWin));
- ewin->win = 0;
+ memset(ewin, 0, sizeof(EWin));
ewin->x = -1;
ewin->y = -1;
ewin->w = -1;
@@ -1331,44 +1332,15 @@
ewin->ly = -1;
ewin->lw = -1;
ewin->lh = -1;
- ewin->type = 0;
- ewin->internal = 0;
- ewin->toggle = 0;
- ewin->client.win = 0;
ewin->client.x = -1;
ewin->client.y = -1;
ewin->client.w = -1;
ewin->client.h = -1;
- ewin->client.title = NULL;
- ewin->client.class = NULL;
- ewin->client.name = NULL;
- ewin->client.role = NULL;
- ewin->client.command = NULL;
- ewin->client.machine = NULL;
- ewin->client.icon_name = NULL;
- ewin->client.is_group_leader = 0;
- ewin->client.no_resize_h = 0;
- ewin->client.no_resize_v = 0;
- ewin->client.shaped = 0;
- ewin->client.icon_win = 0;
- ewin->client.icon_pmap = 0;
- ewin->client.icon_mask = 0;
- ewin->client.start_iconified = 0;
- ewin->client.group = 0;
ewin->client.need_input = 1;
- ewin->client.transient = 0;
- ewin->client.client_leader = 0;
- ewin->client.transient_for = 0;
- ewin->client.already_placed = 0;
ewin->client.aspect_min = 0.0;
ewin->client.aspect_max = 65535.0;
ewin->client.w_inc = 1;
ewin->client.h_inc = 1;
- ewin->client.grav = 0;
- ewin->client.base_w = 0;
- ewin->client.base_h = 0;
- ewin->client.width.min = 0;
- ewin->client.height.min = 0;
ewin->client.width.max = 65535;
ewin->client.height.max = 65535;
ewin->client.mwm_decor_border = 1;
@@ -1382,58 +1354,16 @@
ewin->client.mwm_func_minimize = 1;
ewin->client.mwm_func_maximize = 1;
ewin->client.mwm_func_close = 1;
- ewin->border = NULL;
- ewin->previous_border = NULL;
- ewin->bits = NULL;
- ewin->sticky = 0;
ewin->desktop = desks.current;
- ewin->groups = NULL;
- ewin->num_groups = 0;
- ewin->visible = 0;
- ewin->active = 0;
- ewin->iconified = 0;
- ewin->parent = 0;
ewin->layer = 4;
- ewin->never_use_area = 0;
- ewin->floating = 0;
ewin->win = ECreateWindow(root.win, -10, -10, 1, 1, 1);
ewin->win_container = ECreateWindow(ewin->win, 0, 0, 1, 1, 0);
- ewin->shapedone = 0;
- ewin->docked = 0;
- ewin->shaded = 0;
- ewin->fixedpos = 0;
#if 0 /* ENABLE_GNOME - Not actually used */
- ewin->expanded_x = 0;
- ewin->expanded_y = 0;
ewin->expanded_width = -1;
ewin->expanded_height = -1;
#endif
- ewin->ignorearrange = 0;
- ewin->skiptask = 0;
- ewin->skip_ext_pager = 0;
- ewin->skipwinlist = 0;
- ewin->skipfocus = 0;
- ewin->neverfocus = 0;
- ewin->focusclick = 0;
- ewin->ewmh_flags = 0;
- ewin->menu = NULL;
- ewin->dialog = NULL;
- ewin->shownmenu = 0;
- ewin->pager = NULL;
- ewin->ibox = NULL;
ewin->area_x = -1;
ewin->area_y = -1;
- ewin->session_id = NULL;
- ewin->has_transients = 0;
- ewin->mini_w = 0;
- ewin->mini_h = 0;
- ewin->mini_pmm.type = 0;
- ewin->mini_pmm.pmap = 0;
- ewin->mini_pmm.mask = 0;
- ewin->snap = NULL;
- ewin->icon_pmm.type = 0;
- ewin->icon_pmm.pmap = 0;
- ewin->icon_pmm.mask = 0;
att.event_mask =
StructureNotifyMask | ResizeRedirectMask | ButtonPressMask |
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -3 -r1.97 -r1.98
--- menus.c 19 Jan 2004 22:30:32 -0000 1.97
+++ menus.c 20 Jan 2004 17:17:36 -0000 1.98
@@ -2321,7 +2321,7 @@
MenuDrawItem(m, mi, 1);
if ((mi->act_id) && (!mode.justclicked))
{
- ActionsCall(mi->act_id, GetContextEwin(), mi->params);
+ ActionsCall(mi->act_id, NULL, mi->params);
if (clickmenu)
{
MenusHide();
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
