callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deprecate and ignore the timeout-initial and timeout-repeat settings

Browse Source
This commit is contained in:
William Jon McCann
2013-07-09 16:44:04 -04:00
parent 0efeb96dab
commit 57fc8763e9
8 changed files with 39 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/win32/gdkproperty-win32.c
View File

@ -311,8 +311,6 @@ _gdk_win32_window_delete_property (GdkWindow *window,
"Gtk/Modules\0" "gtk-modules\0" "Gtk/Modules\0" "gtk-modules\0"
"Gtk/CursorThemeName\0" "gtk-cursor-theme-name\0" "Gtk/CursorThemeName\0" "gtk-cursor-theme-name\0"
"Gtk/CursorThemeSize\0" "gtk-cursor-theme-size\0" "Gtk/CursorThemeSize\0" "gtk-cursor-theme-size\0"
"Gtk/TimeoutInitial\0" "gtk-timeout-initial\0"
"Gtk/TimeoutRepeat\0" "gtk-timeout-repeat\0"
"Gtk/ColorScheme\0" "gtk-color-scheme\0" "Gtk/ColorScheme\0" "gtk-color-scheme\0"
"Gtk/EnableAnimations\0" "gtk-enable-animations\0" "Gtk/EnableAnimations\0" "gtk-enable-animations\0"
"Xft/Antialias\0" "gtk-xft-antialias\0" "Xft/Antialias\0" "gtk-xft-antialias\0"

2
gdk/x11/gdksettings.c
View File

@ -36,8 +36,6 @@ static const struct {
{"Gtk/Modules", "gtk-modules"}, {"Gtk/Modules", "gtk-modules"},
{"Gtk/CursorThemeName", "gtk-cursor-theme-name"}, {"Gtk/CursorThemeName", "gtk-cursor-theme-name"},
{"Gtk/CursorThemeSize", "gtk-cursor-theme-size"}, {"Gtk/CursorThemeSize", "gtk-cursor-theme-size"},
{"Gtk/TimeoutInitial", "gtk-timeout-initial"},
{"Gtk/TimeoutRepeat", "gtk-timeout-repeat"},
{"Gtk/ColorScheme", "gtk-color-scheme"}, {"Gtk/ColorScheme", "gtk-color-scheme"},
{"Gtk/EnableAnimations", "gtk-enable-animations"}, {"Gtk/EnableAnimations", "gtk-enable-animations"},
{"Xft/Antialias", "gtk-xft-antialias"}, {"Xft/Antialias", "gtk-xft-antialias"},

19
gtk/gtkcalendar.c
View File

@ -81,6 +81,9 @@
#include "gtktooltip.h" #include "gtktooltip.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#define TIMEOUT_INITIAL 500
#define TIMEOUT_REPEAT 50
/***************************************************************************/ /***************************************************************************/
/* The following date routines are taken from the lib_date package. /* The following date routines are taken from the lib_date package.
* They have been minimally edited to avoid conflict with types defined * They have been minimally edited to avoid conflict with types defined
@ -2884,15 +2887,9 @@ calendar_timer (gpointer data)
if (priv->need_timer) if (priv->need_timer)
{ {
GtkSettings *settings;
guint timeout;
settings = gtk_widget_get_settings (GTK_WIDGET (calendar));
g_object_get (settings, "gtk-timeout-repeat", &timeout, NULL);
priv->need_timer = FALSE; priv->need_timer = FALSE;
priv->timer = gdk_threads_add_timeout_full (G_PRIORITY_DEFAULT_IDLE, priv->timer = gdk_threads_add_timeout_full (G_PRIORITY_DEFAULT_IDLE,
timeout * SCROLL_DELAY_FACTOR, TIMEOUT_REPEAT * SCROLL_DELAY_FACTOR,
(GSourceFunc) calendar_timer, (GSourceFunc) calendar_timer,
(gpointer) calendar, NULL); (gpointer) calendar, NULL);
} }
@ -2913,15 +2910,9 @@ calendar_start_spinning (GtkCalendar *calendar,
if (!priv->timer) if (!priv->timer)
{ {
GtkSettings *settings;
guint timeout;
settings = gtk_widget_get_settings (GTK_WIDGET (calendar));
g_object_get (settings, "gtk-timeout-initial", &timeout, NULL);
priv->need_timer = TRUE; priv->need_timer = TRUE;
priv->timer = gdk_threads_add_timeout_full (G_PRIORITY_DEFAULT_IDLE, priv->timer = gdk_threads_add_timeout_full (G_PRIORITY_DEFAULT_IDLE,
timeout, TIMEOUT_INITIAL,
(GSourceFunc) calendar_timer, (GSourceFunc) calendar_timer,
(gpointer) calendar, NULL); (gpointer) calendar, NULL);
} }

34
gtk/gtknotebook.c
View File

@ -104,6 +104,10 @@
#define FRAMES_PER_SECOND 45 #define FRAMES_PER_SECOND 45
#define MSECS_BETWEEN_UPDATES (1000 / FRAMES_PER_SECOND) #define MSECS_BETWEEN_UPDATES (1000 / FRAMES_PER_SECOND)
#define TIMEOUT_INITIAL 500
#define TIMEOUT_REPEAT 50
#define TIMEOUT_EXPAND 500
typedef struct _GtkNotebookPage GtkNotebookPage; typedef struct _GtkNotebookPage GtkNotebookPage;
typedef enum typedef enum
@ -3368,8 +3372,6 @@ gtk_notebook_motion_notify (GtkWidget *widget,
GtkNotebookPage *page; GtkNotebookPage *page;
GtkNotebookArrow arrow; GtkNotebookArrow arrow;
GtkNotebookPointerPosition pointer_position; GtkNotebookPointerPosition pointer_position;
GtkSettings *settings;
guint timeout;
gint x_win, y_win; gint x_win, y_win;
page = priv->cur_page; page = priv->cur_page;
@ -3433,10 +3435,7 @@ gtk_notebook_motion_notify (GtkWidget *widget,
if (!priv->dnd_timer) if (!priv->dnd_timer)
{ {
priv->has_scrolled = TRUE; priv->has_scrolled = TRUE;
settings = gtk_widget_get_settings (GTK_WIDGET (notebook)); priv->dnd_timer = gdk_threads_add_timeout (TIMEOUT_REPEAT * SCROLL_DELAY_FACTOR,
g_object_get (settings, "gtk-timeout-repeat", &timeout, NULL);
priv->dnd_timer = gdk_threads_add_timeout (timeout * SCROLL_DELAY_FACTOR,
scroll_notebook_timer, scroll_notebook_timer,
(gpointer) notebook); (gpointer) notebook);
} }
@ -3700,9 +3699,7 @@ gtk_notebook_drag_motion (GtkWidget *widget,
GtkNotebookPrivate *priv = notebook->priv; GtkNotebookPrivate *priv = notebook->priv;
GtkAllocation allocation; GtkAllocation allocation;
GdkRectangle position; GdkRectangle position;
GtkSettings *settings;
GtkNotebookArrow arrow; GtkNotebookArrow arrow;
guint timeout;
GdkAtom target, tab_target; GdkAtom target, tab_target;
GList *tab; GList *tab;
gboolean retval = FALSE; gboolean retval = FALSE;
@ -3775,10 +3772,7 @@ gtk_notebook_drag_motion (GtkWidget *widget,
if (!priv->switch_tab_timer) if (!priv->switch_tab_timer)
{ {
settings = gtk_widget_get_settings (widget); priv->switch_tab_timer = gdk_threads_add_timeout (TIMEOUT_EXPAND,
g_object_get (settings, "gtk-timeout-expand", &timeout, NULL);
priv->switch_tab_timer = gdk_threads_add_timeout (timeout,
gtk_notebook_switch_tab_timeout, gtk_notebook_switch_tab_timeout,
widget); widget);
} }
@ -4834,14 +4828,8 @@ gtk_notebook_timer (GtkNotebook *notebook)
if (priv->need_timer) if (priv->need_timer)
{ {
GtkSettings *settings;
guint timeout;
settings = gtk_widget_get_settings (GTK_WIDGET (notebook));
g_object_get (settings, "gtk-timeout-repeat", &timeout, NULL);
priv->need_timer = FALSE; priv->need_timer = FALSE;
priv->timer = gdk_threads_add_timeout (timeout * SCROLL_DELAY_FACTOR, priv->timer = gdk_threads_add_timeout (TIMEOUT_REPEAT * SCROLL_DELAY_FACTOR,
(GSourceFunc) gtk_notebook_timer, (GSourceFunc) gtk_notebook_timer,
(gpointer) notebook); (gpointer) notebook);
} }
@ -4856,16 +4844,10 @@ static void
gtk_notebook_set_scroll_timer (GtkNotebook *notebook) gtk_notebook_set_scroll_timer (GtkNotebook *notebook)
{ {
GtkNotebookPrivate *priv = notebook->priv; GtkNotebookPrivate *priv = notebook->priv;
GtkWidget *widget = GTK_WIDGET (notebook);
if (!priv->timer) if (!priv->timer)
{ {
GtkSettings *settings = gtk_widget_get_settings (widget); priv->timer = gdk_threads_add_timeout (TIMEOUT_INITIAL,
guint timeout;
g_object_get (settings, "gtk-timeout-initial", &timeout, NULL);
priv->timer = gdk_threads_add_timeout (timeout,
(GSourceFunc) gtk_notebook_timer, (GSourceFunc) gtk_notebook_timer,
(gpointer) notebook); (gpointer) notebook);
priv->need_timer = TRUE; priv->need_timer = TRUE;

16
gtk/gtkpathbar.c
View File

@ -85,6 +85,8 @@ typedef enum {
#define BUTTON_DATA(x) ((ButtonData *)(x)) #define BUTTON_DATA(x) ((ButtonData *)(x))
#define SCROLL_DELAY_FACTOR 5 #define SCROLL_DELAY_FACTOR 5
#define TIMEOUT_INITIAL 500
#define TIMEOUT_REPEAT 50
static guint path_bar_signals [LAST_SIGNAL] = { 0 }; static guint path_bar_signals [LAST_SIGNAL] = { 0 };
@ -1071,14 +1073,9 @@ gtk_path_bar_scroll_timeout (GtkPathBar *path_bar)
if (path_bar->priv->need_timer) if (path_bar->priv->need_timer)
{ {
GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (path_bar));
guint timeout;
g_object_get (settings, "gtk-timeout-repeat", &timeout, NULL);
path_bar->priv->need_timer = FALSE; path_bar->priv->need_timer = FALSE;
path_bar->priv->timer = gdk_threads_add_timeout (timeout * SCROLL_DELAY_FACTOR, path_bar->priv->timer = gdk_threads_add_timeout (TIMEOUT_REPEAT * SCROLL_DELAY_FACTOR,
(GSourceFunc)gtk_path_bar_scroll_timeout, (GSourceFunc)gtk_path_bar_scroll_timeout,
path_bar); path_bar);
} }
@ -1181,13 +1178,8 @@ gtk_path_bar_slider_button_press (GtkWidget *widget,
if (!path_bar->priv->timer) if (!path_bar->priv->timer)
{ {
GtkSettings *settings = gtk_widget_get_settings (widget);
guint timeout;
g_object_get (settings, "gtk-timeout-initial", &timeout, NULL);
path_bar->priv->need_timer = TRUE; path_bar->priv->need_timer = TRUE;
path_bar->priv->timer = gdk_threads_add_timeout (timeout, path_bar->priv->timer = gdk_threads_add_timeout (TIMEOUT_INITIAL,
(GSourceFunc)gtk_path_bar_scroll_timeout, (GSourceFunc)gtk_path_bar_scroll_timeout,
path_bar); path_bar);
} }

16
gtk/gtkrange.c
View File

@ -60,6 +60,8 @@
#define SCROLL_DELAY_FACTOR 5 /* Scroll repeat multiplier */ #define SCROLL_DELAY_FACTOR 5 /* Scroll repeat multiplier */
#define UPDATE_DELAY 300 /* Delay for queued update */ #define UPDATE_DELAY 300 /* Delay for queued update */
#define TIMEOUT_INITIAL 500
#define TIMEOUT_REPEAT 50
typedef struct _GtkRangeStepTimer GtkRangeStepTimer; typedef struct _GtkRangeStepTimer GtkRangeStepTimer;
@ -4068,13 +4070,8 @@ initial_timeout (gpointer data)
{ {
GtkRange *range = GTK_RANGE (data); GtkRange *range = GTK_RANGE (data);
GtkRangePrivate *priv = range->priv; GtkRangePrivate *priv = range->priv;
GtkSettings *settings;
guint timeout;
settings = gtk_widget_get_settings (GTK_WIDGET (data)); priv->timer->timeout_id = gdk_threads_add_timeout (TIMEOUT_REPEAT * SCROLL_DELAY_FACTOR,
g_object_get (settings, "gtk-timeout-repeat", &timeout, NULL);
priv->timer->timeout_id = gdk_threads_add_timeout (timeout * SCROLL_DELAY_FACTOR,
second_timeout, second_timeout,
range); range);
/* remove self */ /* remove self */
@ -4086,18 +4083,13 @@ gtk_range_add_step_timer (GtkRange *range,
GtkScrollType step) GtkScrollType step)
{ {
GtkRangePrivate *priv = range->priv; GtkRangePrivate *priv = range->priv;
GtkSettings *settings;
guint timeout;
g_return_if_fail (priv->timer == NULL); g_return_if_fail (priv->timer == NULL);
g_return_if_fail (step != GTK_SCROLL_NONE); g_return_if_fail (step != GTK_SCROLL_NONE);
settings = gtk_widget_get_settings (GTK_WIDGET (range));
g_object_get (settings, "gtk-timeout-initial", &timeout, NULL);
priv->timer = g_new (GtkRangeStepTimer, 1); priv->timer = g_new (GtkRangeStepTimer, 1);
priv->timer->timeout_id = gdk_threads_add_timeout (timeout, priv->timer->timeout_id = gdk_threads_add_timeout (TIMEOUT_INITIAL,
initial_timeout, initial_timeout,
range); range);
priv->timer->step = step; priv->timer->step = step;

18
gtk/gtksettings.c
View File

@ -98,8 +98,8 @@
*/ */
#define DEFAULT_TIMEOUT_INITIAL 200 #define DEFAULT_TIMEOUT_INITIAL 500
#define DEFAULT_TIMEOUT_REPEAT 20 #define DEFAULT_TIMEOUT_REPEAT 50
#define DEFAULT_TIMEOUT_EXPAND 500 #define DEFAULT_TIMEOUT_EXPAND 500
typedef struct _GtkSettingsPropertyValue GtkSettingsPropertyValue; typedef struct _GtkSettingsPropertyValue GtkSettingsPropertyValue;
@ -664,22 +664,32 @@ gtk_settings_class_init (GtkSettingsClass *class)
NULL); NULL);
g_assert (result == PROP_SHOW_UNICODE_MENU); g_assert (result == PROP_SHOW_UNICODE_MENU);
/**
* GtkSettings:gtk-timeout-initial:
*
* Deprecated: 3.10: This setting is ignored.
*/
result = settings_install_property_parser (class, result = settings_install_property_parser (class,
g_param_spec_int ("gtk-timeout-initial", g_param_spec_int ("gtk-timeout-initial",
P_("Start timeout"), P_("Start timeout"),
P_("Starting value for timeouts, when button is pressed"), P_("Starting value for timeouts, when button is pressed"),
0, G_MAXINT, DEFAULT_TIMEOUT_INITIAL, 0, G_MAXINT, DEFAULT_TIMEOUT_INITIAL,
GTK_PARAM_READWRITE), GTK_PARAM_READWRITE | G_PARAM_DEPRECATED),
NULL); NULL);
g_assert (result == PROP_TIMEOUT_INITIAL); g_assert (result == PROP_TIMEOUT_INITIAL);
/**
* GtkSettings:gtk-timeout-repeat:
*
* Deprecated: 3.10: This setting is ignored.
*/
result = settings_install_property_parser (class, result = settings_install_property_parser (class,
g_param_spec_int ("gtk-timeout-repeat", g_param_spec_int ("gtk-timeout-repeat",
P_("Repeat timeout"), P_("Repeat timeout"),
P_("Repeat value for timeouts, when button is pressed"), P_("Repeat value for timeouts, when button is pressed"),
0, G_MAXINT, DEFAULT_TIMEOUT_REPEAT, 0, G_MAXINT, DEFAULT_TIMEOUT_REPEAT,
GTK_PARAM_READWRITE), GTK_PARAM_READWRITE | G_PARAM_DEPRECATED),
NULL); NULL);
g_assert (result == PROP_TIMEOUT_REPEAT); g_assert (result == PROP_TIMEOUT_REPEAT);

17
gtk/gtkspinbutton.c
View File

@ -58,7 +58,8 @@
#define EPSILON 1e-10 #define EPSILON 1e-10
#define MAX_DIGITS 20 #define MAX_DIGITS 20
#define MIN_ARROW_WIDTH 6 #define MIN_ARROW_WIDTH 6
#define TIMEOUT_INITIAL 500
#define TIMEOUT_REPEAT 50
/** /**
* SECTION:gtkspinbutton * SECTION:gtkspinbutton
@ -1459,14 +1460,9 @@ start_spinning (GtkSpinButton *spin,
if (!priv->timer) if (!priv->timer)
{ {
GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (spin));
guint timeout;
g_object_get (settings, "gtk-timeout-initial", &timeout, NULL);
priv->timer_step = step; priv->timer_step = step;
priv->need_timer = TRUE; priv->need_timer = TRUE;
priv->timer = gdk_threads_add_timeout (timeout, priv->timer = gdk_threads_add_timeout (TIMEOUT_INITIAL,
(GSourceFunc) gtk_spin_button_timer, (GSourceFunc) gtk_spin_button_timer,
(gpointer) spin); (gpointer) spin);
} }
@ -1590,13 +1586,8 @@ gtk_spin_button_timer (GtkSpinButton *spin_button)
if (priv->need_timer) if (priv->need_timer)
{ {
GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (spin_button));
guint timeout;
g_object_get (settings, "gtk-timeout-repeat", &timeout, NULL);
priv->need_timer = FALSE; priv->need_timer = FALSE;
priv->timer = gdk_threads_add_timeout (timeout, priv->timer = gdk_threads_add_timeout (TIMEOUT_REPEAT,
(GSourceFunc) gtk_spin_button_timer, (GSourceFunc) gtk_spin_button_timer,
(gpointer) spin_button); (gpointer) spin_button);
} }