xemacs-beta: src/frame.c comparison

comparison src/frame.c @ 398:74fd4e045ea6 r21-2-29

Import from CVS: tag r21-2-29

author	cvs
date	Mon, 13 Aug 2007 11:13:30 +0200
parents	bbff43aa5eb7
children	a86b2b5e0111

comparison

equal deleted inserted replaced

-:f4aeb21a5bad
+:74fd4e045ea6
 #include "events.h"
 #include "extents.h"
 #include "faces.h"
 #include "frame.h"
 #include "glyphs.h"
+#include "gutter.h"
 #include "menubar.h"
 #include "redisplay.h"
 #include "scrollbar.h"
 #include "window.h"
 Lisp_Object Quse_backing_store;
 Lisp_Object Qborder_color;
 Lisp_Object Qborder_width;
 Lisp_Object Qframep, Qframe_live_p;
-Lisp_Object Qframe_x_p, Qframe_tty_p;
 Lisp_Object Qdelete_frame;
 Lisp_Object Qframe_title_format, Vframe_title_format;
 Lisp_Object Qframe_icon_title_format, Vframe_icon_title_format;
 other way of getting it if it isn't the selected frame. */
 Lisp_Object Vframe_being_created;
 Lisp_Object Qframe_being_created;
 static void store_minibuf_frame_prop (struct frame *f, Lisp_Object val);
+static struct display_line title_string_display_line;
-EXFUN (Fset_frame_properties, 2);
+/* Used by generate_title_string. Global because they get used so much that
+the dynamic allocation time adds up. */
+static Emchar_dynarr *title_string_emchar_dynarr;
 static Lisp_Object
-mark_frame (Lisp_Object obj, void (*markobj) (Lisp_Object))
+mark_frame (Lisp_Object obj)
 {
 struct frame *f = XFRAME (obj);
-#define MARKED_SLOT(x) ((void) (markobj (f->x)));
+#define MARKED_SLOT(x) mark_object (f->x)
 #include "frameslots.h"
-mark_subwindow_cachels (f->subwindow_cachels, markobj);
+mark_subwindow_cachels (f->subwindow_cachels);
 if (FRAME_LIVE_P (f)) /* device is nil for a dead frame */
-MAYBE_FRAMEMETH (f, mark_frame, (f, markobj));
+MAYBE_FRAMEMETH (f, mark_frame, (f));
 return Qnil;
 }
 static void
 sprintf (buf, " 0x%x>", frm->header.uid);
 write_c_string (buf, printcharfun);
 }
 DEFINE_LRECORD_IMPLEMENTATION ("frame", frame,
-mark_frame, print_frame, 0, 0, 0,
+mark_frame, print_frame, 0, 0, 0, 0,
 			       struct frame);
 static void
 nuke_all_frame_slots (struct frame *f)
 {
-#define MARKED_SLOT(x)	f->x = Qnil;
+#define MARKED_SLOT(x)	f->x = Qnil
 #include "frameslots.h"
 }
 /* Allocate a new frame object and set all its fields to reasonable
 values.  The root window is created but the minibuffer will be done
 allocate_frame_core (Lisp_Object device)
 {
 /* This function can GC */
 Lisp_Object frame;
 Lisp_Object root_window;
-struct frame *f = alloc_lcrecord_type (struct frame, lrecord_frame);
+struct frame *f = alloc_lcrecord_type (struct frame, &lrecord_frame);
 zero_lcrecord (f);
 nuke_all_frame_slots (f);
 XSETFRAME (frame, f);
 f->selected_window = root_window;
 f->last_nonminibuf_window = root_window;
 /* cache of subwindows visible on frame */
 f->subwindow_cachels    = Dynarr_new (subwindow_cachel);
