graphic-forms-cvs March 2007

graphic-forms-cvs@common-lisp.net

1 participants
21 discussions

[graphic-forms-cvs] r451 - trunk/src/uitoolkit/widgets
by junrue＠common-lisp.net 30 Mar '07

30 Mar '07

Author: junrue Date: Thu Mar 29 22:26:46 2007 New Revision: 451 Modified: trunk/src/uitoolkit/widgets/event.lisp Log: when processing WM_CTLCOLOR* messages, call the default wndproc rather than returning 0 Modified: trunk/src/uitoolkit/widgets/event.lisp ============================================================================== --- trunk/src/uitoolkit/widgets/event.lisp (original) +++ trunk/src/uitoolkit/widgets/event.lisp Thu Mar 29 22:26:46 2007 @@ -145,18 +145,17 @@ 0)))) (defun process-ctlcolor-message (wparam lparam) - (let* ((widget (get-widget (thread-context) (cffi:make-pointer (logand #xFFFFFFFF lparam)))) - (hdc (cffi:make-pointer wparam)) - (bkgdcolor (brush-color-of widget)) - (textcolor (text-color-of widget)) - (ret-val 0)) - (when widget + (let ((widget (get-widget (thread-context) (cffi:make-pointer (logand #xFFFFFFFF lparam)))) + (hdc (cffi:make-pointer wparam))) + (if widget + (let ((bkgdcolor (brush-color-of widget)) + (textcolor (text-color-of widget))) (if bkgdcolor (gfs::set-bk-color hdc (gfg:color->rgb bkgdcolor))) (if textcolor (gfs::set-text-color hdc (gfg:color->rgb textcolor))) - (setf ret-val (cffi:pointer-address (brush-handle-of widget)))) - ret-val)) + (cffi:pointer-address (brush-handle-of widget))) + 0))) (defun dispatch-scroll-notification (widget axis wparam-lo) (let ((disp (dispatcher widget)) @@ -425,20 +424,28 @@ 0) (defmethod process-message (hwnd (msg (eql gfs::+wm-ctlcolorbtn+)) wparam lparam) - (declare (ignore hwnd)) - (process-ctlcolor-message wparam lparam)) + (let ((retval (process-ctlcolor-message wparam lparam))) + (if (zerop retval) + (gfs::def-window-proc hwnd msg wparam lparam) + retval))) (defmethod process-message (hwnd (msg (eql gfs::+wm-ctlcoloredit+)) wparam lparam) - (declare (ignore hwnd)) - (process-ctlcolor-message wparam lparam)) + (let ((retval (process-ctlcolor-message wparam lparam))) + (if (zerop retval) + (gfs::def-window-proc hwnd msg wparam lparam) + retval))) (defmethod process-message (hwnd (msg (eql gfs::+wm-ctlcolorlistbox+)) wparam lparam) - (declare (ignore hwnd)) - (process-ctlcolor-message wparam lparam)) + (let ((retval (process-ctlcolor-message wparam lparam))) + (if (zerop retval) + (gfs::def-window-proc hwnd msg wparam lparam) + retval))) (defmethod process-message (hwnd (msg (eql gfs::+wm-ctlcolorstatic+)) wparam lparam) - (declare (ignore hwnd)) - (process-ctlcolor-message wparam lparam)) + (let ((retval (process-ctlcolor-message wparam lparam))) + (if (zerop retval) + (gfs::def-window-proc hwnd msg wparam lparam) + retval))) (defmethod process-message (hwnd (msg (eql gfs::+wm-setcursor+)) wparam lparam) (let* ((widget (get-widget (thread-context) hwnd))

1 0

[graphic-forms-cvs] r450 - branches/graphic-forms-newtypes/src/uitoolkit/widgets
by junrue＠common-lisp.net 30 Mar '07

30 Mar '07

Author: junrue Date: Thu Mar 29 22:26:27 2007 New Revision: 450 Modified: branches/graphic-forms-newtypes/src/uitoolkit/widgets/event.lisp Log: when processing WM_CTLCOLOR* messages, call the default wndproc rather than returning 0 Modified: branches/graphic-forms-newtypes/src/uitoolkit/widgets/event.lisp ============================================================================== --- branches/graphic-forms-newtypes/src/uitoolkit/widgets/event.lisp (original) +++ branches/graphic-forms-newtypes/src/uitoolkit/widgets/event.lisp Thu Mar 29 22:26:27 2007 @@ -145,18 +145,17 @@ 0)))) (defun process-ctlcolor-message (wparam lparam) - (let* ((widget (get-widget (thread-context) (cffi:make-pointer (logand #xFFFFFFFF lparam)))) - (hdc (cffi:make-pointer wparam)) - (bkgdcolor (brush-color-of widget)) - (textcolor (text-color-of widget)) - (ret-val 0)) - (when widget - (if bkgdcolor - (gfs::set-bk-color hdc (gfg:color->rgb bkgdcolor))) - (if textcolor - (gfs::set-text-color hdc (gfg:color->rgb textcolor))) - (setf ret-val (cffi:pointer-address (brush-handle-of widget)))) - ret-val)) + (let ((widget (get-widget (thread-context) (cffi:make-pointer (logand #xFFFFFFFF lparam)))) + (hdc (cffi:make-pointer wparam))) + (if widget + (let ((bkgdcolor (brush-color-of widget)) + (textcolor (text-color-of widget))) + (if bkgdcolor + (gfs::set-bk-color hdc (gfg:color->rgb bkgdcolor))) + (if textcolor + (gfs::set-text-color hdc (gfg:color->rgb textcolor))) + (cffi:pointer-address (brush-handle-of widget))) + 0))) (defun dispatch-scroll-notification (widget axis wparam-lo) (let ((disp (dispatcher widget)) @@ -425,20 +424,28 @@ 0) (defmethod process-message (hwnd (msg (eql gfs::+wm-ctlcolorbtn+)) wparam lparam) - (declare (ignore hwnd)) - (process-ctlcolor-message wparam lparam)) + (let ((retval (process-ctlcolor-message wparam lparam))) + (if (zerop retval) + (gfs::def-window-proc hwnd msg wparam lparam) + retval))) (defmethod process-message (hwnd (msg (eql gfs::+wm-ctlcoloredit+)) wparam lparam) - (declare (ignore hwnd)) - (process-ctlcolor-message wparam lparam)) + (let ((retval (process-ctlcolor-message wparam lparam))) + (if (zerop retval) + (gfs::def-window-proc hwnd msg wparam lparam) + retval))) (defmethod process-message (hwnd (msg (eql gfs::+wm-ctlcolorlistbox+)) wparam lparam) - (declare (ignore hwnd)) - (process-ctlcolor-message wparam lparam)) + (let ((retval (process-ctlcolor-message wparam lparam))) + (if (zerop retval) + (gfs::def-window-proc hwnd msg wparam lparam) + retval))) (defmethod process-message (hwnd (msg (eql gfs::+wm-ctlcolorstatic+)) wparam lparam) - (declare (ignore hwnd)) - (process-ctlcolor-message wparam lparam)) + (let ((retval (process-ctlcolor-message wparam lparam))) + (if (zerop retval) + (gfs::def-window-proc hwnd msg wparam lparam) + retval))) (defmethod process-message (hwnd (msg (eql gfs::+wm-setcursor+)) wparam lparam) (let* ((widget (get-widget (thread-context) hwnd))

1 0

[graphic-forms-cvs] r449 - in trunk/src/uitoolkit: system widgets
by junrue＠common-lisp.net 30 Mar '07

30 Mar '07

Author: junrue Date: Thu Mar 29 20:05:58 2007 New Revision: 449 Modified: trunk/src/uitoolkit/system/user32.lisp trunk/src/uitoolkit/widgets/display.lisp trunk/src/uitoolkit/widgets/thread-context.lisp trunk/src/uitoolkit/widgets/window.lisp Log: completed change-over to stdcall support offered by CFFI Modified: trunk/src/uitoolkit/system/user32.lisp ============================================================================== --- trunk/src/uitoolkit/system/user32.lisp (original) +++ trunk/src/uitoolkit/system/user32.lisp Thu Mar 29 20:05:58 2007 @@ -34,7 +34,9 @@ (in-package :graphic-forms.uitoolkit.system) (eval-when (:compile-toplevel :load-toplevel :execute) - (use-package :cffi)) + (use-package :cffi) +#+cffi-features:no-stdcall + (error "Graphic-Forms requires stdcall support enabled in CFFI.")) (load-foreign-library "user32.dll") @@ -206,7 +208,6 @@ (hwnd HANDLE) (ps LPTR)) -#-cffi-features:no-stdcall (defcfun ("EnumChildWindows" enum-child-windows :cconv :stdcall) INT @@ -214,15 +215,6 @@ (func :pointer) (lparam LPARAM)) -#+lispworks -(fli:define-foreign-function - (enum-child-windows "EnumChildWindows") - ((hwnd :pointer) - (func :pointer) - (lparam :long)) - :result-type :int) - -#-cffi-features:no-stdcall (defcfun ("EnumDisplayMonitors" enum-display-monitors :cconv :stdcall) INT @@ -231,16 +223,6 @@ (enumproc LPTR) (data LPARAM)) -#+lispworks -(fli:define-foreign-function - (enum-display-monitors "EnumDisplayMonitors") - ((hdc :pointer) - (cliprect :pointer) - (enumproc :pointer) - (data :long)) - :result-type :int) - -#-cffi-features:no-stdcall (defcfun ("EnumThreadWindows" enum-thread-windows :cconv :stdcall) INT @@ -248,14 +230,6 @@ (func :pointer) (lparam LPARAM)) -#+lispworks -(fli:define-foreign-function - (enum-thread-windows "EnumThreadWindows") - ((threadid (:unsigned :long)) - (func :pointer) - (lparam :long)) - :result-type :int) - (defcfun ("GetAncestor" get-ancestor) HANDLE Modified: trunk/src/uitoolkit/widgets/display.lisp ============================================================================== --- trunk/src/uitoolkit/widgets/display.lisp (original) +++ trunk/src/uitoolkit/widgets/display.lisp Thu Mar 29 20:05:58 2007 @@ -37,30 +37,16 @@ ;;; helper functions ;;; -#-cffi-features:no-stdcall (cffi:defcallback (display-visitor :cconv :stdcall) gfs::BOOL ((hmonitor :pointer) (hdc :pointer) (monitorrect :pointer) (data gfs::LPARAM)) (declare (ignore hdc monitorrect)) (call-display-visitor-func (thread-context) hmonitor data) 1) -#+lispworks -(fli:define-foreign-callable - ("display_visitor" :result-type :integer :calling-convention :stdcall) - ((hmonitor :pointer) - (hdc :pointer) - (monitorrect :pointer) - (data :long)) - (declare (ignore hdc monitorrect)) - (call-display-visitor-func (thread-context) hmonitor data) - 1) - (defun query-display-info (hmonitor) (let ((info nil)) (cffi:with-foreign-object (mi-ptr 'gfs::monitorinfoex) - (cffi:with-foreign-slots ((gfs::cbsize gfs::monitor gfs::work - gfs::flags gfs::device) - mi-ptr gfs::monitorinfoex) + (cffi:with-foreign-slots ((gfs::cbsize gfs::flags) mi-ptr gfs::monitorinfoex) (setf gfs::cbsize (cffi:foreign-type-size 'gfs::monitorinfoex)) (if (zerop (gfs::get-monitor-info hmonitor mi-ptr)) (error 'gfs:win32-warning :detail "get-monitor-info failed")) @@ -88,13 +74,9 @@ (let ((tc (thread-context))) (setf (display-visitor-func tc) func) (unwind-protect -#-cffi-features:no-stdcall (gfs::enum-display-monitors (cffi:null-pointer) (cffi:null-pointer) (cffi:callback display-visitor) 0) -#+lispworks - (let ((ptr (fli:make-pointer :address 0))) - (gfs::enum-display-monitors ptr ptr (fli:make-pointer :symbol-name "display_visitor") 0)) (setf (display-visitor-func tc) nil)) (let ((tmp (reverse (display-visitor-results tc)))) (setf (display-visitor-results tc) nil) @@ -109,7 +91,6 @@ (defun obtain-primary-display () (find-if #'primary-p (obtain-displays))) -#-cffi-features:no-stdcall (cffi:defcallback (top-level-window-visitor :cconv :stdcall) gfs::BOOL ((hwnd :pointer) (lparam gfs::LPARAM)) (declare (ignore lparam)) @@ -119,14 +100,6 @@ (call-top-level-visitor-func tc win))) 1) -#+lispworks -(fli:define-foreign-callable - ("top_level_window_visitor" :result-type :integer :calling-convention :stdcall) - ((hwnd :pointer) - (lparam :long)) - (top-level-window-visitor hwnd lparam) - 1) - (defun maptoplevels (func) ;; ;; func should expect one parameter: @@ -135,13 +108,8 @@ (let ((tc (thread-context))) (setf (top-level-visitor-func tc) func) (unwind-protect -#-cffi-features:no-stdcall (gfs::enum-thread-windows (gfs::get-window-thread-process-id (utility-hwnd tc) (cffi:null-pointer)) (cffi:callback top-level-window-visitor) - 0) -#+lispworks - (gfs::enum-thread-windows (gfs::get-window-thread-process-id (utility-hwnd tc) (cffi:null-pointer)) - (fli:make-pointer :symbol-name "top_level_window_visitor") 0) (setf (top-level-visitor-func tc) nil)) (let ((tmp (reverse (top-level-visitor-results tc)))) Modified: trunk/src/uitoolkit/widgets/thread-context.lisp ============================================================================== --- trunk/src/uitoolkit/widgets/thread-context.lisp (original) +++ trunk/src/uitoolkit/widgets/thread-context.lisp Thu Mar 29 20:05:58 2007 @@ -1,7 +1,7 @@ ;;;; ;;;; thread-context.lisp ;;;; -;;;; Copyright (C) 2006, Jack D. Unrue +;;;; Copyright (C) 2006-2007, Jack D. Unrue ;;;; All rights reserved. ;;;; ;;;; Redistribution and use in source and binary forms, with or without Modified: trunk/src/uitoolkit/widgets/window.lisp ============================================================================== --- trunk/src/uitoolkit/widgets/window.lisp (original) +++ trunk/src/uitoolkit/widgets/window.lisp Thu Mar 29 20:05:58 2007 @@ -70,7 +70,6 @@ (if (and parent (layout-of parent)) (append-layout-item (layout-of parent) win))))) -#-cffi-features:no-stdcall (cffi:defcallback (child-window-visitor :cconv :stdcall) gfs::BOOL ((hwnd :pointer) (lparam gfs::LPARAM)) (let* ((tc (thread-context)) @@ -83,14 +82,6 @@ (setf (child-visitor-results tc) (push (call-child-visitor-func tc parent child) tmp-list)))))) 1) -#+lispworks -(fli:define-foreign-callable - ("child_window_visitor" :result-type :integer :calling-convention :stdcall) - ((hwnd :pointer) - (lparam :long)) - (child-window-visitor hwnd lparam) - 1) - (defun window-class-registered-p (class-name) (cffi:with-foreign-string (str-ptr class-name) (cffi:with-foreign-object (wc-ptr 'gfs::wndclassex) @@ -326,14 +317,9 @@ (hwnd (gfs:handle self))) (setf (child-visitor-func tc) func) (unwind-protect -#-cffi-features:no-stdcall (gfs::enum-child-windows hwnd (cffi:callback child-window-visitor) (cffi:pointer-address hwnd)) -#+lispworks - (gfs::enum-child-windows hwnd - (fli:make-pointer :symbol-name "child_window_visitor") - (cffi:pointer-address hwnd)) (setf (child-visitor-func tc) nil)) (let ((tmp (reverse (child-visitor-results tc)))) (setf (child-visitor-results tc) nil)

1 0

[graphic-forms-cvs] r448 - in branches/graphic-forms-newtypes/src/uitoolkit: system widgets
by junrue＠common-lisp.net 30 Mar '07

30 Mar '07

Author: junrue Date: Thu Mar 29 20:05:44 2007 New Revision: 448 Modified: branches/graphic-forms-newtypes/src/uitoolkit/system/user32.lisp branches/graphic-forms-newtypes/src/uitoolkit/widgets/display.lisp branches/graphic-forms-newtypes/src/uitoolkit/widgets/thread-context.lisp branches/graphic-forms-newtypes/src/uitoolkit/widgets/window.lisp Log: completed change-over to stdcall support offered by CFFI Modified: branches/graphic-forms-newtypes/src/uitoolkit/system/user32.lisp ============================================================================== --- branches/graphic-forms-newtypes/src/uitoolkit/system/user32.lisp (original) +++ branches/graphic-forms-newtypes/src/uitoolkit/system/user32.lisp Thu Mar 29 20:05:44 2007 @@ -34,7 +34,9 @@ (in-package :graphic-forms.uitoolkit.system) (eval-when (:compile-toplevel :load-toplevel :execute) - (use-package :cffi)) + (use-package :cffi) +#+cffi-features:no-stdcall + (error "Graphic-Forms requires stdcall support enabled in CFFI.")) (load-foreign-library "user32.dll") @@ -206,7 +208,6 @@ (hwnd HANDLE) (ps LPTR)) -#-cffi-features:no-stdcall (defcfun ("EnumChildWindows" enum-child-windows :cconv :stdcall) INT @@ -214,15 +215,6 @@ (func :pointer) (lparam LPARAM)) -#+lispworks -(fli:define-foreign-function - (enum-child-windows "EnumChildWindows") - ((hwnd :pointer) - (func :pointer) - (lparam :long)) - :result-type :int) - -#-cffi-features:no-stdcall (defcfun ("EnumDisplayMonitors" enum-display-monitors :cconv :stdcall) INT @@ -231,16 +223,6 @@ (enumproc LPTR) (data LPARAM)) -#+lispworks -(fli:define-foreign-function - (enum-display-monitors "EnumDisplayMonitors") - ((hdc :pointer) - (cliprect :pointer) - (enumproc :pointer) - (data :long)) - :result-type :int) - -#-cffi-features:no-stdcall (defcfun ("EnumThreadWindows" enum-thread-windows :cconv :stdcall) INT @@ -248,14 +230,6 @@ (func :pointer) (lparam LPARAM)) -#+lispworks -(fli:define-foreign-function - (enum-thread-windows "EnumThreadWindows") - ((threadid (:unsigned :long)) - (func :pointer) - (lparam :long)) - :result-type :int) - (defcfun ("GetAncestor" get-ancestor) HANDLE Modified: branches/graphic-forms-newtypes/src/uitoolkit/widgets/display.lisp ============================================================================== --- branches/graphic-forms-newtypes/src/uitoolkit/widgets/display.lisp (original) +++ branches/graphic-forms-newtypes/src/uitoolkit/widgets/display.lisp Thu Mar 29 20:05:44 2007 @@ -37,30 +37,16 @@ ;;; helper functions ;;; -#-cffi-features:no-stdcall (cffi:defcallback (display-visitor :cconv :stdcall) gfs::BOOL ((hmonitor :pointer) (hdc :pointer) (monitorrect :pointer) (data gfs::LPARAM)) (declare (ignore hdc monitorrect)) (call-display-visitor-func (thread-context) hmonitor data) 1) -#+lispworks -(fli:define-foreign-callable - ("display_visitor" :result-type :integer :calling-convention :stdcall) - ((hmonitor :pointer) - (hdc :pointer) - (monitorrect :pointer) - (data :long)) - (declare (ignore hdc monitorrect)) - (call-display-visitor-func (thread-context) hmonitor data) - 1) - (defun query-display-info (hmonitor) (let ((info nil)) (cffi:with-foreign-object (mi-ptr 'gfs::monitorinfoex) - (cffi:with-foreign-slots ((gfs::cbsize gfs::monitor gfs::work - gfs::flags gfs::device) - mi-ptr gfs::monitorinfoex) + (cffi:with-foreign-slots ((gfs::cbsize gfs::flags) mi-ptr gfs::monitorinfoex) (setf gfs::cbsize (cffi:foreign-type-size 'gfs::monitorinfoex)) (if (zerop (gfs::get-monitor-info hmonitor mi-ptr)) (error 'gfs:win32-warning :detail "get-monitor-info failed")) @@ -88,13 +74,9 @@ (let ((tc (thread-context))) (setf (display-visitor-func tc) func) (unwind-protect -#-cffi-features:no-stdcall (gfs::enum-display-monitors (cffi:null-pointer) (cffi:null-pointer) (cffi:callback display-visitor) 0) -#+lispworks - (let ((ptr (fli:make-pointer :address 0))) - (gfs::enum-display-monitors ptr ptr (fli:make-pointer :symbol-name "display_visitor") 0)) (setf (display-visitor-func tc) nil)) (let ((tmp (reverse (display-visitor-results tc)))) (setf (display-visitor-results tc) nil) @@ -109,7 +91,6 @@ (defun obtain-primary-display () (find-if #'primary-p (obtain-displays))) -#-cffi-features:no-stdcall (cffi:defcallback (top-level-window-visitor :cconv :stdcall) gfs::BOOL ((hwnd :pointer) (lparam gfs::LPARAM)) (declare (ignore lparam)) @@ -119,14 +100,6 @@ (call-top-level-visitor-func tc win))) 1) -#+lispworks -(fli:define-foreign-callable - ("top_level_window_visitor" :result-type :integer :calling-convention :stdcall) - ((hwnd :pointer) - (lparam :long)) - (top-level-window-visitor hwnd lparam) - 1) - (defun maptoplevels (func) ;; ;; func should expect one parameter: @@ -135,14 +108,9 @@ (let ((tc (thread-context))) (setf (top-level-visitor-func tc) func) (unwind-protect -#-cffi-features:no-stdcall (gfs::enum-thread-windows (gfs::get-window-thread-process-id (utility-hwnd tc) (cffi:null-pointer)) (cffi:callback top-level-window-visitor) 0) -#+lispworks - (gfs::enum-thread-windows (gfs::get-window-thread-process-id (utility-hwnd tc) (cffi:null-pointer)) - (fli:make-pointer :symbol-name "top_level_window_visitor") - 0) (setf (top-level-visitor-func tc) nil)) (let ((tmp (reverse (top-level-visitor-results tc)))) (setf (top-level-visitor-results tc) nil) Modified: branches/graphic-forms-newtypes/src/uitoolkit/widgets/thread-context.lisp ============================================================================== --- branches/graphic-forms-newtypes/src/uitoolkit/widgets/thread-context.lisp (original) +++ branches/graphic-forms-newtypes/src/uitoolkit/widgets/thread-context.lisp Thu Mar 29 20:05:44 2007 @@ -1,7 +1,7 @@ ;;;; ;;;; thread-context.lisp ;;;; -;;;; Copyright (C) 2006, Jack D. Unrue +;;;; Copyright (C) 2006-2007, Jack D. Unrue ;;;; All rights reserved. ;;;; ;;;; Redistribution and use in source and binary forms, with or without Modified: branches/graphic-forms-newtypes/src/uitoolkit/widgets/window.lisp ============================================================================== --- branches/graphic-forms-newtypes/src/uitoolkit/widgets/window.lisp (original) +++ branches/graphic-forms-newtypes/src/uitoolkit/widgets/window.lisp Thu Mar 29 20:05:44 2007 @@ -70,7 +70,6 @@ (if (and parent (layout-of parent)) (append-layout-item (layout-of parent) win))))) -#-cffi-features:no-stdcall (cffi:defcallback (child-window-visitor :cconv :stdcall) gfs::BOOL ((hwnd :pointer) (lparam gfs::LPARAM)) (let* ((tc (thread-context)) @@ -83,14 +82,6 @@ (setf (child-visitor-results tc) (push (call-child-visitor-func tc parent child) tmp-list)))))) 1) -#+lispworks -(fli:define-foreign-callable - ("child_window_visitor" :result-type :integer :calling-convention :stdcall) - ((hwnd :pointer) - (lparam :long)) - (child-window-visitor hwnd lparam) - 1) - (defun window-class-registered-p (class-name) (cffi:with-foreign-string (str-ptr class-name) (cffi:with-foreign-object (wc-ptr 'gfs::wndclassex) @@ -326,14 +317,9 @@ (hwnd (gfs:handle self))) (setf (child-visitor-func tc) func) (unwind-protect -#-cffi-features:no-stdcall (gfs::enum-child-windows hwnd (cffi:callback child-window-visitor) (cffi:pointer-address hwnd)) -#+lispworks - (gfs::enum-child-windows hwnd - (fli:make-pointer :symbol-name "child_window_visitor") - (cffi:pointer-address hwnd)) (setf (child-visitor-func tc) nil)) (let ((tmp (reverse (child-visitor-results tc)))) (setf (child-visitor-results tc) nil)

1 0

[graphic-forms-cvs] r447 - trunk/src/uitoolkit/widgets
by junrue＠common-lisp.net 28 Mar '07

28 Mar '07

Author: junrue Date: Wed Mar 28 00:26:10 2007 New Revision: 447 Modified: trunk/src/uitoolkit/widgets/thread-context.lisp trunk/src/uitoolkit/widgets/widget-utils.lisp Log: revised thread context and startup implementation to use Allegro MT support Modified: trunk/src/uitoolkit/widgets/thread-context.lisp ============================================================================== --- trunk/src/uitoolkit/widgets/thread-context.lisp (original) +++ trunk/src/uitoolkit/widgets/thread-context.lisp Wed Mar 28 00:26:10 2007 @@ -65,12 +65,10 @@ ;; ;; TODO: change this once we understand SBCL MT support ;; -;; TODO: support Allegro MT -;; -#+(or allegro clisp sbcl) +#+(or clisp sbcl) (defvar *the-thread-context* nil) -#+(or allegro clisp sbcl) +#+(or clisp sbcl) (defun thread-context () (when (null *the-thread-context*) (setf *the-thread-context* (make-instance 'thread-context)) @@ -81,13 +79,39 @@ (format *error-output* "~a~%" e)))) *the-thread-context*) -#+(or allegro clisp sbcl) +#+(or clisp sbcl) (defun dispose-thread-context () (let ((hwnd (utility-hwnd *the-thread-context*))) (unless (gfs:null-handle-p hwnd) (gfs::destroy-window hwnd))) (setf *the-thread-context* nil)) +#+allegro +(eval-when (:compile-top-level :load-top-level :execute) (require :process)) + +#+allegro +(defun thread-context () + (let ((tc (getf (mp:process-property-list mp:*current-process*) 'thread-context))) + (when (null tc) + (setf tc (make-instance 'thread-context)) + (setf (getf (mp:process-property-list mp:*current-process*) 'thread-context) tc) + (handler-case + (init-utility-hwnd tc) + (gfs:win32-error (e) + (setf (getf (mp:process-property-list mp:*current-process*) 'thread-context) nil) + (format *error-output* "~a~%" e)))) + tc)) + +#+allegro +(defun dispose-thread-context () + (let ((tc (getf (mp:process-property-list mp:*current-process*) 'thread-context))) + (if tc + (let ((hwnd (utility-hwnd tc))) + (unless (gfs:null-handle-p hwnd) + (gfs::destroy-window hwnd))))) + (setf (getf (mp:process-property-list mp:*current-process*) 'thread-context) nil)) + + #+lispworks (defun thread-context () (let ((tc (getf (mp:process-plist mp:*current-process*) 'thread-context))) Modified: trunk/src/uitoolkit/widgets/widget-utils.lisp ============================================================================== --- trunk/src/uitoolkit/widgets/widget-utils.lisp (original) +++ trunk/src/uitoolkit/widgets/widget-utils.lisp Wed Mar 28 00:26:10 2007 @@ -87,12 +87,22 @@ (translate-and-dispatch msg-ptr) nil))) -#+(or allegro clisp sbcl) +#+(or clisp sbcl) (defun startup (thread-name start-fn) (declare (ignore thread-name)) (funcall start-fn) (message-loop #'default-message-filter)) +#+allegro +(eval-when (:compile-top-level :load-top-level :execute) (require :process)) + +#+allegro +(defun startup (thread-name start-fn) + (mp:process-run-function thread-name + (lambda () + (funcall start-fn) + (message-loop #'default-message-filter)))) + #+lispworks (defun startup (thread-name start-fn) (hcl:add-special-free-action 'gfs::native-object-special-action)

1 0

[graphic-forms-cvs] r446 - branches/graphic-forms-newtypes/src/uitoolkit/widgets
by junrue＠common-lisp.net 28 Mar '07

28 Mar '07

Author: junrue Date: Wed Mar 28 00:26:03 2007 New Revision: 446 Modified: branches/graphic-forms-newtypes/src/uitoolkit/widgets/thread-context.lisp branches/graphic-forms-newtypes/src/uitoolkit/widgets/widget-utils.lisp Log: revised thread context and startup implementation to use Allegro MT support Modified: branches/graphic-forms-newtypes/src/uitoolkit/widgets/thread-context.lisp ============================================================================== --- branches/graphic-forms-newtypes/src/uitoolkit/widgets/thread-context.lisp (original) +++ branches/graphic-forms-newtypes/src/uitoolkit/widgets/thread-context.lisp Wed Mar 28 00:26:03 2007 @@ -65,12 +65,10 @@ ;; ;; TODO: change this once we understand SBCL MT support ;; -;; TODO: support Allegro MT -;; -#+(or allegro clisp sbcl) +#+(or clisp sbcl) (defvar *the-thread-context* nil) -#+(or allegro clisp sbcl) +#+(or clisp sbcl) (defun thread-context () (when (null *the-thread-context*) (setf *the-thread-context* (make-instance 'thread-context)) @@ -81,13 +79,39 @@ (format *error-output* "~a~%" e)))) *the-thread-context*) -#+(or allegro clisp sbcl) +#+(or clisp sbcl) (defun dispose-thread-context () (let ((hwnd (utility-hwnd *the-thread-context*))) (unless (gfs:null-handle-p hwnd) (gfs::destroy-window hwnd))) (setf *the-thread-context* nil)) +#+allegro +(eval-when (:compile-top-level :load-top-level :execute) (require :process)) + +#+allegro +(defun thread-context () + (let ((tc (getf (mp:process-property-list mp:*current-process*) 'thread-context))) + (when (null tc) + (setf tc (make-instance 'thread-context)) + (setf (getf (mp:process-property-list mp:*current-process*) 'thread-context) tc) + (handler-case + (init-utility-hwnd tc) + (gfs:win32-error (e) + (setf (getf (mp:process-property-list mp:*current-process*) 'thread-context) nil) + (format *error-output* "~a~%" e)))) + tc)) + +#+allegro +(defun dispose-thread-context () + (let ((tc (getf (mp:process-property-list mp:*current-process*) 'thread-context))) + (if tc + (let ((hwnd (utility-hwnd tc))) + (unless (gfs:null-handle-p hwnd) + (gfs::destroy-window hwnd))))) + (setf (getf (mp:process-property-list mp:*current-process*) 'thread-context) nil)) + + #+lispworks (defun thread-context () (let ((tc (getf (mp:process-plist mp:*current-process*) 'thread-context))) Modified: branches/graphic-forms-newtypes/src/uitoolkit/widgets/widget-utils.lisp ============================================================================== --- branches/graphic-forms-newtypes/src/uitoolkit/widgets/widget-utils.lisp (original) +++ branches/graphic-forms-newtypes/src/uitoolkit/widgets/widget-utils.lisp Wed Mar 28 00:26:03 2007 @@ -87,12 +87,22 @@ (translate-and-dispatch msg-ptr) nil))) -#+(or allegro clisp sbcl) +#+(or clisp sbcl) (defun startup (thread-name start-fn) (declare (ignore thread-name)) (funcall start-fn) (message-loop #'default-message-filter)) +#+allegro +(eval-when (:compile-top-level :load-top-level :execute) (require :process)) + +#+allegro +(defun startup (thread-name start-fn) + (mp:process-run-function thread-name + (lambda () + (funcall start-fn) + (message-loop #'default-message-filter)))) + #+lispworks (defun startup (thread-name start-fn) (hcl:add-special-free-action 'gfs::native-object-special-action)

1 0

[graphic-forms-cvs] r445 - trunk/docs/website
by junrue＠common-lisp.net 28 Mar '07

28 Mar '07

Author: junrue Date: Wed Mar 28 00:25:10 2007 New Revision: 445 Modified: trunk/docs/website/index.html Log: updated LispWorks version Modified: trunk/docs/website/index.html ============================================================================== --- trunk/docs/website/index.html (original) +++ trunk/docs/website/index.html Wed Mar 28 00:25:10 2007 @@ -49,8 +49,8 @@ <ul> <li><a href="http://franz.com/">Allegro CL 8.0</a> or later</li> <li><a href="http://clisp.cons.org/">CLISP 2.40</a> or later</li> - <li><a href="http://www.lispworks.com/">LispWorks 4.4.6</a></li> - <li><a href="http://www.sbcl.org/">SBCL 0.9.15</a> or later</li> + <li><a href="http://www.lispworks.com/">LispWorks 5.0.1</a></li> + <li><a href="http://www.sbcl.org/">SBCL 1.0.2</a> or later</li> </ul> <h3 id="mailinglists">Mailing Lists</h3>

1 0

[graphic-forms-cvs] r444 - branches/graphic-forms-newtypes/docs/website
by junrue＠common-lisp.net 28 Mar '07

28 Mar '07

Author: junrue Date: Wed Mar 28 00:24:46 2007 New Revision: 444 Modified: branches/graphic-forms-newtypes/docs/website/index.html Log: updated LispWorks version Modified: branches/graphic-forms-newtypes/docs/website/index.html ============================================================================== --- branches/graphic-forms-newtypes/docs/website/index.html (original) +++ branches/graphic-forms-newtypes/docs/website/index.html Wed Mar 28 00:24:46 2007 @@ -49,8 +49,8 @@ <ul> <li><a href="http://franz.com/">Allegro CL 8.0</a> or later</li> <li><a href="http://clisp.cons.org/">CLISP 2.40</a> or later</li> - <li><a href="http://www.lispworks.com/">LispWorks 4.4.6</a></li> - <li><a href="http://www.sbcl.org/">SBCL 0.9.15</a> or later</li> + <li><a href="http://www.lispworks.com/">LispWorks 5.0.1</a></li> + <li><a href="http://www.sbcl.org/">SBCL 1.0.2</a> or later</li> </ul> <h3 id="mailinglists">Mailing Lists</h3>

1 0

[graphic-forms-cvs] r443 - in trunk: . src/uitoolkit/system src/uitoolkit/widgets
by junrue＠common-lisp.net 19 Mar '07

19 Mar '07

Author: junrue Date: Sun Mar 18 23:25:52 2007 New Revision: 443 Modified: trunk/NEWS.txt trunk/src/uitoolkit/system/user32.lisp trunk/src/uitoolkit/widgets/display.lisp trunk/src/uitoolkit/widgets/window.lisp Log: revised stdcall callback declarations to take advantage of built-in CFFI support Modified: trunk/NEWS.txt ============================================================================== --- trunk/NEWS.txt (original) +++ trunk/NEWS.txt Sun Mar 18 23:25:52 2007 @@ -1,5 +1,5 @@ -. Latest CFFI is required to take advantage of newly-added support for the +. Latest CFFI is required to take advantage of built-in support for the stdcall calling convention (FIXME: change checked in this past Feb., need to narrow down which snapshot actually has it). @@ -8,12 +8,27 @@ . Ported the library to Allegro CL 8.0. +. Upgraded to LispWorks 5.0.1 (note: 4.4.6 is no longer supported) + . Implemented a new graphics context function GFG:CLEAR that is a convenient way to fill a window or image with a background color. . GFS:OBTAIN-SYSTEM-METRICS now includes version information for comctl32.dll and shell32.dll. +The README.txt file in the release zip file also has additional important +information about this release. + +Download the release zip file here: +http://prdownloads.sourceforge.net/graphic-forms/graphic-forms-0.8.0.zip?download + +The project website is: +http://common-lisp.net/project/graphic-forms/ + +Jack Unrue +jdunrue (at) gmail (dot) com +xx xxxxxxx 2007 + ============================================================================== Release 0.7.0 of Graphic-Forms, a Common Lisp library for Windows GUI Modified: trunk/src/uitoolkit/system/user32.lisp ============================================================================== --- trunk/src/uitoolkit/system/user32.lisp (original) +++ trunk/src/uitoolkit/system/user32.lisp Sun Mar 18 23:25:52 2007 @@ -1,7 +1,7 @@ ;;;; ;;;; user32.lisp ;;;; -;;;; Copyright (C) 2006, Jack D. Unrue +;;;; Copyright (C) 2006-2007, Jack D. Unrue ;;;; All rights reserved. ;;;; ;;;; Redistribution and use in source and binary forms, with or without @@ -206,39 +206,13 @@ (hwnd HANDLE) (ps LPTR)) -;;; FIXME: uncomment this when CFFI callbacks can -;;; be tagged as stdcall or cdecl (only the latter -;;; is supported as of 0.9.0) -;;; -#| +#-cffi-features:no-stdcall (defcfun - ("EnumChildWindows" enum-child-windows) - BOOL + ("EnumChildWindows" enum-child-windows :cconv :stdcall) + INT (hwnd HANDLE) (func :pointer) (lparam LPARAM)) -|# - -#+allegro -(ff:def-foreign-call (enum-child-windows "EnumChildWindows") - ((hwnd :foreign-address) - (func :foreign-address) - (lparam :long))) - -#+clisp -(ffi:def-call-out enum-child-windows - (:name "EnumChildWindows") - (:library "user32.dll") - (:language :stdc) - (:arguments (hwnd ffi:c-pointer) - (func (ffi:c-function - (:arguments - (hwnd ffi:c-pointer) - (lparam ffi:long)) - (:return-type ffi:int) - (:language :stdc-stdcall))) - (lparam ffi:long)) - (:return-type ffi:int)) #+lispworks (fli:define-foreign-function @@ -248,50 +222,14 @@ (lparam :long)) :result-type :int) -#+sbcl -(sb-alien:define-alien-routine ("EnumChildWindows" enum-child-windows) sb-alien:int - (hwnd sb-alien:system-area-pointer) - (func enumchildproc) - (lparam sb-alien:long)) - -;;; FIXME: uncomment this when CFFI callbacks can -;;; be tagged as stdcall or cdecl (only the latter -;;; is supported as of 0.9.0) -;;; -#| +#-cffi-features:no-stdcall (defcfun - ("EnumDisplayMonitors" enum-display-monitors) - BOOL + ("EnumDisplayMonitors" enum-display-monitors :cconv :stdcall) + INT (hdc HANDLE) (cliprect LPTR) (enumproc LPTR) (data LPARAM)) -|# - -#+allegro -(ff:def-foreign-call (enum-display-monitors "EnumDisplayMonitors") - ((hdc :foreign-address) - (cliprect :foreign-address) - (func :foreign-address) - (data :foreign-address))) - -#+clisp -(ffi:def-call-out enum-display-monitors - (:name "EnumDisplayMonitors") - (:library "user32.dll") - (:language :stdc) - (:arguments (hdc ffi:c-pointer) - (cliprect ffi:c-pointer) - (func (ffi:c-function - (:arguments - (hmonitor ffi:c-pointer) - (hdc ffi:c-pointer) - (monitorrect ffi:c-pointer) - (data ffi:long)) - (:return-type ffi:int) - (:language :stdc-stdcall))) - (data ffi:c-pointer)) - (:return-type ffi:int)) #+lispworks (fli:define-foreign-function @@ -302,46 +240,13 @@ (data :long)) :result-type :int) -#+sbcl -(sb-alien:define-alien-routine ("EnumDisplayMonitors" enum-display-monitors) sb-alien:int - (hdc sb-alien:system-area-pointer) - (rect sb-alien:system-area-pointer) - (func monitorsenumproc) - (lparam sb-alien:long)) - -;;; FIXME: uncomment this when CFFI callbacks can -;;; be tagged as stdcall or cdecl (only the latter -;;; is supported as of 0.9.0) -;;; -#| +#-cffi-features:no-stdcall (defcfun - ("EnumThreadWindows" enum-thread-windows) - BOOL + ("EnumThreadWindows" enum-thread-windows :cconv :stdcall) + INT (threadid DWORD) (func :pointer) (lparam LPARAM)) -|# - -#+allegro -(ff:def-foreign-call (enum-thread-windows "EnumThreadWindows") - ((thread-id :unsigned-long) - (func :foreign-address) - (lparam :long))) - -#+clisp -(ffi:def-call-out enum-thread-windows - (:name "EnumThreadWindows") - (:library "user32.dll") - (:language :stdc) - (:arguments (threadid ffi:ulong) - (func (ffi:c-function - (:arguments - (hwnd ffi:c-pointer) - (lparam ffi:long)) - (:return-type ffi:int) - (:language :stdc-stdcall))) - (lparam ffi:long)) - (:return-type ffi:int)) #+lispworks (fli:define-foreign-function @@ -351,12 +256,6 @@ (lparam :long)) :result-type :int) -#+sbcl -(sb-alien:define-alien-routine ("EnumThreadWindows" enum-thread-windows) sb-alien:int - (id sb-alien:unsigned-long) - (func enumthreadwndproc) - (lparam sb-alien:unsigned-long)) - (defcfun ("GetAncestor" get-ancestor) HANDLE Modified: trunk/src/uitoolkit/widgets/display.lisp ============================================================================== --- trunk/src/uitoolkit/widgets/display.lisp (original) +++ trunk/src/uitoolkit/widgets/display.lisp Sun Mar 18 23:25:52 2007 @@ -1,7 +1,7 @@ ;;;; ;;;; display.lisp ;;;; -;;;; Copyright (C) 2006, Jack D. Unrue +;;;; Copyright (C) 2006-2007, Jack D. Unrue ;;;; All rights reserved. ;;;; ;;;; Redistribution and use in source and binary forms, with or without @@ -37,23 +37,13 @@ ;;; helper functions ;;; -(defun display-visitor (hmonitor hdc monitorrect data) +#-cffi-features:no-stdcall +(cffi:defcallback (display-visitor :cconv :stdcall) gfs::BOOL + ((hmonitor :pointer) (hdc :pointer) (monitorrect :pointer) (data gfs::LPARAM)) (declare (ignore hdc monitorrect)) (call-display-visitor-func (thread-context) hmonitor data) 1) -#+allegro -(eval-when (:compile-toplevel :load-toplevel :execute) - (ff:defun-foreign-callable enum-display-monitors-callback ((hmonitor :foreign-address) - (hdc :foreign-address) - (monitorrect :foreign-address) - (data :long)) - (declare (:convention :stdcall)) - (call-display-visitor-func (thread-context) hmonitor data)) - - (defvar *monitors-enum-proc* - (ff:register-foreign-callable 'enum-display-monitors-callback :reuse t))) - #+lispworks (fli:define-foreign-callable ("display_visitor" :result-type :integer :calling-convention :stdcall) @@ -65,17 +55,6 @@ (call-display-visitor-func (thread-context) hmonitor data) 1) -#+sbcl -(defvar *monitors-enum-proc* - (sb-alien::alien-callback - (sb-alien:function sb-alien:int - sb-alien:system-area-pointer - sb-alien:system-area-pointer - sb-alien:system-area-pointer - sb-alien:long) - #'display-visitor - :stdcall)) - (defun query-display-info (hmonitor) (let ((info nil)) (cffi:with-foreign-object (mi-ptr 'gfs::monitorinfoex) @@ -109,17 +88,13 @@ (let ((tc (thread-context))) (setf (display-visitor-func tc) func) (unwind-protect -#+allegro - (let ((ptr (cffi:null-pointer))) - (gfs::enum-display-monitors ptr ptr (cffi:pointer-address *monitors-enum-proc*) 0)) -#+clisp - (gfs::enum-display-monitors nil nil #'display-visitor nil) +#-cffi-features:no-stdcall + (gfs::enum-display-monitors (cffi:null-pointer) + (cffi:null-pointer) + (cffi:callback display-visitor) 0) #+lispworks (let ((ptr (fli:make-pointer :address 0))) (gfs::enum-display-monitors ptr ptr (fli:make-pointer :symbol-name "display_visitor") 0)) -#+sbcl - (let ((ptr (cffi:null-pointer))) - (gfs::enum-display-monitors ptr ptr (sb-alien:alien-sap *monitors-enum-proc*) 0)) (setf (display-visitor-func tc) nil)) (let ((tmp (reverse (display-visitor-results tc)))) (setf (display-visitor-results tc) nil) @@ -134,7 +109,9 @@ (defun obtain-primary-display () (find-if #'primary-p (obtain-displays))) -(defun top-level-window-visitor (hwnd lparam) +#-cffi-features:no-stdcall +(cffi:defcallback (top-level-window-visitor :cconv :stdcall) gfs::BOOL + ((hwnd :pointer) (lparam gfs::LPARAM)) (declare (ignore lparam)) (let* ((tc (thread-context)) (win (get-widget tc hwnd))) @@ -142,16 +119,6 @@ (call-top-level-visitor-func tc win))) 1) -#+allegro -(eval-when (:compile-toplevel :load-toplevel :execute) - (ff:defun-foreign-callable enum-thread-windows-callback ((hwnd :foreign-address) - (lparam :long)) - (declare (:convention :stdcall)) - (top-level-window-visitor hwnd lparam)) - - (defvar *enum-thread-wnd-proc* - (ff:register-foreign-callable 'enum-thread-windows-callback :reuse t))) - #+lispworks (fli:define-foreign-callable ("top_level_window_visitor" :result-type :integer :calling-convention :stdcall) @@ -160,15 +127,6 @@ (top-level-window-visitor hwnd lparam) 1) -#+sbcl -(defvar *enum-thread-wnd-proc* - (sb-alien::alien-callback - (sb-alien:function sb-alien:int - sb-alien:system-area-pointer - sb-alien:long) - #'top-level-window-visitor - :stdcall)) - (defun maptoplevels (func) ;; ;; func should expect one parameter: @@ -177,22 +135,14 @@ (let ((tc (thread-context))) (setf (top-level-visitor-func tc) func) (unwind-protect -#+allegro - (gfs::enum-child-windows (gfs::get-window-thread-process-id (utility-hwnd tc) (cffi:null-pointer)) - (cffi:pointer-address *enum-thread-wnd-proc*) - 0) -#+clisp - (gfs::enum-child-windows (gfs::get-window-thread-process-id (utility-hwnd tc) (cffi:null-pointer)) - #'top-level-window-visitor +#-cffi-features:no-stdcall + (gfs::enum-thread-windows (gfs::get-window-thread-process-id (utility-hwnd tc) (cffi:null-pointer)) + (cffi:callback top-level-window-visitor) 0) #+lispworks (gfs::enum-thread-windows (gfs::get-window-thread-process-id (utility-hwnd tc) (cffi:null-pointer)) (fli:make-pointer :symbol-name "top_level_window_visitor") 0) -#+sbcl - (gfs::enum-child-windows (gfs::get-window-thread-process-id (utility-hwnd tc) (cffi:null-pointer)) - (sb-alien:alien-sap *enum-thread-wnd-proc*) - 0) (setf (top-level-visitor-func tc) nil)) (let ((tmp (reverse (top-level-visitor-results tc)))) (setf (top-level-visitor-results tc) nil) Modified: trunk/src/uitoolkit/widgets/window.lisp ============================================================================== --- trunk/src/uitoolkit/widgets/window.lisp (original) +++ trunk/src/uitoolkit/widgets/window.lisp Sun Mar 18 23:25:52 2007 @@ -70,7 +70,9 @@ (if (and parent (layout-of parent)) (append-layout-item (layout-of parent) win))))) -(defun child-window-visitor (hwnd lparam) +#-cffi-features:no-stdcall +(cffi:defcallback (child-window-visitor :cconv :stdcall) gfs::BOOL + ((hwnd :pointer) (lparam gfs::LPARAM)) (let* ((tc (thread-context)) (child (get-widget tc hwnd)) (parent (get-widget tc (cffi:make-pointer lparam)))) @@ -81,16 +83,6 @@ (setf (child-visitor-results tc) (push (call-child-visitor-func tc parent child) tmp-list)))))) 1) -#+allegro -(eval-when (:compile-toplevel :load-toplevel :execute) - (ff:defun-foreign-callable enum-child-windows-callback ((hwnd :foreign-address) - (lparam :long)) - (declare (:convention :stdcall)) - (child-window-visitor hwnd lparam)) - - (defvar *enum-child-proc* - (ff:register-foreign-callable 'enum-child-windows-callback :reuse t))) - #+lispworks (fli:define-foreign-callable ("child_window_visitor" :result-type :integer :calling-convention :stdcall) @@ -99,13 +91,6 @@ (child-window-visitor hwnd lparam) 1) -#+sbcl -(defvar *enum-child-proc* - (sb-alien::alien-callback - (sb-alien:function sb-alien:int sb-alien:system-area-pointer sb-alien:long) - #'child-window-visitor - :stdcall)) - (defun window-class-registered-p (class-name) (cffi:with-foreign-string (str-ptr class-name) (cffi:with-foreign-object (wc-ptr 'gfs::wndclassex) @@ -341,22 +326,14 @@ (hwnd (gfs:handle self))) (setf (child-visitor-func tc) func) (unwind-protect -#+allegro +#-cffi-features:no-stdcall (gfs::enum-child-windows hwnd - (cffi:pointer-address *enum-child-proc*) - (cffi:pointer-address hwnd)) -#+clisp - (gfs::enum-child-windows hwnd - #'child-window-visitor + (cffi:callback child-window-visitor) (cffi:pointer-address hwnd)) #+lispworks (gfs::enum-child-windows hwnd (fli:make-pointer :symbol-name "child_window_visitor") (cffi:pointer-address hwnd)) -#+sbcl - (gfs::enum-child-windows hwnd - (sb-alien:alien-sap *enum-child-proc*) - (cffi:pointer-address hwnd)) (setf (child-visitor-func tc) nil)) (let ((tmp (reverse (child-visitor-results tc)))) (setf (child-visitor-results tc) nil)

1 0

[graphic-forms-cvs] r442 - in branches/graphic-forms-newtypes: . src/uitoolkit/system src/uitoolkit/widgets
by junrue＠common-lisp.net 19 Mar '07

19 Mar '07

Author: junrue Date: Sun Mar 18 23:25:30 2007 New Revision: 442 Modified: branches/graphic-forms-newtypes/NEWS.txt branches/graphic-forms-newtypes/src/uitoolkit/system/user32.lisp branches/graphic-forms-newtypes/src/uitoolkit/widgets/display.lisp branches/graphic-forms-newtypes/src/uitoolkit/widgets/window.lisp Log: revised stdcall callback declarations to take advantage of built-in CFFI support Modified: branches/graphic-forms-newtypes/NEWS.txt ============================================================================== --- branches/graphic-forms-newtypes/NEWS.txt (original) +++ branches/graphic-forms-newtypes/NEWS.txt Sun Mar 18 23:25:30 2007 @@ -1,5 +1,5 @@ -. Latest CFFI is required to take advantage of newly-added support for the +. Latest CFFI is required to take advantage of built-in support for the stdcall calling convention (FIXME: change checked in this past Feb., need to narrow down which snapshot actually has it). @@ -8,12 +8,27 @@ . Ported the library to Allegro CL 8.0. +. Upgraded to LispWorks 5.0.1 (note: 4.4.6 is no longer supported) + . Implemented a new graphics context function GFG:CLEAR that is a convenient way to fill a window or image with a background color. . GFS:OBTAIN-SYSTEM-METRICS now includes version information for comctl32.dll and shell32.dll. +The README.txt file in the release zip file also has additional important +information about this release. + +Download the release zip file here: +http://prdownloads.sourceforge.net/graphic-forms/graphic-forms-0.8.0.zip?download + +The project website is: +http://common-lisp.net/project/graphic-forms/ + +Jack Unrue +jdunrue (at) gmail (dot) com +xx xxxxxxx 2007 + ============================================================================== Release 0.7.0 of Graphic-Forms, a Common Lisp library for Windows GUI Modified: branches/graphic-forms-newtypes/src/uitoolkit/system/user32.lisp ============================================================================== --- branches/graphic-forms-newtypes/src/uitoolkit/system/user32.lisp (original) +++ branches/graphic-forms-newtypes/src/uitoolkit/system/user32.lisp Sun Mar 18 23:25:30 2007 @@ -1,7 +1,7 @@ ;;;; ;;;; user32.lisp ;;;; -;;;; Copyright (C) 2006, Jack D. Unrue +;;;; Copyright (C) 2006-2007, Jack D. Unrue ;;;; All rights reserved. ;;;; ;;;; Redistribution and use in source and binary forms, with or without @@ -206,39 +206,13 @@ (hwnd HANDLE) (ps LPTR)) -;;; FIXME: uncomment this when CFFI callbacks can -;;; be tagged as stdcall or cdecl (only the latter -;;; is supported as of 0.9.0) -;;; -#| +#-cffi-features:no-stdcall (defcfun - ("EnumChildWindows" enum-child-windows) - BOOL + ("EnumChildWindows" enum-child-windows :cconv :stdcall) + INT (hwnd HANDLE) (func :pointer) (lparam LPARAM)) -|# - -#+allegro -(ff:def-foreign-call (enum-child-windows "EnumChildWindows") - ((hwnd :foreign-address) - (func :foreign-address) - (lparam :long))) - -#+clisp -(ffi:def-call-out enum-child-windows - (:name "EnumChildWindows") - (:library "user32.dll") - (:language :stdc) - (:arguments (hwnd ffi:c-pointer) - (func (ffi:c-function - (:arguments - (hwnd ffi:c-pointer) - (lparam ffi:long)) - (:return-type ffi:int) - (:language :stdc-stdcall))) - (lparam ffi:long)) - (:return-type ffi:int)) #+lispworks (fli:define-foreign-function @@ -248,50 +222,14 @@ (lparam :long)) :result-type :int) -#+sbcl -(sb-alien:define-alien-routine ("EnumChildWindows" enum-child-windows) sb-alien:int - (hwnd sb-alien:system-area-pointer) - (func enumchildproc) - (lparam sb-alien:long)) - -;;; FIXME: uncomment this when CFFI callbacks can -;;; be tagged as stdcall or cdecl (only the latter -;;; is supported as of 0.9.0) -;;; -#| +#-cffi-features:no-stdcall (defcfun - ("EnumDisplayMonitors" enum-display-monitors) - BOOL + ("EnumDisplayMonitors" enum-display-monitors :cconv :stdcall) + INT (hdc HANDLE) (cliprect LPTR) (enumproc LPTR) (data LPARAM)) -|# - -#+allegro -(ff:def-foreign-call (enum-display-monitors "EnumDisplayMonitors") - ((hdc :foreign-address) - (cliprect :foreign-address) - (func :foreign-address) - (data :foreign-address))) - -#+clisp -(ffi:def-call-out enum-display-monitors - (:name "EnumDisplayMonitors") - (:library "user32.dll") - (:language :stdc) - (:arguments (hdc ffi:c-pointer) - (cliprect ffi:c-pointer) - (func (ffi:c-function - (:arguments - (hmonitor ffi:c-pointer) - (hdc ffi:c-pointer) - (monitorrect ffi:c-pointer) - (data ffi:long)) - (:return-type ffi:int) - (:language :stdc-stdcall))) - (data ffi:c-pointer)) - (:return-type ffi:int)) #+lispworks (fli:define-foreign-function @@ -302,46 +240,13 @@ (data :long)) :result-type :int) -#+sbcl -(sb-alien:define-alien-routine ("EnumDisplayMonitors" enum-display-monitors) sb-alien:int - (hdc sb-alien:system-area-pointer) - (rect sb-alien:system-area-pointer) - (func monitorsenumproc) - (lparam sb-alien:long)) - -;;; FIXME: uncomment this when CFFI callbacks can -;;; be tagged as stdcall or cdecl (only the latter -;;; is supported as of 0.9.0) -;;; -#| +#-cffi-features:no-stdcall (defcfun - ("EnumThreadWindows" enum-thread-windows) - BOOL + ("EnumThreadWindows" enum-thread-windows :cconv :stdcall) + INT (threadid DWORD) (func :pointer) (lparam LPARAM)) -|# - -#+allegro -(ff:def-foreign-call (enum-thread-windows "EnumThreadWindows") - ((thread-id :unsigned-long) - (func :foreign-address) - (lparam :long))) - -#+clisp -(ffi:def-call-out enum-thread-windows - (:name "EnumThreadWindows") - (:library "user32.dll") - (:language :stdc) - (:arguments (threadid ffi:ulong) - (func (ffi:c-function - (:arguments - (hwnd ffi:c-pointer) - (lparam ffi:long)) - (:return-type ffi:int) - (:language :stdc-stdcall))) - (lparam ffi:long)) - (:return-type ffi:int)) #+lispworks (fli:define-foreign-function @@ -351,12 +256,6 @@ (lparam :long)) :result-type :int) -#+sbcl -(sb-alien:define-alien-routine ("EnumThreadWindows" enum-thread-windows) sb-alien:int - (id sb-alien:unsigned-long) - (func enumthreadwndproc) - (lparam sb-alien:unsigned-long)) - (defcfun ("GetAncestor" get-ancestor) HANDLE Modified: branches/graphic-forms-newtypes/src/uitoolkit/widgets/display.lisp ============================================================================== --- branches/graphic-forms-newtypes/src/uitoolkit/widgets/display.lisp (original) +++ branches/graphic-forms-newtypes/src/uitoolkit/widgets/display.lisp Sun Mar 18 23:25:30 2007 @@ -1,7 +1,7 @@ ;;;; ;;;; display.lisp ;;;; -;;;; Copyright (C) 2006, Jack D. Unrue +;;;; Copyright (C) 2006-2007, Jack D. Unrue ;;;; All rights reserved. ;;;; ;;;; Redistribution and use in source and binary forms, with or without @@ -37,23 +37,13 @@ ;;; helper functions ;;; -(defun display-visitor (hmonitor hdc monitorrect data) +#-cffi-features:no-stdcall +(cffi:defcallback (display-visitor :cconv :stdcall) gfs::BOOL + ((hmonitor :pointer) (hdc :pointer) (monitorrect :pointer) (data gfs::LPARAM)) (declare (ignore hdc monitorrect)) (call-display-visitor-func (thread-context) hmonitor data) 1) -#+allegro -(eval-when (:compile-toplevel :load-toplevel :execute) - (ff:defun-foreign-callable enum-display-monitors-callback ((hmonitor :foreign-address) - (hdc :foreign-address) - (monitorrect :foreign-address) - (data :long)) - (declare (:convention :stdcall)) - (call-display-visitor-func (thread-context) hmonitor data)) - - (defvar *monitors-enum-proc* - (ff:register-foreign-callable 'enum-display-monitors-callback :reuse t))) - #+lispworks (fli:define-foreign-callable ("display_visitor" :result-type :integer :calling-convention :stdcall) @@ -65,17 +55,6 @@ (call-display-visitor-func (thread-context) hmonitor data) 1) -#+sbcl -(defvar *monitors-enum-proc* - (sb-alien::alien-callback - (sb-alien:function sb-alien:int - sb-alien:system-area-pointer - sb-alien:system-area-pointer - sb-alien:system-area-pointer - sb-alien:long) - #'display-visitor - :stdcall)) - (defun query-display-info (hmonitor) (let ((info nil)) (cffi:with-foreign-object (mi-ptr 'gfs::monitorinfoex) @@ -109,17 +88,13 @@ (let ((tc (thread-context))) (setf (display-visitor-func tc) func) (unwind-protect -#+allegro - (let ((ptr (cffi:null-pointer))) - (gfs::enum-display-monitors ptr ptr (cffi:pointer-address *monitors-enum-proc*) 0)) -#+clisp - (gfs::enum-display-monitors nil nil #'display-visitor nil) +#-cffi-features:no-stdcall + (gfs::enum-display-monitors (cffi:null-pointer) + (cffi:null-pointer) + (cffi:callback display-visitor) 0) #+lispworks (let ((ptr (fli:make-pointer :address 0))) (gfs::enum-display-monitors ptr ptr (fli:make-pointer :symbol-name "display_visitor") 0)) -#+sbcl - (let ((ptr (cffi:null-pointer))) - (gfs::enum-display-monitors ptr ptr (sb-alien:alien-sap *monitors-enum-proc*) 0)) (setf (display-visitor-func tc) nil)) (let ((tmp (reverse (display-visitor-results tc)))) (setf (display-visitor-results tc) nil) @@ -134,7 +109,9 @@ (defun obtain-primary-display () (find-if #'primary-p (obtain-displays))) -(defun top-level-window-visitor (hwnd lparam) +#-cffi-features:no-stdcall +(cffi:defcallback (top-level-window-visitor :cconv :stdcall) gfs::BOOL + ((hwnd :pointer) (lparam gfs::LPARAM)) (declare (ignore lparam)) (let* ((tc (thread-context)) (win (get-widget tc hwnd))) @@ -142,16 +119,6 @@ (call-top-level-visitor-func tc win))) 1) -#+allegro -(eval-when (:compile-toplevel :load-toplevel :execute) - (ff:defun-foreign-callable enum-thread-windows-callback ((hwnd :foreign-address) - (lparam :long)) - (declare (:convention :stdcall)) - (top-level-window-visitor hwnd lparam)) - - (defvar *enum-thread-wnd-proc* - (ff:register-foreign-callable 'enum-thread-windows-callback :reuse t))) - #+lispworks (fli:define-foreign-callable ("top_level_window_visitor" :result-type :integer :calling-convention :stdcall) @@ -160,15 +127,6 @@ (top-level-window-visitor hwnd lparam) 1) -#+sbcl -(defvar *enum-thread-wnd-proc* - (sb-alien::alien-callback - (sb-alien:function sb-alien:int - sb-alien:system-area-pointer - sb-alien:long) - #'top-level-window-visitor - :stdcall)) - (defun maptoplevels (func) ;; ;; func should expect one parameter: @@ -177,22 +135,14 @@ (let ((tc (thread-context))) (setf (top-level-visitor-func tc) func) (unwind-protect -#+allegro - (gfs::enum-child-windows (gfs::get-window-thread-process-id (utility-hwnd tc) (cffi:null-pointer)) - (cffi:pointer-address *enum-thread-wnd-proc*) - 0) -#+clisp - (gfs::enum-child-windows (gfs::get-window-thread-process-id (utility-hwnd tc) (cffi:null-pointer)) - #'top-level-window-visitor - 0) +#-cffi-features:no-stdcall + (gfs::enum-thread-windows (gfs::get-window-thread-process-id (utility-hwnd tc) (cffi:null-pointer)) + (cffi:callback top-level-window-visitor) + 0) #+lispworks (gfs::enum-thread-windows (gfs::get-window-thread-process-id (utility-hwnd tc) (cffi:null-pointer)) (fli:make-pointer :symbol-name "top_level_window_visitor") 0) -#+sbcl - (gfs::enum-child-windows (gfs::get-window-thread-process-id (utility-hwnd tc) (cffi:null-pointer)) - (sb-alien:alien-sap *enum-thread-wnd-proc*) - 0) (setf (top-level-visitor-func tc) nil)) (let ((tmp (reverse (top-level-visitor-results tc)))) (setf (top-level-visitor-results tc) nil) Modified: branches/graphic-forms-newtypes/src/uitoolkit/widgets/window.lisp ============================================================================== --- branches/graphic-forms-newtypes/src/uitoolkit/widgets/window.lisp (original) +++ branches/graphic-forms-newtypes/src/uitoolkit/widgets/window.lisp Sun Mar 18 23:25:30 2007 @@ -70,7 +70,9 @@ (if (and parent (layout-of parent)) (append-layout-item (layout-of parent) win))))) -(defun child-window-visitor (hwnd lparam) +#-cffi-features:no-stdcall +(cffi:defcallback (child-window-visitor :cconv :stdcall) gfs::BOOL + ((hwnd :pointer) (lparam gfs::LPARAM)) (let* ((tc (thread-context)) (child (get-widget tc hwnd)) (parent (get-widget tc (cffi:make-pointer lparam)))) @@ -81,16 +83,6 @@ (setf (child-visitor-results tc) (push (call-child-visitor-func tc parent child) tmp-list)))))) 1) -#+allegro -(eval-when (:compile-toplevel :load-toplevel :execute) - (ff:defun-foreign-callable enum-child-windows-callback ((hwnd :foreign-address) - (lparam :long)) - (declare (:convention :stdcall)) - (child-window-visitor hwnd lparam)) - - (defvar *enum-child-proc* - (ff:register-foreign-callable 'enum-child-windows-callback :reuse t))) - #+lispworks (fli:define-foreign-callable ("child_window_visitor" :result-type :integer :calling-convention :stdcall) @@ -99,13 +91,6 @@ (child-window-visitor hwnd lparam) 1) -#+sbcl -(defvar *enum-child-proc* - (sb-alien::alien-callback - (sb-alien:function sb-alien:int sb-alien:system-area-pointer sb-alien:long) - #'child-window-visitor - :stdcall)) - (defun window-class-registered-p (class-name) (cffi:with-foreign-string (str-ptr class-name) (cffi:with-foreign-object (wc-ptr 'gfs::wndclassex) @@ -341,22 +326,14 @@ (hwnd (gfs:handle self))) (setf (child-visitor-func tc) func) (unwind-protect -#+allegro +#-cffi-features:no-stdcall (gfs::enum-child-windows hwnd - (cffi:pointer-address *enum-child-proc*) - (cffi:pointer-address hwnd)) -#+clisp - (gfs::enum-child-windows hwnd - #'child-window-visitor + (cffi:callback child-window-visitor) (cffi:pointer-address hwnd)) #+lispworks (gfs::enum-child-windows hwnd (fli:make-pointer :symbol-name "child_window_visitor") (cffi:pointer-address hwnd)) -#+sbcl - (gfs::enum-child-windows hwnd - (sb-alien:alien-sap *enum-child-proc*) - (cffi:pointer-address hwnd)) (setf (child-visitor-func tc) nil)) (let ((tmp (reverse (child-visitor-results tc)))) (setf (child-visitor-results tc) nil)

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

graphic-forms-cvs March 2007