--- a/DeviceWorkstation.st Wed Jan 23 21:35:00 2019 +0000
+++ b/DeviceWorkstation.st Fri Jan 25 11:29:18 2019 +0000
@@ -708,7 +708,7 @@
( ExpandSelectionByWord CmdW )
( DeleteWordBeforeCursor CtrlBackSpace )
( Return KP_Enter )
- ( Delete OK_Delete )
+ ( Delete KP_Delete )
"/ Logical Shortcut Aliases Description
"/ ===========================================================
@@ -730,7 +730,7 @@
( UncommentSelection F4 'Uncomment selection' )
"/ ( F5 )
(ConvertSelectionToLowercaseOrUppercaseOrUppercaseFirst
- F6 'Selection to lowercase/UPPERCASE/UpperCaseFirst (toggle through)' )
+ F6 'Selection to lowercase/UPPERCASE/UpperCaseFirst (toggle through)' )
"/ ( F7 )
( Again F8 'Again (repeat last cut/replace)' )
( UndentBy4 F9 'Undent by 4 (move block to left)' )
@@ -739,20 +739,20 @@
( IndentBy1 F12 'Indent by 4 (move block to right)' )
( ParenthizeSelection #'Cmd(' 'Add parentheses around selection' )
- ( UnparenthizeSelection #'Cmd)' 'Remove parentheses' )
- ( LearnKeyboardMacro CmdL CtrlF2 'Enter/leave learn macro mode (CmdM) to replay macro)' )
+ ( UnparenthizeSelection #'Cmd)' 'Remove parentheses' )
+ ( LearnKeyboardMacro CmdL CtrlF2 'Enter/leave learn macro mode (CmdM) to replay macro)' )
( ExecuteKeyboardMacro CmdM CmdF2 'Execute keyboard Macro (CMD-L to learn)' )
( ConvertSelectionToUppercase
- CtrlF6 'Selection to UPPERCASE' )
+ CtrlF6 'Selection to UPPERCASE' )
( ExpandAbbreviation #'Cmd ' 'Insert Abbreviation (try <ALT-SPACE> behind the string ''it'')')
- ( CodeCompletion #'Ctrl ' #'Ctrlspace' )
+ ( CodeCompletion #'Ctrl ' #'Ctrlspace' )
"/ Logical Shortcut Aliases Description
"/ ===========================================================
-"/ Following was used only on NON-macOS systems, not sure why. In case it
+"/ Following was used only on NON-macOS systems, not sure why. In case it
"/ would cause problems, refactor. I cannot test now ans would like to make
"/ the code simpler.
@@ -764,7 +764,7 @@
( $\ #'Cmd\' #'Alt\' )
( $~ #'Cmd~' #'Alt~' )
( $@ #'Cmd@' #'Alt@' )
- ( $# #'Cmd#' #'Alt#' )
+ ( $# #'Cmd#' #'Alt#' )
)
"
@@ -779,7 +779,7 @@
"
"Created: / 12-05-2017 / 21:51:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified (comment): / 14-05-2017 / 10:41:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 25-01-2019 / 11:24:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!DeviceWorkstation class methodsFor:'error handling'!
@@ -5533,6 +5533,20 @@
"Created: / 4.8.1998 / 16:52:13 / cg"
!
+fontDetailMetricsOf:fontId userInputString:aString
+ "return a average font Width and overHang for a specified character fonts metrics
+ info object"
+
+ |info|
+
+ info := DeviceWorkstation::DeviceFontMetrics new.
+ info
+ avgWidth:(self widthOf:aString inFont:fontId)
+ overHang:(self overHangOf:aString inFont:fontId).
+
+ ^ info
+!
+
fontFamilies
"return a set of all available font families on this display"
@@ -5582,20 +5596,6 @@
^ info
!
-fontDetailMetricsOf:fontId userInputString:aString
- "return a average font Width and overHang for a specified character fonts metrics
- info object"
-
- |info|
-
- info := DeviceWorkstation::DeviceFontMetrics new.
- info
- avgWidth:(self widthOf:aString inFont:fontId)
- overHang:(self overHangOf:aString inFont:fontId).
-
- ^ info
-!
-
fontResolutionOf:fontId
"return the resolution (as dpiX @ dpiY) of the font - this is usually the displays resolution,
but due to errors in some XServer installations, some use 75dpi fonts on higher
@@ -5783,6 +5783,18 @@
^ self subclassResponsibility
!
+overHangOf:aString from:index1 to:index2 inFont:aFontId
+ "return the overHang in pixels of a substring in a specific font"
+
+ ^ self subclassResponsibility
+!
+
+overHangOf:aString inFont:aFontId
+ "return the overHang in pixels of a string in a specific font"
+
+ ^ self overHangOf:aString from:1 to:(aString size) inFont:aFontId
+!
+
pixelSizesInFamily:aFamilyName face:aFaceName style:aStyleName filtering:filterBlock
"return a set of all available pixel sizes in aFamily/aFace/aStyle on this display.
But only those matching filterBlock (if notNil)."
@@ -5910,18 +5922,6 @@
"return the width in pixels of a string in a specific font"
^ self widthOf:aString from:1 to:(aString size) inFont:aFontId
-!
-
-overHangOf:aString from:index1 to:index2 inFont:aFontId
- "return the overHang in pixels of a substring in a specific font"
-
- ^ self subclassResponsibility
-!
-
-overHangOf:aString inFont:aFontId
- "return the overHang in pixels of a string in a specific font"
-
- ^ self overHangOf:aString from:1 to:(aString size) inFont:aFontId
! !
!DeviceWorkstation methodsFor:'grabbing'!
@@ -6420,13 +6420,17 @@
"
keyboardMap isNil ifTrue:[
- keyboardMap := KeyboardMap new.
- self initializeDefaultKeyboardMappingsIn:keyboardMap
- ].
-
- "
- no more setup here - moved everything out into 'display.rc' file
- "
+ keyboardMap := KeyboardMap new.
+ self initializeDefaultKeyboardMappingsIn:keyboardMap
+ ].
+
+ "
+ Screen current instVarNamed:#keyboardMap put: nil.
+ Screen current initializeKeyboardMap
+ Screen current keyboardMap
+ "
+
+ "Modified (format): / 25-01-2019 / 11:26:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
initializeModifierMappings
@@ -8531,50 +8535,18 @@
overHang := overHangArg.
!
+averageWidth
+ "return the averageWidth"
+
+ ^ averageWidth
+!
+
descent
"return the descent"
^ descent
!
-maxAscent
- "return the maxAscent"
-
- ^ maxAscent
-!
-
-maxDescent
- "return the maxDescent"
-
- ^ maxDescent
-!
-
-minWidth
- "return the minWidth"
-
- ^ minWidth
-!
-
-maxWidth
- "return the maxWidth"
-
- ^ maxWidth
-!
-
-averageWidth
- "return the averageWidth"
-
- ^ averageWidth
-!
-
-minCode
- ^ minCode ? 0
-!
-
-maxCode
- ^ maxCode ? 16rFFFF
-!
-
direction
"return the drawing direction (think of hebrew and arabic !!)"
@@ -8587,6 +8559,38 @@
^ encoding
!
+maxAscent
+ "return the maxAscent"
+
+ ^ maxAscent
+!
+
+maxCode
+ ^ maxCode ? 16rFFFF
+!
+
+maxDescent
+ "return the maxDescent"
+
+ ^ maxDescent
+!
+
+maxWidth
+ "return the maxWidth"
+
+ ^ maxWidth
+!
+
+minCode
+ ^ minCode ? 0
+!
+
+minWidth
+ "return the minWidth"
+
+ ^ minWidth
+!
+
overHang
"return font the overHang"