comparison src/scrollbar-gtk.c @ 617:af57a77cbc92

[xemacs-hg @ 2001-06-18 07:09:50 by ben] --------------------------------------------------------------- DOCUMENTATION FIXES: --------------------------------------------------------------- eval.c: Correct documentation. elhash.c: Doc correction. --------------------------------------------------------------- LISP OBJECT CLEANUP: --------------------------------------------------------------- bytecode.h, buffer.h, casetab.h, chartab.h, console-msw.h, console.h, database.c, device.h, eldap.h, elhash.h, events.h, extents.h, faces.h, file-coding.h, frame.h, glyphs.h, gui-x.h, gui.h, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lrecord.h, lstream.h, mule-charset.h, objects.h, opaque.h, postgresql.h, process.h, rangetab.h, specifier.h, toolbar.h, tooltalk.h, ui-gtk.h: Add wrap_* to all objects (it was already there for a few of them) -- an expression to encapsulate a pointer into a Lisp object, rather than the inconvenient XSET*. "wrap" was chosen because "make" as in make_int(), make_char() is not appropriate. (It implies allocation. The issue does not exist for ints and chars because they are not allocated.) Full error checking has been added to these expressions. When used without error checking, non-union build, use of these expressions will incur no loss of efficiency. (In fact, XSET* is now defined in terms of wrap_* in a non-union build.) In a union build, you will also get no loss of efficiency provided that you have a decent optimizing compiler, and a compiler that either understands inlines or automatically inlines those particular functions. (And since people don't normally do their production builds on union, it doesn't matter.) Update the sample Lisp object definition in lrecord.h accordingly. dumper.c: Fix places in dumper that referenced wrap_object to reference its new name, wrap_pointer_1. buffer.c, bufslots.h, conslots.h, console.c, console.h, devslots.h, device.c, device.h, frame.c, frame.h, frameslots.h, window.c, window.h, winslots.h: -- Extract out the Lisp objects of `struct device' into devslots.h, just like for the other structures. -- Extract out the remaining (not copied into the window config) Lisp objects in `struct window' into winslots.h; use different macros (WINDOW_SLOT vs. WINDOW_SAVED_SLOT) to differentiate them. -- Eliminate the `dead' flag of `struct frame', since it duplicates information already available in `framemeths', and fix FRAME_LIVE_P accordingly. (Devices and consoles already work this way.) -- In *slots.h, switch to system where MARKED_SLOT is automatically undef'd at the end of the file. (Follows what winslots.h already does.) -- Update the comments at the beginning of *slots.h to be accurate. -- When making any of the above objects dead, zero it out entirely and reset all Lisp object slots to Qnil. (We were already doing this somewhat, but not consistently.) This (1) Eliminates the possibility of extra objects hanging around that ought to be GC'd, (2) Causes an immediate crash if anyone tries to access a structure in one of these objects, (3) Ensures consistent behavior wrt dead objects. dialog-msw.c: Use internal_object_printer, since this object should not escape. --------------------------------------------------------------- FIXING A CRASH THAT I HIT ONCE (AND A RELATED BAD BEHAVIOR): --------------------------------------------------------------- eval.c: Fix up some comments about the FSF implementation. Fix two nasty bugs: (1) condition_case_unwind frees the conses sitting in the catch->tag slot too quickly, resulting in a crash that I hit. (2) catches need to be unwound one at a time when calling unwind-protect code, rather than all at once at the end; otherwise, incorrect behavior can result. (A comment shows exactly how.) backtrace.h: Improve comment about FSF differences in the handler stack. --------------------------------------------------------------- FIXING A CRASH THAT I REPEATEDLY HIT WHEN USING THE MOUSE WHEEL UNDER MSWINDOWS: --------------------------------------------------------------- Basic idea: My crash is due either to a dead, non-marked, GC-collected frame inside of a window mirror, or a prematurely freed window mirror. We need to mark the Lisp objects inside of window mirrors. Tracking the lifespan of window mirrors and scrollbar instances is extremely hard, and there may well be lurking bugs where such objects are freed too soon. The only safe way to fix these problems (and it fixes both problems at once) is to make both of these structures Lisp objects. lrecord.h, emacs.c, inline.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, symsinit.h: Make scrollbar instances actual Lisp objects. Mark the window mirrors in them. inline.c needs to know about scrollbar.h now. Record the new type in lrecord.h. Fix up scrollbar-*.c appropriately. Create a hash table in scrollbar-msw.c so that the scrollbar instances stored in scrollbar HWND's are properly GC-protected. Create complex_vars_of_scrollbar_mswindows() to create the hash table at startup, and call it from emacs.c. Don't store the scrollbar instance as a property of the GTK scrollbar, as it's not used and if we did this, we'd have to separately GC-protect it in a hash table, like in MS Windows. lrecord.h, frame.h, frame.c, frameslots.h, redisplay.c, window.c, window.h: Move mark_window_mirror from redisplay.c to window.c. Make window mirrors actual Lisp objects. Tell lrecord.h about them. Change the window mirror member of struct frame from a pointer to a Lisp object, and add XWINDOW_MIRROR in appropriate places. Mark the scrollbar instances in the window mirror. redisplay.c, redisplay.h, alloc.c: Delete mark_redisplay. Don't call mark_redisplay. We now mark frame-specific structures in mark_frame. NOTE: I also deleted an extremely questionable call to update_frame_window_mirrors(). It was extremely questionable before, and now totally impossible, since it will create Lisp objects during redisplay. frame.c: Mark the scrollbar instances, which are now Lisp objects. Call mark_gutter() here, not in mark_redisplay(). gutter.c: Update comments about correct marking. --------------------------------------------------------------- ISSUES BROUGHT UP BY MARTIN: --------------------------------------------------------------- buffer.h: Put back these macros the way Steve T and I think they ought to be. I already explained in a previous changelog entry why I think these macros should be the way I'd defined them. Once again: We fix these macros so they don't care about the type of their lvalues. The non-C-string equivalents of these already function in the same way, and it's correct because it should be OK to pass in a CBufbyte *, a BufByte *, a Char_Binary *, an UChar_Binary *, etc. The whole reason for these different types is to work around errors caused by signed-vs-unsigned non-matching types. Any possible error that might be caught in a DFC macro would also be caught wherever the argument is used elsewhere. So creating multiple macro versions would add no useful error-checking and just further complicate an already complicated area. As for Martin's "ANSI aliasing" bug, XEmacs is not ANSI-aliasing clean and probably never will be. Unless the board agrees to change XEmacs in this way (and we really don't want to go down that road), this is not a bug. sound.h: Undo Martin's type change. signal.c: Fix problem identified by Martin with Linux and g++ due to non-standard declaration of setitimer(). systime.h: Update the docs for "qxe_" to point out why making the encapsulation explicit is always the right way to go. (setitimer() itself serves as an example.) For 21.4: update-elc-2.el: Correct misplaced parentheses, making lisp/mule not get recompiled.
author ben
date Mon, 18 Jun 2001 07:10:32 +0000
parents 4d7fdf497470
children e38acbeb1cae
comparison
equal deleted inserted replaced
616:4f1c7a4ac1e6 617:af57a77cbc92
98 SCROLLBAR_GTK_VDRAG_ORIG_VALUE (instance) = -1; 98 SCROLLBAR_GTK_VDRAG_ORIG_VALUE (instance) = -1;
99 SCROLLBAR_GTK_LAST_VALUE (instance) = adj->value; 99 SCROLLBAR_GTK_LAST_VALUE (instance) = adj->value;
100 100
101 gtk_object_set_data (GTK_OBJECT (adj), "xemacs::gui_id", (void *) SCROLLBAR_GTK_ID (instance)); 101 gtk_object_set_data (GTK_OBJECT (adj), "xemacs::gui_id", (void *) SCROLLBAR_GTK_ID (instance));
102 gtk_object_set_data (GTK_OBJECT (adj), "xemacs::frame", f); 102 gtk_object_set_data (GTK_OBJECT (adj), "xemacs::frame", f);
103 gtk_object_set_data (GTK_OBJECT (adj), "xemacs::sb_instance", instance);
104 103
105 sb = GTK_SCROLLBAR (vertical ? gtk_vscrollbar_new (adj) : gtk_hscrollbar_new (adj)); 104 sb = GTK_SCROLLBAR (vertical ? gtk_vscrollbar_new (adj) : gtk_hscrollbar_new (adj));
106 SCROLLBAR_GTK_WIDGET (instance) = GTK_WIDGET (sb); 105 SCROLLBAR_GTK_WIDGET (instance) = GTK_WIDGET (sb);
107 106
108 gtk_signal_connect (GTK_OBJECT (adj),"value-changed", 107 gtk_signal_connect (GTK_OBJECT (adj),"value-changed",
355 find_scrollbar_window_mirror (struct frame *f, GUI_ID id) 354 find_scrollbar_window_mirror (struct frame *f, GUI_ID id)
356 { 355 {
357 if (f->mirror_dirty) 356 if (f->mirror_dirty)
358 update_frame_window_mirror (f); 357 update_frame_window_mirror (f);
359 return gtk_scrollbar_loop (GTK_FIND_SCROLLBAR_WINDOW_MIRROR, f->root_window, 358 return gtk_scrollbar_loop (GTK_FIND_SCROLLBAR_WINDOW_MIRROR, f->root_window,
360 f->root_mirror, id, (GdkWindow *) NULL); 359 XWINDOW_MIRROR (f->root_mirror), id,
360 (GdkWindow *) NULL);
361 } 361 }
362 362
363 static gboolean 363 static gboolean
364 scrollbar_cb (GtkAdjustment *adj, gpointer user_data) 364 scrollbar_cb (GtkAdjustment *adj, gpointer user_data)
365 { 365 {
366 /* This function can GC */ 366 /* This function can GC */
367 int vertical = (int) user_data; 367 int vertical = (int) user_data;
368 struct frame *f = gtk_object_get_data (GTK_OBJECT (adj), "xemacs::frame"); 368 struct frame *f = gtk_object_get_data (GTK_OBJECT (adj), "xemacs::frame");
369 struct scrollbar_instance *instance = gtk_object_get_data (GTK_OBJECT (adj), "xemacs::sb_instance"); 369 struct scrollbar_instance *instance;
370 GUI_ID id = (GUI_ID) gtk_object_get_data (GTK_OBJECT (adj), "xemacs::gui_id"); 370 GUI_ID id = (GUI_ID) gtk_object_get_data (GTK_OBJECT (adj), "xemacs::gui_id");
371 Lisp_Object win, frame; 371 Lisp_Object win, frame;
372 struct window_mirror *mirror; 372 struct window_mirror *mirror;
373 Lisp_Object event_type = Qnil; 373 Lisp_Object event_type = Qnil;
374 Lisp_Object event_data = Qnil; 374 Lisp_Object event_data = Qnil;
425 gtk_scrollbar_pointer_changed_in_window (struct window *w) 425 gtk_scrollbar_pointer_changed_in_window (struct window *w)
426 { 426 {
427 Lisp_Object window; 427 Lisp_Object window;
428 428
429 XSETWINDOW (window, w); 429 XSETWINDOW (window, w);
430 gtk_scrollbar_loop (GTK_SET_SCROLLBAR_POINTER, window, find_window_mirror (w), 430 gtk_scrollbar_loop (GTK_SET_SCROLLBAR_POINTER, window,
431 0, (GdkWindow *) NULL); 431 find_window_mirror (w), 0, (GdkWindow *) NULL);
432 } 432 }
433 433
434 /* #### BILL!!! This comment is not true for Gtk - should it be? */ 434 /* #### BILL!!! This comment is not true for Gtk - should it be? */
435 /* Make sure that all scrollbars on frame are up-to-date. Called 435 /* Make sure that all scrollbars on frame are up-to-date. Called
436 directly from gtk_set_frame_properties in frame-gtk.c*/ 436 directly from gtk_set_frame_properties in frame-gtk.c*/
438 gtk_update_frame_scrollbars (struct frame *f) 438 gtk_update_frame_scrollbars (struct frame *f)
439 { 439 {
440 /* Consider this code to be "in_display" so that we abort() if Fsignal() 440 /* Consider this code to be "in_display" so that we abort() if Fsignal()
441 gets called. */ 441 gets called. */
442 in_display++; 442 in_display++;
443 gtk_scrollbar_loop (GTK_UPDATE_FRAME_SCROLLBARS, f->root_window, f->root_mirror, 443 gtk_scrollbar_loop (GTK_UPDATE_FRAME_SCROLLBARS, f->root_window,
444 XWINDOW_MIRROR (f->root_mirror),
444 0, (GdkWindow *) NULL); 445 0, (GdkWindow *) NULL);
445 in_display--; 446 in_display--;
446 if (in_display < 0) abort (); 447 if (in_display < 0) abort ();
447 } 448 }
448 449