XQF/xqf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- variable number of server filters

Browse Source 
- fix segfault when deleting last player filter entry
- update german translation


git-svn-id: http://svn.code.sf.net/p/xqf/code/trunk@178 d2ac09be-c843-0410-8b1f-f8a84130e0ec
This commit is contained in:
Ludwig Nussel 2002-07-26 11:51:04 +00:00 committed by l-n
parent 54436779b8
commit c928039d97
11 changed files with 1144 additions and 485 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xqf/ChangeLog
View File

@ -1,3 +1,9 @@
Jul 26, 2002: Ludwig Nussel <l-n@users.sourceforge.net>
- variable number of server filters
- fix segfault when deleting last player filter entry
- update german translation
- better back up your config before trying this new versoin
July 7, 2002: Alex Burger <alex@fragit_dot_net>
- Changed version to 0.9.9.1

4
xqf/configure.in
View File

@ -76,14 +76,14 @@ AC_DEFINE_UNQUOTED(XQF_VERSION, "$VERSION", XQF Version number)
AC_DEFINE_UNQUOTED(QSTAT_EXEC, "$QSTATEXEC", QSTAT executable path)
# workaround for intl/ which requires config.h
echo "creating link config.h -> src/gnuconfig.h"
AC_MSG_NOTICE([creating link config.h -> src/gnuconfig.h])
test -e config.h -a ! -L config.h && rm config.h
test ! -e config.h && ln -s src/gnuconfig.h config.h
rm -f intl/libintl.h
# damn gettext should do that itself!
if test "$USE_INCLUDED_LIBINTL" = "yes"; then
echo "creating link intl/libintl.h -> libgnuintl.h"
AC_MSG_NOTICE([creating link intl/libintl.h -> libgnuintl.h])
ln -s libgnuintl.h intl/libintl.h
fi

506
xqf/po/de.po
View File

File diff suppressed because it is too large Load Diff

4
xqf/src/Makefile.am
View File

@ -1,12 +1,12 @@
SUBDIRS = xpm
localedir = $(datadir)/locale
INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\" @GTK_CFLAGS@
INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\" $(GTK_CFLAGS)
CFLAGS = @CFLAGS@ @QSTAT23@ @DEBUG@ @COMPRESSION@
bin_PROGRAMS = xqf
xqf_LDADD = @INTLLIBS@ @GTK_LIBS@
xqf_LDADD = @INTLLIBS@ $(GTK_LIBS)
xqf_SOURCES = \
addmaster.c \

912
xqf/src/filter.c
View File

File diff suppressed because it is too large Load Diff

12
xqf/src/filter.h
View File

