int block_changed;
McPresence state;
+ int previous_type;
McPresence flash_state_1;
McPresence flash_state_2;
}
static void
-popup_shown_cb (GObject *self, GParamSpec *pspec, gpointer user_data)
+presence_chooser_popup_shown_cb (GObject *self,
+ GParamSpec *pspec,
+ gpointer user_data)
{
gboolean shown;
g_object_get (self, "popup-shown", &shown, NULL);
}
static void
-set_status_editing (EmpathyPresenceChooser *self, gboolean editing)
+presence_chooser_set_status_editing (EmpathyPresenceChooser *self,
+ gboolean editing)
{
EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
GtkWidget *entry = gtk_bin_get_child (GTK_BIN (self));
}
static void
-entry_icon_release_cb (EmpathyPresenceChooser *self,
- GtkEntryIconPosition icon_pos,
- GdkEvent *event,
- GtkEntry *entry)
+presence_chooser_reset_status (EmpathyPresenceChooser *self)
{
- set_status_editing (self, FALSE);
+ /* recover the status that was unset */
+ presence_chooser_presence_changed_cb (self);
+}
+
+static void
+presence_chooser_entry_icon_release_cb (EmpathyPresenceChooser *self,
+ GtkEntryIconPosition icon_pos,
+ GdkEvent *event,
+ GtkEntry *entry)
+{
+ presence_chooser_set_status_editing (self, FALSE);
mc_set_custom_state (self);
}
static void
-entry_activate_cb (EmpathyPresenceChooser *self,
- GtkEntry *entry)
+presence_chooser_entry_activate_cb (EmpathyPresenceChooser *self,
+ GtkEntry *entry)
{
- set_status_editing (self, FALSE);
+ presence_chooser_set_status_editing (self, FALSE);
mc_set_custom_state (self);
}
static gboolean
-entry_key_press_event_cb (EmpathyPresenceChooser *self,
- GdkEventKey *event,
- GtkWidget *entry)
+presence_chooser_entry_key_press_event_cb (EmpathyPresenceChooser *self,
+ GdkEventKey *event,
+ GtkWidget *entry)
{
EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
if (priv->editing_status && event->keyval == GDK_Escape)
{
/* the user pressed Escape, undo the editing */
- set_status_editing (self, FALSE);
- presence_chooser_presence_changed_cb (self);
+ presence_chooser_set_status_editing (self, FALSE);
+ presence_chooser_reset_status (self);
return TRUE;
}
+ else if (event->keyval == GDK_Up || event->keyval == GDK_Down)
+ {
+ /* ignore */
+ return TRUE;
+ }
return FALSE; /* send this event elsewhere */
}
+static gboolean
+presence_chooser_entry_button_press_event_cb (EmpathyPresenceChooser *self,
+ GdkEventButton *event,
+ GtkWidget *entry)
+{
+ EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
+
+ if (!priv->editing_status && event->button == 1)
+ {
+ presence_chooser_set_status_editing (self, TRUE);
+ gtk_widget_grab_focus (entry);
+ gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1);
+
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
static void
-changed_cb (GtkComboBox *self, gpointer user_data)
+presence_chooser_entry_changed_cb (EmpathyPresenceChooser *self,
+ gpointer user_data)
+{
+ EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
+
+ if (priv->block_changed) return;
+
+ /* the combo is being edited to a custom entry */
+ if (!priv->editing_status)
+ {
+ presence_chooser_set_status_editing (self, TRUE);
+ }
+}
+
+static void
+presence_chooser_changed_cb (GtkComboBox *self, gpointer user_data)
{
EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
GtkTreeIter iter;
char *icon_name;
+ McPresence new_state;
gboolean customisable = TRUE;
int type = -1;
GtkTreeModel *model = gtk_combo_box_get_model (self);
if (!gtk_combo_box_get_active_iter (self, &iter))
{
- /* the combo is being edited to a custom entry */
- if (!priv->editing_status)
- {
- set_status_editing (EMPATHY_PRESENCE_CHOOSER (self), TRUE);
- }
return;
}
gtk_tree_model_get (model, &iter,
COL_STATE_ICON_NAME, &icon_name,
- COL_STATE, &priv->state,
+ COL_STATE, &new_state,
COL_STATUS_CUSTOMISABLE, &customisable,
COL_TYPE, &type,
-1);
/* some types of status aren't editable, set the editability of the
* entry appropriately. Unless we're just about to reset it anyway,
* in which case, don't fiddle with it */
- /* FIXME: there is a bug here, if we start in the Hidden state, it
- * will be editable. It's not something that often occurs though. */
if (type != ENTRY_TYPE_EDIT_CUSTOM)
{
gtk_editable_set_editable (GTK_EDITABLE (entry), customisable);
+ priv->state = new_state;
}
if (type == ENTRY_TYPE_EDIT_CUSTOM)
{
- /* recover the status that was unset because COL_STATUS_TEXT
- * is "". Unfortunately if you try and set COL_STATUS_TEXT to
- * NULL, it generates a g_critical. I wonder if there is a
- * better way around this. */
- const char *status = empathy_idle_get_status (priv->idle);
- priv->block_set_editing++;
- gtk_entry_set_text (GTK_ENTRY (entry), status);
- priv->block_set_editing--;
+ presence_chooser_reset_status (EMPATHY_PRESENCE_CHOOSER (self));
/* attempt to get the toplevel for this widget */
GtkWidget *window = gtk_widget_get_toplevel (GTK_WIDGET (self));
icon_name);
/* preseed the status */
- const char *status = empathy_idle_get_status (priv->idle);
- priv->block_set_editing++;
- gtk_entry_set_text (GTK_ENTRY (entry), status);
- priv->block_set_editing--;
+ if (priv->previous_type == ENTRY_TYPE_BUILTIN)
+ {
+ gtk_entry_set_text (GTK_ENTRY (entry), "");
+ }
+ else
+ {
+ const char *status = empathy_idle_get_status (priv->idle);
+ gtk_entry_set_text (GTK_ENTRY (entry), status);
+ }
/* grab the focus */
gtk_widget_grab_focus (entry);
-
- set_status_editing (EMPATHY_PRESENCE_CHOOSER (self), TRUE);
}
else
{
char *status;
/* just in case we were setting a new status when
* things were changed */
- set_status_editing (EMPATHY_PRESENCE_CHOOSER (self), FALSE);
+ presence_chooser_set_status_editing (
+ EMPATHY_PRESENCE_CHOOSER (self),
+ FALSE);
gtk_tree_model_get (model, &iter,
COL_STATUS_TEXT, &status,
g_free (status);
}
+ if (type != ENTRY_TYPE_EDIT_CUSTOM)
+ {
+ priv->previous_type = type;
+ }
g_free (icon_name);
}
return (type == ENTRY_TYPE_SEPARATOR);
}
+static gboolean
+presence_chooser_entry_focus_out_cb (EmpathyPresenceChooser *chooser,
+ GdkEventFocus *event,
+ GtkEntry *entry)
+{
+ EmpathyPresenceChooserPriv *priv = GET_PRIV (chooser);
+
+ if (priv->editing_status)
+ {
+ // entry_activate_cb (chooser, entry);
+ }
+
+ return FALSE;
+}
+
static void
empathy_presence_chooser_init (EmpathyPresenceChooser *chooser)
{
gtk_entry_set_icon_activatable (GTK_ENTRY (entry),
GTK_ENTRY_ICON_PRIMARY, FALSE);
g_signal_connect_object (entry, "icon-release",
- G_CALLBACK (entry_icon_release_cb), chooser,
+ G_CALLBACK (presence_chooser_entry_icon_release_cb),
+ chooser,
G_CONNECT_SWAPPED);
g_signal_connect_object (entry, "activate",
- G_CALLBACK (entry_activate_cb), chooser,
+ G_CALLBACK (presence_chooser_entry_activate_cb),
+ chooser,
G_CONNECT_SWAPPED);
g_signal_connect_object (entry, "key-press-event",
- G_CALLBACK (entry_key_press_event_cb), chooser,
+ G_CALLBACK (presence_chooser_entry_key_press_event_cb),
+ chooser,
+ G_CONNECT_SWAPPED);
+ g_signal_connect_object (entry, "button-press-event",
+ G_CALLBACK (presence_chooser_entry_button_press_event_cb),
+ chooser,
G_CONNECT_SWAPPED);
- // FIXME - should this also happen when the user presses TAB ?
GtkCellRenderer *renderer;
gtk_cell_layout_clear (GTK_CELL_LAYOUT (chooser));
g_object_unref (model);
g_signal_connect (chooser, "notify::popup-shown",
- G_CALLBACK (popup_shown_cb), NULL);
+ G_CALLBACK (presence_chooser_popup_shown_cb), NULL);
g_signal_connect (chooser, "changed",
- G_CALLBACK (changed_cb), NULL);
+ G_CALLBACK (presence_chooser_changed_cb), NULL);
g_signal_connect_swapped (entry, "changed",
- G_CALLBACK (changed_cb), chooser);
+ G_CALLBACK (presence_chooser_entry_changed_cb),
+ chooser);
+ g_signal_connect_swapped (entry, "focus-out-event",
+ G_CALLBACK (presence_chooser_entry_focus_out_cb),
+ chooser);
priv->idle = empathy_idle_dup_singleton ();
presence_chooser_presence_changed_cb (chooser);
g_signal_connect_swapped (priv->idle, "notify",
- G_CALLBACK (presence_chooser_presence_changed_cb),
- chooser);
+ G_CALLBACK (presence_chooser_presence_changed_cb),
+ chooser);
g_object_set (chooser,
// FIXME: this string sucks
}
else
{
- // FIXME - do we insert the match into the menu?
ui_set_custom_state (chooser, state, status);
}
projects / empathy.git / blobdiff