Usermode/axwin3 - Copying parts of AxWin2 over to get it compiling
authorJohn Hodge <[email protected]>
Wed, 26 Oct 2011 08:49:36 +0000 (16:49 +0800)
committerJohn Hodge <[email protected]>
Wed, 26 Oct 2011 08:49:36 +0000 (16:49 +0800)
Usermode/Applications/axwin3_src/Makefile [new file with mode: 0644]
Usermode/Applications/axwin3_src/WM/Makefile [new file with mode: 0644]
Usermode/Applications/axwin3_src/WM/include/common.h
Usermode/Applications/axwin3_src/WM/include/messages.h
Usermode/Applications/axwin3_src/WM/include/wm.h
Usermode/Applications/axwin3_src/WM/include/wm_renderer.h
Usermode/Applications/axwin3_src/WM/input.c [new file with mode: 0644]
Usermode/Applications/axwin3_src/WM/main.c [new file with mode: 0644]
Usermode/Applications/axwin3_src/WM/video.c [new file with mode: 0644]

diff --git a/Usermode/Applications/axwin3_src/Makefile b/Usermode/Applications/axwin3_src/Makefile
new file mode 100644 (file)
index 0000000..daf0685
--- /dev/null
@@ -0,0 +1,13 @@
+
+NAME = AxWin3
+DIRS = WM
+
+SUBMAKE = $(MAKE) --no-print-directory
+
+all:
+       @$(foreach DIR,$(DIRS), echo --- $(NAME)/$(DIR) && $(SUBMAKE) -C $(DIR) $@ &&) true
+install:
+       @$(foreach DIR,$(DIRS), echo --- $(NAME)/$(DIR) && $(SUBMAKE) -C $(DIR) $@ &&) true
+
+clean:
+       @$(foreach DIR,$(DIRS), $(SUBMAKE) -C $(DIR) $@ &&) true
diff --git a/Usermode/Applications/axwin3_src/WM/Makefile b/Usermode/Applications/axwin3_src/WM/Makefile
new file mode 100644 (file)
index 0000000..69c99b2
--- /dev/null
@@ -0,0 +1,22 @@
+# Project: Acess2 GUI v3 Window Manager
+
+-include ../../Makefile.cfg
+
+CPPFLAGS += -I include/
+
+DIR := Apps/AxWin/2.0
+BIN := AxWinWM
+OBJ := main.o
+OBJ += messageio.o
+OBJ += renderer_classes.o renderer_passthru.o renderer_widget.o
+
+LDFLAGS += -limage_sif -luri -lnet
+
+-include ../../Makefile.tpl
+
+#all: resources/LogoSmall.sif.res.h
+
+%.res.h: % Makefile
+       echo "#define RESOURCE_$(notdir $<) \\"| sed -e 's/\./_/g' > $@
+       base64 $< | sed -e 's/.*/"&"\\/' >> $@
+       echo "" >> $@
index ffaff33..7da032d 100644 (file)
@@ -8,5 +8,17 @@
 #ifndef _COMMON_H_
 #define _COMMON_H_
 
+#include <acess/sys.h>
+
+// === FUNCTIONS ===
+// --- Input ---
+ int   Input_Init(void);
+void   Input_FillSelect(int *nfds, fd_set *set);
+void   Input_HandleSelect(fd_set *set);
+// --- IPC ---
+ int   IPC_Init(void);
+void   IPC_FillSelect(int *nfds, fd_set *set);
+void   IPC_HandleSelect(fd_set *set);
+
 #endif
 
index 840ad68..3219ea0 100644 (file)
@@ -4,6 +4,13 @@
 #ifndef _MESSAGES_H_
 #define _MESSAGES_H_
 
+struct sAxWin_Message
+{
+       uint16_t        ID;
+};
+
+typedef struct sAxWin_Message  tAxWin_Message;
+
 enum eMessages
 {
        MSG_NULL,
index 56118f6..79b8b3a 100644 (file)
  * \}
  */
 
