Implemented scroll handling in gemtk.

1 files changed, 39 insertions, 33 deletions

diff --git a/atari/gemtk/gemtk.h b/atari/gemtk/gemtk.h
index 412871598..51844519f 100644
--- a/atari/gemtk/gemtk.h
+++ b/atari/gemtk/gemtk.h
@@ -1,22 +1,23 @@
-#ifndef GEMTK_H_INCLUDED

-#define GEMTK_H_INCLUDED

+#ifndef GEMTK_H_INCLUDED
+#define GEMTK_H_INCLUDED
 
 #include <gem.h>
 #include <mint/osbind.h>
 #include <mint/cookie.h>
-#include <stdint.h>

-

-/* System type detection added by [GS]  */

+#include <stdint.h>
+#include <stdbool.h>
+
+/* System type detection added by [GS]  */
 /* detect the system type, AES + kernel */
-#define SYS_TOS    0x0001

-#define SYS_MAGIC  0x0002

-#define SYS_MINT   0x0004

-#define SYS_GENEVA 0x0010

-#define SYS_NAES   0x0020

-#define SYS_XAAES  0x0040

-#define sys_type()    (_systype_v ? _systype_v : _systype())

-#define sys_MAGIC()   ((sys_type() & SYS_MAGIC) != 0)

-#define sys_NAES()    ((sys_type() & SYS_NAES)  != 0)

+#define SYS_TOS    0x0001
+#define SYS_MAGIC  0x0002
+#define SYS_MINT   0x0004
+#define SYS_GENEVA 0x0010
+#define SYS_NAES   0x0020
+#define SYS_XAAES  0x0040
+#define sys_type()    (_systype_v ? _systype_v : _systype())
+#define sys_MAGIC()   ((sys_type() & SYS_MAGIC) != 0)
+#define sys_NAES()    ((sys_type() & SYS_NAES)  != 0)
 #define sys_XAAES()   ((sys_type() & SYS_XAAES) != 0)
 
 #define TOS4VER 0x03300 /* this is assumed to be the last single tasking OS */
@@ -29,20 +30,20 @@ extern unsigned short _systype_v;
 unsigned short _systype (void);
 OBJECT *get_tree( int idx );
 
-/*

-*	MultiTOS Drag&Drop

-*/

-short ddcreate(short *pipe);

-short ddmessage(short apid, short fd, short winid, short mx, short my, short kstate, short pipename);

-short ddrexts(short fd, char *exts);

-short ddstry(short fd, char *ext, char *text, char *name, long size);

-void ddclose(short fd);

-void ddgetsig(long *oldsig);

-void ddsetsig(long oldsig);

-short ddopen(short ddnam, char ddmsg);

-short ddsexts(short fd, char *exts);

-short ddrtry(short fd, char *name, char *file, char *whichext, long *size);

-short ddreply(short fd, char ack);

+/*
+*	MultiTOS Drag&Drop
+*/
+short ddcreate(short *pipe);
+short ddmessage(short apid, short fd, short winid, short mx, short my, short kstate, short pipename);
+short ddrexts(short fd, char *exts);
+short ddstry(short fd, char *ext, char *text, char *name, long size);
+void ddclose(short fd);
+void ddgetsig(long *oldsig);
+void ddsetsig(long oldsig);
+short ddopen(short ddnam, char ddmsg);
+short ddsexts(short fd, char *exts);
+short ddrtry(short fd, char *name, char *file, char *whichext, long *size);
+short ddreply(short fd, char ack);
 
 /*
 	Message box
@@ -61,8 +62,12 @@ short msg_box_show(short type, const char * msg);
 #define GW_FLAG_CUSTOM_TOOLBAR		0x08	// no internal toolbar handling
 #define GW_FLAG_CUSTOM_SCROLLING	0x10	// no internal scroller handling
 
-#define GW_STATUS_ICONIFIED		0x01
-#define GW_STATUS_SHADED		0x02
+#define GW_STATUS_ICONIFIED			0x01
+#define GW_STATUS_SHADED			0x02
+
+#define GUIWIN_VSLIDER 				0x01
+#define GUIWIN_HSLIDER 				0x02
+#define GUIWIN_VH_SLIDER 			0x03
 
 struct gui_window_s;
 typedef struct gui_window_s GUIWIN;
@@ -101,9 +106,10 @@ void guiwin_set_event_handler(GUIWIN *win,guiwin_event_handler_f cb);
 void guiwin_set_user_data(GUIWIN *win, void *data);
 void *guiwin_get_user_data(GUIWIN *win);
 struct guiwin_scroll_info_s * guiwin_get_scroll_info(GUIWIN *win);
-void guiwin_update_slider(GUIWIN *win, short mode);
+bool guiwin_update_slider(GUIWIN *win, short mode);
 void guiwin_send_redraw(GUIWIN *win, GRECT *area);
 VdiHdl guiwin_get_vdi_handle(GUIWIN *win);
+bool guiwin_has_intersection(GUIWIN *win, GRECT *work);
 
 
 
@@ -123,5 +129,5 @@ VdiHdl guiwin_get_vdi_handle(GUIWIN *win);
 #ifndef MIN
 #define MIN(_a,_b) ((_a<_b) ? _a : _b)
 #endif
-

-#endif // GEMTK_H_INCLUDED

+
+#endif // GEMTK_H_INCLUDED