Mercurial > hg > xemacs-beta
view src/scrollbar-gtk.c @ 853:2b6fa2618f76
[xemacs-hg @ 2002-05-28 08:44:22 by ben]
merge my stderr-proc ws
make-docfile.c: Fix places where we forget to check for EOF.
code-init.el: Don't use CRLF conversion by default on process output. CMD.EXE and
friends work both ways but Cygwin programs don't like the CRs.
code-process.el, multicast.el, process.el: Removed.
Improvements to call-process-internal:
-- allows a buffer to be specified for input and stderr output
-- use it on all systems
-- implement C-g as documented
-- clean up and comment
call-process-region uses new call-process facilities; no temp file.
remove duplicate funs in process.el.
comment exactly how coding systems work and fix various problems.
open-multicast-group now does similar coding-system frobbing to
open-network-stream.
dumped-lisp.el, faces.el, msw-faces.el: Fix some hidden errors due to code not being defined at the right time.
xemacs.mak: Add -DSTRICT.
================================================================
ALLOW SEPARATION OF STDOUT AND STDERR IN PROCESSES
================================================================
Standard output and standard error can be processed separately in
a process. Each can have its own buffer, its own mark in that buffer,
and its filter function. You can specify a separate buffer for stderr
in `start-process' to get things started, or use the new primitives:
set-process-stderr-buffer
process-stderr-buffer
process-stderr-mark
set-process-stderr-filter
process-stderr-filter
Also, process-send-region takes a 4th optional arg, a buffer.
Currently always uses a pipe() under Unix to read the error output.
(#### Would a PTY be better?)
sysdep.h, sysproc.h, unexfreebsd.c, unexsunos4.c, nt.c, emacs.c, callproc.c, symsinit.h, sysdep.c, Makefile.in.in, process-unix.c: Delete callproc.c. Move child_setup() to process-unix.c.
wait_for_termination() now only needed on a few really old systems.
console-msw.h, event-Xt.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.h, process-nt.c, process-unix.c, process.c, process.h, procimpl.h: Rewrite the process methods to handle a separate channel for
error input. Create Lstreams for reading in the error channel.
Many process methods need change. In general the changes are
fairly clear as they involve duplicating what's used for reading
the normal stdout and changing for stderr -- although tedious,
as such changes are required throughout the entire process code.
Rewrote the code that reads process output to do two loops, one
for stdout and one for stderr.
gpmevent.c, tooltalk.c: set_process_filter takes an argument for stderr.
================================================================
NEW ERROR-TRAPPING MECHANISM
================================================================
Totally rewrite error trapping code to be unified and support more
features. Basic function is call_trapping_problems(), which lets
you specify, by means of flags, what sorts of problems you want
trapped. these can include
-- quit
-- errors
-- throws past the function
-- creation of "display objects" (e.g. buffers)
-- deletion of already-existing "display objects" (e.g. buffers)
-- modification of already-existing buffers
-- entering the debugger
-- gc
-- errors->warnings (ala suspended errors)
etc. All other error funs rewritten in terms of this one.
Various older mechanisms removed or rewritten.
window.c, insdel.c, console.c, buffer.c, device.c, frame.c: When creating a display object, added call to
note_object_created(), for use with trapping_problems mechanism.
When deleting, call check_allowed_operation() and note_object
deleted().
The trapping-problems code records the objects created since the
call-trapping-problems began. Those objects can be deleted, but
none others (i.e. previously existing ones).
bytecode.c, cmdloop.c: internal_catch takes another arg.
eval.c: Add long comments describing the "five lists" used to maintain
state (backtrace, gcpro, specbind, etc.) in the Lisp engine.
backtrace.h, eval.c: Implement trapping-problems mechanism, eliminate old mechanisms or
redo in terms of new one.
frame.c, gutter.c: Flush out the concept of "critical display section", defined by
the in_display() var. Use an internal_bind() to get it reset,
rather than just doing it at end, because there may be a non-local
exit.
event-msw.c, event-stream.c, console-msw.h, device.c, dialog-msw.c, frame.c, frame.h, intl.c, toolbar.c, menubar-msw.c, redisplay.c, alloc.c, menubar-x.c: Make use of new trapping-errors stuff and rewrite code based on
old mechanisms.
glyphs-widget.c, redisplay.h: Protect calling Lisp in redisplay.
insdel.c: Protect hooks against deleting existing buffers.
frame-msw.c: Use EQ, not EQUAL in hash tables whose keys are just numbers.
Otherwise we run into stickiness in redisplay because
internal_equal() can QUIT.
================================================================
SIGNAL, C-G CHANGES
================================================================
Here we change the way that C-g interacts with event reading. The
idea is that a C-g occurring while we're reading a user event
should be read as C-g, but elsewhere should be a QUIT. The former
code did all sorts of bizarreness -- requiring that no QUIT occurs
anywhere in event-reading code (impossible to enforce given the
stuff called or Lisp code invoked), and having some weird system
involving enqueue/dequeue of a C-g and interaction with Vquit_flag
-- and it didn't work.
Now, we simply enclose all code where we want C-g read as an event
with {begin/end}_dont_check_for_quit(). This completely turns off
the mechanism that checks (and may remove or alter) C-g in the
read-ahead queues, so we just get the C-g normal.
Signal.c documents this very carefully.
cmdloop.c: Correct use of dont_check_for_quit to new scheme, remove old
out-of-date comments.
event-stream.c: Fix C-g handling to actually work.
device-x.c: Disable quit checking when err out.
signal.c: Cleanup. Add large descriptive comment.
process-unix.c, process-nt.c, sysdep.c: Use QUIT instead of REALLY_QUIT.
It's not necessary to use REALLY_QUIT and just confuses the issue.
lisp.h: Comment quit handlers.
================================================================
CONS CHANGES
================================================================
free_cons() now takes a Lisp_Object not the result of XCONS().
car and cdr have been renamed so that they don't get used directly;
go through XCAR(), XCDR() instead.
alloc.c, dired.c, editfns.c, emodules.c, fns.c, glyphs-msw.c, glyphs-x.c, glyphs.c, keymap.c, minibuf.c, search.c, eval.c, lread.c, lisp.h: Correct free_cons calling convention: now takes Lisp_Object,
not Lisp_Cons
chartab.c: Eliminate direct use of ->car, ->cdr, should be black box.
callint.c: Rewrote using EXTERNAL_LIST_LOOP to avoid use of Lisp_Cons.
================================================================
USE INTERNAL-BIND-*
================================================================
eval.c: Cleanups of these funs.
alloc.c, fileio.c, undo.c, specifier.c, text.c, profile.c, lread.c, redisplay.c, menubar-x.c, macros.c: Rewrote to use internal_bind_int() and internal_bind_lisp_object()
in place of whatever varied and cumbersome mechanisms were
formerly there.
================================================================
SPECBIND SANITY
================================================================
backtrace.h: - Improved comments
backtrace.h, bytecode.c, eval.c: Add new mechanism check_specbind_stack_sanity() for sanity
checking code each time the catchlist or specbind stack change.
Removed older prototype of same mechanism.
================================================================
MISC
================================================================
lisp.h, insdel.c, window.c, device.c, console.c, buffer.c: Fleshed out authorship.
device-msw.c: Correct bad Unicode-ization.
print.c: Be more careful when not initialized or in fatal error handling.
search.c: Eliminate running_asynch_code, an FSF holdover.
alloc.c: Added comments about gc-cons-threshold.
dialog-x.c: Use begin_gc_forbidden() around code to build up a widget value
tree, like in menubar-x.c.
gui.c: Use Qunbound not Qnil as the default for
gethash.
lisp-disunion.h, lisp-union.h: Added warnings on use of VOID_TO_LISP().
lisp.h: Use ERROR_CHECK_STRUCTURES to turn on
ERROR_CHECK_TRAPPING_PROBLEMS and ERROR_CHECK_TYPECHECK
lisp.h: Add assert_with_message.
lisp.h: Add macros for gcproing entire arrays. (You could do this before
but it required manual twiddling the gcpro structure.)
lisp.h: Add prototypes for new functions defined elsewhere.
author | ben |
---|---|
date | Tue, 28 May 2002 08:45:36 +0000 |
parents | e38acbeb1cae |
children | 79c6ff3eef26 |
line wrap: on
line source
/* scrollbar implementation -- X interface. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 1994 Amdhal Corporation. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 1995 Darrell Kindred <dkindred+@cmu.edu>. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* Gtk version by William M. Perry */ #include <config.h> #include "lisp.h" #include "console-gtk.h" #include "glyphs-gtk.h" #include "gui-gtk.h" #include "scrollbar-gtk.h" #include "frame.h" #include "window.h" static gboolean scrollbar_cb (GtkAdjustment *adj, gpointer user_data); /* Used to prevent changing the size of the slider while drag scrolling, under Motif. This is necessary because the Motif scrollbar is incredibly stupid about updating the slider and causes lots of flicker if it is done too often. */ static int inhibit_slider_size_change; static int vertical_drag_in_progress; /* A device method. */ static int gtk_inhibit_scrollbar_slider_size_change (void) { return inhibit_slider_size_change; } /* A device method. */ static void gtk_free_scrollbar_instance (struct scrollbar_instance *instance) { if (SCROLLBAR_GTK_WIDGET (instance)) { gtk_widget_hide_all (SCROLLBAR_GTK_WIDGET (instance)); gtk_widget_destroy (SCROLLBAR_GTK_WIDGET (instance)); } if (instance->scrollbar_data) xfree (instance->scrollbar_data); } /* A device method. */ static void gtk_release_scrollbar_instance (struct scrollbar_instance *instance) { /* It won't hurt to hide it all the time, will it? */ gtk_widget_hide_all (SCROLLBAR_GTK_WIDGET (instance)); } static gboolean scrollbar_drag_hack_cb (GtkWidget *w, GdkEventButton *ev, gpointer v) { vertical_drag_in_progress = (int) v; inhibit_slider_size_change = (int) v; return (FALSE); } /* A device method. */ static void gtk_create_scrollbar_instance (struct frame *f, int vertical, struct scrollbar_instance *instance) { GtkAdjustment *adj = GTK_ADJUSTMENT (gtk_adjustment_new (0,0,0,0,0,0)); GtkScrollbar *sb = NULL; /* initialize the X specific data section. */ instance->scrollbar_data = xnew_and_zero (struct gtk_scrollbar_data); SCROLLBAR_GTK_ID (instance) = new_gui_id (); SCROLLBAR_GTK_VDRAG_ORIG_VALUE (instance) = -1; SCROLLBAR_GTK_LAST_VALUE (instance) = adj->value; gtk_object_set_data (GTK_OBJECT (adj), "xemacs::gui_id", (void *) SCROLLBAR_GTK_ID (instance)); gtk_object_set_data (GTK_OBJECT (adj), "xemacs::frame", f); sb = GTK_SCROLLBAR (vertical ? gtk_vscrollbar_new (adj) : gtk_hscrollbar_new (adj)); SCROLLBAR_GTK_WIDGET (instance) = GTK_WIDGET (sb); gtk_signal_connect (GTK_OBJECT (adj),"value-changed", GTK_SIGNAL_FUNC (scrollbar_cb), (gpointer) vertical); gtk_signal_connect (GTK_OBJECT (sb), "button-press-event", GTK_SIGNAL_FUNC (scrollbar_drag_hack_cb), (gpointer) 1); gtk_signal_connect (GTK_OBJECT (sb), "button-release-event", GTK_SIGNAL_FUNC (scrollbar_drag_hack_cb), (gpointer) 0); gtk_fixed_put (GTK_FIXED (FRAME_GTK_TEXT_WIDGET (f)), SCROLLBAR_GTK_WIDGET (instance), 0, 0); /* ** With gtk version > 1.2.8 the scrollbars in gtk-xemacs and xemacs ** from CVS are invisible. In fact they are not invisible but very ** thin (0 pixels wide). This is so, because the new gtk code does ** not call gtk_widget_request_size() on the newly created ** scrollbars anymore. this change was done to allow the theme ** engines to manipulate the scrollbar width. This patch calls ** gtk_widget_request_size with the newly created scollbars. Maybe ** it is better to postpone this call just before the ** gtk_widget_show() call is done on the scrolbar. */ gtk_widget_size_request(GTK_WIDGET(sb), &(GTK_WIDGET(sb)->requisition)); gtk_widget_hide (SCROLLBAR_GTK_WIDGET (instance)); } #define UPDATE_DATA_FIELD(field) \ if (new_##field >= 0 && \ SCROLLBAR_GTK_POS_DATA (inst).field != new_##field) { \ SCROLLBAR_GTK_POS_DATA (inst).field = new_##field; \ inst->scrollbar_instance_changed = 1; \ } /* A device method. */ /* #### The -1 check is such a hack. */ static void gtk_update_scrollbar_instance_values (struct window *w, struct scrollbar_instance *inst, int new_line_increment, int new_page_increment, int new_minimum, int new_maximum, int new_slider_size, int new_slider_position, int new_scrollbar_width, int new_scrollbar_height, int new_scrollbar_x, int new_scrollbar_y) { UPDATE_DATA_FIELD (line_increment); UPDATE_DATA_FIELD (page_increment); UPDATE_DATA_FIELD (minimum); UPDATE_DATA_FIELD (maximum); UPDATE_DATA_FIELD (slider_size); UPDATE_DATA_FIELD (slider_position); UPDATE_DATA_FIELD (scrollbar_width); UPDATE_DATA_FIELD (scrollbar_height); UPDATE_DATA_FIELD (scrollbar_x); UPDATE_DATA_FIELD (scrollbar_y); if (w && !vertical_drag_in_progress) { int new_vov = SCROLLBAR_GTK_POS_DATA (inst).slider_position; int new_vows = marker_position (w->start[CURRENT_DISP]); if (SCROLLBAR_GTK_VDRAG_ORIG_VALUE (inst) != new_vov) { SCROLLBAR_GTK_VDRAG_ORIG_VALUE (inst) = new_vov; inst->scrollbar_instance_changed = 1; } if (SCROLLBAR_GTK_VDRAG_ORIG_WINDOW_START (inst) != new_vows) { SCROLLBAR_GTK_VDRAG_ORIG_WINDOW_START (inst) = new_vows; inst->scrollbar_instance_changed = 1; } } } /* Used by gtk_update_scrollbar_instance_status. */ static void update_one_widget_scrollbar_pointer (struct window *w, GtkWidget *wid) { if (!wid->window) gtk_widget_realize (wid); if (POINTER_IMAGE_INSTANCEP (w->scrollbar_pointer)) { gdk_window_set_cursor (GET_GTK_WIDGET_WINDOW (wid), XIMAGE_INSTANCE_GTK_CURSOR (w->scrollbar_pointer)); gdk_flush (); } } /* A device method. */ static void gtk_update_scrollbar_instance_status (struct window *w, int active, int size, struct scrollbar_instance *instance) { struct frame *f = XFRAME (w->frame); GtkWidget *wid = SCROLLBAR_GTK_WIDGET (instance); gboolean managed = GTK_WIDGET_MAPPED (wid); if (active && size) { if (instance->scrollbar_instance_changed) { /* Need to set the height, width, and position of the widget */ GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (wid)); scrollbar_values *pos_data = & SCROLLBAR_GTK_POS_DATA (instance); int modified_p = 0; /* We do not want to update the size all the time if we can help it. This cuts down on annoying flicker. */ if ((wid->allocation.width != pos_data->scrollbar_width) || (wid->allocation.height != pos_data->scrollbar_height)) { gtk_widget_set_usize (wid, pos_data->scrollbar_width, pos_data->scrollbar_height); modified_p = 1; } /* Ditto for the x/y position. */ if ((wid->allocation.x != pos_data->scrollbar_x) || (wid->allocation.y != pos_data->scrollbar_y)) { gtk_fixed_move (GTK_FIXED (FRAME_GTK_TEXT_WIDGET (f)), wid, pos_data->scrollbar_x, pos_data->scrollbar_y); modified_p = 1; } adj->lower = pos_data->minimum; adj->upper = pos_data->maximum; adj->page_increment = pos_data->slider_size + 1; adj->step_increment = w->max_line_len - 1; adj->page_size = pos_data->slider_size + 1; adj->value = pos_data->slider_position; /* But, if we didn't resize or move the scrollbar, the widget will not get redrawn correctly when the user scrolls around in the XEmacs frame manually. So we update the slider manually here. */ if (!modified_p) gtk_range_slider_update (GTK_RANGE (wid)); instance->scrollbar_instance_changed = 0; } if (!managed) { gtk_widget_show (wid); update_one_widget_scrollbar_pointer (w, wid); } } else if (managed) { gtk_widget_hide (wid); } } enum gtk_scrollbar_loop { GTK_FIND_SCROLLBAR_WINDOW_MIRROR, GTK_SET_SCROLLBAR_POINTER, GTK_WINDOW_IS_SCROLLBAR, GTK_UPDATE_FRAME_SCROLLBARS }; static struct window_mirror * gtk_scrollbar_loop (enum gtk_scrollbar_loop type, Lisp_Object window, struct window_mirror *mir, GUI_ID id, GdkWindow *x_win) { struct window_mirror *retval = NULL; while (mir) { struct scrollbar_instance *vinstance = mir->scrollbar_vertical_instance; struct scrollbar_instance *hinstance = mir->scrollbar_horizontal_instance; struct window *w = XWINDOW (window); if (mir->vchild) retval = gtk_scrollbar_loop (type, w->vchild, mir->vchild, id, x_win); else if (mir->hchild) retval = gtk_scrollbar_loop (type, w->hchild, mir->hchild, id, x_win); if (retval) return retval; if (hinstance || vinstance) { switch (type) { case GTK_FIND_SCROLLBAR_WINDOW_MIRROR: if ((vinstance && SCROLLBAR_GTK_ID (vinstance) == id) || (hinstance && SCROLLBAR_GTK_ID (hinstance) == id)) return mir; break; case GTK_UPDATE_FRAME_SCROLLBARS: if (!mir->vchild && !mir->hchild) update_window_scrollbars (w, mir, 1, 0); break; case GTK_SET_SCROLLBAR_POINTER: if (!mir->vchild && !mir->hchild) { GtkWidget *widget; widget = SCROLLBAR_GTK_WIDGET (hinstance); if (widget && GTK_WIDGET_MAPPED (widget)) update_one_widget_scrollbar_pointer (w, widget); widget = SCROLLBAR_GTK_WIDGET (vinstance); if (widget && GTK_WIDGET_MAPPED (widget)) update_one_widget_scrollbar_pointer (w, widget); } break; case GTK_WINDOW_IS_SCROLLBAR: if (!mir->vchild && !mir->hchild) { GtkWidget *widget; widget = SCROLLBAR_GTK_WIDGET (hinstance); if (widget && GTK_WIDGET_MAPPED (widget) && GET_GTK_WIDGET_WINDOW (widget) == x_win) return (struct window_mirror *) 1; widget = SCROLLBAR_GTK_WIDGET (vinstance); if (widget && GTK_WIDGET_MAPPED (widget) && GET_GTK_WIDGET_WINDOW (widget) == x_win) return (struct window_mirror *) 1; } break; default: abort (); } } mir = mir->next; window = w->next; } return NULL; } /* Used by callbacks. */ static struct window_mirror * find_scrollbar_window_mirror (struct frame *f, GUI_ID id) { if (f->mirror_dirty) update_frame_window_mirror (f); return gtk_scrollbar_loop (GTK_FIND_SCROLLBAR_WINDOW_MIRROR, f->root_window, XWINDOW_MIRROR (f->root_mirror), id, (GdkWindow *) NULL); } static gboolean scrollbar_cb (GtkAdjustment *adj, gpointer user_data) { /* This function can GC */ int vertical = (int) user_data; struct frame *f = gtk_object_get_data (GTK_OBJECT (adj), "xemacs::frame"); struct scrollbar_instance *instance; GUI_ID id = (GUI_ID) gtk_object_get_data (GTK_OBJECT (adj), "xemacs::gui_id"); Lisp_Object win, frame; struct window_mirror *mirror; Lisp_Object event_type = Qnil; Lisp_Object event_data = Qnil; if (!f) return(FALSE); mirror = find_scrollbar_window_mirror (f, id); if (!mirror) return(FALSE); win = real_window (mirror, 1); if (NILP (win)) return(FALSE); instance = vertical ? mirror->scrollbar_vertical_instance : mirror->scrollbar_horizontal_instance; frame = WINDOW_FRAME (XWINDOW (win)); inhibit_slider_size_change = 0; switch (GTK_RANGE (SCROLLBAR_GTK_WIDGET (instance))->scroll_type) { case GTK_SCROLL_PAGE_BACKWARD: event_type = vertical ? Qscrollbar_page_up : Qscrollbar_page_left; event_data = Fcons (win, Qnil); break; case GTK_SCROLL_PAGE_FORWARD: event_type = vertical ? Qscrollbar_page_down : Qscrollbar_page_right; event_data = Fcons (win, Qnil); break; case GTK_SCROLL_STEP_FORWARD: event_type = vertical ? Qscrollbar_line_down : Qscrollbar_char_right; event_data = win; break; case GTK_SCROLL_STEP_BACKWARD: event_type = vertical ? Qscrollbar_line_up : Qscrollbar_char_left; event_data = win; break; case GTK_SCROLL_NONE: case GTK_SCROLL_JUMP: inhibit_slider_size_change = 1; event_type = vertical ? Qscrollbar_vertical_drag : Qscrollbar_horizontal_drag; event_data = Fcons (win, make_int ((int)adj->value)); break; default: abort(); } signal_special_gtk_user_event (frame, event_type, event_data); return (TRUE); } static void gtk_scrollbar_pointer_changed_in_window (struct window *w) { Lisp_Object window = wrap_window (w); gtk_scrollbar_loop (GTK_SET_SCROLLBAR_POINTER, window, find_window_mirror (w), 0, (GdkWindow *) NULL); } /* #### BILL!!! This comment is not true for Gtk - should it be? */ /* Make sure that all scrollbars on frame are up-to-date. Called directly from gtk_set_frame_properties in frame-gtk.c*/ void gtk_update_frame_scrollbars (struct frame *f) { /* Consider this code to be "in_display" so that we abort() if Fsignal() gets called. */ in_display++; gtk_scrollbar_loop (GTK_UPDATE_FRAME_SCROLLBARS, f->root_window, XWINDOW_MIRROR (f->root_mirror), 0, (GdkWindow *) NULL); in_display--; if (in_display < 0) abort (); } #ifdef MEMORY_USAGE_STATS static int gtk_compute_scrollbar_instance_usage (struct device *d, struct scrollbar_instance *inst, struct overhead_stats *ovstats) { int total = 0; while (inst) { struct gtk_scrollbar_data *data = (struct gtk_scrollbar_data *) inst->scrollbar_data; total += malloced_storage_size (data, sizeof (*data), ovstats); inst = inst->next; } return total; } #endif /* MEMORY_USAGE_STATS */ /************************************************************************/ /* initialization */ /************************************************************************/ void console_type_create_scrollbar_gtk (void) { CONSOLE_HAS_METHOD (gtk, inhibit_scrollbar_slider_size_change); CONSOLE_HAS_METHOD (gtk, free_scrollbar_instance); CONSOLE_HAS_METHOD (gtk, release_scrollbar_instance); CONSOLE_HAS_METHOD (gtk, create_scrollbar_instance); CONSOLE_HAS_METHOD (gtk, update_scrollbar_instance_values); CONSOLE_HAS_METHOD (gtk, update_scrollbar_instance_status); CONSOLE_HAS_METHOD (gtk, scrollbar_pointer_changed_in_window); #ifdef MEMORY_USAGE_STATS CONSOLE_HAS_METHOD (gtk, compute_scrollbar_instance_usage); #endif /* MEMORY_USAGE_STATS */ } void vars_of_scrollbar_gtk (void) { Fprovide (intern ("gtk-scrollbars")); }