KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

[Apps/Magnify] Codebase, logic and display rework #194

Merged
mxlgv merged 2 commits from magnify-show-grid into main 2025-05-14 21:23:47 +02:00
Conversation 16 Commits 2 Files Changed 7 +234 -176
Leency commented 2025-04-03 02:39:33 +02:00
Owner
Copy Link
  • Fully refactored codestyle (Burer);
  • Changed magnify calculations and display logic,
    now it is similar to Pipet (Burer);
  • Added proper copyrights (Burer);
  • Added visual grid (Leency);
  • Localization to all system languages (Burer).
- Fully refactored codestyle (Burer); - Changed magnify calculations and display logic, now it is similar to Pipet (Burer); - Added proper copyrights (Burer); - Added visual grid (Leency); - Localization to all system languages (Burer).
Screenshot_1.png
13 KiB
Screenshot_1.png
Leency added 1 commit 2025-04-03 02:39:35 +02:00
magnify: just show grid
All checks were successful
Build system / Check kernel codestyle (pull_request) Successful in 41s
Details
Build system / Build (pull_request) Successful in 6m28s
Details
296f700f2c
mxlgv added the
PR
Review required
 label 2025-04-03 09:36:31 +02:00
mxlgv requested changes 2025-04-03 10:36:31 +02:00
Dismissed
mxlgv left a comment
Owner
Copy Link

Based on the screenshot, it’s not very clear to me what it fixes. Could you describe what has changed?

Based on the screenshot, it’s not very clear to me what it fixes. Could you describe what has changed?
mxlgv added
PR
Request changes
 and removed
PR
Review required
 labels 2025-04-03 10:36:39 +02:00
Burer commented 2025-04-05 14:02:22 +02:00
Owner
Copy Link

Based on the screenshot, it’s not very clear to me what it fixes. Could you describe what has changed?

If I understand correct, Leency just added display of visual grid between magnified pixels (previously, the program did not display grid).

Also, he mentioned some improvements that can be done in this program. I will commit them later, so let's keep this PR WIP for now.

> > Based on the screenshot, it’s not very clear to me what it fixes. Could you describe what has changed? If I understand correct, Leency just added display of visual grid between magnified pixels (previously, the program did not display grid). Also, he mentioned some improvements that can be done in this program. I will commit them later, so let's keep this PR WIP for now.
Burer changed title from magnify: just show grid to WIP: [Apps/Magnify] Just show grid 2025-04-05 14:02:46 +02:00
mxlgv removed the
PR
Request changes
 label 2025-04-07 13:16:11 +02:00
mxlgv dismissed mxlgv’s review 2025-04-07 13:16:39 +02:00
Reason:

This is WIP

Burer added 1 commit 2025-05-04 17:19:02 +02:00
[Apps/Magnify] Massive codebase refactoring
Some checks failed
Build system / Check kernel codestyle (pull_request) Successful in 26s
Details
Build system / Build (pull_request) Failing after 1m20s
Details
504661ec41 
- Fully refactored magnify logic and drawing
- Better code formatting
- Updated credits
- Source code is now UTF-8
Burer added 1 commit 2025-05-04 17:29:23 +02:00
[Apps/Magnify] Fix include path's to previous
All checks were successful
Build system / Check kernel codestyle (pull_request) Successful in 24s
Details
Build system / Build (pull_request) Successful in 7m0s
Details
e11c94e6ce
Burer commented 2025-05-04 17:30:54 +02:00
Owner
Copy Link

Now Magnify has better display with higher "FPS" and refactored codebase.
Magnification algorithm works similar to Pipet.

