diff src/gtkidle.c @ 12272:3ef381cdc47e

[gaim-migrate @ 14574] This should fix idle time reporting for all accounts. Previously it would only work for one account because I'm dumb. We're also doing one idleness check every 5 seconds instead of checking for each account every 20 seconds. committer: Tailor Script <[e-mail]>

--- a/src/gtkidle.c	Wed Nov 30 06:02:38 2005 +0000
+++ b/src/gtkidle.c	Wed Nov 30 06:03:49 2005 +0000
@@ -33,34 +33,8 @@
 # endif
 #endif /* USE_SCREENSAVER */
 
-#include "connection.h"
-#include "debug.h"
-#include "log.h"
-#include "prefs.h"
-#include "savedstatuses.h"
-#include "signals.h"
-
-#define IDLEMARK 600 /* 10 minutes! */
-#define IDLE_CHECK_INTERVAL 20 /* 20 seconds */
+#include "idle.h"
 
-typedef enum
-{
-	GAIM_IDLE_NOT_AWAY = 0,
-	GAIM_IDLE_AUTO_AWAY,
-	GAIM_IDLE_AWAY_BUT_NOT_AUTO_AWAY
-
-} GaimAutoAwayState;
-
-/**
- * This is needed for the I'dle Mak'er plugin to work correctly.  We
- * use it to determine if we're the ones who set our accounts idle
- * or if someone else did it (the I'dle Mak'er plugin, for example).
- * If our accounts are marked as idle and have_set_idle is FALSE and
- * the user moves the mouse, then we will NOT unidle our accounts.
- */
-static gboolean have_set_idle = FALSE;
-
-#ifdef USE_SCREENSAVER
 /**
  * Get the number of seconds the user has been idle.  In Unix-world
  * this is based on the X Windows usage.  In MS Windows this is based
@@ -83,10 +57,12 @@
  *
  * @return The number of seconds the user has been idle.
  */
-static int
-get_idle_time_from_system()
+static time_t
+gaim_gtk_get_time_idle()
 {
-#ifndef _WIN32
+#ifdef USE_SCREENSAVER
+# ifndef _WIN32
+	/* Query xscreensaver */
 	static XScreenSaverInfo *mit_info = NULL;
 	int event_base, error_base;
 	if (XScreenSaverQueryExtension(GDK_DISPLAY(), &event_base, &error_base)) {
@@ -97,186 +73,20 @@
 		return (mit_info->idle) / 1000;
 	} else
 		return 0;
-#else
+# else
+	/* Query windows */
 	return (GetTickCount() - wgaim_get_lastactive()) / 1000;
-#endif
-}
-#endif /* USE_SCREENSAVER */
-
-/*
- * This function should be called when you think your idle state
- * may have changed.  Maybe you're over the 10-minute mark and
- * Gaim should start reporting idle time to the server.  Maybe
- * you've returned from being idle.  Maybe your auto-away message
- * should be set.
- *
- * There is no harm to calling this many many times, other than
- * it will be kinda slow.  This is called every 20 seconds by a
- * timer set when an account logs in.  It is also called when
- * you send an IM, a chat, etc.
- *
- * This function has 3 sections.
- * 1. Get your idle time.  It will query XScreenSaver or Windows
- *    or get the Gaim idle time.  Whatever.
- * 2. Set or unset your auto-away message.
- * 3. Report your current idle time to the IM server.
- */
-/*
- * TODO: Make this loop so it's only called once, and handles all accounts?
- */
-static gint
-gaim_gtk_idle_check(gpointer data)
-{
-	GaimConnection *gc = (GaimConnection *)data;
-	gboolean report_idle;
-	GaimAccount *account;
-	GaimPresence *presence;
-	GaimStatus *status;
-	time_t t;
-	int idle_time;
-
-	account = gaim_connection_get_account(gc);
-	presence = gaim_account_get_presence(account);
-	status = gaim_presence_get_active_status(presence);
-
-	gaim_signal_emit(gaim_blist_get_handle(), "update-idle");
-
-	time(&t);
-
-	report_idle = gaim_prefs_get_bool("/gaim/gtk/idle/report");
-
-#ifdef USE_SCREENSAVER
-	idle_time = get_idle_time_from_system();
-#else
-	/*
-	 * If Gaim wasn't built with xscreensaver support, then
-	 * fallback to calculating our idle time based on when
-	 * we last sent a message.
-	 */
-	idle_time = t - gc->last_sent_time;
+# endif /* _WIN32 */
 #endif /* USE_SCREENSAVER */
-
-	/* Begining of auto-away stuff */
-	if (gaim_prefs_get_bool("/core/away/away_when_idle") &&
-		(idle_time > (60 * gaim_prefs_get_int("/core/away/mins_before_away")))
-		&& (!gc->is_auto_away))
-	{
-		if (gaim_status_is_available(status))
-		{
-			GaimSavedStatus *saved_status;
-
-			gaim_debug_info("idle", "Making %s auto-away\n",
-							gaim_account_get_username(account));
-
-			/* Mark our accounts "away" using the idleaway status */
-			saved_status = gaim_savedstatus_get_idleaway();
-			gaim_savedstatus_activate_for_account(saved_status, account);
-
-			gc->is_auto_away = GAIM_IDLE_AUTO_AWAY;
-		} else {
-			gc->is_auto_away = GAIM_IDLE_AWAY_BUT_NOT_AUTO_AWAY;
-		}
-
-	} else if (gc->is_auto_away &&
-			idle_time < 60 * gaim_prefs_get_int("/core/away/mins_before_away"))
-	{
-		/* Return from being idle */
-		GaimSavedStatus *saved_status;
-
-		if (gc->is_auto_away == GAIM_IDLE_AWAY_BUT_NOT_AUTO_AWAY) {
-			gc->is_auto_away = GAIM_IDLE_NOT_AWAY;
-		} else {
-			gc->is_auto_away = GAIM_IDLE_NOT_AWAY;
-
-			gaim_debug_info("idle", "%s returning from auto-away\n",
-							gaim_account_get_username(account));
-
-			/* Return our account to its previous status */
-			saved_status = gaim_savedstatus_get_current();
-			gaim_savedstatus_activate_for_account(saved_status, account);
-		}
-	}
-	/* End of auto-away stuff */
-
-	/* Begining of idle reporting stuff */
-	if (report_idle && idle_time >= IDLEMARK && !have_set_idle && !gaim_presence_is_idle(presence))
-	{
-		gaim_debug_info("idle", "Setting %s idle %d seconds\n",
-				   gaim_account_get_username(account), idle_time);
-		gaim_presence_set_idle(presence, TRUE, time(NULL) - idle_time);
-		have_set_idle = TRUE;
-	} else if ((!report_idle || idle_time < IDLEMARK) && have_set_idle && gaim_presence_is_idle(presence))
-	{
-		gaim_debug_info("idle", "Setting %s unidle\n",
-				   gaim_account_get_username(account));
-		gaim_presence_set_idle(presence, FALSE, time(NULL));
-		have_set_idle = FALSE;
-	}
-	/* End of idle reporting stuff */
-
-	return TRUE;
 }
 
