From b52015e71d387d0963aa799e9440d6b6f5a0bc5d Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Sat, 27 Jan 2024 14:06:45 -0800 Subject: [PATCH] \MODERNIZED.TEDIT.BUTTONEVENTFN passes down a hardwired value for TITLEPROPORTION of NIL. This prevents the Notecards left button title bar menu from ever being shown. Replaced this hardwired NIL value with (WINDOWPROP W 'MODERNIZE.TITLEPROPORTION) so that Notecards can set this Windowprop and hence get its left title bar menu. --- lispusers/MODERNIZE | 59 +++++++++++++++++++-------------------- lispusers/MODERNIZE.LCOM | Bin 10424 -> 10582 bytes 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/lispusers/MODERNIZE b/lispusers/MODERNIZE index 515f99a7..dcf2b370 100644 --- a/lispusers/MODERNIZE +++ b/lispusers/MODERNIZE @@ -1,12 +1,11 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "29-Oct-2023 10:56:48" {WMEDLEY}MODERNIZE.;48 30909 +(FILECREATED "27-Jan-2024 13:38:15" {DSK}frank>il>medley>gmedley>lispusers>MODERNIZE.;7 30816 - :EDIT-BY rmk + :CHANGES-TO (FNS \MODERNIZED.TEDIT.BUTTONEVENTFN) - :CHANGES-TO (FNS NEARESTCORNER) - - :PREVIOUS-DATE "29-Jul-2023 10:48:55" {WMEDLEY}MODERNIZE.;47) + :PREVIOUS-DATE "27-Jan-2024 13:28:36" {DSK}frank>il>medley>gmedley>lispusers>MODERNIZE.;6 +) (PRETTYCOMPRINT MODERNIZECOMS) @@ -368,26 +367,24 @@ (\CURSORPOSITION X Y]) (INCORNER.REGION - [LAMBDA (CORNERREGION TOPMARGIN) (* ; "Edited 13-Oct-2021 15:04 by rmk:") + [LAMBDA (CORNERREGION TOPMARGIN) (* ; "Edited 13-Oct-2021 15:04 by rmk:") (* ;; "CORNERREGION, LASTMOUSEX, LASTMOUSEY in screen coordinates.") (* ;; "TOPMARGIN is the height of the titlebar for titled windows, otherwise the margin at the top of the window's content that we regard as the top. ") - (IF (ILEQ (IABS (IDIFFERENCE LASTMOUSEX (FETCH LEFT OF CORNERREGION))) - MODERN-WINDOW-MARGIN) - THEN (IF (NEARTOP CORNERREGION TOPMARGIN) - THEN 'LEFTTOP - ELSEIF (ILEQ LASTMOUSEY (IPLUS MODERN-WINDOW-MARGIN (FETCH BOTTOM - OF CORNERREGION))) - THEN 'LEFTBOTTOM) - ELSEIF (ILEQ (IABS (IDIFFERENCE LASTMOUSEX (FETCH RIGHT OF CORNERREGION))) - MODERN-WINDOW-MARGIN) - THEN (IF (NEARTOP CORNERREGION TOPMARGIN) - THEN 'RIGHTTOP - ELSEIF (ILEQ LASTMOUSEY (IPLUS MODERN-WINDOW-MARGIN (FETCH BOTTOM - OF CORNERREGION))) - THEN 'RIGHTBOTTOM]) + (if (ILEQ (IABS (IDIFFERENCE LASTMOUSEX (fetch LEFT of CORNERREGION))) + MODERN-WINDOW-MARGIN) + then (if (NEARTOP CORNERREGION TOPMARGIN) + then 'LEFTTOP + elseif (ILEQ LASTMOUSEY (IPLUS MODERN-WINDOW-MARGIN (fetch BOTTOM of CORNERREGION))) + then 'LEFTBOTTOM) + elseif (ILEQ (IABS (IDIFFERENCE LASTMOUSEX (fetch RIGHT of CORNERREGION))) + MODERN-WINDOW-MARGIN) + then (if (NEARTOP CORNERREGION TOPMARGIN) + then 'RIGHTTOP + elseif (ILEQ LASTMOUSEY (IPLUS MODERN-WINDOW-MARGIN (fetch BOTTOM of CORNERREGION))) + then 'RIGHTBOTTOM]) ) @@ -510,9 +507,11 @@ (* ;; "We pass the pane that received the click, because that's what the original \TEDIT.BUTTONEVENTFN needs to see, if we decide not to shape or move.") (MODERNWINDOW.BUTTONEVENTFN W (FUNCTION MODERN-ORIG-\TEDIT.BUTTONEVENTFN) - NIL NIL [APPLY (FUNCTION UNIONREGIONS) - (bind PANE _ (CENTRALWINDOW W) collect (WINDOWPROP PANE 'REGION) - repeatwhile (SETQ PANE (WINDOWPROP PANE 'TEDIT-NEXT-PANE-DOWN] + NIL + (WINDOWPROP W 'MODERNIZE.TITLEPROPORTION) + [APPLY (FUNCTION UNIONREGIONS) + (bind PANE _ (CENTRALWINDOW W) collect (WINDOWPROP PANE 'REGION) + repeatwhile (SETQ PANE (WINDOWPROP PANE 'TEDIT-NEXT-PANE-DOWN] (WINDOWPROP (CENTRALWINDOW W) 'TITLE]) ) @@ -615,11 +614,11 @@ (ADDTOVAR LAMA MODERN-ADD-EXEC) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (5048 11410 (MODERNWINDOW 5058 . 6598) (MODERNWINDOW.SETUP 6600 . 9549) (UNMODERNWINDOW -9551 . 9945) (MODERNWINDOW.UNSETUP 9947 . 10759) (\MODERNIZED.FREEMENU.BUTTONEVENTFN 10761 . 11408)) ( -11475 22625 (MODERNWINDOW.BUTTONEVENTFN 11485 . 18512) (NEARTOP 18514 . 19442) (NEARESTCORNER 19444 . -21311) (INCORNER.REGION 21313 . 22623)) (22683 25155 (MODERN-ADD-EXEC 22693 . 23124) (MODERN-SNAPW -23126 . 23669) (TOTOPW.MODERNIZE 23671 . 24099) (MODERN-MENUBUTTONFN 24101 . 25153)) (25156 27585 ( -\MODERNIZED.FREEMENU.BUTTONEVENTFN 25166 . 25813) (MODERNIZED.TB.BUTTONEVENTFN 25815 . 27583)) (27626 -29148 (TEDIT.MODERNIZE 27636 . 27989) (\MODERNIZED.TEDIT.BUTTONEVENTFN 27991 . 29146))))) + (FILEMAP (NIL (5095 11457 (MODERNWINDOW 5105 . 6645) (MODERNWINDOW.SETUP 6647 . 9596) (UNMODERNWINDOW +9598 . 9992) (MODERNWINDOW.UNSETUP 9994 . 10806) (\MODERNIZED.FREEMENU.BUTTONEVENTFN 10808 . 11455)) ( +11522 22488 (MODERNWINDOW.BUTTONEVENTFN 11532 . 18559) (NEARTOP 18561 . 19489) (NEARESTCORNER 19491 . +21358) (INCORNER.REGION 21360 . 22486)) (22546 25018 (MODERN-ADD-EXEC 22556 . 22987) (MODERN-SNAPW +22989 . 23532) (TOTOPW.MODERNIZE 23534 . 23962) (MODERN-MENUBUTTONFN 23964 . 25016)) (25019 27448 ( +\MODERNIZED.FREEMENU.BUTTONEVENTFN 25029 . 25676) (MODERNIZED.TB.BUTTONEVENTFN 25678 . 27446)) (27489 +29055 (TEDIT.MODERNIZE 27499 . 27852) (\MODERNIZED.TEDIT.BUTTONEVENTFN 27854 . 29053))))) STOP diff --git a/lispusers/MODERNIZE.LCOM b/lispusers/MODERNIZE.LCOM index 3ce8dfb2aac18908395aadb9e618a05cfa1c04b8..48ef25e8e9607c16abe3c6125fe5af2bd634bb87 100644 GIT binary patch delta 674 zcma)3zi-n(7>$!wG*_WYP2EIoLOx8TIuedzJFy)LMMUv6m>QpJJEW}`8j;XO^ zf2S8fP%cQyrm6^Vc&0d5??QhBNT_>W0RIz<#i9V+&LMNWN}wtfkhozxxZ&e^h^@;c z!;~w+8eDVG6&=))A!~rl#)G=s#DNqN5I5Wa=*eo{DS+wu__0k|fn+hmOMVJlly?2a za9T9se$37wu`JVHi52?&2BtqVhAjg)EPj7K#?HZcKxa9;w(VM^4SEF{*bV) zK&48zZl>tY!s4QFfg|hmIL&hvdYVn&RTOBsHgSF2WOo3vGJUYUi;JNhI@t4xNBoeX J(Q@wN{2x>Nw_5-J delta 634 zcmZvZ%Wl&^6oymxLX*e>2@F(f)FUH=vv6=6Uq@YF;z=-aXWX&f5QznC64I(SC}oA9 zdsZOtSa5rT$}D)2u3*cWM_}5ZKnk-s8l7+c|NJ_0!oIG)d2riRY41?gHN63K4Ve}) z92pe3x4-*jYiH1h{XLN3MP~*3A@06he)~x}GMp-uWZn6r)ayvMkm<^>aWEK5dzH> z>=Rjsh64@F)m%W>4-)lm7Y=r}0X6S=q>W=Wp`esnB%VxI1r#y77SJ?SeLm}K)cxl> z<24x$GR<>q5ez#o3O{D2#O&vVjTup?irLYelx@$STo#pv1uN9YjHr|aZI!d6sPLyB zmTu%9i_2wx{eDFrsiq}7FOncUvxuZeoE=NIM(msPZp`vmSC@pTO7{NxLRp+G@N=o4 z=vH<-x0s6ykEg}8nLR5}4r~n`1|&`y?gYfA9k5JjVv;Z~{M|5J z@S-T}g5g3NC!=l}V-_(Qfo`AE*PTf{|0^SVTDf+yu0u)!N*HeQ8s}dspUb}h7&@bD