Permalink
Browse files

Sony's changes for snap-1.2.2

  • Loading branch information...
1 parent b2b0f0a commit 1585bf9896fbeaf7237dfe0b2bde0da44e2d6def @thezerobit thezerobit committed Nov 27, 2010
Showing with 9,134 additions and 949 deletions.
  1. +0 −7 .cvsignore
  2. +0 −2 ColorPickers/.cvsignore
  3. +36 −0 ColorPickers/GNUmakefile.preamble
  4. +0 −31 Documentation/.cvsignore
  5. +0 −1 Documentation/GuiUser/.cvsignore
  6. +3 −1 GNUmakefile
  7. +36 −0 GNUmakefile.preamble
  8. +0 −2 Headers/Additions/GNUstepGUI/.cvsignore
  9. +7 −0 Headers/Additions/GNUstepGUI/GSDragView.h
  10. +7 −0 Headers/Additions/GNUstepGUI/GSTitleView.h
  11. +60 −2 Headers/AppKit/NSAnimation.h
  12. +2 −1 Headers/AppKit/NSApplication.h
  13. +14 −0 Headers/AppKit/NSCell.h
  14. +5 −0 Headers/AppKit/NSComboBoxCell.h
  15. +12 −0 Headers/AppKit/NSControl.h
  16. +8 −0 Headers/AppKit/NSDownRightGestureRecognizer.h
  17. +56 −9 Headers/AppKit/NSEvent.h
  18. +7 −0 Headers/AppKit/NSMenuView.h
  19. +7 −0 Headers/AppKit/NSResponder.h
  20. +1 −0 Headers/AppKit/NSScroller.h
  21. +7 −0 Headers/AppKit/NSSplitView.h
  22. +18 −0 Headers/AppKit/NSTableView.h
  23. +10 −0 Headers/AppKit/NSTextView.h
  24. +69 −0 Headers/AppKit/NSView.h
  25. +20 −0 Headers/AppKit/NSWindow.h
  26. +12 −0 Headers/AppKit/SNCheckmarkGestureRecognizer.h
  27. +99 −0 Headers/AppKit/SNGestureRecognizer.h
  28. +66 −0 Headers/AppKit/SNLassoGestureRecognizer.h
  29. +33 −0 Headers/AppKit/SNLongPressGestureRecognizer.h
  30. +31 −0 Headers/AppKit/SNPanGestureRecognizer.h
  31. +32 −0 Headers/AppKit/SNPinchGestureRecognizer.h
  32. +33 −0 Headers/AppKit/SNRotationGestureRecognizer.h
  33. +45 −0 Headers/AppKit/SNSwipeGestureRecognizer.h
  34. +30 −0 Headers/AppKit/SNTapGestureRecognizer.h
  35. +78 −0 Headers/AppKit/SNTouch.h
  36. +0 −2 Images/.cvsignore
  37. +0 −9 Model/.cvsignore
  38. +1 −1 Model/GNUmakefile
  39. +1 −1 Model/GNUmakefile.postamble
  40. +36 −0 Model/GNUmakefile.preamble
  41. +1 −1 Printing/GSCUPS/GNUmakefile.preamble
  42. +1 −1 Printing/GSLPR/GNUmakefile.preamble
  43. +1 −1 Resources/Esperanto.lproj/Localizable.strings
  44. +0 −1 Source/.cvsignore
  45. +22 −2 Source/GNUmakefile
  46. +3 −3 Source/GNUmakefile.preamble
  47. +5 −0 Source/GSDisplayServer.m
  48. +305 −178 Source/GSDragView.m
  49. +41 −2 Source/GSTitleView.m
  50. +390 −17 Source/NSAnimation.m
  51. +351 −20 Source/NSApplication.m
  52. +500 −0 Source/NSCell.m
  53. +24 −0 Source/NSComboBox.m
  54. +244 −46 Source/NSComboBoxCell.m
  55. +261 −12 Source/NSControl.m
  56. +62 −0 Source/NSDownRightGestureRecognizer.m
  57. +342 −26 Source/NSEvent.m
  58. +2 −0 Source/NSMatrix.m
  59. +1 −0 Source/NSMenu.m
  60. +65 −2 Source/NSMenuView.m
  61. +2 −0 Source/NSPopUpButton.m
  62. +41 −1 Source/NSResponder.m
  63. +134 −31 Source/NSScroller.m
  64. +18 −0 Source/NSSlider.m
  65. +78 −41 Source/NSSliderCell.m
  66. +104 −2 Source/NSSplitView.m
  67. +267 −201 Source/NSTableView.m
  68. +490 −260 Source/NSTextView.m
  69. +241 −0 Source/NSView.m
  70. +769 −20 Source/NSWindow.m
  71. +101 −0 Source/SNCheckmarkGestureRecognizer.m
  72. +310 −0 Source/SNGestureRecognizer.m
  73. +603 −0 Source/SNLassoGestureRecognizer.m
  74. +422 −0 Source/SNLongPressGestureRecognizer.m
  75. +382 −0 Source/SNPanGestureRecognizer.m
  76. +338 −0 Source/SNPinchGestureRecognizer.m
  77. +389 −0 Source/SNRotationGestureRecognizer.m
  78. +396 −0 Source/SNSwipeGestureRecognizer.m
  79. +412 −0 Source/SNTapGestureRecognizer.m
  80. +130 −0 Source/SNTouch.m
  81. +0 −6 TextConverters/RTF/.cvsignore
  82. +1 −1 TextConverters/RTF/GNUmakefile.preamble
  83. +0 −2 Tools/.cvsignore
  84. +3 −3 Tools/GNUmakefile.preamble