+// === TYPES ===
+typedef struct sWindow tWindow;
+typedef struct sWMRenderer     tWMRenderer;
+typedef uint32_t       tColour;
+
 // === FUNCTIONS ===
-extern tWindow *WM_CreateWindow(tWindow *Parent, int X, int Y, int W, int H, int Flags, tRenderer *Handler);
+// --- Management
+extern tWindow *WM_CreateWindow(tWindow *Parent, int X, int Y, int W, int H, int Flags, tWMRenderer *Handler);
 extern int     WM_Reposition(tWindow *Window, int X, int Y, int W, int H);
 extern int     WM_SetFlags(tWindow *Window, int Flags);
 extern int     WM_SendMessage(tWindow *Window, int MessageID, int Length, void *Data);
+// --- Rendering
+extern void    Render_DrawFilledRect(tWindow *Window, tColour Colour, int X, int Y, int W, int H);
 
 #endif
 
index ba8ce04..165d38a 100644 (file)
@@ -8,7 +8,9 @@
 #ifndef _WM_RENDERER_H_
 #define _WM_RENDERER_H_
 
-typedef struct sWMRenderer
+#include <wm.h>
+
+struct sWMRenderer
 {
        /**
         * \brief Internal pointer to next loaded renderer
@@ -29,7 +31,7 @@ typedef struct sWMRenderer
         * \note Only the fields \a W and \a H need be filled in the window
         *       structure, the rest will be filled by the caller.
         */
-       tWindow (*InitWindow)(int W, int H, int Flags);
+       tWindow *(*CreateWindow)(int W, int H, int Flags);
 
        /**
         * \brief Redraw a window on the screen
@@ -49,7 +51,10 @@ typedef struct sWMRenderer
         * \param Length        Length of the buffer \a Data
         * \param Data          Implementation defined data buffer
         */
-        int    (*SendMessage)(tWindow *Window, int MessageID, int Length, void *Data);
-}      tWMRenderer;
+        int    (*HandleMessage)(tWindow *Window, int MessageID, int Length, void *Data);
+};
+
+extern void    WM_RegisterRenderer(tWMRenderer *Renderer);
+extern tWindow *WM_CreateWindowStruct(size_t ExtraBytes);
 
 #endif
