Commit 2dbbb658 authored by Kevin Bracey's avatar Kevin Bracey
Browse files

Spinner branch merged

parent 33c0c95f
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#define Service_Memory 0x11 #define Service_Memory 0x11
#define Service_Reset 0x27 #define Service_Reset 0x27
#define Service_StartWimp 0x49
#define Service_WimpCloseDown 0x53 #define Service_WimpCloseDown 0x53
#define Service_FilterManagerInstalled 0x87 #define Service_FilterManagerInstalled 0x87
......
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
(wimp_ICONFLAGS_FORECOL * style_ACTION_BUTTON_FORECOL) |\ (wimp_ICONFLAGS_FORECOL * style_ACTION_BUTTON_FORECOL) |\
(wimp_ICONFLAGS_BACKCOL * style_ACTION_BUTTON_BACKCOL)\ (wimp_ICONFLAGS_BACKCOL * style_ACTION_BUTTON_BACKCOL)\
) )
#define style_ACTION_BUTTON_VALIDSTR "R5,3" #define style_ACTION_BUTTON_VALIDSTR "R5,3;f17"
#define style_DEFAULT_ACTION_HEIGHT 68 /* OS Units */ #define style_DEFAULT_ACTION_HEIGHT 68 /* OS Units */
......
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
/* Title: wimp.h /* Title: wimp.h
* Purpose: C interface to RISC OS Wimp routines. * Purpose: C interface to RISC OS Wimp routines.
* Author: IDJ * Author: IDJ
* History: 16-Sep-93: created * History: 16-Sep-93: IDJ: created
* 25-Nov-96: EPW: Updated structures for nested window support
*/ */
# ifndef __wimp_h # ifndef __wimp_h
...@@ -308,9 +309,18 @@ typedef struct ...@@ -308,9 +309,18 @@ typedef struct
int scx, int scx,
scy; /* scroll offsets */ scy; /* scroll offsets */
int behind; /* handle to open window behind */ int behind; /* handle to open window behind */
} wimp_OpenWindow; } wimp_OpenWindow;
typedef struct
{
int window_handle; /* handle of window to open */
wimp_Bbox visible_area; /* visible area coords */
int scx,
scy; /* scroll offsets */
int behind; /* handle to open window behind */
/* The following requires nested window support in the Wimp */
int window_flags;
} wimp_NestedOpenWindow;
#define wimp_OpenWindow_TopOfStack (-1) #define wimp_OpenWindow_TopOfStack (-1)
#define wimp_OpenWindow_BottomOfStack (-2) #define wimp_OpenWindow_BottomOfStack (-2)
...@@ -674,6 +684,10 @@ _kernel_oserror *wimp_delete_icon (wimp_IconDelete *block); ...@@ -674,6 +684,10 @@ _kernel_oserror *wimp_delete_icon (wimp_IconDelete *block);
_kernel_oserror *wimp_open_window (wimp_OpenWindow *show); _kernel_oserror *wimp_open_window (wimp_OpenWindow *show);
_kernel_oserror *wimp_open_window2 (wimp_NestedOpenWindow *show,
int parent_handle,
unsigned int alignment_flags);
_kernel_oserror *wimp_close_window (int *window_handle); _kernel_oserror *wimp_close_window (int *window_handle);
_kernel_oserror *wimp_poll (int mask, _kernel_oserror *wimp_poll (int mask,
...@@ -689,6 +703,10 @@ _kernel_oserror *wimp_get_rectangle (WindowRedraw *block, int *more); ...@@ -689,6 +703,10 @@ _kernel_oserror *wimp_get_rectangle (WindowRedraw *block, int *more);
_kernel_oserror *wimp_get_window_state (wimp_GetWindowState *state); _kernel_oserror *wimp_get_window_state (wimp_GetWindowState *state);
_kernel_oserror *wimp_get_window_state2 (wimp_GetWindowState *state,
int *parent_handle,
unsigned int *alignment_flags);
_kernel_oserror *wimp_get_window_info (wimp_GetWindowInfo *block); _kernel_oserror *wimp_get_window_info (wimp_GetWindowInfo *block);
_kernel_oserror *wimp_set_icon_state (wimp_SetIconState *block); _kernel_oserror *wimp_set_icon_state (wimp_SetIconState *block);
...@@ -707,6 +725,8 @@ _kernel_oserror *wimp_force_redraw (int window_handle, ...@@ -707,6 +725,8 @@ _kernel_oserror *wimp_force_redraw (int window_handle,
int xmax, int xmax,
int ymax); int ymax);
_kernel_oserror *wimp_force_title_redraw (int window_handle);
_kernel_oserror *wimp_set_caret_position (int window_handle, _kernel_oserror *wimp_set_caret_position (int window_handle,
int icon_handle, int icon_handle,
int xoffset, int xoffset,
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
* Author: Ian Johnson * Author: Ian Johnson
* History: 8-Dec-93: IDJ: created * History: 8-Dec-93: IDJ: created
* 18-Apr-94: IDJ: removed options string from object hdr. * 18-Apr-94: IDJ: removed options string from object hdr.
* 02-Feb-97: EPW: Added Toolbox_ShowObject_AtPointer
* *
*/ */
...@@ -225,10 +226,13 @@ typedef struct ...@@ -225,10 +226,13 @@ typedef struct
#define Toolbox_ShowObject_AsMenu 0x00000001 #define Toolbox_ShowObject_AsMenu 0x00000001
#define Toolbox_ShowObject_AsSubMenu 0x00000002 #define Toolbox_ShowObject_AsSubMenu 0x00000002
#define Toolbox_ShowObject_AsSubWindow 0x00000004
#define Toolbox_ShowObject_Default 0 #define Toolbox_ShowObject_Default 0
#define Toolbox_ShowObject_FullSpec 1 #define Toolbox_ShowObject_FullSpec 1
#define Toolbox_ShowObject_TopLeft 2 #define Toolbox_ShowObject_TopLeft 2
#define Toolbox_ShowObject_Centre 3
#define Toolbox_ShowObject_AtPointer 4
typedef struct typedef struct
{ {
......
...@@ -114,8 +114,10 @@ typedef struct ...@@ -114,8 +114,10 @@ typedef struct
#define ActionButton_IsCancel 0x00000002 #define ActionButton_IsCancel 0x00000002
#define ActionButton_IsLocal 0x00000004 #define ActionButton_IsLocal 0x00000004
#define ActionButton_ClickShowTransient 0x00000008 #define ActionButton_ClickShowTransient 0x00000008
#define ActionButton_ClickShowCentred 0x00000010
#define ActionButton_ClickShowAtPointer 0x00000020
#define ActionButtonValidFlags 0xC000000F #define ActionButtonValidFlags 0xC000003F
/* action button methods */ /* action button methods */
...@@ -126,6 +128,7 @@ typedef struct ...@@ -126,6 +128,7 @@ typedef struct
#define ActionButton_GetEvent (ActionButton_Base + 3) /* 131 */ #define ActionButton_GetEvent (ActionButton_Base + 3) /* 131 */
#define ActionButton_SetClickShow (ActionButton_Base + 4) /* 132 */ #define ActionButton_SetClickShow (ActionButton_Base + 4) /* 132 */
#define ActionButton_GetClickShow (ActionButton_Base + 5) /* 133 */ #define ActionButton_GetClickShow (ActionButton_Base + 5) /* 133 */
#define ActionButton_SetFont (ActionButton_Base + 6) /* 134 */
#define ActionButton_Max (ActionButton_Base + 63) /* 191 */ #define ActionButton_Max (ActionButton_Base + 63) /* 191 */
#if (ActionButton_Base % 64 != 0) #if (ActionButton_Base % 64 != 0)
#error "Gadget codes out of sync" #error "Gadget codes out of sync"
...@@ -174,6 +177,7 @@ typedef struct ...@@ -174,6 +177,7 @@ typedef struct
#define OptionButton_GetEvent (OptionButton_Base + 3) /* 195 */ #define OptionButton_GetEvent (OptionButton_Base + 3) /* 195 */
#define OptionButton_SetState (OptionButton_Base + 4) /* 196 */ #define OptionButton_SetState (OptionButton_Base + 4) /* 196 */
#define OptionButton_GetState (OptionButton_Base + 5) /* 197 */ #define OptionButton_GetState (OptionButton_Base + 5) /* 197 */
#define OptionButton_SetFont (OptionButton_Base + 6) /* 198 */
#define OptionButton_Max (OptionButton_Base + 63) /* 255 */ #define OptionButton_Max (OptionButton_Base + 63) /* 255 */
#if (OptionButton_Base % 64 != 0) #if (OptionButton_Base % 64 != 0)
#error "Gadget codes out of sync" #error "Gadget codes out of sync"
...@@ -286,6 +290,7 @@ typedef struct ...@@ -286,6 +290,7 @@ typedef struct
#define RadioButton_GetEvent (RadioButton_Base + 3) /* 387 */ #define RadioButton_GetEvent (RadioButton_Base + 3) /* 387 */
#define RadioButton_SetState (RadioButton_Base + 4) /* 388 */ #define RadioButton_SetState (RadioButton_Base + 4) /* 388 */
#define RadioButton_GetState (RadioButton_Base + 5) /* 389 */ #define RadioButton_GetState (RadioButton_Base + 5) /* 389 */
#define RadioButton_SetFont (RadioButton_Base + 6) /* 390 */
#define RadioButton_Max (RadioButton_Base + 63) /* 447 */ #define RadioButton_Max (RadioButton_Base + 63) /* 447 */
#if (RadioButton_Base % 64 != 0) #if (RadioButton_Base % 64 != 0)
#error "Gadget codes out of sync" #error "Gadget codes out of sync"
...@@ -805,6 +810,8 @@ typedef struct ...@@ -805,6 +810,8 @@ typedef struct
#define KeyBoardShortcut_ShowAsTransient 0x00000001 #define KeyBoardShortcut_ShowAsTransient 0x00000001
#define KeyBoardShortcut_ShowInCentre 0x00000002
#define KeyBoardShortcut_ShowAtPointer 0x00000004
typedef struct typedef struct
...@@ -907,7 +914,11 @@ typedef struct ...@@ -907,7 +914,11 @@ typedef struct
int scx, int scx,
scy; /* scroll offsets */ scy; /* scroll offsets */
int behind; /* handle to open window behind */ int behind; /* handle to open window behind */
/* The following are only used with the extended Toolbox_ShowObject
* method (when Toolbox_ShowObject_AsSubWindow is set in flags) */
unsigned int window_flags;
unsigned int parent_window_handle;
unsigned int alignment_flags;
} WindowShowObjectBlock; } WindowShowObjectBlock;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment