Mercurial > hg > xemacs-beta

comparison src/objects.c @ 793:e38acbeb1cae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 /* Generic Objects and Functions. 1 /* Generic Objects and Functions.
2 Copyright (C) 1995 Free Software Foundation, Inc. 2 Copyright (C) 1995 Free Software Foundation, Inc.
3 Copyright (C) 1995 Board of Trustees, University of Illinois. 3 Copyright (C) 1995 Board of Trustees, University of Illinois.
4 Copyright (C) 1995, 1996 Ben Wing. 4 Copyright (C) 1995, 1996, 2002 Ben Wing.
5 5
6 This file is part of XEmacs. 6 This file is part of XEmacs.
7 7
8 XEmacs is free software; you can redistribute it and/or modify it 8 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 9 under the terms of the GNU General Public License as published by the
41 /* Authors: Ben Wing, Chuck Thompson */ 41 /* Authors: Ben Wing, Chuck Thompson */
42 42
43 void 43 void
44 finalose (void *ptr) 44 finalose (void *ptr)
45 { 45 {
46 Lisp_Object obj; 46 Lisp_Object obj = wrap_pointer_1 (ptr);
47 XSETOBJ (obj, ptr); 47
48 48
49 invalid_operation 49 invalid_operation
50 ("Can't dump an emacs containing window system objects", obj); 50 ("Can't dump an emacs containing window system objects", obj);
51 } 51 }
52 52
149 is deallocated as well. 149 is deallocated as well.
150 */ 150 */
151 (name, device, noerror)) 151 (name, device, noerror))
152 { 152 {
153 Lisp_Color_Instance *c; 153 Lisp_Color_Instance *c;
154 Lisp_Object val;
155 int retval; 154 int retval;
156 155
157 CHECK_STRING (name); 156 CHECK_STRING (name);
158 XSETDEVICE (device, decode_device (device)); 157 device = wrap_device (decode_device (device));
159 158
160 c = alloc_lcrecord_type (Lisp_Color_Instance, &lrecord_color_instance); 159 c = alloc_lcrecord_type (Lisp_Color_Instance, &lrecord_color_instance);
161 c->name = name; 160 c->name = name;
162 c->device = device; 161 c->device = device;
163 c->data = 0; 162 c->data = 0;
166 (c, name, device, 165 (c, name, device,
167 decode_error_behavior_flag (noerror))); 166 decode_error_behavior_flag (noerror)));
168 if (!retval) 167 if (!retval)
169 return Qnil; 168 return Qnil;
170 169
171 XSETCOLOR_INSTANCE (val, c); 170 return wrap_color_instance (c);
172 return val;
173 } 171 }
174 172
175 DEFUN ("color-instance-p", Fcolor_instance_p, 1, 1, 0, /* 173 DEFUN ("color-instance-p", Fcolor_instance_p, 1, 1, 0, /*
176 Return non-nil if OBJECT is a color instance. 174 Return non-nil if OBJECT is a color instance.
177 */ 175 */
285 */ 283 */
286 static int 284 static int
287 font_instance_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) 285 font_instance_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
288 { 286 {
289 /* #### should this be moved into a device method? */ 287 /* #### should this be moved into a device method? */
290 return internal_equal (font_instance_truename_internal (obj1, ERROR_ME_NOT), 288 return internal_equal (font_instance_truename_internal
291 font_instance_truename_internal (obj2, ERROR_ME_NOT), 289 (obj1, ERROR_ME_DEBUG_WARN),
290 font_instance_truename_internal
291 (obj2, ERROR_ME_DEBUG_WARN),
292 depth + 1); 292 depth + 1);
293 } 293 }
294 294
295 static unsigned long 295 static unsigned long
296 font_instance_hash (Lisp_Object obj, int depth) 296 font_instance_hash (Lisp_Object obj, int depth)
297 { 297 {
298 return internal_hash (font_instance_truename_internal (obj, ERROR_ME_NOT), 298 return internal_hash (font_instance_truename_internal
299 (obj, ERROR_ME_DEBUG_WARN),
299 depth + 1); 300 depth + 1);
300 } 301 }
301 302
302 DEFINE_LRECORD_IMPLEMENTATION ("font-instance", font_instance, 303 DEFINE_LRECORD_IMPLEMENTATION ("font-instance", font_instance,
303 mark_font_instance, print_font_instance, 304 mark_font_instance, print_font_instance,
317 these objects are GCed, the underlying X data is deallocated as well. 318 these objects are GCed, the underlying X data is deallocated as well.
318 */ 319 */
319 (name, device, noerror)) 320 (name, device, noerror))
320 { 321 {
321 Lisp_Font_Instance *f; 322 Lisp_Font_Instance *f;
322 Lisp_Object val;
323 int retval = 0; 323 int retval = 0;
324 Error_Behavior errb = decode_error_behavior_flag (noerror); 324 Error_Behavior errb = decode_error_behavior_flag (noerror);
325 325
326 if (ERRB_EQ (errb, ERROR_ME)) 326 if (ERRB_EQ (errb, ERROR_ME))
327 CHECK_STRING (name); 327 CHECK_STRING (name);
328 else if (!STRINGP (name)) 328 else if (!STRINGP (name))
329 return Qnil; 329 return Qnil;
330 330
331 XSETDEVICE (device, decode_device (device)); 331 device = wrap_device (decode_device (device));
332 332
333 f = alloc_lcrecord_type (Lisp_Font_Instance, &lrecord_font_instance); 333 f = alloc_lcrecord_type (Lisp_Font_Instance, &lrecord_font_instance);
334 f->name = name; 334 f->name = name;
335 f->device = device; 335 f->device = device;
336 336
346 (f, name, device, errb)); 346 (f, name, device, errb));
347 347
348 if (!retval) 348 if (!retval)
349 return Qnil; 349 return Qnil;
350 350
351 XSETFONT_INSTANCE (val, f); 351 return wrap_font_instance (f);
352 return val;
353 } 352 }
354 353
355 DEFUN ("font-instance-p", Ffont_instance_p, 1, 1, 0, /* 354 DEFUN ("font-instance-p", Ffont_instance_p, 1, 1, 0, /*
356 Return non-nil if OBJECT is a font instance. 355 Return non-nil if OBJECT is a font instance.
357 */ 356 */
466 currently selected device. 465 currently selected device.
467 */ 466 */
468 (pattern, device)) 467 (pattern, device))
469 { 468 {
470 CHECK_STRING (pattern); 469 CHECK_STRING (pattern);
471 XSETDEVICE (device, decode_device (device)); 470 device = wrap_device (decode_device (device));
472 471
473 return MAYBE_LISP_DEVMETH (XDEVICE (device), list_fonts, (pattern, device)); 472 return MAYBE_LISP_DEVMETH (XDEVICE (device), list_fonts, (pattern, device));
474 } 473 }
475 474
476 475
1092 alloc_lcrecord_type (Lisp_Color_Instance, &lrecord_color_instance); 1091 alloc_lcrecord_type (Lisp_Color_Instance, &lrecord_color_instance);
1093 c->name = Qnil; 1092 c->name = Qnil;
1094 c->device = Qnil; 1093 c->device = Qnil;
1095 c->data = 0; 1094 c->data = 0;
1096 1095
1097 XSETCOLOR_INSTANCE (Vthe_null_color_instance, c); 1096 Vthe_null_color_instance = wrap_color_instance (c);
1098 } 1097 }
1099 1098
1100 staticpro_nodump (&Vthe_null_font_instance); 1099 staticpro_nodump (&Vthe_null_font_instance);
1101 { 1100 {
1102 Lisp_Font_Instance *f = 1101 Lisp_Font_Instance *f =
1108 f->ascent = f->height = 0; 1107 f->ascent = f->height = 0;
1109 f->descent = 0; 1108 f->descent = 0;
1110 f->width = 0; 1109 f->width = 0;
1111 f->proportional_p = 0; 1110 f->proportional_p = 0;
1112 1111
1113 XSETFONT_INSTANCE (Vthe_null_font_instance, f); 1112 Vthe_null_font_instance = wrap_font_instance (f);
1114 } 1113 }
1115 } 1114 }
1116 1115
1117 void 1116 void
1118 vars_of_objects (void) 1117 vars_of_objects (void)