diff --git a/Usermode/Applications/axwin3_src/WM/input.c b/Usermode/Applications/axwin3_src/WM/input.c
new file mode 100644 (file)
index 0000000..ebbad92
--- /dev/null
@@ -0,0 +1,90 @@
+/*
+ * Acess2 GUI (AxWin) Version 3
+ * - By John Hodge (thePowersGang)
+ *
+ * input.c
+ * - Input abstraction
+ */
+#include <common.h>
+#include <acess/sys.h>
+
+typedef struct
+{
+       int Num;
+       int Value;
+} tNumValue;
+
+#define JOY_IOCTL_GETSETAXISLIMIT      6
+#define JOY_IOCTL_GETSETAXISPOSITION   7
+
+// === CODE ===
+int Input_Init(void)
+{
+       tNumValue       num_value;
+
+       // Open mouse for RW
+       giMouseFD = open(gsMouseDevice, 3);
+
+       // Set mouse limits
+       num_value.Num = 0;
+       num_value.Value = giScreenWidth;
+       ioctl(giMouseFD, JOY_IOCTL_GETSETAXISLIMIT, &num_value);
+       num_value.Value = giScreenWidth/2;
+       ioctl(giMouseFD, JOY_IOCTL_GETSETAXISPOSITION, &num_value);
+
+       num_value.Num = 1;
+       num_value.Value = giScreenHeight;
+       ioctl(giMouseFD, JOY_IOCTL_GETSETAXISLIMIT, &num_value);
+       num_value.Value = giScreenHeight/2;
+       ioctl(giMouseFD, JOY_IOCTL_GETSETAXISPOSITION, &num_value);
+
+       return 0;
+}
+
+void Input_FillSelect(int *nfds, fd_set *set)
+{
+       if(*nfds < giTerminalFD)        *nfds = giTerminalFD;
+       if(*nfds < giMouseFD)   *nfds = giMouseFD;
+       FD_SET(giTerminalFD, set);
+       FD_SET(giMouseFD, set);
+}
+
+void Input_HandleSelect(fd_set *set)
+{
+       if(FD_ISSET(giTerminalFD, set))
+       {
+               uint32_t        codepoint;
+               if( read(giTerminalFD, &codepoint, sizeof(codepoint)) != sizeof(codepoint) )
+               {
+                       // oops, error
+               }
+               // TODO: pass on to message handler
+               _SysDebug("Keypress 0x%x", codepoint);
+       }
+
+       if(FD_ISSET(giMouseFD, set))
+       {
+               struct sMouseInfo {
+                       uint16_t        NAxies;
+                       uint16_t        NButtons;
+                       struct sMouseAxis {
+                                int16_t        MinValue;
+                                int16_t        MaxValue;
+                                int16_t        CurValue;
+                               uint16_t        CursorPos;
+                       }       Axies[2];
+                       uint8_t Buttons[3];
+               }       mouseinfo;
+       
+               seek(giMouseFD, 0, SEEK_SET);
+               if( read(giMouseFD, &mouseinfo, sizeof(mouseinfo)) != sizeof(mouseinfo) )
+               {
+                       // Not a 3 button mouse, oops
+                       return ;
+               }
+
+               // Handle movement
+               Video_SetCursorPos( mouseinfo.Axies[0].CursorPos, mouseinfo.Axies[1].CursorPos );
+//             _SysDebug("Cursor to %i,%i", mouseinfo.Axies[0].CursorPos, mouseinfo.Axies[1].CursorPos);
+       }
+}
diff --git a/Usermode/Applications/axwin3_src/WM/main.c b/Usermode/Applications/axwin3_src/WM/main.c
new file mode 100644 (file)
index 0000000..5186c21
--- /dev/null
@@ -0,0 +1,74 @@
+/*
+ * Acess2 GUI (AxWin) Version 3
+ * - By John Hodge (thePowersGang)
+ *
+ * main.c
+ * - Entrypoint
+ */
+#include <common.h>
+#include <acess/sys.h>
+
+// === IMPORTS ===
+extern void    WM_Update(void);
+
+// === PROTOTYPES ===
+void   ParseCommandline(int argc, char **argv);
+
+// === GLOBALS ===
+const char     *gsTerminalDevice = NULL;
+const char     *gsMouseDevice = NULL;
+
+ int   giScreenWidth = 640;
+ int   giScreenHeight = 480;
+uint32_t       *gpScreenBuffer = NULL;
+
+ int   giTerminalFD = -1;
+ int   giMouseFD = -1;
+
+// === CODE ===
+/**
+ * \brief Program Entrypoint
+ */
+int main(int argc, char *argv[])
+{
+       ParseCommandline(argc, argv);
+       
+       if( gsTerminalDevice == NULL ) {
+               gsTerminalDevice = "/Devices/VTerm/6";
+       }
+       if( gsMouseDevice == NULL ) {
+               gsMouseDevice = "/Devices/PS2Mouse";
+       }
+       
+//     Video_Setup();
+//     Interface_Init();
+       IPC_Init();
+       Input_Init();
+       
+//     WM_Update();
+       
+       // Main Loop
+       for(;;)
+       {
+               fd_set  fds;
+                int    nfds = 0;
+               FD_ZERO(&fds);
+       
+               Input_FillSelect(&nfds, &fds);
+               IPC_FillSelect(&nfds, &fds);
+               
+               nfds ++;
+               select(nfds, &fds, NULL, NULL, NULL);
+
+               Input_HandleSelect(&fds);
+               IPC_HandleSelect(&fds);
+       }
+       return 0;
+}
+
+void ParseCommandline(int argc, char **argv)
+{
+       
+}
+
diff --git a/Usermode/Applications/axwin3_src/WM/video.c b/Usermode/Applications/axwin3_src/WM/video.c
new file mode 100644 (file)
index 0000000..4121fbe
--- /dev/null
@@ -0,0 +1,203 @@
+/*
+ * Acess GUI (AxWin) Version 2
+ * By John Hodge (thePowersGang)
+ */
+#include "common.h"
+#include <acess/sys.h>
+#include <acess/devices/terminal.h>
+#include <image.h>
+#include "resources/cursor.h"
+
+// === PROTOTYPES ===
+void   Video_Setup(void);
+void   Video_SetCursorPos(short X, short Y);
+void   Video_Update(void);
+void   Video_FillRect(short X, short Y, short W, short H, uint32_t Color);
+void   Video_DrawRect(short X, short Y, short W, short H, uint32_t Color);
+
+// === GLOBALS ===
+ int   giVideo_CursorX;
+ int   giVideo_CursorY;
+
+// === CODE ===
+void Video_Setup(void)
+{
+        int    tmpInt;
+       
+       // Open terminal
+       giTerminalFD = open(gsTerminalDevice, OPENFLAG_READ|OPENFLAG_WRITE);
+       if( giTerminalFD == -1 )
+       {
+               fprintf(stderr, "ERROR: Unable to open '%s' (%i)\n", gsTerminalDevice, _errno);
+               exit(-1);
+       }
+       
+       // Set width
+       tmpInt = giScreenWidth;
+       tmpInt = ioctl( giTerminalFD, TERM_IOCTL_WIDTH, &tmpInt );
+       if(tmpInt != giScreenWidth)
+       {
+               fprintf(stderr, "Warning: Selected width (%i) is invalid, clipped to %i\n",
+                       giScreenWidth, tmpInt);
+               giScreenWidth = tmpInt;
+       }
+       
+       // Set height
+       tmpInt = giScreenHeight;
+       tmpInt = ioctl( giTerminalFD, TERM_IOCTL_HEIGHT, &tmpInt );
+       if(tmpInt != giScreenHeight)
+       {
+               fprintf(stderr, "Warning: Selected height (%i) is invalid, clipped to %i\n",
+                       giScreenHeight, tmpInt);
+               giScreenHeight = tmpInt;
+       }
+       
+       // Set mode to video
+       tmpInt = TERM_MODE_FB;
+       ioctl( giTerminalFD, TERM_IOCTL_MODETYPE, &tmpInt );
+       
+       // Force VT to be shown
+       ioctl( giTerminalFD, TERM_IOCTL_FORCESHOW, NULL );
+       
+       // Create local framebuffer (back buffer)
+       gpScreenBuffer = malloc( giScreenWidth*giScreenHeight*4 );
+       memset32( gpScreenBuffer, 0x8888FF, giScreenWidth*giScreenHeight );
+
+       // Set cursor position and bitmap
+       ioctl(giTerminalFD, TERM_IOCTL_SETCURSORBITMAP, &cCursorBitmap);
+       Video_SetCursorPos( giScreenWidth/2, giScreenHeight/2 );
+
+       Video_Update();
+}
+
+void Video_Update(void)
+{
+       //seek(giTerminalFD, 0, SEEK_SET);
+       seek(giTerminalFD, 0, 1);
+       write(giTerminalFD, gpScreenBuffer, giScreenWidth*giScreenHeight*4);
+}
+
+void Video_SetCursorPos(short X, short Y)
+{
+       struct {
+               uint16_t        x;
+               uint16_t        y;
+       } pos;
+       pos.x = giVideo_CursorX = X;
+       pos.y = giVideo_CursorY = Y;
+       ioctl(giTerminalFD, TERM_IOCTL_GETSETCURSOR, &pos);
+}
+
+void Video_FillRect(short X, short Y, short W, short H, uint32_t Color)
+{
+       uint32_t        *buf = gpScreenBuffer + Y*giScreenWidth + X;
+       
+       _SysDebug("Video_FillRect: (X=%i, Y=%i, W=%i, H=%i, Color=%08x)",
+               X, Y, W, H, Color);
+       
+       if(W < 0 || X < 0 || X >= giScreenWidth)        return ;
+       if(X + W > giScreenWidth)       W = giScreenWidth - X;
+       
+       if(H < 0 || Y < 0 || Y >= giScreenHeight)       return ;
+       if(Y + H > giScreenHeight)      H = giScreenHeight - Y;
+       
+       while( H -- )
+       {
+               memset32( buf, Color, W );
+               buf += giScreenWidth;
+       }
+}
+
+void Video_DrawRect(short X, short Y, short W, short H, uint32_t Color)
+{      
+       Video_FillRect(X, Y, W, 1, Color);
+       Video_FillRect(X, Y+H-1, W, 1, Color);
+       Video_FillRect(X, Y, 1, H, Color);
+       Video_FillRect(X+W-1, Y, 1, H, Color);
+}
+
+/**
+ * \brief Draw an image to the screen
+ * \todo Maybe have support for an offset in the image
+ */
+void Video_DrawImage(short X, short Y, short W, short H, tImage *Image)
+{
+        int    x, y;
+       uint8_t *buf = (uint8_t *)(gpScreenBuffer + Y*giScreenWidth + X);
+       uint8_t *data;
+       
+       // Sanity please
+       if( !Image )
+               return ;
+       
+       // Bounds Check
+       if( X >= giScreenWidth )        return ;
+       if( Y >= giScreenHeight )       return ;
+       
+       // Wrap to image size
+       if( W > Image->Width )  W = Image->Width;
+       if( H > Image->Height ) H = Image->Height;
+       
+       // Wrap to screen size
+       if( X + W > giScreenWidth )     W = giScreenWidth - X;
+       if( Y + H > giScreenHeight )    H = giScreenHeight - Y;
+       
+       // Do the render
+       data = Image->Data;
+       switch( Image->Format )
+       {
+       case IMGFMT_BGRA:
+               for( y = 0; y < H; y ++ )
+               {
+                        int    r, g, b, a;     // New
+                        int    or, og, ob;     // Original
+                       for( x = 0; x < W; x ++ )
+                       {
+                               b = data[x*4+0]; g = data[x*4+1]; r = data[x*4+2]; a = data[x*4+3];
+                               if( a == 0 )    continue;       // 100% transparent
+                               ob = buf[x*4+0]; og = buf[x*4+1]; or = buf[x*4+2];
+                               // Handle Alpha
+                               switch(a)
+                               {
+                               // Transparent: Handled above
+                               // Solid
+                               case 0xFF:      break;
+                               // Half
+                               case 0x80:
+                                       r = (or + r) / 2;
+                                       g = (og + g) / 2;
+                                       b = (ob + b) / 2;
+                                       break;
+                               // General
+                               default:
+                                       r = (or * (255-a) + r * a) / 255;
+                                       g = (og * (255-a) + g * a) / 255;
+                                       b = (ob * (255-a) + b * a) / 255;
+                                       break;
+                               }
+                               buf[x*4+0] = b; buf[x*4+1] = g; buf[x*4+2] = r;
+                       }
+                       data += Image->Width * 4;
+                       buf += giScreenWidth * 4;
+               }
+               break;
+       
+       // RGB
+       case IMGFMT_RGB:
+               for( y = 0; y < H; y ++ )
+               {
+                       for( x = 0; x < W; x ++ )
+                       {
+                               buf[x*4+0] = data[x*3+2];       // Blue
+                               buf[x*4+1] = data[x*3+1];       // Green
+                               buf[x*4+2] = data[x*3+0];       // Red
+                       }
+                       data += W * 3;
+                       buf += giScreenWidth * 4;
+               }
+               break;
+       default:
+               _SysDebug("ERROR: Unknown image format %i\n", Image->Format);
+               break;
+       }
+}

UCC git Repository :: git.ucc.asn.au