qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-11 07:42:18 +00:00
Code Issues Projects Releases Packages Wiki Activity
quakeforge/ruamoko/qwaq/ui/view.h

144 lines
2.9 KiB
C
Raw Normal View History

[qwaq] Clean up the qwaq directory Things were getting rather cluttered with everything being qwaq-* and all in one directory. Now most have lost the qwaq- prefix and have been moved into subdirectories (non-recursive make).
2020-03-29 17:34:08 +00:00
#ifndef __qwaq_ui_view_h
#define __qwaq_ui_view_h
[qwaq] Start work on the actual app It doesn't look good, but it does have panel based windows working, and using objects. Won't build reliably right now due to qwaq being in tools and thus building before ruamoko, but I'll fix that next.
2020-02-29 15:40:55 +00:00
#include <Array.h>
#include <Object.h>
[build] Move to non-recursive make There's still some cleanup to do, but everything seems to be working nicely: `make -j` works, `make distcheck` passes. There is probably plenty of bitrot in the package directories (RPM, debian), though. The vc project files have been removed since those versions are way out of date and quakeforge is pretty much dependent on gcc now anyway. Most of the old Makefile.am files are now Makemodule.am. This should allow for new Makefile.am files that allow local building (to be added on an as-needed bases). The current remaining Makefile.am files are for standalone sub-projects.a The installable bins are currently built in the top-level build directory. This may change if the clutter gets to be too much. While this does make a noticeable difference in build times, the main reason for the switch was to take care of the growing dependency issues: now it's possible to build tools for code generation (eg, using qfcc and ruamoko programs for code-gen).
2020-06-21 14:15:17 +00:00
#include "ruamoko/qwaq/ui/draw.h"
#include "ruamoko/qwaq/ui/rect.h"
#include "ruamoko/qwaq/ui/textcontext.h"
[qwaq] Start work on the actual app It doesn't look good, but it does have panel based windows working, and using objects. Won't build reliably right now due to qwaq being in tools and thus building before ruamoko, but I'll fix that next.
2020-02-29 15:40:55 +00:00
[qwaq] Add Group and clean up lots of mess Things are finally doing something again, and getting closer to having a moveable window.
2020-03-05 06:44:53 +00:00
@class Group;
[qwaq] Implement focus handling Sort of works (when not segfaulting due to problem fixed in next commit).
2020-03-24 04:33:28 +00:00
@class ListenerGroup;
[qwaq] Move scroll bar management into View Putting it in Editor worked as a proof of concept, but it seems those always turn out to need tweaking like this because the concept proves itself to be generally worthwhile :P
2020-03-31 02:21:47 +00:00
@class ScrollBar;
[qwaq] Add Group and clean up lots of mess Things are finally doing something again, and getting closer to having a moveable window.
2020-03-05 06:44:53 +00:00
enum {
Adjust some whitespace
2020-03-23 11:18:12 +00:00
ofCanFocus = 0x0001,
ofFirstClick = 0x0002,
[qwaq] Move onEvent into View In the end, it did make sense since it seems to facilitate MVC nicely.
2020-03-26 08:28:38 +00:00
ofMakeFirst = 0x0004,
ofDontDraw = 0x0008,
ofRelativeEvents= 0x0010,
ofTileable = 0x0020,
ofCentered = 0x0040,
[qwaq] Add Group and clean up lots of mess Things are finally doing something again, and getting closer to having a moveable window.
2020-03-05 06:44:53 +00:00
};
enum {
Adjust some whitespace
2020-03-23 11:18:12 +00:00
sfDrawn = 0x0001,
sfDisabled = 0x0002,
sfInFocus = 0x0004,
sfModal = 0x0008,
sfLocked = 0x0010,
[qwaq] Add Group and clean up lots of mess Things are finally doing something again, and getting closer to having a moveable window.
2020-03-05 06:44:53 +00:00
};
[qwaq] Implement resizing Terminal resize is detected and the views adjust appropriately (well, those for which I've set grow flags: the window title bar doesn't adjust yet).
2020-03-23 11:14:32 +00:00
enum {
[qwaq] Add gfGrowNone and a grow mode setter gfGrowNone is just to allow not growing with the owner to be explicitly stated.
2020-03-23 13:08:30 +00:00
gfGrowNone = 0x0000,
[qwaq] Implement resizing Terminal resize is detected and the views adjust appropriately (well, those for which I've set grow flags: the window title bar doesn't adjust yet).
2020-03-23 11:14:32 +00:00
gfGrowLoX = 0x0001,
gfGrowLoY = 0x0002,
gfGrowHiX = 0x0004,
gfGrowHiY = 0x0008,
gfGrowRel = 0x0010,
gfGrowLo = gfGrowLoX | gfGrowLoY,
gfGrowHi = gfGrowHiX | gfGrowHiY,
gfGrowX = gfGrowLoX | gfGrowHiX,
gfGrowY = gfGrowLoY | gfGrowHiY,
gfGrowAll = gfGrowX | gfGrowY,
};
[qwaq] Clean up the hierarchy I think I've finally figured out what I want the core hierarchy to be. Right now, it's just the two classes: View and Window (derived from View). Window has a Group, and Group is just a collection of Views that it manages. QwaqApplication is just an object but like a Window, it has a Group of views. View Window has a Group Group contains Views QwaqApplication has a group More work needs to be done on drawing and event handling, but things are working again.
2020-03-19 02:32:44 +00:00
[qwaq] Make a View protocol
2020-03-24 12:02:26 +00:00
@protocol View
[qwaq] Add Group and clean up lots of mess Things are finally doing something again, and getting closer to having a moveable window.
2020-03-05 06:44:53 +00:00
-setOwner: (Group *) owner;
[qwaq] Add gfGrowNone and a grow mode setter gfGrowNone is just to allow not growing with the owner to be explicitly stated.
2020-03-23 13:08:30 +00:00
-setGrowMode: (int) mode;
[qwaq] Clean up the hierarchy I think I've finally figured out what I want the core hierarchy to be. Right now, it's just the two classes: View and Window (derived from View). Window has a Group, and Group is just a collection of Views that it manages. QwaqApplication is just an object but like a Window, it has a Group of views. View Window has a Group Group contains Views QwaqApplication has a group More work needs to be done on drawing and event handling, but things are working again.
2020-03-19 02:32:44 +00:00
[qwaq] Implement mouse enter/leave events
2020-03-19 06:55:57 +00:00
-(Rect)rect;
[qwaq] Start work on cursor management For now, the cursor is always hidden, but the plan is to have it visible in only the focused view if that view has enabled the cursor.
2021-06-01 03:59:01 +00:00
-(Rect)absRect;
[qwaq] Fetch View origin and size separately
2020-03-19 09:38:24 +00:00
-(Point)origin;
-(Extent)size;
[qwaq] Implement mouse enter/leave events
2020-03-19 06:55:57 +00:00
-(int) containsPoint: (Point) point;
[qwaq] Clean things up in prep for button testing
2020-03-19 07:27:30 +00:00
-(void) grabMouse;
-(void) releaseMouse;
[qwaq] Clean up the hierarchy I think I've finally figured out what I want the core hierarchy to be. Right now, it's just the two classes: View and Window (derived from View). Window has a Group, and Group is just a collection of Views that it manages. QwaqApplication is just an object but like a Window, it has a Group of views. View Window has a Group Group contains Views QwaqApplication has a group More work needs to be done on drawing and event handling, but things are working again.
2020-03-19 02:32:44 +00:00
-(int) options;
[qwaq] Implement focus handling Sort of works (when not segfaulting due to problem fixed in next commit).
2020-03-24 04:33:28 +00:00
-(int) state;
[qwaq] Clean up the hierarchy I think I've finally figured out what I want the core hierarchy to be. Right now, it's just the two classes: View and Window (derived from View). Window has a Group, and Group is just a collection of Views that it manages. QwaqApplication is just an object but like a Window, it has a Group of views. View Window has a Group Group contains Views QwaqApplication has a group More work needs to be done on drawing and event handling, but things are working again.
2020-03-19 02:32:44 +00:00
[qwaq] Move scroll bar management into View Putting it in Editor worked as a proof of concept, but it seems those always turn out to need tweaking like this because the concept proves itself to be generally worthwhile :P
2020-03-31 02:21:47 +00:00
-setVerticalScrollBar:(ScrollBar *)scrollbar;
-setHorizontalScrollBar:(ScrollBar *)scrollbar;
-(ListenerGroup *) onViewScrolled;
[qwaq] Transfer context to new view in proxy This fixes the broken source window on file change.
2020-03-26 04:20:10 +00:00
-(id<TextContext>)context;
[qwaq] Clean up the hierarchy I think I've finally figured out what I want the core hierarchy to be. Right now, it's just the two classes: View and Window (derived from View). Window has a Group, and Group is just a collection of Views that it manages. QwaqApplication is just an object but like a Window, it has a Group of views. View Window has a Group Group contains Views QwaqApplication has a group More work needs to be done on drawing and event handling, but things are working again.
2020-03-19 02:32:44 +00:00
-setContext: (id<TextContext>) context;
[qwaq] Add Group and clean up lots of mess Things are finally doing something again, and getting closer to having a moveable window.
2020-03-05 06:44:53 +00:00
-draw;
[qwaq] Add -hide to View's interface Missed it somehow.
2020-03-24 12:01:48 +00:00
-hide;
[qwaq] Add Group and clean up lots of mess Things are finally doing something again, and getting closer to having a moveable window.
2020-03-05 06:44:53 +00:00
-redraw;
[qwaq] Implement resizing Terminal resize is detected and the views adjust appropriately (well, those for which I've set grow flags: the window title bar doesn't adjust yet).
2020-03-23 11:14:32 +00:00
-move: (Point) delta;
[qwaq] Start work on cursor management For now, the cursor is always hidden, but the plan is to have it visible in only the focused view if that view has enabled the cursor.
2021-06-01 03:59:01 +00:00
-updateAbsPos: (Point) absPos;
[qwaq] Implement resizing Terminal resize is detected and the views adjust appropriately (well, those for which I've set grow flags: the window title bar doesn't adjust yet).
2020-03-23 11:14:32 +00:00
-resize: (Extent) delta;
[qwaq] Add combined move and resize method This fixes the hall of mirrors bug (needed to move, resize, then move the window).
2020-03-25 05:39:37 +00:00
-move:(Point)dpos andResize:(Extent)dsize;
[qwaq] Allow views to be moved/resized without redraw The move is to a specified point and resize to a specified size rather than a delta.
2020-03-31 01:54:15 +00:00
-moveTo:(Point)pos; // does not redraw
-resizeTo:(Extent)size; // does not redraw
[qwaq] Implement resizing Terminal resize is detected and the views adjust appropriately (well, those for which I've set grow flags: the window title bar doesn't adjust yet).
2020-03-23 11:14:32 +00:00
-grow: (Extent) delta;
[qwaq] Move onEvent into View In the end, it did make sense since it seems to facilitate MVC nicely.
2020-03-26 08:28:38 +00:00
-(ListenerGroup *)onEvent;
[qwaq] Rework the hierarchy again It doesn't work right now because View unconditionally sends refresh to its textContext, but textContext can be a draw buffer which does not respond to refresh. Still, these changes (notably the assignment chain in qwaq-group.r really pushed qfcc).
2020-03-14 10:45:07 +00:00
-handleEvent: (qwaq_event_t *) event;
[qwaq] Implement focus handling Sort of works (when not segfaulting due to problem fixed in next commit).
2020-03-24 04:33:28 +00:00
-takeFocus;
-loseFocus;
-(ListenerGroup *) onReceiveFocus;
-(ListenerGroup *) onReleaseFocus;
[qwaq] Raise windows when clicked
2020-03-26 02:18:00 +00:00
-raise;
[qwaq] Start work on cursor management For now, the cursor is always hidden, but the plan is to have it visible in only the focused view if that view has enabled the cursor.
2021-06-01 03:59:01 +00:00
-hideCursor;
-showCursor;
-setCursorVisible:(int) visible;
-moveCursor:(Point) pos;
[qwaq] Use new TextContext Not quite right yet, but it worked first try (once I got another compiler bug sorted).
2020-03-06 08:25:19 +00:00
[qwaq] Implement mouse enter/leave events
2020-03-19 06:55:57 +00:00
- (void) onMouseEnter: (Point) pos;
- (void) onMouseLeave: (Point) pos;
[qwaq] Use new TextContext Not quite right yet, but it worked first try (once I got another compiler bug sorted).
2020-03-06 08:25:19 +00:00
- (void) refresh;
- (void) mvprintf: (Point) pos, string fmt, ...;
- (void) mvvprintf: (Point) pos, string fmt, @va_list args;
- (void) mvaddch: (Point) pos, int ch;
[qwaq] Implement rectangular region clearing You'd think ncurses would have this, but I guess it's too window-oriented.
2020-03-28 00:41:54 +00:00
-clear;
[qwaq] Start work on the actual app It doesn't look good, but it does have panel based windows working, and using objects. Won't build reliably right now due to qwaq being in tools and thus building before ruamoko, but I'll fix that next.
2020-02-29 15:40:55 +00:00
@end
[qwaq] Make a View protocol
2020-03-24 12:02:26 +00:00
@interface View: Object <View>
{
union {
Rect rect;
struct {
int xpos;
int ypos;
int xlen;
int ylen;
};
struct {
Point pos;
Extent size;
};
};
Rect absRect;
Group *owner;
id<TextContext> textContext;
int state;
int options;
int growMode;
int cursorState;
[qwaq] Start work on cursor management For now, the cursor is always hidden, but the plan is to have it visible in only the focused view if that view has enabled the cursor.
2021-06-01 03:59:01 +00:00
Point cursorPos;
[qwaq] Make a View protocol
2020-03-24 12:02:26 +00:00
ListenerGroup *onReceiveFocus;
ListenerGroup *onReleaseFocus;
[qwaq] Move onEvent into View In the end, it did make sense since it seems to facilitate MVC nicely.
2020-03-26 08:28:38 +00:00
ListenerGroup *onEvent;
[qwaq] Move scroll bar management into View Putting it in Editor worked as a proof of concept, but it seems those always turn out to need tweaking like this because the concept proves itself to be generally worthwhile :P
2020-03-31 02:21:47 +00:00
ListenerGroup *onViewScrolled;
ScrollBar *hScrollBar;
ScrollBar *vScrollBar;
Point scroll;
[qwaq] Make a View protocol
2020-03-24 12:02:26 +00:00
}
[qwaq] Rework allocation to use retain/release It currently dies when single stepping or exiting due to EditBuffer's retain count not getting incremented when initialized. This is because EditBuffer is initialized in C and thus does not call Object's -init.
2020-03-30 07:30:58 +00:00
+(View *)viewWithRect:(Rect)rect;
+(View *)viewWithRect:(Rect)rect options:(int)options;
-initWithRect:(Rect)rect;
-initWithRect:(Rect)rect options:(int)options;
[qwaq] Make a View protocol
2020-03-24 12:02:26 +00:00
@end
[qwaq] Create protocols for DrawBuffer and TextContext Plenty of flaws at the moment (casts to id :/), but the basic idea seems to be ok.
2020-03-17 16:39:12 +00:00
@interface View (TextContext) <TextContext>
[qwaq] Use forwarding for some text methods refresh won't be in the drawing buffer protocol, and the move commands need to be offset by the view's position in its window, but it works as intended.
2020-03-09 17:58:30 +00:00
@end
[qwaq] Clean up the qwaq directory Things were getting rather cluttered with everything being qwaq-* and all in one directory. Now most have lost the qwaq- prefix and have been moved into subdirectories (non-recursive make).
2020-03-29 17:34:08 +00:00
#endif//__qwaq_ui_view_h
Reference in a new issue Copy permalink