mirror of https://github.com/xzeldon/htop.git
Support for NCurses 6.0 and mouse wheel
This commit is contained in:
parent
3e93f9b852
commit
b003636958
12
CRT.c
12
CRT.c
|
@ -29,6 +29,9 @@ in the source distribution for its full text.
|
||||||
#define Cyan COLOR_CYAN
|
#define Cyan COLOR_CYAN
|
||||||
#define White COLOR_WHITE
|
#define White COLOR_WHITE
|
||||||
|
|
||||||
|
#define KEY_WHEELUP KEY_F(20)
|
||||||
|
#define KEY_WHEELDOWN KEY_F(21)
|
||||||
|
|
||||||
//#link curses
|
//#link curses
|
||||||
|
|
||||||
/*{
|
/*{
|
||||||
|
@ -515,6 +518,8 @@ int CRT_cursorX = 0;
|
||||||
|
|
||||||
int CRT_scrollHAmount = 5;
|
int CRT_scrollHAmount = 5;
|
||||||
|
|
||||||
|
int CRT_scrollWheelVAmount = 10;
|
||||||
|
|
||||||
char* CRT_termType;
|
char* CRT_termType;
|
||||||
|
|
||||||
// TODO move color scheme to Settings, perhaps?
|
// TODO move color scheme to Settings, perhaps?
|
||||||
|
@ -550,6 +555,7 @@ void CRT_init(int delay, int colorScheme) {
|
||||||
nonl();
|
nonl();
|
||||||
intrflush(stdscr, false);
|
intrflush(stdscr, false);
|
||||||
keypad(stdscr, true);
|
keypad(stdscr, true);
|
||||||
|
mouseinterval(0);
|
||||||
curs_set(0);
|
curs_set(0);
|
||||||
if (has_colors()) {
|
if (has_colors()) {
|
||||||
start_color();
|
start_color();
|
||||||
|
@ -598,7 +604,11 @@ void CRT_init(int delay, int colorScheme) {
|
||||||
|
|
||||||
CRT_treeStr = CRT_utf8 ? CRT_treeStrUtf8 : CRT_treeStrAscii;
|
CRT_treeStr = CRT_utf8 ? CRT_treeStrUtf8 : CRT_treeStrAscii;
|
||||||
|
|
||||||
mousemask(BUTTON1_CLICKED, NULL);
|
#if NCURSES_MOUSE_VERSION > 1
|
||||||
|
mousemask(BUTTON1_RELEASED | BUTTON4_PRESSED | BUTTON5_PRESSED, NULL);
|
||||||
|
#else
|
||||||
|
mousemask(BUTTON1_RELEASED, NULL);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void CRT_done() {
|
void CRT_done() {
|
||||||
|
|
5
CRT.h
5
CRT.h
|
@ -20,6 +20,9 @@ in the source distribution for its full text.
|
||||||
#define Cyan COLOR_CYAN
|
#define Cyan COLOR_CYAN
|
||||||
#define White COLOR_WHITE
|
#define White COLOR_WHITE
|
||||||
|
|
||||||
|
#define KEY_WHEELUP KEY_F(20)
|
||||||
|
#define KEY_WHEELDOWN KEY_F(21)
|
||||||
|
|
||||||
//#link curses
|
//#link curses
|
||||||
|
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
@ -130,6 +133,8 @@ extern int CRT_cursorX;
|
||||||
|
|
||||||
extern int CRT_scrollHAmount;
|
extern int CRT_scrollHAmount;
|
||||||
|
|
||||||
|
extern int CRT_scrollWheelVAmount;
|
||||||
|
|
||||||
char* CRT_termType;
|
char* CRT_termType;
|
||||||
|
|
||||||
// TODO move color scheme to Settings, perhaps?
|
// TODO move color scheme to Settings, perhaps?
|
||||||
|
|
15
Panel.c
15
Panel.c
|
@ -412,6 +412,21 @@ bool Panel_onKey(Panel* this, int key) {
|
||||||
this->scrollV += (this->h - 1);
|
this->scrollV += (this->h - 1);
|
||||||
this->needsRedraw = true;
|
this->needsRedraw = true;
|
||||||
break;
|
break;
|
||||||
|
case KEY_WHEELUP:
|
||||||
|
this->selected -= CRT_scrollWheelVAmount;
|
||||||
|
this->scrollV -= CRT_scrollWheelVAmount;
|
||||||
|
this->needsRedraw = true;
|
||||||
|
break;
|
||||||
|
case KEY_WHEELDOWN:
|
||||||
|
{
|
||||||
|
this->selected += CRT_scrollWheelVAmount;
|
||||||
|
this->scrollV += CRT_scrollWheelVAmount;
|
||||||
|
if (this->scrollV > Vector_size(this->items) - this->h) {
|
||||||
|
this->scrollV = Vector_size(this->items) - this->h;
|
||||||
|
}
|
||||||
|
this->needsRedraw = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
case KEY_HOME:
|
case KEY_HOME:
|
||||||
this->selected = 0;
|
this->selected = 0;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -9,6 +9,7 @@ in the source distribution for its full text.
|
||||||
#include "ProcessList.h"
|
#include "ProcessList.h"
|
||||||
|
|
||||||
#include "Object.h"
|
#include "Object.h"
|
||||||
|
#include "CRT.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
@ -196,6 +197,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) {
|
||||||
MEVENT mevent;
|
MEVENT mevent;
|
||||||
int ok = getmouse(&mevent);
|
int ok = getmouse(&mevent);
|
||||||
if (ok == OK) {
|
if (ok == OK) {
|
||||||
|
if (mevent.bstate & BUTTON1_RELEASED) {
|
||||||
if (mevent.y == LINES - 1) {
|
if (mevent.y == LINES - 1) {
|
||||||
ch = FunctionBar_synthesizeEvent(panelFocus->currentBar, mevent.x);
|
ch = FunctionBar_synthesizeEvent(panelFocus->currentBar, mevent.x);
|
||||||
} else {
|
} else {
|
||||||
|
@ -217,6 +219,13 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#if NCURSES_MOUSE_VERSION > 1
|
||||||
|
} else if (mevent.bstate & BUTTON4_PRESSED) {
|
||||||
|
ch = KEY_WHEELUP;
|
||||||
|
} else if (mevent.bstate & BUTTON5_PRESSED) {
|
||||||
|
ch = KEY_WHEELDOWN;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (ch == ERR) {
|
if (ch == ERR) {
|
||||||
|
|
|
@ -143,10 +143,12 @@ fi
|
||||||
|
|
||||||
AC_ARG_ENABLE(unicode, [AC_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
|
AC_ARG_ENABLE(unicode, [AC_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
|
||||||
if test "x$enable_unicode" = xyes; then
|
if test "x$enable_unicode" = xyes; then
|
||||||
|
AC_CHECK_LIB([ncursesw6], [refresh], [], [
|
||||||
AC_CHECK_LIB([ncursesw], [refresh], [], [
|
AC_CHECK_LIB([ncursesw], [refresh], [], [
|
||||||
missing_libraries="$missing_libraries libncursesw"
|
missing_libraries="$missing_libraries libncursesw"
|
||||||
AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
|
AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
|
||||||
])
|
])
|
||||||
|
])
|
||||||
AC_CHECK_HEADERS([ncursesw/curses.h],[:],
|
AC_CHECK_HEADERS([ncursesw/curses.h],[:],
|
||||||
[AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
|
[AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
|
||||||
[AC_CHECK_HEADERS([ncurses/curses.h],[:],
|
[AC_CHECK_HEADERS([ncurses/curses.h],[:],
|
||||||
|
|
Loading…
Reference in New Issue