comparison src/redisplay-x.c @ 793:e38acbeb1cae

[xemacs-hg @ 2002-03-29 04:46:17 by ben] lots o' fixes etc/ChangeLog: New file. Separated out all entries for etc/ into their own ChangeLog. Includes entries for the following files: etc/BABYL, etc/BETA, etc/CHARSETS, etc/DISTRIB, etc/Emacs.ad, etc/FTP, etc/GNUS-NEWS, etc/GOATS, etc/HELLO, etc/INSTALL, etc/MACHINES, etc/MAILINGLISTS, etc/MSDOS, etc/MYTHOLOGY, etc/NEWS, etc/OXYMORONS, etc/PACKAGES, etc/README, etc/TUTORIAL, etc/TUTORIAL.de, etc/TUTORIAL.ja, etc/TUTORIAL.ko, etc/TUTORIAL.se, etc/aliases.ksh, etc/altrasoft-logo.xpm, etc/check_cygwin_setup.sh, etc/custom/example-themes/europe-theme.el, etc/custom/example-themes/ex-custom-file, etc/custom/example-themes/example-theme.el, etc/e/eterm.ti, etc/edt-user.doc, etc/enriched.doc, etc/etags.1, etc/gnuserv.1, etc/gnuserv.README, etc/package-index.LATEST.gpg, etc/package-index.LATEST.pgp, etc/photos/jan.png, etc/recycle.xpm, etc/refcard.tex, etc/sample.Xdefaults, etc/sample.emacs, etc/sgml/CATALOG, etc/sgml/HTML32.dtd, etc/skk/SKK.tut.E, etc/smilies/Face_ase.xbm, etc/smilies/Face_ase2.xbm, etc/smilies/Face_ase3.xbm, etc/smilies/Face_smile.xbm, etc/smilies/Face_weep.xbm, etc/sounds, etc/toolbar, etc/toolbar/workshop-cap-up.xpm, etc/xemacs-ja.1, etc/xemacs.1, etc/yow.lines, etc\BETA, etc\NEWS, etc\README, etc\TUTORIAL, etc\TUTORIAL.de, etc\check_cygwin_setup.sh, etc\sample.init.el, etc\unicode\README, etc\unicode\mule-ucs\*, etc\unicode\other\* unicode/unicode-consortium/8859-16.TXT: New file. mule/english.el: Define this charset now, since a bug was fixed that formerly prevented it. mule/ethio-util.el: Fix compile errors involving Unicode `characters', which should be integers. Makefile.in.in: Always include gui.c, to fix compile error when TTY-only. EmacsFrame.c, abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, bytecode.h, callint.c, callproc.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.c, console-msw.h, console-tty.c, console-x.c, console-x.h, console.c, console.h, data.c, database.c, device-gtk.c, device-msw.c, device-x.c, device.c, device.h, dialog-msw.c, doc.c, doprnt.c, dumper.c, dynarr.c, editfns.c, eldap.c, eldap.h, elhash.c, elhash.h, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, events.h, extents.c, extents.h, faces.c, faces.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, free-hook.c, general-slots.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gtk-xemacs.c, gui-msw.c, gui-x.c, gui-x.h, gui.c, gui.h, gutter.c, gutter.h, indent.c, input-method-xlib.c, insdel.c, keymap.c, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-canna.c, mule-ccl.c, mule-charset.c, mule-wnnfns.c, native-gtk-toolbar.c, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, opaque.c, opaque.h, postgresql.c, postgresql.h, print.c, process-unix.c, process.c, process.h, rangetab.c, rangetab.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, search.c, select-gtk.c, select-x.c, sound.c, specifier.c, specifier.h, strftime.c, symbols.c, symeval.h, syntax.h, text.c, text.h, toolbar-common.c, toolbar-msw.c, toolbar.c, toolbar.h, tooltalk.c, tooltalk.h, ui-gtk.c, ui-gtk.h, undo.c, vm-limit.c, window.c, window.h: Eliminate XSETFOO. Replace all usages with wrap_foo(). Make symbol->name a Lisp_Object, not Lisp_String *. Eliminate nearly all uses of Lisp_String * in favor of Lisp_Object, and correct macros so most of them favor Lisp_Object. Create new error-behavior ERROR_ME_DEBUG_WARN -- output warnings, but at level `debug' (usually ignored). Use it when instantiating specifiers, so problems can be debugged. Move log-warning-minimum-level into C so that we can optimize ERROR_ME_DEBUG_WARN. Fix warning levels consistent with new definitions. Add default_ and parent fields to char table; not yet implemented. New fun Dynarr_verify(); use for further error checking on Dynarrs. Rearrange code at top of lisp.h in conjunction with dynarr changes. Fix eifree(). Use Eistrings in various places (format_event_object(), where_is_to_char(), and callers thereof) to avoid fixed-size strings buffers. New fun write_eistring(). Reindent and fix GPM code to follow standards. Set default MS Windows font to Lucida Console (same size as Courier New but less interline spacing, so more lines fit). Increase default frame size on Windows to 50 lines. (If that's too big for the workspace, the frame will be shrunk as necessary.) Fix problem with text files with no newlines (). (Change `convert-eol' coding system to use `nil' for autodetect, consistent with make-coding-system.) Correct compile warnings in vm-limit.c. Fix handling of reverse-direction charsets to avoid errors when opening (e.g.) mule-ucs/lisp/reldata/uiso8859-6.el. Recode some object printing methods to use write_fmt_string() instead of a fixed buffer and sprintf. Turn on display of png comments as warnings (level `info'), now that they're unobtrusive. Revamped the sound documentation. Fixed bug in redisplay w.r.t. hscroll/truncation/continuation glyphs causing jumping up and down of the lines, since they're bigger than the line size. (It was seen most obviously when there's a horizontal scroll bar, e.g. do C-h a glyph or something like that.) The problem was that the glyph-contrib-p setting on glyphs was ignored even if it was set properly, which it wasn't until now.
author ben
date Fri, 29 Mar 2002 04:49:13 +0000
parents 6e99cc8c6ca5
children a5954632b187
comparison
equal deleted inserted replaced
792:4e83fdb13eb9 793:e38acbeb1cae
1 /* X output and frame manipulation routines. 1 /* X output and frame manipulation routines.
2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. 2 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois.
3 Copyright (C) 1994 Lucid, Inc. 3 Copyright (C) 1994 Lucid, Inc.
4 Copyright (C) 1995 Sun Microsystems, Inc. 4 Copyright (C) 1995 Sun Microsystems, Inc.
5 Copyright (C) 2002 Ben Wing.
5 6
6 This file is part of XEmacs. 7 This file is part of XEmacs.
7 8
8 XEmacs is free software; you can redistribute it and/or modify it 9 XEmacs is free software; you can redistribute it and/or modify it
9 under the terms of the GNU General Public License as published by the 10 under the terms of the GNU General Public License as published by the
329 face_index findex; 330 face_index findex;
330 int xpos, width = 0; 331 int xpos, width = 0;
331 Lisp_Object charset = Qunbound; /* Qnil is a valid charset when 332 Lisp_Object charset = Qunbound; /* Qnil is a valid charset when
332 MULE is not defined */ 333 MULE is not defined */
333 334
334 XSETWINDOW (window, w); 335 window = wrap_window (w);
335 rb = Dynarr_atp (rba, start); 336 rb = Dynarr_atp (rba, start);
336 337
337 if (!rb) 338 if (!rb)
338 /* Nothing to do so don't do anything. */ 339 /* Nothing to do so don't do anything. */
339 return; 340 return;
441 struct display_glyph_area dga; 442 struct display_glyph_area dga;
442 redisplay_calculate_display_boxes (dl, rb->xpos, rb->object.dglyph.xoffset, 443 redisplay_calculate_display_boxes (dl, rb->xpos, rb->object.dglyph.xoffset,
443 start_pixpos, rb->width, 444 start_pixpos, rb->width,
444 &dbox, &dga); 445 &dbox, &dga);
445 446
446 XSETWINDOW (window, w); 447 window = wrap_window (w);
447 instance = glyph_image_instance (rb->object.dglyph.glyph, 448 instance = glyph_image_instance (rb->object.dglyph.glyph,
448 window, ERROR_ME_NOT, 1); 449 window, ERROR_ME_DEBUG_WARN, 1);
449 findex = rb->findex; 450 findex = rb->findex;
450 451
451 if (IMAGE_INSTANCEP (instance)) 452 if (IMAGE_INSTANCEP (instance))
452 { 453 {
453 switch (XIMAGE_INSTANCE_TYPE (instance)) 454 switch (XIMAGE_INSTANCE_TYPE (instance))
794 struct textual_run *runs = alloca_array (struct textual_run, len); 795 struct textual_run *runs = alloca_array (struct textual_run, len);
795 int nruns; 796 int nruns;
796 int i; 797 int i;
797 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, findex); 798 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, findex);
798 799
799 XSETDEVICE (device, d); 800 device = wrap_device (d);
800 XSETWINDOW (window, w); 801 window = wrap_window (w);
801 802
802 if (width < 0) 803 if (width < 0)
803 width = x_text_width (f, cachel, Dynarr_atp (buf, 0), Dynarr_length (buf)); 804 width = x_text_width (f, cachel, Dynarr_atp (buf, 0), Dynarr_length (buf));
804 height = DISPLAY_LINE_HEIGHT (dl); 805 height = DISPLAY_LINE_HEIGHT (dl);
805 806
1859 int width = EOL_CURSOR_WIDTH; 1860 int width = EOL_CURSOR_WIDTH;
1860 int height = DISPLAY_LINE_HEIGHT (dl); 1861 int height = DISPLAY_LINE_HEIGHT (dl);
1861 int cursor_height, cursor_y; 1862 int cursor_height, cursor_y;
1862 int defheight, defascent; 1863 int defheight, defascent;
1863 1864
1864 XSETWINDOW (window, w); 1865 window = wrap_window (w);
1865 redisplay_clear_region (window, findex, x, y, width, height); 1866 redisplay_clear_region (window, findex, x, y, width, height);
1866 1867
1867 if (NILP (w->text_cursor_visible_p)) 1868 if (NILP (w->text_cursor_visible_p))
1868 return; 1869 return;
1869 1870
1954 2 * FRAME_REAL_TOP_TOOLBAR_BORDER_WIDTH (f) - 1955 2 * FRAME_REAL_TOP_TOOLBAR_BORDER_WIDTH (f) -
1955 2 * FRAME_REAL_BOTTOM_TOOLBAR_BORDER_WIDTH (f)) + 1; 1956 2 * FRAME_REAL_BOTTOM_TOOLBAR_BORDER_WIDTH (f)) + 1;
1956 1957
1957 XClearArea (dpy, x_win, x, y, width, height, False); 1958 XClearArea (dpy, x_win, x, y, width, height, False);
1958 1959
1959 XSETFRAME (frame, f); 1960 frame = wrap_frame (f);
1960 1961
1961 if (!UNBOUNDP (FACE_BACKGROUND_PIXMAP (Vdefault_face, frame)) 1962 if (!UNBOUNDP (FACE_BACKGROUND_PIXMAP (Vdefault_face, frame))
1962 || !UNBOUNDP (FACE_BACKGROUND_PIXMAP (Vleft_margin_face, frame)) 1963 || !UNBOUNDP (FACE_BACKGROUND_PIXMAP (Vleft_margin_face, frame))
1963 || !UNBOUNDP (FACE_BACKGROUND_PIXMAP (Vright_margin_face, frame))) 1964 || !UNBOUNDP (FACE_BACKGROUND_PIXMAP (Vright_margin_face, frame)))
1964 { 1965 {
1983 struct frame *f = device_selected_frame (d); 1984 struct frame *f = device_selected_frame (d);
1984 struct window *w = XWINDOW (FRAME_ROOT_WINDOW (f)); 1985 struct window *w = XWINDOW (FRAME_ROOT_WINDOW (f));
1985 Widget shell = FRAME_X_SHELL_WIDGET (f); 1986 Widget shell = FRAME_X_SHELL_WIDGET (f);
1986 int flash_height; 1987 int flash_height;
1987 1988
1988 XSETFRAME (frame, f); 1989 frame = wrap_frame (f);
1989 1990
1990 tmp_pixel = FACE_FOREGROUND (Vdefault_face, frame); 1991 tmp_pixel = FACE_FOREGROUND (Vdefault_face, frame);
1991 tmp_fcolor = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (tmp_pixel)); 1992 tmp_fcolor = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (tmp_pixel));
1992 tmp_pixel = FACE_BACKGROUND (Vdefault_face, frame); 1993 tmp_pixel = FACE_BACKGROUND (Vdefault_face, frame);
1993 tmp_bcolor = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (tmp_pixel)); 1994 tmp_bcolor = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (tmp_pixel));