image.png
Now Magnify has better display with higher "FPS" and refactored codebase. Magnification algorithm works similar to Pipet. <img width="773" alt="image.png" src="attachments/f3f4b991-625b-4feb-af04-22dbbaf4a8f7">
image.png
98 KiB
Burer changed title from WIP: [Apps/Magnify] Just show grid to [Apps/Magnify] Codebase, logic and display rework 2025-05-04 17:37:39 +02:00
Burer requested review from Doczom 2025-05-04 17:38:17 +02:00
Burer requested review from dunkaist 2025-05-04 17:38:17 +02:00
Burer requested review from mxlgv 2025-05-04 17:38:17 +02:00
Burer added the
Category/Applications
FASM
Kind
Enhancement
Priority
Medium
 labels 2025-05-04 17:38:38 +02:00
mxlgv requested changes 2025-05-04 19:09:40 +02:00
Dismissed
programs/demos/magnify/trunk/magnify.asm Outdated
@@ -3,2 +2,3 @@
;
; Version for KolibriOS 2005-2011
; Magnify - Screen Magnifier
; Copyright (C) 2005-2025 MenuetOS, KolibriOS team
mxlgv commented 2025-05-04 19:09:37 +02:00
Owner
Copy Link

Please correct to:

; Copyright (C) 2005 MenuetOS
; Copyright (C) 2005-2025 KolibriOS team
Please correct to: ```fasm ; Copyright (C) 2005 MenuetOS ; Copyright (C) 2005-2025 KolibriOS team ```
ace-dent commented 2025-05-04 19:12:35 +02:00
Member
Copy Link

It is preferable to have most current Copyright details first, with older notices last.

; Copyright (C) 2005-2025 KolibriOS team
; Copyright (C) 2005 MenuetOS
It is preferable to have most current Copyright details first, with older notices last. ```asm ; Copyright (C) 2005-2025 KolibriOS team ; Copyright (C) 2005 MenuetOS ```
mxlgv commented 2025-05-04 20:05:00 +02:00
Owner
Copy Link

@ace-dent

It is preferable to have most current Copyright details first, with older notices last.

; Copyright (C) 2005-2025 KolibriOS team
; Copyright (C) 2005 MenuetOS

Please justify. For example, here I see that this is not so https://github.com/ARM-software/u-boot/blob/master/include/clk.h

@ace-dent > It is preferable to have most current Copyright details first, with older notices last. > ```asm > ; Copyright (C) 2005-2025 KolibriOS team > ; Copyright (C) 2005 MenuetOS > ``` Please justify. For example, here I see that this is not so https://github.com/ARM-software/u-boot/blob/master/include/clk.h
Burer commented 2025-05-04 20:42:26 +02:00
Owner
Copy Link

I corrected to first variant.
Can correct to second, if community decide on this.

I corrected to first variant. Can correct to second, if community decide on this.
ace-dent marked this conversation as resolved
programs/demos/magnify/trunk/magnify.asm Outdated
@@ -157,0 +230,4 @@
align 512
STACKTOP:
WIN_INFO rb 1024
mxlgv commented 2025-05-04 19:06:49 +02:00
Owner
Copy Link

it's not a constant. Let's not use upper case.
Also, the name does not at all reflect what this structure is for.

it's not a constant. Let's not use upper case. Also, the name does not at all reflect what this structure is for.
Burer commented 2025-05-04 19:33:04 +02:00
Owner
Copy Link

What is your proposition for name here?
Return it to procinfo, as this label is used for app proc_info?

What is your proposition for name here? Return it to `procinfo`, as this label is used for app proc_info?
mxlgv commented 2025-05-04 20:07:36 +02:00
Owner
Copy Link

Yes, the old label name seems better.

Yes, the old label name seems better.
Burer marked this conversation as resolved
Burer added 1 commit 2025-05-04 20:40:58 +02:00
[Apps/Magnify] Fixed copyright and label name
All checks were successful
Build system / Check kernel codestyle (pull_request) Successful in 24s
Details
Build system / Build (pull_request) Successful in 7m7s
Details
d45938350e
IgorA reviewed 2025-05-04 21:36:40 +02:00
programs/demos/magnify/trunk/magnify.asm Outdated
@@ -44,1 +45,3 @@
jmp wtevent
mcall SF_WAIT_EVENT_TIMEOUT, DELAY
cmp eax, 1
IgorA commented 2025-05-04 21:36:40 +02:00
Member
Copy Link

