WPrefs/editmenu: use WME_ event types instead of X11 event types
editmenu.c switched on event->type (which is a WMEventType enum) but the case labels used X11 event names (Expose, DestroyNotify, ButtonPress, ButtonRelease, MotionNotify). These are different numeric values, so no case ever matched — menu items never painted, never received clicks, never handled drag. Replace with WME_EXPOSE, WME_DESTROY, WME_BUTTON_PRESS, WME_BUTTON_RELEASE, WME_MOTION.
This commit is contained in:
parent
27802e6d43
commit
931469dbf4
|
|
@ -244,13 +244,13 @@ static void handleItemEvents(WMEvent * event, void *data)
|
|||
WEditMenuItem *iPtr = (WEditMenuItem *) data;
|
||||
|
||||
switch (event->type) {
|
||||
case Expose:
|
||||
case WME_EXPOSE:
|
||||
if (event->u.expose.count != 0)
|
||||
break;
|
||||
paintEditMenuItem(iPtr);
|
||||
break;
|
||||
|
||||
case DestroyNotify:
|
||||
case WME_DESTROY:
|
||||
destroyEditMenuItem(iPtr);
|
||||
break;
|
||||
}
|
||||
|
|
@ -791,11 +791,11 @@ static void handleEvents(WMEvent * event, void *data)
|
|||
WEditMenu *mPtr = (WEditMenu *) data;
|
||||
|
||||
switch (event->type) {
|
||||
case DestroyNotify:
|
||||
case WME_DESTROY:
|
||||
destroyEditMenu(mPtr);
|
||||
break;
|
||||
|
||||
case Expose:
|
||||
case WME_EXPOSE:
|
||||
if (event->u.expose.count == 0)
|
||||
paintMenu(mPtr);
|
||||
break;
|
||||
|
|
@ -1318,7 +1318,7 @@ static void handleItemClick(WMEvent * event, void *data)
|
|||
WEditMenu *menu = item->parent;
|
||||
|
||||
switch (event->type) {
|
||||
case ButtonPress:
|
||||
case WME_BUTTON_PRESS:
|
||||
selectItem(menu, item);
|
||||
|
||||
if (WMIsDoubleClick(event)) {
|
||||
|
|
@ -1330,11 +1330,11 @@ static void handleItemClick(WMEvent * event, void *data)
|
|||
menu->dragY = event->u.button.y_root;
|
||||
break;
|
||||
|
||||
case ButtonRelease:
|
||||
case WME_BUTTON_RELEASE:
|
||||
menu->flags.isDragging = 0;
|
||||
break;
|
||||
|
||||
case MotionNotify:
|
||||
case WME_MOTION:
|
||||
if (menu->flags.isDragging) {
|
||||
if (abs(event->u.button.x_root - menu->dragX) > 5
|
||||
|| abs(event->u.button.y_root - menu->dragY) > 5) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue