Changeset 7347 for branches

Timestamp:

Oct 4, 2007, 8:02:08 AM (17 years ago)

Author:

af

Message:

Initial work on an interface to selections in text fields.

NB: Not entirely working yet.

Location:

branches/easygui/ccl/examples/cocoa/easygui

Files:

• new-cocoa-bindings.lisp (modified) (1 diff)
• package.lisp (modified) (2 diffs)
• views.lisp (modified) (2 diffs)

branches/easygui/ccl/examples/cocoa/easygui/new-cocoa-bindings.lisp

@@ -9 +9 @@
   (assert (>= y 0))
   (make-instance 'eg-point :x x :y y))
+
+(defclass eg-range ()
+     ((start :initarg :start :reader range-start)
+      (end :initarg :end :reader range-end)))
+
+(defun range (start end)
+  (assert (>= end start))
+  (make-instance 'eg-range :start start :end end))
+
+(defun range-nsrange (range)
+  (ns:make-ns-range (range-start range) (range-end range)))
 
 (defclass easy-cocoa-object ()

branches/easygui/ccl/examples/cocoa/easygui/package.lisp

@@ -2 +2 @@
   (:use :cl)
   (:import-from :ccl with-autorelease-pool @selector lisp-string-from-nsstring +null-ptr+)
-  (:export #:point #:window
+  (:export #:point #:range #:window
            ;; view classes
            #:view #:static-text-view #:text-input-view #:password-input-view
@@ -11 +11 @@
            #:initialize-view #:action #:view-text
            #:add-entry #:add-entries #:editable-p
-           #:entry-text #:nth-cell))
+           #:entry-text #:nth-cell #:selection))
 
 (cl:defpackage :easygui-user

branches/easygui/ccl/examples/cocoa/easygui/views.lisp

@@ -44 +44 @@
   (check-type editable-p boolean)
   (dcc (#/setEditable: (cocoa-ref view) editable-p)))
+
+(defclass one-selection-mixin () ())
+
+(defmethod (setf selection) (selection (view one-selection-mixin))
+  (dcc (#/setSelectedRange: (cocoa-ref view) (range-nsrange selection))))
+
+(defmethod selection ((view one-selection-mixin))
+  (let ((range (dcc (#/selectedRange (cocoa-ref view)))))
+    (if (= (ns:ns-range-location range) #$NSNotFound)
+        nil
+        (range (ns:ns-range-location range)
+               (ns:ns-range-length range)))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -66 +78 @@
 (defclass static-text-view (view view-text-via-stringvalue-mixin) ())
 
-(defclass text-input-view (view editable-mixin view-text-via-stringvalue-mixin)
+(defclass text-input-view (view editable-mixin view-text-via-stringvalue-mixin
+                                ;; XXX: requires NSTextView, but this is an
+                                ;; NSTextField:
+                                #+not-yet one-selection-mixin)
      ((input-locked-p :initform nil :initarg :input-locked-p
                       :reader text-input-locked-p)))