@ -40,7 +40,8 @@ enum filter_status {
FILTER_DATA_CHANGED /* data changed, but no need to re-apply filter */
};
// need to modify server_filter_vars_new, server_filter_vars_free,
// server_filter_vars_copy too
struct server_filter_vars {
int filter_retries;
int filter_ping;
@ -60,10 +61,12 @@ struct filter {
char *short_name;
char *short_cfg_name;
int (*func) (struct server *s, struct server_filter_vars *vars);
int (*func) (struct server *s);
void (*filter_init) (void);
void (*filter_done) (void);
void (*filter_on_ok) (void); // function to call when ok is pressed
void (*filter_on_cancel) (void); // function to call when abort is pressed
unsigned last_changed;
enum filter_status changed;
@ -72,7 +75,8 @@ struct filter {
extern struct filter filters[];
extern unsigned char cur_filter;
struct server_filter_vars server_filters[MAX_SERVER_FILTERS+1];
extern GArray* server_filters;
unsigned int current_server_filter;
extern unsigned int current_server_filter;
@ -94,7 +98,5 @@ extern int filters_cfg_dialog (int page_num);
extern void filters_init (void);
extern void filters_done (void);
#endif /* __FILTER_H__ */

7
xqf/src/flt-player.c
View File

@ -78,7 +78,7 @@ static const char *mode_names[3] = {
};
int player_filter (struct server *s, struct server_filter_vars *vars) {
int player_filter (struct server *s) {
/* The 'vars' is ignored in this function, however, since we need it
for applying the server filter, we will put it in the arguments. */
@ -504,6 +504,11 @@ static int pattern_clist_event_callback (GtkWidget *widget, GdkEvent *event) {
static void pattern_clist_select_row_callback (GtkWidget *widget,
int row, int column, GdkEventButton *event) {
sync_pattern_data ();
// for some reason this function is called when a row gets deleted, would
// segfault later when row was the last one
if(row>=g_slist_length(curplrs)) return;
current_row = row;
pattern_clist_sync_selection ();

2
xqf/src/flt-player.h
View File

@ -45,7 +45,7 @@ struct player_pattern {
int dirty;
};
extern int player_filter (struct server *s, struct server_filter_vars *vars);
extern int player_filter (struct server *s);
extern void player_filter_page (GtkWidget *notebook);

3
xqf/src/srv-list.c
View File

@ -574,6 +574,9 @@ void server_clist_build_filtered (GSList *server_list, int update) {
struct server *server;
int row;
if(!server_list)
return;
debug (6, "server_clist_build_filterd() -- Update? %d", update);
delete = server_clist_all_servers ();
add = build_filtered_list (cur_filter, server_list); /* in filter.c */

171
xqf/src/xqf.c
View File

@ -147,6 +147,9 @@ static GtkWidget *server_resolve_menu_item = NULL;
static GtkWidget *server_properties_menu_item = NULL;
static GtkWidget *server_rcon_menu_item = NULL;
static GtkWidget *server_serverfilter_menu_item = NULL;
static GArray* server_filter_menu_items;
static GtkWidget *player_filter_menu_item = NULL;
static GtkWidget *update_button = NULL;
@ -168,8 +171,14 @@ static GtkWidget *server_filter_2_widget = NULL;
static GtkWidget *server_filter_3_widget = NULL;
*/
GtkWidget *server_filter_widget[MAX_SERVER_FILTERS + 3];
//XXX GtkWidget *server_filter_widget[MAX_SERVER_FILTERS + 3];
/** build server filter menu for menubar
*/
static GtkWidget* create_filter_menu();
//static GtkWidget* filter_menu = NULL; // need to store that for toggling the checkboxes
static GSList* filter_menu_radio_buttons = NULL; // for finding the widgets to activate
// returns 0 if equal, -1 if too old, 1 if have > expected
int compare_qstat_version ( const char* have, const char* expected )
{
@ -537,16 +546,43 @@ static void filter_toggle_callback (GtkWidget *widget, unsigned char mask) {
}
}
// iterate through radio buttons and activate the one for the current server
// filter
static void filter_menu_activate_current()
{
unsigned int count = 0;
GSList* rbgroup = filter_menu_radio_buttons;
GtkWidget* widget = NULL;
while(rbgroup)
{
if(GTK_IS_CHECK_MENU_ITEM(rbgroup->data))
{
if(count == current_server_filter)
{
widget = GTK_WIDGET(rbgroup->data);
break;
}
count++;
}
rbgroup=rbgroup->next;
}
if(widget)
{
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), TRUE);
}
}
void set_server_filter_menu_list_text( void ){
/* baa -- Set the names of the filters if they have been set in
the config file. The server_filters is defined in filter.h */
char buf[64];
char status_buf[64];
int i;
char* name;
#if 0
for (i = 0; i < MAX_SERVER_FILTERS; i++) {
if( i == 0 ){
@ -584,15 +620,28 @@ void set_server_filter_menu_list_text( void ){
}
}
#endif
/* Show the active filter on the status bar
-- Add code to indicate if the filter button is checked.
*/
if( current_server_filter == 0 ){
if( current_server_filter == 0 )
{
snprintf( status_buf, 64, _("No Server Filter Active"));
} else if( server_filters[current_server_filter].filter_name ){
snprintf( status_buf, 64, _("Server Filter: %s"), server_filters[current_server_filter].filter_name );
} else {
snprintf( status_buf, 64, _("Server Filter: %d"), current_server_filter );
}
else
{
name = g_array_index (server_filters, struct server_filter_vars*, current_server_filter-1)->filter_name;
if(name)
{
snprintf( status_buf, 64, _("Server Filter: %s"), name);
}
else
{
snprintf( status_buf, 64, _("Server Filter: %d"), current_server_filter );
debug(0,__FILE__ " " __FUNCTION__ ":%d this is a bug",__LINE__);
}
}
print_status (main_filter_status_bar, status_buf);
@ -600,9 +649,9 @@ void set_server_filter_menu_list_text( void ){
}
static void server_filter_select_callback (GtkWidget *widget, int mode) {
static void server_filter_select_callback (GtkWidget *widget, int number) {
current_server_filter = mode;
current_server_filter = number;
filters[FILTER_SERVER].changed = FILTER_CHANGED;
filters[FILTER_SERVER].last_changed = ++filter_current_time;
@ -630,7 +679,9 @@ static void start_filters_cfg_dialog (GtkWidget *widget, int page_num) {
if (filters_cfg_dialog (page_num)) {
config_sync ();
rc_save ();
server_clist_build_filtered (cur_server_list, TRUE);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (server_serverfilter_menu_item), create_filter_menu());
filter_menu_activate_current();
//happes automagically server_clist_build_filtered (cur_server_list, TRUE);
player_clist_redraw ();
}
}
@ -2178,17 +2229,11 @@ static const struct menuitem view_menu_items[] = {
it no longer a const.
*/
struct menuitem *server_filter_menu_items;
/* Bad Bill! The const has been removed from the next line. */
static struct menuitem server_menu_items[] = {
static const struct menuitem server_menu_items[] = {
{
MENU_BRANCH, N_("_Server Filters"), 0, 0,
NULL,
NULL, /* <-- This gets set to the addres
of server_filter_menu_items after
we g_malloc the memory. */
NULL
MENU_ITEM, N_("_Server Filters"), 0, 0,
NULL, 0,
&server_serverfilter_menu_item
},
{
MENU_ITEM, N_("_Connect"), 0, 0,
@ -2504,7 +2549,77 @@ static void populate_main_toolbar (void) {
default_toolbar_style, default_toolbar_tips);
}
/** build server filter menu for menubar
*/
static GtkWidget* create_filter_menu()
{
unsigned int i;
GtkWidget *menu;
GtkWidget *menu_item;
// GtkWidget *radiobutton;
struct server_filter_vars* filter = NULL;
GSList* rbgroup = NULL;
filter_menu_radio_buttons = NULL;
menu = gtk_menu_new();
// menu_item = gtk_menu_item_new_with_label(_("None"));
// menu_item = gtk_check_menu_item_new_with_label(_("None"));
// gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_item), (current_server_filter == 0));
// gtk_menu_append (GTK_MENU (menu), menu_item);
// gtk_widget_show (menu_item);
// gtk_signal_connect (GTK_OBJECT (menu_item), "activate",
// GTK_SIGNAL_FUNC (server_filter_select_callback), 0);
for (i = 0;i<=server_filters->len;i++)
{
char* name = NULL;
if(i == 0)
{
filter = NULL;
name = _("None");
}
else
{
filter = g_array_index (server_filters, struct server_filter_vars*, i-1);
name = filter->filter_name;
}
// menu_item = gtk_menu_item_new_with_label(name);
// menu_item = gtk_menu_item_new();
// radiobutton = gtk_radio_button_new_with_label(rbgroup,name);
// rbgroup = gtk_radio_button_group(GTK_RADIO_BUTTON(radiobutton));
// gtk_container_add(GTK_CONTAINER(menu_item),radiobutton);
// gtk_widget_show(radiobutton);
// menu_item = gtk_check_menu_item_new_with_label(name);
// gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_item), (current_server_filter == i));
// that doesn't do what the docu says, right?
// gtk_check_menu_item_set_show_toggle ( GTK_CHECK_MENU_ITEM (menu_item), FALSE);
menu_item = gtk_radio_menu_item_new_with_label(rbgroup,name);
rbgroup = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (menu_item));
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_item), FALSE);
filter_menu_radio_buttons = g_slist_append(filter_menu_radio_buttons,menu_item);
gtk_menu_append (GTK_MENU (menu), menu_item);
gtk_widget_show (menu_item);
gtk_signal_connect (GTK_OBJECT (menu_item), "activate",
GTK_SIGNAL_FUNC (server_filter_select_callback), (gpointer)i); // array starts from zero but filters from 1
// add separator
if(i == 0)
{
menu_item = gtk_menu_item_new ();
gtk_widget_set_sensitive (menu_item, FALSE);
gtk_menu_append (GTK_MENU (menu), menu_item);
gtk_widget_show (menu_item);
}
}
// filter_menu = menu;
return menu;
}
void create_main_window (void) {
@ -2518,8 +2633,8 @@ void create_main_window (void) {
GtkWidget *handlebox;
GtkWidget *scrollwin;
GtkAccelGroup *accel_group;
int i, j;
char *buf;
int i;
// char *buf;
main_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_signal_connect (GTK_OBJECT (main_window), "delete_event",
@ -2549,6 +2664,7 @@ void create_main_window (void) {
you need to change the server_filter_widget line in xqf.h.
*/
#if 0
if ((server_filter_menu_items = g_malloc( sizeof( struct menuitem ) * ( MAX_SERVER_FILTERS + 4 )))) {
i = 0;
j = 0;
@ -2609,9 +2725,12 @@ void create_main_window (void) {
srvopt_menu_items[0].user_data = &server_filter_menu_items[0];
#else
server_menu_items[0].user_data = &server_filter_menu_items[0];
#endif
#endif
server_menu = create_menu (srvopt_menu_items, accel_group);
source_menu = create_menu (source_ctree_popup_menu, accel_group);
/* We will call set_server_filter_menu_list_text (); below after we
@ -2636,6 +2755,12 @@ void create_main_window (void) {
menu_bar = create_menubar (menubar_menu_items, accel_group);
// add server filters to menu
server_filter_menu_items = g_array_new(FALSE,FALSE,sizeof(GtkWidget*));
gtk_menu_item_set_submenu (GTK_MENU_ITEM (server_serverfilter_menu_item), create_filter_menu());
filter_menu_activate_current();
gtk_signal_connect_object (GTK_OBJECT (file_quit_menu_item), "activate",
GTK_SIGNAL_FUNC (gtk_widget_destroy), GTK_OBJECT (main_window));

2
xqf/src/xqf.h
View File

@ -38,8 +38,6 @@
#define PASSWORD_CFG "__passwd.cfg"
#define LAUNCHINFO_FILE "LaunchInfo.txt"
#define MAX_SERVER_FILTERS 10
#define MAX_PING 9999
#define MAX_RETRIES 10