Skip to content

GitLab

Commit 6ea7dfc3 authored by deuce's avatar deuce
Browse files

Move mouse support out of uifc32 and into ciolib. 

!!! THIS MAY NOW WORK ON WIN32 (Untested) !!!
parent dbbb8b79
Hide whitespace changes
Inline Side-by-side
src/uifc/keys.h deleted 100644 → 0
View file @ dbbb8b79
/* $Id$ */
#define CIO_KEY_HOME 0x47 << 8
#define CIO_KEY_UP 72 << 8
#define CIO_KEY_END 0x4f << 8
#define CIO_KEY_DOWN 80 << 8
#define CIO_KEY_F(x) (0x3a+x) << 8
#define CIO_KEY_IC 0x52 << 8
#define CIO_KEY_DC 0x53 << 8
#define CIO_KEY_LEFT 0x4b << 8
#define CIO_KEY_RIGHT 0x4d << 8
#define CIO_KEY_PPAGE 0x49 << 8
#define CIO_KEY_NPAGE 0x51 << 8
#define CIO_KEY_MOUSE 0xff02
src/uifc/uifc32.c
View file @ 6ea7dfc3
......@@ -98,17 +98,7 @@ static int *last_menu_bar=NULL;
static int save_menu_cur=-1;
static int save_menu_bar=-1;
/* Internal Structs */
struct uifc_mouse_event {
int x;
int y;
int button;
};
/* Mouse support */
#ifdef _WIN32
static struct uifc_mouse_event uifc_last_button_press;
static struct uifc_mouse_event last_mouse_click;
#define kbhit() console_hit()
int console_hit(void);
#endif
......@@ -135,119 +125,16 @@ int kbwait(void) {
return(FALSE);
}
#ifdef _WIN32
int console_hit(void)
{
INPUT_RECORD input;
DWORD num=0;
while(1) {
if(!PeekConsoleInput(GetStdHandle(STD_INPUT_HANDLE), &input, 1, &num)
|| !num)
break;
if(input.EventType==KEY_EVENT && input.Event.KeyEvent.bKeyDown)
return(1);
if(input.EventType==MOUSE_EVENT) {
if(!input.Event.MouseEvent.dwEventFlags
&& (!input.Event.MouseEvent.dwButtonState
|| input.Event.MouseEvent.dwButtonState==FROM_LEFT_1ST_BUTTON_PRESSED
|| input.Event.MouseEvent.dwButtonState==RIGHTMOST_BUTTON_PRESSED))
return(1);
}
if(ReadConsoleInput(GetStdHandle(STD_INPUT_HANDLE), &input, 1, &num)
&& num) {
continue;
}
}
return(0);
}
int inkey()
{
char str[128];
INPUT_RECORD input;
DWORD num=0;
while(1) {
if(!ReadConsoleInput(GetStdHandle(STD_INPUT_HANDLE), &input, 1, &num)
|| !num || (input.EventType!=KEY_EVENT && input.EventType!=MOUSE_EVENT))
continue;
switch(input.EventType) {
case KEY_EVENT:
if(!input.Event.KeyEvent.bKeyDown)
continue;
#if 0
sprintf(str,"keydown=%d\n",input.Event.KeyEvent.bKeyDown);
OutputDebugString(str);
sprintf(str,"repeat=%d\n",input.Event.KeyEvent.wRepeatCount);
OutputDebugString(str);
sprintf(str,"keycode=%x\n",input.Event.KeyEvent.wVirtualKeyCode);
OutputDebugString(str);
sprintf(str,"scancode=%x\n",input.Event.KeyEvent.wVirtualScanCode);
OutputDebugString(str);
sprintf(str,"ascii=%d\n",input.Event.KeyEvent.uChar.AsciiChar);
OutputDebugString(str);
sprintf(str,"dwControlKeyState=%lx\n",input.Event.KeyEvent.dwControlKeyState);
OutputDebugString(str);
#endif
if(input.Event.KeyEvent.uChar.AsciiChar)
return(input.Event.KeyEvent.uChar.AsciiChar);
return(input.Event.KeyEvent.wVirtualScanCode<<8);
break;
case MOUSE_EVENT:
if(input.Event.MouseEvent.dwEventFlags!=0)
continue;
if(input.Event.MouseEvent.dwButtonState==0) {
if(uifc_last_button_press.button
&& uifc_last_button_press.x==input.Event.MouseEvent.dwMousePosition.X
&& uifc_last_button_press.y==input.Event.MouseEvent.dwMousePosition.Y) {
memcpy(&last_mouse_click,&uifc_last_button_press,sizeof(last_mouse_click));
memset(&uifc_last_button_press,0,sizeof(uifc_last_button_press));
return(CIO_KEY_MOUSE);
}
else {
memset(&uifc_last_button_press,0,sizeof(uifc_last_button_press));
}
}
else {
memset(&uifc_last_button_press,0,sizeof(uifc_last_button_press));
switch(input.Event.MouseEvent.dwButtonState) {
case FROM_LEFT_1ST_BUTTON_PRESSED:
uifc_last_button_press.x=input.Event.MouseEvent.dwMousePosition.X;
uifc_last_button_press.y=input.Event.MouseEvent.dwMousePosition.Y;
uifc_last_button_press.button=1;
break;
case RIGHTMOST_BUTTON_PRESSED:
uifc_last_button_press.x=input.Event.MouseEvent.dwMousePosition.X;
uifc_last_button_press.y=input.Event.MouseEvent.dwMousePosition.Y;
uifc_last_button_press.button=2;
break;
}
}
}
}
return(0);
}
#else
int inkey()
{
int c;
c=getch();
if(!c)
c=(getch()<<8);
if(!c || c==0xff)
c|=(getch()<<8);
return(c);
}
#endif
int uifcini32(uifcapi_t* uifcapi)
{
int i;
......@@ -278,6 +165,11 @@ int uifcini32(uifcapi_t* uifcapi)
if(api->esc_delay < 10)
api->esc_delay=25;
#ifdef NCURSES_VERSION_MAJOR
if(cio_api.mode==CIOLIB_MODE_CURSES) {
ESCDELAY=api->esc_delay;
#endif
#ifdef PDCURSES
/*
* "ALL DESCRIPTIONS ARE GUESSES. I DON'T KNOW ANYONE WHO KNOWS EXACTLY WHAT THESE FUNCTIONS DO!"
......@@ -287,18 +179,6 @@ int uifcini32(uifcapi_t* uifcapi)
* else
* mouse_set(0);
*/
#endif
#ifdef __unix__
#ifdef NCURSES_VERSION_MAJOR
if(cio_api.mode==CIOLIB_MODE_CURSES) {
ESCDELAY=api->esc_delay;
if(mousemask(BUTTON1_CLICKED|BUTTON3_CLICKED,NULL)==BUTTON1_CLICKED|BUTTON3_CLICKED)
api->mode|=UIFC_MOUSE;
else
mousemask(0,NULL);
}
#endif
#endif
if(api->scrn_len!=0) {
switch(api->scrn_len) {
......@@ -345,9 +225,6 @@ int uifcini32(uifcapi_t* uifcapi)
gettextinfo(&txtinfo);
#ifdef _WIN32
memset(&uifc_last_button_press,0,sizeof(uifc_last_button_press));
memset(&last_mouse_click,0,sizeof(last_mouse_click));
api->mode|=UIFC_MOUSE;
/* unsupported mode? */
if(txtinfo.screenheight<MIN_LINES
/* || txtinfo.screenheight>MAX_LINES */
......@@ -356,10 +233,6 @@ int uifcini32(uifcapi_t* uifcapi)
gettextinfo(&txtinfo);
}
if(GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &conmode))
conmode&=~ENABLE_PROCESSED_INPUT;
conmode|=ENABLE_MOUSE_INPUT;
SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), conmode);
#endif
api->scrn_len=txtinfo.screenheight;
......@@ -422,75 +295,19 @@ int uifcini32(uifcapi_t* uifcapi)
cursor=_NOCURSOR;
_setcursortype(cursor);
return(0);
}
if(cio_api.mouse)
api->mode|=UIFC_MOUSE;
static void hidemouse(void)
{
if(api->mode&UIFC_MOUSE) {
#ifdef XCURSES
mouse_set(0);
#endif
#ifdef NCURSES_VERSION_MAJOR
if(cio_api.mode==CIOLIB_MODE_CURSES)
mousemask(0,NULL);
#endif
}
}
static void showmouse(void)
{
if(api->mode&UIFC_MOUSE) {
#ifdef XCURSES
mouse_set(BUTTON1_CLICKED|BUTTON3_CLICKED);
#endif
#ifdef NCURSES_VERSION_MAJOR
if(cio_api.mode==CIOLIB_MODE_CURSES)
mousemask(BUTTON1_CLICKED|BUTTON3_CLICKED,NULL);
#endif
}
return(0);
}
static int uifc_getmouse(struct uifc_mouse_event *mevent)
static int uifc_getmouse(struct cio_mouse_event *mevent)
{
mevent->x=0;
mevent->y=0;
mevent->button=0;
if(api->mode&UIFC_MOUSE) {
#ifdef _WIN32
memcpy(mevent,&last_mouse_click,sizeof(last_mouse_click));
#endif
#ifdef NCURSES_VERSION_MAJOR
MEVENT mevnt;
if(getmouse(&mevnt)==OK) {
mevent->x=mevnt.x;
mevent->y=mevnt.y;
switch(mevnt.bstate) {
case BUTTON1_CLICKED:
mevent->button=1;
break;
case BUTTON3_CLICKED:
mevent->button=2;
break;
}
}
else
return(-1);
#endif
#ifdef XCURSES
if(getmouse()==0) {
mevent->x=Mouse_status.x;
mevent->y=Mouse_status.y;
if(Mouse_status.button[1]==BUTTON_CLICKED)
mevent->button=1;
if(Mouse_status.button[3]==BUTTON_CLICKED)
mevent->button=3;
}
else
return(-1);
#endif
getmouse(mevent);
if(mevent->button==2)
return(ESC);
if(mevent->y==api->buttony) {
......@@ -608,7 +425,7 @@ int ulist(int mode, int left, int top, int width, int *cur, int *bar
uint s_right=SCRN_RIGHT;
uint s_bottom=api->scrn_len-3;
uint title_len;
struct uifc_mouse_event mevnt;
struct cio_mouse_event mevnt;
char *title;
int a,b,c,longopt;
......@@ -963,11 +780,7 @@ int ulist(int mode, int left, int top, int width, int *cur, int *bar
i=inkey();
if(i==BS)
i=ESC;
#ifdef CIO_KEY_MOUSE
if(i==CIO_KEY_MOUSE) {
#else
if(0) {
#endif
if((i=uifc_getmouse(&mevnt))==0) {
/* Clicked in menu */
if(mevnt.x>=s_left+left+2
......@@ -1733,7 +1546,7 @@ int ugetstr(int left, int top, int width, char *outstr, int max, long mode, int
int i,j,k,f=0; /* i=offset, j=length */
BOOL gotdecimal=FALSE;
int soffset=0;
struct uifc_mouse_event mevnt;
struct cio_mouse_event mevnt;
if((str=(uchar *)malloc(max+1))==NULL) {
cprintf("UIFC line %d: error allocating %u bytes\r\n"
......@@ -1767,11 +1580,7 @@ int ugetstr(int left, int top, int width, char *outstr, int max, long mode, int
}
#endif
f=inkey();
#ifdef CIO_KEY_MOUSE
if(f==CIO_KEY_MOUSE) {
#else
if(0) {
#endif
if((f=uifc_getmouse(&mevnt))==0) {
if(mevnt.x>=left-1
&& mevnt.x<=left+width-1
......@@ -1812,11 +1621,7 @@ int ugetstr(int left, int top, int width, char *outstr, int max, long mode, int
ch=f;
else {
ch=inkey();
#ifdef CIO_KEY_MOUSE
if(ch==CIO_KEY_MOUSE) {
#else
if(0) {
#endif
if((ch=uifc_getmouse(&mevnt))==0) {
if(mevnt.x>=left-1
&& mevnt.x<=left+width-1
......@@ -2204,7 +2009,7 @@ void showbuf(int mode, int left, int top, int width, int height, char *title, ch
int pad=1;
int is_redraw=0;
uint title_len=0;
struct uifc_mouse_event mevnt;
struct cio_mouse_event mevnt;
_setcursortype(_NOCURSOR);
......@@ -2380,11 +2185,7 @@ void showbuf(int mode, int left, int top, int width, int height, char *title, ch
puttext(left+1+pad,top+2+pad,left+width-2-pad,top+height-1-pad,p);
if(kbwait()) {
j=inkey();
#ifdef CIO_KEY_MOUSE
if(j==CIO_KEY_MOUSE) {
#else
if(0) {
#endif
/* Ignores return value to avoid hitting help/exit hotspots */
if(uifc_getmouse(&mevnt)>=0) {
/* Clicked Scroll Up */
......
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