comparison src/redisplay-msw.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 943eaba38521
children a5954632b187
comparison
equal deleted inserted replaced
792:4e83fdb13eb9 793:e38acbeb1cae
1 /* mswindows output and frame manipulation routines. 1 /* mswindows 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) 2001 Ben Wing. 5 Copyright (C) 2001, 2002 Ben Wing.
6 6
7 This file is part of XEmacs. 7 This file is part of XEmacs.
8 8
9 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
10 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
451 int nruns; 451 int nruns;
452 int i, height; 452 int i, height;
453 RECT rect; 453 RECT rect;
454 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, findex); 454 struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, findex);
455 455
456 XSETWINDOW (window, w); 456 window = wrap_window (w);
457 457
458 #if 0 /* #### FIXME? */ 458 #if 0 /* #### FIXME? */
459 /* We can't work out the width before we've set the font in the DC */ 459 /* We can't work out the width before we've set the font in the DC */
460 if (width < 0) 460 if (width < 0)
461 width = mswindows_text_width (cachel, Dynarr_atp (buf, 0), Dynarr_length (buf)); 461 width = mswindows_text_width (cachel, Dynarr_atp (buf, 0), Dynarr_length (buf));
688 { 688 {
689 struct frame *f = XFRAME (w->frame); 689 struct frame *f = XFRAME (w->frame);
690 HDC hdc = get_frame_dc (f, 1); 690 HDC hdc = get_frame_dc (f, 1);
691 691
692 Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance); 692 Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
693 Lisp_Object window;
694
695 XSETWINDOW (window, w);
696 693
697 /* Output the pixmap. Have to do this as many times as is required 694 /* Output the pixmap. Have to do this as many times as is required
698 to fill the given area */ 695 to fill the given area */
699 mswindows_update_dc (hdc, 696 mswindows_update_dc (hdc,
700 WINDOW_FACE_CACHEL_FOREGROUND (w, findex), 697 WINDOW_FACE_CACHEL_FOREGROUND (w, findex),
1035 int elt = start; 1032 int elt = start;
1036 face_index findex; 1033 face_index findex;
1037 int xpos, width; 1034 int xpos, width;
1038 Lisp_Object charset = Qunbound; /* Qnil is a valid charset when 1035 Lisp_Object charset = Qunbound; /* Qnil is a valid charset when
1039 MULE is not defined */ 1036 MULE is not defined */
1040 XSETWINDOW (window, w); 1037 window = wrap_window (w);
1041 rb = Dynarr_atp (rba, start); 1038 rb = Dynarr_atp (rba, start);
1042 1039
1043 if (!rb) 1040 if (!rb)
1044 /* Nothing to do so don't do anything. */ 1041 /* Nothing to do so don't do anything. */
1045 return; 1042 return;
1148 1145
1149 redisplay_calculate_display_boxes (dl, rb->xpos, rb->object.dglyph.xoffset, 1146 redisplay_calculate_display_boxes (dl, rb->xpos, rb->object.dglyph.xoffset,
1150 start_pixpos, rb->width, 1147 start_pixpos, rb->width,
1151 &dbox, &dga); 1148 &dbox, &dga);
1152 1149
1153 XSETWINDOW (window, w); 1150 window = wrap_window (w);
1154 instance = glyph_image_instance (rb->object.dglyph.glyph, 1151 instance = glyph_image_instance (rb->object.dglyph.glyph,
1155 window, ERROR_ME_NOT, 1); 1152 window, ERROR_ME_DEBUG_WARN, 1);
1156 findex = rb->findex; 1153 findex = rb->findex;
1157 1154
1158 if (IMAGE_INSTANCEP (instance)) 1155 if (IMAGE_INSTANCEP (instance))
1159 { 1156 {
1160 switch (XIMAGE_INSTANCE_TYPE (instance)) 1157 switch (XIMAGE_INSTANCE_TYPE (instance))