From 45acbddb792490d25281f2504b955e4ef56a8d1e Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Fri, 13 Mar 2020 02:52:23 +0900 Subject: [PATCH] [qwaq] Make DrawBuffer and TextContext sizes available --- ruamoko/qwaq/qwaq-draw.h | 1 + ruamoko/qwaq/qwaq-draw.r | 5 +++++ ruamoko/qwaq/qwaq-textcontext.h | 3 ++- ruamoko/qwaq/qwaq-textcontext.r | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ruamoko/qwaq/qwaq-draw.h b/ruamoko/qwaq/qwaq-draw.h index a0ef18dc1..5f7c7bc18 100644 --- a/ruamoko/qwaq/qwaq-draw.h +++ b/ruamoko/qwaq/qwaq-draw.h @@ -16,6 +16,7 @@ - (Extent) size; - (int *) buffer; +- (Rect) rect; - blitFromBuffer: (DrawBuffer *) srcBuffer to: (Point) pos from: (Rect) rect; diff --git a/ruamoko/qwaq/qwaq-draw.r b/ruamoko/qwaq/qwaq-draw.r index d1cdc950d..1311deb3c 100644 --- a/ruamoko/qwaq/qwaq-draw.r +++ b/ruamoko/qwaq/qwaq-draw.r @@ -29,6 +29,11 @@ { return buffer; } +- (Rect) rect +{ + Rect rect = { nil, size }; + return rect; +} - blitFromBuffer: (DrawBuffer *) srcBuffer to: (Point) pos from: (Rect) rect { diff --git a/ruamoko/qwaq/qwaq-textcontext.h b/ruamoko/qwaq/qwaq-textcontext.h index c260b6f44..1fbcb4fbd 100644 --- a/ruamoko/qwaq/qwaq-textcontext.h +++ b/ruamoko/qwaq/qwaq-textcontext.h @@ -38,7 +38,8 @@ -initWithRect: (Rect) rect; -initWithWindow: (window_t) window; --(window_t) window; +- (window_t) window; +- (Extent) size; - blitFromBuffer: (DrawBuffer *) srcBuffer to: (Point) pos from: (Rect) rect; diff --git a/ruamoko/qwaq/qwaq-textcontext.r b/ruamoko/qwaq/qwaq-textcontext.r index 848f3dfd5..dd94e34c1 100644 --- a/ruamoko/qwaq/qwaq-textcontext.r +++ b/ruamoko/qwaq/qwaq-textcontext.r @@ -33,6 +33,7 @@ static TextContext *screen; return nil; } window = stdscr; + rect = getwrect (window); return self; }