Mercurial > emacs
comparison src/xterm.c @ 90068:eac554634bfa
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-79
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-735
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-747
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 25 Dec 2004 02:00:25 +0000 |
parents | fb79180b618d 0395e55b4aa7 |
children | 95879cc1ed20 |
comparison
equal
deleted
inserted
replaced
90067:b481c5870e10 | 90068:eac554634bfa |
---|---|
4287 int diff; | 4287 int diff; |
4288 | 4288 |
4289 int part = -1, whole = 0, portion = 0; | 4289 int part = -1, whole = 0, portion = 0; |
4290 GtkAdjustment *adj = GTK_ADJUSTMENT (gtk_range_get_adjustment (widget)); | 4290 GtkAdjustment *adj = GTK_ADJUSTMENT (gtk_range_get_adjustment (widget)); |
4291 | 4291 |
4292 if (xg_ignore_gtk_scrollbar) return; | |
4293 | |
4294 position = gtk_adjustment_get_value (adj); | 4292 position = gtk_adjustment_get_value (adj); |
4295 | 4293 |
4296 p = g_object_get_data (G_OBJECT (widget), XG_LAST_SB_DATA); | 4294 p = g_object_get_data (G_OBJECT (widget), XG_LAST_SB_DATA); |
4297 if (! p) | 4295 if (! p) |
4298 { | 4296 { |
4301 g_object_set_data (G_OBJECT (widget), XG_LAST_SB_DATA, p); | 4299 g_object_set_data (G_OBJECT (widget), XG_LAST_SB_DATA, p); |
4302 } | 4300 } |
4303 | 4301 |
4304 previous = *p; | 4302 previous = *p; |
4305 *p = position; | 4303 *p = position; |
4304 | |
4305 if (xg_ignore_gtk_scrollbar) return; | |
4306 | 4306 |
4307 diff = (int) (position - previous); | 4307 diff = (int) (position - previous); |
4308 | 4308 |
4309 if (diff == (int) adj->step_increment) | 4309 if (diff == (int) adj->step_increment) |
4310 { | 4310 { |
4333 portion = min ((int)position, whole); | 4333 portion = min ((int)position, whole); |
4334 bar->dragging = make_number ((int)portion); | 4334 bar->dragging = make_number ((int)portion); |
4335 } | 4335 } |
4336 | 4336 |
4337 if (part >= 0) | 4337 if (part >= 0) |
4338 { | 4338 { |
4339 window_being_scrolled = bar->window; | 4339 window_being_scrolled = bar->window; |
4340 last_scroll_bar_part = part; | 4340 last_scroll_bar_part = part; |
4341 x_send_scroll_bar_event (bar->window, part, portion, whole); | 4341 x_send_scroll_bar_event (bar->window, part, portion, whole); |
4342 } | 4342 } |
4343 } | 4343 } |