/* PUBLIC SERVER APIS *********************************************************/
/*
- * FIXME: This function MUST be moved fro condrv/conoutput.c because only
+ * FIXME: This function MUST be moved from condrv/conoutput.c because only
* consrv knows how to manipulate VDM screenbuffers.
*/
NTSTATUS NTAPI
PaintSelectionRect(GuiData, &ps);
}
+ // TODO: Move cursor display here!
+
LeaveCriticalSection(&GuiData->Lock);
}
EndPaint(GuiData->hWindow, &ps);
PCONSRV_CONSOLE Console = Buffer->Header.Console;
// ASSERT(Console == GuiData->Console);
- SetRectEmpty(rcFramebuffer);
+ ConioInitLongRect(rcFramebuffer, 0, 0, 0, 0);
- if (Buffer->BitMap == NULL) return;
+ if (Buffer->BitMap == NULL)
+ return;
- if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return;
+ if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE))
+ return;
- rcFramebuffer->left = Buffer->ViewOrigin.X * 1 + rcView->left;
- rcFramebuffer->top = Buffer->ViewOrigin.Y * 1 + rcView->top;
- rcFramebuffer->right = Buffer->ViewOrigin.X * 1 + rcView->right;
- rcFramebuffer->bottom = Buffer->ViewOrigin.Y * 1 + rcView->bottom;
+ ConioInitLongRect(rcFramebuffer,
+ Buffer->ViewOrigin.Y * 1 + rcView->top,
+ Buffer->ViewOrigin.X * 1 + rcView->left,
+ Buffer->ViewOrigin.Y * 1 + rcView->bottom,
+ Buffer->ViewOrigin.X * 1 + rcView->right);
/* Grab the mutex */
NtWaitForSingleObject(Buffer->Mutex, FALSE, NULL);
else // if (GetType(ActiveBuffer) == GRAPHICS_BUFFER)
{
// PGRAPHICS_SCREEN_BUFFER Buffer = (PGRAPHICS_SCREEN_BUFFER)ActiveBuffer;
- DPRINT1("GuiConsoleShowConsoleProperties - Graphics buffer\n");
// FIXME: Gather defaults from the registry ?
pSharedInfo->ScreenAttributes = DEFAULT_SCREEN_ATTRIB;
PRECT rcFramebuffer)
{
PCONSRV_CONSOLE Console = Buffer->Header.Console;
- // ASSERT(Console == GuiData->Console);
-
- ULONG TopLine, BottomLine, LeftChar, RightChar;
+ ULONG TopLine, BottomLine, LeftColumn, RightColumn;
ULONG Line, Char, Start;
PCHAR_INFO From;
PWCHAR To;
HFONT OldFont, NewFont;
BOOLEAN IsUnderline;
- SetRectEmpty(rcFramebuffer);
+ // ASSERT(Console == GuiData->Console);
+
+ ConioInitLongRect(rcFramebuffer, 0, 0, 0, 0);
- if (Buffer->Buffer == NULL) return;
+ if (Buffer->Buffer == NULL)
+ return;
+
+ if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE))
+ return;
- if (!ConDrvValidateConsoleUnsafe((PCONSOLE)Console, CONSOLE_RUNNING, TRUE)) return;
+ ConioInitLongRect(rcFramebuffer,
+ Buffer->ViewOrigin.Y * GuiData->CharHeight + rcView->top,
+ Buffer->ViewOrigin.X * GuiData->CharWidth + rcView->left,
+ Buffer->ViewOrigin.Y * GuiData->CharHeight + rcView->bottom,
+ Buffer->ViewOrigin.X * GuiData->CharWidth + rcView->right);
- rcFramebuffer->left = Buffer->ViewOrigin.X * GuiData->CharWidth + rcView->left;
- rcFramebuffer->top = Buffer->ViewOrigin.Y * GuiData->CharHeight + rcView->top;
- rcFramebuffer->right = Buffer->ViewOrigin.X * GuiData->CharWidth + rcView->right;
- rcFramebuffer->bottom = Buffer->ViewOrigin.Y * GuiData->CharHeight + rcView->bottom;
+ LeftColumn = rcFramebuffer->left / GuiData->CharWidth;
+ RightColumn = rcFramebuffer->right / GuiData->CharWidth;
+ if (RightColumn >= (ULONG)Buffer->ScreenBufferSize.X)
+ RightColumn = Buffer->ScreenBufferSize.X - 1;
- LeftChar = rcFramebuffer->left / GuiData->CharWidth;
TopLine = rcFramebuffer->top / GuiData->CharHeight;
- RightChar = rcFramebuffer->right / GuiData->CharWidth;
BottomLine = rcFramebuffer->bottom / GuiData->CharHeight;
+ if (BottomLine >= (ULONG)Buffer->ScreenBufferSize.Y)
+ BottomLine = Buffer->ScreenBufferSize.Y - 1;
- if (RightChar >= (ULONG)Buffer->ScreenBufferSize.X) RightChar = Buffer->ScreenBufferSize.X - 1;
- if (BottomLine >= (ULONG)Buffer->ScreenBufferSize.Y) BottomLine = Buffer->ScreenBufferSize.Y - 1;
-
- LastAttribute = ConioCoordToPointer(Buffer, LeftChar, TopLine)->Attributes;
+ LastAttribute = ConioCoordToPointer(Buffer, LeftColumn, TopLine)->Attributes;
SetTextColor(GuiData->hMemDC, PaletteRGBFromAttrib(Console, TextAttribFromAttrib(LastAttribute)));
SetBkColor(GuiData->hMemDC, PaletteRGBFromAttrib(Console, BkgdAttribFromAttrib(LastAttribute)));
for (Line = TopLine; Line <= BottomLine; Line++)
{
WCHAR LineBuffer[80]; // Buffer containing a part or all the line to be displayed
- From = ConioCoordToPointer(Buffer, LeftChar, Line); // Get the first code of the line
- Start = LeftChar;
+ From = ConioCoordToPointer(Buffer, LeftColumn, Line); // Get the first code of the line
+ Start = LeftColumn;
To = LineBuffer;
- for (Char = LeftChar; Char <= RightChar; Char++)
+ for (Char = LeftColumn; Char <= RightColumn; Char++)
{
/*
* We flush the buffer if the new attribute is different
Start * GuiData->CharWidth,
Line * GuiData->CharHeight,
LineBuffer,
- RightChar - Start + 1);
+ RightColumn - Start + 1);
}
/* Restore the old font */
{
CursorX = Buffer->CursorPosition.X;
CursorY = Buffer->CursorPosition.Y;
- if (LeftChar <= CursorX && CursorX <= RightChar &&
- TopLine <= CursorY && CursorY <= BottomLine)
+ if (LeftColumn <= CursorX && CursorX <= RightColumn &&
+ TopLine <= CursorY && CursorY <= BottomLine)
{
CursorHeight = ConioEffectiveCursorSize(Console, GuiData->CharHeight);
Attribute = ConioCoordToPointer(Buffer, Buffer->CursorPosition.X, Buffer->CursorPosition.Y)->Attributes;
- if (Attribute == DEFAULT_SCREEN_ATTRIB) Attribute = Buffer->ScreenDefaultAttrib;
+ if (Attribute == DEFAULT_SCREEN_ATTRIB)
+ Attribute = Buffer->ScreenDefaultAttrib;
CursorBrush = CreateSolidBrush(PaletteRGBFromAttrib(Console, TextAttribFromAttrib(Attribute)));
OldBrush = SelectObject(GuiData->hMemDC, CursorBrush);
HistoryDisplayCurrentHistory(PCONSRV_CONSOLE Console,
PUNICODE_STRING ExeName)
{
- PTEXTMODE_SCREEN_BUFFER ActiveBuffer;
+ PCONSOLE_SCREEN_BUFFER ActiveBuffer;
PPOPUP_WINDOW Popup;
SHORT xLeft, yTop;
if (Hist->NumEntries == 0) return NULL;
if (GetType(Console->ActiveBuffer) != TEXTMODE_BUFFER) return NULL;
- ActiveBuffer = (PTEXTMODE_SCREEN_BUFFER)Console->ActiveBuffer;
+ ActiveBuffer = Console->ActiveBuffer;
Width = 40;
Height = 10;
#pragma once
+#define ConioInitLongRect(Rect, Top, Left, Bottom, Right) \
+do { \
+ ((Rect)->top) = Top; \
+ ((Rect)->left) = Left; \
+ ((Rect)->bottom) = Bottom; \
+ ((Rect)->right) = Right; \
+} while (0)
+
#define ConioInitRect(Rect, top, left, bottom, right) \
do { \
- ((Rect)->Top) = top; \
- ((Rect)->Left) = left; \
+ ((Rect)->Top) = top; \
+ ((Rect)->Left) = left; \
((Rect)->Bottom) = bottom; \
- ((Rect)->Right) = right; \
+ ((Rect)->Right) = right; \
} while (0)
+
#define ConioIsRectEmpty(Rect) \
(((Rect)->Left > (Rect)->Right) || ((Rect)->Top > (Rect)->Bottom))
LineInputSetPos(Console, Pos + NumToInsert);
}
-#if 0
static VOID
LineInputRecallHistory(PCONSRV_CONSOLE Console,
PUNICODE_STRING ExeName,
INT Offset)
{
+#if 0
PHISTORY_BUFFER Hist = HistoryCurrentBuffer(Console, ExeName);
UINT Position = 0;
LineInputEdit(Console, Console->LineSize,
Hist->Entries[Hist->Position].Length / sizeof(WCHAR),
Hist->Entries[Hist->Position].Buffer);
-}
+
#else
-static VOID
-LineInputRecallHistory(PCONSRV_CONSOLE Console,
- PUNICODE_STRING ExeName,
- INT Offset)
-{
+
UNICODE_STRING Entry;
if (!HistoryRecallHistory(Console, ExeName, Offset, &Entry)) return;
LineInputEdit(Console, Console->LineSize,
Entry.Length / sizeof(WCHAR),
Entry.Buffer);
-}
#endif
+}
// TESTS!!
/* PUBLIC FUNCTIONS ***********************************************************/
PPOPUP_WINDOW
-CreatePopupWindow(PCONSRV_CONSOLE Console,
- PTEXTMODE_SCREEN_BUFFER Buffer,
- SHORT xLeft,
- SHORT yTop,
- SHORT Width,
- SHORT Height)
+CreatePopupWindow(
+ IN PCONSRV_CONSOLE Console,
+ IN PCONSOLE_SCREEN_BUFFER ScreenBuffer,
+ IN SHORT xLeft,
+ IN SHORT yTop,
+ IN SHORT Width,
+ IN SHORT Height)
{
+ PTEXTMODE_SCREEN_BUFFER Buffer;
PPOPUP_WINDOW Popup;
SMALL_RECT Region;
- ASSERT((PCONSOLE)Console == Buffer->Header.Console);
+ ASSERT((PCONSOLE)Console == ScreenBuffer->Header.Console);
+
+ if (GetType(ScreenBuffer) != TEXTMODE_BUFFER)
+ return NULL;
+
+ Buffer = (PTEXTMODE_SCREEN_BUFFER)ScreenBuffer;
/* Create the popup window */
Popup = ConsoleAllocHeap(HEAP_ZERO_MEMORY, sizeof(*Popup));
}
VOID
-DestroyPopupWindow(PPOPUP_WINDOW Popup)
+DestroyPopupWindow(
+ IN PPOPUP_WINDOW Popup)
{
SMALL_RECT Region;
PPOPUP_WINDOW
-CreatePopupWindow(PCONSRV_CONSOLE Console,
- PTEXTMODE_SCREEN_BUFFER Buffer,
- SHORT xLeft,
- SHORT yTop,
- SHORT Width,
- SHORT Height);
+CreatePopupWindow(
+ IN PCONSRV_CONSOLE Console,
+ IN PCONSOLE_SCREEN_BUFFER ScreenBuffer,
+ IN SHORT xLeft,
+ IN SHORT yTop,
+ IN SHORT Width,
+ IN SHORT Height);
+
VOID
-DestroyPopupWindow(PPOPUP_WINDOW Popup);
+DestroyPopupWindow(
+ IN PPOPUP_WINDOW Popup);
if (GetType(ActiveBuffer) == TEXTMODE_BUFFER)
{
- PTEXTMODE_SCREEN_BUFFER Buffer = (PTEXTMODE_SCREEN_BUFFER)ActiveBuffer;
- COORD BufSize;
-
/* Resize its active screen-buffer */
- BufSize = ConsoleInfo->ScreenBufferSize;
+ PTEXTMODE_SCREEN_BUFFER Buffer = (PTEXTMODE_SCREEN_BUFFER)ActiveBuffer;
+ COORD BufSize = ConsoleInfo->ScreenBufferSize;
if (Console->FixedSize)
{
* at the moment. However, keep those settings somewhere so that
* we can try to set them up when we will be allowed to do so.
*/
- if (ConsoleInfo->WindowSize.X != Buffer->OldViewSize.X ||
- ConsoleInfo->WindowSize.Y != Buffer->OldViewSize.Y)
+ if (ConsoleInfo->WindowSize.X != ActiveBuffer->OldViewSize.X ||
+ ConsoleInfo->WindowSize.Y != ActiveBuffer->OldViewSize.Y)
{
- Buffer->OldViewSize = ConsoleInfo->WindowSize;
+ ActiveBuffer->OldViewSize = ConsoleInfo->WindowSize;
}
- /* Buffer size is not allowed to be smaller than the view size */
- if (BufSize.X >= Buffer->OldViewSize.X && BufSize.Y >= Buffer->OldViewSize.Y)
+ /* The buffer size is not allowed to be smaller than the view size */
+ if (BufSize.X >= ActiveBuffer->OldViewSize.X && BufSize.Y >= ActiveBuffer->OldViewSize.Y)
{
- if (BufSize.X != Buffer->OldScreenBufferSize.X ||
- BufSize.Y != Buffer->OldScreenBufferSize.Y)
+ if (BufSize.X != ActiveBuffer->OldScreenBufferSize.X ||
+ BufSize.Y != ActiveBuffer->OldScreenBufferSize.Y)
{
/*
* The console is in fixed-size mode, so we cannot resize anything
* at the moment. However, keep those settings somewhere so that
* we can try to set them up when we will be allowed to do so.
*/
- Buffer->OldScreenBufferSize = BufSize;
+ ActiveBuffer->OldScreenBufferSize = BufSize;
}
}
}
BOOL SizeChanged = FALSE;
/* Resize the console */
- if (ConsoleInfo->WindowSize.X != Buffer->ViewSize.X ||
- ConsoleInfo->WindowSize.Y != Buffer->ViewSize.Y)
+ if (ConsoleInfo->WindowSize.X != ActiveBuffer->ViewSize.X ||
+ ConsoleInfo->WindowSize.Y != ActiveBuffer->ViewSize.Y)
{
- Buffer->ViewSize = ConsoleInfo->WindowSize;
+ ActiveBuffer->ViewSize = ConsoleInfo->WindowSize;
SizeChanged = TRUE;
}
/* Resize the screen-buffer */
- if (BufSize.X != Buffer->ScreenBufferSize.X ||
- BufSize.Y != Buffer->ScreenBufferSize.Y)
+ if (BufSize.X != ActiveBuffer->ScreenBufferSize.X ||
+ BufSize.Y != ActiveBuffer->ScreenBufferSize.Y)
{
if (NT_SUCCESS(ConioResizeBuffer(Console, Buffer, BufSize)))
SizeChanged = TRUE;
}
else // if (GetType(ActiveBuffer) == GRAPHICS_BUFFER)
{
- PGRAPHICS_SCREEN_BUFFER Buffer = (PGRAPHICS_SCREEN_BUFFER)ActiveBuffer;
-
/*
* In any case we do NOT modify the size of the graphics screen-buffer.
* We just allow resizing the view only if the new size is smaller
* than the older one.
*/
-
if (Console->FixedSize)
{
/*
* at the moment. However, keep those settings somewhere so that
* we can try to set them up when we will be allowed to do so.
*/
- if (ConsoleInfo->WindowSize.X <= Buffer->ViewSize.X ||
- ConsoleInfo->WindowSize.Y <= Buffer->ViewSize.Y)
+ if (ConsoleInfo->WindowSize.X <= ActiveBuffer->ViewSize.X ||
+ ConsoleInfo->WindowSize.Y <= ActiveBuffer->ViewSize.Y)
{
- Buffer->OldViewSize = ConsoleInfo->WindowSize;
+ ActiveBuffer->OldViewSize = ConsoleInfo->WindowSize;
}
}
else
{
/* Resize the view if its size is bigger than the specified size */
- if (ConsoleInfo->WindowSize.X <= Buffer->ViewSize.X ||
- ConsoleInfo->WindowSize.Y <= Buffer->ViewSize.Y)
+ if (ConsoleInfo->WindowSize.X <= ActiveBuffer->ViewSize.X ||
+ ConsoleInfo->WindowSize.Y <= ActiveBuffer->ViewSize.Y)
{
- Buffer->ViewSize = ConsoleInfo->WindowSize;
+ ActiveBuffer->ViewSize = ConsoleInfo->WindowSize;
// SizeChanged = TRUE;
}
}
projects / reactos.git / commitdiff