View
@@ -1,7 +0,0 @@
-config.log
-config.status
-config.cache
-config.make
-gnustep-gui.spec
-gnustep-gui-debug.spec
-gui.make
View
@@ -1,2 +0,0 @@
-*.bundle
-*obj
@@ -0,0 +1,36 @@
+#
+# GNUmakefile.preamble - Generated by ProjectCenter
+#
+#include ../../../../../../target/defs.mk
+#include $(BASE_DIR)/src/defs.mk
+# Additional flags to pass to the preprocessor
+ADDITIONAL_CPPFLAGS +=
+
+# Additional flags to pass to Objective C compiler
+ADDITIONAL_OBJCFLAGS +=
+
+# Additional flags to pass to C compiler
+ADDITIONAL_CFLAGS +=
+
+# Additional flags to pass to the linker
+ADDITIONAL_LDFLAGS += -lapplication_manager
+
+# Additional include directories the compiler should search
+ADDITIONAL_INCLUDE_DIRS += -I$(WORKSPACE_ROOT)/src/include
+
+# Additional library directories the linker should search
+#ADDITIONAL_LIB_DIRS += /home/hul/oryza/target/X86_LINUX_PC/rootfs/devel-rootfs/usr/local/lib/libmedia_player.so /home/hul/oryza/target/X86_LINUX_PC/rootfs/devel-rootfs/usr/local/lib/libgstreamer-0.10.so /usr/local/lib/libglib-2.0.so
+
+#ADDITIONAL_LIB_DIRS += /Home/hul/Desktop/CHG-USERS/premv/SNMoviePlayer/libmedia_player.so /home/hul/oryza/target/X86_LINUX_PC/rootfs/devel-rootfs/usr/local/lib/libgstreamer-0.10.so /usr/local/lib/libglib-2.0.so
+
+
+ADDITIONAL_LIB_DIRS += -L$(TARGET_ROOT)/lib
+#ADDITIONAL_LIB_DIRS += $(TARGET_ROOT)/lib/libospl.so
+#ADDITIONAL_LIB_DIRS += $(TARGET_ROOT)/lib/libdebug.so
+
+#ADDITIONAL_LIB_DIRS += `PKG_CONFIG_LIBDIR=$(TARGET_ROOT)/lib/pkgconfig pkg-config --libs gstreamer-0.10 glib-2.0`
+
+
+# Additional GUI libraries to link
+ADDITIONAL_GUI_LIBS +=
+
View
@@ -1,31 +0,0 @@
-gnustep-gui.texi
-version.texi
-version.tmpl.texi
-install.texi
-news.texi
-readme.texi
-announce.texi
-todo.texi
-*.log
-*.dvi
-*.ps
-*.html
-*.info
-*.aux
-*.toc
-*.cp
-*.fn
-*.vr
-*.tp
-*.ky
-*.pg
-*.ps
-*.vrs
-*.cl
-*.pr
-ANNOUNCE
-BUGS
-INSTALL
-NEWS
-README
-
@@ -1 +0,0 @@
-*.html
View
@@ -22,6 +22,8 @@
# If not, see <http://www.gnu.org/licenses/> or write to the
# Free Software Foundation, 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
+include ../../../../../../target/defs.mk
+include $(BASE_DIR)/src/defs.mk
ifeq ($(GNUSTEP_MAKEFILES),)
GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
@@ -68,7 +70,7 @@ ifeq ($(doc), yes)
SUBPROJECTS += Documentation
endif
--include GNUmakefile.preamble
+include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/aggregate.make
View
@@ -0,0 +1,36 @@
+#
+# GNUmakefile.preamble - Generated by ProjectCenter
+#
+#include ../../../../../../target/defs.mk
+#include $(BASE_DIR)/src/defs.mk
+# Additional flags to pass to the preprocessor
+# ADDITIONAL_CPPFLAGS +=
+
+# Additional flags to pass to Objective C compiler
+# ADDITIONAL_OBJCFLAGS +=
+
+# Additional flags to pass to C compiler
+# ADDITIONAL_CFLAGS +=
+
+# Additional flags to pass to the linker
+ADDITIONAL_LDFLAGS += -lapplication_manager
+
+# Additional include directories the compiler should search
+ADDITIONAL_INCLUDE_DIRS += -I$(WORKSPACE_ROOT)/src/include
+
+# Additional library directories the linker should search
+#ADDITIONAL_LIB_DIRS += /home/hul/oryza/target/X86_LINUX_PC/rootfs/devel-rootfs/usr/local/lib/libmedia_player.so /home/hul/oryza/target/X86_LINUX_PC/rootfs/devel-rootfs/usr/local/lib/libgstreamer-0.10.so /usr/local/lib/libglib-2.0.so
+
+#ADDITIONAL_LIB_DIRS += /Home/hul/Desktop/CHG-USERS/premv/SNMoviePlayer/libmedia_player.so /home/hul/oryza/target/X86_LINUX_PC/rootfs/devel-rootfs/usr/local/lib/libgstreamer-0.10.so /usr/local/lib/libglib-2.0.so
+
+
+ADDITIONAL_LIB_DIRS += -L$(TARGET_ROOT)/lib
+#ADDITIONAL_LIB_DIRS += $(TARGET_ROOT)/lib/libospl.so
+#ADDITIONAL_LIB_DIRS += $(TARGET_ROOT)/lib/libdebug.so
+
+#ADDITIONAL_LIB_DIRS += `PKG_CONFIG_LIBDIR=$(TARGET_ROOT)/lib/pkgconfig pkg-config --libs gstreamer-0.10 glib-2.0`
+
+
+# Additional GUI libraries to link
+# ADDITIONAL_GUI_LIBS +=
+
@@ -1,2 +0,0 @@
-config.h
-GSVersion.h
@@ -104,6 +104,13 @@
// Cache for cursors
NSMutableDictionary *cursors;
+
+ // Instance variables to store state info for loop-free event handling
+ NSCursor *_cursorBeforeDrag;
+ NSPoint _slidePoint;
+
+ // for sliding dragged image
+ NSEvent *_eventCausingSlide;
}
+ (id) sharedDragView;
@@ -60,6 +60,13 @@
- (id) owner;
- (NSSize) titleSize;
+//
+// Handling touch events... for testing purpose
+//
+- (void) touchesBeganWithEvent: (NSEvent *) theEvent;
+- (void) touchesMovedWithEvent: (NSEvent *) theEvent;
+- (void) touchesEndedWithEvent: (NSEvent *) theEvent;
+
// ============================================================================
// ==== Buttons
// ============================================================================
@@ -36,6 +36,7 @@
#include <Foundation/NSObject.h>
#include <AppKit/AppKitDefines.h>
#include <GNUstepGUI/GSAnimator.h>
+#include <Foundation/NSGeometry.h>
@class NSString;
@class NSArray;
@@ -51,7 +52,52 @@ typedef enum _NSAnimationCurve
NSAnimationEaseIn,
NSAnimationEaseOut,
NSAnimationLinear,
- NSAnimationSpeedInOut // GNUstep only
+ NSAnimationSpeedInOut, // GNUstep only
+/*SN FEA 002*/
+ NSBackNone,
+ NSBackEaseIn,
+ NSBackEaseOut,
+ NSBackEaseInOut,
+ NSBounceNone,
+ NSBounceEaseIn,
+ NSBounceEaseOut,
+ NSBounceEaseInOut,
+ NSElasticNone,
+ NSElasticEaseIn,
+ NSElasticEaseOut,
+ NSElasticEaseInOut,
+ NSCircNone,
+ NSCircEaseIn,
+ NSCircEaseOut,
+ NSCircEaseInOut,
+ NSCubicNone,
+ NSCubicEaseIn,
+ NSCubicEaseOut,
+ NSCubicEaseInOut,
+ NSExpoNone,
+ NSExpoEaseIn,
+ NSExpoEaseOut,
+ NSExpoEaseInOut,
+ NSLinearNone,
+ NSLinearEaseIn,
+ NSLinearEaseOut,
+ NSLinearEaseInOut,
+ NSQuadNone,
+ NSQuadEaseIn,
+ NSQuadEaseOut,
+ NSQuadEaseInOut,
+ NSQuartNone,
+ NSQuartEaseIn,
+ NSQuartEaseOut,
+ NSQuartEaseInOut,
+ NSQuintNone,
+ NSQuintEaseIn,
+ NSQuintEaseOut,
+ NSQuintEaseInOut,
+ NSSineNone,
+ NSSineEaseIn,
+ NSSineEaseOut,
+ NSSineEaseInOut
} NSAnimationCurve;
/** These constants indicate the blocking mode of an NSAnimation object when it is running. */
@@ -288,7 +334,7 @@ APPKIT_EXPORT NSString *NSViewAnimationTargetKey;
APPKIT_EXPORT NSString *NSViewAnimationStartFrameKey;
APPKIT_EXPORT NSString *NSViewAnimationEndFrameKey;
APPKIT_EXPORT NSString *NSViewAnimationEffectKey;
-
+APPKIT_EXPORT NSString *NSViewAnimationPathKey;
APPKIT_EXPORT NSString *NSViewAnimationFadeInEffect;
APPKIT_EXPORT NSString *NSViewAnimationFadeOutEffect;
@@ -315,6 +361,18 @@ APPKIT_EXPORT NSString *NSViewAnimationFadeOutEffect;
@end
+
+/* Animation path - bezier*/
+/*SNE FEA 001*/
+@interface NSAnimationPath:NSObject
+{
+@public
+NSPoint start;
+NSPoint end;
+NSPoint cp1;
+NSPoint cp2;
+}
+@end
#endif /* OS_API_VERSION */
#endif /* _GNUstep_H_NSAnimation_ */
@@ -38,7 +38,8 @@
#ifndef _GNUstep_H_NSApplication
#define _GNUstep_H_NSApplication
#import <GNUstepBase/GSVersionMacros.h>
-
+#include "application_manager.h"
+//static void event_handler(application_event_t);
#include <AppKit/NSResponder.h>
@class NSArray;
View
@@ -172,6 +172,8 @@ enum {
NSMenu *_menu;
id _represented_object;
void *_reserved1;
+ unsigned periodCount;
+ NSPoint _temp_last_point;
}
//
@@ -399,6 +401,18 @@ enum {
ofView:(NSView *)controlView
untilMouseUp:(BOOL)flag;
+- (BOOL) trackMouseOriginal: (NSEvent*)theEvent
+ inRect: (NSRect)cellFrame
+ ofView: (NSView*)controlView
+ untilMouseUp: (BOOL)flag;
+
+/***** NOT USING MODEL 4 *****
+- (BOOL)trackTouch:(NSEvent *)theEvent
+ inRect:(NSRect)cellFrame
+ ofView:(NSView *)controlView
+ untilTouchEnded:(BOOL)flag;
+***** NOT USING MODEL 4 *****/
+
//
// Managing the Cursor
//
@@ -51,6 +51,11 @@
int _selectedItem;
NSRect _lastValidFrame;
NSRange _prevSelectedRange;
+ BOOL _shouldOpenPopUp;
+ NSTimeInterval _popUpCloseTime; //last popup close time
+
+ // Instance variables for maintaining states in trackMouse
+ BOOL _mouseBeganInButtonCell;
@private
id _popup;
View
@@ -182,9 +182,21 @@
// Tracking the Mouse
//
- (void)mouseDown:(NSEvent *)theEvent;
+- (void)mouseUp:(NSEvent *)theEvent;
+- (void)mouseDragged:(NSEvent *)theEvent;
- (BOOL)ignoresMultiClick;
- (void)setIgnoresMultiClick:(BOOL)flag;
+//
+// Handling touch events
+//
+/***** NOT USING MODEL 4 *****
+- (void) handleSingleTouch: (NSEvent *) theEvent;
+- (void) touchesBeganWithEvent: (NSEvent *) theEvent;
+- (void) touchesMovedWithEvent: (NSEvent *) theEvent;
+- (void) touchesEndedWithEvent: (NSEvent *) theEvent;
+***** NOT USING MODEL 4 *****/
+
@end
APPKIT_EXPORT NSString *NSControlTextDidBeginEditingNotification;
@@ -0,0 +1,8 @@
+#import <AppKit/NSGestureRecognizer.h>
+
+@interface NSDownRightGestureRecognizer : NSGestureRecognizer {
+ NSPoint initialPoint;
+}
+
+- (float) distanceFrom: (NSPoint) p1 to: (NSPoint) p2;
+@end
Oops, something went wrong.

0 comments on commit 1585bf9

Please sign in to comment.