Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 10:35:10 +00:00
Code Issues Releases Activity

Implemented goto action for ncurses mode (#299)

Browse Source
This commit is contained in:
roy-mustang 2016-07-20 18:53:48 +02:00 committed by Brenden Matthews
parent b14f459740
commit 3b4b9abd97
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/conky.cc
View File

@ -61,6 +61,9 @@
#include "imlib2.h"
#endif /* BUILD_IMLIB2 */
#endif /* BUILD_X11 */
#ifdef BUILD_NCURSES
#include <ncurses.h>
#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <netinet/in.h>
@ -158,6 +161,10 @@ static conky::simple_config_setting<bool> disable_auto_reload("disable_auto_relo
/* two strings for internal use */
static char *tmpstring1, *tmpstring2;
#ifdef BUILD_NCURSES
extern WINDOW* ncurses_window;
#endif
enum spacer_state {
NO_SPACER = 0,
LEFT_SPACER,
@ -1751,16 +1758,6 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
cur_y += current->arg;
break;
case GOTO:
if (current->arg >= 0) {
cur_x = (int) current->arg;
#ifdef BUILD_X11
//make sure shades are 1 pixel to the right of the text
if(draw_mode == BG) cur_x++;
#endif
}
break;
case TAB:
{
int start = current->arg;
@ -1812,6 +1809,23 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
break;
}
#endif /* BUILD_X11 */
case GOTO:
if (current->arg >= 0) {
cur_x = (int) current->arg;
#ifdef BUILD_X11
//make sure shades are 1 pixel to the right of the text
if(draw_mode == BG) cur_x++;
#endif /* BUILD_X11 */
#ifdef BUILD_NCURSES
if (out_to_ncurses.get(*state)){
int x, y;
getyx(ncurses_window, y, x);
move(y, cur_x);
}
#endif /* BUILD_NCURSES */
}
break;
}
#ifdef BUILD_X11

6
src/nc.cc
View File

@ -6,6 +6,10 @@
#include "nc.h"
#ifdef BUILD_NCURSES
WINDOW* ncurses_window;
#endif
namespace priv {
void out_to_ncurses_setting::lua_setter(lua::state &l, bool init)
{
@ -14,7 +18,7 @@ namespace priv {
Base::lua_setter(l, init);
if(init && do_convert(l, -1).first) {
initscr();
ncurses_window = initscr();
start_color();
}