+/* associated exposure ignore list */
+f->subwindow_exposures = 0;
+f->subwindow_exposures_tail = 0;
+FRAME_SET_PAGENUMBER (f, 1);
 /* Choose a buffer for the frame's root window.  */
 XWINDOW (root_window)->buffer = Qt;
 {
 Lisp_Object buf;
 buf = Fcurrent_buffer ();
 /* If buf is a 'hidden' buffer (i.e. one whose name starts with
 a space), try to find another one.  */
 if (string_char (XSTRING (Fbuffer_name (buf)), 0) == ' ')
 buf = Fother_buffer (buf, Qnil, Qnil);
-Fset_window_buffer (root_window, buf);
+Fset_window_buffer (root_window, buf, Qnil);
 }
 return f;
 }
 XWINDOW (mini_window)->frame = frame;
 f->minibuffer_window = mini_window;
 f->has_minibuffer = 1;
 XWINDOW (mini_window)->buffer = Qt;
-Fset_window_buffer (mini_window, Vminibuffer_zero);
+Fset_window_buffer (mini_window, Vminibuffer_zero, Qt);
 }
 /* Make a frame using a separate minibuffer window on another frame.
 MINI_WINDOW is the minibuffer window to use.  nil means use the
 default-minibuffer-frame.  */
 mini_window = XFRAME (con->default_minibuffer_frame)->minibuffer_window;
 }
 /* Install the chosen minibuffer window, with proper buffer.  */
 store_minibuf_frame_prop (f, mini_window);
-Fset_window_buffer (mini_window, Vminibuffer_zero);
+Fset_window_buffer (mini_window, Vminibuffer_zero, Qt);
 }
 /* Make a frame containing only a minibuffer window.  */
 static void
 XWINDOW (mini_window)->prev   = Qnil;
 XWINDOW (mini_window)->frame  = frame;
 /* Put the proper buffer in that window.  */
