Menu
▾
▴
[Gaim-commits] CVS: gaim/plugins filectl.c,1.13,1.14 history.c,1.7,1.8 iconaway.c,1.20,1.21 notify.c,1.25,1.26 timestamp.c,1.7,1.8
|
From: Christian H. <ch...@us...> - 2003-01-20 09:10:55
|
Update of /cvsroot/gaim/gaim/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv31570/plugins
Modified Files:
filectl.c history.c iconaway.c notify.c timestamp.c
Log Message:
Wow, okay, where to begin with this one ;)
I rewrote the whole conversation backend. It is now core/UI split. Here's
how it works..
Every conversation is represented by a gaim_conversation structure. This
branches out into gaim_im and gaim_chat structures. Every conversation
lives in (well, normally, but it doesn't have to) a gaim_window structure.
This is a _CORE_ representation of a window. There can be multiple
gaim_window structures around.
The gaim_window and gaim_conversation structures have UI-specific operation
structures associated with them. At the moment, the only UI is GTK+, and
this will be for some time. Don't start thinking you can write a QT UI now.
It's just not going to happen.
Everything that is done on a conversation is done through the core API.
This API does core processing and then calls the UI operations for the
rendering and anything else.
Now, what does this give the user?
- Multiple windows.
- Multiple tabs per window.
- Draggable tabs.
- Send As menu is moved to the menubar.
- Menubar for chats.
- Some very cool stuff in the future, like replacing, say, IRC chat windows
with an X-Chat interface, or whatever.
- Later on, customizable window/conversation positioning.
For developers:
- Fully documented API
- Core/UI split
- Variable checking and mostly sane handling of incorrect variables.
- Logical structure to conversations, both core and UI.
- Some very cool stuff in the future, like replacing, say, IRC chat windows
with an X-Chat interface, or whatever.
- Later on, customizable window/conversation positioning.
- Oh yeah, and the beginning of a stock icon system.
Now, there are things that aren't there yet. You will see tabs even if you
have them turned off. This will be fixed in time. Also, the preferences
will change to work with the new structure. I'm starting school in 2 days,
so it may not be done immediately, but hopefully in the next week.
Enjoy!
Index: filectl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/filectl.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- filectl.c 2 Jan 2003 05:20:55 -0000 1.13
+++ filectl.c 20 Jan 2003 09:09:44 -0000 1.14
@@ -72,11 +72,11 @@
signoff_all(NULL, NULL);
free(arg1);
} else if (!strncasecmp(command, "send", 4)) {
- struct conversation *c;
+ struct gaim_conversation *c;
arg1 = getarg(buffer, 1, 0);
arg2 = getarg(buffer, 2, 1);
c = find_conversation(arg1);
- if (!c) c = new_conversation(arg1);
+ if (!c) c = gaim_conversation_new(GAIM_CONV_IM, arg1);
write_to_conv(c, arg2, WFLAG_SEND, NULL, time(NULL), -1);
serv_send_im(c->gc, arg1, arg2, -1, 0);
free(arg1);
Index: history.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/history.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- history.c 7 Jan 2003 23:58:52 -0000 1.7
+++ history.c 20 Jan 2003 09:09:45 -0000 1.8
@@ -19,7 +19,8 @@
void historize (char *name, void *data)
{
- struct conversation *c = find_conversation(name);
+ struct gaim_conversation *c = gaim_find_conversation(name);
+ struct gaim_gtk_conversation *gtkconv;
struct stat st;
FILE *fd;
char *userdir = g_strdup(gaim_user_dir());
@@ -52,7 +53,9 @@
if(*tmp == '<')
options |= GTK_IMHTML_NO_NEWLINE;
- gtk_imhtml_append_text(GTK_IMHTML(c->text), tmp, strlen(tmp), options);
+ gtkconv = GAIM_GTK_CONVERSATION(c);
+
+ gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), tmp, strlen(tmp), options);
g_free(userdir);
g_free(logfile);
Index: iconaway.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/iconaway.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- iconaway.c 5 Jan 2003 03:02:52 -0000 1.20
+++ iconaway.c 20 Jan 2003 09:09:45 -0000 1.21
@@ -16,22 +16,38 @@
G_MODULE_IMPORT GtkWidget *imaway;
G_MODULE_IMPORT GtkWidget *blist;
-G_MODULE_IMPORT GtkWidget *all_chats;
+/* XXX G_MODULE_IMPORT GtkWidget *all_chats; */
G_MODULE_IMPORT GtkWidget *all_convos;
#ifdef USE_APPLET
extern void applet_destroy_buddy();
#endif
-void iconify_windows(struct gaim_connection *gc, char *state, char *message, void *data) {
+void iconify_windows(struct gaim_connection *gc, char *state,
+ char *message, void *data) {
+ struct gaim_window *win;
+ GList *windows;
+
if (!imaway || !gc->away)
return;
+
gtk_window_iconify(GTK_WINDOW(imaway));
hide_buddy_list();
- if (all_convos)
- gtk_window_iconify(GTK_WINDOW(all_convos));
- if (all_chats)
- gtk_window_iconify(GTK_WINDOW(all_chats));
+
+ for (windows = gaim_get_windows();
+ windows != NULL;
+ windows = windows->next) {
+
+ win = (struct gaim_window *)windows->data;
+
+ if (gaim_window_get_ops(win) == gaim_get_gtk_window_ops()) {
+ struct gaim_gtk_window *gtkwin;
+
+ gtkwin = GAIM_GTK_WINDOW(win);
+
+ gtk_window_iconify(GTK_WINDOW(gtkwin->window));
+ }
+ }
}
/*
Index: notify.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/notify.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- notify.c 7 Jan 2003 06:11:08 -0000 1.25
+++ notify.c 20 Jan 2003 09:09:46 -0000 1.26
@@ -70,46 +70,38 @@
void quote_add(GtkWidget *widget);
gboolean quote_remove(GtkWidget *widget);
/* urgent functions */
-void urgent_add(struct conversation *c);
-gboolean urgent_remove(struct conversation *c);
-
-struct conversation *find_chat(struct gaim_connection *gc, int id) {
- GList *cnv = chats;
- struct conversation *c;
-
- while (cnv) {
- c = (struct conversation *) cnv->data;
-
- if (c && (c->gc == gc) && c->is_chat && (c->id == id))
- return c;
-
- cnv = cnv->next;
- }
- return NULL;
-}
+void urgent_add(struct gaim_conversation *c);
+gboolean urgent_remove(struct gaim_conversation *c);
-int notify(struct conversation *cnv) {
+int notify(struct gaim_conversation *cnv) {
+ struct gaim_gtk_window *gtkwin;
Window focus_return;
int revert_to_return;
- XGetInputFocus(GDK_WINDOW_XDISPLAY(cnv->window->window), &focus_return, &revert_to_return);
+ gtkwin = GAIM_GTK_WINDOW(gaim_conversation_get_window(cnv));
+
+ XGetInputFocus(GDK_WINDOW_XDISPLAY(gtkwin->window->window), &focus_return, &revert_to_return);
if ((choice & NOTIFY_IN_FOCUS) ||
- focus_return != GDK_WINDOW_XWINDOW(cnv->window->window)) {
+ focus_return != GDK_WINDOW_XWINDOW(gtkwin->window->window)) {
if (method & METHOD_STRING)
- string_add(cnv->window);
+ string_add(gtkwin->window);
if (method & METHOD_COUNT)
- count_add(cnv->window, 0);
+ count_add(gtkwin->window, 0);
if (method & METHOD_QUOTE)
- quote_add(cnv->window);
+ quote_add(gtkwin->window);
if (method & METHOD_URGENT)
urgent_add(cnv);
}
return 0;
}
-guint unnotify(struct conversation *c, gboolean clean) {
+guint unnotify(struct gaim_conversation *c, gboolean clean) {
+ struct gaim_gtk_window *gtkwin;
guint option = 0;
+
+ gtkwin = GAIM_GTK_WINDOW(gaim_conversation_get_window(c));
+
/* The top level ifs check whether we are either cleaning all methods,
* or whether we have that method is currently selected.
* If we do then they are cleaned
@@ -118,15 +110,15 @@
* and if that method is currently selected.
* If we did and it is then set option so that it can be re-added */
if (clean || (method & METHOD_QUOTE))
- if (quote_remove(c->window) && (method & METHOD_QUOTE))
+ if (quote_remove(gtkwin->window) && (method & METHOD_QUOTE))
option ^= METHOD_QUOTE;
if (clean || (method & METHOD_COUNT))
- if (count_remove(c->window) && (method & METHOD_COUNT))
+ if (count_remove(gtkwin->window) && (method & METHOD_COUNT))
option ^= METHOD_COUNT;
if (clean || (method & METHOD_STRING))
- if (string_remove(c->window) && (method & METHOD_STRING))
+ if (string_remove(gtkwin->window) && (method & METHOD_STRING))
option ^= METHOD_STRING;
if (clean || (method & METHOD_URGENT))
@@ -137,7 +129,7 @@
}
void chat_recv_im(struct gaim_connection *gc, int id, char **who, char **text) {
- struct conversation *c = find_chat(gc, id);
+ struct gaim_conversation *c = gaim_find_chat(gc, id);
if (c && (type & TYPE_CHAT))
notify(c);
@@ -145,7 +137,7 @@
}
void chat_sent_im(struct gaim_connection *gc, int id, char **text) {
- struct conversation *c = find_chat(gc, id);
+ struct gaim_conversation *c = gaim_find_chat(gc, id);
if (c && (type & TYPE_CHAT))
unnotify(c, FALSE);
@@ -153,7 +145,7 @@
}
int im_recv_im(struct gaim_connection *gc, char **who, char **what, void *m) {
- struct conversation *c = find_conversation(*who);
+ struct gaim_conversation *c = gaim_find_conversation(*who);
if (c && (type & TYPE_IM))
notify(c);
@@ -161,70 +153,81 @@
}
int im_sent_im(struct gaim_connection *gc, char *who, char **what, void *m) {
- struct conversation *c = find_conversation(who);
+ struct gaim_conversation *c = gaim_find_conversation(who);
if (c && (type & TYPE_IM))
unnotify(c, FALSE);
return 0;
}
-int attach_signals(struct conversation *c) {
+int attach_signals(struct gaim_conversation *c) {
+ struct gaim_gtk_conversation *gtkconv;
+ struct gaim_gtk_window *gtkwin;
+
+ gtkconv = GAIM_GTK_CONVERSATION(c);
+ gtkwin = GAIM_GTK_WINDOW(gaim_conversation_get_window(c));
+
if (choice & NOTIFY_FOCUS) {
- g_signal_connect(G_OBJECT(c->window), "focus-in-event", G_CALLBACK(un_star), NULL);
+ g_signal_connect(G_OBJECT(gtkwin->window), "focus-in-event", G_CALLBACK(un_star), NULL);
}
if (choice & NOTIFY_CLICK) {
- g_signal_connect(G_OBJECT(c->window), "button_press_event", G_CALLBACK(un_star), NULL);
+ g_signal_connect(G_OBJECT(gtkwin->window), "button_press_event", G_CALLBACK(un_star), NULL);
- g_signal_connect_swapped(G_OBJECT(c->text), "button_press_event", G_CALLBACK(un_star), G_OBJECT(c->window));
+ g_signal_connect_swapped(G_OBJECT(gtkconv->imhtml), "button_press_event", G_CALLBACK(un_star), G_OBJECT(gtkwin->window));
- g_signal_connect_swapped(G_OBJECT(c->entry), "button_press_event", G_CALLBACK(un_star), G_OBJECT(c->window));
+ g_signal_connect_swapped(G_OBJECT(gtkconv->entry), "button_press_event", G_CALLBACK(un_star), G_OBJECT(gtkwin->window));
}
if (choice & NOTIFY_TYPE) {
- g_signal_connect_swapped(G_OBJECT(c->entry), "key-press-event", G_CALLBACK(un_star), G_OBJECT(c->window));
+ g_signal_connect_swapped(G_OBJECT(gtkconv->entry), "key-press-event", G_CALLBACK(un_star), G_OBJECT(gtkwin->window));
}
- g_object_set_data(G_OBJECT(c->window), "user_data", c);
- g_object_set_data(G_OBJECT(c->window), "notify_data", GUINT_TO_POINTER(choice));
+ g_object_set_data(G_OBJECT(gtkwin->window), "user_data", c);
+ g_object_set_data(G_OBJECT(gtkwin->window), "notify_data", GUINT_TO_POINTER(choice));
return 0;
}
-void detach_signals(struct conversation *c) {
- guint options = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(c->window), "notify_data"));
+void detach_signals(struct gaim_conversation *c) {
+ struct gaim_gtk_conversation *gtkconv;
+ struct gaim_gtk_window *gtkwin;
+ guint options;
+
+ gtkconv = GAIM_GTK_CONVERSATION(c);
+ gtkwin = GAIM_GTK_WINDOW(gaim_conversation_get_window(c));
+
+ options = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(gtkwin->window), "notify_data"));
if (options & NOTIFY_FOCUS) {
- g_signal_handlers_disconnect_by_func(G_OBJECT(c->window), un_star, NULL);
+ g_signal_handlers_disconnect_by_func(G_OBJECT(gtkwin->window), un_star, NULL);
}
if (options & NOTIFY_CLICK) {
- g_signal_handlers_disconnect_by_func(G_OBJECT(c->window), un_star, NULL);
- g_signal_handlers_disconnect_by_func(G_OBJECT(c->text), un_star, c->window);
- g_signal_handlers_disconnect_by_func(G_OBJECT(c->entry), un_star, c->window);
+ g_signal_handlers_disconnect_by_func(G_OBJECT(gtkwin->window), un_star, NULL);
+ g_signal_handlers_disconnect_by_func(G_OBJECT(gtkconv->imhtml), un_star, gtkwin->window);
+ g_signal_handlers_disconnect_by_func(G_OBJECT(gtkconv->entry), un_star, gtkwin->window);
}
if (options & NOTIFY_TYPE) {
- g_signal_handlers_disconnect_by_func(G_OBJECT(c->entry), un_star, c->window);
+ g_signal_handlers_disconnect_by_func(G_OBJECT(gtkconv->entry), un_star, gtkwin->window);
}
}
void new_conv(char *who) {
- struct conversation *c = find_conversation(who);
+ struct gaim_conversation *c = gaim_find_conversation(who);
if (c && (type & TYPE_IM))
attach_signals(c);
- return;
}
void chat_join(struct gaim_connection *gc, int id, char *room) {
- struct conversation *c = find_chat(gc, id);
+ struct gaim_conversation *c = gaim_find_chat(gc, id);
if (c && (type & TYPE_CHAT))
attach_signals(c);
- return;
}
int un_star(GtkWidget *widget, gpointer data) {
- struct conversation *c = g_object_get_data(G_OBJECT(widget), "user_data");
+ struct gaim_conversation *c = g_object_get_data(G_OBJECT(widget), "user_data");
if (method & METHOD_QUOTE)
quote_remove(widget);
@@ -338,36 +341,60 @@
return FALSE;
}
-void urgent_add(struct conversation *c) {
- XWMHints *hints = XGetWMHints(GDK_WINDOW_XDISPLAY(c->window->window), GDK_WINDOW_XWINDOW(c->window->window));
+void urgent_add(struct gaim_conversation *c) {
+ struct gaim_gtk_window *gtkwin;
+ XWMHints *hints;
+
+ gtkwin = GAIM_GTK_WINDOW(gaim_conversation_get_window(c));
+
+ hints = XGetWMHints(GDK_WINDOW_XDISPLAY(gtkwin->window->window), GDK_WINDOW_XWINDOW(gtkwin->window->window));
hints->flags |= XUrgencyHint;
- XSetWMHints(GDK_WINDOW_XDISPLAY(c->window->window), GDK_WINDOW_XWINDOW(c->window->window), hints);
+ XSetWMHints(GDK_WINDOW_XDISPLAY(gtkwin->window->window), GDK_WINDOW_XWINDOW(gtkwin->window->window), hints);
XFree(hints);
}
-gboolean urgent_remove(struct conversation *c) {
- if ((c->is_chat && (chat_options & OPT_CHAT_ONE_WINDOW)) || (!c->is_chat && (im_options & OPT_IM_ONE_WINDOW))) {
- if (c->is_chat) {
- struct conversation *c = (struct conversation *)chats->data;
- GdkWindow *win = c->window->window;
+gboolean urgent_remove(struct gaim_conversation *c) {
+ struct gaim_gtk_conversation *gtkconv;
- XWMHints *hints = XGetWMHints(GDK_WINDOW_XDISPLAY(win), GDK_WINDOW_XWINDOW(win));
+ gtkconv = GAIM_GTK_CONVERSATION(c);
+
+ if ((gaim_conversation_get_type(c) == GAIM_CONV_CHAT &&
+ (chat_options & OPT_CHAT_ONE_WINDOW)) ||
+ (gaim_conversation_get_type(c) != GAIM_CONV_CHAT &&
+ (im_options & OPT_IM_ONE_WINDOW))) {
+ if (gaim_conversation_get_type(c) == GAIM_CONV_CHAT) {
+ struct gaim_conversation *c = (struct gaim_conversation *)gaim_get_chats()->data;
+ struct gaim_gtk_window *gtkwin;
+ GdkWindow *win;
+ XWMHints *hints;
+
+ gtkwin = GAIM_GTK_WINDOW(gaim_conversation_get_window(c));
+
+ win = gtkwin->window->window;
+
+ hints = XGetWMHints(GDK_WINDOW_XDISPLAY(win), GDK_WINDOW_XWINDOW(win));
if (hints->flags & XUrgencyHint) {
hints->flags &= ~XUrgencyHint;
- XSetWMHints(GDK_WINDOW_XDISPLAY(c->window->window), GDK_WINDOW_XWINDOW(c->window->window), hints);
+ XSetWMHints(GDK_WINDOW_XDISPLAY(gtkwin->window->window), GDK_WINDOW_XWINDOW(gtkwin->window->window), hints);
XFree(hints);
return TRUE;
}
XFree(hints);
return FALSE;
} else {
- struct conversation *c = (struct conversation *)conversations->data;
- GdkWindow *win = c->window->window;
+ struct gaim_conversation *c;
+ struct gaim_gtk_window *gtkwin;
+ GdkWindow *win;
+ XWMHints *hints;
- XWMHints *hints = XGetWMHints(GDK_WINDOW_XDISPLAY(win), GDK_WINDOW_XWINDOW(win));
+ c = (struct gaim_conversation *)gaim_get_ims()->data;
+ gtkwin = GAIM_GTK_WINDOW(gaim_conversation_get_window(c));
+ win = gtkwin->window->window;
+
+ hints = XGetWMHints(GDK_WINDOW_XDISPLAY(win), GDK_WINDOW_XWINDOW(win));
if (hints->flags & XUrgencyHint) {
hints->flags &= ~XUrgencyHint;
- XSetWMHints(GDK_WINDOW_XDISPLAY(c->window->window), GDK_WINDOW_XWINDOW(c->window->window), hints);
+ XSetWMHints(GDK_WINDOW_XDISPLAY(gtkwin->window->window), GDK_WINDOW_XWINDOW(gtkwin->window->window), hints);
XFree(hints);
return TRUE;
}
@@ -375,10 +402,15 @@
return FALSE;
}
} else {
- XWMHints *hints = XGetWMHints(GDK_WINDOW_XDISPLAY(c->window->window), GDK_WINDOW_XWINDOW(c->window->window));
+ struct gaim_gtk_window *gtkwin;
+ XWMHints *hints;
+
+ gtkwin = GAIM_GTK_WINDOW(gaim_conversation_get_window(c));
+ hints = XGetWMHints(GDK_WINDOW_XDISPLAY(gtkwin->window->window), GDK_WINDOW_XWINDOW(gtkwin->window->window));
+
if (hints->flags & XUrgencyHint) {
hints->flags &= ~XUrgencyHint;
- XSetWMHints(GDK_WINDOW_XDISPLAY(c->window->window), GDK_WINDOW_XWINDOW(c->window->window), hints);
+ XSetWMHints(GDK_WINDOW_XDISPLAY(gtkwin->window->window), GDK_WINDOW_XWINDOW(gtkwin->window->window), hints);
XFree(hints);
return TRUE;
}
@@ -480,7 +512,16 @@
while (cnv) {
guint notification;
- struct conversation *c = (struct conversation *) cnv->data;
+ struct gaim_conversation *c = (struct gaim_conversation *) cnv->data;
+ struct gaim_gtk_conversation *gtkconv;
+ struct gaim_gtk_window *gtkwin;
+ guint options = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(c->window), "notify_data"));
+
+ gtkconv = GAIM_GTK_CONVERSATION(c);
+ gtkwin = GAIM_GTK_WINDOW(gaim_conversation_get_window(c));
+
+ if (options & NOTIFY_FOCUS)
+ g_signal_handlers_disconnect_by_func(G_OBJECT(gtkwin->window), un_star, NULL);
/* remove old notification signals */
detach_signals(c);
@@ -490,11 +531,11 @@
/* re-add appropriate notification methods cleaned above */
if (notification & METHOD_STRING) /* re-add string */
- string_add(c->window);
+ string_add(gtkwin->window);
if (notification & METHOD_QUOTE) /* re-add quote */
- quote_add(c->window);
+ quote_add(gtkwin->window);
if (notification & METHOD_COUNT) /* re-add count */
- count_add(c->window, Number);
+ count_add(gtkwin->window, Number);
if (notification & METHOD_URGENT) /* re-add urgent */
urgent_add(c);
@@ -503,8 +544,6 @@
cnv = cnv->next;
}
-
- return;
}
char *gaim_plugin_init(GModule *hndl) {
@@ -523,14 +562,17 @@
}
void gaim_plugin_remove() {
- GList *c = conversations;
+ GList *c = gaim_get_ims();
while (c) {
- struct conversation *cnv = (struct conversation *)c->data;
-
+ struct gaim_conversation *cnv = (struct gaim_conversation *)c->data;
+ struct gaim_gtk_window *gtkwin;
+
+ gtkwin = GAIM_GTK_WINDOW(gaim_conversation_get_window(cnv));
+
detach_signals(cnv);
- un_star(cnv->window, NULL);
-
+ un_star(gtkwin->window, NULL);
+
c = c->next;
}
Index: timestamp.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/timestamp.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- timestamp.c 7 Jan 2003 14:21:43 -0000 1.7
+++ timestamp.c 20 Jan 2003 09:09:47 -0000 1.8
@@ -21,7 +21,7 @@
gboolean do_timestamp (gpointer data)
{
- struct conversation *c = data;
+ struct gaim_conversation *c = (struct gaim_conversation *)data;
char *buf;
char mdate[6];
time_t tim = time(NULL);
@@ -31,14 +31,14 @@
strftime(mdate, sizeof(mdate), "%H:%M", localtime(&tim));
buf = g_strdup_printf(" %s", mdate);
- write_to_conv(c, buf, WFLAG_NOLOG, NULL, tim, -1);
+ gaim_conversation_write(c, NULL, buf, WFLAG_NOLOG, tim, -1);
g_free(buf);
return TRUE;
}
void timestamp_new_convo(char *name)
{
- struct conversation *c = find_conversation(name);
+ struct gaim_conversation *c = gaim_find_conversation(name);
do_timestamp(c);
timestamp_timeouts = g_slist_append(timestamp_timeouts,
@@ -100,7 +100,7 @@
char *gaim_plugin_init(GModule *h) {
GList *cnvs = conversations;
- struct conversation *c;
+ struct gaim_conversation *c;
handle = h;
while (cnvs) {
|