comparison src/glyphs-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 943eaba38521
children a5954632b187
comparison
equal deleted inserted replaced
792:4e83fdb13eb9 793:e38acbeb1cae
1141 if (NILP (value)) 1141 if (NILP (value))
1142 continue; 1142 continue;
1143 if (STRINGP (value)) 1143 if (STRINGP (value))
1144 value = 1144 value =
1145 Fmake_color_instance 1145 Fmake_color_instance
1146 (value, device, encode_error_behavior_flag (ERROR_ME_NOT)); 1146 (value, device, encode_error_behavior_flag (ERROR_ME_DEBUG_WARN));
1147 else 1147 else
1148 { 1148 {
1149 assert (COLOR_SPECIFIERP (value)); 1149 assert (COLOR_SPECIFIERP (value));
1150 value = Fspecifier_instance (value, domain, Qnil, Qnil); 1150 value = Fspecifier_instance (value, domain, Qnil, Qnil);
1151 } 1151 }
1402 int xhot = 0, yhot = 0; 1402 int xhot = 0, yhot = 0;
1403 1403
1404 if (xpmattrs.valuemask & XpmHotspot) 1404 if (xpmattrs.valuemask & XpmHotspot)
1405 { 1405 {
1406 xhot = xpmattrs.x_hotspot; 1406 xhot = xpmattrs.x_hotspot;
1407 XSETINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii), xpmattrs.x_hotspot); 1407 IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii) = make_int (xpmattrs.x_hotspot);
1408 } 1408 }
1409 if (xpmattrs.valuemask & XpmHotspot) 1409 if (xpmattrs.valuemask & XpmHotspot)
1410 { 1410 {
1411 yhot = xpmattrs.y_hotspot; 1411 yhot = xpmattrs.y_hotspot;
1412 XSETINT (IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii), xpmattrs.y_hotspot); 1412 IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii) = make_int (xpmattrs.y_hotspot);
1413 } 1413 }
1414 check_pointer_sizes (xs, w, h, instantiator); 1414 check_pointer_sizes (xs, w, h, instantiator);
1415 1415
1416 /* If the loaded pixmap has colors allocated (meaning it came from an 1416 /* If the loaded pixmap has colors allocated (meaning it came from an
1417 XPM file), then use those as the default colors for the cursor we 1417 XPM file), then use those as the default colors for the cursor we
2105 /* First get the items if they have changed since this is a 2105 /* First get the items if they have changed since this is a
2106 structural change. As such it will nuke all added values so we 2106 structural change. As such it will nuke all added values so we
2107 need to update most other things after the items have changed.*/ 2107 need to update most other things after the items have changed.*/
2108 if (IMAGE_INSTANCE_WIDGET_ITEMS_CHANGED (p)) 2108 if (IMAGE_INSTANCE_WIDGET_ITEMS_CHANGED (p))
2109 { 2109 {
2110 Lisp_Object image_instance; 2110 Lisp_Object image_instance = wrap_image_instance (p);
2111 2111
2112 XSETIMAGE_INSTANCE (image_instance, p);
2113 wv = gui_items_to_widget_values 2112 wv = gui_items_to_widget_values
2114 (image_instance, IMAGE_INSTANCE_WIDGET_PENDING_ITEMS (p), 2113 (image_instance, IMAGE_INSTANCE_WIDGET_PENDING_ITEMS (p),
2115 /* #### this is not right; we need to keep track of which widgets 2114 /* #### this is not right; we need to keep track of which widgets
2116 want accelerators and which don't */ 0); 2115 want accelerators and which don't */ 0);
2117 wv->change = STRUCTURAL_CHANGE; 2116 wv->change = STRUCTURAL_CHANGE;
2165 IMAGE_INSTANCE_X_CLIPWIDGET (p)) ; 2164 IMAGE_INSTANCE_X_CLIPWIDGET (p)) ;
2166 2165
2167 if (IMAGE_INSTANCE_X_WIDGET_ID (p)->core.being_destroyed 2166 if (IMAGE_INSTANCE_X_WIDGET_ID (p)->core.being_destroyed
2168 || !XtIsManaged(IMAGE_INSTANCE_X_WIDGET_ID (p))) 2167 || !XtIsManaged(IMAGE_INSTANCE_X_WIDGET_ID (p)))
2169 { 2168 {
2170 Lisp_Object sw; 2169 Lisp_Object sw = wrap_image_instance (p);
2171 XSETIMAGE_INSTANCE (sw, p); 2170
2172 signal_error (Qinternal_error, 2171 signal_error (Qinternal_error,
2173 "XEmacs bug: subwindow is deleted", sw); 2172 "XEmacs bug: subwindow is deleted", sw);
2174 } 2173 }
2175 2174
2176 lw_add_widget_value_arg (wv, XtNwidth, 2175 lw_add_widget_value_arg (wv, XtNwidth,