gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 07:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename middl toother mouse

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@12948 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2002-03-02 07:23:18 +00:00
parent 464f76e2be
commit c1ffddcdc8
14 changed files with 92 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ChangeLog
View file

@ -1,3 +1,20 @@
2002-03-01 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/AppKit/NSEvent.h: Rename 'middle' mouse to 'other' as
MacOS-X has caught up with the functionality but not adopted our
names.
* Headers/AppKit/NSResponder.h: ditto
* Source/Functions.m: ditto
* Source/GSComboSupport.m: ditto
* Source/NSApplication.m: ditto
* Source/NSCell.m: ditto
* Source/NSControl.m: ditto
* Source/NSEvent.m: ditto
* Source/NSMenuView.m: ditto
* Source/NSResponder.m: ditto
* Source/NSTextView.m: ditto
* Source/NSWindow.m: ditto
2002-03-01 Michael Hanni <mhanni@yahoo.com>
First cut at improving NSPopUpButton/Cell.

15
Headers/gnustep/gui/NSEvent.h
View file

@ -44,13 +44,13 @@
typedef enum _NSEventType {
NSLeftMouseDown,
NSLeftMouseUp,
NSMiddleMouseDown, /* GNUstep extension */
NSMiddleMouseUp, /* GNUstep extension */
NSOtherMouseDown,
NSOtherMouseUp,
NSRightMouseDown,
NSRightMouseUp,
NSMouseMoved,
NSLeftMouseDragged,
NSMiddleMouseDragged, /* GNUstep extension */
NSOtherMouseDragged,
NSRightMouseDragged,
NSMouseEntered,
NSMouseExited,
@ -68,13 +68,13 @@ typedef enum _NSEventType {
enum {
NSLeftMouseDownMask = (1 << NSLeftMouseDown),
NSLeftMouseUpMask = (1 << NSLeftMouseUp),
NSMiddleMouseDownMask = (1 << NSMiddleMouseDown), /* GNUstep */
NSMiddleMouseUpMask = (1 << NSMiddleMouseUp), /* GNUstep */
NSOtherMouseDownMask = (1 << NSOtherMouseDown),
NSOtherMouseUpMask = (1 << NSOtherMouseUp),
NSRightMouseDownMask = (1 << NSRightMouseDown),
NSRightMouseUpMask = (1 << NSRightMouseUp),
NSMouseMovedMask = (1 << NSMouseMoved),
NSLeftMouseDraggedMask = (1 << NSLeftMouseDragged),
NSMiddleMouseDraggedMask = (1 << NSMiddleMouseDragged), /* GNUstep */
NSOtherMouseDraggedMask = (1 << NSOtherMouseDragged),
NSRightMouseDraggedMask = (1 << NSRightMouseDragged),
NSMouseEnteredMask = (1 << NSMouseEntered),
NSMouseExitedMask = (1 << NSMouseExited),
@ -203,6 +203,9 @@ enum {
/*
* Getting General Event Information
*/
#ifndef STRICT_OPENSTEP
- (int) buttonNumber;
#endif
- (NSGraphicsContext*) context;
- (NSPoint) locationInWindow;
- (unsigned int) modifierFlags;

8
Headers/gnustep/gui/NSResponder.h
View file

@ -104,10 +104,10 @@
- (void) mouseMoved: (NSEvent*)theEvent;
- (void) mouseUp: (NSEvent*)theEvent;
- (void) noResponderFor: (SEL)eventSelector;
#ifndef NO_GNUSTEP
- (void) middleMouseDown: (NSEvent*)theEvent;
- (void) middleMouseDragged: (NSEvent*)theEvent;
- (void) middleMouseUp: (NSEvent*)theEvent;
#ifndef STRICT_OPENSTEP
- (void) otherMouseDown: (NSEvent*)theEvent;
- (void) otherMouseDragged: (NSEvent*)theEvent;
- (void) otherMouseUp: (NSEvent*)theEvent;
#endif
- (void) rightMouseDown: (NSEvent*)theEvent;
- (void) rightMouseDragged: (NSEvent*)theEvent;

6
Source/Functions.m
View file

@ -86,15 +86,15 @@ NSEventMaskFromType(NSEventType type)
{
case NSLeftMouseDown: return NSLeftMouseDownMask;
case NSLeftMouseUp: return NSLeftMouseUpMask;
case NSMiddleMouseDown: return NSMiddleMouseDownMask;
case NSMiddleMouseUp: return NSMiddleMouseUpMask;
case NSOtherMouseDown: return NSOtherMouseDownMask;
case NSOtherMouseUp: return NSOtherMouseUpMask;
case NSRightMouseDown: return NSRightMouseDownMask;
case NSRightMouseUp: return NSRightMouseUpMask;
case NSMouseMoved: return NSMouseMovedMask;
case NSMouseEntered: return NSMouseEnteredMask;
case NSMouseExited: return NSMouseExitedMask;
case NSLeftMouseDragged: return NSLeftMouseDraggedMask;
case NSMiddleMouseDragged: return NSMiddleMouseDraggedMask;
case NSOtherMouseDragged: return NSOtherMouseDraggedMask;
case NSRightMouseDragged: return NSRightMouseDraggedMask;
case NSKeyDown: return NSKeyDownMask;
case NSKeyUp: return NSKeyUpMask;

2
Source/GSComboSupport.m
View file

@ -227,7 +227,7 @@
}
else if ([event type] == NSMouseMoved ||
[event type] == NSLeftMouseDragged ||
[event type] == NSMiddleMouseDragged ||
[event type] == NSOtherMouseDragged ||
[event type] == NSRightMouseDragged ||
[event type] == NSMouseEntered ||
[event type] == NSMouseExited ||

6
Source/NSApplication.m
View file

@ -354,7 +354,7 @@ static NSCell* tileCell = nil;
NSPoint lastLocation;
NSPoint location;
unsigned eventMask = NSLeftMouseDownMask | NSLeftMouseUpMask
| NSPeriodicMask | NSMiddleMouseUpMask | NSRightMouseUpMask;
| NSPeriodicMask | NSOtherMouseUpMask | NSRightMouseUpMask;
NSDate *theDistantFuture = [NSDate distantFuture];
BOOL done = NO;
@ -371,7 +371,7 @@ static NSCell* tileCell = nil;
switch ([theEvent type])
{
case NSRightMouseUp:
case NSMiddleMouseUp:
case NSOtherMouseUp:
case NSLeftMouseUp:
/* any mouse up means we're done */
done = YES;
@ -1409,7 +1409,7 @@ IF_NO_GC(NSAssert([event retainCount] > 0, NSInternalInconsistencyException));
NSEventType type = [event type];
if ((type == NSLeftMouseDown) || (type == NSLeftMouseUp)
|| (type == NSMiddleMouseDown) || (type == NSMiddleMouseUp)
|| (type == NSOtherMouseDown) || (type == NSOtherMouseUp)
|| (type == NSRightMouseDown) || (type == NSRightMouseUp)
|| (type == NSMouseMoved))
{

2
Source/NSCell.m
View file

@ -1255,7 +1255,7 @@ static NSColor *shadowCol;
{
NSApplication *theApp = [NSApplication sharedApplication];
unsigned event_mask = NSLeftMouseDownMask | NSLeftMouseUpMask
| NSMouseMovedMask | NSLeftMouseDraggedMask | NSMiddleMouseDraggedMask
| NSMouseMovedMask | NSLeftMouseDraggedMask | NSOtherMouseDraggedMask
| NSRightMouseDraggedMask;
NSPoint location = [theEvent locationInWindow];
NSPoint point = [controlView convertPoint: location fromView: nil];

2
Source/NSControl.m
View file

@ -490,7 +490,7 @@ static Class actionCellClass;
int oldActionMask;
NSPoint location;
unsigned int event_mask = NSLeftMouseDownMask | NSLeftMouseUpMask
| NSMouseMovedMask | NSLeftMouseDraggedMask | NSMiddleMouseDraggedMask
| NSMouseMovedMask | NSLeftMouseDraggedMask | NSOtherMouseDraggedMask
| NSRightMouseDraggedMask;
NSDebugLog(@"NSControl mouseDown\n");

30
Source/NSEvent.m
View file

@ -452,6 +452,12 @@ static Class eventClass;
return NSMakePoint(x, y);
}
- (int) buttonNumber
{
/* FIXME */
return 0;
}
- (int) clickCount
{
/* Make sure it is one of the right event types */
@ -622,8 +628,8 @@ static Class eventClass;
{
case NSLeftMouseDown:
case NSLeftMouseUp:
case NSMiddleMouseDown:
case NSMiddleMouseUp:
case NSOtherMouseDown:
case NSOtherMouseUp:
case NSRightMouseDown:
case NSRightMouseUp:
[aCoder encodeValuesOfObjCTypes: "iif", &event_data.mouse.event_num,
@ -658,7 +664,7 @@ static Class eventClass;
case NSScrollWheel:
case NSMouseMoved:
case NSLeftMouseDragged:
case NSMiddleMouseDragged:
case NSOtherMouseDragged:
case NSRightMouseDragged:
[aCoder encodeValuesOfObjCTypes: "fff",
&event_data.scrollWheel.deltaX,
@ -681,8 +687,8 @@ static Class eventClass;
{
case NSLeftMouseDown:
case NSLeftMouseUp:
case NSMiddleMouseDown:
case NSMiddleMouseUp:
case NSOtherMouseDown:
case NSOtherMouseUp:
case NSRightMouseDown:
case NSRightMouseUp:
[aDecoder decodeValuesOfObjCTypes: "iif", &event_data.mouse.event_num,
@ -718,7 +724,7 @@ static Class eventClass;
case NSScrollWheel:
case NSMouseMoved:
case NSLeftMouseDragged:
case NSMiddleMouseDragged:
case NSOtherMouseDragged:
case NSRightMouseDragged:
[aDecoder decodeValuesOfObjCTypes: "fff",
&event_data.scrollWheel.deltaX,
@ -754,13 +760,13 @@ static Class eventClass;
const char* eventTypes[] = {
"leftMouseDown",
"leftMouseUp",
"middleMouseDown",
"middleMouseUp",
"otherMouseDown",
"otherMouseUp",
"rightMouseDown",
"rightMouseUp",
"mouseMoved",
"leftMouseDragged",
"middleMouseDragged",
"otherMouseDragged",
"rightMouseDragged",
"mouseEntered",
"mouseExited",
@ -779,8 +785,8 @@ static Class eventClass;
{
case NSLeftMouseDown:
case NSLeftMouseUp:
case NSMiddleMouseDown:
case NSMiddleMouseUp:
case NSOtherMouseDown:
case NSOtherMouseUp:
case NSRightMouseDown:
case NSRightMouseUp:
return [NSString stringWithFormat:
@ -838,7 +844,7 @@ static Class eventClass;
case NSScrollWheel:
case NSMouseMoved:
case NSLeftMouseDragged:
case NSMiddleMouseDragged:
case NSOtherMouseDragged:
case NSRightMouseDragged:
return [NSString stringWithFormat:
@"NSEvent: eventType = %s, point = { %f, %f }, modifiers = %u,"

24
Source/NSGraphicsContext.m
View file

@ -2234,13 +2234,13 @@ NSGraphicsContext *GSCurrentContext()
matched = YES;
break;
case NSMiddleMouseDown:
if (mask & NSMiddleMouseDownMask)
case NSOtherMouseDown:
if (mask & NSOtherMouseDownMask)
matched = YES;
break;
case NSMiddleMouseUp:
if (mask & NSMiddleMouseUpMask)
case NSOtherMouseUp:
if (mask & NSOtherMouseUpMask)
matched = YES;
break;
@ -2274,8 +2274,8 @@ NSGraphicsContext *GSCurrentContext()
matched = YES;
break;
case NSMiddleMouseDragged:
if (mask & NSMiddleMouseDraggedMask)
case NSOtherMouseDragged:
if (mask & NSOtherMouseDraggedMask)
matched = YES;
break;
@ -2404,13 +2404,13 @@ NSGraphicsContext *GSCurrentContext()
shouldRemove = YES;
break;
case NSMiddleMouseDown:
if (mask & NSMiddleMouseDownMask)
case NSOtherMouseDown:
if (mask & NSOtherMouseDownMask)
shouldRemove = YES;
break;
case NSMiddleMouseUp:
if (mask & NSMiddleMouseUpMask)
case NSOtherMouseUp:
if (mask & NSOtherMouseUpMask)
shouldRemove = YES;
break;
@ -2444,8 +2444,8 @@ NSGraphicsContext *GSCurrentContext()
shouldRemove = YES;
break;
case NSMiddleMouseDragged:
if (mask & NSMiddleMouseDraggedMask)
case NSOtherMouseDragged:
if (mask & NSOtherMouseDraggedMask)
shouldRemove = YES;
break;

6
Source/NSMenuView.m
View file

@ -881,10 +881,10 @@ _addLeftBorderOffsetToRect(NSRect aRect, BOOL isHorizontal)
end = NSRightMouseUp;
eventMask |= NSRightMouseUpMask | NSRightMouseDraggedMask;
}
else if (type == NSMiddleMouseDown)
else if (type == NSOtherMouseDown)
{
end = NSMiddleMouseUp;
eventMask |= NSMiddleMouseUpMask | NSMiddleMouseDraggedMask;
end = NSOtherMouseUp;
eventMask |= NSOtherMouseUpMask | NSOtherMouseDraggedMask;
}
else
{

18
Source/NSResponder.m
View file

@ -184,28 +184,28 @@
return [self noResponderFor: @selector(keyUp:)];
}
- (void) middleMouseDown: (NSEvent*)theEvent
- (void) otherMouseDown: (NSEvent*)theEvent
{
if (_next_responder)
return [_next_responder middleMouseDown: theEvent];
return [_next_responder otherMouseDown: theEvent];
else
return [self noResponderFor: @selector(middleMouseDown:)];
return [self noResponderFor: @selector(otherMouseDown:)];
}
- (void) middleMouseDragged: (NSEvent*)theEvent
- (void) otherMouseDragged: (NSEvent*)theEvent
{
if (_next_responder)
return [_next_responder middleMouseDragged: theEvent];
return [_next_responder otherMouseDragged: theEvent];
else
return [self noResponderFor: @selector(middleMouseDragged:)];
return [self noResponderFor: @selector(otherMouseDragged:)];
}
- (void) middleMouseUp: (NSEvent*)theEvent
- (void) otherMouseUp: (NSEvent*)theEvent
{
if (_next_responder)
return [_next_responder middleMouseUp: theEvent];
return [_next_responder otherMouseUp: theEvent];
else
return [self noResponderFor: @selector(middleMouseUp:)];
return [self noResponderFor: @selector(otherMouseUp:)];
}
- (void) mouseDown: (NSEvent*)theEvent

4
Source/NSTextView.m
View file

@ -4113,8 +4113,8 @@ other than copy/paste or dragging. */
type: NSStringPboardType];
}
/** Bind middle mouse up to pasteSelection. This should be done via configuation! */
- (void) middleMouseUp: (NSEvent*)theEvent
/** Bind other mouse up to pasteSelection. This should be done via configuation! */
- (void) otherMouseUp: (NSEvent*)theEvent
{
// Should we change the insertion point, based on the event position?
[self pasteSelection];

18
Source/NSWindow.m
View file

@ -256,7 +256,7 @@ static NSCell *tileCell = nil;
NSPoint lastLocation;
NSPoint location;
unsigned eventMask = NSLeftMouseDownMask | NSLeftMouseUpMask
| NSPeriodicMask | NSMiddleMouseUpMask | NSRightMouseUpMask;
| NSPeriodicMask | NSOtherMouseUpMask | NSRightMouseUpMask;
NSDate *theDistantFuture = [NSDate distantFuture];
BOOL done = NO;
@ -273,7 +273,7 @@ static NSCell *tileCell = nil;
switch ([theEvent type])
{
case NSRightMouseUp:
case NSMiddleMouseUp:
case NSOtherMouseUp:
case NSLeftMouseUp:
/* right mouse up or left mouse up means we're done */
done = YES;
@ -2702,15 +2702,15 @@ resetCursorRectsForView(NSView *theView)
_lastPoint = [theEvent locationInWindow];
break;
case NSMiddleMouseDown:
case NSOtherMouseDown:
v = [_contentView hitTest: [theEvent locationInWindow]];
[v middleMouseDown: theEvent];
[v otherMouseDown: theEvent];
_lastPoint = [theEvent locationInWindow];
break;
case NSMiddleMouseUp:
case NSOtherMouseUp:
v = [_contentView hitTest: [theEvent locationInWindow]];
[v middleMouseUp: theEvent];
[v otherMouseUp: theEvent];
_lastPoint = [theEvent locationInWindow];
break;
@ -2727,7 +2727,7 @@ resetCursorRectsForView(NSView *theView)
break;
case NSLeftMouseDragged:
case NSMiddleMouseDragged:
case NSOtherMouseDragged:
case NSRightMouseDragged:
case NSMouseMoved:
switch (type)
@ -2736,9 +2736,9 @@ resetCursorRectsForView(NSView *theView)
v = [_contentView hitTest: [theEvent locationInWindow]];
[v mouseDragged: theEvent];
break;
case NSMiddleMouseDragged:
case NSOtherMouseDragged:
v = [_contentView hitTest: [theEvent locationInWindow]];
[v middleMouseDragged: theEvent];
[v otherMouseDragged: theEvent];
break;
case NSRightMouseDragged:
v = [_contentView hitTest: [theEvent locationInWindow]];