rpms/xchat/F-11 xchat-2.8.6-change-page-activity.patch, NONE, 1.1 xchat-2.8.6-freenode-ports.patch, NONE, 1.1 xchat.spec, 1.102, 1.103 xchat-2.0.2-freenode.patch, 1.1, NONE
Kevin Kofler
kkofler at fedoraproject.org
Sat May 1 07:17:53 UTC 2010
Author: kkofler
Update of /cvs/pkgs/rpms/xchat/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8962/F-11
Modified Files:
xchat.spec
Added Files:
xchat-2.8.6-change-page-activity.patch
xchat-2.8.6-freenode-ports.patch
Removed Files:
xchat-2.0.2-freenode.patch
Log Message:
Sync from devel:
* Wed Apr 21 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.6-17
- Add port numbers for Freenode (Debarshi Ray)
* Fri Apr 09 2010 Rudolf Kastl <rkastl at redhat.com> - 1:2.8.6-16
- Added IRCClient .desktop file subcategory (#485306)
- Added GTK .desktop file subcategory
- Added curly brackets to the name macro for consistency.
* Wed Dec 16 2009 Kevin Fenzi <kevin at tummy.com> - 1:2.8.6-15
- Add patch to allow switching to next channel with activity.
* Mon Dec 7 2009 Stepan Kasal <skasal at redhat.com> - 1:2.8.6-14
- rebuild against perl 5.10.1
* Thu Sep 10 2009 Christopher Aillon <caillon at redhat.com> - 1:2.8.6-13
- Drop the antiquated OPN reference
* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:2.8.6-12
- rebuilt with new openssl
xchat-2.8.6-change-page-activity.patch:
common/inbound.c | 5 ++
common/xchat.c | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
common/xchat.h | 13 +++++
common/xchatc.h | 3 +
fe-gtk/fe-gtk.c | 1
fe-gtk/fkeys.c | 41 +++++++++++++++++
fe-gtk/maingui.c | 2
7 files changed, 193 insertions(+), 1 deletion(-)
--- NEW FILE xchat-2.8.6-change-page-activity.patch ---
diff -paur xchat2.orig/src/common/inbound.c xchat2/src/common/inbound.c
--- xchat2.orig/src/common/inbound.c 2008-07-20 17:31:44.898468115 +0200
+++ xchat2/src/common/inbound.c 2008-07-19 19:57:09.799906780 +0200
@@ -297,7 +297,10 @@ is_hilight (char *from, char *text, sess
{
g_free (text);
if (sess != current_tab)
+ {
sess->nick_said = TRUE;
+ lastact_update(sess);
+ }
fe_set_hilight (sess);
return 1;
}
@@ -344,6 +347,7 @@ inbound_action (session *sess, char *cha
sess->msg_said = TRUE;
sess->new_data = FALSE;
}
+ lastact_update(sess);
}
user = userlist_find (sess, from);
@@ -395,6 +399,7 @@ inbound_chanmsg (server *serv, session *
{
sess->msg_said = TRUE;
sess->new_data = FALSE;
+ lastact_update(sess);
}
user = userlist_find (sess, from);
diff -paur xchat2.orig/src/common/xchat.c xchat2/src/common/xchat.c
--- xchat2.orig/src/common/xchat.c 2008-07-20 17:31:44.900468825 +0200
+++ xchat2/src/common/xchat.c 2008-07-20 17:33:57.089468218 +0200
@@ -71,6 +71,23 @@ GSList *usermenu_list = 0;
GSList *urlhandler_list = 0;
GSList *tabmenu_list = 0;
+/*
+ * This array contains 5 double linked lists, one for each priority in the
+ * "interesting session" queue ("channel" stands for everything but
+ * SESS_DIALOG):
+ *
+ * [0] queries with hilight
+ * [1] queries
+ * [2] channels with hilight
+ * [3] channels with dialogue
+ * [4] channels with other data
+ *
+ * Each time activity happens the corresponding session is put at the
+ * beginning of one of the lists. The aim is to be able to switch to the
+ * session with the most important/recent activity.
+ */
+GList *sess_list_by_lastact[5] = {NULL, NULL, NULL, NULL, NULL};
+
static int in_xchat_exit = FALSE;
int xchat_is_quitting = FALSE;
/* command-line args */
@@ -93,6 +110,105 @@ struct xchatprefs prefs;
SSL_CTX *ctx = NULL;
#endif
+/*
+ * Update the priority queue of the "interesting sessions"
+ * (sess_list_by_lastact).
+ */
+void
+lastact_update(session *sess)
+{
+ int newidx;
+
+ /* Find the priority (for the order see before) */
+ if (sess->type == SESS_DIALOG)
+ {
+ if (sess->nick_said)
+ newidx = LACT_QUERY_HI;
+ else if (sess->msg_said)
+ newidx = LACT_QUERY;
+ else if (sess->new_data)
+ newidx = LACT_QUERY;
+ else
+ newidx = LACT_NONE;
+ }
+ else
+ {
+ if (sess->nick_said)
+ newidx = LACT_CHAN_HI;
+ else if (sess->msg_said)
+ newidx = LACT_CHAN;
+ else if (sess->new_data)
+ newidx = LACT_CHAN_DATA;
+ else
+ newidx = LACT_NONE;
+ }
+
+ /* Check if this update is a no-op */
+ if (sess->lastact_idx == newidx &&
+ ((newidx != LACT_NONE && sess->lastact_elem == sess_list_by_lastact[newidx]) ||
+ (newidx == LACT_NONE)))
+ return;
+
+ /* Remove from the old position (and, if no new position, return */
+ else if (sess->lastact_idx != LACT_NONE && sess->lastact_elem)
+ {
+ sess_list_by_lastact[sess->lastact_idx] = g_list_remove_link(
+ sess_list_by_lastact[sess->lastact_idx],
+ sess->lastact_elem);
+ if (newidx == LACT_NONE)
+ {
+ sess->lastact_idx = newidx;
+ return;
+ }
+ }
+
+ /* No previous position, allocate new */
+ else if (!sess->lastact_elem)
+ sess->lastact_elem = g_list_prepend(sess->lastact_elem, sess);
+
+ sess->lastact_idx = newidx;
+ sess_list_by_lastact[newidx] = g_list_concat(
+ sess->lastact_elem, sess_list_by_lastact[newidx]);
+}
+
+/*
+ * Extract the first session from the priority queue of sessions with recent
+ * activity. Return NULL if no such session can be found.
+ *
+ * If filter is specified, skip a session if filter(session) returns 0. This
+ * can be used for UI-specific needs, e.g. in fe-gtk we want to filter out
+ * detached sessions.
+ */
+session *
+lastact_getfirst(int (*filter) (session *sess))
+{
+ int i;
+ session *sess = NULL;
+ GList *curitem;
+
+ /* 5 is the number of priority classes LACT_ */
+ for (i = 0; i < 5 && !sess; i++)
+ {
+ curitem = sess_list_by_lastact[i];
+ while (curitem && !sess)
+ {
+ sess = g_list_nth_data(curitem, 0);
+ if (!sess || (filter && !filter(sess)))
+ {
+ sess = NULL;
+ curitem = g_list_next(curitem);
+ }
+ }
+
+ if (sess)
+ {
+ sess_list_by_lastact[i] = g_list_remove_link(sess_list_by_lastact[i], curitem);
+ sess->lastact_idx = LACT_NONE;
+ }
+ }
+
+ return sess;
+}
int
is_session (session * sess)
@@ -362,6 +478,9 @@ session_new (server *serv, char *from, i
sess_list = g_slist_prepend (sess_list, sess);
+ sess->lastact_elem = NULL;
+ sess->lastact_idx = LACT_NONE;
+
fe_new_window (sess, focus);
return sess;
@@ -533,6 +652,16 @@ session_free (session *killsess)
current_sess = sess_list->data;
}
+ if (killsess->lastact_elem)
+ {
+ if (killsess->lastact_idx != LACT_NONE)
+ sess_list_by_lastact[killsess->lastact_idx] = g_list_delete_link(
+ sess_list_by_lastact[killsess->lastact_idx],
+ killsess->lastact_elem);
+ else
+ g_list_free_1(killsess->lastact_elem);
+ }
+
free (killsess);
if (!sess_list && !in_xchat_exit)
diff -paur xchat2.orig/src/common/xchat.h xchat2/src/common/xchat.h
--- xchat2.orig/src/common/xchat.h 2008-07-20 17:31:44.901467675 +0200
+++ xchat2/src/common/xchat.h 2008-07-20 17:33:28.240467970 +0200
@@ -320,6 +320,15 @@ struct xchatprefs
#define SET_ON 1
#define SET_DEFAULT 2 /* use global setting */
+/* Priorities in the "interesting sessions" priority queue
+ * (see xchat.c:sess_list_by_lastact) */
+#define LACT_NONE -1 /* no queues */
+#define LACT_QUERY_HI 0 /* query with hilight */
+#define LACT_QUERY 1 /* query with messages */
+#define LACT_CHAN_HI 2 /* channel with hilight */
+#define LACT_CHAN 3 /* channel with messages */
+#define LACT_CHAN_DATA 4 /* channel with other data */
+
typedef struct session
{
/* Per-Channel Alerts */
@@ -369,6 +378,10 @@ typedef struct session
int type; /* SESS_* */
+ GList *lastact_elem; /* our GList element in sess_list_by_lastact */
+ int lastact_idx; /* the sess_list_by_lastact[] index of the list we're in.
+ * For valid values, see defines of LACT_*. */
+
int new_data:1; /* new data avail? (purple tab) */
int nick_said:1; /* your nick mentioned? (blue tab) */
int msg_said:1; /* new msg available? (red tab) */
diff -paur xchat2.orig/src/common/xchatc.h xchat2/src/common/xchatc.h
--- xchat2.orig/src/common/xchatc.h 2008-07-20 17:31:44.901467675 +0200
+++ xchat2/src/common/xchatc.h 2008-07-20 11:43:36.673967630 +0200
@@ -25,10 +25,13 @@ extern GSList *ignore_list;
extern GSList *usermenu_list;
extern GSList *urlhandler_list;
extern GSList *tabmenu_list;
+extern GList *sess_list_by_lastact[];
session * find_channel (server *serv, char *chan);
session * find_dialog (server *serv, char *nick);
session * new_ircwindow (server *serv, char *name, int type, int focus);
+void lastact_update (session * sess);
+session * lastact_getfirst (int (*filter) (session *sess));
int is_session (session * sess);
void session_free (session *killsess);
void lag_check (void);
diff -paur xchat2.orig/src/fe-gtk/fe-gtk.c xchat2/src/fe-gtk/fe-gtk.c
--- xchat2.orig/src/fe-gtk/fe-gtk.c 2008-07-20 17:31:44.958466232 +0200
+++ xchat2/src/fe-gtk/fe-gtk.c 2008-07-19 19:58:57.431961788 +0200
@@ -603,6 +603,7 @@ fe_print_text (struct session *sess, cha
sess->gui->is_tab && !sess->nick_said && stamp == 0)
{
sess->new_data = TRUE;
+ lastact_update(sess);
if (sess->msg_said)
fe_set_tab_color (sess, 2);
else
diff -paur xchat2.orig/src/fe-gtk/fkeys.c xchat2/src/fe-gtk/fkeys.c
--- xchat2.orig/src/fe-gtk/fkeys.c 2008-07-20 17:31:44.960465847 +0200
+++ xchat2/src/fe-gtk/fkeys.c 2008-07-20 12:20:50.186930065 +0200
@@ -158,7 +158,7 @@ static const struct key_action key_actio
{key_action_handle_command, "Run Command",
N_("The \002Run Command\002 action runs the data in Data 1 as if it has been typed into the entry box where you pressed the key sequence. Thus it can contain text (which will be sent to the channel/person), commands or user commands. When run all \002\\n\002 characters in Data 1 are used to deliminate seperate commands so it is possible to run more than one command. If you want a \002\\\002 in the actual text run then enter \002\\\\\002")},
{key_action_page_switch, "Change Page",
- N_("The \002Change Page\002 command switches between pages in the notebook. Set Data 1 to the page you want to switch to. If Data 2 is set to anything then the switch will be relative to the current position")},
+ N_("The \002Change Page\002 command switches between pages in the notebook. Set Data 1 to the page you want to switch to. If Data 2 is set to anything then the switch will be relative to the current position. Set Data 1 to auto to switch to the page with the most recent and important activity (queries first, then channels with hilight, channels with dialogue, channels with other data)")},
{key_action_insert, "Insert in Buffer",
N_("The \002Insert in Buffer\002 command will insert the contents of Data 1 into the entry where the key sequence was pressed at the current cursor position")},
{key_action_scroll_page, "Scroll Page",
@@ -402,6 +402,7 @@ key_load_defaults ()
"A\n3\nChange Page\nD1:3\nD2!\n\n"\
"A\n2\nChange Page\nD1:2\nD2!\n\n"\
"A\n1\nChange Page\nD1:1\nD2!\n\n"\
+ "A\ngrave\nChange Page\nD1:auto\nD2!\n\n"\
"C\no\nInsert in Buffer\nD1:\nD2!\n\n"\
"C\nb\nInsert in Buffer\nD1:\nD2!\n\n"\
"C\nk\nInsert in Buffer\nD1:\nD2!\n\n"\
@@ -1196,6 +1197,20 @@ key_action_handle_command (GtkWidget * w
return 0;
}
+/*
+ * Check if the given session is inside the main window. This predicate
+ * is passed to lastact_pop as a way to filter out detached sessions.
+ * XXX: Consider moving this in a different file?
+ */
+static int
+session_check_is_tab(session *sess)
+{
+ if (!sess || !sess->gui)
+ return FALSE;
+
+ return (sess->gui->is_tab);
+}
+
static int
key_action_page_switch (GtkWidget * wid, GdkEventKey * evt, char *d1,
char *d2, struct session *sess)
@@ -1209,6 +1224,30 @@ key_action_page_switch (GtkWidget * wid,
if (!len)
return 1;
+ if (strcasecmp(d1, "auto") == 0)
+ {
+ /* Auto switch makes no sense in detached sessions */
+ if (!sess->gui->is_tab)
+ return 1;
+
+ /* Obtain a session with recent activity */
+ session *newsess = lastact_getfirst(session_check_is_tab);
+
+ if (newsess)
+ {
+ /*
+ * Only sessions in the current window should be considered (i.e.
+ * we don't want to move the focus on a different window). This
+ * call could, in theory, do this, but we checked before that
+ * newsess->gui->is_tab and sess->gui->is_tab.
+ */
+ mg_bring_tofront_sess(newsess);
+ return 0;
+ }
+ else
+ return 1;
+ }
+
for (i = 0; i < len; i++)
{
if (d1[i] < '0' || d1[i] > '9')
diff -paur xchat2.orig/src/fe-gtk/maingui.c xchat2/src/fe-gtk/maingui.c
--- xchat2.orig/src/fe-gtk/maingui.c 2008-07-20 17:31:44.964469466 +0200
+++ xchat2/src/fe-gtk/maingui.c 2008-07-19 19:58:58.255909127 +0200
@@ -359,6 +359,7 @@ fe_set_tab_color (struct session *sess,
break;
}
+ lastact_update(sess);
}
}
@@ -643,6 +644,7 @@ mg_focus (session *sess)
sess->nick_said = FALSE;
sess->msg_said = FALSE;
sess->new_data = FALSE;
+ lastact_update(sess);
/* when called via mg_changui_new, is_tab might be true, but
sess->res->tab is still NULL. */
if (sess->res->tab)
xchat-2.8.6-freenode-ports.patch:
servlist.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
--- NEW FILE xchat-2.8.6-freenode-ports.patch ---
>From bc98c28e891408145bed2b18d3c02adbadadde31 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir at src.gnome.org>
Date: Sat, 30 Jan 2010 13:05:21 +0200
Subject: [PATCH] Added port numbers for Freenode
http://freenode.net/irc_servers.shtml
---
src/common/servlist.c | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/common/servlist.c b/src/common/servlist.c
index c6839e0..3082966 100644
--- a/src/common/servlist.c
+++ b/src/common/servlist.c
@@ -207,7 +207,16 @@ static const struct defaultserver def[] =
{0, "irc.vendetta.com"},
{"FreeNode", 0},
- {0, "irc.freenode.net"},
+ {0, "irc.freenode.net/6665"},
+ {0, "irc.freenode.net/6666"},
+ {0, "irc.freenode.net/6667"},
+ {0, "irc.freenode.net/8000"},
+ {0, "irc.freenode.net/8001"},
+ {0, "irc.freenode.net/8002"},
+#ifdef USE_OPENSSL
+ {0, "irc.freenode.net/+7000"},
+ {0, "irc.freenode.net/+7070"},
+#endif
/* {"Freeworld", 0},
{0, "kabel.freeworld.nu"},
--
1.6.6
Index: xchat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat/F-11/xchat.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -p -r1.102 -r1.103
--- xchat.spec 7 Aug 2009 12:43:05 -0000 1.102
+++ xchat.spec 1 May 2010 07:17:53 -0000 1.103
@@ -4,7 +4,7 @@
Summary: A popular and easy to use graphical IRC (chat) client
Name: xchat
Version: 2.8.6
-Release: 11%{?dist}
+Release: 17%{?dist}
Epoch: 1
Group: Applications/Internet
License: GPLv2+
@@ -17,7 +17,6 @@ Patch0: xc286-smallfixes.diff
Patch10: xchat-2.8.4-redhat-desktop.patch
Patch12: xchat-1.8.7-use-sysconf-to-detect-cpus.patch
-Patch19: xchat-2.0.2-freenode.patch
# see #241923
Patch35: xchat-2.8.4-disable-tray-icon-by-default.patch
Patch40: xchat-2.8.4-shm-pixmaps.patch
@@ -29,6 +28,11 @@ Patch40: xchat-2.8.4-shm-pixmaps.patch
Patch41: xchat-2.8.6-default-utf8.patch
# fix literal underscore in "C_onnect" button (#512034, Edward Sheldrake)
Patch42: xchat-2.8.6-connect-mnemonic.patch
+# patch to add ability to change to tab with most recent activity
+# See http://sourceforge.net/tracker/?func=detail&aid=2022871&group_id=239&atid=350239
+Patch50: xchat-2.8.6-change-page-activity.patch
+# add port numbers for Freenode (Debarshi Ray)
+Patch51: xchat-2.8.6-freenode-ports.patch
BuildRequires: perl perl(ExtUtils::Embed) python-devel openssl-devel pkgconfig, tcl-devel
BuildRequires: GConf2-devel
@@ -73,11 +77,12 @@ This package contains the X-Chat plugin
%patch10 -p1 -b .desktop-file
%patch12 -p0 -b .use-sysconf-to-detect-cpus
-%patch19 -p0 -b .freenode
%patch35 -p1 -b .tray-icon
%patch40 -p1 -b .shm-pixmaps
%patch41 -p1 -b .default-utf8
%patch42 -p1 -b .connect-mnemonic
+%patch50 -p1 -b .active-channel-switch
+%patch51 -p1 -b .freenode-ports
sed -i -e 's/#define GTK_DISABLE_DEPRECATED//g' src/fe-gtk/*.c
@@ -112,9 +117,11 @@ make %{?_smp_mflags}
# Install the .desktop file properly
%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/applications/xchat.desktop
desktop-file-install --vendor="" \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications xchat.desktop
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --add-category=IRCClient \
+ --add-category=GTK xchat.desktop
-%find_lang %name
+%find_lang %{name}
# do not Provide plugins .so
%define _use_internal_dependency_generator 0
@@ -167,6 +174,26 @@ fi
%{_libdir}/xchat/plugins/tcl.so
%changelog
+* Wed Apr 21 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:2.8.6-17
+- Add port numbers for Freenode (Debarshi Ray)
+
+* Fri Apr 09 2010 Rudolf Kastl <rkastl at redhat.com> - 1:2.8.6-16
+- Added IRCClient .desktop file subcategory (#485306)
+- Added GTK .desktop file subcategory
+- Added curly brackets to the name macro for consistency.
+
+* Wed Dec 16 2009 Kevin Fenzi <kevin at tummy.com> - 1:2.8.6-15
+- Add patch to allow switching to next channel with activity.
+
+* Mon Dec 7 2009 Stepan Kasal <skasal at redhat.com> - 1:2.8.6-14
+- rebuild against perl 5.10.1
+
+* Thu Sep 10 2009 Christopher Aillon <caillon at redhat.com> - 1:2.8.6-13
+- Drop the antiquated OPN reference
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1:2.8.6-12
+- rebuilt with new openssl
+
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.8.6-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
--- xchat-2.0.2-freenode.patch DELETED ---
More information about the scm-commits
mailing list