Skip to content
Snippets Groups Projects
Commit cdbb0e2b authored by Russell Bryant's avatar Russell Bryant
Browse files

merge changes to get menuselect using svn:externals 

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35704 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 0d0fadc7
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Makefile
+ 6
− 6
View file @ cdbb0e2b
......@@ -392,8 +392,8 @@ makeopts: configure
@echo "****"
@exit 1
menuselect.makeopts: build_tools/menuselect makeopts.xml
@build_tools/menuselect --check-deps ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} $@
menuselect.makeopts: menuselect/menuselect makeopts.xml
@menuselect/menuselect --check-deps ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} $@
#ifneq ($(wildcard tags),)
ctags: tags
......@@ -871,11 +871,11 @@ uninstall-all: _uninstall
rm -rf $(DESTDIR)$(ASTETCDIR)
rm -rf $(DESTDIR)$(ASTLOGDIR)
menuselect: build_tools/menuselect makeopts.xml
-@build_tools/menuselect ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
menuselect: menuselect/menuselect makeopts.xml
-@menuselect/menuselect ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
build_tools/menuselect: build_tools/menuselect.c build_tools/menuselect_curses.c build_tools/menuselect.h config.status mxml/libmxml.a $(MENUSELECT_OBJS)
$(MAKE) -C build_tools menuselect
menuselect/menuselect: menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect.h config.status mxml/libmxml.a $(MENUSELECT_OBJS)
@CFLAGS="-include ../include/asterisk/autoconfig.h" $(MAKE) -C menuselect menuselect
mxml/libmxml.a:
@cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure
......
build_tools/Makefile deleted 100644 → 0
+ 0
− 45
View file @ 0d0fadc7
#
# Asterisk -- A telephony toolkit for Linux.
#
# Makefile for Build Tools
#
# Copyright (C) 2005-2006, Digium, Inc.
#
# Russell Bryant <russell@digium.com>
#
# This program is free software, distributed under the terms of
# the GNU General Public License
#
.PHONY: clean dist-clean
MENUSELECT_OBJS=menuselect.o menuselect_curses.o
MENUSELECT_CFLAGS=-g -c -D_GNU_SOURCE -DMENUSELECT -I../ -I../include/
MENUSELECT_LIBS=../mxml/libmxml.a
ifeq ($(OSARCH),SunOS)
MENUSELECT_OBJS+=../strcompat.o
endif
ifneq ($(NCURSES_LIB),)
MENUSELECT_LIBS+=$(NCURSES_LIB)
MENUSELECT_INCLUDE=$(NCURSES_INCLUDE)
else
MENUSELECT_LIBS+=$(CURSES_LIB)
MENUSELECT_INCLUDE=$(CURSES_INCLUDE)
endif
menuselect: $(MENUSELECT_OBJS)
$(CC) -g -Wall -o $@ $(MENUSELECT_OBJS) $(MENUSELECT_LIBS)
menuselect.o: menuselect.c menuselect.h
$(CC) -Wall -o $@ $(MENUSELECT_CFLAGS) $<
menuselect_curses.o: menuselect_curses.c menuselect.h
$(CC) -Wall -o $@ $(MENUSELECT_CFLAGS) $(MENUSELECT_INCLUDE) $<
clean:
rm -f menuselect *.o
dist-clean: clean
rm -f menuselect-deps
build_tools/menuselect.c deleted 100644 → 0
+ 0
− 743
View file @ 0d0fadc7
This diff is collapsed.
build_tools/menuselect.h deleted 100644 → 0
+ 0
− 109
View file @ 0d0fadc7
/*
* Asterisk -- An open source telephony toolkit.
*
* Copyright (C) 2005-2006, Russell Bryant
*
* Russell Bryant <russell@digium.com>
*
* See http://www.asterisk.org for more information about
* the Asterisk project. Please do not directly contact
* any of the maintainers of this project for assistance;
* the project provides a web site, mailing lists and IRC
* channels for your use.
*
* This program is free software, distributed under the terms of
* the GNU General Public License Version 2. See the LICENSE file
* at the top of the source tree.
*/
/*!
* \file
*
* \brief public data structures and defaults for menuselect
*
*/
#ifndef MENUSELECT_H
#define MENUSELECT_H
#include "asterisk/linkedlists.h"
#define OUTPUT_MAKEOPTS_DEFAULT "menuselect.makeopts"
#define MENUSELECT_DEPS "build_tools/menuselect-deps"
struct depend {
/*! the name of the dependency */
const char *name;
/*! for linking */
AST_LIST_ENTRY(depend) list;
};
struct conflict {
/*! the name of the conflict */
const char *name;
/*! for linking */
AST_LIST_ENTRY(conflict) list;
};
struct member {
/*! What will be sent to the makeopts file */
const char *name;
/*! Display name if known */
const char *displayname;
/*! Default setting */
const char *defaultenabled;
/*! Delete these file(s) if this member changes */
const char *remove_on_change;
/*! This module is currently selected */
unsigned int enabled:1;
/*! This module was enabled when the config was loaded */
unsigned int was_enabled:1;
/*! This module has failed dependencies */
unsigned int depsfailed:1;
/*! This module has failed conflicts */
unsigned int conflictsfailed:1;
/*! dependencies of this module */
AST_LIST_HEAD_NOLOCK(, depend) deps;
/*! conflicts of this module */
AST_LIST_HEAD_NOLOCK(, conflict) conflicts;
/*! for making a list of modules */
AST_LIST_ENTRY(member) list;
};
struct category {
/*! the Makefile variable */
const char *name;
/*! the name displayed in the menu */
const char *displayname;
/*! Delete these file(s) if anything in this category changes */
const char *remove_on_change;
/*! Output what is selected, as opposed to not selected */
unsigned int positive_output:1;
/*! the list of possible values to be set in this variable */
AST_LIST_HEAD_NOLOCK(, member) members;
/*! for linking */
AST_LIST_ENTRY(category) list;
};
extern AST_LIST_HEAD_NOLOCK(categories, category) categories;
/*! This is implemented by the frontend */
int run_menu(void);
int count_categories(void);
int count_members(struct category *cat);
/*! \brief Toggle a member of a category at the specified index to enabled/disabled */
void toggle_enabled(struct category *cat, int index);
/*! \brief Enable/Disable all members of a category as long as dependencies have been met and no conflicts are found */
void set_all(struct category *cat, int val);
/*! \brief returns non-zero if the string is not defined, or has zero length */
static inline int strlen_zero(const char *s)
{
return (!s || (*s == '\0'));
}
#endif /* MENUSELECT_H */
build_tools/menuselect_curses.c deleted 100644 → 0
+ 0
− 374
View file @ 0d0fadc7
/*
* Asterisk -- An open source telephony toolkit.
*
* Copyright (C) 2005 - 2006, Russell Bryant
*
* Russell Bryant <russell@digium.com>
*
* See http://www.asterisk.org for more information about
* the Asterisk project. Please do not directly contact
* any of the maintainers of this project for assistance;
* the project provides a web site, mailing lists and IRC
* channels for your use.
*
* This program is free software, distributed under the terms of
* the GNU General Public License Version 2. See the LICENSE file
* at the top of the source tree.
*/
/*
* \file
*
* \author Russell Bryant <russell@digium.com>
*
* \brief curses frontend for Asterisk module selection
*/
#include "asterisk/autoconfig.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <signal.h>
#include <curses.h>
#include "menuselect.h"
#define MENU_TITLE1 "*************************************"
#define MENU_TITLE2 "* Asterisk Module Selection *"
#define MENU_TITLE3 "*************************************"
#define MENU_HELP "Press 'h' for help."
#define TITLE_HEIGHT 7
#define MIN_X 80
#define MIN_Y 20
#define PAGE_OFFSET 10
/*! Maximum number of characters horizontally */
static int max_x = 0;
/*! Maximum number of characters vertically */
static int max_y = 0;
static const char * const help_info[] = {
"scroll => up/down arrows",
"(de)select => Enter",
"select all => F8",
"deselect all => F7",
"back => left arrow",
"quit => q",
"save and quit => x",
"",
"XXX means dependencies have not been met"
};
/*! \brief Handle a window resize in xterm */
static void winch_handler(int sig)
{
getmaxyx(stdscr, max_y, max_x);
if (max_x < MIN_X - 1 || max_y < MIN_Y - 1) {
fprintf(stderr, "Terminal must be at least 80 x 25.\n");
max_x = MIN_X - 1;
max_y = MIN_Y - 1;
}
}
/*! \brief Display help information */
static void show_help(WINDOW *win)
{
int i;
wclear(win);
for (i = 0; i < (sizeof(help_info) / sizeof(help_info[0])); i++) {
wmove(win, i, max_x / 2 - 15);
waddstr(win, help_info[i]);
}
wrefresh(win);
getch(); /* display the help until the user hits a key */
}
static void draw_main_menu(WINDOW *menu, int curopt)
{
struct category *cat;
char buf[64];
int i = 0;
wclear(menu);
AST_LIST_TRAVERSE(&categories, cat, list) {
wmove(menu, i++, max_x / 2 - 10);
if (!strlen_zero(cat->displayname))
snprintf(buf, sizeof(buf), "%d.%s %s", i, i < 10 ? " " : "", cat->displayname);
else
snprintf(buf, sizeof(buf), "%d.%s %s", i, i < 10 ? " " : "", cat->name);
waddstr(menu, buf);
}
wmove(menu, curopt, (max_x / 2) - 15);
waddstr(menu, "--->");
wmove(menu, 0, 0);
wrefresh(menu);
}
static void display_mem_info(WINDOW *menu, struct member *mem, int start, int end)
{
char buf[64];
struct depend *dep;
struct conflict *con;
wmove(menu, end - start + 2, max_x / 2 - 16);
wclrtoeol(menu);
wmove(menu, end - start + 3, max_x / 2 - 16);
wclrtoeol(menu);
wmove(menu, end - start + 4, max_x / 2 - 16);
wclrtoeol(menu);
if (mem->displayname) {
wmove(menu, end - start + 2, max_x / 2 - 16);
waddstr(menu, mem->displayname);
}
if (!AST_LIST_EMPTY(&mem->deps)) {
wmove(menu, end - start + 3, max_x / 2 - 16);
strcpy(buf, "Depends on: ");
AST_LIST_TRAVERSE(&mem->deps, dep, list) {
strncat(buf, dep->name, sizeof(buf) - strlen(buf) - 1);
if (AST_LIST_NEXT(dep, list))
strncat(buf, ", ", sizeof(buf) - strlen(buf) - 1);
}
waddstr(menu, buf);
}
if (!AST_LIST_EMPTY(&mem->conflicts)) {
wmove(menu, end - start + 4, max_x / 2 - 16);
strcpy(buf, "Conflicts with: ");
AST_LIST_TRAVERSE(&mem->conflicts, con, list) {
strncat(buf, con->name, sizeof(buf) - strlen(buf) - 1);
if (AST_LIST_NEXT(con, list))
strncat(buf, ", ", sizeof(buf) - strlen(buf) - 1);
}
waddstr(menu, buf);
}
}
static void draw_category_menu(WINDOW *menu, struct category *cat, int start, int end, int curopt, int changed)
{
int i = 0;
int j = 0;
struct member *mem;
char buf[64];
if (!changed) {
/* If all we have to do is move the cursor,
* then don't clear the screen and start over */
AST_LIST_TRAVERSE(&cat->members, mem, list) {
i++;
if (curopt + 1 == i) {
display_mem_info(menu, mem, start, end);
break;
}
}
wmove(menu, curopt - start, max_x / 2 - 9);
wrefresh(menu);
return;
}
wclear(menu);
i = 0;
AST_LIST_TRAVERSE(&cat->members, mem, list) {
if (i < start) {
i++;
continue;
}
wmove(menu, j++, max_x / 2 - 10);
i++;
if (mem->depsfailed)
snprintf(buf, sizeof(buf), "XXX %d.%s %s", i, i < 10 ? " " : "", mem->name);
else
snprintf(buf, sizeof(buf), "[%s] %d.%s %s", mem->enabled ? "*" : " ", i, i < 10 ? " " : "", mem->name);
waddstr(menu, buf);
if (curopt + 1 == i)
display_mem_info(menu, mem, start, end);
if (i == end)
break;
}
wmove(menu, curopt - start, max_x / 2 - 9);
wrefresh(menu);
}
static int run_category_menu(WINDOW *menu, int cat_num)
{
struct category *cat;
int i = 0;
int start = 0;
int end = max_y - TITLE_HEIGHT - 6;
int c;
int curopt = 0;
int maxopt;
int changed = 1;
AST_LIST_TRAVERSE(&categories, cat, list) {
if (i++ == cat_num)
break;
}
if (!cat)
return -1;
maxopt = count_members(cat) - 1;
draw_category_menu(menu, cat, start, end, curopt, changed);
while ((c = getch())) {
changed = 0;
switch (c) {
case KEY_UP:
if (curopt > 0) {
curopt--;
if (curopt < start) {
start--;
end--;
changed = 1;
}
}
break;
case KEY_DOWN:
if (curopt < maxopt) {
curopt++;
if (curopt > end - 1) {
start++;
end++;
changed = 1;
}
}
break;
case KEY_NPAGE:
/* XXX Move down the list by PAGE_OFFSET */
break;
case KEY_PPAGE:
/* XXX Move up the list by PAGE_OFFSET */
break;
case KEY_LEFT:
case 27: /* Esc key */
return 0;
case KEY_RIGHT:
case KEY_ENTER:
case '\n':
case ' ':
toggle_enabled(cat, curopt);
changed = 1;
break;
case 'h':
case 'H':
show_help(menu);
changed = 1;
break;
case KEY_F(7):
set_all(cat, 0);
changed = 1;
break;
case KEY_F(8):
set_all(cat, 1);
changed = 1;
default:
break;
}
if (c == 'x' || c == 'X' || c == 'Q' || c == 'q')
break;
draw_category_menu(menu, cat, start, end, curopt, changed);
}
wrefresh(menu);
return c;
}
static void draw_title_window(WINDOW *title)
{
wmove(title, 1, (max_x / 2) - (strlen(MENU_TITLE1) / 2));
waddstr(title, MENU_TITLE1);
wmove(title, 2, (max_x / 2) - (strlen(MENU_TITLE2) / 2));
waddstr(title, MENU_TITLE2);
wmove(title, 3, (max_x / 2) - (strlen(MENU_TITLE3) / 2));
waddstr(title, MENU_TITLE3);
wmove(title, 5, (max_x / 2) - (strlen(MENU_HELP) / 2));
waddstr(title, MENU_HELP);
wrefresh(title);
}
int run_menu(void)
{
WINDOW *title;
WINDOW *menu;
int maxopt;
int curopt = 0;
int c;
int res = 0;
initscr();
getmaxyx(stdscr, max_y, max_x);
signal(SIGWINCH, winch_handler); /* handle window resizing in xterm */
if (max_x < MIN_X - 1 || max_y < MIN_Y - 1) {
fprintf(stderr, "Terminal must be at least %d x %d.\n", MIN_X, MIN_Y);
endwin();
return -1;
}
cbreak(); /* don't buffer input until the enter key is pressed */
noecho(); /* don't echo user input to the screen */
keypad(stdscr, TRUE); /* allow the use of arrow keys */
clear();
refresh();
maxopt = count_categories() - 1;
/* We have two windows - the title window at the top, and the menu window gets the rest */
title = newwin(TITLE_HEIGHT, max_x, 0, 0);
menu = newwin(max_y - TITLE_HEIGHT, max_x, TITLE_HEIGHT, 0);
draw_title_window(title);
draw_main_menu(menu, curopt);
while ((c = getch())) {
switch (c) {
case KEY_UP:
if (curopt > 0)
curopt--;
break;
case KEY_DOWN:
if (curopt < maxopt)
curopt++;
break;
case KEY_RIGHT:
case KEY_ENTER:
case '\n':
case ' ':
c = run_category_menu(menu, curopt);
break;
case 'h':
case 'H':
show_help(menu);
default:
break;
}
if (c == 'q' || c == 'Q' || c == 27) {
res = -1;
break;
}
if (c == 'x' || c == 'X' || c == 's' || c == 'S')
break;
draw_main_menu(menu, curopt);
}
endwin();
return res;
}
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