From 8e711e95ae530e23254c467ef2ed0d5c9ae27222 Mon Sep 17 00:00:00 2001 From: serr Date: Tue, 4 Feb 2025 20:28:41 +0300 Subject: [PATCH] =?UTF-8?q?displayLines,=20displayCols=20=D0=B8=D0=B7=20?= =?UTF-8?q?=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D0=B8,=20=D1=83=D0=B1=D1=80?= =?UTF-8?q?=D0=B0=D0=BB=20=D0=BB=D0=B8=D1=88=D0=BD=D1=8E=D1=8E=20=D1=84?= =?UTF-8?q?=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 8 +++----- mvc/controllers.py | 5 ++++- mvc/models.py | 33 +++++++++------------------------ mvc/views.py | 4 ++-- 4 files changed, 18 insertions(+), 32 deletions(-) diff --git a/main.py b/main.py index a21b4da..fe4a4ba 100644 --- a/main.py +++ b/main.py @@ -1,15 +1,13 @@ from mvc.models import VimModel -from mvc.views import VimView, CursesAdapter +from mvc.views import VimView from mvc.controllers import Controller, ReturnCode from mvc.controllers import EditStrategy, CommandStrategy, NormalStrategy def main(): - adapter = CursesAdapter() - model = VimModel(adapter.lines, adapter.cols) - view = VimView(adapter) + model, view = VimModel(), VimView() # start mode - navigation mode - strategy = NormalStrategy(model, adapter) + strategy = NormalStrategy(model, view.curses_adapter) controller = Controller(strategy) # Загрузка файла для редактирования diff --git a/mvc/controllers.py b/mvc/controllers.py index 05edbf9..87a594e 100644 --- a/mvc/controllers.py +++ b/mvc/controllers.py @@ -50,7 +50,10 @@ class CommandStrategy(BaseStrategy): if result != ReturnCode.CONTINUE: return result match symbolCode: - case self.adapter.KEY_ENTER: return self.model.EnterCommand() + case self.adapter.KEY_ENTER: + code = self.model.EnterCommand() + self.model.Scroll(self.adapter.lines, self.adapter.cols) + return code case self.adapter.KEY_BACKSPACE_1 | self.adapter.KEY_BACKSPACE_2: self.model.BackspaceCommand() case _: diff --git a/mvc/models.py b/mvc/models.py index 60d7ead..03c9dc0 100644 --- a/mvc/models.py +++ b/mvc/models.py @@ -9,9 +9,7 @@ class ReturnCode(Enum): CONTINUE = -96 class VimModel: - def __init__(self, displayLines: int, displayCols: int): - self.displayLines = displayLines - self.displayCols = displayCols + def __init__(self): self.displayBuffer = [] # буфер для хранения всех строк self.currentLine = 0 # текущий индекс строки self.currentCol = 0 # текущий индекс колонки @@ -46,56 +44,43 @@ class VimModel: self.displayBuffer[self.currentLine].insert(self.currentCol, chr(symbolCode)) self.currentCol += 1 - def MoveToPositionWithScroll(self, position: int) -> None: - """ - Перемещает курсор в указанную позицию в текущей строке - и корректирует прокрутку, если это необходимо. - """ - line_length = len(self.displayBuffer[self.currentLine]) - self.currentCol = max(0, min(position, line_length)) - - # Корректируем прокрутку, если курсор выходит за пределы видимой области - if self.currentCol < self.scrollX: - self.scrollX = self.currentCol # Прокрутка влево - elif self.currentCol >= self.scrollX + self.displayCols: - self.scrollX = self.currentCol - self.displayCols + 1 # Прокрутка вправо - def EnterCommand(self): """Обработка введенной команды""" cmd = ''.join(self.commandBuffer) self.commandBuffer.clear() match cmd: case "$": - self.MoveToPositionWithScroll(len(self.displayBuffer[self.currentLine])) # Перемещение в конец строки + self.currentCol = len(self.displayBuffer[self.currentLine]) # Перемещение в конец строки return ReturnCode.GOOD case "^" | "0": - self.MoveToPositionWithScroll(0) # Перемещение в начало строки + self.currentCol = 0 # Перемещение в начало строки return ReturnCode.GOOD case "q": return ReturnCode.EXIT_CODE case "i": return ReturnCode.SET_EDIT_MODE case "S": - self.MoveToPositionWithScroll(0) + self.currentCol = 0 self.displayBuffer[self.currentLine] = [] return ReturnCode.SET_EDIT_MODE case "RIGHT": - self.MoveToPositionWithScroll(self.currentCol + 1) + self.currentCol += 1 return ReturnCode.GOOD case "LEFT": - self.MoveToPositionWithScroll(self.currentCol - 1) + if self.currentCol > 0: + self.currentCol -= 1 return ReturnCode.GOOD case "UP": if self.currentLine > 0: self.currentLine -= 1 if self.currentCol > len(self.displayBuffer[self.currentLine]): - self.MoveToPositionWithScroll(len(self.displayBuffer[self.currentLine])) + self.currentCol = len(self.displayBuffer[self.currentLine]) return ReturnCode.GOOD case "DOWN": if self.currentLine < len(self.displayBuffer) - 1: self.currentLine += 1 if self.currentCol > len(self.displayBuffer[self.currentLine]): - self.MoveToPositionWithScroll(len(self.displayBuffer[self.currentLine])) + self.currentCol = len(self.displayBuffer[self.currentLine]) return ReturnCode.GOOD def Enter(self) -> None: diff --git a/mvc/views.py b/mvc/views.py index a876847..a6798bc 100644 --- a/mvc/views.py +++ b/mvc/views.py @@ -49,8 +49,8 @@ class CursesAdapter: class VimView: - def __init__(self, adapter: CursesAdapter) -> None: - self.curses_adapter = adapter + def __init__(self) -> None: + self.curses_adapter = CursesAdapter() def Render(self,