Mercurial > hg > xemacs-beta

diff src/console.h @ 771:943eaba38521

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-13 08:51:24 by ben] The big ben-mule-21-5 check-in! Various files were added and deleted. See CHANGES-ben-mule. There are still some test suite failures. No crashes, though. Many of the failures have to do with problems in the test suite itself rather than in the actual code. I'll be addressing these in the next day or so -- none of the test suite failures are at all critical. Meanwhile I'll be trying to address the biggest issues -- i.e. build or run failures, which will almost certainly happen on various platforms. All comments should be sent to ben@xemacs.org -- use a Cc: if necessary when sending to mailing lists. There will be pre- and post- tags, something like pre-ben-mule-21-5-merge-in, and post-ben-mule-21-5-merge-in.
author ben
date Wed, 13 Mar 2002 08:54:06 +0000
parents fdefd0186b75
children e38acbeb1cae
line wrap: on
line diff
--- a/src/console.h	Fri Mar 08 13:33:14 2002 +0000
+++ b/src/console.h	Wed Mar 13 08:54:06 2002 +0000
@@ -133,7 +133,8 @@
 
   /* frame methods */
   Lisp_Object *device_specific_frame_props;
-  void (*init_frame_1_method) (struct frame *, Lisp_Object properties);
+  void (*init_frame_1_method) (struct frame *, Lisp_Object properties,
+			       int frame_name_is_defaulted);
   void (*init_frame_2_method) (struct frame *, Lisp_Object properties);
   void (*init_frame_3_method) (struct frame *);
   void (*after_init_frame_method) (struct frame *, int first_on_device,
@@ -206,6 +207,7 @@
 				int start_pixpos, int width, face_index findex,
 				int cursor, int cursor_start, int cursor_width,
 				int cursor_height);
+
   /* color methods */
   int (*initialize_color_instance_method) (Lisp_Color_Instance *,
 					   Lisp_Object name,
@@ -276,6 +278,10 @@
   Lisp_Object (*locate_pixmap_file_method) (Lisp_Object file_method);
   int (*colorize_image_instance_method) (Lisp_Object image_instance,
 					 Lisp_Object fg, Lisp_Object bg);
+  void (*widget_query_string_geometry_method) (Lisp_Object string, 
+					       Lisp_Object face,
+					       int* width, int* height, 
+					       Lisp_Object domain);
   Lisp_Object image_conversion_list;
 
 #ifdef HAVE_TOOLBARS
@@ -620,7 +626,6 @@
 			    Lisp_Object connection, Lisp_Object props);
 void select_console_1 (Lisp_Object);
 struct console *decode_console (Lisp_Object);
-Lisp_Object make_console (struct console *c);
 void add_entry_to_console_type_list (Lisp_Object symbol,
 				     struct console_methods *type);
 struct console_methods *decode_console_type (Lisp_Object type,