you can put constants EV_REDRAW, EV_BUTTON,
EV_MOUSE

you can put constants EV_REDRAW, EV_BUTTON, EV_MOUSE
Burer marked this conversation as resolved
IgorA reviewed 2025-05-04 21:37:14 +02:00
programs/demos/magnify/trunk/magnify.asm Outdated
@@ -81,2 +106,2 @@
inc eax
mov [size_x], eax
mcall SF_THREAD_INFO, procinfo, -1
mov al, byte [procinfo + 70]
IgorA commented 2025-05-04 21:37:14 +02:00
Member
Copy Link

mov al, byte [procinfo + process_information.wnd_state]
or
mov al, byte [procinfo.wnd_state]

mov al, byte [procinfo + process_information.wnd_state] or mov al, byte [procinfo.wnd_state]
Burer marked this conversation as resolved
IgorA reviewed 2025-05-04 21:37:34 +02:00
programs/demos/magnify/trunk/magnify.asm Outdated
@@ -157,0 +231,4 @@
align 512
STACKTOP:
procinfo rb 1024
IgorA commented 2025-05-04 21:37:34 +02:00
Member
Copy Link

procinfo process_information

procinfo process_information
Burer marked this conversation as resolved
Burer added 1 commit 2025-05-05 07:19:26 +02:00
[Apps/Magnify] Used constants instead of magic numbers
All checks were successful
Build system / Check kernel codestyle (pull_request) Successful in 22s
Details
Build system / Build (pull_request) Successful in 4m45s
Details
00a1fc3529
ace-dent requested changes 2025-05-05 09:59:06 +02:00
programs/demos/magnify/trunk/magnify.asm Outdated
@@ -1,156 +1,234 @@
;---------------------------------------------------------------------
; MAGNIFY SCREEN v1.0
; SPDX-License-Identifier: GPL-2.0-only
ace-dent commented 2025-05-04 19:18:29 +02:00
Member
Copy Link

If this code has been rewritten, are you sure it should be GPL2? Was it licensed before?
Where the license is unknown, it should be marked as NOASSERTION, until determined by the authors and/or copyright holders, or other sources. Do not mark the file as GPL without absolute certainty.

If this code has been rewritten, are you sure it should be GPL2? Was it licensed before? Where the license is unknown, it should be marked as `NOASSERTION`, until determined by the authors and/or copyright holders, or other sources. Do not mark the file as GPL without _absolute certainty_.
mxlgv commented 2025-05-05 16:48:41 +02:00
Owner
Copy Link

This program is over 19 years old and I haven't been able to find the source code anywhere else. I am absolutely sure that this program was written specifically for KolibriOS in the days when KolibriOS was still called MenuetRE. Hence the copyright text.

The fact that you suggest inserting this stub leads the source code into an incomprehensible state.

This program is over 19 years old and I haven't been able to find the source code anywhere else. I am absolutely sure that this program was written specifically for KolibriOS in the days when KolibriOS was still called MenuetRE. Hence the copyright text. The fact that you suggest inserting this stub leads the source code into an incomprehensible state.
mxlgv marked this conversation as resolved
mxlgv requested changes 2025-05-05 16:53:47 +02:00
Dismissed
programs/demos/magnify/trunk/magnify.asm Outdated
@@ -22,3 +7,1 @@
include 'lang.inc' ; Language support for locales: ru_RU (CP866), en_US.
include '..\..\..\macros.inc'
delay equ 20
; Contributor MenuetOS - Main code
mxlgv commented 2025-05-05 16:52:46 +02:00
Owner
Copy Link

