mirrors/conterm
1
0
Fork 0
mirror of https://github.com/0intro/conterm synced 2024-11-22 13:51:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixes from Andrey - extra buttons and Alt handling.

Browse Source
This commit is contained in:
Russ Cox 2007-01-15 20:40:54 +00:00
parent 2dfb06d6b6
commit e8b1d5b0dd
1 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
gui-osx/screen.c
View File

@ -63,6 +63,8 @@ static CGRect bounds;
static PasteboardRef appleclip; static PasteboardRef appleclip;
static _Rect winRect; static _Rect winRect;
Boolean altPressed = false;
static int static int
isready(void*a) isready(void*a)
@ -330,6 +332,8 @@ static OSStatus MainWindowEventHandler(EventHandlerCallRef nextHandler, EventRef
result = CallNextEventHandler(nextHandler, event); result = CallNextEventHandler(nextHandler, event);
UInt32 class = GetEventClass (event); UInt32 class = GetEventClass (event);
UInt32 kind = GetEventKind (event); UInt32 kind = GetEventKind (event);
uint32_t mousebuttons = 0; // bitmask of buttons currently down
if(class == kEventClassKeyboard) { if(class == kEventClassKeyboard) {
char macCharCodes; char macCharCodes;
UInt32 macKeyCode; UInt32 macKeyCode;
@ -343,20 +347,23 @@ static OSStatus MainWindowEventHandler(EventHandlerCallRef nextHandler, EventRef
sizeof(macKeyModifiers), NULL, &macKeyModifiers); sizeof(macKeyModifiers), NULL, &macKeyModifiers);
switch(kind) { switch(kind) {
case kEventRawKeyModifiersChanged: case kEventRawKeyModifiersChanged:
if ( macKeyModifiers == 0x1800 ) leave_full_screen(); if (macKeyModifiers == (controlKey | optionKey)) leave_full_screen();
if(macKeyModifiers & optionKey) {
altPressed = true;
} else if(altPressed) {
kbdputc(kbdq, Kalt);
altPressed = false;
}
break; break;
case kEventRawKeyDown: case kEventRawKeyDown:
case kEventRawKeyRepeat: { case kEventRawKeyRepeat:
if(macKeyModifiers != 256) { if(macKeyModifiers != cmdKey) {
if (kind == kEventRawKeyRepeat || kind == kEventRawKeyDown) {
int key = convert_key(macKeyCode, macCharCodes); int key = convert_key(macKeyCode, macCharCodes);
if (key != -1) kbdputc(kbdq, key); if (key != -1) kbdputc(kbdq, key);
} } else
}
else
result = eventNotHandledErr; result = eventNotHandledErr;
break; break;
}
default: default:
break; break;
} }
@ -367,14 +374,12 @@ static OSStatus MainWindowEventHandler(EventHandlerCallRef nextHandler, EventRef
GetEventParameter(event, kEventParamMouseLocation, typeQDPoint, GetEventParameter(event, kEventParamMouseLocation, typeQDPoint,
0, sizeof mousePos, 0, &mousePos); 0, sizeof mousePos, 0, &mousePos);
static uint32_t mousebuttons = 0; // bitmask of buttons currently down
switch (kind) { switch (kind) {
case kEventMouseWheelMoved: case kEventMouseWheelMoved:
{ {
int32_t wheeldelta; int32_t wheeldelta;
GetEventParameter(event,kEventParamMouseWheelDelta,typeSInt32, GetEventParameter(event,kEventParamMouseWheelDelta,typeSInt32,
0,sizeof(EventMouseButton), 0, &wheeldelta); 0,sizeof(wheeldelta), 0, &wheeldelta);
sendbuttons(wheeldelta>0 ? 8 : 16, sendbuttons(wheeldelta>0 ? 8 : 16,
mousePos.h - winRect.left, mousePos.h - winRect.left,
mousePos.v - winRect.top); mousePos.v - winRect.top);
@ -384,22 +389,33 @@ static OSStatus MainWindowEventHandler(EventHandlerCallRef nextHandler, EventRef
case kEventMouseDown: case kEventMouseDown:
{ {
uint32_t buttons; uint32_t buttons;
uint32_t modifiers;
GetEventParameter(event, kEventParamKeyModifiers, typeUInt32,
0, sizeof(modifiers), 0, &modifiers);
GetEventParameter(event, kEventParamMouseChord, GetEventParameter(event, kEventParamMouseChord,
typeUInt32, 0, sizeof buttons, 0, &buttons); typeUInt32, 0, sizeof buttons, 0, &buttons);
mousebuttons = (buttons & 1) /* simulate other buttons via alt/apple key. like x11 */
| ((buttons & 2)<<1) if(modifiers & optionKey) {
| ((buttons & 4)>>1); mousebuttons = ((buttons & 1) ? 2 : 0);
altPressed = false;
} else if(modifiers & cmdKey)
mousebuttons = ((buttons & 1) ? 4 : 0);
else
mousebuttons = (buttons & 1);
mousebuttons |= ((buttons & 2)<<1);
mousebuttons |= ((buttons & 4)>>1);
} /* Fallthrough */ } /* Fallthrough */
case kEventMouseMoved: case kEventMouseMoved:
case kEventMouseDragged: case kEventMouseDragged:
{
sendbuttons(mousebuttons, sendbuttons(mousebuttons,
mousePos.h - winRect.left, mousePos.h - winRect.left,
mousePos.v - winRect.top); mousePos.v - winRect.top);
}
break; break;
default:
default:result = eventNotHandledErr;break; result = eventNotHandledErr;
break;
} }
} }
return result; return result;