167 lines
4.6 KiB
Diff
167 lines
4.6 KiB
Diff
|
--- pTk/mTk/generic/tkBind.c
|
||
|
|
+++ pTk/mTk/generic/tkBind.c
|
||
|
|
@@ -550,89 +550,86 @@
|
||
|
|
#define CIRCREQ 0x400000
|
||
|
|
|
||
|
|
char *eventTypeName[TK_LASTEVENT] = {
|
||
|
|
- NULL,
|
||
|
|
- NULL,
|
||
|
|
- "KeyPress",
|
||
|
|
- "KeyRelease",
|
||
|
|
- "ButtonPress",
|
||
|
|
- "ButtonRelease",
|
||
|
|
- "MotionNotify",
|
||
|
|
- "EnterNotify",
|
||
|
|
- "LeaveNotify",
|
||
|
|
- "FocusIn",
|
||
|
|
- "FocusOut",
|
||
|
|
- "KeymapNotify",
|
||
|
|
- "Expose",
|
||
|
|
- "GraphicsExpose",
|
||
|
|
- "NoExpose",
|
||
|
|
- "VisibilityNotify",
|
||
|
|
- "CreateNotify",
|
||
|
|
- "DestroyNotify",
|
||
|
|
- "UnmapNotify",
|
||
|
|
- "MapNotify",
|
||
|
|
- "MapRequest",
|
||
|
|
- "ReparentNotify",
|
||
|
|
- "ConfigureNotify",
|
||
|
|
- "ConfigureRequest",
|
||
|
|
- "GravityNotify",
|
||
|
|
- "ResizeRequest",
|
||
|
|
- "CirculateNotify",
|
||
|
|
- "CirculateRequest",
|
||
|
|
- "PropertyNotify",
|
||
|
|
- "SelectionClear",
|
||
|
|
- "SelectionRequest",
|
||
|
|
- "SelectionNotify",
|
||
|
|
- "ColormapNotify",
|
||
|
|
- "ClientMessage",
|
||
|
|
- "MappingNotify",
|
||
|
|
- "VirtualEvent",
|
||
|
|
- "Activate",
|
||
|
|
- "Deactivate"
|
||
|
|
+ [KeyPress] = "KeyPress",
|
||
|
|
+ [KeyRelease] = "KeyRelease",
|
||
|
|
+ [ButtonPress] = "ButtonPress",
|
||
|
|
+ [ButtonRelease] = "ButtonRelease",
|
||
|
|
+ [MotionNotify] = "MotionNotify",
|
||
|
|
+ [EnterNotify] = "EnterNotify",
|
||
|
|
+ [LeaveNotify] = "LeaveNotify",
|
||
|
|
+ [FocusIn] = "FocusIn",
|
||
|
|
+ [FocusOut] = "FocusOut",
|
||
|
|
+ [KeymapNotify] = "KeymapNotify",
|
||
|
|
+ [Expose] = "Expose",
|
||
|
|
+ [GraphicsExpose] = "GraphicsExpose",
|
||
|
|
+ [NoExpose] = "NoExpose",
|
||
|
|
+ [VisibilityNotify] ="VisibilityNotify",
|
||
|
|
+ [CreateNotify] = "CreateNotify",
|
||
|
|
+ [DestroyNotify] = "DestroyNotify",
|
||
|
|
+ [UnmapNotify] = "UnmapNotify",
|
||
|
|
+ [MapNotify] = "MapNotify",
|
||
|
|
+ [MapRequest] = "MapRequest",
|
||
|
|
+ [ReparentNotify] = "ReparentNotify",
|
||
|
|
+ [ConfigureNotify] = "ConfigureNotify",
|
||
|
|
+ [ConfigureRequest] ="ConfigureRequest",
|
||
|
|
+ [GravityNotify] = "GravityNotify",
|
||
|
|
+ [ResizeRequest] = "ResizeRequest",
|
||
|
|
+ [CirculateNotify] = "CirculateNotify",
|
||
|
|
+ [CirculateRequest] ="CirculateRequest",
|
||
|
|
+ [PropertyNotify] = "PropertyNotify",
|
||
|
|
+ [SelectionClear] = "SelectionClear",
|
||
|
|
+ [SelectionRequest] ="SelectionRequest",
|
||
|
|
+ [SelectionNotify] = "SelectionNotify",
|
||
|
|
+ [ColormapNotify] = "ColormapNotify",
|
||
|
|
+ [ClientMessage] = "ClientMessage",
|
||
|
|
+ [MappingNotify] = "MappingNotify",
|
||
|
|
+ [VirtualEvent] = "VirtualEvent",
|
||
|
|
+ [ActivateNotify] = "Activate",
|
||
|
|
+ [DeactivateNotify] ="Deactivate"
|
||
|
|
};
|
||
|
|
|
||
|
|
#define KEY_BUTTON_MOTION_VIRTUAL (KEY|BUTTON|MOTION|VIRTUAL)
|
||
|
|
#define KEY_BUTTON_MOTION_CROSSING (KEY|BUTTON|MOTION|CROSSING|VIRTUAL)
|
||
|
|
|
||
|
|
static int flagArray[TK_LASTEVENT] = {
|
||
|
|
- /* Not used */ 0,
|
||
|
|
- /* Not used */ 0,
|
||
|
|
- /* KeyPress */ KEY,
|
||
|
|
- /* KeyRelease */ KEY,
|
||
|
|
- /* ButtonPress */ BUTTON,
|
||
|
|
- /* ButtonRelease */ BUTTON,
|
||
|
|
- /* MotionNotify */ MOTION,
|
||
|
|
- /* EnterNotify */ CROSSING,
|
||
|
|
- /* LeaveNotify */ CROSSING,
|
||
|
|
- /* FocusIn */ FOCUS,
|
||
|
|
- /* FocusOut */ FOCUS,
|
||
|
|
- /* KeymapNotify */ 0,
|
||
|
|
- /* Expose */ EXPOSE,
|
||
|
|
- /* GraphicsExpose */ EXPOSE,
|
||
|
|
- /* NoExpose */ 0,
|
||
|
|
- /* VisibilityNotify */ VISIBILITY,
|
||
|
|
- /* CreateNotify */ CREATE,
|
||
|
|
- /* DestroyNotify */ DESTROY,
|
||
|
|
- /* UnmapNotify */ UNMAP,
|
||
|
|
- /* MapNotify */ MAP,
|
||
|
|
- /* MapRequest */ MAPREQ,
|
||
|
|
- /* ReparentNotify */ REPARENT,
|
||
|
|
- /* ConfigureNotify */ CONFIG,
|
||
|
|
- /* ConfigureRequest */ CONFIGREQ,
|
||
|
|
- /* GravityNotify */ GRAVITY,
|
||
|
|
- /* ResizeRequest */ RESIZEREQ,
|
||
|
|
- /* CirculateNotify */ CIRC,
|
||
|
|
- /* CirculateRequest */ 0,
|
||
|
|
- /* PropertyNotify */ PROP,
|
||
|
|
- /* SelectionClear */ 0,
|
||
|
|
- /* SelectionRequest */ 0,
|
||
|
|
- /* SelectionNotify */ 0,
|
||
|
|
- /* ColormapNotify */ COLORMAP,
|
||
|
|
- /* ClientMessage */ 0,
|
||
|
|
- /* MappingNotify */ 0,
|
||
|
|
- /* VirtualEvent */ VIRTUAL,
|
||
|
|
- /* Activate */ ACTIVATE,
|
||
|
|
- /* Deactivate */ ACTIVATE,
|
||
|
|
- /* MouseWheel */ KEY
|
||
|
|
+
|
||
|
|
+ [KeyPress] = KEY,
|
||
|
|
+ [KeyRelease] = KEY,
|
||
|
|
+ [ButtonPress] = BUTTON,
|
||
|
|
+ [ButtonRelease] = BUTTON,
|
||
|
|
+ [MotionNotify] = MOTION,
|
||
|
|
+ [EnterNotify] = CROSSING,
|
||
|
|
+ [LeaveNotify] = CROSSING,
|
||
|
|
+ [FocusIn] = FOCUS,
|
||
|
|
+ [FocusOut] = FOCUS,
|
||
|
|
+ [KeymapNotify] = 0,
|
||
|
|
+ [Expose] = EXPOSE,
|
||
|
|
+ [GraphicsExpose] = EXPOSE,
|
||
|
|
+ [NoExpose] = 0,
|
||
|
|
+ [VisibilityNotify] = VISIBILITY,
|
||
|
|
+ [CreateNotify] = CREATE,
|
||
|
|
+ [DestroyNotify] = DESTROY,
|
||
|
|
+ [UnmapNotify] = UNMAP,
|
||
|
|
+ [MapNotify] = MAP,
|
||
|
|
+ [MapRequest] = MAPREQ,
|
||
|
|
+ [ReparentNotify] = REPARENT,
|
||
|
|
+ [ConfigureNotify] = CONFIG,
|
||
|
|
+ [ConfigureRequest] = CONFIGREQ,
|
||
|
|
+ [GravityNotify] = GRAVITY,
|
||
|
|
+ [ResizeRequest] = RESIZEREQ,
|
||
|
|
+ [CirculateNotify] = CIRC,
|
||
|
|
+ [CirculateRequest] = 0,
|
||
|
|
+ [PropertyNotify] = PROP,
|
||
|
|
+ [SelectionClear] = 0,
|
||
|
|
+ [SelectionRequest] = 0,
|
||
|
|
+ [SelectionNotify] = 0,
|
||
|
|
+ [ColormapNotify] = COLORMAP,
|
||
|
|
+ [ClientMessage] = 0,
|
||
|
|
+ [MappingNotify] = 0,
|
||
|
|
+ [VirtualEvent] = VIRTUAL,
|
||
|
|
+ [ActivateNotify] = ACTIVATE,
|
||
|
|
+ [DeactivateNotify] = ACTIVATE,
|
||
|
|
+ [MouseWheelEvent] = KEY
|
||
|
|
};
|
||
|
|
|
||
|
|
/*
|