+2006-03-18 [colin] 2.0.0cvs151
+
+ * src/mainwindow.c
+ * src/textview.c
+ * src/textview.h
+ Put a watch cursor in textview too when the mainwindow's
+ cursor in a watch
+
2006-03-18 [colin] 2.0.0cvs150
* src/folder.c
( cvs diff -u -r 1.382.2.253 -r 1.382.2.254 src/compose.c; ) > 2.0.0cvs148.patchset
( cvs diff -u -r 1.274.2.102 -r 1.274.2.103 src/mainwindow.c; cvs diff -u -r 1.39.2.14 -r 1.39.2.15 src/mainwindow.h; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/prefs_msg_colors.c; cvs diff -u -r 1.395.2.182 -r 1.395.2.183 src/summaryview.c; cvs diff -u -r 1.68.2.19 -r 1.68.2.20 src/summaryview.h; cvs diff -u -r 1.2.2.11 -r 1.2.2.12 src/gtk/colorlabel.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/colorlabel.h; ) > 2.0.0cvs149.patchset
( cvs diff -u -r 1.213.2.86 -r 1.213.2.87 src/folder.c; ) > 2.0.0cvs150.patchset
+( cvs diff -u -r 1.274.2.103 -r 1.274.2.104 src/mainwindow.c; cvs diff -u -r 1.96.2.102 -r 1.96.2.103 src/textview.c; cvs diff -u -r 1.12.2.10 -r 1.12.2.11 src/textview.h; ) > 2.0.0cvs151.patchset
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=150
+EXTRA_VERSION=151
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
#include "foldersort.h"
#include "icon_legend.h"
#include "colorlabel.h"
+#include "textview.h"
#define AC_LABEL_WIDTH 240
/* list of all instantiated MainWindow */
static GList *mainwin_list = NULL;
-static GdkCursor *watch_cursor;
+static GdkCursor *watch_cursor = NULL;
static void main_window_menu_callback_block (MainWindow *mainwin);
static void main_window_menu_callback_unblock (MainWindow *mainwin);
void main_window_cursor_wait(MainWindow *mainwin)
{
- if (mainwin->cursor_count == 0)
+ if (mainwin->cursor_count == 0) {
gdk_window_set_cursor(mainwin->window->window, watch_cursor);
-
+ textview_cursor_wait(mainwin->messageview->mimeview->textview);
+ }
+
mainwin->cursor_count++;
gdk_flush();
if (mainwin->cursor_count)
mainwin->cursor_count--;
- if (mainwin->cursor_count == 0)
+ if (mainwin->cursor_count == 0) {
gdk_window_set_cursor(mainwin->window->window, NULL);
-
+ textview_cursor_normal(mainwin->messageview->mimeview->textview);
+ }
gdk_flush();
}
static GdkCursor *hand_cursor = NULL;
static GdkCursor *text_cursor = NULL;
+static GdkCursor *watch_cursor= NULL;
#define TEXTVIEW_STATUSBAR_PUSH(textview, str) \
{ if (textview->messageview->statusbar) \
hand_cursor = gdk_cursor_new(GDK_HAND2);
if (!text_cursor)
text_cursor = gdk_cursor_new(GDK_XTERM);
+ if (!watch_cursor)
+ watch_cursor = gdk_cursor_new(GDK_WATCH);
textview_reflect_prefs(textview);
textview_set_all_headers(textview, FALSE);
return FALSE;
}
+void textview_cursor_wait(TextView *textview)
+{
+ GdkWindow *window = gtk_text_view_get_window(
+ GTK_TEXT_VIEW(textview->text),
+ GTK_TEXT_WINDOW_TEXT);
+ gdk_window_set_cursor(window, watch_cursor);
+}
+
+void textview_cursor_normal(TextView *textview)
+{
+ GdkWindow *window = gtk_text_view_get_window(
+ GTK_TEXT_VIEW(textview->text),
+ GTK_TEXT_WINDOW_TEXT);
+ gdk_window_set_cursor(window, NULL);
+}
+
static void textview_uri_update(TextView *textview, gint x, gint y)
{
GtkTextBuffer *buffer;
window = gtk_text_view_get_window(GTK_TEXT_VIEW(textview->text),
GTK_TEXT_WINDOW_TEXT);
- gdk_window_set_cursor(window, uri ? hand_cursor : text_cursor);
+ if (textview->messageview->mainwin->cursor_count == 0) {
+ gdk_window_set_cursor(window, uri ? hand_cursor : text_cursor);
+ } else {
+ gdk_window_set_cursor(window, watch_cursor);
+ }
TEXTVIEW_STATUSBAR_POP(textview);
gboolean textview_search_string_backward (TextView *textview,
const gchar *str,
gboolean case_sens);
+void textview_cursor_wait(TextView *textview);
+void textview_cursor_normal(TextView *textview);
#endif /* __TEXTVIEW_H__ */