-Fset_window_buffer (mini_window, Vminibuffer_zero);
+Fset_window_buffer (mini_window, Vminibuffer_zero, Qt);
 }
 static Lisp_Object
 make_sure_its_a_fresh_plist (Lisp_Object foolist)
 {
 else if (STRINGP (Vdefault_frame_name))
 name = Vdefault_frame_name;
 else
 name = build_string ("emacs");
-if (!NILP (Fstring_match (make_string ((CONST Bufbyte *) "\\.", 2), name,
+if (!NILP (Fstring_match (make_string ((const Bufbyte *) "\\.", 2), name,
 			    Qnil, Qnil)))
 signal_simple_error (". not allowed in frame names", name);
 f = allocate_frame_core (device);
 XSETFRAME (frame, f);
 else
 signal_simple_error ("Invalid value for `minibuffer'", minibuf);
 update_frame_window_mirror (f);
-if (initialized)
+if (initialized && !DEVICE_STREAM_P (d))
 {
 if (!NILP (f->minibuffer_window))
 reset_face_cachels (XWINDOW (f->minibuffer_window));
 reset_face_cachels (XWINDOW (f->root_window));
 }
 #endif
 reset_face_cachels (XWINDOW (FRAME_SELECTED_WINDOW (f)));
 reset_glyph_cachels (XWINDOW (FRAME_SELECTED_WINDOW (f)));
 reset_subwindow_cachels (f);
 change_frame_size (f, f->height, f->width, 0);
 }
 MAYBE_FRAMEMETH (f, init_frame_2, (f, props));
 Fset_frame_properties (frame, props);
 MAYBE_FRAMEMETH (f, init_frame_3, (f));
+/* now initialise the gutters, this won't change the frame size
+so is ok here. */
+if (!DEVICE_STREAM_P (d))
+init_frame_gutters (f);
 /* Hallelujah, praise the lord. */
 f->init_finished = 1;
 /* If this is the first frame on the device, make it the selected one. */
 f->selected_window = window;
 if (!MINI_WINDOW_P (XWINDOW (window)) || FRAME_MINIBUF_ONLY_P (f))
 {
 #ifdef HAVE_TOOLBARS
 if (!EQ (f->last_nonminibuf_window, window))
-	MARK_TOOLBAR_CHANGED;
+	{
+	  MARK_TOOLBAR_CHANGED;
+	  MARK_GUTTER_CHANGED;
+	}
 #endif
 f->last_nonminibuf_window = window;
 }
 }
 device = FRAME_DEVICE (f);
 d = XDEVICE (device);
 console = DEVICE_CONSOLE (d);
 con = XCONSOLE (console);
-if (!called_from_delete_device)
+if (!called_from_delete_device &&
+!(MAYBE_INT_DEVMETH (d, device_implementation_flags, ())
+	& XDEVIMPF_FRAMELESS_OK))
 {
 /* If we're deleting the only non-minibuffer frame on the
 	 device, delete the device. */
 if (EQ (frame, next_frame (frame, Qnomini, FRAME_DEVICE (f))))
 	{
 	    {
 		Lisp_Object next_f =
 		    next_frame_internal (frame, Qt, device,
 					 called_from_delete_device);
 		if (NILP (next_f) || EQ (next_f, frame))
-		  ;
+		  set_device_selected_frame (d, Qnil);
 		else
 		  set_device_selected_frame (d, next_f);
 	    }
 	  else if (! did_select)
 	    set_device_selected_frame (d, next);
 /* Don't allow minibuf_window to remain on a deleted frame.  */
 if (EQ (f->minibuffer_window, minibuf_window))
 {
 struct frame *sel_frame = selected_frame ();
 Fset_window_buffer (sel_frame->minibuffer_window,
-			  XWINDOW (minibuf_window)->buffer);
+			  XWINDOW (minibuf_window)->buffer, Qt);
 minibuf_window = sel_frame->minibuffer_window;
 /* If the dying minibuffer window was selected,
 	 select the new one.  */
 if (minibuffer_selected)
 free_frame_scrollbars (f);
 #endif
 #ifdef HAVE_TOOLBARS
 free_frame_toolbars (f);
 #endif
+free_frame_gutters (f);
 /* This must be done before the window and window_mirror structures
 are freed.  The scrollbar information is attached to them. */
 MAYBE_FRAMEMETH (f, delete_frame, (f));
 (window, x, y))
 {
 struct window *w;
 int pix_x, pix_y;
-CHECK_WINDOW (window);
+CHECK_LIVE_WINDOW (window);
 CHECK_INT (x);
 CHECK_INT (y);
 /* Warping the mouse will cause EnterNotify and Focus events under X. */
 w = XWINDOW (window);
 */
 (window, x, y))
 {
 struct window *w;
-CHECK_WINDOW (window);
+CHECK_LIVE_WINDOW (window);
 CHECK_INT (x);
 CHECK_INT (y);
 /* Warping the mouse will cause EnterNotify and Focus events under X. */
 w = XWINDOW (window);
 /* Don't allow minibuf_window to remain on a deleted frame.  */
 if (EQ (f->minibuffer_window, minibuf_window))
 {
 Fset_window_buffer (sel_frame->minibuffer_window,
-			  XWINDOW (minibuf_window)->buffer);
+			  XWINDOW (minibuf_window)->buffer, Qt);
 minibuf_window = sel_frame->minibuffer_window;
 }
 MAYBE_FRAMEMETH (f, make_frame_invisible, (f));
 /* Don't allow minibuf_window to remain on a deleted frame.  */
 if (EQ (f->minibuffer_window, minibuf_window))
 {
 Fset_window_buffer (sel_frame->minibuffer_window,
-			  XWINDOW (minibuf_window)->buffer);
+			  XWINDOW (minibuf_window)->buffer, Qt);
 minibuf_window = sel_frame->minibuffer_window;
 }
 MAYBE_FRAMEMETH (f, iconify_frame, (f));
 return Qnil;
 }
 /* Ben thinks there is no need for `redirect-frame-focus' or `frame-focus',
 crockish FSFmacs functions.  See summary on focus in event-stream.c. */
+DEFUN ("print-job-page-number", Fprint_job_page_number, 1, 1, 0, /*
+Return current page number for the print job FRAME.
+*/
+(frame))
+{
+CHECK_PRINTER_FRAME (frame);
+return make_int (FRAME_PAGENUMBER (XFRAME (frame)));
+}
+DEFUN ("print-job-eject-page", Fprint_job_eject_page, 1, 1, 0, /*
+Eject page in the print job FRAME.
+*/
+(frame))
+{
+struct frame *f;
+CHECK_PRINTER_FRAME (frame);
+f = XFRAME (frame);
+FRAMEMETH (f, eject_page, (f));
+FRAME_SET_PAGENUMBER (f, 1 + FRAME_PAGENUMBER (f));
+f->clear = 1;
+return Qnil;
+}
 /***************************************************************************/
 /*                           frame properties                              */
 /***************************************************************************/
 static int
 dissect_as_face_setting (Lisp_Object sym, Lisp_Object *face_out,
 			 Lisp_Object *face_prop_out)
 {
 Lisp_Object list = Vbuilt_in_face_specifiers;
-struct Lisp_String *s;
+Lisp_String *s;
 if (!SYMBOLP (sym))
 return 0;
 s = symbol_name (XSYMBOL (sym));
 while (!NILP (list))
 {
 Lisp_Object prop = Fcar (list);
-struct Lisp_String *prop_name;
+Lisp_String *prop_name;
 if (!SYMBOLP (prop))
 	continue;
 prop_name = symbol_name (XSYMBOL (prop));
 if (string_length (s) > string_length (prop_name) + 1
 else
 default_face_height_and_width_1 (frame, &cph, &cpw);
 window = FRAME_SELECTED_WINDOW (f);
-egw = max (glyph_width (Vcontinuation_glyph, Vdefault_face, 0, window),
+egw = max (glyph_width (Vcontinuation_glyph, window),
-	     glyph_width (Vtruncation_glyph, Vdefault_face, 0, window));
+	     glyph_width (Vtruncation_glyph, window));
 egw = max (egw, cpw);
 bdr = 2 * f->internal_border_width;
 obw = FRAME_SCROLLBAR_WIDTH (f) + FRAME_THEORETICAL_LEFT_TOOLBAR_WIDTH (f) +
 FRAME_THEORETICAL_RIGHT_TOOLBAR_WIDTH (f) +
 2 * FRAME_THEORETICAL_LEFT_TOOLBAR_BORDER_WIDTH (f) +
 /* Adjust the width for the end glyph which may be a different width
 than the default character width. */
 {
 int adjustment, trunc_width, cont_width;
-trunc_width = glyph_width (Vtruncation_glyph, Vdefault_face, 0,
+trunc_width = glyph_width (Vtruncation_glyph,
 			       FRAME_SELECTED_WINDOW (f));
-cont_width = glyph_width (Vcontinuation_glyph, Vdefault_face, 0,
+cont_width = glyph_width (Vcontinuation_glyph,
 			      FRAME_SELECTED_WINDOW (f));
 adjustment = max (trunc_width, cont_width);
 adjustment = max (adjustment, font_width);
 new_pixwidth += adjustment;
 else
 change_frame_size_1 (f, newheight, newwidth);
 }
+/* The caller is responsible for freeing the returned string. */
+static Bufbyte *
+generate_title_string (struct window *w, Lisp_Object format_str,
+		       face_index findex, int type)
+{
+struct display_line *dl;
+struct display_block *db;
+int elt = 0;
+dl = &title_string_display_line;
+db = get_display_block_from_line (dl, TEXT);
+Dynarr_reset (db->runes);
+generate_formatted_string_db (format_str, Qnil, w, dl, db, findex, 0,
+-1, type);
+Dynarr_reset (title_string_emchar_dynarr);
+while (elt < Dynarr_length (db->runes))
+{
+if (Dynarr_atp (db->runes, elt)->type == RUNE_CHAR)
+	Dynarr_add (title_string_emchar_dynarr,
+		    Dynarr_atp (db->runes, elt)->object.chr.ch);
+elt++;
+}
+return
+convert_emchar_string_into_malloced_string
+(Dynarr_atp (title_string_emchar_dynarr, 0),
+Dynarr_length (title_string_emchar_dynarr), 0);
+}
 void
 update_frame_title (struct frame *f)
 {
 struct window *w = XWINDOW (FRAME_SELECTED_WINDOW (f));
 Lisp_Object title_format;
 title_format = symbol_value_in_buffer (Qframe_title_format,      w->buffer);
 icon_format  = symbol_value_in_buffer (Qframe_icon_title_format, w->buffer);
 if (HAS_FRAMEMETH_P (f, set_title_from_bufbyte))
 {
-title = generate_formatted_string (w, title_format, Qnil,
+title = generate_title_string (w, title_format,
-DEFAULT_INDEX, CURRENT_DISP);
+				     DEFAULT_INDEX, CURRENT_DISP);
 FRAMEMETH (f, set_title_from_bufbyte, (f, title));
 }
 if (HAS_FRAMEMETH_P (f, set_icon_name_from_bufbyte))
 {
 if (!EQ (icon_format, title_format) || !title)
 	{
 	  if (title)
 	    xfree (title);
-	  title = generate_formatted_string (w, icon_format, Qnil,
+	  title = generate_title_string (w, icon_format,
-DEFAULT_INDEX, CURRENT_DISP);
+					 DEFAULT_INDEX, CURRENT_DISP);
 	}
 FRAMEMETH (f, set_icon_name_from_bufbyte, (f, title));
 }
 if (title)
 {
 MARK_ICON_CHANGED;
 }
+/***************************************************************************/
+/*									   */
+/*                              initialization                             */
+/*									   */
+/***************************************************************************/
+void
+init_frame (void)
+{
+#ifndef PDUMP
+if (!initialized)
+#endif
+{
+title_string_emchar_dynarr = Dynarr_new (Emchar);
+xzero (title_string_display_line);
+}
+}
 void
 syms_of_frame (void)
 {
 defsymbol (&Qdelete_frame_hook, "delete-frame-hook");
 defsymbol (&Qselect_frame_hook, "select-frame-hook");
 defsymbol (&Qmap_frame_hook, "map-frame-hook");
 defsymbol (&Qunmap_frame_hook, "unmap-frame-hook");
 defsymbol (&Qframep, "framep");
 defsymbol (&Qframe_live_p, "frame-live-p");
-defsymbol (&Qframe_x_p, "frame-x-p");
-defsymbol (&Qframe_tty_p, "frame-tty-p");
 defsymbol (&Qdelete_frame, "delete-frame");
 defsymbol (&Qsynchronize_minibuffers, "synchronize-minibuffers");
 defsymbol (&Qbuffer_predicate, "buffer-predicate");
 defsymbol (&Qframe_being_created, "frame-being-created");
 defsymbol (&Qmake_initial_minibuffer_frame, "make-initial-minibuffer-frame");
 DEFSUBR (Fset_frame_height);
 DEFSUBR (Fset_frame_width);
 DEFSUBR (Fset_frame_size);
 DEFSUBR (Fset_frame_position);
 DEFSUBR (Fset_frame_pointer);
+DEFSUBR (Fprint_job_page_number);
+DEFSUBR (Fprint_job_eject_page);
 }
 void
 vars_of_frame (void)
 {
 DEFVAR_LISP ("frame-title-format", &Vframe_title_format /*
 Controls the title of the X window corresponding to the selected frame.
 This is the same format as `modeline-format' with the exception that
 %- is ignored.
 */ );
-Vframe_title_format = Fpurecopy (build_string ("%S: %b"));
+Vframe_title_format = build_string ("%S: %b");
 DEFVAR_LISP ("frame-icon-title-format", &Vframe_icon_title_format /*
 Controls the title of the icon corresponding to the selected frame.
 See also the variable `frame-title-format'.
 */ );
-Vframe_icon_title_format = Fpurecopy (build_string ("%b"));
+Vframe_icon_title_format = build_string ("%b");
 DEFVAR_LISP ("default-frame-name", &Vdefault_frame_name /*
 The default name to assign to newly-created frames.
 This can be overridden by arguments to `make-frame'.
 This must be a string.
 */ );
 #ifndef INFODOCK
-Vdefault_frame_name = Fpurecopy (build_string ("emacs"));
+Vdefault_frame_name = build_string ("emacs");
 #else
-Vdefault_frame_name = Fpurecopy (build_string ("InfoDock"));
+Vdefault_frame_name = build_string ("InfoDock");
 #endif
 DEFVAR_LISP ("default-frame-plist", &Vdefault_frame_plist /*
 Plist of default values for frame creation, other than the first one.
 These may be set in your init file, like this:

Mercurial > hg > xemacs-beta

comparison src/frame.c @ 398:74fd4e045ea6 r21-2-29