-static void
-im_msg_sent_cb(GaimAccount *account, const char *receiver,
-			   const char *message, void *data)
-{
-	GaimConnection	*gc = gaim_account_get_connection(account);
-
-	/* After an IM is sent, check our idle time */
-	gaim_gtk_idle_check(gc);
-}
-
-static void
-remove_idle_timer(GaimConnection *gc)
+static GaimIdleUiOps ui_ops =
 {
-	/* Remove any existing idle_timer */
-	if (gc->idle_timer > 0)
-		gaim_timeout_remove(gc->idle_timer);
-	gc->idle_timer = 0;
-}
-
-static void
-connection_disconnected_cb(GaimConnection *gc, gpointer user_data)
-{
-	remove_idle_timer(gc);
-}
-
-static void
-connection_connected_cb(GaimConnection *gc, gpointer user_data)
-{
-	/* Now that we are connected, check for idleness every 20 seconds */
-	remove_idle_timer(gc);
-	gc->idle_timer = gaim_timeout_add(IDLE_CHECK_INTERVAL * 1000, gaim_gtk_idle_check, gc);
+	gaim_gtk_get_time_idle
+};
 
-	/* Immediately update our idleness, in case we connected while idle */
-	gaim_gtk_idle_check(gc);
-}
-
-void *
-gaim_gtk_idle_get_handle()
-{
-	static int handle;
-
-	return &handle;
-}
-
-void
-gaim_gtk_idle_init()
+GaimIdleUiOps *
+gaim_gtk_idle_get_ui_ops()
 {
-	gaim_signal_connect(gaim_conversations_get_handle(), "sent-im-msg",
-						gaim_gtk_idle_get_handle(),
-						GAIM_CALLBACK(im_msg_sent_cb), NULL);
-	gaim_signal_connect(gaim_connections_get_handle(), "signed-on",
-						gaim_gtk_idle_get_handle(),
-						GAIM_CALLBACK(connection_connected_cb), NULL);
-	gaim_signal_connect(gaim_connections_get_handle(), "signed-off",
-						gaim_gtk_idle_get_handle(),
-						GAIM_CALLBACK(connection_disconnected_cb), NULL);
+	return &ui_ops;
 }
-
-void
-gaim_gtk_idle_uninit()
-{
-	gaim_signals_disconnect_by_handle(gaim_gtk_idle_get_handle());
-}