Please delete this information. It is in the history of changes. In addition, if you look at the file history, there are clearly not enough contributors.

Please delete this information. It is in the history of changes. In addition, if you look at the file history, there are clearly not enough contributors.
mxlgv marked this conversation as resolved
mxlgv added the
PR
Request changes
 label 2025-05-05 18:31:21 +02:00
Burer added 1 commit 2025-05-06 12:37:53 +02:00
[Apps/Magnify] Remove contributors list from source code
All checks were successful
Build system / Check kernel codestyle (pull_request) Successful in 23s
Details
Build system / Build (pull_request) Successful in 4m48s
Details
0355200d8f
mxlgv approved these changes 2025-05-06 12:45:14 +02:00
Dismissed
mxlgv requested review from ace-dent 2025-05-06 12:46:01 +02:00
Burer changed title from [Apps/Magnify] Codebase, logic and display rework to WIP: [Apps/Magnify] Codebase, logic and display rework 2025-05-06 13:25:35 +02:00
Burer added 1 commit 2025-05-06 13:39:53 +02:00
[Apps/Magnify] Fixed build for different locales
All checks were successful
Build system / Check kernel codestyle (pull_request) Successful in 24s
Details
Build system / Build (pull_request) Successful in 4m43s
Details
aa8f65af48
Burer dismissed mxlgv’s review 2025-05-06 13:39:53 +02:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

Burer added 1 commit 2025-05-06 15:46:43 +02:00
[Apps/Magnify] Delete build.bat files
All checks were successful
Build system / Check kernel codestyle (pull_request) Successful in 23s
Details
Build system / Build (pull_request) Successful in 4m18s
Details
b8d7f4a022
Doczom reviewed 2025-05-08 06:06:34 +02:00
programs/demos/magnify/trunk/magnify.asm Outdated
@@ -32,0 +26,4 @@
;---------------------------------------------------------------------
START:
mcall SF_SET_EVENTS_MASK, 0x00000027
Doczom commented 2025-05-08 06:06:34 +02:00
Owner
Copy Link

the constants for event flags are in macros.inc.

И зачем тут сетевые события, а?

the constants for event flags are in macros.inc. ~~И зачем тут сетевые события, а?~~
Burer marked this conversation as resolved
Doczom requested changes 2025-05-08 06:24:43 +02:00
Dismissed
Doczom left a comment
Owner
Copy Link

delete dir "trunk" and change bitmask for events.

delete dir "trunk" and change bitmask for events.
Burer added 1 commit 2025-05-08 13:49:01 +02:00
[Apps/Magnify] Remove trunk folder and use proper event mask names
Some checks failed
Build system / Check kernel codestyle (pull_request) Successful in 31s
Details
Build system / Build (pull_request) Failing after 1m50s
Details
fafa78e61d
Burer added 1 commit 2025-05-08 14:11:17 +02:00
[Apps/Magnify] Fix to previous
All checks were successful
Build system / Check kernel codestyle (pull_request) Successful in 34s
Details
Build system / Build (pull_request) Successful in 6m13s
Details
ff60bedc09
Burer commented 2025-05-08 14:23:04 +02:00
Owner
Copy Link

delete dir "trunk" and change bitmask for events.

Done. Hope I didn't break anything.

> delete dir "trunk" and change bitmask for events. Done. Hope I didn't break anything.
Doczom approved these changes 2025-05-08 17:54:33 +02:00
Dismissed
programs/demos/magnify/magnify.asm Outdated
@@ -0,0 +67,4 @@
mcall SF_MOUSE_GET, SSF_BUTTON
test ax, 0x0001
jz .move
jmp still
Doczom commented 2025-05-08 17:48:36 +02:00
Owner
Copy Link

not a very successful sequence of commands

