From: Enlightenment C. <no...@cv...> - 2006-11-19 21:55:56
|
Enlightenment CVS committal Author : kwo Project : e16 Module : e Dir : e16/e/src Modified Files: E.h Makefile.am aclass.c actions.c borders.c buttons.c comms.c config.c cursors.c desktops.c ecompmgr.c econfig.c eobj.c events.c ewin-ops.c ewins.c ewins.h extinitwin.c focus.c grabs.c handlers.c hints.c hiwin.c icccm.c icons.c ipc.c lang.c main.c menus-misc.c menus.c misc.c mod-misc.c moveresize.c pager.c progress.c session.c setup.c slideout.c snaps.c stacking.c systray.c text.c timers.c warp.c windowmatch.c x.c zoom.c Added Files: about.c cursors.h edebug.h events.h focus.h grabs.h progress.h windowmatch.h Log Message: Split up, shuffle around, rename. =================================================================== RCS file: /cvs/e/e16/e/src/E.h,v retrieving revision 1.569 retrieving revision 1.570 diff -u -3 -r1.569 -r1.570 --- E.h 29 Oct 2006 15:21:14 -0000 1.569 +++ E.h 19 Nov 2006 21:55:50 -0000 1.570 @@ -28,6 +28,7 @@ #include "config.h" #include "alert.h" +#include "edebug.h" #include "lang.h" #include "util.h" @@ -547,31 +548,15 @@ * Function prototypes */ -/* actions.c */ -int ActionsSuspend(void); -int ActionsResume(void); -void ActionsHandleMotion(void); -int ActionsEnd(EWin * ewin); +/* about.c */ void About(void); +/* actions.c */ #define EXEC_SET_LANG 0x01 int execApplication(const char *params, int flags); void Espawn(int argc, char **argv); void EspawnCmd(const char *cmd); -/* arrange.c */ -#define ARRANGE_VERBATIM 0 -#define ARRANGE_BY_SIZE 1 -#define ARRANGE_BY_POSITION 2 - -void SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, - int *new_dy); -void ArrangeEwin(EWin * ewin); -void ArrangeEwinCentered(EWin * ewin); -void ArrangeEwinXY(EWin * ewin, int *px, int *py); -void ArrangeEwinCenteredXY(EWin * ewin, int *px, int *py); -void ArrangeEwins(const char *params); - /* comms.c */ void CommsInit(void); void CommsSend(Client * c, const char *s); @@ -595,39 +580,12 @@ int ThemeConfigLoad(void); void RecoverUserConfig(void); -/* coords.c */ -void CoordsShow(EWin * ewin); -void CoordsHide(void); - -/* cursors.c */ -#define ECSR_NONE 0 -#define ECSR_ROOT 1 -#define ECSR_GRAB 2 -#define ECSR_PGRAB 3 -#define ECSR_ACT_MOVE 4 -#define ECSR_ACT_RESIZE 5 -#define ECSR_COUNT 6 - -ECursor *ECursorFind(const char *name); -void ECursorApply(ECursor * ec, Win win); -void ECursorIncRefcount(ECursor * ec); -void ECursorDecRefcount(ECursor * ec); -Cursor ECsrGet(int which); -void ECsrApply(int which, Window win); - /* dialog.c */ void DialogOK(const char *title, const char *fmt, ...); void DialogOKstr(const char *title, const char *txt); void DialogAlert(const char *fmt, ...); void DialogAlertOK(const char *fmt, ...); -/* dock.c */ -void DockIt(EWin * ewin); - -/* draw.c */ -void DrawEwinShape(EWin * ewin, int md, int x, int y, int w, - int h, char firstlast); - /* econfig.c */ void ConfigurationLoad(void); void ConfigurationSave(void); @@ -639,100 +597,17 @@ void EdgeWindowsShow(void); void EdgeWindowsHide(void); -/* events.c */ -/* Re-mapped X-events */ -#define EX_EVENT_CREATE_GONE 64 -#define EX_EVENT_UNMAP_GONE 65 -#define EX_EVENT_MAP_GONE 66 -#define EX_EVENT_MAPREQUEST_GONE 67 -#define EX_EVENT_REPARENT_GONE 68 - -#define EX_EVENT_SHAPE_NOTIFY 72 -#define EX_EVENT_SCREEN_CHANGE_NOTIFY 73 -#define EX_EVENT_DAMAGE_NOTIFY 74 - -#define ENABLE_DEBUG_EVENTS 1 -#if ENABLE_DEBUG_EVENTS -#define EDBUG_TYPE_EWINS 128 -#define EDBUG_TYPE_FOCUS 129 -#define EDBUG_TYPE_COMPRESSION 130 -#define EDBUG_TYPE_STACKING 131 -#define EDBUG_TYPE_RAISELOWER 132 -#define EDBUG_TYPE_MOVERESIZE 133 -#define EDBUG_TYPE_SESSION 134 -#define EDBUG_TYPE_SNAPS 135 -#define EDBUG_TYPE_DESKS 136 -#define EDBUG_TYPE_GRABS 137 -#define EDBUG_TYPE_DISPATCH 138 -#define EDBUG_TYPE_MODULES 139 -#define EDBUG_TYPE_CONFIG 140 -#define EDBUG_TYPE_IPC 141 -#define EDBUG_TYPE_EVENTS 142 -#define EDBUG_TYPE_ICONBOX 143 -#define EDBUG_TYPE_VERBOSE 144 -#define EDBUG_TYPE_SYNC 145 -#define EDBUG_TYPE_PAGER 146 -#define EDBUG_TYPE_SELECTION 147 -#define EDBUG_TYPE_FONTS 148 - -int EventDebug(unsigned int type); -void EventDebugSet(unsigned int type, int value); -#else -#define EventDebug(type) 0 -#define EventDebugSet(type, value) -#endif -void EventsInit(void); -void EventsMain(void); -void EventDebugInit(const char *s); -void EventShow(const XEvent * ev); - /* extinitwin.c */ Window ExtInitWinCreate(void); void ExtInitWinSet(Window win); Window ExtInitWinGet(void); void ExtInitWinKill(void); -/* focus.c */ -#define FOCUS_NOP 0 -#define FOCUS_INIT 1 -#define FOCUS_SET 2 -#define FOCUS_NONE 3 -#define FOCUS_ENTER 4 -#define FOCUS_LEAVE 5 -#define FOCUS_EWIN_NEW 6 -#define FOCUS_EWIN_UNMAP 7 -#define FOCUS_DESK_ENTER 8 -#define FOCUS_DESK_LEAVE 9 -#define FOCUS_NEXT 10 -#define FOCUS_PREV 11 -#define FOCUS_CLICK 12 - -void FocusEnable(int on); -void FocusToEWin(EWin * ewin, int why); -void FocusHandleEnter(EWin * ewin, XEvent * ev); -void FocusHandleLeave(EWin * ewin, XEvent * ev); -void FocusHandleChange(EWin * ewin, XEvent * ev); -void FocusHandleClick(EWin * ewin, Win win); -void FocusNewDeskBegin(void); -void FocusNewDesk(void); -void FocusGrabsUpdate(void); - /* fonts.c */ int FontConfigLoad(FILE * fs); void FontConfigUnload(void); const char *FontLookup(const char *name); -/* grabs.c */ -int GrabKeyboardSet(Win win); -int GrabKeyboardRelease(void); -int GrabPointerSet(Win win, unsigned int csr, int confine); -void GrabPointerRelease(void); -void GrabButtonSet(unsigned int button, unsigned int modifiers, - Win win, unsigned int event_mask, - unsigned int csr, int confine); -void GrabButtonRelease(unsigned int button, - unsigned int modifiers, Win win); - /* handlers.c */ void SignalsSetup(void); void SignalsRestore(void); @@ -764,26 +639,6 @@ /* mod-misc.c */ void autosave(void); -/* moveresize.c */ -int ActionMoveStart(EWin * ewin, int grab, char constrained, - int nogroup); -int ActionMoveEnd(EWin * ewin); -int ActionMoveSuspend(void); -int ActionMoveResume(void); -void ActionMoveHandleMotion(void); -int ActionResizeStart(EWin * ewin, int grab, int hv); -int ActionResizeEnd(EWin * ewin); -void ActionResizeHandleMotion(void); - -/* progress.c */ -typedef struct _progressbar Progressbar; - -Progressbar *ProgressbarCreate(const char *name, int width, int height); -void ProgressbarDestroy(Progressbar * p); -void ProgressbarSet(Progressbar * p, int progress); -void ProgressbarShow(Progressbar * p); -void ProgressbarHide(Progressbar * p); - /* regex.c */ int matchregexp(const char *rx, const char *s); @@ -804,15 +659,6 @@ /* theme.c */ void ThemePathFind(void); char **ThemesList(int *num); - -/* warp.c */ -void WarpFocus(int delta); - -/* windowmatch.c */ -int WindowMatchConfigLoad(FILE * fs); -Border *WindowMatchEwinBorder(const EWin * ewin); -const char *WindowMatchEwinIcon(const EWin * ewin); -void WindowMatchEwinOps(EWin * ewin); /* * Global vars =================================================================== RCS file: /cvs/e/e16/e/src/Makefile.am,v retrieving revision 1.79 retrieving revision 1.80 diff -u -3 -r1.79 -r1.80 --- Makefile.am 22 Oct 2006 14:09:50 -0000 1.79 +++ Makefile.am 19 Nov 2006 21:55:50 -0000 1.80 @@ -15,80 +15,58 @@ endif e16_SOURCES = \ E.h \ - aclass.c \ - aclass.h \ + about.c \ + aclass.c aclass.h \ actions.c \ - alert.c \ - alert.h \ + alert.c alert.h \ arrange.c \ - backgrounds.c \ - backgrounds.h \ - borders.c \ - borders.h \ - buttons.c \ - buttons.h \ + backgrounds.c backgrounds.h \ + borders.c borders.h \ + buttons.c buttons.h \ cmclass.c \ comms.c \ conf.h \ config.c \ - container.c \ - container.h \ + container.c container.h \ coords.c \ - cursors.c \ - desktops.c \ - desktops.h \ - dialog.c \ - dialog.h \ + cursors.c cursors.h \ + desktops.c desktops.h \ + dialog.c dialog.h \ dock.c \ draw.c \ - e16-ecore_hints.c \ - e16-ecore_hints.h \ - e16-ecore_list.c \ - e16-ecore_list.h \ - econfig.c \ - econfig.h \ + e16-ecore_hints.c e16-ecore_hints.h \ + e16-ecore_list.c e16-ecore_list.h \ + econfig.c econfig.h \ + edebug.h \ edge.c \ - eimage.c \ - eimage.h \ - emodule.c \ - emodule.h \ - eobj.c \ - eobj.h \ + eimage.c eimage.h \ + emodule.c emodule.h \ + eobj.c eobj.h \ etypes.h \ - events.c \ - ewins.c \ - ewins.h \ - ewin-ops.c \ - ewin-ops.h \ + events.c events.h \ + ewins.c ewins.h \ + ewin-ops.c ewin-ops.h \ ewmh.c \ extinitwin.c \ - file.c \ - file.h \ + file.c file.h \ finders.c \ - focus.c \ + focus.c focus.h \ fonts.c \ fx.c \ - grabs.c \ - groups.c \ - groups.h \ + grabs.c grabs.h \ + groups.c groups.h \ handlers.c \ - hints.c \ - hints.h \ - hiwin.c \ - hiwin.h \ + hints.c hints.h \ + hiwin.c hiwin.h \ icccm.c \ - iclass.c \ - iclass.h \ + iclass.c iclass.h \ iconify.c \ - icons.c \ - icons.h \ + icons.c icons.h \ ipc.c \ - lang.c \ - lang.h \ + lang.c lang.h \ main.c \ memory.c \ - menus.c \ - menus.h \ + menus.c menus.h \ menus-misc.c \ misc.c \ mod-misc.c \ @@ -96,41 +74,31 @@ moveresize.c \ mwm.c \ pager.c \ - parse.c \ - parse.h \ - progress.c \ + parse.c parse.h \ + progress.c progress.h \ regex.c \ - screen.c \ - screen.h \ - session.c \ - session.h \ - settings.c \ - settings.h \ + screen.c screen.h \ + session.c session.h \ + settings.c settings.h \ setup.c \ size.c \ slideout.c \ - snaps.c \ - snaps.h \ + snaps.c snaps.h \ sound.c \ stacking.c \ startup.c \ systray.c \ - tclass.c \ - tclass.h \ + tclass.c tclass.h \ text.c \ theme.c \ - timers.c \ - timers.h \ - tooltips.c \ - tooltips.h \ - user.c \ - user.h \ + timers.c timers.h \ + tooltips.c tooltips.h \ + user.c user.h \ util.h \ ttfont.c \ warp.c \ - windowmatch.c \ - x.c \ - xwin.h \ + windowmatch.c windowmatch.h \ + x.c xwin.h \ zoom.c \ $(SRCS_GNOME) \ $(SRCS_ECOMPMGR) \ =================================================================== RCS file: /cvs/e/e16/e/src/aclass.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- aclass.c 24 Jul 2006 21:10:58 -0000 1.35 +++ aclass.c 19 Nov 2006 21:55:50 -0000 1.36 @@ -24,10 +24,12 @@ #include "E.h" #include "aclass.h" #include "conf.h" +#include "cursors.h" #include "e16-ecore_list.h" #include "emodule.h" #include "ewins.h" #include "file.h" +#include "grabs.h" #include "parse.h" #include <ctype.h> =================================================================== RCS file: /cvs/e/e16/e/src/actions.c,v retrieving revision 1.210 retrieving revision 1.211 diff -u -3 -r1.210 -r1.211 --- actions.c 24 Sep 2006 19:07:02 -0000 1.210 +++ actions.c 19 Nov 2006 21:55:50 -0000 1.211 @@ -22,7 +22,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "E.h" -#include "dialog.h" #include "file.h" #include "user.h" @@ -190,140 +189,6 @@ argv = StrlistDecodeEscaped(cmd, &argc); Espawn(argc, argv); StrlistFree(argv, argc); -} - -void -ActionsHandleMotion(void) -{ - switch (Mode.mode) - { - case MODE_MOVE_PENDING: - case MODE_MOVE: - ActionMoveHandleMotion(); - break; - - case MODE_RESIZE: - case MODE_RESIZE_H: - case MODE_RESIZE_V: - ActionResizeHandleMotion(); - break; - - default: - break; - } -} - -int -ActionsSuspend(void) -{ - switch (Mode.mode) - { - case MODE_MOVE_PENDING: - case MODE_MOVE: - ActionMoveSuspend(); - break; - case MODE_RESIZE: - case MODE_RESIZE_H: - case MODE_RESIZE_V: - ActionResizeEnd(NULL); - break; - } - - return 0; -} - -int -ActionsResume(void) -{ - switch (Mode.mode) - { - case MODE_MOVE_PENDING: - case MODE_MOVE: - ActionMoveResume(); - break; - } - - return 0; -} - -int -ActionsEnd(EWin * ewin) -{ - int did_end = 1; - - switch (Mode.mode) - { - case MODE_RESIZE: - case MODE_RESIZE_H: - case MODE_RESIZE_V: - ActionResizeEnd(ewin); - Mode.action_inhibit = 1; - break; - - case MODE_MOVE_PENDING: - case MODE_MOVE: - ActionMoveEnd(ewin); - Mode.action_inhibit = 1; - break; - - default: - did_end = 0; - break; - } - - return did_end; -} - -static void -_DlgFillAbout(Dialog * d, DItem * table, void *data __UNUSED__) -{ - DItem *di; - char buf[1024]; - - Esnprintf(buf, sizeof(buf), _("About Enlightenment %s"), e_wm_version); - DialogSetTitle(d, buf); - - DialogItemTableSetOptions(table, 2, 0, 0, 0); - - di = DialogAddItem(table, DITEM_IMAGE); - DialogItemImageSetFile(di, "pix/about.png"); - - di = DialogAddItem(table, DITEM_TEXT); - Esnprintf(buf, sizeof(buf), - _("Welcome to the %s version\n" - "of the Enlightenment window manager.\n" - "Enlightenment is still under development, but\n" - "we have tried to iron out all the bugs that\n" - "we can find. If you find a bug in the software,\n" - "please do not hesitate to send in a bug report.\n" - "See \"Help\" for information on joining the\n" - "mailing list.\n" "\n" - "This code was last updated on:\n%s\n" "\n" - "Good luck. We hope you enjoy the software.\n" "\n" - "The Rasterman - ra...@ra...\n" - "Mandrake - man...@ma...\n" - "Kim Woelders - ki...@wo...\n"), e_wm_version, e_wm_date); - DialogItemSetText(di, buf); - - DialogBindKey(d, "Return", DialogCallbackClose, 0, NULL); - DialogBindKey(d, "Escape", DialogCallbackClose, 0, NULL); -} - -static const DialogDef DlgAbout = { - "ABOUT_ENLIGHTENMENT", - NULL, - NULL, - NULL, - NULL, - NULL, - _DlgFillAbout, - DLG_OK | DLG_NO_SEPARATOR, DialogCallbackClose, -}; - -void -About(void) -{ - DialogShowSimple(&DlgAbout, NULL); } #if 0 /* FIXME - Fix */ =================================================================== RCS file: /cvs/e/e16/e/src/borders.c,v retrieving revision 1.289 retrieving revision 1.290 diff -u -3 -r1.289 -r1.290 --- borders.c 7 Aug 2006 20:47:12 -0000 1.289 +++ borders.c 19 Nov 2006 21:55:51 -0000 1.290 @@ -24,13 +24,17 @@ #include "E.h" #include "aclass.h" #include "borders.h" +#include "cursors.h" #include "e16-ecore_list.h" #include "ewins.h" +#include "focus.h" +#include "grabs.h" #include "hints.h" #include "iclass.h" #include "snaps.h" #include "tclass.h" #include "tooltips.h" +#include "windowmatch.h" #include "xwin.h" #define EWIN_BORDER_PART_EVENT_MASK \ =================================================================== RCS file: /cvs/e/e16/e/src/buttons.c,v retrieving revision 1.95 retrieving revision 1.96 diff -u -3 -r1.95 -r1.96 --- buttons.c 23 Aug 2006 21:04:53 -0000 1.95 +++ buttons.c 19 Nov 2006 21:55:51 -0000 1.96 @@ -24,11 +24,13 @@ #include "E.h" #include "aclass.h" #include "buttons.h" +#include "cursors.h" #include "desktops.h" #include "e16-ecore_list.h" #include "eimage.h" #include "emodule.h" #include "file.h" +#include "grabs.h" #include "iclass.h" #include "parse.h" #include "tclass.h" =================================================================== RCS file: /cvs/e/e16/e/src/comms.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -3 -r1.78 -r1.79 --- comms.c 7 Aug 2006 20:47:12 -0000 1.78 +++ comms.c 19 Nov 2006 21:55:51 -0000 1.79 @@ -221,7 +221,7 @@ if (!s) return; - if (EventDebug(EDBUG_TYPE_IPC)) + if (EDebug(EDBUG_TYPE_IPC)) Eprintf("ClientHandleComms: %s\n", s); if (!strncmp(s, "set ", 4)) =================================================================== RCS file: /cvs/e/e16/e/src/config.c,v retrieving revision 1.150 retrieving revision 1.151 diff -u -3 -r1.150 -r1.151 --- config.c 12 Aug 2006 10:33:47 -0000 1.150 +++ config.c 19 Nov 2006 21:55:51 -0000 1.151 @@ -30,10 +30,12 @@ #include "file.h" #include "iclass.h" #include "menus.h" +#include "progress.h" #include "session.h" #include "tclass.h" #include "tooltips.h" #include "user.h" +#include "windowmatch.h" void SkipTillEnd(FILE * ConfigFile) @@ -161,7 +163,7 @@ if (so != si) *so = '\0'; - if (EventDebug(EDBUG_TYPE_CONFIG) > 1) + if (EDebug(EDBUG_TYPE_CONFIG) > 1) Eprintf("GetLine %s\n", s); return s; @@ -182,7 +184,7 @@ const char *epp_path = ENLIGHTENMENT_BIN "/epp"; char *def_home, *def_user, *def_shell; - if (EventDebug(EDBUG_TYPE_CONFIG)) + if (EDebug(EDBUG_TYPE_CONFIG)) Eprintf("ConfigFilePreparse %s -> %s\n", path, dest); def_home = homedir(getuid()); @@ -501,7 +503,7 @@ char *file; FILE *fs; - if (EventDebug(EDBUG_TYPE_CONFIG)) + if (EDebug(EDBUG_TYPE_CONFIG)) Eprintf("ConfigFileLoad %s\n", name); file = ConfigFileFind(name, themepath, preparse); =================================================================== RCS file: /cvs/e/e16/e/src/cursors.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- cursors.c 7 Aug 2006 20:47:12 -0000 1.36 +++ cursors.c 19 Nov 2006 21:55:51 -0000 1.37 @@ -24,6 +24,7 @@ #include "E.h" #include "X11/cursorfont.h" #include "conf.h" +#include "cursors.h" #include "e16-ecore_list.h" #include "emodule.h" #include "xwin.h" =================================================================== RCS file: /cvs/e/e16/e/src/desktops.c,v retrieving revision 1.252 retrieving revision 1.253 diff -u -3 -r1.252 -r1.253 --- desktops.c 19 Nov 2006 20:20:22 -0000 1.252 +++ desktops.c 19 Nov 2006 21:55:51 -0000 1.253 @@ -30,7 +30,10 @@ #include "ecompmgr.h" #include "emodule.h" #include "eobj.h" +#include "events.h" #include "ewins.h" +#include "focus.h" +#include "grabs.h" #include "hints.h" #include "iclass.h" #include "timers.h" @@ -515,7 +518,7 @@ Pixmap pmap = dsk->bg.pmap; unsigned long pixel = dsk->bg.pixel; - if (EventDebug(EDBUG_TYPE_DESKS)) + if (EDebug(EDBUG_TYPE_DESKS)) Eprintf ("DeskBackgroundConfigure %d v=%d %#lx/%#lx: ext=%d pmap=%#lx/%#lx pixel=%#lx/%#lx\n", dsk->num, dsk->viewable, EoGetXwin(dsk), EobjGetXwin(dsk->bg.o), @@ -587,7 +590,7 @@ int changed = 0; int reconfigure = 0; - if (EventDebug(EDBUG_TYPE_DESKS)) + if (EDebug(EDBUG_TYPE_DESKS)) Eprintf("DeskBackgroundRefresh %d v=%d why=%d pmap=%#lx pixel=%#lx\n", dsk->num, dsk->viewable, why, pmap, pixel); @@ -779,7 +782,7 @@ dsk->stack.latest = eo; if (EobjGetType(eo) == EOBJ_TYPE_EWIN) dsk->stack.update_client_list = 1; - if (EventDebug(EDBUG_TYPE_STACKING)) + if (EDebug(EDBUG_TYPE_STACKING)) Eprintf("DeskSetDirtyStack %d (%d): %s\n", dsk->num, dsk->stack.dirty, EobjGetName(eo)); } @@ -1220,7 +1223,7 @@ if (!dsk || dsk == desks.previous) return; - if (EventDebug(EDBUG_TYPE_DESKS)) + if (EDebug(EDBUG_TYPE_DESKS)) Eprintf("DeskGoto %d\n", dsk->num); ModulesSignal(ESIGNAL_DESK_SWITCH_START, NULL); @@ -1284,7 +1287,7 @@ ModulesSignal(ESIGNAL_DESK_SWITCH_DONE, NULL); - if (EventDebug(EDBUG_TYPE_DESKS)) + if (EDebug(EDBUG_TYPE_DESKS)) Eprintf("DeskGoto %d done\n", dsk->num); } @@ -1312,7 +1315,7 @@ dsk = _DeskGet(desk); - if (EventDebug(EDBUG_TYPE_DESKS)) + if (EDebug(EDBUG_TYPE_DESKS)) Eprintf("DeskRaise(%d) current=%d\n", desk, desks.current->num); DeskSwitchStart(); @@ -1337,7 +1340,7 @@ DeskSwitchStart(); MoveToDeskBottom(dsk); - if (EventDebug(EDBUG_TYPE_DESKS)) + if (EDebug(EDBUG_TYPE_DESKS)) Eprintf("DeskLower(%d) %d -> %d\n", desk, desks.current->num, desks.order[0]); @@ -1395,7 +1398,7 @@ eo = dsk->stack.latest; eo->stacked = 1; - if (EventDebug(EDBUG_TYPE_STACKING)) + if (EDebug(EDBUG_TYPE_STACKING)) Eprintf("DeskRestackSimple %#lx %s\n", EobjGetXwin(eo), EobjGetName(eo)); lst = EobjListStackGetForDesk(&num, dsk); @@ -1419,7 +1422,7 @@ xwc.sibling = EobjGetXwin(lst[i - 1]); } value_mask = CWSibling | CWStackMode; - if (EventDebug(EDBUG_TYPE_STACKING)) + if (EDebug(EDBUG_TYPE_STACKING)) Eprintf("DeskRestackSimple %#10lx %s %#10lx\n", EobjGetXwin(eo), (xwc.stack_mode == Above) ? "Above" : "Below", xwc.sibling); XConfigureWindow(disp, EobjGetXwin(eo), value_mask, &xwc); @@ -1457,7 +1460,7 @@ eo->stacked = 1; } - if (EventDebug(EDBUG_TYPE_STACKING)) + if (EDebug(EDBUG_TYPE_STACKING)) { Eprintf("DeskRestack %d (%d):\n", dsk->num, dsk->stack.dirty); for (i = 0; i < tot; i++) @@ -1651,7 +1654,7 @@ if (ax == pax && ay == pay) return; - if (EventDebug(EDBUG_TYPE_DESKS)) + if (EDebug(EDBUG_TYPE_DESKS)) Eprintf("DeskCurrentGotoArea %d,%d\n", ax, ay); ModulesSignal(ESIGNAL_AREA_SWITCH_START, NULL); @@ -1894,7 +1897,7 @@ { int ww, hh; - if (EventDebug(EDBUG_TYPE_DESKS)) + if (EDebug(EDBUG_TYPE_DESKS)) Eprintf("DeskRootResize %d %dx%d\n", root, w, h); if (root) @@ -1964,7 +1967,7 @@ { /* Possible race here? */ pmap = HintsGetRootPixmap(EoGetWin(dsk)); - if (EventDebug(EDBUG_TYPE_DESKS)) + if (EDebug(EDBUG_TYPE_DESKS)) Eprintf("DeskPropertyChange win=%#lx _XROOTPMAP_ID=%#lx\n", ev->xany.window, pmap); if (ev->xany.window != VRoot.xwin) @@ -1980,7 +1983,7 @@ } else if (ev->xproperty.atom == E_XROOTCOLOR_PIXEL) { - if (EventDebug(EDBUG_TYPE_DESKS)) + if (EDebug(EDBUG_TYPE_DESKS)) Eprintf("DeskPropertyChange win=%#lx _XROOTCOLOR_PIXEL\n", ev->xany.window); if (ev->xany.window != VRoot.xwin) =================================================================== RCS file: /cvs/e/e16/e/src/ecompmgr.c,v retrieving revision 1.130 retrieving revision 1.131 diff -u -3 -r1.130 -r1.131 --- ecompmgr.c 19 Nov 2006 12:37:09 -0000 1.130 +++ ecompmgr.c 19 Nov 2006 21:55:51 -0000 1.131 @@ -33,6 +33,7 @@ #include "ecompmgr.h" #include "emodule.h" #include "eobj.h" +#include "events.h" #include "hints.h" #include "settings.h" #include "timers.h" @@ -62,10 +63,10 @@ #define EDBUG_TYPE_COMPMGR2 162 #define EDBUG_TYPE_COMPMGR3 163 #define EDBUG_TYPE_COMPMGR4 164 -#define D1printf(fmt...) if(EventDebug(EDBUG_TYPE_COMPMGR))Eprintf(fmt) -#define D2printf(fmt...) if(EventDebug(EDBUG_TYPE_COMPMGR2))Eprintf(fmt) -#define D3printf(fmt...) if(EventDebug(EDBUG_TYPE_COMPMGR3))Eprintf(fmt) -#define D4printf(fmt...) if(EventDebug(EDBUG_TYPE_COMPMGR4))Eprintf(fmt) +#define D1printf(fmt...) if(EDebug(EDBUG_TYPE_COMPMGR))Eprintf(fmt) +#define D2printf(fmt...) if(EDebug(EDBUG_TYPE_COMPMGR2))Eprintf(fmt) +#define D3printf(fmt...) if(EDebug(EDBUG_TYPE_COMPMGR3))Eprintf(fmt) +#define D4printf(fmt...) if(EDebug(EDBUG_TYPE_COMPMGR4))Eprintf(fmt) #else #define D1printf(fmt...) #define D2printf(fmt...) @@ -601,7 +602,7 @@ { if (allDamage != None) { - if (EventDebug(EDBUG_TYPE_COMPMGR3)) + if (EDebug(EDBUG_TYPE_COMPMGR3)) ERegionShow("ECompMgrDamageMerge add:", damage); ERegionUnion(allDamage, damage); @@ -617,7 +618,7 @@ allDamage = damage; } - if (EventDebug(EDBUG_TYPE_COMPMGR3)) + if (EDebug(EDBUG_TYPE_COMPMGR3)) ERegionShow("ECompMgrDamageMerge all:", allDamage); } @@ -1031,7 +1032,7 @@ rgn = ERegionCreateRect(r.x, r.y, r.width, r.height); - if (EventDebug(EDBUG_TYPE_COMPMGR3)) + if (EDebug(EDBUG_TYPE_COMPMGR3)) ERegionShow("extents", rgn); #if 0 /* FIXME - Set picture clip region */ @@ -1073,7 +1074,7 @@ ERegionTranslate(border, x, y); D2printf("shape %#lx: %d %d\n", EobjGetXwin(eo), x, y); - if (EventDebug(EDBUG_TYPE_COMPMGR3)) + if (EDebug(EDBUG_TYPE_COMPMGR3)) ERegionShow("shape", border); return border; @@ -1516,7 +1517,7 @@ /* Invalidate old window region */ damage = cw->extents; cw->extents = None; - if (EventDebug(EDBUG_TYPE_COMPMGR3)) + if (EDebug(EDBUG_TYPE_COMPMGR3)) ERegionShow("old-extents:", damage); #if 0 /* FIXME - We shouldn't have to update clip if transparent */ @@ -1578,7 +1579,7 @@ EobjGetX(eo), EobjGetY(eo), change_xy); /* Invalidate old window region */ - if (EventDebug(EDBUG_TYPE_COMPMGR3)) + if (EDebug(EDBUG_TYPE_COMPMGR3)) ERegionShow("old-extents:", cw->extents); ECompMgrDamageMergeObject(eo, cw->extents, change_xy); if (change_xy) @@ -1724,7 +1725,7 @@ return; } - if (force || EventDebug(EDBUG_TYPE_COMPMGR3)) + if (force || EDebug(EDBUG_TYPE_COMPMGR3)) { Eprintf(" - pict=%#lx pmap=%#lx\n", cw->picture, cw->pixmap); @@ -1964,7 +1965,7 @@ case WINDOW_UNREDIR: case WINDOW_SOLID: clip = ECompMgrRepaintObjSetClip(rgn_clip, region, cw->clip, x, y); - if (EventDebug(EDBUG_TYPE_COMPMGR2)) + if (EDebug(EDBUG_TYPE_COMPMGR2)) ECompMgrWinDumpInfo("ECompMgrRepaintObj solid", eo, clip, 0); XFixesSetPictureClipRegion(dpy, pbuf, 0, 0, clip); XRenderComposite(dpy, PictOpSrc, cw->picture, None, pbuf, @@ -1986,7 +1987,7 @@ case WINDOW_TRANS: case WINDOW_ARGB: clip = ECompMgrRepaintObjSetClip(rgn_clip, region, cw->clip, x, y); - if (EventDebug(EDBUG_TYPE_COMPMGR2)) + if (EDebug(EDBUG_TYPE_COMPMGR2)) ECompMgrWinDumpInfo("ECompMgrRepaintObj trans", eo, clip, 0); XFixesSetPictureClipRegion(dpy, pbuf, 0, 0, clip); if (cw->opacity != OPAQUE && !cw->pict_alpha) @@ -2065,7 +2066,7 @@ D2printf("ECompMgrRepaint rootBuffer=%#lx rootPicture=%#lx\n", rootBuffer, rootPicture); - if (EventDebug(EDBUG_TYPE_COMPMGR)) + if (EDebug(EDBUG_TYPE_COMPMGR)) ERegionShow("allDamage", allDamage); if (!rootBuffer) @@ -2089,7 +2090,7 @@ #if 0 /* FIXME - NoBg? */ Picture pict; - if (EventDebug(EDBUG_TYPE_COMPMGR2)) + if (EDebug(EDBUG_TYPE_COMPMGR2)) ERegionShow("after opaque", region); /* Repaint background, clipped by damage region and opaque windows */ =================================================================== RCS file: /cvs/e/e16/e/src/econfig.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- econfig.c 21 Apr 2006 23:47:30 -0000 1.11 +++ econfig.c 19 Nov 2006 21:55:51 -0000 1.12 @@ -231,7 +231,7 @@ else name = ci->name; - if (EventDebug(EDBUG_TYPE_CONFIG)) + if (EDebug(EDBUG_TYPE_CONFIG)) Eprintf("CfgItemLoad %s\n", name); if (!ci->ptr) @@ -274,7 +274,7 @@ else name = ci->name; - if (EventDebug(EDBUG_TYPE_CONFIG)) + if (EDebug(EDBUG_TYPE_CONFIG)) Eprintf("CfgItemSave %s\n", name); if (!ci->ptr) =================================================================== RCS file: /cvs/e/e16/e/src/eobj.c,v retrieving revision 1.85 retrieving revision 1.86 diff -u -3 -r1.85 -r1.86 --- eobj.c 19 Nov 2006 12:37:09 -0000 1.85 +++ eobj.c 19 Nov 2006 21:55:51 -0000 1.86 @@ -209,14 +209,14 @@ if (EobjGetXwin(eo) != VRoot.xwin) EobjListStackAdd(eo, 1); - if (EventDebug(EDBUG_TYPE_EWINS)) + if (EDebug(EDBUG_TYPE_EWINS)) Eprintf("EobjInit: %#lx %s\n", EobjGetXwin(eo), eo->name); } void EobjFini(EObj * eo) { - if (EventDebug(EDBUG_TYPE_EWINS)) + if (EDebug(EDBUG_TYPE_EWINS)) Eprintf("EobjFini: %#lx %s\n", EobjGetXwin(eo), eo->name); EobjListStackDel(eo); @@ -241,7 +241,7 @@ void EobjDestroy(EObj * eo) { - if (EventDebug(EDBUG_TYPE_EWINS)) + if (EDebug(EDBUG_TYPE_EWINS)) Eprintf("EobjDestroy: %#lx %s\n", EobjGetXwin(eo), eo->name); EobjFini(eo); =================================================================== RCS file: /cvs/e/e16/e/src/events.c,v retrieving revision 1.128 retrieving revision 1.129 diff -u -3 -r1.128 -r1.129 --- events.c 19 Nov 2006 20:43:28 -0000 1.128 +++ events.c 19 Nov 2006 21:55:51 -0000 1.129 @@ -24,6 +24,7 @@ #include "E.h" #include "aclass.h" #include "emodule.h" +#include "events.h" #include "session.h" #include "timers.h" #include "xwin.h" @@ -99,7 +100,7 @@ { if (!strcmp(xssc[i].name, "SERVERTIME")) Mode.display.server_time = xssc[i].counter; - if (EventDebug(EDBUG_TYPE_SYNC)) + if (EDebug(EDBUG_TYPE_SYNC)) Eprintf(" Sync counter %2d: %10s %#lx %#x:%#x\n", i, xssc[i].name, xssc[i].counter, XSyncValueHigh32(xssc[i].resolution), @@ -119,7 +120,7 @@ if (!available) return; - if (EventDebug(EDBUG_TYPE_VERBOSE)) + if (EDebug(EDBUG_TYPE_VERBOSE)) { XScreenSaverInfo *xssi = XScreenSaverAllocInfo(); @@ -178,7 +179,7 @@ ext->query_ver(disp, &(exd->major), &(exd->minor)); - if (EventDebug(EDBUG_TYPE_VERBOSE)) + if (EDebug(EDBUG_TYPE_VERBOSE)) Eprintf("Found extension %-10s version %d.%d -" " Event/error base = %d/%d\n", ext->name, exd->major, exd->minor, exd->event_base, exd->error_base); @@ -233,7 +234,7 @@ Win win; #if ENABLE_DEBUG_EVENTS - if (EventDebug(ev->type)) + if (EDebug(ev->type)) EventShow(ev); #endif @@ -363,7 +364,7 @@ #if ENABLE_DEBUG_EVENTS /* Debug - should be taken out */ - if (EventDebug(EDBUG_TYPE_COMPRESSION)) + if (EDebug(EDBUG_TYPE_COMPRESSION)) for (i = 0; i < count; i++) if (evq[i].type) Eprintf("EventsCompress-1 %3d %s w=%#lx\n", i, @@ -395,7 +396,7 @@ } } #if ENABLE_DEBUG_EVENTS - if (n && EventDebug(EDBUG_TYPE_COMPRESSION)) + if (n && EDebug(EDBUG_TYPE_COMPRESSION)) Eprintf("EventsCompress n=%4d %s %#lx x,y = %d,%d\n", n, EventName(ev->type), ev->xmotion.window, ev->xmotion.x, ev->xmotion.y); @@ -485,7 +486,7 @@ ev->xexpose.height = yb - ya; } #if ENABLE_DEBUG_EVENTS - if (EventDebug(EDBUG_TYPE_COMPRESSION)) + if (EDebug(EDBUG_TYPE_COMPRESSION)) Eprintf("EventsCompress n=%4d %s %#lx x=%4d-%4d y=%4d-%4d\n", n, EventName(ev->type), ev->xexpose.window, xa, xb, ya, yb); @@ -505,7 +506,7 @@ } } #if ENABLE_DEBUG_EVENTS - if (n && EventDebug(EDBUG_TYPE_COMPRESSION)) + if (n && EDebug(EDBUG_TYPE_COMPRESSION)) Eprintf("EventsCompress n=%4d %s %#lx\n", n, EventName(ev->type), ev->xmotion.window); #endif @@ -524,7 +525,7 @@ #if ENABLE_DEBUG_EVENTS /* Debug - should be taken out */ - if (EventDebug(EDBUG_TYPE_COMPRESSION)) + if (EDebug(EDBUG_TYPE_COMPRESSION)) for (i = 0; i < count; i++) if (evq[i].type) Eprintf("EventsCompress-2 %3d %s w=%#lx\n", i, @@ -585,7 +586,7 @@ n = EventsFetch(evq_p, evq_n); evq = *evq_p; - if (EventDebug(EDBUG_TYPE_EVENTS)) + if (EDebug(EDBUG_TYPE_EVENTS)) Eprintf("EventsProcess-B %d\n", n); for (i = count = 0; i < n; i++) @@ -593,7 +594,7 @@ if (evq[i].type == 0) continue; - if (EventDebug(EDBUG_TYPE_EVENTS) > 1) + if (EDebug(EDBUG_TYPE_EVENTS) > 1) EventShow(evq + i); count++; @@ -601,7 +602,7 @@ evq[i].type = 0; } - if (EventDebug(EDBUG_TYPE_EVENTS)) + if (EDebug(EDBUG_TYPE_EVENTS)) Eprintf("EventsProcess-E %d/%d\n", count, n); if (n > *evq_f) @@ -635,7 +636,7 @@ pfetch = 0; count = EventsProcess(&evq_ptr, &evq_alloc, &pfetch); - if (EventDebug(EDBUG_TYPE_EVENTS)) + if (EDebug(EDBUG_TYPE_EVENTS)) Eprintf("EventsMain - Idlers\n"); IdlersRun(); @@ -643,7 +644,7 @@ { evq_fetch = (pfetch > evq_fetch) ? pfetch : (3 * evq_fetch + pfetch) / 4; - if (EventDebug(EDBUG_TYPE_EVENTS)) + if (EDebug(EDBUG_TYPE_EVENTS)) Eprintf("EventsMain - Alloc/fetch/pfetch/peak=%d/%d/%d/%d)\n", evq_alloc, evq_fetch, pfetch, count); if ((evq_ptr) && ((evq_alloc - evq_fetch) > 64)) @@ -694,7 +695,7 @@ count = select(fdsize, &fdset, NULL, NULL, NULL); } - if (EventDebug(EDBUG_TYPE_EVENTS)) + if (EDebug(EDBUG_TYPE_EVENTS)) Eprintf ("EventsMain - count=%d xfd=%d:%d smfd=%d:%d dt=%lf time2=%lf\n", count, xfd, FD_ISSET(xfd, &fdset), smfd, @@ -704,7 +705,7 @@ { if ((smfd >= 0) && (FD_ISSET(smfd, &fdset))) { - if (EventDebug(EDBUG_TYPE_EVENTS)) + if (EDebug(EDBUG_TYPE_EVENTS)) Eprintf("EventsMain - ICE\n"); ProcessICEMSGS(); } @@ -716,61 +717,6 @@ /* * Event debug stuff */ -#define N_DEBUG_FLAGS 256 -static char ev_debug; -static char ev_debug_flags[N_DEBUG_FLAGS]; - -/* - * param is <EventNumber>[:<EventNumber> ... ] - */ -void -EventDebugInit(const char *param) -{ - const char *s; - int ix, onoff; - - if (!param) - return; - - for (;;) - { - s = strchr(param, ':'); - if (!param[0]) - break; - ev_debug = 1; - ix = strtol(param, NULL, 0); - onoff = (ix >= 0); - if (ix < 0) - ix = -ix; - if (ix < N_DEBUG_FLAGS) - { - if (onoff) - ev_debug_flags[ix]++; - else - ev_debug_flags[ix] = 0; - } - if (!s) - break; - param = s + 1; - } -} - -int -EventDebug(unsigned int type) -{ - return (ev_debug && - (type < sizeof(ev_debug_flags))) ? ev_debug_flags[type] : 0; -} - -void -EventDebugSet(unsigned int type, int value) -{ - if (type >= sizeof(ev_debug_flags)) - return; - - ev_debug = 1; - ev_debug_flags[type] += value; -} static const char *const TxtEventNames[] = { "Error", "Reply", "KeyPress", "KeyRelease", "ButtonPress", @@ -983,12 +929,4 @@ break; } } - -#else - -void -EventDebugInit(const char *param __UNUSED__) -{ -} - #endif /* ENABLE_DEBUG_EVENTS */ =================================================================== RCS file: /cvs/e/e16/e/src/ewin-ops.c,v retrieving revision 1.105 retrieving revision 1.106 diff -u -3 -r1.105 -r1.106 --- ewin-ops.c 3 Nov 2006 23:44:32 -0000 1.105 +++ ewin-ops.c 19 Nov 2006 21:55:51 -0000 1.106 @@ -28,6 +28,7 @@ #include "eobj.h" #include "ewins.h" #include "ewin-ops.h" +#include "focus.h" #include "groups.h" #include "hints.h" #include "iclass.h" /* FIXME - Should not be here */ @@ -308,7 +309,7 @@ return; call_depth++; - if (EventDebug(EDBUG_TYPE_MOVERESIZE)) + if (EDebug(EDBUG_TYPE_MOVERESIZE)) Eprintf("doEwinMoveResize(%d,%d) %#lx f=%x d=%d %d+%d %d*%d %s\n", call_depth, Mode.mode, EwinGetClientXwin(ewin), flags, (dsk) ? (int)dsk->num : -1, x, y, w, h, EwinGetName(ewin)); =================================================================== RCS file: /cvs/e/e16/e/src/ewins.c,v retrieving revision 1.178 retrieving revision 1.179 diff -u -3 -r1.178 -r1.179 --- ewins.c 19 Nov 2006 20:43:28 -0000 1.178 +++ ewins.c 19 Nov 2006 21:55:51 -0000 1.179 @@ -24,15 +24,20 @@ #include "E.h" #include "aclass.h" #include "borders.h" +#include "cursors.h" #include "desktops.h" #include "ecompmgr.h" #include "emodule.h" #include "eobj.h" +#include "events.h" #include "ewins.h" +#include "focus.h" +#include "grabs.h" #include "groups.h" #include "hints.h" #include "snaps.h" #include "timers.h" +#include "windowmatch.h" #include "xwin.h" #define EWIN_TOP_EVENT_MASK \ @@ -162,7 +167,7 @@ ewin->client.cmap = xwa.colormap; ewin->client.grav = NorthWestGravity; - if (EventDebug(EDBUG_TYPE_SNAPS)) + if (EDebug(EDBUG_TYPE_SNAPS)) Eprintf("Snap get attr %#lx: %4d+%4d %4dx%4d: %s\n", EwinGetClientXwin(ewin), ewin->client.x, ewin->client.y, ewin->client.w, ewin->client.h, EwinGetName(ewin)); @@ -173,7 +178,7 @@ static void EwinGetHints(EWin * ewin) { - if (EventDebug(EDBUG_TYPE_EWINS)) + if (EDebug(EDBUG_TYPE_EWINS)) Eprintf("EwinGetHints %#lx\n", EwinGetClientXwin(ewin)); ICCCM_GetTitle(ewin, 0); @@ -244,7 +249,7 @@ ewin->client.event_mask = EWIN_CLIENT_EVENT_MASK; - if (EventDebug(EDBUG_TYPE_EWINS)) + if (EDebug(EDBUG_TYPE_EWINS)) Eprintf("EwinManage %#lx frame=%#lx cont=%#lx st=%d\n", EwinGetClientXwin(ewin), EoGetXwin(ewin), EwinGetContainerXwin(ewin), ewin->state.state); @@ -329,7 +334,7 @@ HintsSetClientList(); - if (EventDebug(EDBUG_TYPE_EWINS)) + if (EDebug(EDBUG_TYPE_EWINS)) Eprintf("EwinConfigure %#lx st=%d: %s\n", EwinGetClientXwin(ewin), ewin->state.state, EwinGetName(ewin)); } @@ -349,7 +354,7 @@ if (!ewin) return; - if (EventDebug(EDBUG_TYPE_EWINS)) + if (EDebug(EDBUG_TYPE_EWINS)) Eprintf("EwinDestroy %#lx st=%d: %s\n", EwinGetClientXwin(ewin), ewin->state.state, EwinGetName(ewin)); @@ -620,7 +625,7 @@ ewin->state.shaped = EShapeCopy(ewin->win_container, EwinGetClientWin(ewin)); EUngrabServer(); - if (EventDebug(EX_EVENT_SHAPE_NOTIFY)) + if (EDebug(EX_EVENT_SHAPE_NOTIFY)) Eprintf("EwinUpdateShapeInfo %#lx cont=%#lx shaped=%d\n", EwinGetClientXwin(ewin), EwinGetContainerXwin(ewin), ewin->state.shaped); @@ -638,7 +643,7 @@ if (!ewin->update.shape) return; - if (EventDebug(EX_EVENT_SHAPE_NOTIFY)) + if (EDebug(EX_EVENT_SHAPE_NOTIFY)) Eprintf("EwinPropagateShapes %#lx frame=%#lx shaped=%d\n", EwinGetClientXwin(ewin), EoGetXwin(ewin), ewin->state.shaped); @@ -1033,7 +1038,7 @@ /* Only external clients should go here */ - if (EventDebug(EDBUG_TYPE_EWINS)) + if (EDebug(EDBUG_TYPE_EWINS)) Eprintf("EwinWithdraw %#lx st=%d: %s\n", EwinGetClientXwin(ewin), ewin->state.state, EwinGetName(ewin)); @@ -1096,7 +1101,7 @@ static void EwinEventDestroy(EWin * ewin) { - if (EventDebug(EDBUG_TYPE_EWINS)) + if (EDebug(EDBUG_TYPE_EWINS)) Eprintf("EwinEventDestroy %#lx st=%d: %s\n", EwinGetClientXwin(ewin), ewin->state.state, EwinGetName(ewin)); @@ -1115,7 +1120,7 @@ parent = None; else parent = EXWindowGetParent(EwinGetClientXwin(ewin)); - if (EventDebug(EDBUG_TYPE_EWINS)) + if (EDebug(EDBUG_TYPE_EWINS)) Eprintf("EwinEventReparent %#lx st=%d parent=%#lx: %s\n", EwinGetClientXwin(ewin), ewin->state.state, parent, EwinGetName(ewin)); @@ -1137,7 +1142,7 @@ old_state = ewin->state.state; ewin->state.state = EWIN_STATE_MAPPED; - if (EventDebug(EDBUG_TYPE_EWINS)) + if (EDebug(EDBUG_TYPE_EWINS)) Eprintf("EwinEventMap %#lx st=%d: %s\n", EwinGetClientXwin(ewin), ewin->state.state, EwinGetName(ewin)); @@ -1153,7 +1158,7 @@ static void EwinEventUnmap(EWin * ewin, XEvent * ev) { - if (EventDebug(EDBUG_TYPE_EWINS)) + if (EDebug(EDBUG_TYPE_EWINS)) Eprintf("EwinEventUnmap %#lx st=%d: %s\n", EwinGetClientXwin(ewin), ewin->state.state, EwinGetName(ewin)); @@ -1333,7 +1338,7 @@ EwinEventShapeChange(EWin * ewin, XEvent * ev) { #define se ((XShapeEvent *)ev) - if (EventDebug(EX_EVENT_SHAPE_NOTIFY)) + if (EDebug(EX_EVENT_SHAPE_NOTIFY)) Eprintf("EwinEventShapeChange %#lx %s: state.shaped=%d ev->shaped=%d\n", EwinGetClientXwin(ewin), EoGetName(ewin), ewin->state.shaped, se->shaped); @@ -1370,7 +1375,7 @@ num = EoRaise(ewin); - if (EventDebug(EDBUG_TYPE_RAISELOWER)) + if (EDebug(EDBUG_TYPE_RAISELOWER)) Eprintf("EwinRaise(%d) %#lx %s n=%d\n", call_depth, EwinGetClientXwin(ewin), EwinGetName(ewin), num); @@ -1403,7 +1408,7 @@ num = EoLower(ewin); - if (EventDebug(EDBUG_TYPE_RAISELOWER)) + if (EDebug(EDBUG_TYPE_RAISELOWER)) Eprintf("EwinLower(%d) %#lx %s n=%d\n", call_depth, EwinGetClientXwin(ewin), EwinGetName(ewin), num); @@ -1966,7 +1971,7 @@ int i, num; EWin *const *lst, *ewin; - if (EventDebug(EDBUG_TYPE_SESSION)) + if (EDebug(EDBUG_TYPE_SESSION)) Eprintf("EwinsSetFree\n"); EHintsSetInfoOnAll(); =================================================================== RCS file: /cvs/e/e16/e/src/ewins.h,v retrieving revision 1.58 retrieving revision 1.59 diff -u -3 -r1.58 -r1.59 --- ewins.h 3 Nov 2006 23:44:32 -0000 1.58 +++ ewins.h 19 Nov 2006 21:55:51 -0000 1.59 @@ -293,6 +293,31 @@ #define EwinGetClientWin(ewin) ((ewin)->client.win) #define EwinGetContainerWin(ewin) ((ewin)->win_container) +/* arrange.c */ +#define ARRANGE_VERBATIM 0 +#define ARRANGE_BY_SIZE 1 +#define ARRANGE_BY_POSITION 2 + +void SnapEwin(EWin * ewin, int dx, int dy, int *new_dx, + int *new_dy); +void ArrangeEwin(EWin * ewin); +void ArrangeEwinCentered(EWin * ewin); +void ArrangeEwinXY(EWin * ewin, int *px, int *py); +void ArrangeEwinCenteredXY(EWin * ewin, int *px, int *py); + +void ArrangeEwins(const char *params); + +/* coords.c */ +void CoordsShow(EWin * ewin); +void CoordsHide(void); + +/* dock.c */ +void DockIt(EWin * ewin); + +/* draw.c */ +void DrawEwinShape(EWin * ewin, int md, int x, int y, int w, + int h, char firstlast); + /* ewins.c */ #define EWIN_CHANGE_NAME (1<<0) #define EWIN_CHANGE_ICON_NAME (1<<1) @@ -413,6 +438,21 @@ int EwinSyncRequestSend(EWin * ewin); void EwinSyncRequestWait(EWin * ewin); #endif + +/* moveresize.c */ +int ActionMoveStart(EWin * ewin, int grab, char constrained, + int nogroup); +int ActionMoveEnd(EWin * ewin); +int ActionMoveSuspend(void); +int ActionMoveResume(void); +void ActionMoveHandleMotion(void); +int ActionResizeStart(EWin * ewin, int grab, int hv); +int ActionResizeEnd(EWin * ewin); +void ActionResizeHandleMotion(void); +int ActionsSuspend(void); +int ActionsResume(void); +void ActionsHandleMotion(void); +int ActionsEnd(EWin * ewin); /* session.c */ void SessionGetInfo(EWin * ewin, Atom atom_change); =================================================================== RCS file: /cvs/e/e16/e/src/extinitwin.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- extinitwin.c 13 May 2006 13:25:30 -0000 1.17 +++ extinitwin.c 19 Nov 2006 21:55:51 -0000 1.18 @@ -38,7 +38,7 @@ int i; XSetWindowAttributes attr; - if (EventDebug(EDBUG_TYPE_SESSION)) + if (EDebug(EDBUG_TYPE_SESSION)) Eprintf("ExtInitWinMain enter\n"); disp = EDisplayOpen(NULL, -1); @@ -112,7 +112,7 @@ i = 1; Esnprintf(s, sizeof(s), "pix/wait%i.png", i); - if (EventDebug(EDBUG_TYPE_SESSION)) + if (EDebug(EDBUG_TYPE_SESSION)) Eprintf("ExtInitWinCreate - child %s\n", s); im = EImageLoad(s); @@ -137,7 +137,7 @@ } } - if (EventDebug(EDBUG_TYPE_SESSION)) + if (EDebug(EDBUG_TYPE_SESSION)) Eprintf("ExtInitWinMain exit\n"); EDisplayClose(); @@ -152,7 +152,7 @@ Window win; Atom a; - if (EventDebug(EDBUG_TYPE_SESSION)) + if (EDebug(EDBUG_TYPE_SESSION)) Eprintf("ExtInitWinCreate\n"); a = XInternAtom(disp, "ENLIGHTENMENT_RESTART_SCREEN", False); @@ -165,7 +165,7 @@ for (;;) { - if (EventDebug(EDBUG_TYPE_SESSION)) + if (EDebug(EDBUG_TYPE_SESSION)) Eprintf("ExtInitWinCreate - parent\n"); /* Hack to give the child some space. Not foolproof. */ @@ -176,7 +176,7 @@ } win = win_ex; - if (EventDebug(EDBUG_TYPE_SESSION)) + if (EDebug(EDBUG_TYPE_SESSION)) Eprintf("ExtInitWinCreate - parent - %#lx\n", win); return win; @@ -184,7 +184,7 @@ /* Child - Create the init window */ - if (EventDebug(EDBUG_TYPE_SESSION)) + if (EDebug(EDBUG_TYPE_SESSION)) Eprintf("ExtInitWinCreate - child\n"); /* Clean up inherited stuff */ @@ -220,7 +220,7 @@ if (!disp || init_win_ext == None) return; - if (EventDebug(EDBUG_TYPE_SESSION)) + if (EDebug(EDBUG_TYPE_SESSION)) Eprintf("Kill init window %#lx\n", init_win_ext); XKillClient(disp, init_win_ext); init_win_ext = None; =================================================================== RCS file: /cvs/e/e16/e/src/focus.c,v retrieving revision 1.157 retrieving revision 1.158 diff -u -3 -r1.157 -r1.158 --- focus.c 24 Aug 2006 21:52:28 -0000 1.157 +++ focus.c 19 Nov 2006 21:55:51 -0000 1.158 @@ -22,10 +22,13 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "E.h" +#include "cursors.h" #include "desktops.h" /* FIXME - Should not be here */ #include "dialog.h" #include "emodule.h" #include "ewins.h" +#include "focus.h" +#include "grabs.h" #include "hints.h" #include "timers.h" #include "xwin.h" @@ -53,7 +56,7 @@ focus_inhibit++; } - if (EventDebug(EDBUG_TYPE_FOCUS)) + if (EDebug(EDBUG_TYPE_FOCUS)) Eprintf("FocusEnable inhibit=%d\n", focus_inhibit); } @@ -219,7 +222,7 @@ { GrabButtonSet(AnyButton, AnyModifier, EwinGetContainerWin(ewin), ButtonPressMask, ECSR_PGRAB, 1); - if (EventDebug(EDBUG_TYPE_GRABS)) + if (EDebug(EDBUG_TYPE_GRABS)) Eprintf("FocusEwinSetGrabs: %#lx set %s\n", EwinGetClientXwin(ewin), EwinGetName(ewin)); ewin->state.click_grab_isset = 1; @@ -231,7 +234,7 @@ { GrabButtonRelease(AnyButton, AnyModifier, EwinGetContainerWin(ewin)); - if (EventDebug(EDBUG_TYPE_GRABS)) + if (EDebug(EDBUG_TYPE_GRABS)) Eprintf("FocusEwinSetGrabs: %#lx unset %s\n", EwinGetClientXwin(ewin), EwinGetName(ewin)); ewin->state.click_grab_isset = 0; @@ -288,7 +291,7 @@ if (focus_inhibit) return; - if (EventDebug(EDBUG_TYPE_FOCUS)) + if (EDebug(EDBUG_TYPE_FOCUS)) Eprintf("doFocusToEWin %#lx %s why=%d\n", (ewin) ? EwinGetClientXwin(ewin) : 0, (ewin) ? EwinGetName(ewin) : "None", why); @@ -451,7 +454,7 @@ void FocusToEWin(EWin * ewin, int why) { - if (EventDebug(EDBUG_TYPE_FOCUS)) + if (EDebug(EDBUG_TYPE_FOCUS)) Eprintf("FocusToEWin(%d) %#lx %s why=%d\n", focus_inhibit, (ewin) ? EwinGetClientXwin(ewin) : 0, (ewin) ? EwinGetName(ewin) : "None", why); @@ -616,7 +619,7 @@ FocusToEWin(ewin, FOCUS_CLICK); /* Allow click to pass thorugh */ - if (EventDebug(EDBUG_TYPE_GRABS)) + if (EDebug(EDBUG_TYPE_GRABS)) Eprintf("FocusHandleClick %#lx %#lx\n", WinGetXwin(win), EwinGetContainerXwin(ewin)); if (win == EwinGetContainerWin(ewin)) =================================================================== RCS file: /cvs/e/e16/e/src/grabs.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- grabs.c 7 Aug 2006 20:47:12 -0000 1.27 +++ grabs.c 19 Nov 2006 21:55:51 -0000 1.28 @@ -22,6 +22,8 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "E.h" +#include "cursors.h" +#include "grabs.h" int GrabKeyboardSet(Win win) @@ -66,7 +68,7 @@ Mode.grabs.pointer_grab_window = WinGetXwin(win); Mode.grabs.pointer_grab_active = 1; - if (EventDebug(EDBUG_TYPE_GRABS)) + if (EDebug(EDBUG_TYPE_GRABS)) Eprintf("GrabPointerSet: %#lx, ret=%d\n", Mode.grabs.pointer_grab_window, ret); @@ -78,7 +80,7 @@ { XUngrabPointer(disp, CurrentTime); - if (EventDebug(EDBUG_TYPE_GRABS)) + if (EDebug(EDBUG_TYPE_GRABS)) Eprintf("GrabPointerRelease: %#lx\n", Mode.grabs.pointer_grab_window); Mode.grabs.pointer_grab_active = 0; =================================================================== RCS file: /cvs/e/e16/e/src/handlers.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -3 -r1.55 -r1.56 --- handlers.c 11 Jul 2006 23:17:19 -0000 1.55 +++ handlers.c 19 Nov 2006 21:55:51 -0000 1.56 @@ -36,7 +36,7 @@ Mode.wm.in_signal_handler = 1; - if (EventDebug(EDBUG_TYPE_SESSION)) + if (EDebug(EDBUG_TYPE_SESSION)) Eprintf("SignalHandler signal=%d\n", sig); switch (sig) @@ -199,7 +199,7 @@ } } - if (EventDebug(1)) + if (EDebug(1)) { XGetErrorText(disp, ev->error_code, buf, 63); Eprintf("*** ERROR: xid=%#lx error=%i req=%i/%i: %s\n", =================================================================== RCS file: /cvs/e/e16/e/src/hints.c,v retrieving revision 1.71 retrieving revision 1.72 diff -u -3 -r1.71 -r1.72 --- hints.c 8 Oct 2006 13:01:42 -0000 1.71 +++ hints.c 19 Nov 2006 21:55:51 -0000 1.72 @@ -364,7 +364,7 @@ ecore_x_window_prop_string_set(EwinGetClientXwin(ewin), ENL_WIN_BORDER, ewin->normal_border->name); - if (EventDebug(EDBUG_TYPE_SNAPS)) + if (EDebug(EDBUG_TYPE_SNAPS)) Eprintf("Snap set einf %#lx: %4d+%4d %4dx%4d: %s\n", EwinGetClientXwin(ewin), ewin->client.x, ewin->client.y, ewin->client.w, ewin->client.h, EwinGetName(ewin)); @@ -410,7 +410,7 @@ EwinSetBorderByName(ewin, str); Efree(str); - if (EventDebug(EDBUG_TYPE_SNAPS)) + if (EDebug(EDBUG_TYPE_SNAPS)) Eprintf("Snap get einf %#lx: %4d+%4d %4dx%4d: %s\n", EwinGetClientXwin(ewin), ewin->client.x, ewin->client.y, ewin->client.w, ewin->client.h, EwinGetName(ewin)); @@ -495,7 +495,7 @@ int i, num; EWin *const *lst; - if (EventDebug(EDBUG_TYPE_SESSION)) + if (EDebug(EDBUG_TYPE_SESSION)) Eprintf("SetEInfoOnAll\n"); lst = EwinListGetAll(&num); @@ -557,7 +557,7 @@ StructureNotifyMask, CurrentTime, sel->atom, WinGetXwin(sel->win), 0, 0); - if (EventDebug(EDBUG_TYPE_SELECTION)) + if (EDebug(EDBUG_TYPE_SELECTION)) Eprintf("Window %#lx is now %s owner, time=%lu\n", WinGetXwin(sel->win), buf, sel->time); @@ -570,7 +570,7 @@ if (!sel) return; - if (EventDebug(EDBUG_TYPE_SELECTION)) + if (EDebug(EDBUG_TYPE_SELECTION)) Eprintf("Window %#lx is no longer %s owner\n", WinGetXwin(sel->win), XGetAtomName(disp, sel->atom)); =================================================================== RCS file: /cvs/e/e16/e/src/hiwin.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- hiwin.c 24 Aug 2006 21:52:28 -0000 1.20 +++ hiwin.c 19 Nov 2006 21:55:51 -0000 1.21 @@ -22,8 +22,11 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "E.h" +#include "cursors.h" #include "eobj.h" +#include "events.h" #include "ewins.h" +#include "grabs.h" #include "hiwin.h" #include "iclass.h" #include "xwin.h" =================================================================== RCS file: /cvs/e/e16/e/src/icccm.c,v retrieving revision 1.130 retrieving revision 1.131 diff -u -3 -r1.130 -r1.131 --- icccm.c 28 Oct 2006 14:53:16 -0000 1.130 +++ icccm.c 19 Nov 2006 21:55:51 -0000 1.131 @@ -360,7 +360,7 @@ void ICCCM_Focus(const EWin * ewin) { - if (EventDebug(EDBUG_TYPE_FOCUS)) + if (EDebug(EDBUG_TYPE_FOCUS)) { if (ewin) Eprintf("ICCCM_Focus T=%#lx %#lx %s\n", Mode.events.time, @@ -524,7 +524,7 @@ ewin->props.no_resize_h = (ewin->icccm.width.min == ewin->icccm.width.max); ewin->props.no_resize_v = (ewin->icccm.height.min == ewin->icccm.height.max); - if (EventDebug(EDBUG_TYPE_SNAPS)) + if (EDebug(EDBUG_TYPE_SNAPS)) Eprintf("Snap get icccm %#lx: %4d+%4d %4dx%4d: %s\n", EwinGetClientXwin(ewin), ewin->client.x, ewin->client.y, ewin->client.w, ewin->client.h, EwinGetName(ewin)); @@ -819,7 +819,7 @@ t = GetTime(); XSyncAwait(disp, xswc, 2); - if (EventDebug(EDBUG_TYPE_SYNC)) + if (EDebug(EDBUG_TYPE_SYNC)) Eprintf("Sync t=%#lx c=%llx: Delay=%8.6lf us\n", xswc[0].trigger.counter, ewin->ewmh.sync_request_count, GetTime() - t); =================================================================== RCS file: /cvs/e/e16/e/src/icons.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- icons.c 14 May 2006 10:59:30 -0000 1.13 +++ icons.c 19 Nov 2006 21:55:51 -0000 1.14 @@ -25,6 +25,7 @@ #include "eimage.h" #include "ewins.h" #include "icons.h" +#include "windowmatch.h" #include "xwin.h" static int =================================================================== RCS file: /cvs/e/e16/e/src/ipc.c,v retrieving revision 1.280 retrieving revision 1.281 diff -u -3 -r1.280 -r1.281 --- ipc.c 12 Nov 2006 20:46:39 -0000 1.280 +++ ipc.c 19 Nov 2006 21:55:51 -0000 1.281 @@ -29,6 +29,7 @@ #include "eobj.h" #include "ewins.h" #include "ewin-ops.h" +#include "grabs.h" #include "hints.h" /* FIXME - Should not be here */ #include "parse.h" #include "screen.h" @@ -1077,7 +1078,7 @@ if (!strncmp(param, "event", 2)) { - EventDebugInit(p); + EDebugInit(p); } else if (!strncmp(param, "grab", 2)) { @@ -1582,7 +1583,7 @@ char w[FILEPATH_LEN_MAX]; const IpcItem **lst, *ipc; - if (EventDebug(EDBUG_TYPE_IPC)) + if (EDebug(EDBUG_TYPE_IPC)) Eprintf("HandleIPC: %s\n", params); IpcPrintInit(); =================================================================== RCS file: /cvs/e/e16/e/src/lang.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- lang.c 19 Nov 2006 12:34:18 -0000 1.14 +++ lang.c 19 Nov 2006 21:55:51 -0000 1.15 @@ -364,7 +364,7 @@ enc_int = enc_loc; Mode.locale.lang = setlocale(LC_MESSAGES, NULL); - if (EventDebug(EDBUG_TYPE_VERBOSE)) + if (EDebug(EDBUG_TYPE_VERBOSE)) { Eprintf("Locale: %s\n", setlocale(LC_ALL, NULL)); Eprintf("Character encoding: locale=%s internal=%s MB_CUR_MAX=%d\n", =================================================================== RCS file: /cvs/e/e16/e/src/main.c,v retrieving revision 1.152 retrieving revision 1.153 diff -u -3 -r1.152 -r1.153 --- main.c 19 Sep 2006 16:55:16 -0000 1.152 +++ main.c 19 Nov 2006 21:55:51 -0000 1.153 @@ -22,11 +22,14 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "E.h" +#include "cursors.h" #include "desktops.h" #include "dialog.h" #include "eimage.h" #include "emodule.h" +#include "events.h" #include "file.h" +#include "grabs.h" #include "hints.h" #include "session.h" #include "snaps.h" @@ -112,7 +115,7 @@ str = getenv("EDEBUG"); if (str) - EventDebugInit(str); + EDebugInit(str); str = getenv("EDEBUG_COREDUMP"); if (str) Mode.wm.coredump = 1; @@ -194,7 +197,7 @@ exit(0); break; case 'v': - EventDebugSet(EDBUG_TYPE_VERBOSE, 1); + EDebugSet(EDBUG_TYPE_VERBOSE, 1); break; case 'w': sscanf(eoptarg, "%dx%d", &VRoot.w, &VRoot.h); @@ -309,7 +312,7 @@ { int i; - if (EventDebug(EDBUG_TYPE_SESSION)) + if (EDebug(EDBUG_TYPE_SESSION)) Eprintf("EExit(%d)\n", exitcode); if (disp) =================================================================== RCS file: /cvs/e/e16/e/src/menus-misc.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- menus-misc.c 7 Aug 2006 20:20:15 -0000 1.35 +++ menus-misc.c 19 Nov 2006 21:55:51 -0000 1.36 @@ -31,6 +31,7 @@ #include "iclass.h" #include "menus.h" #include "parse.h" +#include "progress.h" #include <errno.h> #include <sys/stat.h> =================================================================== RCS file: /cvs/e/e16/e/src/menus.c,v retrieving revision 1.261 retrieving revision 1.262 diff -u -3 -r1.261 -r1.262 --- menus.c 13 Oct 2006 15:22:19 -0000 1.261 +++ menus.c 19 Nov 2006 21:55:51 -0000 1.262 @@ -31,6 +31,7 @@ #include "eobj.h" #include "ewins.h" #include "file.h" +#include "grabs.h" #include "hints.h" #include "iclass.h" #include "menus.h" =================================================================== RCS file: /cvs/e/e16/e/src/misc.c,v retrieving revision 1.72 retrieving revision 1.73 diff -u -3 -r1.72 -r1.73 --- misc.c 27 Apr 2006 21:52:32 -0000 1.72 +++ misc.c 19 Nov 2006 21:55:52 -0000 1.73 @@ -232,3 +232,72 @@ } #endif + +#if ENABLE_DEBUG_EVENTS +/* + * Event debug stuff + */ +#define N_DEBUG_FLAGS 256 +static char ev_debug; +static char ev_debug_flags[N_DEBUG_FLAGS]; + +/* + * param is <ItemNumber>[:<ItemNumber> ... ] + * + * ItemNumber: + * 0 : Verbose flag + * 1 : X11 errors + * [ 2; 35 [ : X11 event codes, see /usr/include/X11/X.h + * [ 64; ... [ : Remapped X11 events, see events.h + * [ 128; 256 [ : E events, see E.h + */ +void +EDebugInit(const char *param) +{ + const char *s; + int ix, onoff; + + if (!param) + return; + + for (;;) + { + s = strchr(param, ':'); + if (!param[0]) + break; + ev_debug = 1; + ix = strtol(param, NULL, 0); + onoff = (ix >= 0); + if (ix < 0) + ix = -ix; + if (ix < N_DEBUG_FLAGS) + { + if (onoff) + ev_debug_flags[ix]++; + else + ev_debug_flags[ix] = 0; + } + if (!s) + break; + param = s + 1; + } +} + +int +EDebug(unsigned int type) +{ + return (ev_debug && + (type < sizeof(ev_debug_flags))) ? ev_debug_flags[type] : 0; +} + +void +EDebugSet(unsigned int type, int value) +{ + if (type >= sizeof(ev_debug_flags)) + return; + + ev_debug = 1; + ev_debug_flags[type] += value; +} + +#endif =================================================================== RCS file: /cvs/e/e16/e/src/mod-misc.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -3 -r1.48 -r1.49 --- mod-misc.c 19 Nov 2006 20:20:22 -0000 1.48 +++ mod-misc.c 19 Nov 2006 21:55:52 -0000 1.49 @@ -248,7 +248,7 @@ if (!Mode.wm.save_ok) return; - if (EventDebug(EDBUG_TYPE_SESSION)) + if (EDebug(EDBUG_TYPE_SESSION)) Eprintf("autosave\n"); Real_SaveSnapInfo(0, NULL); =================================================================== RCS file: /cvs/e/e16/e/src/moveresize.c,v retrieving revision 1.70 retrieving revision 1.71 diff -u -3 -r1.70 -r1.71 --- moveresize.c 28 May 2006 10:12:25 -0000 1.70 +++ moveresize.c 19 Nov 2006 21:55:52 -0000 1.71 @@ -22,9 +22,12 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "E.h" +#include "cursors.h" #include "desktops.h" #include "emodule.h" #include "ewins.h" +#include "focus.h" +#include "grabs.h" #include "groups.h" #include "hints.h" #include "timers.h" @@ -792,4 +795,86 @@ default: break; } +} + +void +ActionsHandleMotion(void) +{ + switch (Mode.mode) + { + case MODE_MOVE_PENDING: + case MODE_MOVE: + ActionMoveHandleMotion(); + break; + + case MODE_RESIZE: + case MODE_RESIZE_H: + case MODE_RESIZE_V: + ActionResizeHandleMotion(); + break; + + default: + break; + } +} + +int +ActionsSuspend(void) +{ + switch (Mode.mode) + { + case MODE_MOVE_PENDING: + case MODE_MOVE: + ActionMoveSuspend(); + bre... [truncated message content] |