Overview
Comment: | of_point_t -> OFPoint |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | new-naming-convention |
Files: | files | file ages | folders |
SHA3-256: |
3524409dd07ef663358a20321a0ac19b |
User & Date: | js on 2021-04-17 00:54:43 |
Other Links: | branch diff | manifest | tags |
Context
2021-04-17
| ||
00:59 | Merge trunk into branch "new-naming-convention" check-in: b57126a21e user: js tags: new-naming-convention | |
00:54 | of_point_t -> OFPoint check-in: 3524409dd0 user: js tags: new-naming-convention | |
00:51 | of_time_interval_t -> OFTimeInterval check-in: 8c0d76f782 user: js tags: new-naming-convention | |
Changes
Modified src/OFNumber.h from [39b3c2a529] to [b9da3b2822].
︙ | ︙ | |||
126 127 128 129 130 131 132 | #ifdef OF_HAVE_UNAVAILABLE + (instancetype)valueWithBytes: (const void *)bytes objCType: (const char *)objCType OF_UNAVAILABLE; + (instancetype)valueWithPointer: (const void *)pointer OF_UNAVAILABLE; + (instancetype)valueWithNonretainedObject: (id)object OF_UNAVAILABLE; + (instancetype)valueWithRange: (OFRange)range OF_UNAVAILABLE; | | | 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | #ifdef OF_HAVE_UNAVAILABLE + (instancetype)valueWithBytes: (const void *)bytes objCType: (const char *)objCType OF_UNAVAILABLE; + (instancetype)valueWithPointer: (const void *)pointer OF_UNAVAILABLE; + (instancetype)valueWithNonretainedObject: (id)object OF_UNAVAILABLE; + (instancetype)valueWithRange: (OFRange)range OF_UNAVAILABLE; + (instancetype)valueWithPoint: (OFPoint)point OF_UNAVAILABLE; + (instancetype)valueWithDimension: (of_dimension_t)dimension OF_UNAVAILABLE; + (instancetype)valueWithRectangle: (of_rectangle_t)rectangle OF_UNAVAILABLE; #endif /** * @brief Creates a new OFNumber with the specified `bool`. * |
︙ | ︙ | |||
242 243 244 245 246 247 248 | - (instancetype)init OF_UNAVAILABLE; #ifdef OF_HAVE_UNAVAILABLE - (instancetype)initWithBytes: (const void *)bytes objCType: (const char *)objCType OF_UNAVAILABLE; - (instancetype)initWithPointer: (const void *)pointer OF_UNAVAILABLE; - (instancetype)initWithNonretainedObject: (id)object OF_UNAVAILABLE; - (instancetype)initWithRange: (OFRange)range OF_UNAVAILABLE; | | | 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 | - (instancetype)init OF_UNAVAILABLE; #ifdef OF_HAVE_UNAVAILABLE - (instancetype)initWithBytes: (const void *)bytes objCType: (const char *)objCType OF_UNAVAILABLE; - (instancetype)initWithPointer: (const void *)pointer OF_UNAVAILABLE; - (instancetype)initWithNonretainedObject: (id)object OF_UNAVAILABLE; - (instancetype)initWithRange: (OFRange)range OF_UNAVAILABLE; - (instancetype)initWithPoint: (OFPoint)point OF_UNAVAILABLE; - (instancetype)initWithDimension: (of_dimension_t)dimension OF_UNAVAILABLE; - (instancetype)initWithRectangle: (of_rectangle_t)rectangle OF_UNAVAILABLE; #endif /** * @brief Initializes an already allocated OFNumber with the specified `bool`. * |
︙ | ︙ |
Modified src/OFObject.h from [cae8b45bf8] to [257923a725].
︙ | ︙ | |||
139 140 141 142 143 144 145 | /** * @brief A time interval in seconds. */ typedef double OFTimeInterval; /** | | | | | | | | | | | 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 | /** * @brief A time interval in seconds. */ typedef double OFTimeInterval; /** * @struct OFPoint OFObject.h ObjFW/OFObject.h * * @brief A point. */ struct OF_BOXABLE OFPoint { /** The x coordinate of the point */ float x; /** The y coordinate of the point */ float y; }; typedef struct OFPoint OFPoint; /** * @brief Creates a new OFPoint. * * @param x The x coordinate of the point * @param y The x coordinate of the point * @return An OFPoint with the specified coordinates */ static OF_INLINE OFPoint OF_CONST_FUNC OFMakePoint(float x, float y) { OFPoint point = { x, y }; return point; } /** * @brief Returns whether the two points are equal. * * @param point1 The first point for the comparison * @param point2 The second point for the comparison * @return Whether the two points are equal */ static OF_INLINE bool OFEqualPoints(OFPoint point1, OFPoint point2) { if (point1.x != point2.x) return false; if (point1.y != point2.y) return false; |
︙ | ︙ | |||
239 240 241 242 243 244 245 | /** * @struct of_rectangle_t OFObject.h ObjFW/OFObject.h * * @brief A rectangle. */ struct OF_BOXABLE of_rectangle_t { /** The point from where the rectangle originates */ | | | | | 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 | /** * @struct of_rectangle_t OFObject.h ObjFW/OFObject.h * * @brief A rectangle. */ struct OF_BOXABLE of_rectangle_t { /** The point from where the rectangle originates */ OFPoint origin; /** The size of the rectangle */ of_dimension_t size; }; typedef struct of_rectangle_t of_rectangle_t; /** * @brief Creates a new of_rectangle_t. * * @param x The x coordinate of the top left corner of the rectangle * @param y The y coordinate of the top left corner of the rectangle * @param width The width of the rectangle * @param height The height of the rectangle * @return An of_rectangle_t with the specified origin and size */ static OF_INLINE of_rectangle_t OF_CONST_FUNC of_rectangle(float x, float y, float width, float height) { of_rectangle_t rectangle = { OFMakePoint(x, y), of_dimension(width, height) }; return rectangle; } /** * @brief Returns whether the two rectangles are equal. * * @param rectangle1 The first rectangle for the comparison * @param rectangle2 The second rectangle for the comparison * @return Whether the two rectangles are equal */ static OF_INLINE bool of_rectangle_equal(of_rectangle_t rectangle1, of_rectangle_t rectangle2) { if (!OFEqualPoints(rectangle1.origin, rectangle2.origin)) return false; if (!of_dimension_equal(rectangle1.size, rectangle2.size)) return false; return true; } |
︙ | ︙ |
Modified src/OFPointValue.h from [8f405bc77c] to [4a1e3a3976].
︙ | ︙ | |||
15 16 17 18 19 20 21 | #import "OFValue.h" OF_ASSUME_NONNULL_BEGIN @interface OFPointValue: OFValue { | | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | #import "OFValue.h" OF_ASSUME_NONNULL_BEGIN @interface OFPointValue: OFValue { OFPoint _point; } - (instancetype)initWithPoint: (OFPoint)point; @end OF_ASSUME_NONNULL_END |
Modified src/OFPointValue.m from [637e52428d] to [4e64632cbc].
︙ | ︙ | |||
18 19 20 21 22 23 24 | #import "OFString.h" #import "OFOutOfRangeException.h" @implementation OFPointValue @synthesize pointValue = _point; | | | | | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | #import "OFString.h" #import "OFOutOfRangeException.h" @implementation OFPointValue @synthesize pointValue = _point; - (instancetype)initWithPoint: (OFPoint)point { self = [super init]; _point = point; return self; } - (const char *)objCType { return @encode(OFPoint); } - (void)getValue: (void *)value size: (size_t)size { if (size != sizeof(_point)) @throw [OFOutOfRangeException exception]; memcpy(value, &_point, sizeof(_point)); } - (OFString *)description { return [OFString stringWithFormat: @"<OFValue: OFPoint { %f, %f }>", _point.x, _point.y]; } @end |
Modified src/OFStdIOStream.h from [db049cd597] to [cc0a782d1d].
︙ | ︙ | |||
114 115 116 117 118 119 120 | /** * @brief Moves the cursor to the specified absolute position. Does nothing if * there is no underlying terminal. * * @param position The position to move the cursor to */ | | | | 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 | /** * @brief Moves the cursor to the specified absolute position. Does nothing if * there is no underlying terminal. * * @param position The position to move the cursor to */ - (void)setCursorPosition: (OFPoint)position; /** * @brief Moves the cursor to the specified relative position. Does nothing if * there is no underlying terminal. * * @param position The position to move the cursor to */ - (void)setRelativeCursorPosition: (OFPoint)position; @end #ifdef __cplusplus extern "C" { #endif /** @file */ |
︙ | ︙ |
Modified src/OFStdIOStream.m from [56aed5bccb] to [4b65dc7955].
︙ | ︙ | |||
489 490 491 492 493 494 495 | if (!isatty(_fd)) return; [self writeFormat: @"\033[%uG", column + 1]; #endif } | | | | 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 | if (!isatty(_fd)) return; [self writeFormat: @"\033[%uG", column + 1]; #endif } - (void)setCursorPosition: (OFPoint)position { if (position.x < 0 || position.y < 0) @throw [OFInvalidArgumentException exception]; #ifdef HAVE_ISATTY if (!isatty(_fd)) return; [self writeFormat: @"\033[%u;%uH", (unsigned)position.y + 1, (unsigned)position.x + 1]; #endif } - (void)setRelativeCursorPosition: (OFPoint)position { #ifdef HAVE_ISATTY if (!isatty(_fd)) return; if (position.x > 0) [self writeFormat: @"\033[%uC", (unsigned)position.x]; |
︙ | ︙ |
Modified src/OFValue.h from [a6b31cd7ee] to [2be6441b1c].
︙ | ︙ | |||
54 55 56 57 58 59 60 | @property (readonly, nonatomic) OFRange rangeValue; /** * @brief The value as a point. * * If the value is not point-sized, @ref OFOutOfRangeException is thrown. */ | | | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | @property (readonly, nonatomic) OFRange rangeValue; /** * @brief The value as a point. * * If the value is not point-sized, @ref OFOutOfRangeException is thrown. */ @property (readonly, nonatomic) OFPoint pointValue; /** * @brief The value as a dimension. * * If the value is not dimension-sized, @ref OFOutOfRangeException is thrown. */ @property (readonly, nonatomic) of_dimension_t dimensionValue; |
︙ | ︙ | |||
117 118 119 120 121 122 123 | /** * @brief Creates a new, autoreleased OFValue containing the specified point. * * @param point The point the OFValue should contain * @return A new, autoreleased OFValue */ | | | 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 | /** * @brief Creates a new, autoreleased OFValue containing the specified point. * * @param point The point the OFValue should contain * @return A new, autoreleased OFValue */ + (instancetype)valueWithPoint: (OFPoint)point; /** * @brief Creates a new, autoreleased OFValue containing the specified * dimension. * * @param dimension The dimension the OFValue should contain * @return A new, autoreleased OFValue |
︙ | ︙ |
Modified src/OFValue.m from [9ac03935d2] to [073716b8bf].
︙ | ︙ | |||
54 55 56 57 58 59 60 | } + (instancetype)valueWithRange: (OFRange)range { return [[[OFRangeValue alloc] initWithRange: range] autorelease]; } | | | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | } + (instancetype)valueWithRange: (OFRange)range { return [[[OFRangeValue alloc] initWithRange: range] autorelease]; } + (instancetype)valueWithPoint: (OFPoint)point { return [[[OFPointValue alloc] initWithPoint: point] autorelease]; } + (instancetype)valueWithDimension: (of_dimension_t)dimension { return [[[OFDimensionValue alloc] |
︙ | ︙ | |||
176 177 178 179 180 181 182 | - (OFRange)rangeValue { OFRange ret; [self getValue: &ret size: sizeof(ret)]; return ret; } | | | | 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 | - (OFRange)rangeValue { OFRange ret; [self getValue: &ret size: sizeof(ret)]; return ret; } - (OFPoint)pointValue { OFPoint ret; [self getValue: &ret size: sizeof(ret)]; return ret; } - (of_dimension_t)dimensionValue { of_dimension_t ret; |
︙ | ︙ |
Modified src/OFWin32ConsoleStdIOStream.m from [0662c30238] to [44d7e170bf].
︙ | ︙ | |||
578 579 580 581 582 583 584 | return; csbi.dwCursorPosition.X = column; SetConsoleCursorPosition(_handle, csbi.dwCursorPosition); } | | | | 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 | return; csbi.dwCursorPosition.X = column; SetConsoleCursorPosition(_handle, csbi.dwCursorPosition); } - (void)setCursorPosition: (OFPoint)position { if (position.x < 0 || position.y < 0) @throw [OFInvalidArgumentException exception]; SetConsoleCursorPosition(_handle, (COORD){ position.x, position.y }); } - (void)setRelativeCursorPosition: (OFPoint)position { CONSOLE_SCREEN_BUFFER_INFO csbi; if (!GetConsoleScreenBufferInfo(_handle, &csbi)) return; csbi.dwCursorPosition.X += position.x; |
︙ | ︙ |
Modified tests/OFValueTests.m from [2f27932fb7] to [f272ff9674].
︙ | ︙ | |||
22 23 24 25 26 27 28 | static OFString *module = @"OFValue"; @implementation TestsAppDelegate (OFValueTests) - (void)valueTests { void *pool = objc_autoreleasePoolPush(); OFRange range = OFMakeRange(1, 64), range2; | | | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | static OFString *module = @"OFValue"; @implementation TestsAppDelegate (OFValueTests) - (void)valueTests { void *pool = objc_autoreleasePoolPush(); OFRange range = OFMakeRange(1, 64), range2; OFPoint point = OFMakePoint(1.5f, 3.0f), point2; of_dimension_t dimension = of_dimension(4.5f, 5.0f), dimension2; of_rectangle_t rectangle = of_rectangle(1.5f, 3.0f, 4.5f, 6.0f); of_rectangle_t rectangle2; OFValue *value; void *pointer = &value; TEST(@"+[valueWithBytes:objCType:]", |
︙ | ︙ | |||
92 93 94 95 96 97 98 | [[OFValue valueWithBytes: "a" objCType: @encode(char)] rangeValue]) TEST(@"+[valueWithPoint:]", (value = [OFValue valueWithPoint: point])) TEST(@"-[pointValue]", | | | | | | 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 | [[OFValue valueWithBytes: "a" objCType: @encode(char)] rangeValue]) TEST(@"+[valueWithPoint:]", (value = [OFValue valueWithPoint: point])) TEST(@"-[pointValue]", OFEqualPoints(value.pointValue, point) && (value = [OFValue valueWithBytes: &point objCType: @encode(OFPoint)]) && OFEqualPoints(value.pointValue, point)) TEST(@"-[getValue:size:] for OFPointValue", (value = [OFValue valueWithPoint: point]) && R([value getValue: &point2 size: sizeof(point2)]) && OFEqualPoints(point2, point)) EXPECT_EXCEPTION(@"-[pointValue] with wrong size throws", OFOutOfRangeException, [[OFValue valueWithBytes: "a" objCType: @encode(char)] pointValue]) TEST(@"+[valueWithDimension:]", |
︙ | ︙ |
Modified tests/terminal/TerminalTests.m from [cd3ec05bca] to [75c2b20fdf].
︙ | ︙ | |||
88 89 90 91 92 93 94 | [of_stdout eraseLine]; [of_stdout writeString: @"World!"]; [OFThread sleepForTimeInterval: 2]; [of_stdout clear]; [OFThread sleepForTimeInterval: 2]; | | | | | | | | | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 | [of_stdout eraseLine]; [of_stdout writeString: @"World!"]; [OFThread sleepForTimeInterval: 2]; [of_stdout clear]; [OFThread sleepForTimeInterval: 2]; [of_stdout setCursorPosition: OFMakePoint(5, 3)]; [of_stdout writeString: @"Text at (5, 3)"]; [OFThread sleepForTimeInterval: 2]; [of_stdout setRelativeCursorPosition: OFMakePoint(-2, 0)]; [OFThread sleepForTimeInterval: 2]; [of_stdout setRelativeCursorPosition: OFMakePoint(2, 0)]; [OFThread sleepForTimeInterval: 2]; [of_stdout setRelativeCursorPosition: OFMakePoint(0, -2)]; [OFThread sleepForTimeInterval: 2]; [of_stdout setRelativeCursorPosition: OFMakePoint(0, 2)]; [OFThread sleepForTimeInterval: 2]; [of_stdout setRelativeCursorPosition: OFMakePoint(1, 1)]; [OFThread sleepForTimeInterval: 2]; [of_stdout setRelativeCursorPosition: OFMakePoint(-1, -1)]; [OFThread sleepForTimeInterval: 2]; [of_stdout setCursorColumn: 2]; [OFThread sleepForTimeInterval: 2]; [of_stdout reset]; |
︙ | ︙ |