not a very successful sequence of commands
Burer marked this conversation as resolved
Burer added 1 commit 2025-05-08 21:49:54 +02:00
[Apps/Magnify] Small code improvement
All checks were successful
Build system / Check kernel codestyle (pull_request) Successful in 24s
Details
Build system / Build (pull_request) Successful in 6m8s
Details
87dacf1193
Burer dismissed Doczom’s review 2025-05-08 21:49:55 +02:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

Burer changed title from WIP: [Apps/Magnify] Codebase, logic and display rework to [Apps/Magnify] Codebase, logic and display rework 2025-05-10 10:31:41 +02:00
Doczom approved these changes 2025-05-10 18:12:54 +02:00
Dismissed
mxlgv force-pushed magnify-show-grid from 87dacf1193 to 9328b1d79a 2025-05-14 20:34:26 +02:00 Compare
mxlgv dismissed Doczom’s review 2025-05-14 20:34:27 +02:00
Reason:

New commits pushed, approval review dismissed automatically according to repository settings

mxlgv force-pushed magnify-show-grid from 9328b1d79a to da1c067d66 2025-05-14 20:38:58 +02:00 Compare
mxlgv added 1 commit 2025-05-14 20:50:04 +02:00
Magnify: Moved to programs/system
Some checks failed
Build system / Check kernel codestyle (pull_request) Successful in 26s
Details
Build system / Build (pull_request) Failing after 1m6s
Details
fcaba668e4 
Signed-off-by: Max Logaev <maxlogaev@proton.me>
mxlgv force-pushed magnify-show-grid from fcaba668e4 to 8cbed751a3 2025-05-14 20:54:51 +02:00 Compare
mxlgv force-pushed magnify-show-grid from 8cbed751a3 to 4550e15838 2025-05-14 20:59:01 +02:00 Compare
mxlgv approved these changes 2025-05-14 21:12:07 +02:00
mxlgv added
PR
Ready to merge
 and removed
PR
Request changes
 labels 2025-05-14 21:12:27 +02:00
mxlgv merged commit 4550e15838 into main 2025-05-14 21:23:47 +02:00
mxlgv deleted branch magnify-show-grid 2025-05-14 21:23:48 +02:00
Sign in to join this conversation.
Reviewers
No Reviewers
dunkaist
ace-dent
mxlgv
Labels
Clear labels
C
Category/Applications
Category/Drivers
Category/General
Category/Kernel
Category/Libraries
Eolite
FASM
FS
GSoC
This issue in GSoC program
HardwareTested
HLL
Influence/Settings
Influence/Text/TYPO
IRCC
Kernel
Kind
Breaking
Breaking change that won't be backward compatible
Kind
Bug
Something is not working
Kind
Build
Kind
Documentation
Documentation changes
Kind
Enhancement
Improve existing functionality
Kind
Feature
New functionality
Kind
Security
This is security issue
Kind
Testing
Issue or pull request related to testing
Pay for the code
Paid task
PR
Conflicts
PR conflicts with main
PR
Dependent
This PR is dependent on another PR
Priority
Critical
The priority is critical
Priority
High
The priority is high
Priority
Low
The priority is low
Priority
Medium
The priority is medium
PR
Ready to merge
Pull request is ready for merge
PR
Request changes
Changes requested in pull request
PR
Review required
Reviewed
Confirmed
Issue has been confirmed
Reviewed
Duplicate
This issue or pull request already exists
Reviewed
Invalid
Invalid issue
Reviewed
Won't Fix
This issue won't be fixed
Status
Abandoned
Somebody has started to work on this but abandoned work
Status
Blocked
Something is blocking this issue or pull request
Status
Need More Info
Feedback is required to reproduce issue or to continue work
No Label
Category/Applications
FASM
Kind
Enhancement
Priority
Medium
PR
Ready to merge
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
ace-dent Burer Doczom dunkaist IgorA Leency mxlgv ramenu rgimad sdongles Sweetbread
No Assignees
6 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: KolibriOS/kolibrios#194
No description provided.
Delete Branch "magnify-show-grid"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?