mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

* key.c (get_event): Recognize KEY_MOUSE, not just MCKEY_MOUSE.

Browse Source 
* mouse.c: Don't use or emulate keyok(), since MC understands
KEY_MOUSE now.
This commit is contained in:
Pavel Roskin 2001-09-15 01:18:11 +00:00
parent 462e063ce4
commit 7efdf3527d
3 changed files with 17 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2001-09-14 Pavel Roskin <proski@gnu.org>
* key.c (get_event): Recognize KEY_MOUSE, not just MCKEY_MOUSE.
* mouse.c: Don't use or emulate keyok(), since MC understands
KEY_MOUSE now.
2001-09-11 Pavel Roskin <proski@gnu.org>
* cmd.c (check_for_default): Make accessible from other files.

17
src/key.c
View File

@ -769,20 +769,25 @@ int get_event (Gpm_Event *event, int redo_event, int block)
*event = ev;
return EV_MOUSE;
}
#endif
#endif /* !HAVE_LIBGPM */
}
# ifndef HAVE_SLANG
#ifndef HAVE_SLANG
flag = is_wintouched(stdscr);
untouchwin (stdscr);
# endif
#endif /* !HAVE_SLANG */
c = block ? getch_with_delay () : get_key_code(1);
# ifndef HAVE_SLANG
#ifndef HAVE_SLANG
if (flag)
touchwin (stdscr);
# endif
#endif /* !HAVE_SLANG */
if (c == MCKEY_MOUSE) { /* Mouse event */
if (c == MCKEY_MOUSE
#ifdef KEY_MOUSE
|| c == KEY_MOUSE
#endif /* KEY_MOUSE */
) {
/* Mouse event */
xmouse_get_event (event);
if (event->type)
return EV_MOUSE;

91
src/mouse.c
View File

@ -38,84 +38,6 @@
int xmouse_flag = 0;
/*
* This chunk of NCURSES internals is used to support the keyok() function for
* NCURSES versions between 1.9.6 (when the mouse code was introduced in 1995),
* and 4.2 (when the keyok function will be release).
*/
#ifndef HAVE_KEYOK
#ifdef NCURSES_MOUSE_VERSION /* first defined for ncurses 1.9.6 */
#ifdef NCURSES_970530 /* defined by configure script */
/*
* ncurses 1.9.8a ported to QNX doesn't provide the SP pointer as a global
* symbol in the library...
*/
#ifndef __QNX__
struct tries {
struct tries *child;
struct tries *sibling;
unsigned char ch;
unsigned short value;
};
struct screen {
int _ifd;
FILE *_ofp;
#if NCURSES_970530 >= 2
char *_setbuf; /*4.0*/
#endif
int _checkfd;
struct term *_term;
short _lines;
short _columns;
#if NCURSES_970530 >= 1
short _lines_avail; /*1.9.9g*/
short _topstolen; /*1.9.9g*/
#endif
struct _win_st *_curscr;
struct _win_st *_newscr;
struct _win_st *_stdscr;
struct tries *_keytry; /* "Try" for use with keypad mode */
/* there's more, but this is just for alignment */
};
extern struct screen *SP;
/*
* Remove a code from the specified tree, freeing the unused nodes. Returns
* true if the code was found/removed.
*/
static
int _nc_remove_key(struct tries **tree, unsigned short code)
{
struct tries *ptr = (*tree);
if (code > 0) {
while (ptr != 0) {
if (_nc_remove_key(&(ptr->child), code)) {
return TRUE;
}
if (ptr->value == code) {
*tree = 0;
g_free (ptr);
return TRUE;
}
ptr = ptr->sibling;
}
}
return FALSE;
}
int
keyok(int code, bool flag)
{
_nc_remove_key(&(SP->_keytry), code);
return OK;
}
#endif /* __QNX__ */
#endif /* NCURSES_970530 */
#endif /* NCURSES_MOUSE_VERSION */
#endif /* HAVE_KEYOK */
#ifdef HAVE_LIBGPM
static int mouse_d; /* Handle to the mouse server */
#endif
@ -182,19 +104,6 @@ int redo_mouse (Gpm_Event *event)
void init_mouse (void)
{
/*
* MC's use of xterm mouse is incompatible with NCURSES's support. The
* simplest solution is to disable NCURSE's mouse.
*/
#ifdef NCURSES_MOUSE_VERSION
/* See the comment above about QNX/ncurses 1.9.8a ... */
#ifndef __QNX__
keyok(KEY_MOUSE, FALSE);
#endif /* __QNX__ */
#endif /* NCURSES_MOUSE_VERSION */
#if defined(NCURSES_970530)
#endif
switch (use_mouse_p)
{
#ifdef HAVE_LIBGPM