comparison src/redisplay-gtk.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 2923009caf47
children 285f13b079f3
comparison
equal deleted inserted replaced
792:4e83fdb13eb9 793:e38acbeb1cae
305 face_index findex; 305 face_index findex;
306 int xpos, width; 306 int xpos, width;
307 Lisp_Object charset = Qunbound; /* Qnil is a valid charset when 307 Lisp_Object charset = Qunbound; /* Qnil is a valid charset when
308 MULE is not defined */ 308 MULE is not defined */
309 309
310 XSETWINDOW (window, w); 310 window = wrap_window (w);
311 rb = Dynarr_atp (rba, start); 311 rb = Dynarr_atp (rba, start);
312 312
313 if (!rb) 313 if (!rb)
314 { 314 {
315 /* Nothing to do so don't do anything. */ 315 /* Nothing to do so don't do anything. */
422 struct display_glyph_area dga; 422 struct display_glyph_area dga;
423 redisplay_calculate_display_boxes (dl, rb->xpos, rb->object.dglyph.xoffset, 423 redisplay_calculate_display_boxes (dl, rb->xpos, rb->object.dglyph.xoffset,
424 start_pixpos, rb->width, 424 start_pixpos, rb->width,
425 &dbox, &dga); 425 &dbox, &dga);
426 426
427 XSETWINDOW (window, w); 427 window = wrap_window (w);
428 instance = glyph_image_instance (rb->object.dglyph.glyph, 428 instance = glyph_image_instance (rb->object.dglyph.glyph,
429 window, ERROR_ME_NOT, 1); 429 window, ERROR_ME_DEBUG_WARN, 1);
430 findex = rb->findex; 430 findex = rb->findex;
431 431
432 if (IMAGE_INSTANCEP (instance)) 432 if (IMAGE_INSTANCEP (instance))
433 switch (XIMAGE_INSTANCE_TYPE (instance)) 433 switch (XIMAGE_INSTANCE_TYPE (instance))
434 { 434 {
686 struct textual_run *runs = alloca_array (struct textual_run, len); 686 struct textual_run *runs = alloca_array (struct textual_run, len);
687 int nruns; 687 int nruns;
688 int i; 688 int i;
689 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, findex); 689 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, findex);
690 690
691 XSETDEVICE (device, d); 691 device = wrap_device (d);
692 XSETWINDOW (window, w); 692 window = wrap_window (w);
693 693
694 if (width < 0) 694 if (width < 0)
695 width = gtk_text_width (f, cachel, Dynarr_atp (buf, 0), Dynarr_length (buf)); 695 width = gtk_text_width (f, cachel, Dynarr_atp (buf, 0), Dynarr_length (buf));
696 height = dl->ascent + dl->descent - dl->clip; 696 height = dl->ascent + dl->descent - dl->clip;
697 697
1127 struct Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance); 1127 struct Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
1128 Lisp_Object window; 1128 Lisp_Object window;
1129 1129
1130 GdkWindow *x_win = GET_GTK_WIDGET_WINDOW (FRAME_GTK_TEXT_WIDGET (f)); 1130 GdkWindow *x_win = GET_GTK_WIDGET_WINDOW (FRAME_GTK_TEXT_WIDGET (f));
1131 1131
1132 XSETWINDOW (window, w); 1132 window = wrap_window (w);
1133 1133
1134 /* Output the pixmap. */ 1134 /* Output the pixmap. */
1135 { 1135 {
1136 Lisp_Object tmp_pixel; 1136 Lisp_Object tmp_pixel;
1137 GdkColor *tmp_bcolor, *tmp_fcolor; 1137 GdkColor *tmp_bcolor, *tmp_fcolor;
1437 Lisp_Object window; 1437 Lisp_Object window;
1438 int bflag = (window_needs_vertical_divider (w) ? 0 : 1); 1438 int bflag = (window_needs_vertical_divider (w) ? 0 : 1);
1439 layout_bounds bounds; 1439 layout_bounds bounds;
1440 1440
1441 bounds = calculate_display_line_boundaries (w, bflag); 1441 bounds = calculate_display_line_boundaries (w, bflag);
1442 XSETWINDOW (window, w); 1442 window = wrap_window (w);
1443 1443
1444 if (window_is_leftmost (w)) 1444 if (window_is_leftmost (w))
1445 redisplay_clear_region (window, DEFAULT_INDEX, FRAME_LEFT_BORDER_START (f), 1445 redisplay_clear_region (window, DEFAULT_INDEX, FRAME_LEFT_BORDER_START (f),
1446 ypos1, FRAME_BORDER_WIDTH (f), height); 1446 ypos1, FRAME_BORDER_WIDTH (f), height);
1447 1447
1655 int width = EOL_CURSOR_WIDTH; 1655 int width = EOL_CURSOR_WIDTH;
1656 int height = dl->ascent + dl->descent - dl->clip; 1656 int height = dl->ascent + dl->descent - dl->clip;
1657 int cursor_height, cursor_y; 1657 int cursor_height, cursor_y;
1658 int defheight, defascent; 1658 int defheight, defascent;
1659 1659
1660 XSETWINDOW (window, w); 1660 window = wrap_window (w);
1661 redisplay_clear_region (window, findex, x, y, width, height); 1661 redisplay_clear_region (window, findex, x, y, width, height);
1662 1662
1663 if (NILP (w->text_cursor_visible_p)) 1663 if (NILP (w->text_cursor_visible_p))
1664 return; 1664 return;
1665 1665
1743 2 * FRAME_REAL_TOP_TOOLBAR_BORDER_WIDTH (f) - 1743 2 * FRAME_REAL_TOP_TOOLBAR_BORDER_WIDTH (f) -
1744 2 * FRAME_REAL_BOTTOM_TOOLBAR_BORDER_WIDTH (f)) + 1; 1744 2 * FRAME_REAL_BOTTOM_TOOLBAR_BORDER_WIDTH (f)) + 1;
1745 1745
1746 gdk_window_clear_area (x_win, x, y, width, height); 1746 gdk_window_clear_area (x_win, x, y, width, height);
1747 1747
1748 XSETFRAME (frame, f); 1748 frame = wrap_frame (f);
1749 1749
1750 if (!UNBOUNDP (FACE_BACKGROUND_PIXMAP (Vdefault_face, frame)) 1750 if (!UNBOUNDP (FACE_BACKGROUND_PIXMAP (Vdefault_face, frame))
1751 || !UNBOUNDP (FACE_BACKGROUND_PIXMAP (Vleft_margin_face, frame)) 1751 || !UNBOUNDP (FACE_BACKGROUND_PIXMAP (Vleft_margin_face, frame))
1752 || !UNBOUNDP (FACE_BACKGROUND_PIXMAP (Vright_margin_face, frame))) 1752 || !UNBOUNDP (FACE_BACKGROUND_PIXMAP (Vright_margin_face, frame)))
1753 { 1753 {
1763 GdkColor tmp_fcolor, tmp_bcolor; 1763 GdkColor tmp_fcolor, tmp_bcolor;
1764 Lisp_Object tmp_pixel, frame; 1764 Lisp_Object tmp_pixel, frame;
1765 struct frame *f = device_selected_frame (d); 1765 struct frame *f = device_selected_frame (d);
1766 struct window *w = XWINDOW (FRAME_ROOT_WINDOW (f)); 1766 struct window *w = XWINDOW (FRAME_ROOT_WINDOW (f));
1767 1767
1768 XSETFRAME (frame, f); 1768 frame = wrap_frame (f);
1769 1769
1770 tmp_pixel = FACE_FOREGROUND (Vdefault_face, frame); 1770 tmp_pixel = FACE_FOREGROUND (Vdefault_face, frame);
1771 tmp_fcolor = * (COLOR_INSTANCE_GTK_COLOR (XCOLOR_INSTANCE (tmp_pixel))); 1771 tmp_fcolor = * (COLOR_INSTANCE_GTK_COLOR (XCOLOR_INSTANCE (tmp_pixel)));
1772 tmp_pixel = FACE_BACKGROUND (Vdefault_face, frame); 1772 tmp_pixel = FACE_BACKGROUND (Vdefault_face, frame);
1773 tmp_bcolor = * (COLOR_INSTANCE_GTK_COLOR (XCOLOR_INSTANCE (tmp_pixel))); 1773 tmp_bcolor = * (COLOR_INSTANCE_GTK_COLOR (XCOLOR_INSTANCE (tmp_pixel)));