Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
borders.c borders.h desktops.c ewins.c
Log Message:
Eliminate obsolete EventsConfigure stuff.
===================================================================
RCS file: /cvs/e/e16/e/src/borders.c,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -3 -r1.304 -r1.305
--- borders.c 30 Dec 2007 21:03:57 -0000 1.304
+++ borders.c 19 Jan 2008 13:32:30 -0000 1.305
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various
contributors
- * Copyright (C) 2004-2007 Kim Woelders
+ * Copyright (C) 2004-2008 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -525,20 +525,6 @@
EMapWindow(ewin->bits[i].win);
EventCallbackRegister(ewin->bits[i].win, 0,
BorderWinpartHandleEvents, &ewin->bits[i]);
- /*
- * KeyPressMask KeyReleaseMask ButtonPressMask
- * ButtonReleaseMask
- * EnterWindowMask LeaveWindowMask PointerMotionMask
- * PointerMotionHintMask Button1MotionMask
- * Button2MotionMask
- * Button3MotionMask Button4MotionMask Button5MotionMask
- * ButtonMotionMask KeymapStateMask ExposureMask
- * VisibilityChangeMask StructureNotifyMask
- * ResizeRedirectMask
- * SubstructureNotifyMask SubstructureRedirectMask
- * FocusChangeMask PropertyChangeMas ColormapChangeMask
- * OwnerGrabButtonMask
- */
if (b->part[i].flags & FLAG_TITLE)
ESelectInput(ewin->bits[i].win, EWIN_BORDER_TITLE_EVENT_MASK);
else
@@ -849,24 +835,6 @@
}
return -1; /* Not found */
-}
-
-void
-EwinBorderEventsConfigure(EWin * ewin, int mode)
-{
- int i;
- long emask;
-
- emask = (mode) ? ~((long)0) : ~(EnterWindowMask | LeaveWindowMask);
-
- for (i = 0; i < ewin->border->num_winparts; i++)
- {
- if (ewin->border->part[i].flags & FLAG_TITLE)
- ESelectInput(ewin->bits[i].win,
- EWIN_BORDER_TITLE_EVENT_MASK & emask);
- else
- ESelectInput(ewin->bits[i].win, EWIN_BORDER_PART_EVENT_MASK & emask);
- }
}
/*
===================================================================
RCS file: /cvs/e/e16/e/src/borders.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- borders.h 10 Sep 2007 20:26:53 -0000 1.10
+++ borders.h 19 Jan 2008 13:32:30 -0000 1.11
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various
contributors
- * Copyright (C) 2004-2007 Kim Woelders
+ * Copyright (C) 2004-2008 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -99,7 +99,6 @@
void EwinBorderCalcSizes(EWin * ewin, int propagate);
void EwinBorderMinShadeSize(EWin * ewin, int *mw, int *mh);
void EwinBorderUpdateInfo(EWin * ewin);
-void EwinBorderEventsConfigure(EWin * ewin, int mode);
void EwinSetBorder(EWin * ewin, const Border * b, int apply);
void EwinSetBorderByName(EWin * ewin, const char *name);
int BorderWinpartIndex(EWin * ewin, Win win);
===================================================================
RCS file: /cvs/e/e16/e/src/desktops.c,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -3 -r1.275 -r1.276
--- desktops.c 30 Dec 2007 21:20:52 -0000 1.275
+++ desktops.c 19 Jan 2008 13:32:30 -0000 1.276
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various
contributors
- * Copyright (C) 2004-2007 Kim Woelders
+ * Copyright (C) 2004-2008 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -413,10 +413,6 @@
{
EoSetFloating(dsk, 1);
EoSetLayer(dsk, 0);
-#if 0 /* TBD */
- dsk->event_mask = EDESK_EVENT_MASK;
- DeskEventsConfigure(dsk, 1);
-#endif
/* Set the _XROOT... atoms so apps will find them even before the bg is
set */
HintsSetRootInfo(EoGetWin(dsk), None, 0);
}
===================================================================
RCS file: /cvs/e/e16/e/src/ewins.c,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -3 -r1.211 -r1.212
--- ewins.c 24 Dec 2007 00:04:55 -0000 1.211
+++ ewins.c 19 Jan 2008 13:32:30 -0000 1.212
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various
contributors
- * Copyright (C) 2004-2007 Kim Woelders
+ * Copyright (C) 2004-2008 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -80,18 +80,6 @@
return (win) ? WinGetXwin(win) : None;
}
-static void
-EwinEventsConfigure(EWin * ewin, int mode)
-{
- long emask;
-
- emask = (mode) ? ~((long)0) : ~(EnterWindowMask | LeaveWindowMask);
-
- ESelectInput(EoGetWin(ewin), EWIN_TOP_EVENT_MASK & emask);
- ESelectInput(EwinGetClientWin(ewin), ewin->client.event_mask & emask);
- EwinBorderEventsConfigure(ewin, mode);
-}
-
static EWin *
EwinCreate(int type)
{
@@ -274,6 +262,7 @@
EChangeWindowAttributes(EoGetWin(ewin), CWEventMask | CWDontPropagate,
&att);
ewin->client.event_mask = EWIN_CLIENT_EVENT_MASK;
+ ESelectInput(EwinGetClientWin(ewin), ewin->client.event_mask);
if (EDebug(EDBUG_TYPE_EWINS))
Eprintf("EwinManage %#lx frame=%#lx cont=%#lx st=%d\n",
@@ -343,8 +332,6 @@
EwinBorderSelect(ewin); /* Select border before calculating geometry */
EwinSetGeometry(ewin); /* Calculate window geometry before border
parts */
EwinBorderSetTo(ewin, NULL);
-
- EwinEventsConfigure(ewin, 1);
if (!ewin->props.no_button_grabs)
GrabButtonGrabs(ewin);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
